Translation updates

17 files changed, 4562 insertions, 4335 deletions

diff --git a/src/backend/po/pt_BR.po b/src/backend/po/pt_BR.po
index 5aac9039e3..1b66ad722c 100644
--- a/src/backend/po/pt_BR.po
+++ b/src/backend/po/pt_BR.po
@@ -1,11 +1,11 @@
 # "postgres" 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:20-0300\n"
-"PO-Revision-Date: 2004-10-18 16:16-0300\n"
+"POT-Creation-Date: 2004-10-30 17:43-0300\n"
+"PO-Revision-Date: 2004-10-30 17:48-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"
@@ -14,24 +14,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: lib/dllist.c:43 lib/dllist.c:88 libpq/auth.c:637
-#: utils/adt/oracle_compat.c:73 utils/adt/oracle_compat.c:124
+#: utils/adt/oracle_compat.c:73 utils/adt/oracle_compat.c:125
 #: utils/adt/ri_triggers.c:3476 utils/adt/cash.c:297 utils/adt/cash.c:312
-#: utils/adt/regexp.c:191 utils/fmgr/dfmgr.c:127 utils/fmgr/fmgr.c:521
-#: utils/fmgr/fmgr.c:532 utils/init/miscinit.c:213 utils/init/miscinit.c:234
-#: utils/init/miscinit.c:244 utils/misc/guc.c:1896 utils/misc/guc.c:1909
-#: utils/misc/guc.c:1922 utils/mmgr/aset.c:337 utils/mmgr/aset.c:503
+#: utils/adt/regexp.c:191 utils/fmgr/dfmgr.c:127 utils/fmgr/fmgr.c:528
+#: utils/hash/dynahash.c:178 utils/hash/dynahash.c:248
+#: utils/init/miscinit.c:213 utils/init/miscinit.c:234
+#: utils/init/miscinit.c:244 utils/misc/guc.c:1907 utils/misc/guc.c:1920
+#: utils/misc/guc.c:1933 utils/mmgr/aset.c:337 utils/mmgr/aset.c:503
 #: utils/mmgr/aset.c:700 utils/mmgr/aset.c:893 utils/mmgr/portalmem.c:75
 #: utils/cache/typcache.c:165 utils/cache/typcache.c:487
 #: utils/cache/relcache.c:164 utils/cache/relcache.c:178
 #: utils/cache/relcache.c:1130 storage/ipc/sinval.c:789 storage/file/fd.c:587
-#: storage/file/fd.c:620 storage/file/fd.c:766 storage/lmgr/lock.c:497
-#: storage/smgr/md.c:138 storage/smgr/md.c:848 storage/smgr/smgr.c:213
-#: storage/buffer/localbuf.c:139 commands/sequence.c:798
-#: executor/execGrouping.c:328 executor/execGrouping.c:388
-#: executor/nodeIndexscan.c:1051 postmaster/postmaster.c:755
-#: postmaster/postmaster.c:1625 postmaster/postmaster.c:2344
-#: postmaster/pgstat.c:1006 postmaster/pgstat.c:1023 postmaster/pgstat.c:2452
-#: postmaster/pgstat.c:2527 postmaster/pgstat.c:2572 postmaster/pgstat.c:2623
+#: storage/file/fd.c:620 storage/file/fd.c:766 storage/lmgr/lock.c:494
+#: storage/smgr/md.c:844 storage/smgr/smgr.c:213 storage/buffer/localbuf.c:139
+#: commands/sequence.c:798 executor/execGrouping.c:384
+#: postmaster/postmaster.c:755 postmaster/postmaster.c:1625
+#: postmaster/postmaster.c:2344 postmaster/pgstat.c:2421
+#: postmaster/pgstat.c:2488
 msgid "out of memory"
 msgstr "sem mem�ria"
 
@@ -505,7 +504,7 @@ msgstr "  -s              mostra estat�sticas ap�s cada consulta\n"
 #: tcop/postgres.c:2140
 msgid "  -S WORK-MEM     set amount of memory for sorts (in kB)\n"
 msgstr ""
-"  -S MEM-ORD       define a quantidade de mem�ria para ordena��es (em kB)\n"
+"  -S MEM-ORD      define a quantidade de mem�ria para ordena��es (em kB)\n"
 
 #: tcop/postgres.c:2141
 msgid "  --describe-config  describe configuration parameters, then exit\n"
@@ -602,7 +601,7 @@ msgid "invalid DESCRIBE message subtype %d"
 msgstr "subtipo %d de mensagem DESCRIBE inv�lido"
 
 #: tcop/postgres.c:3295 nodes/print.c:86 storage/lmgr/deadlock.c:888
-#: commands/vacuumlazy.c:483 commands/vacuumlazy.c:764 commands/vacuum.c:2257
+#: commands/vacuumlazy.c:483 commands/vacuumlazy.c:774 commands/vacuum.c:2257
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -675,7 +674,7 @@ msgstr "Use DROP INDEX para remover um �ndice."
 #: tcop/utility.c:97 utils/adt/regproc.c:1003 commands/functioncmds.c:110
 #: commands/typecmds.c:423 commands/typecmds.c:809 commands/typecmds.c:1167
 #: commands/typecmds.c:1288 commands/typecmds.c:1400 commands/typecmds.c:1487
-#: commands/typecmds.c:2072 commands/tablecmds.c:4592 parser/parse_func.c:1401
+#: commands/typecmds.c:2072 commands/tablecmds.c:4604 parser/parse_func.c:1401
 #: parser/parse_type.c:201 parser/parse_type.c:227 catalog/pg_type.c:517
 #, c-format
 msgid "type \"%s\" does not exist"
@@ -693,7 +692,7 @@ msgstr "use DROP TYPE para remover um tipo."
 #: tcop/utility.c:182 tcop/utility.c:217 commands/trigger.c:147
 #: commands/trigger.c:552 commands/tablecmds.c:556 commands/tablecmds.c:1248
 #: commands/tablecmds.c:1454 commands/tablecmds.c:2610
-#: commands/tablecmds.c:3772 commands/tablecmds.c:5380
+#: commands/tablecmds.c:3772 commands/tablecmds.c:5399
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
 msgstr "permiss�o negada: \"%s\" � um cat�logo do sistema"
@@ -842,8 +841,8 @@ msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr "coluna \"%s\" � do tipo %s mas express�o padr�o � do tipo %s"
 
 #: rewrite/rewriteHandler.c:651 parser/analyze.c:2689 parser/parse_node.c:247
-#: parser/parse_target.c:362 parser/parse_target.c:570
-#: parser/parse_target.c:579 catalog/heap.c:1832
+#: parser/parse_target.c:362 parser/parse_target.c:572
+#: parser/parse_target.c:581 catalog/heap.c:1832
 msgid "You will need to rewrite or cast the expression."
 msgstr "Voc� precisar� reescrever ou converter a express�o."
 
@@ -922,9 +921,9 @@ msgstr "faltando campo no arquivo \"%s\" no fim da linha %d"
 
 #: libpq/hba.c:911 libpq/hba.c:935 utils/init/miscinit.c:783
 #: utils/init/miscinit.c:889 utils/misc/database.c:68 utils/error/elog.c:1118
-#: access/transam/slru.c:638 access/transam/xlog.c:1631
-#: access/transam/xlog.c:2742 access/transam/xlog.c:2832
-#: access/transam/xlog.c:2930
+#: access/transam/slru.c:638 access/transam/xlog.c:1632
+#: access/transam/xlog.c:2753 access/transam/xlog.c:2843
+#: access/transam/xlog.c:2941
 #, c-format
 msgid "could not open file \"%s\": %m"
 msgstr "n�o p�de abrir arquivo \"%s\": %m"
@@ -1429,19 +1428,19 @@ msgstr "n�o p�de aceitar nova conex�o: %m"
 msgid "could not receive data from client: %m"
 msgstr "n�o p�de receber dados do cliente: %m"
 
-#: libpq/pqcomm.c:865
+#: libpq/pqcomm.c:895
 msgid "unexpected EOF within message length word"
 msgstr "EOF inesperado dentro da palavra de tamanho de mensagem"
 
-#: libpq/pqcomm.c:877
+#: libpq/pqcomm.c:906
 msgid "invalid message length"
 msgstr "tamanho de mensagem inv�lido"
 
-#: libpq/pqcomm.c:891
+#: libpq/pqcomm.c:928 libpq/pqcomm.c:938
 msgid "incomplete message from client"
 msgstr "mensagem incompleta do cliente"
 
-#: libpq/pqcomm.c:1001
+#: libpq/pqcomm.c:1048
 #, c-format
 msgid "could not send data to client: %m"
 msgstr "n�o p�de enviar dados para cliente: %m"
@@ -1676,8 +1675,8 @@ msgstr "valor de data/hora \"%s\" n�o � mais suportado"
 #: utils/adt/nabstime.c:570 utils/adt/nabstime.c:613 utils/adt/nabstime.c:643
 #: utils/adt/nabstime.c:686 utils/adt/date.c:732 utils/adt/date.c:775
 #: utils/adt/date.c:1337 utils/adt/date.c:1374 utils/adt/date.c:2252
-#: utils/adt/formatting.c:2894 utils/adt/formatting.c:2919
-#: utils/adt/formatting.c:2978
+#: utils/adt/formatting.c:2895 utils/adt/formatting.c:2920
+#: utils/adt/formatting.c:2979
 msgid "timestamp out of range"
 msgstr "timestamp fora do intervalo"
 
@@ -1878,8 +1877,8 @@ msgid "unrecognized privilege type: \"%s\""
 msgstr "tipo de privil�gio desconhecido: \"%s\""
 
 #: utils/adt/acl.c:1661 utils/init/postinit.c:264 utils/init/postinit.c:276
-#: commands/comment.c:458 commands/dbcommands.c:549 commands/dbcommands.c:673
-#: commands/dbcommands.c:768 commands/dbcommands.c:842 catalog/aclchk.c:451
+#: commands/comment.c:458 commands/dbcommands.c:550 commands/dbcommands.c:682
+#: commands/dbcommands.c:777 commands/dbcommands.c:851 catalog/aclchk.c:451
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "banco de dados \"%s\" n�o existe"
@@ -1905,8 +1904,8 @@ msgid "schema \"%s\" does not exist"
 msgstr "esquema \"%s\" n�o existe"
 
 #: utils/adt/acl.c:2489 commands/tablespace.c:428 commands/tablespace.c:824
-#: commands/tablespace.c:891 commands/dbcommands.c:276
-#: commands/indexcmds.c:169 commands/tablecmds.c:328 commands/tablecmds.c:5388
+#: commands/tablespace.c:891 commands/dbcommands.c:277
+#: commands/indexcmds.c:169 commands/tablecmds.c:328 commands/tablecmds.c:5407
 #: commands/schemacmds.c:117 catalog/aclchk.c:1080
 #, c-format
 msgid "tablespace \"%s\" does not exist"
@@ -1969,12 +1968,20 @@ msgstr "oidvector tem muitos elementos"
 msgid "invalid input syntax for type tid: \"%s\""
 msgstr "sintaxe de entrada inv�lida para tipo tid: \"%s\""
 
-#: utils/adt/oracle_compat.c:99 utils/adt/oracle_compat.c:138
+#: utils/adt/oracle_compat.c:99 utils/adt/oracle_compat.c:139
 msgid "invalid multibyte character for locale"
 msgstr "caracter multibyte inv�lido para localiza��o"
 
-#: utils/adt/oracle_compat.c:410 utils/adt/oracle_compat.c:507
-#: utils/adt/oracle_compat.c:1131
+#: utils/adt/oracle_compat.c:100
+msgid ""
+"The server's LC_CTYPE locale is probably incompatible with the database "
+"encoding."
+msgstr ""
+"A localidade LC_TYPE do servidor � provavelmente incompat�vel com a "
+"codifica��o do banco de dados."
+
+#: utils/adt/oracle_compat.c:411 utils/adt/oracle_compat.c:508
+#: utils/adt/oracle_compat.c:1132
 msgid "requested length too large"
 msgstr "tamanho solicitado � muito grande"
 
@@ -2112,9 +2119,9 @@ msgstr "valor muito longo para tipo character varying(%d)"
 #: utils/adt/ruleutils.c:1305 commands/comment.c:404 commands/tablecmds.c:3074
 #: commands/tablecmds.c:3167 commands/tablecmds.c:3219
 #: commands/tablecmds.c:3315 commands/tablecmds.c:3376
-#: commands/tablecmds.c:3442 commands/tablecmds.c:4568
-#: commands/tablecmds.c:4705 parser/parse_relation.c:1647
-#: parser/parse_relation.c:1705 parser/parse_relation.c:1919
+#: commands/tablecmds.c:3442 commands/tablecmds.c:4580
+#: commands/tablecmds.c:4717 parser/parse_relation.c:1641
+#: parser/parse_relation.c:1700 parser/parse_relation.c:1913
 #: parser/parse_type.c:94
 #, c-format
 msgid "column \"%s\" of relation \"%s\" does not exist"
@@ -2161,7 +2168,7 @@ msgid "date/time value \"current\" is no longer supported"
 msgstr "valor de data/hora \"current\" n�o � mais suportado"
 
 #: utils/adt/datetime.c:1495 utils/adt/datetime.c:2370
-#: utils/adt/formatting.c:3180
+#: utils/adt/formatting.c:3181
 #, c-format
 msgid "inconsistent use of year %04d and \"BC\""
 msgstr "uso inconsistente do ano %04d e \"BC\""
@@ -2575,77 +2582,77 @@ msgstr "correspond�ncia de express�o regular n�o � suportada pelo tipo bytea"
 msgid "encoding conversion from %s to ASCII not supported"
 msgstr "convers�o de condifica��o de %s para ASCII n�o � suportada"
 
-#: utils/adt/formatting.c:985
+#: utils/adt/formatting.c:986
 msgid "\"9\" must be ahead of \"PR\""
 msgstr "\"9\" deve estar a frente de \"PR\""
 
-#: utils/adt/formatting.c:1004
+#: utils/adt/formatting.c:1005
 msgid "\"0\" must be ahead of \"PR\""
 msgstr "\"0\" deve estar a frente de \"PR\""
 
-#: utils/adt/formatting.c:1033
+#: utils/adt/formatting.c:1034
 msgid "multiple decimal points"
 msgstr "m�ltiplas casas decimais"
 
-#: utils/adt/formatting.c:1040 utils/adt/formatting.c:1145
+#: utils/adt/formatting.c:1041 utils/adt/formatting.c:1146
 msgid "cannot use \"V\" and decimal point together"
 msgstr "n�o pode utilizar \"V\" e casas decimais juntos"
 
-#: utils/adt/formatting.c:1055
+#: utils/adt/formatting.c:1056
 msgid "not unique \"S\""
 msgstr "\"S\" n�o � �nico"
 
-#: utils/adt/formatting.c:1062
+#: utils/adt/formatting.c:1063
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "n�o pode utilizar \"S\" e \"PL\"/\"MI\"/\"SG\"/\"PR\" juntos"
 
-#: utils/adt/formatting.c:1086
+#: utils/adt/formatting.c:1087
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "n�o pode utilizar \"S\" e \"MI\" juntos"
 
-#: utils/adt/formatting.c:1099
+#: utils/adt/formatting.c:1100
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "n�o pode utilizar \"S\" e \"PL\" juntos"
 
-#: utils/adt/formatting.c:1112
+#: utils/adt/formatting.c:1113
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "n�o pode utilizar \"S\" e \"SG\" juntos"
 
-#: utils/adt/formatting.c:1124
+#: utils/adt/formatting.c:1125
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "n�o pode utilizar \"PR\" e \"S\"/\"PL\"/\"MI\"/\"SG\" juntos"
 
-#: utils/adt/formatting.c:1154
+#: utils/adt/formatting.c:1155
 msgid "\"E\" is not supported"
 msgstr "\"E\" n�o � suportado"
 
-#: utils/adt/formatting.c:1425
+#: utils/adt/formatting.c:1426
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\" n�o � um n�mero"
 
-#: utils/adt/formatting.c:1688
+#: utils/adt/formatting.c:1689
 msgid "invalid AM/PM string"
 msgstr "cadeia de caracteres AM/PM inv�lida"
 
-#: utils/adt/formatting.c:2034
+#: utils/adt/formatting.c:2035
 msgid "\"TZ\"/\"tz\" not supported"
 msgstr "\"TZ\"/\"tz\" n�o � suportado"
 
-#: utils/adt/formatting.c:2044
+#: utils/adt/formatting.c:2045
 #, c-format
 msgid "invalid value for %s"
 msgstr "valor inv�lido para %s"
 
-#: utils/adt/formatting.c:3141
+#: utils/adt/formatting.c:3142
 msgid "AM/PM hour must be between 1 and 12"
 msgstr "hora AM/PM deve estar entre 1 e 12"
 
-#: utils/adt/formatting.c:3215
+#: utils/adt/formatting.c:3216
 msgid "cannot calculate day of year without year information"
 msgstr "n�o pode calcular dia do ano sem a informa��o do ano"
 
-#: utils/adt/formatting.c:3994
+#: utils/adt/formatting.c:4082
 msgid "\"RN\" not supported"
 msgstr "\"RN\" n�o � suportado"
 
@@ -2766,7 +2773,7 @@ msgstr "marca��es de matriz inv�lidas"
 msgid "wrong element type"
 msgstr "tipo de elemento incorreto"
 
-#: utils/adt/arrayfuncs.c:1211 utils/cache/lsyscache.c:1756
+#: utils/adt/arrayfuncs.c:1211 utils/cache/lsyscache.c:1792
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr "nenhuma fun��o de entrada dispon�vel para tipo %s"
@@ -2776,7 +2783,7 @@ msgstr "nenhuma fun��o de entrada dispon�vel para tipo %s"
 msgid "improper binary format in array element %d"
 msgstr "formato bin�rio inv�lido no elemento %d da matriz"
 
-#: utils/adt/arrayfuncs.c:1383 utils/cache/lsyscache.c:1792
+#: utils/adt/arrayfuncs.c:1383 utils/cache/lsyscache.c:1828
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr "nenhuma fun��o de sa�da dispon�vel para tipo %s"
@@ -3005,7 +3012,7 @@ msgstr "fun��o interna \"%s\" n�o est� na tabela de busca interna"
 msgid "unrecognized API version %d reported by info function \"%s\""
 msgstr "vers�o %d de API desconhecida reportada pela fun��o \"%s\""
 
-#: utils/fmgr/fmgr.c:764 utils/fmgr/fmgr.c:1639
+#: utils/fmgr/fmgr.c:760 utils/fmgr/fmgr.c:1635
 #, c-format
 msgid "function %u has too many arguments (%d, maximum is %d)"
 msgstr "fun��o %u tem muitos argumentos (%d, m�ximo � %d)"
@@ -3018,7 +3025,7 @@ msgstr ""
 "fun��o que tem argumento do tipo conjunto foi chamada em um contexto que n�o "
 "pode aceitar um conjunto"
 
-#: utils/init/miscinit.c:335 utils/cache/lsyscache.c:2064
+#: utils/init/miscinit.c:335 utils/cache/lsyscache.c:2100
 #: commands/variable.c:664 commands/user.c:899 commands/user.c:1012
 #: commands/user.c:1104 commands/user.c:1233
 #, c-format
@@ -3112,14 +3119,14 @@ msgstr ""
 msgid "could not write lock file \"%s\": %m"
 msgstr "n�o p�de escrever no arquivo de travamento \"%s\": %m"
 
-#: utils/init/miscinit.c:792 utils/misc/guc.c:5072
+#: utils/init/miscinit.c:792 utils/misc/guc.c:5102
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "n�o p�de ler do arquivo \"%s\": %m"
 
-#: utils/init/miscinit.c:832 utils/init/miscinit.c:841 utils/misc/guc.c:4932
-#: utils/misc/guc.c:4996 access/transam/xlog.c:1555 access/transam/xlog.c:1679
-#: access/transam/xlog.c:2964 access/transam/xlog.c:3002
+#: utils/init/miscinit.c:832 utils/init/miscinit.c:841 utils/misc/guc.c:4962
+#: utils/misc/guc.c:5026 access/transam/xlog.c:1556 access/transam/xlog.c:1680
+#: access/transam/xlog.c:2975 access/transam/xlog.c:3013
 #: commands/tablespace.c:667 commands/tablespace.c:673 commands/copy.c:1117
 #: postmaster/postmaster.c:3430
 #, c-format
@@ -3145,12 +3152,12 @@ msgstr "Arquivo \"%s\" n�o cont�m dados v�lidos."
 msgid "You may need to initdb."
 msgstr "Voc� precisa executar o initdb."
 
-#: utils/init/miscinit.c:907 access/transam/xlog.c:3188
-#: access/transam/xlog.c:3218 access/transam/xlog.c:3225
-#: access/transam/xlog.c:3232 access/transam/xlog.c:3239
-#: access/transam/xlog.c:3246 access/transam/xlog.c:3253
-#: access/transam/xlog.c:3262 access/transam/xlog.c:3269
-#: access/transam/xlog.c:3277
+#: utils/init/miscinit.c:907 access/transam/xlog.c:3199
+#: access/transam/xlog.c:3229 access/transam/xlog.c:3236
+#: access/transam/xlog.c:3243 access/transam/xlog.c:3250
+#: access/transam/xlog.c:3257 access/transam/xlog.c:3264
+#: access/transam/xlog.c:3273 access/transam/xlog.c:3280
+#: access/transam/xlog.c:3288
 msgid "database files are incompatible with server"
 msgstr "arquivos do banco de dados s�o incompat�veis com o servidor"
 
@@ -4169,76 +4176,76 @@ msgstr ""
 "componente de diret�rio (i.e., o nome n�o cont�m uma barra), o sistema ir� "
 "procurar o caminho para o arquivo especificado."
 
-#: utils/misc/guc.c:1533
+#: utils/misc/guc.c:1534
 msgid "Sets the location of the Kerberos server key file."
 msgstr "Define o local do arquivo da chave do servidor Kerberos."
 
-#: utils/misc/guc.c:1542
+#: utils/misc/guc.c:1544
 msgid "Sets the Rendezvous broadcast service name."
 msgstr "Define o nome do servi�o de difus�o do Rendezvous."
 
-#: utils/misc/guc.c:1553
+#: utils/misc/guc.c:1555
 msgid "Shows the collation order locale."
 msgstr "Mostra a localidade para utilizar na ordena��o."
 
-#: utils/misc/guc.c:1563
+#: utils/misc/guc.c:1565
 msgid "Shows the character classification and case conversion locale."
 msgstr ""
 "Mostra a localidade de classifica��o de caracteres e convers�o entre "
 "mai�sculas/min�sculas."
 
-#: utils/misc/guc.c:1573
+#: utils/misc/guc.c:1575
 msgid "Sets the language in which messages are displayed."
 msgstr "Define a l�ngua na qual as mensagens s�o exibidas."
 
-#: utils/misc/guc.c:1582
+#: utils/misc/guc.c:1584
 msgid "Sets the locale for formatting monetary amounts."
 msgstr "Define a localidade para formato de moeda."
 
-#: utils/misc/guc.c:1591
+#: utils/misc/guc.c:1593
 msgid "Sets the locale for formatting numbers."
 msgstr "Define a localidade para formato de n�mero."
 
-#: utils/misc/guc.c:1600
+#: utils/misc/guc.c:1602
 msgid "Sets the locale for formatting date and time values."
 msgstr "Define a localidade para formato de data e hora."
 
-#: utils/misc/guc.c:1609
+#: utils/misc/guc.c:1611
 msgid "Lists shared libraries to preload into server."
 msgstr "Mostra bibliotecas compartilhadas a serem carregadas no servidor."
 
-#: utils/misc/guc.c:1619
+#: utils/misc/guc.c:1621
 msgid "Sets the regular expression \"flavor\"."
 msgstr "Define a express�o regular como \"flavor\"."
 
-#: utils/misc/guc.c:1620
+#: utils/misc/guc.c:1622
 msgid "This can be set to advanced, extended, or basic."
 msgstr "Isso pode ser definido como advanced, extended ou basic."
 
-#: utils/misc/guc.c:1628
+#: utils/misc/guc.c:1630
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr ""
 "Define a ordem de busca em esquemas para nomes que n�o especificam um "
 "esquema."
 
-#: utils/misc/guc.c:1639
+#: utils/misc/guc.c:1641
 msgid "Sets the server (database) character set encoding."
 msgstr ""
 "Define a codifica��o do conjunto de caracteres do servidor (banco de dados)."
 
-#: utils/misc/guc.c:1650
+#: utils/misc/guc.c:1652
 msgid "Shows the server version."
 msgstr "Mostra a vers�o do servidor."
 
-#: utils/misc/guc.c:1661
+#: utils/misc/guc.c:1663
 msgid "Sets the session user name."
 msgstr "Define o nome do usu�rio da sess�o."
 
-#: utils/misc/guc.c:1671
+#: utils/misc/guc.c:1673
 msgid "Sets the destination for server log output."
 msgstr "Define o destino do log do servidor."
 
-#: utils/misc/guc.c:1672
+#: utils/misc/guc.c:1674
 msgid ""
 "Valid values are combinations of \"stderr\", \"syslog\", and \"eventlog\", "
 "depending on the platform."
@@ -4246,27 +4253,27 @@ msgstr ""
 "Valores v�lidos s�o combina��es de \"stderr\", \"syslog\" e \"eventlog\", "
 "dependendo da plataforma."
 
-#: utils/misc/guc.c:1681
+#: utils/misc/guc.c:1683
 msgid "Sets the destination directory for log files."
 msgstr "Define o diret�rio de destino dos arquivos de log."
 
-#: utils/misc/guc.c:1682
+#: utils/misc/guc.c:1684
 msgid "May be specified as relative to the data directory or as absolute path."
 msgstr ""
 "Pode ser especificado como caminho relativo ao diret�rio de dados ou como "
 "caminho absoluto."
 
-#: utils/misc/guc.c:1690
+#: utils/misc/guc.c:1693
 msgid "Sets the file name pattern for log files."
 msgstr "Define o padr�o de nome de arquivo para arquivos de log."
 
-#: utils/misc/guc.c:1700
+#: utils/misc/guc.c:1704
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr ""
 "Define o syslog \"facility\" a ser utilizado quando syslog estiver "
 "habilitado."
 
-#: utils/misc/guc.c:1701
+#: utils/misc/guc.c:1705
 msgid ""
 "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, "
 "LOCAL7."
@@ -4274,66 +4281,66 @@ msgstr ""
 "Valores v�lidos s�o LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, "
 "LOCAL7."
 
-#: utils/misc/guc.c:1709
+#: utils/misc/guc.c:1713
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr ""
 "Define o nome do programa utilizado para identificar mensagens do PostgreSQL "
 "no syslog."
 
-#: utils/misc/guc.c:1720
+#: utils/misc/guc.c:1724
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "Define a zona hor�ria para mostrar e interpretar timestamps."
 
-#: utils/misc/guc.c:1729
+#: utils/misc/guc.c:1733
 msgid "Sets the current transaction's isolation level."
 msgstr "Define o n�vel de isolamento da transa��o atual."
 
-#: utils/misc/guc.c:1739
+#: utils/misc/guc.c:1743
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "Define o grupo dono do soquete de dom�nio Unix."
 
-#: utils/misc/guc.c:1740
+#: utils/misc/guc.c:1744
 msgid ""
 "(The owning user of the socket is always the user that starts the server.)"
 msgstr "(O usu�rio dono do soquete � sempre aquele que inicia o servidor.)"
 
-#: utils/misc/guc.c:1749
+#: utils/misc/guc.c:1753
 msgid "Sets the directory where the Unix-domain socket will be created."
 msgstr "Define o diret�rio onde o soquete de dom�nio Unix ser� criado."
 
-#: utils/misc/guc.c:1758
+#: utils/misc/guc.c:1763
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "Define o nome da m�quina ou endere�o(s) IP para escutar."
 
-#: utils/misc/guc.c:1768
+#: utils/misc/guc.c:1773
 msgid "Selects the method used for forcing WAL updates out to disk."
 msgstr "Seleciona o m�todo utilizado para for�ar atualiza��es do WAL no disco."
 
-#: utils/misc/guc.c:1777
-msgid "Sets the list of known custom variable classes"
-msgstr "Define a lista de classes de vari�veis customizadas conhecidas"
+#: utils/misc/guc.c:1782
+msgid "Sets the list of known custom variable classes."
+msgstr "Define a lista de classes de vari�veis customizadas conhecidas."
 
-#: utils/misc/guc.c:1787
+#: utils/misc/guc.c:1792
 msgid "Sets the server's data directory."
 msgstr "Define o diret�rio de dados do servidor."
 
-#: utils/misc/guc.c:1796
+#: utils/misc/guc.c:1802
 msgid "Sets the server's main configuration file."
 msgstr "Define o arquivo de configura��o principal do servidor."
 
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1812
 msgid "Sets the server's \"hba\" configuration file"
 msgstr "Define o arquivo de configura��o \"hba\" do servidor"
 
-#: utils/misc/guc.c:1815
+#: utils/misc/guc.c:1822
 msgid "Sets the server's \"ident\" configuration file"
 msgstr "Define o arquivo de configura��o \"ident\" do servidor"
 
-#: utils/misc/guc.c:1824
+#: utils/misc/guc.c:1832
 msgid "Writes the postmaster PID to the specified file."
 msgstr "Escreve o PID do postmaster no arquivo especificado."
 
-#: utils/misc/guc.c:2480
+#: utils/misc/guc.c:2491
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -4344,12 +4351,12 @@ msgstr ""
 "Voc� deve especificar a op��o --config-file ou -D ou definir uma vari�vel de "
 "ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:2505
+#: utils/misc/guc.c:2516
 #, c-format
 msgid "%s cannot access the server configuration file \"%s\": %s\n"
 msgstr "%s n�o pode acessar o arquivo de configura��o do servidor \"%s\": %s\n"
 
-#: utils/misc/guc.c:2525
+#: utils/misc/guc.c:2536
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -4360,7 +4367,7 @@ msgstr ""
 "Isto pode ser especificado como \"data_directory\" no \"%s\", pela op��o -D "
 "ou definindo uma vari�vel de ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:2548
+#: utils/misc/guc.c:2559
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -4371,7 +4378,7 @@ msgstr ""
 "Isto pode ser especificado como \"hba_file\" no \"%s\", pela op��o -D ou "
 "definindo uma vari�vel de ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:2571
+#: utils/misc/guc.c:2582
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -4382,133 +4389,138 @@ msgstr ""
 "Isto pode ser especificado como \"ident_file\" no \"%s\", pela op��o -D ou "
 "definindo uma vari�vel de ambiente PGDATA.\n"
 
-#: utils/misc/guc.c:3279 utils/misc/guc.c:3968 utils/misc/guc.c:4004
-#: utils/misc/guc.c:4060 utils/misc/guc.c:4397 utils/misc/guc.c:4546
+#: utils/misc/guc.c:3290 utils/misc/guc.c:3979 utils/misc/guc.c:4019
+#: utils/misc/guc.c:4079 utils/misc/guc.c:4415 utils/misc/guc.c:4566
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "par�metro de configura��o desconhecido \"%s\""
 
-#: utils/misc/guc.c:3298
+#: utils/misc/guc.c:3309
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "par�metro \"%s\" n�o pode ser mudado"
 
-#: utils/misc/guc.c:3310
+#: utils/misc/guc.c:3321
 #, c-format
 msgid "parameter \"%s\" cannot be changed after server start"
 msgstr ""
 "par�metro \"%s\" n�o pode ser mudado depois que o servidor foi iniciado"
 
-#: utils/misc/guc.c:3320
+#: utils/misc/guc.c:3331
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "par�metro \"%s\" n�o pode ser mudado agora"
 
-#: utils/misc/guc.c:3350
+#: utils/misc/guc.c:3361
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr ""
 "par�metro \"%s\" n�o pode ser definido depois que a conex�o foi iniciada"
 
-#: utils/misc/guc.c:3360 utils/misc/guc.c:3894
+#: utils/misc/guc.c:3371 utils/misc/guc.c:3905
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "permiss�o negada ao definir par�metro \"%s\""
 
-#: utils/misc/guc.c:3417
+#: utils/misc/guc.c:3428
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "par�metro \"%s\" requer um valor booleano"
 
-#: utils/misc/guc.c:3449 utils/misc/guc.c:3557
+#: utils/misc/guc.c:3460 utils/misc/guc.c:3568
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "valor inv�lido para par�metro \"%s\": %d"
 
-#: utils/misc/guc.c:3509
+#: utils/misc/guc.c:3520
 #, c-format
 msgid "parameter \"%s\" requires an integer value"
 msgstr "par�metro \"%s\" requer um valor inteiro"
 
-#: utils/misc/guc.c:3517
+#: utils/misc/guc.c:3528
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d est� fora do intervalo v�lido para par�metro \"%s\" (%d .. %d)"
 
-#: utils/misc/guc.c:3617
+#: utils/misc/guc.c:3628
 #, c-format
 msgid "parameter \"%s\" requires a numeric value"
 msgstr "par�metro \"%s\" requer um valor num�rico"
 
-#: utils/misc/guc.c:3625
+#: utils/misc/guc.c:3636
 #, c-format
 msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
 msgstr "%g est� fora do intervalo v�lido para par�metro \"%s\" (%g .. %g)"
 
-#: utils/misc/guc.c:3658
+#: utils/misc/guc.c:3669
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "valor inv�lido para par�metro \"%s\": %g"
 
-#: utils/misc/guc.c:3790
+#: utils/misc/guc.c:3801
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "valor inv�lido para par�metro \"%s\": \"%s\""
 
-#: utils/misc/guc.c:3897
+#: utils/misc/guc.c:3908
 msgid "Must be superuser to change this value to false."
 msgstr "Deve ser super-usu�rio para mudar esse valor para falso."
 
-#: utils/misc/guc.c:3899
+#: utils/misc/guc.c:3910
 msgid "Must be superuser to increase this value or turn it off."
 msgstr "Deve ser super-usu�rio para aumentar esse valor ou desabilit�-lo."
 
-#: utils/misc/guc.c:3900
+#: utils/misc/guc.c:3911
 msgid "Must be superuser to increase this value."
 msgstr "Deve ser super-usu�rio para aumentar esse valor."
 
-#: utils/misc/guc.c:4069
+#: utils/misc/guc.c:3983 utils/misc/guc.c:4023 utils/misc/guc.c:4570
+#, c-format
+msgid "must be superuser to examine \"%s\""
+msgstr "deve ser super-usu�rio para examinar \"%s\""
+
+#: utils/misc/guc.c:4088
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s s� tem um argumento"
 
-#: utils/misc/guc.c:4173
+#: utils/misc/guc.c:4192
 msgid "SET requires parameter name"
 msgstr "SET requer nome do par�metro"
 
-#: utils/misc/guc.c:4237
+#: utils/misc/guc.c:4256
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "tentativa de redefinir par�metro \"%s\""
 
-#: utils/misc/guc.c:5183
+#: utils/misc/guc.c:5213
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "n�o p�de analisar defini��o para par�metro \"%s\""
 
-#: utils/misc/guc.c:5381
+#: utils/misc/guc.c:5411
 msgid "invalid list syntax for parameter \"log_destination\""
 msgstr "sintaxe de lista inv�lida para par�metro \"log_destination\""
 
-#: utils/misc/guc.c:5404
+#: utils/misc/guc.c:5434
 #, c-format
 msgid "unrecognized \"log_destination\" key word: \"%s\""
 msgstr "palavra chave de \"log_destination\" desconhecida: \"%s\""
 
-#: utils/misc/guc.c:5638
+#: utils/misc/guc.c:5668
 msgid "SET AUTOCOMMIT TO OFF is no longer supported"
 msgstr "SET AUTOCOMMIT TO OFF n�o � mais suportado"
 
-#: utils/misc/guc.c:5686
+#: utils/misc/guc.c:5716
 #, c-format
 msgid "invalid syntax for \"custom_variable_classes\": \"%s\""
 msgstr "sintaxe inv�lida para \"custom_variable_classes\": \"%s\""
 
-#: utils/misc/guc.c:5715
+#: utils/misc/guc.c:5745
 msgid "cannot enable parameter when \"log_statement_stats\" is true"
 msgstr "n�o pode habilitar par�metro quando \"log_statement_stats\" � true"
 
-#: utils/misc/guc.c:5732
+#: utils/misc/guc.c:5762
 msgid ""
 "cannot enable \"log_statement_stats\" when \"log_parser_stats\", "
 "\"log_planner_stats\", or \"log_executor_stats\" is true"
@@ -4516,7 +4528,7 @@ msgstr ""
 "n�o pode habilitar \"log_statement_stats\" quando \"log_parser_stats\", "
 "\"log_planner_stats\" ou \"log_executor_stats\" � true"
 
-#: utils/misc/guc.c:5751
+#: utils/misc/guc.c:5781
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr ""
 "n�o pode definir modo leitura-escrita da transa��o dentro de uma transa��o "
@@ -4587,18 +4599,18 @@ msgstr "tipo %s n�o � composto"
 msgid "record type has not been registered"
 msgstr "tipo record n�o foi registrado"
 
-#: utils/cache/lsyscache.c:1679 utils/cache/lsyscache.c:1715
-#: utils/cache/lsyscache.c:1751 utils/cache/lsyscache.c:1787
+#: utils/cache/lsyscache.c:1715 utils/cache/lsyscache.c:1751
+#: utils/cache/lsyscache.c:1787 utils/cache/lsyscache.c:1823
 #, c-format
 msgid "type %s is only a shell"
 msgstr "tipo %s � indefinido"
 
-#: utils/cache/lsyscache.c:1684
+#: utils/cache/lsyscache.c:1720
 #, c-format
 msgid "no input function available for type %s"
 msgstr "nenhuma fun��o de entrada dispon�vel para tipo %s"
 
-#: utils/cache/lsyscache.c:1720
+#: utils/cache/lsyscache.c:1756
 #, c-format
 msgid "no output function available for type %s"
 msgstr "nenhuma fun��o de sa�da dispon�vel para tipo %s"
@@ -4828,9 +4840,9 @@ msgstr "arquivo \"%s\" n�o existe, lendo como zeros"
 msgid "could not access status of transaction %u"
 msgstr "n�o p�de acessar status da transa��o %u"
 
-#: access/transam/slru.c:645 access/transam/xlog.c:1526
-#: access/transam/xlog.c:1646 access/transam/xlog.c:2911
-#: access/transam/xlog.c:5308 access/transam/xlog.c:5426
+#: access/transam/slru.c:645 access/transam/xlog.c:1527
+#: access/transam/xlog.c:1647 access/transam/xlog.c:2922
+#: access/transam/xlog.c:5332 access/transam/xlog.c:5450
 #: postmaster/postmaster.c:3366
 #, c-format
 msgid "could not create file \"%s\": %m"
@@ -4851,14 +4863,14 @@ msgstr "n�o p�de ler do arquivo \"%s\" deslocado de %u: %m"
 msgid "could not write to file \"%s\" at offset %u: %m"
 msgstr "n�o p�de escrever no arquivo \"%s\" deslocado de %u: %m"
 
-#: access/transam/slru.c:673 access/transam/xlog.c:1562
-#: access/transam/xlog.c:1686 access/transam/xlog.c:3008
+#: access/transam/slru.c:673 access/transam/xlog.c:1563
+#: access/transam/xlog.c:1687 access/transam/xlog.c:3019
 #, c-format
 msgid "could not fsync file \"%s\": %m"
 msgstr "n�o p�de executar fsync no arquivo \"%s\": %m"
 
-#: access/transam/slru.c:680 access/transam/xlog.c:1567
-#: access/transam/xlog.c:1691 access/transam/xlog.c:3013
+#: access/transam/slru.c:680 access/transam/xlog.c:1568
+#: access/transam/xlog.c:1692 access/transam/xlog.c:3024
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "n�o p�de fechar arquivo \"%s\": %m"
@@ -4925,54 +4937,54 @@ msgstr "savepoint inexistente"
 msgid "cannot have more than 2^32-1 subtransactions in a transaction"
 msgstr "n�o pode ter mais do que 2^32-1 subtransa��es em uma transa��o"
 
-#: access/transam/xlog.c:906
+#: access/transam/xlog.c:907
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "n�o p�de criar arquivo de status do arquivador \"%s\": %m"
 
-#: access/transam/xlog.c:914
+#: access/transam/xlog.c:915
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "n�o p�de escrever no arquivo de status do arquivador \"%s\": %m"
 
-#: access/transam/xlog.c:1179 access/transam/xlog.c:1303
-#: access/transam/xlog.c:5168
+#: access/transam/xlog.c:1180 access/transam/xlog.c:1304
+#: access/transam/xlog.c:5192
 #, c-format
 msgid "could not close log file %u, segment %u: %m"
 msgstr "n�o p�de fechar arquivo de log %u, segmento %u: %m"
 
-#: access/transam/xlog.c:1237 access/transam/xlog.c:2405
+#: access/transam/xlog.c:1238 access/transam/xlog.c:2416
 #, c-format
 msgid "could not seek in log file %u, segment %u to offset %u: %m"
 msgstr "n�o p�de buscar no arquivo de log %u, segmento %u deslocado de %u: %m"
 
-#: access/transam/xlog.c:1251
+#: access/transam/xlog.c:1252
 #, c-format
 msgid "could not write to log file %u, segment %u at offset %u: %m"
 msgstr ""
 "n�o p�de escrever no arquivo de log %u, segmento %u deslocado de %u: %m"
 
-#: access/transam/xlog.c:1503 access/transam/xlog.c:1594
-#: access/transam/xlog.c:1807 access/transam/xlog.c:1861
-#: access/transam/xlog.c:1870
+#: access/transam/xlog.c:1504 access/transam/xlog.c:1595
+#: access/transam/xlog.c:1808 access/transam/xlog.c:1862
+#: access/transam/xlog.c:1871
 #, c-format
 msgid "could not open file \"%s\" (log file %u, segment %u): %m"
 msgstr "n�o p�de abrir arquivo \"%s\" (arquivo de log %u, segmento %u): %m"
 
-#: access/transam/xlog.c:1659 access/transam/xlog.c:2942
-#: access/transam/xlog.c:5397 access/transam/xlog.c:5448
-#: access/transam/xlog.c:5520 access/transam/xlog.c:5545
-#: access/transam/xlog.c:5583
+#: access/transam/xlog.c:1660 access/transam/xlog.c:2953
+#: access/transam/xlog.c:5421 access/transam/xlog.c:5472
+#: access/transam/xlog.c:5544 access/transam/xlog.c:5569
+#: access/transam/xlog.c:5607
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "n�o p�de ler arquivo \"%s\": %m"
 
-#: access/transam/xlog.c:1662
+#: access/transam/xlog.c:1663
 #, c-format
 msgid "insufficient data in file \"%s\""
 msgstr "dados insuficientes no arquivo \"%s\""
 
-#: access/transam/xlog.c:1774
+#: access/transam/xlog.c:1775
 #, c-format
 msgid ""
 "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment "
@@ -4981,7 +4993,7 @@ msgstr ""
 "n�o p�de vincular arquivo \"%s\" para \"%s\" (inicializa��o do arquivo de "
 "log %u, segmento %u): %m"
 
-#: access/transam/xlog.c:1781
+#: access/transam/xlog.c:1782
 #, c-format
 msgid ""
 "could not rename file \"%s\" to \"%s\" (initialization of log file %u, "
@@ -4990,157 +5002,157 @@ msgstr ""
 "n�o p�de renomear arquivo \"%s\" para \"%s\" (inicializa��o do arquivo de "
 "log %u, segmento %u): %m"
 
-#: access/transam/xlog.c:1936 access/transam/xlog.c:2038
-#: access/transam/xlog.c:5291
+#: access/transam/xlog.c:1937 access/transam/xlog.c:2039
+#: access/transam/xlog.c:5315
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "n�o p�de executar stat no arquivo \"%s\": %m"
 
-#: access/transam/xlog.c:1944 access/transam/xlog.c:5453
-#: access/transam/xlog.c:5607 postmaster/postmaster.c:3504
+#: access/transam/xlog.c:1945 access/transam/xlog.c:5477
+#: access/transam/xlog.c:5631 postmaster/postmaster.c:3504
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "n�o p�de remover arquivo \"%s\": %m"
 
-#: access/transam/xlog.c:2019
+#: access/transam/xlog.c:2020
 #, c-format
 msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
 msgstr "arquivo do arquivador \"%s\" tem tamanho errado: %lu ao inv�s de %lu"
 
-#: access/transam/xlog.c:2026
+#: access/transam/xlog.c:2027
 #, c-format
 msgid "restored log file \"%s\" from archive"
 msgstr "arquivo de log restaurado \"%s\" do arquivador"
 
-#: access/transam/xlog.c:2051
+#: access/transam/xlog.c:2052
 #, c-format
 msgid "could not restore \"%s\" from archive: return code %d"
 msgstr "n�o p�de restaurar \"%s\" do arquivador: c�digo retornado %d"
 
-#: access/transam/xlog.c:2111
+#: access/transam/xlog.c:2120
 #, c-format
 msgid "could not open transaction log directory \"%s\": %m"
 msgstr "n�o p�de abrir diret�rio do log de transa��o \"%s\": %m"
 
-#: access/transam/xlog.c:2156
+#: access/transam/xlog.c:2165
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr "arquivo do log de transa��o \"%s\" reciclado"
 
-#: access/transam/xlog.c:2163
+#: access/transam/xlog.c:2173
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "removendo arquivo do log de transa��o \"%s\""
 
-#: access/transam/xlog.c:2185
+#: access/transam/xlog.c:2196
 #, c-format
 msgid "could not read transaction log directory \"%s\": %m"
 msgstr "n�o p�de ler diret�rio do log de transa��o \"%s\": %m"
 
-#: access/transam/xlog.c:2269
+#: access/transam/xlog.c:2280
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 "soma de verifica��o de dados do gerenciador de recursos est� incorreta no "
 "registro em %X/%Xincorreta"
 
-#: access/transam/xlog.c:2292
+#: access/transam/xlog.c:2303
 #, c-format
 msgid "incorrect checksum of backup block %d in record at %X/%X"
 msgstr ""
 "soma de verifica��o do bloco de c�pia de seguran�a %d est� incorreta no "
 "registro em %X/%X"
 
-#: access/transam/xlog.c:2365 access/transam/xlog.c:2435
+#: access/transam/xlog.c:2376 access/transam/xlog.c:2446
 #, c-format
 msgid "invalid record offset at %X/%X"
 msgstr "deslocamento de registro inv�lido em %X/%X"
 
-#: access/transam/xlog.c:2413
+#: access/transam/xlog.c:2424
 #, c-format
 msgid "could not read from log file %u, segment %u at offset %u: %m"
 msgstr "n�o p�de ler do arquivo de log %u, segmento %u deslocamento %u: %m"
 
-#: access/transam/xlog.c:2443
+#: access/transam/xlog.c:2454
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr "contrecord � solicitado por %X/%X"
 
-#: access/transam/xlog.c:2458
+#: access/transam/xlog.c:2469
 #, c-format
 msgid "record with zero length at %X/%X"
 msgstr "registro com comprimento zero em %X/%X"
 
-#: access/transam/xlog.c:2465
+#: access/transam/xlog.c:2476
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "ID do gerenciador de recursos %u � inv�lido em %X/%X"
 
-#: access/transam/xlog.c:2503
+#: access/transam/xlog.c:2514
 #, c-format
 msgid "record length %u at %X/%X too long"
 msgstr "comprimento do registro %u em %X/%X � muito longo"
 
-#: access/transam/xlog.c:2539
+#: access/transam/xlog.c:2550
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u: %m"
 msgstr "n�o p�de ler do arquivo de log %u, segmento %u, deslocamento %u: %m"
 
-#: access/transam/xlog.c:2548
+#: access/transam/xlog.c:2559
 #, c-format
 msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 "n�o h� marca��o em contrecord no arquivo de log %u, segmento %u, "
 "deslocamento %u"
 
-#: access/transam/xlog.c:2558
+#: access/transam/xlog.c:2569
 #, c-format
 msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
 msgstr ""
 "tamanho de contrecord %u � inv�lido no arquivo de log %u, segmento %u, "
 "deslocamento %u"
 
-#: access/transam/xlog.c:2625
+#: access/transam/xlog.c:2636
 #, c-format
 msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 "n�mero m�gico %04X � invalido no arquivo de log %u, segmento %u, "
 "deslocamento %u"
 
-#: access/transam/xlog.c:2632
+#: access/transam/xlog.c:2643
 #, c-format
 msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 "bits de informa��o %04X inv�lidos no arquivo de log %u, segmento %u, "
 "deslocamento %u"
 
-#: access/transam/xlog.c:2654 access/transam/xlog.c:2662
+#: access/transam/xlog.c:2665 access/transam/xlog.c:2673
 msgid "WAL file is from different system"
 msgstr "arquivo WAL � de um sistema diferente"
 
-#: access/transam/xlog.c:2655
+#: access/transam/xlog.c:2666
 #, c-format
 msgid "WAL file SYSID is %s, pg_control SYSID is %s"
 msgstr "SYSID do arquivo WAL � %s, SYSID do pg_control � %s"
 
-#: access/transam/xlog.c:2663
+#: access/transam/xlog.c:2674
 msgid "Incorrect XLOG_SEG_SIZE in page header."
 msgstr "XLOG_SEG_SIZE incorreto no cabe�alho da p�gina."
 
-#: access/transam/xlog.c:2672
+#: access/transam/xlog.c:2683
 #, c-format
 msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
 "pageaddr %X/%X inesperado no arquivo de log %u, segmento %u, deslocalemto %u"
 
-#: access/transam/xlog.c:2684
+#: access/transam/xlog.c:2695
 #, c-format
 msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
 msgstr ""
 "ID de linha do tempo %u inesperado no arquivo de log %u, segmento %u, "
 "deslocalemto %u"
 
-#: access/transam/xlog.c:2702
+#: access/transam/xlog.c:2713
 #, c-format
 msgid ""
 "out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset "
@@ -5149,90 +5161,90 @@ msgstr ""
 "ID de linha do tempo %u fora de sequ�ncia (depois %u) no arquivo de log %u, "
 "segmento %u, deslocamento %u"
 
-#: access/transam/xlog.c:2771
+#: access/transam/xlog.c:2782
 #, c-format
 msgid "syntax error in history file: %s"
 msgstr "erro de sintaxe no arquivo de hist�rico: %s"
 
-#: access/transam/xlog.c:2772
+#: access/transam/xlog.c:2783
 msgid "Expected a numeric timeline ID."
 msgstr "Esperado um ID de linha do tempo num�rico."
 
-#: access/transam/xlog.c:2777
+#: access/transam/xlog.c:2788
 #, c-format
 msgid "invalid data in history file: %s"
 msgstr "dado inv�lido no arquivo de hist�rico: %s"
 
-#: access/transam/xlog.c:2778
+#: access/transam/xlog.c:2789
 msgid "Timeline IDs must be in increasing sequence."
 msgstr "IDs de linha do tempo devem ser uma sequ�ncia crescente."
 
-#: access/transam/xlog.c:2791
+#: access/transam/xlog.c:2802
 #, c-format
 msgid "invalid data in history file \"%s\""
 msgstr "dado inv�lido no arquivo de hist�rico \"%s\""
 
-#: access/transam/xlog.c:2792
+#: access/transam/xlog.c:2803
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr ""
 "IDs de linha do tempo devem ser menores do que ID de linha do tempo "
 "descendente."
 
-#: access/transam/xlog.c:3030
+#: access/transam/xlog.c:3041
 #, c-format
 msgid "could not link file \"%s\" to \"%s\": %m"
 msgstr "n�o p�de vincular arquivo \"%s\" a \"%s\": %m"
 
-#: access/transam/xlog.c:3037 access/transam/xlog.c:3819
-#: access/transam/xlog.c:3862 commands/user.c:282 commands/user.c:412
+#: access/transam/xlog.c:3048 access/transam/xlog.c:3830
+#: access/transam/xlog.c:3873 commands/user.c:282 commands/user.c:412
 #: postmaster/pgarch.c:597
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "n�o p�de renomear arquivo \"%s\" para \"%s\": %m"
 
-#: access/transam/xlog.c:3098
+#: access/transam/xlog.c:3109
 msgid "invalid LC_COLLATE setting"
 msgstr "valor do LC_COLLATE inv�lido"
 
-#: access/transam/xlog.c:3103
+#: access/transam/xlog.c:3114
 msgid "invalid LC_CTYPE setting"
 msgstr "valor do LC_CTYPE inv�lido"
 
-#: access/transam/xlog.c:3122
+#: access/transam/xlog.c:3133
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr "sizeof(ControlFileData) � maior do que BLCKSZ; conserte um deles"
 
-#: access/transam/xlog.c:3132
+#: access/transam/xlog.c:3143
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "n�o p�de criar arquivo de controle \"%s\": %m"
 
-#: access/transam/xlog.c:3143 access/transam/xlog.c:3330
+#: access/transam/xlog.c:3154 access/transam/xlog.c:3341
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "n�o p�de escrever em arquivo de controle: %m"
 
-#: access/transam/xlog.c:3149 access/transam/xlog.c:3336
+#: access/transam/xlog.c:3160 access/transam/xlog.c:3347
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "n�o p�de executar fsync no arquivo de controle: %m"
 
-#: access/transam/xlog.c:3154 access/transam/xlog.c:3341
+#: access/transam/xlog.c:3165 access/transam/xlog.c:3352
 #, c-format
 msgid "could not close control file: %m"
 msgstr "n�o p�de fechar arquivo de controle: %m"
 
-#: access/transam/xlog.c:3170 access/transam/xlog.c:3319
+#: access/transam/xlog.c:3181 access/transam/xlog.c:3330
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "n�o p�de abrir arquivo de controle \"%s\": %m"
 
-#: access/transam/xlog.c:3176
+#: access/transam/xlog.c:3187
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "n�o p�de ler do arquivo de controle: %m"
 
-#: access/transam/xlog.c:3189
+#: access/transam/xlog.c:3200
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d, but the "
@@ -5241,15 +5253,15 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com PG_CONTROL_VERSION %d, "
 "mas o servidor foi compilado com PG_CONTROL_VERSION %d."
 
-#: access/transam/xlog.c:3192 access/transam/xlog.c:3222
+#: access/transam/xlog.c:3203 access/transam/xlog.c:3233
 msgid "It looks like you need to initdb."
 msgstr "Parece que voc� precisa executar o initdb."
 
-#: access/transam/xlog.c:3202
+#: access/transam/xlog.c:3213
 msgid "incorrect checksum in control file"
 msgstr "soma de verifica��o incorreta em arquivo de controle"
 
-#: access/transam/xlog.c:3219
+#: access/transam/xlog.c:3230
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d, but the "
@@ -5258,7 +5270,7 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com CATALOG_VERSION_NO %d, "
 "mas o servidor foi compilado com CATALOG_VERSION_NO %d."
 
-#: access/transam/xlog.c:3226
+#: access/transam/xlog.c:3237
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d, but the server was "
@@ -5267,14 +5279,14 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com BLCSZ %d, mas o "
 "servidor foi compilado com BLCSZ %d."
 
-#: access/transam/xlog.c:3229 access/transam/xlog.c:3236
-#: access/transam/xlog.c:3243 access/transam/xlog.c:3250
-#: access/transam/xlog.c:3257 access/transam/xlog.c:3265
-#: access/transam/xlog.c:3272 access/transam/xlog.c:3281
+#: access/transam/xlog.c:3240 access/transam/xlog.c:3247
+#: access/transam/xlog.c:3254 access/transam/xlog.c:3261
+#: access/transam/xlog.c:3268 access/transam/xlog.c:3276
+#: access/transam/xlog.c:3283 access/transam/xlog.c:3292
 msgid "It looks like you need to recompile or initdb."
 msgstr "Parece que voc� precisa recompilar ou executar o initdb."
 
-#: access/transam/xlog.c:3233
+#: access/transam/xlog.c:3244
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d, but the server was "
@@ -5283,7 +5295,7 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com RELSEG_SIZE %d, mas o "
 "servidor foi compilado com RELSEG_SIZE %d."
 
-#: access/transam/xlog.c:3240
+#: access/transam/xlog.c:3251
 #, c-format
 msgid ""
 "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server "
@@ -5292,7 +5304,7 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com XLOG_SEG_SIZE %d, mas o "
 "servidor foi compilado com XLOG_SEG_SIZE %d."
 
-#: access/transam/xlog.c:3247
+#: access/transam/xlog.c:3258
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d, but the server was "
@@ -5301,7 +5313,7 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com NAMEDATALEN %d, mas o "
 "servidor foi compilado com NAMEDATALEN %d."
 
-#: access/transam/xlog.c:3254
+#: access/transam/xlog.c:3265
 #, c-format
 msgid ""
 "The database cluster was initialized with FUNC_MAX_ARGS %d, but the server "
@@ -5310,7 +5322,7 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com FUNC_MAX_ARGS %d, mas o "
 "servidor foi compilado com FUNC_MAX_ARGS %d."
 
-#: access/transam/xlog.c:3263
+#: access/transam/xlog.c:3274
 msgid ""
 "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the "
 "server was compiled with HAVE_INT64_TIMESTAMP."
@@ -5318,7 +5330,7 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado sem HAVE_INT64_TIMESTAMP "
 "mas o servidor foi compilado com HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:3270
+#: access/transam/xlog.c:3281
 msgid ""
 "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the "
 "server was compiled without HAVE_INT64_TIMESTAMP."
@@ -5326,7 +5338,7 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com HAVE_INT64_TIMESTAMP "
 "mas o servidor foi compilado sem HAVE_INT64_TIMESTAMP."
 
-#: access/transam/xlog.c:3278
+#: access/transam/xlog.c:3289
 #, c-format
 msgid ""
 "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the "
@@ -5335,11 +5347,11 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com LOCALE_NAME_BUFLEN %d, "
 "mas o servidor foi compilado com LOCALE_NAME_BUFLEN %d."
 
-#: access/transam/xlog.c:3284 access/transam/xlog.c:3291
+#: access/transam/xlog.c:3295 access/transam/xlog.c:3302
 msgid "database files are incompatible with operating system"
 msgstr "arquivos do banco de dados s�o incompat�veis com o sistema operacional"
 
-#: access/transam/xlog.c:3285
+#: access/transam/xlog.c:3296
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_COLLATE \"%s\", which is not "
@@ -5348,12 +5360,12 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com LC_COLLATE \"%s\", que "
 "n�o � reconhecido pelo setlocale()."
 
-#: access/transam/xlog.c:3288 access/transam/xlog.c:3295
+#: access/transam/xlog.c:3299 access/transam/xlog.c:3306
 msgid "It looks like you need to initdb or install locale support."
 msgstr ""
 "Parece que voc� precisa executar o initdb ou instalar o suporte a localidade."
 
-#: access/transam/xlog.c:3292
+#: access/transam/xlog.c:3303
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_CTYPE \"%s\", which is not "
@@ -5362,140 +5374,140 @@ msgstr ""
 "O agrupamento de banco de dados foi inicializado com LC_CTYPE \"%s\", que "
 "n�o � reconhecido pelo setlocale()."
 
-#: access/transam/xlog.c:3518
+#: access/transam/xlog.c:3529
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr "n�o p�de escrever no arquivo inicial de log de transa��o: %m"
 
-#: access/transam/xlog.c:3524
+#: access/transam/xlog.c:3535
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
 msgstr "n�o p�de executar fsync no arquivo inicial de log de transa��o: %m"
 
-#: access/transam/xlog.c:3529
+#: access/transam/xlog.c:3540
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr "n�o p�de fechar arquivo inicial de log de transa��o: %m"
 
-#: access/transam/xlog.c:3591
+#: access/transam/xlog.c:3602
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
 msgstr "n�o p�de abrir arquivo de comando de recupera��o \"%s\": %m"
 
-#: access/transam/xlog.c:3596
+#: access/transam/xlog.c:3607
 msgid "starting archive recovery"
 msgstr "iniciando recupera��o do arquivador"
 
-#: access/transam/xlog.c:3641
+#: access/transam/xlog.c:3652
 #, c-format
 msgid "restore_command = \"%s\""
 msgstr "restore_command = \"%s\""
 
-#: access/transam/xlog.c:3655
+#: access/transam/xlog.c:3666
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
 msgstr "recovery_target_timeline n�o � um n�mero v�lido: \"%s\""
 
-#: access/transam/xlog.c:3660
+#: access/transam/xlog.c:3671
 #, c-format
 msgid "recovery_target_timeline = %u"
 msgstr "recovery_target_timeline = %u"
 
-#: access/transam/xlog.c:3663
+#: access/transam/xlog.c:3674
 msgid "recovery_target_timeline = latest"
 msgstr "recovery_target_timeline = latest"
 
-#: access/transam/xlog.c:3671
+#: access/transam/xlog.c:3682
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
 msgstr "recovery_target_xid n�o � um n�mero v�lido: \"%s\""
 
-#: access/transam/xlog.c:3674
+#: access/transam/xlog.c:3685
 #, c-format
 msgid "recovery_target_xid = %u"
 msgstr "recovery_target_xid = %u"
 
-#: access/transam/xlog.c:3699
+#: access/transam/xlog.c:3710
 #, c-format
 msgid "recovery_target_time = %s"
 msgstr "recovery_target_time = %s"
 
-#: access/transam/xlog.c:3716
+#: access/transam/xlog.c:3727
 #, c-format
 msgid "recovery_target_inclusive = %s"
 msgstr "recovery_target_inclusive = %s"
 
-#: access/transam/xlog.c:3720
+#: access/transam/xlog.c:3731
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "par�metro de recupera��o desconhecido \"%s\""
 
-#: access/transam/xlog.c:3728
+#: access/transam/xlog.c:3739
 #, c-format
 msgid "syntax error in recovery command file: %s"
 msgstr "erro de sintaxe no arquivo de comando de recupera��o: %s"
 
-#: access/transam/xlog.c:3730
+#: access/transam/xlog.c:3741
 msgid "Lines should have the format parameter = 'value'."
 msgstr "Linhas devem ter o formato par�metro = 'valor'."
 
-#: access/transam/xlog.c:3735
+#: access/transam/xlog.c:3746
 #, c-format
 msgid "recovery command file \"%s\" did not specify restore_command"
 msgstr ""
 "arquivo de comando de recupera��o \"%s\" n�o especificou restore_command"
 
-#: access/transam/xlog.c:3754
+#: access/transam/xlog.c:3765
 #, c-format
 msgid "recovery_target_timeline %u does not exist"
 msgstr "recovery_target_timeline %u n�o existe"
 
-#: access/transam/xlog.c:3866
+#: access/transam/xlog.c:3877
 msgid "archive recovery complete"
 msgstr "recupera��o do archive est� completa"
 
-#: access/transam/xlog.c:3950
+#: access/transam/xlog.c:3961
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "recupera��o parada ap�s efetiva��o da transa��o %u, tempo %s"
 
-#: access/transam/xlog.c:3954
+#: access/transam/xlog.c:3965
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "recupera��o parada antes da efetiva��o da transa��o %u, tempo %s"
 
-#: access/transam/xlog.c:3961
+#: access/transam/xlog.c:3972
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "recupera��o parada ap�s interrup��o da transa��o %u, tempo %s"
 
-#: access/transam/xlog.c:3965
+#: access/transam/xlog.c:3976
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "recupera��o parada antes interrup��o da transa��o %u, tempo %s"
 
-#: access/transam/xlog.c:4007
+#: access/transam/xlog.c:4018
 msgid "control file contains invalid data"
 msgstr "arquivo de controle cont�m dados inv�lidos"
 
-#: access/transam/xlog.c:4011
+#: access/transam/xlog.c:4022
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "sistema de banco de dados foi desligado em %s"
 
-#: access/transam/xlog.c:4015
+#: access/transam/xlog.c:4026
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr "sistema de banco de dados foi interrompido em %s"
 
-#: access/transam/xlog.c:4019
+#: access/transam/xlog.c:4030
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr ""
 "sistema de banco de dados foi interrompido enquanto estava sendo recuperado "
 "em %s"
 
-#: access/transam/xlog.c:4021
+#: access/transam/xlog.c:4032
 msgid ""
 "This probably means that some data is corrupted and you will have to use the "
 "last backup for recovery."
@@ -5503,28 +5515,28 @@ msgstr ""
 "Isso provavelmente significa que algum dado foi corrompido e voc� ter� que "
 "utilizar o �ltimo backup para recupera��o."
 
-#: access/transam/xlog.c:4025
+#: access/transam/xlog.c:4036
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr "sistema de banco de dados foi interrompido em %s"
 
-#: access/transam/xlog.c:4057
+#: access/transam/xlog.c:4068
 #, c-format
 msgid "requested timeline %u is not a child of database system timeline %u"
 msgstr ""
 "linha de tempo solicitada %u n�o � descendente da linha de tempo %u do "
 "sistema de banco de dados"
 
-#: access/transam/xlog.c:4072 access/transam/xlog.c:4094
+#: access/transam/xlog.c:4083 access/transam/xlog.c:4105
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "registro de ponto de controle est� em %X/%X"
 
-#: access/transam/xlog.c:4079
+#: access/transam/xlog.c:4090
 msgid "could not locate required checkpoint record"
 msgstr "n�o p�de localizar registro de ponto de controle requerido"
 
-#: access/transam/xlog.c:4080
+#: access/transam/xlog.c:4091
 #, c-format
 msgid ""
 "If you are not restoring from a backup, try removing the file \"%s/"
@@ -5533,211 +5545,224 @@ msgstr ""
 "Se voc� n�o est� restaurando uma c�pia de seguran�a, tente remover o arquivo "
 "\"%s/backup_label\"."
 
-#: access/transam/xlog.c:4104
+#: access/transam/xlog.c:4115
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "utilizando registro de ponto de controle anterior em %X/%X"
 
-#: access/transam/xlog.c:4111
+#: access/transam/xlog.c:4122
 msgid "could not locate a valid checkpoint record"
 msgstr "n�o p�de localizar registro de ponto de controle v�lido"
 
-#: access/transam/xlog.c:4120
+#: access/transam/xlog.c:4131
 #, c-format
 msgid "redo record is at %X/%X; undo record is at %X/%X; shutdown %s"
 msgstr ""
 "registro de redo est� em %X/%X; registro de undo est� em %X/%X; desligamento "
 "%s"
 
-#: access/transam/xlog.c:4125
+#: access/transam/xlog.c:4136
 #, c-format
 msgid "next transaction ID: %u; next OID: %u"
 msgstr "pr�ximo ID de transa��o: %u; pr�ximo OID: %u"
 
-#: access/transam/xlog.c:4129
+#: access/transam/xlog.c:4140
 msgid "invalid next transaction ID"
 msgstr "pr�ximo ID de transa��o inv�lido"
 
-#: access/transam/xlog.c:4146
+#: access/transam/xlog.c:4157
 msgid "invalid redo in checkpoint record"
 msgstr "redo � inv�lido no registro de ponto de controle"
 
-#: access/transam/xlog.c:4160
+#: access/transam/xlog.c:4171
 msgid "invalid redo/undo record in shutdown checkpoint"
 msgstr "registro de redo/undo � inv�lido no ponto de controle de desligamento"
 
-#: access/transam/xlog.c:4178
+#: access/transam/xlog.c:4189
 msgid "automatic recovery in progress"
 msgstr "recupera��o autom�tica em progresso"
 
-#: access/transam/xlog.c:4181
+#: access/transam/xlog.c:4192
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 "sistema de banco de dados n�o foi desligado corretamente; recupera��o "
 "autom�tica em progresso"
 
-#: access/transam/xlog.c:4218
+#: access/transam/xlog.c:4229
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "redo inicia em %X/%X"
 
-#: access/transam/xlog.c:4276
+#: access/transam/xlog.c:4287
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "redo pronto em %X/%X"
 
-#: access/transam/xlog.c:4284
+#: access/transam/xlog.c:4295
 msgid "redo is not required"
 msgstr "redo n�o � requerido"
 
-#: access/transam/xlog.c:4304
+#: access/transam/xlog.c:4315
 msgid "requested recovery stop point is before end time of backup dump"
 msgstr ""
 "ponto de parada de recupera��o solicitada est� antes do tempo final da c�pia "
 "de seguran�a"
 
-#: access/transam/xlog.c:4308
+#: access/transam/xlog.c:4319
 msgid "WAL ends before end time of backup dump"
 msgstr "WAL acabou antes do tempo final da c�pia de seguran�a"
 
-#: access/transam/xlog.c:4323
+#: access/transam/xlog.c:4334
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr "novo ID de linha de tempo selecionado: %u"
 
-#: access/transam/xlog.c:4405
+#: access/transam/xlog.c:4416
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr "undo inicia em %X/%X"
 
-#: access/transam/xlog.c:4416
+#: access/transam/xlog.c:4427
 #, c-format
 msgid "undo done at %X/%X"
 msgstr "undo pronto em %X/%X"
 
-#: access/transam/xlog.c:4421
+#: access/transam/xlog.c:4432
 msgid "undo is not required"
 msgstr "undo n�o � requerido"
 
-#: access/transam/xlog.c:4489
+#: access/transam/xlog.c:4500
 msgid "database system is ready"
 msgstr "sistema de banco de dados est� pronto"
 
-#: access/transam/xlog.c:4528
+#: access/transam/xlog.c:4539
 msgid "invalid primary checkpoint link in control file"
 msgstr "v�nculo de ponto de controle prim�rio inv�lido no arquivo de controle"
 
-#: access/transam/xlog.c:4532
+#: access/transam/xlog.c:4543
 msgid "invalid secondary checkpoint link in control file"
 msgstr ""
 "v�nculo de ponto de controle secund�rio inv�lido no arquivo de controle"
 
-#: access/transam/xlog.c:4536
+#: access/transam/xlog.c:4547
 msgid "invalid checkpoint link in backup_label file"
 msgstr "v�nculo de ponto de controle inv�lido no arquivo backup_label"
 
-#: access/transam/xlog.c:4550
+#: access/transam/xlog.c:4561
 msgid "invalid primary checkpoint record"
 msgstr "registro de ponto de controle prim�rio inv�lido"
 
-#: access/transam/xlog.c:4554
+#: access/transam/xlog.c:4565
 msgid "invalid secondary checkpoint record"
 msgstr "registro de ponto de controle secund�rio inv�lido"
 
-#: access/transam/xlog.c:4558
+#: access/transam/xlog.c:4569
 msgid "invalid checkpoint record"
 msgstr "registro de ponto de controle inv�lido"
 
-#: access/transam/xlog.c:4569
+#: access/transam/xlog.c:4580
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr ""
 "ID do gerenciador de recursos inv�lido no registro de ponto de controle "
 "prim�rio"
 
-#: access/transam/xlog.c:4573
+#: access/transam/xlog.c:4584
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr ""
 "ID do gerenciador de recursos inv�lido no registro de ponto de controle "
 "secund�rio"
 
-#: access/transam/xlog.c:4577
+#: access/transam/xlog.c:4588
 msgid "invalid resource manager ID in checkpoint record"
 msgstr ""
 "ID do gerenciador de recursos inv�lido no registro de ponto de controle"
 
-#: access/transam/xlog.c:4589
+#: access/transam/xlog.c:4600
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "xl_info inv�lido no registro de ponto de controle prim�rio"
 
-#: access/transam/xlog.c:4593
+#: access/transam/xlog.c:4604
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "xl_info inv�lido no registro de ponto de controle secund�rio"
 
-#: access/transam/xlog.c:4597
+#: access/transam/xlog.c:4608
 msgid "invalid xl_info in checkpoint record"
 msgstr "xl_info inv�lido no registro de ponto de contrle"
 
-#: access/transam/xlog.c:4608
+#: access/transam/xlog.c:4619
 msgid "invalid length of primary checkpoint record"
 msgstr "comprimento do registro de ponto de controle prim�rio inv�lido"
 
-#: access/transam/xlog.c:4612
+#: access/transam/xlog.c:4623
 msgid "invalid length of secondary checkpoint record"
 msgstr "comprimento do registro de ponto de controle secund�rio inv�lido"
 
-#: access/transam/xlog.c:4616
+#: access/transam/xlog.c:4627
 msgid "invalid length of checkpoint record"
 msgstr "comprimento do registro de ponto de controle inv�lido"
 
-#: access/transam/xlog.c:4669
+#: access/transam/xlog.c:4680
 msgid "shutting down"
 msgstr "desligando"
 
-#: access/transam/xlog.c:4678
+#: access/transam/xlog.c:4689
 msgid "database system is shut down"
 msgstr "sistema de banco de dados est� desligado"
 
-#: access/transam/xlog.c:4891
+#: access/transam/xlog.c:4880
+msgid "checkpoint starting"
+msgstr "iniciando ponto de controle"
+
+#: access/transam/xlog.c:4909
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 "atividade concorrente no log de transa��o enquanto o sistema de banco de "
 "dados est� sendo desligado"
 
-#: access/transam/xlog.c:5017
+#: access/transam/xlog.c:4981
+#, c-format
+msgid ""
+"checkpoint complete; %d transaction log file(s) added, %d removed, %d "
+"recycled"
+msgstr ""
+"ponto de controle completo; %d arquivo(s) de log de transa��o adicionado(s), "
+"%d removido(s), %d reciclado(s)"
+
+#: access/transam/xlog.c:5041
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr ""
 "ID de linha de tempo %u inesperado (depois %u) no registro de ponto de "
 "controle"
 
-#: access/transam/xlog.c:5040
+#: access/transam/xlog.c:5064
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr ""
 "ID de linha de tempo %u inesperado (deve ser %u) no registro de ponto de "
 "controle"
 
-#: access/transam/xlog.c:5161 access/transam/xlog.c:5193
+#: access/transam/xlog.c:5185 access/transam/xlog.c:5217
 #, c-format
 msgid "could not fsync log file %u, segment %u: %m"
 msgstr "n�o p�de executar fsync no arquivo de log %u, segmento %u: %m"
 
-#: access/transam/xlog.c:5201
+#: access/transam/xlog.c:5225
 #, c-format
 msgid "could not fdatasync log file %u, segment %u: %m"
 msgstr "n�o p�de executar fdatasync no arquivo de log %u, segmento %u: %m"
 
-#: access/transam/xlog.c:5244 access/transam/xlog.c:5363
+#: access/transam/xlog.c:5268 access/transam/xlog.c:5387
 msgid "must be superuser to run a backup"
 msgstr "deve ser super-usu�rio para fazer uma c�pia de seguran�a"
 
-#: access/transam/xlog.c:5297
+#: access/transam/xlog.c:5321
 msgid "a backup is already in progress"
 msgstr "uma c�pia de seguran�a est� em progresso"
 
-#: access/transam/xlog.c:5298
+#: access/transam/xlog.c:5322
 #, c-format
 msgid ""
 "If you're sure there is no backup in progress, remove file \"%s\" and try "
@@ -5746,18 +5771,18 @@ msgstr ""
 "Se voc� tem certeza que n�o h� c�pia de seguran�a em progresso, remova o "
 "arquivo \"%s\" e tente novamente."
 
-#: access/transam/xlog.c:5319 access/transam/xlog.c:5439
+#: access/transam/xlog.c:5343 access/transam/xlog.c:5463
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "n�o p�de escrever no arquivo \"%s\": %m"
 
-#: access/transam/xlog.c:5401
+#: access/transam/xlog.c:5425
 msgid "a backup is not in progress"
 msgstr "n�o h� uma c�pia de seguran�a em progresso"
 
-#: access/transam/xlog.c:5414 access/transam/xlog.c:5535
-#: access/transam/xlog.c:5541 access/transam/xlog.c:5572
-#: access/transam/xlog.c:5578
+#: access/transam/xlog.c:5438 access/transam/xlog.c:5559
+#: access/transam/xlog.c:5565 access/transam/xlog.c:5596
+#: access/transam/xlog.c:5602
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "dados inv�lidos no arquivo \"%s\""
@@ -5791,7 +5816,7 @@ msgid "sorry, too many clients already"
 msgstr "desculpe, muitos clientes conectados"
 
 #: storage/ipc/shmem.c:185 storage/ipc/shmem.c:246 storage/ipc/shmem.c:386
-#: storage/lmgr/lock.c:561 storage/lmgr/lock.c:624 storage/lmgr/proc.c:179
+#: storage/lmgr/lock.c:558 storage/lmgr/lock.c:621 storage/lmgr/proc.c:179
 #: storage/buffer/buf_table.c:93 storage/freespace/freespace.c:1014
 msgid "out of shared memory"
 msgstr "sem mem�ria compartilhada"
@@ -5817,7 +5842,7 @@ msgstr "Sistema permite %d, n�s precisamos pelo menos de %d."
 msgid "out of file descriptors: %m; release and retry"
 msgstr "sem descritores de arquivo: %m; libere ou tente novamente"
 
-#: storage/lmgr/lock.c:562 storage/lmgr/lock.c:625
+#: storage/lmgr/lock.c:559 storage/lmgr/lock.c:622
 msgid "You may need to increase max_locks_per_transaction."
 msgstr "Voc� precisa aumentar max_locks_per_transaction."
 
@@ -5860,17 +5885,17 @@ msgstr "tamanhos de itens corrompidos: total %u, espa�o livre %u"
 msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr "ponteiro de item corrompido: deslocamento = %u, tamanho = %u"
 
-#: storage/smgr/md.c:367
+#: storage/smgr/md.c:363
 #, c-format
 msgid "could not open relation %u/%u/%u: %m"
 msgstr "n�o p�de abrir rela��o %u/%u/%u: %m"
 
-#: storage/smgr/md.c:769
+#: storage/smgr/md.c:765
 #, c-format
 msgid "could not fsync segment %u of relation %u/%u/%u: %m"
 msgstr "n�o p�de executar fsync no segmento %u da rela��o %u/%u/%u: %m"
 
-#: storage/smgr/md.c:959
+#: storage/smgr/md.c:955
 #, c-format
 msgid "could not open segment %u of relation %u/%u/%u (target block %u): %m"
 msgstr "n�o p�de abrir segmento %u da rela��o %u/%u/%u (bloco alvo %u): %m"
@@ -6084,9 +6109,9 @@ msgid "could not unlink symbolic link \"%s\": %m"
 msgstr "n�o p�de remover link simb�lico \"%s\": %m"
 
 #: commands/tablespace.c:913 commands/functioncmds.c:773
-#: commands/dbcommands.c:866 commands/conversioncmds.c:213
+#: commands/dbcommands.c:875 commands/conversioncmds.c:213
 #: commands/typecmds.c:2103 commands/opclasscmds.c:954
-#: commands/operatorcmds.c:303 commands/tablecmds.c:5181
+#: commands/operatorcmds.c:303 commands/tablecmds.c:5200
 #: commands/aggregatecmds.c:335 commands/schemacmds.c:348
 msgid "must be superuser to change owner"
 msgstr "deve ser super-usu�rio para mudar dono"
@@ -6218,12 +6243,12 @@ msgstr "n�o p�de serializar acesso devido a uma atualiza��o concorrente"
 msgid "unnamed constraints cannot be set explicitly"
 msgstr "restri��es n�o-nomeadas n�o podem ser definidas explicitamente"
 
-#: commands/trigger.c:2741
+#: commands/trigger.c:2747
 #, c-format
 msgid "constraint \"%s\" is not deferrable"
 msgstr "restri��o \"%s\" n�o � posterg�vel"
 
-#: commands/trigger.c:2756 commands/tablecmds.c:4534
+#: commands/trigger.c:2762 commands/tablecmds.c:4546
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "restri��o \"%s\" n�o existe"
@@ -6365,9 +6390,9 @@ msgstr "fun��es n�o podem aceitar conjunto de argumentos"
 
 #: commands/functioncmds.c:228 commands/functioncmds.c:236
 #: commands/functioncmds.c:244 commands/functioncmds.c:252
-#: commands/functioncmds.c:260 commands/dbcommands.c:107
-#: commands/dbcommands.c:115 commands/dbcommands.c:123
-#: commands/dbcommands.c:131 commands/copy.c:720 commands/copy.c:728
+#: commands/functioncmds.c:260 commands/dbcommands.c:108
+#: commands/dbcommands.c:116 commands/dbcommands.c:124
+#: commands/dbcommands.c:132 commands/copy.c:720 commands/copy.c:728
 #: commands/copy.c:736 commands/copy.c:744 commands/copy.c:752
 #: commands/copy.c:760 commands/copy.c:768 commands/copy.c:776
 #: commands/copy.c:784 commands/user.c:576 commands/user.c:588
@@ -6504,64 +6529,64 @@ msgstr "tipo de dados fonte e tipo de dados alvo s�o o mesmo"
 msgid "cast from type %s to type %s already exists"
 msgstr "convers�o do tipo %s para tipo %s j� existe"
 
-#: commands/dbcommands.c:138
+#: commands/dbcommands.c:139
 msgid "LOCATION is not supported anymore"
 msgstr "LOCATION n�o � mais suportado"
 
-#: commands/dbcommands.c:139
+#: commands/dbcommands.c:140
 msgid "Consider using tablespaces instead."
 msgstr "Considere utilizar tablespaces."
 
-#: commands/dbcommands.c:162
+#: commands/dbcommands.c:163
 #, c-format
 msgid "%d is not a valid encoding code"
 msgstr "%d n�o � um c�digo de codifica��o v�lido"
 
-#: commands/dbcommands.c:171
+#: commands/dbcommands.c:172
 #, c-format
 msgid "%s is not a valid encoding name"
 msgstr "%s n�o � um nome de codifica��o v�lido"
 
-#: commands/dbcommands.c:192
+#: commands/dbcommands.c:193
 msgid "permission denied to create database"
 msgstr "permiss�o negada ao criar banco de dados"
 
-#: commands/dbcommands.c:201
+#: commands/dbcommands.c:202
 msgid "must be superuser to create database for another user"
 msgstr "deve ser super-usu�rio para criar banco de dados para outro usu�rio"
 
-#: commands/dbcommands.c:215 commands/dbcommands.c:457
-#: commands/dbcommands.c:706
+#: commands/dbcommands.c:216 commands/dbcommands.c:458
+#: commands/dbcommands.c:715
 #, c-format
 msgid "database \"%s\" already exists"
 msgstr "banco de dados \"%s\" j� existe"
 
-#: commands/dbcommands.c:228
+#: commands/dbcommands.c:229
 #, c-format
 msgid "template database \"%s\" does not exist"
 msgstr "banco de dados modelo \"%s\" n�o existe"
 
-#: commands/dbcommands.c:239
+#: commands/dbcommands.c:240
 #, c-format
 msgid "permission denied to copy database \"%s\""
 msgstr "permiss�o negada ao copiar banco de dados \"%s\"'"
 
-#: commands/dbcommands.c:252
+#: commands/dbcommands.c:253
 #, c-format
 msgid "source database \"%s\" is being accessed by other users"
 msgstr "banco de dados fonte \"%s\" est� sendo acessado por outros usu�rios"
 
-#: commands/dbcommands.c:263
+#: commands/dbcommands.c:264
 #, c-format
 msgid "invalid server encoding %d"
 msgstr "codifica��o do servidor %d inv�lida"
 
-#: commands/dbcommands.c:309
+#: commands/dbcommands.c:310
 #, c-format
 msgid "cannot assign new default tablespace \"%s\""
 msgstr "n�o pode atribuir nova tablespace padr�o \"%s\""
 
-#: commands/dbcommands.c:311
+#: commands/dbcommands.c:312
 #, c-format
 msgid ""
 "There is a conflict because database \"%s\" already has some tables in this "
@@ -6570,50 +6595,50 @@ msgstr ""
 "H� um conflito porque o banco de dados \"%s\" j� tem algumas tabelas nesta "
 "tablespace."
 
-#: commands/dbcommands.c:381 commands/dbcommands.c:403
-#: commands/dbcommands.c:413 commands/dbcommands.c:1189
-#: commands/dbcommands.c:1197
+#: commands/dbcommands.c:382 commands/dbcommands.c:404
+#: commands/dbcommands.c:414 commands/dbcommands.c:1198
+#: commands/dbcommands.c:1206
 msgid "could not initialize database directory"
 msgstr "n�o p�de inicializar diret�rio do banco de dados"
 
-#: commands/dbcommands.c:382
+#: commands/dbcommands.c:383
 #, c-format
 msgid "Directory \"%s\" already exists."
 msgstr "Diret�rio \"%s\" j� existe."
 
-#: commands/dbcommands.c:404 commands/dbcommands.c:1190
+#: commands/dbcommands.c:405 commands/dbcommands.c:1199
 #, c-format
 msgid "Failing system command was: %s"
 msgstr "Comando do sistema que falhou foi: %s"
 
-#: commands/dbcommands.c:405 commands/dbcommands.c:1191
+#: commands/dbcommands.c:406 commands/dbcommands.c:1200
 msgid "Look in the postmaster's stderr log for more information."
 msgstr ""
 "Veja no log da sa�da de erro padr�o do postmaster para obter mais informa��o."
 
-#: commands/dbcommands.c:532
+#: commands/dbcommands.c:533
 msgid "cannot drop the currently open database"
 msgstr "n�o pode remover banco de dados que se encontra aberto"
 
-#: commands/dbcommands.c:563
+#: commands/dbcommands.c:564
 msgid "cannot drop a template database"
 msgstr "n�o pode remover banco de dados modelo"
 
-#: commands/dbcommands.c:571 commands/dbcommands.c:693
+#: commands/dbcommands.c:572 commands/dbcommands.c:702
 #, c-format
 msgid "database \"%s\" is being accessed by other users"
 msgstr "banco de dados \"%s\" est� sendo acessado por outros usu�rios"
 
-#: commands/dbcommands.c:684
+#: commands/dbcommands.c:693
 msgid "current database may not be renamed"
 msgstr "banco de dados atual n�o pode ser renomeado"
 
-#: commands/dbcommands.c:718
+#: commands/dbcommands.c:727
 msgid "permission denied to rename database"
 msgstr "permiss�o negada ao renomear banco de dados"
 
-#: commands/dbcommands.c:1026 commands/dbcommands.c:1163
-#: commands/dbcommands.c:1213
+#: commands/dbcommands.c:1035 commands/dbcommands.c:1172
+#: commands/dbcommands.c:1222
 #, c-format
 msgid "could not remove database directory \"%s\""
 msgstr "n�o p�de remover diret�rio do banco de dados \"%s\""
@@ -6641,16 +6666,16 @@ msgstr "nome de comando inv�lido: n�o deve ser vazio"
 msgid "utility statements cannot be prepared"
 msgstr "comandos utilit�rios n�o podem ser preparados"
 
-#: commands/prepare.c:168 commands/prepare.c:173 commands/prepare.c:538
+#: commands/prepare.c:168 commands/prepare.c:173 commands/prepare.c:535
 msgid "prepared statement is not a SELECT"
 msgstr "comando preparado n�o � um SELECT"
 
-#: commands/prepare.c:310
+#: commands/prepare.c:307
 #, c-format
 msgid "prepared statement \"%s\" already exists"
 msgstr "comando preparado \"%s\" j� existe"
 
-#: commands/prepare.c:390
+#: commands/prepare.c:387
 #, c-format
 msgid "prepared statement \"%s\" does not exist"
 msgstr "comando preparado \"%s\" n�o existe"
@@ -6917,7 +6942,7 @@ msgstr "tamanho de campo inv�lido"
 msgid "incorrect binary data format"
 msgstr "formato de dados bin�rio incorreto"
 
-#: commands/copy.c:2716 parser/parse_target.c:648 parser/parse_target.c:658
+#: commands/copy.c:2716 parser/parse_target.c:650 parser/parse_target.c:660
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "coluna \"%s\" especificada mais de uma vez"
@@ -6958,13 +6983,13 @@ msgstr ""
 msgid "\"%s\": removed %d row versions in %d pages"
 msgstr "\"%s\": %d vers�es de registro removidas em %d p�ginas"
 
-#: commands/vacuumlazy.c:591 commands/vacuumlazy.c:651 commands/vacuum.c:2859
+#: commands/vacuumlazy.c:596 commands/vacuumlazy.c:661 commands/vacuum.c:2859
 #: commands/vacuum.c:2926
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr "�ndice \"%s\" agora cont�m %.0f vers�es de registros em %u p�ginas"
 
-#: commands/vacuumlazy.c:595 commands/vacuum.c:2863
+#: commands/vacuumlazy.c:600 commands/vacuum.c:2863
 #, c-format
 msgid ""
 "%u index pages have been deleted, %u are currently reusable.\n"
@@ -6973,7 +6998,7 @@ msgstr ""
 "%u p�ginas de �ndices foram removidas, %u s�o reutiliz�veis.\n"
 "%s"
 
-#: commands/vacuumlazy.c:655 commands/vacuum.c:2930
+#: commands/vacuumlazy.c:665 commands/vacuum.c:2930
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -6984,7 +7009,7 @@ msgstr ""
 "%u p�ginas de �ndice foram removidas, %u s�o reutiliz�veis.\n"
 "%s"
 
-#: commands/vacuumlazy.c:761 commands/vacuum.c:2769
+#: commands/vacuumlazy.c:771 commands/vacuum.c:2769
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr "\"%s\": truncadas %u em %u p�ginas"
@@ -7295,7 +7320,7 @@ msgstr "procedimento de operador deve ser especificado"
 msgid "there is no previously clustered index for table \"%s\""
 msgstr "n�o h� nenhum �ndice previamente agrupado na tabela \"%s\""
 
-#: commands/cluster.c:147 commands/tablecmds.c:5330
+#: commands/cluster.c:147 commands/tablecmds.c:5349
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "�ndice \"%s\" na tabela \"%s\" n�o existe"
@@ -7600,7 +7625,7 @@ msgstr "tabelas podem ter no m�ximo %d colunas"
 
 #: commands/tablecmds.c:3083 commands/tablecmds.c:3176
 #: commands/tablecmds.c:3226 commands/tablecmds.c:3322
-#: commands/tablecmds.c:3383 commands/tablecmds.c:4577
+#: commands/tablecmds.c:3383 commands/tablecmds.c:4589
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "n�o pode alterar coluna do sistema \"%s\""
@@ -7610,7 +7635,7 @@ msgstr "n�o pode alterar coluna do sistema \"%s\""
 msgid "column \"%s\" is in a primary key"
 msgstr "coluna \"%s\" est� em uma chave prim�ria"
 
-#: commands/tablecmds.c:3269 commands/tablecmds.c:5369
+#: commands/tablecmds.c:3269 commands/tablecmds.c:5388
 #, c-format
 msgid "\"%s\" is not a table or index"
 msgstr "\"%s\" n�o � uma tabela ou �ndice"
@@ -7718,100 +7743,100 @@ msgstr ""
 "n�o h� restri��o de unicidade que corresponde com as colunas informadas na "
 "tabela referenciada \"%s\""
 
-#: commands/tablecmds.c:4539
+#: commands/tablecmds.c:4551
 #, c-format
 msgid "multiple constraints named \"%s\" were dropped"
 msgstr "restri��es m�ltiplas chamadas \"%s\" foram removidas"
 
-#: commands/tablecmds.c:4584
+#: commands/tablecmds.c:4596
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "n�o pode alterar coluna herdada \"%s\""
 
-#: commands/tablecmds.c:4624
+#: commands/tablecmds.c:4636
 msgid "transform expression must not return a set"
 msgstr "express�o de transforma��o n�o deve retornar um conjunto"
 
-#: commands/tablecmds.c:4630
+#: commands/tablecmds.c:4642
 msgid "cannot use subquery in transform expression"
 msgstr "n�o pode utilizar subconsulta em express�o de transforma��o"
 
-#: commands/tablecmds.c:4634
+#: commands/tablecmds.c:4646
 msgid "cannot use aggregate function in transform expression"
 msgstr "n�o pode utilizar fun��o de agrega��o em express�o de transforma��o"
 
-#: commands/tablecmds.c:4651
+#: commands/tablecmds.c:4663
 #, c-format
 msgid "column \"%s\" cannot be cast to type \"%s\""
 msgstr "coluna \"%s\" n�o pode ser convertida para tipo \"%s\""
 
-#: commands/tablecmds.c:4677
+#: commands/tablecmds.c:4689
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr ""
 "tipo de coluna herdada \"%s\" deve ser alterado nas tabelas descendentes "
 "tamb�m"
 
-#: commands/tablecmds.c:4715
+#: commands/tablecmds.c:4727
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "n�o pode alterar tipo de coluna \"%s\" duas vezes"
 
-#: commands/tablecmds.c:4742
+#: commands/tablecmds.c:4761
 #, c-format
 msgid "default for column \"%s\" cannot be cast to type \"%s\""
 msgstr ""
 "valor padr�o para coluna \"%s\" n�o pode ser convertido para tipo \"%s\""
 
-#: commands/tablecmds.c:4842
+#: commands/tablecmds.c:4861
 msgid "cannot alter type of a column used by a view or rule"
 msgstr "n�o pode alterar tipo de uma coluna utilizada por uma vis�o ou regra"
 
-#: commands/tablecmds.c:4843
+#: commands/tablecmds.c:4862
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s depende da coluna \"%s\""
 
-#: commands/tablecmds.c:5159
+#: commands/tablecmds.c:5178
 #, c-format
 msgid "\"%s\" is not a table, TOAST table, index, view, or sequence"
 msgstr "\"%s\" n�o � uma tabela, tabela TOAST, �ndice, vis�o ou sequ�ncia"
 
-#: commands/tablecmds.c:5399
+#: commands/tablecmds.c:5418
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr "n�o pode ter m�ltiplos subcomandos SET TABLESPACE"
 
-#: commands/tablecmds.c:5429
+#: commands/tablecmds.c:5448
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "n�o pode mover rela��o do sistema \"%s\""
 
-#: commands/tablecmds.c:5439
+#: commands/tablecmds.c:5458
 msgid "cannot move temporary tables of other sessions"
 msgstr "n�o pode mover tabelas tempor�rias de outras sess�es"
 
-#: commands/tablecmds.c:5649
+#: commands/tablecmds.c:5668
 msgid "shared tables cannot be toasted after initdb"
 msgstr ""
 "n�o se pode criar tabelas toast a partir de tabelas compartilhadas depois da "
 "execu��o do initdb"
 
-#: commands/tablecmds.c:5664
+#: commands/tablecmds.c:5683
 #, c-format
 msgid "table \"%s\" already has a TOAST table"
 msgstr "tabela \"%s\" j� tem uma tabela TOAST"
 
-#: commands/tablecmds.c:5681
+#: commands/tablecmds.c:5700
 #, c-format
 msgid "table \"%s\" does not need a TOAST table"
 msgstr "tabela \"%s\" n�o precisa de uma tabela TOAST"
 
-#: commands/tablecmds.c:5900 catalog/aclchk.c:1761 catalog/aclchk.c:2039
+#: commands/tablecmds.c:5919 catalog/aclchk.c:1761 catalog/aclchk.c:2039
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "tablespace com OID %u n�o existe"
 
-#: commands/tablecmds.c:5902
+#: commands/tablecmds.c:5921
 #, c-format
 msgid "The default tablespace for schema \"%s\" has been dropped."
 msgstr "A tablespace padr�o para o esquema \"%s\" foi removida."
@@ -7836,7 +7861,7 @@ msgstr ""
 msgid "analyzing \"%s.%s\""
 msgstr "analisando \"%s.%s\""
 
-#: commands/analyze.c:916
+#: commands/analyze.c:914
 #, c-format
 msgid ""
 "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead "
@@ -8431,38 +8456,34 @@ msgstr ""
 "uma lista de defini��o de colunas � requerida para fun��es que retornam "
 "\"record\""
 
-#: parser/parse_relation.c:1052
+#: parser/parse_relation.c:1047
 #, c-format
 msgid "too many column aliases specified for function %s"
 msgstr "muitos aliases de coluna especificados para fun��o %s"
 
-#: parser/parse_relation.c:1076
+#: parser/parse_relation.c:1071
 #, c-format
-msgid "function \"%s\" in FROM has unsupported return type"
-msgstr "fun��o \"%s\" no FROM tem tipo de retorno n�o suportado"
+msgid "function \"%s\" in FROM has unsupported return type %s"
+msgstr "fun��o \"%s\" no FROM tem tipo de retorno n�o suportado %s"
 
-#: parser/parse_relation.c:1394 parser/parse_relation.c:1730
-msgid "function in FROM has unsupported return type"
-msgstr "fun��o no FROM tem tipo de retorno n�o suportado"
-
-#: parser/parse_relation.c:2009
+#: parser/parse_relation.c:2003
 #, c-format
 msgid "missing FROM-clause entry in subquery for table \"%s\""
 msgstr "faltando entrada para tabela \"%s\" na cl�usula FROM da subconsulta"
 
-#: parser/parse_relation.c:2014
+#: parser/parse_relation.c:2008
 #, c-format
 msgid "missing FROM-clause entry for table \"%s\""
 msgstr "faltando entrada para tabela \"%s\" na cl�usula FROM"
 
-#: parser/parse_relation.c:2033
+#: parser/parse_relation.c:2027
 #, c-format
 msgid "adding missing FROM-clause entry in subquery for table \"%s\""
 msgstr ""
 "adicionando entrada para tabela \"%s\" que faltava na cl�usula FROM da "
 "subconsulta"
 
-#: parser/parse_relation.c:2038
+#: parser/parse_relation.c:2032
 #, c-format
 msgid "adding missing FROM-clause entry for table \"%s\""
 msgstr "adicionando entrada para tabela \"%s\" que faltava na cl�usula FROM"
@@ -8598,7 +8619,7 @@ msgstr "CREATE ASSERTION n�o foi implementado"
 msgid "DROP ASSERTION is not yet implemented"
 msgstr "DROP ASSERTION n�o foi implementado"
 
-#: gram.y:2516 gram.y:7422 parser/parse_expr.c:1183 parser/parse_target.c:734
+#: gram.y:2516 gram.y:7422 parser/parse_expr.c:1183 parser/parse_target.c:736
 #: catalog/namespace.c:1201
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
@@ -9058,7 +9079,7 @@ msgstr "operador %s n�o deve retornar um conjunto"
 msgid "subquery has too few columns"
 msgstr "subconsulta tem poucas colunas"
 
-#: parser/parse_expr.c:1157 parser/parse_target.c:725 catalog/namespace.c:1195
+#: parser/parse_expr.c:1157 parser/parse_target.c:727 catalog/namespace.c:1195
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr "refer�ncias cruzadas entre bancos de dados n�o est� implementada: %s"
@@ -9121,7 +9142,7 @@ msgstr "agrega��es n�o podem retornar conjuntos"
 msgid "column %s.%s does not exist"
 msgstr "coluna %s.%s n�o existe"
 
-#: parser/parse_func.c:1219 parser/parse_target.c:496
+#: parser/parse_func.c:1219
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr "coluna \"%s\" n�o foi encontrado no tipo de dados %s"
@@ -9213,7 +9234,7 @@ msgstr "op ANY/ALL (array) requer operador que retorna booleano"
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr "op ANY/ALL (array) requer operador que n�o retorne um conjunto"
 
-#: parser/parse_target.c:268 parser/parse_target.c:501
+#: parser/parse_target.c:268 parser/parse_target.c:503
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr "n�o pode atribuir a coluna do sistema \"%s\""
@@ -9233,23 +9254,35 @@ msgstr "coluna \"%s\" � do tipo %s mas express�o � do tipo %s"
 
 #: parser/parse_target.c:489
 #, c-format
-msgid "cannot assign to a column of type %s because it is not a composite type"
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a "
+"composite type"
 msgstr ""
-"n�o pode atribuir a coluna do tipo %s porque ele n�o � um tipo composto"
+"n�o pode atribuir ao campo \"%s\" da coluna \"%s\" porque seu tipo %s n�o � "
+"um tipo composto"
 
-#: parser/parse_target.c:565
+#: parser/parse_target.c:497
+#, c-format
+msgid ""
+"cannot assign to field \"%s\" of column \"%s\" because there is no such "
+"column in data type %s"
+msgstr ""
+"n�o pode atribuir ao campo \"%s\" da coluna \"%s\" porque n�o h� tal coluna "
+"no tipo de dado %s"
+
+#: parser/parse_target.c:567
 #, c-format
 msgid ""
 "array assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr ""
 "atribui��o de matriz para \"%s\" requer tipo %s mas express�o � do tipo %s"
 
-#: parser/parse_target.c:574
+#: parser/parse_target.c:576
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr "subcampo \"%s\" � do tipo %s mas express�o � do tipo %s"
 
-#: parser/parse_target.c:803
+#: parser/parse_target.c:805
 msgid "SELECT * with no tables specified is not valid"
 msgstr "SELECT * sem tabelas especificadas n�o � v�lido"
 
@@ -9311,7 +9344,7 @@ msgstr ""
 msgid "SELECT FOR UPDATE is not allowed in subqueries"
 msgstr "SELECT FOR UPDATE n�o � permitido em subconsultas"
 
-#: optimizer/util/clauses.c:2296
+#: optimizer/util/clauses.c:2331
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr "fun��o SQL \"%s\" durante expans�o em-linha"
@@ -10591,177 +10624,174 @@ msgstr "n�o p�de ler do arquivo de vari�veis do servidor \"%s\": %m"
 msgid "could not wait on child process handle: %d\n"
 msgstr "n�o p�de esperar manipula��o de processo filho: %d\n"
 
-#: postmaster/pgstat.c:257
+#: postmaster/pgstat.c:258
 #, c-format
 msgid "could not resolve \"localhost\": %s"
 msgstr "n�o p�de resolver \"localhost\": %s"
 
-#: postmaster/pgstat.c:285
+#: postmaster/pgstat.c:286
 #, c-format
 msgid "could not create socket for statistics collector: %m"
 msgstr "n�o p�de criar soquete para coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:297
+#: postmaster/pgstat.c:298
 #, c-format
 msgid "could not bind socket for statistics collector: %m"
 msgstr "n�o p�de se ligar ao soquete do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:308
+#: postmaster/pgstat.c:309
 #, c-format
 msgid "could not get address of socket for statistics collector: %m"
 msgstr "n�o p�de pegar endere�o do soquete do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:324
+#: postmaster/pgstat.c:325
 #, c-format
 msgid "could not connect socket for statistics collector: %m"
 msgstr "n�o p�de se conectar ao soquete do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:341
+#: postmaster/pgstat.c:342
 #, c-format
 msgid "could not send test message on socket for statistics collector: %m"
 msgstr ""
 "n�o p�de enviar mensagem de teste ao soquete do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:366 postmaster/pgstat.c:1610
+#: postmaster/pgstat.c:367 postmaster/pgstat.c:1566
 #, c-format
 msgid "select() failed in statistics collector: %m"
 msgstr "select() falhou no coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:381
+#: postmaster/pgstat.c:382
 msgid "test message did not get through on socket for statistics collector"
 msgstr ""
 "mensagem teste n�o foi recebida pelo soquete do coletor de estat�sticas"
 
-#: postmaster/pgstat.c:393
+#: postmaster/pgstat.c:394
 #, c-format
 msgid "could not receive test message on socket for statistics collector: %m"
 msgstr ""
 "n�o p�de receber mensagem teste no soquete do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:403
+#: postmaster/pgstat.c:404
 msgid "incorrect test message transmission on socket for statistics collector"
 msgstr ""
 "transmiss�o de mensagem teste incorreta no soquete do coletor de estat�sticas"
 
-#: postmaster/pgstat.c:418
+#: postmaster/pgstat.c:419
 msgid "disabling statistics collector for lack of working socket"
 msgstr ""
 "desabilitando coletor de estat�sticas por falta de um soquete que funcione"
 
-#: postmaster/pgstat.c:432
+#: postmaster/pgstat.c:433
 #, c-format
 msgid "could not set statistics collector socket to nonblocking mode: %m"
 msgstr ""
 "n�o p�de definir soquete do coletor de estat�sticas para modo n�o-bloqueado: "
 "%m"
 
-#: postmaster/pgstat.c:571
+#: postmaster/pgstat.c:572
 msgid "statistics collector startup skipped"
 msgstr "inicializa��o do coletor de estat�sticas foi omitida"
 
-#: postmaster/pgstat.c:605
+#: postmaster/pgstat.c:606
 #, c-format
 msgid "could not fork statistics buffer: %m"
 msgstr "n�o p�de criar processo para buffer de estat�sticas: %m"
 
-#: postmaster/pgstat.c:963
+#: postmaster/pgstat.c:964
 msgid "must be superuser to reset statistics counters"
 msgstr "deve ser super-usu�rio para reiniciar contadores de estat�sticas"
 
-#: postmaster/pgstat.c:1411
+#: postmaster/pgstat.c:1386
 #, c-format
 msgid "could not create pipe for statistics buffer: %m"
 msgstr "n�o p�de criar pipe para buffer de estat�sticas: %m"
 
-#: postmaster/pgstat.c:1424
+#: postmaster/pgstat.c:1397
 #, c-format
 msgid "could not fork statistics collector: %m"
 msgstr "n�o p�de criar processo para coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:1537 postmaster/pgstat.c:1550 postmaster/pgstat.c:1833
-#: postmaster/pgstat.c:2099 postmaster/pgstat.c:2131 postmaster/pgstat.c:2185
-#: postmaster/pgstat.c:2446 postmaster/pgstat.c:2519 postmaster/pgstat.c:2565
-#: postmaster/pgstat.c:2616 postmaster/pgstat.c:2866 postmaster/pgstat.c:3048
-msgid "out of memory in statistics collector --- abort"
-msgstr "sem mem�ria no coletor de estat�sticas --- interrompendo"
-
-#: postmaster/pgstat.c:1652
+#: postmaster/pgstat.c:1607
 #, c-format
 msgid "could not read from statistics collector pipe: %m"
 msgstr "n�o p�de ler do pipe do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:1674
+#: postmaster/pgstat.c:1628
 msgid "invalid statistics message length"
 msgstr "tamanho da mensagem de estat�stica � inv�lido"
 
-#: postmaster/pgstat.c:1821
+#: postmaster/pgstat.c:1773
 #, c-format
 msgid "could not set statistics collector pipe to nonblocking mode: %m"
 msgstr ""
 "n�o p�de definir modo n�o bloqueado para pipe do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:1861
+#: postmaster/pgstat.c:1804
 msgid "statistics buffer is full"
 msgstr "buffer de estat�sticas est� cheio"
 
-#: postmaster/pgstat.c:1892
+#: postmaster/pgstat.c:1835
 #, c-format
 msgid "select() failed in statistics buffer: %m"
 msgstr "select() falhou no buffer de estat�stica: %m"
 
-#: postmaster/pgstat.c:1908
+#: postmaster/pgstat.c:1849
 #, c-format
 msgid "could not read statistics message: %m"
 msgstr "n�o p�de ler mensagem de estat�stica: %m"
 
-#: postmaster/pgstat.c:1973
+#: postmaster/pgstat.c:1912
 #, c-format
 msgid "could not write to statistics collector pipe: %m"
 msgstr "n�o p�de escrever no pipe do coletor de estat�sticas: %m"
 
-#: postmaster/pgstat.c:2039
+#: postmaster/pgstat.c:1977
 #, c-format
 msgid "invalid server process ID %d"
 msgstr "ID do processo do servidor %d � inv�lido"
 
-#: postmaster/pgstat.c:2234
+#: postmaster/pgstat.c:2036 postmaster/pgstat.c:2111 postmaster/pgstat.c:2709
+msgid "out of memory in statistics collector --- abort"
+msgstr "sem mem�ria no coletor de estat�sticas --- interrompendo"
+
+#: postmaster/pgstat.c:2159
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
 msgstr "n�o p�de abrir arquivo de estat�sticas tempor�rio \"%s\": %m"
 
-#: postmaster/pgstat.c:2261
+#: postmaster/pgstat.c:2185
 msgid "database hash table corrupted during cleanup --- abort"
 msgstr ""
 "tabela hash do banco de dados foi corrompida durante desligamento --- "
 "interrompendo"
 
-#: postmaster/pgstat.c:2298
+#: postmaster/pgstat.c:2220
 #, c-format
 msgid "tables hash table for database %u corrupted during cleanup --- abort"
 msgstr ""
 "tabela hash das tabelas do banco de dados %u foram corrompidas durante "
 "desligamento --- interrompendo"
 
-#: postmaster/pgstat.c:2347
+#: postmaster/pgstat.c:2268
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
 msgstr "n�o p�de fechar arquivo de estat�sticas tempor�rio \"%s\": %m"
 
-#: postmaster/pgstat.c:2356
+#: postmaster/pgstat.c:2277
 #, c-format
 msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
 msgstr ""
 "n�o p�de renomear arquivo de estat�sticas tempor�rio \"%s\" para \"%s\": %m"
 
-#: postmaster/pgstat.c:2378
+#: postmaster/pgstat.c:2299
 msgid "dead-server-process hash table corrupted during cleanup --- abort"
 msgstr ""
 "tabela hash do processo do servidor morto foi corrompida durante "
 "desligamento --- interrompendo"
 
-#: postmaster/pgstat.c:2501 postmaster/pgstat.c:2533 postmaster/pgstat.c:2596
-#: postmaster/pgstat.c:2629 postmaster/pgstat.c:2650 postmaster/pgstat.c:2696
-#: postmaster/pgstat.c:2729
+#: postmaster/pgstat.c:2406 postmaster/pgstat.c:2426 postmaster/pgstat.c:2472
+#: postmaster/pgstat.c:2493 postmaster/pgstat.c:2510 postmaster/pgstat.c:2544
+#: postmaster/pgstat.c:2573
 msgid "corrupted pgstat.stat file"
 msgstr "arquivo pgstat.stat corrompido"
 
@@ -10868,37 +10898,3 @@ msgstr ""
 "  -F               desabilita fsync\n"
 "  -o arquivo       envia sa�da da depura��o para arquivo\n"
 "  -x num           uso interno\n"
-
-#~ msgid "Rejected host: authentication failed for user \"%s\""
-#~ msgstr "M�quina rejeitada: autentica��o falhou para usu�rio \"%s\""
-
-#~ msgid "Unknown auth method: authentication failed for user \"%s\""
-#~ msgstr ""
-#~ "M�todo de autentica��o desconhecido: autentica��o falhou para usu�rio \"%s"
-#~ "\""
-
-#~ msgid "could not open \"%s\": %m"
-#~ msgstr "n�o p�de abrir \"%s\": %m"
-
-#~ msgid "Check for missing \"SPI_finish\" calls"
-#~ msgstr "Verifique a falta de chamadas \"SPI_finish\""
-
-#~ msgid "SQL query \"%s\""
-#~ msgstr "consulta SQL \"%s\""
-
-#~ msgid "operator class %s for %s"
-#~ msgstr "classe de operadores %s para %s"
-
-#~ msgid "invalid entry in pg_ident.conf file at line %d, token \"%s\""
-#~ msgstr ""
-#~ "entrada inv�lida no arquivo pg_ident.conf na linha %d, express�o \"%s\""
-
-#~ msgid "invalid input syntax for type bigint: \"%s\""
-#~ msgstr "sintaxe de entrada inv�lida para tipo bigint: \"%s\""
-
-#~ msgid ""
-#~ "%s does not know where to find the database system data.\n"
-#~ "This should be specified as \"pgdata\" in %s%s.\n"
-#~ msgstr ""
-#~ "%s n�o sabe onde encontrar os dados do sistema de banco de dados.\n"
-#~ "Isto deve ser especificado como \"pgdata\" em %s%s.\n"
diff --git a/src/backend/po/zh_TW.po b/src/backend/po/zh_TW.po
index 55e43f0eab..cd9c432158 100644
--- a/src/backend/po/zh_TW.po
+++ b/src/backend/po/zh_TW.po
@@ -1,24 +1,17 @@
-# Traditional Chinese translation for backend.
-# 2004-08-02 Zhenbang Wei <forth@zbwei.net>
+# 2004-11-01 Zhenbang Wei <forth@zbwei.net>
 # 2004-08-06 JiaYun <jiayun@jiayun.org>
-# 
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.5\n"
-"POT-Creation-Date: 2004-10-19 01:02+0100\n"
-"PO-Revision-Date: 2004-10-19 11:44+0800\n"
+"Project-Id-Version: PostgreSQL 8.0\n"
+"POT-Creation-Date: 2004-11-01 01:13+0000\n"
+"PO-Revision-Date: 2004-11-01 14:08+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"
 
-# access/common/heaptuple.c:580
-#: access/common/heaptuple.c:580
-#, c-format
-msgid "number of columns (%d) exceeds limit (%d)"
-msgstr "欄位數(%d)超過限制(%d)"
-
 # access/common/indextuple.c:57
 #: access/common/indextuple.c:57
 #, c-format
@@ -31,6 +24,12 @@ msgstr "索引欄位數(%d)超過限制(%d)"
 msgid "index row requires %lu bytes, maximum size is %lu"
 msgstr "索引資料行需要 %lu 個位元組，最大值是 %lu"
 
+# access/common/heaptuple.c:580
+#: access/common/heaptuple.c:580
+#, c-format
+msgid "number of columns (%d) exceeds limit (%d)"
+msgstr "欄位數(%d)超過限制(%d)"
+
 # access/common/printtup.c:296 tcop/fastpath.c:186 tcop/fastpath.c:511
 # tcop/postgres.c:1480
 #: access/common/printtup.c:296
@@ -69,17 +68,17 @@ msgstr ""
 msgid "index row size %lu exceeds hash maximum %lu"
 msgstr "索引資料行大小 %lu 超過hash最大值 %lu"
 
+# access/hash/hashsearch.c:146
+#: access/hash/hashsearch.c:146
+msgid "hash indexes do not support whole-index scans"
+msgstr "hash索引不支援完整索引掃描"
+
 # access/hash/hashovfl.c:522
 #: access/hash/hashovfl.c:522
 #, c-format
 msgid "out of overflow pages in hash index \"%s\""
 msgstr "hash索引\"%s\"的overflow頁用盡"
 
-# access/hash/hashsearch.c:146
-#: access/hash/hashsearch.c:146
-msgid "hash indexes do not support whole-index scans"
-msgstr "hash索引不支援完整索引掃描"
-
 # access/hash/hashutil.c:46
 #: access/hash/hashutil.c:46
 msgid "hash indexes cannot contain null keys"
@@ -194,226 +193,36 @@ msgstr "不支援可變長度rtree keys"
 msgid "index row size %lu exceeds rtree maximum, %lu"
 msgstr "索引資料行大小 %lu 超過rtree最大值 %lu"
 
-# access/transam/slru.c:452
-#: access/transam/slru.c:452
-#, c-format
-msgid "file \"%s\" doesn't exist, reading as zeroes"
-msgstr "檔案\"%s\"不存在，當成空檔案讀取"
-
-# access/transam/slru.c:637 access/transam/slru.c:644
-# access/transam/slru.c:651 access/transam/slru.c:658
-# access/transam/slru.c:665 access/transam/slru.c:672
-# access/transam/slru.c:679
-#: access/transam/slru.c:637
-#: access/transam/slru.c:644
-#: access/transam/slru.c:651
-#: access/transam/slru.c:658
-#: access/transam/slru.c:665
-#: access/transam/slru.c:672
-#: access/transam/slru.c:679
-#, c-format
-msgid "could not access status of transaction %u"
-msgstr "無法存取交易 %u 的狀態"
-
-# access/transam/slru.c:638 access/transam/xlog.c:1631
-# access/transam/xlog.c:2742 access/transam/xlog.c:2832
-# access/transam/xlog.c:2930 libpq/hba.c:911 libpq/hba.c:935
-# utils/error/elog.c:1118 utils/init/miscinit.c:783 utils/init/miscinit.c:889
-# utils/misc/database.c:68
-#: access/transam/slru.c:638
-#: access/transam/xlog.c:1631
-#: access/transam/xlog.c:2742
-#: access/transam/xlog.c:2832
-#: access/transam/xlog.c:2930
-#: libpq/hba.c:911
-#: libpq/hba.c:935
-#: utils/error/elog.c:1118
-#: utils/init/miscinit.c:783
-#: utils/init/miscinit.c:889
-#: utils/misc/database.c:68
-#, c-format
-msgid "could not open file \"%s\": %m"
-msgstr "無法開啟檔案\"%s\"：%m"
-
-# access/transam/slru.c:645 access/transam/xlog.c:1526
-# access/transam/xlog.c:1646 access/transam/xlog.c:2911
-# access/transam/xlog.c:5308 access/transam/xlog.c:5426
-# postmaster/postmaster.c:3366
-#: access/transam/slru.c:645
-#: access/transam/xlog.c:1526
-#: access/transam/xlog.c:1646
-#: access/transam/xlog.c:2911
-#: access/transam/xlog.c:5308
-#: access/transam/xlog.c:5426
-#: postmaster/postmaster.c:3366
-#, c-format
-msgid "could not create file \"%s\": %m"
-msgstr "無法建立檔案\"%s\"：%m"
-
-# access/transam/slru.c:652
-#: access/transam/slru.c:652
-#, c-format
-msgid "could not seek in file \"%s\" to offset %u: %m"
-msgstr "無法移動至檔案\"%s\"的偏移位置 %u：%m"
-
-# access/transam/slru.c:659
-#: access/transam/slru.c:659
-#, c-format
-msgid "could not read from file \"%s\" at offset %u: %m"
-msgstr "無法讀取檔案\"%s\"於偏移位置 %u：%m"
-
-# access/transam/slru.c:666
-#: access/transam/slru.c:666
-#, c-format
-msgid "could not write to file \"%s\" at offset %u: %m"
-msgstr "無法寫入檔案\"%s\"於偏移位置 %u：%m"
-
-# access/transam/slru.c:673 access/transam/xlog.c:1562
-# access/transam/xlog.c:1686 access/transam/xlog.c:3008
-#: access/transam/slru.c:673
-#: access/transam/xlog.c:1562
-#: access/transam/xlog.c:1686
-#: access/transam/xlog.c:3008
-#, c-format
-msgid "could not fsync file \"%s\": %m"
-msgstr "無法fsync檔案 \"%s\"：%m"
-
-# access/transam/slru.c:680 access/transam/xlog.c:1567
-# access/transam/xlog.c:1691 access/transam/xlog.c:3013
-#: access/transam/slru.c:680
-#: access/transam/xlog.c:1567
-#: access/transam/xlog.c:1691
-#: access/transam/xlog.c:3013
-#, c-format
-msgid "could not close file \"%s\": %m"
-msgstr "無法關閉檔案\"%s\"：%m"
-
-# access/transam/slru.c:862
-#: access/transam/slru.c:862
-#, c-format
-msgid "could not truncate directory \"%s\": apparent wraparound"
-msgstr ""
-
-# access/transam/slru.c:930 commands/tablespace.c:529
-# commands/tablespace.c:694 utils/adt/misc.c:174
-#: access/transam/slru.c:930
-#: commands/tablespace.c:528
-#: commands/tablespace.c:695
-#: utils/adt/misc.c:174
-#, c-format
-msgid "could not open directory \"%s\": %m"
-msgstr "無法開啟目錄\"%s\"：%m"
-
-# access/transam/slru.c:948
-#: access/transam/slru.c:948
-#, c-format
-msgid "removing file \"%s\""
-msgstr "刪除檔案\"%s\""
-
-# access/transam/slru.c:967 commands/tablespace.c:577
-# commands/tablespace.c:721
-#: access/transam/slru.c:967
-#: commands/tablespace.c:576
-#: commands/tablespace.c:722
-#, c-format
-msgid "could not read directory \"%s\": %m"
-msgstr "無法讀取目錄\"%s\"：%m"
-
-# access/transam/xact.c:510
-#: access/transam/xact.c:510
-msgid "cannot have more than 2^32-1 commands in a transaction"
-msgstr "每筆交易不能超過2^32-1個命令"
-
-#  translator: %s represents an SQL statement name
-# access/transam/xact.c:2173
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2177
-#, c-format
-msgid "%s cannot run inside a transaction block"
-msgstr "%s 不能在交易中執行"
-
-#  translator: %s represents an SQL statement name
-# access/transam/xact.c:2183
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2187
-#, c-format
-msgid "%s cannot run inside a subtransaction"
-msgstr "%s 不能在子交易中執行"
-
-#  translator: %s represents an SQL statement name
-# access/transam/xact.c:2195
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2199
-#, c-format
-msgid "%s cannot be executed from a function"
-msgstr "%s 不能在函式中執行"
-
-#  translator: %s represents an SQL statement name
-# access/transam/xact.c:2246
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:2250
-#, c-format
-msgid "%s may only be used in transaction blocks"
-msgstr "%s 只能在交易中被使用"
-
-# access/transam/xact.c:2429
-#: access/transam/xact.c:2433
-msgid "there is already a transaction in progress"
-msgstr "已經有交易在執行中"
-
-# access/transam/xact.c:2544 access/transam/xact.c:2635
-#: access/transam/xact.c:2548
-#: access/transam/xact.c:2639
-msgid "there is no transaction in progress"
-msgstr "沒有執行中的交易"
-
-# access/transam/xact.c:2727 access/transam/xact.c:2776
-# access/transam/xact.c:2782 access/transam/xact.c:2826
-# access/transam/xact.c:2873 access/transam/xact.c:2879
-#: access/transam/xact.c:2731
-#: access/transam/xact.c:2780
-#: access/transam/xact.c:2786
-#: access/transam/xact.c:2830
-#: access/transam/xact.c:2877
-#: access/transam/xact.c:2883
-msgid "no such savepoint"
-msgstr "沒有這個savepoint"
-
-# access/transam/xact.c:3517
-#: access/transam/xact.c:3521
-msgid "cannot have more than 2^32-1 subtransactions in a transaction"
-msgstr "每筆交易不能擁有超過2^32-1個子交易"
-
 # access/transam/xlog.c:906
-#: access/transam/xlog.c:906
+#: access/transam/xlog.c:907
 #, c-format
 msgid "could not create archive status file \"%s\": %m"
 msgstr "無法建立備份狀態檔\"%s\"：%m"
 
 # access/transam/xlog.c:914
-#: access/transam/xlog.c:914
+#: access/transam/xlog.c:915
 #, c-format
 msgid "could not write archive status file \"%s\": %m"
 msgstr "無法寫入備份狀態檔\"%s\"：%m"
 
 # access/transam/xlog.c:1179 access/transam/xlog.c:1303
 # access/transam/xlog.c:5168
-#: access/transam/xlog.c:1179
-#: access/transam/xlog.c:1303
-#: access/transam/xlog.c:5168
+#: access/transam/xlog.c:1180
+#: access/transam/xlog.c:1304
+#: access/transam/xlog.c:5192
 #, c-format
 msgid "could not close log file %u, segment %u: %m"
 msgstr "無法關閉日誌? %u，區段 %u：%m"
 
 # access/transam/xlog.c:1237 access/transam/xlog.c:2405
-#: access/transam/xlog.c:1237
-#: access/transam/xlog.c:2405
+#: access/transam/xlog.c:1238
+#: access/transam/xlog.c:2416
 #, c-format
 msgid "could not seek in log file %u, segment %u to offset %u: %m"
 msgstr "無法在日誌檔 %u 中移動，區段 %u 至偏移位置 %u：%m"
 
 # access/transam/xlog.c:1251
-#: access/transam/xlog.c:1251
+#: access/transam/xlog.c:1252
 #, c-format
 msgid "could not write to log file %u, segment %u at offset %u: %m"
 msgstr "無法寫入日誌檔 %u，區段 %u 於偏移位置 %u：%m"
@@ -421,279 +230,334 @@ msgstr "無法寫入日誌檔 %u，區段 %u 於偏移位置 %u：%m"
 # access/transam/xlog.c:1503 access/transam/xlog.c:1594
 # access/transam/xlog.c:1807 access/transam/xlog.c:1861
 # access/transam/xlog.c:1870
-#: access/transam/xlog.c:1503
-#: access/transam/xlog.c:1594
-#: access/transam/xlog.c:1807
-#: access/transam/xlog.c:1861
-#: access/transam/xlog.c:1870
+#: access/transam/xlog.c:1504
+#: access/transam/xlog.c:1595
+#: access/transam/xlog.c:1808
+#: access/transam/xlog.c:1862
+#: access/transam/xlog.c:1871
 #, c-format
 msgid "could not open file \"%s\" (log file %u, segment %u): %m"
 msgstr "無法開啟檔案\"%s\"(日誌檔 %u，區段 %u)：%m"
 
+# access/transam/slru.c:645 access/transam/xlog.c:1526
+# access/transam/xlog.c:1646 access/transam/xlog.c:2911
+# access/transam/xlog.c:5308 access/transam/xlog.c:5426
+# postmaster/postmaster.c:3366
+#: access/transam/slru.c:645
+#: access/transam/xlog.c:1527
+#: access/transam/xlog.c:1647
+#: access/transam/xlog.c:2922
+#: access/transam/xlog.c:5332
+#: access/transam/xlog.c:5450
+#: postmaster/postmaster.c:3366
+#, c-format
+msgid "could not create file \"%s\": %m"
+msgstr "無法建立檔案\"%s\"：%m"
+
 # access/transam/xlog.c:1555 access/transam/xlog.c:1679
 # access/transam/xlog.c:2964 access/transam/xlog.c:3002 commands/copy.c:1117
 # commands/tablespace.c:668 commands/tablespace.c:674
 # postmaster/postmaster.c:3430 utils/init/miscinit.c:832
 # utils/init/miscinit.c:841 utils/misc/guc.c:4934 utils/misc/guc.c:4998
-#: access/transam/xlog.c:1555
-#: access/transam/xlog.c:1679
-#: access/transam/xlog.c:2964
-#: access/transam/xlog.c:3002
+#: access/transam/xlog.c:1556
+#: access/transam/xlog.c:1680
+#: access/transam/xlog.c:2975
+#: access/transam/xlog.c:3013
 #: commands/copy.c:1117
 #: commands/tablespace.c:667
 #: commands/tablespace.c:673
 #: postmaster/postmaster.c:3430
 #: utils/init/miscinit.c:832
 #: utils/init/miscinit.c:841
-#: utils/misc/guc.c:4932
-#: utils/misc/guc.c:4996
+#: utils/misc/guc.c:4962
+#: utils/misc/guc.c:5026
 #, c-format
 msgid "could not write to file \"%s\": %m"
 msgstr "無法寫入檔案\"%s\"：%m"
 
+# access/transam/slru.c:673 access/transam/xlog.c:1562
+# access/transam/xlog.c:1686 access/transam/xlog.c:3008
+#: access/transam/slru.c:673
+#: access/transam/xlog.c:1563
+#: access/transam/xlog.c:1687
+#: access/transam/xlog.c:3019
+#, c-format
+msgid "could not fsync file \"%s\": %m"
+msgstr "無法fsync檔案 \"%s\"：%m"
+
+# access/transam/slru.c:680 access/transam/xlog.c:1567
+# access/transam/xlog.c:1691 access/transam/xlog.c:3013
+#: access/transam/slru.c:680
+#: access/transam/xlog.c:1568
+#: access/transam/xlog.c:1692
+#: access/transam/xlog.c:3024
+#, c-format
+msgid "could not close file \"%s\": %m"
+msgstr "無法關閉檔案\"%s\"：%m"
+
+# access/transam/slru.c:638 access/transam/xlog.c:1631
+# access/transam/xlog.c:2742 access/transam/xlog.c:2832
+# access/transam/xlog.c:2930 libpq/hba.c:911 libpq/hba.c:935
+# utils/error/elog.c:1118 utils/init/miscinit.c:783 utils/init/miscinit.c:889
+# utils/misc/database.c:68
+#: access/transam/slru.c:638
+#: access/transam/xlog.c:1632
+#: access/transam/xlog.c:2753
+#: access/transam/xlog.c:2843
+#: access/transam/xlog.c:2941
+#: libpq/hba.c:911
+#: libpq/hba.c:935
+#: utils/error/elog.c:1118
+#: utils/init/miscinit.c:783
+#: utils/init/miscinit.c:889
+#: utils/misc/database.c:68
+#, c-format
+msgid "could not open file \"%s\": %m"
+msgstr "無法開啟檔案\"%s\"：%m"
+
 # access/transam/xlog.c:1659 access/transam/xlog.c:2942
 # access/transam/xlog.c:5397 access/transam/xlog.c:5448
 # access/transam/xlog.c:5520 access/transam/xlog.c:5545
 # access/transam/xlog.c:5583
-#: access/transam/xlog.c:1659
-#: access/transam/xlog.c:2942
-#: access/transam/xlog.c:5397
-#: access/transam/xlog.c:5448
-#: access/transam/xlog.c:5520
-#: access/transam/xlog.c:5545
-#: access/transam/xlog.c:5583
+#: access/transam/xlog.c:1660
+#: access/transam/xlog.c:2953
+#: access/transam/xlog.c:5421
+#: access/transam/xlog.c:5472
+#: access/transam/xlog.c:5544
+#: access/transam/xlog.c:5569
+#: access/transam/xlog.c:5607
 #, c-format
 msgid "could not read file \"%s\": %m"
 msgstr "無法讀取檔案\"%s\"：%m"
 
 # access/transam/xlog.c:1662
-#: access/transam/xlog.c:1662
+#: access/transam/xlog.c:1663
 #, c-format
 msgid "insufficient data in file \"%s\""
 msgstr "檔案\"%s\"內的資料不足"
 
 # access/transam/xlog.c:1774
-#: access/transam/xlog.c:1774
+#: access/transam/xlog.c:1775
 #, c-format
 msgid "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m"
 msgstr ""
 
 # access/transam/xlog.c:1781
-#: access/transam/xlog.c:1781
+#: access/transam/xlog.c:1782
 #, c-format
 msgid "could not rename file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m"
 msgstr "無法將檔案\"%s\"重新命名為\"%s\"(初始化日誌檔 %u，區段 %u)：%m"
 
 # access/transam/xlog.c:1936 access/transam/xlog.c:2038
 # access/transam/xlog.c:5291
-#: access/transam/xlog.c:1936
-#: access/transam/xlog.c:2038
-#: access/transam/xlog.c:5291
+#: access/transam/xlog.c:1937
+#: access/transam/xlog.c:2039
+#: access/transam/xlog.c:5315
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "無法取得檔案狀態\"%s\"：%m"
 
 # access/transam/xlog.c:1944 access/transam/xlog.c:5453
 # access/transam/xlog.c:5607 postmaster/postmaster.c:3504
-#: access/transam/xlog.c:1944
-#: access/transam/xlog.c:5453
-#: access/transam/xlog.c:5607
+#: access/transam/xlog.c:1945
+#: access/transam/xlog.c:5477
+#: access/transam/xlog.c:5631
 #: postmaster/postmaster.c:3504
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "無法刪除檔案\"%s\"：%m"
 
 # access/transam/xlog.c:2019
-#: access/transam/xlog.c:2019
+#: access/transam/xlog.c:2020
 #, c-format
 msgid "archive file \"%s\" has wrong size: %lu instead of %lu"
 msgstr "備份檔\"%s\"大小不正確：%lu 而非 %lu"
 
 # access/transam/xlog.c:2026
-#: access/transam/xlog.c:2026
+#: access/transam/xlog.c:2027
 #, c-format
 msgid "restored log file \"%s\" from archive"
 msgstr "從備份還原日誌檔\"%s\""
 
 # access/transam/xlog.c:2051
-#: access/transam/xlog.c:2051
+#: access/transam/xlog.c:2052
 #, c-format
 msgid "could not restore \"%s\" from archive: return code %d"
 msgstr "無法從備份檔\"%s\"還原：傳回碼 %d"
 
 # access/transam/xlog.c:2111
-#: access/transam/xlog.c:2111
+#: access/transam/xlog.c:2120
 #, c-format
 msgid "could not open transaction log directory \"%s\": %m"
 msgstr "無法開啟交易日誌目錄\"%s\"：%m"
 
 # access/transam/xlog.c:2156
-#: access/transam/xlog.c:2156
+#: access/transam/xlog.c:2165
 #, c-format
 msgid "recycled transaction log file \"%s\""
 msgstr ""
 
 # access/transam/xlog.c:2163
-#: access/transam/xlog.c:2163
+#: access/transam/xlog.c:2173
 #, c-format
 msgid "removing transaction log file \"%s\""
 msgstr "刪除交易日誌檔\"%s\""
 
 # access/transam/xlog.c:2185
-#: access/transam/xlog.c:2185
+#: access/transam/xlog.c:2196
 #, c-format
 msgid "could not read transaction log directory \"%s\": %m"
 msgstr "無法讀取交易記錄目錄 \"%s\": %m"
 
 # access/transam/xlog.c:2269
-#: access/transam/xlog.c:2269
+#: access/transam/xlog.c:2280
 #, c-format
 msgid "incorrect resource manager data checksum in record at %X/%X"
 msgstr ""
 
 # access/transam/xlog.c:2292
-#: access/transam/xlog.c:2292
+#: access/transam/xlog.c:2303
 #, c-format
 msgid "incorrect checksum of backup block %d in record at %X/%X"
 msgstr ""
 
 # access/transam/xlog.c:2365 access/transam/xlog.c:2435
-#: access/transam/xlog.c:2365
-#: access/transam/xlog.c:2435
+#: access/transam/xlog.c:2376
+#: access/transam/xlog.c:2446
 #, c-format
 msgid "invalid record offset at %X/%X"
 msgstr "無效的記錄偏移位置於 %X/%X"
 
 # access/transam/xlog.c:2413
-#: access/transam/xlog.c:2413
+#: access/transam/xlog.c:2424
 #, c-format
 msgid "could not read from log file %u, segment %u at offset %u: %m"
 msgstr "無法讀取日誌檔 %u，區段 %u 於偏移位置 %u：%m"
 
 # access/transam/xlog.c:2443
-#: access/transam/xlog.c:2443
+#: access/transam/xlog.c:2454
 #, c-format
 msgid "contrecord is requested by %X/%X"
 msgstr ""
 
 # access/transam/xlog.c:2458
-#: access/transam/xlog.c:2458
+#: access/transam/xlog.c:2469
 #, c-format
 msgid "record with zero length at %X/%X"
 msgstr "記錄長度為0於 %X/%X"
 
 # access/transam/xlog.c:2465
-#: access/transam/xlog.c:2465
+#: access/transam/xlog.c:2476
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
 msgstr "無效的資源管理器 ID %u 於 %X/%X"
 
 # access/transam/xlog.c:2503
-#: access/transam/xlog.c:2503
+#: access/transam/xlog.c:2514
 #, c-format
 msgid "record length %u at %X/%X too long"
 msgstr "記錄長度 %u 於 %X/%X 太長"
 
 # access/transam/xlog.c:2539
-#: access/transam/xlog.c:2539
+#: access/transam/xlog.c:2550
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u: %m"
 msgstr "無法讀取日誌檔 %u，區段 %u，偏移位置 %u：%m"
 
 # access/transam/xlog.c:2548
-#: access/transam/xlog.c:2548
+#: access/transam/xlog.c:2559
 #, c-format
 msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 
 # access/transam/xlog.c:2558
-#: access/transam/xlog.c:2558
+#: access/transam/xlog.c:2569
 #, c-format
 msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
 msgstr ""
 
 # access/transam/xlog.c:2625
-#: access/transam/xlog.c:2625
+#: access/transam/xlog.c:2636
 #, c-format
 msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
 # access/transam/xlog.c:2632
-#: access/transam/xlog.c:2632
+#: access/transam/xlog.c:2643
 #, c-format
 msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
 # access/transam/xlog.c:2654 access/transam/xlog.c:2662
-#: access/transam/xlog.c:2654
-#: access/transam/xlog.c:2662
+#: access/transam/xlog.c:2665
+#: access/transam/xlog.c:2673
 msgid "WAL file is from different system"
 msgstr "WAL 檔是來自不同系統"
 
 # access/transam/xlog.c:2655
-#: access/transam/xlog.c:2655
+#: access/transam/xlog.c:2666
 #, c-format
 msgid "WAL file SYSID is %s, pg_control SYSID is %s"
 msgstr "WAL 檔 SYSID 為 %s，pg_control SYSID 為 %s"
 
 # access/transam/xlog.c:2663
-#: access/transam/xlog.c:2663
+#: access/transam/xlog.c:2674
 msgid "Incorrect XLOG_SEG_SIZE in page header."
 msgstr "page header中的XLOG_SEG_SIZE不正確"
 
 # access/transam/xlog.c:2672
-#: access/transam/xlog.c:2672
+#: access/transam/xlog.c:2683
 #, c-format
 msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr "非預期的pageaddr %X/%X於日誌檔 %u，區段 %u，偏移位置 %u"
 
 # access/transam/xlog.c:2684
-#: access/transam/xlog.c:2684
+#: access/transam/xlog.c:2695
 #, c-format
 msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
 msgstr "非預期的timeline ID %u於日誌檔 %u，區段 %u，偏移位置 %u"
 
 # access/transam/xlog.c:2702
-#: access/transam/xlog.c:2702
+#: access/transam/xlog.c:2713
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset %u"
 msgstr ""
 
 # access/transam/xlog.c:2771
-#: access/transam/xlog.c:2771
+#: access/transam/xlog.c:2782
 #, c-format
 msgid "syntax error in history file: %s"
 msgstr "歷史記錄檔中有語法錯誤：%s"
 
 # access/transam/xlog.c:2772
-#: access/transam/xlog.c:2772
+#: access/transam/xlog.c:2783
 msgid "Expected a numeric timeline ID."
 msgstr "預期一個數字timeline ID。"
 
 # access/transam/xlog.c:2777
-#: access/transam/xlog.c:2777
+#: access/transam/xlog.c:2788
 #, c-format
 msgid "invalid data in history file: %s"
 msgstr "歷史記錄檔中有無效資料：%s"
 
 # access/transam/xlog.c:2778
-#: access/transam/xlog.c:2778
+#: access/transam/xlog.c:2789
 msgid "Timeline IDs must be in increasing sequence."
 msgstr ""
 
 # access/transam/xlog.c:2791
-#: access/transam/xlog.c:2791
+#: access/transam/xlog.c:2802
 #, c-format
 msgid "invalid data in history file \"%s\""
 msgstr "歷史記錄檔\"%s\"中有無效資料"
 
 # access/transam/xlog.c:2792
-#: access/transam/xlog.c:2792
+#: access/transam/xlog.c:2803
 msgid "Timeline IDs must be less than child timeline's ID."
 msgstr ""
 
 # access/transam/xlog.c:3030
-#: access/transam/xlog.c:3030
+#: access/transam/xlog.c:3041
 #, c-format
 msgid "could not link file \"%s\" to \"%s\": %m"
 msgstr "無法將檔案\"%s\"連結到\"%s\"：%m"
@@ -701,9 +565,9 @@ msgstr "無法將檔案\"%s\"連結到\"%s\"：%m"
 # access/transam/xlog.c:3037 access/transam/xlog.c:3819
 # access/transam/xlog.c:3862 commands/user.c:282 commands/user.c:412
 # postmaster/pgarch.c:597
-#: access/transam/xlog.c:3037
-#: access/transam/xlog.c:3819
-#: access/transam/xlog.c:3862
+#: access/transam/xlog.c:3048
+#: access/transam/xlog.c:3830
+#: access/transam/xlog.c:3873
 #: commands/user.c:282
 #: commands/user.c:412
 #: postmaster/pgarch.c:597
@@ -712,56 +576,56 @@ msgid "could not rename file \"%s\" to \"%s\": %m"
 msgstr "無法將檔案\"%s\"重新命名為\"%s\"：%m"
 
 # access/transam/xlog.c:3098
-#: access/transam/xlog.c:3098
+#: access/transam/xlog.c:3109
 msgid "invalid LC_COLLATE setting"
 msgstr "不合法的LC_COLLATE設定"
 
 # access/transam/xlog.c:3103
-#: access/transam/xlog.c:3103
+#: access/transam/xlog.c:3114
 msgid "invalid LC_CTYPE setting"
 msgstr "不合法的LC_CTYPE設定"
 
 # access/transam/xlog.c:3122
-#: access/transam/xlog.c:3122
+#: access/transam/xlog.c:3133
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr "sizeof(ControlFileData) 大於 BLCKSZ; 修正其中一項"
 
 # access/transam/xlog.c:3132
-#: access/transam/xlog.c:3132
+#: access/transam/xlog.c:3143
 #, c-format
 msgid "could not create control file \"%s\": %m"
 msgstr "無法建立控制檔\"%s\"：%m"
 
 # access/transam/xlog.c:3143 access/transam/xlog.c:3330
-#: access/transam/xlog.c:3143
-#: access/transam/xlog.c:3330
+#: access/transam/xlog.c:3154
+#: access/transam/xlog.c:3341
 #, c-format
 msgid "could not write to control file: %m"
 msgstr "無法寫入控制檔：%m"
 
 # access/transam/xlog.c:3149 access/transam/xlog.c:3336
-#: access/transam/xlog.c:3149
-#: access/transam/xlog.c:3336
+#: access/transam/xlog.c:3160
+#: access/transam/xlog.c:3347
 #, c-format
 msgid "could not fsync control file: %m"
 msgstr "無法fsync控制檔：%m"
 
 # access/transam/xlog.c:3154 access/transam/xlog.c:3341
-#: access/transam/xlog.c:3154
-#: access/transam/xlog.c:3341
+#: access/transam/xlog.c:3165
+#: access/transam/xlog.c:3352
 #, c-format
 msgid "could not close control file: %m"
 msgstr "無法關閉控制檔：%m"
 
 # access/transam/xlog.c:3170 access/transam/xlog.c:3319
-#: access/transam/xlog.c:3170
-#: access/transam/xlog.c:3319
+#: access/transam/xlog.c:3181
+#: access/transam/xlog.c:3330
 #, c-format
 msgid "could not open control file \"%s\": %m"
 msgstr "無法開啟控制檔\"%s\"：%m"
 
 # access/transam/xlog.c:3176
-#: access/transam/xlog.c:3176
+#: access/transam/xlog.c:3187
 #, c-format
 msgid "could not read from control file: %m"
 msgstr "無法讀取控制檔：%m"
@@ -772,45 +636,45 @@ msgstr "無法讀取控制檔：%m"
 # access/transam/xlog.c:3253 access/transam/xlog.c:3262
 # access/transam/xlog.c:3269 access/transam/xlog.c:3277
 # utils/init/miscinit.c:907
-#: access/transam/xlog.c:3188
-#: access/transam/xlog.c:3218
-#: access/transam/xlog.c:3225
-#: access/transam/xlog.c:3232
-#: access/transam/xlog.c:3239
-#: access/transam/xlog.c:3246
-#: access/transam/xlog.c:3253
-#: access/transam/xlog.c:3262
-#: access/transam/xlog.c:3269
-#: access/transam/xlog.c:3277
+#: access/transam/xlog.c:3199
+#: access/transam/xlog.c:3229
+#: access/transam/xlog.c:3236
+#: access/transam/xlog.c:3243
+#: access/transam/xlog.c:3250
+#: access/transam/xlog.c:3257
+#: access/transam/xlog.c:3264
+#: access/transam/xlog.c:3273
+#: access/transam/xlog.c:3280
+#: access/transam/xlog.c:3288
 #: utils/init/miscinit.c:907
 msgid "database files are incompatible with server"
 msgstr "資料庫檔?與伺服器不相容"
 
 # access/transam/xlog.c:3189
-#: access/transam/xlog.c:3189
+#: access/transam/xlog.c:3200
 #, c-format
 msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr "資料庫 cluster 已以 PG_CONTROL_VERSION %d 初始化，但伺服器是以 PG_CONTROL_VERSION %d 編譯。"
 
 # access/transam/xlog.c:3192 access/transam/xlog.c:3222
-#: access/transam/xlog.c:3192
-#: access/transam/xlog.c:3222
+#: access/transam/xlog.c:3203
+#: access/transam/xlog.c:3233
 msgid "It looks like you need to initdb."
 msgstr "你可能需要執行initdb。"
 
 # access/transam/xlog.c:3202
-#: access/transam/xlog.c:3202
+#: access/transam/xlog.c:3213
 msgid "incorrect checksum in control file"
 msgstr "控制檔的checksum不正確"
 
 # access/transam/xlog.c:3219
-#: access/transam/xlog.c:3219
+#: access/transam/xlog.c:3230
 #, c-format
 msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
 msgstr "資料庫 cluster 已以 CATALOG_VERSION_NO %d 初始化，但伺服器是以 CATALOG_VERSION_NO %d 編譯。"
 
 # access/transam/xlog.c:3226
-#: access/transam/xlog.c:3226
+#: access/transam/xlog.c:3237
 #, c-format
 msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
 msgstr "資料庫 cluster 已以 BLCKSZ %d 初始化，但伺服器是以 BLCKSZ %d 編譯。"
@@ -819,532 +683,677 @@ msgstr "資料庫 cluster 已以 BLCKSZ %d 初始化，但伺服器是以 BLCKSZ
 # access/transam/xlog.c:3243 access/transam/xlog.c:3250
 # access/transam/xlog.c:3257 access/transam/xlog.c:3265
 # access/transam/xlog.c:3272 access/transam/xlog.c:3281
-#: access/transam/xlog.c:3229
-#: access/transam/xlog.c:3236
-#: access/transam/xlog.c:3243
-#: access/transam/xlog.c:3250
-#: access/transam/xlog.c:3257
-#: access/transam/xlog.c:3265
-#: access/transam/xlog.c:3272
-#: access/transam/xlog.c:3281
+#: access/transam/xlog.c:3240
+#: access/transam/xlog.c:3247
+#: access/transam/xlog.c:3254
+#: access/transam/xlog.c:3261
+#: access/transam/xlog.c:3268
+#: access/transam/xlog.c:3276
+#: access/transam/xlog.c:3283
+#: access/transam/xlog.c:3292
 msgid "It looks like you need to recompile or initdb."
 msgstr "你可能需要重新編譯initdb。"
 
 # access/transam/xlog.c:3233
-#: access/transam/xlog.c:3233
+#: access/transam/xlog.c:3244
 #, c-format
 msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
 msgstr "資料庫 cluster 已以 RELSEG_SIZE %d 初始化，但伺服器是以 RELSEG_SIZE %d 編譯。"
 
 # access/transam/xlog.c:3240
-#: access/transam/xlog.c:3240
+#: access/transam/xlog.c:3251
 #, c-format
 msgid "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server was compiled with XLOG_SEG_SIZE %d."
 msgstr "資料庫 cluster 已以 XLOG_SEG_SIZE %d 初始化，但伺服器是以 XLOG_SEG_SIZE %d 編譯。"
 
 # access/transam/xlog.c:3247
-#: access/transam/xlog.c:3247
+#: access/transam/xlog.c:3258
 #, c-format
 msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
 msgstr "資料庫 cluster 已以 NAMEDATALEN %d 初始化，但伺服器是以 NAMEDATALEN %d 編譯。"
 
 # access/transam/xlog.c:3254
-#: access/transam/xlog.c:3254
+#: access/transam/xlog.c:3265
 #, c-format
 msgid "The database cluster was initialized with FUNC_MAX_ARGS %d, but the server was compiled with FUNC_MAX_ARGS %d."
 msgstr "資料庫 cluster 已以 FUNC_MAX_ARGS %d 初始化，但伺服器是以 FUNC_MAX_ARGS %d 編譯。"
 
 # access/transam/xlog.c:3263
-#: access/transam/xlog.c:3263
+#: access/transam/xlog.c:3274
 msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP."
 msgstr "資料庫 cluster 已以非 HAVE_INT64_TIMESTAMP 初始化，但伺服器是以 HAVE_INT64_TIMESTAMP 編譯。"
 
 # access/transam/xlog.c:3270
-#: access/transam/xlog.c:3270
+#: access/transam/xlog.c:3281
 msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP."
 msgstr "資料庫 cluster 已以 HAVE_INT64_TIMESTAMP 初始化，但伺服器是以非 HAVE_INT64_TIMESTAMP 編譯。"
 
 # access/transam/xlog.c:3278
-#: access/transam/xlog.c:3278
+#: access/transam/xlog.c:3289
 #, c-format
 msgid "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the server was compiled with LOCALE_NAME_BUFLEN %d."
 msgstr "資料庫 cluster 已以 LOCALE_NAME_BUFLEN %d 初始化，但伺服器是以 LOCALE_NAME_BUFLEN %d 編譯。"
 
 # access/transam/xlog.c:3284 access/transam/xlog.c:3291
-#: access/transam/xlog.c:3284
-#: access/transam/xlog.c:3291
+#: access/transam/xlog.c:3295
+#: access/transam/xlog.c:3302
 msgid "database files are incompatible with operating system"
 msgstr "資料庫檔案與作業系統不相容"
 
 # access/transam/xlog.c:3285
-#: access/transam/xlog.c:3285
+#: access/transam/xlog.c:3296
 #, c-format
 msgid "The database cluster was initialized with LC_COLLATE \"%s\", which is not recognized by setlocale()."
 msgstr "資料庫 cluster 已以 LC_COLLATE \"%s\" 初始化，但 setlocale() 無法辨識該 LC_COLLATE。"
 
 # access/transam/xlog.c:3288 access/transam/xlog.c:3295
-#: access/transam/xlog.c:3288
-#: access/transam/xlog.c:3295
+#: access/transam/xlog.c:3299
+#: access/transam/xlog.c:3306
 msgid "It looks like you need to initdb or install locale support."
 msgstr "你可能需要執行initdb或安裝locale支援。"
 
 # access/transam/xlog.c:3292
-#: access/transam/xlog.c:3292
+#: access/transam/xlog.c:3303
 #, c-format
 msgid "The database cluster was initialized with LC_CTYPE \"%s\", which is not recognized by setlocale()."
 msgstr "資料庫 cluster 已以 LC_CTYPE \"%s\" 初始化，但 setlocale() 無法辨識該 LC_CTYPE。"
 
 # access/transam/xlog.c:3518
-#: access/transam/xlog.c:3518
+#: access/transam/xlog.c:3529
 #, c-format
 msgid "could not write bootstrap transaction log file: %m"
 msgstr ""
 
 # access/transam/xlog.c:3524
-#: access/transam/xlog.c:3524
+#: access/transam/xlog.c:3535
 #, c-format
 msgid "could not fsync bootstrap transaction log file: %m"
 msgstr ""
 
 # access/transam/xlog.c:3529
-#: access/transam/xlog.c:3529
+#: access/transam/xlog.c:3540
 #, c-format
 msgid "could not close bootstrap transaction log file: %m"
 msgstr ""
 
 # access/transam/xlog.c:3591
-#: access/transam/xlog.c:3591
+#: access/transam/xlog.c:3602
 #, c-format
 msgid "could not open recovery command file \"%s\": %m"
 msgstr "無法開啟還原命令檔\"%s\"：%m"
 
 # access/transam/xlog.c:3596
-#: access/transam/xlog.c:3596
+#: access/transam/xlog.c:3607
 msgid "starting archive recovery"
 msgstr "開始備份檔還原"
 
 # access/transam/xlog.c:3641
-#: access/transam/xlog.c:3641
+#: access/transam/xlog.c:3652
 #, c-format
 msgid "restore_command = \"%s\""
 msgstr ""
 
 # access/transam/xlog.c:3655
-#: access/transam/xlog.c:3655
+#: access/transam/xlog.c:3666
 #, c-format
 msgid "recovery_target_timeline is not a valid number: \"%s\""
 msgstr ""
 
 # access/transam/xlog.c:3660
-#: access/transam/xlog.c:3660
+#: access/transam/xlog.c:3671
 #, c-format
 msgid "recovery_target_timeline = %u"
 msgstr ""
 
 # access/transam/xlog.c:3663
-#: access/transam/xlog.c:3663
+#: access/transam/xlog.c:3674
 msgid "recovery_target_timeline = latest"
 msgstr ""
 
 # access/transam/xlog.c:3671
-#: access/transam/xlog.c:3671
+#: access/transam/xlog.c:3682
 #, c-format
 msgid "recovery_target_xid is not a valid number: \"%s\""
 msgstr ""
 
 # access/transam/xlog.c:3674
-#: access/transam/xlog.c:3674
+#: access/transam/xlog.c:3685
 #, c-format
 msgid "recovery_target_xid = %u"
 msgstr ""
 
 # access/transam/xlog.c:3699
-#: access/transam/xlog.c:3699
+#: access/transam/xlog.c:3710
 #, c-format
 msgid "recovery_target_time = %s"
 msgstr ""
 
 # access/transam/xlog.c:3716
-#: access/transam/xlog.c:3716
+#: access/transam/xlog.c:3727
 #, c-format
 msgid "recovery_target_inclusive = %s"
 msgstr ""
 
 # access/transam/xlog.c:3720
-#: access/transam/xlog.c:3720
+#: access/transam/xlog.c:3731
 #, c-format
 msgid "unrecognized recovery parameter \"%s\""
 msgstr "無法識別的還原參數\"%s\""
 
 # access/transam/xlog.c:3728
-#: access/transam/xlog.c:3728
+#: access/transam/xlog.c:3739
 #, c-format
 msgid "syntax error in recovery command file: %s"
 msgstr "還原命令檔有語法錯誤：%s"
 
 # access/transam/xlog.c:3730
-#: access/transam/xlog.c:3730
+#: access/transam/xlog.c:3741
 msgid "Lines should have the format parameter = 'value'."
 msgstr ""
 
 # access/transam/xlog.c:3735
-#: access/transam/xlog.c:3735
+#: access/transam/xlog.c:3746
 #, c-format
 msgid "recovery command file \"%s\" did not specify restore_command"
 msgstr ""
 
 # access/transam/xlog.c:3754
-#: access/transam/xlog.c:3754
+#: access/transam/xlog.c:3765
 #, c-format
 msgid "recovery_target_timeline %u does not exist"
 msgstr ""
 
 # access/transam/xlog.c:3866
-#: access/transam/xlog.c:3866
+#: access/transam/xlog.c:3877
 msgid "archive recovery complete"
 msgstr "備份檔還原完成"
 
 # access/transam/xlog.c:3950
-#: access/transam/xlog.c:3950
+#: access/transam/xlog.c:3961
 #, c-format
 msgid "recovery stopping after commit of transaction %u, time %s"
 msgstr "還原在確認交易 %u 後停止，時間 %s"
 
 # access/transam/xlog.c:3954
-#: access/transam/xlog.c:3954
+#: access/transam/xlog.c:3965
 #, c-format
 msgid "recovery stopping before commit of transaction %u, time %s"
 msgstr "還原在確認交易 %u 前停止，時間 %s"
 
 # access/transam/xlog.c:3961
-#: access/transam/xlog.c:3961
+#: access/transam/xlog.c:3972
 #, c-format
 msgid "recovery stopping after abort of transaction %u, time %s"
 msgstr "還原在取消交易 %u 後停止，時間 %s"
 
 # access/transam/xlog.c:3965
-#: access/transam/xlog.c:3965
+#: access/transam/xlog.c:3976
 #, c-format
 msgid "recovery stopping before abort of transaction %u, time %s"
 msgstr "還原取消交易 %u 前停止，時間 %s"
 
 # access/transam/xlog.c:4007
-#: access/transam/xlog.c:4007
+#: access/transam/xlog.c:4018
 msgid "control file contains invalid data"
 msgstr "控制檔包含無效的資料"
 
 # access/transam/xlog.c:4011
-#: access/transam/xlog.c:4011
+#: access/transam/xlog.c:4022
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "資料庫系統於 %s 被關閉"
 
 # access/transam/xlog.c:4015
-#: access/transam/xlog.c:4015
+#: access/transam/xlog.c:4026
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr "關閉資料庫系統於 %s 被中斷"
 
 # access/transam/xlog.c:4019
-#: access/transam/xlog.c:4019
+#: access/transam/xlog.c:4030
 #, c-format
 msgid "database system was interrupted while in recovery at %s"
 msgstr "資料庫系統還原於 %s 被中斷"
 
 # access/transam/xlog.c:4021
-#: access/transam/xlog.c:4021
+#: access/transam/xlog.c:4032
 msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr "這表示部份資料可能損壞，你需要使用最後的備份進行還原。"
 
 # access/transam/xlog.c:4025
-#: access/transam/xlog.c:4025
+#: access/transam/xlog.c:4036
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr "資料庫系統於 %s 被中斷"
 
 # access/transam/xlog.c:4057
-#: access/transam/xlog.c:4057
+#: access/transam/xlog.c:4068
 #, c-format
 msgid "requested timeline %u is not a child of database system timeline %u"
 msgstr ""
 
 # access/transam/xlog.c:4072 access/transam/xlog.c:4094
-#: access/transam/xlog.c:4072
-#: access/transam/xlog.c:4094
+#: access/transam/xlog.c:4083
+#: access/transam/xlog.c:4105
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "檢查點記錄於 %X/%X"
 
 # access/transam/xlog.c:4079
-#: access/transam/xlog.c:4079
+#: access/transam/xlog.c:4090
 msgid "could not locate required checkpoint record"
 msgstr "找不到要求的檢查點記錄"
 
 # access/transam/xlog.c:4080
-#: access/transam/xlog.c:4080
+#: access/transam/xlog.c:4091
 #, c-format
 msgid "If you are not restoring from a backup, try removing the file \"%s/backup_label\"."
 msgstr ""
 
 # access/transam/xlog.c:4104
-#: access/transam/xlog.c:4104
+#: access/transam/xlog.c:4115
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "使用前一個檢查點記錄於 %X/%X"
 
 # access/transam/xlog.c:4111
-#: access/transam/xlog.c:4111
+#: access/transam/xlog.c:4122
 msgid "could not locate a valid checkpoint record"
 msgstr "找不到有效的檢查點記錄"
 
 # access/transam/xlog.c:4120
-#: access/transam/xlog.c:4120
+#: access/transam/xlog.c:4131
 #, c-format
 msgid "redo record is at %X/%X; undo record is at %X/%X; shutdown %s"
 msgstr "redo記錄於 %X/%X，undo記錄於 %X/%X，關閉 %s"
 
 # access/transam/xlog.c:4125
-#: access/transam/xlog.c:4125
+#: access/transam/xlog.c:4136
 #, c-format
 msgid "next transaction ID: %u; next OID: %u"
 msgstr "下一個交易ID：%u，下一個OID：%u"
 
 # access/transam/xlog.c:4129
-#: access/transam/xlog.c:4129
+#: access/transam/xlog.c:4140
 msgid "invalid next transaction ID"
 msgstr "不合法的下一個交易ID"
 
 # access/transam/xlog.c:4146
-#: access/transam/xlog.c:4146
+#: access/transam/xlog.c:4157
 msgid "invalid redo in checkpoint record"
 msgstr "檢查點記錄中有不合法的redo記茄"
 
 # access/transam/xlog.c:4160
-#: access/transam/xlog.c:4160
+#: access/transam/xlog.c:4171
 msgid "invalid redo/undo record in shutdown checkpoint"
 msgstr "關閉?查點中有不合法的redo/undo記錄"
 
 # access/transam/xlog.c:4178
-#: access/transam/xlog.c:4178
+#: access/transam/xlog.c:4189
 msgid "automatic recovery in progress"
 msgstr "自動還原執行中"
 
 # access/transam/xlog.c:4181
-#: access/transam/xlog.c:4181
+#: access/transam/xlog.c:4192
 msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr "資料庫系統未被正常關閉，自動還原執行中"
 
 # access/transam/xlog.c:4218
-#: access/transam/xlog.c:4218
+#: access/transam/xlog.c:4229
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr "redo開始於 %X/%X"
 
 # access/transam/xlog.c:4276
-#: access/transam/xlog.c:4276
+#: access/transam/xlog.c:4287
 #, c-format
 msgid "redo done at %X/%X"
 msgstr "redo完成於 %X/%X"
 
 # access/transam/xlog.c:4284
-#: access/transam/xlog.c:4284
+#: access/transam/xlog.c:4295
 msgid "redo is not required"
 msgstr "不需要redo"
 
 # access/transam/xlog.c:4304
-#: access/transam/xlog.c:4304
+#: access/transam/xlog.c:4315
 msgid "requested recovery stop point is before end time of backup dump"
 msgstr ""
 
 # access/transam/xlog.c:4308
-#: access/transam/xlog.c:4308
+#: access/transam/xlog.c:4319
 msgid "WAL ends before end time of backup dump"
 msgstr ""
 
 # access/transam/xlog.c:4323
-#: access/transam/xlog.c:4323
+#: access/transam/xlog.c:4334
 #, c-format
 msgid "selected new timeline ID: %u"
 msgstr ""
 
 # access/transam/xlog.c:4405
-#: access/transam/xlog.c:4405
+#: access/transam/xlog.c:4416
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr "undo開始於 %X/%X"
 
 # access/transam/xlog.c:4416
-#: access/transam/xlog.c:4416
+#: access/transam/xlog.c:4427
 #, c-format
 msgid "undo done at %X/%X"
 msgstr "undo完成於 %X/%X"
 
 # access/transam/xlog.c:4421
-#: access/transam/xlog.c:4421
+#: access/transam/xlog.c:4432
 msgid "undo is not required"
 msgstr "不需要undo"
 
 # access/transam/xlog.c:4489
-#: access/transam/xlog.c:4489
+#: access/transam/xlog.c:4500
 msgid "database system is ready"
 msgstr "資料庫系統待命"
 
 # access/transam/xlog.c:4528
-#: access/transam/xlog.c:4528
+#: access/transam/xlog.c:4539
 msgid "invalid primary checkpoint link in control file"
 msgstr "控制檔中有無效的主要檢查點連結"
 
 # access/transam/xlog.c:4532
-#: access/transam/xlog.c:4532
+#: access/transam/xlog.c:4543
 msgid "invalid secondary checkpoint link in control file"
 msgstr "控制檔中有無效的次要檢查點連結"
 
 # access/transam/xlog.c:4536
-#: access/transam/xlog.c:4536
+#: access/transam/xlog.c:4547
 msgid "invalid checkpoint link in backup_label file"
 msgstr "backup_label檔案中有無效的檢查點連結"
 
 # access/transam/xlog.c:4550
-#: access/transam/xlog.c:4550
+#: access/transam/xlog.c:4561
 msgid "invalid primary checkpoint record"
 msgstr "無效的主檢查點記錄"
 
 # access/transam/xlog.c:4554
-#: access/transam/xlog.c:4554
+#: access/transam/xlog.c:4565
 msgid "invalid secondary checkpoint record"
 msgstr "無效的次要檢查點記錄"
 
 # access/transam/xlog.c:4558
-#: access/transam/xlog.c:4558
+#: access/transam/xlog.c:4569
 msgid "invalid checkpoint record"
 msgstr "無效的檢查點記錄"
 
 # access/transam/xlog.c:4569
-#: access/transam/xlog.c:4569
+#: access/transam/xlog.c:4580
 msgid "invalid resource manager ID in primary checkpoint record"
 msgstr "主要檢查點記錄中有無效的資源管理器ID"
 
 # access/transam/xlog.c:4573
-#: access/transam/xlog.c:4573
+#: access/transam/xlog.c:4584
 msgid "invalid resource manager ID in secondary checkpoint record"
 msgstr "次要檢查點記錄中有無效的資源管理器ID"
 
 # access/transam/xlog.c:4577
-#: access/transam/xlog.c:4577
+#: access/transam/xlog.c:4588
 msgid "invalid resource manager ID in checkpoint record"
 msgstr "檢查點記錄中有無效的資源管理器ID"
 
 # access/transam/xlog.c:4589
-#: access/transam/xlog.c:4589
+#: access/transam/xlog.c:4600
 msgid "invalid xl_info in primary checkpoint record"
 msgstr "主要檢查點記錄中有無效的xl_info"
 
 # access/transam/xlog.c:4593
-#: access/transam/xlog.c:4593
+#: access/transam/xlog.c:4604
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr "次要檢查點記錄中有無效的xl_info"
 
 # access/transam/xlog.c:4597
-#: access/transam/xlog.c:4597
+#: access/transam/xlog.c:4608
 msgid "invalid xl_info in checkpoint record"
 msgstr "檢查點記錄中有無效的xl_info"
 
 # access/transam/xlog.c:4608
-#: access/transam/xlog.c:4608
+#: access/transam/xlog.c:4619
 msgid "invalid length of primary checkpoint record"
 msgstr "主要檢查點記錄的長度無效"
 
 # access/transam/xlog.c:4612
-#: access/transam/xlog.c:4612
+#: access/transam/xlog.c:4623
 msgid "invalid length of secondary checkpoint record"
 msgstr "次要檢查點記錄的長度無效"
 
 # access/transam/xlog.c:4616
-#: access/transam/xlog.c:4616
+#: access/transam/xlog.c:4627
 msgid "invalid length of checkpoint record"
 msgstr "無效的檢查點記錄長度"
 
 # access/transam/xlog.c:4669
-#: access/transam/xlog.c:4669
+#: access/transam/xlog.c:4680
 msgid "shutting down"
 msgstr "正在關閉"
 
 # access/transam/xlog.c:4678
-#: access/transam/xlog.c:4678
+#: access/transam/xlog.c:4689
 msgid "database system is shut down"
 msgstr "資料庫系統已關閉"
 
+# postmaster/bgwriter.c:555
+#: access/transam/xlog.c:4880
+msgid "checkpoint starting"
+msgstr "開始檢查點"
+
 # access/transam/xlog.c:4891
-#: access/transam/xlog.c:4891
+#: access/transam/xlog.c:4909
 msgid "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
+#: access/transam/xlog.c:4981
+#, c-format
+msgid "checkpoint complete; %d transaction log file(s) added, %d removed, %d recycled"
+msgstr ""
+
 # access/transam/xlog.c:5017
-#: access/transam/xlog.c:5017
+#: access/transam/xlog.c:5041
 #, c-format
 msgid "unexpected timeline ID %u (after %u) in checkpoint record"
 msgstr ""
 
 # access/transam/xlog.c:5040
-#: access/transam/xlog.c:5040
+#: access/transam/xlog.c:5064
 #, c-format
 msgid "unexpected timeline ID %u (should be %u) in checkpoint record"
 msgstr ""
 
 # access/transam/xlog.c:5161 access/transam/xlog.c:5193
-#: access/transam/xlog.c:5161
-#: access/transam/xlog.c:5193
+#: access/transam/xlog.c:5185
+#: access/transam/xlog.c:5217
 #, c-format
 msgid "could not fsync log file %u, segment %u: %m"
 msgstr "無法fsync日誌檔 %u，區段 %u：%m"
 
 # access/transam/xlog.c:5201
-#: access/transam/xlog.c:5201
+#: access/transam/xlog.c:5225
 #, c-format
 msgid "could not fdatasync log file %u, segment %u: %m"
 msgstr "無法fdatasync日誌檔 %u，區段 %u：%m"
 
 # access/transam/xlog.c:5244 access/transam/xlog.c:5363
-#: access/transam/xlog.c:5244
-#: access/transam/xlog.c:5363
+#: access/transam/xlog.c:5268
+#: access/transam/xlog.c:5387
 msgid "must be superuser to run a backup"
 msgstr "只有管理者能執行備份"
 
 # access/transam/xlog.c:5297
-#: access/transam/xlog.c:5297
+#: access/transam/xlog.c:5321
 msgid "a backup is already in progress"
 msgstr "已有備份動作正在進行"
 
 # access/transam/xlog.c:5298
-#: access/transam/xlog.c:5298
+#: access/transam/xlog.c:5322
 #, c-format
 msgid "If you're sure there is no backup in progress, remove file \"%s\" and try again."
 msgstr "如果您確定沒有備份動作正在進行，移除檔案 \"%s\" 並重試?"
 
 # access/transam/xlog.c:5319 access/transam/xlog.c:5439
-#: access/transam/xlog.c:5319
-#: access/transam/xlog.c:5439
+#: access/transam/xlog.c:5343
+#: access/transam/xlog.c:5463
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "無法?入檔案 \"%s\": %m"
 
 # access/transam/xlog.c:5401
-#: access/transam/xlog.c:5401
+#: access/transam/xlog.c:5425
 msgid "a backup is not in progress"
 msgstr "有一個備份動作不在運行"
 
 # access/transam/xlog.c:5414 access/transam/xlog.c:5535
 # access/transam/xlog.c:5541 access/transam/xlog.c:5572
 # access/transam/xlog.c:5578
-#: access/transam/xlog.c:5414
-#: access/transam/xlog.c:5535
-#: access/transam/xlog.c:5541
-#: access/transam/xlog.c:5572
-#: access/transam/xlog.c:5578
+#: access/transam/xlog.c:5438
+#: access/transam/xlog.c:5559
+#: access/transam/xlog.c:5565
+#: access/transam/xlog.c:5596
+#: access/transam/xlog.c:5602
 #, c-format
 msgid "invalid data in file \"%s\""
 msgstr "歷史記錄檔 \"%s\" 中有無效資料"
 
+# access/transam/slru.c:452
+#: access/transam/slru.c:452
+#, c-format
+msgid "file \"%s\" doesn't exist, reading as zeroes"
+msgstr "檔案\"%s\"不存在，當成空檔案讀取"
+
+# access/transam/slru.c:637 access/transam/slru.c:644
+# access/transam/slru.c:651 access/transam/slru.c:658
+# access/transam/slru.c:665 access/transam/slru.c:672
+# access/transam/slru.c:679
+#: access/transam/slru.c:637
+#: access/transam/slru.c:644
+#: access/transam/slru.c:651
+#: access/transam/slru.c:658
+#: access/transam/slru.c:665
+#: access/transam/slru.c:672
+#: access/transam/slru.c:679
+#, c-format
+msgid "could not access status of transaction %u"
+msgstr "無法存取交易 %u 的狀態"
+
+# access/transam/slru.c:652
+#: access/transam/slru.c:652
+#, c-format
+msgid "could not seek in file \"%s\" to offset %u: %m"
+msgstr "無法移動至檔案\"%s\"的偏移位置 %u：%m"
+
+# access/transam/slru.c:659
+#: access/transam/slru.c:659
+#, c-format
+msgid "could not read from file \"%s\" at offset %u: %m"
+msgstr "無法讀取檔案\"%s\"於偏移位置 %u：%m"
+
+# access/transam/slru.c:666
+#: access/transam/slru.c:666
+#, c-format
+msgid "could not write to file \"%s\" at offset %u: %m"
+msgstr "無法寫入檔案\"%s\"於偏移位置 %u：%m"
+
+# access/transam/slru.c:862
+#: access/transam/slru.c:862
+#, c-format
+msgid "could not truncate directory \"%s\": apparent wraparound"
+msgstr ""
+
+# access/transam/slru.c:930 commands/tablespace.c:529
+# commands/tablespace.c:694 utils/adt/misc.c:174
+#: access/transam/slru.c:930
+#: commands/tablespace.c:528
+#: commands/tablespace.c:695
+#: utils/adt/misc.c:174
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "無法開啟目錄\"%s\"：%m"
+
+# access/transam/slru.c:948
+#: access/transam/slru.c:948
+#, c-format
+msgid "removing file \"%s\""
+msgstr "刪除檔案\"%s\""
+
+# access/transam/slru.c:967 commands/tablespace.c:577
+# commands/tablespace.c:721
+#: access/transam/slru.c:967
+#: commands/tablespace.c:576
+#: commands/tablespace.c:722
+#, c-format
+msgid "could not read directory \"%s\": %m"
+msgstr "無法讀取目錄\"%s\"：%m"
+
+# access/transam/xact.c:510
+#: access/transam/xact.c:510
+msgid "cannot have more than 2^32-1 commands in a transaction"
+msgstr "每筆交易不能超過2^32-1個命令"
+
+#  translator: %s represents an SQL statement name
+# access/transam/xact.c:2173
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2178
+#, c-format
+msgid "%s cannot run inside a transaction block"
+msgstr "%s 不能在交易中執行"
+
+#  translator: %s represents an SQL statement name
+# access/transam/xact.c:2183
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2188
+#, c-format
+msgid "%s cannot run inside a subtransaction"
+msgstr "%s 不能在子交易中執行"
+
+#  translator: %s represents an SQL statement name
+# access/transam/xact.c:2195
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2200
+#, c-format
+msgid "%s cannot be executed from a function"
+msgstr "%s 不能在函式中執行"
+
+#  translator: %s represents an SQL statement name
+# access/transam/xact.c:2246
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:2251
+#, c-format
+msgid "%s may only be used in transaction blocks"
+msgstr "%s 只能在交易中被使用"
+
+# access/transam/xact.c:2429
+#: access/transam/xact.c:2434
+msgid "there is already a transaction in progress"
+msgstr "已經有交易在執行中"
+
+# access/transam/xact.c:2544 access/transam/xact.c:2635
+#: access/transam/xact.c:2549
+#: access/transam/xact.c:2640
+msgid "there is no transaction in progress"
+msgstr "沒有執行中的交易"
+
+# access/transam/xact.c:2727 access/transam/xact.c:2776
+# access/transam/xact.c:2782 access/transam/xact.c:2826
+# access/transam/xact.c:2873 access/transam/xact.c:2879
+#: access/transam/xact.c:2732
+#: access/transam/xact.c:2781
+#: access/transam/xact.c:2787
+#: access/transam/xact.c:2831
+#: access/transam/xact.c:2878
+#: access/transam/xact.c:2884
+msgid "no such savepoint"
+msgstr "沒有這個savepoint"
+
+# access/transam/xact.c:3517
+#: access/transam/xact.c:3522
+msgid "cannot have more than 2^32-1 subtransactions in a transaction"
+msgstr "每筆交易不能擁有超過2^32-1個子交易"
+
 # bootstrap/bootstrap.c:299 postmaster/postmaster.c:495 tcop/postgres.c:2502
 #: bootstrap/bootstrap.c:299
 #: postmaster/postmaster.c:495
@@ -1382,6 +1391,202 @@ msgstr ""
 "  -o file          將除錯訊息寫入檔案\n"
 "  -x num           內部使用\n"
 
+# catalog/dependency.c:152
+#: catalog/dependency.c:152
+#, c-format
+msgid "cannot drop %s because other objects depend on it"
+msgstr "無法刪除 %s，因為有其它物件依存於它"
+
+# catalog/dependency.c:154
+#: catalog/dependency.c:154
+msgid "Use DROP ... CASCADE to drop the dependent objects too."
+msgstr "使用DROP ... CASCADE刪除依存物件。"
+
+# catalog/dependency.c:212
+#: catalog/dependency.c:212
+#, c-format
+msgid "failed to drop all objects depending on %s"
+msgstr "刪除所有依存於 %s 的物件失敗"
+
+# catalog/dependency.c:312 catalog/dependency.c:717
+#: catalog/dependency.c:312
+#: catalog/dependency.c:717
+#, c-format
+msgid "cannot drop %s because it is required by the database system"
+msgstr "無法刪除 %s，因為資料庫系統需要它"
+
+# catalog/dependency.c:451
+#: catalog/dependency.c:451
+#, c-format
+msgid "cannot drop %s because %s requires it"
+msgstr "無法刪除 %s，因為 %s 需要它"
+
+# catalog/dependency.c:453
+#: catalog/dependency.c:453
+#, c-format
+msgid "You may drop %s instead."
+msgstr "你可以改為刪除 %s。"
+
+# catalog/dependency.c:521 catalog/dependency.c:674 catalog/dependency.c:702
+#: catalog/dependency.c:521
+#: catalog/dependency.c:674
+#: catalog/dependency.c:702
+#, c-format
+msgid "drop auto-cascades to %s"
+msgstr ""
+
+# catalog/dependency.c:526 catalog/dependency.c:679
+#: catalog/dependency.c:526
+#: catalog/dependency.c:679
+#, c-format
+msgid "%s depends on %s"
+msgstr "%s 依存於 %s"
+
+# catalog/dependency.c:533 catalog/dependency.c:686
+#: catalog/dependency.c:533
+#: catalog/dependency.c:686
+#, c-format
+msgid "drop cascades to %s"
+msgstr ""
+
+# catalog/dependency.c:1427
+#: catalog/dependency.c:1427
+#, c-format
+msgid " column %s"
+msgstr ""
+
+# catalog/dependency.c:1433
+#: catalog/dependency.c:1433
+#, c-format
+msgid "function %s"
+msgstr "函式 %s"
+
+# catalog/dependency.c:1438
+#: catalog/dependency.c:1438
+#, c-format
+msgid "type %s"
+msgstr "型別 %s"
+
+# catalog/dependency.c:1468
+#: catalog/dependency.c:1468
+#, c-format
+msgid "cast from %s to %s"
+msgstr ""
+
+# catalog/dependency.c:1505
+#: catalog/dependency.c:1505
+#, c-format
+msgid "constraint %s on "
+msgstr ""
+
+# catalog/dependency.c:1511
+#: catalog/dependency.c:1511
+#, c-format
+msgid "constraint %s"
+msgstr ""
+
+# catalog/dependency.c:1530
+#: catalog/dependency.c:1530
+#, c-format
+msgid "conversion %s"
+msgstr ""
+
+# catalog/dependency.c:1567
+#: catalog/dependency.c:1567
+#, c-format
+msgid "default for %s"
+msgstr ""
+
+# catalog/dependency.c:1585
+#: catalog/dependency.c:1585
+#, c-format
+msgid "language %s"
+msgstr "語言 %s"
+
+# catalog/dependency.c:1592
+#: catalog/dependency.c:1592
+#, c-format
+msgid "operator %s"
+msgstr ""
+
+# catalog/dependency.c:1626
+#: catalog/dependency.c:1626
+#, c-format
+msgid "operator class %s for access method %s"
+msgstr ""
+
+# catalog/dependency.c:1662
+#: catalog/dependency.c:1662
+#, c-format
+msgid "rule %s on "
+msgstr ""
+
+# catalog/dependency.c:1697
+#: catalog/dependency.c:1697
+#, c-format
+msgid "trigger %s on "
+msgstr ""
+
+# catalog/dependency.c:1714
+#: catalog/dependency.c:1714
+#, c-format
+msgid "schema %s"
+msgstr ""
+
+# catalog/dependency.c:1758
+#: catalog/dependency.c:1758
+#, c-format
+msgid "table %s"
+msgstr "資料表 %s"
+
+# catalog/dependency.c:1762
+#: catalog/dependency.c:1762
+#, c-format
+msgid "index %s"
+msgstr "索引 %s"
+
+# catalog/dependency.c:1766
+#: catalog/dependency.c:1766
+#, c-format
+msgid "special system relation %s"
+msgstr "特別系統relation %s"
+
+# catalog/dependency.c:1770
+#: catalog/dependency.c:1770
+#, c-format
+msgid "sequence %s"
+msgstr ""
+
+# catalog/dependency.c:1774
+#: catalog/dependency.c:1774
+#, c-format
+msgid "uncataloged table %s"
+msgstr ""
+
+# catalog/dependency.c:1778
+#: catalog/dependency.c:1778
+#, c-format
+msgid "toast table %s"
+msgstr ""
+
+# catalog/dependency.c:1782
+#: catalog/dependency.c:1782
+#, c-format
+msgid "view %s"
+msgstr ""
+
+# catalog/dependency.c:1786
+#: catalog/dependency.c:1786
+#, c-format
+msgid "composite type %s"
+msgstr "複合型別 %s"
+
+# catalog/dependency.c:1791
+#: catalog/dependency.c:1791
+#, c-format
+msgid "relation %s"
+msgstr ""
+
 # catalog/aclchk.c:158
 #: catalog/aclchk.c:158
 msgid "grant options can only be granted to individual users"
@@ -1449,10 +1654,10 @@ msgstr "無效的 database 權限型別 %s"
 # utils/init/postinit.c:276
 #: catalog/aclchk.c:451
 #: commands/comment.c:458
-#: commands/dbcommands.c:549
-#: commands/dbcommands.c:673
-#: commands/dbcommands.c:768
-#: commands/dbcommands.c:842
+#: commands/dbcommands.c:550
+#: commands/dbcommands.c:682
+#: commands/dbcommands.c:777
+#: commands/dbcommands.c:851
 #: utils/adt/acl.c:1661
 #: utils/init/postinit.c:264
 #: utils/init/postinit.c:276
@@ -1530,11 +1735,11 @@ msgstr "無效的 tablespace 權限型別 %s"
 # commands/tablecmds.c:5384 commands/tablespace.c:429
 # commands/tablespace.c:823 commands/tablespace.c:890 utils/adt/acl.c:2489
 #: catalog/aclchk.c:1080
-#: commands/dbcommands.c:276
+#: commands/dbcommands.c:277
 #: commands/indexcmds.c:169
 #: commands/schemacmds.c:117
 #: commands/tablecmds.c:328
-#: commands/tablecmds.c:5388
+#: commands/tablecmds.c:5409
 #: commands/tablespace.c:428
 #: commands/tablespace.c:824
 #: commands/tablespace.c:891
@@ -1718,7 +1923,7 @@ msgstr "OID為 %u 的schema不存在"
 # catalog/aclchk.c:1761 catalog/aclchk.c:2039
 #: catalog/aclchk.c:1761
 #: catalog/aclchk.c:2039
-#: commands/tablecmds.c:5900
+#: commands/tablecmds.c:5921
 #, c-format
 msgid "tablespace with OID %u does not exist"
 msgstr "OID為 %u 的tablespace不存在"
@@ -1747,200 +1952,65 @@ msgstr "OID為 %u 的operator class不存在"
 msgid "conversion with OID %u does not exist"
 msgstr "OID為 %u 的conversion不存在"
 
-# catalog/dependency.c:152
-#: catalog/dependency.c:152
-#, c-format
-msgid "cannot drop %s because other objects depend on it"
-msgstr "無法刪除 %s，因為有其它物件依存於它"
-
-# catalog/dependency.c:154
-#: catalog/dependency.c:154
-msgid "Use DROP ... CASCADE to drop the dependent objects too."
-msgstr "使用DROP ... CASCADE刪除依存物件。"
-
-# catalog/dependency.c:212
-#: catalog/dependency.c:212
-#, c-format
-msgid "failed to drop all objects depending on %s"
-msgstr "刪除所有依存於 %s 的物件失敗"
-
-# catalog/dependency.c:312 catalog/dependency.c:717
-#: catalog/dependency.c:312
-#: catalog/dependency.c:717
-#, c-format
-msgid "cannot drop %s because it is required by the database system"
-msgstr "無法刪除 %s，因為資料庫系統需要它"
-
-# catalog/dependency.c:451
-#: catalog/dependency.c:451
-#, c-format
-msgid "cannot drop %s because %s requires it"
-msgstr "無法刪除 %s，因為 %s 需要它"
-
-# catalog/dependency.c:453
-#: catalog/dependency.c:453
-#, c-format
-msgid "You may drop %s instead."
-msgstr "你可以改為刪除 %s。"
-
-# catalog/dependency.c:521 catalog/dependency.c:674 catalog/dependency.c:702
-#: catalog/dependency.c:521
-#: catalog/dependency.c:674
-#: catalog/dependency.c:702
-#, c-format
-msgid "drop auto-cascades to %s"
-msgstr ""
-
-# catalog/dependency.c:526 catalog/dependency.c:679
-#: catalog/dependency.c:526
-#: catalog/dependency.c:679
-#, c-format
-msgid "%s depends on %s"
-msgstr "%s 依存於 %s"
-
-# catalog/dependency.c:533 catalog/dependency.c:686
-#: catalog/dependency.c:533
-#: catalog/dependency.c:686
-#, c-format
-msgid "drop cascades to %s"
-msgstr ""
-
-# catalog/dependency.c:1427
-#: catalog/dependency.c:1427
-#, c-format
-msgid " column %s"
-msgstr ""
-
-# catalog/dependency.c:1433
-#: catalog/dependency.c:1433
-#, c-format
-msgid "function %s"
-msgstr "函式 %s"
-
-# catalog/dependency.c:1438
-#: catalog/dependency.c:1438
-#, c-format
-msgid "type %s"
-msgstr "型別 %s"
-
-# catalog/dependency.c:1468
-#: catalog/dependency.c:1468
-#, c-format
-msgid "cast from %s to %s"
-msgstr ""
-
-# catalog/dependency.c:1505
-#: catalog/dependency.c:1505
-#, c-format
-msgid "constraint %s on "
-msgstr ""
-
-# catalog/dependency.c:1511
-#: catalog/dependency.c:1511
-#, c-format
-msgid "constraint %s"
-msgstr ""
-
-# catalog/dependency.c:1530
-#: catalog/dependency.c:1530
-#, c-format
-msgid "conversion %s"
-msgstr ""
-
-# catalog/dependency.c:1567
-#: catalog/dependency.c:1567
-#, c-format
-msgid "default for %s"
-msgstr ""
-
-# catalog/dependency.c:1585
-#: catalog/dependency.c:1585
-#, c-format
-msgid "language %s"
-msgstr "語言 %s"
-
-# catalog/dependency.c:1592
-#: catalog/dependency.c:1592
-#, c-format
-msgid "operator %s"
-msgstr ""
-
-# catalog/dependency.c:1626
-#: catalog/dependency.c:1626
-#, c-format
-msgid "operator class %s for access method %s"
-msgstr ""
-
-# catalog/dependency.c:1662
-#: catalog/dependency.c:1662
-#, c-format
-msgid "rule %s on "
-msgstr ""
+# catalog/pg_aggregate.c:80
+#: catalog/pg_aggregate.c:80
+msgid "cannot determine transition data type"
+msgstr "無法判斷交易資料型別"
 
-# catalog/dependency.c:1697
-#: catalog/dependency.c:1697
-#, c-format
-msgid "trigger %s on "
+# catalog/pg_aggregate.c:81
+#: catalog/pg_aggregate.c:81
+msgid "An aggregate using \"anyarray\" or \"anyelement\" as transition type must have one of them as its base type."
 msgstr ""
 
-# catalog/dependency.c:1714
-#: catalog/dependency.c:1714
+# catalog/pg_aggregate.c:110
+#: catalog/pg_aggregate.c:110
 #, c-format
-msgid "schema %s"
+msgid "return type of transition function %s is not %s"
 msgstr ""
 
-# catalog/dependency.c:1758
-#: catalog/dependency.c:1758
-#, c-format
-msgid "table %s"
-msgstr "資料表 %s"
-
-# catalog/dependency.c:1762
-#: catalog/dependency.c:1762
-#, c-format
-msgid "index %s"
-msgstr "索引 %s"
-
-# catalog/dependency.c:1766
-#: catalog/dependency.c:1766
-#, c-format
-msgid "special system relation %s"
-msgstr "特別系統relation %s"
-
-# catalog/dependency.c:1770
-#: catalog/dependency.c:1770
-#, c-format
-msgid "sequence %s"
+# catalog/pg_aggregate.c:132
+#: catalog/pg_aggregate.c:132
+msgid "must not omit initial value when transition function is strict and transition type is not compatible with input type"
 msgstr ""
 
-# catalog/dependency.c:1774
-#: catalog/dependency.c:1774
-#, c-format
-msgid "uncataloged table %s"
-msgstr ""
+# catalog/pg_aggregate.c:165 catalog/pg_proc.c:124 executor/functions.c:1082
+#: catalog/pg_aggregate.c:165
+#: catalog/pg_proc.c:124
+#: executor/functions.c:1082
+msgid "cannot determine result data type"
+msgstr "無法識別結果資料型別"
 
-# catalog/dependency.c:1778
-#: catalog/dependency.c:1778
-#, c-format
-msgid "toast table %s"
+# catalog/pg_aggregate.c:166
+#: catalog/pg_aggregate.c:166
+msgid "An aggregate returning \"anyarray\" or \"anyelement\" must have one of them as its base type."
 msgstr ""
 
-# catalog/dependency.c:1782
-#: catalog/dependency.c:1782
+# catalog/pg_aggregate.c:281 commands/typecmds.c:919 commands/typecmds.c:989
+# commands/typecmds.c:1021 commands/typecmds.c:1053 commands/typecmds.c:1077
+# parser/parse_func.c:203 parser/parse_func.c:1364
+#: catalog/pg_aggregate.c:281
+#: commands/typecmds.c:919
+#: commands/typecmds.c:989
+#: commands/typecmds.c:1021
+#: commands/typecmds.c:1053
+#: commands/typecmds.c:1077
+#: parser/parse_func.c:203
+#: parser/parse_func.c:1364
 #, c-format
-msgid "view %s"
-msgstr ""
+msgid "function %s does not exist"
+msgstr "函式 %s 不存在"
 
-# catalog/dependency.c:1786
-#: catalog/dependency.c:1786
+# catalog/pg_aggregate.c:286
+#: catalog/pg_aggregate.c:286
 #, c-format
-msgid "composite type %s"
-msgstr "複合型別 %s"
+msgid "function %s returns a set"
+msgstr "函式%s傳回一個set"
 
-# catalog/dependency.c:1791
-#: catalog/dependency.c:1791
+# catalog/pg_aggregate.c:317 catalog/pg_aggregate.c:326
+#: catalog/pg_aggregate.c:317
+#: catalog/pg_aggregate.c:326
 #, c-format
-msgid "relation %s"
+msgid "function %s requires run-time type coercion"
 msgstr ""
 
 # catalog/heap.c:221
@@ -2062,8 +2132,8 @@ msgstr "欄位\"%s\"是型別 %s，但是預設值expression是型別 %s"
 #: parser/analyze.c:2689
 #: parser/parse_node.c:247
 #: parser/parse_target.c:362
-#: parser/parse_target.c:570
-#: parser/parse_target.c:579
+#: parser/parse_target.c:572
+#: parser/parse_target.c:581
 #: rewrite/rewriteHandler.c:651
 msgid "You will need to rewrite or cast the expression."
 msgstr ""
@@ -2129,7 +2199,7 @@ msgstr ""
 # catalog/namespace.c:1195 parser/parse_expr.c:1157 parser/parse_target.c:725
 #: catalog/namespace.c:1195
 #: parser/parse_expr.c:1157
-#: parser/parse_target.c:725
+#: parser/parse_target.c:727
 #, c-format
 msgid "cross-database references are not implemented: %s"
 msgstr ""
@@ -2140,7 +2210,7 @@ msgstr ""
 #: gram.y:2516
 #: gram.y:7422
 #: parser/parse_expr.c:1183
-#: parser/parse_target.c:734
+#: parser/parse_target.c:736
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr ""
@@ -2157,66 +2227,15 @@ msgstr ""
 msgid "permission denied to create temporary tables in database \"%s\""
 msgstr ""
 
-# catalog/pg_aggregate.c:80
-#: catalog/pg_aggregate.c:80
-msgid "cannot determine transition data type"
-msgstr "無法判斷交易資料型別"
-
-# catalog/pg_aggregate.c:81
-#: catalog/pg_aggregate.c:81
-msgid "An aggregate using \"anyarray\" or \"anyelement\" as transition type must have one of them as its base type."
-msgstr ""
-
-# catalog/pg_aggregate.c:110
-#: catalog/pg_aggregate.c:110
-#, c-format
-msgid "return type of transition function %s is not %s"
-msgstr ""
-
-# catalog/pg_aggregate.c:132
-#: catalog/pg_aggregate.c:132
-msgid "must not omit initial value when transition function is strict and transition type is not compatible with input type"
-msgstr ""
-
-# catalog/pg_aggregate.c:165 catalog/pg_proc.c:124 executor/functions.c:1082
-#: catalog/pg_aggregate.c:165
-#: catalog/pg_proc.c:124
-#: executor/functions.c:1082
-msgid "cannot determine result data type"
-msgstr "無法識別結果資料型別"
-
-# catalog/pg_aggregate.c:166
-#: catalog/pg_aggregate.c:166
-msgid "An aggregate returning \"anyarray\" or \"anyelement\" must have one of them as its base type."
-msgstr ""
-
-# catalog/pg_aggregate.c:281 commands/typecmds.c:919 commands/typecmds.c:989
-# commands/typecmds.c:1021 commands/typecmds.c:1053 commands/typecmds.c:1077
-# parser/parse_func.c:203 parser/parse_func.c:1364
-#: catalog/pg_aggregate.c:281
-#: commands/typecmds.c:919
-#: commands/typecmds.c:989
-#: commands/typecmds.c:1021
-#: commands/typecmds.c:1053
-#: commands/typecmds.c:1077
-#: parser/parse_func.c:203
-#: parser/parse_func.c:1364
-#, c-format
-msgid "function %s does not exist"
-msgstr "函式 %s 不存在"
-
-# catalog/pg_aggregate.c:286
-#: catalog/pg_aggregate.c:286
-#, c-format
-msgid "function %s returns a set"
-msgstr "函式%s傳回一個set"
-
-# catalog/pg_aggregate.c:317 catalog/pg_aggregate.c:326
-#: catalog/pg_aggregate.c:317
-#: catalog/pg_aggregate.c:326
+# catalog/pg_largeobject.c:107 commands/comment.c:1151
+# storage/large_object/inv_api.c:197 storage/large_object/inv_api.c:312
+#: catalog/pg_largeobject.c:107
+#: commands/comment.c:1151
+#: storage/large_object/inv_api.c:197
+#: storage/large_object/inv_api.c:312
 #, c-format
-msgid "function %s requires run-time type coercion"
-msgstr ""
+msgid "large object %u does not exist"
+msgstr "large object %u不存在"
 
 # catalog/pg_conversion.c:66
 #: catalog/pg_conversion.c:66
@@ -2242,16 +2261,6 @@ msgstr ""
 msgid "conversion \"%s\" does not exist"
 msgstr "conversion \"%s\"不存在"
 
-# catalog/pg_largeobject.c:107 commands/comment.c:1151
-# storage/large_object/inv_api.c:197 storage/large_object/inv_api.c:312
-#: catalog/pg_largeobject.c:107
-#: commands/comment.c:1151
-#: storage/large_object/inv_api.c:197
-#: storage/large_object/inv_api.c:312
-#, c-format
-msgid "large object %u does not exist"
-msgstr "large object %u不存在"
-
 # catalog/pg_namespace.c:51 commands/schemacmds.c:281
 #: catalog/pg_namespace.c:51
 #: commands/schemacmds.c:281
@@ -2406,7 +2415,7 @@ msgstr "\"%s\"型別已經存在"
 # parser/parse_type.c:227 tcop/utility.c:97 utils/adt/regproc.c:1003
 #: catalog/pg_type.c:517
 #: commands/functioncmds.c:110
-#: commands/tablecmds.c:4592
+#: commands/tablecmds.c:4606
 #: commands/typecmds.c:423
 #: commands/typecmds.c:809
 #: commands/typecmds.c:1167
@@ -2470,12 +2479,12 @@ msgstr "函式%s已經存在於schema\"%s\""
 # commands/tablespace.c:912 commands/typecmds.c:2103
 #: commands/aggregatecmds.c:335
 #: commands/conversioncmds.c:213
-#: commands/dbcommands.c:866
+#: commands/dbcommands.c:875
 #: commands/functioncmds.c:773
 #: commands/opclasscmds.c:954
 #: commands/operatorcmds.c:303
 #: commands/schemacmds.c:348
-#: commands/tablecmds.c:5181
+#: commands/tablecmds.c:5202
 #: commands/tablespace.c:913
 #: commands/typecmds.c:2103
 msgid "must be superuser to change owner"
@@ -2500,7 +2509,7 @@ msgid "analyzing \"%s.%s\""
 msgstr "分析\"%s.%s\""
 
 # commands/analyze.c:916
-#: commands/analyze.c:916
+#: commands/analyze.c:914
 #, c-format
 msgid "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead rows; %d rows in sample, %.0f estimated total rows"
 msgstr ""
@@ -2513,7 +2522,7 @@ msgstr ""
 
 # commands/cluster.c:147 commands/tablecmds.c:5326
 #: commands/cluster.c:147
-#: commands/tablecmds.c:5330
+#: commands/tablecmds.c:5351
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr "索引\"%s\"於資料表\"%s\"不存在"
@@ -2554,7 +2563,25 @@ msgstr "\"%s\"是系統catalog"
 # commands/cluster.c:394
 #: commands/cluster.c:394
 msgid "cannot cluster temporary tables of other sessions"
-msgstr "無法cluster其它sessions的暫存資料表"
+msgstr "無法cluster其它sessions的暫存資疙表"
+
+# commands/conversioncmds.c:66
+#: commands/conversioncmds.c:66
+#, c-format
+msgid "source encoding \"%s\" does not exist"
+msgstr "來源編碼\"%s\"不存在"
+
+# commands/conversioncmds.c:73
+#: commands/conversioncmds.c:73
+#, c-format
+msgid "destination encoding \"%s\" does not exist"
+msgstr "目標編碼\"%s\"不存在"
+
+# commands/conversioncmds.c:151
+#: commands/conversioncmds.c:151
+#, c-format
+msgid "conversion \"%s\" already exists in schema \"%s\""
+msgstr "conversion \"%s\"已經存在於schema \"%s\""
 
 # commands/comment.c:334 commands/sequence.c:771 tcop/utility.c:83
 #: commands/comment.c:334
@@ -2602,11 +2629,11 @@ msgstr "\"%s\"不是view"
 #: commands/tablecmds.c:3315
 #: commands/tablecmds.c:3376
 #: commands/tablecmds.c:3442
-#: commands/tablecmds.c:4568
-#: commands/tablecmds.c:4705
-#: parser/parse_relation.c:1647
-#: parser/parse_relation.c:1705
-#: parser/parse_relation.c:1919
+#: commands/tablecmds.c:4582
+#: commands/tablecmds.c:4719
+#: parser/parse_relation.c:1641
+#: parser/parse_relation.c:1700
+#: parser/parse_relation.c:1913
 #: parser/parse_type.c:94
 #: utils/adt/ruleutils.c:1305
 #, c-format
@@ -2751,23 +2778,200 @@ msgstr ""
 msgid "must be owner of type %s or type %s"
 msgstr "必須是型別 %s 或型別 %s 的?有者"
 
-# commands/conversioncmds.c:66
-#: commands/conversioncmds.c:66
+# commands/copy.c:720 commands/copy.c:728 commands/copy.c:736
+# commands/copy.c:744 commands/copy.c:752 commands/copy.c:760
+# commands/copy.c:768 commands/copy.c:776 commands/copy.c:784
+# commands/dbcommands.c:107 commands/dbcommands.c:115
+# commands/dbcommands.c:123 commands/dbcommands.c:131
+# commands/functioncmds.c:228 commands/functioncmds.c:236
+# commands/functioncmds.c:244 commands/functioncmds.c:252
+# commands/functioncmds.c:260 commands/sequence.c:903 commands/sequence.c:916
+# commands/sequence.c:924 commands/sequence.c:932 commands/sequence.c:940
+# commands/sequence.c:948 commands/user.c:576 commands/user.c:588
+# commands/user.c:596 commands/user.c:604 commands/user.c:612
+# commands/user.c:620 commands/user.c:826 commands/user.c:838
+# commands/user.c:846 commands/user.c:854 commands/user.c:1356
+# commands/user.c:1364
+#: commands/copy.c:720
+#: commands/copy.c:728
+#: commands/copy.c:736
+#: commands/copy.c:744
+#: commands/copy.c:752
+#: commands/copy.c:760
+#: commands/copy.c:768
+#: commands/copy.c:776
+#: commands/copy.c:784
+#: commands/dbcommands.c:108
+#: commands/dbcommands.c:116
+#: commands/dbcommands.c:124
+#: commands/dbcommands.c:132
+#: commands/functioncmds.c:228
+#: commands/functioncmds.c:236
+#: commands/functioncmds.c:244
+#: commands/functioncmds.c:252
+#: commands/functioncmds.c:260
+#: commands/sequence.c:903
+#: commands/sequence.c:916
+#: commands/sequence.c:924
+#: commands/sequence.c:932
+#: commands/sequence.c:940
+#: commands/sequence.c:948
+#: commands/user.c:576
+#: commands/user.c:588
+#: commands/user.c:596
+#: commands/user.c:604
+#: commands/user.c:612
+#: commands/user.c:620
+#: commands/user.c:826
+#: commands/user.c:838
+#: commands/user.c:846
+#: commands/user.c:854
+#: commands/user.c:1356
+#: commands/user.c:1364
+msgid "conflicting or redundant options"
+msgstr "選項衝突或重覆"
+
+# commands/dbcommands.c:138
+#: commands/dbcommands.c:139
+msgid "LOCATION is not supported anymore"
+msgstr "LOCATION已不被支援"
+
+# commands/dbcommands.c:139
+#: commands/dbcommands.c:140
+msgid "Consider using tablespaces instead."
+msgstr "請考慮改用taplespace。"
+
+# commands/dbcommands.c:162
+#: commands/dbcommands.c:163
 #, c-format
-msgid "source encoding \"%s\" does not exist"
-msgstr "來源編碼\"%s\"不存在"
+msgid "%d is not a valid encoding code"
+msgstr "%d 不是有效的編碼代碼"
 
-# commands/conversioncmds.c:73
-#: commands/conversioncmds.c:73
+# commands/dbcommands.c:171
+#: commands/dbcommands.c:172
 #, c-format
-msgid "destination encoding \"%s\" does not exist"
-msgstr "目標編碼\"%s\"不存在"
+msgid "%s is not a valid encoding name"
+msgstr "%s 不是有效的編碼名稱"
 
-# commands/conversioncmds.c:151
-#: commands/conversioncmds.c:151
+# commands/dbcommands.c:192
+#: commands/dbcommands.c:193
+msgid "permission denied to create database"
+msgstr "建立資料庫被拒"
+
+# commands/dbcommands.c:201
+#: commands/dbcommands.c:202
+msgid "must be superuser to create database for another user"
+msgstr "只有管理者能為其他使用者建立資料庫"
+
+# commands/dbcommands.c:215 commands/dbcommands.c:429
+# commands/dbcommands.c:678
+#: commands/dbcommands.c:216
+#: commands/dbcommands.c:458
+#: commands/dbcommands.c:715
 #, c-format
-msgid "conversion \"%s\" already exists in schema \"%s\""
-msgstr "conversion \"%s\"已經存在於schema \"%s\""
+msgid "database \"%s\" already exists"
+msgstr "資料庫\"%s\"已經存在"
+
+# commands/dbcommands.c:228
+#: commands/dbcommands.c:229
+#, c-format
+msgid "template database \"%s\" does not exist"
+msgstr "範本資料庫\"%s\"不存在"
+
+# commands/dbcommands.c:239
+#: commands/dbcommands.c:240
+#, c-format
+msgid "permission denied to copy database \"%s\""
+msgstr "複製?料庫\"%s\"被拒"
+
+# commands/dbcommands.c:252
+#: commands/dbcommands.c:253
+#, c-format
+msgid "source database \"%s\" is being accessed by other users"
+msgstr "來源資料庫\"%s\"正在被其他使用者存取"
+
+# commands/dbcommands.c:263
+#: commands/dbcommands.c:264
+#, c-format
+msgid "invalid server encoding %d"
+msgstr "不合法的伺服器編碼 %d"
+
+# commands/tablespace.c:227
+#: commands/dbcommands.c:310
+#, c-format
+msgid "cannot assign new default tablespace \"%s\""
+msgstr "無法指定新的預設tablespace \"%s\""
+
+#: commands/dbcommands.c:312
+#, c-format
+msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
+msgstr ""
+
+# commands/dbcommands.c:354 commands/dbcommands.c:375
+# commands/dbcommands.c:385 commands/dbcommands.c:1161
+# commands/dbcommands.c:1169
+#: commands/dbcommands.c:382
+#: commands/dbcommands.c:404
+#: commands/dbcommands.c:414
+#: commands/dbcommands.c:1198
+#: commands/dbcommands.c:1206
+msgid "could not initialize database directory"
+msgstr "無法初始化資料庫目錄"
+
+# commands/dbcommands.c:355
+#: commands/dbcommands.c:383
+#, c-format
+msgid "Directory \"%s\" already exists."
+msgstr "目錄\"%s\"已經存在。"
+
+# commands/dbcommands.c:376 commands/dbcommands.c:1162
+#: commands/dbcommands.c:405
+#: commands/dbcommands.c:1199
+#, c-format
+msgid "Failing system command was: %s"
+msgstr "失敗的系統命令是：%s"
+
+# commands/dbcommands.c:377 commands/dbcommands.c:1163
+#: commands/dbcommands.c:406
+#: commands/dbcommands.c:1200
+msgid "Look in the postmaster's stderr log for more information."
+msgstr "請檢查postmaster的stderr記錄取得更多資訊。"
+
+# commands/dbcommands.c:504
+#: commands/dbcommands.c:533
+msgid "cannot drop the currently open database"
+msgstr "無法刪除目前正在開啟的資料庫"
+
+# commands/dbcommands.c:535
+#: commands/dbcommands.c:564
+msgid "cannot drop a template database"
+msgstr "無法刪資範本資料庫"
+
+# commands/dbcommands.c:543 commands/dbcommands.c:665
+#: commands/dbcommands.c:572
+#: commands/dbcommands.c:702
+#, c-format
+msgid "database \"%s\" is being accessed by other users"
+msgstr "資料庫\"%s\"正在被其他使用者存取"
+
+# commands/dbcommands.c:656
+#: commands/dbcommands.c:693
+msgid "current database may not be renamed"
+msgstr "無法變更目前資料庫名稱"
+
+# commands/dbcommands.c:690
+#: commands/dbcommands.c:727
+msgid "permission denied to rename database"
+msgstr "重新命名資料庫被拒"
+
+# commands/dbcommands.c:998 commands/dbcommands.c:1135
+# commands/dbcommands.c:1185
+#: commands/dbcommands.c:1035
+#: commands/dbcommands.c:1172
+#: commands/dbcommands.c:1222
+#, c-format
+msgid "could not remove database directory \"%s\""
+msgstr "無法刪除資料庫目錄\"%s\""
 
 # commands/copy.c:204 commands/copy.c:216 commands/copy.c:249
 # commands/copy.c:259
@@ -2815,59 +3019,6 @@ msgstr "從標準輸入COPY失敗：%s"
 msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr ""
 
-# commands/copy.c:720 commands/copy.c:728 commands/copy.c:736
-# commands/copy.c:744 commands/copy.c:752 commands/copy.c:760
-# commands/copy.c:768 commands/copy.c:776 commands/copy.c:784
-# commands/dbcommands.c:107 commands/dbcommands.c:115
-# commands/dbcommands.c:123 commands/dbcommands.c:131
-# commands/functioncmds.c:228 commands/functioncmds.c:236
-# commands/functioncmds.c:244 commands/functioncmds.c:252
-# commands/functioncmds.c:260 commands/sequence.c:903 commands/sequence.c:916
-# commands/sequence.c:924 commands/sequence.c:932 commands/sequence.c:940
-# commands/sequence.c:948 commands/user.c:576 commands/user.c:588
-# commands/user.c:596 commands/user.c:604 commands/user.c:612
-# commands/user.c:620 commands/user.c:826 commands/user.c:838
-# commands/user.c:846 commands/user.c:854 commands/user.c:1356
-# commands/user.c:1364
-#: commands/copy.c:720
-#: commands/copy.c:728
-#: commands/copy.c:736
-#: commands/copy.c:744
-#: commands/copy.c:752
-#: commands/copy.c:760
-#: commands/copy.c:768
-#: commands/copy.c:776
-#: commands/copy.c:784
-#: commands/dbcommands.c:107
-#: commands/dbcommands.c:115
-#: commands/dbcommands.c:123
-#: commands/dbcommands.c:131
-#: commands/functioncmds.c:228
-#: commands/functioncmds.c:236
-#: commands/functioncmds.c:244
-#: commands/functioncmds.c:252
-#: commands/functioncmds.c:260
-#: commands/sequence.c:903
-#: commands/sequence.c:916
-#: commands/sequence.c:924
-#: commands/sequence.c:932
-#: commands/sequence.c:940
-#: commands/sequence.c:948
-#: commands/user.c:576
-#: commands/user.c:588
-#: commands/user.c:596
-#: commands/user.c:604
-#: commands/user.c:612
-#: commands/user.c:620
-#: commands/user.c:826
-#: commands/user.c:838
-#: commands/user.c:846
-#: commands/user.c:854
-#: commands/user.c:1356
-#: commands/user.c:1364
-msgid "conflicting or redundant options"
-msgstr "選項衝突或重覆"
-
 # commands/copy.c:795
 #: commands/copy.c:795
 msgid "cannot specify DELIMITER in BINARY mode"
@@ -3041,6 +3192,7 @@ msgstr ""
 
 # commands/copy.c:1389
 #: commands/copy.c:1389
+#: commands/copy.c:1422
 #, c-format
 msgid "COPY %s, line %d"
 msgstr ""
@@ -3052,88 +3204,88 @@ msgid "COPY %s, line %d, column %s: \"%s\""
 msgstr ""
 
 # commands/copy.c:1424
-#: commands/copy.c:1424
+#: commands/copy.c:1408
 #, c-format
 msgid "COPY %s, line %d: \"%s\""
 msgstr ""
 
 # commands/copy.c:1637
-#: commands/copy.c:1637
+#: commands/copy.c:1634
 msgid "COPY file signature not recognized"
 msgstr ""
 
 # commands/copy.c:1643
-#: commands/copy.c:1643
+#: commands/copy.c:1640
 msgid "invalid COPY file header (missing flags)"
 msgstr "無效的COPY檔案header(缺少旗標)"
 
 # commands/copy.c:1649
-#: commands/copy.c:1649
+#: commands/copy.c:1646
 msgid "unrecognized critical flags in COPY file header"
 msgstr ""
 
 # commands/copy.c:1655
-#: commands/copy.c:1655
+#: commands/copy.c:1652
 msgid "invalid COPY file header (missing length)"
 msgstr "無效的COPY檔案header(缺少長度)"
 
 # commands/copy.c:1663
-#: commands/copy.c:1663
+#: commands/copy.c:1660
 msgid "invalid COPY file header (wrong length)"
 msgstr "無效的COPY檔案header(長度不正確)"
 
 # commands/copy.c:1742
-#: commands/copy.c:1742
+#: commands/copy.c:1739
 msgid "null OID in COPY data"
 msgstr "COPY資料中有空OID"
 
 # commands/copy.c:1751 commands/copy.c:1848
-#: commands/copy.c:1751
-#: commands/copy.c:1848
+#: commands/copy.c:1748
+#: commands/copy.c:1845
 msgid "invalid OID in COPY data"
 msgstr "COPY資料中有無效的OID"
 
 # commands/copy.c:1771
-#: commands/copy.c:1771
+#: commands/copy.c:1768
 #, c-format
 msgid "missing data for column \"%s\""
 msgstr "欄位\"%s\"缺少資料"
 
 # commands/copy.c:1781
-#: commands/copy.c:1781
+#: commands/copy.c:1778
 msgid "unterminated CSV quoted field"
 msgstr ""
 
 # commands/copy.c:1816
-#: commands/copy.c:1816
+#: commands/copy.c:1813
 msgid "extra data after last expected column"
 msgstr ""
 
 # commands/copy.c:1834
-#: commands/copy.c:1834
+#: commands/copy.c:1831
 #, c-format
 msgid "row field count is %d, expected %d"
 msgstr ""
 
 # commands/copy.c:2056 commands/copy.c:2074
-#: commands/copy.c:2056
-#: commands/copy.c:2074
+#: commands/copy.c:2053
+#: commands/copy.c:2071
 msgid "literal carriage return found in data"
 msgstr "資料裡含有歸位(carriage return)實量"
 
 # commands/copy.c:2057 commands/copy.c:2075
-#: commands/copy.c:2057
-#: commands/copy.c:2075
+#: commands/copy.c:2054
+#: commands/copy.c:2072
 msgid "Use \"\\r\" to represent carriage return."
 msgstr "使用 \"\\r\" 表示歸位(carriage return)。"
 
 # commands/copy.c:2092
-#: commands/copy.c:2092
+#: commands/copy.c:2089
 msgid "literal newline found in data"
 msgstr "資料裡含有換行(newline)實量"
 
 # commands/copy.c:2093
-#: commands/copy.c:2093
+#: commands/copy.c:2090
 msgid ""
 "Use \"\\n"
 "\" to represent newline."
@@ -3142,233 +3294,41 @@ msgstr ""
 "\" 表示換行(newline)。"
 
 # commands/copy.c:2113 commands/copy.c:2129
-#: commands/copy.c:2113
-#: commands/copy.c:2129
+#: commands/copy.c:2110
+#: commands/copy.c:2126
 msgid "end-of-copy marker does not match previous newline style"
 msgstr ""
 
 # commands/copy.c:2117 commands/copy.c:2123
-#: commands/copy.c:2117
-#: commands/copy.c:2123
+#: commands/copy.c:2114
+#: commands/copy.c:2120
 msgid "end-of-copy marker corrupt"
 msgstr ""
 
 # commands/copy.c:2494 commands/copy.c:2516
-#: commands/copy.c:2494
-#: commands/copy.c:2516
+#: commands/copy.c:2485
+#: commands/copy.c:2507
 msgid "unexpected EOF in COPY data"
 msgstr ""
 
 # commands/copy.c:2503
-#: commands/copy.c:2503
+#: commands/copy.c:2494
 msgid "invalid field size"
 msgstr "無效的field大小"
 
 # commands/copy.c:2530
-#: commands/copy.c:2530
+#: commands/copy.c:2521
 msgid "incorrect binary data format"
 msgstr "不正確的binary資料格式"
 
 # commands/copy.c:2716 parser/parse_target.c:648 parser/parse_target.c:658
-#: commands/copy.c:2716
-#: parser/parse_target.c:648
-#: parser/parse_target.c:658
+#: commands/copy.c:2707
+#: parser/parse_target.c:650
+#: parser/parse_target.c:660
 #, c-format
 msgid "column \"%s\" specified more than once"
 msgstr "欄位\"%s\"被指定多次"
 
-# commands/dbcommands.c:138
-#: commands/dbcommands.c:138
-msgid "LOCATION is not supported anymore"
-msgstr "LOCATION已不被支援"
-
-# commands/dbcommands.c:139
-#: commands/dbcommands.c:139
-msgid "Consider using tablespaces instead."
-msgstr "請考慮改用taplespace。"
-
-# commands/dbcommands.c:162
-#: commands/dbcommands.c:162
-#, c-format
-msgid "%d is not a valid encoding code"
-msgstr "%d 不是有效的編碼代碼"
-
-# commands/dbcommands.c:171
-#: commands/dbcommands.c:171
-#, c-format
-msgid "%s is not a valid encoding name"
-msgstr "%s 不是有效的編碼名稱"
-
-# commands/dbcommands.c:192
-#: commands/dbcommands.c:192
-msgid "permission denied to create database"
-msgstr "建立資料庫被拒"
-
-# commands/dbcommands.c:201
-#: commands/dbcommands.c:201
-msgid "must be superuser to create database for another user"
-msgstr "只有管理者能為其他使用者建立資料庫"
-
-# commands/dbcommands.c:215 commands/dbcommands.c:429
-# commands/dbcommands.c:678
-#: commands/dbcommands.c:215
-#: commands/dbcommands.c:457
-#: commands/dbcommands.c:706
-#, c-format
-msgid "database \"%s\" already exists"
-msgstr "資料庫\"%s\"已經存在"
-
-# commands/dbcommands.c:228
-#: commands/dbcommands.c:228
-#, c-format
-msgid "template database \"%s\" does not exist"
-msgstr "範本資料庫\"%s\"不存在"
-
-# commands/dbcommands.c:239
-#: commands/dbcommands.c:239
-#, c-format
-msgid "permission denied to copy database \"%s\""
-msgstr "複製?料庫\"%s\"被拒"
-
-# commands/dbcommands.c:252
-#: commands/dbcommands.c:252
-#, c-format
-msgid "source database \"%s\" is being accessed by other users"
-msgstr "來源資料庫\"%s\"正在被其他使用者存取"
-
-# commands/dbcommands.c:263
-#: commands/dbcommands.c:263
-#, c-format
-msgid "invalid server encoding %d"
-msgstr "不合法的伺服器編碼 %d"
-
-# commands/tablespace.c:227
-#: commands/dbcommands.c:309
-#, c-format
-msgid "cannot assign new default tablespace \"%s\""
-msgstr "無法指定新的預設tablespace \"%s\""
-
-#: commands/dbcommands.c:311
-#, c-format
-msgid "There is a conflict because database \"%s\" already has some tables in this tablespace."
-msgstr ""
-
-# commands/dbcommands.c:354 commands/dbcommands.c:375
-# commands/dbcommands.c:385 commands/dbcommands.c:1161
-# commands/dbcommands.c:1169
-#: commands/dbcommands.c:381
-#: commands/dbcommands.c:403
-#: commands/dbcommands.c:413
-#: commands/dbcommands.c:1189
-#: commands/dbcommands.c:1197
-msgid "could not initialize database directory"
-msgstr "無法初始化資料庫目錄"
-
-# commands/dbcommands.c:355
-#: commands/dbcommands.c:382
-#, c-format
-msgid "Directory \"%s\" already exists."
-msgstr "目錄\"%s\"已經存在。"
-
-# commands/dbcommands.c:376 commands/dbcommands.c:1162
-#: commands/dbcommands.c:404
-#: commands/dbcommands.c:1190
-#, c-format
-msgid "Failing system command was: %s"
-msgstr "失敗的系統命令是：%s"
-
-# commands/dbcommands.c:377 commands/dbcommands.c:1163
-#: commands/dbcommands.c:405
-#: commands/dbcommands.c:1191
-msgid "Look in the postmaster's stderr log for more information."
-msgstr "請檢查postmaster的stderr記錄取得更多資訊。"
-
-# commands/dbcommands.c:504
-#: commands/dbcommands.c:532
-msgid "cannot drop the currently open database"
-msgstr "無法刪除目前正在開啟的資料庫"
-
-# commands/dbcommands.c:535
-#: commands/dbcommands.c:563
-msgid "cannot drop a template database"
-msgstr "無法刪資範本資料庫"
-
-# commands/dbcommands.c:543 commands/dbcommands.c:665
-#: commands/dbcommands.c:571
-#: commands/dbcommands.c:693
-#, c-format
-msgid "database \"%s\" is being accessed by other users"
-msgstr "資料庫\"%s\"正在被其他使用者存取"
-
-# commands/dbcommands.c:656
-#: commands/dbcommands.c:684
-msgid "current database may not be renamed"
-msgstr "無法變更目前資料庫名稱"
-
-# commands/dbcommands.c:690
-#: commands/dbcommands.c:718
-msgid "permission denied to rename database"
-msgstr "重新命名資料庫被拒"
-
-# commands/dbcommands.c:998 commands/dbcommands.c:1135
-# commands/dbcommands.c:1185
-#: commands/dbcommands.c:1026
-#: commands/dbcommands.c:1163
-#: commands/dbcommands.c:1213
-#, c-format
-msgid "could not remove database directory \"%s\""
-msgstr "無法刪除資料庫目錄\"%s\""
-
-# commands/define.c:66 commands/define.c:183 commands/define.c:215
-# commands/define.c:249
-#: commands/define.c:66
-#: commands/define.c:183
-#: commands/define.c:215
-#: commands/define.c:249
-#, c-format
-msgid "%s requires a parameter"
-msgstr "%s需要一個參數"
-
-# commands/define.c:105 commands/define.c:116 commands/define.c:150
-# commands/define.c:168
-#: commands/define.c:105
-#: commands/define.c:116
-#: commands/define.c:150
-#: commands/define.c:168
-#, c-format
-msgid "%s requires a numeric value"
-msgstr "%s需要一個numeric值"
-
-# commands/define.c:136
-#: commands/define.c:136
-#, c-format
-msgid "%s does not take a parameter"
-msgstr "%s不需要參數"
-
-# commands/define.c:197
-#: commands/define.c:197
-#, c-format
-msgid "argument of %s must be a name"
-msgstr "%s的引數必需是名稱"
-
-# commands/define.c:233
-#: commands/define.c:233
-#, c-format
-msgid "argument of %s must be a type name"
-msgstr "%s的引數必需是型別名稱"
-
-# commands/define.c:258
-#: commands/define.c:258
-#, c-format
-msgid "%s requires an integer value"
-msgstr "%s需要一個整數"
-
-# commands/define.c:279
-#: commands/define.c:279
-#, c-format
-msgid "invalid argument for %s: \"%s\""
-msgstr "給 %s 的引數不合法：\"%s\""
-
 # commands/functioncmds.c:84
 #: commands/functioncmds.c:84
 #, c-format
@@ -3559,6 +3519,150 @@ msgstr ""
 msgid "cast from type %s to type %s already exists"
 msgstr ""
 
+# commands/define.c:66 commands/define.c:183 commands/define.c:215
+# commands/define.c:249
+#: commands/define.c:66
+#: commands/define.c:183
+#: commands/define.c:215
+#: commands/define.c:249
+#, c-format
+msgid "%s requires a parameter"
+msgstr "%s需要一個參數"
+
+# commands/define.c:105 commands/define.c:116 commands/define.c:150
+# commands/define.c:168
+#: commands/define.c:105
+#: commands/define.c:116
+#: commands/define.c:150
+#: commands/define.c:168
+#, c-format
+msgid "%s requires a numeric value"
+msgstr "%s需要一個numeric值"
+
+# commands/define.c:136
+#: commands/define.c:136
+#, c-format
+msgid "%s does not take a parameter"
+msgstr "%s不需要參數"
+
+# commands/define.c:197
+#: commands/define.c:197
+#, c-format
+msgid "argument of %s must be a name"
+msgstr "%s的引數必需是名稱"
+
+# commands/define.c:233
+#: commands/define.c:233
+#, c-format
+msgid "argument of %s must be a type name"
+msgstr "%s的引數必需是型別名稱"
+
+# commands/define.c:258
+#: commands/define.c:258
+#, c-format
+msgid "%s requires an integer value"
+msgstr "%s需要一個整數"
+
+# commands/define.c:279
+#: commands/define.c:279
+#, c-format
+msgid "invalid argument for %s: \"%s\""
+msgstr "給 %s 的引數不合法：\"%s\""
+
+# commands/opclasscmds.c:129
+#: commands/opclasscmds.c:129
+msgid "must be superuser to create an operator class"
+msgstr "只有管理者能建立operator class"
+
+# commands/opclasscmds.c:166
+#: commands/opclasscmds.c:166
+#, c-format
+msgid "invalid operator number %d, must be between 1 and %d"
+msgstr ""
+
+# commands/opclasscmds.c:204
+#: commands/opclasscmds.c:204
+#, c-format
+msgid "invalid procedure number %d, must be between 1 and %d"
+msgstr ""
+
+# commands/opclasscmds.c:226
+#: commands/opclasscmds.c:226
+msgid "storage type specified more than once"
+msgstr ""
+
+# commands/opclasscmds.c:253
+#: commands/opclasscmds.c:253
+#, c-format
+msgid "storage type may not be different from data type for access method \"%s\""
+msgstr ""
+
+# commands/opclasscmds.c:271
+#: commands/opclasscmds.c:271
+#, c-format
+msgid "operator class \"%s\" for access method \"%s\" already exists"
+msgstr ""
+
+# commands/opclasscmds.c:300
+#: commands/opclasscmds.c:300
+#, c-format
+msgid "could not make operator class \"%s\" be default for type %s"
+msgstr ""
+
+# commands/opclasscmds.c:303
+#: commands/opclasscmds.c:303
+#, c-format
+msgid "Operator class \"%s\" already is the default."
+msgstr "operator class \"%s\"已經是預設的。"
+
+# commands/opclasscmds.c:430
+#: commands/opclasscmds.c:430
+msgid "btree operators must be binary"
+msgstr "btree operators必須是binary"
+
+# commands/opclasscmds.c:434
+#: commands/opclasscmds.c:434
+msgid "btree operators must return boolean"
+msgstr "btree operators必須傳回boolean"
+
+# commands/opclasscmds.c:438
+#: commands/opclasscmds.c:438
+msgid "btree operators must have index type as left input"
+msgstr ""
+
+# commands/opclasscmds.c:484
+#: commands/opclasscmds.c:484
+msgid "btree procedures must have two arguments"
+msgstr ""
+
+# commands/opclasscmds.c:488
+#: commands/opclasscmds.c:488
+msgid "btree procedures must return integer"
+msgstr ""
+
+# commands/opclasscmds.c:492
+#: commands/opclasscmds.c:492
+msgid "btree procedures must have index type as first input"
+msgstr ""
+
+# commands/opclasscmds.c:525
+#: commands/opclasscmds.c:525
+#, c-format
+msgid "procedure number %d appears more than once"
+msgstr ""
+
+# commands/opclasscmds.c:530
+#: commands/opclasscmds.c:530
+#, c-format
+msgid "operator number %d appears more than once"
+msgstr ""
+
+# commands/opclasscmds.c:854
+#: commands/opclasscmds.c:854
+#, c-format
+msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
+msgstr ""
+
 # commands/indexcmds.c:119
 #: commands/indexcmds.c:119
 msgid "must specify at least one column"
@@ -3698,98 +3802,33 @@ msgstr "只能重新索引目前開啟的資料庫"
 msgid "table \"%s\" was reindexed"
 msgstr "資料表\"%s\"已重新索引"
 
-# commands/opclasscmds.c:129
-#: commands/opclasscmds.c:129
-msgid "must be superuser to create an operator class"
-msgstr "只有管理者能建立operator class"
-
-# commands/opclasscmds.c:166
-#: commands/opclasscmds.c:166
-#, c-format
-msgid "invalid operator number %d, must be between 1 and %d"
-msgstr ""
-
-# commands/opclasscmds.c:204
-#: commands/opclasscmds.c:204
-#, c-format
-msgid "invalid procedure number %d, must be between 1 and %d"
-msgstr ""
-
-# commands/opclasscmds.c:226
-#: commands/opclasscmds.c:226
-msgid "storage type specified more than once"
-msgstr ""
-
-# commands/opclasscmds.c:253
-#: commands/opclasscmds.c:253
-#, c-format
-msgid "storage type may not be different from data type for access method \"%s\""
-msgstr ""
-
-# commands/opclasscmds.c:271
-#: commands/opclasscmds.c:271
-#, c-format
-msgid "operator class \"%s\" for access method \"%s\" already exists"
-msgstr ""
-
-# commands/opclasscmds.c:300
-#: commands/opclasscmds.c:300
-#, c-format
-msgid "could not make operator class \"%s\" be default for type %s"
-msgstr ""
-
-# commands/opclasscmds.c:303
-#: commands/opclasscmds.c:303
-#, c-format
-msgid "Operator class \"%s\" already is the default."
-msgstr "operator class \"%s\"已經是預設的。"
-
-# commands/opclasscmds.c:430
-#: commands/opclasscmds.c:430
-msgid "btree operators must be binary"
-msgstr "btree operators必須是binary"
-
-# commands/opclasscmds.c:434
-#: commands/opclasscmds.c:434
-msgid "btree operators must return boolean"
-msgstr "btree operators必須傳回boolean"
-
-# commands/opclasscmds.c:438
-#: commands/opclasscmds.c:438
-msgid "btree operators must have index type as left input"
-msgstr ""
-
-# commands/opclasscmds.c:484
-#: commands/opclasscmds.c:484
-msgid "btree procedures must have two arguments"
-msgstr ""
-
-# commands/opclasscmds.c:488
-#: commands/opclasscmds.c:488
-msgid "btree procedures must return integer"
+# commands/prepare.c:61
+#: commands/prepare.c:61
+msgid "invalid statement name: must not be empty"
 msgstr ""
 
-# commands/opclasscmds.c:492
-#: commands/opclasscmds.c:492
-msgid "btree procedures must have index type as first input"
+# commands/prepare.c:80
+#: commands/prepare.c:80
+msgid "utility statements cannot be prepared"
 msgstr ""
 
-# commands/opclasscmds.c:525
-#: commands/opclasscmds.c:525
-#, c-format
-msgid "procedure number %d appears more than once"
+# commands/prepare.c:168 commands/prepare.c:173 commands/prepare.c:538
+#: commands/prepare.c:168
+#: commands/prepare.c:173
+#: commands/prepare.c:535
+msgid "prepared statement is not a SELECT"
 msgstr ""
 
-# commands/opclasscmds.c:530
-#: commands/opclasscmds.c:530
+# commands/prepare.c:310
+#: commands/prepare.c:307
 #, c-format
-msgid "operator number %d appears more than once"
+msgid "prepared statement \"%s\" already exists"
 msgstr ""
 
-# commands/opclasscmds.c:854
-#: commands/opclasscmds.c:854
+# commands/prepare.c:390
+#: commands/prepare.c:387
 #, c-format
-msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
+msgid "prepared statement \"%s\" does not exist"
 msgstr ""
 
 # commands/operatorcmds.c:107 commands/operatorcmds.c:115
@@ -3852,229 +3891,6 @@ msgstr ""
 msgid "could not reposition held cursor"
 msgstr "無法重新定位持有的cursor"
 
-# commands/prepare.c:61
-#: commands/prepare.c:61
-msgid "invalid statement name: must not be empty"
-msgstr ""
-
-# commands/prepare.c:80
-#: commands/prepare.c:80
-msgid "utility statements cannot be prepared"
-msgstr ""
-
-# commands/prepare.c:168 commands/prepare.c:173 commands/prepare.c:538
-#: commands/prepare.c:168
-#: commands/prepare.c:173
-#: commands/prepare.c:538
-msgid "prepared statement is not a SELECT"
-msgstr ""
-
-# commands/prepare.c:310
-#: commands/prepare.c:310
-#, c-format
-msgid "prepared statement \"%s\" already exists"
-msgstr ""
-
-# commands/prepare.c:390
-#: commands/prepare.c:390
-#, c-format
-msgid "prepared statement \"%s\" does not exist"
-msgstr ""
-
-# commands/proclang.c:64
-#: commands/proclang.c:64
-msgid "must be superuser to create procedural language"
-msgstr ""
-
-# commands/proclang.c:77 commands/proclang.c:265
-#: commands/proclang.c:77
-#: commands/proclang.c:265
-#, c-format
-msgid "language \"%s\" already exists"
-msgstr "語言\"%s\"已經存在"
-
-# commands/proclang.c:97
-#: commands/proclang.c:97
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to \"language_handler\""
-msgstr ""
-
-# commands/proclang.c:104
-#: commands/proclang.c:104
-#, c-format
-msgid "function %s must return type \"language_handler\""
-msgstr ""
-
-# commands/proclang.c:188
-#: commands/proclang.c:188
-msgid "must be superuser to drop procedural language"
-msgstr ""
-
-# commands/proclang.c:271
-#: commands/proclang.c:271
-msgid "must be superuser to rename procedural language"
-msgstr ""
-
-# commands/schemacmds.c:86 commands/user.c:883 commands/user.c:1018
-#: commands/schemacmds.c:86
-#: commands/user.c:883
-#: commands/user.c:1018
-msgid "permission denied"
-msgstr "權限不足"
-
-# commands/schemacmds.c:87
-#: commands/schemacmds.c:87
-#, c-format
-msgid "\"%s\" is not a superuser, so cannot create a schema for \"%s\""
-msgstr ""
-
-# commands/schemacmds.c:102 commands/schemacmds.c:297
-#: commands/schemacmds.c:102
-#: commands/schemacmds.c:297
-#, c-format
-msgid "unacceptable schema name \"%s\""
-msgstr ""
-
-# commands/schemacmds.c:103 commands/schemacmds.c:298
-#: commands/schemacmds.c:103
-#: commands/schemacmds.c:298
-msgid "The prefix \"pg_\" is reserved for system schemas."
-msgstr ""
-
-# commands/sequence.c:403 commands/sequence.c:595 commands/sequence.c:638
-#: commands/sequence.c:403
-#: commands/sequence.c:595
-#: commands/sequence.c:638
-#, c-format
-msgid "permission denied for sequence %s"
-msgstr ""
-
-# commands/sequence.c:480
-#: commands/sequence.c:480
-#, c-format
-msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
-msgstr ""
-
-# commands/sequence.c:503
-#: commands/sequence.c:503
-#, c-format
-msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
-msgstr ""
-
-# commands/sequence.c:601
-#: commands/sequence.c:601
-#, c-format
-msgid "currval of sequence \"%s\" is not yet defined in this session"
-msgstr ""
-
-# commands/sequence.c:655
-#: commands/sequence.c:655
-#, c-format
-msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
-msgstr ""
-
-# commands/sequence.c:798 executor/execGrouping.c:328
-# executor/execGrouping.c:388 executor/nodeIndexscan.c:1051 lib/dllist.c:43
-# lib/dllist.c:88 libpq/auth.c:637 postmaster/pgstat.c:1006
-# postmaster/pgstat.c:1023 postmaster/pgstat.c:2452 postmaster/pgstat.c:2527
-# postmaster/pgstat.c:2572 postmaster/pgstat.c:2623
-# postmaster/postmaster.c:755 postmaster/postmaster.c:1625
-# postmaster/postmaster.c:2344 storage/buffer/localbuf.c:139
-# storage/file/fd.c:587 storage/file/fd.c:620 storage/file/fd.c:766
-# storage/ipc/sinval.c:789 storage/lmgr/lock.c:497 storage/smgr/md.c:138
-# storage/smgr/md.c:848 storage/smgr/smgr.c:213 utils/adt/cash.c:297
-# utils/adt/cash.c:312 utils/adt/oracle_compat.c:73
-# utils/adt/oracle_compat.c:124 utils/adt/regexp.c:191
-# utils/adt/ri_triggers.c:3471 utils/cache/relcache.c:164
-# utils/cache/relcache.c:178 utils/cache/relcache.c:1130
-# utils/cache/typcache.c:165 utils/cache/typcache.c:487
-# utils/fmgr/dfmgr.c:127 utils/fmgr/fmgr.c:521 utils/fmgr/fmgr.c:532
-# utils/init/miscinit.c:213 utils/init/miscinit.c:234
-# utils/init/miscinit.c:244 utils/misc/guc.c:1898 utils/misc/guc.c:1911
-# utils/misc/guc.c:1924 utils/mmgr/aset.c:337 utils/mmgr/aset.c:503
-# utils/mmgr/aset.c:700 utils/mmgr/aset.c:893 utils/mmgr/portalmem.c:75
-#: commands/sequence.c:798
-#: executor/execGrouping.c:328
-#: executor/execGrouping.c:388
-#: executor/nodeIndexscan.c:1051
-#: lib/dllist.c:43
-#: lib/dllist.c:88
-#: libpq/auth.c:637
-#: postmaster/pgstat.c:1006
-#: postmaster/pgstat.c:1023
-#: postmaster/pgstat.c:2452
-#: postmaster/pgstat.c:2527
-#: postmaster/pgstat.c:2572
-#: postmaster/pgstat.c:2623
-#: postmaster/postmaster.c:755
-#: postmaster/postmaster.c:1625
-#: postmaster/postmaster.c:2344
-#: storage/buffer/localbuf.c:139
-#: storage/file/fd.c:587
-#: storage/file/fd.c:620
-#: storage/file/fd.c:766
-#: storage/ipc/sinval.c:789
-#: storage/lmgr/lock.c:497
-#: storage/smgr/md.c:138
-#: storage/smgr/md.c:848
-#: storage/smgr/smgr.c:213
-#: utils/adt/cash.c:297
-#: utils/adt/cash.c:312
-#: utils/adt/oracle_compat.c:73
-#: utils/adt/oracle_compat.c:124
-#: utils/adt/regexp.c:191
-#: utils/adt/ri_triggers.c:3476
-#: utils/cache/relcache.c:164
-#: utils/cache/relcache.c:178
-#: utils/cache/relcache.c:1130
-#: utils/cache/typcache.c:165
-#: utils/cache/typcache.c:487
-#: utils/fmgr/dfmgr.c:127
-#: utils/fmgr/fmgr.c:521
-#: utils/fmgr/fmgr.c:532
-#: utils/init/miscinit.c:213
-#: utils/init/miscinit.c:234
-#: utils/init/miscinit.c:244
-#: utils/misc/guc.c:1896
-#: utils/misc/guc.c:1909
-#: utils/misc/guc.c:1922
-#: utils/mmgr/aset.c:337
-#: utils/mmgr/aset.c:503
-#: utils/mmgr/aset.c:700
-#: utils/mmgr/aset.c:893
-#: utils/mmgr/portalmem.c:75
-msgid "out of memory"
-msgstr "記憶體用盡"
-
-# commands/sequence.c:963
-#: commands/sequence.c:963
-msgid "INCREMENT must not be zero"
-msgstr "INCREMENT 不可為 0"
-
-# commands/sequence.c:1009
-#: commands/sequence.c:1009
-#, c-format
-msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
-msgstr "MINVALUE (%s) 必須小於 MAXVALUE (%s)"
-
-# commands/sequence.c:1040
-#: commands/sequence.c:1040
-#, c-format
-msgid "START value (%s) can't be less than MINVALUE (%s)"
-msgstr "START 值 (%s) 不可小於 MINVALUE (%s)"
-
-# commands/sequence.c:1052
-#: commands/sequence.c:1052
-#, c-format
-msgid "START value (%s) can't be greater than MAXVALUE (%s)"
-msgstr "START 值 (%s) 不可大於 MAXVALUE (%s)"
-
-# commands/sequence.c:1067
-#: commands/sequence.c:1067
-#, c-format
-msgid "CACHE (%s) must be greater than zero"
-msgstr "CACHE (%s) 必須大於 0"
-
 # commands/tablecmds.c:294
 #: commands/tablecmds.c:295
 msgid "ON COMMIT can only be used on temporary tables"
@@ -4095,7 +3911,7 @@ msgstr ""
 #: commands/tablecmds.c:1454
 #: commands/tablecmds.c:2610
 #: commands/tablecmds.c:3772
-#: commands/tablecmds.c:5380
+#: commands/tablecmds.c:5401
 #: commands/trigger.c:147
 #: commands/trigger.c:552
 #: tcop/utility.c:182
@@ -4274,7 +4090,7 @@ msgstr ""
 #: commands/tablecmds.c:3226
 #: commands/tablecmds.c:3322
 #: commands/tablecmds.c:3383
-#: commands/tablecmds.c:4577
+#: commands/tablecmds.c:4591
 #, c-format
 msgid "cannot alter system column \"%s\""
 msgstr "無法修改系統欄位\"%s\""
@@ -4287,7 +4103,7 @@ msgstr "欄位\"%s\"是主鍵"
 
 # commands/tablecmds.c:3265 commands/tablecmds.c:5365
 #: commands/tablecmds.c:3269
-#: commands/tablecmds.c:5369
+#: commands/tablecmds.c:5390
 #, c-format
 msgid "\"%s\" is not a table or index"
 msgstr "\"%s\"不是資料表或索引"
@@ -4346,7 +4162,7 @@ msgstr ""
 
 # commands/tablecmds.c:3842 commands/tablecmds.c:4330
 #: commands/tablecmds.c:3846
-#: commands/tablecmds.c:4334
+#: commands/tablecmds.c:4336
 msgid "number of referencing and referenced columns for foreign key disagree"
 msgstr ""
 
@@ -4399,118 +4215,379 @@ msgid "there is no unique constraint matching given keys for referenced table \"
 msgstr ""
 
 # commands/tablecmds.c:4530 commands/trigger.c:2756
-#: commands/tablecmds.c:4534
-#: commands/trigger.c:2756
+#: commands/tablecmds.c:4548
+#: commands/trigger.c:2780
 #, c-format
 msgid "constraint \"%s\" does not exist"
 msgstr "constraint \"%s\"不存在"
 
 # commands/tablecmds.c:4535
-#: commands/tablecmds.c:4539
+#: commands/tablecmds.c:4553
 #, c-format
 msgid "multiple constraints named \"%s\" were dropped"
 msgstr "多個名稱為\"%s\"的constraints被刪除"
 
 # commands/tablecmds.c:4580
-#: commands/tablecmds.c:4584
+#: commands/tablecmds.c:4598
 #, c-format
 msgid "cannot alter inherited column \"%s\""
 msgstr "無法修改被繼承的欄位\"%s\""
 
 # commands/tablecmds.c:4620
-#: commands/tablecmds.c:4624
+#: commands/tablecmds.c:4638
 msgid "transform expression must not return a set"
 msgstr ""
 
 # commands/tablecmds.c:4626
-#: commands/tablecmds.c:4630
+#: commands/tablecmds.c:4644
 msgid "cannot use subquery in transform expression"
 msgstr ""
 
 # commands/tablecmds.c:4630
-#: commands/tablecmds.c:4634
+#: commands/tablecmds.c:4648
 msgid "cannot use aggregate function in transform expression"
 msgstr ""
 
 # commands/tablecmds.c:4647
-#: commands/tablecmds.c:4651
+#: commands/tablecmds.c:4665
 #, c-format
 msgid "column \"%s\" cannot be cast to type \"%s\""
 msgstr "欄位\"%s\"無法被轉換為型別\"%s\""
 
 # commands/tablecmds.c:4673
-#: commands/tablecmds.c:4677
+#: commands/tablecmds.c:4691
 #, c-format
 msgid "type of inherited column \"%s\" must be changed in child tables too"
 msgstr ""
 
 # commands/tablecmds.c:4711
-#: commands/tablecmds.c:4715
+#: commands/tablecmds.c:4729
 #, c-format
 msgid "cannot alter type of column \"%s\" twice"
 msgstr "無法修改欄位\"%s\"的型別兩次"
 
 # commands/tablecmds.c:4738
-#: commands/tablecmds.c:4742
+#: commands/tablecmds.c:4763
 #, c-format
 msgid "default for column \"%s\" cannot be cast to type \"%s\""
 msgstr ""
 
 # commands/tablecmds.c:4838
-#: commands/tablecmds.c:4842
+#: commands/tablecmds.c:4863
 msgid "cannot alter type of a column used by a view or rule"
 msgstr ""
 
 # commands/tablecmds.c:4839
-#: commands/tablecmds.c:4843
+#: commands/tablecmds.c:4864
 #, c-format
 msgid "%s depends on column \"%s\""
 msgstr "%s 依存於欄位\"%s\""
 
 # commands/tablecmds.c:5155
-#: commands/tablecmds.c:5159
+#: commands/tablecmds.c:5180
 #, c-format
 msgid "\"%s\" is not a table, TOAST table, index, view, or sequence"
 msgstr ""
 
 # commands/tablecmds.c:5395
-#: commands/tablecmds.c:5399
+#: commands/tablecmds.c:5420
 msgid "cannot have multiple SET TABLESPACE subcommands"
 msgstr ""
 
 # commands/tablecmds.c:5425
-#: commands/tablecmds.c:5429
+#: commands/tablecmds.c:5450
 #, c-format
 msgid "cannot move system relation \"%s\""
 msgstr "無法搬移系統relation \"%s\""
 
 # commands/tablecmds.c:5435
-#: commands/tablecmds.c:5439
+#: commands/tablecmds.c:5460
 msgid "cannot move temporary tables of other sessions"
 msgstr "無法替其它session搬移暫存資料表"
 
 # commands/tablecmds.c:5645
-#: commands/tablecmds.c:5649
+#: commands/tablecmds.c:5670
 msgid "shared tables cannot be toasted after initdb"
 msgstr ""
 
 # commands/tablecmds.c:5660
-#: commands/tablecmds.c:5664
+#: commands/tablecmds.c:5685
 #, c-format
 msgid "table \"%s\" already has a TOAST table"
 msgstr "資料表\"%s\"已經有TOAST資料表"
 
 # commands/tablecmds.c:5677
-#: commands/tablecmds.c:5681
+#: commands/tablecmds.c:5702
 #, c-format
 msgid "table \"%s\" does not need a TOAST table"
 msgstr "資料表\"%s\"不需要TOAST資料表"
 
-#: commands/tablecmds.c:5902
+#: commands/tablecmds.c:5923
 #, c-format
 msgid "The default tablespace for schema \"%s\" has been dropped."
 msgstr ""
 
+# commands/proclang.c:64
+#: commands/proclang.c:64
+msgid "must be superuser to create procedural language"
+msgstr ""
+
+# commands/proclang.c:77 commands/proclang.c:265
+#: commands/proclang.c:77
+#: commands/proclang.c:265
+#, c-format
+msgid "language \"%s\" already exists"
+msgstr "語言\"%s\"已經存在"
+
+# commands/proclang.c:97
+#: commands/proclang.c:97
+#, c-format
+msgid "changing return type of function %s from \"opaque\" to \"language_handler\""
+msgstr ""
+
+# commands/proclang.c:104
+#: commands/proclang.c:104
+#, c-format
+msgid "function %s must return type \"language_handler\""
+msgstr ""
+
+# commands/proclang.c:188
+#: commands/proclang.c:188
+msgid "must be superuser to drop procedural language"
+msgstr ""
+
+# commands/proclang.c:271
+#: commands/proclang.c:271
+msgid "must be superuser to rename procedural language"
+msgstr ""
+
+# commands/schemacmds.c:86 commands/user.c:883 commands/user.c:1018
+#: commands/schemacmds.c:86
+#: commands/user.c:883
+#: commands/user.c:1018
+msgid "permission denied"
+msgstr "權限不足"
+
+# commands/schemacmds.c:87
+#: commands/schemacmds.c:87
+#, c-format
+msgid "\"%s\" is not a superuser, so cannot create a schema for \"%s\""
+msgstr ""
+
+# commands/schemacmds.c:102 commands/schemacmds.c:297
+#: commands/schemacmds.c:102
+#: commands/schemacmds.c:297
+#, c-format
+msgid "unacceptable schema name \"%s\""
+msgstr ""
+
+# commands/schemacmds.c:103 commands/schemacmds.c:298
+#: commands/schemacmds.c:103
+#: commands/schemacmds.c:298
+msgid "The prefix \"pg_\" is reserved for system schemas."
+msgstr ""
+
+# commands/sequence.c:403 commands/sequence.c:595 commands/sequence.c:638
+#: commands/sequence.c:403
+#: commands/sequence.c:595
+#: commands/sequence.c:638
+#, c-format
+msgid "permission denied for sequence %s"
+msgstr ""
+
+# commands/sequence.c:480
+#: commands/sequence.c:480
+#, c-format
+msgid "nextval: reached maximum value of sequence \"%s\" (%s)"
+msgstr ""
+
+# commands/sequence.c:503
+#: commands/sequence.c:503
+#, c-format
+msgid "nextval: reached minimum value of sequence \"%s\" (%s)"
+msgstr ""
+
+# commands/sequence.c:601
+#: commands/sequence.c:601
+#, c-format
+msgid "currval of sequence \"%s\" is not yet defined in this session"
+msgstr ""
+
+# commands/sequence.c:655
+#: commands/sequence.c:655
+#, c-format
+msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)"
+msgstr ""
+
+# commands/sequence.c:798 executor/execGrouping.c:328
+# executor/execGrouping.c:388 executor/nodeIndexscan.c:1051 lib/dllist.c:43
+# lib/dllist.c:88 libpq/auth.c:637 postmaster/pgstat.c:1006
+# postmaster/pgstat.c:1023 postmaster/pgstat.c:2452 postmaster/pgstat.c:2527
+# postmaster/pgstat.c:2572 postmaster/pgstat.c:2623
+# postmaster/postmaster.c:755 postmaster/postmaster.c:1625
+# postmaster/postmaster.c:2344 storage/buffer/localbuf.c:139
+# storage/file/fd.c:587 storage/file/fd.c:620 storage/file/fd.c:766
+# storage/ipc/sinval.c:789 storage/lmgr/lock.c:497 storage/smgr/md.c:138
+# storage/smgr/md.c:848 storage/smgr/smgr.c:213 utils/adt/cash.c:297
+# utils/adt/cash.c:312 utils/adt/oracle_compat.c:73
+# utils/adt/oracle_compat.c:124 utils/adt/regexp.c:191
+# utils/adt/ri_triggers.c:3471 utils/cache/relcache.c:164
+# utils/cache/relcache.c:178 utils/cache/relcache.c:1130
+# utils/cache/typcache.c:165 utils/cache/typcache.c:487
+# utils/fmgr/dfmgr.c:127 utils/fmgr/fmgr.c:521 utils/fmgr/fmgr.c:532
+# utils/init/miscinit.c:213 utils/init/miscinit.c:234
+# utils/init/miscinit.c:244 utils/misc/guc.c:1898 utils/misc/guc.c:1911
+# utils/misc/guc.c:1924 utils/mmgr/aset.c:337 utils/mmgr/aset.c:503
+# utils/mmgr/aset.c:700 utils/mmgr/aset.c:893 utils/mmgr/portalmem.c:75
+#: commands/sequence.c:798
+#: executor/execGrouping.c:384
+#: lib/dllist.c:43
+#: lib/dllist.c:88
+#: libpq/auth.c:637
+#: postmaster/pgstat.c:2421
+#: postmaster/pgstat.c:2488
+#: postmaster/postmaster.c:755
+#: postmaster/postmaster.c:1625
+#: postmaster/postmaster.c:2344
+#: storage/buffer/localbuf.c:139
+#: storage/file/fd.c:587
+#: storage/file/fd.c:620
+#: storage/file/fd.c:766
+#: storage/ipc/sinval.c:789
+#: storage/lmgr/lock.c:494
+#: storage/smgr/md.c:844
+#: storage/smgr/smgr.c:213
+#: utils/adt/cash.c:297
+#: utils/adt/cash.c:312
+#: utils/adt/oracle_compat.c:73
+#: utils/adt/oracle_compat.c:125
+#: utils/adt/regexp.c:191
+#: utils/adt/ri_triggers.c:3472
+#: utils/cache/relcache.c:164
+#: utils/cache/relcache.c:178
+#: utils/cache/relcache.c:1130
+#: utils/cache/typcache.c:165
+#: utils/cache/typcache.c:487
+#: utils/fmgr/dfmgr.c:127
+#: utils/fmgr/fmgr.c:528
+#: utils/hash/dynahash.c:178
+#: utils/hash/dynahash.c:248
+#: utils/init/miscinit.c:213
+#: utils/init/miscinit.c:234
+#: utils/init/miscinit.c:244
+#: utils/misc/guc.c:1907
+#: utils/misc/guc.c:1920
+#: utils/misc/guc.c:1933
+#: utils/mmgr/aset.c:337
+#: utils/mmgr/aset.c:503
+#: utils/mmgr/aset.c:700
+#: utils/mmgr/aset.c:893
+#: utils/mmgr/portalmem.c:75
+msgid "out of memory"
+msgstr "記憶體用盡"
+
+# commands/sequence.c:963
+#: commands/sequence.c:963
+msgid "INCREMENT must not be zero"
+msgstr "INCREMENT 不可為 0"
+
+# commands/sequence.c:1009
+#: commands/sequence.c:1009
+#, c-format
+msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
+msgstr "MINVALUE (%s) 必須小於 MAXVALUE (%s)"
+
+# commands/sequence.c:1040
+#: commands/sequence.c:1040
+#, c-format
+msgid "START value (%s) can't be less than MINVALUE (%s)"
+msgstr "START 值 (%s) 不可小於 MINVALUE (%s)"
+
+# commands/sequence.c:1052
+#: commands/sequence.c:1052
+#, c-format
+msgid "START value (%s) can't be greater than MAXVALUE (%s)"
+msgstr "START 值 (%s) 不可大於 MAXVALUE (%s)"
+
+# commands/sequence.c:1067
+#: commands/sequence.c:1067
+#, c-format
+msgid "CACHE (%s) must be greater than zero"
+msgstr "CACHE (%s) 必須大於 0"
+
+# commands/trigger.c:134
+#: commands/trigger.c:134
+#, c-format
+msgid "could not determine referenced table for constraint \"%s\""
+msgstr ""
+
+# commands/trigger.c:219
+#: commands/trigger.c:219
+msgid "multiple INSERT events specified"
+msgstr ""
+
+# commands/trigger.c:226
+#: commands/trigger.c:226
+msgid "multiple DELETE events specified"
+msgstr ""
+
+# commands/trigger.c:233
+#: commands/trigger.c:233
+msgid "multiple UPDATE events specified"
+msgstr ""
+
+# commands/trigger.c:266 commands/trigger.c:654
+#: commands/trigger.c:266
+#: commands/trigger.c:654
+#, c-format
+msgid "trigger \"%s\" for relation \"%s\" already exists"
+msgstr ""
+
+# commands/trigger.c:287
+#: commands/trigger.c:287
+#, c-format
+msgid "changing return type of function %s from \"opaque\" to \"trigger\""
+msgstr ""
+
+# commands/trigger.c:294
+#: commands/trigger.c:294
+#, c-format
+msgid "function %s must return type \"trigger\""
+msgstr "函式 %s 必須傳回型別\"trigger\""
+
+# commands/trigger.c:1160
+#: commands/trigger.c:1160
+#, c-format
+msgid "trigger function %u returned null value"
+msgstr "trigger函 %u 式傳回空值"
+
+# commands/trigger.c:1212 commands/trigger.c:1325 commands/trigger.c:1454
+#: commands/trigger.c:1214
+#: commands/trigger.c:1331
+#: commands/trigger.c:1464
+msgid "BEFORE STATEMENT trigger cannot return a value"
+msgstr ""
+
+# commands/trigger.c:1581 executor/execMain.c:1151 executor/execMain.c:1457
+# executor/execMain.c:1598
+#: commands/trigger.c:1593
+#: executor/execMain.c:1151
+#: executor/execMain.c:1457
+#: executor/execMain.c:1598
+msgid "could not serialize access due to concurrent update"
+msgstr ""
+
+# commands/trigger.c:2708
+#: commands/trigger.c:2726
+msgid "unnamed constraints cannot be set explicitly"
+msgstr ""
+
+# commands/trigger.c:2741
+#: commands/trigger.c:2765
+#, c-format
+msgid "constraint \"%s\" is not deferrable"
+msgstr ""
+
 # commands/tablespace.c:154 commands/tablespace.c:162
 # commands/tablespace.c:168
 #: commands/tablespace.c:153
@@ -4641,79 +4718,6 @@ msgstr "無法刪除符號連結\"%s\"：%m"
 msgid "tablespace %u is not empty"
 msgstr "tablespace %u 不是空的"
 
-# commands/trigger.c:134
-#: commands/trigger.c:134
-#, c-format
-msgid "could not determine referenced table for constraint \"%s\""
-msgstr ""
-
-# commands/trigger.c:219
-#: commands/trigger.c:219
-msgid "multiple INSERT events specified"
-msgstr ""
-
-# commands/trigger.c:226
-#: commands/trigger.c:226
-msgid "multiple DELETE events specified"
-msgstr ""
-
-# commands/trigger.c:233
-#: commands/trigger.c:233
-msgid "multiple UPDATE events specified"
-msgstr ""
-
-# commands/trigger.c:266 commands/trigger.c:654
-#: commands/trigger.c:266
-#: commands/trigger.c:654
-#, c-format
-msgid "trigger \"%s\" for relation \"%s\" already exists"
-msgstr ""
-
-# commands/trigger.c:287
-#: commands/trigger.c:287
-#, c-format
-msgid "changing return type of function %s from \"opaque\" to \"trigger\""
-msgstr ""
-
-# commands/trigger.c:294
-#: commands/trigger.c:294
-#, c-format
-msgid "function %s must return type \"trigger\""
-msgstr "函式 %s 必須傳回型別\"trigger\""
-
-# commands/trigger.c:1160
-#: commands/trigger.c:1160
-#, c-format
-msgid "trigger function %u returned null value"
-msgstr "trigger函 %u 式傳回空值"
-
-# commands/trigger.c:1212 commands/trigger.c:1325 commands/trigger.c:1454
-#: commands/trigger.c:1212
-#: commands/trigger.c:1325
-#: commands/trigger.c:1454
-msgid "BEFORE STATEMENT trigger cannot return a value"
-msgstr ""
-
-# commands/trigger.c:1581 executor/execMain.c:1151 executor/execMain.c:1457
-# executor/execMain.c:1598
-#: commands/trigger.c:1581
-#: executor/execMain.c:1151
-#: executor/execMain.c:1457
-#: executor/execMain.c:1598
-msgid "could not serialize access due to concurrent update"
-msgstr ""
-
-# commands/trigger.c:2708
-#: commands/trigger.c:2708
-msgid "unnamed constraints cannot be set explicitly"
-msgstr ""
-
-# commands/trigger.c:2741
-#: commands/trigger.c:2741
-#, c-format
-msgid "constraint \"%s\" is not deferrable"
-msgstr ""
-
 # commands/typecmds.c:138
 #: commands/typecmds.c:138
 #, c-format
@@ -4968,7 +4972,7 @@ msgstr "使用者ID %d已經被指派"
 #: commands/user.c:1104
 #: commands/user.c:1233
 #: commands/variable.c:664
-#: utils/cache/lsyscache.c:2064
+#: utils/cache/lsyscache.c:2100
 #: utils/init/miscinit.c:335
 #, c-format
 msgid "user \"%s\" does not exist"
@@ -5199,7 +5203,7 @@ msgstr ""
 # nodes/print.c:86 storage/lmgr/deadlock.c:888 tcop/postgres.c:3285
 #: commands/vacuum.c:2257
 #: commands/vacuumlazy.c:483
-#: commands/vacuumlazy.c:764
+#: commands/vacuumlazy.c:774
 #: nodes/print.c:86
 #: storage/lmgr/deadlock.c:888
 #: tcop/postgres.c:3295
@@ -5209,7 +5213,7 @@ msgstr "%s"
 
 # commands/vacuum.c:2770 commands/vacuumlazy.c:767
 #: commands/vacuum.c:2769
-#: commands/vacuumlazy.c:761
+#: commands/vacuumlazy.c:771
 #, c-format
 msgid "\"%s\": truncated %u to %u pages"
 msgstr ""
@@ -5218,15 +5222,15 @@ msgstr ""
 # commands/vacuumlazy.c:657
 #: commands/vacuum.c:2859
 #: commands/vacuum.c:2926
-#: commands/vacuumlazy.c:591
-#: commands/vacuumlazy.c:651
+#: commands/vacuumlazy.c:596
+#: commands/vacuumlazy.c:661
 #, c-format
 msgid "index \"%s\" now contains %.0f row versions in %u pages"
 msgstr ""
 
 # commands/vacuum.c:2864 commands/vacuumlazy.c:601
 #: commands/vacuum.c:2863
-#: commands/vacuumlazy.c:595
+#: commands/vacuumlazy.c:600
 #, c-format
 msgid ""
 "%u index pages have been deleted, %u are currently reusable.\n"
@@ -5248,7 +5252,7 @@ msgstr "以 REINDEX 重建索引。"
 
 # commands/vacuum.c:2931 commands/vacuumlazy.c:661
 #: commands/vacuum.c:2930
-#: commands/vacuumlazy.c:655
+#: commands/vacuumlazy.c:665
 #, c-format
 msgid ""
 "%.0f index row versions were removed.\n"
@@ -5676,6 +5680,61 @@ msgstr ""
 msgid "SQL statement \"%s\""
 msgstr "SQL敘述\"%s\""
 
+# libpq/be-fsstubs.c:132 libpq/be-fsstubs.c:170 libpq/be-fsstubs.c:194
+# libpq/be-fsstubs.c:222 libpq/be-fsstubs.c:274
+#: libpq/be-fsstubs.c:132
+#: libpq/be-fsstubs.c:170
+#: libpq/be-fsstubs.c:194
+#: libpq/be-fsstubs.c:222
+#: libpq/be-fsstubs.c:274
+#, c-format
+msgid "invalid large-object descriptor: %d"
+msgstr ""
+
+# libpq/be-fsstubs.c:378
+#: libpq/be-fsstubs.c:378
+msgid "must be superuser to use server-side lo_import()"
+msgstr "必須是管理者才能使用伺服端 lo_import()"
+
+# libpq/be-fsstubs.c:379
+#: libpq/be-fsstubs.c:379
+msgid "Anyone can use the client-side lo_import() provided by libpq."
+msgstr "任何人都能使用 libpq 提供的客戶端 lo_import()。"
+
+# libpq/be-fsstubs.c:400
+#: libpq/be-fsstubs.c:400
+#, c-format
+msgid "could not open server file \"%s\": %m"
+msgstr "無法開啟伺服器檔案 \"%s\": %m"
+
+# libpq/be-fsstubs.c:421
+#: libpq/be-fsstubs.c:421
+#, c-format
+msgid "could not read server file \"%s\": %m"
+msgstr "無法讀取伺服器檔案\"%s\"：%m"
+
+# libpq/be-fsstubs.c:451
+#: libpq/be-fsstubs.c:451
+msgid "must be superuser to use server-side lo_export()"
+msgstr "必須是管理者才能使用伺服端 lo_export()"
+
+# libpq/be-fsstubs.c:452
+#: libpq/be-fsstubs.c:452
+msgid "Anyone can use the client-side lo_export() provided by libpq."
+msgstr "任何人都能使用 libpq 提供的客戶端 lo_export()。"
+
+# libpq/be-fsstubs.c:484
+#: libpq/be-fsstubs.c:484
+#, c-format
+msgid "could not create server file \"%s\": %m"
+msgstr "無法建立伺服器檔案\"%s\"：%m"
+
+# libpq/be-fsstubs.c:496
+#: libpq/be-fsstubs.c:496
+#, c-format
+msgid "could not write server file \"%s\": %m"
+msgstr "無法寫入伺服器檔案\"%s\"：%m"
+
 # libpq/auth.c:113
 #: libpq/auth.c:113
 #, c-format
@@ -5895,61 +5954,6 @@ msgstr "無效的密碼封包大小"
 msgid "received password packet"
 msgstr "已接收密碼封包"
 
-# libpq/be-fsstubs.c:132 libpq/be-fsstubs.c:170 libpq/be-fsstubs.c:194
-# libpq/be-fsstubs.c:222 libpq/be-fsstubs.c:274
-#: libpq/be-fsstubs.c:132
-#: libpq/be-fsstubs.c:170
-#: libpq/be-fsstubs.c:194
-#: libpq/be-fsstubs.c:222
-#: libpq/be-fsstubs.c:274
-#, c-format
-msgid "invalid large-object descriptor: %d"
-msgstr ""
-
-# libpq/be-fsstubs.c:378
-#: libpq/be-fsstubs.c:378
-msgid "must be superuser to use server-side lo_import()"
-msgstr "必須是管理者才能使用伺服端 lo_import()"
-
-# libpq/be-fsstubs.c:379
-#: libpq/be-fsstubs.c:379
-msgid "Anyone can use the client-side lo_import() provided by libpq."
-msgstr "任何人都能使用 libpq 提供的客戶端 lo_import()。"
-
-# libpq/be-fsstubs.c:400
-#: libpq/be-fsstubs.c:400
-#, c-format
-msgid "could not open server file \"%s\": %m"
-msgstr "無法開啟伺服器檔案 \"%s\": %m"
-
-# libpq/be-fsstubs.c:421
-#: libpq/be-fsstubs.c:421
-#, c-format
-msgid "could not read server file \"%s\": %m"
-msgstr "無法讀取伺服器檔案\"%s\"：%m"
-
-# libpq/be-fsstubs.c:451
-#: libpq/be-fsstubs.c:451
-msgid "must be superuser to use server-side lo_export()"
-msgstr "必須是管理者才能使用伺服端 lo_export()"
-
-# libpq/be-fsstubs.c:452
-#: libpq/be-fsstubs.c:452
-msgid "Anyone can use the client-side lo_export() provided by libpq."
-msgstr "任何人都能使用 libpq 提供的客戶端 lo_export()。"
-
-# libpq/be-fsstubs.c:484
-#: libpq/be-fsstubs.c:484
-#, c-format
-msgid "could not create server file \"%s\": %m"
-msgstr "無法建立伺服器檔案\"%s\"：%m"
-
-# libpq/be-fsstubs.c:496
-#: libpq/be-fsstubs.c:496
-#, c-format
-msgid "could not write server file \"%s\": %m"
-msgstr "無法寫入伺服器檔案\"%s\"：%m"
-
 # libpq/be-secure.c:281 libpq/be-secure.c:374
 #: libpq/be-secure.c:281
 #: libpq/be-secure.c:374
@@ -6118,7 +6122,7 @@ msgstr ""
 #: libpq/hba.c:1044
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
-msgstr "無法開啟設定檔\"%s\"：%m"
+msgstr "無法?啟設定檔\"%s\"：%m"
 
 # libpq/hba.c:1110
 #: libpq/hba.c:1110
@@ -6463,11 +6467,133 @@ msgid "SELECT FOR UPDATE is not allowed in subqueries"
 msgstr "子查詢不能使用SELECT FOR UPDATE"
 
 # optimizer/util/clauses.c:2296
-#: optimizer/util/clauses.c:2296
+#: optimizer/util/clauses.c:2331
 #, c-format
 msgid "SQL function \"%s\" during inlining"
 msgstr ""
 
+# parser/parse_clause.c:363
+#: parser/parse_clause.c:363
+#, c-format
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+msgstr ""
+
+# gram.y:5166 parser/parse_clause.c:423
+#: gram.y:5166
+#: parser/parse_clause.c:423
+msgid "subquery in FROM must have an alias"
+msgstr "FROM中的子查詢要有別名"
+
+# parser/parse_clause.c:446
+#: parser/parse_clause.c:446
+msgid "subquery in FROM may not have SELECT INTO"
+msgstr "FROM中的子查詢不能有SELECT INTO"
+
+# parser/parse_clause.c:468
+#: parser/parse_clause.c:468
+msgid "subquery in FROM may not refer to other relations of same query level"
+msgstr ""
+
+# parser/parse_clause.c:527
+#: parser/parse_clause.c:527
+msgid "function expression in FROM may not refer to other relations of same query level"
+msgstr ""
+
+# parser/parse_clause.c:539
+#: parser/parse_clause.c:539
+msgid "cannot use aggregate function in function expression in FROM"
+msgstr ""
+
+# parser/parse_clause.c:759
+#: parser/parse_clause.c:759
+#, c-format
+msgid "column name \"%s\" appears more than once in USING clause"
+msgstr ""
+
+# parser/parse_clause.c:774
+#: parser/parse_clause.c:774
+#, c-format
+msgid "common column name \"%s\" appears more than once in left table"
+msgstr ""
+
+# parser/parse_clause.c:783
+#: parser/parse_clause.c:783
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in left table"
+msgstr ""
+
+# parser/parse_clause.c:797
+#: parser/parse_clause.c:797
+#, c-format
+msgid "common column name \"%s\" appears more than once in right table"
+msgstr ""
+
+# parser/parse_clause.c:806
+#: parser/parse_clause.c:806
+#, c-format
+msgid "column \"%s\" specified in USING clause does not exist in right table"
+msgstr ""
+
+# parser/parse_clause.c:858
+#: parser/parse_clause.c:858
+#, c-format
+msgid "column alias list for \"%s\" has too many entries"
+msgstr ""
+
+# parser/parse_clause.c:1051
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1051
+#, c-format
+msgid "argument of %s must not contain variables"
+msgstr ""
+
+# parser/parse_clause.c:1059
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1059
+#, c-format
+msgid "argument of %s must not contain aggregates"
+msgstr ""
+
+#  translator: %s is name of a SQL construct, eg LIMIT
+# parser/parse_clause.c:1067
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1067
+#, c-format
+msgid "argument of %s must not contain subqueries"
+msgstr ""
+
+#  translator: first %s is name of a SQL construct, eg ORDER BY
+# parser/parse_clause.c:1179
+#: parser/parse_clause.c:1179
+#, c-format
+msgid "%s \"%s\" is ambiguous"
+msgstr ""
+
+#  translator: %s is name of a SQL construct, eg ORDER BY
+# parser/parse_clause.c:1201
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1201
+#, c-format
+msgid "non-integer constant in %s"
+msgstr ""
+
+# parser/parse_clause.c:1218
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1218
+#, c-format
+msgid "%s position %d is not in select list"
+msgstr ""
+
+# parser/parse_clause.c:1411
+#: parser/parse_clause.c:1411
+msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
+msgstr ""
+
+# parser/parse_clause.c:1451
+#: parser/parse_clause.c:1451
+msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgstr ""
+
 # parser/analyze.c:446
 #: parser/analyze.c:446
 msgid "CREATE VIEW specifies more column names than columns"
@@ -6727,6 +6853,57 @@ msgstr "並沒有參數 $%d"
 msgid "could not determine data type of parameter $%d"
 msgstr ""
 
+# scan.l:312
+#: scan.l:312
+msgid "unterminated /* comment"
+msgstr "未結束的 /* 註解"
+
+# scan.l:339
+#: scan.l:339
+msgid "unterminated bit string literal"
+msgstr "未結束的位元字串實量"
+
+# scan.l:358
+#: scan.l:358
+msgid "unterminated hexadecimal string literal"
+msgstr "未結束的十六進位?串實"
+
+# scan.l:407
+#: scan.l:407
+msgid "unterminated quoted string"
+msgstr "未結束的引號字串"
+
+# scan.l:441
+#: scan.l:441
+msgid "unterminated dollar-quoted string"
+msgstr ""
+
+# scan.l:453
+#: scan.l:453
+msgid "zero-length delimited identifier"
+msgstr ""
+
+# scan.l:466
+#: scan.l:466
+msgid "unterminated quoted identifier"
+msgstr ""
+
+#  translator: %s is typically "syntax error"
+# scan.l:621
+#. translator: %s is typically "syntax error"
+#: scan.l:621
+#, c-format
+msgid "%s at end of input"
+msgstr "在輸入末端發生 %s"
+
+#  translator: first %s is typically "syntax error"
+# scan.l:629
+#. translator: first %s is typically "syntax error"
+#: scan.l:629
+#, c-format
+msgid "%s at or near \"%s\""
+msgstr "在\"%s\"附近發生 %s"
+
 # parser/parse_agg.c:120
 #: parser/parse_agg.c:120
 msgid "aggregates not allowed in WHERE clause"
@@ -6754,126 +6931,85 @@ msgstr ""
 msgid "subquery uses ungrouped column \"%s.%s\" from outer query"
 msgstr ""
 
-# parser/parse_clause.c:363
-#: parser/parse_clause.c:363
+# parser/parse_relation.c:174 parser/parse_relation.c:189
+#: parser/parse_relation.c:174
+#: parser/parse_relation.c:189
 #, c-format
-msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
-msgstr ""
-
-# gram.y:5166 parser/parse_clause.c:423
-#: gram.y:5166
-#: parser/parse_clause.c:423
-msgid "subquery in FROM must have an alias"
-msgstr "FROM中的子查詢要有別名"
-
-# parser/parse_clause.c:446
-#: parser/parse_clause.c:446
-msgid "subquery in FROM may not have SELECT INTO"
-msgstr "FROM中的子查詢不能有SELECT INTO"
-
-# parser/parse_clause.c:468
-#: parser/parse_clause.c:468
-msgid "subquery in FROM may not refer to other relations of same query level"
-msgstr ""
-
-# parser/parse_clause.c:527
-#: parser/parse_clause.c:527
-msgid "function expression in FROM may not refer to other relations of same query level"
-msgstr ""
-
-# parser/parse_clause.c:539
-#: parser/parse_clause.c:539
-msgid "cannot use aggregate function in function expression in FROM"
+msgid "table reference \"%s\" is ambiguous"
 msgstr ""
 
-# parser/parse_clause.c:759
-#: parser/parse_clause.c:759
+# parser/parse_relation.c:249 parser/parse_relation.c:264
+#: parser/parse_relation.c:249
+#: parser/parse_relation.c:264
 #, c-format
-msgid "column name \"%s\" appears more than once in USING clause"
+msgid "table reference %u is ambiguous"
 msgstr ""
 
-# parser/parse_clause.c:774
-#: parser/parse_clause.c:774
+# parser/parse_relation.c:356 parser/parse_relation.c:368
+#: parser/parse_relation.c:356
+#: parser/parse_relation.c:368
 #, c-format
-msgid "common column name \"%s\" appears more than once in left table"
+msgid "table name \"%s\" specified more than once"
 msgstr ""
 
-# parser/parse_clause.c:783
-#: parser/parse_clause.c:783
+# parser/parse_relation.c:510 parser/parse_relation.c:609
+#: parser/parse_relation.c:510
+#: parser/parse_relation.c:609
 #, c-format
-msgid "column \"%s\" specified in USING clause does not exist in left table"
+msgid "column reference \"%s\" is ambiguous"
 msgstr ""
 
-# parser/parse_clause.c:797
-#: parser/parse_clause.c:797
+# parser/parse_relation.c:726 parser/parse_relation.c:925
+#: parser/parse_relation.c:726
+#: parser/parse_relation.c:925
 #, c-format
-msgid "common column name \"%s\" appears more than once in right table"
+msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr ""
 
-# parser/parse_clause.c:806
-#: parser/parse_clause.c:806
-#, c-format
-msgid "column \"%s\" specified in USING clause does not exist in right table"
+# parser/parse_relation.c:997
+#: parser/parse_relation.c:997
+msgid "a column definition list is only allowed for functions returning \"record\""
 msgstr ""
 
-# parser/parse_clause.c:858
-#: parser/parse_clause.c:858
-#, c-format
-msgid "column alias list for \"%s\" has too many entries"
+# parser/parse_relation.c:1008
+#: parser/parse_relation.c:1008
+msgid "a column definition list is required for functions returning \"record\""
 msgstr ""
 
-# parser/parse_clause.c:1051
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1051
+# parser/parse_relation.c:1052
+#: parser/parse_relation.c:1047
 #, c-format
-msgid "argument of %s must not contain variables"
+msgid "too many column aliases specified for function %s"
 msgstr ""
 
-# parser/parse_clause.c:1059
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1059
+# catalog/pg_proc.c:487
+#: parser/parse_relation.c:1071
 #, c-format
-msgid "argument of %s must not contain aggregates"
-msgstr ""
+msgid "function \"%s\" in FROM has unsupported return type %s"
+msgstr "FROM條件使用的函式\"%s\"傳回不受支援的型別%s"
 
-#  translator: %s is name of a SQL construct, eg LIMIT
-# parser/parse_clause.c:1067
-#. translator: %s is name of a SQL construct, eg LIMIT
-#: parser/parse_clause.c:1067
+# parser/parse_relation.c:2009
+#: parser/parse_relation.c:2003
 #, c-format
-msgid "argument of %s must not contain subqueries"
+msgid "missing FROM-clause entry in subquery for table \"%s\""
 msgstr ""
 
-#  translator: first %s is name of a SQL construct, eg ORDER BY
-# parser/parse_clause.c:1179
-#: parser/parse_clause.c:1179
+# parser/parse_relation.c:2014
+#: parser/parse_relation.c:2008
 #, c-format
-msgid "%s \"%s\" is ambiguous"
+msgid "missing FROM-clause entry for table \"%s\""
 msgstr ""
 
-#  translator: %s is name of a SQL construct, eg ORDER BY
-# parser/parse_clause.c:1201
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1201
+# parser/parse_relation.c:2033
+#: parser/parse_relation.c:2027
 #, c-format
-msgid "non-integer constant in %s"
+msgid "adding missing FROM-clause entry in subquery for table \"%s\""
 msgstr ""
 
-# parser/parse_clause.c:1218
-#. translator: %s is name of a SQL construct, eg ORDER BY
-#: parser/parse_clause.c:1218
+# parser/parse_relation.c:2038
+#: parser/parse_relation.c:2032
 #, c-format
-msgid "%s position %d is not in select list"
-msgstr ""
-
-# parser/parse_clause.c:1411
-#: parser/parse_clause.c:1411
-msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list"
-msgstr ""
-
-# parser/parse_clause.c:1451
-#: parser/parse_clause.c:1451
-msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgid "adding missing FROM-clause entry for table \"%s\""
 msgstr ""
 
 # parser/parse_coerce.c:237
@@ -7105,7 +7241,6 @@ msgstr "欄位 %s.%s 不存在"
 
 # parser/parse_func.c:1219 parser/parse_target.c:496
 #: parser/parse_func.c:1219
-#: parser/parse_target.c:496
 #, c-format
 msgid "column \"%s\" not found in data type %s"
 msgstr ""
@@ -7173,7 +7308,7 @@ msgstr "operator不存在：%s"
 # utils/adt/ri_triggers.c:3641
 #: parser/parse_oper.c:185
 #: utils/adt/arrayfuncs.c:2581
-#: utils/adt/ri_triggers.c:3646
+#: utils/adt/ri_triggers.c:3642
 #, c-format
 msgid "could not identify an equality operator for type %s"
 msgstr ""
@@ -7228,96 +7363,9 @@ msgstr ""
 msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr ""
 
-# parser/parse_relation.c:174 parser/parse_relation.c:189
-#: parser/parse_relation.c:174
-#: parser/parse_relation.c:189
-#, c-format
-msgid "table reference \"%s\" is ambiguous"
-msgstr ""
-
-# parser/parse_relation.c:249 parser/parse_relation.c:264
-#: parser/parse_relation.c:249
-#: parser/parse_relation.c:264
-#, c-format
-msgid "table reference %u is ambiguous"
-msgstr ""
-
-# parser/parse_relation.c:356 parser/parse_relation.c:368
-#: parser/parse_relation.c:356
-#: parser/parse_relation.c:368
-#, c-format
-msgid "table name \"%s\" specified more than once"
-msgstr ""
-
-# parser/parse_relation.c:510 parser/parse_relation.c:609
-#: parser/parse_relation.c:510
-#: parser/parse_relation.c:609
-#, c-format
-msgid "column reference \"%s\" is ambiguous"
-msgstr ""
-
-# parser/parse_relation.c:726 parser/parse_relation.c:925
-#: parser/parse_relation.c:726
-#: parser/parse_relation.c:925
-#, c-format
-msgid "table \"%s\" has %d columns available but %d columns specified"
-msgstr ""
-
-# parser/parse_relation.c:997
-#: parser/parse_relation.c:997
-msgid "a column definition list is only allowed for functions returning \"record\""
-msgstr ""
-
-# parser/parse_relation.c:1008
-#: parser/parse_relation.c:1008
-msgid "a column definition list is required for functions returning \"record\""
-msgstr ""
-
-# parser/parse_relation.c:1052
-#: parser/parse_relation.c:1052
-#, c-format
-msgid "too many column aliases specified for function %s"
-msgstr ""
-
-# parser/parse_relation.c:1076
-#: parser/parse_relation.c:1076
-#, c-format
-msgid "function \"%s\" in FROM has unsupported return type"
-msgstr ""
-
-# parser/parse_relation.c:1394 parser/parse_relation.c:1730
-#: parser/parse_relation.c:1394
-#: parser/parse_relation.c:1730
-msgid "function in FROM has unsupported return type"
-msgstr ""
-
-# parser/parse_relation.c:2009
-#: parser/parse_relation.c:2009
-#, c-format
-msgid "missing FROM-clause entry in subquery for table \"%s\""
-msgstr ""
-
-# parser/parse_relation.c:2014
-#: parser/parse_relation.c:2014
-#, c-format
-msgid "missing FROM-clause entry for table \"%s\""
-msgstr ""
-
-# parser/parse_relation.c:2033
-#: parser/parse_relation.c:2033
-#, c-format
-msgid "adding missing FROM-clause entry in subquery for table \"%s\""
-msgstr ""
-
-# parser/parse_relation.c:2038
-#: parser/parse_relation.c:2038
-#, c-format
-msgid "adding missing FROM-clause entry for table \"%s\""
-msgstr ""
-
 # parser/parse_target.c:268 parser/parse_target.c:501
 #: parser/parse_target.c:268
-#: parser/parse_target.c:501
+#: parser/parse_target.c:503
 #, c-format
 msgid "cannot assign to system column \"%s\""
 msgstr ""
@@ -7338,119 +7386,33 @@ msgstr ""
 msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr ""
 
-# parser/parse_target.c:489
 #: parser/parse_target.c:489
 #, c-format
-msgid "cannot assign to a column of type %s because it is not a composite type"
+msgid "cannot assign to field \"%s\" of column \"%s\" because its type %s is not a composite type"
+msgstr ""
+
+#: parser/parse_target.c:497
+#, c-format
+msgid "cannot assign to field \"%s\" of column \"%s\" because there is no such column in data type %s"
 msgstr ""
 
 # parser/parse_target.c:565
-#: parser/parse_target.c:565
+#: parser/parse_target.c:567
 #, c-format
 msgid "array assignment to \"%s\" requires type %s but expression is of type %s"
 msgstr ""
 
 # parser/parse_target.c:574
-#: parser/parse_target.c:574
+#: parser/parse_target.c:576
 #, c-format
 msgid "subfield \"%s\" is of type %s but expression is of type %s"
 msgstr ""
 
 # parser/parse_target.c:803
-#: parser/parse_target.c:803
+#: parser/parse_target.c:805
 msgid "SELECT * with no tables specified is not valid"
 msgstr ""
 
-# parser/parse_type.c:62
-#: parser/parse_type.c:62
-#, c-format
-msgid "improper %%TYPE reference (too few dotted names): %s"
-msgstr ""
-
-# parser/parse_type.c:83
-#: parser/parse_type.c:83
-#, c-format
-msgid "improper %%TYPE reference (too many dotted names): %s"
-msgstr ""
-
-# parser/parse_type.c:103
-#: parser/parse_type.c:103
-#, c-format
-msgid "type reference %s converted to %s"
-msgstr ""
-
-# parser/parse_type.c:206 parser/parse_type.c:237 utils/cache/typcache.c:155
-#: parser/parse_type.c:206
-#: parser/parse_type.c:237
-#: utils/cache/typcache.c:155
-#, c-format
-msgid "type \"%s\" is only a shell"
-msgstr ""
-
-# parser/parse_type.c:372 parser/parse_type.c:467
-#: parser/parse_type.c:372
-#: parser/parse_type.c:467
-#, c-format
-msgid "invalid type name \"%s\""
-msgstr "不合法的型別名稱\"%s\""
-
-# parser/scansup.c:182
-#: parser/scansup.c:182
-#, c-format
-msgid "identifier \"%s\" will be truncated to \"%.*s\""
-msgstr ""
-
-# scan.l:312
-#: scan.l:312
-msgid "unterminated /* comment"
-msgstr "未結束的 /* 註解"
-
-# scan.l:339
-#: scan.l:339
-msgid "unterminated bit string literal"
-msgstr "未結束的位元字串實量"
-
-# scan.l:358
-#: scan.l:358
-msgid "unterminated hexadecimal string literal"
-msgstr "未結束的十六進位字串實量"
-
-# scan.l:407
-#: scan.l:407
-msgid "unterminated quoted string"
-msgstr "未結束的引號字串"
-
-# scan.l:441
-#: scan.l:441
-msgid "unterminated dollar-quoted string"
-msgstr ""
-
-# scan.l:453
-#: scan.l:453
-msgid "zero-length delimited identifier"
-msgstr ""
-
-# scan.l:466
-#: scan.l:466
-msgid "unterminated quoted identifier"
-msgstr ""
-
-#  translator: %s is typically "syntax error"
-# scan.l:621
-#. translator: %s is typically "syntax error"
-#: scan.l:621
-#, c-format
-msgid "%s at end of input"
-msgstr "在輸入末端發生 %s"
-
-#  translator: first %s is typically "syntax error"
-# scan.l:629
-#. translator: first %s is typically "syntax error"
-#: scan.l:629
-#, c-format
-msgid "%s at or near \"%s\""
-msgstr "在\"%s\"附近發生 %s"
-
 # y.tab.c:9591
 #: y.tab.c:9591
 msgid "syntax error: cannot back up"
@@ -7487,21 +7449,21 @@ msgstr ""
 # utils/adt/ri_triggers.c:2440 utils/adt/ri_triggers.c:2536
 # utils/adt/ri_triggers.c:2659
 #: gram.y:1887
-#: utils/adt/ri_triggers.c:306
-#: utils/adt/ri_triggers.c:368
-#: utils/adt/ri_triggers.c:547
-#: utils/adt/ri_triggers.c:786
-#: utils/adt/ri_triggers.c:977
-#: utils/adt/ri_triggers.c:1138
-#: utils/adt/ri_triggers.c:1322
-#: utils/adt/ri_triggers.c:1491
-#: utils/adt/ri_triggers.c:1672
-#: utils/adt/ri_triggers.c:1842
-#: utils/adt/ri_triggers.c:2060
-#: utils/adt/ri_triggers.c:2240
-#: utils/adt/ri_triggers.c:2445
-#: utils/adt/ri_triggers.c:2541
-#: utils/adt/ri_triggers.c:2664
+#: utils/adt/ri_triggers.c:302
+#: utils/adt/ri_triggers.c:364
+#: utils/adt/ri_triggers.c:543
+#: utils/adt/ri_triggers.c:782
+#: utils/adt/ri_triggers.c:973
+#: utils/adt/ri_triggers.c:1134
+#: utils/adt/ri_triggers.c:1318
+#: utils/adt/ri_triggers.c:1487
+#: utils/adt/ri_triggers.c:1668
+#: utils/adt/ri_triggers.c:1838
+#: utils/adt/ri_triggers.c:2056
+#: utils/adt/ri_triggers.c:2236
+#: utils/adt/ri_triggers.c:2441
+#: utils/adt/ri_triggers.c:2537
+#: utils/adt/ri_triggers.c:2660
 msgid "MATCH PARTIAL not yet implemented"
 msgstr "MATCH PARTIAL尚未實做"
 
@@ -7746,6 +7708,45 @@ msgstr ""
 msgid "multiple LIMIT clauses not allowed"
 msgstr ""
 
+# parser/parse_type.c:62
+#: parser/parse_type.c:62
+#, c-format
+msgid "improper %%TYPE reference (too few dotted names): %s"
+msgstr ""
+
+# parser/parse_type.c:83
+#: parser/parse_type.c:83
+#, c-format
+msgid "improper %%TYPE reference (too many dotted names): %s"
+msgstr ""
+
+# parser/parse_type.c:103
+#: parser/parse_type.c:103
+#, c-format
+msgid "type reference %s converted to %s"
+msgstr ""
+
+# parser/parse_type.c:206 parser/parse_type.c:237 utils/cache/typcache.c:155
+#: parser/parse_type.c:206
+#: parser/parse_type.c:237
+#: utils/cache/typcache.c:155
+#, c-format
+msgid "type \"%s\" is only a shell"
+msgstr ""
+
+# parser/parse_type.c:372 parser/parse_type.c:467
+#: parser/parse_type.c:372
+#: parser/parse_type.c:467
+#, c-format
+msgid "invalid type name \"%s\""
+msgstr "不合法的型別名稱\"%s\""
+
+# parser/scansup.c:182
+#: parser/scansup.c:182
+#, c-format
+msgid "identifier \"%s\" will be truncated to \"%.*s\""
+msgstr ""
+
 # port/pg_sema.c:117 port/sysv_sema.c:117
 #: port/pg_sema.c:117
 #: port/sysv_sema.c:117
@@ -7777,48 +7778,6 @@ msgstr ""
 msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr ""
 
-# port/pg_shmem.c:94 port/sysv_shmem.c:94
-#: port/pg_shmem.c:94
-#: port/sysv_shmem.c:94
-#, c-format
-msgid "could not create shared memory segment: %m"
-msgstr "無法建立共享記憶區段：%m"
-
-# port/pg_shmem.c:95 port/sysv_shmem.c:95
-#: port/pg_shmem.c:95
-#: port/sysv_shmem.c:95
-#, c-format
-msgid "Failed system call was shmget(key=%lu, size=%u, 0%o)."
-msgstr "失敗的系統呼叫是shmget(key=%lu，size=%u，0%o)。"
-
-# port/pg_shmem.c:99 port/sysv_shmem.c:99
-#: port/pg_shmem.c:99
-#: port/sysv_shmem.c:99
-#, c-format
-msgid ""
-"This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMMAX.  To reduce the request size (currently %u bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
-"If the request size is already small, it's possible that it is less than your kernel's SHMMIN parameter, in which case raising the request size or reconfiguring SHMMIN is called for.\n"
-"The PostgreSQL documentation contains more information about shared memory configuration."
-msgstr ""
-
-# port/pg_shmem.c:112 port/sysv_shmem.c:112
-#: port/pg_shmem.c:112
-#: port/sysv_shmem.c:112
-#, c-format
-msgid ""
-"This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory or swap space. To reduce the request size (currently %u bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory configuration."
-msgstr ""
-
-# port/pg_shmem.c:121 port/sysv_shmem.c:121
-#: port/pg_shmem.c:121
-#: port/sysv_shmem.c:121
-#, c-format
-msgid ""
-"This error does *not* mean that you have run out of disk space. It occurs either if all available shared memory IDs have been taken, in which case you need to raise the SHMMNI parameter in your kernel, or because the system's overall limit for shared memory has been reached.  If you cannot increase the shared memory limit, reduce PostgreSQL's shared memory request (currently %u bytes), by reducing its shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
-"The PostgreSQL documentation contains more information about shared memory configuration."
-msgstr ""
-
 # port/win32/security.c:39
 #: port/win32/security.c:39
 #, c-format
@@ -7867,276 +7826,46 @@ msgstr ""
 msgid "could not create signal dispatch thread: %d\n"
 msgstr "無法建立信號派送執行緒：%d\n"
 
-# postmaster/bgwriter.c:336
-#: postmaster/bgwriter.c:336
-#, c-format
-msgid "checkpoints are occurring too frequently (%d seconds apart)"
-msgstr ""
-
-# postmaster/bgwriter.c:338
-#: postmaster/bgwriter.c:338
-msgid "Consider increasing the configuration parameter \"checkpoint_segments\"."
-msgstr ""
-
-# postmaster/bgwriter.c:490
-#: postmaster/bgwriter.c:490
-msgid "not enough shared memory for background writer"
-msgstr ""
-
-# postmaster/bgwriter.c:555
-#: postmaster/bgwriter.c:555
-msgid "checkpoint request failed"
-msgstr "檢查點請求失敗"
-
-# postmaster/bgwriter.c:556
-#: postmaster/bgwriter.c:556
-msgid "Consult the postmaster log for details."
-msgstr ""
-
-# postmaster/pgarch.c:164
-#: postmaster/pgarch.c:164
-#, c-format
-msgid "could not fork archiver: %m"
-msgstr ""
-
-# postmaster/pgarch.c:392
-#: postmaster/pgarch.c:392
-#, c-format
-msgid "transaction log file \"%s\" could not be archived"
-msgstr ""
-
-# postmaster/pgarch.c:475
-#: postmaster/pgarch.c:475
-#, c-format
-msgid "archive command \"%s\" failed: return code %d"
-msgstr ""
-
-# postmaster/pgarch.c:480
-#: postmaster/pgarch.c:480
-#, c-format
-msgid "archived transaction log file \"%s\""
-msgstr ""
-
-# postmaster/pgarch.c:526
-#: postmaster/pgarch.c:526
-#, c-format
-msgid "could not open archive status directory \"%s\": %m"
-msgstr ""
-
-# postmaster/pgarch.c:565
-#: postmaster/pgarch.c:565
-#, c-format
-msgid "could not read archive status directory \"%s\": %m"
-msgstr ""
-
-# postmaster/pgstat.c:257
-#: postmaster/pgstat.c:257
-#, c-format
-msgid "could not resolve \"localhost\": %s"
-msgstr "無法解析\"localhost\"：%s"
-
-# postmaster/pgstat.c:285
-#: postmaster/pgstat.c:285
-#, c-format
-msgid "could not create socket for statistics collector: %m"
-msgstr ""
-
-# postmaster/pgstat.c:297
-#: postmaster/pgstat.c:297
-#, c-format
-msgid "could not bind socket for statistics collector: %m"
-msgstr ""
-
-# postmaster/pgstat.c:308
-#: postmaster/pgstat.c:308
-#, c-format
-msgid "could not get address of socket for statistics collector: %m"
-msgstr ""
-
-# postmaster/pgstat.c:324
-#: postmaster/pgstat.c:324
-#, c-format
-msgid "could not connect socket for statistics collector: %m"
-msgstr ""
-
-# postmaster/pgstat.c:341
-#: postmaster/pgstat.c:341
-#, c-format
-msgid "could not send test message on socket for statistics collector: %m"
-msgstr ""
-
-# postmaster/pgstat.c:366 postmaster/pgstat.c:1610
-#: postmaster/pgstat.c:366
-#: postmaster/pgstat.c:1610
-#, c-format
-msgid "select() failed in statistics collector: %m"
-msgstr "在統計資料收集器中 select() 失敗: %m"
-
-# postmaster/pgstat.c:381
-#: postmaster/pgstat.c:381
-msgid "test message did not get through on socket for statistics collector"
-msgstr ""
-
-# postmaster/pgstat.c:393
-#: postmaster/pgstat.c:393
-#, c-format
-msgid "could not receive test message on socket for statistics collector: %m"
-msgstr ""
-
-# postmaster/pgstat.c:403
-#: postmaster/pgstat.c:403
-msgid "incorrect test message transmission on socket for statistics collector"
-msgstr ""
-
-# postmaster/pgstat.c:418
-#: postmaster/pgstat.c:418
-msgid "disabling statistics collector for lack of working socket"
-msgstr "沒有可用的socket，停用統計資料收集器"
-
-# postmaster/pgstat.c:432
-#: postmaster/pgstat.c:432
-#, c-format
-msgid "could not set statistics collector socket to nonblocking mode: %m"
-msgstr "無法將統計資料收集器 socket 設為非阻擋模式：%m"
-
-# postmaster/pgstat.c:571
-#: postmaster/pgstat.c:571
-msgid "statistics collector startup skipped"
-msgstr "跳過統計資料收集器啟動程序"
-
-# postmaster/pgstat.c:605
-#: postmaster/pgstat.c:605
-#, c-format
-msgid "could not fork statistics buffer: %m"
-msgstr "無法 fork 統計資料緩衝區：%m"
-
-# postmaster/pgstat.c:963
-#: postmaster/pgstat.c:963
-msgid "must be superuser to reset statistics counters"
-msgstr "只有管理者能重設統計資料計數器"
-
-# postmaster/pgstat.c:1411
-#: postmaster/pgstat.c:1411
-#, c-format
-msgid "could not create pipe for statistics buffer: %m"
-msgstr "無法為統計資料緩衝區建立管道：%m"
-
-# postmaster/pgstat.c:1424
-#: postmaster/pgstat.c:1424
-#, c-format
-msgid "could not fork statistics collector: %m"
-msgstr "無法fork統計資料收集器：%m"
-
-# postmaster/pgstat.c:1537 postmaster/pgstat.c:1550 postmaster/pgstat.c:1833
-# postmaster/pgstat.c:2099 postmaster/pgstat.c:2131 postmaster/pgstat.c:2185
-# postmaster/pgstat.c:2446 postmaster/pgstat.c:2519 postmaster/pgstat.c:2565
-# postmaster/pgstat.c:2616 postmaster/pgstat.c:2866 postmaster/pgstat.c:3048
-#: postmaster/pgstat.c:1537
-#: postmaster/pgstat.c:1550
-#: postmaster/pgstat.c:1833
-#: postmaster/pgstat.c:2099
-#: postmaster/pgstat.c:2131
-#: postmaster/pgstat.c:2185
-#: postmaster/pgstat.c:2446
-#: postmaster/pgstat.c:2519
-#: postmaster/pgstat.c:2565
-#: postmaster/pgstat.c:2616
-#: postmaster/pgstat.c:2866
-#: postmaster/pgstat.c:3048
-msgid "out of memory in statistics collector --- abort"
-msgstr "統計資料收集器記憶體用盡 --- 中止"
-
-# postmaster/pgstat.c:1652
-#: postmaster/pgstat.c:1652
-#, c-format
-msgid "could not read from statistics collector pipe: %m"
-msgstr "無法由統計資料收集器管道讀取資料: %m"
-
-# postmaster/pgstat.c:1674
-#: postmaster/pgstat.c:1674
-msgid "invalid statistics message length"
-msgstr "無效的統計資料訊息長度"
-
-# postmaster/pgstat.c:1821
-#: postmaster/pgstat.c:1821
-#, c-format
-msgid "could not set statistics collector pipe to nonblocking mode: %m"
-msgstr "無法將統計資料收集器管道設為非阻擋模式: %m"
-
-# postmaster/pgstat.c:1861
-#: postmaster/pgstat.c:1861
-msgid "statistics buffer is full"
-msgstr "統計資料緩衝區已滿"
-
-# postmaster/pgstat.c:1892
-#: postmaster/pgstat.c:1892
-#, c-format
-msgid "select() failed in statistics buffer: %m"
-msgstr "在統計資料緩衝區中 select() 失敗: %m"
-
-# postmaster/pgstat.c:1908
-#: postmaster/pgstat.c:1908
-#, c-format
-msgid "could not read statistics message: %m"
-msgstr "無法讀取統計資料訊息: %m"
-
-# postmaster/pgstat.c:1973
-#: postmaster/pgstat.c:1973
+# port/pg_shmem.c:94 port/sysv_shmem.c:94
+#: port/pg_shmem.c:94
+#: port/sysv_shmem.c:94
 #, c-format
-msgid "could not write to statistics collector pipe: %m"
-msgstr "無法寫至統計資料收集器的管道：%m"
+msgid "could not create shared memory segment: %m"
+msgstr "無法建立共享記憶區段：%m"
 
-# postmaster/pgstat.c:2039
-#: postmaster/pgstat.c:2039
+# port/pg_shmem.c:95 port/sysv_shmem.c:95
+#: port/pg_shmem.c:95
+#: port/sysv_shmem.c:95
 #, c-format
-msgid "invalid server process ID %d"
-msgstr "不合法的伺服器行程ID %d"
+msgid "Failed system call was shmget(key=%lu, size=%u, 0%o)."
+msgstr "失敗的系統呼叫是shmget(key=%lu，size=%u，0%o)。"
 
-# postmaster/pgstat.c:2234
-#: postmaster/pgstat.c:2234
+# port/pg_shmem.c:99 port/sysv_shmem.c:99
+#: port/pg_shmem.c:99
+#: port/sysv_shmem.c:99
 #, c-format
-msgid "could not open temporary statistics file \"%s\": %m"
-msgstr "無法開啟統計資料暫存檔 \"%s\": %m"
-
-# postmaster/pgstat.c:2261
-#: postmaster/pgstat.c:2261
-msgid "database hash table corrupted during cleanup --- abort"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMMAX.  To reduce the request size (currently %u bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"If the request size is already small, it's possible that it is less than your kernel's SHMMIN parameter, in which case raising the request size or reconfiguring SHMMIN is called for.\n"
+"The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 
-# postmaster/pgstat.c:2298
-#: postmaster/pgstat.c:2298
+# port/pg_shmem.c:112 port/sysv_shmem.c:112
+#: port/pg_shmem.c:112
+#: port/sysv_shmem.c:112
 #, c-format
-msgid "tables hash table for database %u corrupted during cleanup --- abort"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory or swap space. To reduce the request size (currently %u bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 
-# postmaster/pgstat.c:2347
-#: postmaster/pgstat.c:2347
-#, c-format
-msgid "could not close temporary statistics file \"%s\": %m"
-msgstr "無法關閉統計資料暫存檔 \"%s\": %m"
-
-# postmaster/pgstat.c:2356
-#: postmaster/pgstat.c:2356
+# port/pg_shmem.c:121 port/sysv_shmem.c:121
+#: port/pg_shmem.c:121
+#: port/sysv_shmem.c:121
 #, c-format
-msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr "無法將統計資料暫存檔由 \"%s\" 更名為 \"%s\": %m"
-
-# postmaster/pgstat.c:2378
-#: postmaster/pgstat.c:2378
-msgid "dead-server-process hash table corrupted during cleanup --- abort"
-msgstr ""
-
-# postmaster/pgstat.c:2501 postmaster/pgstat.c:2533 postmaster/pgstat.c:2596
-# postmaster/pgstat.c:2629 postmaster/pgstat.c:2650 postmaster/pgstat.c:2696
-# postmaster/pgstat.c:2729
-#: postmaster/pgstat.c:2501
-#: postmaster/pgstat.c:2533
-#: postmaster/pgstat.c:2596
-#: postmaster/pgstat.c:2629
-#: postmaster/pgstat.c:2650
-#: postmaster/pgstat.c:2696
-#: postmaster/pgstat.c:2729
-msgid "corrupted pgstat.stat file"
+msgid ""
+"This error does *not* mean that you have run out of disk space. It occurs either if all available shared memory IDs have been taken, in which case you need to raise the SHMMNI parameter in your kernel, or because the system's overall limit for shared memory has been reached.  If you cannot increase the shared memory limit, reduce PostgreSQL's shared memory request (currently %u bytes), by reducing its shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 
 # postmaster/postmaster.c:387
@@ -8450,7 +8179,7 @@ msgstr "起始封包中未指定PostgreSQL使用者"
 # postmaster/postmaster.c:1495
 #: postmaster/postmaster.c:1495
 msgid "the database system is starting up"
-msgstr "資料庫系統正在啟動"
+msgstr "資料庫系統正?啟動"
 
 # postmaster/postmaster.c:1500
 #: postmaster/postmaster.c:1500
@@ -8624,6 +8353,269 @@ msgstr ""
 msgid "could not wait on child process handle: %d\n"
 msgstr "無法等待子行程handle：%d\n"
 
+# postmaster/bgwriter.c:336
+#: postmaster/bgwriter.c:336
+#, c-format
+msgid "checkpoints are occurring too frequently (%d seconds apart)"
+msgstr ""
+
+# postmaster/bgwriter.c:338
+#: postmaster/bgwriter.c:338
+msgid "Consider increasing the configuration parameter \"checkpoint_segments\"."
+msgstr ""
+
+# postmaster/bgwriter.c:490
+#: postmaster/bgwriter.c:490
+msgid "not enough shared memory for background writer"
+msgstr ""
+
+# postmaster/bgwriter.c:555
+#: postmaster/bgwriter.c:555
+msgid "checkpoint request failed"
+msgstr "檢查點請求失敗"
+
+# postmaster/bgwriter.c:556
+#: postmaster/bgwriter.c:556
+msgid "Consult the postmaster log for details."
+msgstr ""
+
+# postmaster/pgarch.c:164
+#: postmaster/pgarch.c:164
+#, c-format
+msgid "could not fork archiver: %m"
+msgstr ""
+
+# postmaster/pgarch.c:392
+#: postmaster/pgarch.c:392
+#, c-format
+msgid "transaction log file \"%s\" could not be archived"
+msgstr ""
+
+# postmaster/pgarch.c:475
+#: postmaster/pgarch.c:475
+#, c-format
+msgid "archive command \"%s\" failed: return code %d"
+msgstr ""
+
+# postmaster/pgarch.c:480
+#: postmaster/pgarch.c:480
+#, c-format
+msgid "archived transaction log file \"%s\""
+msgstr ""
+
+# postmaster/pgarch.c:526
+#: postmaster/pgarch.c:526
+#, c-format
+msgid "could not open archive status directory \"%s\": %m"
+msgstr ""
+
+# postmaster/pgarch.c:565
+#: postmaster/pgarch.c:565
+#, c-format
+msgid "could not read archive status directory \"%s\": %m"
+msgstr ""
+
+# postmaster/pgstat.c:257
+#: postmaster/pgstat.c:258
+#, c-format
+msgid "could not resolve \"localhost\": %s"
+msgstr "無法解析\"localhost\"：%s"
+
+# postmaster/pgstat.c:285
+#: postmaster/pgstat.c:286
+#, c-format
+msgid "could not create socket for statistics collector: %m"
+msgstr ""
+
+# postmaster/pgstat.c:297
+#: postmaster/pgstat.c:298
+#, c-format
+msgid "could not bind socket for statistics collector: %m"
+msgstr ""
+
+# postmaster/pgstat.c:308
+#: postmaster/pgstat.c:309
+#, c-format
+msgid "could not get address of socket for statistics collector: %m"
+msgstr ""
+
+# postmaster/pgstat.c:324
+#: postmaster/pgstat.c:325
+#, c-format
+msgid "could not connect socket for statistics collector: %m"
+msgstr ""
+
+# postmaster/pgstat.c:341
+#: postmaster/pgstat.c:342
+#, c-format
+msgid "could not send test message on socket for statistics collector: %m"
+msgstr ""
+
+# postmaster/pgstat.c:366 postmaster/pgstat.c:1610
+#: postmaster/pgstat.c:367
+#: postmaster/pgstat.c:1566
+#, c-format
+msgid "select() failed in statistics collector: %m"
+msgstr "在統計資料收集器中 select() 失敗: %m"
+
+# postmaster/pgstat.c:381
+#: postmaster/pgstat.c:382
+msgid "test message did not get through on socket for statistics collector"
+msgstr ""
+
+# postmaster/pgstat.c:393
+#: postmaster/pgstat.c:394
+#, c-format
+msgid "could not receive test message on socket for statistics collector: %m"
+msgstr ""
+
+# postmaster/pgstat.c:403
+#: postmaster/pgstat.c:404
+msgid "incorrect test message transmission on socket for statistics collector"
+msgstr ""
+
+# postmaster/pgstat.c:418
+#: postmaster/pgstat.c:419
+msgid "disabling statistics collector for lack of working socket"
+msgstr "沒有可用的socket，停用統計資料收集器"
+
+# postmaster/pgstat.c:432
+#: postmaster/pgstat.c:433
+#, c-format
+msgid "could not set statistics collector socket to nonblocking mode: %m"
+msgstr "無法將統計資料收集器 socket 設為非阻擋模式：%m"
+
+# postmaster/pgstat.c:571
+#: postmaster/pgstat.c:572
+msgid "statistics collector startup skipped"
+msgstr "跳過統計資料收集器啟動程序"
+
+# postmaster/pgstat.c:605
+#: postmaster/pgstat.c:606
+#, c-format
+msgid "could not fork statistics buffer: %m"
+msgstr "無法 fork 統計資料緩衝區：%m"
+
+# postmaster/pgstat.c:963
+#: postmaster/pgstat.c:964
+msgid "must be superuser to reset statistics counters"
+msgstr "只有管理者能重設統計資料計數器"
+
+# postmaster/pgstat.c:1411
+#: postmaster/pgstat.c:1386
+#, c-format
+msgid "could not create pipe for statistics buffer: %m"
+msgstr "無法為統計資料緩衝區建立管道：%m"
+
+# postmaster/pgstat.c:1424
+#: postmaster/pgstat.c:1397
+#, c-format
+msgid "could not fork statistics collector: %m"
+msgstr "無法fork統計資料收集器：%m"
+
+# postmaster/pgstat.c:1652
+#: postmaster/pgstat.c:1607
+#, c-format
+msgid "could not read from statistics collector pipe: %m"
+msgstr "無法由統計資料收集器管道讀取資料: %m"
+
+# postmaster/pgstat.c:1674
+#: postmaster/pgstat.c:1628
+msgid "invalid statistics message length"
+msgstr "無效的統計資料訊息長度"
+
+# postmaster/pgstat.c:1821
+#: postmaster/pgstat.c:1773
+#, c-format
+msgid "could not set statistics collector pipe to nonblocking mode: %m"
+msgstr "無法將統計資料收集器管道設為非阻擋模式: %m"
+
+# postmaster/pgstat.c:1861
+#: postmaster/pgstat.c:1804
+msgid "statistics buffer is full"
+msgstr "統計資料緩衝區已滿"
+
+# postmaster/pgstat.c:1892
+#: postmaster/pgstat.c:1835
+#, c-format
+msgid "select() failed in statistics buffer: %m"
+msgstr "在統計資料緩衝區中 select() 失敗: %m"
+
+# postmaster/pgstat.c:1908
+#: postmaster/pgstat.c:1849
+#, c-format
+msgid "could not read statistics message: %m"
+msgstr "無法讀取統計資料訊息: %m"
+
+# postmaster/pgstat.c:1973
+#: postmaster/pgstat.c:1912
+#, c-format
+msgid "could not write to statistics collector pipe: %m"
+msgstr "無法寫至統計資料收集器的管道：%m"
+
+# postmaster/pgstat.c:2039
+#: postmaster/pgstat.c:1977
+#, c-format
+msgid "invalid server process ID %d"
+msgstr "不合法的伺服器行程ID %d"
+
+# postmaster/pgstat.c:1537 postmaster/pgstat.c:1550 postmaster/pgstat.c:1833
+# postmaster/pgstat.c:2099 postmaster/pgstat.c:2131 postmaster/pgstat.c:2185
+# postmaster/pgstat.c:2446 postmaster/pgstat.c:2519 postmaster/pgstat.c:2565
+# postmaster/pgstat.c:2616 postmaster/pgstat.c:2866 postmaster/pgstat.c:3048
+#: postmaster/pgstat.c:2036
+#: postmaster/pgstat.c:2111
+#: postmaster/pgstat.c:2709
+msgid "out of memory in statistics collector --- abort"
+msgstr "統計資料收集器記憶體用盡 --- 中止"
+
+# postmaster/pgstat.c:2234
+#: postmaster/pgstat.c:2159
+#, c-format
+msgid "could not open temporary statistics file \"%s\": %m"
+msgstr "無法開啟統計資料暫存檔 \"%s\": %m"
+
+# postmaster/pgstat.c:2261
+#: postmaster/pgstat.c:2185
+msgid "database hash table corrupted during cleanup --- abort"
+msgstr ""
+
+# postmaster/pgstat.c:2298
+#: postmaster/pgstat.c:2220
+#, c-format
+msgid "tables hash table for database %u corrupted during cleanup --- abort"
+msgstr ""
+
+# postmaster/pgstat.c:2347
+#: postmaster/pgstat.c:2268
+#, c-format
+msgid "could not close temporary statistics file \"%s\": %m"
+msgstr "無法關閉統計資料暫存檔 \"%s\": %m"
+
+# postmaster/pgstat.c:2356
+#: postmaster/pgstat.c:2277
+#, c-format
+msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
+msgstr "無法將統計資料暫存檔由 \"%s\" 更名為 \"%s\": %m"
+
+# postmaster/pgstat.c:2378
+#: postmaster/pgstat.c:2299
+msgid "dead-server-process hash table corrupted during cleanup --- abort"
+msgstr ""
+
+# postmaster/pgstat.c:2501 postmaster/pgstat.c:2533 postmaster/pgstat.c:2596
+# postmaster/pgstat.c:2629 postmaster/pgstat.c:2650 postmaster/pgstat.c:2696
+# postmaster/pgstat.c:2729
+#: postmaster/pgstat.c:2406
+#: postmaster/pgstat.c:2426
+#: postmaster/pgstat.c:2472
+#: postmaster/pgstat.c:2493
+#: postmaster/pgstat.c:2510
+#: postmaster/pgstat.c:2544
+#: postmaster/pgstat.c:2573
+msgid "corrupted pgstat.stat file"
+msgstr ""
+
 # postmaster/syslogger.c:317
 #: postmaster/syslogger.c:317
 #, c-format
@@ -8880,8 +8872,8 @@ msgstr ""
 #: storage/ipc/shmem.c:185
 #: storage/ipc/shmem.c:246
 #: storage/ipc/shmem.c:386
-#: storage/lmgr/lock.c:561
-#: storage/lmgr/lock.c:624
+#: storage/lmgr/lock.c:558
+#: storage/lmgr/lock.c:621
 #: storage/lmgr/proc.c:179
 msgid "out of shared memory"
 msgstr "共享記憶體用盡"
@@ -8976,6 +8968,12 @@ msgstr ""
 msgid "could not allocate shared memory segment \"%s\""
 msgstr ""
 
+# storage/lmgr/lock.c:562 storage/lmgr/lock.c:625
+#: storage/lmgr/lock.c:559
+#: storage/lmgr/lock.c:622
+msgid "You may need to increase max_locks_per_transaction."
+msgstr "您可能必須增加 max_locks_per_transaction。"
+
 # storage/lmgr/deadlock.c:867
 #: storage/lmgr/deadlock.c:867
 #, c-format
@@ -8993,12 +8991,6 @@ msgstr ""
 msgid "deadlock detected"
 msgstr "發現deadlock"
 
-# storage/lmgr/lock.c:562 storage/lmgr/lock.c:625
-#: storage/lmgr/lock.c:562
-#: storage/lmgr/lock.c:625
-msgid "You may need to increase max_locks_per_transaction."
-msgstr "您可能必須增加 max_locks_per_transaction。"
-
 # storage/page/bufpage.c:135 storage/page/bufpage.c:334
 # storage/page/bufpage.c:472
 #: storage/page/bufpage.c:135
@@ -9027,19 +9019,19 @@ msgid "corrupted item pointer: offset = %u, size = %u"
 msgstr ""
 
 # storage/smgr/md.c:367
-#: storage/smgr/md.c:367
+#: storage/smgr/md.c:363
 #, c-format
 msgid "could not open relation %u/%u/%u: %m"
 msgstr "無法開啟relation %u/%u/%u：%m"
 
 # storage/smgr/md.c:769
-#: storage/smgr/md.c:769
+#: storage/smgr/md.c:765
 #, c-format
 msgid "could not fsync segment %u of relation %u/%u/%u: %m"
 msgstr ""
 
 # storage/smgr/md.c:959
-#: storage/smgr/md.c:959
+#: storage/smgr/md.c:955
 #, c-format
 msgid "could not open segment %u of relation %u/%u/%u (target block %u): %m"
 msgstr ""
@@ -9236,7 +9228,7 @@ msgstr ""
 # tcop/postgres.c:2032
 #: tcop/postgres.c:2042
 msgid "terminating connection due to administrator command"
-msgstr ""
+msgstr "因管理命令中斷連線"
 
 # tcop/postgres.c:2042
 #: tcop/postgres.c:2052
@@ -9409,7 +9401,7 @@ msgstr ""
 # tcop/pquery.c:771
 #: tcop/pquery.c:771
 msgid "cursor can only scan forward"
-msgstr ""
+msgstr "cursor只能向前掃描"
 
 # tcop/pquery.c:772
 #: tcop/pquery.c:772
@@ -9476,6 +9468,70 @@ msgstr "使用DROP TYPE刪除資料型別。"
 msgid "must be superuser to do CHECKPOINT"
 msgstr "只有管理者能用CHECKPOINT"
 
+# utils/adt/array_userfuncs.c:50
+#: utils/adt/array_userfuncs.c:50
+msgid "could not determine input data types"
+msgstr "無法識別輸入資料型別"
+
+# utils/adt/array_userfuncs.c:72
+#: utils/adt/array_userfuncs.c:72
+msgid "neither input type is an array"
+msgstr ""
+
+# utils/adt/array_userfuncs.c:99
+#: utils/adt/array_userfuncs.c:99
+msgid "argument must be empty or one-dimensional array"
+msgstr ""
+
+# utils/adt/array_userfuncs.c:198 utils/adt/array_userfuncs.c:210
+# utils/adt/array_userfuncs.c:247 utils/adt/array_userfuncs.c:280
+# utils/adt/array_userfuncs.c:308
+#: utils/adt/array_userfuncs.c:198
+#: utils/adt/array_userfuncs.c:210
+#: utils/adt/array_userfuncs.c:247
+#: utils/adt/array_userfuncs.c:280
+#: utils/adt/array_userfuncs.c:308
+msgid "cannot concatenate incompatible arrays"
+msgstr "無法串接型別不符的陣列"
+
+# utils/adt/array_userfuncs.c:199
+#: utils/adt/array_userfuncs.c:199
+#, c-format
+msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
+msgstr ""
+
+# utils/adt/array_userfuncs.c:211
+#: utils/adt/array_userfuncs.c:211
+#, c-format
+msgid "Arrays with element types %s and %s are not compatible for concatenation."
+msgstr ""
+
+# utils/adt/array_userfuncs.c:248
+#: utils/adt/array_userfuncs.c:248
+msgid "Arrays with differing element dimensions are not compatible for concatenation."
+msgstr ""
+
+# utils/adt/array_userfuncs.c:281 utils/adt/array_userfuncs.c:309
+#: utils/adt/array_userfuncs.c:281
+#: utils/adt/array_userfuncs.c:309
+msgid "Arrays with differing dimensions are not compatible for concatenation."
+msgstr ""
+
+# utils/adt/array_userfuncs.c:354
+#: utils/adt/array_userfuncs.c:354
+#, c-format
+msgid "invalid array element type OID: %u"
+msgstr "無效的陣列元素型別OID：%u"
+
+# utils/adt/array_userfuncs.c:358 utils/adt/arrayfuncs.c:1149
+# utils/adt/arrayfuncs.c:2417
+#: utils/adt/array_userfuncs.c:358
+#: utils/adt/arrayfuncs.c:1149
+#: utils/adt/arrayfuncs.c:2417
+#, c-format
+msgid "invalid number of dimensions: %d"
+msgstr "無效的維度數值：%d"
+
 # utils/adt/acl.c:109 utils/adt/name.c:90
 #: utils/adt/acl.c:109
 #: utils/adt/name.c:90
@@ -9597,68 +9653,18 @@ msgstr ""
 msgid "function \"%s\" does not exist"
 msgstr "函式\"%s\"不存在"
 
-# utils/adt/array_userfuncs.c:50
-#: utils/adt/array_userfuncs.c:50
-msgid "could not determine input data types"
-msgstr "無法識別輸入資料型別"
-
-# utils/adt/array_userfuncs.c:72
-#: utils/adt/array_userfuncs.c:72
-msgid "neither input type is an array"
-msgstr ""
-
-# utils/adt/array_userfuncs.c:99
-#: utils/adt/array_userfuncs.c:99
-msgid "argument must be empty or one-dimensional array"
-msgstr ""
-
-# utils/adt/array_userfuncs.c:198 utils/adt/array_userfuncs.c:210
-# utils/adt/array_userfuncs.c:247 utils/adt/array_userfuncs.c:280
-# utils/adt/array_userfuncs.c:308
-#: utils/adt/array_userfuncs.c:198
-#: utils/adt/array_userfuncs.c:210
-#: utils/adt/array_userfuncs.c:247
-#: utils/adt/array_userfuncs.c:280
-#: utils/adt/array_userfuncs.c:308
-msgid "cannot concatenate incompatible arrays"
-msgstr "無法串接型別不符的陣列"
-
-# utils/adt/array_userfuncs.c:199
-#: utils/adt/array_userfuncs.c:199
-#, c-format
-msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
-msgstr ""
-
-# utils/adt/array_userfuncs.c:211
-#: utils/adt/array_userfuncs.c:211
-#, c-format
-msgid "Arrays with element types %s and %s are not compatible for concatenation."
-msgstr ""
-
-# utils/adt/array_userfuncs.c:248
-#: utils/adt/array_userfuncs.c:248
-msgid "Arrays with differing element dimensions are not compatible for concatenation."
-msgstr ""
-
-# utils/adt/array_userfuncs.c:281 utils/adt/array_userfuncs.c:309
-#: utils/adt/array_userfuncs.c:281
-#: utils/adt/array_userfuncs.c:309
-msgid "Arrays with differing dimensions are not compatible for concatenation."
-msgstr ""
-
-# utils/adt/array_userfuncs.c:354
-#: utils/adt/array_userfuncs.c:354
-#, c-format
-msgid "invalid array element type OID: %u"
+# utils/adt/like.c:453 utils/adt/like_match.c:291 utils/adt/regexp.c:461
+#: utils/adt/like.c:453
+#: utils/adt/like_match.c:291
+#: utils/adt/regexp.c:461
+msgid "invalid escape string"
 msgstr ""
 
-# utils/adt/array_userfuncs.c:358 utils/adt/arrayfuncs.c:1149
-# utils/adt/arrayfuncs.c:2417
-#: utils/adt/array_userfuncs.c:358
-#: utils/adt/arrayfuncs.c:1149
-#: utils/adt/arrayfuncs.c:2417
-#, c-format
-msgid "invalid number of dimensions: %d"
+# utils/adt/like.c:454 utils/adt/like_match.c:292 utils/adt/regexp.c:462
+#: utils/adt/like.c:454
+#: utils/adt/like_match.c:292
+#: utils/adt/regexp.c:462
+msgid "Escape string must be empty or one character."
 msgstr ""
 
 # utils/adt/arrayfuncs.c:223 utils/adt/arrayfuncs.c:235
@@ -9738,7 +9744,7 @@ msgstr "錯誤的元素型別"
 
 # utils/adt/arrayfuncs.c:1211 utils/cache/lsyscache.c:1756
 #: utils/adt/arrayfuncs.c:1211
-#: utils/cache/lsyscache.c:1756
+#: utils/cache/lsyscache.c:1792
 #, c-format
 msgid "no binary input function available for type %s"
 msgstr ""
@@ -9751,7 +9757,7 @@ msgstr ""
 
 # utils/adt/arrayfuncs.c:1383 utils/cache/lsyscache.c:1792
 #: utils/adt/arrayfuncs.c:1383
-#: utils/cache/lsyscache.c:1792
+#: utils/cache/lsyscache.c:1828
 #, c-format
 msgid "no binary output function available for type %s"
 msgstr ""
@@ -9788,19 +9794,19 @@ msgstr ""
 #: utils/adt/arrayfuncs.c:2026
 #: utils/adt/arrayfuncs.c:2095
 msgid "source array too small"
-msgstr ""
+msgstr "來源陣列太小"
 
 # utils/adt/arrayfuncs.c:2319 utils/adt/arrayfuncs.c:3321
 #: utils/adt/arrayfuncs.c:2319
 #: utils/adt/arrayfuncs.c:3321
 msgid "null array elements not supported"
-msgstr ""
+msgstr "不支援空陣列元素"
 
 # utils/adt/arrayfuncs.c:2559 utils/adt/arrayfuncs.c:2714
 #: utils/adt/arrayfuncs.c:2559
 #: utils/adt/arrayfuncs.c:2714
 msgid "cannot compare arrays of different element types"
-msgstr ""
+msgstr "無法比較元素型別不同的陣列"
 
 # utils/adt/arrayfuncs.c:2731
 #: utils/adt/arrayfuncs.c:2731
@@ -9811,12 +9817,12 @@ msgstr ""
 # utils/adt/arrayfuncs.c:3130
 #: utils/adt/arrayfuncs.c:3130
 msgid "could not determine target array type"
-msgstr ""
+msgstr "無法確認目標陣列型別"
 
 # utils/adt/arrayfuncs.c:3136
 #: utils/adt/arrayfuncs.c:3136
 msgid "target type is not an array"
-msgstr ""
+msgstr "目標型別不是陣列"
 
 # utils/adt/arrayfuncs.c:3148
 #: utils/adt/arrayfuncs.c:3148
@@ -9910,9 +9916,9 @@ msgstr "date/time 的值 \"current\" 已不再受支援"
 #: utils/adt/date.c:1337
 #: utils/adt/date.c:1374
 #: utils/adt/date.c:2252
-#: utils/adt/formatting.c:2894
-#: utils/adt/formatting.c:2919
-#: utils/adt/formatting.c:2978
+#: utils/adt/formatting.c:2895
+#: utils/adt/formatting.c:2920
+#: utils/adt/formatting.c:2979
 #: utils/adt/nabstime.c:570
 #: utils/adt/nabstime.c:613
 #: utils/adt/nabstime.c:643
@@ -10001,7 +10007,7 @@ msgstr "\"interval\" 時區 \"%s\" 無效"
 # utils/adt/formatting.c:3180
 #: utils/adt/datetime.c:1495
 #: utils/adt/datetime.c:2370
-#: utils/adt/formatting.c:3180
+#: utils/adt/formatting.c:3181
 #, c-format
 msgid "inconsistent use of year %04d and \"BC\""
 msgstr ""
@@ -10250,95 +10256,95 @@ msgid "input is out of range"
 msgstr "輸入資料超過範圍"
 
 # utils/adt/formatting.c:985
-#: utils/adt/formatting.c:985
+#: utils/adt/formatting.c:986
 msgid "\"9\" must be ahead of \"PR\""
 msgstr ""
 
 # utils/adt/formatting.c:1004
-#: utils/adt/formatting.c:1004
+#: utils/adt/formatting.c:1005
 msgid "\"0\" must be ahead of \"PR\""
 msgstr ""
 
 # utils/adt/formatting.c:1033
-#: utils/adt/formatting.c:1033
+#: utils/adt/formatting.c:1034
 msgid "multiple decimal points"
-msgstr ""
+msgstr "多個小數點"
 
 # utils/adt/formatting.c:1040 utils/adt/formatting.c:1145
-#: utils/adt/formatting.c:1040
-#: utils/adt/formatting.c:1145
+#: utils/adt/formatting.c:1041
+#: utils/adt/formatting.c:1146
 msgid "cannot use \"V\" and decimal point together"
 msgstr ""
 
 # utils/adt/formatting.c:1055
-#: utils/adt/formatting.c:1055
+#: utils/adt/formatting.c:1056
 msgid "not unique \"S\""
 msgstr ""
 
 # utils/adt/formatting.c:1062
-#: utils/adt/formatting.c:1062
+#: utils/adt/formatting.c:1063
 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr "無法同時使用 \"S\" 和 \"PL\"/\"MI\"/\"SG\"/\"PR\""
 
 # utils/adt/formatting.c:1086
-#: utils/adt/formatting.c:1086
+#: utils/adt/formatting.c:1087
 msgid "cannot use \"S\" and \"MI\" together"
 msgstr "無法同時使用 \"S\" 和 \"MI\""
 
 # utils/adt/formatting.c:1099
-#: utils/adt/formatting.c:1099
+#: utils/adt/formatting.c:1100
 msgid "cannot use \"S\" and \"PL\" together"
 msgstr "無法同時使用 \"S\" 和 \"PL\""
 
 # utils/adt/formatting.c:1112
-#: utils/adt/formatting.c:1112
+#: utils/adt/formatting.c:1113
 msgid "cannot use \"S\" and \"SG\" together"
 msgstr "無法同時使用 \"S\" 和 \"SG\""
 
 # utils/adt/formatting.c:1124
-#: utils/adt/formatting.c:1124
+#: utils/adt/formatting.c:1125
 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr "無法同時使用 \"PR\" 和 \"S\"/\"PL\"/\"MI\"/\"SG\""
 
 # utils/adt/formatting.c:1154
-#: utils/adt/formatting.c:1154
+#: utils/adt/formatting.c:1155
 msgid "\"E\" is not supported"
 msgstr "\"E\"未被支援"
 
 # utils/adt/formatting.c:1425
-#: utils/adt/formatting.c:1425
+#: utils/adt/formatting.c:1426
 #, c-format
 msgid "\"%s\" is not a number"
 msgstr "\"%s\"不是數字"
 
 # utils/adt/formatting.c:1688
-#: utils/adt/formatting.c:1688
+#: utils/adt/formatting.c:1689
 msgid "invalid AM/PM string"
 msgstr "不?法的AM/PM字串"
 
 # utils/adt/formatting.c:2034
-#: utils/adt/formatting.c:2034
+#: utils/adt/formatting.c:2035
 msgid "\"TZ\"/\"tz\" not supported"
 msgstr "\"TZ\"/\"tz\"不被支援"
 
 # utils/adt/formatting.c:2044
-#: utils/adt/formatting.c:2044
+#: utils/adt/formatting.c:2045
 #, c-format
 msgid "invalid value for %s"
 msgstr "%s 的值不合法"
 
 # utils/adt/formatting.c:3141
-#: utils/adt/formatting.c:3141
+#: utils/adt/formatting.c:3142
 msgid "AM/PM hour must be between 1 and 12"
 msgstr "AM/PM 小時必須介於 1 到 12 之間"
 
 # utils/adt/formatting.c:3215
-#: utils/adt/formatting.c:3215
+#: utils/adt/formatting.c:3216
 msgid "cannot calculate day of year without year information"
 msgstr ""
 
 # utils/adt/formatting.c:3994
-#: utils/adt/formatting.c:3994
+#: utils/adt/formatting.c:4082
 msgid "\"RN\" not supported"
 msgstr "\"RN\"不被支援"
 
@@ -10538,18 +10544,22 @@ msgstr "bigint超過範圍"
 msgid "OID out of range"
 msgstr "OID 超出範圍"
 
-# utils/adt/like.c:453 utils/adt/like_match.c:291 utils/adt/regexp.c:461
-#: utils/adt/like.c:453
-#: utils/adt/like_match.c:291
-#: utils/adt/regexp.c:461
-msgid "invalid escape string"
+# utils/adt/oracle_compat.c:99 utils/adt/oracle_compat.c:138
+#: utils/adt/oracle_compat.c:99
+#: utils/adt/oracle_compat.c:139
+msgid "invalid multibyte character for locale"
 msgstr ""
 
-# utils/adt/like.c:454 utils/adt/like_match.c:292 utils/adt/regexp.c:462
-#: utils/adt/like.c:454
-#: utils/adt/like_match.c:292
-#: utils/adt/regexp.c:462
-msgid "Escape string must be empty or one character."
+#: utils/adt/oracle_compat.c:100
+msgid "The server's LC_CTYPE locale is probably incompatible with the database encoding."
+msgstr ""
+
+# utils/adt/oracle_compat.c:410 utils/adt/oracle_compat.c:507
+# utils/adt/oracle_compat.c:1131
+#: utils/adt/oracle_compat.c:411
+#: utils/adt/oracle_compat.c:508
+#: utils/adt/oracle_compat.c:1132
+msgid "requested length too large"
 msgstr ""
 
 # utils/adt/mac.c:65
@@ -10813,18 +10823,10 @@ msgstr ""
 msgid "oidvector has too many elements"
 msgstr ""
 
-# utils/adt/oracle_compat.c:99 utils/adt/oracle_compat.c:138
-#: utils/adt/oracle_compat.c:99
-#: utils/adt/oracle_compat.c:138
-msgid "invalid multibyte character for locale"
-msgstr ""
-
-# utils/adt/oracle_compat.c:410 utils/adt/oracle_compat.c:507
-# utils/adt/oracle_compat.c:1131
-#: utils/adt/oracle_compat.c:410
-#: utils/adt/oracle_compat.c:507
-#: utils/adt/oracle_compat.c:1131
-msgid "requested length too large"
+# utils/adt/ruleutils.c:1719
+#: utils/adt/ruleutils.c:1724
+#, c-format
+msgid "rule \"%s\" has unsupported event type %d"
 msgstr ""
 
 # utils/adt/pseudotypes.c:94
@@ -10904,14 +10906,14 @@ msgstr "不合法的正規表示式：%s"
 #: utils/adt/regproc.c:142
 #, c-format
 msgid "more than one function named \"%s\""
-msgstr ""
+msgstr "有一個以上的函式被命名為\"%s\""
 
 # utils/adt/regproc.c:471 utils/adt/regproc.c:491
 #: utils/adt/regproc.c:471
 #: utils/adt/regproc.c:491
 #, c-format
 msgid "more than one operator named %s"
-msgstr ""
+msgstr "有一個以上的operator被命名為 %s"
 
 # utils/adt/regproc.c:644 utils/adt/regproc.c:1276
 #: utils/adt/regproc.c:644
@@ -10946,116 +10948,116 @@ msgstr "不合適的型別名稱"
 
 # utils/adt/ri_triggers.c:337 utils/adt/ri_triggers.c:2743
 # utils/adt/ri_triggers.c:3248 utils/adt/ri_triggers.c:3285
-#: utils/adt/ri_triggers.c:342
-#: utils/adt/ri_triggers.c:2748
-#: utils/adt/ri_triggers.c:3253
-#: utils/adt/ri_triggers.c:3290
+#: utils/adt/ri_triggers.c:338
+#: utils/adt/ri_triggers.c:2744
+#: utils/adt/ri_triggers.c:3249
+#: utils/adt/ri_triggers.c:3286
 #, c-format
 msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
 
 # utils/adt/ri_triggers.c:340 utils/adt/ri_triggers.c:2746
-#: utils/adt/ri_triggers.c:345
-#: utils/adt/ri_triggers.c:2751
+#: utils/adt/ri_triggers.c:341
+#: utils/adt/ri_triggers.c:2747
 msgid "MATCH FULL does not allow mixing of null and nonnull key values."
 msgstr ""
 
 # utils/adt/ri_triggers.c:2482 utils/adt/ri_triggers.c:2971
-#: utils/adt/ri_triggers.c:2487
-#: utils/adt/ri_triggers.c:2976
+#: utils/adt/ri_triggers.c:2483
+#: utils/adt/ri_triggers.c:2972
 #, c-format
 msgid "function \"%s\" called with wrong number of trigger arguments"
 msgstr ""
 
 # utils/adt/ri_triggers.c:2500 utils/adt/ri_triggers.c:2981
-#: utils/adt/ri_triggers.c:2505
-#: utils/adt/ri_triggers.c:2986
+#: utils/adt/ri_triggers.c:2501
+#: utils/adt/ri_triggers.c:2982
 #, c-format
 msgid "no target table given for trigger \"%s\" on table \"%s\""
 msgstr ""
 
 # utils/adt/ri_triggers.c:2503 utils/adt/ri_triggers.c:2984
-#: utils/adt/ri_triggers.c:2508
-#: utils/adt/ri_triggers.c:2989
+#: utils/adt/ri_triggers.c:2504
+#: utils/adt/ri_triggers.c:2985
 msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
 msgstr ""
 
 # utils/adt/ri_triggers.c:2891 utils/adt/ri_triggers.c:2901
 # utils/adt/ri_triggers.c:3347
-#: utils/adt/ri_triggers.c:2896
-#: utils/adt/ri_triggers.c:2906
-#: utils/adt/ri_triggers.c:3352
+#: utils/adt/ri_triggers.c:2892
+#: utils/adt/ri_triggers.c:2902
+#: utils/adt/ri_triggers.c:3348
 #, c-format
 msgid "table \"%s\" does not have column \"%s\" referenced by constraint \"%s\""
 msgstr ""
 
 # utils/adt/ri_triggers.c:2921
-#: utils/adt/ri_triggers.c:2926
+#: utils/adt/ri_triggers.c:2922
 #, c-format
 msgid "function \"%s\" was not called by trigger manager"
 msgstr ""
 
 # utils/adt/ri_triggers.c:2930
-#: utils/adt/ri_triggers.c:2935
+#: utils/adt/ri_triggers.c:2931
 #, c-format
 msgid "function \"%s\" must be fired AFTER ROW"
 msgstr ""
 
 # utils/adt/ri_triggers.c:2938
-#: utils/adt/ri_triggers.c:2943
+#: utils/adt/ri_triggers.c:2939
 #, c-format
 msgid "function \"%s\" must be fired for INSERT"
 msgstr ""
 
 # utils/adt/ri_triggers.c:2944
-#: utils/adt/ri_triggers.c:2949
+#: utils/adt/ri_triggers.c:2945
 #, c-format
 msgid "function \"%s\" must be fired for UPDATE"
 msgstr ""
 
 # utils/adt/ri_triggers.c:2951
-#: utils/adt/ri_triggers.c:2956
+#: utils/adt/ri_triggers.c:2952
 #, c-format
 msgid "function \"%s\" must be fired for INSERT or UPDATE"
 msgstr ""
 
 # utils/adt/ri_triggers.c:2958
-#: utils/adt/ri_triggers.c:2963
+#: utils/adt/ri_triggers.c:2959
 #, c-format
 msgid "function \"%s\" must be fired for DELETE"
 msgstr ""
 
 # utils/adt/ri_triggers.c:3215
-#: utils/adt/ri_triggers.c:3220
+#: utils/adt/ri_triggers.c:3216
 #, c-format
 msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
 msgstr ""
 
 # utils/adt/ri_triggers.c:3219
-#: utils/adt/ri_triggers.c:3224
+#: utils/adt/ri_triggers.c:3220
 msgid "This is most likely due to a rule having rewritten the query."
 msgstr ""
 
 # utils/adt/ri_triggers.c:3250
-#: utils/adt/ri_triggers.c:3255
+#: utils/adt/ri_triggers.c:3251
 #, c-format
 msgid "No rows were found in \"%s\"."
 msgstr ""
 
 # utils/adt/ri_triggers.c:3287
-#: utils/adt/ri_triggers.c:3292
+#: utils/adt/ri_triggers.c:3288
 #, c-format
 msgid "Key (%s)=(%s) is not present in table \"%s\"."
 msgstr ""
 
 # utils/adt/ri_triggers.c:3293
-#: utils/adt/ri_triggers.c:3298
+#: utils/adt/ri_triggers.c:3294
 #, c-format
 msgid "update or delete on \"%s\" violates foreign key constraint \"%s\" on \"%s\""
 msgstr ""
 
 # utils/adt/ri_triggers.c:3296
-#: utils/adt/ri_triggers.c:3301
+#: utils/adt/ri_triggers.c:3297
 #, c-format
 msgid "Key (%s)=(%s) is still referenced from table \"%s\"."
 msgstr ""
@@ -11086,7 +11088,7 @@ msgstr "缺少左圓括號。"
 # utils/adt/rowtypes.c:153
 #: utils/adt/rowtypes.c:153
 msgid "Too few columns."
-msgstr ""
+msgstr "欄位不足。"
 
 # utils/adt/rowtypes.c:178 utils/adt/rowtypes.c:186
 #: utils/adt/rowtypes.c:178
@@ -11097,7 +11099,7 @@ msgstr "非預期的輸入終止。"
 # utils/adt/rowtypes.c:235
 #: utils/adt/rowtypes.c:235
 msgid "Too many columns."
-msgstr ""
+msgstr "欄位過多。"
 
 # utils/adt/rowtypes.c:243
 #: utils/adt/rowtypes.c:243
@@ -11122,12 +11124,6 @@ msgstr "錯誤的資料型別: %u, 預期應為 %u"
 msgid "improper binary format in record column %d"
 msgstr ""
 
-# utils/adt/ruleutils.c:1719
-#: utils/adt/ruleutils.c:1724
-#, c-format
-msgid "rule \"%s\" has unsupported event type %d"
-msgstr ""
-
 # utils/adt/selfuncs.c:3409 utils/adt/selfuncs.c:3796
 #: utils/adt/selfuncs.c:3409
 #: utils/adt/selfuncs.c:3796
@@ -11357,22 +11353,22 @@ msgstr ""
 
 # utils/cache/lsyscache.c:1679 utils/cache/lsyscache.c:1715
 # utils/cache/lsyscache.c:1751 utils/cache/lsyscache.c:1787
-#: utils/cache/lsyscache.c:1679
 #: utils/cache/lsyscache.c:1715
 #: utils/cache/lsyscache.c:1751
 #: utils/cache/lsyscache.c:1787
+#: utils/cache/lsyscache.c:1823
 #, c-format
 msgid "type %s is only a shell"
 msgstr ""
 
 # utils/cache/lsyscache.c:1684
-#: utils/cache/lsyscache.c:1684
+#: utils/cache/lsyscache.c:1720
 #, c-format
 msgid "no input function available for type %s"
 msgstr ""
 
 # utils/cache/lsyscache.c:1720
-#: utils/cache/lsyscache.c:1720
+#: utils/cache/lsyscache.c:1756
 #, c-format
 msgid "no output function available for type %s"
 msgstr ""
@@ -11528,6 +11524,25 @@ msgstr "嚴重錯誤"
 msgid "PANIC"
 msgstr ""
 
+# utils/fmgr/fmgr.c:247
+#: utils/fmgr/fmgr.c:247
+#, c-format
+msgid "internal function \"%s\" is not in internal lookup table"
+msgstr ""
+
+# utils/fmgr/fmgr.c:449
+#: utils/fmgr/fmgr.c:449
+#, c-format
+msgid "unrecognized API version %d reported by info function \"%s\""
+msgstr ""
+
+# utils/fmgr/fmgr.c:764 utils/fmgr/fmgr.c:1639
+#: utils/fmgr/fmgr.c:760
+#: utils/fmgr/fmgr.c:1635
+#, c-format
+msgid "function %u has too many arguments (%d, maximum is %d)"
+msgstr ""
+
 # utils/fmgr/dfmgr.c:107 utils/fmgr/dfmgr.c:209 utils/fmgr/dfmgr.c:263
 #: utils/fmgr/dfmgr.c:107
 #: utils/fmgr/dfmgr.c:209
@@ -11564,25 +11579,6 @@ msgstr ""
 msgid "component in parameter \"dynamic_library_path\" is not an absolute path"
 msgstr ""
 
-# utils/fmgr/fmgr.c:247
-#: utils/fmgr/fmgr.c:247
-#, c-format
-msgid "internal function \"%s\" is not in internal lookup table"
-msgstr ""
-
-# utils/fmgr/fmgr.c:449
-#: utils/fmgr/fmgr.c:449
-#, c-format
-msgid "unrecognized API version %d reported by info function \"%s\""
-msgstr ""
-
-# utils/fmgr/fmgr.c:764 utils/fmgr/fmgr.c:1639
-#: utils/fmgr/fmgr.c:764
-#: utils/fmgr/fmgr.c:1639
-#, c-format
-msgid "function %u has too many arguments (%d, maximum is %d)"
-msgstr ""
-
 # utils/init/miscinit.c:403
 #: utils/init/miscinit.c:403
 msgid "permission denied to set session authorization"
@@ -11674,7 +11670,7 @@ msgstr "無法寫入鎖定檔\"%s\"：%m"
 
 # utils/init/miscinit.c:792 utils/misc/guc.c:5074
 #: utils/init/miscinit.c:792
-#: utils/misc/guc.c:5072
+#: utils/misc/guc.c:5102
 #, c-format
 msgid "could not read from file \"%s\": %m"
 msgstr "無法讀取鎖定檔\"%s\"：%m"
@@ -11824,6 +11820,11 @@ msgstr ""
 msgid "invalid byte sequence for encoding \"%s\": 0x%s"
 msgstr ""
 
+# utils/misc/help_config.c:125
+#: utils/misc/help_config.c:125
+msgid "internal error: unrecognized run-time parameter type\n"
+msgstr ""
+
 # utils/misc/guc.c:237
 #: utils/misc/guc.c:237
 msgid "Ungrouped"
@@ -12758,187 +12759,186 @@ msgid "If a dynamically loadable module needs to be opened and the specified nam
 msgstr ""
 
 # utils/misc/guc.c:1535
-#: utils/misc/guc.c:1533
+#: utils/misc/guc.c:1534
 msgid "Sets the location of the Kerberos server key file."
 msgstr "設定Kerberos伺服器金鑰所在位置。"
 
 # utils/misc/guc.c:1544
-#: utils/misc/guc.c:1542
+#: utils/misc/guc.c:1544
 msgid "Sets the Rendezvous broadcast service name."
 msgstr "設定Rendezvous廣播服務名?。"
 
 # utils/misc/guc.c:1555
-#: utils/misc/guc.c:1553
+#: utils/misc/guc.c:1555
 msgid "Shows the collation order locale."
 msgstr ""
 
 # utils/misc/guc.c:1565
-#: utils/misc/guc.c:1563
+#: utils/misc/guc.c:1565
 msgid "Shows the character classification and case conversion locale."
 msgstr ""
 
 # utils/misc/guc.c:1575
-#: utils/misc/guc.c:1573
+#: utils/misc/guc.c:1575
 msgid "Sets the language in which messages are displayed."
 msgstr "設定顯示訊息時使用的語言。"
 
 # utils/misc/guc.c:1584
-#: utils/misc/guc.c:1582
+#: utils/misc/guc.c:1584
 msgid "Sets the locale for formatting monetary amounts."
 msgstr ""
 
 # utils/misc/guc.c:1593
-#: utils/misc/guc.c:1591
+#: utils/misc/guc.c:1593
 msgid "Sets the locale for formatting numbers."
 msgstr "設定格式化數字時使用的locale。"
 
 # utils/misc/guc.c:1602
-#: utils/misc/guc.c:1600
+#: utils/misc/guc.c:1602
 msgid "Sets the locale for formatting date and time values."
 msgstr "設定格式化日期和時間時使用的locale。"
 
 # utils/misc/guc.c:1611
-#: utils/misc/guc.c:1609
+#: utils/misc/guc.c:1611
 msgid "Lists shared libraries to preload into server."
 msgstr "列出預先載入伺服器的共享程式庫。"
 
 # utils/misc/guc.c:1621
-#: utils/misc/guc.c:1619
+#: utils/misc/guc.c:1621
 msgid "Sets the regular expression \"flavor\"."
 msgstr ""
 
 # utils/misc/guc.c:1622
-#: utils/misc/guc.c:1620
+#: utils/misc/guc.c:1622
 msgid "This can be set to advanced, extended, or basic."
 msgstr ""
 
 # utils/misc/guc.c:1630
-#: utils/misc/guc.c:1628
+#: utils/misc/guc.c:1630
 msgid "Sets the schema search order for names that are not schema-qualified."
 msgstr ""
 
 # utils/misc/guc.c:1641
-#: utils/misc/guc.c:1639
+#: utils/misc/guc.c:1641
 msgid "Sets the server (database) character set encoding."
 msgstr "設定伺服器(資料庫)使用的字元編碼。"
 
 # utils/misc/guc.c:1652
-#: utils/misc/guc.c:1650
+#: utils/misc/guc.c:1652
 msgid "Shows the server version."
 msgstr "顯示伺服器版本。"
 
 # utils/misc/guc.c:1663
-#: utils/misc/guc.c:1661
+#: utils/misc/guc.c:1663
 msgid "Sets the session user name."
 msgstr "設定 session 使用者名稱。"
 
 # utils/misc/guc.c:1673
-#: utils/misc/guc.c:1671
+#: utils/misc/guc.c:1673
 msgid "Sets the destination for server log output."
 msgstr "設定伺服器記錄輸出目的地。"
 
 # utils/misc/guc.c:1674
-#: utils/misc/guc.c:1672
+#: utils/misc/guc.c:1674
 msgid "Valid values are combinations of \"stderr\", \"syslog\", and \"eventlog\", depending on the platform."
 msgstr ""
 
 # utils/misc/guc.c:1683
-#: utils/misc/guc.c:1681
+#: utils/misc/guc.c:1683
 msgid "Sets the destination directory for log files."
 msgstr "設定伺服器記錄輸出目錄。"
 
 # utils/misc/guc.c:1684
-#: utils/misc/guc.c:1682
+#: utils/misc/guc.c:1684
 msgid "May be specified as relative to the data directory or as absolute path."
 msgstr ""
 
 # utils/misc/guc.c:1692
-#: utils/misc/guc.c:1690
+#: utils/misc/guc.c:1693
 msgid "Sets the file name pattern for log files."
 msgstr "設定log檔的檔名格式。"
 
 # utils/misc/guc.c:1702
-#: utils/misc/guc.c:1700
+#: utils/misc/guc.c:1704
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
 msgstr "設定當系統記錄啟用時的被使用的系統記錄 \"facility\"。"
 
 # utils/misc/guc.c:1703
-#: utils/misc/guc.c:1701
+#: utils/misc/guc.c:1705
 msgid "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7."
 msgstr "合法的值有LOCAL0、LOCAL1、LOCAL2、LOCAL3、LOCAL4、LOCAL5、LOCAL6、LOCAL7。"
 
 # utils/misc/guc.c:1711
-#: utils/misc/guc.c:1709
+#: utils/misc/guc.c:1713
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
 msgstr "設定用來在系統記錄中識別 PostgreSQL 訊息的程式名稱。"
 
 # utils/misc/guc.c:1722
-#: utils/misc/guc.c:1720
+#: utils/misc/guc.c:1724
 msgid "Sets the time zone for displaying and interpreting time stamps."
 msgstr "設定用來顯示或解讀timestamp的時區。"
 
 # utils/misc/guc.c:1731
-#: utils/misc/guc.c:1729
+#: utils/misc/guc.c:1733
 msgid "Sets the current transaction's isolation level."
 msgstr "設定目前交易的隔離等級。"
 
 # utils/misc/guc.c:1741
-#: utils/misc/guc.c:1739
+#: utils/misc/guc.c:1743
 msgid "Sets the owning group of the Unix-domain socket."
 msgstr "設定Unix-domain socket的所屬群組。"
 
 # utils/misc/guc.c:1742
-#: utils/misc/guc.c:1740
+#: utils/misc/guc.c:1744
 msgid "(The owning user of the socket is always the user that starts the server.)"
 msgstr "(socket的所屬使用者永遠是啟動伺服器的使用者。)"
 
 # utils/misc/guc.c:1751
-#: utils/misc/guc.c:1749
+#: utils/misc/guc.c:1753
 msgid "Sets the directory where the Unix-domain socket will be created."
 msgstr "設定用來建立Unix-domain socket的目錄位置。"
 
 # utils/misc/guc.c:1760
-#: utils/misc/guc.c:1758
+#: utils/misc/guc.c:1763
 msgid "Sets the host name or IP address(es) to listen to."
 msgstr "設定要傾聽的主機名稱或IP位置。"
 
 # utils/misc/guc.c:1770
-#: utils/misc/guc.c:1768
+#: utils/misc/guc.c:1773
 msgid "Selects the method used for forcing WAL updates out to disk."
 msgstr ""
 
-# utils/misc/guc.c:1779
-#: utils/misc/guc.c:1777
-msgid "Sets the list of known custom variable classes"
+#: utils/misc/guc.c:1782
+msgid "Sets the list of known custom variable classes."
 msgstr ""
 
 # utils/misc/guc.c:1789
-#: utils/misc/guc.c:1787
+#: utils/misc/guc.c:1792
 msgid "Sets the server's data directory."
 msgstr "設定伺服器的資料目錄。"
 
 # utils/misc/guc.c:1798
-#: utils/misc/guc.c:1796
+#: utils/misc/guc.c:1802
 msgid "Sets the server's main configuration file."
 msgstr "設定伺服器的主要設定檔。"
 
 # utils/misc/guc.c:1808
-#: utils/misc/guc.c:1806
+#: utils/misc/guc.c:1812
 msgid "Sets the server's \"hba\" configuration file"
 msgstr "設定伺服器的\"hba\"設定檔"
 
 # utils/misc/guc.c:1817
-#: utils/misc/guc.c:1815
+#: utils/misc/guc.c:1822
 msgid "Sets the server's \"ident\" configuration file"
 msgstr "設定伺服器的\"ident\"設定檔"
 
 # utils/misc/guc.c:1826
-#: utils/misc/guc.c:1824
+#: utils/misc/guc.c:1832
 msgid "Writes the postmaster PID to the specified file."
 msgstr "將postmaster的PID寫入指定的檔案。"
 
 # utils/misc/guc.c:2482
-#: utils/misc/guc.c:2480
+#: utils/misc/guc.c:2491
 #, c-format
 msgid ""
 "%s does not know where to find the server configuration file.\n"
@@ -12948,13 +12948,13 @@ msgstr ""
 "您必須指定--config-file或-D選項，或使用PGDATA環境變數。\n"
 
 # utils/misc/guc.c:2507
-#: utils/misc/guc.c:2505
+#: utils/misc/guc.c:2516
 #, c-format
 msgid "%s cannot access the server configuration file \"%s\": %s\n"
 msgstr "%s 無法存取伺服器設定檔\"%s\"：%s\n"
 
 # utils/misc/guc.c:2527
-#: utils/misc/guc.c:2525
+#: utils/misc/guc.c:2536
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -12964,7 +12964,7 @@ msgstr ""
 "您必須指定\"data_directory\"於\"%ss\"或 -D 選項，或設定PGDATA環境變數。\n"
 
 # utils/misc/guc.c:2550
-#: utils/misc/guc.c:2548
+#: utils/misc/guc.c:2559
 #, c-format
 msgid ""
 "%s does not know where to find the \"hba\" configuration file.\n"
@@ -12974,7 +12974,7 @@ msgstr ""
 "您必須指定\"hba_file\"於\"%s\"或 -D 選項，或設定PGDATA環境變數設。\n"
 
 # utils/misc/guc.c:2573
-#: utils/misc/guc.c:2571
+#: utils/misc/guc.c:2582
 #, c-format
 msgid ""
 "%s does not know where to find the \"ident\" configuration file.\n"
@@ -12985,183 +12985,186 @@ msgstr ""
 
 # utils/misc/guc.c:3281 utils/misc/guc.c:3970 utils/misc/guc.c:4006
 # utils/misc/guc.c:4062 utils/misc/guc.c:4399 utils/misc/guc.c:4548
-#: utils/misc/guc.c:3279
-#: utils/misc/guc.c:3968
-#: utils/misc/guc.c:4004
-#: utils/misc/guc.c:4060
-#: utils/misc/guc.c:4397
-#: utils/misc/guc.c:4546
+#: utils/misc/guc.c:3290
+#: utils/misc/guc.c:3979
+#: utils/misc/guc.c:4019
+#: utils/misc/guc.c:4079
+#: utils/misc/guc.c:4415
+#: utils/misc/guc.c:4566
 #, c-format
 msgid "unrecognized configuration parameter \"%s\""
 msgstr "無法識別的設定參數\"%s\""
 
 # utils/misc/guc.c:3300
-#: utils/misc/guc.c:3298
+#: utils/misc/guc.c:3309
 #, c-format
 msgid "parameter \"%s\" cannot be changed"
 msgstr "參數\"%s\"不能被修改"
 
 # utils/misc/guc.c:3312
-#: utils/misc/guc.c:3310
+#: utils/misc/guc.c:3321
 #, c-format
 msgid "parameter \"%s\" cannot be changed after server start"
 msgstr "參數\"%s\"在伺服器啟動後不能被修改"
 
 # utils/misc/guc.c:3322
-#: utils/misc/guc.c:3320
+#: utils/misc/guc.c:3331
 #, c-format
 msgid "parameter \"%s\" cannot be changed now"
 msgstr "參數\"%s\"現在不能被修改"
 
 # utils/misc/guc.c:3352
-#: utils/misc/guc.c:3350
+#: utils/misc/guc.c:3361
 #, c-format
 msgid "parameter \"%s\" cannot be set after connection start"
 msgstr "參數\"%s\"在連線後不能被修改"
 
 # utils/misc/guc.c:3362 utils/misc/guc.c:3896
-#: utils/misc/guc.c:3360
-#: utils/misc/guc.c:3894
+#: utils/misc/guc.c:3371
+#: utils/misc/guc.c:3905
 #, c-format
 msgid "permission denied to set parameter \"%s\""
 msgstr "權限不足無法設定參數\"%s\""
 
 # utils/misc/guc.c:3419
-#: utils/misc/guc.c:3417
+#: utils/misc/guc.c:3428
 #, c-format
 msgid "parameter \"%s\" requires a Boolean value"
 msgstr "參數\"%s\"要求Boolean值"
 
 # utils/misc/guc.c:3451 utils/misc/guc.c:3559
-#: utils/misc/guc.c:3449
-#: utils/misc/guc.c:3557
+#: utils/misc/guc.c:3460
+#: utils/misc/guc.c:3568
 #, c-format
 msgid "invalid value for parameter \"%s\": %d"
 msgstr "給參數\"%s\"的值不合法：%d"
 
 # utils/misc/guc.c:3511
-#: utils/misc/guc.c:3509
+#: utils/misc/guc.c:3520
 #, c-format
 msgid "parameter \"%s\" requires an integer value"
 msgstr "參數\"%s\"要求整數值"
 
 # utils/misc/guc.c:3519
-#: utils/misc/guc.c:3517
+#: utils/misc/guc.c:3528
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
 msgstr "%d 超出參數 \"%s\" 的有效範圍 (%d .. %d)"
 
 # utils/misc/guc.c:3619
-#: utils/misc/guc.c:3617
+#: utils/misc/guc.c:3628
 #, c-format
 msgid "parameter \"%s\" requires a numeric value"
 msgstr "參數\"%s\"要求numeric值"
 
 # utils/misc/guc.c:3627
-#: utils/misc/guc.c:3625
+#: utils/misc/guc.c:3636
 #, c-format
 msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
 msgstr "%g 超出參數 \"%s\" 的有效範圍 (%g .. %g)"
 
 # utils/misc/guc.c:3660
-#: utils/misc/guc.c:3658
+#: utils/misc/guc.c:3669
 #, c-format
 msgid "invalid value for parameter \"%s\": %g"
 msgstr "給參數\"%s\"的值不合法：%g"
 
 # utils/misc/guc.c:3792
-#: utils/misc/guc.c:3790
+#: utils/misc/guc.c:3801
 #, c-format
 msgid "invalid value for parameter \"%s\": \"%s\""
 msgstr "給參數\"%s\"的值不合法：\"%s\""
 
 # utils/misc/guc.c:3899
-#: utils/misc/guc.c:3897
+#: utils/misc/guc.c:3908
 msgid "Must be superuser to change this value to false."
 msgstr "只有管理者能將這個值設成false。"
 
 # utils/misc/guc.c:3901
-#: utils/misc/guc.c:3899
+#: utils/misc/guc.c:3910
 msgid "Must be superuser to increase this value or turn it off."
 msgstr "只有管理者可以調低這個值或將其關閉。"
 
 # utils/misc/guc.c:3902
-#: utils/misc/guc.c:3900
+#: utils/misc/guc.c:3911
 msgid "Must be superuser to increase this value."
-msgstr "只有管理者可以調高這個值。"
+msgstr "只有管理者可以調高這饋值"
+
+# commands/user.c:1258
+#: utils/misc/guc.c:3983
+#: utils/misc/guc.c:4023
+#: utils/misc/guc.c:4570
+#, c-format
+msgid "must be superuser to examine \"%s\""
+msgstr "只有管理者能能檢查\"%s\""
 
 # utils/misc/guc.c:4071
-#: utils/misc/guc.c:4069
+#: utils/misc/guc.c:4088
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s 只接受一個引數"
 
 # utils/misc/guc.c:4175
-#: utils/misc/guc.c:4173
+#: utils/misc/guc.c:4192
 msgid "SET requires parameter name"
 msgstr "SET需要參數名稱"
 
 # utils/misc/guc.c:4239
-#: utils/misc/guc.c:4237
+#: utils/misc/guc.c:4256
 #, c-format
 msgid "attempt to redefine parameter \"%s\""
 msgstr "試圖重新定義參?\"%s\""
 
 # utils/misc/guc.c:5185
-#: utils/misc/guc.c:5183
+#: utils/misc/guc.c:5213
 #, c-format
 msgid "could not parse setting for parameter \"%s\""
 msgstr "無法解讀參數\"%s\"的設定"
 
 # utils/misc/guc.c:5383
-#: utils/misc/guc.c:5381
+#: utils/misc/guc.c:5411
 msgid "invalid list syntax for parameter \"log_destination\""
 msgstr "參數\"log_destination\"的list語法錯誤"
 
 # utils/misc/guc.c:5406
-#: utils/misc/guc.c:5404
+#: utils/misc/guc.c:5434
 #, c-format
 msgid "unrecognized \"log_destination\" key word: \"%s\""
 msgstr "無法識別的\"log_destination\"關鍵字：\"%s\""
 
 # utils/misc/guc.c:5640
-#: utils/misc/guc.c:5638
+#: utils/misc/guc.c:5668
 msgid "SET AUTOCOMMIT TO OFF is no longer supported"
 msgstr "SET AUTOCOMMIT TO OFF已不被支援"
 
 # utils/misc/guc.c:5688
-#: utils/misc/guc.c:5686
+#: utils/misc/guc.c:5716
 #, c-format
 msgid "invalid syntax for \"custom_variable_classes\": \"%s\""
 msgstr "\"custom_variable_classes\"語法錯誤：\"%s\""
 
 # utils/misc/guc.c:5717
-#: utils/misc/guc.c:5715
+#: utils/misc/guc.c:5745
 msgid "cannot enable parameter when \"log_statement_stats\" is true"
 msgstr "當 \"log_statement_stats\" 為true時無法啟用參數"
 
 # utils/misc/guc.c:5734
-#: utils/misc/guc.c:5732
+#: utils/misc/guc.c:5762
 msgid "cannot enable \"log_statement_stats\" when \"log_parser_stats\", \"log_planner_stats\", or \"log_executor_stats\" is true"
 msgstr ""
 "當\"log_parser_stats\"、\"log_planner_stats\"或\"log_executor_stats\"\n"
 "為true時不能啟用\"log_statement_stats\""
 
 # utils/misc/guc.c:5753
-#: utils/misc/guc.c:5751
+#: utils/misc/guc.c:5781
 msgid "cannot set transaction read-write mode inside a read-only transaction"
 msgstr "無法在唯讀交易中設定交易讀寫模式"
 
-# utils/misc/help_config.c:125
-#: utils/misc/help_config.c:125
-msgid "internal error: unrecognized run-time parameter type\n"
-msgstr ""
-
 # guc-file.l:267
 #: guc-file.l:267
 #, c-format
 msgid "syntax error in file \"%s\" line %u, near end of line"
-msgstr "語法錯誤於檔案\"%s\"列 %u，檔案結尾附近"
+msgstr "語法匯誤於檔案\"%s\"列 %u，檔案結尾附近"
 
 # guc-file.l:272
 #: guc-file.l:272
@@ -13221,4 +13224,3 @@ msgstr "無法建立唯行索伕"
 #: utils/sort/tuplesort.c:2083
 msgid "Table contains duplicated values."
 msgstr "資料表含有重覆的值。"
-
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"
diff --git a/src/interfaces/libpq/po/pt_BR.po b/src/interfaces/libpq/po/pt_BR.po
index e489588b8a..3f1636f53b 100644
--- a/src/interfaces/libpq/po/pt_BR.po
+++ b/src/interfaces/libpq/po/pt_BR.po
@@ -1,13 +1,13 @@
 # "libpq" 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-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"
@@ -70,28 +70,23 @@ msgstr "nome do servi�o de autentica��o \"%s\" � inv�lido, ignorado\n"
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: sistema de autentica��o inv�lido: %d\n"
 
-#: fe-connect.c:452
+#: fe-connect.c:457
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "valor do modo ssl desconhecido: \"%s\"\n"
 
-#: fe-connect.c:472
+#: fe-connect.c:477
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr ""
 "valor do modo ssl � \"%s\" inv�lido quando suporte a SSL n�o foi compilado\n"
 
-#: fe-connect.c:783
-#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "n�o p�de configurar o soquete para modo n�o-bloqueado: %s\n"
-
-#: fe-connect.c:810
+#: fe-connect.c:793
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "n�o p�de configurar o soquete para modo TCP sem atraso: %s\n"
 
-#: fe-connect.c:841
+#: fe-connect.c:824
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -102,7 +97,7 @@ msgstr ""
 "\tO servidor est� executando localmente e aceitando\n"
 "\tconex�es no soquete de dom�nio Unix \"%s\"?\n"
 
-#: fe-connect.c:853
+#: fe-connect.c:836
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -113,106 +108,116 @@ msgstr ""
 "\tO servidor est� executando na m�quina \"%s\" e aceitando\n"
 "\tconex�es TCP/IP na porta %s?\n"
 
-#: fe-connect.c:946
+#: fe-connect.c:929
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "n�o p�de traduzir nome de m�quina \"%s\" para endere�o: %s\n"
 
-#: fe-connect.c:950
+#: fe-connect.c:933
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr ""
 "n�o p�de traduzir caminho do soquete de dom�nio UNIX \"%s\" para endere�o: %"
 "s\n"
 
-#: fe-connect.c:1154
+#: fe-connect.c:1137
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr ""
 "estado de conex�o inv�lido, provavelmente indicativo de corrup��o de "
 "mem�ria\n"
 
-#: fe-connect.c:1197
+#: fe-connect.c:1180
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "n�o p�de criar soquete: %s\n"
 
-#: fe-connect.c:1308
+#: fe-connect.c:1203
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "n�o p�de configurar o soquete para modo n�o-bloqueado: %s\n"
+
+#: fe-connect.c:1215
+#, c-format
+msgid "could not set socket to close-on-exec mode: %s\n"
+msgstr "n�o p�de configurar o soquete para modo fechar-ap�s-execu��o: %s\n"
+
+#: fe-connect.c:1307
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "n�o p�de obter status de erro do soquete: %s\n"
 
-#: fe-connect.c:1347
+#: fe-connect.c:1346
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "n�o p�de obter do soquete o endere�o do cliente: %s\n"
 
-#: fe-connect.c:1392
+#: fe-connect.c:1391
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "n�o p�de mandar pacote de negocia��o SSL: %s\n"
 
-#: fe-connect.c:1414 fe-connect.c:2544 fe-connect.c:2553 fe-connect.c:3132
-#: fe-lobj.c:556 fe-protocol2.c:1007 fe-protocol3.c:949
+#: fe-connect.c:1413 fe-connect.c:2543 fe-connect.c:2552 fe-connect.c:3131
+#: fe-lobj.c:556 fe-protocol2.c:1007 fe-protocol3.c:958
 msgid "out of memory\n"
 msgstr "sem mem�ria\n"
 
-#: fe-connect.c:1427
+#: fe-connect.c:1426
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "n�o p�de enviar pacote de inicializa��o: %s\n"
 
-#: fe-connect.c:1467
+#: fe-connect.c:1466
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr ""
 "n�o p�de receber resposta do servidor para pacote de negocia��o SSL: %s\n"
 
-#: fe-connect.c:1486 fe-connect.c:1503
+#: fe-connect.c:1485 fe-connect.c:1502
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "servidor n�o suporta SSL, mas SSL foi requerido\n"
 
-#: fe-connect.c:1519
+#: fe-connect.c:1518
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "a negocia��o SSL recebeu uma resposta inv�lida: %c\n"
 
-#: fe-connect.c:1576 fe-connect.c:1608
+#: fe-connect.c:1575 fe-connect.c:1607
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "pedido de autentica��o esperado do servidor, mas foi recebido %c\n"
 
-#: fe-connect.c:1844
+#: fe-connect.c:1843
 msgid "unexpected message from server during startup\n"
 msgstr "mensagem n�o esperada do servidor durante inicializa��o\n"
 
-#: fe-connect.c:1914
+#: fe-connect.c:1913
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr ""
 "estado de conex�o %c � inv�lido, provavelmente indicativo de corrup��o de "
 "mem�ria\n"
 
-#: fe-connect.c:2592
+#: fe-connect.c:2591
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "faltando \"=\" depois de \"%s\" na cadeia de caracteres de conex�o\n"
 
-#: fe-connect.c:2641
+#: fe-connect.c:2640
 msgid "unterminated quoted string in connection info string\n"
 msgstr ""
 "cadeia de caracteres entre aspas n�o terminada na cadeia de caracteres de "
 "conex�o\n"
 
-#: fe-connect.c:2675
+#: fe-connect.c:2674
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "op��o de conex�o \"%s\" inv�lida\n"
 
-#: fe-connect.c:2897
+#: fe-connect.c:2896
 msgid "connection pointer is NULL\n"
 msgstr "ponteiro de conex�o � NULO\n"
 
-#: fe-connect.c:3154
+#: fe-connect.c:3153
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -221,71 +226,71 @@ msgstr ""
 "AVISO: Arquivo de senhas %s tem permiss�es de leitura de grupo ou globais; "
 "permiss�o deve ser u=rw (0600)\n"
 
-#: fe-exec.c:484
+#: fe-exec.c:479
 msgid "NOTICE"
 msgstr "NOTA"
 
-#: fe-exec.c:653 fe-exec.c:705
+#: fe-exec.c:648 fe-exec.c:700 fe-exec.c:740
 msgid "command string is a null pointer\n"
 msgstr "linha de comando � um ponteiro nulo\n"
 
-#: fe-exec.c:740
+#: fe-exec.c:733 fe-exec.c:823
 msgid "statement name is a null pointer\n"
 msgstr "nome do comando � um ponteiro nulo\n"
 
-#: fe-exec.c:771
+#: fe-exec.c:748 fe-exec.c:897 fe-exec.c:1572
+msgid "function requires at least protocol version 3.0\n"
+msgstr "fun��o requer pelo menos a vers�o 3.0 do protocolo\n"
+
+#: fe-exec.c:854
 msgid "no connection to the server\n"
 msgstr "sem conex�o ao servidor\n"
 
-#: fe-exec.c:778
+#: fe-exec.c:861
 msgid "another command is already in progress\n"
 msgstr "outro comando j� est� em execu��o\n"
 
-#: fe-exec.c:814 fe-exec.c:1467
-msgid "function requires at least protocol version 3.0\n"
-msgstr "fun��o requer pelo menos a vers�o 3.0 do protocolo\n"
-
-#: fe-exec.c:1116
+#: fe-exec.c:1199
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus n�o esperado: %d\n"
 
-#: fe-exec.c:1221
+#: fe-exec.c:1326
 msgid "COPY terminated by new PQexec"
 msgstr "COPY terminado por novo PQexec"
 
-#: fe-exec.c:1229
+#: fe-exec.c:1334
 msgid "COPY IN state must be terminated first\n"
 msgstr "Estado de COPY IN deve ser terminado primeiro\n"
 
-#: fe-exec.c:1249
+#: fe-exec.c:1354
 msgid "COPY OUT state must be terminated first\n"
 msgstr "Estado de COPY OUT deve ser terminado primeiro\n"
 
-#: fe-exec.c:1359 fe-exec.c:1424 fe-exec.c:1509 fe-protocol2.c:1153
-#: fe-protocol3.c:1106
+#: fe-exec.c:1464 fe-exec.c:1529 fe-exec.c:1614 fe-protocol2.c:1153
+#: fe-protocol3.c:1115
 msgid "no COPY in progress\n"
 msgstr "Nenhum COPY em andamento\n"
 
-#: fe-exec.c:1701
+#: fe-exec.c:1806
 msgid "connection in wrong state\n"
 msgstr "conex�o em estado errado\n"
 
-#: fe-exec.c:1732
+#: fe-exec.c:1837
 msgid "invalid ExecStatusType code"
 msgstr "c�digo de ExecStatusType � inv�lido"
 
-#: fe-exec.c:1796 fe-exec.c:1819
+#: fe-exec.c:1901 fe-exec.c:1924
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "coluna n�mero %d est� fora do intervalo 0..%d"
 
-#: fe-exec.c:1812
+#: fe-exec.c:1917
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "linha n�mero %d est� fora do intervalo 0..%d"
 
-#: fe-exec.c:2094
+#: fe-exec.c:2199
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "n�o p�de interpretar resultado do servidor: %s"
@@ -440,17 +445,17 @@ msgstr ""
 "servidor enviou dados bin�rios (mensagem \"B\") sem antes enviar descri��o "
 "de registro (mensagem \"T\")"
 
-#: fe-protocol2.c:548 fe-protocol3.c:335
+#: fe-protocol2.c:548 fe-protocol3.c:344
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr ""
 "resposta inesperada do servidor; primeiro caracter recebido foi \"%c\"\n"
 
-#: fe-protocol2.c:760 fe-protocol3.c:568
+#: fe-protocol2.c:760 fe-protocol3.c:577
 msgid "out of memory for query result\n"
 msgstr "sem mem�ria para resultado da consulta\n"
 
-#: fe-protocol2.c:1196 fe-protocol3.c:1175
+#: fe-protocol2.c:1196 fe-protocol3.c:1184
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -459,12 +464,12 @@ msgstr "%s"
 msgid "lost synchronization with server, resetting connection"
 msgstr "perda de sincronismo com o servidor, reiniciando conex�o"
 
-#: fe-protocol2.c:1343 fe-protocol2.c:1375 fe-protocol3.c:1378
+#: fe-protocol2.c:1343 fe-protocol2.c:1375 fe-protocol3.c:1387
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "erro do protocolo: id=0x%x\n"
 
-#: fe-protocol3.c:297
+#: fe-protocol3.c:306
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)\n"
@@ -472,65 +477,65 @@ msgstr ""
 "servidor enviou dados (mensagem \"D\") sem antes enviar descri��o de "
 "registro (mensagem \"T\")\n"
 
-#: fe-protocol3.c:356
+#: fe-protocol3.c:365
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr ""
 "conte�do da mensagem n�o est� de acordo com o tamanho no tipo de mensagem \"%"
 "c\"\n"
 
-#: fe-protocol3.c:377
+#: fe-protocol3.c:386
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr ""
 "perda de sincronismo com o servidor: recebeu tipo de mensagem \"%c\", "
 "tamanho %d\n"
 
-#: fe-protocol3.c:513
+#: fe-protocol3.c:522
 msgid "unexpected field count in \"D\" message\n"
 msgstr "contagem de campos inesperada em mensagem \"D\"\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:642 fe-protocol3.c:650
+#: fe-protocol3.c:651 fe-protocol3.c:659
 #, c-format
 msgid " at character %s"
 msgstr " no caracter %s"
 
-#: fe-protocol3.c:659
+#: fe-protocol3.c:668
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "DETALHE:  %s\n"
 
-#: fe-protocol3.c:662
+#: fe-protocol3.c:671
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "DICA:  %s\n"
 
-#: fe-protocol3.c:665
+#: fe-protocol3.c:674
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "CONSULTA:  %s\n"
 
-#: fe-protocol3.c:668
+#: fe-protocol3.c:677
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "CONTEXTO:  %s\n"
 
-#: fe-protocol3.c:680
+#: fe-protocol3.c:689
 msgid "LOCATION:  "
 msgstr "LOCAL:  "
 
-#: fe-protocol3.c:682
+#: fe-protocol3.c:691
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:684
+#: fe-protocol3.c:693
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:991
+#: fe-protocol3.c:1000
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: n�o est� fazendo COPY OUT de texto\n"
 
@@ -645,6 +650,3 @@ msgstr "certificado n�o p�de ser validado: %s\n"
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "certificado n�o p�de ser obtido: %s\n"
-
-#~ msgid "certificate/private key mismatch (%s): %s\n"
-#~ msgstr "certificado/chave privada n�o correspondem (%s): %s\n"
diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po
index 2641775c04..83627c15d9 100644
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
@@ -1,10 +1,13 @@
 # ru.po
 # LIBPQ Translated Messages into the Russian Language (KOI8-R)
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/ru.po,v 1.16 2004/10/27 11:22:18 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/interfaces/libpq/po/ru.po,v 1.17 2004/11/02 09:20:22 petere Exp $
 #
 # ChangeLog:
-#   - March 27 - October 17, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
+#   - March 27 - November 1, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
 #   - July 24 - October 5, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca>
 #   - Januray 2, 2002: Completed SSL translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Post-7.3beta2 fuzzy translation fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -14,13 +17,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-17 01:11+0100\n"
-"PO-Revision-Date: 2004-10-17 15:47-0500\n"
+"POT-Creation-Date: 2004-11-01 19:28+0000\n"
+"PO-Revision-Date: 2004-11-01 15:49-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"
 
 #: fe-auth.c:232
 #, c-format
@@ -78,27 +83,22 @@ msgstr "������������ ��� ������� �������������� \"%s\", ������������\n"
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ������������ ������� ��������������: %d\n"
 
-#: fe-connect.c:452
+#: fe-connect.c:457
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "�������� �������� sslmode: \"%s\"\n"
 
-#: fe-connect.c:472
+#: fe-connect.c:477
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "�������� sslmode \"%s\" ������� ���� ��������� SSL �� ��������������\n"
 
-#: fe-connect.c:783
-#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "�� ���������� ���������� ����� � �� ����������� �����: %s\n"
-
-#: fe-connect.c:810
+#: fe-connect.c:793
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "�� ���������� ���������� ����� � ������������ TCP �����: %s\n"
 
-#: fe-connect.c:841
+#: fe-connect.c:824
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -109,7 +109,7 @@ msgstr ""
 "\t�������� �� ������ �������� � ���������\n"
 "\t������������� �� ������ Unix'������� ������ \"%s\"?\n"
 
-#: fe-connect.c:853
+#: fe-connect.c:836
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -120,179 +120,192 @@ msgstr ""
 "\t�������� �� ������ �� ����� \"%s\" � ��������� ��\n"
 "\t������������� ����� TCP/IP �������� �� ���� %s?\n"
 
-#: fe-connect.c:946
+#: fe-connect.c:929
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "�� ���������� ������������� ��� ����� \"%s\" � �����: %s\n"
 
-#: fe-connect.c:950
+#: fe-connect.c:933
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "�� ���������� ������������� ���� ������� UNIX-������ \"%s\" � �����: %s\n"
 
-#: fe-connect.c:1154
+#: fe-connect.c:1137
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "������������ ��������� �������������, ��������� ��������� �� ��������� ����������� ������\n"
 
-#: fe-connect.c:1197
+#: fe-connect.c:1180
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "�� ���������� ������� �����: %s\n"
 
-#: fe-connect.c:1308
+#: fe-connect.c:1203
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "�� ���������� ���������� ����� � �� ����������� �����: %s\n"
+
+#: fe-connect.c:1215
+#, c-format
+msgid "could not set socket to close-on-exec mode: %s\n"
+msgstr "�� ���������� ���������� ����� � ����� ��������-��-���������� (close-on-exec): %s\n"
+
+#: fe-connect.c:1307
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "���������� ���� �������� ������ ������ ������: %s\n"
 
-#: fe-connect.c:1347
+#: fe-connect.c:1346
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "���������� ���� �������� ����� ������� �� ������: %s\n"
 
-#: fe-connect.c:1392
+#: fe-connect.c:1391
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "�� ���������� ��������� ����� ������������ SSL: %s\n"
 
-#: fe-connect.c:1414
-#: fe-connect.c:2544
-#: fe-connect.c:2553
-#: fe-connect.c:3132
+#: fe-connect.c:1413
+#: fe-connect.c:2628
+#: fe-connect.c:2637
+#: fe-connect.c:3216
 #: fe-lobj.c:556
 #: fe-protocol2.c:1007
-#: fe-protocol3.c:949
+#: fe-protocol3.c:958
 msgid "out of memory\n"
 msgstr "������������ ������\n"
 
-#: fe-connect.c:1427
+#: fe-connect.c:1426
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "�� ���������� ��������� ��������� �����: %s\n"
 
-#: fe-connect.c:1467
+#: fe-connect.c:1466
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "�� ��� ������� ����� ������� �� ����� ������������ SSL: %s\n"
 
-#: fe-connect.c:1486
-#: fe-connect.c:1503
+#: fe-connect.c:1485
+#: fe-connect.c:1502
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "������ �� ������������ SSL, �� ������� SSL ���� ����������\n"
 
-#: fe-connect.c:1519
+#: fe-connect.c:1518
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "������� ������������ ����� �� ��������� ������������ �� SSL: %c\n"
 
-#: fe-connect.c:1576
-#: fe-connect.c:1608
+#: fe-connect.c:1575
+#: fe-connect.c:1607
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "�������� ������ �������������� �� �������, �� ���� ��������: %c\n"
 
-#: fe-connect.c:1844
+#: fe-connect.c:1843
 msgid "unexpected message from server during startup\n"
 msgstr "����������� ��������� �� ������� ��� �������\n"
 
-#: fe-connect.c:1914
+#: fe-connect.c:1913
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "������������ ��������� ������������� %c, ��������� ��������� �� ��������� ����������� ������\n"
 
-#: fe-connect.c:2592
+#: fe-connect.c:2676
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "����������� \"=\" ����� \"%s\" � ������ �������������\n"
 
-#: fe-connect.c:2641
+#: fe-connect.c:2725
 msgid "unterminated quoted string in connection info string\n"
 msgstr "������������ ������ (�� ������� �������) � ������ �������������\n"
 
-#: fe-connect.c:2675
+#: fe-connect.c:2759
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "������������ ����� ������������� \"%s\"\n"
 
-#: fe-connect.c:2897
+#: fe-connect.c:2981
 msgid "connection pointer is NULL\n"
 msgstr "��������� ������������� �������� NULL'��\n"
 
-#: fe-connect.c:3154
+#: fe-connect.c:3238
 #, c-format
 msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"
 msgstr "��������: ��������� ���� %s ������� � ������� ������ ��� ���� ��� ������; ����� ������ ���� u=rw (0600)\n"
 
-#: fe-exec.c:484
+#: fe-exec.c:479
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: fe-exec.c:653
-#: fe-exec.c:705
+#: fe-exec.c:648
+#: fe-exec.c:700
+#: fe-exec.c:740
 msgid "command string is a null pointer\n"
 msgstr "��������� ������ �������� ������� ����������\n"
 
-#: fe-exec.c:740
+#: fe-exec.c:733
+#: fe-exec.c:823
 msgid "statement name is a null pointer\n"
 msgstr "��� ������� �������� ������� ����������\n"
 
-#: fe-exec.c:771
+#: fe-exec.c:748
+#: fe-exec.c:897
+#: fe-exec.c:1572
+msgid "function requires at least protocol version 3.0\n"
+msgstr "������� ������� ��� ������� ������ ��������� 3.0\n"
+
+#: fe-exec.c:854
 msgid "no connection to the server\n"
 msgstr "��� ������������� � �������\n"
 
-#: fe-exec.c:778
+#: fe-exec.c:861
 msgid "another command is already in progress\n"
 msgstr "������ ������� � �������� ����������\n"
 
-#: fe-exec.c:814
-#: fe-exec.c:1467
-msgid "function requires at least protocol version 3.0\n"
-msgstr "������� ������� ��� ������� ������ ��������� 3.0\n"
-
-#: fe-exec.c:1116
+#: fe-exec.c:1199
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "����������� asyncStatus: %d\n"
 
-#: fe-exec.c:1221
+#: fe-exec.c:1326
 msgid "COPY terminated by new PQexec"
 msgstr "COPY ���������� ����� PQexec"
 
-#: fe-exec.c:1229
+#: fe-exec.c:1334
 msgid "COPY IN state must be terminated first\n"
 msgstr "������� ��������� COPY IN ������ ���� ���������\n"
 
-#: fe-exec.c:1249
+#: fe-exec.c:1354
 msgid "COPY OUT state must be terminated first\n"
 msgstr "������� ��������� COPY OUT ������ ���� ���������\n"
 
-#: fe-exec.c:1359
-#: fe-exec.c:1424
-#: fe-exec.c:1509
+#: fe-exec.c:1464
+#: fe-exec.c:1529
+#: fe-exec.c:1614
 #: fe-protocol2.c:1153
-#: fe-protocol3.c:1106
+#: fe-protocol3.c:1115
 msgid "no COPY in progress\n"
 msgstr "���������� �������� COPY �� �����������\n"
 
-#: fe-exec.c:1701
+#: fe-exec.c:1806
 msgid "connection in wrong state\n"
 msgstr "���������� � �������� ���������\n"
 
-#: fe-exec.c:1732
+#: fe-exec.c:1837
 msgid "invalid ExecStatusType code"
 msgstr "�������� ��� ExecStatusType"
 
-#: fe-exec.c:1796
-#: fe-exec.c:1819
+#: fe-exec.c:1901
+#: fe-exec.c:1924
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "������� N %d ��� ��������� 0..%d"
 
-#: fe-exec.c:1812
+#: fe-exec.c:1917
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "��� N %d ��� ��������� 0..%d"
 
-#: fe-exec.c:2094
+#: fe-exec.c:2199
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "�� � ��������� ���������������� ����� �������: %s"
@@ -441,18 +454,18 @@ msgid "server sent binary data (\"B\" message) without prior row description (\"
 msgstr "������ �������� �������� ������ (��������� \"B\") ��� ���������������� �������� ������ (��������� \"T\")"
 
 #: fe-protocol2.c:548
-#: fe-protocol3.c:335
+#: fe-protocol3.c:344
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "����������� ����� �������; ������ ���������� ������: \"%c\"\n"
 
 #: fe-protocol2.c:760
-#: fe-protocol3.c:568
+#: fe-protocol3.c:577
 msgid "out of memory for query result\n"
 msgstr "������������ ������ ��� ���������� �������\n"
 
 #: fe-protocol2.c:1196
-#: fe-protocol3.c:1175
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -463,71 +476,71 @@ msgstr "�������� ������������� � ��������; �����������������"
 
 #: fe-protocol2.c:1343
 #: fe-protocol2.c:1375
-#: fe-protocol3.c:1378
+#: fe-protocol3.c:1387
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "������ ���������: id=0x%x\n"
 
-#: fe-protocol3.c:297
+#: fe-protocol3.c:306
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
 msgstr "������ �������� ������ (��������� \"D\") ��� ���������������� �������� ������ (��������� \"T\")\n"
 
-#: fe-protocol3.c:356
+#: fe-protocol3.c:365
 #, c-format
 msgid "message contents do not agree with length in message type \"%c\"\n"
 msgstr "���������� ��������� �� ����������� � ������ � ��������� ���� \"%c\"\n"
 
-#: fe-protocol3.c:377
+#: fe-protocol3.c:386
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr "�������� ������������� � ��������: �������� ��������� ���� \"%c\", ����� %d\n"
 
-#: fe-protocol3.c:513
+#: fe-protocol3.c:522
 msgid "unexpected field count in \"D\" message\n"
 msgstr "����������� ����� ����� � �������� \"D\"\n"
 
 #. translator: %s represents a digit string
-#: fe-protocol3.c:642
-#: fe-protocol3.c:650
+#: fe-protocol3.c:651
+#: fe-protocol3.c:659
 #, c-format
 msgid " at character %s"
 msgstr " �� ������� %s"
 
-#: fe-protocol3.c:659
+#: fe-protocol3.c:668
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr "��������:  %s\n"
 
-#: fe-protocol3.c:662
+#: fe-protocol3.c:671
 #, c-format
 msgid "HINT:  %s\n"
 msgstr "���������:  %s\n"
 
-#: fe-protocol3.c:665
+#: fe-protocol3.c:674
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr "������:  %s\n"
 
-#: fe-protocol3.c:668
+#: fe-protocol3.c:677
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr "��������:  %s\n"
 
-#: fe-protocol3.c:680
+#: fe-protocol3.c:689
 msgid "LOCATION:  "
 msgstr "������������:  "
 
-#: fe-protocol3.c:682
+#: fe-protocol3.c:691
 #, c-format
 msgid "%s, "
 msgstr "%s, "
 
-#: fe-protocol3.c:684
+#: fe-protocol3.c:693
 #, c-format
 msgid "%s:%s"
 msgstr "%s:%s"
 
-#: fe-protocol3.c:991
+#: fe-protocol3.c:1000
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr "PQgetline: �� ������������ ��������� COPY OUT\n"
 
diff --git a/src/interfaces/libpq/po/zh_TW.po b/src/interfaces/libpq/po/zh_TW.po
index 1f6e5b5057..a07320cf46 100644
--- a/src/interfaces/libpq/po/zh_TW.po
+++ b/src/interfaces/libpq/po/zh_TW.po
@@ -1,646 +1,816 @@
-# Traditional Chinese translation for libpq.

-# 2004-07-29 Zhenbang Wei <forth@zbwei.net>

-#

-msgid ""

-msgstr ""

-"Project-Id-Version: PostgreSQL 7.5\n"

-"POT-Creation-Date: 2004-10-19 01:10+0100\n"

-"PO-Revision-Date: 2004-10-19 11:08+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"

-

-#: fe-auth.c:232

-#, c-format

-msgid "Kerberos 4 error: %s\n"

-msgstr "Kerberos 4錯誤：%s\n"

-

-#: fe-auth.c:394

-#, c-format

-msgid "could not set socket to blocking mode: %s\n"

-msgstr "無法將socket設為阻擋模式：%s\n"

-

-#: fe-auth.c:411

-#: fe-auth.c:415

-#, c-format

-msgid "Kerberos 5 authentication rejected: %*s\n"

-msgstr "kerberos 5認證被拒絕：%*s\n"

-

-#: fe-auth.c:441

-#, c-format

-msgid "could not restore non-blocking mode on socket: %s\n"

-msgstr "無法將socket還原為非阻擋模式：%s\n"

-

-#: fe-auth.c:508

-msgid "SCM_CRED authentication method not supported\n"

-msgstr "不支援 SCM_CRED 認證方式\n"

-

-#: fe-auth.c:600

-msgid "Kerberos 4 authentication failed\n"

-msgstr "Kerberos 4認證失敗\n"

-

-#: fe-auth.c:608

-msgid "Kerberos 4 authentication not supported\n"

-msgstr "不支援Kerberos 4認證方式\n"

-

-#: fe-auth.c:619

-msgid "Kerberos 5 authentication failed\n"

-msgstr "Kerberos 5認證失敗\n"

-

-#: fe-auth.c:627

-msgid "Kerberos 5 authentication not supported\n"

-msgstr "不支援Kerberos 5認證方式\n"

-

-#: fe-auth.c:655

-#, c-format

-msgid "authentication method %u not supported\n"

-msgstr "不支援 %u 認證方式\n"

-

-#: fe-auth.c:692

-#, c-format

-msgid "invalid authentication service name \"%s\", ignored\n"

-msgstr "忽略非法的認證服務名稱\"%s\"\n"

-

-#: fe-auth.c:764

-#, c-format

-msgid "fe_getauthname: invalid authentication system: %d\n"

-msgstr "fe_getauthname：無效的認證系統：%d\n"

-

-#: fe-connect.c:452

-#, c-format

-msgid "invalid sslmode value: \"%s\"\n"

-msgstr "無效的sslmode：\"%s\"\n"

-

-#: fe-connect.c:472

-#, c-format

-msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"

-msgstr "編譯時未加入SSL支援，無效的sllmode值\"%s\"\n"

-

-#: fe-connect.c:783

-#, c-format

-msgid "could not set socket to non-blocking mode: %s\n"

-msgstr "無法將socket設定為非阻擋模式：%s\n"

-

-#: fe-connect.c:810

-#, c-format

-msgid "could not set socket to TCP no delay mode: %s\n"

-msgstr "無法將socket設定為TCP無延遲模式：%s\n"

-

-#: fe-connect.c:841

-#, c-format

-msgid ""

-"could not connect to server: %s\n"

-"\tIs the server running locally and accepting\n"

-"\tconnections on Unix domain socket \"%s\"?\n"

-msgstr ""

-"無法連線到伺服器: %s\n"

-"\t伺服器是否在本地執行並且在 Unix domain socket\n"

-"\t\"%s\"上準備接受連線？\n"

-

-#: fe-connect.c:853

-#, c-format

-msgid ""

-"could not connect to server: %s\n"

-"\tIs the server running on host \"%s\" and accepting\n"

-"\tTCP/IP connections on port %s?\n"

-msgstr ""

-"無法連線到伺服器：%s\n"

-"\t伺服器是否在主機\"%s\"上執行並且準備接受在\n"

-"\t埠號 %s 上的TCP/IP連線？\n"

-

-#: fe-connect.c:946

-#, c-format

-msgid "could not translate host name \"%s\" to address: %s\n"

-msgstr "無法將主機名稱\"%s\"轉換成位址：%s\n"

-

-#: fe-connect.c:950

-#, c-format

-msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"

-msgstr "無法將Unix-domain socket路徑\"%s\"轉換成位址：%s\n"

-

-#: fe-connect.c:1154

-msgid "invalid connection state, probably indicative of memory corruption\n"

-msgstr "無效的連線狀態，可能是記憶體中的資料被破壞\n"

-

-#: fe-connect.c:1197

-#, c-format

-msgid "could not create socket: %s\n"

-msgstr "無法建立socket：%s\n"

-

-#: fe-connect.c:1308

-#, c-format

-msgid "could not get socket error status: %s\n"

-msgstr "無法取得socket的錯誤狀態：%s\n"

-

-#: fe-connect.c:1347

-#, c-format

-msgid "could not get client address from socket: %s\n"

-msgstr "無法從socket取得客戶端位址：%s\n"

-

-#: fe-connect.c:1392

-#, c-format

-msgid "could not send SSL negotiation packet: %s\n"

-msgstr "無法傳送SSL交談封包：%s\n"

-

-#: fe-connect.c:1414

-#: fe-connect.c:2544

-#: fe-connect.c:2553

-#: fe-connect.c:3132

-#: fe-lobj.c:556

-#: fe-protocol2.c:1007

-#: fe-protocol3.c:958

-msgid "out of memory\n"

-msgstr "記憶體用盡\n"

-

-#: fe-connect.c:1427

-#, c-format

-msgid "could not send startup packet: %s\n"

-msgstr "無法傳送啟動封包：%s\n"

-

-#: fe-connect.c:1467

-#, c-format

-msgid "could not receive server response to SSL negotiation packet: %s\n"

-msgstr "收不到伺服器對 SSL 交談封包的回應: %s\n"

-

-#: fe-connect.c:1486

-#: fe-connect.c:1503

-msgid "server does not support SSL, but SSL was required\n"

-msgstr "伺服器不支援 SSL，但是被要求使用 SSL\n"

-

-#: fe-connect.c:1519

-#, c-format

-msgid "received invalid response to SSL negotiation: %c\n"

-msgstr "收到無效的 SSL 交談回應：%c\n"

-

-#: fe-connect.c:1576

-#: fe-connect.c:1608

-#, c-format

-msgid "expected authentication request from server, but received %c\n"

-msgstr "期待來自伺服器的認證請求，但是收到 %c\n"

-

-#: fe-connect.c:1844

-msgid "unexpected message from server during startup\n"

-msgstr "啟動過程中收到來自伺服器的非預期訊息\n"

-

-#: fe-connect.c:1914

-#, c-format

-msgid "invalid connection state %c, probably indicative of memory corruption\n"

-msgstr "無效的連線狀態 %c，可能是記憶體中的資料被破壞\n"

-

-#: fe-connect.c:2592

-#, c-format

-msgid "missing \"=\" after \"%s\" in connection info string\n"

-msgstr "在連線資訊字串裡的 \"%s\" 後面缺少 \"=\"\n"

-

-#: fe-connect.c:2641

-msgid "unterminated quoted string in connection info string\n"

-msgstr "連線資訊字串中有未結束的引號\n"

-

-#: fe-connect.c:2675

-#, c-format

-msgid "invalid connection option \"%s\"\n"

-msgstr "無效的連線選項 \"%s\"\n"

-

-#: fe-connect.c:2897

-msgid "connection pointer is NULL\n"

-msgstr "連線指標是 NULL\n"

-

-#: fe-connect.c:3154

-#, c-format

-msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"

-msgstr "警告：密碼檔%s可以被其他人或群組存取，應該將權限設為u=rw(0600)\n"

-

-#: fe-exec.c:484

-msgid "NOTICE"

-msgstr "注意"

-

-#: fe-exec.c:653

-#: fe-exec.c:705

-#: fe-exec.c:745

-msgid "command string is a null pointer\n"

-msgstr "命令字串是一個空指標\n"

-

-#: fe-exec.c:738

-#: fe-exec.c:828

-msgid "statement name is a null pointer\n"

-msgstr "敘述名稱是一個空指標\n"

-

-#: fe-exec.c:753

-#: fe-exec.c:902

-#: fe-exec.c:1577

-msgid "function requires at least protocol version 3.0\n"

-msgstr "函式需要3.0版以上的協定\n"

-

-#: fe-exec.c:859

-msgid "no connection to the server\n"

-msgstr "沒有連線到伺服器\n"

-

-#: fe-exec.c:866

-msgid "another command is already in progress\n"

-msgstr "另外一條命令正在執行中\n"

-

-#: fe-exec.c:1204

-#, c-format

-msgid "unexpected asyncStatus: %d\n"

-msgstr "非預期的asyncStatus：%d\n"

-

-#: fe-exec.c:1331

-msgid "COPY terminated by new PQexec"

-msgstr "COPY被新的PQexec中斷"

-

-#: fe-exec.c:1339

-msgid "COPY IN state must be terminated first\n"

-msgstr "必須先結束 COPY IN 狀態\n"

-

-#: fe-exec.c:1359

-msgid "COPY OUT state must be terminated first\n"

-msgstr "必須先結束 COPY OUT 狀態\n"

-

-#: fe-exec.c:1469

-#: fe-exec.c:1534

-#: fe-exec.c:1619

-#: fe-protocol2.c:1153

-#: fe-protocol3.c:1115

-msgid "no COPY in progress\n"

-msgstr "沒有執行中的 COPY 命令\n"

-

-#: fe-exec.c:1811

-msgid "connection in wrong state\n"

-msgstr "連線處於錯誤的狀態\n"

-

-#: fe-exec.c:1842

-msgid "invalid ExecStatusType code"

-msgstr "無效的 ExecStatusType 代碼"

-

-#: fe-exec.c:1906

-#: fe-exec.c:1929

-#, c-format

-msgid "column number %d is out of range 0..%d"

-msgstr "列號 %d 超出了範圍 0..%d"

-

-#: fe-exec.c:1922

-#, c-format

-msgid "row number %d is out of range 0..%d"

-msgstr "行號 %d 超出了範圍 0..%d"

-

-#: fe-exec.c:2204

-#, c-format

-msgid "could not interpret result from server: %s"

-msgstr "無法解讀來自伺服器的結果：%s"

-

-#: fe-lobj.c:410

-#: fe-lobj.c:495

-#, c-format

-msgid "could not open file \"%s\": %s\n"

-msgstr "無法開啟檔案 \"%s\"：%s\n"

-

-#: fe-lobj.c:422

-#, c-format

-msgid "could not create large object for file \"%s\"\n"

-msgstr "無法為檔案 \"%s\" 建立 large object\n"

-

-#: fe-lobj.c:432

-#: fe-lobj.c:482

-#, c-format

-msgid "could not open large object %u\n"

-msgstr "無法開啟 large object %u\n"

-

-#: fe-lobj.c:447

-#, c-format

-msgid "error while reading file \"%s\"\n"

-msgstr "讀取檔案 \"%s\" 時發生錯誤\n"

-

-#: fe-lobj.c:510

-#: fe-lobj.c:523

-#, c-format

-msgid "error while writing to file \"%s\"\n"

-msgstr "寫入檔案 \"%s\" 時發生錯誤\n"

-

-#: fe-lobj.c:601

-msgid "query to initialize large object functions did not return data\n"

-msgstr "初始化大型物件函式的查詢沒有傳回資料\n"

-

-#: fe-lobj.c:639

-msgid "cannot determine OID of function lo_open\n"

-msgstr "無法判斷函式 lo_open 的 OID\n"

-

-#: fe-lobj.c:646

-msgid "cannot determine OID of function lo_close\n"

-msgstr "無法判斷函式 lo_close 的 OID\n"

-

-#: fe-lobj.c:653

-msgid "cannot determine OID of function lo_creat\n"

-msgstr "無法判斷函式 lo_creat 的 OID\n"

-

-#: fe-lobj.c:660

-msgid "cannot determine OID of function lo_unlink\n"

-msgstr "無法判斷函式 lo_unlink 的 OID\n"

-

-#: fe-lobj.c:667

-msgid "cannot determine OID of function lo_lseek\n"

-msgstr "無法判斷函式 lo_lseek 的 OID\n"

-

-#: fe-lobj.c:674

-msgid "cannot determine OID of function lo_tell\n"

-msgstr "無法判斷懽式 lo_tell 的 OID\n"

-

-#: fe-lobj.c:681

-msgid "cannot determine OID of function loread\n"

-msgstr "無法判斷函式 loread 的 OID\n"

-

-#: fe-lobj.c:688

-msgid "cannot determine OID of function lowrite\n"

-msgstr "無法判斷函式 lowrite 的 OID\n"

-

-#: fe-misc.c:228

-#, c-format

-msgid "integer of size %lu not supported by pqGetInt"

-msgstr "pgGetInt不支援大小為 %lu 的整數 "

-

-#: fe-misc.c:264

-#, c-format

-msgid "integer of size %lu not supported by pqPutInt"

-msgstr "pgPutInt不支援大小為 %lu 的整數"

-

-#: fe-misc.c:544

-#: fe-misc.c:748

-msgid "connection not open\n"

-msgstr "連接未開啟\n"

-

-#: fe-misc.c:610

-#: fe-misc.c:701

-#, c-format

-msgid "could not receive data from server: %s\n"

-msgstr "無法從伺服器接收資料：%s\n"

-

-#: fe-misc.c:718

-#: fe-misc.c:786

-msgid ""

-"server closed the connection unexpectedly\n"

-"\tThis probably means the server terminated abnormally\n"

-"\tbefore or while processing the request.\n"

-msgstr ""

-"伺服器意外地中斷了連線\n"

-"\t可能是伺服器在處理請求之前\n"

-"\t或者正在處理請求的時候不正常中止\n"

-

-#: fe-misc.c:803

-#, c-format

-msgid "could not send data to server: %s\n"

-msgstr "無法向伺服器傳送資料：%s\n"

-

-#: fe-misc.c:923

-msgid "timeout expired\n"

-msgstr "發生逾時\n"

-

-#: fe-misc.c:968

-msgid "socket not open\n"

-msgstr "socket 未開啟\n"

-

-#: fe-misc.c:991

-#, c-format

-msgid "select() failed: %s\n"

-msgstr "select()失敗：%s\n"

-

-#: fe-protocol2.c:91

-#, c-format

-msgid "invalid setenv state %c, probably indicative of memory corruption\n"

-msgstr "無效的setenv狀態 %c，可能是記憶體中的資料被破壞\n"

-

-#: fe-protocol2.c:333

-#, c-format

-msgid "invalid state %c, probably indicative of memory corruption\n"

-msgstr "無效的狀態 %c，可能是記憶體中的資料被破壞\n"

-

-#: fe-protocol2.c:423

-#: fe-protocol3.c:183

-#, c-format

-msgid "message type 0x%02x arrived from server while idle"

-msgstr "閒置時收到伺服器送來類型為0x%02x的訊息"

-

-#: fe-protocol2.c:462

-#, c-format

-msgid "unexpected character %c following empty query response (\"I\" message)"

-msgstr "空的查詢回應(\"I\"訊息)後跟隨非預期字元 %c"

-

-#: fe-protocol2.c:517

-msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"

-msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)"

-

-#: fe-protocol2.c:533

-msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"

-msgstr "伺服器傳送二元資料(\"B\"訊息)而未提供資料行描述(\"T\"訊息)"

-

-#: fe-protocol2.c:548

-#: fe-protocol3.c:344

-#, c-format

-msgid "unexpected response from server; first received character was \"%c\"\n"

-msgstr "非預期的伺服器回應，收到的第一個字元是\"%c\"\n"

-

-#: fe-protocol2.c:760

-#: fe-protocol3.c:577

-msgid "out of memory for query result\n"

-msgstr "查詢結果用盡記憶體\n"

-

-#: fe-protocol2.c:1196

-#: fe-protocol3.c:1184

-#, c-format

-msgid "%s"

-msgstr ""

-

-#: fe-protocol2.c:1208

-msgid "lost synchronization with server, resetting connection"

-msgstr "無法與伺服器協調，重置連線"

-

-#: fe-protocol2.c:1343

-#: fe-protocol2.c:1375

-#: fe-protocol3.c:1387

-#, c-format

-msgid "protocol error: id=0x%x\n"

-msgstr "協定錯誤：id=0x%x\n"

-

-#: fe-protocol3.c:306

-msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"

-msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)\n"

-

-#: fe-protocol3.c:365

-#, c-format

-msgid "message contents do not agree with length in message type \"%c\"\n"

-msgstr "訊息類型\"%c\"的長度與訊息內容不符\n"

-

-#: fe-protocol3.c:386

-#, c-format

-msgid "lost synchronization with server: got message type \"%c\", length %d\n"

-msgstr "無法與伺服器協調：收到訊息類型\"%c\"，長度 %d\n"

-

-#: fe-protocol3.c:522

-msgid "unexpected field count in \"D\" message\n"

-msgstr "非預期的\"D\"訊息欄位數\n"

-

-#  translator: %s represents a digit string

-#  translator: %s represents a digit string

-#: fe-protocol3.c:651

-#: fe-protocol3.c:659

-#, c-format

-msgid " at character %s"

-msgstr "於字元 %s"

-

-#: fe-protocol3.c:668

-#, c-format

-msgid "DETAIL:  %s\n"

-msgstr ""

-

-#: fe-protocol3.c:671

-#, c-format

-msgid "HINT:  %s\n"

-msgstr ""

-

-#: fe-protocol3.c:674

-#, c-format

-msgid "QUERY:  %s\n"

-msgstr ""

-

-#: fe-protocol3.c:677

-#, c-format

-msgid "CONTEXT:  %s\n"

-msgstr ""

-

-#: fe-protocol3.c:689

-msgid "LOCATION:  "

-msgstr ""

-

-#: fe-protocol3.c:691

-#, c-format

-msgid "%s, "

-msgstr ""

-

-#: fe-protocol3.c:693

-#, c-format

-msgid "%s:%s"

-msgstr ""

-

-#: fe-protocol3.c:1000

-msgid "PQgetline: not doing text COPY OUT\n"

-msgstr ""

-

-#: fe-secure.c:264

-#, c-format

-msgid "could not establish SSL connection: %s\n"

-msgstr "無法建立 SSL 連線?%s\n"

-

-#: fe-secure.c:330

-#: fe-secure.c:415

-#: fe-secure.c:1038

-#, c-format

-msgid "SSL SYSCALL error: %s\n"

-msgstr "SSL SYSCALL錯誤：%s\n"

-

-#: fe-secure.c:335

-#: fe-secure.c:420

-#: fe-secure.c:1042

-msgid "SSL SYSCALL error: EOF detected\n"

-msgstr "SSL SYSCALL錯誤：發現EOF\n"

-

-#: fe-secure.c:347

-#: fe-secure.c:431

-#: fe-secure.c:1051

-#, c-format

-msgid "SSL error: %s\n"

-msgstr "SSL 錯誤：%s\n"

-

-#: fe-secure.c:357

-#: fe-secure.c:441

-#: fe-secure.c:1059

-#, c-format

-msgid "unrecognized SSL error code: %d\n"

-msgstr "無法識別的SSL錯誤碼：%d\n"

-

-#: fe-secure.c:504

-#, c-format

-msgid "error querying socket: %s\n"

-msgstr "詢問socket發生錯誤：%s\n"

-

-#: fe-secure.c:532

-#, c-format

-msgid "could not get information about host \"%s\": %s\n"

-msgstr "無法取得關於主機\"%s\"的資訊：%s\n"

-

-#: fe-secure.c:551

-msgid "unsupported protocol\n"

-msgstr "不被支援的協定\n"

-

-#: fe-secure.c:573

-#, c-format

-msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"

-msgstr "伺服器的common name \"%s\" 無法解析成位址%ld.%ld.%ld.%ld\n"

-

-#: fe-secure.c:580

-#, c-format

-msgid "server common name \"%s\" does not resolve to peer address\n"

-msgstr "伺服器的common name \"%s\" 無法解析成位址\n"

-

-#: fe-secure.c:763

-msgid "could not get user information\n"

-msgstr "無法取得使用者的資訊\n"

-

-#: fe-secure.c:775

-#, c-format

-msgid "could not open certificate file \"%s\": %s\n"

-msgstr "無法開啟憑證檔\"%s\"：%s\n"

-

-#: fe-secure.c:784

-#, c-format

-msgid "could not read certificate file \"%s\": %s\n"

-msgstr "無法讀取憑證檔\"%s\"：%s\n"

-

-#: fe-secure.c:798

-#, c-format

-msgid "certificate present, but not private key file \"%s\"\n"

-msgstr "發現憑證，但是沒有私鑰檔\"%s\"\n"

-

-#: fe-secure.c:807

-#, c-format

-msgid "private key file \"%s\" has wrong permissions\n"

-msgstr "私鑰檔\"%s\"權限錯誤\n"

-

-#: fe-secure.c:815

-#, c-format

-msgid "could not open private key file \"%s\": %s\n"

-msgstr "無法開啟私鑰檔\"%s\"：%s\n"

-

-#: fe-secure.c:824

-#, c-format

-msgid "private key file \"%s\" changed during execution\n"

-msgstr "私鑰檔\"%s\"在執行過程中被改變\n"

-

-#: fe-secure.c:833

-#, c-format

-msgid "could not read private key file \"%s\": %s\n"

-msgstr "無法讀取私鑰檔\"%s\"：%s\n"

-

-#: fe-secure.c:848

-#, c-format

-msgid "certificate does not match private key file \"%s\": %s\n"

-msgstr "憑證與私?檔\"%s\"不符：%s\n"

-

-#: fe-secure.c:932

-#, c-format

-msgid "could not create SSL context: %s\n"

-msgstr "無法建立SSL context：%s\n"

-

-#: fe-secure.c:977

-#, c-format

-msgid "could not read root certificate file \"%s\": %s\n"

-msgstr "無法讀取根憑證檔\"%s\"：%s\n"

-

-#: fe-secure.c:1079

-#, c-format

-msgid "certificate could not be validated: %s\n"

-msgstr "無法驗證憑證：%s\n"

-

-#: fe-secure.c:1093

-#, c-format

-msgid "certificate could not be obtained: %s\n"

-msgstr "無法取得憑證：%s\n"

+# 2004-11-01 Zhenbang Wei <forth@zbwei.net>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.0\n"
+"POT-Creation-Date: 2004-11-01 01:57+0000\n"
+"PO-Revision-Date: 2004-11-01 13:32+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"
+
+# fe-auth.c:232
+#: fe-auth.c:232
+#, c-format
+msgid "Kerberos 4 error: %s\n"
+msgstr "Kerberos 4錯誤：%s\n"
+
+# fe-auth.c:394
+#: fe-auth.c:394
+#, c-format
+msgid "could not set socket to blocking mode: %s\n"
+msgstr "無法將socket設為阻擋模式：%s\n"
+
+# fe-auth.c:411
+# fe-auth.c:415
+#: fe-auth.c:411
+#: fe-auth.c:415
+#, c-format
+msgid "Kerberos 5 authentication rejected: %*s\n"
+msgstr "kerberos 5認證被拒絕：%*s\n"
+
+# fe-auth.c:441
+#: fe-auth.c:441
+#, c-format
+msgid "could not restore non-blocking mode on socket: %s\n"
+msgstr "無法將socket還原為非阻擋模式：%s\n"
+
+# fe-auth.c:508
+#: fe-auth.c:508
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "不支援 SCM_CRED 認證方式\n"
+
+# fe-auth.c:600
+#: fe-auth.c:600
+msgid "Kerberos 4 authentication failed\n"
+msgstr "Kerberos 4認證失敗\n"
+
+# fe-auth.c:608
+#: fe-auth.c:608
+msgid "Kerberos 4 authentication not supported\n"
+msgstr "不支援Kerberos 4認證方式\n"
+
+# fe-auth.c:619
+#: fe-auth.c:619
+msgid "Kerberos 5 authentication failed\n"
+msgstr "Kerberos 5認證失敗\n"
+
+# fe-auth.c:627
+#: fe-auth.c:627
+msgid "Kerberos 5 authentication not supported\n"
+msgstr "不支援Kerberos 5認證方式\n"
+
+# fe-auth.c:655
+#: fe-auth.c:655
+#, c-format
+msgid "authentication method %u not supported\n"
+msgstr "不支援 %u 認證方式\n"
+
+# fe-auth.c:692
+#: fe-auth.c:692
+#, c-format
+msgid "invalid authentication service name \"%s\", ignored\n"
+msgstr "忽略非法的認證服務名稱\"%s\"\n"
+
+# fe-auth.c:764
+#: fe-auth.c:764
+#, c-format
+msgid "fe_getauthname: invalid authentication system: %d\n"
+msgstr "fe_getauthname：無效的認證系統：%d\n"
+
+# fe-connect.c:452
+#: fe-connect.c:457
+#, c-format
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "無效的sslmode：\"%s\"\n"
+
+# fe-connect.c:472
+#: fe-connect.c:477
+#, c-format
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "編譯時未加入SSL支援，無效的sllmode值\"%s\"\n"
+
+# fe-connect.c:810
+#: fe-connect.c:793
+#, c-format
+msgid "could not set socket to TCP no delay mode: %s\n"
+msgstr "無法將socket設定為TCP無延遲模式：%s\n"
+
+# fe-connect.c:841
+#: fe-connect.c:824
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running locally and accepting\n"
+"\tconnections on Unix domain socket \"%s\"?\n"
+msgstr ""
+"無法連線到伺服器: %s\n"
+"\t伺服器是否在本地執行並且在 Unix domain socket\n"
+"\t\"%s\"上準備接受連線？\n"
+
+# fe-connect.c:853
+#: fe-connect.c:836
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"無法連線到伺服器：%s\n"
+"\t伺服器是否在主機\"%s\"上執行並且準備接受在\n"
+"\t埠號 %s 上的TCP/IP連線？\n"
+
+# fe-connect.c:946
+#: fe-connect.c:929
+#, c-format
+msgid "could not translate host name \"%s\" to address: %s\n"
+msgstr "無法將主機名稱\"%s\"轉換成位址：%s\n"
+
+# fe-connect.c:950
+#: fe-connect.c:933
+#, c-format
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr "無法將Unix-domain socket路徑\"%s\"轉換成位址：%s\n"
+
+# fe-connect.c:1154
+#: fe-connect.c:1137
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "無效的連線狀態，可能是記憶體中的資料被破壞\n"
+
+# fe-connect.c:1197
+#: fe-connect.c:1180
+#, c-format
+msgid "could not create socket: %s\n"
+msgstr "無法建立socket：%s\n"
+
+# fe-connect.c:783
+#: fe-connect.c:1203
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "無法將socket設定為非阻擋模式：%s\n"
+
+# fe-auth.c:394
+#: fe-connect.c:1215
+#, c-format
+msgid "could not set socket to close-on-exec mode: %s\n"
+msgstr "無法將socket設為close-on-exec模式：%s\n"
+
+# fe-connect.c:1308
+#: fe-connect.c:1307
+#, c-format
+msgid "could not get socket error status: %s\n"
+msgstr "無法取得socket的錯誤狀態：%s\n"
+
+# fe-connect.c:1347
+#: fe-connect.c:1346
+#, c-format
+msgid "could not get client address from socket: %s\n"
+msgstr "無法從socket取得客戶端位址：%s\n"
+
+# fe-connect.c:1392
+#: fe-connect.c:1391
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "無法傳送SSL交談封包：%s\n"
+
+# fe-connect.c:1414
+# fe-connect.c:2544
+# fe-connect.c:2553
+# fe-connect.c:3132
+# fe-lobj.c:556
+# fe-protocol2.c:1007
+# fe-protocol3.c:958
+#: fe-connect.c:1413
+#: fe-connect.c:2628
+#: fe-connect.c:2637
+#: fe-connect.c:3216
+#: fe-lobj.c:556
+#: fe-protocol2.c:1007
+#: fe-protocol3.c:958
+msgid "out of memory\n"
+msgstr "記憶體用盡\n"
+
+# fe-connect.c:1427
+#: fe-connect.c:1426
+#, c-format
+msgid "could not send startup packet: %s\n"
+msgstr "無法傳送啟動封包：%s\n"
+
+# fe-connect.c:1467
+#: fe-connect.c:1466
+#, c-format
+msgid "could not receive server response to SSL negotiation packet: %s\n"
+msgstr "收不到伺服器對 SSL 交談封包的回應: %s\n"
+
+# fe-connect.c:1486
+# fe-connect.c:1503
+#: fe-connect.c:1485
+#: fe-connect.c:1502
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "伺服器不支援 SSL，但是被要求使用 SSL\n"
+
+# fe-connect.c:1519
+#: fe-connect.c:1518
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "收到無效的 SSL 交談回應：%c\n"
+
+# fe-connect.c:1576
+# fe-connect.c:1608
+#: fe-connect.c:1575
+#: fe-connect.c:1607
+#, c-format
+msgid "expected authentication request from server, but received %c\n"
+msgstr "期待來自伺服器的認證請求，但是收到 %c\n"
+
+# fe-connect.c:1844
+#: fe-connect.c:1843
+msgid "unexpected message from server during startup\n"
+msgstr "啟動過程中收到來自伺服器的非預期訊息\n"
+
+# fe-connect.c:1914
+#: fe-connect.c:1913
+#, c-format
+msgid "invalid connection state %c, probably indicative of memory corruption\n"
+msgstr "無效的連線狀態 %c，可能是記憶體中的資料被破壞\n"
+
+# fe-connect.c:2592
+#: fe-connect.c:2676
+#, c-format
+msgid "missing \"=\" after \"%s\" in connection info string\n"
+msgstr "在連線資訊字串裡的 \"%s\" 後面缺少 \"=\"\n"
+
+# fe-connect.c:2641
+#: fe-connect.c:2725
+msgid "unterminated quoted string in connection info string\n"
+msgstr "連線資訊字串中有未結束的引號\n"
+
+# fe-connect.c:2675
+#: fe-connect.c:2759
+#, c-format
+msgid "invalid connection option \"%s\"\n"
+msgstr "無效的連線選項 \"%s\"\n"
+
+# fe-connect.c:2897
+#: fe-connect.c:2981
+msgid "connection pointer is NULL\n"
+msgstr "連線指標是 NULL\n"
+
+# fe-connect.c:3154
+#: fe-connect.c:3238
+#, c-format
+msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"
+msgstr "警告：密碼檔%s可以被其他人或群組存取，應該將權限設為u=rw(0600)\n"
+
+# fe-exec.c:484
+#: fe-exec.c:479
+msgid "NOTICE"
+msgstr "注意"
+
+# fe-exec.c:653
+# fe-exec.c:705
+# fe-exec.c:745
+#: fe-exec.c:648
+#: fe-exec.c:700
+#: fe-exec.c:740
+msgid "command string is a null pointer\n"
+msgstr "命令字串是一個空指標\n"
+
+# fe-exec.c:738
+# fe-exec.c:828
+#: fe-exec.c:733
+#: fe-exec.c:823
+msgid "statement name is a null pointer\n"
+msgstr "敘述名稱是一個空指標\n"
+
+# fe-exec.c:753
+# fe-exec.c:902
+# fe-exec.c:1577
+#: fe-exec.c:748
+#: fe-exec.c:897
+#: fe-exec.c:1572
+msgid "function requires at least protocol version 3.0\n"
+msgstr "函式需要3.0版以上的協定\n"
+
+# fe-exec.c:859
+#: fe-exec.c:854
+msgid "no connection to the server\n"
+msgstr "沒有連線到伺服器\n"
+
+# fe-exec.c:866
+#: fe-exec.c:861
+msgid "another command is already in progress\n"
+msgstr "另外一條命令正在執行中\n"
+
+# fe-exec.c:1204
+#: fe-exec.c:1199
+#, c-format
+msgid "unexpected asyncStatus: %d\n"
+msgstr "非預期的asyncStatus：%d\n"
+
+# fe-exec.c:1331
+#: fe-exec.c:1326
+msgid "COPY terminated by new PQexec"
+msgstr "COPY被新的PQexec中斷"
+
+# fe-exec.c:1339
+#: fe-exec.c:1334
+msgid "COPY IN state must be terminated first\n"
+msgstr "必須先結束 COPY IN 狀態\n"
+
+# fe-exec.c:1359
+#: fe-exec.c:1354
+msgid "COPY OUT state must be terminated first\n"
+msgstr "必須先結束 COPY OUT 狀態\n"
+
+# fe-exec.c:1469
+# fe-exec.c:1534
+# fe-exec.c:1619
+# fe-protocol2.c:1153
+# fe-protocol3.c:1115
+#: fe-exec.c:1464
+#: fe-exec.c:1529
+#: fe-exec.c:1614
+#: fe-protocol2.c:1153
+#: fe-protocol3.c:1115
+msgid "no COPY in progress\n"
+msgstr "沒有執行中的 COPY 命令\n"
+
+# fe-exec.c:1811
+#: fe-exec.c:1806
+msgid "connection in wrong state\n"
+msgstr "連線處於錯誤的狀態\n"
+
+# fe-exec.c:1842
+#: fe-exec.c:1837
+msgid "invalid ExecStatusType code"
+msgstr "無效的 ExecStatusType 代碼"
+
+# fe-exec.c:1906
+# fe-exec.c:1929
+#: fe-exec.c:1901
+#: fe-exec.c:1924
+#, c-format
+msgid "column number %d is out of range 0..%d"
+msgstr "列號 %d 超出了範圍 0..%d"
+
+# fe-exec.c:1922
+#: fe-exec.c:1917
+#, c-format
+msgid "row number %d is out of range 0..%d"
+msgstr "行號 %d 超出了範圍 0..%d"
+
+# fe-exec.c:2204
+#: fe-exec.c:2199
+#, c-format
+msgid "could not interpret result from server: %s"
+msgstr "無法解讀來自伺服器的結果：%s"
+
+# fe-lobj.c:410
+# fe-lobj.c:495
+#: fe-lobj.c:410
+#: fe-lobj.c:495
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "無法開啟檔案 \"%s\"：%s\n"
+
+# fe-lobj.c:422
+#: fe-lobj.c:422
+#, c-format
+msgid "could not create large object for file \"%s\"\n"
+msgstr "無法為檔案 \"%s\" 建立 large object\n"
+
+# fe-lobj.c:432
+# fe-lobj.c:482
+#: fe-lobj.c:432
+#: fe-lobj.c:482
+#, c-format
+msgid "could not open large object %u\n"
+msgstr "無法開啟 large object %u\n"
+
+# fe-lobj.c:447
+#: fe-lobj.c:447
+#, c-format
+msgid "error while reading file \"%s\"\n"
+msgstr "讀取檔案 \"%s\" 時發生錯誤\n"
+
+# fe-lobj.c:510
+# fe-lobj.c:523
+#: fe-lobj.c:510
+#: fe-lobj.c:523
+#, c-format
+msgid "error while writing to file \"%s\"\n"
+msgstr "寫入檔案 \"%s\" 時發生錯誤\n"
+
+# fe-lobj.c:601
+#: fe-lobj.c:601
+msgid "query to initialize large object functions did not return data\n"
+msgstr "初始化大型物件函式的查詢沒有傳回資料\n"
+
+# fe-lobj.c:639
+#: fe-lobj.c:639
+msgid "cannot determine OID of function lo_open\n"
+msgstr "無法判斷函式 lo_open 的 OID\n"
+
+# fe-lobj.c:646
+#: fe-lobj.c:646
+msgid "cannot determine OID of function lo_close\n"
+msgstr "無法判斷函式 lo_close 的 OID\n"
+
+# fe-lobj.c:653
+#: fe-lobj.c:653
+msgid "cannot determine OID of function lo_creat\n"
+msgstr "無法判斷函式 lo_creat 的 OID\n"
+
+# fe-lobj.c:660
+#: fe-lobj.c:660
+msgid "cannot determine OID of function lo_unlink\n"
+msgstr "無法判斷函式 lo_unlink 的 OID\n"
+
+# fe-lobj.c:667
+#: fe-lobj.c:667
+msgid "cannot determine OID of function lo_lseek\n"
+msgstr "無法判斷函式 lo_lseek 的 OID\n"
+
+# fe-lobj.c:674
+#: fe-lobj.c:674
+msgid "cannot determine OID of function lo_tell\n"
+msgstr "無法判斷懽式 lo_tell 的 OID\n"
+
+# fe-lobj.c:681
+#: fe-lobj.c:681
+msgid "cannot determine OID of function loread\n"
+msgstr "無法判斷函式 loread 的 OID\n"
+
+# fe-lobj.c:688
+#: fe-lobj.c:688
+msgid "cannot determine OID of function lowrite\n"
+msgstr "無法判斷函式 lowrite 的 OID\n"
+
+# fe-misc.c:228
+#: fe-misc.c:228
+#, c-format
+msgid "integer of size %lu not supported by pqGetInt"
+msgstr "pgGetInt不支援大小為 %lu 的整數 "
+
+# fe-misc.c:264
+#: fe-misc.c:264
+#, c-format
+msgid "integer of size %lu not supported by pqPutInt"
+msgstr "pgPutInt不支援大小為 %lu 的整數"
+
+# fe-misc.c:544
+# fe-misc.c:748
+#: fe-misc.c:544
+#: fe-misc.c:748
+msgid "connection not open\n"
+msgstr "連線未開啟\n"
+
+# fe-misc.c:610
+# fe-misc.c:701
+#: fe-misc.c:610
+#: fe-misc.c:701
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "無法從伺服器接收資料：%s\n"
+
+# fe-misc.c:718
+# fe-misc.c:786
+#: fe-misc.c:718
+#: fe-misc.c:786
+msgid ""
+"server closed the connection unexpectedly\n"
+"\tThis probably means the server terminated abnormally\n"
+"\tbefore or while processing the request.\n"
+msgstr ""
+"伺服器意外地中斷了連線\n"
+"\t可能是伺服器在處理請求之前\n"
+"\t或者正在處理請求的時候不正常中止\n"
+
+# fe-misc.c:803
+#: fe-misc.c:803
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "無法向伺服器傳送資料：%s\n"
+
+# fe-misc.c:923
+#: fe-misc.c:923
+msgid "timeout expired\n"
+msgstr "發生逾時\n"
+
+# fe-misc.c:968
+#: fe-misc.c:968
+msgid "socket not open\n"
+msgstr "socket 未開啟\n"
+
+# fe-misc.c:991
+#: fe-misc.c:991
+#, c-format
+msgid "select() failed: %s\n"
+msgstr "select()失敗：%s\n"
+
+# fe-protocol2.c:91
+#: fe-protocol2.c:91
+#, c-format
+msgid "invalid setenv state %c, probably indicative of memory corruption\n"
+msgstr "無效的setenv狀態 %c，可能是記憶體中的資料被破壞\n"
+
+# fe-protocol2.c:333
+#: fe-protocol2.c:333
+#, c-format
+msgid "invalid state %c, probably indicative of memory corruption\n"
+msgstr "無效的狀態 %c，可能是記憶體中的資料被破壞\n"
+
+# fe-protocol2.c:423
+# fe-protocol3.c:183
+#: fe-protocol2.c:423
+#: fe-protocol3.c:183
+#, c-format
+msgid "message type 0x%02x arrived from server while idle"
+msgstr "閒置時收到伺服器送來類型為0x%02x的訊息"
+
+# fe-protocol2.c:462
+#: fe-protocol2.c:462
+#, c-format
+msgid "unexpected character %c following empty query response (\"I\" message)"
+msgstr "空的查詢回應(\"I\"訊息)後跟隨非預期字元 %c"
+
+# fe-protocol2.c:517
+#: fe-protocol2.c:517
+msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
+msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)"
+
+# fe-protocol2.c:533
+#: fe-protocol2.c:533
+msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
+msgstr "伺服器傳送二元資料(\"B\"訊息)而未提供資料行描述(\"T\"訊息)"
+
+# fe-protocol2.c:548
+# fe-protocol3.c:344
+#: fe-protocol2.c:548
+#: fe-protocol3.c:344
+#, c-format
+msgid "unexpected response from server; first received character was \"%c\"\n"
+msgstr "非預期的伺服器回應，收到的第一個字元是\"%c\"\n"
+
+# fe-protocol2.c:760
+# fe-protocol3.c:577
+#: fe-protocol2.c:760
+#: fe-protocol3.c:577
+msgid "out of memory for query result\n"
+msgstr "查詢結果用盡記憶體\n"
+
+# fe-protocol2.c:1196
+# fe-protocol3.c:1184
+#: fe-protocol2.c:1196
+#: fe-protocol3.c:1184
+#, c-format
+msgid "%s"
+msgstr ""
+
+# fe-protocol2.c:1208
+#: fe-protocol2.c:1208
+msgid "lost synchronization with server, resetting connection"
+msgstr "無法與伺服器協調，重置連線"
+
+# fe-protocol2.c:1343
+# fe-protocol2.c:1375
+# fe-protocol3.c:1387
+#: fe-protocol2.c:1343
+#: fe-protocol2.c:1375
+#: fe-protocol3.c:1387
+#, c-format
+msgid "protocol error: id=0x%x\n"
+msgstr "協定錯誤：id=0x%x\n"
+
+# fe-protocol3.c:306
+#: fe-protocol3.c:306
+msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
+msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)\n"
+
+# fe-protocol3.c:365
+#: fe-protocol3.c:365
+#, c-format
+msgid "message contents do not agree with length in message type \"%c\"\n"
+msgstr "訊息類型\"%c\"的長度與訊息內容不符\n"
+
+# fe-protocol3.c:386
+#: fe-protocol3.c:386
+#, c-format
+msgid "lost synchronization with server: got message type \"%c\", length %d\n"
+msgstr "無法與伺服器協調：收到訊息類型\"%c\"，長度 %d\n"
+
+# fe-protocol3.c:522
+#: fe-protocol3.c:522
+msgid "unexpected field count in \"D\" message\n"
+msgstr "非預期的\"D\"訊息欄位數\n"
+
+#  translator: %s represents a digit string
+#  translator: %s represents a digit string
+# fe-protocol3.c:651
+# fe-protocol3.c:659
+#. translator: %s represents a digit string
+#: fe-protocol3.c:651
+#: fe-protocol3.c:659
+#, c-format
+msgid " at character %s"
+msgstr "於字元 %s"
+
+# fe-protocol3.c:668
+#: fe-protocol3.c:668
+#, c-format
+msgid "DETAIL:  %s\n"
+msgstr ""
+
+# fe-protocol3.c:671
+#: fe-protocol3.c:671
+#, c-format
+msgid "HINT:  %s\n"
+msgstr ""
+
+# fe-protocol3.c:674
+#: fe-protocol3.c:674
+#, c-format
+msgid "QUERY:  %s\n"
+msgstr ""
+
+# fe-protocol3.c:677
+#: fe-protocol3.c:677
+#, c-format
+msgid "CONTEXT:  %s\n"
+msgstr ""
+
+# fe-protocol3.c:689
+#: fe-protocol3.c:689
+msgid "LOCATION:  "
+msgstr ""
+
+# fe-protocol3.c:691
+#: fe-protocol3.c:691
+#, c-format
+msgid "%s, "
+msgstr ""
+
+# fe-protocol3.c:693
+#: fe-protocol3.c:693
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
+# fe-protocol3.c:1000
+#: fe-protocol3.c:1000
+msgid "PQgetline: not doing text COPY OUT\n"
+msgstr "PQgetline：不進行文字COPY OUT\n"
+
+# fe-secure.c:264
+#: fe-secure.c:264
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "無法建立 SSL 連線?%s\n"
+
+# fe-secure.c:330
+# fe-secure.c:415
+# fe-secure.c:1038
+#: fe-secure.c:330
+#: fe-secure.c:415
+#: fe-secure.c:1038
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "SSL SYSCALL錯誤：%s\n"
+
+# fe-secure.c:335
+# fe-secure.c:420
+# fe-secure.c:1042
+#: fe-secure.c:335
+#: fe-secure.c:420
+#: fe-secure.c:1042
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "SSL SYSCALL錯誤：發現EOF\n"
+
+# fe-secure.c:347
+# fe-secure.c:431
+# fe-secure.c:1051
+#: fe-secure.c:347
+#: fe-secure.c:431
+#: fe-secure.c:1051
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "SSL 錯誤：%s\n"
+
+# fe-secure.c:357
+# fe-secure.c:441
+# fe-secure.c:1059
+#: fe-secure.c:357
+#: fe-secure.c:441
+#: fe-secure.c:1059
+#, c-format
+msgid "unrecognized SSL error code: %d\n"
+msgstr "無法識別的SSL錯誤碼：%d\n"
+
+# fe-secure.c:504
+#: fe-secure.c:504
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "詢問socket發生錯誤：%s\n"
+
+# fe-secure.c:532
+#: fe-secure.c:532
+#, c-format
+msgid "could not get information about host \"%s\": %s\n"
+msgstr "無法取得關於主機\"%s\"的資訊：%s\n"
+
+# fe-secure.c:551
+#: fe-secure.c:551
+msgid "unsupported protocol\n"
+msgstr "不被支援的協定\n"
+
+# fe-secure.c:573
+#: fe-secure.c:573
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr "伺服器的common name \"%s\" 無法解析成位址%ld.%ld.%ld.%ld\n"
+
+# fe-secure.c:580
+#: fe-secure.c:580
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr "伺服器的common name \"%s\" 無法解析成位?\n"
+
+# fe-secure.c:763
+#: fe-secure.c:763
+msgid "could not get user information\n"
+msgstr "無法取得使用者的資訊\n"
+
+# fe-secure.c:775
+#: fe-secure.c:775
+#, c-format
+msgid "could not open certificate file \"%s\": %s\n"
+msgstr "無法開啟憑證檔\"%s\"：%s\n"
+
+# fe-secure.c:784
+#: fe-secure.c:784
+#, c-format
+msgid "could not read certificate file \"%s\": %s\n"
+msgstr "無法讀取憑證檔\"%s\"：%s\n"
+
+# fe-secure.c:798
+#: fe-secure.c:798
+#, c-format
+msgid "certificate present, but not private key file \"%s\"\n"
+msgstr "發現憑證，但是沒有私鑰檔\"%s\"\n"
+
+# fe-secure.c:807
+#: fe-secure.c:807
+#, c-format
+msgid "private key file \"%s\" has wrong permissions\n"
+msgstr "私鑰檔\"%s\"權限錯誤\n"
+
+# fe-secure.c:815
+#: fe-secure.c:815
+#, c-format
+msgid "could not open private key file \"%s\": %s\n"
+msgstr "無法開啟私鑰檔\"%s\"：%s\n"
+
+# fe-secure.c:824
+#: fe-secure.c:824
+#, c-format
+msgid "private key file \"%s\" changed during execution\n"
+msgstr "私鑰檔\"%s\"在執行過程中被改變\n"
+
+# fe-secure.c:833
+#: fe-secure.c:833
+#, c-format
+msgid "could not read private key file \"%s\": %s\n"
+msgstr "無法讀取私鑰檔\"%s\"：%s\n"
+
+# fe-secure.c:848
+#: fe-secure.c:848
+#, c-format
+msgid "certificate does not match private key file \"%s\": %s\n"
+msgstr "憑證與私?檔\"%s\"不符：%s\n"
+
+# fe-secure.c:932
+#: fe-secure.c:932
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "無法建立SSL context：%s\n"
+
+# fe-secure.c:977
+#: fe-secure.c:977
+#, c-format
+msgid "could not read root certificate file \"%s\": %s\n"
+msgstr "無法讀取根憑證檔\"%s\"：%s\n"
+
+# fe-secure.c:1079
+#: fe-secure.c:1079
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "無法驗證憑證：%s\n"
+
+# fe-secure.c:1093
+#: fe-secure.c:1093
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "無法取得憑證：%s\n"