Translation updates

50634c13 · Peter Eisentraut · 4a513ab0 · 50634c13 · 50634c13 · 50634c13
Commit 50634c13 authored Oct 14, 2002 by Peter Eisentraut
19 changed files
--- a/src/backend/po/ru.po
+++ b/src/backend/po/ru.po
--- a/src/backend/po/sv.po
+++ b/src/backend/po/sv.po
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/nls.mk,v 1.2 2002/09/02 22:22:12 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/nls.mk,v 1.3 2002/10/14 19:04:28 petere Exp $
 CATALOG_NAME	:= pg_controldata
-AVAIL_LANGUAGES	:= de es ru sv
+AVAIL_LANGUAGES	:= de es pt_BR ru sv zh_CN
 GETTEXT_FILES	:= pg_controldata.c
 GETTEXT_TRIGGERS:= _
--- a/src/bin/pg_controldata/po/pt_BR.po
+++ b/src/bin/pg_controldata/po/pt_BR.po
+# Translation to Portuguese (Brazilian) language
+# Cesar Suga <sartre@linuxbr.com>, 2002.
+# Fair & Simple Networks Ltda.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-29 04:16-0400\n"
+"PO-Revision-Date: 2002-07-20 17:25-0300\n"
+"Last-Translator: Cesar Suga <sartre@linuxbr.com>\n"
+"Language-Team: Cesar Suga <sartre@linuxbr.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: pg_controldata.c:28
+#, c-format
+msgid "%s displays PostgreSQL database cluster control information.\n"
+msgstr "%s mostra informaes de controle de cluster de banco de dados de PostgreSQL.\n"
+#: pg_controldata.c:29
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DATADIR]\n"
+"\n"
+msgstr ""
+"Uso:\n"
+"  %s [DATADIR]\n"
+"\n"
+#: pg_controldata.c:30
+msgid ""
+"If not data directory is specified, the environment variable PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"Se o diretrio de dados no for especificado, a varivel de sistema\n"
+"PGDATA  utilizada.\n"
+"\n"
+#: pg_controldata.c:31
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Reporte bugs a <pgsql-bugs@postgresql.org>.\n"
+#: pg_controldata.c:41
+msgid "starting up"
+msgstr "iniciando operaes"
+#: pg_controldata.c:43
+msgid "shut down"
+msgstr "desligar"
+#: pg_controldata.c:45
+msgid "shutting down"
+msgstr "desligando"
+#: pg_controldata.c:47
+msgid "in recovery"
+msgstr "em recovery"
+#: pg_controldata.c:49
+msgid "in production"
+msgstr "em produo"
+#: pg_controldata.c:51
+msgid "unrecognized status code"
+msgstr "cdigo de estado no reconhecido"
+#: pg_controldata.c:99
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: nenhum diretrio de dados especificado\n"
+#: pg_controldata.c:107
+#, c-format
+msgid "%s: could not open file \"%s\" for reading (%s)\n"
+msgstr "%s: no pude abrir arquivo \"%s\" para leitura (%s)\n"
+#: pg_controldata.c:114
+#, c-format
+msgid "%s: could not read file \"%s\" (%s)\n"
+msgstr "%s: no pude ler arquivo \"%s\" (%s)\n"
+#: pg_controldata.c:128
+msgid ""
+"WARNING: Calculated CRC checksum does not match value stored in file.\n"
+"Either the file is corrupt, or it has a different layout than this program\n"
+"is expecting.  The results below are untrustworthy.\n"
+"\n"
+msgstr ""
+"AVISO: A soma calculada de CRC no  a mesma do valor armazenado no arquivo.\n"
+"Ou o arquivo est corrompido ou tem um layout diferente do que este programa\n"
+"est esperando.  Os resultados abaixo no so confiveis.\n"
+#: pg_controldata.c:141
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "verso do pg_control nmero:          %u\n"
+#: pg_controldata.c:142
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Nmero de verso de catlogo:         %u\n"
+#: pg_controldata.c:143
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "Estado do cluster de banco:           %s\n"
+#: pg_controldata.c:144
+#, c-format
+msgid "pg_control last modified:             %s\n"
+msgstr "ltima modificao do pg_control:     %s\n"
+#: pg_controldata.c:145
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "ID de arquivo de log atual:           %u\n"
+#: pg_controldata.c:146
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "Prximo segmento de arquivo de log:   %u\n"
+#: pg_controldata.c:147
+#, c-format
+msgid "Latest checkpoint location:           %X/%X\n"
+msgstr "ltimo lugar de checkpoint:           %X/%X\n"
+#: pg_controldata.c:149
+#, c-format
+msgid "Prior checkpoint location:            %X/%X\n"
+msgstr "Lugar de checkpoint anterior:         %X/%X\n"
+#: pg_controldata.c:151
+#, c-format
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgstr "ltimo lugar de REDO no checkpoint:   %X/%X\n"
+#: pg_controldata.c:153
+#, c-format
+msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+msgstr "ltimo lugar de UNDO no checkpoint:   %X/%X\n"
+#: pg_controldata.c:155
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "ltimo StartUpID no checkpoint:       %u\n"
+#: pg_controldata.c:156
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "ltimo NextXID do checkpoint:         %u\n"
+#: pg_controldata.c:157
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "ltimo NextOID do checkpoint:         %u\n"
+#: pg_controldata.c:158
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "Hora do ltimo checkpoint:            %s\n"
+#: pg_controldata.c:159
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Tamanho de bloco do banco de dados:   %u\n"
+#: pg_controldata.c:160
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Blocos/segmento de relao grande:   %u\n"
+#: pg_controldata.c:161
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Tamanho mximo de identificadores:    %u\n"
+#: pg_controldata.c:162
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "Nro. mximo de argumentos de funo:  %u\n"
+#: pg_controldata.c:163
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Uso em disco do tipo date/time:       %s\n"
+#: pg_controldata.c:164
+msgid "64-bit integers"
+msgstr "Nmeros de 64 bits"
+#: pg_controldata.c:164
+msgid "Floating point"
+msgstr "Ponto flutuante"
+#: pg_controldata.c:165
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "Mximo tamanho do nome de localidade: %u\n"
+#: pg_controldata.c:166
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+#: pg_controldata.c:167
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
--- a/src/bin/pg_controldata/po/zh_CN.po
+++ b/src/bin/pg_controldata/po/zh_CN.po
+# simplified Chinese translation file for pg_controldata and friends
+# Bao Wei <weibao@forevertek.com>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-27 13:21+0800\n"
+"PO-Revision-Date: 2002-09-19 16:45+0800\n"
+"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: pg_controldata.c:28
+#, c-format
+msgid "%s displays PostgreSQL database cluster control information.\n"
+msgstr "%s 显示 PostgreSQL 数据库簇控制信息.\n"
+#: pg_controldata.c:29
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DATADIR]\n"
+"\n"
+msgstr ""
+"使用方法:\n"
+"  %s [数据目录]\n"
+"\n"
+#: pg_controldata.c:30
+msgid ""
+"If not data directory is specified, the environment variable PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"如果没有指定数据目录, 将使用\n"
+"环境变量PGDATA.\n"
+"\n"
+#: pg_controldata.c:31
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "报告错误至 <pgsql-bugs@postgresql.org>.\n"
+#: pg_controldata.c:41
+msgid "starting up"
+msgstr "正在启动"
+#: pg_controldata.c:43
+msgid "shut down"
+msgstr "关闭"
+#: pg_controldata.c:45
+msgid "shutting down"
+msgstr "正在关闭"
+#: pg_controldata.c:47
+msgid "in recovery"
+msgstr "在恢复中"
+#: pg_controldata.c:49
+msgid "in production"
+msgstr "在运行中"
+#: pg_controldata.c:51
+msgid "unrecognized status code"
+msgstr "不被认可的状态码"
+#: pg_controldata.c:99
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: 没有指定数据目录\n"
+#: pg_controldata.c:107
+#, c-format
+msgid "%s: could not open file \"%s\" for reading (%s)\n"
+msgstr "%s: 无法打开文件 \"%s\" 读取信息 (%s)\n"
+#: pg_controldata.c:114
+#, c-format
+msgid "%s: could not read file \"%s\" (%s)\n"
+msgstr "%s: 无法读取文件 \"%s\" (%s)\n"
+#: pg_controldata.c:128
+msgid ""
+"WARNING: Calculated CRC checksum does not match value stored in file.\n"
+"Either the file is corrupt, or it has a different layout than this program\n"
+"is expecting.  The results below are untrustworthy.\n"
+"\n"
+msgstr ""
+"警告: 计算出来的CRC校验值与已保存在文件中的值不匹配.\n"
+"不是文件坏了,就是设计与程序的期望值不同.\n"
+"下面的结果是不可靠的.\n"
+"\n"
+#: pg_controldata.c:141
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control 版本:            %u\n"
+#: pg_controldata.c:142
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Catalog 版本:               %u\n"
+#: pg_controldata.c:143
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "数据库簇状态:               %s\n"
+#: pg_controldata.c:144
+#, c-format
+msgid "pg_control last modified:             %s\n"
+msgstr "pg_control 最后修改:             %s\n"
+#: pg_controldata.c:145
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "当前日志文件ID:                  %u\n"
+#: pg_controldata.c:146
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "下一个日志文件段:                %u\n"
+#: pg_controldata.c:147
+#, c-format
+msgid "Latest checkpoint location:           %X/%X\n"
+msgstr "最新检查点位置:           %X/%X\n"
+#: pg_controldata.c:149
+#, c-format
+msgid "Prior checkpoint location:            %X/%X\n"
+msgstr "优先检查点位置:            %X/%X\n"
+#: pg_controldata.c:151
+#, c-format
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgstr "最新检查点的 REDO 位置:    %X/%X\n"
+#: pg_controldata.c:153
+#, c-format
+msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+msgstr "最新检查点的 UNDO 位置:    %X/%X\n"
+#: pg_controldata.c:155
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "最新检查点的 StartUpID:        %u\n"
+#: pg_controldata.c:156
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "最新检查点的 NextXID:          %u\n"
+#: pg_controldata.c:157
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "最新检查点的 NextOID:          %u\n"
+#: pg_controldata.c:158
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "最新检查点的时间:            %s\n"
+#: pg_controldata.c:159
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "数据库块大小:                  %u\n"
+#: pg_controldata.c:160
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "大关系的每段块数: %u\n"
+#: pg_controldata.c:161
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "标识符的最大长度:        %u\n"
+#: pg_controldata.c:162
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "函数参数的最大个数: %u\n"
+#: pg_controldata.c:163
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "日期/时间 类型存储:               %s\n"
+#: pg_controldata.c:164
+msgid "64-bit integers"
+msgstr "64位整数"
+#: pg_controldata.c:164
+msgid "Floating point"
+msgstr "浮点数"
+#: pg_controldata.c:165
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "本地名字的最大长度:        %u\n"
+#: pg_controldata.c:166
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+#: pg_controldata.c:167
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
--- a/src/bin/pg_dump/po/ru.po
+++ b/src/bin/pg_dump/po/ru.po
 # ru.po
 # PG_DUMP Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/Attic/ru.po,v 1.3 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/Attic/ru.po,v 1.4 2002/10/14 19:04:28 petere Exp $
 #
 # Changelog:
-#   - September 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Post-7.3 beta 2, Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - September 7, 2002: Post-7.3 beta 1 fuzzy messages fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 14, 2002: Post-7.3 beta 1, Take II, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - September 7, 2002: Post-7.3 beta 1 fuzzy messages fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - September 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
@@ -1273,7 +1274,7 @@ msgstr "
 #: pg_backup_archiver.c:1480
 msgid "attempting to ascertain archive format\n"
-msgstr ""
+msgstr "    \n"
 #: pg_backup_archiver.c:1500 pg_backup_files.c:148
 #, c-format

--- a/src/bin/pg_dump/po/sv.po
+++ b/src/bin/pg_dump/po/sv.po
--- a/src/bin/pg_dump/po/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.3 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.4 2002/10/14 19:04:28 petere Exp $
 CATALOG_NAME	:= pg_resetxlog
-AVAIL_LANGUAGES	:= de ru
+AVAIL_LANGUAGES	:= de pt_BR ru sv zh_CN
 GETTEXT_FILES	:= pg_resetxlog.c
 GETTEXT_TRIGGERS:= _
--- a/src/bin/pg_resetxlog/po/pt_BR.po
+++ b/src/bin/pg_resetxlog/po/pt_BR.po
+# Translation to Portuguese (Brazilian) language
+# Cesar Suga <sartre@linuxbr.com>, 2002.
+# Fair & Simple Networks Ltda.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-29 06:35-0300\n"
+"PO-Revision-Date: 2002-09-29 06:45-0300\n"
+"Last-Translator: Cesar Suga <sartre@linuxbr.com>\n"
+"Language-Team: Cesar Suga <sartre@linuxbr.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: ID de transao (-x) no pode ser 0\n"
+#: pg_resetxlog.c:149
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: argumento invlido para a opo -l\n"
+#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Tente '%s --help' para mais informao.\n"
+#: pg_resetxlog.c:163
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: nenhum diretrio de dados especificado\n"
+#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#, c-format
+msgid "%s: could not open %s for reading: %s\n"
+msgstr "%s: no pude abrir %s para leitura: %s\n"
+#: pg_resetxlog.c:189
+#, c-format
+msgid ""
+"%s: lock file %s exists\n"
+"Is a server running? If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: arquivo de lock %s existe\n"
+"H algum servidor rodando? Se no, delete o arquivo de lock e tente novamente.\n"
+#: pg_resetxlog.c:210
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"Se estes valores parecem aceitveis, use -f para forar o reset.\n"
+#: pg_resetxlog.c:222
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"O servidor de banco de dados no foi desativado corretamente.\n"
+"Resetar o log de transao pode causar perdas de dados.\n"
+"Se voc quer continuar de qualquer forma, use -f para forar o reset.\n"
+#: pg_resetxlog.c:247
+msgid "Transaction log reset\n"
+msgstr "Reset do log de transao\n"
+#: pg_resetxlog.c:276
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, do\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"Se voc tem certeza de que o diretrio de dados est correto, faa\n"
+"  touch %s\n"
+"e tente noavmente.\n"
+#: pg_resetxlog.c:289
+#, c-format
+msgid "%s: could not read %s: %s\n"
+msgstr "%s: no pude ler %s: %s\n"
+#: pg_resetxlog.c:312
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control existe mas tem CRC invlido: prossiga com cuidado\n"
+#: pg_resetxlog.c:321
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control existe mas  de verso desconhecida ou no funciona; ignorando\n"
+#: pg_resetxlog.c:363
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: setagem de LC_COLLATE invlida\n"
+#: pg_resetxlog.c:370
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: setagem LC_CTYPE invlida\n"
+#: pg_resetxlog.c:392
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"Valores de pg_control supostos:\n"
+"\n"
+#: pg_resetxlog.c:394
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"Valores de pg_control:\n"
+"\n"
+#: pg_resetxlog.c:396
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "Nmero de verso do pg_control:       %u\n"
+#: pg_resetxlog.c:397
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Nmero de verso de catlogo:         %u\n"
+#: pg_resetxlog.c:398
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "ID de arquivo de log atual:           %u\n"
+#: pg_resetxlog.c:399
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "Prximo segmento de arquivo de log:   %u\n"
+#: pg_resetxlog.c:400
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "ltimo StartUpID do checkpoint:       %u\n"
+#: pg_resetxlog.c:401
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "ltimo NextXID do checkpoint:         %u\n"
+#: pg_resetxlog.c:402
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "ltimo NextOID do checkpoint:         %u\n"
+#: pg_resetxlog.c:403
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Tamanho de bloco do banco de dados:   %u\n"
+#: pg_resetxlog.c:404
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Blocos/segmento de relao grande:   %u\n"
+#: pg_resetxlog.c:405
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+#: pg_resetxlog.c:406
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+#: pg_resetxlog.c:459
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr ""
+"%s: erro interno -- sizeof(ControlFileData) muito grande ... consertar xlog.c\n"
+#: pg_resetxlog.c:472
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: no pude criar arquivo de pg_control: %s\n"
+#: pg_resetxlog.c:483
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: no pude escerver arquivo de pg_control: %s\n"
+#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: erro de fsync: %s\n"
+#: pg_resetxlog.c:511
+#, c-format
+msgid "%s: could not open directory %s: %s\n"
+msgstr "%s: no pude abrir diretrio %s: %s\n"
+#: pg_resetxlog.c:525
+#, c-format
+msgid "%s: could not delete file %s: %s\n"
+msgstr "%s: no pude deletar arquivo %s: %s\n"
+#: pg_resetxlog.c:535
+#, c-format
+msgid "%s: could not read from directory %s: %s\n"
+msgstr "%s: no pude ler do diretrio %s: %s\n"
+#: pg_resetxlog.c:598
+#, c-format
+msgid "%s: could not open %s: %s\n"
+msgstr "%s: no pude ler %s: %s\n"
+#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#, c-format
+msgid "%s: could not write %s: %s\n"
+msgstr "%s: no pude escrever %s: %s\n"
+#: pg_resetxlog.c:642
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s reseta o log de transao PostgreSQL.\n"
+"\n"
+#: pg_resetxlog.c:643
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTIONS] DATADIR\n"
+"\n"
+msgstr ""
+"Uso:\n"
+"  %s [OPES] DATADIR\n"
+"\n"
+#: pg_resetxlog.c:644
+msgid "Options:\n"
+msgstr "Opes:\n"
+#: pg_resetxlog.c:645
+msgid "  -f                force update to be done\n"
+msgstr "  -f                fora o update a ser feito\n"
+#: pg_resetxlog.c:646
+msgid ""
+"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"log\n"
+msgstr ""
+"  -l FILEID,SEG     fora localizao mnima de WAL para novos logs de transao\n"
+#: pg_resetxlog.c:647
+msgid ""
+"  -n                no update, just show extracted control values (for "
+"testing)\n"
+msgstr ""
+"  -n                sem update, s mostra valores de controle extrados (para teste)\n"
+#: pg_resetxlog.c:648
+msgid "  -x XID            set next transaction ID\n"
+msgstr "  -x XID            seta prximo ID de transao\n"
+#: pg_resetxlog.c:649
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Reportar bugs a <pgsql-bugs@postgresql.org>.\n"
--- a/src/bin/pg_resetxlog/po/ru.po
+++ b/src/bin/pg_resetxlog/po/ru.po
 # ru.po
 # PG_RESETXLOG Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.1 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.2 2002/10/14 19:04:28 petere Exp $
 #
 # Changelog:
-#   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-09-07 19:50-0400\n"
+"POT-Creation-Date: 2002-10-12 13:18-0400\n"
-"PO-Revision-Date: 2002-08-31 15:17-0500\n"
+"PO-Revision-Date: 2002-10-12 13:27-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:144
+#, c-format
+msgid "%s: invalid argument for -x option\n"
+msgstr "%s:     -x\n"
+#: pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175 pg_resetxlog.c:182
+#: pg_resetxlog.c:188 pg_resetxlog.c:196
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr " '%s --help'    .\n"
+#: pg_resetxlog.c:150
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: ID  (-x)    0\n"
-#: pg_resetxlog.c:149
+#: pg_resetxlog.c:159
 #, c-format
-msgid "%s: invalid argument for -l option\n"
+msgid "%s: invalid argument for -o option\n"
-msgstr "%s:     -l\n"
+msgstr "%s:     -o\n"
-#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#: pg_resetxlog.c:165
 #, c-format
-msgid "Try '%s --help' for more information.\n"
+msgid "%s: OID (-o) must not be 0\n"
-msgstr " '%s --help'    .\n"
+msgstr "%s: OID (-o)    0\n"
+#: pg_resetxlog.c:174 pg_resetxlog.c:181
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s:     -l\n"
-#: pg_resetxlog.c:163
+#: pg_resetxlog.c:195
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s:    \n"
-#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#: pg_resetxlog.c:215 pg_resetxlog.c:311
 #, c-format
 msgid "%s: could not open %s for reading: %s\n"
 msgstr "%s:    %s  : %s\n"
-#: pg_resetxlog.c:189
+#: pg_resetxlog.c:221
 #, c-format
 msgid ""
 "%s: lock file %s exists\n"
@@ -52,7 +69,7 @@ msgstr ""
 "%s:  lock- %s\n"
 "  ?  ,      .\n"
-#: pg_resetxlog.c:210
+#: pg_resetxlog.c:260
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -61,7 +78,7 @@ msgstr ""
 "    ,  -f  ģ "
 ".\n"
-#: pg_resetxlog.c:222
+#: pg_resetxlog.c:272
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -72,11 +89,11 @@ msgstr ""
 "  ӣ     ,  -f  "
 "ģ .\n"
-#: pg_resetxlog.c:247
+#: pg_resetxlog.c:285
 msgid "Transaction log reset\n"
 msgstr "  \n"
-#: pg_resetxlog.c:276
+#: pg_resetxlog.c:314
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, do\n"
@@ -87,32 +104,36 @@ msgstr ""
 "  touch %s\n"
 "  .\n"
-#: pg_resetxlog.c:289
+#: pg_resetxlog.c:327
 #, c-format
 msgid "%s: could not read %s: %s\n"
 msgstr "%s:    %s: %s\n"
-#: pg_resetxlog.c:312
+#: pg_resetxlog.c:350
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
-msgstr "%s: pg_control ,     CRC ;   \n"
+msgstr ""
+"%s: pg_control ,     CRC ;  "
+" \n"
-#: pg_resetxlog.c:321
+#: pg_resetxlog.c:359
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control   ģ   ; ...\n"
+msgstr ""
+"%s: pg_control   ģ   ; "
+"...\n"
-#: pg_resetxlog.c:363
+#: pg_resetxlog.c:410
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s:   LC_COLLATE\n"
-#: pg_resetxlog.c:370
+#: pg_resetxlog.c:417
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s:   LC_CTYPE\n"
-#: pg_resetxlog.c:392
+#: pg_resetxlog.c:439
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -120,7 +141,7 @@ msgstr ""
 "  pg_control:\n"
 "\n"
-#: pg_resetxlog.c:394
+#: pg_resetxlog.c:441
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -128,109 +149,138 @@ msgstr ""
 " pg_control:\n"
 "\n"
-#: pg_resetxlog.c:396
+#: pg_resetxlog.c:443
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "  pg_control:              %u\n"
-#: pg_resetxlog.c:397
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "  :                %u\n"
-#: pg_resetxlog.c:398
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr " ID  :             %u\n"
-#: pg_resetxlog.c:399
+#: pg_resetxlog.c:446
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "   :      %u\n"
-#: pg_resetxlog.c:400
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
 msgstr "StartUpID  checkpoint:       %u\n"
-#: pg_resetxlog.c:401
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "NextXID  checkpoint:         %u\n"
-#: pg_resetxlog.c:402
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID  checkpoint:         %u\n"
-#: pg_resetxlog.c:403
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "  :                    %u\n"
-#: pg_resetxlog.c:404
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "    :      %u\n"
-#: pg_resetxlog.c:405
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "  :   %u\n"
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr ".   :       %u\n"
+#: pg_resetxlog.c:454
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "  /:            %s\n"
+#: pg_resetxlog.c:455
+msgid "64-bit integers"
+msgstr "64- "
+#: pg_resetxlog.c:455
+msgid "Floating point"
+msgstr " "
+#: pg_resetxlog.c:456
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "   :      %u\n"
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
-#: pg_resetxlog.c:406
+#: pg_resetxlog.c:458
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
-#: pg_resetxlog.c:459
+#: pg_resetxlog.c:511
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr ""
-"%s:   -- sizeof(ControlFileData)   ...   xlog.c\n"
+"%s:   -- sizeof(ControlFileData)   ...  "
+" xlog.c\n"
-#: pg_resetxlog.c:472
+#: pg_resetxlog.c:524
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s:     pg_control: %s\n"
-#: pg_resetxlog.c:483
+#: pg_resetxlog.c:535
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s:      pg_control: %s\n"
-#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#: pg_resetxlog.c:542 pg_resetxlog.c:683
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s:  fsync: %s\n"
-#: pg_resetxlog.c:511
+#: pg_resetxlog.c:563
 #, c-format
 msgid "%s: could not open directory %s: %s\n"
 msgstr "%s:     %s: %s\n"
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:577
 #, c-format
 msgid "%s: could not delete file %s: %s\n"
 msgstr "%s:     %s: %s\n"
-#: pg_resetxlog.c:535
+#: pg_resetxlog.c:587
 #, c-format
 msgid "%s: could not read from directory %s: %s\n"
 msgstr "%s:      %s: %s\n"
-#: pg_resetxlog.c:598
+#: pg_resetxlog.c:650
 #, c-format
 msgid "%s: could not open %s: %s\n"
 msgstr "%s:    %s: %s\n"
-#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#: pg_resetxlog.c:661 pg_resetxlog.c:675
 #, c-format
 msgid "%s: could not write %s: %s\n"
 msgstr "%s:    %s: %s\n"
-#: pg_resetxlog.c:642
+#: pg_resetxlog.c:694
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -239,7 +289,7 @@ msgstr ""
 "%s    PostgreSQL.\n"
 "\n"
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:695
 #, c-format
 msgid ""
 "Usage:\n"
@@ -250,15 +300,15 @@ msgstr ""
 "  %s [] \n"
 "\n"
-#: pg_resetxlog.c:644
+#: pg_resetxlog.c:696
 msgid "Options:\n"
 msgstr ":\n"
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:697
 msgid "  -f                force update to be done\n"
 msgstr "  -f                  \n"
-#: pg_resetxlog.c:646
+#: pg_resetxlog.c:698
 msgid ""
 "  -l FILEID,SEG     force minimum WAL starting location for new transaction "
 "log\n"
@@ -266,7 +316,7 @@ msgstr ""
 "  -l FILEID,SEG          WAL  "
 "  \n"
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:699
 msgid ""
 "  -n                no update, just show extracted control values (for "
 "testing)\n"
@@ -274,11 +324,15 @@ msgstr ""
 "  -n                 ,     "
 " ( )\n"
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:700
+msgid "  -o OID            set next OID\n"
+msgstr "  -o OID              OID\n"
+#: pg_resetxlog.c:701
 msgid "  -x XID            set next transaction ID\n"
 msgstr "  -x XID             ID  \n"
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:702
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"

--- a/src/bin/pg_resetxlog/po/sv.po
+++ b/src/bin/pg_resetxlog/po/sv.po
+# Swedish message translation file for resetxlog.
+# Dennis Bjrklund <db@zigo.dhs.org>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-10-04 04:17-0400\n"
+"PO-Revision-Date: 2002-10-04 18:28+0200\n"
+"Last-Translator: Dennis Bjrklund <db@zigo.dhs.org>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: pg_resetxlog.c:144
+#, c-format
+msgid "%s: invalid argument for -x option\n"
+msgstr "%s: ogiltigt argument till flaggan -x\n"
+#: pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175 pg_resetxlog.c:182
+#: pg_resetxlog.c:188 pg_resetxlog.c:196
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Frsk med \"%s --help\" fr mer information.\n"
+#: pg_resetxlog.c:150
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: transaktions-ID (-x) fr inte vara 0\n"
+#: pg_resetxlog.c:159
+#, c-format
+msgid "%s: invalid argument for -o option\n"
+msgstr "%s: ogiltigt argument till flaggan -o\n"
+#: pg_resetxlog.c:165
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) fr inte vara 0\n"
+#: pg_resetxlog.c:174 pg_resetxlog.c:181
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: ogiltigt argument till flaggan -l\n"
+#: pg_resetxlog.c:195
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: ingen datakatalog angiven\n"
+#: pg_resetxlog.c:215 pg_resetxlog.c:311
+#, c-format
+msgid "%s: could not open %s for reading: %s\n"
+msgstr "%s: kunde inte ppna %s fr lsning: %s\n"
+#: pg_resetxlog.c:221
+#, c-format
+msgid ""
+"%s: lock file %s exists\n"
+"Is a server running? If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: lsfil %s existerar\n"
+"Kr servern redan? Om inte, radera lsfilen och frsk igen.\n"
+#: pg_resetxlog.c:260
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"Om dessa vrden verkar acceptable, anvnd -f fr\n"
+"att forcera terstllande.\n"
+#: pg_resetxlog.c:272
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"Databasservern stngdes inte ner korrekt. Att terstlla\n"
+"transaktionsloggen kan medfra att data frloras.\n"
+"Om du vill fortstta nd, anvnd -f fr att forcera\n"
+"terstllande.\n"
+#: pg_resetxlog.c:285
+msgid "Transaction log reset\n"
+msgstr "terstllande frn transaktionslogg\n"
+#: pg_resetxlog.c:314
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, do\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"Om du r sker p att datakatalogskvgen r korrekt s gr\n"
+"  touch %s\n"
+"och frsk igen\n"
+#: pg_resetxlog.c:327
+#, c-format
+msgid "%s: could not read %s: %s\n"
+msgstr "%s: kunde inte lsa %s: %s\n"
+#: pg_resetxlog.c:350
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control existerar men har ogiltig CRC; fortstt med frsiktighet\n"
+#: pg_resetxlog.c:359
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control existerar men r trasig eller har oknd version; ignorerar den\n"
+#: pg_resetxlog.c:410
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: ogiltigt instllning fr LC_COLLATE\n"
+#: pg_resetxlog.c:417
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: ogiltig instllning fr LC_CTYPE\n"
+#: pg_resetxlog.c:439
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr "Gissade pg_control-vrden:\n\n"
+#: pg_resetxlog.c:441
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr "pg_control-vrden:\n\n"
+#: pg_resetxlog.c:443
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control versionsnummer:            %u\n"
+#: pg_resetxlog.c:444
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Katalogversionsnummer:                %u\n"
+#: pg_resetxlog.c:445
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "Aktuell loggfil-ID:                   %u\n"
+#: pg_resetxlog.c:446
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "Nsta loggfilsegment:                 %u\n"
+#: pg_resetxlog.c:447
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "Senaste kontrollpunktens StartUpID:   %u\n"
+#: pg_resetxlog.c:448
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "Senaste kontrollpunktens NextXID:     %u\n"
+#: pg_resetxlog.c:449
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "Senaste kontrollpunktens NextOID:     %u\n"
+#: pg_resetxlog.c:450
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Databasens blockstorlek:              %u\n"
+#: pg_resetxlog.c:451
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Block per segment i stor relation:    %u\n"
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maximal lngd p identifierare:       %u\n"
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "Maximalt antal funktionsargument:     %u\n"
+#: pg_resetxlog.c:454
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Lagringstyp fr datum/tid:            %s\n"
+#: pg_resetxlog.c:455
+msgid "64-bit integers"
+msgstr "64-bits heltal"
+#: pg_resetxlog.c:455
+msgid "Floating point"
+msgstr "Flyttal"
+#: pg_resetxlog.c:456
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "Maximal lngd p lokalnamn:           %u\n"
+#: pg_resetxlog.c:457
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+#: pg_resetxlog.c:458
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+#: pg_resetxlog.c:511
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: internt fel -- sizeof(ControlFileData) r fr stor ... laga xlog.c\n"
+#: pg_resetxlog.c:524
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: kunde inte skapa pg_control-fil: %s\n"
+#: pg_resetxlog.c:535
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: kunde inte skriva pg_control-fil: %s\n"
+#: pg_resetxlog.c:542 pg_resetxlog.c:683
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsync fel: %s\n"
+#: pg_resetxlog.c:563
+#, c-format
+msgid "%s: could not open directory %s: %s\n"
+msgstr "%s: kunde inte ppna katalog %s: %s\n"
+#: pg_resetxlog.c:577
+#, c-format
+msgid "%s: could not delete file %s: %s\n"
+msgstr "%s: kunde inte radera filen %s: %s\n"
+#: pg_resetxlog.c:587
+#, c-format
+msgid "%s: could not read from directory %s: %s\n"
+msgstr "%s: kunde inte lsa frn katalog %s: %s\n"
+#: pg_resetxlog.c:650
+#, c-format
+msgid "%s: could not open %s: %s\n"
+msgstr "%s: kunde inte ppna %s: %s\n"
+#: pg_resetxlog.c:661 pg_resetxlog.c:675
+#, c-format
+msgid "%s: could not write %s: %s\n"
+msgstr "%s: kunde inte skriva %s: %s\n"
+#: pg_resetxlog.c:694
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr "%s terstller PostgreSQL transaktionslogg.\n\n"
+#: pg_resetxlog.c:695
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTIONS] DATADIR\n"
+"\n"
+msgstr ""
+"Anvndning:\n"
+"  %s [FLAGGOR] DATAKATALOG\n"
+"\n"
+#: pg_resetxlog.c:696
+msgid "Options:\n"
+msgstr "Flaggor:\n"
+#: pg_resetxlog.c:697
+msgid "  -f                force update to be done\n"
+msgstr "  -f                forcera terstllande\n"
+#: pg_resetxlog.c:698
+msgid ""
+"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"log\n"
+msgstr "  -l FILID,SEG      ange minsta WAL-startposition fr ny transaktionslogg\n"
+#: pg_resetxlog.c:699
+msgid ""
+"  -n                no update, just show extracted control values (for "
+"testing)\n"
+msgstr "  -n                ingen updatering, visa bara kontrollvrden (fr testning)\n"
+#: pg_resetxlog.c:700
+msgid "  -o OID            set next OID\n"
+msgstr "  -o OID            stt nsta OID\n"
+#: pg_resetxlog.c:701
+msgid "  -x XID            set next transaction ID\n"
+msgstr "  -x XID            stt nsta transaktions-ID\n"
+#: pg_resetxlog.c:702
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "\nReportera buggar till <pgsql-bugs@postgresql.org>.\n"
--- a/src/bin/pg_resetxlog/po/zh_CN.po
+++ b/src/bin/pg_resetxlog/po/zh_CN.po
+# simplified Chinese translation file for pg_resetxlog and friends
+# Bao Wei <weibao@forevertek.com>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-27 13:41+0800\n"
+"PO-Revision-Date: 2002-09-19 16:43+0800\n"
+"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: 事务 ID (-x) 不能为 0\n"
+#: pg_resetxlog.c:149
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: 为 -l 选项的无效参数\n"
+#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "输入 '%s --help' 获取更多的信息.\n"
+#: pg_resetxlog.c:163
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: 没有指定数据目录\n"
+#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#, c-format
+msgid "%s: could not open %s for reading: %s\n"
+msgstr "%s: 无法打开 %s 读取信息: %s\n"
+#: pg_resetxlog.c:189
+#, c-format
+msgid ""
+"%s: lock file %s exists\n"
+"Is a server running? If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: 锁文件 %s 已经存在\n"
+"是否有一个服务正在运行? 如果没有, 删除那个锁文件然后再试一次.\n"
+#: pg_resetxlog.c:210
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"如果这些值可接受, 用 -f 强制重置.\n"
+#: pg_resetxlog.c:222
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"数据库服务器没有彻底关闭.\n"
+"重置事务日志有可能会引起丢失数据.\n"
+"如果你仍想继续, 用 -f 强制重置.\n"
+#: pg_resetxlog.c:247
+msgid "Transaction log reset\n"
+msgstr "事务日志重置\n"
+#: pg_resetxlog.c:276
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, do\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"如果你确定数据目录路径是正确的, 运行\n"
+"  touch %s\n"
+"然后再试一次.\n"
+#: pg_resetxlog.c:289
+#, c-format
+msgid "%s: could not read %s: %s\n"
+msgstr "%s: 无法读取 %s: %s\n"
+#: pg_resetxlog.c:312
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control 已经存在, 但有无效的CRC; 带有警告的继续运行\n"
+#: pg_resetxlog.c:321
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control 已经存在, 但已破坏或无效版本; 忽略它\n"
+#: pg_resetxlog.c:363
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: 无效的 LC_COLLATE 设置\n"
+#: pg_resetxlog.c:370
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: 无效的 LC_CTYPE 设置\n"
+#: pg_resetxlog.c:392
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"猜测的 pg_control 值:\n"
+"\n"
+#: pg_resetxlog.c:394
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"pg_control 值:\n"
+"\n"
+#: pg_resetxlog.c:396
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control 版本:            %u\n"
+#: pg_resetxlog.c:397
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Catalog 版本:               %u\n"
+#: pg_resetxlog.c:398
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "当前日志文件ID:                  %u\n"
+#: pg_resetxlog.c:399
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "下一个日志文件段:                %u\n"
+#: pg_resetxlog.c:400
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "最新检查点的 StartUpID:        %u\n"
+#: pg_resetxlog.c:401
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "最新检查点的 NextXID:          %u\n"
+#: pg_resetxlog.c:402
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "最新检查点的 NextOID:          %u\n"
+#: pg_resetxlog.c:403
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "数据库块大小:                  %u\n"
+#: pg_resetxlog.c:404
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "大关系的每段块数: %u\n"
+#: pg_resetxlog.c:405
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+#: pg_resetxlog.c:406
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+#: pg_resetxlog.c:459
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: 内部错误 -- sizeof(ControlFileData) 太大 ... 修复 xlog.c\n"
+#: pg_resetxlog.c:472
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: 无法创建 pg_control 文件: %s\n"
+#: pg_resetxlog.c:483
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: 无法写 pg_control 文件: %s\n"
+#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsync 错误: %s\n"
+#: pg_resetxlog.c:511
+#, c-format
+msgid "%s: could not open directory %s: %s\n"
+msgstr "%s: 无法打开目录 %s: %s\n"
+#: pg_resetxlog.c:525
+#, c-format
+msgid "%s: could not delete file %s: %s\n"
+msgstr "%s: 无法删除文件 %s: %s\n"
+#: pg_resetxlog.c:535
+#, c-format
+msgid "%s: could not read from directory %s: %s\n"
+msgstr "%s: 无法从目录 %s 中读取: %s\n"
+#: pg_resetxlog.c:598
+#, c-format
+msgid "%s: could not open %s: %s\n"
+msgstr "%s: 无法打开 %s: %s\n"
+#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#, c-format
+msgid "%s: could not write %s: %s\n"
+msgstr "%s: 无法写 %s: %s\n"
+#: pg_resetxlog.c:642
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s 重置 PostgreSQL 事务日志.\n"
+"\n"
+#: pg_resetxlog.c:643
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTIONS] DATADIR\n"
+"\n"
+msgstr ""
+"使用方法:\n"
+"  %s [选项] 数据目录\n"
+"\n"
+#: pg_resetxlog.c:644
+msgid "Options:\n"
+msgstr "选项:\n"
+#: pg_resetxlog.c:645
+msgid "  -f                force update to be done\n"
+msgstr "  -f                强制更新\n"
+#: pg_resetxlog.c:646
+msgid ""
+"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"log\n"
+msgstr "  -l FILEID,SEG     在新的事务日志中强制最小 WAL 起始位置\n"
+#: pg_resetxlog.c:647
+msgid ""
+"  -n                no update, just show extracted control values (for "
+"testing)\n"
+msgstr "  -n                未更新, 只显示抽取的控制值 (测试用途)\n"
+#: pg_resetxlog.c:648
+msgid "  -x XID            set next transaction ID\n"
+msgstr "  -x XID            设置下一个事务 ID\n"
+#: pg_resetxlog.c:649
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"报告错误至 <pgsql-bugs@postgresql.org>.\n"
--- a/src/bin/psql/po/ru.po
+++ b/src/bin/psql/po/ru.po
--- a/src/bin/psql/po/sv.po
+++ b/src/bin/psql/po/sv.po
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
 # ru.po
 # LIBPQ Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.2 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.3 2002/10/14 19:04:28 petere Exp $
 #
 # Changelog:
-#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Post-7.3beta2 fuzzy translation fizes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-09-07 20:04-0400\n"
+"POT-Creation-Date: 2002-10-12 12:42-0400\n"
-"PO-Revision-Date: 2002-09-07 20:06-0500\n"
+"PO-Revision-Date: 2002-10-12 12:45-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -73,22 +74,22 @@ msgstr "
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname:   : %d\n"
-#: fe-connect.c:484
+#: fe-connect.c:483
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr ""
 "      PostgreSQL \n"
-#: fe-connect.c:708
+#: fe-connect.c:707
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "       : %s\n"
-#: fe-connect.c:732
+#: fe-connect.c:731
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "      TCP : %s\n"
-#: fe-connect.c:752
+#: fe-connect.c:751
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -99,7 +100,7 @@ msgstr ""
 "\t     \n"
 "\t   Unix'  \"%s\"?\n"
-#: fe-connect.c:761
+#: fe-connect.c:760
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -110,127 +111,127 @@ msgstr ""
 "\t     %s  \n"
 "\t  TCP/IP    %s?\n"
-#: fe-connect.c:825
+#: fe-connect.c:824
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "  : %s\n"
-#: fe-connect.c:844
+#: fe-connect.c:843
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "  : %s\n"
-#: fe-connect.c:891
+#: fe-connect.c:890
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "   : %s\n"
-#: fe-connect.c:959
+#: fe-connect.c:958
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "     SSL: %s\n"
-#: fe-connect.c:972
+#: fe-connect.c:971
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "        SSL: %s\n"
-#: fe-connect.c:1001
+#: fe-connect.c:1000
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "       SSL: %c\n"
-#: fe-connect.c:1010
+#: fe-connect.c:1009
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "   SSL,   SSL  \n"
-#: fe-connect.c:1232
+#: fe-connect.c:1218
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr ""
 "  ,     "
 " \n"
-#: fe-connect.c:1263
+#: fe-connect.c:1249
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "     : %s\n"
-#: fe-connect.c:1283
+#: fe-connect.c:1269
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "      : %s\n"
-#: fe-connect.c:1322
+#: fe-connect.c:1308
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "    : %s\n"
-#: fe-connect.c:1378
+#: fe-connect.c:1364
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "    ,   : %c\n"
-#: fe-connect.c:1490
+#: fe-connect.c:1476
 msgid "unexpected message from server during startup\n"
 msgstr "     \n"
-#: fe-connect.c:1549
+#: fe-connect.c:1535
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr ""
 "   %c,     "
 " \n"
-#: fe-connect.c:1637
+#: fe-connect.c:1623
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr ""
 "  setenv %c,     "
 "\n"
-#: fe-connect.c:1676
+#: fe-connect.c:1662
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "    PGCLIENTENCODING: %s\n"
-#: fe-connect.c:1800
+#: fe-connect.c:1786
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr ""
 "  %c,     "
 "\n"
-#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+#: fe-connect.c:2413 fe-connect.c:2422 fe-connect.c:2919 fe-exec.c:1284
 #: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr " \n"
-#: fe-connect.c:2475
+#: fe-connect.c:2461
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr " \"=\"  \"%s\"   \n"
-#: fe-connect.c:2524
+#: fe-connect.c:2510
 msgid "unterminated quoted string in connection info string\n"
 msgstr "  (  )   \n"
-#: fe-connect.c:2558
+#: fe-connect.c:2544
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "   \"%s\"\n"
-#: fe-connect.c:2744
+#: fe-connect.c:2730
 msgid "connection pointer is NULL\n"
 msgstr "   NULL'\n"
-#: fe-connect.c:2953
+#: fe-connect.c:2940
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
-"be u=rw (0600)"
+"be u=rw (0600)\n"
 msgstr ""
-":   %s       / ; "
+":   %s        ; "
-"   u=rw (0600)"
+"   u=rw (0600)\n"
 #: fe-exec.c:737
 msgid "command string is a null pointer\n"
@@ -428,3 +429,106 @@ msgstr ""
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "    : %s\n"
+#: fe-secure.c:275 fe-secure.c:321
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr " SSL SYSCALL: %s\n"
+#: fe-secure.c:280 fe-secure.c:326
+#, c-format
+msgid "SSL error: %s\n"
+msgstr " SSL: %s\n"
+#: fe-secure.c:387
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "   : %s\n"
+#: fe-secure.c:400
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "     (%s): %s\n"
+#: fe-secure.c:419
+msgid "unsupported protocol\n"
+msgstr "  \n"
+#: fe-secure.c:441
+#, 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:448
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr ""
+#: fe-secure.c:617
+msgid "could not get user information\n"
+msgstr "     \n"
+#: fe-secure.c:629
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "     (%s): %s\n"
+#: fe-secure.c:636
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "     (%s): %s\n"
+#: fe-secure.c:649
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr ""
+#: fe-secure.c:658
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr ""
+#: fe-secure.c:665
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr ""
+#: fe-secure.c:674
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr ""
+#: fe-secure.c:681
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr ""
+#: fe-secure.c:693
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr ""
+#: fe-secure.c:721
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "    SSL: %s\n"
+#: fe-secure.c:737 fe-secure.c:745
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "      (%s): %s\n"
+#: fe-secure.c:794
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "   SSL-: %s\n"
+#: fe-secure.c:812
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "   : %s\n"
+#: fe-secure.c:824
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "   : %s\n"
--- a/src/interfaces/libpq/po/sv.po
+++ b/src/interfaces/libpq/po/sv.po
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po