summaryrefslogtreecommitdiff
path: root/src/interfaces
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2010-12-13 23:20:00 +0200
committerPeter Eisentraut <peter_e@gmx.net>2010-12-13 23:20:00 +0200
commitc8a154e3f887457d777c77e36ad4c8024e1292d1 (patch)
treef3b2204fb67db77fff6d190e9eb49537489ba155 /src/interfaces
parentdc124a541079b34a92d16649883ec929f4a5dec9 (diff)
Translation updates for release 9.0.2
Diffstat (limited to 'src/interfaces')
-rw-r--r--src/interfaces/ecpg/ecpglib/po/zh_CN.po22
-rw-r--r--src/interfaces/ecpg/preproc/nls.mk2
-rw-r--r--src/interfaces/ecpg/preproc/po/ko.po592
-rw-r--r--src/interfaces/ecpg/preproc/po/zh_CN.po342
-rw-r--r--src/interfaces/ecpg/preproc/po/zh_TW.po611
-rw-r--r--src/interfaces/libpq/nls.mk2
-rw-r--r--src/interfaces/libpq/po/ko.po437
-rw-r--r--src/interfaces/libpq/po/ru.po947
-rw-r--r--src/interfaces/libpq/po/zh_CN.po726
-rw-r--r--src/interfaces/libpq/po/zh_TW.po1039
10 files changed, 3587 insertions, 1133 deletions
diff --git a/src/interfaces/ecpg/ecpglib/po/zh_CN.po b/src/interfaces/ecpg/ecpglib/po/zh_CN.po
index 2288d873c10..69659ba181c 100644
--- a/src/interfaces/ecpg/ecpglib/po/zh_CN.po
+++ b/src/interfaces/ecpg/ecpglib/po/zh_CN.po
@@ -5,12 +5,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: ecpglib (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 02:00+0000\n"
-"PO-Revision-Date: 2010-03-30 13:34+0800\n"
+"POT-Creation-Date: 2010-10-01 14:43+0000\n"
+"PO-Revision-Date: 2010-09-26 09:04+0800\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Weibin <ssmei_2000@yahoo.com>\n"
+"Language-Team: Chinese (Simplified)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,9 +19,7 @@ msgstr ""
msgid "empty message text"
msgstr "消息文本为空"
-#: connect.c:381
-#: connect.c:407
-#: connect.c:520
+#: connect.c:381 connect.c:407 connect.c:520
msgid "<DEFAULT>"
msgstr "<DEFAULT>"
@@ -155,16 +153,20 @@ msgstr "在第%2$d行上无法连接数据库\"%1$s\""
msgid "SQL error %d on line %d"
msgstr "在第%2$d行上的SQL命令发生错误 代码%1$d"
-#: error.c:391
+# common.c:298
+#: error.c:318
+msgid "the connection to the server was lost"
+msgstr "与服务器的连接丢失"
+
+#: error.c:405
#, c-format
msgid "SQL error: %s\n"
msgstr "SQL语句错误: %s\n"
-#: execute.c:1639
+#: execute.c:1912
msgid "<empty>"
msgstr "<空>"
#: misc.c:113
msgid "NULL"
msgstr "NULL"
-
diff --git a/src/interfaces/ecpg/preproc/nls.mk b/src/interfaces/ecpg/preproc/nls.mk
index a6f276ea9ac..cbf21f41bb3 100644
--- a/src/interfaces/ecpg/preproc/nls.mk
+++ b/src/interfaces/ecpg/preproc/nls.mk
@@ -1,5 +1,5 @@
# $PostgreSQL $
CATALOG_NAME = ecpg
-AVAIL_LANGUAGES = de es fr it ja pt_BR tr zh_CN
+AVAIL_LANGUAGES = de es fr it ja ko pt_BR tr zh_CN zh_TW
GETTEXT_FILES = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c
GETTEXT_TRIGGERS = _ mmerror:3
diff --git a/src/interfaces/ecpg/preproc/po/ko.po b/src/interfaces/ecpg/preproc/po/ko.po
new file mode 100644
index 00000000000..b096d7205d3
--- /dev/null
+++ b/src/interfaces/ecpg/preproc/po/ko.po
@@ -0,0 +1,592 @@
+# Korean message translation file for ecpg
+# Copyright (C) 2010 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+#
+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:34+0000\n"
+"PO-Revision-Date: 2010-09-09 17:00+0000\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"
+
+#: descriptor.c:64
+#, c-format
+msgid "variable \"%s\" must have a numeric type"
+msgstr "\"%s\" 변수는 숫자 형식이어야 함"
+
+#: descriptor.c:124 descriptor.c:146
+#, c-format
+msgid "descriptor \"%s\" does not exist"
+msgstr "\"%s\" 설명자가 없음"
+
+#: descriptor.c:161 descriptor.c:210
+#, c-format
+msgid "descriptor header item \"%d\" does not exist"
+msgstr "설명자 헤더 항목 \"%d\"이(가) 없음"
+
+#: descriptor.c:182
+msgid "nullable is always 1"
+msgstr "null 허용 여부는 항상 1"
+
+#: descriptor.c:185
+msgid "key_member is always 0"
+msgstr "key_member는 항상 0"
+
+#: descriptor.c:277
+#, c-format
+msgid "descriptor item \"%s\" is not implemented"
+msgstr "설명자 항목 \"%s\"이(가) 구현되지 않음"
+
+#: descriptor.c:287
+#, c-format
+msgid "descriptor item \"%s\" cannot be set"
+msgstr "설명자 항목 \"%s\"을(를) 설정할 수 없음"
+
+#: ecpg.c:36
+#, c-format
+msgid ""
+"%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
+"\n"
+msgstr ""
+"%s은(는) C 프로그램용 PostgreSQL 포함 SQL 전처리기입니다.\n"
+"\n"
+
+#: ecpg.c:38
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION]... FILE...\n"
+"\n"
+msgstr ""
+"사용:\n"
+" %s [OPTION]... 파일...\n"
+"\n"
+
+#: ecpg.c:41
+#, c-format
+msgid "Options:\n"
+msgstr "옵션들:\n"
+
+#: ecpg.c:42
+#, c-format
+msgid ""
+" -c automatically generate C code from embedded SQL code;\n"
+" this affects EXEC SQL TYPE\n"
+msgstr ""
+" -c 포함된 SQL 코드에서 자동으로 C 코드를 생성합니다.\n"
+" EXEC SQL TYPE에 영향을 줍니다.\n"
+
+#: ecpg.c:44
+#, c-format
+msgid ""
+" -C MODE set compatibility mode; MODE can be one of\n"
+" \"INFORMIX\", \"INFORMIX_SE\"\n"
+msgstr ""
+" -C MODE 호환성 모드를 설정합니다. MODE는 다음 중 하나일 수 있습니"
+"다.\n"
+" \"INFORMIX\", \"INFORMIX_SE\"\n"
+
+#: ecpg.c:47
+#, c-format
+msgid " -d generate parser debug output\n"
+msgstr " -d 파서 디버그 출력 생성\n"
+
+#: ecpg.c:49
+#, c-format
+msgid " -D SYMBOL define SYMBOL\n"
+msgstr " -D SYMBOL SYMBOL 정의\n"
+
+#: ecpg.c:50
+#, c-format
+msgid ""
+" -h parse a header file, this option includes option \"-c\"\n"
+msgstr " -h 헤더 파일 구문 분석. 이 옵션은 \"-c\" 옵션 포함\n"
+
+#: ecpg.c:51
+#, c-format
+msgid " -i parse system include files as well\n"
+msgstr " -i 시스템 포함 파일도 구문 분석\n"
+
+#: ecpg.c:52
+#, c-format
+msgid " -I DIRECTORY search DIRECTORY for include files\n"
+msgstr " -I DIRECTORY DIRECTORY에서 포함 파일 검색\n"
+
+#: ecpg.c:53
+#, c-format
+msgid " -o OUTFILE write result to OUTFILE\n"
+msgstr " -o OUTFILE OUTFILE에 결과 쓰기\n"
+
+#: ecpg.c:54
+#, c-format
+msgid ""
+" -r OPTION specify run-time behavior; OPTION can be:\n"
+" \"no_indicator\", \"prepare\", \"questionmarks\"\n"
+msgstr ""
+" -r OPTION 런타임 동작을 지정합니다. 사용 가능한 OPTION은 다음과 같습니"
+"다.\n"
+" \"no_indicator\", \"prepare\", \"questionmarks\"\n"
+
+#: ecpg.c:56
+#, c-format
+msgid " --regression run in regression testing mode\n"
+msgstr " --regression 회귀 테스트 모드에서 실행\n"
+
+#: ecpg.c:57
+#, c-format
+msgid " -t turn on autocommit of transactions\n"
+msgstr " -t 트랜잭션 자동 커밋 설정\n"
+
+#: ecpg.c:58
+#, c-format
+msgid " --help show this help, then exit\n"
+msgstr " --help 이 도움말을 표시하고 종료\n"
+
+#: ecpg.c:59
+#, c-format
+msgid " --version output version information, then exit\n"
+msgstr " --version 버전 정보를 출력하고 종료\n"
+
+#: ecpg.c:60
+#, c-format
+msgid ""
+"\n"
+"If no output file is specified, the name is formed by adding .c to the\n"
+"input file name, after stripping off .pgc if present.\n"
+msgstr ""
+"\n"
+"출력 파일 이름을 지정하지 않으면 입력 파일 이름에 .pgc가 있을 경우 제거하고\n"
+".c를 추가하여 이름이 지정됩니다.\n"
+
+#: ecpg.c:62
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"오류보고: <pgsql-bugs@postgresql.org>.\n"
+
+#: ecpg.c:183 ecpg.c:334 ecpg.c:344
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: \"%s\" 파일 열 수 없음: %s\n"
+
+#: ecpg.c:222 ecpg.c:235 ecpg.c:251 ecpg.c:276
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "자제한 사항은 \"%s --help\" 명령으로 살펴보십시오.\n"
+
+#: ecpg.c:246
+#, c-format
+msgid "%s: parser debug support (-d) not available\n"
+msgstr "%s: 파서 디버그 지원(-d)을 사용할 수 없음\n"
+
+#: ecpg.c:264
+#, c-format
+msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
+msgstr "PostgreSQL 포함 C 전처리기 %s의 버전 %d.%d.%d\n"
+
+#: ecpg.c:266
+#, c-format
+msgid "EXEC SQL INCLUDE ... search starts here:\n"
+msgstr "EXEC SQL INCLUDE ... 여기서 검색 시작:\n"
+
+#: ecpg.c:269
+#, c-format
+msgid "end of search list\n"
+msgstr "검색 목록의 끝\n"
+
+#: ecpg.c:275
+#, c-format
+msgid "%s: no input files specified\n"
+msgstr "%s: 지정된 입력 파일 없음\n"
+
+#: ecpg.c:464
+#, c-format
+msgid "cursor \"%s\" has been declared but not opened"
+msgstr "\"%s\" 커서가 선언되었지만 열리지 않음"
+
+# # advance 끝
+#: pgc.l:386
+msgid "unterminated /* comment"
+msgstr "마무리 안된 /* 주석"
+
+#: pgc.l:399
+msgid "invalid bit string literal"
+msgstr "잘못된 비트 문자열 리터럴"
+
+#: pgc.l:408
+msgid "unterminated bit string literal"
+msgstr "마무리 안된 비트 문자열 문자"
+
+#: pgc.l:424
+msgid "unterminated hexadecimal string literal"
+msgstr "마무리 안된 16진수 문자열 문자"
+
+#: pgc.l:501
+msgid "unterminated quoted string"
+msgstr "마무리 안된 따옴표 안의 문자열"
+
+#: pgc.l:556 pgc.l:569
+msgid "zero-length delimited identifier"
+msgstr "길이가 0인 구분 식별자"
+
+#: pgc.l:577
+msgid "unterminated quoted identifier"
+msgstr "마무리 안된 따옴표 안의 식별자"
+
+#: pgc.l:898
+msgid "missing identifier in EXEC SQL UNDEF command"
+msgstr "EXEC SQL UNDEF 명령에 식별자 누락"
+
+#: pgc.l:944 pgc.l:958
+msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
+msgstr "일치하는 \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\" 누락"
+
+#: pgc.l:947 pgc.l:960 pgc.l:1136
+msgid "missing \"EXEC SQL ENDIF;\""
+msgstr "\"EXEC SQL ENDIF;\" 누락"
+
+#: pgc.l:976 pgc.l:995
+msgid "more than one EXEC SQL ELSE"
+msgstr "두 개 이상의 EXEC SQL ELSE"
+
+#: pgc.l:1017 pgc.l:1031
+msgid "unmatched EXEC SQL ENDIF"
+msgstr "일치하지 않는 EXEC SQL ENDIF"
+
+#: pgc.l:1051
+msgid "too many nested EXEC SQL IFDEF conditions"
+msgstr "중첩된 EXEC SQL IFDEF 조건이 너무 많음"
+
+#: pgc.l:1084
+msgid "missing identifier in EXEC SQL IFDEF command"
+msgstr "EXEC SQL IFDEF 명령에 식별자 누락"
+
+#: pgc.l:1093
+msgid "missing identifier in EXEC SQL DEFINE command"
+msgstr "EXEC SQL DEFINE 명령에 식별자 누락"
+
+#: pgc.l:1126
+msgid "syntax error in EXEC SQL INCLUDE command"
+msgstr "EXEC SQL INCLUDE 명령에 구문 오류 발생"
+
+#: pgc.l:1175
+msgid ""
+"internal error: unreachable state; please report this to <pgsql-"
+"bugs@postgresql.org>"
+msgstr ""
+"내부 오류: 연결할 수 없습니다. 이 문제를 <pgsql-bugs@postgresql.org&gt;로 알"
+"려주십시오."
+
+#: pgc.l:1298
+#, c-format
+msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
+msgstr "오류: 포함 경로 \"%s/%s\"이(가) %d줄에서 너무 길어서 건너뜀\n"
+
+#: pgc.l:1314
+#, c-format
+msgid "could not open include file \"%s\" on line %d"
+msgstr "포함 파일 \"%s\"을(를) %d줄에서 열 수 없음"
+
+#: preproc.y:30
+msgid "syntax error"
+msgstr "구문 오류"
+
+#: preproc.y:78
+#, c-format
+msgid "WARNING: "
+msgstr "경고: "
+
+#: preproc.y:82
+#, c-format
+msgid "ERROR: "
+msgstr "오류: "
+
+#: preproc.y:106
+#, c-format
+msgid "could not remove output file \"%s\"\n"
+msgstr "출력 파일 \"%s\"을(를) 제거할 수 없음\n"
+
+#: preproc.y:314
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "\"%s\" 이름의 커서가 없음"
+
+#: preproc.y:342
+msgid "initializer not allowed in type definition"
+msgstr "형식 정의에 이니셜라이저가 허용되지 않음"
+
+#: preproc.y:349 preproc.y:11533
+#, c-format
+msgid "type \"%s\" is already defined"
+msgstr "\"%s\" 형식이 이미 정의됨"
+
+#: preproc.y:372 preproc.y:12132 preproc.y:12442 variable.c:584
+msgid "multidimensional arrays for simple data types are not supported"
+msgstr "단순 데이터 형식에 다차원 배열이 지원되지 않음"
+
+#: preproc.y:1238
+msgid "AT option not allowed in CLOSE DATABASE statement"
+msgstr "CLOSE DATABASE 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1304 preproc.y:1444
+msgid "AT option not allowed in DEALLOCATE statement"
+msgstr "DEALLOCATE 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1430
+msgid "AT option not allowed in CONNECT statement"
+msgstr "CONNECT 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1466
+msgid "AT option not allowed in DISCONNECT statement"
+msgstr "DISCONNECT 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1518
+msgid "AT option not allowed in SET CONNECTION statement"
+msgstr "SET CONNECTION 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1540
+msgid "AT option not allowed in TYPE statement"
+msgstr "TYPE 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1549
+msgid "AT option not allowed in VAR statement"
+msgstr "VAR 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1556
+msgid "AT option not allowed in WHENEVER statement"
+msgstr "WHENEVER 문에 AT 옵션이 허용되지 않음"
+
+#: preproc.y:1912 preproc.y:2908 preproc.y:3802 preproc.y:3811 preproc.y:4042
+#: preproc.y:5851 preproc.y:5856 preproc.y:5861 preproc.y:8035 preproc.y:8565
+#: preproc.y:8570
+msgid "unsupported feature will be passed to server"
+msgstr "지원되지 않는 기능이 서버에 전달됨"
+
+#: preproc.y:2142
+msgid "SHOW ALL is not implemented"
+msgstr "SHOW ALL이 구현되지 않음"
+
+#: preproc.y:2477 preproc.y:2488
+msgid "COPY TO STDIN is not possible"
+msgstr "COPY TO STDIN을 실행할 수 없음"
+
+#: preproc.y:2479
+msgid "COPY FROM STDOUT is not possible"
+msgstr "COPY FROM STDOUT을 실행할 수 없음"
+
+#: preproc.y:2481
+msgid "COPY FROM STDIN is not implemented"
+msgstr "COPY FROM STDIN이 구현되지 않음"
+
+#: preproc.y:3742 preproc.y:3753
+msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+msgstr "INITIALLY DEFERRED 로 선언된 조건문은 반드시 DEFERABLE 여야만 한다"
+
+#: preproc.y:6561 preproc.y:11149
+#, c-format
+msgid "cursor \"%s\" is already defined"
+msgstr "\"%s\" 커서가 이미 정의됨"
+
+#: preproc.y:6922
+msgid "no longer supported LIMIT #,# syntax passed to server"
+msgstr "더 이상 지원되지 않는 LIMIT #,# 구문이 서버에 전달됨"
+
+#: preproc.y:7164
+msgid "subquery in FROM must have an alias"
+msgstr "FROM 절 내의 subquery 에는 반드시 alias 를 가져야만 합니다"
+
+#: preproc.y:10838
+msgid "OLD used in query that is not in a rule"
+msgstr "rule이 아닌 쿼리에서 OLD 예약어가 사용되었습니다"
+
+#: preproc.y:10845
+msgid "NEW used in query that is not in a rule"
+msgstr "rule이 아닌 쿼리에서 NEW 예약어가 사용되었습니다"
+
+#: preproc.y:10877
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS에서 INTO를 지정할 수 없음"
+
+#: preproc.y:10924
+#, c-format
+msgid "expected \"@\", found \"%s\""
+msgstr "\"@\"이 필요한데 \"%s\"이(가) 있음"
+
+#: preproc.y:10936
+msgid ""
+"only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
+"supported"
+msgstr ""
+"\"tcp\" 및 \"unix\" 프로토콜과 데이터베이스 형식 \"postgresql\"만 지원됨"
+
+#: preproc.y:10939
+#, c-format
+msgid "expected \"://\", found \"%s\""
+msgstr "\"://\"가 필요한데 \"%s\"이(가) 있음"
+
+#: preproc.y:10944
+#, c-format
+msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
+msgstr ""
+"Unix-domain 소켓은 \"localhost\"에서만 작동하며 \"%s\"에서는 작동하지 않음"
+
+#: preproc.y:10970
+#, c-format
+msgid "expected \"postgresql\", found \"%s\""
+msgstr "\"postgresql\"이 필요한데 \"%s\"이(가) 있음"
+
+#: preproc.y:10973
+#, c-format
+msgid "invalid connection type: %s"
+msgstr "잘못된 연결 형식: %s"
+
+#: preproc.y:10982
+#, c-format
+msgid "expected \"@\" or \"://\", found \"%s\""
+msgstr "\"@\" 또는 \"://\"가 필요한데 \"%s\"이(가) 있음"
+
+#: preproc.y:11057 preproc.y:11074
+msgid "invalid data type"
+msgstr "잘못된 데이터 형식"
+
+#: preproc.y:11085 preproc.y:11100
+msgid "incomplete statement"
+msgstr "불완전한 문"
+
+#: preproc.y:11088 preproc.y:11103
+#, c-format
+msgid "unrecognized token \"%s\""
+msgstr "인식할 수 없는 토큰 \"%s\""
+
+#: preproc.y:11352
+msgid "only data types numeric and decimal have precision/scale argument"
+msgstr "숫자 및 10진수 데이터 형식에만 전체 자릿수/소수 자릿수 인수 포함"
+
+#: preproc.y:11364
+msgid "interval specification not allowed here"
+msgstr "여기에는 간격 지정이 허용되지 않음"
+
+#: preproc.y:11508 preproc.y:11560
+msgid "too many levels in nested structure/union definition"
+msgstr "중첩된 구조/union 정의에 수준이 너무 많음"
+
+#: preproc.y:11691
+msgid "pointers to varchar are not implemented"
+msgstr "varchar에 대한 포인터가 구현되지 않음"
+
+#: preproc.y:11855 preproc.y:11862 preproc.y:11869
+msgid "using unsupported DESCRIBE statement"
+msgstr "지원되지 않는 DESCRIBE 문 사용"
+
+#: preproc.y:12100
+msgid "initializer not allowed in EXEC SQL VAR command"
+msgstr "EXEC SQL VAR 명령에 이니셜라이저가 허용되지 않음"
+
+#: preproc.y:12411
+msgid "arrays of indicators are not allowed on input"
+msgstr "입력에서 표시기의 배열이 허용되지 않음"
+
+#. translator: %s is typically the translation of "syntax error"
+#: preproc.y:12638
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "%s, \"%s\" 부근"
+
+#: type.c:18 type.c:30
+msgid "out of memory"
+msgstr "메모리 부족"
+
+#: type.c:204 type.c:556
+#, c-format
+msgid "unrecognized variable type code %d"
+msgstr "인식할 수 없는 변수 형식 코드 %d"
+
+#: type.c:241
+msgid "indicator for array/pointer has to be array/pointer"
+msgstr "배열/포인터의 표시기는 배열/포인터여야 함"
+
+#: type.c:245
+msgid "nested arrays are not supported (except strings)"
+msgstr "중첩된 배열은 지원되지 않음(문자열 제외)"
+
+#: type.c:278
+msgid "indicator for struct has to be a struct"
+msgstr "구조의 표시기는 구조여야 함"
+
+#: type.c:287 type.c:295 type.c:303
+msgid "indicator for simple data type has to be simple"
+msgstr "단순 데이터 형식의 표시기는 단순이어야 함"
+
+#: type.c:615
+#, c-format
+msgid "unrecognized descriptor item code %d"
+msgstr "인식할 수 없는 설명자 항목 코드 %d"
+
+#: variable.c:89 variable.c:112
+#, c-format
+msgid "incorrectly formed variable \"%s\""
+msgstr "잘못된 형식의 변수 \"%s\""
+
+#: variable.c:135
+#, c-format
+msgid "variable \"%s\" is not a pointer"
+msgstr "\"%s\" 변수가 포인터가 아님"
+
+#: variable.c:138 variable.c:163
+#, c-format
+msgid "variable \"%s\" is not a pointer to a structure or a union"
+msgstr "\"%s\" 변수가 구조나 union의 포인터가 아님"
+
+#: variable.c:150
+#, c-format
+msgid "variable \"%s\" is neither a structure nor a union"
+msgstr "\"%s\" 변수가 구조나 union이 아님"
+
+#: variable.c:160
+#, c-format
+msgid "variable \"%s\" is not an array"
+msgstr "\"%s\" 변수가 배열이 아님"
+
+#: variable.c:229 variable.c:251
+#, c-format
+msgid "variable \"%s\" is not declared"
+msgstr "\"%s\" 변수가 선언되지 않음"
+
+#: variable.c:459
+msgid "indicator variable must have an integer type"
+msgstr "표시기 변수에 정수 형식이 있어야 함"
+
+#: variable.c:471
+#, c-format
+msgid "unrecognized data type name \"%s\""
+msgstr "인식할 수 없는 데이터 형식 이름 \"%s\""
+
+#: variable.c:482 variable.c:490 variable.c:507 variable.c:510
+msgid "multidimensional arrays are not supported"
+msgstr "다차원 배열이 지원되지 않음"
+
+#: variable.c:499
+#, c-format
+msgid ""
+"multilevel pointers (more than 2 levels) are not supported; found %d level"
+msgid_plural ""
+"multilevel pointers (more than 2 levels) are not supported; found %d levels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: variable.c:504
+msgid "pointer to pointer is not supported for this data type"
+msgstr "이 데이터 형식에는 포인터에 대한 포인터가 지원되지 않음"
+
+#: variable.c:524
+msgid "multidimensional arrays for structures are not supported"
+msgstr "구조에는 다차원 배열이 지원되지 않음"
diff --git a/src/interfaces/ecpg/preproc/po/zh_CN.po b/src/interfaces/ecpg/preproc/po/zh_CN.po
index e41a80326cf..5c893f03010 100644
--- a/src/interfaces/ecpg/preproc/po/zh_CN.po
+++ b/src/interfaces/ecpg/preproc/po/zh_CN.po
@@ -5,12 +5,12 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.4\n"
+"Project-Id-Version: ecpg (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 02:00+0000\n"
-"PO-Revision-Date: 2010-03-30 13:47+0800\n"
+"POT-Creation-Date: 2010-10-01 14:42+0000\n"
+"PO-Revision-Date: 2010-10-01 12:43+0800\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
-"Language-Team: Weibin <ssmei_2000@yahoo.com>\n"
+"Language-Team: Chinese (Simplified)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -21,14 +21,12 @@ msgstr ""
msgid "variable \"%s\" must have a numeric type"
msgstr "变量 \"%s\"必须是数值类型"
-#: descriptor.c:124
-#: descriptor.c:146
+#: descriptor.c:124 descriptor.c:146
#, c-format
msgid "descriptor \"%s\" does not exist"
msgstr "描述符\"%s\"不存在"
-#: descriptor.c:161
-#: descriptor.c:210
+#: descriptor.c:161 descriptor.c:210
#, c-format
msgid "descriptor header item \"%d\" does not exist"
msgstr "描述符标题成员\"%d\"不存在"
@@ -51,7 +49,7 @@ msgstr "没有使用描述符成员\"%s\"."
msgid "descriptor item \"%s\" cannot be set"
msgstr "无法设置描述符成员 \"%s\""
-#: ecpg.c:36
+#: ecpg.c:35
#, c-format
msgid ""
"%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
@@ -60,7 +58,7 @@ msgstr ""
"%s是用于C语言程序的PostgreSQL嵌入式SQL预处理器.\n"
"\n"
-#: ecpg.c:38
+#: ecpg.c:37
#, c-format
msgid ""
"Usage:\n"
@@ -71,12 +69,12 @@ msgstr ""
" %s [OPTION]... FILE...\n"
"\n"
-#: ecpg.c:41
+#: ecpg.c:40
#, c-format
msgid "Options:\n"
msgstr "选项:\n"
-#: ecpg.c:42
+#: ecpg.c:41
#, c-format
msgid ""
" -c automatically generate C code from embedded SQL code;\n"
@@ -85,7 +83,7 @@ msgstr ""
"-c 从嵌入式SQL代码中自动产生C代码;\n"
" 这将影响EXEC SQL TYPE\n"
-#: ecpg.c:44
+#: ecpg.c:43
#, c-format
msgid ""
" -C MODE set compatibility mode; MODE can be one of\n"
@@ -94,37 +92,38 @@ msgstr ""
"-C MODE 设置兼容模式;MODE可以是下列模式之一\n"
" \"INFORMIX\", \"INFORMIX_SE\"\n"
-#: ecpg.c:47
+#: ecpg.c:46
#, c-format
msgid " -d generate parser debug output\n"
msgstr " -d 产生解析器的调试输出\n"
-#: ecpg.c:49
+#: ecpg.c:48
#, c-format
msgid " -D SYMBOL define SYMBOL\n"
msgstr " -D SYMBOL 定义SYMBOL\n"
-#: ecpg.c:50
+#: ecpg.c:49
#, c-format
-msgid " -h parse a header file, this option includes option \"-c\"\n"
+msgid ""
+" -h parse a header file, this option includes option \"-c\"\n"
msgstr "-h 分析一个头文件,这个选项包含选项\"-c\"\n"
-#: ecpg.c:51
+#: ecpg.c:50
#, c-format
msgid " -i parse system include files as well\n"
msgstr "-i 分析系统引用文件\n"
-#: ecpg.c:52
+#: ecpg.c:51
#, c-format
msgid " -I DIRECTORY search DIRECTORY for include files\n"
msgstr " -I DIRECTORY 为引用文件搜索变量DIRECTORY\n"
-#: ecpg.c:53
+#: ecpg.c:52
#, c-format
msgid " -o OUTFILE write result to OUTFILE\n"
msgstr "-o OUTFILE 将结果写入到OUTFILE\n"
-#: ecpg.c:54
+#: ecpg.c:53
#, c-format
msgid ""
" -r OPTION specify run-time behavior; OPTION can be:\n"
@@ -133,27 +132,27 @@ msgstr ""
" -r OPTION 指定运行时的系统行为; OPTION可以是:\n"
" \"no_indicator\", \"prepare\", \"questionmarks\"\n"
-#: ecpg.c:56
+#: ecpg.c:55
#, c-format
msgid " --regression run in regression testing mode\n"
msgstr " --regression 在回归测试模式下运行\n"
-#: ecpg.c:57
+#: ecpg.c:56
#, c-format
msgid " -t turn on autocommit of transactions\n"
msgstr " -t 打开事务的自动提交功能\n"
-#: ecpg.c:58
+#: ecpg.c:57
#, c-format
msgid " --help show this help, then exit\n"
msgstr " --help 显示帮助信息,然后退出\n"
-#: ecpg.c:59
+#: ecpg.c:58
#, c-format
msgid " --version output version information, then exit\n"
msgstr " --version 输出版本信息,然后退出\n"
-#: ecpg.c:60
+#: ecpg.c:59
#, c-format
msgid ""
"\n"
@@ -161,10 +160,11 @@ msgid ""
"input file name, after stripping off .pgc if present.\n"
msgstr ""
"\n"
-"如果没有指定输出文件,那么输出文件名将由输入文件名(如果有后缀,那么去掉.pgc)\n"
+"如果没有指定输出文件,那么输出文件名将由输入文件名(如果有后缀,那么去掉."
+"pgc)\n"
"加上.c的后缀名组成.\n"
-#: ecpg.c:62
+#: ecpg.c:61
#, c-format
msgid ""
"\n"
@@ -173,394 +173,382 @@ msgstr ""
"\n"
"错误报告至 <pgsql-bugs@postgresql.org>.\n"
-#: ecpg.c:183
-#: ecpg.c:334
-#: ecpg.c:344
+#: ecpg.c:182 ecpg.c:333 ecpg.c:343
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: 无法打开文件 \"%s\": %s\n"
-#: ecpg.c:222
-#: ecpg.c:235
-#: ecpg.c:251
-#: ecpg.c:276
+#: ecpg.c:221 ecpg.c:234 ecpg.c:250 ecpg.c:275
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: ecpg.c:246
+#: ecpg.c:245
#, c-format
msgid "%s: parser debug support (-d) not available\n"
msgstr "%s: 解析器跟踪调试支持(-d)无效\n"
-#: ecpg.c:264
+#: ecpg.c:263
#, c-format
msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
msgstr "%s, PostgreSQL嵌入式C语言预处理器, 版本%d.%d.%d\n"
-#: ecpg.c:266
+#: ecpg.c:265
#, c-format
msgid "EXEC SQL INCLUDE ... search starts here:\n"
msgstr "EXEC SQL INCLUDE ... 从这里开始搜索:\n"
-#: ecpg.c:269
+#: ecpg.c:268
#, c-format
msgid "end of search list\n"
msgstr "搜索列表的结束部分\n"
-#: ecpg.c:275
+#: ecpg.c:274
#, c-format
msgid "%s: no input files specified\n"
msgstr "%s: 没有指定输入文件\n"
-#: ecpg.c:464
+#: ecpg.c:466
#, c-format
msgid "cursor \"%s\" has been declared but not opened"
msgstr "已经声明了游标\"%s\",但是没有打开"
-#: pgc.l:386
+#: ecpg.c:479 preproc.y:109
+#, c-format
+msgid "could not remove output file \"%s\"\n"
+msgstr "无法删除输出文件 \"%s\"\n"
+
+#: pgc.l:401
msgid "unterminated /* comment"
msgstr "/* 注释没有结束"
-#: pgc.l:399
+#: pgc.l:414
msgid "invalid bit string literal"
msgstr "无效的bit字符串常量"
-#: pgc.l:408
+#: pgc.l:423
msgid "unterminated bit string literal"
msgstr "未结束的bit字符串常量"
-#: pgc.l:424
+#: pgc.l:439
msgid "unterminated hexadecimal string literal"
msgstr "未结束的16进制字符串常量"
-#: pgc.l:501
+#: pgc.l:516
msgid "unterminated quoted string"
msgstr "未结束的引用字符串"
-#: pgc.l:556
-#: pgc.l:569
+#: pgc.l:571 pgc.l:584
msgid "zero-length delimited identifier"
msgstr "长度为0的分隔标识符"
-#: pgc.l:577
+#: pgc.l:592
msgid "unterminated quoted identifier"
msgstr "未结束的引用标识符"
-#: pgc.l:898
+#: pgc.l:938
msgid "missing identifier in EXEC SQL UNDEF command"
msgstr "在EXEC SQL UNDEF命令中丢失标识符"
-#: pgc.l:944
-#: pgc.l:958
+#: pgc.l:984 pgc.l:998
msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
msgstr "丢失匹配 \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
-#: pgc.l:947
-#: pgc.l:960
-#: pgc.l:1136
+#: pgc.l:987 pgc.l:1000 pgc.l:1176
msgid "missing \"EXEC SQL ENDIF;\""
msgstr "\"EXEC SQL ENDIF;\"丢失"
-#: pgc.l:976
-#: pgc.l:995
+#: pgc.l:1016 pgc.l:1035
msgid "more than one EXEC SQL ELSE"
msgstr "多个EXEC SQL ELSE"
-#: pgc.l:1017
-#: pgc.l:1031
+#: pgc.l:1057 pgc.l:1071
msgid "unmatched EXEC SQL ENDIF"
msgstr "EXEC SQL ENDIF不匹配"
-#: pgc.l:1051
+#: pgc.l:1091
msgid "too many nested EXEC SQL IFDEF conditions"
msgstr "嵌套EXEC SQL IFDEF条件太多"
-#: pgc.l:1084
+#: pgc.l:1124
msgid "missing identifier in EXEC SQL IFDEF command"
msgstr "在EXEC SQL IFDEF命令中丢失标识符"
-#: pgc.l:1093
+#: pgc.l:1133
msgid "missing identifier in EXEC SQL DEFINE command"
msgstr "在EXEC SQL DEFINE命令中丢失标识符"
-#: pgc.l:1126
+#: pgc.l:1166
msgid "syntax error in EXEC SQL INCLUDE command"
msgstr "在EXEC SQL INCLUDE命令中出现语法错误"
-#: pgc.l:1175
-msgid "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"
+#: pgc.l:1215
+msgid ""
+"internal error: unreachable state; please report this to <pgsql-"
+"bugs@postgresql.org>"
msgstr "内部错误:不可到达的状态;请向<pgsql-bugs@postgresql.org>发送报告"
-#: pgc.l:1298
+#: pgc.l:1340
#, c-format
msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
msgstr "错误:在第%3$d行上包含路径\"%1$s/%2$s\"太长,跳过\n"
-#: pgc.l:1314
+#: pgc.l:1362
#, c-format
msgid "could not open include file \"%s\" on line %d"
msgstr "在第%2$d行无法打开应用文件\"%1$s\""
-#: preproc.y:30
+#: preproc.y:31
msgid "syntax error"
msgstr "语法错误"
-#: preproc.y:78
+#: preproc.y:81
#, c-format
msgid "WARNING: "
msgstr "警告:"
-#: preproc.y:82
+#: preproc.y:85
#, c-format
msgid "ERROR: "
msgstr "错误:"
-#: preproc.y:106
-#, c-format
-msgid "could not remove output file \"%s\"\n"
-msgstr "无法删除输出文件 \"%s\"\n"
-
-#: preproc.y:314
+#: preproc.y:399
#, c-format
msgid "cursor \"%s\" does not exist"
msgstr "游标 \"%s\" 不存在"
-#: preproc.y:342
+#: preproc.y:427
msgid "initializer not allowed in type definition"
msgstr "在类型定义中不允许进行初始化"
-#: preproc.y:349
-#: preproc.y:11533
+#: preproc.y:429
+msgid "type name \"string\" is reserved in Informix mode"
+msgstr "在Informix模式中类型名称\"string\" 是被保留的"
+
+#: preproc.y:436 preproc.y:12413
#, c-format
msgid "type \"%s\" is already defined"
msgstr "已定义类型\"%s\" "
-#: preproc.y:372
-#: preproc.y:12132
-#: preproc.y:12442
-#: variable.c:584
+#: preproc.y:460 preproc.y:13053 preproc.y:13374 variable.c:610
msgid "multidimensional arrays for simple data types are not supported"
msgstr "不支持针对简单数据类型的多维数组"
-#: preproc.y:1238
+#: preproc.y:1392
msgid "AT option not allowed in CLOSE DATABASE statement"
msgstr "在CLOSE DATABASE语句中不允许使用AT选项"
-#: preproc.y:1304
-#: preproc.y:1444
+#: preproc.y:1458 preproc.y:1600
msgid "AT option not allowed in DEALLOCATE statement"
msgstr "在DEALLOCATE语句中不允许使用AT选项"
-#: preproc.y:1430
+#: preproc.y:1586
msgid "AT option not allowed in CONNECT statement"
msgstr "在CONNECT语句中不允许使用AT选项"
-#: preproc.y:1466
+#: preproc.y:1622
msgid "AT option not allowed in DISCONNECT statement"
msgstr "在DISCONNECT语句中不允许使用AT选项"
-#: preproc.y:1518
+#: preproc.y:1677
msgid "AT option not allowed in SET CONNECTION statement"
msgstr "在SET CONNECTION语句中不允许使用AT选项"
-#: preproc.y:1540
+#: preproc.y:1699
msgid "AT option not allowed in TYPE statement"
msgstr "在TYPE语句中不允许使用AT选项"
-#: preproc.y:1549
+#: preproc.y:1708
msgid "AT option not allowed in VAR statement"
msgstr "在VAR语句中不允许使用AT选项"
-#: preproc.y:1556
+#: preproc.y:1715
msgid "AT option not allowed in WHENEVER statement"
msgstr "在WHENEVER语句中不允许使用AT选项"
-#: preproc.y:1912
-#: preproc.y:2908
-#: preproc.y:3802
-#: preproc.y:3811
-#: preproc.y:4042
-#: preproc.y:5851
-#: preproc.y:5856
-#: preproc.y:5861
-#: preproc.y:8035
-#: preproc.y:8565
-#: preproc.y:8570
+#: preproc.y:2101 preproc.y:3197 preproc.y:3257 preproc.y:4210 preproc.y:4219
+#: preproc.y:4461 preproc.y:6550 preproc.y:6555 preproc.y:6560 preproc.y:8866
+#: preproc.y:9385
msgid "unsupported feature will be passed to server"
msgstr "不支持的功能特性将会传递给服务器"
-#: preproc.y:2142
+#: preproc.y:2331
msgid "SHOW ALL is not implemented"
msgstr "没有使用SHOW ALL"
-#: preproc.y:2477
-#: preproc.y:2488
+#: preproc.y:2687 preproc.y:2698
msgid "COPY TO STDIN is not possible"
msgstr "不能进行COPY TO STDIN的操作"
-#: preproc.y:2479
+#: preproc.y:2689
msgid "COPY FROM STDOUT is not possible"
msgstr "不能进行COPY FROM STDOUT的操作"
-#: preproc.y:2481
+#: preproc.y:2691
msgid "COPY FROM STDIN is not implemented"
msgstr "不能进行COPY FROM STDIN的操作"
-#: preproc.y:3742
-#: preproc.y:3753
+#: preproc.y:4150 preproc.y:4161
msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
msgstr "约束声明 INITIALLY DEFERRED 必须为 DEFERRABLE"
-#: preproc.y:6561
-#: preproc.y:11149
+#: preproc.y:7359 preproc.y:12002
+#, c-format
+msgid "using variable \"%s\" in different declare statements is not supported"
+msgstr "不支持在不同的声明语句中使用变量\"%s\""
+
+#: preproc.y:7361 preproc.y:12004
#, c-format
msgid "cursor \"%s\" is already defined"
msgstr "已经定义了游标\"%s\""
-#: preproc.y:6922
+#: preproc.y:7764
msgid "no longer supported LIMIT #,# syntax passed to server"
msgstr "不再支持将LIMIT #,#语法传递给服务器"
-#: preproc.y:7164
+#: preproc.y:7999
msgid "subquery in FROM must have an alias"
msgstr "FROM 中的子查询必须有一个别名"
-#: preproc.y:10838
-msgid "OLD used in query that is not in a rule"
-msgstr "查询中使用的 OLD 不在一个规则中"
-
-#: preproc.y:10845
-msgid "NEW used in query that is not in a rule"
-msgstr "查询中使用的 NEW 不在一个规则中"
-
-#: preproc.y:10877
+#: preproc.y:11735
msgid "CREATE TABLE AS cannot specify INTO"
msgstr "在CREATE TABLE AS语句中不能指定INTO子句"
-#: preproc.y:10924
+#: preproc.y:11772
#, c-format
msgid "expected \"@\", found \"%s\""
msgstr "期望 \"@\", 但是找到了\"%s\""
-#: preproc.y:10936
-msgid "only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are supported"
+#: preproc.y:11784
+msgid ""
+"only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
+"supported"
msgstr "只支持协议\"tcp\"和 \"unix\"以及数据库类型 \"postgresql\""
-#: preproc.y:10939
+#: preproc.y:11787
#, c-format
msgid "expected \"://\", found \"%s\""
msgstr "期望得到 \"://\",但是找到了\"%s\""
-#: preproc.y:10944
+#: preproc.y:11792
#, c-format
msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
msgstr "Unix-域的sockets只能在\"localhost\"上运行,而不能在\"%s\"上运行"
-#: preproc.y:10970
+#: preproc.y:11818
#, c-format
msgid "expected \"postgresql\", found \"%s\""
msgstr "期望\"postgresql\", 但是只找到了\"%s\""
-#: preproc.y:10973
+#: preproc.y:11821
#, c-format
msgid "invalid connection type: %s"
msgstr "无效的连接类型: %s"
-#: preproc.y:10982
+#: preproc.y:11830
#, c-format
msgid "expected \"@\" or \"://\", found \"%s\""
msgstr "期望\"@\"或\"://\",但是只找到了\"%s\""
-#: preproc.y:11057
-#: preproc.y:11074
+#: preproc.y:11905 preproc.y:11923
msgid "invalid data type"
msgstr "无效数据类型"
-#: preproc.y:11085
-#: preproc.y:11100
+#: preproc.y:11934 preproc.y:11949
msgid "incomplete statement"
msgstr "未结束的语句"
-#: preproc.y:11088
-#: preproc.y:11103
+#: preproc.y:11937 preproc.y:11952
#, c-format
msgid "unrecognized token \"%s\""
msgstr "无法识别的符号\"%s\""
-#: preproc.y:11352
+#: preproc.y:12224
msgid "only data types numeric and decimal have precision/scale argument"
msgstr "只有数据类型numeric和decimal有精度/范围参数"
-#: preproc.y:11364
+#: preproc.y:12236
msgid "interval specification not allowed here"
msgstr "在这里不允许使用间隔定义"
-#: preproc.y:11508
-#: preproc.y:11560
+#: preproc.y:12388 preproc.y:12440
msgid "too many levels in nested structure/union definition"
msgstr "在嵌套结构/联合定义中存在太多的层次"
-#: preproc.y:11691
+#: preproc.y:12571
msgid "pointers to varchar are not implemented"
msgstr "没有实现指向varchar类型值的指针"
-#: preproc.y:11855
-#: preproc.y:11862
-#: preproc.y:11869
+#: preproc.y:12758 preproc.y:12783
msgid "using unsupported DESCRIBE statement"
msgstr "使用不支持的DESCRIBE语句"
-#: preproc.y:12100
+#: preproc.y:13020
msgid "initializer not allowed in EXEC SQL VAR command"
msgstr "在EXEC SQL VAR命令中不允许初始化"
-#: preproc.y:12411
+#: preproc.y:13332
msgid "arrays of indicators are not allowed on input"
msgstr "在输入上不允许使用标识数组"
#. translator: %s is typically the translation of "syntax error"
-#: preproc.y:12638
+#: preproc.y:13586
#, c-format
msgid "%s at or near \"%s\""
msgstr "%s 在 \"%s\" 或附近的"
-#: type.c:18
-#: type.c:30
+#: type.c:18 type.c:30
msgid "out of memory"
msgstr "内存用尽"
-#: type.c:204
-#: type.c:556
+#: type.c:212 type.c:594
#, c-format
msgid "unrecognized variable type code %d"
msgstr "无法识别的变量类型代码%d"
-#: type.c:241
+#: type.c:261
+#, c-format
+msgid "variable \"%s\" is hidden by a local variable of a different type"
+msgstr "变量\"%s\"是由一个不同类型的局部变量隐藏的"
+
+#: type.c:263
+#, c-format
+msgid "variable \"%s\" is hidden by a local variable"
+msgstr "变量\"%s\"是由一个局部变量隐藏的"
+
+#: type.c:275
+#, c-format
+msgid ""
+"indicator variable \"%s\" is hidden by a local variable of a different type"
+msgstr "标记变量(indicator variable)\"%s\"是由一个不同类型的局部变量隐藏的。"
+
+#: type.c:277
+#, c-format
+msgid "indicator variable \"%s\" is hidden by a local variable"
+msgstr "标记变量(indicator variable)\"%s\"是由一个局部变量隐藏的"
+
+#: type.c:285
msgid "indicator for array/pointer has to be array/pointer"
msgstr "对于数组/指针的记号必须是array/pointer"
-#: type.c:245
+#: type.c:289
msgid "nested arrays are not supported (except strings)"
msgstr "不支持嵌套数组(除了字符串外)"
-#: type.c:278
+#: type.c:322
msgid "indicator for struct has to be a struct"
msgstr "结构的记号必须是struct"
-#: type.c:287
-#: type.c:295
-#: type.c:303
+#: type.c:331 type.c:339 type.c:347
msgid "indicator for simple data type has to be simple"
msgstr "对简单数据类型的指标要简单 "
-#: type.c:615
+#: type.c:653
#, c-format
msgid "unrecognized descriptor item code %d"
msgstr "无法识别的描述符成员代码 %d"
-#: variable.c:89
-#: variable.c:112
+#: variable.c:89 variable.c:112
#, c-format
msgid "incorrectly formed variable \"%s\""
msgstr "不正确形成的变量 \"%s\""
@@ -570,8 +558,7 @@ msgstr "不正确形成的变量 \"%s\""
msgid "variable \"%s\" is not a pointer"
msgstr "变量\"%s\"不是一个指针"
-#: variable.c:138
-#: variable.c:163
+#: variable.c:138 variable.c:163
#, c-format
msgid "variable \"%s\" is not a pointer to a structure or a union"
msgstr "变量\"%s\" 不是一个指向结构或联合的指针"
@@ -586,39 +573,42 @@ msgstr "变量\"%s\"既不是一个结构也不是一个联合"
msgid "variable \"%s\" is not an array"
msgstr "变量\"%s\"不是一个数组"
-#: variable.c:229
-#: variable.c:251
+#: variable.c:229 variable.c:251
#, c-format
msgid "variable \"%s\" is not declared"
msgstr "没有声明变量\"%s\""
-#: variable.c:459
+#: variable.c:484
msgid "indicator variable must have an integer type"
msgstr "标记变量必须有一个整数类型"
-#: variable.c:471
+#: variable.c:496
#, c-format
msgid "unrecognized data type name \"%s\""
msgstr "无法识别的数据类型名称 \"%s\""
-#: variable.c:482
-#: variable.c:490
-#: variable.c:507
-#: variable.c:510
+#: variable.c:507 variable.c:515 variable.c:532 variable.c:535
msgid "multidimensional arrays are not supported"
msgstr "不支持多维数组"
-#: variable.c:499
+#: variable.c:524
#, c-format
-msgid "multilevel pointers (more than 2 levels) are not supported; found %d level"
-msgid_plural "multilevel pointers (more than 2 levels) are not supported; found %d levels"
+msgid ""
+"multilevel pointers (more than 2 levels) are not supported; found %d level"
+msgid_plural ""
+"multilevel pointers (more than 2 levels) are not supported; found %d levels"
msgstr[0] "不支持多级指针(超过2级);找到了%d级指针."
-#: variable.c:504
+#: variable.c:529
msgid "pointer to pointer is not supported for this data type"
msgstr "对于这种数据类型不支持指向指针的指针"
-#: variable.c:524
+#: variable.c:549
msgid "multidimensional arrays for structures are not supported"
msgstr "不支持结构类型的多维数组"
+#~ msgid "OLD used in query that is not in a rule"
+#~ msgstr "查询中使用的 OLD 不在一个规则中"
+
+#~ msgid "NEW used in query that is not in a rule"
+#~ msgstr "查询中使用的 NEW 不在一个规则中"
diff --git a/src/interfaces/ecpg/preproc/po/zh_TW.po b/src/interfaces/ecpg/preproc/po/zh_TW.po
new file mode 100644
index 00000000000..b3aa7be58ea
--- /dev/null
+++ b/src/interfaces/ecpg/preproc/po/zh_TW.po
@@ -0,0 +1,611 @@
+# Traditional Chinese message translation file for ecpg
+# Copyright (C) 2010 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+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:34+0000\n"
+"PO-Revision-Date: 2010-09-24 17:04-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"
+
+#: descriptor.c:64
+#, c-format
+msgid "variable \"%s\" must have a numeric type"
+msgstr "變數 \"%s\" 必須具有數值型別"
+
+#: descriptor.c:124 descriptor.c:146
+#, c-format
+msgid "descriptor \"%s\" does not exist"
+msgstr "描述子 \"%s\" 不存在"
+
+#: descriptor.c:161 descriptor.c:210
+#, c-format
+msgid "descriptor header item \"%d\" does not exist"
+msgstr "描述子標頭項目 \"%d\" 不存在"
+
+#: descriptor.c:182
+msgid "nullable is always 1"
+msgstr "Nullable 一律為 1"
+
+#: descriptor.c:185
+msgid "key_member is always 0"
+msgstr "key_member 一律為 0"
+
+#: descriptor.c:277
+#, c-format
+msgid "descriptor item \"%s\" is not implemented"
+msgstr "未實作描述子項目 \"%s\""
+
+#: ecpg.c:36
+#, c-format
+msgid ""
+"%s is the PostgreSQL embedded SQL preprocessor for C programs.\n"
+"\n"
+msgstr ""
+"%s 是 PostgreSQL 內嵌 SQL 前置處理器,適用於 C 程式。\n"
+"\n"
+
+#: ecpg.c:38
+#, c-format
+msgid ""
+"Usage:\n"
+" %s [OPTION]... FILE...\n"
+"\n"
+msgstr ""
+"使用方法:\n"
+"%s [OPTION]...檔案...\n"
+"\n"
+
+# postmaster/postmaster.c:1017 tcop/postgres.c:2115
+#: ecpg.c:41
+#, c-format
+msgid "Options:\n"
+msgstr "選項:\n"
+
+#: ecpg.c:42
+#, c-format
+msgid ""
+" -c automatically generate C code from embedded SQL code;\n"
+" this affects EXEC SQL TYPE\n"
+msgstr ""
+" -c 自動從內嵌 SQL 程式碼產生 C 程式碼,\n"
+" EXEC SQL TYPE 會受到影響\n"
+
+#: ecpg.c:44
+#, c-format
+msgid ""
+" -C MODE set compatibility mode; MODE can be one of\n"
+" \"INFORMIX\", \"INFORMIX_SE\"\n"
+msgstr ""
+" -C 模式 設定相容性模式,模式可以是下列其中一項\n"
+" \"INFORMIX\"、\"INFORMIX_SE\"\n"
+
+#: ecpg.c:47
+#, c-format
+msgid " -d generate parser debug output\n"
+msgstr " -d 產生解譯器偵錯輸出\n"
+
+#: ecpg.c:49
+#, c-format
+msgid " -D SYMBOL define SYMBOL\n"
+msgstr " -D 符號 定義符號\n"
+
+#: ecpg.c:50
+#, c-format
+msgid ""
+" -h parse a header file, this option includes option \"-c\"\n"
+msgstr " -h 解譯標頭檔,此選項包含選項 \"-c\"\n"
+
+#: ecpg.c:51
+#, c-format
+msgid " -i parse system include files as well\n"
+msgstr " -i 同時解譯系統 Include 檔案\n"
+
+#: ecpg.c:52
+#, c-format
+msgid " -I DIRECTORY search DIRECTORY for include files\n"
+msgstr " -I 目錄 搜尋 Include 檔案的目錄\n"
+
+#: ecpg.c:53
+#, c-format
+msgid " -o OUTFILE write result to OUTFILE\n"
+msgstr " -o 輸出檔 將結果寫入輸出檔\n"
+
+#: ecpg.c:54
+#, c-format
+msgid ""
+" -r OPTION specify run-time behavior; OPTION can be:\n"
+" \"no_indicator\", \"prepare\", \"questionmarks\"\n"
+msgstr ""
+" -r 選項 指定執行階段行為,選項可以是:\n"
+" \"no_indicator\"、\"prepare\"、\"questionmarks\"\n"
+
+#: ecpg.c:56
+#, c-format
+msgid " --regression run in regression testing mode\n"
+msgstr " --regression 以迴歸測試模式執行\n"
+
+#: ecpg.c:57
+#, c-format
+msgid " -t turn on autocommit of transactions\n"
+msgstr " -t 開啟交易自動提交功能\n"
+
+#: ecpg.c:58
+#, c-format
+msgid " --help show this help, then exit\n"
+msgstr " --help 顯示此說明,然後結束\n"
+
+#: ecpg.c:59
+#, c-format
+msgid " --version output version information, then exit\n"
+msgstr " --version 輸出版本資訊,然後結束\n"
+
+#: ecpg.c:60
+#, c-format
+msgid ""
+"\n"
+"If no output file is specified, the name is formed by adding .c to the\n"
+"input file name, after stripping off .pgc if present.\n"
+msgstr ""
+"\n"
+"如果未指定輸出檔,檔名就是將輸入檔的檔名\n"
+"去掉 .pgc (如果有的話) 再加上 .c。\n"
+
+# tcop/postgres.c:2140
+#: ecpg.c:62
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"回報錯誤給<pgsql-bugs@postgresql.org>。\n"
+
+#: ecpg.c:183 ecpg.c:334 ecpg.c:344
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: 無法開啟檔案\"%s\": %s\n"
+
+# postmaster/postmaster.c:512 postmaster/postmaster.c:525
+#: ecpg.c:222 ecpg.c:235 ecpg.c:251 ecpg.c:276
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "執行\"%s --help\"顯示更多資訊。\n"
+
+#: ecpg.c:246
+#, c-format
+msgid "%s: parser debug support (-d) not available\n"
+msgstr "%s: 解譯器偵錯支援 (-d) 無法使用\n"
+
+#: ecpg.c:264
+#, c-format
+msgid "%s, the PostgreSQL embedded C preprocessor, version %d.%d.%d\n"
+msgstr "%s,PostgreSQL 內嵌 C 前置處理器,版本 %d.%d.%d\n"
+
+#: ecpg.c:266
+#, c-format
+msgid "EXEC SQL INCLUDE ... search starts here:\n"
+msgstr "EXEC SQL INCLUDE ... 在此處開始搜尋:\n"
+
+#: ecpg.c:269
+#, c-format
+msgid "end of search list\n"
+msgstr "搜尋清單結尾\n"
+
+#: ecpg.c:275
+#, c-format
+msgid "%s: no input files specified\n"
+msgstr "%s: 未指定輸入檔\n"
+
+#: ecpg.c:464
+#, c-format
+msgid "cursor \"%s\" has been declared but not opened"
+msgstr "指標 \"%s\" 已宣告但尚未開啟"
+
+# scan.l:312
+#: pgc.l:386
+msgid "unterminated /* comment"
+msgstr "未結束的 /* 註解"
+
+#: pgc.l:399
+msgid "invalid bit string literal"
+msgstr "位元字串實量無效"
+
+# scan.l:339
+#: pgc.l:408
+msgid "unterminated bit string literal"
+msgstr "未結束的位元字串實量"
+
+# scan.l:358
+#: pgc.l:424
+msgid "unterminated hexadecimal string literal"
+msgstr "未結束的十六進位字串實量"
+
+# scan.l:407
+#: pgc.l:501
+msgid "unterminated quoted string"
+msgstr "未結束的引號字串"
+
+#: pgc.l:556 pgc.l:569
+msgid "zero-length delimited identifier"
+msgstr "長度為零的分隔識別字"
+
+#: pgc.l:577
+msgid "unterminated quoted identifier"
+msgstr "未結束的引號識別字"
+
+#: pgc.l:898
+msgid "missing identifier in EXEC SQL UNDEF command"
+msgstr "EXEC SQL UNDEF 指令遺漏識別字"
+
+#: pgc.l:944 pgc.l:958
+msgid "missing matching \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
+msgstr "遺漏相符的 \"EXEC SQL IFDEF\" / \"EXEC SQL IFNDEF\""
+
+#: pgc.l:947 pgc.l:960 pgc.l:1136
+msgid "missing \"EXEC SQL ENDIF;\""
+msgstr "遺漏 \"EXEC SQL ENDIF;\""
+
+#: pgc.l:976 pgc.l:995
+msgid "more than one EXEC SQL ELSE"
+msgstr "多個 EXEC SQL ELSE"
+
+#: pgc.l:1017 pgc.l:1031
+msgid "unmatched EXEC SQL ENDIF"
+msgstr "EXEC SQL ENDIF 不相符"
+
+#: pgc.l:1051
+msgid "too many nested EXEC SQL IFDEF conditions"
+msgstr "過多巢狀 EXEC SQL IFDEF 條件"
+
+#: pgc.l:1084
+msgid "missing identifier in EXEC SQL IFDEF command"
+msgstr "EXEC SQL IFDEF 指令遺漏識別字"
+
+#: pgc.l:1093
+msgid "missing identifier in EXEC SQL DEFINE command"
+msgstr "EXEC SQL DEFINE 指令遺漏識別字"
+
+#: pgc.l:1126
+msgid "syntax error in EXEC SQL INCLUDE command"
+msgstr "EXEC SQL INCLUDE 指令的語法錯誤"
+
+#: pgc.l:1175
+msgid ""
+"internal error: unreachable state; please report this to <pgsql-"
+"bugs@postgresql.org>"
+msgstr "內部錯誤: 無法連線狀態,請回報此錯誤給 <pgsql-bugs@postgresql.org&gt;"
+
+#: pgc.l:1298
+#, c-format
+msgid "Error: include path \"%s/%s\" is too long on line %d, skipping\n"
+msgstr "錯誤: Include 路徑 \"%s/%s\" 太長 (位於行 %d),略過\n"
+
+#: pgc.l:1314
+#, c-format
+msgid "could not open include file \"%s\" on line %d"
+msgstr "無法開啟 Include 檔案 \"%s\" (位於行 %d)"
+
+# gram.y:8218 gram.y:8220 y.tab.c:19175
+#: preproc.y:30
+msgid "syntax error"
+msgstr "語法錯誤"
+
+#: preproc.y:78
+#, c-format
+msgid "WARNING: "
+msgstr "警告:"
+
+#: preproc.y:82
+#, c-format
+msgid "ERROR: "
+msgstr "錯誤:"
+
+#: preproc.y:106
+#, c-format
+msgid "could not remove output file \"%s\"\n"
+msgstr "無法移除輸出檔 \"%s\"\n"
+
+# commands/portalcmds.c:182 commands/portalcmds.c:229
+#: preproc.y:314
+#, c-format
+msgid "cursor \"%s\" does not exist"
+msgstr "cursor \"%s\"不存在"
+
+#: preproc.y:342
+msgid "initializer not allowed in type definition"
+msgstr "型別定義中不允許使用初始設定式"
+
+#: preproc.y:349 preproc.y:11533
+#, c-format
+msgid "type \"%s\" is already defined"
+msgstr "型別 \"%s\" 已定義"
+
+#: preproc.y:372 preproc.y:12132 preproc.y:12442 variable.c:584
+msgid "multidimensional arrays for simple data types are not supported"
+msgstr "不支援簡單資料型別的多維度陣列"
+
+#: preproc.y:1238
+msgid "AT option not allowed in CLOSE DATABASE statement"
+msgstr "CLOSE DATABASE 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1304 preproc.y:1444
+msgid "AT option not allowed in DEALLOCATE statement"
+msgstr "DEALLOCATE 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1430
+msgid "AT option not allowed in CONNECT statement"
+msgstr "CONNECT 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1466
+msgid "AT option not allowed in DISCONNECT statement"
+msgstr "DISCONNECT 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1518
+msgid "AT option not allowed in SET CONNECTION statement"
+msgstr "SET CONNECTION 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1540
+msgid "AT option not allowed in TYPE statement"
+msgstr "TYPE 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1549
+msgid "AT option not allowed in VAR statement"
+msgstr "VAR 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1556
+msgid "AT option not allowed in WHENEVER statement"
+msgstr "WHENEVER 陳述式中不允許使用 AT 選項"
+
+#: preproc.y:1912 preproc.y:2908 preproc.y:3802 preproc.y:3811 preproc.y:4042
+#: preproc.y:5851 preproc.y:5856 preproc.y:5861 preproc.y:8035 preproc.y:8565
+#: preproc.y:8570
+msgid "unsupported feature will be passed to server"
+msgstr "不支援的功能將會傳遞到伺服器"
+
+#: preproc.y:2142
+msgid "SHOW ALL is not implemented"
+msgstr "未實作 SHOW ALL"
+
+#: preproc.y:2477 preproc.y:2488
+msgid "COPY TO STDIN is not possible"
+msgstr "COPY TO STDIN 不可行"
+
+#: preproc.y:2479
+msgid "COPY FROM STDOUT is not possible"
+msgstr "COPY FROM STDOUT 不可行"
+
+#: preproc.y:2481
+msgid "COPY FROM STDIN is not implemented"
+msgstr "未實作 COPY FROM STDIN"
+
+#: preproc.y:3742 preproc.y:3753
+msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
+msgstr "限制宣告的 INITIALLY DEFERRED 必須是 DEFERRABLE"
+
+#: preproc.y:6561 preproc.y:11149
+#, c-format
+msgid "cursor \"%s\" is already defined"
+msgstr "指標 \"%s\" 已定義"
+
+#: preproc.y:6922
+msgid "no longer supported LIMIT #,# syntax passed to server"
+msgstr "不再支援的 LIMIT #,# 語法已傳遞到伺服器"
+
+# gram.y:5166 parser/parse_clause.c:423
+#: preproc.y:7164
+msgid "subquery in FROM must have an alias"
+msgstr "FROM中的子查詢要有別名"
+
+#: preproc.y:10838
+msgid "OLD used in query that is not in a rule"
+msgstr "查詢中使用的 OLD 不在規則中"
+
+#: preproc.y:10845
+msgid "NEW used in query that is not in a rule"
+msgstr "查詢中使用的 NEW 不在規則中"
+
+#: preproc.y:10877
+msgid "CREATE TABLE AS cannot specify INTO"
+msgstr "CREATE TABLE AS 不能指定 INTO"
+
+#: preproc.y:10924
+#, c-format
+msgid "expected \"@\", found \"%s\""
+msgstr "預期 \"@\",找到 \"%s\""
+
+#: preproc.y:10936
+msgid ""
+"only protocols \"tcp\" and \"unix\" and database type \"postgresql\" are "
+"supported"
+msgstr "只支援通訊協定 \"tcp\" 和 \"unix\" 以及資料庫類型 \"postgresql\""
+
+#: preproc.y:10939
+#, c-format
+msgid "expected \"://\", found \"%s\""
+msgstr "預期 \"://\",找到 \"%s\""
+
+#: preproc.y:10944
+#, c-format
+msgid "Unix-domain sockets only work on \"localhost\" but not on \"%s\""
+msgstr "Unix-可用域通訊端僅適用 \"localhost\",不適用 \"%s\""
+
+#: preproc.y:10970
+#, c-format
+msgid "expected \"postgresql\", found \"%s\""
+msgstr "預期 \"postgresql\",找到 \"%s\""
+
+#: preproc.y:10973
+#, c-format
+msgid "invalid connection type: %s"
+msgstr "連線類型無效:%s"
+
+#: preproc.y:10982
+#, c-format
+msgid "expected \"@\" or \"://\", found \"%s\""
+msgstr "預期 \"@\" 或 \"://\",找到 \"%s\""
+
+#: preproc.y:11057 preproc.y:11074
+msgid "invalid data type"
+msgstr "資料型別無效"
+
+#: preproc.y:11085 preproc.y:11100
+msgid "incomplete statement"
+msgstr "陳述式不完整"
+
+#: preproc.y:11088 preproc.y:11103
+#, c-format
+msgid "unrecognized token \"%s\""
+msgstr "無法辨識的 token \"%s\""
+
+#: preproc.y:11352
+msgid "only data types numeric and decimal have precision/scale argument"
+msgstr "只有數值和十進位資料型別有精確度/小數位數參數"
+
+#: preproc.y:11364
+msgid "interval specification not allowed here"
+msgstr "這裡不允許使用間隔規格"
+
+#: preproc.y:11508 preproc.y:11560
+msgid "too many levels in nested structure/union definition"
+msgstr "巢狀結構/聯集定義中的層級過多"
+
+#: preproc.y:11691
+msgid "pointers to varchar are not implemented"
+msgstr "Varchar 的指標未實作"
+
+#: preproc.y:11855 preproc.y:11862 preproc.y:11869
+msgid "using unsupported DESCRIBE statement"
+msgstr "正在使用不支援的 DESCRIBE 陳述式"
+
+#: preproc.y:12100
+msgid "initializer not allowed in EXEC SQL VAR command"
+msgstr "EXEC SQL VAR 指令中不允許使用初始設定式"
+
+#: preproc.y:12411
+msgid "arrays of indicators are not allowed on input"
+msgstr "輸入中不允許使用指標陣列"
+
+# translator: first %s is typically "syntax error"
+# scan.l:629
+#. translator: %s is typically the translation of "syntax error"
+#: preproc.y:12638
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "在\"%s\"附近發生 %s"
+
+# 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
+#: type.c:18 type.c:30
+msgid "out of memory"
+msgstr "記憶體用盡"
+
+#: type.c:204 type.c:556
+#, c-format
+msgid "unrecognized variable type code %d"
+msgstr "無法辨識的變數型別程式碼 %d "
+
+#: type.c:241
+msgid "indicator for array/pointer has to be array/pointer"
+msgstr "陣列/指標的指標必須是陣列/指標"
+
+#: type.c:245
+msgid "nested arrays are not supported (except strings)"
+msgstr "不支援巢狀陣列 (字串除外)"
+
+#: type.c:278
+msgid "indicator for struct has to be a struct"
+msgstr "建構的指標必須是建構"
+
+#: type.c:287 type.c:295 type.c:303
+msgid "indicator for simple data type has to be simple"
+msgstr "簡單資料型別的指標必須簡單"
+
+#: type.c:615
+#, c-format
+msgid "unrecognized descriptor item code %d"
+msgstr "無法辨識的描述子項目程式碼 %d"
+
+#: variable.c:89 variable.c:112
+#, c-format
+msgid "incorrectly formed variable \"%s\""
+msgstr "變數 \"%s\" 的格式不正確"
+
+#: variable.c:135
+#, c-format
+msgid "variable \"%s\" is not a pointer"
+msgstr "變數 \"%s\" 不是指標"
+
+#: variable.c:138 variable.c:163
+#, c-format
+msgid "variable \"%s\" is not a pointer to a structure or a union"
+msgstr "變數 \"%s\"不是結構或聯集的指標"
+
+#: variable.c:150
+#, c-format
+msgid "variable \"%s\" is neither a structure nor a union"
+msgstr "變數 \"%s\" 不是結構也不是聯集"
+
+#: variable.c:160
+#, c-format
+msgid "variable \"%s\" is not an array"
+msgstr "變數 \"%s\" 不是陣列"
+
+#: variable.c:229 variable.c:251
+#, c-format
+msgid "variable \"%s\" is not declared"
+msgstr "變數 \"%s\" 未宣告"
+
+#: variable.c:459
+msgid "indicator variable must have an integer type"
+msgstr "指標變數必須是整數型別"
+
+#: variable.c:471
+#, c-format
+msgid "unrecognized data type name \"%s\""
+msgstr " 無法辨識的資料型別名稱 \"%s\""
+
+#: variable.c:482 variable.c:490 variable.c:507 variable.c:510
+msgid "multidimensional arrays are not supported"
+msgstr "不支援多維度陣列"
+
+#: variable.c:499
+#, c-format
+msgid ""
+"multilevel pointers (more than 2 levels) are not supported; found %d level"
+msgid_plural ""
+"multilevel pointers (more than 2 levels) are not supported; found %d levels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: variable.c:504
+msgid "pointer to pointer is not supported for this data type"
+msgstr "此資料型別不支援指標的指標"
+
+#: variable.c:524
+msgid "multidimensional arrays for structures are not supported"
+msgstr "不支援多維度的結構陣列"
diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index 81ce2025f0e..f1cefce513a 100644
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,5 +1,5 @@
# $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.25 2010/05/13 15:56:42 petere Exp $
CATALOG_NAME := libpq
-AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ru sv ta tr zh_CN
+AVAIL_LANGUAGES := cs de es fr it ja ko pt_BR ru sv ta tr zh_CN zh_TW
GETTEXT_FILES := fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
diff --git a/src/interfaces/libpq/po/ko.po b/src/interfaces/libpq/po/ko.po
index 48cabdfdf2a..8e79e40b6ba 100644
--- a/src/interfaces/libpq/po/ko.po
+++ b/src/interfaces/libpq/po/ko.po
@@ -3,73 +3,110 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-07 00:41+0900\n"
-"PO-Revision-Date: 2006-12-07 04:37+0900\n"
-"Last-Translator: Ioseph Kim <ioseph@uri.sarang.net>\n"
-"Language-Team: Korean <ioseph@uri.sarang.net>\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:26-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"
-#: fe-auth.c:258
+#: fe-auth.c:212 fe-auth.c:432 fe-auth.c:659
+msgid "host name must be specified\n"
+msgstr "ȣƮ ̸ ؾ \n"
+
+#: fe-auth.c:242
#, c-format
msgid "could not set socket to blocking mode: %s\n"
msgstr " blocking : %s\n"
-#: fe-auth.c:276 fe-auth.c:280
+#: fe-auth.c:260 fe-auth.c:264
#, c-format
msgid "Kerberos 5 authentication rejected: %*s\n"
msgstr "Kerberos 5 : %*s\n"
-#: fe-auth.c:306
+#: fe-auth.c:290
#, c-format
msgid "could not restore non-blocking mode on socket: %s\n"
msgstr " non-blocking ǵ : %s\n"
-#: fe-auth.c:375
-msgid "SCM_CRED authentication method not supported\n"
-msgstr "SCM_CRED \n"
+#: fe-auth.c:403
+msgid "GSSAPI continuation error"
+msgstr "GSSAPI "
+
+#: fe-auth.c:439
+msgid "duplicate GSS authentication request\n"
+msgstr "ߺ GSS û\n"
-#: fe-auth.c:398 fe-connect.c:1276 fe-connect.c:2437 fe-connect.c:2654
-#: fe-connect.c:2984 fe-connect.c:2993 fe-connect.c:3130 fe-connect.c:3170
-#: fe-connect.c:3188 fe-exec.c:2751 fe-lobj.c:616 fe-protocol2.c:1027
-#: fe-protocol3.c:1330
+#: fe-auth.c:459
+msgid "GSSAPI name import error"
+msgstr "GSSAPI ̸ "
+
+#: fe-auth.c:545
+msgid "SSPI continuation error"
+msgstr "SSPI "
+
+#: fe-auth.c:556 fe-auth.c:630 fe-auth.c:665 fe-auth.c:762 fe-connect.c:1342
+#: fe-connect.c:2625 fe-connect.c:2842 fe-connect.c:3208 fe-connect.c:3217
+#: fe-connect.c:3354 fe-connect.c:3400 fe-connect.c:3418 fe-exec.c:3110
+#: fe-lobj.c:696 fe-protocol2.c:1027 fe-protocol3.c:1421
msgid "out of memory\n"
msgstr "޸ \n"
-#: fe-auth.c:461
+#: fe-auth.c:645
+msgid "could not acquire SSPI credentials"
+msgstr "SSPI ڰ "
+
+#: fe-auth.c:738
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "SCM_CRED \n"
+
+#: fe-auth.c:812
msgid "Kerberos 4 authentication not supported\n"
msgstr "Kerberos 4 \n"
-#: fe-auth.c:478
+#: fe-auth.c:828
msgid "Kerberos 5 authentication not supported\n"
msgstr "Kerberos 5 \n"
-#: fe-auth.c:506
+#: fe-auth.c:895
+msgid "GSSAPI authentication not supported\n"
+msgstr "GSSAPI \n"
+
+#: fe-auth.c:919
+msgid "SSPI authentication not supported\n"
+msgstr "SSPI \n"
+
+#: fe-auth.c:926
+msgid "Crypt authentication not supported\n"
+msgstr "ȣȭ \n"
+
+#: fe-auth.c:953
#, c-format
msgid "authentication method %u not supported\n"
msgstr "%u \n"
-#: fe-connect.c:486
+#: fe-connect.c:524
#, c-format
msgid "invalid sslmode value: \"%s\"\n"
msgstr "߸ sslmode : \"%s\"\n"
-#: fe-connect.c:506
+#: fe-connect.c:545
#, c-format
msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
msgstr ""
"SSL ʰ sslmode \"%s\" Ÿ"
"ġ ʽϴ\n"
-#: fe-connect.c:672
+#: fe-connect.c:728
#, c-format
msgid "could not set socket to TCP no delay mode: %s\n"
msgstr " TCP no delay : %s\n"
-#: fe-connect.c:702
+#: fe-connect.c:758
#, c-format
msgid ""
"could not connect to server: %s\n"
@@ -80,7 +117,7 @@ msgstr ""
"\tȣƮ ,\n"
"\t\"%s\" н 캸ʽÿ.\n"
-#: fe-connect.c:712
+#: fe-connect.c:768
#, c-format
msgid ""
"could not connect to server: %s\n"
@@ -91,333 +128,352 @@ msgstr ""
"\t\"%s\" ȣƮ ,\n"
"\t%s Ʈ TCP/IP 캸ʽÿ.\n"
-#: fe-connect.c:802
+#: fe-connect.c:858
#, c-format
msgid "could not translate host name \"%s\" to address: %s\n"
msgstr "\"%s\" ȣƮ ̸ ϴ: ּ: %s\n"
-#: fe-connect.c:806
+#: fe-connect.c:862
#, c-format
msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
msgstr "\"%s\" н θ ϴ: ּ: %s\n"
-#: fe-connect.c:1007
+#: fe-connect.c:1069
msgid "invalid connection state, probably indicative of memory corruption\n"
msgstr "߸ , ޸ ջ ɼ ŭ\n"
-#: fe-connect.c:1050
+#: fe-connect.c:1112
#, c-format
msgid "could not create socket: %s\n"
msgstr " : %s\n"
-#: fe-connect.c:1073
+#: fe-connect.c:1135
#, c-format
msgid "could not set socket to non-blocking mode: %s\n"
msgstr " non-blocking : %s\n"
-#: fe-connect.c:1085
+#: fe-connect.c:1147
#, c-format
msgid "could not set socket to close-on-exec mode: %s\n"
msgstr " close-on-exec : %s\n"
-#: fe-connect.c:1172
+#: fe-connect.c:1234
#, c-format
msgid "could not get socket error status: %s\n"
msgstr " ¸ : %s\n"
-#: fe-connect.c:1210
+#: fe-connect.c:1272
#, c-format
msgid "could not get client address from socket: %s\n"
msgstr "Ͽ Ŭ̾Ʈ ּҸ : %s\n"
-#: fe-connect.c:1254
+#: fe-connect.c:1316
#, c-format
msgid "could not send SSL negotiation packet: %s\n"
msgstr "SSL Ŷ : %s\n"
-#: fe-connect.c:1289
+#: fe-connect.c:1355
#, c-format
msgid "could not send startup packet: %s\n"
msgstr " Ŷ : %s\n"
-#: fe-connect.c:1354 fe-connect.c:1371
+#: fe-connect.c:1422 fe-connect.c:1441
msgid "server does not support SSL, but SSL was required\n"
msgstr " SSL ʴµ, SSL 䱸\n"
-#: fe-connect.c:1387
+#: fe-connect.c:1457
#, c-format
msgid "received invalid response to SSL negotiation: %c\n"
msgstr "SSL ߸ : %c\n"
-#: fe-connect.c:1463 fe-connect.c:1495
+#: fe-connect.c:1533 fe-connect.c:1566
#, c-format
msgid "expected authentication request from server, but received %c\n"
msgstr " 䱸, %c ޾\n"
-#: fe-connect.c:1727
+#: fe-connect.c:1737
+#, c-format
+msgid "out of memory allocating GSSAPI buffer (%i)"
+msgstr "GSSAPI (%i) Ҵ ޸ "
+
+#: fe-connect.c:1822
msgid "unexpected message from server during startup\n"
msgstr "ϴ κ ʴ ޽\n"
-#: fe-connect.c:1795
+#: fe-connect.c:1890
#, c-format
msgid "invalid connection state %c, probably indicative of memory corruption\n"
msgstr "߸ %c, ޸ ջ ɼ ŭ\n"
-#: fe-connect.c:2450
+#: fe-connect.c:2233 fe-connect.c:2293
+#, c-format
+msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
+msgstr "PGEVT_CONNRESET ̺Ʈ PGEventProc \"%s\"() \n"
+
+#: fe-connect.c:2638
#, c-format
msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
msgstr "߸ LDAP URL \"%s\": Ű ldap:// \n"
-#: fe-connect.c:2465
+#: fe-connect.c:2653
#, c-format
msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
msgstr "߸ LDAP URL \"%s\": ĺ ̸ \n"
-#: fe-connect.c:2476 fe-connect.c:2529
+#: fe-connect.c:2664 fe-connect.c:2717
#, c-format
msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
msgstr "߸ LDAP URL \"%s\": ϳ Ӽ \n"
-#: fe-connect.c:2486 fe-connect.c:2543
+#: fe-connect.c:2674 fe-connect.c:2731
#, c-format
msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
msgstr "߸ LDAP URL \"%s\": ˻(base/one/sub) ؾ\n"
-#: fe-connect.c:2497
+#: fe-connect.c:2685
#, c-format
msgid "invalid LDAP URL \"%s\": no filter\n"
msgstr "߸ LDAP URL \"%s\": \n"
-#: fe-connect.c:2518
+#: fe-connect.c:2706
#, c-format
msgid "invalid LDAP URL \"%s\": invalid port number\n"
msgstr "߸ LDAP URL \"%s\": Ʈȣ ߸\n"
-#: fe-connect.c:2552
+#: fe-connect.c:2740
msgid "could not create LDAP structure\n"
msgstr "LDAP \n"
-#: fe-connect.c:2594
+#: fe-connect.c:2782
#, c-format
msgid "lookup on LDAP server failed: %s\n"
msgstr "LDAP ã : %s\n"
-#: fe-connect.c:2605
+#: fe-connect.c:2793
msgid "more than one entry found on LDAP lookup\n"
msgstr "LDAP ˻ ϳ ̻ Ʈ ߰ߵǾ\n"
-#: fe-connect.c:2606 fe-connect.c:2618
+#: fe-connect.c:2794 fe-connect.c:2806
msgid "no entry found on LDAP lookup\n"
msgstr "LDAP ˻ ش ׸ \n"
-#: fe-connect.c:2629 fe-connect.c:2642
+#: fe-connect.c:2817 fe-connect.c:2830
msgid "attribute has no values on LDAP lookup\n"
msgstr "LDAP ˻ Ӽ \n"
-#: fe-connect.c:2693 fe-connect.c:2711 fe-connect.c:3032
+#: fe-connect.c:2881 fe-connect.c:2899 fe-connect.c:3256
#, c-format
msgid "missing \"=\" after \"%s\" in connection info string\n"
msgstr "Ṯڿ \"%s\" \"=\" \n"
-#: fe-connect.c:2774 fe-connect.c:3114
+#: fe-connect.c:2962 fe-connect.c:3338
#, c-format
msgid "invalid connection option \"%s\"\n"
msgstr "߸ ɼ \"%s\"\n"
-#: fe-connect.c:2787 fe-connect.c:3081
+#: fe-connect.c:2975 fe-connect.c:3305
msgid "unterminated quoted string in connection info string\n"
msgstr "Ṯڿ ϼ ǥڿ \n"
-#: fe-connect.c:2830
+#: fe-connect.c:3018
#, c-format
msgid "ERROR: service file \"%s\" not found\n"
msgstr ": \"%s\" ã \n"
-#: fe-connect.c:2843
+#: fe-connect.c:3031
#, c-format
msgid "ERROR: line %d too long in service file \"%s\"\n"
msgstr ": %d° \"%s\" Ͽ ʹ ϴ\n"
-#: fe-connect.c:2915 fe-connect.c:2942
+#: fe-connect.c:3103 fe-connect.c:3130
#, c-format
msgid "ERROR: syntax error in service file \"%s\", line %d\n"
msgstr ": \"%s\" %d° ٿ \n"
-#: fe-connect.c:3357
+#: fe-connect.c:3586
msgid "connection pointer is NULL\n"
msgstr " Ͱ NULL\n"
-#: fe-connect.c:3618
+#: fe-connect.c:3869
#, c-format
msgid "WARNING: password file \"%s\" is not a plain file\n"
msgstr ": \"%s\" н plain ƴ\n"
-#: fe-connect.c:3628
+#: fe-connect.c:3878
#, c-format
msgid ""
-"WARNING: password file \"%s\" has world or group read access; permission "
-"should be u=rw (0600)\n"
+"WARNING: password file \"%s\" has group or world access; permissions should "
+"be u=rw (0600) or less\n"
msgstr ""
-": \"%s\" н б ġ ʽϴ: (u=rw, "
-"0600), chmod ֽʽÿ\n"
+": н \"%s\" ׷ Ǵ ׼ ֽϴ. "
+"u=rw(0600) Ͽ մϴ.\n"
-#: fe-exec.c:498
+#: fe-exec.c:827
msgid "NOTICE"
msgstr "˸"
-#: fe-exec.c:682 fe-exec.c:739 fe-exec.c:779
+#: fe-exec.c:1014 fe-exec.c:1071 fe-exec.c:1111
msgid "command string is a null pointer\n"
msgstr " ڿ null \n"
-#: fe-exec.c:772 fe-exec.c:867
+#: fe-exec.c:1104 fe-exec.c:1199
msgid "statement name is a null pointer\n"
msgstr " ̸ null Ʈ( )Դϴ\n"
-#: fe-exec.c:787 fe-exec.c:941 fe-exec.c:1570 fe-exec.c:1766
+#: fe-exec.c:1119 fe-exec.c:1273 fe-exec.c:1928 fe-exec.c:2125
msgid "function requires at least protocol version 3.0\n"
msgstr "Լ  3 䱸ϰ ֽϴ\n"
-#: fe-exec.c:898
+#: fe-exec.c:1230
msgid "no connection to the server\n"
msgstr " \n"
-#: fe-exec.c:905
+#: fe-exec.c:1237
msgid "another command is already in progress\n"
msgstr "ó ߿ ̹ ٸ \n"
-#: fe-exec.c:1015
+#: fe-exec.c:1349
msgid "length must be given for binary parameter\n"
-msgstr " ڷ ڸ ̸ ؾ\n"
+msgstr "̳ʸ ڷ Ű ̸ ؾ \n"
-#: fe-exec.c:1262
+#: fe-exec.c:1596
#, c-format
msgid "unexpected asyncStatus: %d\n"
msgstr " ȭ: %d\n"
-#: fe-exec.c:1388
+#: fe-exec.c:1616
+#, c-format
+msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
+msgstr "PGEVT_RESULTCREATE ̺Ʈ PGEventProc \"%s\" \n"
+
+#: fe-exec.c:1746
msgid "COPY terminated by new PQexec"
msgstr " PQexec ȣ COPY ۾ Ǿϴ"
-#: fe-exec.c:1396
+#: fe-exec.c:1754
msgid "COPY IN state must be terminated first\n"
msgstr "COPY IN ° \n"
-#: fe-exec.c:1416
+#: fe-exec.c:1774
msgid "COPY OUT state must be terminated first\n"
msgstr "COPY OUT ° \n"
-#: fe-exec.c:1658 fe-exec.c:1723 fe-exec.c:1808 fe-protocol2.c:1172
-#: fe-protocol3.c:1486
+#: fe-exec.c:2016 fe-exec.c:2082 fe-exec.c:2167 fe-protocol2.c:1172
+#: fe-protocol3.c:1557
msgid "no COPY in progress\n"
msgstr "ó  COPY \n"
-#: fe-exec.c:2000
+#: fe-exec.c:2359
msgid "connection in wrong state\n"
msgstr "߸ \n"
-#: fe-exec.c:2031
+#: fe-exec.c:2390
msgid "invalid ExecStatusType code"
msgstr "߸ ExecStatusType ڵ"
-#: fe-exec.c:2095 fe-exec.c:2118
+#: fe-exec.c:2454 fe-exec.c:2477
#, c-format
msgid "column number %d is out of range 0..%d"
-msgstr "%d ° ÷ 0..%d "
+msgstr "%d ° 0..%d "
-#: fe-exec.c:2111
+#: fe-exec.c:2470
#, c-format
msgid "row number %d is out of range 0..%d"
-msgstr "%d ° ο(row) 0..%d "
+msgstr "%d ° (row) 0..%d "
-#: fe-exec.c:2133
+#: fe-exec.c:2492
#, c-format
msgid "parameter number %d is out of range 0..%d"
-msgstr "%d ڴ 0..%d "
+msgstr "%d Ű 0..%d "
-#: fe-exec.c:2420
+#: fe-exec.c:2779
#, c-format
msgid "could not interpret result from server: %s"
msgstr "κ ó ų : %s"
-#: fe-exec.c:2659
+#: fe-exec.c:3018
msgid "incomplete multibyte character\n"
msgstr "ϼ ƼƮ \n"
-#: fe-lobj.c:325
+#: fe-lobj.c:152
+msgid "cannot determine OID of function lo_truncate\n"
+msgstr "lo_truncate Լ OID \n"
+
+#: fe-lobj.c:380
msgid "cannot determine OID of function lo_create\n"
msgstr "lo_create Լ OID 縦 \n"
-#: fe-lobj.c:449 fe-lobj.c:544
+#: fe-lobj.c:525 fe-lobj.c:624
#, c-format
msgid "could not open file \"%s\": %s\n"
msgstr "\"%s\" : %s\n"
-#: fe-lobj.c:495
+#: fe-lobj.c:575
#, c-format
msgid "could not read from file \"%s\": %s\n"
msgstr "\"%s\" : %s\n"
-#: fe-lobj.c:559 fe-lobj.c:583
+#: fe-lobj.c:639 fe-lobj.c:663
#, c-format
msgid "could not write to file \"%s\": %s\n"
msgstr "\"%s\" : %s\n"
-#: fe-lobj.c:662
+#: fe-lobj.c:744
msgid "query to initialize large object functions did not return data\n"
msgstr "large object function ʱȭ ϴ ͸ ʾ\n"
-#: fe-lobj.c:702
+#: fe-lobj.c:785
msgid "cannot determine OID of function lo_open\n"
msgstr "lo_open Լ OID 縦 \n"
-#: fe-lobj.c:709
+#: fe-lobj.c:792
msgid "cannot determine OID of function lo_close\n"
msgstr "lo_close Լ OID 縦 \n"
-#: fe-lobj.c:716
+#: fe-lobj.c:799
msgid "cannot determine OID of function lo_creat\n"
msgstr "lo_create Լ OID 縦 \n"
-#: fe-lobj.c:723
+#: fe-lobj.c:806
msgid "cannot determine OID of function lo_unlink\n"
msgstr "lo_unlink Լ OID 縦 \n"
-#: fe-lobj.c:730
+#: fe-lobj.c:813
msgid "cannot determine OID of function lo_lseek\n"
msgstr "lo_lseek Լ OID 縦 \n"
-#: fe-lobj.c:737
+#: fe-lobj.c:820
msgid "cannot determine OID of function lo_tell\n"
msgstr "lo_tell Լ OID 縦 \n"
-#: fe-lobj.c:744
+#: fe-lobj.c:827
msgid "cannot determine OID of function loread\n"
msgstr "loread Լ OID 縦 \n"
-#: fe-lobj.c:751
+#: fe-lobj.c:834
msgid "cannot determine OID of function lowrite\n"
msgstr "lowrite Լ OID 縦 \n"
-#: fe-misc.c:227
+#: fe-misc.c:262
#, c-format
msgid "integer of size %lu not supported by pqGetInt"
msgstr "%lu ũ pqGetInt Լ "
-#: fe-misc.c:263
+#: fe-misc.c:298
#, c-format
msgid "integer of size %lu not supported by pqPutInt"
msgstr "%lu ũ pqPutInt Լ "
-#: fe-misc.c:543 fe-misc.c:745
+#: fe-misc.c:578 fe-misc.c:780
msgid "connection not open\n"
msgstr " \n"
-#: fe-misc.c:608 fe-misc.c:698
+#: fe-misc.c:643 fe-misc.c:733
#, c-format
msgid "could not receive data from server: %s\n"
msgstr "κ ͸ : %s\n"
-#: fe-misc.c:715 fe-misc.c:783
+#: fe-misc.c:750 fe-misc.c:828
msgid ""
"server closed the connection unexpectedly\n"
"\tThis probably means the server terminated abnormally\n"
@@ -427,20 +483,20 @@ msgstr ""
"\t̷ ó Ŭ̾Ʈ 䱸 óϴ ̳\n"
"\tóϱ ڱ Ǿ ǹ\n"
-#: fe-misc.c:800
+#: fe-misc.c:845
#, c-format
msgid "could not send data to server: %s\n"
msgstr " ͸ : %s\n"
-#: fe-misc.c:919
+#: fe-misc.c:964
msgid "timeout expired\n"
msgstr "ð ʰ\n"
-#: fe-misc.c:964
+#: fe-misc.c:1009
msgid "socket not open\n"
msgstr "Ĺ \n"
-#: fe-misc.c:987
+#: fe-misc.c:1032
#, c-format
msgid "select() failed: %s\n"
msgstr "select() : %s\n"
@@ -455,7 +511,7 @@ msgstr "߸ ȯ溯 %c, ޸ ջ ɼ ŭ\n"
msgid "invalid state %c, probably indicative of memory corruption\n"
msgstr "߸ %c, ޸ ջ ɼ ŭ\n"
-#: fe-protocol2.c:419 fe-protocol3.c:185
+#: fe-protocol2.c:419 fe-protocol3.c:186
#, c-format
msgid "message type 0x%02x arrived from server while idle"
msgstr "(idle) 0x%02x ޽ ޾"
@@ -470,26 +526,26 @@ msgid ""
"server sent data (\"D\" message) without prior row description (\"T\" "
"message)"
msgstr ""
-" ο(row) (\"T\" ޽) ڷ(\"D\" ޽) "
+" (row) (\"T\" ޽) ڷ(\"D\" ޽) "
#: fe-protocol2.c:532
msgid ""
"server sent binary data (\"B\" message) without prior row description (\"T\" "
"message)"
msgstr ""
-" ο(row) (\"T\" ޽) ڷ(\"B\" ޽) "
-""
+" (row) (\"T\" ޽) ̳ʸ ڷ(\"B\" ޽) "
+""
-#: fe-protocol2.c:547 fe-protocol3.c:376
+#: fe-protocol2.c:547 fe-protocol3.c:382
#, c-format
msgid "unexpected response from server; first received character was \"%c\"\n"
msgstr "κ ġ ޾; \"%c\" ڸ ùڷ ޾\n"
-#: fe-protocol2.c:768 fe-protocol3.c:695
+#: fe-protocol2.c:768 fe-protocol3.c:701
msgid "out of memory for query result\n"
msgstr " ó ޸ \n"
-#: fe-protocol2.c:1215 fe-protocol3.c:1554
+#: fe-protocol2.c:1215 fe-protocol3.c:1625
#, c-format
msgid "%s"
msgstr "%s"
@@ -498,204 +554,223 @@ msgstr "%s"
msgid "lost synchronization with server, resetting connection"
msgstr " ȭ , õ"
-#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1756
+#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1828
#, c-format
msgid "protocol error: id=0x%x\n"
msgstr " : id=0x%x\n"
-#: fe-protocol3.c:338
+#: fe-protocol3.c:344
msgid ""
"server sent data (\"D\" message) without prior row description (\"T\" "
"message)\n"
msgstr ""
-" ο(row) (\"T\" ޽) ڷ(\"D\" ޽) \n"
+" (row) (\"T\" ޽) ڷ(\"D\" ޽) \n"
-#: fe-protocol3.c:397
+#: fe-protocol3.c:403
#, c-format
msgid "message contents do not agree with length in message type \"%c\"\n"
msgstr "޽ \"%c\" ޽ ̸ \n"
-#: fe-protocol3.c:418
+#: fe-protocol3.c:424
#, c-format
msgid "lost synchronization with server: got message type \"%c\", length %d\n"
msgstr " ȭ : \"%c\" %d ޽ \n"
-#: fe-protocol3.c:640
+#: fe-protocol3.c:646
msgid "unexpected field count in \"D\" message\n"
msgstr "\"D\" ޽ ġ \n"
#. translator: %s represents a digit string
-#: fe-protocol3.c:782 fe-protocol3.c:801
+#: fe-protocol3.c:788 fe-protocol3.c:807
#, c-format
msgid " at character %s"
msgstr " ġ: %s"
-#: fe-protocol3.c:814
+#: fe-protocol3.c:820
#, c-format
msgid "DETAIL: %s\n"
msgstr ": %s\n"
-#: fe-protocol3.c:817
+#: fe-protocol3.c:823
#, c-format
msgid "HINT: %s\n"
msgstr "Ʈ: %s\n"
-#: fe-protocol3.c:820
+#: fe-protocol3.c:826
#, c-format
msgid "QUERY: %s\n"
msgstr ": %s\n"
-#: fe-protocol3.c:823
+#: fe-protocol3.c:829
#, c-format
msgid "CONTEXT: %s\n"
msgstr ": %s\n"
-#: fe-protocol3.c:835
+#: fe-protocol3.c:841
msgid "LOCATION: "
msgstr "ġ: "
-#: fe-protocol3.c:837
+#: fe-protocol3.c:843
#, c-format
msgid "%s, "
msgstr "%s, "
-#: fe-protocol3.c:839
+#: fe-protocol3.c:845
#, c-format
msgid "%s:%s"
msgstr "%s:%s"
-#: fe-protocol3.c:1064
+#: fe-protocol3.c:1069
#, c-format
msgid "LINE %d: "
msgstr " %d: "
-#: fe-protocol3.c:1372
+#: fe-protocol3.c:1453
msgid "PQgetline: not doing text COPY OUT\n"
msgstr "PQgetline: text COPY OUT ۾ \n"
-#: fe-secure.c:212
+#: fe-secure.c:241
#, c-format
msgid "could not establish SSL connection: %s\n"
msgstr "SSL Ȯ : %s\n"
-#: fe-secure.c:283 fe-secure.c:379 fe-secure.c:869
+#: fe-secure.c:318 fe-secure.c:403 fe-secure.c:1140
#, c-format
msgid "SSL SYSCALL error: %s\n"
msgstr "SSL SYSCALL : %s\n"
-#: fe-secure.c:288 fe-secure.c:385 fe-secure.c:873
+#: fe-secure.c:324 fe-secure.c:409 fe-secure.c:1144
msgid "SSL SYSCALL error: EOF detected\n"
msgstr "SSL SYSCALL : EOF \n"
-#: fe-secure.c:300 fe-secure.c:396 fe-secure.c:892
+#: fe-secure.c:336 fe-secure.c:420 fe-secure.c:1163
#, c-format
msgid "SSL error: %s\n"
msgstr "SSL : %s\n"
-#: fe-secure.c:310 fe-secure.c:406 fe-secure.c:902
+#: fe-secure.c:346 fe-secure.c:430 fe-secure.c:1173
#, c-format
msgid "unrecognized SSL error code: %d\n"
msgstr " SSL ڵ: %d\n"
-#: fe-secure.c:476
-#, c-format
-msgid "error querying socket: %s\n"
-msgstr " : %s\n"
-
-#: fe-secure.c:503
-#, c-format
-msgid "could not get information about host \"%s\": %s\n"
-msgstr "\"%s\" ȣƮ : %s\n"
-
-#: fe-secure.c:522
-msgid "unsupported protocol\n"
-msgstr " ʴ \n"
+#: fe-secure.c:539
+#, fuzzy
+msgid "host name must be specified for a verified SSL connection\n"
+msgstr "ȣƮ ̸ ؾ \n"
-#: fe-secure.c:544
-#, c-format
-msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+#: fe-secure.c:558
+#, fuzzy, c-format
+msgid "server common name \"%s\" does not match host name \"%s\"\n"
msgstr ""
-"\"%s\" Ϲ ̸ %ld.%ld.%ld.%ld ּҷ մϴ.\n"
-
-#: fe-secure.c:551
-#, c-format
-msgid "server common name \"%s\" does not resolve to peer address\n"
-msgstr "\"%s\" Ϲ ̸ peer ּҷ մϴ\n"
+" Ϲ ̸ \"%s\"() ȣƮ ̸ \"%s\"() ġ "
-#: fe-secure.c:584
-msgid "could not get user information\n"
-msgstr " \n"
+#: fe-secure.c:600
+msgid "could not get home directory to locate client certificate files"
+msgstr "Ŭ̾Ʈ ã ִ Ȩ ͸ "
-#: fe-secure.c:593
+#: fe-secure.c:624 fe-secure.c:638
#, c-format
msgid "could not open certificate file \"%s\": %s\n"
msgstr "\"%s\" : %s\n"
-#: fe-secure.c:602
+#: fe-secure.c:649
#, c-format
msgid "could not read certificate file \"%s\": %s\n"
msgstr "\"%s\" : %s\n"
-#: fe-secure.c:615
+#: fe-secure.c:687
+#, c-format
+msgid "could not load SSL engine \"%s\": %s\n"
+msgstr "SSL \"%s\"() ε : %s\n"
+
+#: fe-secure.c:700
+#, c-format
+msgid "could not initialize SSL engine \"%s\": %s\n"
+msgstr "SSL \"%s\"() ʱȭ : %s\n"
+
+#: fe-secure.c:717
+#, c-format
+msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr " SSL Ű \"%s\"() \"%s\" : %s\n"
+
+#: fe-secure.c:752
#, c-format
msgid "certificate present, but not private key file \"%s\"\n"
msgstr " , \"%s\" Ű ƴմϴ.\n"
-#: fe-secure.c:624
+#: fe-secure.c:761
#, c-format
-msgid "private key file \"%s\" has wrong permissions\n"
-msgstr "\"%s\" Ű ٱ ߸Ǿֽϴ\n"
+msgid ""
+"private key file \"%s\" has group or world access; permissions should be "
+"u=rw (0600) or less\n"
+msgstr ""
+" Ű \"%s\" ׷ Ǵ ׼ ֽϴ. u=rw"
+"(0600) Ͽ մϴ.\n"
-#: fe-secure.c:632
+#: fe-secure.c:771
#, c-format
msgid "could not open private key file \"%s\": %s\n"
msgstr "\"%s\" Ű : %s\n"
-#: fe-secure.c:641
+#: fe-secure.c:782
#, c-format
msgid "private key file \"%s\" changed during execution\n"
msgstr "óϴ \"%s\" Ű Ǿϴ\n"
-#: fe-secure.c:650
+#: fe-secure.c:793
#, c-format
msgid "could not read private key file \"%s\": %s\n"
msgstr "\"%s\" Ű : %s\n"
-#: fe-secure.c:664
+#: fe-secure.c:811
#, c-format
msgid "certificate does not match private key file \"%s\": %s\n"
msgstr " \"%s\" Ű ϰ ʽϴ: %s\n"
-#: fe-secure.c:750
+#: fe-secure.c:942
#, c-format
msgid "could not create SSL context: %s\n"
msgstr "SSL context : %s\n"
-#: fe-secure.c:791
+#: fe-secure.c:1030
+msgid "could not get home directory to locate root certificate file"
+msgstr "Ʈ ã ִ Ȩ ͸ "
+
+#: fe-secure.c:1054
#, c-format
msgid "could not read root certificate file \"%s\": %s\n"
msgstr "\"%s\" Ʈ : %s\n"
-#: fe-secure.c:811
+#: fe-secure.c:1079
#, c-format
msgid "SSL library does not support CRL certificates (file \"%s\")\n"
msgstr "SSL ̺귯 CRL (\"%s\" ) \n"
-#: fe-secure.c:922
+#: fe-secure.c:1095
#, c-format
-msgid "certificate could not be validated: %s\n"
-msgstr " Ÿġ մϴ: %s\n"
+msgid ""
+"root certificate file \"%s\" does not exist\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"Ʈ \"%s\"() ϴ.\n"
+"ش ϰų Ȯ ʵ sslmode Ͻ"
+"ÿ.\n"
-#: fe-secure.c:936
+#: fe-secure.c:1192
#, c-format
msgid "certificate could not be obtained: %s\n"
msgstr " ߽ϴ: %s\n"
-#: fe-secure.c:1016
+#: fe-secure.c:1220
+msgid "SSL certificate's common name contains embedded null\n"
+msgstr "SSL Ϲ ̸ Ե null \n"
+
+#: fe-secure.c:1294
msgid "no SSL error reported"
msgstr "SSL "
-#: fe-secure.c:1026
+#: fe-secure.c:1303
#, c-format
msgid "SSL error code %lu"
msgstr "SSL ȣ %lu"
diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po
index 8d1338cac4e..8f15a11c5d3 100644
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
@@ -1,12 +1,13 @@
# ru.po
-# LIBPQ Translated Messages into the Russian Language (KOI8-R)
+# LIBPQ Translated Messages into the Russian Language (UTF-8)
#
# Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
# Distributed under the same licensing terms as PostgreSQL itself.
#
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/ru.po,v 1.19 2007/10/27 00:13:43 petere Exp $
+# pgtranslation Id: libpq.po,v 1.4 2010/12/07 21:22:21 petere Exp $
#
# ChangeLog:
+# - November, 2010: Updates for PostgreSQL 9 by Andrey Sudnik <sudnikand@yandex.ru>
# - January, 2005: Corrections and improvements by Oleg Bartunov <oleg@sai.msu.su>
# - March 27 - November 1, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
# - July 24 - October 5, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca>
@@ -17,812 +18,948 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-16 15:21-0300\n"
-"PO-Revision-Date: 2007-09-17 10:06+0500\n"
-"Last-Translator: Andrey S. Zevakin <azevakin@gmail.com>\n"
-"Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
+"Project-Id-Version: PostgreSQL 9 current\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2010-11-29 18:43+0000\n"
+"PO-Revision-Date: 2010-11-30 20:14+0600\n"
+"Last-Translator: Andrey Sudnik <sudnikand@yandex.ru>\n"
+"Language-Team: pgsql-rus\n"
+"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=koi8-r\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Russian\n"
"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
-#: fe-auth.c:268
+#: fe-auth.c:212
+#: fe-auth.c:432
+#: fe-auth.c:659
+msgid "host name must be specified\n"
+msgstr "должно быть указано имя хоста\n"
+
+#: fe-auth.c:242
#, c-format
msgid "could not set socket to blocking mode: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось установить сокет в блокирующий режим: %s\n"
-#: fe-auth.c:286
-#: fe-auth.c:290
+#: fe-auth.c:260
+#: fe-auth.c:264
#, c-format
msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr " Kerberos 5 : %*s\n"
+msgstr "аутентификация Kerberos 5 отклонена: %*s\n"
-#: fe-auth.c:316
+#: fe-auth.c:290
#, c-format
msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось восстановить неблокирующий режим для сокета: %s\n"
-#: fe-auth.c:439
+#: fe-auth.c:403
msgid "GSSAPI continuation error"
-msgstr ""
+msgstr "GSSAPI ошибка возобновления"
-#: fe-auth.c:467
-msgid "duplicate GSS auth request\n"
-msgstr ""
+#: fe-auth.c:439
+msgid "duplicate GSS authentication request\n"
+msgstr "повторный запрос аутентификации GSS\n"
-#: fe-auth.c:487
+#: fe-auth.c:459
msgid "GSSAPI name import error"
-msgstr ""
+msgstr "GSSAPI ошибка импорта имени"
-#: fe-auth.c:573
+#: fe-auth.c:545
msgid "SSPI continuation error"
-msgstr ""
-
-#: fe-auth.c:584
-#: fe-auth.c:649
-#: fe-auth.c:675
-#: fe-auth.c:772
-#: fe-connect.c:1299
-#: fe-connect.c:2532
-#: fe-connect.c:2749
-#: fe-connect.c:3078
-#: fe-connect.c:3087
-#: fe-connect.c:3224
-#: fe-connect.c:3264
-#: fe-connect.c:3282
-#: fe-exec.c:2751
-#: fe-lobj.c:669
+msgstr "SSPI ошибка возобновления"
+
+#: fe-auth.c:556
+#: fe-auth.c:630
+#: fe-auth.c:665
+#: fe-auth.c:762
+#: fe-connect.c:1970
+#: fe-connect.c:3369
+#: fe-connect.c:3586
+#: fe-connect.c:4002
+#: fe-connect.c:4011
+#: fe-connect.c:4148
+#: fe-connect.c:4194
+#: fe-connect.c:4212
+#: fe-connect.c:4291
+#: fe-connect.c:4361
+#: fe-connect.c:4407
+#: fe-connect.c:4425
+#: fe-exec.c:3121
+#: fe-exec.c:3286
+#: fe-lobj.c:696
#: fe-protocol2.c:1027
-#: fe-protocol3.c:1330
+#: fe-protocol3.c:1425
msgid "out of memory\n"
-msgstr " \n"
+msgstr "недостаточно памяти\n"
-#: fe-auth.c:669
-msgid "hostname must be specified\n"
-msgstr ""
+#: fe-auth.c:645
+msgid "could not acquire SSPI credentials"
+msgstr "не удалось получить SSPI удостоверение"
-#: fe-auth.c:748
+#: fe-auth.c:738
msgid "SCM_CRED authentication method not supported\n"
-msgstr " SCM_CRED \n"
+msgstr "аутентификация SCM_CRED не поддерживается\n"
-#: fe-auth.c:830
+#: fe-auth.c:812
msgid "Kerberos 4 authentication not supported\n"
-msgstr " Kerberos 4 \n"
+msgstr "аутентификация Kerberos 4 не поддерживается\n"
-#: fe-auth.c:846
+#: fe-auth.c:828
msgid "Kerberos 5 authentication not supported\n"
-msgstr " Kerberos 5 \n"
+msgstr "аутентификация Kerberos 5 не поддерживается\n"
-#: fe-auth.c:910
+#: fe-auth.c:895
msgid "GSSAPI authentication not supported\n"
-msgstr " GSSAPI \n"
+msgstr "аутентификация GSSAPI не поддерживается\n"
-#: fe-auth.c:933
+#: fe-auth.c:919
msgid "SSPI authentication not supported\n"
-msgstr " SSPI \n"
+msgstr "аутентификация SSPI не поддерживается\n"
-#: fe-auth.c:962
+#: fe-auth.c:926
+msgid "Crypt authentication not supported\n"
+msgstr "Шифрованая аутентификация не поддерживается\n"
+
+#: fe-auth.c:953
#, c-format
msgid "authentication method %u not supported\n"
-msgstr " %u \n"
+msgstr "метод аутентификации %u не поддерживается\n"
-#: fe-connect.c:496
+#: fe-connect.c:759
#, c-format
msgid "invalid sslmode value: \"%s\"\n"
-msgstr " sslmode: \"%s\"\n"
+msgstr "неверное значение sslmode: \"%s\"\n"
-#: fe-connect.c:516
+#: fe-connect.c:780
#, c-format
msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
-msgstr " sslmode \"%s\" , SSL \n"
+msgstr "значение sslmode \"%s\" неверно, если поддержка SSL не скомпилирована\n"
-#: fe-connect.c:695
+#: fe-connect.c:963
#, c-format
msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr " TCP : %s\n"
+msgstr "не удалось установить сокет в режим TCP передачи без задержки: %s\n"
-#: fe-connect.c:725
+#: fe-connect.c:993
#, c-format
msgid ""
"could not connect to server: %s\n"
"\tIs the server running locally and accepting\n"
"\tconnections on Unix domain socket \"%s\"?\n"
msgstr ""
-" : %s\n"
-"\t \n"
-"\t Unix- \"%s\"?\n"
+"не удалось соединиться с сервером: %s\n"
+"\tРаботает ли сервер локально и принимает\n"
+"\tсоединения через сокет Unix-домена \"%s\"?\n"
-#: fe-connect.c:735
+#: fe-connect.c:1037
#, c-format
msgid ""
"could not connect to server: %s\n"
-"\tIs the server running on host \"%s\" and accepting\n"
+"\tIs the server running on host \"%s\"%s%s%s and accepting\n"
"\tTCP/IP connections on port %s?\n"
msgstr ""
-" : %s\n"
-"\t \"%s\" \n"
-"\tTCP/IP %s?\n"
+"не удалось подсоединиться к серверу: %s\n"
+"\tРаботает ли сервер на хосте \"%s\"%s%s%s и принимает ли\n"
+"\tTCP/IP соединения по порту %s?\n"
+
+#: fe-connect.c:1096
+#, c-format
+msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPIDLE) не удался: %s\n"
+
+#: fe-connect.c:1109
+#, c-format
+msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPALIVE) не удался: %s\n"
+
+#: fe-connect.c:1141
+#, c-format
+msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPINTVL) не удался: %s\n"
+
+#: fe-connect.c:1173
+#, c-format
+msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
+msgstr "setsockopt(TCP_KEEPCNT) не удался: %s\n"
-#: fe-connect.c:825
+#: fe-connect.c:1222
+#, c-format
+msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
+msgstr "WSAIoctl(SIO_KEEPALIVE_VALS) потерпел неудачу: %ui\n"
+
+#: fe-connect.c:1274
+#, c-format
+msgid "invalid port number: \"%s\"\n"
+msgstr "неверный номер порта: \"%s\"\n"
+
+#: fe-connect.c:1317
#, c-format
msgid "could not translate host name \"%s\" to address: %s\n"
-msgstr " \"%s\" : %s\n"
+msgstr "не удалось преобразовать имя хоста \"%s\" в адрес: %s\n"
-#: fe-connect.c:829
+#: fe-connect.c:1321
#, c-format
msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
-msgstr " UNIX- \"%s\" : %s\n"
+msgstr "не удалось преобразовать название директории сокетов UNIX-домена \"%s\" в адрес: %s\n"
-#: fe-connect.c:1030
+#: fe-connect.c:1531
msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr " , \n"
+msgstr "неверное состояние соединения, возможный указатель на нарушение целостности памяти\n"
-#: fe-connect.c:1073
+#: fe-connect.c:1572
#, c-format
msgid "could not create socket: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось создать сокет: %s\n"
-#: fe-connect.c:1096
+#: fe-connect.c:1595
#, c-format
msgid "could not set socket to non-blocking mode: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось установить сокет в неблокирующий режим: %s\n"
-#: fe-connect.c:1108
+#: fe-connect.c:1607
#, c-format
msgid "could not set socket to close-on-exec mode: %s\n"
-msgstr " -- (close-on-exec): %s\n"
+msgstr "не удалось установить сокет в режим закрытия-на-выполнение (close-on-exec): %s\n"
+
+#: fe-connect.c:1625
+msgid "keepalives parameter must be an integer\n"
+msgstr "keepalives параметр должен быть целым числом\n"
-#: fe-connect.c:1195
+#: fe-connect.c:1638
+#, c-format
+msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
+msgstr "setsockopt(SO_KEEPALIVE) не удался: %s\n"
+
+#: fe-connect.c:1779
#, c-format
msgid "could not get socket error status: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось получить статус ошибки сокета: %s\n"
-#: fe-connect.c:1233
+#: fe-connect.c:1817
#, c-format
msgid "could not get client address from socket: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось получить адрес клиента из сокета: %s\n"
+
+#: fe-connect.c:1849
+#: fe-connect.c:1863
+#: fe-connect.c:1875
+#, c-format
+msgid "could not get peer credentials: %s\n"
+msgstr "не удалось получить удостоверение peer-a: %s\n"
+
+#: fe-connect.c:1883
+#, c-format
+msgid "could not get effective UID from peer credentials: %s\n"
+msgstr "не удалось получить эффективный UID из удостоверения peer-а: %s\n"
+
+#: fe-connect.c:1898
+#, c-format
+msgid "local user with ID %d does not exist\n"
+msgstr "локальный пользователь с ID %d не существует\n"
-#: fe-connect.c:1277
+#: fe-connect.c:1906
+#, c-format
+msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
+msgstr "requirepeer задан как \"%s\", но настоящее имя пользователя peer-а \"%s\"\n"
+
+#: fe-connect.c:1912
+msgid "requirepeer parameter is not supported on this platform\n"
+msgstr "параметр requirepeer не поддерживаются на этой платформе\n"
+
+#: fe-connect.c:1944
#, c-format
msgid "could not send SSL negotiation packet: %s\n"
-msgstr " SSL: %s\n"
+msgstr "не удалось отправить пакет согласования SSL: %s\n"
-#: fe-connect.c:1312
+#: fe-connect.c:1983
#, c-format
msgid "could not send startup packet: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось отправить начальный пакет: %s\n"
-#: fe-connect.c:1377
-#: fe-connect.c:1394
+#: fe-connect.c:2050
+#: fe-connect.c:2069
msgid "server does not support SSL, but SSL was required\n"
-msgstr " SSL, SSL \n"
+msgstr "сервер не поддерживает SSL, но наличие SSL было необходимо\n"
-#: fe-connect.c:1410
+#: fe-connect.c:2085
#, c-format
msgid "received invalid response to SSL negotiation: %c\n"
-msgstr " SSL: %c\n"
+msgstr "получен неверный ответ на согласование по SSL: %c\n"
-#: fe-connect.c:1486
-#: fe-connect.c:1519
+#: fe-connect.c:2161
+#: fe-connect.c:2194
#, c-format
msgid "expected authentication request from server, but received %c\n"
-msgstr " , : %c\n"
+msgstr "ожидался запрос аутентификации от сервера, но было получено: %c\n"
-#: fe-connect.c:1696
+#: fe-connect.c:2367
#, c-format
msgid "out of memory allocating GSSAPI buffer (%i)"
-msgstr ""
+msgstr "недостаточно памяти для аллоцирования GSSAPI буфера (%i)"
-#: fe-connect.c:1785
+#: fe-connect.c:2452
msgid "unexpected message from server during startup\n"
-msgstr " \n"
+msgstr "неожиданное сообщение от сервера при запуске\n"
-#: fe-connect.c:1853
+#: fe-connect.c:2548
+#, c-format
+msgid "invalid connection state %d, probably indicative of memory corruption\n"
+msgstr "неверное состояние соединения %d, возможно, это признак нарушения целостности памяти\n"
+
+#: fe-connect.c:2977
+#: fe-connect.c:3037
#, c-format
-msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr " %c, \n"
+msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
+msgstr "PGEventProc \"%s\" потерпел неудачу во время события PGEVT_CONNRESET\n"
-#: fe-connect.c:2545
+#: fe-connect.c:3382
#, c-format
msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
-msgstr ""
+msgstr "некорректный LDAP URL \"%s\": схема должна быть ldap://\n"
-#: fe-connect.c:2560
+#: fe-connect.c:3397
#, c-format
msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
-msgstr ""
+msgstr "не корректный LDAP URL \"%s\": отсутствует уникальное имя\n"
-#: fe-connect.c:2571
-#: fe-connect.c:2624
+#: fe-connect.c:3408
+#: fe-connect.c:3461
#, c-format
msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
-msgstr ""
+msgstr "не корректный LDAP URL \"%s\": должен быть только один аттрибут\n"
-#: fe-connect.c:2581
-#: fe-connect.c:2638
+#: fe-connect.c:3418
+#: fe-connect.c:3475
#, c-format
msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
-msgstr ""
+msgstr "не корректный LDAP URL \"%s\": должна быть границы поиска (base/one/sub)\n"
-#: fe-connect.c:2592
+#: fe-connect.c:3429
#, c-format
msgid "invalid LDAP URL \"%s\": no filter\n"
-msgstr ""
+msgstr "не корректный LDAP URL \"%s\": нет фильтра\n"
-#: fe-connect.c:2613
+#: fe-connect.c:3450
#, c-format
msgid "invalid LDAP URL \"%s\": invalid port number\n"
-msgstr ""
+msgstr "не корректный LDAP URL \"%s\": неверный номер порта\n"
-#: fe-connect.c:2647
-#, fuzzy
+#: fe-connect.c:3484
msgid "could not create LDAP structure\n"
-msgstr " SSL: %s\n"
+msgstr "не удалось создать LDAP структуру\n"
-#: fe-connect.c:2689
+#: fe-connect.c:3526
#, c-format
msgid "lookup on LDAP server failed: %s\n"
-msgstr ""
+msgstr "поиск на LDAP сервере закончился неудачно: %s\n"
-#: fe-connect.c:2700
+#: fe-connect.c:3537
msgid "more than one entry found on LDAP lookup\n"
-msgstr ""
+msgstr "более одного вхождения обнаружено при LDAP поиске\n"
-#: fe-connect.c:2701
-#: fe-connect.c:2713
+#: fe-connect.c:3538
+#: fe-connect.c:3550
msgid "no entry found on LDAP lookup\n"
-msgstr ""
+msgstr "ни одного вхождения не обнаружено при LDAP поиске\n"
-#: fe-connect.c:2724
-#: fe-connect.c:2737
+#: fe-connect.c:3561
+#: fe-connect.c:3574
msgid "attribute has no values on LDAP lookup\n"
-msgstr ""
+msgstr "аттрибут не имеет значения при LDAP поиске\n"
-#: fe-connect.c:2788
-#: fe-connect.c:2806
-#: fe-connect.c:3126
+#: fe-connect.c:3625
+#: fe-connect.c:3643
+#: fe-connect.c:4050
#, c-format
msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr " \"=\" \"%s\" \n"
+msgstr "отсутствует \"=\" после \"%s\" в строке соединения\n"
-#: fe-connect.c:2869
-#: fe-connect.c:3208
+#: fe-connect.c:3706
+#: fe-connect.c:4132
+#: fe-connect.c:4316
#, c-format
msgid "invalid connection option \"%s\"\n"
-msgstr " \"%s\"\n"
+msgstr "неверный параметр соединения \"%s\"\n"
-#: fe-connect.c:2882
-#: fe-connect.c:3175
+#: fe-connect.c:3719
+#: fe-connect.c:4099
msgid "unterminated quoted string in connection info string\n"
-msgstr " ( ) \n"
+msgstr "неоконченная строка (не хватает кавычки) в строке соединения\n"
+
+#: fe-connect.c:3758
+msgid "could not get home directory to locate service definition file"
+msgstr "не удалось получить домашнюю директорию, чтобы найти файл со служебными определениями"
-#: fe-connect.c:2925
+#: fe-connect.c:3791
#, c-format
-msgid "ERROR: service file \"%s\" not found\n"
-msgstr ""
+msgid "definition of service \"%s\" not found\n"
+msgstr "определение сервиса \"%s\" не найдено\n"
-#: fe-connect.c:2938
+#: fe-connect.c:3814
#, c-format
-msgid "ERROR: line %d too long in service file \"%s\"\n"
-msgstr ""
+msgid "service file \"%s\" not found\n"
+msgstr "служебный файл \"%s\" не найден\n"
-#: fe-connect.c:3010
-#: fe-connect.c:3037
+#: fe-connect.c:3827
#, c-format
-msgid "ERROR: syntax error in service file \"%s\", line %d\n"
-msgstr ""
+msgid "line %d too long in service file \"%s\"\n"
+msgstr "строка %d слишком длинная в служебном файле \"%s\"\n"
-#: fe-connect.c:3450
+#: fe-connect.c:3898
+#: fe-connect.c:3925
+#, c-format
+msgid "syntax error in service file \"%s\", line %d\n"
+msgstr "синтаксическая ошибка в служебном файле \"%s\", строка %d\n"
+
+#: fe-connect.c:4592
msgid "connection pointer is NULL\n"
-msgstr " NULL\n"
+msgstr "указатель соединения является NULL\n"
-#: fe-connect.c:3724
-#, fuzzy, c-format
+#: fe-connect.c:4865
+#, c-format
msgid "WARNING: password file \"%s\" is not a plain file\n"
-msgstr ""
+msgstr "ВНИМАНИЕ: файл паролей \"%s\" не обычный текстовый файл\n"
+
+#: fe-connect.c:4874
+#, c-format
+msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
+msgstr "ВНИМАНИЕ: файл с паролями \"%s\" имеет права на чтение для всех или для группы; права должны быть u=rw (0600) или меньше\n"
-#: fe-connect.c:3734
+#: fe-connect.c:4962
#, c-format
-msgid "WARNING: password file \"%s\" has world or group read access; permission should be u=rw (0600)\n"
-msgstr ": \"%s\" ; u=rw (0600)\n"
+msgid "password retrieved from file \"%s\"\n"
+msgstr "пароль получен из файла \"%s\"\n"
-#: fe-exec.c:498
+#: fe-exec.c:827
msgid "NOTICE"
msgstr "NOTICE"
-#: fe-exec.c:682
-#: fe-exec.c:739
-#: fe-exec.c:779
+#: fe-exec.c:1014
+#: fe-exec.c:1071
+#: fe-exec.c:1111
msgid "command string is a null pointer\n"
-msgstr " \n"
+msgstr "командная строка является нулевым указателем\n"
-#: fe-exec.c:772
-#: fe-exec.c:867
+#: fe-exec.c:1104
+#: fe-exec.c:1199
msgid "statement name is a null pointer\n"
-msgstr " \n"
+msgstr "имя команды является нулевым указателем\n"
-#: fe-exec.c:787
-#: fe-exec.c:941
-#: fe-exec.c:1570
-#: fe-exec.c:1766
+#: fe-exec.c:1119
+#: fe-exec.c:1273
+#: fe-exec.c:1928
+#: fe-exec.c:2125
msgid "function requires at least protocol version 3.0\n"
-msgstr " 3.0\n"
+msgstr "функция требует как минимум версию протокола 3.0\n"
-#: fe-exec.c:898
+#: fe-exec.c:1230
msgid "no connection to the server\n"
-msgstr " \n"
+msgstr "нет соединения с сервером\n"
-#: fe-exec.c:905
+#: fe-exec.c:1237
msgid "another command is already in progress\n"
-msgstr " \n"
+msgstr "другая команда уже выполняется\n"
-#: fe-exec.c:1015
+#: fe-exec.c:1349
msgid "length must be given for binary parameter\n"
-msgstr ""
+msgstr "для бинарного параметра должа быть указана длина\n"
-#: fe-exec.c:1262
+#: fe-exec.c:1596
#, c-format
msgid "unexpected asyncStatus: %d\n"
-msgstr " asyncStatus: %d\n"
+msgstr "неожиданный asyncStatus: %d\n"
-#: fe-exec.c:1388
+#: fe-exec.c:1616
+#, c-format
+msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
+msgstr "PGEventProc \"%s\" порушился во время события PGEVT_RESULTCREATE\n"
+
+#: fe-exec.c:1746
msgid "COPY terminated by new PQexec"
-msgstr "COPY PQexec"
+msgstr "COPY прекращена новой PQexec"
-#: fe-exec.c:1396
+#: fe-exec.c:1754
msgid "COPY IN state must be terminated first\n"
-msgstr ", COPY IN \n"
+msgstr "Сначала, состояние COPY IN должно завершиться\n"
-#: fe-exec.c:1416
+#: fe-exec.c:1774
msgid "COPY OUT state must be terminated first\n"
-msgstr ", COPY OUT \n"
+msgstr "Сначала, состояние COPY OUT должно завершиться\n"
-#: fe-exec.c:1658
-#: fe-exec.c:1723
-#: fe-exec.c:1808
+#: fe-exec.c:2016
+#: fe-exec.c:2082
+#: fe-exec.c:2167
#: fe-protocol2.c:1172
-#: fe-protocol3.c:1486
+#: fe-protocol3.c:1561
msgid "no COPY in progress\n"
-msgstr "COPY \n"
+msgstr "COPY не выполняется\n"
-#: fe-exec.c:2000
+#: fe-exec.c:2359
msgid "connection in wrong state\n"
-msgstr " \n"
+msgstr "соединение в неправильном состоянии\n"
-#: fe-exec.c:2031
+#: fe-exec.c:2390
msgid "invalid ExecStatusType code"
-msgstr " ExecStatusType"
+msgstr "неверный код ExecStatusType"
-#: fe-exec.c:2095
-#: fe-exec.c:2118
+#: fe-exec.c:2454
+#: fe-exec.c:2477
#, c-format
msgid "column number %d is out of range 0..%d"
-msgstr " %d 0..%d"
+msgstr "номер колонки %d вне диапазона 0..%d"
-#: fe-exec.c:2111
+#: fe-exec.c:2470
#, c-format
msgid "row number %d is out of range 0..%d"
-msgstr " %d 0..%d"
+msgstr "номер записи %d вне диапазона 0..%d"
-#: fe-exec.c:2133
+#: fe-exec.c:2492
#, c-format
msgid "parameter number %d is out of range 0..%d"
-msgstr " %d 0..%d"
+msgstr "номер параметра %d вне диапазона 0..%d"
-#: fe-exec.c:2420
+#: fe-exec.c:2780
#, c-format
msgid "could not interpret result from server: %s"
-msgstr " : %s"
+msgstr "не в состоянии интерпретировать ответ сервера: %s"
-#: fe-exec.c:2659
+#: fe-exec.c:3019
+#: fe-exec.c:3103
msgid "incomplete multibyte character\n"
-msgstr ""
+msgstr "неполный мультибайтовый символ\n"
-#: fe-lobj.c:150
+#: fe-lobj.c:152
msgid "cannot determine OID of function lo_truncate\n"
-msgstr " OID lo_truncate\n"
+msgstr "не в состоянии определить OID функции lo_truncate\n"
-#: fe-lobj.c:378
+#: fe-lobj.c:380
msgid "cannot determine OID of function lo_create\n"
-msgstr " OID lo_create\n"
+msgstr "не в состоянии определить OID функции lo_create\n"
-#: fe-lobj.c:502
-#: fe-lobj.c:597
+#: fe-lobj.c:525
+#: fe-lobj.c:624
#, c-format
msgid "could not open file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не в состоянии открыть файл \"%s\": %s\n"
-#: fe-lobj.c:548
+#: fe-lobj.c:575
#, c-format
msgid "could not read from file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не в состоянии произвести чтение из файла \"%s\": %s\n"
-#: fe-lobj.c:612
-#: fe-lobj.c:636
+#: fe-lobj.c:639
+#: fe-lobj.c:663
#, c-format
msgid "could not write to file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не в состоянии призвести запись в файл \"%s\": %s\n"
-#: fe-lobj.c:717
+#: fe-lobj.c:744
msgid "query to initialize large object functions did not return data\n"
-msgstr " (LOs) \n"
+msgstr "запрос об инициализации функций для больших объектов (LOs) не вернул данных\n"
-#: fe-lobj.c:758
+#: fe-lobj.c:785
msgid "cannot determine OID of function lo_open\n"
-msgstr " OID lo_open\n"
+msgstr "не в состоянии определить OID функции lo_open\n"
-#: fe-lobj.c:765
+#: fe-lobj.c:792
msgid "cannot determine OID of function lo_close\n"
-msgstr " OID lo_close\n"
+msgstr "не в состоянии определить OID функции lo_close\n"
-#: fe-lobj.c:772
+#: fe-lobj.c:799
msgid "cannot determine OID of function lo_creat\n"
-msgstr " OID lo_creat\n"
+msgstr "не в состоянии определить OID функции lo_creat\n"
-#: fe-lobj.c:779
+#: fe-lobj.c:806
msgid "cannot determine OID of function lo_unlink\n"
-msgstr " OID lo_unlink\n"
+msgstr "не в состоянии определить OID функции lo_unlink\n"
-#: fe-lobj.c:786
+#: fe-lobj.c:813
msgid "cannot determine OID of function lo_lseek\n"
-msgstr " OID lo_lseek\n"
+msgstr "не в состоянии определить OID функции lo_lseek\n"
-#: fe-lobj.c:793
+#: fe-lobj.c:820
msgid "cannot determine OID of function lo_tell\n"
-msgstr " OID lo_tell\n"
+msgstr "не в состоянии определить OID функции lo_tell\n"
-#: fe-lobj.c:800
+#: fe-lobj.c:827
msgid "cannot determine OID of function loread\n"
-msgstr " OID loread\n"
+msgstr "не в состоянии определить OID функции loread\n"
-#: fe-lobj.c:807
+#: fe-lobj.c:834
msgid "cannot determine OID of function lowrite\n"
-msgstr " OID lowrite\n"
+msgstr "не в состоянии определить OID функции lowrite\n"
-#: fe-misc.c:227
+#: fe-misc.c:262
#, c-format
msgid "integer of size %lu not supported by pqGetInt"
-msgstr " integer %lu pqGetInt"
+msgstr "тип integer длиной %lu байт не поддерживается функцией pqGetInt"
-#: fe-misc.c:263
+#: fe-misc.c:298
#, c-format
msgid "integer of size %lu not supported by pqPutInt"
-msgstr " integer %lu pqPutInt"
+msgstr "тип integer длиной %lu байт не поддерживается функцией pqPutInt"
-#: fe-misc.c:543
-#: fe-misc.c:745
+#: fe-misc.c:578
+#: fe-misc.c:780
msgid "connection not open\n"
-msgstr " \n"
+msgstr "соединение не открыто\n"
-#: fe-misc.c:608
-#: fe-misc.c:698
+#: fe-misc.c:643
+#: fe-misc.c:733
#, c-format
msgid "could not receive data from server: %s\n"
-msgstr " : %s\n"
+msgstr "ошибка при получении данных с сервера: %s\n"
-#: fe-misc.c:715
-#: fe-misc.c:783
+#: fe-misc.c:750
+#: fe-misc.c:828
msgid ""
"server closed the connection unexpectedly\n"
"\tThis probably means the server terminated abnormally\n"
"\tbefore or while processing the request.\n"
msgstr ""
-" \n"
-"\t , \n"
-"\t .\n"
+"сервер неожиданно закрыл соединение\n"
+"\tСкорее всего это означает, что сервер завершил работу со сбоем\n"
+"\tдо или в процессе выполнения запроса.\n"
-#: fe-misc.c:800
+#: fe-misc.c:845
#, c-format
msgid "could not send data to server: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось послать данные серверу: %s\n"
-#: fe-misc.c:919
+#: fe-misc.c:964
msgid "timeout expired\n"
-msgstr " \n"
+msgstr "интервал ожидания закончился\n"
-#: fe-misc.c:964
+#: fe-misc.c:1009
msgid "socket not open\n"
-msgstr " \n"
+msgstr "сокет не открыт\n"
-#: fe-misc.c:987
+#: fe-misc.c:1032
#, c-format
msgid "select() failed: %s\n"
-msgstr "select() : %s\n"
+msgstr "select() не удался: %s\n"
#: fe-protocol2.c:89
#, c-format
msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr " setenv %c, \n"
+msgstr "неверное состояние setenv %c, возможный указатель на нарушение целостности памяти\n"
#: fe-protocol2.c:330
#, c-format
msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr " %c, \n"
+msgstr "неверное состояние %c, возможный указатель на нарушение целостности памяти\n"
#: fe-protocol2.c:419
-#: fe-protocol3.c:185
+#: fe-protocol3.c:186
#, c-format
msgid "message type 0x%02x arrived from server while idle"
-msgstr " 0x%02x "
+msgstr "сообщение типа 0x%02x прибыло от сервера во время простоя"
#: fe-protocol2.c:462
#, c-format
msgid "unexpected character %c following empty query response (\"I\" message)"
-msgstr " %c ( \"I\")"
+msgstr "неожиданный символ %c вслед за пустым ответом (сообщение \"I\")"
#: fe-protocol2.c:516
msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
-msgstr " ( \"D\") ( \"T\")"
+msgstr "сервер отправил данные (сообщение \"D\") без предварительного строки описания (сообщение \"T\")"
#: fe-protocol2.c:532
msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
-msgstr " ( \"B\") ( \"T\")"
+msgstr "сервер отправил двоичные данные (сообщение \"B\") без предварительного строки описания (сообщение \"T\")"
#: fe-protocol2.c:547
-#: fe-protocol3.c:376
+#: fe-protocol3.c:382
#, c-format
msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr " ; : \"%c\"\n"
+msgstr "неожиданный ответ сервера; первый полученный символ: \"%c\"\n"
#: fe-protocol2.c:768
-#: fe-protocol3.c:695
+#: fe-protocol3.c:701
msgid "out of memory for query result\n"
-msgstr " \n"
+msgstr "недостаточно памяти для результата запроса\n"
#: fe-protocol2.c:1215
-#: fe-protocol3.c:1554
+#: fe-protocol3.c:1629
#, c-format
msgid "%s"
msgstr "%s"
#: fe-protocol2.c:1227
msgid "lost synchronization with server, resetting connection"
-msgstr " ; "
+msgstr "потеряна синхронизация с сервером; переустановка соединения"
#: fe-protocol2.c:1361
#: fe-protocol2.c:1393
-#: fe-protocol3.c:1756
+#: fe-protocol3.c:1832
#, c-format
msgid "protocol error: id=0x%x\n"
-msgstr " : id=0x%x\n"
+msgstr "ошибка протокола: id=0x%x\n"
-#: fe-protocol3.c:338
+#: fe-protocol3.c:344
msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
-msgstr " ( \"D\") ( \"T\")\n"
+msgstr "сервер отправил данные (сообщение \"D\") без предварительного строки описания (сообщение \"T\")\n"
-#: fe-protocol3.c:397
+#: fe-protocol3.c:403
#, c-format
msgid "message contents do not agree with length in message type \"%c\"\n"
-msgstr " \"%c\"\n"
+msgstr "содержимое сообщения не согласуется с длиной в сообщении типа \"%c\"\n"
-#: fe-protocol3.c:418
+#: fe-protocol3.c:424
#, c-format
msgid "lost synchronization with server: got message type \"%c\", length %d\n"
-msgstr " : \"%c\", %d\n"
+msgstr "потеряна синхронизация с сервером: получено сообщение типа \"%c\", длина %d\n"
-#: fe-protocol3.c:640
+#: fe-protocol3.c:646
msgid "unexpected field count in \"D\" message\n"
-msgstr " \"D\"\n"
+msgstr "неожиданное число полей в собщении \"D\"\n"
#. translator: %s represents a digit string
-#: fe-protocol3.c:782
-#: fe-protocol3.c:801
+#: fe-protocol3.c:792
+#: fe-protocol3.c:811
#, c-format
msgid " at character %s"
-msgstr " %s"
+msgstr " у символа %s"
-#: fe-protocol3.c:814
+#: fe-protocol3.c:824
#, c-format
msgid "DETAIL: %s\n"
-msgstr ": %s\n"
+msgstr "ПОДРОБНО: %s\n"
-#: fe-protocol3.c:817
+#: fe-protocol3.c:827
#, c-format
msgid "HINT: %s\n"
-msgstr ": %s\n"
+msgstr "ПОДСКАЗКА: %s\n"
-#: fe-protocol3.c:820
+#: fe-protocol3.c:830
#, c-format
msgid "QUERY: %s\n"
-msgstr ": %s\n"
+msgstr "ЗАПРОС: %s\n"
-#: fe-protocol3.c:823
+#: fe-protocol3.c:833
#, c-format
msgid "CONTEXT: %s\n"
-msgstr ": %s\n"
+msgstr "КОНТЕКСТ: %s\n"
-#: fe-protocol3.c:835
+#: fe-protocol3.c:845
msgid "LOCATION: "
-msgstr ": "
+msgstr "РАСПОЛОЖЕНИЕ: "
-#: fe-protocol3.c:837
+#: fe-protocol3.c:847
#, c-format
msgid "%s, "
msgstr "%s, "
-#: fe-protocol3.c:839
+#: fe-protocol3.c:849
#, c-format
msgid "%s:%s"
msgstr "%s:%s"
-#: fe-protocol3.c:1064
+#: fe-protocol3.c:1073
#, c-format
msgid "LINE %d: "
-msgstr " %d:"
+msgstr "СТРОКА %d:"
-#: fe-protocol3.c:1372
+#: fe-protocol3.c:1457
msgid "PQgetline: not doing text COPY OUT\n"
-msgstr "PQgetline: COPY OUT\n"
+msgstr "PQgetline: не производится текстовый COPY OUT\n"
-#: fe-secure.c:218
+#: fe-secure.c:265
#, c-format
msgid "could not establish SSL connection: %s\n"
-msgstr " SSL-: %s\n"
+msgstr "не удалось установить SSL-соединение: %s\n"
-#: fe-secure.c:289
-#: fe-secure.c:385
-#: fe-secure.c:927
+#: fe-secure.c:349
+#: fe-secure.c:436
+#: fe-secure.c:1162
#, c-format
msgid "SSL SYSCALL error: %s\n"
-msgstr " SSL SYSCALL: %s\n"
+msgstr "ошибка SSL SYSCALL: %s\n"
-#: fe-secure.c:294
-#: fe-secure.c:391
-#: fe-secure.c:931
+#: fe-secure.c:355
+#: fe-secure.c:442
+#: fe-secure.c:1166
msgid "SSL SYSCALL error: EOF detected\n"
-msgstr " SSL SYSCALL: (EOF)\n"
+msgstr "ошибка SSL SYSCALL: обнаружен конец файла (EOF)\n"
-#: fe-secure.c:306
-#: fe-secure.c:402
-#: fe-secure.c:950
+#: fe-secure.c:367
+#: fe-secure.c:453
+#: fe-secure.c:1175
#, c-format
msgid "SSL error: %s\n"
-msgstr " SSL: %s\n"
+msgstr "ошибка SSL: %s\n"
-#: fe-secure.c:316
-#: fe-secure.c:412
-#: fe-secure.c:960
+#: fe-secure.c:377
+#: fe-secure.c:463
+#: fe-secure.c:1184
#, c-format
msgid "unrecognized SSL error code: %d\n"
-msgstr " SSL: %d\n"
+msgstr "нераспознанный код ошибки SSL: %d\n"
-#: fe-secure.c:482
-#, c-format
-msgid "error querying socket: %s\n"
-msgstr " : %s\n"
+#: fe-secure.c:601
+msgid "host name must be specified for a verified SSL connection\n"
+msgstr "для заверенного SSL соединения должно быть указано имя хоста\n"
-#: fe-secure.c:509
+#: fe-secure.c:620
#, c-format
-msgid "could not get information about host \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
-
-#: fe-secure.c:528
-msgid "unsupported protocol\n"
-msgstr " \n"
+msgid "server common name \"%s\" does not match host name \"%s\"\n"
+msgstr "общее имя сервера \"%s\" не совпадает с именем хоста \"%s\"\n"
-#: fe-secure.c:550
+#: fe-secure.c:752
#, c-format
-msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
-msgstr " \"%s\" %ld.%ld.%ld.%ld\n"
-
-#: fe-secure.c:557
-#, c-format
-msgid "server common name \"%s\" does not resolve to peer address\n"
-msgstr " \"%s\" \n"
+msgid "could not create SSL context: %s\n"
+msgstr "не удалось создать контекст SSL: %s\n"
-#: fe-secure.c:589
-msgid "could not get user information\n"
-msgstr " \n"
+#: fe-secure.c:843
+msgid "could not get home directory to locate client certificate files\n"
+msgstr "не удалось получить домашнюю директорию, чтобы найти файлы с клиентскими сертификатами\n"
-#: fe-secure.c:598
+#: fe-secure.c:868
#, c-format
msgid "could not open certificate file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не в состоянии открыть файл сертификата \"%s\": %s\n"
-#: fe-secure.c:607
+#: fe-secure.c:893
+#: fe-secure.c:903
#, c-format
msgid "could not read certificate file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не в состоянии считать файл сертификата \"%s\": %s\n"
-#: fe-secure.c:627
-msgid "invalid value of PGSSLKEY environment variable\n"
-msgstr " PGSSLKEY\n"
-
-#: fe-secure.c:639
-#, fuzzy, c-format
+#: fe-secure.c:940
+#, c-format
msgid "could not load SSL engine \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
-
-#: fe-secure.c:653
-#, fuzzy, c-format
-msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не удаётся загрузить движок SSL \"%s\": %s\n"
-#: fe-secure.c:669
+#: fe-secure.c:952
#, c-format
-msgid "certificate present, but not private key file \"%s\"\n"
-msgstr " , \"%s\"\n"
+msgid "could not initialize SSL engine \"%s\": %s\n"
+msgstr "не удаётся инициализировать движок SSL \"%s\": %s\n"
-#: fe-secure.c:678
+#: fe-secure.c:968
#, c-format
-msgid "private key file \"%s\" has wrong permissions\n"
-msgstr " \"%s\"\n"
+msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr "не удалось прочитать приватный SSL ключ \"%s\" из движка \"%s\": %s\n"
-#: fe-secure.c:686
+#: fe-secure.c:982
#, c-format
-msgid "could not open private key file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr "не удалось загрузить приватный SSL ключ \"%s\" из движка \"%s\": %s\n"
-#: fe-secure.c:695
+#: fe-secure.c:1017
#, c-format
-msgid "private key file \"%s\" changed during execution\n"
-msgstr " \"%s\" \n"
+msgid "certificate present, but not private key file \"%s\"\n"
+msgstr "сертификат присутствует, но нет файла с личным ключом \"%s\"\n"
-#: fe-secure.c:704
+#: fe-secure.c:1025
#, c-format
-msgid "could not read private key file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
+msgstr "файл приватного ключа \"%s\" имеет права на чтение для всех или для группы; права должны быть u=rw (0600) или меньше\n"
-#: fe-secure.c:719
+#: fe-secure.c:1036
#, c-format
-msgid "certificate does not match private key file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgid "could not load private key file \"%s\": %s\n"
+msgstr "не удалось загрузить файл приватного ключа \"%s\": %s\n"
-#: fe-secure.c:808
+#: fe-secure.c:1050
#, c-format
-msgid "could not create SSL context: %s\n"
-msgstr " SSL: %s\n"
+msgid "certificate does not match private key file \"%s\": %s\n"
+msgstr "сертификат не совпадает с файлом личного ключа \"%s\": %s\n"
-#: fe-secure.c:849
+#: fe-secure.c:1075
#, c-format
msgid "could not read root certificate file \"%s\": %s\n"
-msgstr " \"%s\": %s\n"
+msgstr "не удалось прочитать файл корневых сертификатов \"%s\": %s\n"
-#: fe-secure.c:869
+#: fe-secure.c:1099
#, c-format
msgid "SSL library does not support CRL certificates (file \"%s\")\n"
-msgstr " SSL CRL ( \"%s\")\n"
+msgstr "Библиотека SSL не поддерживает CRL сертификаты (файл \"%s\")\n"
-#: fe-secure.c:980
+#: fe-secure.c:1120
#, c-format
-msgid "certificate could not be validated: %s\n"
-msgstr " : %s\n"
+msgid ""
+"root certificate file \"%s\" does not exist\n"
+"Either provide the file or change sslmode to disable server certificate verification.\n"
+msgstr ""
+"корневой файл сертификата \"%s\" не существует\n"
+"Предоставьте файл с сертификатом или измените sslmode, чтобы отключить проверку сертификата.\n"
-#: fe-secure.c:994
+#: fe-secure.c:1203
#, c-format
msgid "certificate could not be obtained: %s\n"
-msgstr " : %s\n"
+msgstr "не удалось получить сертификат: %s\n"
+
+#: fe-secure.c:1231
+msgid "SSL certificate's common name contains embedded null\n"
+msgstr "Общее имя SSL сертификата содержит вставленный null\n"
-#: fe-secure.c:1074
+#: fe-secure.c:1307
msgid "no SSL error reported"
-msgstr " SSL"
+msgstr "нераспознанный код ошибки SSL"
-#: fe-secure.c:1083
+#: fe-secure.c:1316
#, c-format
msgid "SSL error code %lu"
-msgstr " SSL: %lu"
+msgstr "ошибка SSL: %lu"
+
+#~ msgid "error querying socket: %s\n"
+#~ msgstr "ошибка при запросе сокета: %s\n"
+
+#~ msgid "could not get information about host \"%s\": %s\n"
+#~ msgstr "не удалось получить информацию о хосте \"%s\": %s\n"
+
+#~ msgid "unsupported protocol\n"
+#~ msgstr "протокол не поддерживается\n"
+
+#~ msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+#~ msgstr "имя сервера \"%s\" не транслируется в %ld.%ld.%ld.%ld\n"
+
+#~ msgid "could not get user information\n"
+#~ msgstr "не удалось получить информацию о пользователе\n"
+
+#~ msgid "invalid value of PGSSLKEY environment variable\n"
+#~ msgstr "неверное значение для переменной окружения PGSSLKEY\n"
+
+#~ msgid "private key file \"%s\" has wrong permissions\n"
+#~ msgstr "неправильные права доступа к файла личного ключа \"%s\"\n"
+
+#~ msgid "could not open private key file \"%s\": %s\n"
+#~ msgstr "не удалось открыть файл личного ключа \"%s\": %s\n"
+
+#~ msgid "private key file \"%s\" changed during execution\n"
+#~ msgstr "личный ключ \"%s\" изменился во время исполнения\n"
+
+#~ msgid "certificate could not be validated: %s\n"
+#~ msgstr "сертификат не может быть проверен: %s\n"
#~ msgid "Kerberos 4 error: %s\n"
-#~ msgstr " Kerberos 4: %s\n"
+#~ msgstr "ошибка Kerberos 4: %s\n"
+
#~ msgid "Kerberos 4 authentication failed\n"
-#~ msgstr " Kerberos 4 \n"
+#~ msgstr "аутентификация Kerberos 4 не удалась\n"
+
#~ msgid "Kerberos 5 authentication failed\n"
-#~ msgstr " Kerberos 5 \n"
+#~ msgstr "аутентификация Kerberos 5 не удалась\n"
+
#~ msgid "invalid authentication service name \"%s\", ignored\n"
-#~ msgstr " \"%s\", \n"
+#~ msgstr "неверное имя сервиса аутентификации \"%s\", игнорируется\n"
+
#~ msgid "fe_getauthname: invalid authentication system: %d\n"
-#~ msgstr "fe_getauthname: : %d\n"
+#~ msgstr "fe_getauthname: неверная система аутентификации: %d\n"
+
#~ msgid "could not receive server response to SSL negotiation packet: %s\n"
-#~ msgstr " SSL: %s\n"
+#~ msgstr "не был получен ответ сервера на пакет согласования SSL: %s\n"
+
#~ msgid "could not create large object for file \"%s\"\n"
-#~ msgstr " (LO) \"%s\"\n"
+#~ msgstr "не в состоянии создать большой объект (LO) для файла \"%s\"\n"
+
#~ msgid "could not open large object %u\n"
-#~ msgstr " (LO) %u\n"
+#~ msgstr "не в состоянии открыть большой объект (LO) %u\n"
+
#~ msgid "error while reading file \"%s\"\n"
-#~ msgstr " \"%s\"\n"
-#~ msgid "error while writing to file \"%s\"\n"
-#~ msgstr " \"%s\"\n"
+#~ msgstr "ошибка при чтении файла \"%s\"\n"
+#~ msgid "error while writing to file \"%s\"\n"
+#~ msgstr "ошибка при записи в файл \"%s\"\n"
diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index e121cdc2d22..d456f27e47b 100644
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,627 +1,642 @@
# simplified Chinese translation file for libpq
# Bao Wei <weibao@forevertek.com>, 2002
#
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.11 2010/05/13 15:56:42 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.8 2005/01/06 09:07:17 petere Exp $
#
msgid ""
msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
+"Project-Id-Version: libpq (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2010-02-19 02:00+0000\n"
-"PO-Revision-Date: 2010-03-30 13:51+0800\n"
+"POT-Creation-Date: 2010-10-01 14:43+0000\n"
+"PO-Revision-Date: 2010-10-01 12:43+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"
+#: fe-auth.c:212 fe-auth.c:432 fe-auth.c:659
+msgid "host name must be specified\n"
+msgstr "必须指定主机名\n"
+
# fe-auth.c:395
#: fe-auth.c:242
#, c-format
msgid "could not set socket to blocking mode: %s\n"
-msgstr "޷׽Ϊģʽ: %s\n"
+msgstr "无法将套接字设置为阻塞模式: %s\n"
# fe-auth.c:412 fe-auth.c:416
-#: fe-auth.c:260
-#: fe-auth.c:264
+#: fe-auth.c:260 fe-auth.c:264
#, c-format
msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "kerberos 5 ֤ܾ: %*s\n"
+msgstr "kerberos 5 认证拒绝: %*s\n"
# fe-auth.c:440
#: fe-auth.c:290
#, c-format
msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "޷׽: %s ϻָģʽ\n"
+msgstr "无法在套接字: %s 上恢复非阻塞模式\n"
#: fe-auth.c:403
msgid "GSSAPI continuation error"
-msgstr "GSSAPIִ"
+msgstr "GSSAPI连续出现错误"
-#: fe-auth.c:432
+#: fe-auth.c:439
msgid "duplicate GSS authentication request\n"
-msgstr "ظGSS֤\n"
+msgstr "重复的GSS认证请求\n"
-#: fe-auth.c:452
+#: fe-auth.c:459
msgid "GSSAPI name import error"
-msgstr "GSSAPIƵ"
+msgstr "GSSAPI名称导入错误"
-#: fe-auth.c:538
+#: fe-auth.c:545
msgid "SSPI continuation error"
-msgstr "SSPIִ"
+msgstr "SSPI连续出现错误"
# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
# fe-lobj.c:536
-#: fe-auth.c:549
-#: fe-auth.c:623
-#: fe-auth.c:657
-#: fe-auth.c:754
-#: fe-connect.c:1342
-#: fe-connect.c:2625
-#: fe-connect.c:2842
-#: fe-connect.c:3208
-#: fe-connect.c:3217
-#: fe-connect.c:3354
-#: fe-connect.c:3400
-#: fe-connect.c:3418
-#: fe-exec.c:3110
-#: fe-lobj.c:696
-#: fe-protocol2.c:1027
-#: fe-protocol3.c:1421
+#: fe-auth.c:556 fe-auth.c:630 fe-auth.c:665 fe-auth.c:762 fe-connect.c:1802
+#: fe-connect.c:3129 fe-connect.c:3346 fe-connect.c:3762 fe-connect.c:3771
+#: fe-connect.c:3908 fe-connect.c:3954 fe-connect.c:3972 fe-connect.c:4051
+#: fe-connect.c:4121 fe-connect.c:4167 fe-connect.c:4185 fe-exec.c:3121
+#: fe-exec.c:3286 fe-lobj.c:696 fe-protocol2.c:1027 fe-protocol3.c:1421
msgid "out of memory\n"
-msgstr "ڴþ\n"
+msgstr "内存用尽\n"
-#: fe-auth.c:638
+#: fe-auth.c:645
msgid "could not acquire SSPI credentials"
-msgstr "޷SSPI֤"
-
-#: fe-auth.c:651
-msgid "host name must be specified\n"
-msgstr "ָ\n"
+msgstr "无法获得SSPI证书"
# fe-auth.c:503
-#: fe-auth.c:730
+#: fe-auth.c:738
msgid "SCM_CRED authentication method not supported\n"
-msgstr "֧ SCM_CRED ֤ʽ\n"
+msgstr "不支持 SCM_CRED 认证方式\n"
# fe-auth.c:595
-#: fe-auth.c:804
+#: fe-auth.c:812
msgid "Kerberos 4 authentication not supported\n"
-msgstr "֧ Kerberos 4 ֤\n"
+msgstr "不支持 Kerberos 4 认证\n"
# fe-auth.c:612
-#: fe-auth.c:820
+#: fe-auth.c:828
msgid "Kerberos 5 authentication not supported\n"
-msgstr "֧ Kerberos 5 ֤\n"
+msgstr "不支持 Kerberos 5 认证\n"
# fe-auth.c:595
-#: fe-auth.c:887
+#: fe-auth.c:895
msgid "GSSAPI authentication not supported\n"
-msgstr "֧GSSAPI֤\n"
+msgstr "不支持GSSAPI认证\n"
# fe-auth.c:595
-#: fe-auth.c:911
+#: fe-auth.c:919
msgid "SSPI authentication not supported\n"
-msgstr "֧SSPI֤\n"
+msgstr "不支持SSPI认证\n"
# fe-auth.c:595
-#: fe-auth.c:918
+#: fe-auth.c:926
msgid "Crypt authentication not supported\n"
-msgstr "֧Crypt֤\n"
+msgstr "不支持Crypt认证\n"
# fe-auth.c:640
-#: fe-auth.c:945
+#: fe-auth.c:953
#, c-format
msgid "authentication method %u not supported\n"
-msgstr "֧ %u ֤ʽ\n"
+msgstr "不支持 %u 认证方式\n"
-#: fe-connect.c:524
+#: fe-connect.c:712
#, c-format
msgid "invalid sslmode value: \"%s\"\n"
-msgstr "Ч sslmode ֵ: \"%s\"\n"
+msgstr "无效的 sslmode 值: \"%s\"\n"
-#: fe-connect.c:545
+#: fe-connect.c:733
#, c-format
msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
-msgstr "Ч sslmode ֵ \"%s\" ûа SSL ֱ֧ʱ\n"
+msgstr "无效的 sslmode 值 \"%s\" 当没有把 SSL 支持编译进来时\n"
# fe-connect.c:732
-#: fe-connect.c:728
+#: fe-connect.c:916
#, c-format
msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "޷׽Ϊ TCP ӳģʽ: %s\n"
+msgstr "无法将套接字设置为 TCP 无延迟模式: %s\n"
# fe-connect.c:752
-#: fe-connect.c:758
+#: fe-connect.c:946
#, c-format
msgid ""
"could not connect to server: %s\n"
"\tIs the server running locally and accepting\n"
"\tconnections on Unix domain socket \"%s\"?\n"
msgstr ""
-"޷ӵ: %s\n"
-"\tǷڱв Unix ׽\n"
-"\t\"%s\"׼?\n"
+"无法联接到服务器: %s\n"
+"\t服务器是否在本地运行并且在 Unix 域套接字\n"
+"\t\"%s\"上准备接受联接?\n"
# fe-connect.c:761
-#: fe-connect.c:768
+#: fe-connect.c:956
#, c-format
msgid ""
"could not connect to server: %s\n"
"\tIs the server running on host \"%s\" and accepting\n"
"\tTCP/IP connections on port %s?\n"
msgstr ""
-"޷ӵ: %s\n"
-"\tǷ \"%s\" в׼ڶ˿\n"
-"%s ϵ TCP/IP ?\n"
+"无法联接到服务器: %s\n"
+"\t服务器是否在主机 \"%s\" 上运行并且准备接受在端口\n"
+"%s 上的 TCP/IP 联接?\n"
+
+#: fe-connect.c:1011
+#, c-format
+msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
+msgstr "执行setsockopt(TCP_KEEPIDLE)失败: %s\n"
+
+#: fe-connect.c:1024
+#, c-format
+msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
+msgstr "执行setsockopt(TCP_KEEPALIVE)失败: %s\n"
+
+#: fe-connect.c:1056
+#, c-format
+msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
+msgstr "执行setsockopt(TCP_KEEPINTVL)失败: %s\n"
+
+#: fe-connect.c:1088
+#, c-format
+msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
+msgstr "执行setsockopt(TCP_KEEPCNT) 失败: %s\n"
+
+#: fe-connect.c:1137
+#, c-format
+msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
+msgstr "执行WSAIoctl(SIO_KEEPALIVE_VALS)失败:%u\n"
+
+#: fe-connect.c:1189
+#, c-format
+msgid "invalid port number: \"%s\"\n"
+msgstr "无效端口号: \"%s\"\n"
# fe-misc.c:702
-#: fe-connect.c:858
+#: fe-connect.c:1231
#, c-format
msgid "could not translate host name \"%s\" to address: %s\n"
-msgstr "޷ \"%s\" ַ: %s\n"
+msgstr "无法解释主机名 \"%s\" 到地址: %s\n"
# fe-misc.c:702
-#: fe-connect.c:862
+#: fe-connect.c:1235
#, c-format
msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
-msgstr "޷ Unix-domian ׽· \"%s\" ַ: %s\n"
+msgstr "无法解释 Unix-domian 套接字路径 \"%s\" 到地址: %s\n"
# fe-connect.c:1232
-#: fe-connect.c:1069
+#: fe-connect.c:1444
msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "Ч״̬, Ǵ洢ݱƻı־\n"
+msgstr "无效的联接状态, 可能是存储器数据被破坏的标志\n"
# fe-connect.c:891
-#: fe-connect.c:1112
+#: fe-connect.c:1487
#, c-format
msgid "could not create socket: %s\n"
-msgstr "޷׽: %s\n"
+msgstr "无法创建套接字: %s\n"
# fe-connect.c:708
-#: fe-connect.c:1135
+#: fe-connect.c:1510
#, c-format
msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "޷׽Ϊģʽ: %s\n"
+msgstr "无法将套接字设置为非阻塞模式: %s\n"
# fe-auth.c:395
-#: fe-connect.c:1147
+#: fe-connect.c:1522
#, c-format
msgid "could not set socket to close-on-exec mode: %s\n"
-msgstr "޷׽Ϊִʱر (close-on-exec) ģʽ: %s\n"
+msgstr "无法将套接字设置为执行时关闭 (close-on-exec) 模式: %s\n"
+
+#: fe-connect.c:1540
+msgid "keepalives parameter must be an integer\n"
+msgstr "参数keepalives必须是一个整数\n"
+
+#: fe-connect.c:1553
+#, c-format
+msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
+msgstr "执行setsockopt(SO_KEEPALIVE) 失败: %s\n"
# fe-connect.c:1263
-#: fe-connect.c:1234
+#: fe-connect.c:1694
#, c-format
msgid "could not get socket error status: %s\n"
-msgstr "޷ȡ׽ִ״̬: %s\n"
+msgstr "无法获取套接字错误状态: %s\n"
# fe-connect.c:1283
-#: fe-connect.c:1272
+#: fe-connect.c:1732
#, c-format
msgid "could not get client address from socket: %s\n"
-msgstr "޷׽ֻȡͻ˵ַ: %s\n"
+msgstr "无法从套接字获取客户端地址: %s\n"
# fe-connect.c:959
-#: fe-connect.c:1316
+#: fe-connect.c:1776
#, c-format
msgid "could not send SSL negotiation packet: %s\n"
-msgstr "޷ SSL ְ: %s\n"
+msgstr "无法发送 SSL 握手包: %s\n"
# fe-connect.c:1322
-#: fe-connect.c:1355
+#: fe-connect.c:1815
#, c-format
msgid "could not send startup packet: %s\n"
-msgstr "޷: %s\n"
+msgstr "无法发送启动包: %s\n"
# fe-connect.c:1010
-#: fe-connect.c:1422
-#: fe-connect.c:1441
+#: fe-connect.c:1882 fe-connect.c:1901
msgid "server does not support SSL, but SSL was required\n"
-msgstr "֧ SSL, Ҫʹ SSL\n"
+msgstr "服务器不支持 SSL, 但是要求使用 SSL\n"
# fe-connect.c:1001
-#: fe-connect.c:1457
+#: fe-connect.c:1917
#, c-format
msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "յ SSL ֵЧӦ: %c\n"
+msgstr "收到对 SSL 握手的无效响应: %c\n"
# fe-connect.c:1378
-#: fe-connect.c:1533
-#: fe-connect.c:1566
+#: fe-connect.c:1993 fe-connect.c:2026
#, c-format
msgid "expected authentication request from server, but received %c\n"
-msgstr "ڴԷ֤, ȴյ %c\n"
+msgstr "期待来自服务器的认证请求, 却收到 %c\n"
-#: fe-connect.c:1737
+#: fe-connect.c:2197
#, c-format
msgid "out of memory allocating GSSAPI buffer (%i)"
-msgstr "ڷGSSAPI(%i)ʱڴþ"
+msgstr "在分配GSSAPI缓冲区(%i)时内存用尽"
# fe-connect.c:1490
-#: fe-connect.c:1822
+#: fe-connect.c:2282
msgid "unexpected message from server during startup\n"
-msgstr "յԷķԤϢ\n"
+msgstr "启动过程中收到来自服务器的非预期信息\n"
# fe-connect.c:1549
-#: fe-connect.c:1890
+#: fe-connect.c:2378
#, c-format
-msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "Ч״̬ %c, Ǵ洢ݱƻı־\n"
+msgid "invalid connection state %d, probably indicative of memory corruption\n"
+msgstr "无效的连接状态 %d, 这可能表示内存出现问题\n"
-#: fe-connect.c:2233
-#: fe-connect.c:2293
+#: fe-connect.c:2737 fe-connect.c:2797
#, c-format
msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
-msgstr "PGEVT_CONNRESET¼ڼִPGEventProc \"%s\"\n"
+msgstr "在PGEVT_CONNRESET事件触发期间执行PGEventProc \"%s\"错误\n"
-#: fe-connect.c:2638
+#: fe-connect.c:3142
#, c-format
msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
-msgstr "ЧLDAP URL\"%s\": ģʽldap://\n"
+msgstr "无效LDAP URL\"%s\": 模式必须是ldap://\n"
-#: fe-connect.c:2653
+#: fe-connect.c:3157
#, c-format
msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
-msgstr "ЧLDAP URL \"%s\": ʧֵ\n"
+msgstr "无效LDAP URL \"%s\": 丢失可区分的名称\n"
-#: fe-connect.c:2664
-#: fe-connect.c:2717
+#: fe-connect.c:3168 fe-connect.c:3221
#, c-format
msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
-msgstr "ЧLDAP URL \"%s\": ֻһ\n"
+msgstr "无效LDAP URL \"%s\": 只能有一个属性\n"
-#: fe-connect.c:2674
-#: fe-connect.c:2731
+#: fe-connect.c:3178 fe-connect.c:3235
#, c-format
msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
-msgstr "ЧLDAP URL \"%s\": Χ(base/one/sub)\n"
+msgstr "无效LDAP URL \"%s\": 必须有搜索范围(base/one/sub)\n"
-#: fe-connect.c:2685
+#: fe-connect.c:3189
#, c-format
msgid "invalid LDAP URL \"%s\": no filter\n"
-msgstr "Ч LDAP URL \"%s\": ûй\n"
+msgstr "无效的 LDAP URL \"%s\": 没有过滤器\n"
-#: fe-connect.c:2706
+#: fe-connect.c:3210
#, c-format
msgid "invalid LDAP URL \"%s\": invalid port number\n"
-msgstr "ЧLDAP URL \"%s\": Ч˿ں\n"
+msgstr "无效LDAP URL \"%s\": 无效端口号\n"
-#: fe-connect.c:2740
+#: fe-connect.c:3244
msgid "could not create LDAP structure\n"
-msgstr "޷LDAPṹ: %s\n"
+msgstr "无法创建LDAP结构: %s\n"
-#: fe-connect.c:2782
+#: fe-connect.c:3286
#, c-format
msgid "lookup on LDAP server failed: %s\n"
-msgstr "LDAPϵIJʧ: %s\n"
+msgstr "在LDAP服务器上的查找失败: %s\n"
-#: fe-connect.c:2793
+#: fe-connect.c:3297
msgid "more than one entry found on LDAP lookup\n"
-msgstr "LDAPҵ\n"
+msgstr "在LDAP搜索上找到多个入口\n"
-#: fe-connect.c:2794
-#: fe-connect.c:2806
+#: fe-connect.c:3298 fe-connect.c:3310
msgid "no entry found on LDAP lookup\n"
-msgstr "LDAPûз\n"
+msgstr "在LDAP查找上没有发现入口\n"
-#: fe-connect.c:2817
-#: fe-connect.c:2830
+#: fe-connect.c:3321 fe-connect.c:3334
msgid "attribute has no values on LDAP lookup\n"
-msgstr "LDAPϵûֵ\n"
+msgstr "在LDAP查找上的属性没有值\n"
# fe-connect.c:2475
-#: fe-connect.c:2881
-#: fe-connect.c:2899
-#: fe-connect.c:3256
+#: fe-connect.c:3385 fe-connect.c:3403 fe-connect.c:3810
#, c-format
msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr "Ϣִ \"%s\" ȱ \"=\"\n"
+msgstr "在联接信息字串里的 \"%s\" 后面缺少 \"=\"\n"
# fe-connect.c:2558
-#: fe-connect.c:2962
-#: fe-connect.c:3338
+#: fe-connect.c:3466 fe-connect.c:3892 fe-connect.c:4076
#, c-format
msgid "invalid connection option \"%s\"\n"
-msgstr "Ƿѡ \"%s\"\n"
+msgstr "非法联接选项 \"%s\"\n"
# fe-connect.c:2524
-#: fe-connect.c:2975
-#: fe-connect.c:3305
+#: fe-connect.c:3479 fe-connect.c:3859
msgid "unterminated quoted string in connection info string\n"
-msgstr "Ϣִδִ\n"
+msgstr "联接信息字串中未结束的引号字串\n"
-#: fe-connect.c:3018
+#: fe-connect.c:3518
+msgid "could not get home directory to locate service definition file"
+msgstr "无法进入home目录来定位服务定义文件"
+
+#: fe-connect.c:3551
+#, c-format
+msgid "definition of service \"%s\" not found\n"
+msgstr "错误:没有找到服务\"%s\"的定义\n"
+
+#: fe-connect.c:3574
#, c-format
-msgid "ERROR: service file \"%s\" not found\n"
-msgstr "ûҵļ\"%s\"\n"
+msgid "service file \"%s\" not found\n"
+msgstr "错误:没有找到服务文件\"%s\"\n"
-#: fe-connect.c:3031
+#: fe-connect.c:3587
#, c-format
-msgid "ERROR: line %d too long in service file \"%s\"\n"
-msgstr ": ڷļ\"%2$s\"еĵ%1$d̫\n"
+msgid "line %d too long in service file \"%s\"\n"
+msgstr "在服务文件\"%2$s\"中的第%1$d行的长度太长\n"
-#: fe-connect.c:3103
-#: fe-connect.c:3130
+#: fe-connect.c:3658 fe-connect.c:3685
#, c-format
-msgid "ERROR: syntax error in service file \"%s\", line %d\n"
-msgstr ": ڷļ\"%s\"ĵ%dг﷨\n"
+msgid "syntax error in service file \"%s\", line %d\n"
+msgstr "在服务文件\"%s\"的第%d行出现语法错误\n"
# fe-connect.c:2744
-#: fe-connect.c:3586
+#: fe-connect.c:4352
msgid "connection pointer is NULL\n"
-msgstr "ָ NULL\n"
+msgstr "联接指针是 NULL\n"
-#: fe-connect.c:3869
+#: fe-connect.c:4625
#, c-format
msgid "WARNING: password file \"%s\" is not a plain file\n"
-msgstr ": ļ\"%s\"ͨıļ\n"
+msgstr "警告: 口令文件\"%s\"不是普通文本文件\n"
# fe-connect.c:2953
-#: fe-connect.c:3878
+#: fe-connect.c:4634
+#, c-format
+msgid ""
+"WARNING: password file \"%s\" has group or world access; permissions should "
+"be u=rw (0600) or less\n"
+msgstr "警告: 口令文件\"%s\"的访问权限过大; 权限应设置 为 u=rw (0600)或更少\n"
+
+#: fe-connect.c:4722
#, c-format
-msgid "WARNING: password file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
-msgstr ": ļ\"%s\"ķȨ޹; ȨӦ Ϊ u=rw (0600)\n"
+msgid "password retrieved from file \"%s\"\n"
+msgstr "从文件\"%s\"中获取口令\n"
#: fe-exec.c:827
msgid "NOTICE"
-msgstr "ע"
+msgstr "注意"
# fe-exec.c:737
-#: fe-exec.c:1014
-#: fe-exec.c:1071
-#: fe-exec.c:1111
+#: fe-exec.c:1014 fe-exec.c:1071 fe-exec.c:1111
msgid "command string is a null pointer\n"
-msgstr "ִһָ\n"
+msgstr "命令字串是一个空指针\n"
# fe-exec.c:737
-#: fe-exec.c:1104
-#: fe-exec.c:1199
+#: fe-exec.c:1104 fe-exec.c:1199
msgid "statement name is a null pointer\n"
-msgstr "һָ\n"
+msgstr "声明名字是一个空指针\n"
-#: fe-exec.c:1119
-#: fe-exec.c:1273
-#: fe-exec.c:1928
-#: fe-exec.c:2125
+#: fe-exec.c:1119 fe-exec.c:1273 fe-exec.c:1928 fe-exec.c:2125
msgid "function requires at least protocol version 3.0\n"
-msgstr "Ҫ 3.0 汾Э\n"
+msgstr "函数至少需要 3.0 版本的协议\n"
# fe-exec.c:745
#: fe-exec.c:1230
msgid "no connection to the server\n"
-msgstr "ûе\n"
+msgstr "没有到服务器的联接\n"
# fe-exec.c:752
#: fe-exec.c:1237
msgid "another command is already in progress\n"
-msgstr "Ѿһڴ\n"
+msgstr "已经有另外一条命令在处理\n"
#: fe-exec.c:1349
msgid "length must be given for binary parameter\n"
-msgstr "2Ʋָ\n"
+msgstr "对于2进制参数必须指定长度\n"
# fe-exec.c:1371
#: fe-exec.c:1596
#, c-format
msgid "unexpected asyncStatus: %d\n"
-msgstr " asyncStatus(첽״̬): %d\n"
+msgstr "意外的 asyncStatus(异步状态): %d\n"
#: fe-exec.c:1616
#, c-format
msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
-msgstr "PGEVT_CONNRESET¼ڼִPGEventProc \"%s\"\n"
+msgstr "在PGEVT_CONNRESET事件触发期间执行PGEventProc \"%s\"错误\n"
#: fe-exec.c:1746
msgid "COPY terminated by new PQexec"
-msgstr "COPY һµ PQexec ֹ"
+msgstr "COPY 被一个新的 PQexec 终止"
# fe-exec.c:1421
#: fe-exec.c:1754
msgid "COPY IN state must be terminated first\n"
-msgstr "COPY IN ״̬Ƚ\n"
+msgstr "COPY IN 状态必须先结束\n"
# fe-exec.c:1421
#: fe-exec.c:1774
msgid "COPY OUT state must be terminated first\n"
-msgstr "COPY OUT ״̬Ƚ\n"
+msgstr "COPY OUT 状态必须先结束\n"
# fe-exec.c:1780
-#: fe-exec.c:2016
-#: fe-exec.c:2082
-#: fe-exec.c:2167
-#: fe-protocol2.c:1172
+#: fe-exec.c:2016 fe-exec.c:2082 fe-exec.c:2167 fe-protocol2.c:1172
#: fe-protocol3.c:1557
msgid "no COPY in progress\n"
-msgstr "ûڴ COPY\n"
+msgstr "没有正在处理的 COPY\n"
# fe-exec.c:1884
#: fe-exec.c:2359
msgid "connection in wrong state\n"
-msgstr "Ӵڴ״̬\n"
+msgstr "联接处于错误状态\n"
# fe-exec.c:2055
#: fe-exec.c:2390
msgid "invalid ExecStatusType code"
-msgstr "Ƿ ExecStatusType "
+msgstr "非法 ExecStatusType 代码"
# fe-exec.c:2108 fe-exec.c:2141
-#: fe-exec.c:2454
-#: fe-exec.c:2477
+#: fe-exec.c:2454 fe-exec.c:2477
#, c-format
msgid "column number %d is out of range 0..%d"
-msgstr "к %d ˷Χ 0..%d"
+msgstr "列号码 %d 超出了范围 0..%d"
# fe-exec.c:2130
#: fe-exec.c:2470
#, c-format
msgid "row number %d is out of range 0..%d"
-msgstr "к %d ˷Χ 0..%d"
+msgstr "行号码 %d 超出了范围 0..%d"
# fe-exec.c:2130
#: fe-exec.c:2492
#, c-format
msgid "parameter number %d is out of range 0..%d"
-msgstr "%d˷Χ 0..%d"
+msgstr "参数号%d超出了范围 0..%d"
# fe-exec.c:2325
-#: fe-exec.c:2779
+#: fe-exec.c:2780
#, c-format
msgid "could not interpret result from server: %s"
-msgstr "޷ԷĽ: %s"
+msgstr "无法解释来自服务器的结果: %s"
-#: fe-exec.c:3018
+#: fe-exec.c:3019 fe-exec.c:3103
msgid "incomplete multibyte character\n"
-msgstr "ЧĶַֽ\n"
+msgstr "无效的多字节字符\n"
# fe-lobj.c:616
#: fe-lobj.c:152
msgid "cannot determine OID of function lo_truncate\n"
-msgstr "޷ȷ lo_creat OID\n"
+msgstr "无法确定函数 lo_creat 的 OID\n"
# fe-lobj.c:616
#: fe-lobj.c:380
msgid "cannot determine OID of function lo_create\n"
-msgstr "޷ȷ lo_creat OID\n"
+msgstr "无法确定函数 lo_creat 的 OID\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-lobj.c:525
-#: fe-lobj.c:624
+#: fe-lobj.c:525 fe-lobj.c:624
#, c-format
msgid "could not open file \"%s\": %s\n"
-msgstr "޷ļ \"%s\": %s\n"
+msgstr "无法打开文件 \"%s\": %s\n"
#: fe-lobj.c:575
#, c-format
msgid "could not read from file \"%s\": %s\n"
-msgstr "޷ȡļ \"%s\": %s\n"
+msgstr "无法读取文件 \"%s\": %s\n"
-#: fe-lobj.c:639
-#: fe-lobj.c:663
+#: fe-lobj.c:639 fe-lobj.c:663
#, c-format
msgid "could not write to file \"%s\": %s\n"
-msgstr "޷дļ \"%s\": %s\n"
+msgstr "无法写入文件 \"%s\": %s\n"
# fe-lobj.c:564
#: fe-lobj.c:744
msgid "query to initialize large object functions did not return data\n"
-msgstr "ʼIJѯûз\n"
+msgstr "初始化大对象函数的查询没有返回数据\n"
# fe-lobj.c:602
#: fe-lobj.c:785
msgid "cannot determine OID of function lo_open\n"
-msgstr "޷жϺ lo_open OID\n"
+msgstr "无法判断函数 lo_open 的 OID\n"
# fe-lobj.c:609
#: fe-lobj.c:792
msgid "cannot determine OID of function lo_close\n"
-msgstr "޷жϺ lo_close OID\n"
+msgstr "无法判断函数 lo_close 的 OID\n"
# fe-lobj.c:616
#: fe-lobj.c:799
msgid "cannot determine OID of function lo_creat\n"
-msgstr "޷жϺ lo_creat OID\n"
+msgstr "无法判断函数 lo_creat 的 OID\n"
# fe-lobj.c:623
#: fe-lobj.c:806
msgid "cannot determine OID of function lo_unlink\n"
-msgstr "޷жϺ lo_unlink OID\n"
+msgstr "无法判断函数 lo_unlink 的 OID\n"
# fe-lobj.c:630
#: fe-lobj.c:813
msgid "cannot determine OID of function lo_lseek\n"
-msgstr "޷жϺ lo_lseek OID\n"
+msgstr "无法判断函数 lo_lseek 的 OID\n"
# fe-lobj.c:637
#: fe-lobj.c:820
msgid "cannot determine OID of function lo_tell\n"
-msgstr "޷жϺ lo_tell OID\n"
+msgstr "无法判断函数 lo_tell 的 OID\n"
# fe-lobj.c:644
#: fe-lobj.c:827
msgid "cannot determine OID of function loread\n"
-msgstr "޷жϺ loread OID\n"
+msgstr "无法判断函数 loread 的 OID\n"
# fe-lobj.c:651
#: fe-lobj.c:834
msgid "cannot determine OID of function lowrite\n"
-msgstr "޷жϺ lowrite OID\n"
+msgstr "无法判断函数 lowrite 的 OID\n"
# fe-misc.c:303
-#: fe-misc.c:241
+#: fe-misc.c:262
#, c-format
msgid "integer of size %lu not supported by pqGetInt"
-msgstr "pgGetInt ִ֧СΪ %lu "
+msgstr "pgGetInt 不支持大小为 %lu 的整数"
# fe-misc.c:341
-#: fe-misc.c:277
+#: fe-misc.c:298
#, c-format
msgid "integer of size %lu not supported by pqPutInt"
-msgstr "pgPutInt ִ֧СΪ %lu "
+msgstr "pgPutInt 不支持大小为 %lu 的整数"
# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: fe-misc.c:557
-#: fe-misc.c:759
+#: fe-misc.c:578 fe-misc.c:780
msgid "connection not open\n"
-msgstr "δ\n"
+msgstr "联接未打开\n"
# fe-misc.c:515 fe-misc.c:595
-#: fe-misc.c:622
-#: fe-misc.c:712
+#: fe-misc.c:643 fe-misc.c:733
#, c-format
msgid "could not receive data from server: %s\n"
-msgstr "޷ӷ: %s\n"
+msgstr "无法从服务器接收数据: %s\n"
# fe-misc.c:612 fe-misc.c:686
-#: fe-misc.c:729
-#: fe-misc.c:807
+#: fe-misc.c:750 fe-misc.c:828
msgid ""
"server closed the connection unexpectedly\n"
"\tThis probably means the server terminated abnormally\n"
"\tbefore or while processing the request.\n"
msgstr ""
-"عر\n"
-"\tͨζŷڴ֮ǰ\n"
-"ڴʱֹ\n"
+"服务器意外地关闭了联接\n"
+"\t这种现象通常意味着服务器在处理请求之前\n"
+"或者正在处理请求的时候意外中止\n"
# fe-misc.c:702
-#: fe-misc.c:824
+#: fe-misc.c:845
#, c-format
msgid "could not send data to server: %s\n"
-msgstr "޷: %s\n"
+msgstr "无法向服务器发送数据: %s\n"
-#: fe-misc.c:943
+#: fe-misc.c:964
msgid "timeout expired\n"
-msgstr "ʱ\n"
+msgstr "超时满\n"
# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: fe-misc.c:988
+#: fe-misc.c:1009
msgid "socket not open\n"
-msgstr "׽δ\n"
+msgstr "套接字未打开\n"
# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
-#: fe-misc.c:1011
+#: fe-misc.c:1032
#, c-format
msgid "select() failed: %s\n"
-msgstr "select() ʧ: %s\n"
+msgstr "select() 失败: %s\n"
# fe-connect.c:1549
#: fe-protocol2.c:89
#, c-format
msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "Ч setenv ״̬ %c, ڴ汻ƻ\n"
+msgstr "无效的 setenv 状态 %c, 可能是内存被破坏\n"
# fe-connect.c:1549
#: fe-protocol2.c:330
#, c-format
msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "Ч״̬ %c, ڴ汻ƻ\n"
+msgstr "无效状态 %c, 可能是内存被破坏\n"
-#: fe-protocol2.c:419
-#: fe-protocol3.c:186
+#: fe-protocol2.c:419 fe-protocol3.c:186
#, c-format
msgid "message type 0x%02x arrived from server while idle"
-msgstr "ʱյ͹Ϣ 0x%02x"
+msgstr "当空闲时收到服务起发送过来的消息类型 0x%02x"
#: fe-protocol2.c:462
#, c-format
@@ -629,92 +644,98 @@ msgid "unexpected character %c following empty query response (\"I\" message)"
msgstr "unexpected character %c following empty query response (\"I\" message)"
#: fe-protocol2.c:516
-msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
-msgstr "server sent data (\"D\" message) without prior row description (\"T\" message)"
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)"
+msgstr ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)"
#: fe-protocol2.c:532
-msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
-msgstr "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
+msgid ""
+"server sent binary data (\"B\" message) without prior row description (\"T\" "
+"message)"
+msgstr ""
+"server sent binary data (\"B\" message) without prior row description (\"T\" "
+"message)"
# fe-connect.c:1378
-#: fe-protocol2.c:547
-#: fe-protocol3.c:382
+#: fe-protocol2.c:547 fe-protocol3.c:382
#, c-format
msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "ԷĻִ, һյַ \"%c\"\n"
+msgstr "来自服务器意外的回执, 第一个收到的字符是 \"%c\"\n"
# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
# fe-lobj.c:536
-#: fe-protocol2.c:768
-#: fe-protocol3.c:701
+#: fe-protocol2.c:768 fe-protocol3.c:701
msgid "out of memory for query result\n"
-msgstr "Ϊѯڴþ\n"
+msgstr "为查询结果内存用尽\n"
-#: fe-protocol2.c:1215
-#: fe-protocol3.c:1625
+#: fe-protocol2.c:1215 fe-protocol3.c:1625
#, c-format
msgid "%s"
msgstr "%s"
#: fe-protocol2.c:1227
msgid "lost synchronization with server, resetting connection"
-msgstr "ʧȥͬ, "
+msgstr "失去与服务器同步, 重置连接"
-#: fe-protocol2.c:1361
-#: fe-protocol2.c:1393
-#: fe-protocol3.c:1828
+#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1828
#, c-format
msgid "protocol error: id=0x%x\n"
-msgstr "Э: id=0x%x\n"
+msgstr "协议错误: id=0x%x\n"
#: fe-protocol3.c:344
-msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
-msgstr "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)\n"
+msgstr ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)\n"
#: fe-protocol3.c:403
#, c-format
msgid "message contents do not agree with length in message type \"%c\"\n"
-msgstr "Ϣ \"%c\" , Ϣ볤Ȳƥ\n"
+msgstr "在消息类型 \"%c\" 中, 消息内容与长度不匹配\n"
#: fe-protocol3.c:424
#, c-format
msgid "lost synchronization with server: got message type \"%c\", length %d\n"
-msgstr "ʧȥͬ: ȡϢ \"%c\", %d\n"
+msgstr "失去与服务器同步: 获取到消息类型 \"%c\", 长度 %d\n"
#: fe-protocol3.c:646
msgid "unexpected field count in \"D\" message\n"
-msgstr " \"D\" Ϣ, ֶ\n"
+msgstr "在 \"D\" 消息中, 意外的字段数\n"
#. translator: %s represents a digit string
-#: fe-protocol3.c:788
-#: fe-protocol3.c:807
+#: fe-protocol3.c:788 fe-protocol3.c:807
#, c-format
msgid " at character %s"
-msgstr " ַ %s"
+msgstr " 在字符 %s"
#: fe-protocol3.c:820
#, c-format
msgid "DETAIL: %s\n"
-msgstr ": %s\n"
+msgstr "描述: %s\n"
#: fe-protocol3.c:823
#, c-format
msgid "HINT: %s\n"
-msgstr "ʾ: %s\n"
+msgstr "提示: %s\n"
#: fe-protocol3.c:826
#, c-format
msgid "QUERY: %s\n"
-msgstr "ѯ: %s\n"
+msgstr "查询: %s\n"
#: fe-protocol3.c:829
#, c-format
msgid "CONTEXT: %s\n"
-msgstr ": %s\n"
+msgstr "背景: %s\n"
#: fe-protocol3.c:841
msgid "LOCATION: "
-msgstr "λ: "
+msgstr "位置: "
#: fe-protocol3.c:843
#, c-format
@@ -729,166 +750,153 @@ msgstr "%s:%s"
#: fe-protocol3.c:1069
#, c-format
msgid "LINE %d: "
-msgstr "%d"
+msgstr "第%d行"
#: fe-protocol3.c:1453
msgid "PQgetline: not doing text COPY OUT\n"
msgstr "PQgetline: not doing text COPY OUT\n"
-#: fe-secure.c:241
+#: fe-secure.c:265
#, c-format
msgid "could not establish SSL connection: %s\n"
-msgstr "޷ SSL : %s\n"
+msgstr "无法建立 SSL 联接: %s\n"
-#: fe-secure.c:318
-#: fe-secure.c:403
-#: fe-secure.c:1140
+#: fe-secure.c:349 fe-secure.c:436 fe-secure.c:1162
#, c-format
msgid "SSL SYSCALL error: %s\n"
-msgstr "SSL SYSCALL : %s\n"
+msgstr "SSL SYSCALL 错误: %s\n"
-#: fe-secure.c:324
-#: fe-secure.c:409
-#: fe-secure.c:1144
+#: fe-secure.c:355 fe-secure.c:442 fe-secure.c:1166
msgid "SSL SYSCALL error: EOF detected\n"
-msgstr "SSL SYSCALL : ֽ\n"
+msgstr "SSL SYSCALL 错误: 发现结束符\n"
# fe-auth.c:232
-#: fe-secure.c:336
-#: fe-secure.c:420
-#: fe-secure.c:1163
+#: fe-secure.c:367 fe-secure.c:453 fe-secure.c:1175
#, c-format
msgid "SSL error: %s\n"
-msgstr "SSL : %s\n"
+msgstr "SSL 错误: %s\n"
-#: fe-secure.c:346
-#: fe-secure.c:430
-#: fe-secure.c:1173
+#: fe-secure.c:377 fe-secure.c:463 fe-secure.c:1184
#, c-format
msgid "unrecognized SSL error code: %d\n"
-msgstr "δ֪ SSL : %d\n"
+msgstr "未知的 SSL 错误码: %d\n"
-#: fe-secure.c:539
-msgid "verified SSL connections are only supported when connecting to a host name"
-msgstr "ֻеһʱּ֧SSL"
+#: fe-secure.c:601
+msgid "host name must be specified for a verified SSL connection\n"
+msgstr "必须为一个已验证的SSL连接指定主机名\n"
-#: fe-secure.c:558
+#: fe-secure.c:620
#, c-format
-msgid "server common name \"%s\" does not match host name \"%s\""
-msgstr " \"%s\"ƥ\"%s\""
+msgid "server common name \"%s\" does not match host name \"%s\"\n"
+msgstr "服务器名字 \"%s\"与主机名不匹配\"%s\"\n"
-#: fe-secure.c:600
-msgid "could not get home directory to locate client certificate files"
-msgstr "޷homeĿ¼λͻ֤ļ"
+#: fe-secure.c:752
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "无法创建 SSL 环境: %s\n"
+
+#: fe-secure.c:843
+msgid "could not get home directory to locate client certificate files\n"
+msgstr "无法进入home目录来定位客户端认证文件\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:624
-#: fe-secure.c:638
+#: fe-secure.c:868
#, c-format
msgid "could not open certificate file \"%s\": %s\n"
-msgstr "޷֤ļ \"%s\": %s\n"
+msgstr "无法打开证书文件 \"%s\": %s\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:649
+#: fe-secure.c:893 fe-secure.c:903
#, c-format
msgid "could not read certificate file \"%s\": %s\n"
-msgstr "޷ȡ֤ļ \"%s\": %s\n"
+msgstr "无法读取证书文件 \"%s\": %s\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:687
+#: fe-secure.c:940
#, c-format
msgid "could not load SSL engine \"%s\": %s\n"
-msgstr "޷SSL \"%s\": %s\n"
+msgstr "无法加载SSL引擎 \"%s\": %s\n"
-#: fe-secure.c:700
+#: fe-secure.c:952
#, c-format
msgid "could not initialize SSL engine \"%s\": %s\n"
-msgstr "޷ʼSSL\"%s\": %s\n"
+msgstr "无法初始化SSL引擎\"%s\": %s\n"
# fe-connect.c:891
-#: fe-secure.c:717
+#: fe-secure.c:968
#, c-format
msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
-msgstr "޷\"%2$s\"ȡ˽SSLԿ\"%1$s\": %3$s\n"
+msgstr "无法从引擎\"%2$s\"读取私有SSL钥\"%1$s\": %3$s\n"
-#: fe-secure.c:752
-#, c-format
-msgid "certificate present, but not private key file \"%s\"\n"
-msgstr "֤, ˽Կļ \"%s\"\n"
-
-# fe-connect.c:2953
-#: fe-secure.c:761
+# fe-connect.c:891
+#: fe-secure.c:982
#, c-format
-msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
-msgstr ": ˽Կļ \"%s\"ķȨ޹; ȨӦ Ϊ u=rw (0600)С\n"
+msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr "无法从引擎\"%2$s\"读取私有SSL钥\"%1$s\": %3$s\n"
-# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:771
+#: fe-secure.c:1017
#, c-format
-msgid "could not open private key file \"%s\": %s\n"
-msgstr "޷˽Կļ \"%s\": %s\n"
+msgid "certificate present, but not private key file \"%s\"\n"
+msgstr "有证书, 但不是私钥文件 \"%s\"\n"
-#: fe-secure.c:782
+# fe-connect.c:2953
+#: fe-secure.c:1025
#, c-format
-msgid "private key file \"%s\" changed during execution\n"
-msgstr "ִй˽Կļ \"%s\" ı\n"
+msgid ""
+"private key file \"%s\" has group or world access; permissions should be "
+"u=rw (0600) or less\n"
+msgstr "警告: 私钥文件 \"%s\"的访问权限过大; 权限应设置 为 u=rw (0600)或更小\n"
-# fe-connect.c:891
-#: fe-secure.c:793
+#: fe-secure.c:1036
#, c-format
-msgid "could not read private key file \"%s\": %s\n"
-msgstr "޷ȡ˽Կļ \"%s\": %s\n"
+msgid "could not load private key file \"%s\": %s\n"
+msgstr "无法装载私钥文件 \"%s\": %s\n"
-#: fe-secure.c:811
+#: fe-secure.c:1050
#, c-format
msgid "certificate does not match private key file \"%s\": %s\n"
-msgstr "֤鲻ƥ˽Կļ \"%s\": %s\n"
-
-#: fe-secure.c:942
-#, c-format
-msgid "could not create SSL context: %s\n"
-msgstr "޷ SSL : %s\n"
-
-#: fe-secure.c:1030
-msgid "could not get home directory to locate root certificate file"
-msgstr "޷homeĿ¼λ֤ļ"
+msgstr "证书不匹配私钥文件 \"%s\": %s\n"
# fe-connect.c:891
-#: fe-secure.c:1054
+#: fe-secure.c:1075
#, c-format
msgid "could not read root certificate file \"%s\": %s\n"
-msgstr "޷ȡ֤ļ \"%s\": %s\n"
+msgstr "无法读取根证书文件 \"%s\": %s\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:1079
+#: fe-secure.c:1099
#, c-format
msgid "SSL library does not support CRL certificates (file \"%s\")\n"
-msgstr "SSLⲻ֧CRL֤(ļ \"%s\")\n"
+msgstr "SSL库不支持CRL认证(文件 \"%s\")\n"
-#: fe-secure.c:1095
+#: fe-secure.c:1120
#, c-format
msgid ""
"root certificate file \"%s\" does not exist\n"
-"Either provide the file or change sslmode to disable server certificate verification.\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
msgstr ""
-"֤ļ\"%s\"\n"
-"ṩļ߽sslmodeΪ÷֤.\n"
+"根认证文件\"%s\"不存在\n"
+"可以提供这个文件或者将sslmode改为禁用服务器认证检验.\n"
-#: fe-secure.c:1192
+#: fe-secure.c:1203
#, c-format
msgid "certificate could not be obtained: %s\n"
-msgstr "޷֤: %s\n"
+msgstr "无法获得证书: %s\n"
-#: fe-secure.c:1220
+#: fe-secure.c:1231
msgid "SSL certificate's common name contains embedded null\n"
-msgstr "SSL֤ͨưǶĿֵ\n"
+msgstr "SSL认证的普通名称包含了嵌入的空值\n"
-#: fe-secure.c:1294
+#: fe-secure.c:1307
msgid "no SSL error reported"
-msgstr "ûбSSL"
+msgstr "没有报告SSL错误"
-#: fe-secure.c:1303
+#: fe-secure.c:1316
#, c-format
msgid "SSL error code %lu"
-msgstr "SSL %lu"
+msgstr "SSL 错误代码 %lu"
+#~ msgid ""
+#~ "verified SSL connections are only supported when connecting to a host name"
+#~ msgstr "只有当正在连接一个主机时才支持检查的SSL连接"
diff --git a/src/interfaces/libpq/po/zh_TW.po b/src/interfaces/libpq/po/zh_TW.po
new file mode 100644
index 00000000000..1e217d0a2af
--- /dev/null
+++ b/src/interfaces/libpq/po/zh_TW.po
@@ -0,0 +1,1039 @@
+# 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:05-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"
+
+# commands/aggregatecmds.c:111
+#: fe-auth.c:212 fe-auth.c:432 fe-auth.c:659
+msgid "host name must be specified\n"
+msgstr "必須指定主機名稱\n"
+
+# fe-auth.c:394
+#: fe-auth.c:242
+#, c-format
+msgid "could not set socket to blocking mode: %s\n"
+msgstr "無法將socket設為阻擋模式:%s\n"
+
+# fe-auth.c:411
+# fe-auth.c:415
+#: fe-auth.c:260 fe-auth.c:264
+#, c-format
+msgid "Kerberos 5 authentication rejected: %*s\n"
+msgstr "kerberos 5認證被拒絕:%*s\n"
+
+# fe-auth.c:441
+#: fe-auth.c:290
+#, c-format
+msgid "could not restore non-blocking mode on socket: %s\n"
+msgstr "無法將socket還原為非阻擋模式:%s\n"
+
+#: fe-auth.c:403
+msgid "GSSAPI continuation error"
+msgstr "GSSAPI 接續錯誤"
+
+#: fe-auth.c:439
+msgid "duplicate GSS authentication request\n"
+msgstr "重複的 GSS 驗證要求\n"
+
+#: fe-auth.c:459
+msgid "GSSAPI name import error"
+msgstr "GSSAPI 名稱匯入錯誤"
+
+#: fe-auth.c:545
+msgid "SSPI continuation error"
+msgstr "SSPI 接續錯誤"
+
+# fe-connect.c:1414
+# fe-connect.c:2544
+# fe-connect.c:2553
+# fe-connect.c:3132
+# fe-lobj.c:556
+# fe-protocol2.c:1007
+# fe-protocol3.c:958
+#: fe-auth.c:556 fe-auth.c:630 fe-auth.c:665 fe-auth.c:762 fe-connect.c:1342
+#: fe-connect.c:2625 fe-connect.c:2842 fe-connect.c:3208 fe-connect.c:3217
+#: fe-connect.c:3354 fe-connect.c:3400 fe-connect.c:3418 fe-exec.c:3110
+#: fe-lobj.c:696 fe-protocol2.c:1027 fe-protocol3.c:1421
+msgid "out of memory\n"
+msgstr "記憶體用盡\n"
+
+# libpq/be-secure.c:807
+#: fe-auth.c:645
+msgid "could not acquire SSPI credentials"
+msgstr "無法取得 SSPI 認證"
+
+# fe-auth.c:508
+#: fe-auth.c:738
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "不支援 SCM_CRED 認證方式\n"
+
+# fe-auth.c:608
+#: fe-auth.c:812
+msgid "Kerberos 4 authentication not supported\n"
+msgstr "不支援Kerberos 4認證方式\n"
+
+# fe-auth.c:627
+#: fe-auth.c:828
+msgid "Kerberos 5 authentication not supported\n"
+msgstr "不支援Kerberos 5認證方式\n"
+
+# fe-auth.c:608
+#: fe-auth.c:895
+msgid "GSSAPI authentication not supported\n"
+msgstr "不支援 GSSAPI 驗證\n"
+
+# fe-auth.c:608
+#: fe-auth.c:919
+msgid "SSPI authentication not supported\n"
+msgstr "不支援 SSPI 驗證\n"
+
+# fe-auth.c:608
+#: fe-auth.c:926
+msgid "Crypt authentication not supported\n"
+msgstr "不支援加密驗證\n"
+
+# fe-auth.c:655
+#: fe-auth.c:953
+#, c-format
+msgid "authentication method %u not supported\n"
+msgstr "不支援 %u 認證方式\n"
+
+# fe-connect.c:452
+#: fe-connect.c:524
+#, c-format
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "無效的sslmode:\"%s\"\n"
+
+# fe-connect.c:472
+#: fe-connect.c:545
+#, c-format
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "編譯時未加入SSL支援,無效的sllmode值\"%s\"\n"
+
+# fe-connect.c:810
+#: fe-connect.c:728
+#, c-format
+msgid "could not set socket to TCP no delay mode: %s\n"
+msgstr "無法將socket設定為TCP無延遲模式:%s\n"
+
+# fe-connect.c:841
+#: fe-connect.c:758
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running locally and accepting\n"
+"\tconnections on Unix domain socket \"%s\"?\n"
+msgstr ""
+"無法連線到伺服器: %s\n"
+"\t伺服器是否在本地執行並且在 Unix domain socket\n"
+"\t\"%s\"上準備接受連線?\n"
+
+# fe-connect.c:853
+#: fe-connect.c:768
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"無法連線到伺服器:%s\n"
+"\t伺服器是否在主機\"%s\"上執行並且準備接受在\n"
+"\t埠號 %s 上的TCP/IP連線?\n"
+
+# fe-connect.c:946
+#: fe-connect.c:858
+#, c-format
+msgid "could not translate host name \"%s\" to address: %s\n"
+msgstr "無法將主機名稱\"%s\"轉換成位址:%s\n"
+
+# fe-connect.c:950
+#: fe-connect.c:862
+#, c-format
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr "無法將Unix-domain socket路徑\"%s\"轉換成位址:%s\n"
+
+# fe-connect.c:1154
+#: fe-connect.c:1069
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "無效的連線狀態,可能是記憶體中的資料被破壞\n"
+
+# fe-connect.c:1197
+#: fe-connect.c:1112
+#, c-format
+msgid "could not create socket: %s\n"
+msgstr "無法建立socket:%s\n"
+
+# fe-connect.c:783
+#: fe-connect.c:1135
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "無法將socket設定為非阻擋模式:%s\n"
+
+# fe-auth.c:394
+#: fe-connect.c:1147
+#, c-format
+msgid "could not set socket to close-on-exec mode: %s\n"
+msgstr "無法將socket設為close-on-exec模式:%s\n"
+
+# fe-connect.c:1308
+#: fe-connect.c:1234
+#, c-format
+msgid "could not get socket error status: %s\n"
+msgstr "無法取得socket的錯誤狀態:%s\n"
+
+# fe-connect.c:1347
+#: fe-connect.c:1272
+#, c-format
+msgid "could not get client address from socket: %s\n"
+msgstr "無法從socket取得客戶端位址:%s\n"
+
+# fe-connect.c:1392
+#: fe-connect.c:1316
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "無法傳送SSL交談封包:%s\n"
+
+# fe-connect.c:1427
+#: fe-connect.c:1355
+#, c-format
+msgid "could not send startup packet: %s\n"
+msgstr "無法傳送啟動封包:%s\n"
+
+# fe-connect.c:1486
+# fe-connect.c:1503
+#: fe-connect.c:1422 fe-connect.c:1441
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "伺服器不支援 SSL,但是被要求使用 SSL\n"
+
+# fe-connect.c:1519
+#: fe-connect.c:1457
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "收到無效的 SSL 交談回應:%c\n"
+
+# fe-connect.c:1576
+# fe-connect.c:1608
+#: fe-connect.c:1533 fe-connect.c:1566
+#, c-format
+msgid "expected authentication request from server, but received %c\n"
+msgstr "期待來自伺服器的認證請求,但是收到 %c\n"
+
+#: fe-connect.c:1737
+#, c-format
+msgid "out of memory allocating GSSAPI buffer (%i)"
+msgstr "配置 GSSAPI 緩衝區時記憶體不足 (%i)"
+
+# fe-connect.c:1844
+#: fe-connect.c:1822
+msgid "unexpected message from server during startup\n"
+msgstr "啟動過程中收到來自伺服器的非預期訊息\n"
+
+# fe-connect.c:1914
+#: fe-connect.c:1890
+#, c-format
+msgid "invalid connection state %c, probably indicative of memory corruption\n"
+msgstr "無效的連線狀態 %c,可能是記憶體中的資料被破壞\n"
+
+#: fe-connect.c:2233 fe-connect.c:2293
+#, c-format
+msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
+msgstr "PGEVT_CONNRESET 事件期間 PGEventProc \"%s\" 失敗\n"
+
+#: fe-connect.c:2638
+#, c-format
+msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
+msgstr "LDAP URL \"%s\" 無效: 類型必須是 ldap://\n"
+
+#: fe-connect.c:2653
+#, c-format
+msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
+msgstr "LDAP URL \"%s\" 無效: 遺漏識別名稱\n"
+
+#: fe-connect.c:2664 fe-connect.c:2717
+#, c-format
+msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
+msgstr "LDAP URL \"%s\" 無效: 只能有一個屬性\n"
+
+#: fe-connect.c:2674 fe-connect.c:2731
+#, c-format
+msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
+msgstr "LDAP URL \"%s\" 無效: 必須有搜尋範圍 (base/one/sub)\n"
+
+#: fe-connect.c:2685
+#, c-format
+msgid "invalid LDAP URL \"%s\": no filter\n"
+msgstr "LDAP URL \"%s\" 無效: 無過濾器\n"
+
+#: fe-connect.c:2706
+#, c-format
+msgid "invalid LDAP URL \"%s\": invalid port number\n"
+msgstr "LDAP URL \"%s\" 無效: 埠號無效\n"
+
+# fe-secure.c:932
+#: fe-connect.c:2740
+msgid "could not create LDAP structure\n"
+msgstr "無法建立 LDAP 結構\n"
+
+#: fe-connect.c:2782
+#, c-format
+msgid "lookup on LDAP server failed: %s\n"
+msgstr "查閱 LDAP 伺服器失敗:%s\n"
+
+#: fe-connect.c:2793
+msgid "more than one entry found on LDAP lookup\n"
+msgstr "LDAP 查閱作業找到多個項目\n"
+
+#: fe-connect.c:2794 fe-connect.c:2806
+msgid "no entry found on LDAP lookup\n"
+msgstr "LDAP 查閱作業找不到項目\n"
+
+#: fe-connect.c:2817 fe-connect.c:2830
+msgid "attribute has no values on LDAP lookup\n"
+msgstr "用於 LDAP 查閱作業的屬性沒有值\n"
+
+# fe-connect.c:2592
+#: fe-connect.c:2881 fe-connect.c:2899 fe-connect.c:3256
+#, c-format
+msgid "missing \"=\" after \"%s\" in connection info string\n"
+msgstr "在連線資訊字串裡的 \"%s\" 後面缺少 \"=\"\n"
+
+# fe-connect.c:2675
+#: fe-connect.c:2962 fe-connect.c:3338
+#, c-format
+msgid "invalid connection option \"%s\"\n"
+msgstr "無效的連線選項 \"%s\"\n"
+
+# fe-connect.c:2641
+#: fe-connect.c:2975 fe-connect.c:3305
+msgid "unterminated quoted string in connection info string\n"
+msgstr "連線資訊字串中有未結束的引號\n"
+
+#: fe-connect.c:3018
+#, c-format
+msgid "ERROR: service file \"%s\" not found\n"
+msgstr "錯誤: 找不到服務檔 \"%s\"\n"
+
+#: fe-connect.c:3031
+#, c-format
+msgid "ERROR: line %d too long in service file \"%s\"\n"
+msgstr "錯誤: 行 %d 過長 (在 服務檔 \"%s\" 中)\n"
+
+# guc-file.l:267
+#: fe-connect.c:3103 fe-connect.c:3130
+#, c-format
+msgid "ERROR: syntax error in service file \"%s\", line %d\n"
+msgstr "錯誤: 服務檔出現語法錯誤 \"%s\",位於行 %d\n"
+
+# fe-connect.c:2897
+#: fe-connect.c:3586
+msgid "connection pointer is NULL\n"
+msgstr "連線指標是 NULL\n"
+
+#: fe-connect.c:3869
+#, c-format
+msgid "WARNING: password file \"%s\" is not a plain file\n"
+msgstr "警告: 密碼檔 \"%s\" 不是純文字檔\n"
+
+# fe-connect.c:3154
+#: fe-connect.c:3878
+#, c-format
+msgid ""
+"WARNING: password file \"%s\" has group or world access; permissions should "
+"be u=rw (0600) or less\n"
+msgstr ""
+"警告: 密碼檔 \"%s\" 可以被群組或其他使用者存取,應該將權限設為 be u=rw "
+"(0600) 或更少\n"
+
+# fe-exec.c:484
+#: fe-exec.c:827
+msgid "NOTICE"
+msgstr "注意"
+
+# fe-exec.c:653
+# fe-exec.c:705
+# fe-exec.c:745
+#: fe-exec.c:1014 fe-exec.c:1071 fe-exec.c:1111
+msgid "command string is a null pointer\n"
+msgstr "命令字串是一個空指標\n"
+
+# fe-exec.c:738
+# fe-exec.c:828
+#: fe-exec.c:1104 fe-exec.c:1199
+msgid "statement name is a null pointer\n"
+msgstr "敘述名稱是一個空指標\n"
+
+# fe-exec.c:753
+# fe-exec.c:902
+# fe-exec.c:1577
+#: fe-exec.c:1119 fe-exec.c:1273 fe-exec.c:1928 fe-exec.c:2125
+msgid "function requires at least protocol version 3.0\n"
+msgstr "函式需要3.0版以上的協定\n"
+
+# fe-exec.c:859
+#: fe-exec.c:1230
+msgid "no connection to the server\n"
+msgstr "沒有連線到伺服器\n"
+
+# fe-exec.c:866
+#: fe-exec.c:1237
+msgid "another command is already in progress\n"
+msgstr "另外一條命令正在執行中\n"
+
+#: fe-exec.c:1349
+msgid "length must be given for binary parameter\n"
+msgstr "必須指定二進位參數的長度\n"
+
+# fe-exec.c:1204
+#: fe-exec.c:1596
+#, c-format
+msgid "unexpected asyncStatus: %d\n"
+msgstr "非預期的asyncStatus:%d\n"
+
+#: fe-exec.c:1616
+#, c-format
+msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
+msgstr "PGEVT_RESULTCREATE 事件期間 PGEventProc \"%s\" 失敗\n"
+
+# fe-exec.c:1331
+#: fe-exec.c:1746
+msgid "COPY terminated by new PQexec"
+msgstr "COPY被新的PQexec中斷"
+
+# fe-exec.c:1339
+#: fe-exec.c:1754
+msgid "COPY IN state must be terminated first\n"
+msgstr "必須先結束 COPY IN 狀態\n"
+
+# fe-exec.c:1359
+#: fe-exec.c:1774
+msgid "COPY OUT state must be terminated first\n"
+msgstr "必須先結束 COPY OUT 狀態\n"
+
+# fe-exec.c:1469
+# fe-exec.c:1534
+# fe-exec.c:1619
+# fe-protocol2.c:1153
+# fe-protocol3.c:1115
+#: fe-exec.c:2016 fe-exec.c:2082 fe-exec.c:2167 fe-protocol2.c:1172
+#: fe-protocol3.c:1557
+msgid "no COPY in progress\n"
+msgstr "沒有執行中的 COPY 命令\n"
+
+# fe-exec.c:1811
+#: fe-exec.c:2359
+msgid "connection in wrong state\n"
+msgstr "連線處於錯誤的狀態\n"
+
+# fe-exec.c:1842
+#: fe-exec.c:2390
+msgid "invalid ExecStatusType code"
+msgstr "無效的 ExecStatusType 代碼"
+
+# fe-exec.c:1906
+# fe-exec.c:1929
+#: fe-exec.c:2454 fe-exec.c:2477
+#, c-format
+msgid "column number %d is out of range 0..%d"
+msgstr "列號 %d 超出了範圍 0..%d"
+
+# fe-exec.c:1922
+#: fe-exec.c:2470
+#, c-format
+msgid "row number %d is out of range 0..%d"
+msgstr "行號 %d 超出了範圍 0..%d"
+
+# fe-exec.c:1922
+#: fe-exec.c:2492
+#, c-format
+msgid "parameter number %d is out of range 0..%d"
+msgstr "參數編號 %d 超出了範圍 0..%d"
+
+# fe-exec.c:2204
+#: fe-exec.c:2779
+#, c-format
+msgid "could not interpret result from server: %s"
+msgstr "無法解讀來自伺服器的結果:%s"
+
+# postmaster/postmaster.c:1256 postmaster/postmaster.c:1287
+#: fe-exec.c:3018
+msgid "incomplete multibyte character\n"
+msgstr "多位元組字元不完整\n"
+
+# fe-lobj.c:653
+#: fe-lobj.c:152
+msgid "cannot determine OID of function lo_truncate\n"
+msgstr "無法判斷函式 lo_truncate 的 OID\n"
+
+# fe-lobj.c:653
+#: fe-lobj.c:380
+msgid "cannot determine OID of function lo_create\n"
+msgstr "無法判斷函式 lo_create 的 OID\n"
+
+# fe-lobj.c:410
+# fe-lobj.c:495
+#: fe-lobj.c:525 fe-lobj.c:624
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "無法開啟檔案 \"%s\":%s\n"
+
+# utils/init/miscinit.c:792 utils/misc/guc.c:5074
+#: fe-lobj.c:575
+#, c-format
+msgid "could not read from file \"%s\": %s\n"
+msgstr "無法讀取檔案 \"%s\":%s\n"
+
+# access/transam/xlog.c:1555 access/transam/xlog.c:1679
+# access/transam/xlog.c:2964 access/transam/xlog.c:3002 commands/copy.c:1117
+# commands/tablespace.c:668 commands/tablespace.c:674
+# postmaster/postmaster.c:3430 utils/init/miscinit.c:832
+# utils/init/miscinit.c:841 utils/misc/guc.c:4934 utils/misc/guc.c:4998
+#: fe-lobj.c:639 fe-lobj.c:663
+#, c-format
+msgid "could not write to file \"%s\": %s\n"
+msgstr "無法寫入檔案 \"%s\":%s\n"
+
+# fe-lobj.c:601
+#: fe-lobj.c:744
+msgid "query to initialize large object functions did not return data\n"
+msgstr "初始化大型物件函式的查詢沒有傳回資料\n"
+
+# fe-lobj.c:639
+#: fe-lobj.c:785
+msgid "cannot determine OID of function lo_open\n"
+msgstr "無法判斷函式 lo_open 的 OID\n"
+
+# fe-lobj.c:646
+#: fe-lobj.c:792
+msgid "cannot determine OID of function lo_close\n"
+msgstr "無法判斷函式 lo_close 的 OID\n"
+
+# fe-lobj.c:653
+#: fe-lobj.c:799
+msgid "cannot determine OID of function lo_creat\n"
+msgstr "無法判斷函式 lo_creat 的 OID\n"
+
+# fe-lobj.c:660
+#: fe-lobj.c:806
+msgid "cannot determine OID of function lo_unlink\n"
+msgstr "無法判斷函式 lo_unlink 的 OID\n"
+
+# fe-lobj.c:667
+#: fe-lobj.c:813
+msgid "cannot determine OID of function lo_lseek\n"
+msgstr "無法判斷函式 lo_lseek 的 OID\n"
+
+# fe-lobj.c:674
+#: fe-lobj.c:820
+msgid "cannot determine OID of function lo_tell\n"
+msgstr "無法判斷懽式 lo_tell 的 OID\n"
+
+# fe-lobj.c:681
+#: fe-lobj.c:827
+msgid "cannot determine OID of function loread\n"
+msgstr "無法判斷函式 loread 的 OID\n"
+
+# fe-lobj.c:688
+#: fe-lobj.c:834
+msgid "cannot determine OID of function lowrite\n"
+msgstr "無法判斷函式 lowrite 的 OID\n"
+
+# fe-misc.c:228
+#: fe-misc.c:262
+#, c-format
+msgid "integer of size %lu not supported by pqGetInt"
+msgstr "pgGetInt不支援大小為 %lu 的整數 "
+
+# fe-misc.c:264
+#: fe-misc.c:298
+#, c-format
+msgid "integer of size %lu not supported by pqPutInt"
+msgstr "pgPutInt不支援大小為 %lu 的整數"
+
+# fe-misc.c:544
+# fe-misc.c:748
+#: fe-misc.c:578 fe-misc.c:780
+msgid "connection not open\n"
+msgstr "連線未開啟\n"
+
+# fe-misc.c:610
+# fe-misc.c:701
+#: fe-misc.c:643 fe-misc.c:733
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "無法從伺服器接收資料:%s\n"
+
+# fe-misc.c:718
+# fe-misc.c:786
+#: fe-misc.c:750 fe-misc.c:828
+msgid ""
+"server closed the connection unexpectedly\n"
+"\tThis probably means the server terminated abnormally\n"
+"\tbefore or while processing the request.\n"
+msgstr ""
+"伺服器意外地中斷了連線\n"
+"\t可能是伺服器在處理請求之前\n"
+"\t或者正在處理請求的時候不正常中止\n"
+
+# fe-misc.c:803
+#: fe-misc.c:845
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "無法向伺服器傳送資料:%s\n"
+
+# fe-misc.c:923
+#: fe-misc.c:964
+msgid "timeout expired\n"
+msgstr "發生逾時\n"
+
+# fe-misc.c:968
+#: fe-misc.c:1009
+msgid "socket not open\n"
+msgstr "socket 未開啟\n"
+
+# fe-misc.c:991
+#: fe-misc.c:1032
+#, c-format
+msgid "select() failed: %s\n"
+msgstr "select()失敗:%s\n"
+
+# fe-protocol2.c:91
+#: fe-protocol2.c:89
+#, c-format
+msgid "invalid setenv state %c, probably indicative of memory corruption\n"
+msgstr "無效的setenv狀態 %c,可能是記憶體中的資料被破壞\n"
+
+# fe-protocol2.c:333
+#: fe-protocol2.c:330
+#, c-format
+msgid "invalid state %c, probably indicative of memory corruption\n"
+msgstr "無效的狀態 %c,可能是記憶體中的資料被破壞\n"
+
+# fe-protocol2.c:423
+# fe-protocol3.c:183
+#: fe-protocol2.c:419 fe-protocol3.c:186
+#, c-format
+msgid "message type 0x%02x arrived from server while idle"
+msgstr "閒置時收到伺服器送來類型為0x%02x的訊息"
+
+# fe-protocol2.c:462
+#: fe-protocol2.c:462
+#, c-format
+msgid "unexpected character %c following empty query response (\"I\" message)"
+msgstr "空的查詢回應(\"I\"訊息)後跟隨非預期字元 %c"
+
+# fe-protocol2.c:517
+#: fe-protocol2.c:516
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)"
+msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)"
+
+# fe-protocol2.c:533
+#: fe-protocol2.c:532
+msgid ""
+"server sent binary data (\"B\" message) without prior row description (\"T\" "
+"message)"
+msgstr "伺服器傳送二元資料(\"B\"訊息)而未提供資料行描述(\"T\"訊息)"
+
+# fe-protocol2.c:548
+# fe-protocol3.c:344
+#: fe-protocol2.c:547 fe-protocol3.c:382
+#, c-format
+msgid "unexpected response from server; first received character was \"%c\"\n"
+msgstr "非預期的伺服器回應,收到的第一個字元是\"%c\"\n"
+
+# fe-protocol2.c:760
+# fe-protocol3.c:577
+#: fe-protocol2.c:768 fe-protocol3.c:701
+msgid "out of memory for query result\n"
+msgstr "查詢結果用盡記憶體\n"
+
+# commands/vacuum.c:2258 commands/vacuumlazy.c:489 commands/vacuumlazy.c:770
+# nodes/print.c:86 storage/lmgr/deadlock.c:888 tcop/postgres.c:3285
+#: fe-protocol2.c:1215 fe-protocol3.c:1625
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+# fe-protocol2.c:1208
+#: fe-protocol2.c:1227
+msgid "lost synchronization with server, resetting connection"
+msgstr "無法與伺服器協調,重置連線"
+
+# fe-protocol2.c:1343
+# fe-protocol2.c:1375
+# fe-protocol3.c:1387
+#: fe-protocol2.c:1361 fe-protocol2.c:1393 fe-protocol3.c:1828
+#, c-format
+msgid "protocol error: id=0x%x\n"
+msgstr "協定錯誤:id=0x%x\n"
+
+# fe-protocol3.c:306
+#: fe-protocol3.c:344
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)\n"
+msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)\n"
+
+# fe-protocol3.c:365
+#: fe-protocol3.c:403
+#, c-format
+msgid "message contents do not agree with length in message type \"%c\"\n"
+msgstr "訊息類型\"%c\"的長度與訊息內容不符\n"
+
+# fe-protocol3.c:386
+#: fe-protocol3.c:424
+#, c-format
+msgid "lost synchronization with server: got message type \"%c\", length %d\n"
+msgstr "無法與伺服器協調:收到訊息類型\"%c\",長度 %d\n"
+
+# fe-protocol3.c:522
+#: fe-protocol3.c:646
+msgid "unexpected field count in \"D\" message\n"
+msgstr "非預期的\"D\"訊息欄位數\n"
+
+# translator: %s represents a digit string
+# translator: %s represents a digit string
+# fe-protocol3.c:651
+# fe-protocol3.c:659
+#. translator: %s represents a digit string
+#: fe-protocol3.c:788 fe-protocol3.c:807
+#, c-format
+msgid " at character %s"
+msgstr "於字元 %s"
+
+# fe-protocol3.c:668
+#: fe-protocol3.c:820
+#, c-format
+msgid "DETAIL: %s\n"
+msgstr "詳細資料:%s\n"
+
+# fe-protocol3.c:671
+#: fe-protocol3.c:823
+#, c-format
+msgid "HINT: %s\n"
+msgstr "提示:%s\n"
+
+# fe-protocol3.c:674
+#: fe-protocol3.c:826
+#, c-format
+msgid "QUERY: %s\n"
+msgstr "查詢:%s\n"
+
+# fe-protocol3.c:677
+#: fe-protocol3.c:829
+#, c-format
+msgid "CONTEXT: %s\n"
+msgstr "上下文:%s\n"
+
+# fe-protocol3.c:689
+#: fe-protocol3.c:841
+msgid "LOCATION: "
+msgstr "位置:"
+
+# fe-protocol3.c:691
+#: fe-protocol3.c:843
+#, c-format
+msgid "%s, "
+msgstr "%s, "
+
+# fe-protocol3.c:693
+#: fe-protocol3.c:845
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#: fe-protocol3.c:1069
+#, c-format
+msgid "LINE %d: "
+msgstr "行 %d:"
+
+# fe-protocol3.c:1000
+#: fe-protocol3.c:1453
+msgid "PQgetline: not doing text COPY OUT\n"
+msgstr "PQgetline:不進行文字COPY OUT\n"
+
+# fe-secure.c:264
+#: fe-secure.c:241
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "無法建立 SSL 連線:%s\n"
+
+# fe-secure.c:330
+# fe-secure.c:415
+# fe-secure.c:1038
+#: fe-secure.c:318 fe-secure.c:403 fe-secure.c:1140
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "SSL SYSCALL錯誤:%s\n"
+
+# fe-secure.c:335
+# fe-secure.c:420
+# fe-secure.c:1042
+#: fe-secure.c:324 fe-secure.c:409 fe-secure.c:1144
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "SSL SYSCALL錯誤:發現EOF\n"
+
+# fe-secure.c:347
+# fe-secure.c:431
+# fe-secure.c:1051
+#: fe-secure.c:336 fe-secure.c:420 fe-secure.c:1163
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "SSL 錯誤:%s\n"
+
+# fe-secure.c:357
+# fe-secure.c:441
+# fe-secure.c:1059
+#: fe-secure.c:346 fe-secure.c:430 fe-secure.c:1173
+#, c-format
+msgid "unrecognized SSL error code: %d\n"
+msgstr "無法識別的SSL錯誤碼:%d\n"
+
+# commands/aggregatecmds.c:111
+#: fe-secure.c:539
+#, fuzzy
+msgid "host name must be specified for a verified SSL connection\n"
+msgstr "必須指定主機名稱\n"
+
+# fe-secure.c:580
+#: fe-secure.c:558
+#, fuzzy, c-format
+msgid "server common name \"%s\" does not match host name \"%s\"\n"
+msgstr "伺服器的一般名稱 \"%s\" 不符合主機名稱 \"%s\""
+
+# libpq/be-secure.c:714
+#: fe-secure.c:600
+msgid "could not get home directory to locate client certificate files"
+msgstr "無法取得用來找出用戶端憑證檔的主目錄"
+
+# fe-secure.c:775
+#: fe-secure.c:624 fe-secure.c:638
+#, c-format
+msgid "could not open certificate file \"%s\": %s\n"
+msgstr "無法開啟憑證檔\"%s\":%s\n"
+
+# fe-secure.c:784
+#: fe-secure.c:649
+#, c-format
+msgid "could not read certificate file \"%s\": %s\n"
+msgstr "無法讀取憑證檔\"%s\":%s\n"
+
+# fe-lobj.c:410
+# fe-lobj.c:495
+#: fe-secure.c:687
+#, c-format
+msgid "could not load SSL engine \"%s\": %s\n"
+msgstr "無法載入 SSL 引擎 \"%s\":%s\n"
+
+# libpq/be-secure.c:789
+#: fe-secure.c:700
+#, c-format
+msgid "could not initialize SSL engine \"%s\": %s\n"
+msgstr "無法初始化 SSL 引擎 \"%s\":%s\n"
+
+# fe-secure.c:833
+#: fe-secure.c:717
+#, c-format
+msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
+msgstr "無法讀取私密 SSL 金鑰 \"%s\" (從引擎 \"%s\"):%s\n"
+
+# fe-secure.c:798
+#: fe-secure.c:752
+#, c-format
+msgid "certificate present, but not private key file \"%s\"\n"
+msgstr "發現憑證,但是沒有私鑰檔\"%s\"\n"
+
+# fe-connect.c:3154
+#: fe-secure.c:761
+#, c-format
+msgid ""
+"private key file \"%s\" has group or world access; permissions should be "
+"u=rw (0600) or less\n"
+msgstr ""
+"私鑰檔 \"%s\" 可以被群組或其他使用者存取,應該將權限設為 u=rw (0600) 或更"
+"少\n"
+
+# fe-secure.c:815
+#: fe-secure.c:771
+#, c-format
+msgid "could not open private key file \"%s\": %s\n"
+msgstr "無法開啟私鑰檔\"%s\":%s\n"
+
+# fe-secure.c:824
+#: fe-secure.c:782
+#, c-format
+msgid "private key file \"%s\" changed during execution\n"
+msgstr "私鑰檔\"%s\"在執行過程中被改變\n"
+
+# fe-secure.c:833
+#: fe-secure.c:793
+#, c-format
+msgid "could not read private key file \"%s\": %s\n"
+msgstr "無法讀取私鑰檔\"%s\":%s\n"
+
+# fe-secure.c:848
+#: fe-secure.c:811
+#, c-format
+msgid "certificate does not match private key file \"%s\": %s\n"
+msgstr "憑證與私鑰檔\"%s\"不符:%s\n"
+
+# fe-secure.c:932
+#: fe-secure.c:942
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "無法建立SSL context:%s\n"
+
+# libpq/be-secure.c:714
+#: fe-secure.c:1030
+msgid "could not get home directory to locate root certificate file"
+msgstr "無法取得用來找出根憑證檔的主目錄"
+
+# fe-secure.c:977
+#: fe-secure.c:1054
+#, c-format
+msgid "could not read root certificate file \"%s\": %s\n"
+msgstr "無法讀取根憑證檔\"%s\":%s\n"
+
+# fe-secure.c:775
+#: fe-secure.c:1079
+#, c-format
+msgid "SSL library does not support CRL certificates (file \"%s\")\n"
+msgstr "SSL 程式庫不支援 CRL 憑證 (檔案 \"%s\")\n"
+
+#: fe-secure.c:1095
+#, c-format
+msgid ""
+"root certificate file \"%s\" does not exist\n"
+"Either provide the file or change sslmode to disable server certificate "
+"verification.\n"
+msgstr ""
+"根憑證檔 \"%s\" 不存在\n"
+"請提供檔案,或變更 sslmode 以停用伺服器憑證驗證。\n"
+
+# fe-secure.c:1093
+#: fe-secure.c:1192
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "無法取得憑證:%s\n"
+
+#: fe-secure.c:1220
+msgid "SSL certificate's common name contains embedded null\n"
+msgstr "SSL 憑證的一般名稱包含內嵌的 Null\n"
+
+# libpq/be-secure.c:303 libpq/be-secure.c:396
+#: fe-secure.c:1294
+msgid "no SSL error reported"
+msgstr "未回報 SSL 錯誤"
+
+# libpq/be-secure.c:294 libpq/be-secure.c:387
+#: fe-secure.c:1303
+#, c-format
+msgid "SSL error code %lu"
+msgstr "SSL 錯誤代碼 %lu"
+
+# fe-auth.c:692
+msgid "invalid authentication service name \"%s\", ignored\n"
+msgstr "忽略非法的認證服務名稱\"%s\"\n"
+
+# fe-auth.c:764
+msgid "fe_getauthname: invalid authentication system: %d\n"
+msgstr "fe_getauthname:無效的認證系統:%d\n"
+
+# fe-lobj.c:447
+msgid "error while reading file \"%s\"\n"
+msgstr "讀取檔案 \"%s\" 時發生錯誤\n"
+
+# fe-secure.c:504
+msgid "error querying socket: %s\n"
+msgstr "詢問socket發生錯誤:%s\n"
+
+# fe-secure.c:551
+msgid "unsupported protocol\n"
+msgstr "不被支援的協定\n"
+
+# fe-secure.c:347
+# fe-secure.c:431
+# fe-secure.c:1051
+#, fuzzy
+#~ msgid "Kerberos 4 error: %s\n"
+#~ msgstr "SSL 錯誤:%s\n"
+
+# fe-auth.c:608
+#, fuzzy
+#~ msgid "Kerberos 4 authentication failed\n"
+#~ msgstr "不支援Kerberos 4認證方式\n"
+
+# fe-auth.c:411
+# fe-auth.c:415
+#, fuzzy
+#~ msgid "Kerberos 5 authentication failed\n"
+#~ msgstr "kerberos 5認證被拒絕:%*s\n"
+
+# fe-connect.c:1392
+#, fuzzy
+#~ msgid "could not receive server response to SSL negotiation packet: %s\n"
+#~ msgstr "無法傳送SSL交談封包:%s\n"
+
+# access/transam/xlog.c:1555 access/transam/xlog.c:1679
+# access/transam/xlog.c:2964 access/transam/xlog.c:3002 commands/copy.c:1117
+# commands/tablespace.c:668 commands/tablespace.c:674
+# postmaster/postmaster.c:3430 utils/init/miscinit.c:832
+# utils/init/miscinit.c:841 utils/misc/guc.c:4934 utils/misc/guc.c:4998
+#, fuzzy
+#~ msgid "could not create large object for file \"%s\"\n"
+#~ msgstr "無法寫入檔案 \"%s\":%s\n"
+
+# fe-lobj.c:410
+# fe-lobj.c:495
+#, fuzzy
+#~ msgid "could not open large object %u\n"
+#~ msgstr "無法開啟檔案 \"%s\":%s\n"
+
+# access/transam/xlog.c:1555 access/transam/xlog.c:1679
+# access/transam/xlog.c:2964 access/transam/xlog.c:3002 commands/copy.c:1117
+# commands/tablespace.c:668 commands/tablespace.c:674
+# postmaster/postmaster.c:3430 utils/init/miscinit.c:832
+# utils/init/miscinit.c:841 utils/misc/guc.c:4934 utils/misc/guc.c:4998
+#, fuzzy
+#~ msgid "error while writing to file \"%s\"\n"
+#~ msgstr "無法寫入檔案 \"%s\":%s\n"
+
+# utils/init/miscinit.c:792 utils/misc/guc.c:5074
+#, fuzzy
+#~ msgid "could not get information about host \"%s\": %s\n"
+#~ msgstr "無法讀取檔案 \"%s\":%s\n"
+
+# fe-secure.c:580
+#, fuzzy
+#~ msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+#~ msgstr "伺服器的一般名稱 \"%s\" 不符合主機名稱 \"%s\""
+
+# fe-connect.c:1308
+#, fuzzy
+#~ msgid "could not get user information\n"
+#~ msgstr "無法取得socket的錯誤狀態:%s\n"
+
+# fe-secure.c:824
+#, fuzzy
+#~ msgid "private key file \"%s\" has wrong permissions\n"
+#~ msgstr "私鑰檔\"%s\"在執行過程中被改變\n"
+
+# fe-secure.c:1093
+#, fuzzy
+#~ msgid "certificate could not be validated: %s\n"
+#~ msgstr "無法取得憑證:%s\n"
+
+#~ msgid ""
+#~ "verified SSL connections are only supported when connecting to a host name"
+#~ msgstr "只有在連線到主機名稱時,才支援經驗證的 SSL 連線"