*** a/src/bin/psql/po/zh_CN.po
--- b/src/bin/psql/po/zh_CN.po
***************
*** 4,10 **** msgstr ""
  "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
  "POT-Creation-Date: 2014-11-22 21:11+0000\n"
  "PO-Revision-Date: 2014-11-28 16:08+0800\n"
! "Last-Translator: Xiong He <iihero@qq.com>\n"
  "Language-Team: Chinese (Simplified)\n"
  "Language: zh_CN\n"
  "MIME-Version: 1.0\n"
--- 4,10 ----
  "Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
  "POT-Creation-Date: 2014-11-22 21:11+0000\n"
  "PO-Revision-Date: 2014-11-28 16:08+0800\n"
! "Last-Translator: Rugal Bernstein <ryujinwrath@gmail.com>\n"
  "Language-Team: Chinese (Simplified)\n"
  "Language: zh_CN\n"
  "MIME-Version: 1.0\n"
***************
*** 47,53 **** msgstr "无法跳转到目录 \"%s\" 中: %s"
  #: ../../common/exec.c:272
  #, c-format
  msgid "could not read symbolic link \"%s\""
! msgstr "无法读取符号连结 \"%s\""
  
  #: ../../common/exec.c:523
  #, c-format
--- 47,53 ----
  #: ../../common/exec.c:272
  #, c-format
  msgid "could not read symbolic link \"%s\""
! msgstr "无法读取符号链接 \"%s\""
  
  #: ../../common/exec.c:523
  #, c-format
***************
*** 62,68 **** msgstr "pclose调用失败: %s"
  #: ../../common/fe_memutils.c:83 input.c:205 mainloop.c:72 mainloop.c:234
  #, c-format
  msgid "out of memory\n"
! msgstr "记忆体用尽\n"
  
  # common.c:78
  #: ../../common/fe_memutils.c:77
--- 62,68 ----
  #: ../../common/fe_memutils.c:83 input.c:205 mainloop.c:72 mainloop.c:234
  #, c-format
  msgid "out of memory\n"
! msgstr "内存耗尽\n"
  
  # common.c:78
  #: ../../common/fe_memutils.c:77
***************
*** 104,110 **** msgstr "子进程结束，结束代码 %d"
  #: ../../common/wait_error.c:63
  #, c-format
  msgid "child process was terminated by exception 0x%X"
! msgstr "子进程被例外(exception) 0x%X 终止"
  
  #: ../../common/wait_error.c:73
  #, c-format
--- 104,110 ----
  #: ../../common/wait_error.c:63
  #, c-format
  msgid "child process was terminated by exception 0x%X"
! msgstr "子进程被异常(exception) 0x%X 终止"
  
  #: ../../common/wait_error.c:73
  #, c-format
***************
*** 125,131 **** msgstr "子进程结束，不明状态代码 %d"
  #: command.c:117
  #, c-format
  msgid "Invalid command \\%s. Try \\? for help.\n"
! msgstr "无效的命令 \\%s，用 \\? 显示说明。\n"
  
  # command.c:122
  #: command.c:119
--- 125,131 ----
  #: command.c:117
  #, c-format
  msgid "Invalid command \\%s. Try \\? for help.\n"
! msgstr "无效的命令 \\%s，用 \\? 查看帮助。\n"
  
  # command.c:122
  #: command.c:119
***************
*** 144,150 **** msgstr "\\%s：忽略多余的参数 \"%s\" \n"
  #, c-format
  #| msgid "could not get home directory: %s\n"
  msgid "could not get home directory for user ID %ld: %s\n"
! msgstr "无法得到用户ID %ld: %s对应的home 目录\n"
  
  # command.c:256
  #: command.c:292
--- 144,150 ----
  #, c-format
  #| msgid "could not get home directory: %s\n"
  msgid "could not get home directory for user ID %ld: %s\n"
! msgstr "无法获取用户ID %ld: %s对应的home 目录\n"
  
  # command.c:256
  #: command.c:292
***************
*** 157,163 **** msgstr "\\%s: 无法切换目录至 \"%s\": %s\n"
  #: command.c:308 common.c:446 common.c:886
  #, c-format
  msgid "You are currently not connected to a database.\n"
! msgstr "你目前没有与资料库连线。\n"
  
  #: command.c:315
  #, c-format
--- 157,163 ----
  #: command.c:308 common.c:446 common.c:886
  #, c-format
  msgid "You are currently not connected to a database.\n"
! msgstr "你目前没有连接到数据库。\n"
  
  #: command.c:315
  #, c-format
***************
*** 186,192 **** msgstr "没有查询缓存区\n"
  #: command.c:550 command.c:2978
  #, c-format
  msgid "invalid line number: %s\n"
! msgstr "无效行号: %s\n"
  
  # describe.c:117
  #: command.c:581
--- 186,192 ----
  #: command.c:550 command.c:2978
  #, c-format
  msgid "invalid line number: %s\n"
! msgstr "行号无效: %s\n"
  
  # describe.c:117
  #: command.c:581
***************
*** 196,202 **** msgstr "服务器(版本%d.%d)不支持编辑函数源码.\n"
  
  #: command.c:661
  msgid "No changes"
! msgstr "没有发生"
  
  # command.c:433
  #: command.c:715
--- 196,202 ----
  
  #: command.c:661
  msgid "No changes"
! msgstr "没有发生更改"
  
  # command.c:433
  #: command.c:715
***************
*** 232,248 **** msgstr "输入新的密码："
  
  #: command.c:936
  msgid "Enter it again: "
! msgstr "再次键入："
  
  #: command.c:940
  #, c-format
  msgid "Passwords didn't match.\n"
! msgstr "Passwords didn't match.\n"
  
  #: command.c:958
  #, c-format
  msgid "Password encryption failed.\n"
! msgstr "密码加密失败.\n"
  
  # startup.c:502
  #: command.c:1029 command.c:1140 command.c:1367
--- 232,248 ----
  
  #: command.c:936
  msgid "Enter it again: "
! msgstr "再次输入："
  
  #: command.c:940
  #, c-format
  msgid "Passwords didn't match.\n"
! msgstr "两次密码不匹配。\n"
  
  #: command.c:958
  #, c-format
  msgid "Password encryption failed.\n"
! msgstr "密码加密失败。\n"
  
  # startup.c:502
  #: command.c:1029 command.c:1140 command.c:1367
***************
*** 253,266 **** msgstr "\\%s: 设定变量值时出错\n"
  # command.c:632
  #: command.c:1087
  msgid "Query buffer reset (cleared)."
! msgstr "查询缓存区重置(清空)。"
  
  # command.c:646
  #: command.c:1099
  #, c-format
  #| msgid "Wrote history to file \"%s/%s\".\n"
  msgid "Wrote history to file \"%s\".\n"
! msgstr "写入历史到文件 \"%s\".\n"
  
  #: command.c:1164
  #, c-format
--- 253,266 ----
  # command.c:632
  #: command.c:1087
  msgid "Query buffer reset (cleared)."
! msgstr "查询缓存区重置(已清空)。"
  
  # command.c:646
  #: command.c:1099
  #, c-format
  #| msgid "Wrote history to file \"%s/%s\".\n"
  msgid "Wrote history to file \"%s\".\n"
! msgstr "写入历史记录到文件 \"%s\".\n"
  
  #: command.c:1164
  #, c-format
***************
*** 355,367 **** msgstr "%s"
  #: command.c:1675
  #, c-format
  msgid "Previous connection kept\n"
! msgstr "保留上一次连线\n"
  
  # command.c:969
  #: command.c:1679
  #, c-format
  msgid "\\connect: %s"
! msgstr "\\连线：%s"
  
  # command.c:981
  #: command.c:1712
--- 355,367 ----
  #: command.c:1675
  #, c-format
  msgid "Previous connection kept\n"
! msgstr "保留上一次连接\n"
  
  # command.c:969
  #: command.c:1679
  #, c-format
  msgid "\\connect: %s"
! msgstr "\\连接：%s"
  
  # command.c:981
  #: command.c:1712
***************
*** 370,376 **** msgid ""
  "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
  "at port \"%s\".\n"
  msgstr ""
! "您现在已经连线到数据库 \"%s\", 用户名 \"%s\" , 套接字 \"%s\", 端口号 \"%s"
  "\".\n"
  
  # command.c:981
--- 370,376 ----
  "You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
  "at port \"%s\".\n"
  msgstr ""
! "您现在已经连接到数据库 \"%s\", 用户名 \"%s\" , 套接字 \"%s\", 端口号 \"%s"
  "\".\n"
  
  # command.c:981
***************
*** 380,392 **** msgid ""
  "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
  "port \"%s\".\n"
  msgstr ""
! "您现在已经连线到数据库 \"%s\", 用户 \"%s\",主机 \"%s\",端口号 \"%s\".\n"
  
  # command.c:981
  #: command.c:1719
  #, c-format
  msgid "You are now connected to database \"%s\" as user \"%s\".\n"
! msgstr "您现在已经连线到数据库 \"%s\",用户 \"%s\".\n"
  
  #: command.c:1753
  #, c-format
--- 380,392 ----
  "You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
  "port \"%s\".\n"
  msgstr ""
! "您现在已经连接到数据库 \"%s\", 用户 \"%s\",主机 \"%s\",端口号 \"%s\".\n"
  
  # command.c:981
  #: command.c:1719
  #, c-format
  msgid "You are now connected to database \"%s\" as user \"%s\".\n"
! msgstr "您现在已经连接到数据库 \"%s\",用户 \"%s\".\n"
  
  #: command.c:1753
  #, c-format
***************
*** 400,406 **** msgid ""
  "         Some psql features might not work.\n"
  msgstr ""
  "警告：%s 主版本%d.%d,服务器主版本为%d.%d.\n"
! "     一些psql功能可能无法工作.\n"
  
  # startup.c:652
  #: command.c:1791
--- 400,406 ----
  "         Some psql features might not work.\n"
  msgstr ""
  "警告：%s 主版本%d.%d,服务器主版本为%d.%d.\n"
! "     一些psql功能可能无法正常使用。\n"
  
  # startup.c:652
  #: command.c:1791
***************
*** 433,439 **** msgid ""
  "         page \"Notes for Windows users\" for details.\n"
  msgstr ""
  "警告：来自 Windows 代码页 (%u) 的控制台代码页 (%u) 的差异\n"
! "         8-bit 字元可能无法正常工作。查阅 psql 参考\n"
  "         页 \"Windows 用户注意事项\" 的详细说明。\n"
  
  #: command.c:1907
--- 433,439 ----
  "         page \"Notes for Windows users\" for details.\n"
  msgstr ""
  "警告：来自 Windows 代码页 (%u) 的控制台代码页 (%u) 的差异\n"
! "         8-bit 字符可能无法正常工作。请查阅 psql 参考\n"
  "         页 \"Windows 用户注意事项\" 的详细说明。\n"
  
  #: command.c:1907
***************
*** 459,471 **** msgstr "无法启动 /bin/sh\n"
  #: command.c:1976
  #, c-format
  msgid "could not locate temporary directory: %s\n"
! msgstr "找不到暂存目录：%s\n"
  
  # command.c:1148
  #: command.c:2003
  #, c-format
  msgid "could not open temporary file \"%s\": %s\n"
! msgstr "无法开启暂存档 \"%s\": %s\n"
  
  # command.c:1340
  #: command.c:2271
--- 459,471 ----
  #: command.c:1976
  #, c-format
  msgid "could not locate temporary directory: %s\n"
! msgstr "找不到临时目录：%s\n"
  
  # command.c:1148
  #: command.c:2003
  #, c-format
  msgid "could not open temporary file \"%s\": %s\n"
! msgstr "无法打开临时文件 \"%s\": %s\n"
  
  # command.c:1340
  #: command.c:2271
***************
*** 491,497 **** msgstr "\\pset: 不明选项: %s\n"
  #: command.c:2450
  #, c-format
  msgid "Border style is %d.\n"
! msgstr "边界风格是 %d。\n"
  
  #: command.c:2456
  #, c-format
--- 491,497 ----
  #: command.c:2450
  #, c-format
  msgid "Border style is %d.\n"
! msgstr "边缘风格是 %d。\n"
  
  #: command.c:2456
  #, c-format
***************
*** 539,552 **** msgstr "栏位分隔符号是 \"%s\"。\n"
  #, c-format
  #| msgid "Default footer is on."
  msgid "Default footer is on.\n"
! msgstr "打开预设步进器(Footer).\n"
  
  # command.c:1487
  #: command.c:2493
  #, c-format
  #| msgid "Default footer is off."
  msgid "Default footer is off.\n"
! msgstr "关闭预设步进器(Footer)。\n"
  
  # command.c:1345
  #: command.c:2499
--- 539,552 ----
  #, c-format
  #| msgid "Default footer is on."
  msgid "Default footer is on.\n"
! msgstr "打开默认步进器。\n"
  
  # command.c:1487
  #: command.c:2493
  #, c-format
  #| msgid "Default footer is off."
  msgid "Default footer is off.\n"
! msgstr "关闭默认步进器。\n"
  
  # command.c:1345
  #: command.c:2499
***************
*** 570,589 **** msgstr " \"%s\" 是空值显示。\n"
  #, c-format
  #| msgid "Locale-adjusted numeric output is off."
  msgid "Locale-adjusted numeric output is on.\n"
! msgstr "语言环境调整后的数值输出开启。\n"
  
  #: command.c:2522
  #, c-format
  #| msgid "Locale-adjusted numeric output is off."
  msgid "Locale-adjusted numeric output is off.\n"
! msgstr "语言环境调整后的数值输出关闭。\n"
  
  # command.c:1470
  #: command.c:2529
  #, c-format
  #| msgid "Pager is used for long output."
  msgid "Pager is used for long output.\n"
! msgstr "显示大量资料时使用分页器。\n"
  
  # command.c:1472
  #: command.c:2531
--- 570,589 ----
  #, c-format
  #| msgid "Locale-adjusted numeric output is off."
  msgid "Locale-adjusted numeric output is on.\n"
! msgstr "启动语言环境调整后的数值输出。\n"
  
  #: command.c:2522
  #, c-format
  #| msgid "Locale-adjusted numeric output is off."
  msgid "Locale-adjusted numeric output is off.\n"
! msgstr "关闭语言环境调整后的数值输出。\n"
  
  # command.c:1470
  #: command.c:2529
  #, c-format
  #| msgid "Pager is used for long output."
  msgid "Pager is used for long output.\n"
! msgstr "显示大量数据时使用分页器。\n"
  
  # command.c:1472
  #: command.c:2531
***************
*** 629,635 **** msgstr "表属性是 \"%s\".\n"
  #: command.c:2560
  #, c-format
  msgid "Table attributes unset.\n"
! msgstr "未设置资料表属性。\n"
  
  # command.c:1434
  #: command.c:2567
--- 629,635 ----
  #: command.c:2560
  #, c-format
  msgid "Table attributes unset.\n"
! msgstr "未设置数据表属性。\n"
  
  # command.c:1434
  #: command.c:2567
***************
*** 648,661 **** msgstr "无标题。\n"
  #, c-format
  #| msgid "Tuples only is off."
  msgid "Tuples only is on.\n"
! msgstr "开启只显示 Tuples。\n"
  
  # command.c:1418
  #: command.c:2578
  #, c-format
  #| msgid "Tuples only is off."
  msgid "Tuples only is off.\n"
! msgstr "关闭只显示 Tuples。\n"
  
  # command.c:1532
  #: command.c:2729
--- 648,661 ----
  #, c-format
  #| msgid "Tuples only is off."
  msgid "Tuples only is on.\n"
! msgstr "开启只显示元组。\n"
  
  # command.c:1418
  #: command.c:2578
  #, c-format
  #| msgid "Tuples only is off."
  msgid "Tuples only is off.\n"
! msgstr "关闭只显示元组。\n"
  
  # command.c:1532
  #: command.c:2729
***************
*** 688,700 **** msgstr "\\Watch出现意外的结果状态\n"
  #: common.c:287
  #, c-format
  msgid "connection to server was lost\n"
! msgstr "与资料库的连线遗失\n"
  
  # common.c:302
  #: common.c:291
  #, c-format
  msgid "The connection to the server was lost. Attempting reset: "
! msgstr "与伺服器的连线已遗失，尝试重置: "
  
  # common.c:307
  #: common.c:296
--- 688,700 ----
  #: common.c:287
  #, c-format
  msgid "connection to server was lost\n"
! msgstr "与数据库的连接已经断开\n"
  
  # common.c:302
  #: common.c:291
  #, c-format
  msgid "The connection to the server was lost. Attempting reset: "
! msgstr "与服务器的连接已断开，正在试图重置: "
  
  # common.c:307
  #: common.c:296
***************
*** 741,747 **** msgstr ""
  #, c-format
  msgid ""
  "Asynchronous notification \"%s\" received from server process with PID %d.\n"
! msgstr "收到来自伺服器 \"%s\" 进程 PID %d 非同步通知。\n"
  
  #: common.c:578
  #, c-format
--- 741,747 ----
  #, c-format
  msgid ""
  "Asynchronous notification \"%s\" received from server process with PID %d.\n"
! msgstr "收到来自服务器 \"%s\" 进程 PID %d 非同步通知。\n"
  
  #: common.c:578
  #, c-format
***************
*** 757,763 **** msgstr "\\gset返回超过１个记录行\n"
  #: common.c:609
  #, c-format
  msgid "could not set variable \"%s\"\n"
! msgstr "无法设定变量 \"%s\"\n"
  
  # common.c:879
  #: common.c:894
--- 757,763 ----
  #: common.c:609
  #, c-format
  msgid "could not set variable \"%s\"\n"
! msgstr "无法设置变量 \"%s\"\n"
  
  # common.c:879
  #: common.c:894
***************
*** 769,775 **** msgid ""
  "***(press return to proceed or enter x and return to cancel)"
  "********************\n"
  msgstr ""
! "***(单步(Single step)模式：验证命令)"
  "*******************************************\n"
  "%s\n"
  "***(按 Enter 键继续或键入 x 来取消)********************\n"
--- 769,775 ----
  "***(press return to proceed or enter x and return to cancel)"
  "********************\n"
  msgstr ""
! "***(单步模式：验证命令)"
  "*******************************************\n"
  "%s\n"
  "***(按 Enter 键继续或键入 x 来取消)********************\n"
***************
*** 821,827 **** msgstr "无法执行命令 \"%s\": %s\n"
  #, c-format
  #| msgid "could not stat file \"%s\": %m"
  msgid "could not stat file \"%s\": %s\n"
! msgstr "无法取文件 \"%s\":%s 的状态\n"
  
  # copy.c:541
  #: copy.c:350
--- 821,827 ----
  #, c-format
  #| msgid "could not stat file \"%s\": %m"
  msgid "could not stat file \"%s\": %s\n"
! msgstr "无法获取文件 \"%s\":%s 的状态\n"
  
  # copy.c:541
  #: copy.c:350
***************
*** 838,849 **** msgstr "无法为外部命令: %s关闭管道\n"
  #: copy.c:455 copy.c:466
  #, c-format
  msgid "could not write COPY data: %s\n"
! msgstr "无法写入 COPY 资料：%s\n"
  
  #: copy.c:473
  #, c-format
  msgid "COPY data transfer failed: %s"
! msgstr "COPY 资料转换失败：%s"
  
  #: copy.c:534
  msgid "canceled by user"
--- 838,849 ----
  #: copy.c:455 copy.c:466
  #, c-format
  msgid "could not write COPY data: %s\n"
! msgstr "无法写入 COPY 数据：%s\n"
  
  #: copy.c:473
  #, c-format
  msgid "COPY data transfer failed: %s"
! msgstr "COPY 数据转换失败：%s"
  
  #: copy.c:534
  msgid "canceled by user"
***************
*** 855,861 **** msgid ""
  "Enter data to be copied followed by a newline.\n"
  "End with a backslash and a period on a line by itself."
  msgstr ""
! "输入要复制的资料并且换行。\n"
  "在独立的一行上输入一个反斜线和一个句点结束。"
  
  #: copy.c:667
--- 855,861 ----
  "Enter data to be copied followed by a newline.\n"
  "End with a backslash and a period on a line by itself."
  msgstr ""
! "输入要复制的数据并且换行。\n"
  "在独立的一行上输入一个反斜线和一个句点结束。"
  
  #: copy.c:667
***************
*** 907,919 **** msgstr "名称"
  # describe.c:177
  #: describe.c:73 describe.c:272 describe.c:318 describe.c:335
  msgid "Result data type"
! msgstr "结果资料型别"
  
  # describe.c:178
  #: describe.c:81 describe.c:94 describe.c:98 describe.c:273 describe.c:319
  #: describe.c:336
  msgid "Argument data types"
! msgstr "参数资料型别"
  
  # describe.c:83
  # describe.c:187
--- 907,919 ----
  # describe.c:177
  #: describe.c:73 describe.c:272 describe.c:318 describe.c:335
  msgid "Result data type"
! msgstr "结果数据类型"
  
  # describe.c:178
  #: describe.c:81 describe.c:94 describe.c:98 describe.c:273 describe.c:319
  #: describe.c:336
  msgid "Argument data types"
! msgstr "参数数据类型"
  
  # describe.c:83
  # describe.c:187
***************
*** 1008,1014 **** msgstr "常规"
  #: describe.c:279 describe.c:324 describe.c:341 describe.c:765 describe.c:853
  #: describe.c:1455 describe.c:2768 describe.c:2966 describe.c:4097
  msgid "Type"
! msgstr "型别"
  
  # sql_help.h:221
  #: describe.c:355
--- 1008,1014 ----
  #: describe.c:279 describe.c:324 describe.c:341 describe.c:765 describe.c:853
  #: describe.c:1455 describe.c:2768 describe.c:2966 describe.c:4097
  msgid "Type"
! msgstr "类型"
  
  # sql_help.h:221
  #: describe.c:355
***************
*** 1028,1034 **** msgstr "安全"
  # describe.c:1477
  #: describe.c:358
  msgid "immutable"
! msgstr "不可改变"
  
  # describe.c:415
  # describe.c:543
--- 1028,1034 ----
  # describe.c:1477
  #: describe.c:358
  msgid "immutable"
! msgstr "不可更改"
  
  # describe.c:415
  # describe.c:543
***************
*** 1077,1098 **** msgstr "成员"
  # describe.c:289
  #: describe.c:574
  msgid "List of data types"
! msgstr "资料型别列表"
  
  # describe.c:321
  #: describe.c:617
  msgid "Left arg type"
! msgstr "左参数型别"
  
  # describe.c:321
  #: describe.c:618
  msgid "Right arg type"
! msgstr "右参数型别"
  
  # describe.c:322
  #: describe.c:619
  msgid "Result type"
! msgstr "结果型别"
  
  # describe.c:1691
  #: describe.c:624 describe.c:3206 describe.c:3573
--- 1077,1098 ----
  # describe.c:289
  #: describe.c:574
  msgid "List of data types"
! msgstr "数据类型列表"
  
  # describe.c:321
  #: describe.c:617
  msgid "Left arg type"
! msgstr "左参数类型"
  
  # describe.c:321
  #: describe.c:618
  msgid "Right arg type"
! msgstr "右参数类型"
  
  # describe.c:322
  #: describe.c:619
  msgid "Result type"
! msgstr "结果类型"
  
  # describe.c:1691
  #: describe.c:624 describe.c:3206 describe.c:3573
***************
*** 1130,1150 **** msgstr "表空间"
  # describe.c:381
  #: describe.c:720
  msgid "List of databases"
! msgstr "资料库列表"
  
  # describe.c:415
  # describe.c:543
  # describe.c:1477
  #: describe.c:760 describe.c:846 describe.c:2761
  msgid "table"
! msgstr "资料表"
  
  # describe.c:415
  # describe.c:543
  # describe.c:1477
  #: describe.c:761 describe.c:2762
  msgid "view"
! msgstr "视观表"
  
  #: describe.c:762 describe.c:2763
  msgid "materialized view"
--- 1130,1150 ----
  # describe.c:381
  #: describe.c:720
  msgid "List of databases"
! msgstr "数据库列表"
  
  # describe.c:415
  # describe.c:543
  # describe.c:1477
  #: describe.c:760 describe.c:846 describe.c:2761
  msgid "table"
! msgstr "数据表"
  
  # describe.c:415
  # describe.c:543
  # describe.c:1477
  #: describe.c:761 describe.c:2762
  msgid "view"
! msgstr "视图"
  
  #: describe.c:762 describe.c:2763
  msgid "materialized view"
***************
*** 1181,1187 **** msgstr "存取权限"
  #, c-format
  msgid ""
  "The server (version %d.%d) does not support altering default privileges.\n"
! msgstr "服务器(版本%d.%d)不支持修改缺省权限.\n"
  
  # describe.c:498
  #: describe.c:850
--- 1181,1187 ----
  #, c-format
  msgid ""
  "The server (version %d.%d) does not support altering default privileges.\n"
! msgstr "服务器(版本%d.%d)不支持修改默认权限.\n"
  
  # describe.c:498
  #: describe.c:850
***************
*** 1199,1210 **** msgstr "类型Ctype"
  # sql_help.h:325
  #: describe.c:876
  msgid "Default access privileges"
! msgstr "缺省的访问权限"
  
  # describe.c:469
  #: describe.c:916
  msgid "Object"
! msgstr "物件"
  
  #: describe.c:930 sql_help.c:1595
  msgid "constraint"
--- 1199,1210 ----
  # sql_help.h:325
  #: describe.c:876
  msgid "Default access privileges"
! msgstr "默认的访问权限"
  
  # describe.c:469
  #: describe.c:916
  msgid "Object"
! msgstr "对象"
  
  #: describe.c:930 sql_help.c:1595
  msgid "constraint"
***************
*** 1227,1233 **** msgstr "规则"
  # describe.c:593
  #: describe.c:1050
  msgid "Object descriptions"
! msgstr "物件描述"
  
  # describe.c:641
  #: describe.c:1104
--- 1227,1233 ----
  # describe.c:593
  #: describe.c:1050
  msgid "Object descriptions"
! msgstr "对象描述"
  
  # describe.c:641
  #: describe.c:1104
***************
*** 1251,1263 **** msgstr "不记录日志的表 \"%s.%s\""
  #: describe.c:1402
  #, c-format
  msgid "Table \"%s.%s\""
! msgstr "资料表 \"%s.%s\""
  
  # describe.c:863
  #: describe.c:1406
  #, c-format
  msgid "View \"%s.%s\""
! msgstr "视观表 \"%s.%s\""
  
  # describe.c:933
  #: describe.c:1411
--- 1251,1263 ----
  #: describe.c:1402
  #, c-format
  msgid "Table \"%s.%s\""
! msgstr "数据表 \"%s.%s\""
  
  # describe.c:863
  #: describe.c:1406
  #, c-format
  msgid "View \"%s.%s\""
! msgstr "视图 \"%s.%s\""
  
  # describe.c:933
  #: describe.c:1411
***************
*** 1298,1310 **** msgstr "特殊关联 \"%s.%s\""
  #: describe.c:1435
  #, c-format
  msgid "TOAST table \"%s.%s\""
! msgstr "TOAST 资料表 \"%s.%s\""
  
  # describe.c:883
  #: describe.c:1439
  #, c-format
  msgid "Composite type \"%s.%s\""
! msgstr "合成型别 \"%s.%s\""
  
  # describe.c:933
  #: describe.c:1443
--- 1298,1310 ----
  #: describe.c:1435
  #, c-format
  msgid "TOAST table \"%s.%s\""
! msgstr "TOAST 数据表 \"%s.%s\""
  
  # describe.c:883
  #: describe.c:1439
  #, c-format
  msgid "Composite type \"%s.%s\""
! msgstr "合成类型 \"%s.%s\""
  
  # describe.c:933
  #: describe.c:1443
***************
*** 1362,1368 **** msgstr "非空"
  #: describe.c:1549
  #, c-format
  msgid "default %s"
! msgstr "缺省 %s"
  
  # describe.c:925
  #: describe.c:1664
--- 1362,1368 ----
  #: describe.c:1549
  #, c-format
  msgid "default %s"
! msgstr "默认 %s"
  
  # describe.c:925
  #: describe.c:1664
***************
*** 1378,1384 **** msgstr "唯一的,"
  #: describe.c:1672
  #, c-format
  msgid "for table \"%s.%s\""
! msgstr "给资料表 \"%s.%s\""
  
  # describe.c:937
  #: describe.c:1676
--- 1378,1384 ----
  #: describe.c:1672
  #, c-format
  msgid "for table \"%s.%s\""
! msgstr "给数据表 \"%s.%s\""
  
  # describe.c:937
  #: describe.c:1676
***************
*** 1636,1642 **** msgstr "特殊"
  # describe.c:1483
  #: describe.c:2774 describe.c:4216
  msgid "Table"
! msgstr "资料表"
  
  # describe.c:1542
  #: describe.c:2850
--- 1636,1642 ----
  # describe.c:1483
  #: describe.c:2774 describe.c:4216
  msgid "Table"
! msgstr "数据表"
  
  # describe.c:1542
  #: describe.c:2850
***************
*** 1784,1795 **** msgstr "事件触发器列表"
  # describe.c:1688
  #: describe.c:3204
  msgid "Source type"
! msgstr "来源型别"
  
  # describe.c:1689
  #: describe.c:3205
  msgid "Target type"
! msgstr "目标型别"
  
  # describe.c:1693
  #: describe.c:3208
--- 1784,1795 ----
  # describe.c:1688
  #: describe.c:3204
  msgid "Source type"
! msgstr "来源类型"
  
  # describe.c:1689
  #: describe.c:3205
  msgid "Target type"
! msgstr "目标类型"
  
  # describe.c:1693
  #: describe.c:3208
***************
*** 1804,1810 **** msgstr "隐含的?"
  # describe.c:1703
  #: describe.c:3261
  msgid "List of casts"
! msgstr "型别转换列表"
  
  # describe.c:117
  #: describe.c:3287
--- 1804,1810 ----
  # describe.c:1703
  #: describe.c:3261
  msgid "List of casts"
! msgstr "类型转换列表"
  
  # describe.c:117
  #: describe.c:3287
***************
*** 1861,1877 **** msgstr "取得首行"
  
  #: describe.c:3582
  msgid "Get token types"
! msgstr "取得标志符型别"
  
  #: describe.c:3592
  #, c-format
  msgid "Text search parser \"%s.%s\""
! msgstr "文本搜寻剖析器 \"%s.%s\""
  
  #: describe.c:3594
  #, c-format
  msgid "Text search parser \"%s\""
! msgstr "文本搜寻剖析器 \"%s\""
  
  # describe.c:1375
  #: describe.c:3613
--- 1861,1877 ----
  
  #: describe.c:3582
  msgid "Get token types"
! msgstr "取得标志符类型"
  
  #: describe.c:3592
  #, c-format
  msgid "Text search parser \"%s.%s\""
! msgstr "文本搜索剖析器 \"%s.%s\""
  
  #: describe.c:3594
  #, c-format
  msgid "Text search parser \"%s\""
! msgstr "文本搜索剖析器 \"%s\""
  
  # describe.c:1375
  #: describe.c:3613
***************
*** 1886,1892 **** msgstr "标志符别型给剖析器 \"%s.%s\""
  #: describe.c:3626
  #, c-format
  msgid "Token types for parser \"%s\""
! msgstr "标志符型别给剖析器 \"%s\""
  
  #: describe.c:3676
  msgid "Template"
--- 1886,1892 ----
  #: describe.c:3626
  #, c-format
  msgid "Token types for parser \"%s\""
! msgstr "标志符类型给剖析器 \"%s\""
  
  #: describe.c:3676
  msgid "Template"
***************
*** 1900,1906 **** msgstr "初始选项"
  # describe.c:1549
  #: describe.c:3699
  msgid "List of text search dictionaries"
! msgstr "文本搜寻字典列表"
  
  #: describe.c:3739
  msgid "Init"
--- 1900,1906 ----
  # describe.c:1549
  #: describe.c:3699
  msgid "List of text search dictionaries"
! msgstr "文本搜索字典列表"
  
  #: describe.c:3739
  msgid "Init"
***************
*** 1914,1931 **** msgstr "词汇"
  # describe.c:1753
  #: describe.c:3767
  msgid "List of text search templates"
! msgstr "文本搜寻样式列表"
  
  # describe.c:97
  #: describe.c:3824
  msgid "List of text search configurations"
! msgstr "文本搜寻组态列表"
  
  # describe.c:641
  #: describe.c:3868
  #, c-format
  msgid "Did not find any text search configuration named \"%s\".\n"
! msgstr "没有找到任何命名为 \"%s\" 的文本搜寻组态。\n"
  
  #: describe.c:3934
  msgid "Token"
--- 1914,1931 ----
  # describe.c:1753
  #: describe.c:3767
  msgid "List of text search templates"
! msgstr "文本搜索样式列表"
  
  # describe.c:97
  #: describe.c:3824
  msgid "List of text search configurations"
! msgstr "文本搜索组态列表"
  
  # describe.c:641
  #: describe.c:3868
  #, c-format
  msgid "Did not find any text search configuration named \"%s\".\n"
! msgstr "没有找到任何命名为 \"%s\" 的文本搜索组态。\n"
  
  #: describe.c:3934
  msgid "Token"
***************
*** 1938,1949 **** msgstr "字典"
  #: describe.c:3946
  #, c-format
  msgid "Text search configuration \"%s.%s\""
! msgstr "文本搜寻组态 \"%s.%s\""
  
  #: describe.c:3949
  #, c-format
  msgid "Text search configuration \"%s\""
! msgstr "文本搜寻组态 \"%s\""
  
  # describe.c:859
  #: describe.c:3953
--- 1938,1949 ----
  #: describe.c:3946
  #, c-format
  msgid "Text search configuration \"%s.%s\""
! msgstr "文本搜索组态 \"%s.%s\""
  
  #: describe.c:3949
  #, c-format
  msgid "Text search configuration \"%s\""
! msgstr "文本搜索组态 \"%s\""
  
  # describe.c:859
  #: describe.c:3953
***************
*** 2113,2119 **** msgstr "  -c,--command=命令        执行单一命令(SQL或内部指令)然
  #, c-format
  msgid ""
  "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
! msgstr " -d, --dbname=数据库名称   指定要连接的数据库 (缺省：\"%s\")\n"
  
  # help.c:95
  #: help.c:78
--- 2113,2119 ----
  #, c-format
  msgid ""
  "  -d, --dbname=DBNAME      database name to connect to (default: \"%s\")\n"
! msgstr " -d, --dbname=数据库名称   指定要连接的数据库 (默认：\"%s\")\n"
  
  # help.c:95
  #: help.c:78
***************
*** 2260,2266 **** msgid ""
  "\"%s\")\n"
  msgstr ""
  "  -F, --field-separator=STRING\n"
! "             为字段设置分隔符,用于不整齐的输出(缺省：\"%s\")\n"
  
  # help.c:114
  #: help.c:104
--- 2260,2266 ----
  "\"%s\")\n"
  msgstr ""
  "  -F, --field-separator=STRING\n"
! "             为字段设置分隔符,用于不整齐的输出(默认：\"%s\")\n"
  
  # help.c:114
  #: help.c:104
***************
*** 2289,2295 **** msgid ""
  "newline)\n"
  msgstr ""
  "  -R, --record-separator=STRING\n"
! "             为不整齐的输出设置字录的分隔符(缺省：换行符号)\n"
  
  # help.c:115
  #: help.c:108
--- 2289,2295 ----
  "newline)\n"
  msgstr ""
  "  -R, --record-separator=STRING\n"
! "             为不整齐的输出设置字录的分隔符(默认：换行符号)\n"
  
  # help.c:115
  #: help.c:108
***************
*** 2355,2361 **** msgid ""
  "  -h, --host=HOSTNAME      database server host or socket directory "
  "(default: \"%s\")\n"
  msgstr ""
! "  -h, --host=主机名        数据库服务器主机或socket目录(缺省：\"%s\")\n"
  
  # help.c:127
  #: help.c:120
--- 2355,2361 ----
  "  -h, --host=HOSTNAME      database server host or socket directory "
  "(default: \"%s\")\n"
  msgstr ""
! "  -h, --host=主机名        数据库服务器主机或socket目录(默认：\"%s\")\n"
  
  # help.c:127
  #: help.c:120
***************
*** 2366,2378 **** msgstr "本地接口"
  #: help.c:123
  #, c-format
  msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
! msgstr "  -p, --port=端口        数据库服务器的端口(缺省：\"%s\")\n"
  
  # help.c:136
  #: help.c:129
  #, c-format
  msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
! msgstr "  -U, --username=用户名    指定数据库用户名(缺省：\"%s\")\n"
  
  #: help.c:130
  #, c-format
--- 2366,2378 ----
  #: help.c:123
  #, c-format
  msgid "  -p, --port=PORT          database server port (default: \"%s\")\n"
! msgstr "  -p, --port=端口        数据库服务器的端口(默认：\"%s\")\n"
  
  # help.c:136
  #: help.c:129
  #, c-format
  msgid "  -U, --username=USERNAME  database user name (default: \"%s\")\n"
! msgstr "  -U, --username=用户名    指定数据库用户名(默认：\"%s\")\n"
  
  #: help.c:130
  #, c-format
***************
*** 2603,2609 **** msgstr "  \\dd[S]  [PATTERN]      显示没有在别处显示的对象描述\n"
  #: help.c:195
  #, c-format
  msgid "  \\ddp    [PATTERN]      list default privileges\n"
! msgstr "  \\ddp     [模式]    列出缺省权限\n"
  
  # help.c:220
  #: help.c:196
--- 2603,2609 ----
  #: help.c:195
  #, c-format
  msgid "  \\ddp    [PATTERN]      list default privileges\n"
! msgstr "  \\ddp     [模式]    列出默认权限\n"
  
  # help.c:220
  #: help.c:196
***************
*** 2652,2658 **** msgstr "  \\dF[+]  [模式]   列出文本搜索配置\n"
  #: help.c:203
  #, c-format
  msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
! msgstr "  \\dFd[+] [模式]     列出文本搜寻字典\n"
  
  # help.c:228
  #: help.c:204
--- 2652,2658 ----
  #: help.c:203
  #, c-format
  msgid "  \\dFd[+] [PATTERN]      list text search dictionaries\n"
! msgstr "  \\dFd[+] [模式]     列出文本搜索字典\n"
  
  # help.c:228
  #: help.c:204
***************
*** 2902,2908 **** msgstr "  \\encoding [编码名称] 显示或设定客户端编码\n"
  #: help.c:254
  #, c-format
  msgid "  \\password [USERNAME]   securely change the password for a user\n"
! msgstr "  \\password [USERNAME]  安全地为用户改变口令\n"
  
  #: help.c:255
  #, c-format
--- 2902,2908 ----
  #: help.c:254
  #, c-format
  msgid "  \\password [USERNAME]   securely change the password for a user\n"
! msgstr "  \\password [USERNAME]  安全地为用户更改口令\n"
  
  #: help.c:255
  #, c-format
***************
*** 2919,2925 **** msgstr "操作系统\n"
  #: help.c:259
  #, c-format
  msgid "  \\cd [DIR]              change the current working directory\n"
! msgstr "  \\cd [目录]     改变目前的工作目录\n"
  
  # help.c:188
  #: help.c:260
--- 2919,2925 ----
  #: help.c:259
  #, c-format
  msgid "  \\cd [DIR]              change the current working directory\n"
! msgstr "  \\cd [目录]     更改目前的工作目录\n"
  
  # help.c:188
  #: help.c:260
***************
*** 3039,3057 **** msgstr "这个安装不支援命令记录\n"
  #: large_obj.c:66
  #, c-format
  msgid "%s: not connected to a database\n"
! msgstr "%s：尚未与资料库连线\n"
  
  # large_obj.c:55
  #: large_obj.c:85
  #, c-format
  msgid "%s: current transaction is aborted\n"
! msgstr "%s：目前的交易被中止\n"
  
  # large_obj.c:58
  #: large_obj.c:88
  #, c-format
  msgid "%s: unknown transaction status\n"
! msgstr "%s：不明交易状态\n"
  
  #: large_obj.c:289 large_obj.c:300
  msgid "ID"
--- 3039,3057 ----
  #: large_obj.c:66
  #, c-format
  msgid "%s: not connected to a database\n"
! msgstr "%s：尚未与数据库连接\n"
  
  # large_obj.c:55
  #: large_obj.c:85
  #, c-format
  msgid "%s: current transaction is aborted\n"
! msgstr "%s：目前的事务被中止\n"
  
  # large_obj.c:58
  #: large_obj.c:88
  #, c-format
  msgid "%s: unknown transaction status\n"
! msgstr "%s：不明事务状态\n"
  
  #: large_obj.c:289 large_obj.c:300
  msgid "ID"
***************
*** 3060,3066 **** msgstr "ID"
  # large_obj.c:264
  #: large_obj.c:310
  msgid "Large objects"
! msgstr "大型物件"
  
  # mainloop.c:172
  #: mainloop.c:159
--- 3060,3066 ----
  # large_obj.c:264
  #: large_obj.c:310
  msgid "Large objects"
! msgstr "大型对象"
  
  # mainloop.c:172
  #: mainloop.c:159
***************
*** 3099,3105 **** msgstr[0] "(%lu 行记录)"
  #: print.c:1174
  #, c-format
  msgid "(No rows)\n"
! msgstr "(无资料列)\n"
  
  #: print.c:2238
  #, c-format
--- 3099,3105 ----
  #: print.c:1174
  #, c-format
  msgid "(No rows)\n"
! msgstr "(无数据列)\n"
  
  #: print.c:2238
  #, c-format
***************
*** 3991,3997 **** msgstr "列的约束是:"
  # describe.c:1639
  #: sql_help.c:1673 sql_help.c:1700 sql_help.c:2056
  msgid "default_expr"
! msgstr "缺省_表达式"
  
  # describe.c:1689
  #: sql_help.c:1701
--- 3991,3997 ----
  # describe.c:1639
  #: sql_help.c:1673 sql_help.c:1700 sql_help.c:2056
  msgid "default_expr"
! msgstr "默认_表达式"
  
  # describe.c:1689
  #: sql_help.c:1701
***************
*** 4305,4311 **** msgstr "优先"
  # describe.c:1639
  #: sql_help.c:2279
  msgid "default"
! msgstr "缺省"
  
  #: sql_help.c:2280
  msgid "element"
--- 4305,4311 ----
  # describe.c:1639
  #: sql_help.c:2279
  msgid "default"
! msgstr "默认"
  
  #: sql_help.c:2280
  msgid "element"
***************
*** 4330,4336 **** msgstr "with查询语句(with_query)"
  #: sql_help.c:3561 sql_help.c:3609 sql_help.c:3708 sql_help.c:3711
  #: sql_help.c:3714 sql_help.c:3718 sql_help.c:3722 sql_help.c:3730
  msgid "alias"
! msgstr "化名"
  
  #: sql_help.c:2382
  msgid "using_list"
--- 4330,4336 ----
  #: sql_help.c:3561 sql_help.c:3609 sql_help.c:3708 sql_help.c:3711
  #: sql_help.c:3714 sql_help.c:3718 sql_help.c:3722 sql_help.c:3730
  msgid "alias"
! msgstr "别名"
  
  #: sql_help.c:2382
  msgid "using_list"
***************
*** 4466,4472 **** msgstr "from 列表中的项可以是下列内容之一"
  #: sql_help.c:3550 sql_help.c:3562 sql_help.c:3709 sql_help.c:3712
  #: sql_help.c:3715 sql_help.c:3719 sql_help.c:3731
  msgid "column_alias"
! msgstr "列的化名"
  
  #: sql_help.c:3326 sql_help.c:3351 sql_help.c:3544 sql_help.c:3569
  #: sql_help.c:3713 sql_help.c:3738
--- 4466,4472 ----
  #: sql_help.c:3550 sql_help.c:3562 sql_help.c:3709 sql_help.c:3712
  #: sql_help.c:3715 sql_help.c:3719 sql_help.c:3731
  msgid "column_alias"
! msgstr "列的别名"
  
  #: sql_help.c:3326 sql_help.c:3351 sql_help.c:3544 sql_help.c:3569
  #: sql_help.c:3713 sql_help.c:3738
***************
*** 4530,4540 **** msgstr "新的表"
  
  #: sql_help.c:3409
  msgid "timezone"
! msgstr "时间区域"
  
  #: sql_help.c:3454
  msgid "snapshot_id"
! msgstr "snapshot_id"
  
  #: sql_help.c:3614
  msgid "from_list"
--- 4530,4540 ----
  
  #: sql_help.c:3409
  msgid "timezone"
! msgstr "时区"
  
  #: sql_help.c:3454
  msgid "snapshot_id"
! msgstr "快照id"
  
  #: sql_help.c:3614
  msgid "from_list"
***************
*** 4548,4554 **** msgstr "排序表达式"
  # sql_help.h:373
  #: sql_help.h:191 sql_help.h:891
  msgid "abort the current transaction"
! msgstr "中止目前的交易"
  
  # sql_help.h:29
  #: sql_help.h:196
--- 4548,4554 ----
  # sql_help.h:373
  #: sql_help.h:191 sql_help.h:891
  msgid "abort the current transaction"
! msgstr "中止目前的事务"
  
  # sql_help.h:29
  #: sql_help.h:196
***************
*** 4563,4579 **** msgstr "更改校对规则的定义"
  # sql_help.h:33
  #: sql_help.h:206
  msgid "change the definition of a conversion"
! msgstr "更改一个字元编码转换的定义"
  
  # sql_help.h:37
  #: sql_help.h:211
  msgid "change a database"
! msgstr "更改一个资料库"
  
  # sql_help.h:325
  #: sql_help.h:216
  msgid "define default access privileges"
! msgstr "定义缺省的访问权限"
  
  # sql_help.h:41
  #: sql_help.h:221
--- 4563,4579 ----
  # sql_help.h:33
  #: sql_help.h:206
  msgid "change the definition of a conversion"
! msgstr "更改一个字符编码转换的定义"
  
  # sql_help.h:37
  #: sql_help.h:211
  msgid "change a database"
! msgstr "更改一个数据库"
  
  # sql_help.h:325
  #: sql_help.h:216
  msgid "define default access privileges"
! msgstr "定义默认的访问权限"
  
  # sql_help.h:41
  #: sql_help.h:221
***************
*** 4607,4613 **** msgstr "更改函数的定义"
  
  #: sql_help.h:251
  msgid "change role name or membership"
! msgstr "更改角色名称或会员"
  
  # sql_help.h:53
  #: sql_help.h:256
--- 4607,4613 ----
  
  #: sql_help.h:251
  msgid "change role name or membership"
! msgstr "更改角色名称或成员状态"
  
  # sql_help.h:53
  #: sql_help.h:256
***************
*** 4622,4628 **** msgstr "更改程序语言的定义"
  # sql_help.h:77
  #: sql_help.h:266
  msgid "change the definition of a large object"
! msgstr "改变大对象的定义"
  
  # sql_help.h:53
  #: sql_help.h:271
--- 4622,4628 ----
  # sql_help.h:77
  #: sql_help.h:266
  msgid "change the definition of a large object"
! msgstr "更改大对象的定义"
  
  # sql_help.h:53
  #: sql_help.h:271
***************
*** 4647,4653 **** msgstr "更改一个运算子家族的识别"
  # sql_help.h:37
  #: sql_help.h:291 sql_help.h:361
  msgid "change a database role"
! msgstr "变更资料库角色"
  
  # sql_help.h:77
  #: sql_help.h:296
--- 4647,4653 ----
  # sql_help.h:37
  #: sql_help.h:291 sql_help.h:361
  msgid "change a database role"
! msgstr "更改数据库角色"
  
  # sql_help.h:77
  #: sql_help.h:296
***************
*** 4673,4684 **** msgstr "更改外部服务器的定义"
  #: sql_help.h:316
  #| msgid "configuration_parameter"
  msgid "change a server configuration parameter"
! msgstr "改变服务器的配置参数"
  
  # sql_help.h:77
  #: sql_help.h:321
  msgid "change the definition of a table"
! msgstr "更改资料表的定义"
  
  # sql_help.h:81
  #: sql_help.h:326
--- 4673,4684 ----
  #: sql_help.h:316
  #| msgid "configuration_parameter"
  msgid "change a server configuration parameter"
! msgstr "更改服务器的配置参数"
  
  # sql_help.h:77
  #: sql_help.h:321
  msgid "change the definition of a table"
! msgstr "更改数据表的定义"
  
  # sql_help.h:81
  #: sql_help.h:326
***************
*** 4688,4709 **** msgstr "更改表空间的定义"
  # sql_help.h:33
  #: sql_help.h:331
  msgid "change the definition of a text search configuration"
! msgstr "更改一个文本搜寻组态的定义"
  
  # sql_help.h:45
  #: sql_help.h:336
  msgid "change the definition of a text search dictionary"
! msgstr "更改一个文本搜寻字典的定义"
  
  # sql_help.h:81
  #: sql_help.h:341
  msgid "change the definition of a text search parser"
! msgstr "更改一个文本搜寻剖析器的定义"
  
  # sql_help.h:69
  #: sql_help.h:346
  msgid "change the definition of a text search template"
! msgstr "更改一个文本搜寻模版的定义"
  
  # sql_help.h:85
  #: sql_help.h:351
--- 4688,4709 ----
  # sql_help.h:33
  #: sql_help.h:331
  msgid "change the definition of a text search configuration"
! msgstr "更改一个文本搜索组态的定义"
  
  # sql_help.h:45
  #: sql_help.h:336
  msgid "change the definition of a text search dictionary"
! msgstr "更改一个文本搜索字典的定义"
  
  # sql_help.h:81
  #: sql_help.h:341
  msgid "change the definition of a text search parser"
! msgstr "更改一个文本搜索剖析器的定义"
  
  # sql_help.h:69
  #: sql_help.h:346
  msgid "change the definition of a text search template"
! msgstr "更改一个文本搜索模版的定义"
  
  # sql_help.h:85
  #: sql_help.h:351
***************
*** 4713,4719 **** msgstr "更改触发器的定义"
  # sql_help.h:89
  #: sql_help.h:356
  msgid "change the definition of a type"
! msgstr "更改资料型别的定义"
  
  # sql_help.h:41
  #: sql_help.h:366
--- 4713,4719 ----
  # sql_help.h:89
  #: sql_help.h:356
  msgid "change the definition of a type"
! msgstr "更改数据类型的定义"
  
  # sql_help.h:41
  #: sql_help.h:366
***************
*** 4723,4775 **** msgstr "更改用户映射的定义"
  # sql_help.h:53
  #: sql_help.h:371
  msgid "change the definition of a view"
! msgstr "更改视观表的定义"
  
  # sql_help.h:97
  #: sql_help.h:376
  msgid "collect statistics about a database"
! msgstr "关于资料库的收集统计"
  
  # sql_help.h:101
  # sql_help.h:413
  #: sql_help.h:381 sql_help.h:956
  msgid "start a transaction block"
! msgstr "开始一个事物交易区块"
  
  # sql_help.h:105
  #: sql_help.h:386
  msgid "force a transaction log checkpoint"
! msgstr "强制事物交易日志检查点"
  
  # sql_help.h:109
  #: sql_help.h:391
  msgid "close a cursor"
! msgstr "关闭 cursor"
  
  # sql_help.h:113
  #: sql_help.h:396
  msgid "cluster a table according to an index"
! msgstr "丛集一个资料表根据一个索引"
  
  # sql_help.h:117
  #: sql_help.h:401
  msgid "define or change the comment of an object"
! msgstr "定义或更改一个物件的注解"
  
  # sql_help.h:121
  # sql_help.h:309
  #: sql_help.h:406 sql_help.h:796
  msgid "commit the current transaction"
! msgstr "确认目前的事物交易"
  
  #: sql_help.h:411
  msgid "commit a transaction that was earlier prepared for two-phase commit"
! msgstr "提交一项事务交易这是两阶段提交的先前准备"
  
  # sql_help.h:125
  #: sql_help.h:416
  msgid "copy data between a file and a table"
! msgstr "在档案和资料表间复制资料"
  
  # sql_help.h:129
  #: sql_help.h:421
--- 4723,4775 ----
  # sql_help.h:53
  #: sql_help.h:371
  msgid "change the definition of a view"
! msgstr "更改视图的定义"
  
  # sql_help.h:97
  #: sql_help.h:376
  msgid "collect statistics about a database"
! msgstr "收集数据库的统计信息"
  
  # sql_help.h:101
  # sql_help.h:413
  #: sql_help.h:381 sql_help.h:956
  msgid "start a transaction block"
! msgstr "开始一个事务区块"
  
  # sql_help.h:105
  #: sql_help.h:386
  msgid "force a transaction log checkpoint"
! msgstr "强制一个事务触发检查点"
  
  # sql_help.h:109
  #: sql_help.h:391
  msgid "close a cursor"
! msgstr "关闭游标"
  
  # sql_help.h:113
  #: sql_help.h:396
  msgid "cluster a table according to an index"
! msgstr "按照索引进行表的聚集"
  
  # sql_help.h:117
  #: sql_help.h:401
  msgid "define or change the comment of an object"
! msgstr "定义或更改一个对象的注解"
  
  # sql_help.h:121
  # sql_help.h:309
  #: sql_help.h:406 sql_help.h:796
  msgid "commit the current transaction"
! msgstr "确认目前的事务"
  
  #: sql_help.h:411
  msgid "commit a transaction that was earlier prepared for two-phase commit"
! msgstr "提交一项事务这是两阶段提交的先前准备"
  
  # sql_help.h:125
  #: sql_help.h:416
  msgid "copy data between a file and a table"
! msgstr "在档案和数据表间复制数据"
  
  # sql_help.h:129
  #: sql_help.h:421
***************
*** 4779,4785 **** msgstr "定义一个新的聚集函数"
  # sql_help.h:133
  #: sql_help.h:426
  msgid "define a new cast"
! msgstr "建立新的型别转换"
  
  # sql_help.h:153
  #: sql_help.h:431
--- 4779,4785 ----
  # sql_help.h:133
  #: sql_help.h:426
  msgid "define a new cast"
! msgstr "建立新的类型转换"
  
  # sql_help.h:153
  #: sql_help.h:431
***************
*** 4794,4800 **** msgstr "定义一个新的字元编码转换"
  # sql_help.h:145
  #: sql_help.h:441
  msgid "create a new database"
! msgstr "建立新的资料库"
  
  # sql_help.h:149
  #: sql_help.h:446
--- 4794,4800 ----
  # sql_help.h:145
  #: sql_help.h:441
  msgid "create a new database"
! msgstr "建立新的数据库"
  
  # sql_help.h:149
  #: sql_help.h:446
***************
*** 4828,4834 **** msgstr "建立新的函数"
  # sql_help.h:189
  #: sql_help.h:476 sql_help.h:511 sql_help.h:581
  msgid "define a new database role"
! msgstr "定义一个新资料库角色"
  
  # sql_help.h:161
  #: sql_help.h:481
--- 4828,4834 ----
  # sql_help.h:189
  #: sql_help.h:476 sql_help.h:511 sql_help.h:581
  msgid "define a new database role"
! msgstr "定义一个新数据库角色"
  
  # sql_help.h:161
  #: sql_help.h:481
***************
*** 4883,4895 **** msgstr "建立新的触发器"
  # sql_help.h:189
  #: sql_help.h:536
  msgid "define a new table"
! msgstr "建立新的资料表"
  
  # sql_help.h:193
  # sql_help.h:389
  #: sql_help.h:541 sql_help.h:921
  msgid "define a new table from the results of a query"
! msgstr "以查询结果建立新的资料表"
  
  # sql_help.h:197
  #: sql_help.h:546
--- 4883,4895 ----
  # sql_help.h:189
  #: sql_help.h:536
  msgid "define a new table"
! msgstr "建立新的数据表"
  
  # sql_help.h:193
  # sql_help.h:389
  #: sql_help.h:541 sql_help.h:921
  msgid "define a new table from the results of a query"
! msgstr "以查询结果建立新的数据表"
  
  # sql_help.h:197
  #: sql_help.h:546
***************
*** 4899,4920 **** msgstr "建立新的表空间"
  # sql_help.h:129
  #: sql_help.h:551
  msgid "define a new text search configuration"
! msgstr "定义一个新文本搜寻组态"
  
  # sql_help.h:129
  #: sql_help.h:556
  msgid "define a new text search dictionary"
! msgstr "定义一个新文本搜寻字典"
  
  # sql_help.h:197
  #: sql_help.h:561
  msgid "define a new text search parser"
! msgstr "定义一个新文本搜寻剖析器"
  
  # sql_help.h:181
  #: sql_help.h:566
  msgid "define a new text search template"
! msgstr "定义一个新文本搜寻模版"
  
  # sql_help.h:201
  #: sql_help.h:571
--- 4899,4920 ----
  # sql_help.h:129
  #: sql_help.h:551
  msgid "define a new text search configuration"
! msgstr "定义一个新文本搜索组态"
  
  # sql_help.h:129
  #: sql_help.h:556
  msgid "define a new text search dictionary"
! msgstr "定义一个新文本搜索字典"
  
  # sql_help.h:197
  #: sql_help.h:561
  msgid "define a new text search parser"
! msgstr "定义一个新文本搜索剖析器"
  
  # sql_help.h:181
  #: sql_help.h:566
  msgid "define a new text search template"
! msgstr "定义一个新文本搜索模版"
  
  # sql_help.h:201
  #: sql_help.h:571
***************
*** 4924,4930 **** msgstr "建立新的触发器"
  # sql_help.h:205
  #: sql_help.h:576
  msgid "define a new data type"
! msgstr "建立新的资料型别"
  
  #: sql_help.h:586
  msgid "define a new mapping of a user to a foreign server"
--- 4924,4930 ----
  # sql_help.h:205
  #: sql_help.h:576
  msgid "define a new data type"
! msgstr "建立新的数据类型"
  
  #: sql_help.h:586
  msgid "define a new mapping of a user to a foreign server"
***************
*** 4933,4939 **** msgstr "将用户的新映射定义到一个外部服务器"
  # sql_help.h:213
  #: sql_help.h:591
  msgid "define a new view"
! msgstr "建立新的视观表"
  
  # sql_help.h:217
  #: sql_help.h:596
--- 4933,4939 ----
  # sql_help.h:213
  #: sql_help.h:591
  msgid "define a new view"
! msgstr "建立新的视图"
  
  # sql_help.h:217
  #: sql_help.h:596
***************
*** 4948,4954 **** msgstr "建立一个 cursor"
  # sql_help.h:225
  #: sql_help.h:606
  msgid "delete rows of a table"
! msgstr "删除资料表中的资料列"
  
  #: sql_help.h:611
  msgid "discard session state"
--- 4948,4954 ----
  # sql_help.h:225
  #: sql_help.h:606
  msgid "delete rows of a table"
! msgstr "删除数据表中的数据列"
  
  #: sql_help.h:611
  msgid "discard session state"
***************
*** 4966,4972 **** msgstr "移除一个聚集函数"
  # sql_help.h:233
  #: sql_help.h:626
  msgid "remove a cast"
! msgstr "移除一个型别转换"
  
  # sql_help.h:249
  #: sql_help.h:631
--- 4966,4972 ----
  # sql_help.h:233
  #: sql_help.h:626
  msgid "remove a cast"
! msgstr "移除一个类型转换"
  
  # sql_help.h:249
  #: sql_help.h:631
***************
*** 4981,4987 **** msgstr "移除一个字元编码转换"
  # sql_help.h:241
  #: sql_help.h:641
  msgid "remove a database"
! msgstr "移除资料库"
  
  # sql_help.h:245
  #: sql_help.h:646
--- 4981,4987 ----
  # sql_help.h:241
  #: sql_help.h:641
  msgid "remove a database"
! msgstr "移除数据库"
  
  # sql_help.h:245
  #: sql_help.h:646
***************
*** 5016,5022 **** msgstr "移除函数"
  # sql_help.h:241
  #: sql_help.h:676 sql_help.h:716 sql_help.h:781
  msgid "remove a database role"
! msgstr "移除一个资料库成员"
  
  # sql_help.h:257
  #: sql_help.h:681
--- 5016,5022 ----
  # sql_help.h:241
  #: sql_help.h:676 sql_help.h:716 sql_help.h:781
  msgid "remove a database role"
! msgstr "移除一个数据库成员"
  
  # sql_help.h:257
  #: sql_help.h:681
***************
*** 5050,5056 **** msgstr "移除一个运算子家族"
  
  #: sql_help.h:711
  msgid "remove database objects owned by a database role"
! msgstr "依照一个资料库角色拥有的资料库物件来移除"
  
  # sql_help.h:273
  #: sql_help.h:721
--- 5050,5056 ----
  
  #: sql_help.h:711
  msgid "remove database objects owned by a database role"
! msgstr "依照一个数据库角色拥有的数据库对象来移除"
  
  # sql_help.h:273
  #: sql_help.h:721
***************
*** 5060,5071 **** msgstr "移除一个重写规则"
  # sql_help.h:277
  #: sql_help.h:726
  msgid "remove a schema"
! msgstr "移除一个架构模式"
  
  # sql_help.h:281
  #: sql_help.h:731
  msgid "remove a sequence"
! msgstr "移除序列数"
  
  # sql_help.h:237
  #: sql_help.h:736
--- 5060,5071 ----
  # sql_help.h:277
  #: sql_help.h:726
  msgid "remove a schema"
! msgstr "移除一个模式"
  
  # sql_help.h:281
  #: sql_help.h:731
  msgid "remove a sequence"
! msgstr "移除序列"
  
  # sql_help.h:237
  #: sql_help.h:736
***************
*** 5075,5081 **** msgstr "删除一个外部服务器描述符"
  # sql_help.h:285
  #: sql_help.h:741
  msgid "remove a table"
! msgstr "移除资料表"
  
  # sql_help.h:289
  #: sql_help.h:746
--- 5075,5081 ----
  # sql_help.h:285
  #: sql_help.h:741
  msgid "remove a table"
! msgstr "移除数据表"
  
  # sql_help.h:289
  #: sql_help.h:746
***************
*** 5085,5106 **** msgstr "移除一个表空间"
  # sql_help.h:301
  #: sql_help.h:751
  msgid "remove a text search configuration"
! msgstr "移除一个文本搜寻组态"
  
  # sql_help.h:301
  #: sql_help.h:756
  msgid "remove a text search dictionary"
! msgstr "移除一个文本搜寻字典"
  
  # sql_help.h:289
  #: sql_help.h:761
  msgid "remove a text search parser"
! msgstr "移除一个文本搜寻剖析器"
  
  # sql_help.h:277
  #: sql_help.h:766
  msgid "remove a text search template"
! msgstr "移除一个文本搜寻模版"
  
  # sql_help.h:293
  #: sql_help.h:771
--- 5085,5106 ----
  # sql_help.h:301
  #: sql_help.h:751
  msgid "remove a text search configuration"
! msgstr "移除一个文本搜索配置"
  
  # sql_help.h:301
  #: sql_help.h:756
  msgid "remove a text search dictionary"
! msgstr "移除一个文本搜索字典"
  
  # sql_help.h:289
  #: sql_help.h:761
  msgid "remove a text search parser"
! msgstr "移除一个文本搜索剖析器"
  
  # sql_help.h:277
  #: sql_help.h:766
  msgid "remove a text search template"
! msgstr "移除一个文本搜索模版"
  
  # sql_help.h:293
  #: sql_help.h:771
***************
*** 5110,5116 **** msgstr "移除触发器"
  # sql_help.h:297
  #: sql_help.h:776
  msgid "remove a data type"
! msgstr "移除资料型别"
  
  #: sql_help.h:786
  msgid "remove a user mapping for a foreign server"
--- 5110,5116 ----
  # sql_help.h:297
  #: sql_help.h:776
  msgid "remove a data type"
! msgstr "移除数据类型"
  
  #: sql_help.h:786
  msgid "remove a user mapping for a foreign server"
***************
*** 5119,5150 **** msgstr "为外部服务器删除用户映射"
  # sql_help.h:305
  #: sql_help.h:791
  msgid "remove a view"
! msgstr "移除一个视观表"
  
  # sql_help.h:313
  #: sql_help.h:801
  msgid "execute a prepared statement"
! msgstr "执行一个已准备好的叙述区块"
  
  # sql_help.h:317
  #: sql_help.h:806
  msgid "show the execution plan of a statement"
! msgstr "显示一个叙述区块的执行计划"
  
  # sql_help.h:321
  #: sql_help.h:811
  msgid "retrieve rows from a query using a cursor"
! msgstr "从使用 cursor 的查询读取资料"
  
  # sql_help.h:325
  #: sql_help.h:816
  msgid "define access privileges"
! msgstr "建立存取权限"
  
  # sql_help.h:329
  #: sql_help.h:821
  msgid "create new rows in a table"
! msgstr "在资料表中建立资料"
  
  # sql_help.h:333
  #: sql_help.h:826
--- 5119,5150 ----
  # sql_help.h:305
  #: sql_help.h:791
  msgid "remove a view"
! msgstr "移除一个视图"
  
  # sql_help.h:313
  #: sql_help.h:801
  msgid "execute a prepared statement"
! msgstr "执行一个已准备好的语句块"
  
  # sql_help.h:317
  #: sql_help.h:806
  msgid "show the execution plan of a statement"
! msgstr "显示一个语句块的执行计划"
  
  # sql_help.h:321
  #: sql_help.h:811
  msgid "retrieve rows from a query using a cursor"
! msgstr "从使用游标的查询读取数据"
  
  # sql_help.h:325
  #: sql_help.h:816
  msgid "define access privileges"
! msgstr "定义存取权限"
  
  # sql_help.h:329
  #: sql_help.h:821
  msgid "create new rows in a table"
! msgstr "在表中创建新数据行"
  
  # sql_help.h:333
  #: sql_help.h:826
***************
*** 5159,5165 **** msgstr "加载一个共享库文件"
  # sql_help.h:341
  #: sql_help.h:836
  msgid "lock a table"
! msgstr "锁住资料表"
  
  # sql_help.h:345
  #: sql_help.h:841
--- 5159,5165 ----
  # sql_help.h:341
  #: sql_help.h:836
  msgid "lock a table"
! msgstr "锁定数据表"
  
  # sql_help.h:345
  #: sql_help.h:841
***************
*** 5169,5190 **** msgstr "移动游标位置"
  # sql_help.h:349
  #: sql_help.h:846
  msgid "generate a notification"
! msgstr "产生通告"
  
  # sql_help.h:353
  #: sql_help.h:851
  msgid "prepare a statement for execution"
! msgstr "预先编译叙述以执行"
  
  # sql_help.h:25
  # sql_help.h:373
  #: sql_help.h:856
  msgid "prepare the current transaction for two-phase commit"
! msgstr "预备当前事务交易的二段式提交"
  
  #: sql_help.h:861
  msgid "change the ownership of database objects owned by a database role"
! msgstr "依照一个资料库角色拥有的的资料库物件来更变所有权"
  
  #: sql_help.h:866
  msgid "replace the contents of a materialized view"
--- 5169,5190 ----
  # sql_help.h:349
  #: sql_help.h:846
  msgid "generate a notification"
! msgstr "产生通知"
  
  # sql_help.h:353
  #: sql_help.h:851
  msgid "prepare a statement for execution"
! msgstr "预先编译语句以执行"
  
  # sql_help.h:25
  # sql_help.h:373
  #: sql_help.h:856
  msgid "prepare the current transaction for two-phase commit"
! msgstr "准备将当前事务进行二段式提交"
  
  #: sql_help.h:861
  msgid "change the ownership of database objects owned by a database role"
! msgstr "依照一个数据库角色拥有的的数据库对象来更变所有权"
  
  #: sql_help.h:866
  msgid "replace the contents of a materialized view"
***************
*** 5222,5228 **** msgstr "还原至一个储存点(Savepoint)"
  # sql_help.h:381
  #: sql_help.h:906
  msgid "define a new savepoint within the current transaction"
! msgstr "在目前的事物交易中建立新的储存点(Savepoint)"
  
  # sql_help.h:117
  #: sql_help.h:911
--- 5222,5228 ----
  # sql_help.h:381
  #: sql_help.h:906
  msgid "define a new savepoint within the current transaction"
! msgstr "在当前事务中建立新的储存点(Savepoint)"
  
  # sql_help.h:117
  #: sql_help.h:911
***************
*** 5232,5243 **** msgstr "定义或更改一个对象的安全标签"
  # sql_help.h:385
  #: sql_help.h:916 sql_help.h:961 sql_help.h:991
  msgid "retrieve rows from a table or view"
! msgstr "从资料表或视观表读取资料"
  
  # sql_help.h:393
  #: sql_help.h:926
  msgid "change a run-time parameter"
! msgstr "更改一个执行时期参数"
  
  # sql_help.h:397
  #: sql_help.h:931
--- 5232,5243 ----
  # sql_help.h:385
  #: sql_help.h:916 sql_help.h:961 sql_help.h:991
  msgid "retrieve rows from a table or view"
! msgstr "从数据表或视图中读取数据"
  
  # sql_help.h:393
  #: sql_help.h:926
  msgid "change a run-time parameter"
! msgstr "更改一个运行期参数"
  
  # sql_help.h:397
  #: sql_help.h:931
***************
*** 5247,5294 **** msgstr "为当前事务设定约束限制检查的时间模式"
  # sql_help.h:405
  #: sql_help.h:936
  msgid "set the current user identifier of the current session"
! msgstr "设置当前 session 的当前用户的身份标识"
  
  # sql_help.h:401
  #: sql_help.h:941
  msgid ""
  "set the session user identifier and the current user identifier of the "
  "current session"
! msgstr "设置会话用户标识符和当前会话的当前用户标识符"
  
  # sql_help.h:405
  #: sql_help.h:946
  msgid "set the characteristics of the current transaction"
! msgstr "设定目前事物交易属性"
  
  # sql_help.h:409
  #: sql_help.h:951
  msgid "show the value of a run-time parameter"
! msgstr "显示执行时期的参数值"
  
  # sql_help.h:425
  #: sql_help.h:966
  msgid "empty a table or set of tables"
! msgstr "空的资料表或资料表设置"
  
  # sql_help.h:421
  #: sql_help.h:971
  msgid "stop listening for a notification"
! msgstr "停止倾听通告"
  
  # sql_help.h:425
  #: sql_help.h:976
  msgid "update rows of a table"
! msgstr "更新资料表中的资料列"
  
  # sql_help.h:429
  #: sql_help.h:981
  msgid "garbage-collect and optionally analyze a database"
! msgstr "垃圾收集(GC)并选择性的分析资料库"
  
  #: sql_help.h:986
  msgid "compute a set of rows"
! msgstr "计算一个资料列的集合"
  
  #: startup.c:166
  #, c-format
--- 5247,5294 ----
  # sql_help.h:405
  #: sql_help.h:936
  msgid "set the current user identifier of the current session"
! msgstr "为当前会话的当前用户的设置身份标识"
  
  # sql_help.h:401
  #: sql_help.h:941
  msgid ""
  "set the session user identifier and the current user identifier of the "
  "current session"
! msgstr "为当前会话设置会话用户标识符和当前用户标识符"
  
  # sql_help.h:405
  #: sql_help.h:946
  msgid "set the characteristics of the current transaction"
! msgstr "设定当前事务属性"
  
  # sql_help.h:409
  #: sql_help.h:951
  msgid "show the value of a run-time parameter"
! msgstr "显示运行期的参数值"
  
  # sql_help.h:425
  #: sql_help.h:966
  msgid "empty a table or set of tables"
! msgstr "空的数据表或数据表集合"
  
  # sql_help.h:421
  #: sql_help.h:971
  msgid "stop listening for a notification"
! msgstr "停止监听通知"
  
  # sql_help.h:425
  #: sql_help.h:976
  msgid "update rows of a table"
! msgstr "更新数据表中的数据列"
  
  # sql_help.h:429
  #: sql_help.h:981
  msgid "garbage-collect and optionally analyze a database"
! msgstr "垃圾收集(GC)并选择地分析数据库"
  
  #: sql_help.h:986
  msgid "compute a set of rows"
! msgstr "计算一个数据列的集合"
  
  #: startup.c:166
  #, c-format
***************
*** 5299,5305 **** msgstr "%s: -1 只能用于非交互模式下\n"
  #: startup.c:266
  #, c-format
  msgid "%s: could not open log file \"%s\": %s\n"
! msgstr "%s：无法开启日志档 \"%s\"：%s\n"
  
  #: startup.c:328
  #, c-format
--- 5299,5305 ----
  #: startup.c:266
  #, c-format
  msgid "%s: could not open log file \"%s\": %s\n"
! msgstr "%s：无法开启日志文件 \"%s\"：%s\n"
  
  #: startup.c:328
  #, c-format
***************
*** 5314,5350 **** msgstr ""
  #: startup.c:471
  #, c-format
  msgid "%s: could not set printing parameter \"%s\"\n"
! msgstr "%s：无法设定列印参数 \"%s\"\n"
  
  # startup.c:492
  #: startup.c:511
  #, c-format
  msgid "%s: could not delete variable \"%s\"\n"
! msgstr "%s：无法删除变数 \"%s\"\n"
  
  # startup.c:502
  #: startup.c:521
  #, c-format
  msgid "%s: could not set variable \"%s\"\n"
! msgstr "%s：无法设定变数 \"%s\"\n"
  
  # startup.c:533
  # startup.c:539
  #: startup.c:564 startup.c:570
  #, c-format
  msgid "Try \"%s --help\" for more information.\n"
! msgstr "尝试 \"%s --help\" 以得到更多资讯。\n"
  
  # startup.c:557
  #: startup.c:587
  #, c-format
  msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
! msgstr "%s：警告：忽略多余的命令列参数 \"%s\"\n"
  
  #: startup.c:609
  #, c-format
  msgid "%s: could not find own program executable\n"
! msgstr "%s: 无法找到执行文件\n"
  
  #: tab-complete.c:4110
  #, c-format
--- 5314,5350 ----
  #: startup.c:471
  #, c-format
  msgid "%s: could not set printing parameter \"%s\"\n"
! msgstr "%s：无法设定列打印参数 \"%s\"\n"
  
  # startup.c:492
  #: startup.c:511
  #, c-format
  msgid "%s: could not delete variable \"%s\"\n"
! msgstr "%s：无法删除变量 \"%s\"\n"
  
  # startup.c:502
  #: startup.c:521
  #, c-format
  msgid "%s: could not set variable \"%s\"\n"
! msgstr "%s：无法设定变量 \"%s\"\n"
  
  # startup.c:533
  # startup.c:539
  #: startup.c:564 startup.c:570
  #, c-format
  msgid "Try \"%s --help\" for more information.\n"
! msgstr "尝试 \"%s --help\" 以得到更多信息。\n"
  
  # startup.c:557
  #: startup.c:587
  #, c-format
  msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
! msgstr "%s：警告：忽略多余的命令行参数 \"%s\"\n"
  
  #: startup.c:609
  #, c-format
  msgid "%s: could not find own program executable\n"
! msgstr "%s: 找不到可执行文件\n"
  
  #: tab-complete.c:4110
  #, c-format
***************
*** 5353,5359 **** msgid ""
  "Query was:\n"
  "%s\n"
  msgstr ""
! "tab完成查询失败: %s\n"
  "查询是:\n"
  "%s\n"
  
--- 5353,5359 ----
  "Query was:\n"
  "%s\n"
  msgstr ""
! "自动补全查询失败: %s\n"
  "查询是:\n"
  "%s\n"
  
