Translation updates

1 files changed, 260 insertions, 169 deletions

diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index 85e69c5e050..1785518173c 100644
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,44 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-05 22:14+0000\n"
+"POT-Creation-Date: 2004-06-26 10:44+0000\n"
 "PO-Revision-Date: 2003-09-15 21:03+0000\n"
-"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: createdb.c:101 createdb.c:120 createlang.c:94 createlang.c:115
-#: createlang.c:157 createuser.c:116 createuser.c:131 dropdb.c:83 dropdb.c:92
-#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:151 dropuser.c:83
-#: dropuser.c:98 clusterdb.c:96 clusterdb.c:111 vacuumdb.c:112 vacuumdb.c:127
+#: createdb.c:102 createdb.c:121 createlang.c:97 createlang.c:118
+#: createlang.c:160 createuser.c:117 createuser.c:132 dropdb.c:84 dropdb.c:93
+#: dropdb.c:101 droplang.c:94 droplang.c:115 droplang.c:157 dropuser.c:84
+#: dropuser.c:99 clusterdb.c:97 clusterdb.c:112 vacuumdb.c:114 vacuumdb.c:129
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "请用 \"%s --help\" 获取更多的信息.\n"
 
-#: createdb.c:118 createlang.c:113 createuser.c:129 dropdb.c:98 droplang.c:107
-#: dropuser.c:96 clusterdb.c:109 vacuumdb.c:125
+#: createdb.c:119 createlang.c:116 createuser.c:130 dropdb.c:99 droplang.c:113
+#: dropuser.c:97 clusterdb.c:110 vacuumdb.c:127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: 太多的命令行参数 (第一个是 \"%s\")\n"
 
-#: createdb.c:128
+#: createdb.c:129
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
 msgstr "%s: \"%s\" 不是一个有效的编码名称\n"
 
-#: createdb.c:170
+#: createdb.c:168
 #, c-format
 msgid "%s: database creation failed: %s"
 msgstr "%s: 创建数据库失败: %s"
 
-#: createdb.c:195
+#: createdb.c:196
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
 msgstr "%s: 创建注释失败 (数据库已创建): %s"
 
-#: createdb.c:213
+#: createdb.c:217
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -52,18 +52,20 @@ msgstr ""
 "%s 创建一个 PostgreSQL 数据库.\n"
 "\n"
 
-#: createdb.c:214 createlang.c:272 createuser.c:236 dropdb.c:143
-#: droplang.c:242 dropuser.c:143 clusterdb.c:232 vacuumdb.c:256
+#: createdb.c:218 createlang.c:299 createuser.c:240 dropdb.c:147
+#: droplang.c:280 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
+#, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: createdb.c:215
+#: createdb.c:219
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [选项]... [数据库名称] [描述]\n"
 
-#: createdb.c:216 createlang.c:274 createuser.c:238 dropdb.c:145
-#: droplang.c:244 dropuser.c:145 clusterdb.c:234 vacuumdb.c:258
+#: createdb.c:220 createlang.c:301 createuser.c:242 dropdb.c:149
+#: droplang.c:282 dropuser.c:149 clusterdb.c:238 vacuumdb.c:264
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -71,44 +73,49 @@ msgstr ""
 "\n"
 "选项:\n"
 
-#: createdb.c:217
-msgid "  -D, --location=PATH       alternative place to store the database\n"
-msgstr "  -D, --location=PATH       选择一个地方存放数据库\n"
+#: createdb.c:221
+#, c-format
+msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
+msgstr "  -D, --tablespace=TABLESPACE  数据库默认表空间\n"
 
-#: createdb.c:218
-msgid "  -E, --encoding=ENCODING   encoding for the database\n"
-msgstr "  -E, --encoding=ENCODING   数据库编码\n"
+#: createdb.c:222
+#, c-format
+msgid "  -E, --encoding=ENCODING      encoding for the database\n"
+msgstr "  -E, --encoding=ENCODING      数据库编码\n"
 
-#: createdb.c:219
-msgid "  -O, --owner=OWNER         database user to own the new database\n"
-msgstr "  -O, --owner=OWNER         新数据库的所属用户\n"
+#: createdb.c:223
+#, c-format
+msgid "  -O, --owner=OWNER            database user to own the new database\n"
+msgstr "  -O, --owner=OWNER            新数据库的所属用户\n"
 
-#: createdb.c:220
-msgid "  -T, --template=TEMPLATE   template database to copy\n"
-msgstr "  -T, --template=TEMPLATE   要拷贝的数据库模板\n"
+#: createdb.c:224
+#, c-format
+msgid "  -T, --template=TEMPLATE      template database to copy\n"
+msgstr "  -T, --template=TEMPLATE      要拷贝的数据库模板\n"
 
-#: createdb.c:221 createlang.c:276 createuser.c:247 dropdb.c:146
-#: droplang.c:246 dropuser.c:146 clusterdb.c:238
+#: createdb.c:225
+#, c-format
 msgid ""
-"  -e, --echo                show the commands being sent to the server\n"
-msgstr ""
-"  -e, --echo                显示发送到服务端的命令\n"
+"  -e, --echo                   show the commands being sent to the server\n"
+msgstr "  -e, --echo                   显示发送到服务端的命令\n"
 
-#: createdb.c:222 createuser.c:248 dropdb.c:148 dropuser.c:148 clusterdb.c:239
-msgid "  -q, --quiet               don't write any messages\n"
-msgstr "  -q, --quiet               不写任何信息\n"
+#: createdb.c:226
+#, c-format
+msgid "  -q, --quiet                  don't write any messages\n"
+msgstr "  -q, --quiet                  不写任何信息\n"
 
-#: createdb.c:223 createlang.c:283 createuser.c:249 dropdb.c:153
-#: droplang.c:252 dropuser.c:153 clusterdb.c:240
-msgid "  --help                    show this help, then exit\n"
-msgstr "  --help                    显示此帮助信息, 然后退出\n"
+#: createdb.c:227
+#, c-format
+msgid "  --help                       show this help, then exit\n"
+msgstr "  --help                       显示此帮助信息, 然后退出\n"
 
-#: createdb.c:224 createlang.c:284 createuser.c:250 dropdb.c:154
-#: droplang.c:253 dropuser.c:154 clusterdb.c:241
-msgid "  --version                 output version information, then exit\n"
-msgstr "  --version                 输出版本信息, 然后退出\n"
+#: createdb.c:228
+#, c-format
+msgid "  --version                    output version information, then exit\n"
+msgstr "  --versoin                    输出版本信息, 然后退出\n"
 
-#: createdb.c:225 createuser.c:251 clusterdb.c:242 vacuumdb.c:269
+#: createdb.c:229 createuser.c:255 clusterdb.c:246 vacuumdb.c:275
+#, c-format
 msgid ""
 "\n"
 "Connection options:\n"
@@ -116,27 +123,30 @@ msgstr ""
 "\n"
 "联接选项:\n"
 
-#: createdb.c:226 createlang.c:279 createuser.c:252 dropdb.c:149
-#: droplang.c:248 dropuser.c:149 clusterdb.c:243 vacuumdb.c:270
-msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
-msgstr "  -h, --host=HOSTNAM        数据库服务器所在机器的主机名或套接字目录\n"
+#: createdb.c:230
+#, c-format
+msgid ""
+"  -h, --host=HOSTNAME          database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME          数据库服务器所在机器的主机名或套接字目录\n"
 
-#: createdb.c:227 createlang.c:280 createuser.c:253 dropdb.c:150
-#: droplang.c:249 dropuser.c:150 clusterdb.c:244 vacuumdb.c:271
-msgid "  -p, --port=PORT           database server port\n"
-msgstr "  -p, --port=PORT           数据库服务器端口号\n"
+#: createdb.c:231
+#, c-format
+msgid "  -p, --port=PORT              database server port\n"
+msgstr "  -p, --port=PORT              数据库服务器端口号\n"
 
-#: createdb.c:228 createlang.c:281 dropdb.c:151 droplang.c:250 clusterdb.c:245
-#: vacuumdb.c:272
-msgid "  -U, --username=USERNAME   user name to connect as\n"
-msgstr "  -U, --username=USERNAME   联接的用户名\n"
+#: createdb.c:232
+#, c-format
+msgid "  -U, --username=USERNAME      user name to connect as\n"
+msgstr "  -U, --username=USERNAME      联接的用户名\n"
 
-#: createdb.c:229 createlang.c:282 dropdb.c:152 droplang.c:251 clusterdb.c:246
-#: vacuumdb.c:273
-msgid "  -W, --password            prompt for password\n"
-msgstr "  -W, --password            提示输入口令\n"
+#: createdb.c:233
+#, c-format
+msgid "  -W, --password               prompt for password\n"
+msgstr "  -W, --password               提示输入口令\n"
 
-#: createdb.c:230
+#: createdb.c:234
+#, c-format
 msgid ""
 "\n"
 "By default, a database with the same name as the current user is created.\n"
@@ -144,8 +154,9 @@ msgstr ""
 "\n"
 "默认情况下, 以当前用户的用户名创建数据库.\n"
 
-#: createdb.c:231 createlang.c:285 createuser.c:258 dropdb.c:155
-#: droplang.c:254 dropuser.c:155 clusterdb.c:248 vacuumdb.c:275
+#: createdb.c:235 createlang.c:312 createuser.c:262 dropdb.c:159
+#: droplang.c:292 dropuser.c:159 clusterdb.c:252 vacuumdb.c:281
+#, c-format
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -153,115 +164,162 @@ msgstr ""
 "\n"
 "臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "Name"
 msgstr "名字"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "yes"
 msgstr "yes"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "no"
 msgstr "no"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "Trusted?"
 msgstr "是否信任?"
 
-#: createlang.c:147 droplang.c:141
+#: createlang.c:150 droplang.c:147
 msgid "Procedural Languages"
 msgstr "过程语言"
 
-#: createlang.c:156 droplang.c:150
+#: createlang.c:159 droplang.c:156
 #, c-format
 msgid "%s: missing required argument language name\n"
 msgstr "%s: 缺少要求的语言名称参数\n"
 
-#: createlang.c:206
+#: createlang.c:210
 #, c-format
 msgid "%s: unsupported language \"%s\"\n"
 msgstr "%s: 不支持语言 \"%s\"\n"
 
-#: createlang.c:207
+#: createlang.c:211
+#, c-format
 msgid ""
 "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
 "plpythonu.\n"
-msgstr "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
+msgstr ""
+"已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
 
-#: createlang.c:222
+#: createlang.c:226
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%1$s: 数据库 \"%3$s\" 中已经安装了语言 \"%2$s\"\n"
 
-#: createlang.c:256
+#: createlang.c:283
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: 语言安装失败: %s"
 
-#: createlang.c:271
+#: createlang.c:298
 #, c-format
 msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
 "\n"
-msgstr "%s 安装一个过程语言进 PostgreSQL 数据库.\n\n"
+msgstr ""
+"%s 安装一个过程语言进 PostgreSQL 数据库.\n"
+"\n"
 
-#: createlang.c:273 droplang.c:243
+#: createlang.c:300 droplang.c:281
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
 msgstr "  %s [选项]... 语言名称 [数据库名]\n"
 
-#: createlang.c:275
+#: createlang.c:302
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DBNAME       要安装语言的数据库\n"
 
-#: createlang.c:277 droplang.c:247
+#: createlang.c:303 createuser.c:251 dropdb.c:150 droplang.c:284
+#: dropuser.c:150 clusterdb.c:242
+#, c-format
+msgid ""
+"  -e, --echo                show the commands being sent to the server\n"
+msgstr "  -e, --echo                显示发送到服务端的命令\n"
+
+#: createlang.c:304 droplang.c:285
+#, c-format
 msgid ""
 "  -l, --list                show a list of currently installed languages\n"
-msgstr ""
-"  -l, --list                显示当前已经安装了的语言列表\n"
+msgstr "  -l, --list                显示当前已经安装了的语言列表\n"
 
-#: createlang.c:278
+#: createlang.c:305
+#, c-format
 msgid ""
 "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-msgstr ""
-"  -L, --pglib=DIRECTORY     在 DIRECTORY 目录中查找语言翻译文件\n"
+msgstr "  -L, --pglib=DIRECTORY     在 DIRECTORY 目录中查找语言翻译文件\n"
+
+#: createlang.c:306 createuser.c:256 dropdb.c:153 droplang.c:286
+#: dropuser.c:153 clusterdb.c:247 vacuumdb.c:276
+#, c-format
+msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
+msgstr "  -h, --host=HOSTNAM        数据库服务器所在机器的主机名或套接字目录\n"
+
+#: createlang.c:307 createuser.c:257 dropdb.c:154 droplang.c:287
+#: dropuser.c:154 clusterdb.c:248 vacuumdb.c:277
+#, c-format
+msgid "  -p, --port=PORT           database server port\n"
+msgstr "  -p, --port=PORT           数据库服务器端口号\n"
+
+#: createlang.c:308 dropdb.c:155 droplang.c:288 clusterdb.c:249 vacuumdb.c:278
+#, c-format
+msgid "  -U, --username=USERNAME   user name to connect as\n"
+msgstr "  -U, --username=USERNAME   联接的用户名\n"
+
+#: createlang.c:309 dropdb.c:156 droplang.c:289 clusterdb.c:250 vacuumdb.c:279
+#, c-format
+msgid "  -W, --password            prompt for password\n"
+msgstr "  -W, --password            提示输入口令\n"
+
+#: createlang.c:310 createuser.c:253 dropdb.c:157 droplang.c:290
+#: dropuser.c:157 clusterdb.c:244
+#, c-format
+msgid "  --help                    show this help, then exit\n"
+msgstr "  --help                    显示此帮助信息, 然后退出\n"
 
-#: createuser.c:141
+#: createlang.c:311 createuser.c:254 dropdb.c:158 droplang.c:291
+#: dropuser.c:158 clusterdb.c:245
+#, c-format
+msgid "  --version                 output version information, then exit\n"
+msgstr "  --version                 输出版本信息, 然后退出\n"
+
+#: createuser.c:142
 #, c-format
 msgid "%s: user ID must be a positive number\n"
 msgstr "%s: 用户 ID 必需为一个正数\n"
 
-#: createuser.c:147
+#: createuser.c:148
 msgid "Enter name of user to add: "
 msgstr "输入要增加的用户名: "
 
-#: createuser.c:154
+#: createuser.c:155
 msgid "Enter password for new user: "
 msgstr "输入新用户的口令: "
 
-#: createuser.c:155
+#: createuser.c:156
 msgid "Enter it again: "
 msgstr "再输入一遍: "
 
-#: createuser.c:158
+#: createuser.c:159
+#, c-format
 msgid "Passwords didn't match.\n"
 msgstr "口令不匹配.\n"
 
-#: createuser.c:169
+#: createuser.c:170
 msgid "Shall the new user be allowed to create databases? (y/n) "
 msgstr "新用户允许创建数据库吗? (y/n) "
 
-#: createuser.c:180
+#: createuser.c:181
 msgid "Shall the new user be allowed to create more new users? (y/n) "
 msgstr "新用户允许创建用户吗? (y/n) "
 
-#: createuser.c:219
+#: createuser.c:220
 #, c-format
 msgid "%s: creation of new user failed: %s"
 msgstr "%s: 创建新用户失败: %s"
 
-#: createuser.c:235
+#: createuser.c:239
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL user.\n"
@@ -270,54 +328,69 @@ msgstr ""
 "%s 创建一个新的 PostgreSQL 用户.\n"
 "\n"
 
-#: createuser.c:237 dropuser.c:144
+#: createuser.c:241 dropuser.c:148
 #, c-format
 msgid "  %s [OPTION]... [USERNAME]\n"
 msgstr "  %s [选项]... [用户名]\n"
 
-#: createuser.c:239
+#: createuser.c:243
+#, c-format
 msgid "  -a, --adduser             user can add new users\n"
 msgstr "  -a, --adduser             此用户可以创建其他新用户\n"
 
-#: createuser.c:240
+#: createuser.c:244
+#, c-format
 msgid "  -A, --no-adduser          user cannot add new users\n"
 msgstr "  -A, --no-adduser          此用户不可以创建其他新用户\n"
 
-#: createuser.c:241
+#: createuser.c:245
+#, c-format
 msgid "  -d, --createdb            user can create new databases\n"
 msgstr "  -d, --createdb            此用户可以创建新数据库\n"
 
-#: createuser.c:242
+#: createuser.c:246
+#, c-format
 msgid "  -D, --no-createdb         user cannot create databases\n"
 msgstr "  -D, --no-createdb         此用户不可以创建新数据库\n"
 
-#: createuser.c:243
+#: createuser.c:247
+#, c-format
 msgid "  -P, --pwprompt            assign a password to new user\n"
 msgstr "  -P, --pwprompt            给新用户指定口令\n"
 
-#: createuser.c:244
+#: createuser.c:248
+#, c-format
 msgid "  -E, --encrypted           encrypt stored password\n"
 msgstr "  -E, --encrypted           口令加密存储\n"
 
-#: createuser.c:245
+#: createuser.c:249
+#, c-format
 msgid "  -N, --unencrypted         do no encrypt stored password\n"
 msgstr "  -N, --unencrypted         口令不加密存储\n"
 
-#: createuser.c:246
+#: createuser.c:250
+#, c-format
 msgid "  -i, --sysid=SYSID         select sysid for new user\n"
 msgstr "  -i, --sysid=SYSID         选择一个 sysid 给新用户\n"
 
-#: createuser.c:254
+#: createuser.c:252 dropdb.c:152 dropuser.c:152 clusterdb.c:243
+#, c-format
+msgid "  -q, --quiet               don't write any messages\n"
+msgstr "  -q, --quiet               不写任何信息\n"
+
+#: createuser.c:258
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
-msgstr ""
-"  -U, --username=USERNAME   联接用户 (不是要创建的用户名)\n"
+msgstr "  -U, --username=USERNAME   联接用户 (不是要创建的用户名)\n"
 
-#: createuser.c:255 dropuser.c:152
+#: createuser.c:259 dropuser.c:156
+#, c-format
 msgid "  -W, --password            prompt for password to connect\n"
 msgstr "  -W, --password            联接提示口令输入\n"
 
-#: createuser.c:256
+#: createuser.c:260
+#, c-format
 msgid ""
 "\n"
 "If one of -a, -A, -d, -D, and USERNAME is not specified, you will\n"
@@ -327,26 +400,26 @@ msgstr ""
 "如果 -a, -A, -d, -D, 和 USERNAME 一个都没有指定,将使用交互式提示\n"
 "你.\n"
 
-#: dropdb.c:91
+#: dropdb.c:92
 #, c-format
 msgid "%s: missing required argument database name\n"
 msgstr "%s: 缺少需要的数据库名参数\n"
 
-#: dropdb.c:108
+#: dropdb.c:109
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
 msgstr "数据库 \"%s\" 将被永久的删除.\n"
 
-#: dropdb.c:109 dropuser.c:110
+#: dropdb.c:110 dropuser.c:111
 msgid "Are you sure? (y/n) "
 msgstr "你确定吗? (y/n) "
 
-#: dropdb.c:126
+#: dropdb.c:127
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: 数据库删除失败: %s"
 
-#: dropdb.c:142
+#: dropdb.c:146
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -355,32 +428,33 @@ msgstr ""
 "%s 删除一个 PostgreSQL 数据库.\n"
 "\n"
 
-#: dropdb.c:144
+#: dropdb.c:148
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [选项]... 数据库名\n"
 
-#: dropdb.c:147 dropuser.c:147
+#: dropdb.c:151 dropuser.c:151
+#, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         删除任何东西之前给予提示\n"
 
-#: droplang.c:170
+#: droplang.c:176
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%1$s: 数据库 \"%3$s\" 中, 没有安装语言 \"%2$s\"\n"
 
-#: droplang.c:186
+#: droplang.c:193
 #, c-format
 msgid ""
 "%s: still %s functions declared in language \"%s\"; language not removed\n"
 msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
 
-#: droplang.c:227
+#: droplang.c:265
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: 语言删除失败: %s"
 
-#: droplang.c:241
+#: droplang.c:279
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
@@ -389,27 +463,27 @@ msgstr ""
 "%s 从数据库中删除一个过程语言.\n"
 "\n"
 
-#: droplang.c:245
+#: droplang.c:283
+#, c-format
 msgid ""
 "  -d, --dbname=DBNAME       database from which to remove the language\n"
-msgstr ""
-"  -d, --dbname=DBNAME       要删除语言的数据库\n"
+msgstr "  -d, --dbname=DBNAME       要删除语言的数据库\n"
 
-#: dropuser.c:103
+#: dropuser.c:104
 msgid "Enter name of user to drop: "
 msgstr "输入要删除的用户名: "
 
-#: dropuser.c:109
+#: dropuser.c:110
 #, c-format
 msgid "User \"%s\" will be permanently removed.\n"
 msgstr "用户 \"%s\" 将被永久删除.\n"
 
-#: dropuser.c:126
+#: dropuser.c:127
 #, c-format
 msgid "%s: removal of user \"%s\" failed: %s"
 msgstr "%s: 删除用户 \"%s\" 失败: %s"
 
-#: dropuser.c:142
+#: dropuser.c:146
 #, c-format
 msgid ""
 "%s removes a PostgreSQL user.\n"
@@ -418,38 +492,38 @@ msgstr ""
 "%s 删除一个 PostgreSQL 用户.\n"
 "\n"
 
-#: dropuser.c:151
+#: dropuser.c:155
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
-msgstr ""
-"  -U, --username=USERNAME   联接用户 (不是要删除的用户名)\n"
+msgstr "  -U, --username=USERNAME   联接用户 (不是要删除的用户名)\n"
 
-#: clusterdb.c:119
+#: clusterdb.c:120
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr "%s: 无法对所有数据库和一个指定的数据库同时建簇\n"
 
-#: clusterdb.c:125
+#: clusterdb.c:126
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr "%s: 无法在所有数据库中对一个指定的表进行建簇\n"
 
-#: clusterdb.c:181
+#: clusterdb.c:182
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 建簇失败: %4$s"
 
-#: clusterdb.c:184
+#: clusterdb.c:185
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr "%s: 数据库 \"%s\" 建簇失败: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:221
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: 对数据库 \"%s\" 进行建簇\n"
 
-#: clusterdb.c:231
+#: clusterdb.c:235
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -458,24 +532,28 @@ msgstr ""
 "%s 对一个数据库中先前已经建过簇的表进行建簇.\n"
 "\n"
 
-#: clusterdb.c:233 vacuumdb.c:257
+#: clusterdb.c:237 vacuumdb.c:263
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [选项]... [数据库名]\n"
 
-#: clusterdb.c:235
+#: clusterdb.c:239
+#, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 对所有数据库建簇\n"
 
-#: clusterdb.c:236
+#: clusterdb.c:240
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       对数据库 DBNAME 建簇\n"
 
-#: clusterdb.c:237
+#: clusterdb.c:241
+#, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr "  -t, --table=TABLE         只对指定的表 TABLE 建簇\n"
 
-#: clusterdb.c:247
+#: clusterdb.c:251
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command CLUSTER for details.\n"
@@ -483,32 +561,32 @@ msgstr ""
 "\n"
 "阅读 SQL 命令 CLUSTER 的描述信息, 以便获得更详细的信息.\n"
 
-#: vacuumdb.c:135
+#: vacuumdb.c:137
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr "%s: 无法对所有数据库和一个指定的数据库同时清理\n"
 
-#: vacuumdb.c:141
+#: vacuumdb.c:143
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr "%s: 无法在所有数据库中对一个指定的表进行清理\n"
 
-#: vacuumdb.c:204
+#: vacuumdb.c:207
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 清理失败: %4$s"
 
-#: vacuumdb.c:207
+#: vacuumdb.c:210
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: 数据库 \"%s\" 清理失败: %s"
 
-#: vacuumdb.c:241
+#: vacuumdb.c:247
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: 清理数据库 \"%s\"\n"
 
-#: vacuumdb.c:255
+#: vacuumdb.c:261
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -517,52 +595,61 @@ msgstr ""
 "%s 清理并且优化一个 PostgreSQL 数据库.\n"
 "\n"
 
-#: vacuumdb.c:259
+#: vacuumdb.c:265
+#, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       清理所有的数据库\n"
 
-#: vacuumdb.c:260
+#: vacuumdb.c:266
+#, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAME             清理数据库 DBNAME\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:267
+#, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr "  -t, --table='TABLE[(COLUMNS)]'  只清理指定的表 TABLE\n"
 
-#: vacuumdb.c:262
+#: vacuumdb.c:268
+#, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      完全清理\n"
 
-#: vacuumdb.c:263
+#: vacuumdb.c:269
+#, c-format
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr "  -z, --anaylze                   更新优化器信息\n"
 
-#: vacuumdb.c:264
+#: vacuumdb.c:270
+#, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
-msgstr ""
-"  -e, --echo                      显示发送到服务端的命令\n"
+msgstr "  -e, --echo                      显示发送到服务端的命令\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:271
+#, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     不写任何信息\n"
 
-#: vacuumdb.c:266
+#: vacuumdb.c:272
+#, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   写大量的输出\n"
 
-#: vacuumdb.c:267
+#: vacuumdb.c:273
+#, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          显示此帮助信息, 然后退出\n"
 
-#: vacuumdb.c:268
+#: vacuumdb.c:274
+#, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
-msgstr ""
-"  --versoin                       输出版本信息, 然后退出\n"
+msgstr "  --versoin                       输出版本信息, 然后退出\n"
 
-#: vacuumdb.c:274
+#: vacuumdb.c:280
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command VACUUM for details.\n"
@@ -570,36 +657,40 @@ msgstr ""
 "\n"
 "阅读 SQL 命令 VACUUM 的描述信息, 以便获得更详细的信息.\n"
 
-#: common.c:88 common.c:114
+#: common.c:86 common.c:112
 msgid "Password: "
 msgstr "口令: "
 
-#: common.c:101
+#: common.c:99
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: 无法联接到数据库 %s\n"
 
-#: common.c:124
+#: common.c:122
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: 无法联接到数据库 %s: %s"
 
-#: common.c:148
+#: common.c:146
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: 查询失败: %s"
 
-#: common.c:149
+#: common.c:147
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: 查询是: %s\n"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:163
+#: common.c:161
 msgid "y"
 msgstr "y"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:165
+#: common.c:163
 msgid "n"
 msgstr "n"
+
+#~ msgid ""
+#~ "  -D, --location=PATH       alternative place to store the database\n"
+#~ msgstr "  -D, --location=PATH       选择一个地方存放数据库\n"