Translation updates

12 files changed, 783 insertions, 739 deletions

diff --git a/src/bin/initdb/po/pt_BR.po b/src/bin/initdb/po/pt_BR.po
index 450c6562a2..b4efcb1d35 100644
--- a/src/bin/initdb/po/pt_BR.po
+++ b/src/bin/initdb/po/pt_BR.po
@@ -1,11 +1,11 @@
 # "initdb" translation to Brazilian Portuguese Language.
-# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003.
+# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-18 14:00-0300\n"
-"PO-Revision-Date: 2004-10-18 16:10-0300\n"
+"POT-Creation-Date: 2004-10-27 13:07-0300\n"
+"PO-Revision-Date: 2004-10-27 18:36-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@ufgnet.ufg.br>\n"
 "Language-Team: Brazilian Portuguese <pgsql-dev@lists.querencialivre.rs.gov."
 "br>\n"
@@ -18,37 +18,37 @@ msgstr ""
 msgid "%s: out of memory\n"
 msgstr "%s: sem memСria\n"
 
-#: initdb.c:361 initdb.c:1339
+#: initdb.c:361 initdb.c:1342
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: nЦo pТde abrir arquivo \"%s\" para leitura: %s\n"
 
-#: initdb.c:419
+#: initdb.c:422
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: nЦo pТde abrir arquivo \"%s\" para escrita: %s\n"
 
-#: initdb.c:547 initdb.c:556 initdb.c:564
+#: initdb.c:550 initdb.c:559 initdb.c:567
 #, c-format
 msgid "%s: failed\n"
 msgstr "%s: falhou\n"
 
-#: initdb.c:553
+#: initdb.c:556
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: removendo diretСrio de dados \"%s\"\n"
 
-#: initdb.c:561
+#: initdb.c:564
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: removendo conteЗdo do diretСrio de dados \"%s\"\n"
 
-#: initdb.c:572
+#: initdb.c:575
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: diretСrio de dados \"%s\" nЦo foi removido a pedido do usuАrio\n"
 
-#: initdb.c:598
+#: initdb.c:601
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -60,17 +60,17 @@ msgstr ""
 "serА\n"
 "o dono do processo do servidor.\n"
 
-#: initdb.c:647
+#: initdb.c:650
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" nЦo И um nome de codificaГЦo do servidor vАlido\n"
 
-#: initdb.c:802
+#: initdb.c:805
 #, c-format
 msgid "%s: warning: encoding mismatch\n"
 msgstr "%s: aviso: codificaГЦo nЦo corresponde\n"
 
-#: initdb.c:804
+#: initdb.c:807
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected\n"
@@ -86,7 +86,7 @@ msgstr ""
 "esta situaГЦo, execute novamento o %s e nЦo especifique uma codificaГЦo\n"
 "explicitamente ou escolha uma outra combinaГЦo.\n"
 
-#: initdb.c:956
+#: initdb.c:959
 #, c-format
 msgid ""
 "%s: file \"%s\" does not exist\n"
@@ -97,24 +97,24 @@ msgstr ""
 "Isso significa que vocЙ tem uma instalaГЦo corrompida ou especificou\n"
 "o diretСrio errado com a invocaГЦo da opГЦo -L.\n"
 
-#: initdb.c:1021
+#: initdb.c:1024
 msgid "selecting default max_connections ... "
 msgstr "selecionando max_connections padrЦo ... "
 
-#: initdb.c:1057
+#: initdb.c:1060
 msgid "selecting default shared_buffers ... "
 msgstr "selecionando shared_buffers padrЦo ... "
 
-#: initdb.c:1090
+#: initdb.c:1093
 msgid "creating configuration files ... "
 msgstr "criando arquivos de configuraГЦo ... "
 
-#: initdb.c:1186
+#: initdb.c:1189
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "criando banco de dados template1 em %s/base/1 ... "
 
-#: initdb.c:1202
+#: initdb.c:1205
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -124,91 +124,91 @@ msgstr ""
 "Verifique sua instalaГЦo ou especifique o caminho correto utilizando a opГЦo "
 "-L.\n"
 
-#: initdb.c:1278
+#: initdb.c:1281
 msgid "initializing pg_shadow ... "
 msgstr "inicializando pg_shadow ... "
 
-#: initdb.c:1314
+#: initdb.c:1317
 msgid "Enter new superuser password: "
 msgstr "Digite nova senha de super-usuАrio: "
 
-#: initdb.c:1315
+#: initdb.c:1318
 msgid "Enter it again: "
 msgstr "Digite-a novamente: "
 
-#: initdb.c:1318
+#: initdb.c:1321
 msgid "Passwords didn't match.\n"
 msgstr "Senhas nЦo combinam.\n"
 
-#: initdb.c:1345
+#: initdb.c:1348
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: nЦo pТde ler senha do arquivo \"%s\": %s\n"
 
-#: initdb.c:1358
+#: initdb.c:1361
 msgid "setting password ... "
 msgstr "definindo senha ... "
 
-#: initdb.c:1382
+#: initdb.c:1385
 #, c-format
 msgid "%s: The password file was not generated. Please report this problem.\n"
 msgstr ""
 "%s: O arquivo de senhas nЦo foi gerado. Por favor reporte este problema.\n"
 
-#: initdb.c:1412
+#: initdb.c:1415
 msgid "enabling unlimited row size for system tables ... "
 msgstr "habilitando tamanho de registro ilimitado para tabelas do sistema ... "
 
-#: initdb.c:1485
+#: initdb.c:1488
 msgid "initializing pg_depend ... "
 msgstr "inicializando pg_depend ... "
 
-#: initdb.c:1513
+#: initdb.c:1516
 msgid "creating system views ... "
 msgstr "criando visУes do sistema ... "
 
-#: initdb.c:1550
+#: initdb.c:1553
 msgid "loading pg_description ... "
 msgstr "carregando pg_description ... "
 
-#: initdb.c:1598
+#: initdb.c:1601
 msgid "creating conversions ... "
 msgstr "criando conversУes ... "
 
-#: initdb.c:1654
+#: initdb.c:1657
 msgid "setting privileges on built-in objects ... "
 msgstr "definindo privilИgios dos objetos embutidos ... "
 
-#: initdb.c:1712
+#: initdb.c:1715
 msgid "creating information schema ... "
 msgstr "criando esquema informaГЦo ... "
 
-#: initdb.c:1775
+#: initdb.c:1778
 msgid "vacuuming database template1 ... "
 msgstr "faxinando banco de dados template1 ... "
 
-#: initdb.c:1831
+#: initdb.c:1834
 msgid "copying template1 to template0 ... "
 msgstr "copiando template1 para template0 ... "
 
-#: initdb.c:1888
+#: initdb.c:1891
 msgid "caught signal\n"
 msgstr "sinal foi recebido\n"
 
-#: initdb.c:1893
+#: initdb.c:1896
 msgid "could not write to child process\n"
 msgstr "nЦo pТde escrever em processo filho\n"
 
-#: initdb.c:1899
+#: initdb.c:1902
 msgid "ok\n"
 msgstr "ok\n"
 
-#: initdb.c:1946
+#: initdb.c:1949
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: nome de localidade invАlido \"%s\"\n"
 
-#: initdb.c:2013
+#: initdb.c:2016
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -217,16 +217,16 @@ msgstr ""
 "%s inicializa um agrupamento de banco de dados PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2014
+#: initdb.c:2017
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: initdb.c:2015
+#: initdb.c:2018
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [OPгцO]... [DIRDADOS]\n"
 
-#: initdb.c:2016
+#: initdb.c:2019
 msgid ""
 "\n"
 "Options:\n"
@@ -234,25 +234,25 @@ msgstr ""
 "\n"
 "OpГУes:\n"
 
-#: initdb.c:2017
+#: initdb.c:2020
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr ""
 " [-D, --pgdata=]DIRDADOS       local do agrupamento de banco de dados\n"
 
-#: initdb.c:2018
+#: initdb.c:2021
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr ""
 "  -E, --enconding=CODIFICAгцO  ajusta a codificaГЦo padrЦo para novos bancos "
 "de dados\n"
 
-#: initdb.c:2019
+#: initdb.c:2022
 msgid ""
 "  --locale=LOCALE           initialize database cluster with given locale\n"
 msgstr ""
 "  --locale=LOCALIDADE          inicializa o agrupamento de banco de dados "
 "com a localidade informada\n"
 
-#: initdb.c:2020
+#: initdb.c:2023
 msgid ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
 "  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
@@ -262,50 +262,50 @@ msgid ""
 msgstr ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALIDADE\n"
 "  --lc-monetary, --lc-numeric, --lc-time=LOCALIDADE\n"
-"                            inicializa o agrupamento de banco de dados com a "
+"                               inicializa o agrupamento de banco de dados com a "
 "localidade informada\n"
-"                            na respectiva categoria (o ambiente И assumido\n"
-"                            como padrЦo)\n"
+"                               na respectiva categoria (o ambiente И assumido\n"
+"                               como padrЦo)\n"
 
-#: initdb.c:2025
+#: initdb.c:2028
 msgid "  --no-locale               equivalent to --locale=C\n"
 msgstr "  --no-locale                  equivalente a --locale=C\n"
 
-#: initdb.c:2026
+#: initdb.c:2029
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
 "connections\n"
 msgstr ""
-"  -A, --auth=MиTODO         mИtodo de autenticaГЦo padrЦo para conexУes "
+"  -A, --auth=MиTODO            mИtodo de autenticaГЦo padrЦo para conexУes "
 "locais\n"
 
-#: initdb.c:2027
+#: initdb.c:2030
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr ""
 "  -U, --username=NOME          nome do super-usuАrio do banco de dados\n"
 
-#: initdb.c:2028
+#: initdb.c:2031
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt               pergunta senha do novo super-usuАrio\n"
 
-#: initdb.c:2029
+#: initdb.c:2032
 msgid ""
 "  --pwfile=FILE             read password for the new superuser from file\n"
 msgstr ""
-"  --pwfile=ARQUIVO               lЙ senha do novo super-usuАrio a partir do "
+"  --pwfile=ARQUIVO             lЙ senha do novo super-usuАrio a partir do "
 "arquivo\n"
 
-#: initdb.c:2030
+#: initdb.c:2033
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                   mostra essa ajuda e sai\n"
 
-#: initdb.c:2031
+#: initdb.c:2034
 msgid "  -V, --version             output version information, then exit\n"
 msgstr ""
 "  -V, --version                mostra informaГЦo sobre a versЦo e sai\n"
 
-#: initdb.c:2032
+#: initdb.c:2035
 msgid ""
 "\n"
 "Less commonly used options:\n"
@@ -313,23 +313,23 @@ msgstr ""
 "\n"
 "OpГУes utilizadas com menos frequЙncia:\n"
 
-#: initdb.c:2033
+#: initdb.c:2036
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug                  mostra saМda de depuraГЦo\n"
 
-#: initdb.c:2034
+#: initdb.c:2037
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                   mostra definiГУes internas\n"
 
-#: initdb.c:2035
+#: initdb.c:2038
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRETсRIO                 onde encontrar os arquivos de entrada\n"
 
-#: initdb.c:2036
+#: initdb.c:2039
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean                nЦo remove apСs erros\n"
 
-#: initdb.c:2037
+#: initdb.c:2040
 msgid ""
 "\n"
 "If the data directory is not specified, the environment variable PGDATA\n"
@@ -339,7 +339,7 @@ msgstr ""
 "Se o diretСrio de dados nЦo for especificado, a variАvel de ambiente PGDATA\n"
 "И utilizada.\n"
 
-#: initdb.c:2039
+#: initdb.c:2042
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -347,32 +347,32 @@ msgstr ""
 "\n"
 "Reporte erros a <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2130
+#: initdb.c:2133
 msgid "Running in debug mode.\n"
 msgstr "Executando no modo de depuraГЦo.\n"
 
-#: initdb.c:2134
+#: initdb.c:2137
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "Executando no modo sem limpeza. Erros nЦo serЦo removidos.\n"
 
-#: initdb.c:2170 initdb.c:2187 initdb.c:2405
+#: initdb.c:2173 initdb.c:2190 initdb.c:2408
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Tente \"%s --help\" para mais informaГЦo.\n"
 
-#: initdb.c:2185
+#: initdb.c:2188
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: muitos argumentos de linha de comando (primeiro И \"%s\")\n"
 
-#: initdb.c:2193
+#: initdb.c:2196
 #, c-format
 msgid "%s: password prompt and password file may not be specified together\n"
 msgstr ""
 "%s: opГЦo para perguntar a senha e um arquivo de senhas nЦo podem ser "
 "especificados juntos\n"
 
-#: initdb.c:2199
+#: initdb.c:2202
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -384,12 +384,12 @@ msgstr ""
 "VocЙ pode mudА-lo editando o pg_hba.conf ou utilizando a opГЦo -A na\n"
 "prСxima vez que vocЙ executar o initdb.\n"
 
-#: initdb.c:2223
+#: initdb.c:2226
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: mИtodo de autenticaГЦo desconhecido \"%s\"\n"
 
-#: initdb.c:2232
+#: initdb.c:2235
 #, c-format
 msgid ""
 "%s: must specify a password for the superuser to enable %s authentication\n"
@@ -397,7 +397,7 @@ msgstr ""
 "%s: vocЙ precisa especificar uma senha para o super-usuАrio para habilitar a "
 "autenticaГЦo %s\n"
 
-#: initdb.c:2247
+#: initdb.c:2250
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -411,7 +411,7 @@ msgstr ""
 "irА residir. FaГa isso com o invocaГЦo da opГЦo -D ou a\n"
 "variАvel de ambiente PGDATA.\n"
 
-#: initdb.c:2278
+#: initdb.c:2281
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -422,7 +422,7 @@ msgstr ""
 "mesmo diretСrio que \"%s\".\n"
 "Verifique sua instalaГЦo.\n"
 
-#: initdb.c:2285
+#: initdb.c:2288
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -433,17 +433,17 @@ msgstr ""
 "mas nЦo tem a mesma versЦo que %s.\n"
 "Verifique sua instalaГЦo.\n"
 
-#: initdb.c:2304
+#: initdb.c:2307
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: local do arquivo de entrada deve ser um caminho absoluto\n"
 
-#: initdb.c:2312
+#: initdb.c:2315
 #, c-format
 msgid "%s: could not determine valid short version string\n"
 msgstr "%s: nЦo pТde obter versЦo curta vАlida\n"
 
-#: initdb.c:2365
+#: initdb.c:2368
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -454,12 +454,12 @@ msgstr ""
 "Esse usuАrio deve ser o dono do processo do servidor tambИm.\n"
 "\n"
 
-#: initdb.c:2375
+#: initdb.c:2378
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "O agrupamento de banco de dados serА inicializado com localidade %s.\n"
 
-#: initdb.c:2378
+#: initdb.c:2381
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -478,32 +478,32 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2403
+#: initdb.c:2406
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: nЦo pТde encontrar codificaГЦo ideal para localidade \"%s\"\n"
 
-#: initdb.c:2404
+#: initdb.c:2407
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "Execute novamente %s com a opГЦo -E.\n"
 
-#: initdb.c:2411
+#: initdb.c:2414
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "A codificaГЦo padrЦo do banco de dados foi ajustada para %s.\n"
 
-#: initdb.c:2452
+#: initdb.c:2455
 #, c-format
 msgid "creating directory %s ... "
 msgstr "criando diretСrio %s ... "
 
-#: initdb.c:2466
+#: initdb.c:2469
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "consertando permissУes no diretСrio existente %s ... "
 
-#: initdb.c:2484
+#: initdb.c:2487
 #, c-format
 msgid ""
 "%s: directory \"%s\" exists but is not empty\n"
@@ -516,12 +516,12 @@ msgstr ""
 "o diretСrio \"%s\" ou execute %s\n"
 "com um argumento ao invИs de \"%s\".\n"
 
-#: initdb.c:2501
+#: initdb.c:2504
 #, c-format
 msgid "creating directory %s/%s ... "
 msgstr "criando diretСrio %s/%s ... "
 
-#: initdb.c:2565
+#: initdb.c:2568
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_controldata/po/pt_BR.po b/src/bin/pg_controldata/po/pt_BR.po
index 0fce8a62e9..360daa5c77 100644
--- a/src/bin/pg_controldata/po/pt_BR.po
+++ b/src/bin/pg_controldata/po/pt_BR.po
@@ -1,12 +1,12 @@
 # "pg_controldata" translation to Brazilian Portuguese Language.
-# Cesar Suga <sartre@linuxbr.com>, 2002. - Fair & Simple Networks Ltda.
+# Cesar Suga <sartre@linuxbr.com>, 2002.
 # Roberto Mello <rmello@fslc.usu.edu>, 2002.
-# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003.
+# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-09-28 13:54-0300\n"
+"POT-Creation-Date: 2004-10-27 13:07-0300\n"
 "PO-Revision-Date: 2004-09-28 14:10-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@ufgnet.ufg.br>\n"
 "Language-Team: Brazilian Portuguese <pgsql-dev@lists.querencialivre.rs.gov."
diff --git a/src/bin/pg_controldata/po/zh_TW.po b/src/bin/pg_controldata/po/zh_TW.po
index 5edf24c9bf..785914e14c 100644
--- a/src/bin/pg_controldata/po/zh_TW.po
+++ b/src/bin/pg_controldata/po/zh_TW.po
@@ -1,18 +1,17 @@
-# Traditional Chinese translation file for pg_controldata.
-# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+# 2004-11-01 Zhenbang Wei <forth@zbwei.net>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-07-29 19:15-0300\n"
-"PO-Revision-Date: 2004-08-01 13:21+0800\n"
+"POT-Creation-Date: 2004-11-01 01:42+0000\n"
+"PO-Revision-Date: 2004-11-01 13:36+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_controldata.c:28
+#: pg_controldata.c:26
 #, c-format
 msgid ""
 "%s displays control information of a PostgreSQL database cluster.\n"
@@ -21,85 +20,83 @@ msgstr ""
 "%s И║╞Г╓╨PostgreSQLХЁ┤Ф√≥Е╨╚clusterФ▌╖Е┬╤ХЁ┤Х╗┼Ц─┌\n"
 "\n"
 
-#: pg_controldata.c:32
+#: pg_controldata.c:30
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTION]\n"
+"  %s [OPTION] [DATADIR]\n"
 "\n"
 "Options:\n"
-"  DATADIR        show cluster control information for DATADIR\n"
 "  --help         show this help, then exit\n"
 "  --version      output version information, then exit\n"
 msgstr ""
-"Г■╗ФЁ∙:\n"
-"  %s [И│╦И═┘]\n"
+"Г■╗ФЁ∙О╪ \n"
+"  %s [OPTION] [DATADIR]\n"
 "\n"
-"И│╦И═┘:\n"
-"  DATADIR        И║╞Г╓╨DATADIRГ └Е▐╒И⌡├Ф▌╖Е┬╤Х╗┼Ф│╞\n"
+"И│╦И═┘О╪ \n"
 "  --help         И║╞Г╓╨Х╙╙Ф≤▌Х╗┼Ф│╞Г└╤Е╬▄Г╣░Ф²÷\n"
 "  --version      И║╞Г╓╨Г┴┬Ф°╛ХЁ┤Х╗┼Г└╤Е╬▄Г╣░Ф²÷\n"
 
-#: pg_controldata.c:41
+#: pg_controldata.c:38
 msgid ""
 "\n"
-"If no data directory is specified, the environment variable PGDATA\n"
+"If no data directory (DATADIR) is specified, the environment variable PGDATA\n"
 "is used.\n"
 "\n"
 msgstr ""
 "\n"
-"Е╕┌Ф·°Ф╡▓Ф°┴Ф▄┤Е╝ ХЁ┤Ф√≥Г⌡╝И▄└Е╟╠Ф°┐Д╫©Г■╗Г▓╟Е╒┐Х╝┼Ф∙╦PGDATAЦ─┌\n"
+"Е╕┌Ф·°Ф╡▓Ф°┴Ф▄┤Е╝ ХЁ┤Ф√≥Г⌡╝И▄└(DATADIR)Е╟╠Ф°┐Д╫©Г■╗Г▓╟Е╒┐Х╝┼Ф∙╦PGDATAЦ─┌\n"
 "\n"
 
-#: pg_controldata.c:42
+#: pg_controldata.c:40
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Е⌡·Е═╠И▄╞Х╙╓Х┤Ё<pgsql-bugs@postgresql.org>Ц─┌\n"
 
-#: pg_controldata.c:52
+#: pg_controldata.c:50
 msgid "starting up"
 msgstr "Ф╜ёЕ°╗Е∙÷Е▀∙"
 
-#: pg_controldata.c:54
+#: pg_controldata.c:52
 msgid "shut down"
 msgstr "И≈°И√┴"
 
-#: pg_controldata.c:56
+#: pg_controldata.c:54
 msgid "shutting down"
 msgstr "Ф╜ёЕ°╗И≈°И√┴"
 
-#: pg_controldata.c:58
+#: pg_controldata.c:56
 msgid "in recovery"
 msgstr "Ф╜ёЕ°╗Е╬╘Е▌÷"
 
-#: pg_controldata.c:60
+#: pg_controldata.c:58
 msgid "in production"
 msgstr "Ф╜ёЕ°╗И│▀Д╫°"
 
-#: pg_controldata.c:62
+#: pg_controldata.c:60
 msgid "unrecognized status code"
 msgstr "Г└║ФЁ∙Х╜≤Е┬╔Г └Г▀─Ф┘▀Г╒╪"
 
-#: pg_controldata.c:104
+#: pg_controldata.c:102
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: Ф╡▓Ф°┴Ф▄┤Е╝ ХЁ┤Ф√≥Г⌡╝И▄└\n"
 
-#: pg_controldata.c:105
+#: pg_controldata.c:103
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Е÷╥Х║▄\"%s --help\"И║╞Г╓╨Ф⌡╢Е╓ ХЁ┤Х╗┼Ц─┌\n"
 
-#: pg_controldata.c:113
+#: pg_controldata.c:111
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: Г└║ФЁ∙И√▀Е∙÷Ф╙■Ф║┬\"%s\"Д╩╔Х╝─Е▐√: %s\n"
 
-#: pg_controldata.c:120
+#: pg_controldata.c:118
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: Г└║ФЁ∙Х╝─Е▐√Ф╙■Ф║┬\"%s\": %s\n"
 
-#: pg_controldata.c:134
+#: pg_controldata.c:132
 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"
@@ -111,131 +108,130 @@ msgstr ""
 "Г └Г╣░Ф·°Ф≤╞Д╦█Е▐╞Д©║ХЁ╢Г └Ц─┌\n"
 "\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:152
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_controlГ┴┬Ф°╛Х≥÷Г╒╪:                   %u\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:153
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "catalogГ┴┬Ф°╛Х≥÷Г╒╪:                      %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:154
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "ХЁ┤Ф√≥Е╨╚ГЁ╩Г╣╠Х╜≤Е┬╔Е░█Г╗╠:                   %s\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:155
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "ХЁ┤Ф√≥Е╨╚clusterГ▀─Ф┘▀:                    %s\n"
 
-#: pg_controldata.c:157
+#: pg_controldata.c:156
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_controlФ°─Е╬▄Д©╝Ф■╧Ф≥┌И√⌠:               %s\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:157
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "Г⌡╝Е┴█Г └Ф≈╔Х╙▄Ф╙■ID:                       %u\n"
 
-#: pg_controldata.c:159
+#: pg_controldata.c:158
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Д╦▀Д╦─Е─▀Ф≈╔Х╙▄Ф╙■Ф║┬Е█─Ф╝╣:                   %u\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:159
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Ф°─Ф√╟Г └Ф╙╒Ф÷╔И╩·Д╫█Г╫╝:                     %X/%X\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:161
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "Е┴█Д╦─Е─▀Ф╙╒Ф÷╔И╩·Д╫█Г╫╝:                     %X/%X\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:163
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "Ф°─Ф√╟Г └Ф╙╒Ф÷╔И╩·REDOД╫█Г╫╝:                 %X/%X\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:165
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "Ф°─Ф√╟Г └Ф╙╒Ф÷╔И╩·UNDOД╫█Г╫╝:                 %X/%X\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:167
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "Ф°─Ф√╟Г └Ф╙╒Ф÷╔И╩·TimeLineID:               %u\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:168
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "Ф°─Ф√╟Г └Ф╙╒Ф÷╔И╩·NextXID:                  %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Ф°─Ф√╟Г └Ф╙╒Ф÷╔И╩·NextOID:                  %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:170
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "Ф°─Ф√╟Г └Ф╙╒Ф÷╔И╩·Ф≥┌И√⌠:                     %s\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:171
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "ХЁ┤Ф√≥Е╨╚Е█─Е║┼Е╓╖Е╟▐:                       %u\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:172
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "large relationФ╞▐Е─▀Е█─Ф╝╣Г └Е█─Е║┼Ф∙╦:       %u\n"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:173
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "Ф╞▐Е─▀WALЕ█─Ф╝╣Г └Д╫█Е┘┐Г╣└Ф∙╦:                %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:174
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Х╜≤Е┬╔Е╜≈Г └Ф°─Е╓╖И∙╥Е╨╕:                     %u\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:175
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Е┤╫Е╪▐Е▐┐Ф∙╦Г └Ф°─Е╓╖Е─▀Ф∙╦:                   %u\n"
 
-#: pg_controldata.c:177
+#: pg_controldata.c:176
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Ф≈╔Ф°÷/Ф≥┌И√⌠Е└╡Е╜≤И║·Е·▀:                    %s\n"
 
-#: pg_controldata.c:178
+#: pg_controldata.c:177
 msgid "64-bit integers"
 msgstr "64Д╫█Е┘┐Ф∙╢Ф∙╦"
 
-#: pg_controldata.c:178
+#: pg_controldata.c:177
 msgid "floating-point numbers"
 msgstr "Ф╣╝И╩·Ф∙╦"
 
-#: pg_controldata.c:179
+#: pg_controldata.c:178
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "localeЕ░█Г╗╠Г └Ф°─Е╓╖И∙╥Е╨╕:                 %u\n"
 
-#: pg_controldata.c:180
+#: pg_controldata.c:179
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
-msgstr "LC_COLLATE:                           %s\n"
+msgstr ""
 
-#: pg_controldata.c:181
+#: pg_controldata.c:180
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
-msgstr "LC_CTYPE:                             %s\n"
-
+msgstr ""
diff --git a/src/bin/pg_ctl/po/pt_BR.po b/src/bin/pg_ctl/po/pt_BR.po
index cf62614e41..15ad9cd7f3 100644
--- a/src/bin/pg_ctl/po/pt_BR.po
+++ b/src/bin/pg_ctl/po/pt_BR.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-18 14:00-0300\n"
-"PO-Revision-Date: 2004-10-18 14:10-0300\n"
+"POT-Creation-Date: 2004-10-27 13:07-0300\n"
+"PO-Revision-Date: 2004-10-27 18:36-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@ufgnet.ufg.br>\n"
 "Language-Team: Brazilian Portuguese <pgsql-dev@lists.querencialivre.rs.gov."
 "br>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:200 pg_ctl.c:215 pg_ctl.c:1288
+#: pg_ctl.c:200 pg_ctl.c:215 pg_ctl.c:1327
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: sem memСria\n"
@@ -38,8 +38,8 @@ msgstr "%s: nЦo pТde ler arquivo \"%s\"\n"
 
 #: pg_ctl.c:492
 #, c-format
-msgid "%s: option file \"%s\" must have exactly 1 line\n"
-msgstr "%s: arquivo de opГУes \"%s\" deve ter exatamente 1 linha\n"
+msgid "%s: option file \"%s\" must have exactly one line\n"
+msgstr "%s: arquivo de opГУes \"%s\" deve ter exatamente uma linha\n"
 
 #: pg_ctl.c:543
 #, c-format
@@ -85,266 +85,252 @@ msgstr "esperando o postmaster iniciar..."
 msgid "could not start postmaster\n"
 msgstr "nЦo pТde iniciar o postmaster\n"
 
-#: pg_ctl.c:586
-msgid ""
-" done\n"
-"postmaster started\n"
-msgstr ""
-"feito\n"
-"postmaster iniciado\n"
+#: pg_ctl.c:587 pg_ctl.c:653 pg_ctl.c:720
+msgid " done\n"
+msgstr "feito\n"
 
-#: pg_ctl.c:589
+#: pg_ctl.c:588
+msgid "postmaster started\n"
+msgstr "postmaster iniciado\n"
+
+#: pg_ctl.c:592
 msgid "postmaster starting\n"
 msgstr "postmaster iniciando\n"
 
-#: pg_ctl.c:603 pg_ctl.c:671 pg_ctl.c:730
+#: pg_ctl.c:606 pg_ctl.c:674 pg_ctl.c:734
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%s: arquivo contendo PID \"%s\" nЦo existe\n"
 
-#: pg_ctl.c:604 pg_ctl.c:731
+#: pg_ctl.c:607 pg_ctl.c:675 pg_ctl.c:735
 msgid "Is postmaster running?\n"
 msgstr "O postmaster estА executando?\n"
 
-#: pg_ctl.c:610
+#: pg_ctl.c:613
 #, c-format
 msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: nЦo pode parar postmaster; postgres estА executando (PID: %ld)\n"
 
-#: pg_ctl.c:618 pg_ctl.c:688
+#: pg_ctl.c:621 pg_ctl.c:692
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%s: nЦo pТde enviar sinal de parada (PID: %ld): %s\n"
 
-#: pg_ctl.c:625
+#: pg_ctl.c:628
 msgid "postmaster shutting down\n"
 msgstr "postmaster estА sendo desligado\n"
 
-#: pg_ctl.c:630 pg_ctl.c:693
+#: pg_ctl.c:633 pg_ctl.c:697
 msgid "waiting for postmaster to shut down..."
 msgstr "esperando o postmaster desligar..."
 
-#: pg_ctl.c:645 pg_ctl.c:710
+#: pg_ctl.c:648 pg_ctl.c:714
 msgid " failed\n"
 msgstr "falhou\n"
 
-#: pg_ctl.c:647 pg_ctl.c:712
+#: pg_ctl.c:650 pg_ctl.c:716
 #, c-format
 msgid "%s: postmaster does not shut down\n"
 msgstr "%s: postmaster nЦo desligou\n"
 
-#: pg_ctl.c:650 pg_ctl.c:716
-msgid " done\n"
-msgstr "feito\n"
-
-#: pg_ctl.c:652 pg_ctl.c:717
+#: pg_ctl.c:655 pg_ctl.c:721
 msgid "postmaster stopped\n"
 msgstr "postmaster parado\n"
 
-#: pg_ctl.c:672
-msgid ""
-"Is postmaster running?\n"
-"starting postmaster anyway\n"
-msgstr ""
-"O postmaster estА executando?\n"
-"iniciando postmaster mesmo assim\n"
+#: pg_ctl.c:676
+msgid "starting postmaster anyway\n"
+msgstr "iniciando postmaster mesmo assim\n"
 
-#: pg_ctl.c:679
+#: pg_ctl.c:683
 #, c-format
 msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
 msgstr ""
 "%s: nЦo pode reiniciar postmaster; postgres estА executando (PID: %ld)\n"
 
-#: pg_ctl.c:682 pg_ctl.c:740
+#: pg_ctl.c:686 pg_ctl.c:744
 msgid "Please terminate postgres and try again.\n"
 msgstr "Por favor finalize o postgres e tente novamente.\n"
 
-#: pg_ctl.c:737
+#: pg_ctl.c:741
 #, c-format
 msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
 msgstr ""
 "%s: nЦo pode reiniciar postmaster; postgres estА executando (PID: %ld)\n"
 
-#: pg_ctl.c:746
+#: pg_ctl.c:750
 #, c-format
-msgid "could not send reload signal (PID: %ld): %s\n"
-msgstr "nЦo pТde enviar sinal de reinМcio (PID: %ld): %s\n"
+msgid "%s: could not send reload signal (PID: %ld): %s\n"
+msgstr "%s: nЦo pТde enviar sinal de reinМcio (PID: %ld): %s\n"
 
-#: pg_ctl.c:751
+#: pg_ctl.c:755
 msgid "postmaster signaled\n"
 msgstr "postmaster sinalizado\n"
 
-#: pg_ctl.c:766
+#: pg_ctl.c:770
 #, c-format
-msgid "%s: postmaster or postgres not running\n"
-msgstr "%s: postmaster ou postgres nЦo estА executando\n"
+msgid "%s: neither postmaster nor postgres running\n"
+msgstr "%s: nem o postmaster e nem o postgres estА executando\n"
 
-#: pg_ctl.c:772
+#: pg_ctl.c:776
 #, c-format
 msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
 msgstr "%s: um \"postgres\" autТnomo estА executando (PID: %ld)\n"
 
-#: pg_ctl.c:779
+#: pg_ctl.c:783
 #, c-format
 msgid "%s: postmaster is running (PID: %ld)\n"
 msgstr "%s: postmaster estА executando (PID: %ld)\n"
 
-#: pg_ctl.c:795
+#: pg_ctl.c:799
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%s: nЦo pТde enviar sinal %d (PID: %ld): %s\n"
 
-#: pg_ctl.c:826
+#: pg_ctl.c:829
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%s: nЦo pТde encontrar executАvel\n"
+
+#: pg_ctl.c:838
 #, c-format
-msgid "%s: could not find exe"
-msgstr "%s: nЦo pТde encontrar executАvel"
+msgid "%s: could not find postmaster program executable\n"
+msgstr "%s: nЦo pТde encontrar o programa executАvel do postmaster\n"
 
-#: pg_ctl.c:873 pg_ctl.c:905
+#: pg_ctl.c:886 pg_ctl.c:918
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%s: nЦo pТde abrir gerenciador de serviГo\n"
 
-#: pg_ctl.c:879
+#: pg_ctl.c:892
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%s: serviГo \"%s\" jА estА registrado\n"
 
-#: pg_ctl.c:890
+#: pg_ctl.c:903
 #, c-format
-msgid "%s: could not register service \"%s\" [%d]\n"
-msgstr "%s: nЦo pТde registrar serviГo \"%s\" [%d]\n"
+msgid "%s: could not register service \"%s\": error code %d\n"
+msgstr "%s: nЦo pТde registrar serviГo \"%s\": cСdigo de erro %d\n"
 
-#: pg_ctl.c:911
+#: pg_ctl.c:924
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%s: serviГo \"%s\" nЦo estА registrado\n"
 
-#: pg_ctl.c:918
+#: pg_ctl.c:931
 #, c-format
-msgid "%s: could not open service \"%s\" [%d]\n"
-msgstr "%s: nЦo pТde abrir serviГo \"%s\" [%d]\n"
+msgid "%s: could not open service \"%s\": error code %d\n"
+msgstr "%s: nЦo pТde abrir serviГo \"%s\": cСdigo de erro %d\n"
 
-#: pg_ctl.c:925
+#: pg_ctl.c:938
 #, c-format
-msgid "%s: could not unregister service \"%s\" [%d]\n"
-msgstr "%s: nЦo pТde desregistrar serviГo \"%s\" [%d]\n"
+msgid "%s: could not unregister service \"%s\": error code %d\n"
+msgstr "%s: nЦo pТde desregistrar serviГo \"%s\": cСdigo de erro %d\n"
 
-#: pg_ctl.c:1062
+#: pg_ctl.c:1075
 #, c-format
-msgid ""
-"\n"
-"Try \"%s --help\" for more information.\n"
-msgstr ""
-"\n"
-"Tente \"%s --help\" para obter mais informaГЦo.\n"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Tente \"%s --help\" para obter mais informaГЦo.\n"
 
-#: pg_ctl.c:1070
+#: pg_ctl.c:1083
 #, c-format
 msgid ""
 "%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or kill a PostgreSQL process\n"
+"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
 "\n"
 msgstr ""
 "%s И um utilitАrio que inicia, para, reinicia, recarrega arquivos de "
 "configuraГЦo,\n"
-"reporta o estado do servidor PostgreSQL ou termina um processo PostgreSQL\n"
+"reporta o estado do servidor PostgreSQL ou envia um sinal a um processo do "
+"PostgreSQL.\n"
 "\n"
 
-#: pg_ctl.c:1072
+#: pg_ctl.c:1085
 msgid "Usage:\n"
 msgstr "Uso:\n"
 
-#: pg_ctl.c:1073
+#: pg_ctl.c:1086
 #, c-format
 msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr "  %s start   [-w] [-D DIRDADOS] [-s] [-l ARQUIVO] [-o \"OPгуES\"]\n"
 
-#: pg_ctl.c:1074
+#: pg_ctl.c:1087
 #, c-format
 msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-D DIRDADOS] [-s] [-m MODO-DESLIGAMENTO]\n"
 
-#: pg_ctl.c:1075
+#: pg_ctl.c:1088
 #, c-format
 msgid ""
 "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
 msgstr ""
 "  %s restart [-w] [-D DIRDADOS] [-s] [-m MODO-DESLIGAMENTO] [-o \"OPгуES\"]\n"
 
-#: pg_ctl.c:1076
+#: pg_ctl.c:1089
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D DIRDADOS] [-s]\n"
 
-#: pg_ctl.c:1077
+#: pg_ctl.c:1090
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D DIRDADOS]\n"
 
-#: pg_ctl.c:1078
+#: pg_ctl.c:1091
 #, c-format
-msgid "  %s kill    SIGNALNAME PROCESSID\n"
-msgstr "  %s kill    NOME_SINAL ID_PROCESSO\n"
+msgid "  %s kill    SIGNALNAME PID\n"
+msgstr "  %s kill    NOME_SINAL PID\n"
 
-#: pg_ctl.c:1080
+#: pg_ctl.c:1093
 #, c-format
 msgid ""
-"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR] [-"
-"w] [-o \"OPTIONS\"]\n"
+"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
+"                    [-w] [-o \"OPTIONS\"]\n"
 msgstr ""
-"  %s register   [-N NOME_SERVIгO] [-U USUаRIO] [-P SENHA] [-D DIRDADOS] [-"
-"w]  [-o \"OPгуES\"]\n"
+"  %s register   [-N NOME_SERVIгO] [-U USUаRIO] [-P SENHA] [-D DIRDADOS]\n"
+"                    [-w] [-o \"OPгуES\"]\n"
 
-#: pg_ctl.c:1081
+#: pg_ctl.c:1095
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N NOME_SERVIгO]\n"
 
-#: pg_ctl.c:1083
-msgid "Common options:\n"
-msgstr "OpГУes comuns:\n"
+#: pg_ctl.c:1098
+msgid ""
+"\n"
+"Common options:\n"
+msgstr ""
+"\n"
+"OpГУes comuns:\n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1099
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr ""
-"  -D, --pgdata DIRDADOS   localizaГЦo da Аrea de armazenamento do banco de "
+"  -D, --pgdata DIRDADOS  localizaГЦo da Аrea de armazenamento do banco de "
 "dados\n"
 
-#: pg_ctl.c:1085
-msgid "  -s, --silent only print errors, no informational messages\n"
-msgstr "  -s, --silent mostra somente erros, nenhuma mensagem informativa\n"
-
-#: pg_ctl.c:1087
-msgid "  -N       service name with which to register PostgreSQL server\n"
+#: pg_ctl.c:1100
+msgid "  -s, --silent           only print errors, no informational messages\n"
 msgstr ""
-"  -N       nome do serviГo no qual se registrou o servidor PostgreSQL\n"
-"\n"
+"  -s, --silent           mostra somente erros, nenhuma mensagem informativa\n"
 
-#: pg_ctl.c:1088
-msgid "  -P       password of account to register PostgreSQL server\n"
-msgstr "  -P       senha da conta que registrou o servidor PostgreSQL\n"
-
-#: pg_ctl.c:1089
-msgid "  -U       user name of account to register PostgreSQL server\n"
-msgstr "  -U       nome do usuАrio que registrou o servidor PostgreSQL\n"
+#: pg_ctl.c:1101
+msgid "  -w                     wait until operation completes\n"
+msgstr "  -w                     espera atИ que a operaГЦo seja completada\n"
 
-#: pg_ctl.c:1091
-msgid "  -w           wait until operation completes\n"
-msgstr "  -w           espera atИ que a operaГЦo seja completada\n"
-
-#: pg_ctl.c:1092
-msgid "  -W           do not wait until operation completes\n"
-msgstr "  -W           nЦo espera atИ que a operaГЦo seja completada\n"
+#: pg_ctl.c:1102
+msgid "  -W                     do not wait until operation completes\n"
+msgstr ""
+"  -W                     nЦo espera atИ que a operaГЦo seja completada\n"
 
-#: pg_ctl.c:1093
-msgid "  --help       show this help, then exit\n"
-msgstr "  --help       mostra esta ajuda e sai\n"
+#: pg_ctl.c:1103
+msgid "  --help                 show this help, then exit\n"
+msgstr "  --help                 mostra esta ajuda e sai\n"
 
-#: pg_ctl.c:1094
-msgid "  --version    output version information, then exit\n"
-msgstr "  --version    mostra informaГЦo sobre a versЦo e sai\n"
+#: pg_ctl.c:1104
+msgid "  --version              output version information, then exit\n"
+msgstr "  --version              mostra informaГЦo sobre a versЦo e sai\n"
 
-#: pg_ctl.c:1095
+#: pg_ctl.c:1105
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
 "\n"
@@ -352,139 +338,165 @@ msgstr ""
 "(O padrЦo И esperar o desligamento, mas nЦo para inМcio ou reinМcio).\n"
 "\n"
 
-#: pg_ctl.c:1096
+#: pg_ctl.c:1106
+msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
+msgstr ""
+"Se a opГЦo -D for omitida, a variАvel de ambiente PGDATA И utilizada.\n"
+
+#: pg_ctl.c:1108
 msgid ""
-"If the -D option is omitted, the environment variable PGDATA is used.\n"
 "\n"
+"Options for start or restart:\n"
 msgstr ""
-"Se a opГЦo -D for omitida, a variАvel de ambiente PGDATA И utilizada.\n"
 "\n"
+"OpГУes para inМcio ou reinМcio:\n"
 
-#: pg_ctl.c:1097
-msgid "Options for start or restart:\n"
-msgstr "OpГУes para inМcio ou reinМcio:\n"
-
-#: pg_ctl.c:1098
-msgid ""
-"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
-"                          use of this option is highly recommended.\n"
+#: pg_ctl.c:1109
+msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
 msgstr ""
 "  -l, --log ARQUIVO      escreve (ou concatena) log do servidor para "
-"ARQUIVO.  O\n"
-"                          uso desta opГЦo И altamente recomendado.\n"
+"ARQUIVO\n"
 
-#: pg_ctl.c:1100
+#: pg_ctl.c:1110
 msgid ""
-"  -o OPTIONS              command line options to pass to the postmaster\n"
-"                          (PostgreSQL server executable)\n"
+"  -o OPTIONS             command line options to pass to the postmaster\n"
+"                         (PostgreSQL server executable)\n"
 msgstr ""
 "  -o OPгуES              opГУes de linha de comando passadas para o "
 "postmaster\n"
-"                          (executАvel do servidor PostgreSQL)\n"
+"                         (executАvel do servidor PostgreSQL)\n"
 
-#: pg_ctl.c:1102
+#: pg_ctl.c:1112
+msgid "  -p PATH-TO-POSTMASTER  normally not necessary\n"
+msgstr "  -p CAMINHO-PARA-POSTMASTER   normalmente nЦo И necessАrio\n"
+
+#: pg_ctl.c:1114
 msgid ""
-"  -p PATH-TO-POSTMASTER   normally not necessary\n"
 "\n"
+"Options for stop or restart:\n"
 msgstr ""
-"  -p CAMINHO-PARA-POSTMASTER   normalmente nЦo И necessАrio\n"
 "\n"
+"OpГУes para desligar ou reiniciar:\n"
 
-#: pg_ctl.c:1103
-msgid "Options for stop or restart:\n"
-msgstr "OpГУes para desligar ou reiniciar:\n"
-
-#: pg_ctl.c:1104
-msgid ""
-"  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"
-"\n"
+#: pg_ctl.c:1115
+msgid "  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"
 msgstr ""
 "  -m MODO-DESLIGAMENTO   pode ser \"smart\", \"fast\" ou \"immediate\"\n"
-"\n"
 
-#: pg_ctl.c:1105
-msgid "Allowed signal names for kill:\n"
-msgstr "Sinais permitidos para desligamento:\n"
-
-#: pg_ctl.c:1106
+#: pg_ctl.c:1117
 msgid ""
-"  HUP INT QUIT ABRT TERM USR1 USR2\n"
 "\n"
+"Shutdown modes are:\n"
 msgstr ""
-"  HUP INT QUIT ABRT TERM USR1 USR2\n"
 "\n"
+"Modos de desligamento sЦo:\n"
 
-#: pg_ctl.c:1107
-msgid "Shutdown modes are:\n"
-msgstr "Modos de desligamento sЦo:\n"
-
-#: pg_ctl.c:1108
+#: pg_ctl.c:1118
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       sai depois que todos os clientes desconectarem\n"
 
-#: pg_ctl.c:1109
+#: pg_ctl.c:1119
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        sai diretamente, com desligamento apropriado\n"
 
-#: pg_ctl.c:1110
+#: pg_ctl.c:1120
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
 "restart\n"
-"\n"
 msgstr ""
 "  immediate   sai sem desligamento completo; provocarА uma recuperaГЦo no "
 "reinМcio\n"
+
+#: pg_ctl.c:1122
+msgid ""
 "\n"
+"Allowed signal names for kill:\n"
+msgstr ""
+"\n"
+"Sinais permitidos para sinalizaГЦo:\n"
+
+#: pg_ctl.c:1126
+msgid ""
+"\n"
+"Options for register and unregister:\n"
+msgstr ""
+"\n"
+"OpГУes para registro ou desregistro:\n"
+
+#: pg_ctl.c:1127
+msgid ""
+"  -N SERVICENAME  service name with which to register PostgreSQL server\n"
+msgstr ""
+"  -N NOME_SERVIгO nome do serviГo no qual se registrou o servidor "
+"PostgreSQL\n"
 
-#: pg_ctl.c:1111
-msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Reporte erros a <pgsql-bugs@postgresql.org>.\n"
+#: pg_ctl.c:1128
+msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
+msgstr "  -P SENHA        senha da conta que registrou o servidor PostgreSQL\n"
 
-#: pg_ctl.c:1136
+#: pg_ctl.c:1129
+msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
+msgstr ""
+"  -U USUаRIO      nome do usuАrio que registrou o servidor PostgreSQL\n"
+
+#: pg_ctl.c:1132
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Reporte erros a <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_ctl.c:1157
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%s: modo de desligamento \"%s\" invАlido\n"
 
-#: pg_ctl.c:1169
+#: pg_ctl.c:1190
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: nome de sinal \"%s\" invАlido\n"
 
-#: pg_ctl.c:1304
+#: pg_ctl.c:1255
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: nЦo pode ser executado como root\n"
+"Por favor entre (utilizando \"su\") como um usuАrio (sem privilИgios) que\n"
+"serА o dono do processo do servidor.\n"
+
+#: pg_ctl.c:1343
 #, c-format
 msgid "%s: invalid option %s\n"
 msgstr "%s: opГЦo %s invАlida\n"
 
-#: pg_ctl.c:1315
+#: pg_ctl.c:1354
 #, c-format
-msgid "%s: extra operation mode \"%s\"\n"
-msgstr "%s: modo de operaГЦo extra \"%s\"\n"
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: muitos argumentos de linha de comando (primeiro И \"%s\")\n"
 
-#: pg_ctl.c:1334
+#: pg_ctl.c:1373
 #, c-format
-msgid "%s: invalid kill syntax\n"
-msgstr "%s: sintaxe de desligamento invАlida\n"
+msgid "%s: missing arguments for kill mode\n"
+msgstr "%s: faltando argumento para modo kill\n"
 
-#: pg_ctl.c:1352
+#: pg_ctl.c:1391
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: modo de operaГЦo \"%s\" invАlido\n"
 
-#: pg_ctl.c:1362
+#: pg_ctl.c:1401
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: nenhuma operaГЦo especificada\n"
 
-#: pg_ctl.c:1378
+#: pg_ctl.c:1417
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr ""
 "%s: nenhum diretСrio de banco de dados especificado e variАvel de ambiente "
 "PGDATA nЦo foi definida\n"
-
-#~ msgid "waiting for postmaster to shut down... "
-#~ msgstr "esperando o postmaster desligar... "
-
-#~ msgid "failed\n"
-#~ msgstr "falhou\n"
diff --git a/src/bin/pg_ctl/po/ru.po b/src/bin/pg_ctl/po/ru.po
index c74de3cb97..3ab198df0a 100644
--- a/src/bin/pg_ctl/po/ru.po
+++ b/src/bin/pg_ctl/po/ru.po
@@ -1,25 +1,30 @@
 # ru.po
 # PG_CTL Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_ctl/po/ru.po,v 1.5 2004/10/27 11:22:08 petere Exp $
+# Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
+# Distributed under the same licensing terms as PostgreSQL itself.
+#
+# $Header: /cvsroot/pgsql/src/bin/pg_ctl/po/ru.po,v 1.6 2004/11/02 09:20:13 petere Exp $
 #
 # ChangeLog:
-#   - May 29 - October 21, 2004: Initial translation for 8.0; Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - May 29 - November 1, 2004: Initial translation for 8.0; Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-17 01:09+0100\n"
-"PO-Revision-Date: 2004-10-21 03:16-0500\n"
+"POT-Creation-Date: 2004-11-01 19:13+0000\n"
+"PO-Revision-Date: 2004-11-01 15:56-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"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
 
 #: pg_ctl.c:200
 #: pg_ctl.c:215
-#: pg_ctl.c:1309
+#: pg_ctl.c:1331
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: не хватает памяти\n"
@@ -455,32 +460,43 @@ msgstr "%s: неверный режим остановки \"%s\"\n"
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%s: нераспознанное имя сигнала \"%s\"\n"
 
-#: pg_ctl.c:1325
+#: pg_ctl.c:1255
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: нельзя выполнять как root\n"
+"Пожалуйста зайдите как непривелигированный пользователь  (например используя \"su\"),\n"
+"который будет владеть серверным процессом.\n"
+
+#: pg_ctl.c:1347
 #, c-format
 msgid "%s: invalid option %s\n"
 msgstr "%s: неверная опция %s\n"
 
-#: pg_ctl.c:1336
+#: pg_ctl.c:1358
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
 
-#: pg_ctl.c:1355
+#: pg_ctl.c:1377
 #, c-format
 msgid "%s: missing arguments for kill mode\n"
 msgstr "%s: отсутствуют аргументы для режима kill\n"
 
-#: pg_ctl.c:1373
+#: pg_ctl.c:1395
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%s: нераспознанный оперативный режим \"%s\"\n"
 
-#: pg_ctl.c:1383
+#: pg_ctl.c:1405
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: команда не указана\n"
 
-#: pg_ctl.c:1399
+#: pg_ctl.c:1421
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr "%s: директория баз данных не указана и переменная окружения PGDATA не установлена\n"
diff --git a/src/bin/pg_ctl/po/zh_TW.po b/src/bin/pg_ctl/po/zh_TW.po
index 4ade3195e2..3a4075a29f 100644
--- a/src/bin/pg_ctl/po/zh_TW.po
+++ b/src/bin/pg_ctl/po/zh_TW.po
@@ -1,11 +1,10 @@
-# Traditional Chinese translation for pg_ctl.
-# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+# 2004-11-01 Zhenbang Wei <forth@zbwei.net>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-19 01:09+0100\n"
-"PO-Revision-Date: 2004-10-19 10:51+0800\n"
+"POT-Creation-Date: 2004-11-01 01:44+0000\n"
+"PO-Revision-Date: 2004-11-01 13:53+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +13,7 @@ msgstr ""
 
 #: pg_ctl.c:200
 #: pg_ctl.c:215
-#: pg_ctl.c:1288
+#: pg_ctl.c:1331
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%sО╪ Х╗≤Ф├╤И╚■Г■╗Г⌡║\n"
@@ -36,8 +35,8 @@ msgstr "%sО╪ Г└║ФЁ∙Х╝─Е▐√Ф╙■Ф║┬\"%s\"\n"
 
 #: pg_ctl.c:492
 #, c-format
-msgid "%s: option file \"%s\" must have exactly 1 line\n"
-msgstr "%sО╪ И│╦И═┘Ф╙■\"%s\"Е▐╙Х┐╫Ф°┴Д╦─Х║▄ХЁ┤Ф√≥\n"
+msgid "%s: option file \"%s\" must have exactly one line\n"
+msgstr "%sО╪ И│╦И═┘Ф╙■\"%s\"Е▐╙Х┐╫Ф°┴Д╦─Х║▄Е┘╖Е╝╧\n"
 
 #: pg_ctl.c:543
 #, c-format
@@ -81,264 +80,255 @@ msgstr "Г╜┴Е╬┘postmasterЕ∙÷Е▀∙..."
 msgid "could not start postmaster\n"
 msgstr "Г└║ФЁ∙Е∙÷Е▀∙postmaster\n"
 
-#: pg_ctl.c:586
-msgid ""
-" done\n"
-"postmaster started\n"
-msgstr ""
-" Е╝▄Ф┬░\n"
-"postmasterЕ╥╡Г╤⌠Е∙÷Е▀∙\n"
+#: pg_ctl.c:587
+#: pg_ctl.c:653
+#: pg_ctl.c:720
+msgid " done\n"
+msgstr " Е╝▄Ф┬░\n"
+
+#: pg_ctl.c:588
+msgid "postmaster started\n"
+msgstr "postmasterЕ╥╡Г╤⌠Е∙÷Е▀∙\n"
 
-#: pg_ctl.c:589
+#: pg_ctl.c:592
 msgid "postmaster starting\n"
 msgstr "postmasterФ╜ёЕ°╗Е∙÷Е▀∙\n"
 
-#: pg_ctl.c:603
-#: pg_ctl.c:671
-#: pg_ctl.c:730
+#: pg_ctl.c:606
+#: pg_ctl.c:674
+#: pg_ctl.c:734
 #, c-format
 msgid "%s: PID file \"%s\" does not exist\n"
 msgstr "%sО╪ PIDФ╙■\"%s\"Д╦█Е╜≤Е°╗\n"
 
-#: pg_ctl.c:604
-#: pg_ctl.c:731
+#: pg_ctl.c:607
+#: pg_ctl.c:675
+#: pg_ctl.c:735
 msgid "Is postmaster running?\n"
 msgstr "postmasterФ≤╞Е░╕Ф╜ёЕ°╗Е÷╥Х║▄О╪÷\n"
 
-#: pg_ctl.c:610
+#: pg_ctl.c:613
 #, c-format
 msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
 msgstr "%sО╪ Г└║ФЁ∙Е│°Ф╜╒postmasterО╪▄postgresФ╜ёЕ°╗Е÷╥Х║▄(PIDО╪ %ld)\n"
 
-#: pg_ctl.c:618
-#: pg_ctl.c:688
+#: pg_ctl.c:621
+#: pg_ctl.c:692
 #, c-format
 msgid "%s: could not send stop signal (PID: %ld): %s\n"
 msgstr "%sО╪ Г└║ФЁ∙Е┌ЁИ─│stopД©║Х≥÷(PIDО╪ %ld)О╪ %s\n"
 
-#: pg_ctl.c:625
+#: pg_ctl.c:628
 msgid "postmaster shutting down\n"
 msgstr "postmasterФ╜ёЕ°╗И≈°И√┴\n"
 
-#: pg_ctl.c:630
-#: pg_ctl.c:693
+#: pg_ctl.c:633
+#: pg_ctl.c:697
 msgid "waiting for postmaster to shut down..."
 msgstr "Г╜┴Е╬┘postmasterИ≈°И√┴..."
 
-#: pg_ctl.c:645
-#: pg_ctl.c:710
+#: pg_ctl.c:648
+#: pg_ctl.c:714
 msgid " failed\n"
 msgstr " Е╓╠Ф∙≈\n"
 
-#: pg_ctl.c:647
-#: pg_ctl.c:712
+#: pg_ctl.c:650
+#: pg_ctl.c:716
 #, c-format
 msgid "%s: postmaster does not shut down\n"
 msgstr "%sО╪ postmasterГ└║ФЁ∙И≈°И√┴\n"
 
-#: pg_ctl.c:650
-#: pg_ctl.c:716
-msgid " done\n"
-msgstr " Е╝▄Ф┬░\n"
-
-#: pg_ctl.c:652
-#: pg_ctl.c:717
+#: pg_ctl.c:655
+#: pg_ctl.c:721
 msgid "postmaster stopped\n"
 msgstr "postmasterЕ│°Ф╜╒Е÷╥Х║▄\n"
 
-#: pg_ctl.c:672
-msgid ""
-"Is postmaster running?\n"
-"starting postmaster anyway\n"
-msgstr ""
-"postmasterФ≤╞Е░╕Ф╜ёЕ°╗Е÷╥Х║▄О╪÷\n"
-"Е╪╥Е┬╤Е∙÷Е▀∙postmaster\n"
+#: pg_ctl.c:676
+msgid "starting postmaster anyway\n"
+msgstr "Е╪╥Е┬╤Е∙÷Е▀∙postmaster\n"
 
-#: pg_ctl.c:679
+#: pg_ctl.c:683
 #, c-format
 msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
 msgstr "%sО╪ Г└║ФЁ∙И┤█Ф√╟Е∙÷Е▀∙postmasterО╪▄postgresФ╜ёЕ°╗Е÷╥Х║▄(PIDО╪ %ld)\n"
 
-#: pg_ctl.c:682
-#: pg_ctl.c:740
+#: pg_ctl.c:686
+#: pg_ctl.c:744
 msgid "Please terminate postgres and try again.\n"
 msgstr "Х╚▀Г╣░Ф²÷postgresГ└╤Е╬▄Е├█Х╘╕Д╦─Ф╛║Ц─┌\n"
 
-#: pg_ctl.c:737
+#: pg_ctl.c:741
 #, c-format
 msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
 msgstr "%sО╪ Г└║ФЁ∙И┤█Ф√╟Х╪┴Е┘╔postmasterО╪▄ postgresФ╜ёЕ°╗Е÷╥Х║▄(PIDО╪ %ld)\n"
 
-#: pg_ctl.c:746
+#: pg_ctl.c:750
 #, c-format
-msgid "could not send reload signal (PID: %ld): %s\n"
-msgstr "Г└║ФЁ∙Е┌ЁИ─│reloadД©║Х≥÷(PIDО╪ %ld)О╪ %s\n"
+msgid "%s: could not send reload signal (PID: %ld): %s\n"
+msgstr "%sО╪ Г└║ФЁ∙Е┌ЁИ─│reloadД©║Х≥÷(PIDО╪ %ld)О╪ %s\n"
 
-#: pg_ctl.c:751
+#: pg_ctl.c:755
 msgid "postmaster signaled\n"
 msgstr "Е╥╡И─ Г÷╔postmaster\n"
 
-#: pg_ctl.c:766
+#: pg_ctl.c:770
 #, c-format
-msgid "%s: postmaster or postgres not running\n"
+msgid "%s: neither postmaster nor postgres running\n"
 msgstr "%sО╪ postmasterФ┬√postgresЕ╟ Ф°╙Е÷╥Х║▄\n"
 
-#: pg_ctl.c:772
+#: pg_ctl.c:776
 #, c-format
 msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
-msgstr "%sО╪ Д╦─Е─▀Г█╗Г╚▀Е╬▄Г╚╞\"postgres\"Ф╜ёЕ°╗Е÷╥Х║▄(PIDО╪ %ld)\n"
+msgstr "%sО╪ Д╦─Е─▀Г█╗?Е╬▄Г╚╞\"postgres\"Ф╜ёЕ°╗Е÷╥Х║▄(PIDО╪ %ld)\n"
 
-#: pg_ctl.c:779
+#: pg_ctl.c:783
 #, c-format
 msgid "%s: postmaster is running (PID: %ld)\n"
 msgstr "%sО╪ postmasterФ╜ёЕ°╗Е÷╥Х║▄(PIDО╪ %ld)\n"
 
-#: pg_ctl.c:795
+#: pg_ctl.c:799
 #, c-format
 msgid "%s: could not send signal %d (PID: %ld): %s\n"
 msgstr "%sО╪ Г└║ФЁ∙Е┌ЁИ─│Д©║Х≥÷ %d(PIDО╪ %ld)О╪ %s\n"
 
-#: pg_ctl.c:826
+#: pg_ctl.c:829
+#, c-format
+msgid "%s: could not find own program executable\n"
+msgstr "%sО╪ Ф┴╬Д╦█Е┬╟Г╗▀Е╪▐Е÷╥Х║▄Ф╙■\n"
+
+#: pg_ctl.c:838
 #, c-format
-msgid "%s: could not find exe"
-msgstr "%sО╪ Ф┴╬Д╦█Е┬╟exe"
+msgid "%s: could not find postmaster program executable\n"
+msgstr "%sО╪ Ф┴╬Д╦█Е┬╟postmasterЕ÷╥Х║▄Ф╙■\n"
 
-#: pg_ctl.c:873
-#: pg_ctl.c:905
+#: pg_ctl.c:886
+#: pg_ctl.c:918
 #, c-format
 msgid "%s: could not open service manager\n"
 msgstr "%sО╪ Г└║ФЁ∙И√▀Е∙÷Ф°█Е▀≥Г╝║Г░├Е⌠║\n"
 
-#: pg_ctl.c:879
+#: pg_ctl.c:892
 #, c-format
 msgid "%s: service \"%s\" already registered\n"
 msgstr "%sО╪ Ф°█Е▀≥\"%s\"Е╥╡Г╤⌠Х╒╚Х╗╩Е├┼\n"
 
-#: pg_ctl.c:890
+#: pg_ctl.c:903
 #, c-format
-msgid "%s: could not register service \"%s\" [%d]\n"
-msgstr "%sО╪ Г└║ФЁ∙Х╗╩Е├┼Ф°█Е▀≥\"%s\" [%d]\n"
+msgid "%s: could not register service \"%s\": error code %d\n"
+msgstr "%sО╪ Г└║ФЁ∙Х╗╩Е├┼Ф°█Е▀≥\"%s\"О╪ И▄╞Х╙╓Д╩ёГ╒╪%d\n"
 
-#: pg_ctl.c:911
+#: pg_ctl.c:924
 #, c-format
 msgid "%s: service \"%s\" not registered\n"
 msgstr "%sО╪ Ф°█Е▀≥\"%s\"Ф°╙Х╒╚Х╗╩Е├┼\n"
 
-#: pg_ctl.c:918
+#: pg_ctl.c:931
 #, c-format
-msgid "%s: could not open service \"%s\" [%d]\n"
-msgstr "%sО╪ Г└║ФЁ∙И√▀Е∙÷Ф°█Е▀≥\"%s\" [%d]\n"
+msgid "%s: could not open service \"%s\": error code %d\n"
+msgstr "%sО╪ Г└║ФЁ∙И√▀Е∙÷Ф°█Е▀≥\"%s\"О╪ И▄╞Х╙╓Д╩ёГ╒╪%d\n"
 
-#: pg_ctl.c:925
+#: pg_ctl.c:938
 #, c-format
-msgid "%s: could not unregister service \"%s\" [%d]\n"
-msgstr "%sО╪ Г└║ФЁ∙Г╖╩И≥╓Ф°█Е▀≥\"%s\" [%d]\n"
+msgid "%s: could not unregister service \"%s\": error code %d\n"
+msgstr "%sО╪ Г└║ФЁ∙Г╖╩И≥╓Ф°█Е▀≥\"%s\"О╪ И▄╞Х╙╓Д╩ёГ╒╪%d\n"
 
-#: pg_ctl.c:1062
+#: pg_ctl.c:1075
 #, c-format
-msgid ""
-"\n"
-"Try \"%s --help\" for more information.\n"
-msgstr ""
-"\n"
-"Е÷╥Х║▄\"%s --help\"Д╩╔И║╞Г╓╨Ф⌡╢Е╓ ХЁ┤Х╗┼Ц─┌\n"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Е÷╥Х║▄\"%s --help\"Д╩╔И║╞Г╓╨Ф⌡╢Е╓ ХЁ┤Х╗┼Ц─┌\n"
 
-#: pg_ctl.c:1070
+#: pg_ctl.c:1083
 #, c-format
 msgid ""
 "%s is a utility to start, stop, restart, reload configuration files,\n"
-"report the status of a PostgreSQL server, or kill a PostgreSQL process\n"
+"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
 "\n"
 msgstr ""
 "%s Е▐╞Д╩╔Г■╗Д╬├Е∙÷Е▀∙Ц─│Е│°Ф╜╒Ц─│И┤█Ф√╟Е∙÷Е▀∙Ц─│И┤█Ф√╟Х╪┴Е┘╔Х╗╜Е╝ Ф╙■Ц─│\n"
-"Е═╠Е▒┼PostgreSQLД╪╨Ф°█Е≥╗Г▀─Ф┘▀О╪▄Ф┬√Ф≤╞Ф╝╨Ф▌┴PostgreSQLХ║▄Г╗▀\n"
+"Е═╠Е▒┼PostgreSQLД╪╨Ф°█Е≥╗Г▀─Ф┘▀О╪▄Ф┬√И─│Д©║Х≥÷Г╣╕PostgreSQLХ║▄Г╗▀Ц─┌\n"
 "\n"
 
-#: pg_ctl.c:1072
+#: pg_ctl.c:1085
 msgid "Usage:\n"
 msgstr "Д╫©Г■╗Ф√╧ФЁ∙О╪ \n"
 
-#: pg_ctl.c:1073
+#: pg_ctl.c:1086
 #, c-format
 msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr "  %s start   [-w] [-D ХЁ┤Ф√≥Г⌡╝И▄└] [-s] [-l Ф╙■Е░█] [-o \"И│╦И═┘\"]\n"
 
-#: pg_ctl.c:1074
+#: pg_ctl.c:1087
 #, c-format
 msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-D ХЁ┤Ф√≥Г⌡╝И▄└] [-s] [-m И≈°И√┴Ф╗║Е╪▐]\n"
 
-#: pg_ctl.c:1075
+#: pg_ctl.c:1088
 #, c-format
 msgid "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
 msgstr "  %s restart [-w] [-D ХЁ┤Ф√≥Г⌡╝И▄└] [-s] [-m И≈°И√┴Ф╗║Е╪▐] [-o \"И│╦И═┘\"]\n"
 
-#: pg_ctl.c:1076
+#: pg_ctl.c:1089
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D ХЁ┤Ф√≥Г⌡╝И▄└] [-s]\n"
 
-#: pg_ctl.c:1077
+#: pg_ctl.c:1090
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D ХЁ┤Ф√≥Г⌡╝И▄└]\n"
 
-#: pg_ctl.c:1078
+#: pg_ctl.c:1091
 #, c-format
-msgid "  %s kill    SIGNALNAME PROCESSID\n"
-msgstr "  %s kill    Д©║Х≥÷Е░█Г╗╠ Х║▄Г╗▀ID\n"
+msgid "  %s kill    SIGNALNAME PID\n"
+msgstr "  %s kill    Д©║Х≥÷Е░█Г╗╠ PID\n"
 
-#: pg_ctl.c:1080
+#: pg_ctl.c:1093
 #, c-format
-msgid "  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR] [-w] [-o \"OPTIONS\"]\n"
-msgstr "  %s register   [-N Ф°█Е▀≥Е░█Г╗╠] [-U Д╫©Г■╗Х─┘] [-P Е╞├Г╒╪] [-D ХЁ┤Ф√≥Г⌡╝И▄└] [-w] [-o \"И│╦И═┘\"]\n"
+msgid ""
+"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
+"                    [-w] [-o \"OPTIONS\"]\n"
+msgstr ""
+"  %s register   [-N Ф°█Е▀≥Е░█Г╗╠] [-U Д╫©Г■╗Х─┘] [-P Е╞├Г╒╪] [-D ХЁ┤Ф√≥Г⌡╝И▄└] [-w]\n"
+"                    [-o \"И│╦И═┘\"]\n"
 
-#: pg_ctl.c:1081
+#: pg_ctl.c:1095
 #, c-format
 msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N Ф°█Е▀≥Е░█Г╗╠]\n"
 
-#: pg_ctl.c:1083
-msgid "Common options:\n"
-msgstr "Д╦─Х┬╛И│╦И═┘:\n"
+#: pg_ctl.c:1098
+msgid ""
+"\n"
+"Common options:\n"
+msgstr ""
+"\n"
+"Д╦─Х┬╛И│╦И═┘О╪ \n"
 
-#: pg_ctl.c:1084
+#: pg_ctl.c:1099
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata ХЁ┤Ф√≥Г⌡╝И▄└  Е╜≤Ф■╬ХЁ┤Ф√≥Е╨╚Г └Г⌡╝И▄└\n"
 
-#: pg_ctl.c:1085
-msgid "  -s, --silent only print errors, no informational messages\n"
-msgstr "  -s, --silent Е▐╙И║╞Г╓╨И▄╞Х╙╓О╪▄Д╦█И║╞Г╓╨Е┘╤Е╝┐Х╗┼Ф│╞\n"
-
-#: pg_ctl.c:1087
-msgid "  -N       service name with which to register PostgreSQL server\n"
-msgstr "  -N       Г■╗Д╬├Х╗╩Е├┼PostgreSQLД╪╨Ф°█Е≥╗Г └Ф°█Е▀≥Е░█Г╗╠\n"
-
-#: pg_ctl.c:1088
-msgid "  -P       password of account to register PostgreSQL server\n"
-msgstr "  -P       Г■╗Д╬├Х╗╩Е├┼PostgreSQLД╪╨Ф°█Е≥╗Г └Е╞├Г╒╪\n"
-
-#: pg_ctl.c:1089
-msgid "  -U       user name of account to register PostgreSQL server\n"
-msgstr "  -U       Г■╗Д╬├Х╗╩Е├┼PostgreSQLД╪╨Ф°█Е≥╗Г └Е╦ЁХ≥÷\n"
+#: pg_ctl.c:1100
+msgid "  -s, --silent           only print errors, no informational messages\n"
+msgstr "  -s, --silent           Е▐╙И║╞Г╓╨И▄╞Х╙╓О╪▄Д╦█И║╞Г╓╨Е┘╤Е╝┐Х╗┼Ф│╞\n"
 
-#: pg_ctl.c:1091
-msgid "  -w           wait until operation completes\n"
-msgstr "  -w           Г╜┴Е╬┘Ф⌠█Д╫°Е╝▄Ф┬░\n"
+#: pg_ctl.c:1101
+msgid "  -w                     wait until operation completes\n"
+msgstr "  -w                     Г╜┴Е╬┘Ф⌠█Д╫°Е╝▄Ф┬░\n"
 
-#: pg_ctl.c:1092
-msgid "  -W           do not wait until operation completes\n"
-msgstr "  -W           Д╦█Г╜┴Е╬┘Ф⌠█Д╫°Е╝▄Ф┬░\n"
+#: pg_ctl.c:1102
+msgid "  -W                     do not wait until operation completes\n"
+msgstr "  -W                     Д╦█Г╜┴Е╬┘Ф⌠█Д╫°Е╝▄Ф┬░\n"
 
-#: pg_ctl.c:1093
-msgid "  --help       show this help, then exit\n"
-msgstr "  --help       И║╞Г╓╨И─≥Д╩╫Х╙╙Ф≤▌Г└╤Е╬▄Г╣░Ф²÷\n"
+#: pg_ctl.c:1103
+msgid "  --help                 show this help, then exit\n"
+msgstr "  --help                 И║╞Г╓╨И─≥Д╩╫Х╙╙Ф≤▌Г└╤Е╬▄Г╣░Ф²÷\n"
 
-#: pg_ctl.c:1094
-msgid "  --version    output version information, then exit\n"
-msgstr "  --version    И║╞Г╓╨Г┴┬Ф°╛ХЁ┤Х╗┼Г└╤Е╬▄Г╣░Ф²÷\n"
+#: pg_ctl.c:1104
+msgid "  --version              output version information, then exit\n"
+msgstr "  --version              И║╞Г╓╨Г┴┬Ф°╛ХЁ┤Х╗┼Г└╤Е╬▄Г╣░Ф²÷\n"
 
-#: pg_ctl.c:1095
+#: pg_ctl.c:1105
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
 "\n"
@@ -346,121 +336,148 @@ msgstr ""
 "(И═░Х╗╜Ф≤╞И≈°И√┴Ф≥┌Х─▄И²·Е∙÷Е▀∙Ф┬√И┤█Ф√╟Е∙÷Е▀∙Ф≥┌Г╜┴Е╬┘Ц─┌)\n"
 "\n"
 
-#: pg_ctl.c:1096
+#: pg_ctl.c:1106
+msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
+msgstr "Е╕┌Ф·°Ф╡▓Ф°┴Д╫©Г■╗И│╦И═┘ -DО╪▄Ф■╧Г■╗Г▓╟Е╒┐Х╝┼Ф∙╦PGDATAЦ─┌\n"
+
+#: pg_ctl.c:1108
 msgid ""
-"If the -D option is omitted, the environment variable PGDATA is used.\n"
 "\n"
+"Options for start or restart:\n"
 msgstr ""
-"И│╦И═┘ -D Е╥╡Г╤⌠Е▐√Ф╤┬О╪▄Ф■╧Г■╗Г▓╟Е╒┐Х╝┼Ф∙╦PGDATAЦ─┌\n"
 "\n"
+"Е∙÷Е▀∙Ф┬√И┤█Ф√╟Е∙÷Е▀∙Е▐╞Г■╗И│╦И═┘О╪ \n"
 
-#: pg_ctl.c:1097
-msgid "Options for start or restart:\n"
-msgstr "Е∙÷Е▀∙Ф┬√И┤█Ф√╟Е∙÷Е▀∙Е▐╞Г■╗И│╦И═┘:\n"
+#: pg_ctl.c:1109
+msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
+msgstr "  -l, --log Ф╙■Е░█         Е╟┤Д╪╨Ф°█Е≥╗logЕ╞╚Е┘╔(Ф┬√И≥└Е┼═Х┤Ё)Ф╙■Ф║┬Ц─┌\n"
 
-#: pg_ctl.c:1098
+#: pg_ctl.c:1110
 msgid ""
-"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
-"                          use of this option is highly recommended.\n"
-msgstr "  -l, --log Ф╙■Е░█          Е╟┤Д╪╨Ф°█Е≥╗logЕ╞╚Е┘╔Ф╙■Ф║┬О╪▄Е╩╨Х╜╟Д╫©Г■╗Ц─┌\n"
+"  -o OPTIONS             command line options to pass to the postmaster\n"
+"                         (PostgreSQL server executable)\n"
+msgstr ""
+"  -o И│╦И═┘                Е┌ЁГ╣╕postmaster(PostgreSQLД╪╨Ф°█Е≥╗Е÷╥Х║▄Ф╙■)Г └\n"
+"                         Е▒╫Д╩╓Е┬≈И│╦И═┘\n"
 
-#: pg_ctl.c:1100
-msgid ""
-"  -o OPTIONS              command line options to pass to the postmaster\n"
-"                          (PostgreSQL server executable)\n"
-msgstr "  -o И│╦И═┘                 Е┌ЁГ╣╕postmaster(PostgreSQLД╪╨Ф°█Е≥╗Е÷╥Х║▄Ф╙■)Г └Е▒╫Д╩╓Е┬≈И│╦И═┘\n"
+#: pg_ctl.c:1112
+msgid "  -p PATH-TO-POSTMASTER  normally not necessary\n"
+msgstr "  -p postmasterГ └Х╥╞Е╬▒    И─ Е╦╦Д╦█И°─Х╕│\n"
 
-#: pg_ctl.c:1102
+#: pg_ctl.c:1114
 msgid ""
-"  -p PATH-TO-POSTMASTER   normally not necessary\n"
 "\n"
+"Options for stop or restart:\n"
 msgstr ""
-"  -p postmasterГ └Х╥╞Е╬▒     И─ Е╦╦Д╦█И°─Х╕│\n"
 "\n"
+"Е│°Ф╜╒Ф┬√И┤█Ф√╟Е∙÷Е▀∙Е▐╞Г■╗И│╦И═┘О╪ \n"
 
-#: pg_ctl.c:1103
-msgid "Options for stop or restart:\n"
-msgstr "Е│°Ф╜╒Ф┬√И┤█Ф√╟Е∙÷Е▀∙Е▐╞Г■╗И│╦И═┘О╪ \n"
+#: pg_ctl.c:1115
+msgid "  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"
+msgstr "  -m И≈°И√┴Ф╗║Е╪▐        Е▐╞Д╩╔Ф≤╞\"smart\"Ц─│\"fast\"Ф┬√\"immediate\"\n"
 
-#: pg_ctl.c:1104
+#: pg_ctl.c:1117
 msgid ""
-"  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"
 "\n"
+"Shutdown modes are:\n"
 msgstr ""
-"  -m И≈°И√┴Ф╗║Е╪▐        Е▐╞Д╩╔Ф≤╞\"smart\"Ц─│\"fast\"Ф┬√\"immediate\"\n"
 "\n"
+"Е▐╞Г■╗И≈°И√┴Ф╗║Е╪▐О╪ \n"
 
-#: pg_ctl.c:1105
-msgid "Allowed signal names for kill:\n"
-msgstr "killЕ▐╞Д╩╔Д╫©Г■╗Г └Д©║Х≥÷Е░█Г╗╠О╪ \n"
+#: pg_ctl.c:1118
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       Е°╗Ф┴─Ф°┴Г■╗Ф┬╤Г╚╞Ф√╥Г╥ Е╬▄И≈°И√┴\n"
 
-#: pg_ctl.c:1106
+#: pg_ctl.c:1119
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        Г⌡╢Ф▌╔Ф╜ёЕ╦╦И≈°И√┴\n"
+
+#: pg_ctl.c:1120
+msgid "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
+msgstr "  immediate   Г╚▀Е█ЁГ╣░Ф²÷О╪▄Ф°┐Е╟▌Х┤╢Д╦▀Ф╛║Е∙÷Е▀∙Ф≥┌И°─Х╕│Е╬╘Е▌÷Г╗▀Е╨▐\n"
+
+#: pg_ctl.c:1122
 msgid ""
-"  HUP INT QUIT ABRT TERM USR1 USR2\n"
 "\n"
+"Allowed signal names for kill:\n"
 msgstr ""
+"\n"
+"killЕ▐╞Д╩╔Д╫©Г■╗Г └Д©║Х≥÷Е░█Г╗╠О╪ \n"
 
-#: pg_ctl.c:1107
-msgid "Shutdown modes are:\n"
-msgstr "И≈°И√┴Ф╗║Е╪▐О╪ \n"
+#: pg_ctl.c:1126
+msgid ""
+"\n"
+"Options for register and unregister:\n"
+msgstr ""
+"\n"
+"Х╗╩Е├┼Ф┬√Г╖╩И≥╓Х╗╩Е├┼Е▐╞Г■╗И│╦И═┘О╪ \n"
 
-#: pg_ctl.c:1108
-msgid "  smart       quit after all clients have disconnected\n"
-msgstr "  smart       Е°╗Ф┴─Ф°┴Г■╗Ф┬╤Г╚╞Ф√╥Г╥ Е╬▄И≈°И√┴\n"
+#: pg_ctl.c:1127
+msgid "  -N SERVICENAME  service name with which to register PostgreSQL server\n"
+msgstr "  -N Ф°█Е▀≥Е░█Г╗╠     Г■╗Д╬├Х╗╩Е├┼PostgreSQLД╪╨Ф°█Е≥╗Г └Ф°█Е▀≥Е░█Г╗╠\n"
 
-#: pg_ctl.c:1109
-msgid "  fast        quit directly, with proper shutdown\n"
-msgstr "  fast        Г⌡╢Ф▌╔Ф╜ёЕ╦╦И≈°И√┴\n"
+#: pg_ctl.c:1128
+msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
+msgstr "  -P Е╞├Г╒╪         Г■╗Д╬├Х╗╩Е├┼PostgreSQLД╪╨Ф°█Е≥╗Г └Е╞├Г╒╪\n"
 
-#: pg_ctl.c:1110
+#: pg_ctl.c:1129
+msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
+msgstr "  -U Д╫©Г■╗Х─┘       Г■╗Д╬├Х╗╩Е├┼PostgreSQLД╪╨Ф°█Е≥╗Г └Е╦ЁХ≥÷\n"
+
+#: pg_ctl.c:1132
 msgid ""
-"  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 "\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
-"  immediate   Г╚▀Е█ЁИ≈°И√┴О╪▄Ф°┐Е╟▌Х┤╢Д╦▀Ф╛║Е∙÷Е▀∙Ф≥┌И°─Х╕│Е╬╘Е▌÷Г╗▀Е╨▐\n"
 "\n"
+"Е⌡·Е═╠И▄╞Х╙╓Х┤Ё<pgsql-bugs@postgresql.org>Ц─┌\n"
 
-#: pg_ctl.c:1111
-msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Е⌡·Е═╠И▄╞Х╙╓Х┤Ё <pgsql-bugs@postgresql.org>Ц─┌\n"
-
-#: pg_ctl.c:1136
+#: pg_ctl.c:1157
 #, c-format
 msgid "%s: unrecognized shutdown mode \"%s\"\n"
 msgstr "%sО╪ Г└║Ф∙┬Г └И≈°И√┴Ф╗║Е╪▐\"%s\"\n"
 
-#: pg_ctl.c:1169
+#: pg_ctl.c:1190
 #, c-format
 msgid "%s: unrecognized signal name \"%s\"\n"
 msgstr "%sО╪ Г└║Ф∙┬Г └Д©║Х≥÷Е░█Г╗╠\"%s\"\n"
 
-#: pg_ctl.c:1304
+#: pg_ctl.c:1255
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%sО╪ Г└║ФЁ∙Д╩╔rootХ╨╚Д╩╫Е÷╥Х║▄\n"
+"Х╚▀Д╩╔Е╟┤Ф°┐Ф⌠│Ф°┴Д╪╨Ф°█Е▀≥Х║▄Г╗▀Г └(И²·Г┴╧Ф╛┼)Д╫©Г■╗Х─┘Г≥╩Е┘╔(Д╬▀Е╕┌Г■╗\"su\"Е▒╫Д╩╓)Ц─┌\n"
+
+#: pg_ctl.c:1347
 #, c-format
 msgid "%s: invalid option %s\n"
 msgstr "%sО╪ Г└║Ф∙┬Г └И│╦И═┘ %s\n"
 
-#: pg_ctl.c:1315
+#: pg_ctl.c:1358
 #, c-format
-msgid "%s: extra operation mode \"%s\"\n"
-msgstr "%sО╪ Е╓ И╓≤Г └Ф⌠█Д╫°Ф╗║Е╪▐\"%s\"\n"
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%sО╪ Е▒╫Д╩╓Е┬≈Е▐┐Ф∙╦И│▌Е╓ (Г╛╛Д╦─Е─▀Ф≤╞\"%s\")\n"
 
-#: pg_ctl.c:1334
+#: pg_ctl.c:1377
 #, c-format
-msgid "%s: invalid kill syntax\n"
-msgstr "%sО╪ Г└║Ф∙┬Г └killХ╙·ФЁ∙\n"
+msgid "%s: missing arguments for kill mode\n"
+msgstr "%sО╪ killФ╗║Е╪▐Ф°╙Ф▄┤Е╝ Е▐┐Ф∙╦\n"
 
-#: pg_ctl.c:1352
+#: pg_ctl.c:1395
 #, c-format
 msgid "%s: unrecognized operation mode \"%s\"\n"
 msgstr "%sО╪ Г└║Ф∙┬Г └Ф⌠█Д╫°Ф╗║Е╪▐\"%s\"\n"
 
-#: pg_ctl.c:1362
+#: pg_ctl.c:1405
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%sО╪ Ф°╙Ф▄┤Е╝ Ф⌠█Д╫°Ф√╧Е╪▐\n"
 
-#: pg_ctl.c:1378
+#: pg_ctl.c:1421
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr "%sО╪ Ф°╙Ф▄┤Е╝ ХЁ┤Ф√≥Г⌡╝И▄└Е▓▄Х╗╜Е╝ Г▓╟Е╒┐Х╝┼Ф∙╦PGDATA\n"
-
diff --git a/src/bin/pg_dump/po/pt_BR.po b/src/bin/pg_dump/po/pt_BR.po
index 3bad4f5c14..404770858b 100644
--- a/src/bin/pg_dump/po/pt_BR.po
+++ b/src/bin/pg_dump/po/pt_BR.po
@@ -1,12 +1,12 @@
 # "pg_dump" translation to Brazilian Portuguese Language.
-# Roberto Mello <rmello@fslc.usu.edu>, 2002
-# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003.
+# Roberto Mello <rmello@fslc.usu.edu>, 2002.
+# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-18 14:00-0300\n"
-"PO-Revision-Date: 2004-10-18 14:46-0300\n"
+"POT-Creation-Date: 2004-10-27 13:07-0300\n"
+"PO-Revision-Date: 2004-10-27 18:36-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@ufgnet.ufg.br>\n"
 "Language-Team: Brazilian Portuguese <pgsql-dev@lists.querencialivre.rs.gov."
 "br>\n"
@@ -556,12 +556,13 @@ msgstr "nЗmero de colunas (%d) И invАlido para tabela \"%s\"\n"
 
 #: pg_dump.c:6933
 #, c-format
-msgid "missing index for constraint %s\n"
-msgstr "faltando Мndice para restriГЦo %s\n"
+msgid "missing index for constraint \"%s\"\n"
+msgstr "faltando Мndice para restriГЦo \"%s\"\n"
 
 #: pg_dump.c:7103
-msgid "unexpected constraint type\n"
-msgstr "tipo de restriГЦo inesperado\n"
+#, c-format
+msgid "unrecognized constraint type: %c\n"
+msgstr "tipo de restriГЦo inesperado: %c\n"
 
 #: pg_dump.c:7145
 msgid "inserted invalid OID\n"
@@ -615,8 +616,8 @@ msgstr ""
 "de registros foi retornado"
 
 #: pg_dump.c:7702
-msgid "fetching dependency data\n"
-msgstr "buscando dados sobre dependЙncia\n"
+msgid "reading dependency data\n"
+msgstr "lendo dados sobre dependЙncia\n"
 
 #: pg_dump.c:7879
 #, c-format
@@ -798,8 +799,8 @@ msgstr "executando %s %s\n"
 
 #: pg_backup_archiver.c:398
 #, c-format
-msgid "setting owner and acl for %s %s\n"
-msgstr "definindo dono e permissУes para %s %s\n"
+msgid "setting owner and privileges for %s %s\n"
+msgstr "definindo dono e privilИgios para %s %s\n"
 
 #: pg_backup_archiver.c:516
 msgid "disabling triggers\n"
@@ -923,8 +924,8 @@ msgstr "Erro ao FINALIZAR:\n"
 
 #: pg_backup_archiver.c:1272
 #, c-format
-msgid "Error from TOC Entry %d; %u %u %s %s %s\n"
-msgstr "Erro da Entrada TOC %d; %u %u %s %s %s\n"
+msgid "Error from TOC entry %d; %u %u %s %s %s\n"
+msgstr "Erro da entrada TOC %d; %u %u %s %s %s\n"
 
 #: pg_backup_archiver.c:1405
 #, c-format
@@ -1587,7 +1588,7 @@ msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr "  -a, --data-only          restaura somente os dados, nЦo o esquema\n"
 
 #: pg_restore.c:375
-msgid "  -C, --create             process commands to create the database\n"
+msgid "  -C, --create             issue commands to create the database\n"
 msgstr ""
 "  -C, --create             executa comandos para criar o banco de dados\n"
 
@@ -1702,20 +1703,19 @@ msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 "                           pg_dumpall version\n"
 msgstr ""
-"  -i, --ignore-version    prossegue mesmo se a versЦo do servidor e do "
-"pg_dumpall nЦo correspondem\n"
-"                          com a versЦo do pg_dumpall\n"
+"  -i, --ignore-version     prossegue mesmo se a versЦo do servidor e do "
+"                                   pg_dumpall nЦo correspondem\n"
 
 #: pg_dumpall.c:347
 msgid "  -c, --clean              clean (drop) databases prior to create\n"
 msgstr ""
-"  -c, --clean             limpa (exclui) bancos de dados anteriormente "
+"  -c, --clean              limpa (exclui) bancos de dados anteriormente "
 "criados\n"
 
 #: pg_dumpall.c:350
 msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr ""
-"  -g, --globals-only      copia somente objetos globais, e nЦo bancos de "
+"  -g, --globals-only       copia somente objetos globais, e nЦo bancos de "
 "dados\n"
 
 #: pg_dumpall.c:352
diff --git a/src/bin/pg_dump/po/ru.po b/src/bin/pg_dump/po/ru.po
index e36c319afd..eafd6e7468 100644
--- a/src/bin/pg_dump/po/ru.po
+++ b/src/bin/pg_dump/po/ru.po
@@ -1,10 +1,13 @@
 # ru.po
 # PG_DUMP Translated Messages into the Russian Language (KOI8-R)
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/po/ru.po,v 1.14 2004/10/27 11:22:10 petere Exp $
+# Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
+# Distributed under the same licensing terms as PostgreSQL itself.
+#
+# $PostgreSQL: pgsql/src/bin/pg_dump/po/ru.po,v 1.15 2004/11/02 09:20:15 petere Exp $
 #
 # ChangeLog:
-#   - April 6 - October 17, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
+#   - April 6 - November 1, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
 #   - July 24 - October 5, 2003: Updates for 7.4.x; <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Post-7.3 beta 2, 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>
@@ -14,29 +17,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-17 01:09+0100\n"
-"PO-Revision-Date: 2004-10-17 16:14-0500\n"
+"POT-Creation-Date: 2004-11-01 19:15+0000\n"
+"PO-Revision-Date: 2004-11-01 16:02-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_dump.c:363
+#: pg_dump.c:366
 #: pg_restore.c:229
 msgid "User name: "
 msgstr "Имя пользователя: "
 
-#: pg_dump.c:399
+#: pg_dump.c:402
 #: pg_dumpall.c:264
 #: pg_restore.c:256
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: неверная опция -X -- %s\n"
 
-#: pg_dump.c:401
-#: pg_dump.c:415
-#: pg_dump.c:424
+#: pg_dump.c:404
+#: pg_dump.c:418
+#: pg_dump.c:427
 #: pg_dumpall.c:266
 #: pg_dumpall.c:275
 #: pg_dumpall.c:292
@@ -47,72 +50,72 @@ msgstr "%s: неверная опция -X -- %s\n"
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Наберите \"%s --help\" для более подробной информации.\n"
 
-#: pg_dump.c:422
+#: pg_dump.c:425
 #: pg_dumpall.c:290
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: слишком много аргументов командной стороки (первый \"%s\")\n"
 
-#: pg_dump.c:435
+#: pg_dump.c:438
 msgid "options \"schema only\" (-s) and \"data only\" (-a) cannot be used together\n"
 msgstr "опции \"только схема\" (-s) и \"только данные\" (-a) не могут использоваться вместе\n"
 
 # TO REVEIW
-#: pg_dump.c:441
+#: pg_dump.c:444
 msgid "options \"clean\" (-c) and \"data only\" (-a) cannot be used together\n"
 msgstr "опции \"clean\" (-c) и \"data only\" (-a) не могут использоваться вместе\n"
 
-#: pg_dump.c:447
+#: pg_dump.c:450
 msgid "large-object output not supported for a single table\n"
 msgstr "вывод больших объектов не поддерживается для одной таблицы\n"
 
-#: pg_dump.c:448
-#: pg_dump.c:455
+#: pg_dump.c:451
+#: pg_dump.c:458
 msgid "use a full dump instead\n"
 msgstr "вместо этого используйте полную выгрузку\n"
 
-#: pg_dump.c:454
+#: pg_dump.c:457
 msgid "large-object output not supported for a single schema\n"
 msgstr "вывод больших объектов не поддерживается для одной схемы\n"
 
-#: pg_dump.c:461
+#: pg_dump.c:464
 msgid "INSERT (-d, -D) and OID (-o) options cannot be used together\n"
 msgstr "опции INSERT (-d, -D) и OID (-o) не могут использоваться вместе\n"
 
-#: pg_dump.c:462
+#: pg_dump.c:465
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Команда INSERT не может задавать OID.)\n"
 
-#: pg_dump.c:468
+#: pg_dump.c:471
 msgid "large-object output is not supported for plain-text dump files\n"
 msgstr "вывод больших объектов не поддерживается для текстовых файлов выгрузки\n"
 
-#: pg_dump.c:469
+#: pg_dump.c:472
 msgid "(Use a different output format.)\n"
 msgstr "(Используйте другой формат выгрузки.)\n"
 
-#: pg_dump.c:498
+#: pg_dump.c:501
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "указан неверный формат вывода: \"%s\"\n"
 
-#: pg_dump.c:504
+#: pg_dump.c:507
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "не получилось открыть файл вывода \"%s\"  для записи\n"
 
 #: pg_backup_db.c:52
-#: pg_dump.c:515
+#: pg_dump.c:518
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "не в состоянии прочесть строку с номером версии \"%s\"\n"
 
-#: pg_dump.c:551
+#: pg_dump.c:554
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "последний встроенный OID: %u\n"
 
-#: pg_dump.c:662
+#: pg_dump.c:665
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -121,18 +124,18 @@ msgstr ""
 "%s выгружает базу данных в файл в текстовом или других форматах.\n"
 "\n"
 
-#: pg_dump.c:663
+#: pg_dump.c:666
 #: pg_dumpall.c:337
 #: pg_restore.c:359
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: pg_dump.c:664
+#: pg_dump.c:667
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [ОПЦИЯ]... [ИМЯБД]\n"
 
-#: pg_dump.c:666
+#: pg_dump.c:669
 #: pg_dumpall.c:340
 #: pg_restore.c:362
 msgid ""
@@ -142,16 +145,16 @@ msgstr ""
 "\n"
 "Опции общего характера:\n"
 
-#: pg_dump.c:667
+#: pg_dump.c:670
 #: pg_restore.c:364
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ИМЯФАЙЛА      имя выходного файла\n"
 
-#: pg_dump.c:668
+#: pg_dump.c:671
 msgid "  -F, --format=c|t|p       output file format (custom, tar, plain text)\n"
 msgstr "  -F, --format=c|t|p       формат выходного файла (пользовательский, tar, только текст)\n"
 
-#: pg_dump.c:669
+#: pg_dump.c:672
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 "                           pg_dump version\n"
@@ -159,28 +162,28 @@ msgstr ""
 "  -i, --ignore-version     продолжить даже если версия сервера не совпадает с\n"
 "                           версией pg_dump\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:674
 #: pg_restore.c:368
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            режим вывода всех сообщений\n"
 
-#: pg_dump.c:672
+#: pg_dump.c:675
 msgid "  -Z, --compress=0-9       compression level for compressed formats\n"
 msgstr "  -Z, --compress=0-9       уровень сжатия для компрессированных форматов\n"
 
-#: pg_dump.c:673
+#: pg_dump.c:676
 #: pg_dumpall.c:343
 #: pg_restore.c:369
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   показать эту подсказку и выйти\n"
 
-#: pg_dump.c:674
+#: pg_dump.c:677
 #: pg_dumpall.c:344
 #: pg_restore.c:370
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                показать версию и выйти\n"
 
-#: pg_dump.c:676
+#: pg_dump.c:679
 #: pg_dumpall.c:345
 msgid ""
 "\n"
@@ -189,44 +192,44 @@ msgstr ""
 "\n"
 "Options по выводу содержимого базы:\n"
 
-#: pg_dump.c:677
+#: pg_dump.c:680
 #: pg_dumpall.c:346
 msgid "  -a, --data-only          dump only the data, not the schema\n"
 msgstr "  -a, --data-only          выгрузить только данные, без схемы\n"
 
-#: pg_dump.c:678
+#: pg_dump.c:681
 msgid "  -b, --blobs              include large objects in dump\n"
 msgstr "  -b, --blobs              включить большие объекты в выгрузку\n"
 
-#: pg_dump.c:679
+#: pg_dump.c:682
 #: pg_restore.c:374
 msgid "  -c, --clean              clean (drop) schema prior to create\n"
 msgstr "  -c, --clean              очистить (сбросить) схему перед созданием\n"
 
-#: pg_dump.c:680
+#: pg_dump.c:683
 msgid "  -C, --create             include commands to create database in dump\n"
 msgstr "  -C, --create             включить в выгрузку команды по созданию базы данных\n"
 
-#: pg_dump.c:681
+#: pg_dump.c:684
 #: pg_dumpall.c:348
 msgid "  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"
 msgstr "  -d, --inserts            выгрузить данные как набор INSERT команд вместо COPY\n"
 
-#: pg_dump.c:682
+#: pg_dump.c:685
 #: pg_dumpall.c:349
 msgid "  -D, --column-inserts     dump data as INSERT commands with column names\n"
 msgstr "  -D, --column-inserts     выгрузить данные как набор INSERT команд с именами полей\n"
 
-#: pg_dump.c:683
+#: pg_dump.c:686
 msgid "  -n, --schema=SCHEMA      dump the named schema only\n"
 msgstr "  -n, --schema=СХЕМА       выгрузить только указанную схему\n"
 
-#: pg_dump.c:684
+#: pg_dump.c:687
 #: pg_dumpall.c:351
 msgid "  -o, --oids               include OIDs in dump\n"
 msgstr "  -o, --oids               включить OIDs в выгрузку\n"
 
-#: pg_dump.c:685
+#: pg_dump.c:688
 msgid ""
 "  -O, --no-owner           do not output commands to set object ownership\n"
 "                           in plain text format\n"
@@ -234,12 +237,12 @@ msgstr ""
 "  -O, --no-owner           не выводить команды по установке привилегий на объекты\n"
 "                           в формате \"просто текст\"\n"
 
-#: pg_dump.c:687
+#: pg_dump.c:690
 #: pg_dumpall.c:353
 msgid "  -s, --schema-only        dump only the schema, no data\n"
 msgstr "  -s, --schema-only        выгрузить только схему без данных\n"
 
-#: pg_dump.c:688
+#: pg_dump.c:691
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
 "                           plain text format\n"
@@ -247,16 +250,16 @@ msgstr ""
 "  -S, --superuser=ИМЯ      указать какое имя супер-пользователя использовать для\n"
 "                           формата \"только текст\"\n"
 
-#: pg_dump.c:690
+#: pg_dump.c:693
 msgid "  -t, --table=TABLE        dump the named table only\n"
 msgstr "  -t, --table=ТАБЛИЦА      выгрузить только указанную таблицу\n"
 
-#: pg_dump.c:691
+#: pg_dump.c:694
 #: pg_dumpall.c:355
 msgid "  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      не выгружать привилегии (GRANT/REVOKE)\n"
 
-#: pg_dump.c:692
+#: pg_dump.c:695
 #: pg_dumpall.c:356
 msgid ""
 "  -X disable-dollar-quoting, --disable-dollar-quoting\n"
@@ -265,7 +268,7 @@ msgstr ""
 "  -X disable-dollar-quoting, --disable-dollar-quoting\n"
 "                           отключить долларовое квотирование; использовать стандартное SQL\n"
 
-#: pg_dump.c:694
+#: pg_dump.c:697
 #: pg_dumpall.c:358
 #: pg_restore.c:388
 msgid ""
@@ -275,7 +278,7 @@ msgstr ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           отключить триггера для режима восстанновки только данных\n"
 
-#: pg_dump.c:696
+#: pg_dump.c:699
 #: pg_dumpall.c:360
 #: pg_restore.c:390
 msgid ""
@@ -287,7 +290,7 @@ msgstr ""
 "                           использовать команды SESSION AUTHORIZATION вместо\n"
 "                           команд OWNER TO\n"
 
-#: pg_dump.c:700
+#: pg_dump.c:703
 #: pg_dumpall.c:364
 #: pg_restore.c:394
 msgid ""
@@ -297,31 +300,31 @@ msgstr ""
 "\n"
 "Опции подсоединения:\n"
 
-#: pg_dump.c:701
+#: pg_dump.c:704
 #: pg_dumpall.c:365
 #: pg_restore.c:395
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=ИМЯХОСТА      хост сервера баз данных или директория сокетов\n"
 
-#: pg_dump.c:702
+#: pg_dump.c:705
 #: pg_dumpall.c:366
 #: pg_restore.c:396
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=ПОРТ          номер порта сервера баз данных\n"
 
-#: pg_dump.c:703
+#: pg_dump.c:706
 #: pg_dumpall.c:367
 #: pg_restore.c:397
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=ИМЯ       подсоединиться как указанный пользователь\n"
 
-#: pg_dump.c:704
+#: pg_dump.c:707
 #: pg_dumpall.c:368
 #: pg_restore.c:398
 msgid "  -W, --password           force password prompt (should happen automatically)\n"
 msgstr "  -W, --password           принуждённый запрос пароля (должен происходить автоматически)\n"
 
-#: pg_dump.c:706
+#: pg_dump.c:709
 msgid ""
 "\n"
 "If no database name is supplied, then the PGDATABASE environment\n"
@@ -333,306 +336,307 @@ msgstr ""
 "окружения PGDATABASE будет использовано.\n"
 "\n"
 
-#: pg_dump.c:708
+#: pg_dump.c:711
 #: pg_dumpall.c:371
 #: pg_restore.c:402
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Сообщать об ошибках: <pgsql-bugs@postgresql.org>.\n"
 
 #: pg_backup_archiver.c:1209
-#: pg_dump.c:716
+#: pg_dump.c:719
 msgid "*** aborted because of error\n"
 msgstr "*** аварийное завершение из-за ошибки\n"
 
-#: pg_dump.c:798
+#: pg_dump.c:801
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "выгрузка содержимого таблицы %s\n"
 
-#: pg_dump.c:910
+#: pg_dump.c:913
 #, c-format
 msgid "SQL command to dump the contents of table \"%s\" failed: PQendcopy() failed.\n"
 msgstr "SQL-команда по выгрузке содержимого таблицы \"%s\" не удалась: PQendcopy() выполнилась ненормально.\n"
 
-#: pg_dump.c:911
-#: pg_dump.c:8058
+#: pg_dump.c:914
+#: pg_dump.c:8071
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Сообщение об ошибке с сервера: %s"
 
-#: pg_dump.c:912
-#: pg_dump.c:8059
+#: pg_dump.c:915
+#: pg_dump.c:8072
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Команда была: %s\n"
 
-#: pg_dump.c:1182
+#: pg_dump.c:1185
 msgid "saving database definition\n"
 msgstr "сохраняется определение базы данных\n"
 
-#: pg_dump.c:1228
+#: pg_dump.c:1231
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "отсутствует запись в pg_database для базы данных \"%s\"\n"
 
-#: pg_dump.c:1235
+#: pg_dump.c:1238
 #, c-format
 msgid "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr "запрос вернул более чем одну (%d) запись из pg_database для базы данных \"%s\"\n"
 
-#: pg_dump.c:1341
+#: pg_dump.c:1348
 msgid "saving encoding\n"
 msgstr "сохранение кодировки\n"
 
-#: pg_dump.c:1391
+#: pg_dump.c:1398
 msgid "saving large objects\n"
 msgstr "сохранение больших объектов\n"
 
-#: pg_dump.c:1424
+#: pg_dump.c:1431
 #, c-format
 msgid "dumpBlobs(): could not open large object: %s"
 msgstr "dumpBlobs(): не получилось открыть большой объект: %s"
 
-#: pg_dump.c:1437
+#: pg_dump.c:1444
 #, c-format
 msgid "dumpBlobs(): error reading large object: %s"
 msgstr "dumpBlobs(): ошибка при чтении больного объекта: %s"
 
 # TO REVIEW
-#: pg_dump.c:1571
+#: pg_dump.c:1578
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "ВНИМАНИЕ: владелец схемы \"%s\" возможно не верен\n"
 
-#: pg_dump.c:1588
+#: pg_dump.c:1595
 #, c-format
 msgid "specified schema \"%s\" does not exist\n"
 msgstr "указанная схема \"%s\" не существует\n"
 
-#: pg_dump.c:1625
+#: pg_dump.c:1632
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "схема с OID %u не существует\n"
 
-#: pg_dump.c:1810
+#: pg_dump.c:1817
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "ВНИМАНИЕ: владелец типа данных \"%s\" возможно не верен\n"
 
-#: pg_dump.c:1908
+#: pg_dump.c:1915
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "ВНИМАНИЕ: владелец оператора \"%s\" возможно не верен\n"
 
-#: pg_dump.c:2074
+#: pg_dump.c:2081
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "ВНИМАНИЕ: владелец класса оператора \"%s\" возможно не верен\n"
 
-#: pg_dump.c:2178
+#: pg_dump.c:2185
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "ВНИМАНИЕ: владелец агрегатной функции \"%s\" возможно не верен\n"
 
-#: pg_dump.c:2312
+#: pg_dump.c:2319
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "ВНИМАНИЕ: владелец функции \"%s\" возможно не верен\n"
 
-#: pg_dump.c:2590
+#: pg_dump.c:2597
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "ВНИМАНИЕ: владелец таблицы \"%s\" возможно не верен\n"
 
-#: pg_dump.c:2609
+#: pg_dump.c:2616
 #, c-format
 msgid "specified table \"%s\" does not exist\n"
 msgstr "указанная таблица \"%s\" не существует\n"
 
-#: pg_dump.c:2716
+#: pg_dump.c:2723
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "чтение индексов для таблицы \"%s\"\n"
 
-#: pg_dump.c:2953
+#: pg_dump.c:2960
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "чтение вторичных ключей для таблицы \"%s\"\n"
 
-#: pg_dump.c:3229
+#: pg_dump.c:3236
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "чтение триггеров для таблицы \"%s\"\n"
 
-#: pg_dump.c:3301
+#: pg_dump.c:3308
 #, c-format
 msgid "expected %d triggers on table \"%s\" but found %d\n"
 msgstr "ожидалось %d триггеров для таблицы \"%s\", но было найдено %d\n"
 
-#: pg_dump.c:3346
+#: pg_dump.c:3353
 #, c-format
 msgid "query produced null referenced table name for foreign key trigger \"%s\" on table \"%s\" (OID of table: %u)\n"
 msgstr "запрос произвёл нулевое имя таблицы для триггера по вторичному ключу \"%s\" для таблицы \"%s\" (OID таблицы: %u)\n"
 
-#: pg_dump.c:3647
+#: pg_dump.c:3654
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "поиск колонок и типов для таблицы \"%s\"\n"
 
-#: pg_dump.c:3733
+#: pg_dump.c:3740
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "неверно пронумерованные колонки в таблице \"%s\"\n"
 
-#: pg_dump.c:3767
+#: pg_dump.c:3774
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "поиск выражений по умолчанию (default) для таблицы \"%s\"\n"
 
-#: pg_dump.c:3850
+#: pg_dump.c:3857
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "неверное значение adnum - %d - для таблицы \"%s\"\n"
 
-#: pg_dump.c:3868
+#: pg_dump.c:3875
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "производится поиск CHECK-ограничений для таблицы \"%s\"\n"
 
-#: pg_dump.c:3932
+#: pg_dump.c:3939
 #, c-format
 msgid "expected %d check constraints on table \"%s\" but found %d\n"
 msgstr "ожидалось CHECK-ограничений: %d для таблицы \"%s\", но было найдено: %d\n"
 
-#: pg_dump.c:3934
+#: pg_dump.c:3941
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Возможно повреждение системных каталогов.)\n"
 
-#: pg_dump.c:4621
-#: pg_dump.c:4786
-#: pg_dump.c:5185
-#: pg_dump.c:5570
-#: pg_dump.c:5867
-#: pg_dump.c:6067
-#: pg_dump.c:6250
+#: pg_dump.c:4628
+#: pg_dump.c:4793
+#: pg_dump.c:5192
+#: pg_dump.c:5577
+#: pg_dump.c:5874
+#: pg_dump.c:6074
+#: pg_dump.c:6257
 #, c-format
 msgid "Got %d rows instead of one from: %s"
 msgstr "Строк получено строк: %d, тогда как ожидалась всего одна из: %s"
 
-#: pg_dump.c:4894
+#: pg_dump.c:4901
 #, c-format
 msgid "query yielded no rows: %s\n"
 msgstr "запрос произёл ноль строк: %s\n"
 
-#: pg_dump.c:5241
+#: pg_dump.c:5248
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "ВНИМАНИЕ: не удалось проанализировать массив proargnames\n"
 
 # TO REVEIW
-#: pg_dump.c:5278
+#: pg_dump.c:5285
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "Неожиданное provolatile-значение для функции \"%s\"\n"
 
-#: pg_dump.c:5792
+#: pg_dump.c:5799
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "ВНИМАНИЕ: оператор с OID %s не найден\n"
 
-#: pg_dump.c:6278
+#: pg_dump.c:6285
 #, c-format
 msgid "WARNING: aggregate function %s could not be dumped correctly for this database version; ignored\n"
 msgstr "ВНИМАНИЕ: не получилось корректно выгрузить агрегатную функцию %s для этой версии базы данных; функция проигнорирована\n"
 
-#: pg_dump.c:6410
+#: pg_dump.c:6417
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "не получилось проанализировать ACL-список (%s) для объекта \"%s\" (%s)\n"
 
-#: pg_dump.c:6503
+#: pg_dump.c:6510
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "запрос по получению определения вида \"%s\" не возвратил данных\n"
 
-#: pg_dump.c:6506
+#: pg_dump.c:6513
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr "запрос по получению определения вида \"%s\" возвратил более чем одно определение\n"
 
-#: pg_dump.c:6515
+#: pg_dump.c:6522
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "определение вида \"%s\" выглядит пустым (длина равна нулю)\n"
 
-#: pg_dump.c:6822
+#: pg_dump.c:6832
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "не верный номер колонки - %d - для таблицы \"%s\"\n"
 
-#: pg_dump.c:6923
+#: pg_dump.c:6933
 #, c-format
-msgid "missing index for constraint %s\n"
-msgstr "отсутствует индекс лоя констрейнта %s\n"
+msgid "missing index for constraint \"%s\"\n"
+msgstr "отсутствует индекс для констрейнта \"%s\"\n"
 
-#: pg_dump.c:7090
-msgid "unexpected constraint type\n"
-msgstr "неожиданный тип констрейнта\n"
+#: pg_dump.c:7103
+#, c-format
+msgid "unrecognized constraint type: %c\n"
+msgstr "нераспознанный тип констрейнта: %c\n"
 
-#: pg_dump.c:7132
+#: pg_dump.c:7145
 msgid "inserted invalid OID\n"
 msgstr "вставлен неверный OID\n"
 
-#: pg_dump.c:7138
+#: pg_dump.c:7151
 #, c-format
 msgid "maximum system OID is %u\n"
 msgstr "максимальный системный OID: %u\n"
 
-#: pg_dump.c:7179
+#: pg_dump.c:7192
 msgid "missing pg_database entry for this database\n"
 msgstr "отсутствует запись в pg_database для этой базы данных\n"
 
-#: pg_dump.c:7184
+#: pg_dump.c:7197
 msgid "found more than one pg_database entry for this database\n"
 msgstr "найдено более одной записи в pg_database для этой базы данных\n"
 
-#: pg_dump.c:7216
+#: pg_dump.c:7229
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "не найдена запись для pg_indexes в pg_class\n"
 
-#: pg_dump.c:7221
+#: pg_dump.c:7234
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "найдено более одной записи для pg_indexes в pg_class\n"
 
-#: pg_dump.c:7270
+#: pg_dump.c:7283
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
 msgstr "запрос по получению данных последовательности \"%s\" вернул число рядов > 1 (%d)\n"
 
-#: pg_dump.c:7279
+#: pg_dump.c:7292
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "запрос по получению данных последовательности \"%s\" вернул имя \"%s\"\n"
 
-#: pg_dump.c:7516
+#: pg_dump.c:7529
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "неверная строка аргументов (%s) для триггера \"%s\"  таблицы \"%s\"\n"
 
-#: pg_dump.c:7622
+#: pg_dump.c:7635
 #, c-format
 msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows returned"
 msgstr "запрос по получению правила \"%s\" для таблицы \"%s\" не удался: получено не верное число строк"
 
-#: pg_dump.c:7689
-msgid "fetching dependency data\n"
-msgstr "извлечение данных о зависимостях\n"
+#: pg_dump.c:7702
+msgid "reading dependency data\n"
+msgstr "чтение данных о зависимостях\n"
 
-#: pg_dump.c:7866
+#: pg_dump.c:7879
 #, c-format
 msgid "query yielded %d rows instead of one: %s\n"
 msgstr "запрос произвёл строк: %d, тогда как ожидалась всего одна: %s\n"
 
-#: pg_dump.c:8053
+#: pg_dump.c:8066
 msgid "SQL command failed\n"
 msgstr "SQL-команда не удалась\n"
 
@@ -814,8 +818,8 @@ msgstr "выполнение %s %s\n"
 
 #: pg_backup_archiver.c:398
 #, c-format
-msgid "setting owner and acl for %s %s\n"
-msgstr "устанока владельца и ACL для %s %s\n"
+msgid "setting owner and privileges for %s %s\n"
+msgstr "устанока владельца и привилегий для %s %s\n"
 
 #: pg_backup_archiver.c:516
 msgid "disabling triggers\n"
@@ -939,7 +943,7 @@ msgstr "Ошибка при ЗАВЕРШЕНИИ:\n"
 
 #: pg_backup_archiver.c:1272
 #, c-format
-msgid "Error from TOC Entry %d; %u %u %s %s %s\n"
+msgid "Error from TOC entry %d; %u %u %s %s %s\n"
 msgstr "Ошибка из записи оглавления %d; %u %u %s %s %s\n"
 
 #: pg_backup_archiver.c:1405
@@ -1573,8 +1577,8 @@ msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr "  -a, --data-only          восстановить тоько данные, без схемы\n"
 
 #: pg_restore.c:375
-msgid "  -C, --create             process commands to create the database\n"
-msgstr "  -C, --create             выполнить команды по созданию базы\n"
+msgid "  -C, --create             issue commands to create the database\n"
+msgstr "  -C, --create             отправить команды по созданию базы\n"
 
 #: pg_restore.c:376
 msgid "  -I, --index=NAME         restore named index\n"
@@ -1590,7 +1594,7 @@ msgstr ""
 
 #: pg_restore.c:379
 msgid "  -O, --no-owner           do not issue commands to set object ownership\n"
-msgstr "  -O, --no-owner            не отправлять команды по установке привилегий на объекты\n"
+msgstr "  -O, --no-owner           не отправлять команды по установке привилегий на объекты\n"
 
 #: pg_restore.c:380
 msgid ""
@@ -1692,7 +1696,7 @@ msgstr "  -g, --globals-only       выгрузить только глобальные объекты, без баз
 
 #: pg_dumpall.c:352
 msgid "  -O, --no-owner           do not output commands to set object ownership\n"
-msgstr "  -O, --no-owner            не выводить команды по установке привилегий на объекты\n"
+msgstr "  -O, --no-owner           не выводить команды по установке привилегий на объекты\n"
 
 #: pg_dumpall.c:354
 msgid "  -S, --superuser=NAME     specify the superuser user name to use in the dump\n"
diff --git a/src/bin/pg_dump/po/zh_TW.po b/src/bin/pg_dump/po/zh_TW.po
index b6f554fe30..c307b2cf38 100644
--- a/src/bin/pg_dump/po/zh_TW.po
+++ b/src/bin/pg_dump/po/zh_TW.po
@@ -1,11 +1,10 @@
-# Traditional Chinese translation for pg_dump.
-# 2004-07-30 Zhenbang Wei <forth@zbwei.net>
+# 2004-11-01 Zhenbang Wei <forth@zbwei.net>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-19 01:09+0100\n"
-"PO-Revision-Date: 2004-10-19 10:12+0800\n"
+"POT-Creation-Date: 2004-11-01 01:44+0000\n"
+"PO-Revision-Date: 2004-11-01 13:58+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +73,7 @@ msgstr "(INSERTЕ▒╫Д╩╓Д╦█Х┐╫Х╗╜Е╝ OIDЦ─┌)\n"
 
 #: pg_dump.c:471
 msgid "large-object output is not supported for plain-text dump files\n"
-msgstr "Д╦█Ф■╞Ф▐╢Е╟█?Ф√┤Е╜≈?Ф║┬Е┌≥Д╩╫large-object\n"
+msgstr "Д╦█Ф■╞Ф▐╢Е╟█?Ф√┤??????arge-object\n"
 
 #: pg_dump.c:472
 msgid "(Use a different output format.)\n"
@@ -228,7 +227,7 @@ msgstr "  -s, --schema-only        Е▐╙Е┌≥Д╩╫schemaО╪▄Д╦█Е┌≥Д╩╫ХЁ┤Ф√≥\n"
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
 "                           plain text format\n"
-msgstr "  -S, --superuser=NAME     Ф▄┤Е╝ Г╢■Ф√┤Е╜≈Ф═╪Е╪▐Д╫©Г■╗Г └Г╝║Г░├Х─┘Е░█Г╗╠\n"
+msgstr "  -S, --superuser=NAME     Ф▄┤Е╝ Г╢■Ф√┤Е╜≈Ф═╪?Д╫©Г■╗?Г╝║Г░├Х─┘Е░█?\n"
 
 #: pg_dump.c:693
 msgid "  -t, --table=TABLE        dump the named table only\n"
@@ -547,16 +546,17 @@ msgstr "view \"%s\"Г └Е╝ Г╬╘Д╪╪Д╧▌Ф≤╞Г╘╨Г └(И∙╥Е╨╕Г┌╨0)\n"
 #: pg_dump.c:6832
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
-msgstr "Г└║Ф∙┬Г └Ф╛└Д╫█Г╥╗Х≥÷ %d Ф√╪ХЁ┤Ф√≥Х║╗\"%s\"\n"
+msgstr "Г└║Ф∙┬Г └Ф╛└Д╫█?Х≥÷ %d Ф√╪ХЁ┤Ф√≥Х║╗\"%s\"\n"
 
 #: pg_dump.c:6933
 #, c-format
-msgid "missing index for constraint %s\n"
-msgstr "Ф┴╬Д╦█Е┬╟constraint %s Г └Г╢╒Е╪∙\n"
+msgid "missing index for constraint \"%s\"\n"
+msgstr "Ф┴╬Д╦█Е┬╟constraint \"%s\"Г └Г╢╒Е╪∙\n"
 
 #: pg_dump.c:7103
-msgid "unexpected constraint type\n"
-msgstr "И═░Ф°÷Е╓√Г └constraintЕ·▀Е┬╔\n"
+#, c-format
+msgid "unrecognized constraint type: %c\n"
+msgstr "Г└║ФЁ∙Х╜≤Е┬╔Г └constraintЕ·▀Е┬╔О╪ %c\n"
 
 #: pg_dump.c:7145
 msgid "inserted invalid OID\n"
@@ -604,7 +604,7 @@ msgid "query to get rule \"%s\" for table \"%s\" failed: wrong number of rows re
 msgstr "Е▐√Е╬≈rule \"%s\"Ф√╪ХЁ┤Ф√≥Х║╗\"%s\"Г └Ф÷╔Х╘╒Е╓╠Ф∙≈О╪ Е┌ЁЕ⌡·И▄╞Х╙╓Г └Г╜├Ф∙╦"
 
 #: pg_dump.c:7702
-msgid "fetching dependency data\n"
+msgid "reading dependency data\n"
 msgstr "Х╝─Е▐√Д╬²Е╜≤ХЁ┤Ф√≥\n"
 
 #: pg_dump.c:7879
@@ -794,8 +794,8 @@ msgstr "Е÷╥Х║▄ %s %s\n"
 
 #: pg_backup_archiver.c:398
 #, c-format
-msgid "setting owner and acl for %s %s\n"
-msgstr "Г┌╨ %s %s Х╗╜Е╝ Ф⌠│Ф°┴Х─┘Е▓▄acl\n"
+msgid "setting owner and privileges for %s %s\n"
+msgstr "Г┌╨ %s %s Х╗╜Е╝ Ф⌠│Ф°┴Х─┘Е▓▄Ф╛┼И≥░\n"
 
 #: pg_backup_archiver.c:516
 msgid "disabling triggers\n"
@@ -919,8 +919,8 @@ msgstr "FINALIZINGФ≥┌Г≥╪Г■÷И▄╞Х╙╓О╪ \n"
 
 #: pg_backup_archiver.c:1272
 #, c-format
-msgid "Error from TOC Entry %d; %u %u %s %s %s\n"
-msgstr "TOCХ╗≤И▄└Ф°┴И▄╞Х╙╓ %d; %u %u %s %s %s\n"
+msgid "Error from TOC entry %d; %u %u %s %s %s\n"
+msgstr "TOCХ╗≤И▄└%dФ°┴И▄╞Х╙╓О╪⌡%u %u %s %s %s\n"
 
 #: pg_backup_archiver.c:1405
 #, c-format
@@ -1297,8 +1297,8 @@ msgid ""
 "  normal use. Files will be written in the current working directory.\n"
 msgstr ""
 "Х╜╕Е▒┼О╪ \n"
-"  И─≥Г╗╝Ф═╪Е╪▐Е┐┘Г■╗Ф√╪Г╓╨Г╞└О╪▄Д╦█Ф≤╞Г■╗Д╬├Е│ Д╦─Х┬╛Е┌≥Д╩╫О╪▄Ф╙■Ф║┬Ф°┐Х╒╚\n"
-"  Е╞╚Х┤ЁГ⌡╝Е┴█Г └Е╥╔Д╫°Г⌡╝И▄└\n"
+"  И─≥Г╗╝Ф═╪Е╪▐Е┐┘Г■╗Ф√╪Г╓╨Г╞└О╪▄Д╦█Ф≤╞Г■╗Д╬├Е│ Д╦─?Е┌≥Д╩╫О╪▄Ф╙■Ф║┬Ф°┐Х╒╚\n"
+"  Е╞╚Х┤ЁГ⌡╝Е┴█Г └Е╥╔Г╔°Г⌡╝И▄└\n"
 
 #: pg_backup_files.c:246
 msgid "could not open data file for output\n"
@@ -1388,7 +1388,7 @@ msgstr "Г└║ФЁ∙Г■╒Г■÷Ф ╚Е╜≤Ф╙■Е░█Г╗╠О╪ %s\n"
 
 #: pg_backup_tar.c:376
 msgid "could not open temporary file\n"
-msgstr "Г└║ФЁ∙И√▀Е∙÷Ф ╚Е╜≤Ф╙■\n"
+msgstr "Г└║ФЁ∙И√▀Е∙÷Ф ╚Е╜≤?\n"
 
 #: pg_backup_tar.c:406
 msgid "could not close tar member\n"
@@ -1553,7 +1553,7 @@ msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr "  -a, --data-only          Е▐╙И┌└Е▌÷ХЁ┤Ф√≥О╪▄Д╦█И┌└Е▌÷schema\n"
 
 #: pg_restore.c:375
-msgid "  -C, --create             process commands to create the database\n"
+msgid "  -C, --create             issue commands to create the database\n"
 msgstr "  -C, --create             Е÷╥Х║▄Е╩╨Г╚▀ХЁ┤Ф√≥Е╨╚Г └Е▒╫Д╩╓\n"
 
 #: pg_restore.c:376
@@ -1739,4 +1739,3 @@ msgstr "%sО╪ Ф÷╔Х╘╒Е╓╠Ф∙≈О╪ %s"
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%sО╪ Ф÷╔Х╘╒Ф≤╞О╪ %s\n"
-
diff --git a/src/bin/pg_resetxlog/po/pt_BR.po b/src/bin/pg_resetxlog/po/pt_BR.po
index 9f35c79dc4..9e769e6122 100644
--- a/src/bin/pg_resetxlog/po/pt_BR.po
+++ b/src/bin/pg_resetxlog/po/pt_BR.po
@@ -1,13 +1,13 @@
 # "pg_resetxlog" translation to Brazilian Portuguese Language.
-# Cesar Suga <sartre@linuxbr.com>, 2002. - Fair & Simple Networks Ltda.
-# Roberto Mello <rmello@fslc.usu.edu>
-# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003.
+# Cesar Suga <sartre@linuxbr.com>, 2002.
+# Roberto Mello <rmello@fslc.usu.edu>, 2002.
+# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-09-28 13:54-0300\n"
-"PO-Revision-Date: 2004-09-28 14:10-0300\n"
+"POT-Creation-Date: 2004-10-27 13:07-0300\n"
+"PO-Revision-Date: 2004-10-27 18:36-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@ufgnet.ufg.br>\n"
 "Language-Team: Brazilian Portuguese <pgsql-dev@lists.querencialivre.rs.gov."
 "br>\n"
diff --git a/src/bin/psql/po/pt_BR.po b/src/bin/psql/po/pt_BR.po
index 5bd18d9219..8c7c3f1ce3 100644
--- a/src/bin/psql/po/pt_BR.po
+++ b/src/bin/psql/po/pt_BR.po
@@ -1,11 +1,11 @@
 # "psql" translation to Brazilian Portuguese Language.
-# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003.
+# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-18 14:00-0300\n"
-"PO-Revision-Date: 2004-10-18 14:10-0300\n"
+"POT-Creation-Date: 2004-10-27 13:07-0300\n"
+"PO-Revision-Date: 2004-10-27 18:36-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@ufgnet.ufg.br>\n"
 "Language-Team: Brazilian Portuguese <pgsqlbr-dev@lists.querencialivre.rs.gov."
 "br>\n"
diff --git a/src/bin/scripts/po/pt_BR.po b/src/bin/scripts/po/pt_BR.po
index 6a505b7098..cc792b9e3d 100644
--- a/src/bin/scripts/po/pt_BR.po
+++ b/src/bin/scripts/po/pt_BR.po
@@ -1,11 +1,11 @@
 # "pgscripts" translation to Brazilian Portuguese Language.
-# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003.
+# Euler Taveira de Oliveira <euler@ufgnet.ufg.br>, 2003, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-09-28 14:01-0300\n"
-"PO-Revision-Date: 2004-09-28 14:10-0300\n"
+"POT-Creation-Date: 2004-10-27 13:07-0300\n"
+"PO-Revision-Date: 2004-10-27 18:36-0300\n"
 "Last-Translator: Euler Taveira de Oliveira <euler@ufgnet.ufg.br>\n"
 "Language-Team: Brazilian Portuguese <pgsqlbr-dev@lists.querencialivre.rs.gov."
 "br>\n"
@@ -73,7 +73,7 @@ msgstr ""
 #: createdb.c:221
 msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
 msgstr ""
-"  -D, --tablespace=TABLESPACE     tablespace padrЦo para o banco de dados\n"
+"  -D, --tablespace=TABLESPACE  tablespace padrЦo para o banco de dados\n"
 
 #: createdb.c:222
 msgid "  -E, --encoding=ENCODING      encoding for the database\n"
@@ -82,31 +82,31 @@ msgstr "  -E, --encoding=CODIFICAгцO   codificaГЦo para o banco de dados\n"
 #: createdb.c:223
 msgid "  -O, --owner=OWNER            database user to own the new database\n"
 msgstr ""
-"  -O, --owner=DONO          usuАrio do banco que serА dono do banco de "
+"  -O, --owner=DONO             usuАrio do banco que serА dono do banco de "
 "dados\n"
 
 #: createdb.c:224
 msgid "  -T, --template=TEMPLATE      template database to copy\n"
-msgstr "  -T, --template=MODELO     modelo de banco de dados para copiar\n"
+msgstr "  -T, --template=MODELO        modelo de banco de dados para copiar\n"
 
 #: createdb.c:225
 msgid ""
 "  -e, --echo                   show the commands being sent to the server\n"
 msgstr ""
-"  -e, --echo                      mostra os comandos enviados ao servidor\n"
+"  -e, --echo                   mostra os comandos enviados ao servidor\n"
 
 #: createdb.c:226
 msgid "  -q, --quiet                  don't write any messages\n"
-msgstr "  -q, --quiet                     nЦo mostra nenhuma mensagem\n"
+msgstr "  -q, --quiet                  nЦo mostra nenhuma mensagem\n"
 
 #: createdb.c:227
 msgid "  --help                       show this help, then exit\n"
-msgstr "  --help                          mostra esta ajuda e sai\n"
+msgstr "  --help                       mostra esta ajuda e sai\n"
 
 #: createdb.c:228
 msgid "  --version                    output version information, then exit\n"
 msgstr ""
-"  --version                       mostra informaГЦo sobre a versЦo e sai\n"
+"  --version                    mostra informaГЦo sobre a versЦo e sai\n"
 
 #: createdb.c:229 createuser.c:255 clusterdb.c:244 vacuumdb.c:273
 msgid ""
@@ -357,7 +357,7 @@ msgstr "  -q, --quiet               nЦo exibe nenhuma mensagem\n"
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr ""
-"  -U, --username=USUаRIO   nome do usuАrio para se conectar (nЦo И o usuАrio "
+"  -U, --username=USUаRIO    nome do usuАrio para se conectar (nЦo И o usuАrio "
 "a ser criado)\n"
 
 #: createuser.c:259 dropuser.c:156
@@ -625,36 +625,36 @@ msgstr ""
 "\n"
 "Leia a descriГЦo do comando SQL VACUUM para obter mais detalhes.\n"
 
-#: common.c:86 common.c:112
+#: common.c:87 common.c:113
 msgid "Password: "
 msgstr "Senha: "
 
-#: common.c:99
+#: common.c:100
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: nЦo pТde conectar ao banco de dados %s\n"
 
-#: common.c:122
+#: common.c:123
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: nЦo pТde conectar ao banco de dados %s: %s"
 
-#: common.c:146
+#: common.c:147
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: consulta falhou: %s"
 
-#: common.c:147
+#: common.c:148
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: consulta foi: %s\n"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:161
+#: common.c:162
 msgid "y"
 msgstr "s"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:163
+#: common.c:164
 msgid "n"
 msgstr "n"