summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2013-10-07 16:27:04 -0400
committerPeter Eisentraut <peter_e@gmx.net>2013-10-07 16:27:04 -0400
commit4750eae3504e9d74eec883434cf275657d57bd25 (patch)
tree6cae346f2e5a48952b5d23c8313bc01ef5eb1a61
parentef388b65a8b0aad40146ab9e45fe64b405396c7e (diff)
downloadpostgresql-4750eae3504e9d74eec883434cf275657d57bd25.tar.gz
Translation updates
-rw-r--r--src/backend/po/es.po4
-rw-r--r--src/backend/po/it.po524
-rw-r--r--src/backend/po/zh_TW.po4
-rw-r--r--src/bin/initdb/po/cs.po316
-rw-r--r--src/bin/initdb/po/zh_CN.po516
-rw-r--r--src/bin/pg_basebackup/nls.mk2
-rw-r--r--src/bin/pg_basebackup/po/cs.po240
-rw-r--r--src/bin/pg_basebackup/po/zh_CN.po878
-rw-r--r--src/bin/pg_config/po/ko.po3
-rw-r--r--src/bin/pg_config/po/nb.po3
-rw-r--r--src/bin/pg_config/po/ro.po3
-rw-r--r--src/bin/pg_config/po/ta.po3
-rw-r--r--src/bin/pg_config/po/tr.po3
-rw-r--r--src/bin/pg_config/po/zh_CN.po90
-rw-r--r--src/bin/pg_config/po/zh_TW.po7
-rw-r--r--src/bin/pg_controldata/po/cs.po19
-rw-r--r--src/bin/pg_controldata/po/zh_CN.po209
-rw-r--r--src/bin/pg_ctl/po/cs.po289
-rw-r--r--src/bin/pg_ctl/po/zh_CN.po386
-rw-r--r--src/bin/pg_ctl/po/zh_TW.po7
-rw-r--r--src/bin/pg_dump/po/cs.po1137
-rw-r--r--src/bin/pg_dump/po/zh_CN.po1617
-rw-r--r--src/bin/pg_resetxlog/po/cs.po194
-rw-r--r--src/bin/pg_resetxlog/po/zh_CN.po253
-rw-r--r--src/bin/psql/po/cs.po453
-rw-r--r--src/bin/psql/po/zh_CN.po2317
-rw-r--r--src/bin/psql/po/zh_TW.po4
-rw-r--r--src/bin/scripts/po/cs.po107
-rw-r--r--src/bin/scripts/po/zh_CN.po434
-rw-r--r--src/interfaces/ecpg/ecpglib/po/de.po3
-rw-r--r--src/interfaces/ecpg/ecpglib/po/fr.po3
-rw-r--r--src/interfaces/ecpg/ecpglib/po/ja.po3
-rw-r--r--src/interfaces/ecpg/ecpglib/po/tr.po3
-rw-r--r--src/interfaces/ecpg/ecpglib/po/zh_CN.po4
-rw-r--r--src/interfaces/ecpg/preproc/po/ko.po3
-rw-r--r--src/interfaces/ecpg/preproc/po/tr.po3
-rw-r--r--src/interfaces/ecpg/preproc/po/zh_TW.po7
-rw-r--r--src/interfaces/libpq/po/cs.po202
-rw-r--r--src/interfaces/libpq/po/it.po81
-rw-r--r--src/interfaces/libpq/po/zh_CN.po418
-rw-r--r--src/interfaces/libpq/po/zh_TW.po7
-rw-r--r--src/pl/plperl/po/ro.po4
-rw-r--r--src/pl/plperl/po/zh_TW.po4
-rw-r--r--src/pl/plpgsql/src/po/ro.po4
-rw-r--r--src/pl/plpgsql/src/po/zh_CN.po889
-rw-r--r--src/pl/plpgsql/src/po/zh_TW.po7
-rw-r--r--src/pl/plpython/po/ro.po4
-rw-r--r--src/pl/tcl/po/de.po3
-rw-r--r--src/pl/tcl/po/fr.po3
-rw-r--r--src/pl/tcl/po/ja.po3
-rw-r--r--src/pl/tcl/po/ro.po3
-rw-r--r--src/pl/tcl/po/tr.po3
-rw-r--r--src/pl/tcl/po/zh_CN.po4
-rw-r--r--src/pl/tcl/po/zh_TW.po4
54 files changed, 6869 insertions, 4825 deletions
diff --git a/src/backend/po/es.po b/src/backend/po/es.po
index 8425586890..a948c8fe56 100644
--- a/src/backend/po/es.po
+++ b/src/backend/po/es.po
@@ -59,7 +59,7 @@ msgstr ""
"Project-Id-Version: PostgreSQL server 9.3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2013-08-29 23:13+0000\n"
-"PO-Revision-Date: 2013-08-30 13:05-0400\n"
+"PO-Revision-Date: 2013-09-20 10:14-0300\n"
"Last-Translator: Álvaro Herrera <alvherre@alvh.no-ip.org>\n"
"Language-Team: PgSQL Español <pgsql-es-ayuda@postgresql.org>\n"
"Language: es\n"
@@ -1372,7 +1372,7 @@ msgstr "Ejecute pg_xlog_replay_resume() para continuar."
#: access/transam/xlog.c:4795
#, c-format
msgid "hot standby is not possible because %s = %d is a lower setting than on the master server (its value was %d)"
-msgstr "hoy standby no es posible puesto que %s = %d es una configuración menor que en el servidor maestro (su valor era %d)"
+msgstr "hot standby no es posible puesto que %s = %d es una configuración menor que en el servidor maestro (su valor era %d)"
#: access/transam/xlog.c:4817
#, c-format
diff --git a/src/backend/po/it.po b/src/backend/po/it.po
index 863b32ed63..c5f914d0f6 100644
--- a/src/backend/po/it.po
+++ b/src/backend/po/it.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: postgres (PostgreSQL) 9.3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-08-16 22:12+0000\n"
-"PO-Revision-Date: 2013-08-18 19:34+0100\n"
+"POT-Creation-Date: 2013-10-03 02:42+0000\n"
+"PO-Revision-Date: 2013-10-04 01:18+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -26,7 +26,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.5.4\n"
#: ../port/chklocale.c:351 ../port/chklocale.c:357
#, c-format
@@ -487,14 +487,14 @@ msgstr ""
msgid "database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database with OID %u"
msgstr "il database non sta accettando comandi che generano nuovi MultiXactIds per evitare perdite di dati per wraparound nel database con OID %u"
-#: access/transam/multixact.c:943 access/transam/multixact.c:1989
+#: access/transam/multixact.c:943 access/transam/multixact.c:2036
#, c-format
msgid "database \"%s\" must be vacuumed before %u more MultiXactId is used"
msgid_plural "database \"%s\" must be vacuumed before %u more MultiXactIds are used"
msgstr[0] "il database \"%s\" deve ricevere un vacuum prima che altri %u MultiXactIds siano usati"
msgstr[1] "il database \"%s\" deve ricevere un vacuum prima che altri %u MultiXactIds siano usati"
-#: access/transam/multixact.c:952 access/transam/multixact.c:1998
+#: access/transam/multixact.c:952 access/transam/multixact.c:2045
#, c-format
msgid "database with OID %u must be vacuumed before %u more MultiXactId is used"
msgid_plural "database with OID %u must be vacuumed before %u more MultiXactIds are used"
@@ -511,12 +511,12 @@ msgstr "il MultiXactId %u non esiste più -- sembra ci sia stato un wraparound"
msgid "MultiXactId %u has not been created yet -- apparent wraparound"
msgstr "il MultiXactId %u non è stato ancora creato -- sembra ci sia stato un wraparound"
-#: access/transam/multixact.c:1954
+#: access/transam/multixact.c:2001
#, c-format
msgid "MultiXactId wrap limit is %u, limited by database with OID %u"
msgstr "il limite di wrap di MultiXactId è %u, limitato dal database con OID %u"
-#: access/transam/multixact.c:1994 access/transam/multixact.c:2003
+#: access/transam/multixact.c:2041 access/transam/multixact.c:2050
#: access/transam/varsup.c:137 access/transam/varsup.c:144
#: access/transam/varsup.c:373 access/transam/varsup.c:380
#, c-format
@@ -527,59 +527,59 @@ msgstr ""
"Per evitare lo spegnimento del database, si deve eseguire un VACUUM su tutto il database.\n"
"Potrebbe essere necessario inoltre effettuare il COMMIT o il ROLLBACK di vecchie transazioni preparate."
-#: access/transam/multixact.c:2451
+#: access/transam/multixact.c:2498
#, c-format
msgid "invalid MultiXactId: %u"
msgstr "MultiXactId non valido: %u"
-#: access/transam/slru.c:607
+#: access/transam/slru.c:651
#, c-format
msgid "file \"%s\" doesn't exist, reading as zeroes"
msgstr "il file \"%s\" non esiste, interpretato come zeri"
-#: access/transam/slru.c:837 access/transam/slru.c:843
-#: access/transam/slru.c:850 access/transam/slru.c:857
-#: access/transam/slru.c:864 access/transam/slru.c:871
+#: access/transam/slru.c:881 access/transam/slru.c:887
+#: access/transam/slru.c:894 access/transam/slru.c:901
+#: access/transam/slru.c:908 access/transam/slru.c:915
#, c-format
msgid "could not access status of transaction %u"
msgstr "non è stato possibile accedere allo stato della transazione %u"
-#: access/transam/slru.c:838
+#: access/transam/slru.c:882
#, c-format
msgid "Could not open file \"%s\": %m."
msgstr "Apertura del file \"%s\" fallita: %m."
-#: access/transam/slru.c:844
+#: access/transam/slru.c:888
#, c-format
msgid "Could not seek in file \"%s\" to offset %u: %m."
msgstr "Spostamento nel file \"%s\" all'offset %u fallito: %m."
-#: access/transam/slru.c:851
+#: access/transam/slru.c:895
#, c-format
msgid "Could not read from file \"%s\" at offset %u: %m."
msgstr "Lettura dal file \"%s\" all'offset %u fallita: %m."
-#: access/transam/slru.c:858
+#: access/transam/slru.c:902
#, c-format
msgid "Could not write to file \"%s\" at offset %u: %m."
msgstr "Scrittura nel file \"%s\" all'offset %u fallita: %m."
-#: access/transam/slru.c:865
+#: access/transam/slru.c:909
#, c-format
msgid "Could not fsync file \"%s\": %m."
msgstr "fsync del file \"%s\" fallito: %m."
-#: access/transam/slru.c:872
+#: access/transam/slru.c:916
#, c-format
msgid "Could not close file \"%s\": %m."
msgstr "Chiusura del file \"%s\" fallita: %m."
-#: access/transam/slru.c:1127
+#: access/transam/slru.c:1171
#, c-format
msgid "could not truncate directory \"%s\": apparent wraparound"
msgstr "troncamento della directory \"%s\" fallito: probabile wraparound"
-#: access/transam/slru.c:1201 access/transam/slru.c:1219
+#: access/transam/slru.c:1245 access/transam/slru.c:1263
#, c-format
msgid "removing file \"%s\""
msgstr "cancellazione del file \"%s\""
@@ -588,7 +588,7 @@ msgstr "cancellazione del file \"%s\""
#: access/transam/timeline.c:333 access/transam/xlog.c:2271
#: access/transam/xlog.c:2384 access/transam/xlog.c:2421
#: access/transam/xlog.c:2696 access/transam/xlog.c:2774
-#: replication/basebackup.c:366 replication/basebackup.c:992
+#: replication/basebackup.c:374 replication/basebackup.c:1000
#: replication/walsender.c:368 replication/walsender.c:1326
#: storage/file/copydir.c:158 storage/file/copydir.c:248 storage/smgr/md.c:587
#: storage/smgr/md.c:845 utils/error/elog.c:1650 utils/init/miscinit.c:1063
@@ -635,7 +635,7 @@ msgstr "Gli ID della timeline devono avere valori inferiori degli ID della timel
#: access/transam/timeline.c:314 access/transam/timeline.c:471
#: access/transam/xlog.c:2305 access/transam/xlog.c:2436
#: access/transam/xlog.c:8687 access/transam/xlog.c:9004
-#: postmaster/postmaster.c:4090 storage/file/copydir.c:165
+#: postmaster/postmaster.c:4092 storage/file/copydir.c:165
#: storage/smgr/md.c:305 utils/time/snapmgr.c:861
#, c-format
msgid "could not create file \"%s\": %m"
@@ -653,8 +653,8 @@ msgstr "lettura de file \"%s\" fallita: %m"
#: access/transam/timeline.c:366 access/transam/timeline.c:400
#: access/transam/timeline.c:487 access/transam/xlog.c:2335
-#: access/transam/xlog.c:2468 postmaster/postmaster.c:4100
-#: postmaster/postmaster.c:4110 storage/file/copydir.c:190
+#: access/transam/xlog.c:2468 postmaster/postmaster.c:4102
+#: postmaster/postmaster.c:4112 storage/file/copydir.c:190
#: utils/init/miscinit.c:1128 utils/init/miscinit.c:1137
#: utils/init/miscinit.c:1144 utils/misc/guc.c:7596 utils/misc/guc.c:7610
#: utils/time/snapmgr.c:866 utils/time/snapmgr.c:873
@@ -1432,10 +1432,10 @@ msgstr "avvio del ripristino dell'archivio"
#: access/transam/xlog.c:4999 commands/sequence.c:1035 lib/stringinfo.c:266
#: libpq/auth.c:1025 libpq/auth.c:1381 libpq/auth.c:1449 libpq/auth.c:1851
-#: postmaster/postmaster.c:2144 postmaster/postmaster.c:2175
-#: postmaster/postmaster.c:3632 postmaster/postmaster.c:4315
-#: postmaster/postmaster.c:4401 postmaster/postmaster.c:5079
-#: postmaster/postmaster.c:5255 postmaster/postmaster.c:5672
+#: postmaster/postmaster.c:2146 postmaster/postmaster.c:2177
+#: postmaster/postmaster.c:3634 postmaster/postmaster.c:4317
+#: postmaster/postmaster.c:4403 postmaster/postmaster.c:5081
+#: postmaster/postmaster.c:5257 postmaster/postmaster.c:5674
#: storage/buffer/buf_init.c:154 storage/buffer/localbuf.c:397
#: storage/file/fd.c:403 storage/file/fd.c:800 storage/file/fd.c:918
#: storage/file/fd.c:1531 storage/ipc/procarray.c:894
@@ -1838,7 +1838,7 @@ msgstr "Ciò vuol dire che il backup che sta venendo preso sullo standby è corr
#: access/transam/xlog.c:8672 access/transam/xlog.c:8843
#: access/transam/xlogarchive.c:106 access/transam/xlogarchive.c:265
-#: replication/basebackup.c:372 replication/basebackup.c:427
+#: replication/basebackup.c:380 replication/basebackup.c:435
#: storage/file/copydir.c:75 storage/file/copydir.c:118 utils/adt/dbsize.c:68
#: utils/adt/dbsize.c:218 utils/adt/dbsize.c:298 utils/adt/genfile.c:108
#: utils/adt/genfile.c:280 guc-file.l:771
@@ -1875,12 +1875,12 @@ msgstr "rimozione del file \"%s\" fallita: %m"
msgid "invalid data in file \"%s\""
msgstr "i dati nel file \"%s\" non sono validi"
-#: access/transam/xlog.c:8903 replication/basebackup.c:826
+#: access/transam/xlog.c:8903 replication/basebackup.c:834
#, c-format
msgid "the standby was promoted during online backup"
msgstr "lo standby è stato promosso durante il backup online"
-#: access/transam/xlog.c:8904 replication/basebackup.c:827
+#: access/transam/xlog.c:8904 replication/basebackup.c:835
#, c-format
msgid "This means that the backup being taken is corrupt and should not be used. Try taking another online backup."
msgstr "Ciò vuol dire che il backup che stava venendo salvato è corrotto e non dovrebbe essere usato. Prova ad effettuare un altro backup online."
@@ -1951,12 +1951,12 @@ msgstr "spostamento nel segmento di log %s alla posizione %u fallito: %m"
msgid "could not read from log segment %s, offset %u: %m"
msgstr "lettura del segmento di log %s, posizione %u fallita: %m"
-#: access/transam/xlog.c:9946
+#: access/transam/xlog.c:9947
#, c-format
msgid "received promote request"
msgstr "richiesta di promozione ricevuta"
-#: access/transam/xlog.c:9959
+#: access/transam/xlog.c:9960
#, c-format
msgid "trigger file found: %s"
msgstr "trovato il file trigger: %s"
@@ -2052,12 +2052,12 @@ msgstr "Le funzioni di controllo del recupero possono essere eseguite solo duran
msgid "invalid input syntax for transaction log location: \"%s\""
msgstr "sintassi di input non valida per la posizione del log delle transazioni: \"%s\""
-#: bootstrap/bootstrap.c:286 postmaster/postmaster.c:764 tcop/postgres.c:3446
+#: bootstrap/bootstrap.c:286 postmaster/postmaster.c:764 tcop/postgres.c:3453
#, c-format
msgid "--%s requires a value"
msgstr "--%s richiede un valore"
-#: bootstrap/bootstrap.c:291 postmaster/postmaster.c:769 tcop/postgres.c:3451
+#: bootstrap/bootstrap.c:291 postmaster/postmaster.c:769 tcop/postgres.c:3458
#, c-format
msgid "-c %s requires a value"
msgstr "-c %s richiede un valore"
@@ -2185,7 +2185,7 @@ msgstr "i privilegi della colonna sono validi solo per le relazioni"
#: catalog/aclchk.c:688 catalog/aclchk.c:3901 catalog/aclchk.c:4678
#: catalog/objectaddress.c:575 catalog/pg_largeobject.c:113
-#: storage/large_object/inv_api.c:277
+#: storage/large_object/inv_api.c:266
#, c-format
msgid "large object %u does not exist"
msgstr "il large object %u non esiste"
@@ -3650,22 +3650,22 @@ msgstr "la funzione \"%s\" è una funzione finestra"
msgid "function \"%s\" is not a window function"
msgstr "la funzione \"%s\" non è una funzione finestra"
-#: catalog/pg_proc.c:733
+#: catalog/pg_proc.c:743
#, c-format
msgid "there is no built-in function named \"%s\""
msgstr "non c'è nessuna funzione predefinita chiamata \"%s\""
-#: catalog/pg_proc.c:825
+#: catalog/pg_proc.c:835
#, c-format
msgid "SQL functions cannot return type %s"
msgstr "Le funzioni SQL non possono restituire il tipo %s"
-#: catalog/pg_proc.c:840
+#: catalog/pg_proc.c:850
#, c-format
msgid "SQL functions cannot have arguments of type %s"
msgstr "le funzioni SQL non possono avere argomenti di tipo %s"
-#: catalog/pg_proc.c:926 executor/functions.c:1411
+#: catalog/pg_proc.c:936 executor/functions.c:1411
#, c-format
msgid "SQL function \"%s\""
msgstr "funzione SQL \"%s\""
@@ -3994,27 +3994,27 @@ msgstr "non è possibile raggruppare sull'indice parziale \"%s\""
msgid "cannot cluster on invalid index \"%s\""
msgstr "non è possibile raggruppare sull'indice non valido \"%s\""
-#: commands/cluster.c:909
+#: commands/cluster.c:910
#, c-format
msgid "clustering \"%s.%s\" using index scan on \"%s\""
msgstr "raggruppamento di \"%s.%s\" usando una scansione sull'indice \"%s\""
-#: commands/cluster.c:915
+#: commands/cluster.c:916
#, c-format
msgid "clustering \"%s.%s\" using sequential scan and sort"
msgstr "raggruppamento di \"%s.%s\" usando una scansione sequenziale e ordinamento"
-#: commands/cluster.c:920 commands/vacuumlazy.c:411
+#: commands/cluster.c:921 commands/vacuumlazy.c:411
#, c-format
msgid "vacuuming \"%s.%s\""
msgstr "pulizia di \"%s.%s\""
-#: commands/cluster.c:1079
+#: commands/cluster.c:1080
#, c-format
msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages"
msgstr "\"%s\": trovate %.0f versioni di riga removibili, %.0f non removibili in %u pagine"
-#: commands/cluster.c:1083
+#: commands/cluster.c:1084
#, c-format
msgid ""
"%.0f dead row versions cannot be removed yet.\n"
@@ -7019,7 +7019,7 @@ msgid "tablespace \"%s\" already exists"
msgstr "il tablespace \"%s\" esiste già"
#: commands/tablespace.c:372 commands/tablespace.c:530
-#: replication/basebackup.c:162 replication/basebackup.c:913
+#: replication/basebackup.c:162 replication/basebackup.c:921
#: utils/adt/misc.c:372
#, c-format
msgid "tablespaces are not supported on this platform"
@@ -7073,8 +7073,8 @@ msgid "could not create symbolic link \"%s\": %m"
msgstr "creazione del link simbolico \"%s\" fallita: %m"
#: commands/tablespace.c:690 commands/tablespace.c:700
-#: postmaster/postmaster.c:1317 replication/basebackup.c:265
-#: replication/basebackup.c:553 storage/file/copydir.c:56
+#: postmaster/postmaster.c:1319 replication/basebackup.c:265
+#: replication/basebackup.c:561 storage/file/copydir.c:56
#: storage/file/copydir.c:99 storage/file/fd.c:1896 utils/adt/genfile.c:354
#: utils/adt/misc.c:272 utils/misc/tzparser.c:323
#, c-format
@@ -7824,17 +7824,17 @@ msgstr ""
msgid "relation \"%s\" page %u is uninitialized --- fixing"
msgstr "la relazione \"%s\" pagina %u non è inizializzata --- in correzione"
-#: commands/vacuumlazy.c:1033
+#: commands/vacuumlazy.c:1034
#, c-format
msgid "\"%s\": removed %.0f row versions in %u pages"
msgstr "\"%s\": %.0f versioni di riga rimosse in %u pagine"
-#: commands/vacuumlazy.c:1038
+#: commands/vacuumlazy.c:1039
#, c-format
msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages"
msgstr "\"%s\": trovate %.0f versioni di riga removibili, %.0f non removibili in %u pagine su %u"
-#: commands/vacuumlazy.c:1042
+#: commands/vacuumlazy.c:1043
#, c-format
msgid ""
"%.0f dead row versions cannot be removed yet.\n"
@@ -7847,28 +7847,28 @@ msgstr ""
"%u pagine sono completamente vuote.\n"
"%s."
-#: commands/vacuumlazy.c:1113
+#: commands/vacuumlazy.c:1114
#, c-format
msgid "\"%s\": removed %d row versions in %d pages"
msgstr "\"%s\": %d versioni di riga rimosse in %d pagine"
-#: commands/vacuumlazy.c:1116 commands/vacuumlazy.c:1272
-#: commands/vacuumlazy.c:1443
+#: commands/vacuumlazy.c:1117 commands/vacuumlazy.c:1273
+#: commands/vacuumlazy.c:1444
#, c-format
msgid "%s."
msgstr "%s."
-#: commands/vacuumlazy.c:1269
+#: commands/vacuumlazy.c:1270
#, c-format
msgid "scanned index \"%s\" to remove %d row versions"
msgstr "effettuata la scansione dell'indice \"%s\" per rimuovere %d versioni di riga"
-#: commands/vacuumlazy.c:1314
+#: commands/vacuumlazy.c:1315
#, c-format
msgid "index \"%s\" now contains %.0f row versions in %u pages"
msgstr "l'indice \"%s\" ora contiene %.0f versioni di riga in %u pagine"
-#: commands/vacuumlazy.c:1318
+#: commands/vacuumlazy.c:1319
#, c-format
msgid ""
"%.0f index row versions were removed.\n"
@@ -7879,17 +7879,17 @@ msgstr ""
"%u pagine dell'indice sono state cancellate, %u sono attualmente riusabili.\n"
"%s."
-#: commands/vacuumlazy.c:1375
+#: commands/vacuumlazy.c:1376
#, c-format
msgid "\"%s\": stopping truncate due to conflicting lock request"
msgstr "\"%s\": truncate interrotto a causa di una richiesta di lock in conflitto"
-#: commands/vacuumlazy.c:1440
+#: commands/vacuumlazy.c:1441
#, c-format
msgid "\"%s\": truncated %u to %u pages"
msgstr "\"%s\": %u pagine ridotte a %u"
-#: commands/vacuumlazy.c:1496
+#: commands/vacuumlazy.c:1497
#, c-format
msgid "\"%s\": suspending truncate due to conflicting lock request"
msgstr "\"%s\": annullamento del troncamento a causa di richieste di lock in conflitto"
@@ -10122,7 +10122,7 @@ msgid "FULL JOIN is only supported with merge-joinable or hash-joinable join con
msgstr "FULL JOIN è supportato solo con condizioni di join realizzabili con merge o hash"
#. translator: %s is a SQL row locking clause such as FOR UPDATE
-#: optimizer/plan/initsplan.c:876
+#: optimizer/plan/initsplan.c:1057
#, c-format
msgid "%s cannot be applied to the nullable side of an outer join"
msgstr "%s non può essere applicato sul lato che può essere nullo di un join esterno"
@@ -10150,22 +10150,22 @@ msgstr "Alcuni dei tipi di dati supportano solo l'hashing, mentre altri supporta
msgid "could not implement DISTINCT"
msgstr "non è stato possibile implementare DISTINCT"
-#: optimizer/plan/planner.c:3271
+#: optimizer/plan/planner.c:3290
#, c-format
msgid "could not implement window PARTITION BY"
msgstr "non è stato possibile implementare PARTITION BY della finestra"
-#: optimizer/plan/planner.c:3272
+#: optimizer/plan/planner.c:3291
#, c-format
msgid "Window partitioning columns must be of sortable datatypes."
msgstr "La colonna di partizionamento della finestra dev'essere un tipo di dato ordinabile."
-#: optimizer/plan/planner.c:3276
+#: optimizer/plan/planner.c:3295
#, c-format
msgid "could not implement window ORDER BY"
msgstr "non è stato possibile implementare ORDER BY della finestra"
-#: optimizer/plan/planner.c:3277
+#: optimizer/plan/planner.c:3296
#, c-format
msgid "Window ordering columns must be of sortable datatypes."
msgstr "La colonna di ordinamento della finestra dev'essere un tipo di dato ordinabile."
@@ -11800,42 +11800,42 @@ msgstr "esecutore di autovacuum avviato"
msgid "autovacuum launcher shutting down"
msgstr "arresto dell'esecutore di autovacuum"
-#: postmaster/autovacuum.c:1447
+#: postmaster/autovacuum.c:1446
#, c-format
msgid "could not fork autovacuum worker process: %m"
msgstr "fork del processo di lavoro di autovacuum fallito: %m"
-#: postmaster/autovacuum.c:1666
+#: postmaster/autovacuum.c:1665
#, c-format
msgid "autovacuum: processing database \"%s\""
msgstr "autovacuum: elaborazione del database \"%s\""
-#: postmaster/autovacuum.c:2060
+#: postmaster/autovacuum.c:2059
#, c-format
msgid "autovacuum: dropping orphan temp table \"%s\".\"%s\" in database \"%s\""
msgstr "autovacuum: eliminazione della tabella temporanea orfana \"%s\".\"%s\" nel database \"%s\""
-#: postmaster/autovacuum.c:2072
+#: postmaster/autovacuum.c:2071
#, c-format
msgid "autovacuum: found orphan temp table \"%s\".\"%s\" in database \"%s\""
msgstr "autovacuum: trovata tabella temporanea orfana \"%s\".\"%s\" nel database \"%s\""
-#: postmaster/autovacuum.c:2336
+#: postmaster/autovacuum.c:2335
#, c-format
msgid "automatic vacuum of table \"%s.%s.%s\""
msgstr "pulizia automatica della tabella \"%s.%s.%s\""
-#: postmaster/autovacuum.c:2339
+#: postmaster/autovacuum.c:2338
#, c-format
msgid "automatic analyze of table \"%s.%s.%s\""
msgstr "analisi automatica della tabella \"%s.%s.%s\""
-#: postmaster/autovacuum.c:2835
+#: postmaster/autovacuum.c:2834
#, c-format
msgid "autovacuum not started because of misconfiguration"
msgstr "autovacuum non avviato a causa di configurazione errata"
-#: postmaster/autovacuum.c:2836
+#: postmaster/autovacuum.c:2835
#, c-format
msgid "Enable the \"track_counts\" option."
msgstr "Abilita l'opzione \"track_counts\"."
@@ -11903,7 +11903,7 @@ msgstr "Il comando di archiviazione fallito era: %s"
msgid "archive command was terminated by exception 0x%X"
msgstr "comando di archiviazione terminato da eccezione 0x%X"
-#: postmaster/pgarch.c:620 postmaster/postmaster.c:3231
+#: postmaster/pgarch.c:620 postmaster/postmaster.c:3233
#, c-format
msgid "See C include file \"ntstatus.h\" for a description of the hexadecimal value."
msgstr "Consulta il file include C \"ntstatus.h\" per una spiegazione del valore esadecimale."
@@ -11998,66 +11998,66 @@ msgstr "impostazione del socket per il raccoglitore di statistiche in modalità
msgid "disabling statistics collector for lack of working socket"
msgstr "raccoglitore di statistiche disabilitato per mancanza di un socket funzionante"
-#: postmaster/pgstat.c:664
+#: postmaster/pgstat.c:684
#, c-format
msgid "could not fork statistics collector: %m"
msgstr "fork del raccoglitore di statistiche fallito: %m"
-#: postmaster/pgstat.c:1200 postmaster/pgstat.c:1224 postmaster/pgstat.c:1255
+#: postmaster/pgstat.c:1220 postmaster/pgstat.c:1244 postmaster/pgstat.c:1275
#, c-format
msgid "must be superuser to reset statistics counters"
msgstr "occorre essere un superutente per resettare i contatori delle statistiche"
-#: postmaster/pgstat.c:1231
+#: postmaster/pgstat.c:1251
#, c-format
msgid "unrecognized reset target: \"%s\""
msgstr "obiettivo del reset sconosciuto: \"%s\""
-#: postmaster/pgstat.c:1232
+#: postmaster/pgstat.c:1252
#, c-format
msgid "Target must be \"bgwriter\"."
msgstr "L'obiettivo deve essere \"bgwriter\"."
-#: postmaster/pgstat.c:3177
+#: postmaster/pgstat.c:3197
#, c-format
msgid "could not read statistics message: %m"
msgstr "lettura del messaggio delle statistiche fallito: %m"
-#: postmaster/pgstat.c:3506 postmaster/pgstat.c:3676
+#: postmaster/pgstat.c:3526 postmaster/pgstat.c:3697
#, c-format
msgid "could not open temporary statistics file \"%s\": %m"
msgstr "apertura del file temporaneo delle statistiche \"%s\" fallita: %m"
-#: postmaster/pgstat.c:3568 postmaster/pgstat.c:3721
+#: postmaster/pgstat.c:3588 postmaster/pgstat.c:3742
#, c-format
msgid "could not write temporary statistics file \"%s\": %m"
msgstr "scrittura del file temporaneo delle statistiche \"%s\" fallita: %m"
-#: postmaster/pgstat.c:3577 postmaster/pgstat.c:3730
+#: postmaster/pgstat.c:3597 postmaster/pgstat.c:3751
#, c-format
msgid "could not close temporary statistics file \"%s\": %m"
msgstr "chiusura del file temporaneo delle statistiche \"%s\" fallita: %m"
-#: postmaster/pgstat.c:3585 postmaster/pgstat.c:3738
+#: postmaster/pgstat.c:3605 postmaster/pgstat.c:3759
#, c-format
msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
msgstr "non è stato possibile rinominare il file temporaneo delle statistiche \"%s\" in \"%s\": %m"
-#: postmaster/pgstat.c:3819 postmaster/pgstat.c:3994 postmaster/pgstat.c:4148
+#: postmaster/pgstat.c:3840 postmaster/pgstat.c:4015 postmaster/pgstat.c:4169
#, c-format
msgid "could not open statistics file \"%s\": %m"
msgstr "apertura del file delle statistiche \"%s\" fallita: %m"
-#: postmaster/pgstat.c:3831 postmaster/pgstat.c:3841 postmaster/pgstat.c:3862
-#: postmaster/pgstat.c:3877 postmaster/pgstat.c:3935 postmaster/pgstat.c:4006
-#: postmaster/pgstat.c:4026 postmaster/pgstat.c:4044 postmaster/pgstat.c:4060
-#: postmaster/pgstat.c:4078 postmaster/pgstat.c:4094 postmaster/pgstat.c:4160
-#: postmaster/pgstat.c:4172 postmaster/pgstat.c:4197 postmaster/pgstat.c:4219
+#: postmaster/pgstat.c:3852 postmaster/pgstat.c:3862 postmaster/pgstat.c:3883
+#: postmaster/pgstat.c:3898 postmaster/pgstat.c:3956 postmaster/pgstat.c:4027
+#: postmaster/pgstat.c:4047 postmaster/pgstat.c:4065 postmaster/pgstat.c:4081
+#: postmaster/pgstat.c:4099 postmaster/pgstat.c:4115 postmaster/pgstat.c:4181
+#: postmaster/pgstat.c:4193 postmaster/pgstat.c:4218 postmaster/pgstat.c:4240
#, c-format
msgid "corrupted statistics file \"%s\""
msgstr "file delle statistiche corrotto \"%s\""
-#: postmaster/pgstat.c:4646
+#: postmaster/pgstat.c:4667
#, c-format
msgid "database hash table corrupted during cleanup --- abort"
msgstr "tabella hash del database corrotta durante la pulizia --- interruzione"
@@ -12102,117 +12102,113 @@ msgstr "lo streaming dei WAL (max_wal_senders > 0) richiede wal_level \"archive
msgid "%s: invalid datetoken tables, please fix\n"
msgstr "%s: datetoken tables non valido, per favore correggilo\n"
-#: postmaster/postmaster.c:930
+#: postmaster/postmaster.c:930 postmaster/postmaster.c:1028
+#: utils/init/miscinit.c:1259
#, c-format
-msgid "invalid list syntax for \"listen_addresses\""
-msgstr "sintassi della lista non valida per \"listen_addresses\""
+msgid "invalid list syntax in parameter \"%s\""
+msgstr "sintassi di lista non valida nel parametro \"%s\""
-#: postmaster/postmaster.c:960
+#: postmaster/postmaster.c:961
#, c-format
msgid "could not create listen socket for \"%s\""
msgstr "creazione del socket di ascolto per \"%s\" fallita"
-#: postmaster/postmaster.c:966
+#: postmaster/postmaster.c:967
#, c-format
msgid "could not create any TCP/IP sockets"
msgstr "non è stato possibile creare alcun socket TCP/IP"
-#: postmaster/postmaster.c:1027
-#, c-format
-msgid "invalid list syntax for \"unix_socket_directories\""
-msgstr "sintassi non valida per \"unix_socket_directories\""
-
-#: postmaster/postmaster.c:1048
+#: postmaster/postmaster.c:1050
#, c-format
msgid "could not create Unix-domain socket in directory \"%s\""
msgstr "creazione del socket di dominio Unix fallita nella directory \"%s\""
-#: postmaster/postmaster.c:1054
+#: postmaster/postmaster.c:1056
#, c-format
msgid "could not create any Unix-domain sockets"
msgstr "creazione del socket di dominio Unix fallita"
-#: postmaster/postmaster.c:1066
+#: postmaster/postmaster.c:1068
#, c-format
msgid "no socket created for listening"
msgstr "nessun socket per l'ascolto è stato creato"
-#: postmaster/postmaster.c:1106
+#: postmaster/postmaster.c:1108
#, c-format
msgid "could not create I/O completion port for child queue"
msgstr "creazione della porta di completamento I/O per la coda dei figli fallita"
-#: postmaster/postmaster.c:1135
+#: postmaster/postmaster.c:1137
#, c-format
msgid "%s: could not change permissions of external PID file \"%s\": %s\n"
msgstr "%s: modifica dei permessi del file PID esterno \"%s\" fallita: %s\n"
-#: postmaster/postmaster.c:1139
+#: postmaster/postmaster.c:1141
#, c-format
msgid "%s: could not write external PID file \"%s\": %s\n"
msgstr "%s: scrittura del file PID esterno \"%s\" fallita: %s\n"
-#: postmaster/postmaster.c:1193
+#: postmaster/postmaster.c:1195
#, c-format
msgid "ending log output to stderr"
msgstr "terminazione dell'output del log su stderr"
-#: postmaster/postmaster.c:1194
+#: postmaster/postmaster.c:1196
#, c-format
msgid "Future log output will go to log destination \"%s\"."
msgstr "L'output dei prossimi log andrà su \"%s\"."
-#: postmaster/postmaster.c:1220 utils/init/postinit.c:199
+#: postmaster/postmaster.c:1222 utils/init/postinit.c:199
#, c-format
msgid "could not load pg_hba.conf"
msgstr "caricamento di pg_hba.conf fallito"
-#: postmaster/postmaster.c:1296
+#: postmaster/postmaster.c:1298
#, c-format
msgid "%s: could not locate matching postgres executable"
msgstr "%s: eseguibile postgres corrispondente non trovato"
-#: postmaster/postmaster.c:1319 utils/misc/tzparser.c:325
+#: postmaster/postmaster.c:1321 utils/misc/tzparser.c:325
#, c-format
msgid "This may indicate an incomplete PostgreSQL installation, or that the file \"%s\" has been moved away from its proper location."
msgstr "Questo potrebbe indicare una installazione di PostgreSQL incompleta, o che il file \"%s\" sia stato spostato dalla sua posizione corretta."
-#: postmaster/postmaster.c:1347
+#: postmaster/postmaster.c:1349
#, c-format
msgid "data directory \"%s\" does not exist"
msgstr "la directory dei dati \"%s\" non esiste"
-#: postmaster/postmaster.c:1352
+#: postmaster/postmaster.c:1354
#, c-format
msgid "could not read permissions of directory \"%s\": %m"
msgstr "lettura dei permessi della directory \"%s\" fallita: %m"
-#: postmaster/postmaster.c:1360
+#: postmaster/postmaster.c:1362
#, c-format
msgid "specified data directory \"%s\" is not a directory"
msgstr "la directory dei dati specificata \"%s\" non è una directory"
-#: postmaster/postmaster.c:1376
+#: postmaster/postmaster.c:1378
#, c-format
msgid "data directory \"%s\" has wrong ownership"
msgstr "la directory dei dati \"%s\" ha il proprietario errato"
-#: postmaster/postmaster.c:1378
+#: postmaster/postmaster.c:1380
#, c-format
msgid "The server must be started by the user that owns the data directory."
msgstr "Il server deve essere avviato dall'utente che possiede la directory dei dati."
-#: postmaster/postmaster.c:1398
+#: postmaster/postmaster.c:1400
#, c-format
msgid "data directory \"%s\" has group or world access"
msgstr "la directory dei dati \"%s\" è accessibile dal gruppo o da tutti"
-#: postmaster/postmaster.c:1400
+#: postmaster/postmaster.c:1402
#, c-format
msgid "Permissions should be u=rwx (0700)."
msgstr "I permessi dovrebbero essere u=rwx (0700)."
-#: postmaster/postmaster.c:1411
+#: postmaster/postmaster.c:1413
#, c-format
msgid ""
"%s: could not find the database system\n"
@@ -12223,386 +12219,386 @@ msgstr ""
"Sarebbe dovuto essere nella directory \"%s\",\n"
"ma l'apertura del file \"%s\" è fallita: %s\n"
-#: postmaster/postmaster.c:1563
+#: postmaster/postmaster.c:1565
#, c-format
msgid "select() failed in postmaster: %m"
msgstr "select() fallita in postmaster: %m"
-#: postmaster/postmaster.c:1733 postmaster/postmaster.c:1764
+#: postmaster/postmaster.c:1735 postmaster/postmaster.c:1766
#, c-format
msgid "incomplete startup packet"
msgstr "pacchetto di avvio incompleto"
-#: postmaster/postmaster.c:1745
+#: postmaster/postmaster.c:1747
#, c-format
msgid "invalid length of startup packet"
msgstr "dimensione del pacchetto di avvio non valida"
-#: postmaster/postmaster.c:1802
+#: postmaster/postmaster.c:1804
#, c-format
msgid "failed to send SSL negotiation response: %m"
msgstr "invio della risposta di negoziazione SSL fallito: %m"
-#: postmaster/postmaster.c:1831
+#: postmaster/postmaster.c:1833
#, c-format
msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
msgstr "protocollo frontend non supportato %u.%u: il server supporta da %u.0 a %u.%u"
-#: postmaster/postmaster.c:1882
+#: postmaster/postmaster.c:1884
#, c-format
msgid "invalid value for boolean option \"replication\""
msgstr "valore per l'opzione booleana \"replication\" non valido"
-#: postmaster/postmaster.c:1902
+#: postmaster/postmaster.c:1904
#, c-format
msgid "invalid startup packet layout: expected terminator as last byte"
msgstr "formato del pacchetto di avvio non valido: atteso il terminatore all'ultimo byte"
-#: postmaster/postmaster.c:1930
+#: postmaster/postmaster.c:1932
#, c-format
msgid "no PostgreSQL user name specified in startup packet"
msgstr "nessun utente PostgreSQL specificato nel pacchetto di avvio"
-#: postmaster/postmaster.c:1987
+#: postmaster/postmaster.c:1989
#, c-format
msgid "the database system is starting up"
msgstr "il database si sta avviando"
-#: postmaster/postmaster.c:1992
+#: postmaster/postmaster.c:1994
#, c-format
msgid "the database system is shutting down"
msgstr "il database si sta spegnendo"
-#: postmaster/postmaster.c:1997
+#: postmaster/postmaster.c:1999
#, c-format
msgid "the database system is in recovery mode"
msgstr "il database è in modalità di ripristino"
-#: postmaster/postmaster.c:2002 storage/ipc/procarray.c:278
+#: postmaster/postmaster.c:2004 storage/ipc/procarray.c:278
#: storage/ipc/sinvaladt.c:304 storage/lmgr/proc.c:339
#, c-format
msgid "sorry, too many clients already"
msgstr "spiacente, troppi client già connessi"
-#: postmaster/postmaster.c:2064
+#: postmaster/postmaster.c:2066
#, c-format
msgid "wrong key in cancel request for process %d"
msgstr "chiave sbagliata nella richiesta di annullamento per il processo %d"
-#: postmaster/postmaster.c:2072
+#: postmaster/postmaster.c:2074
#, c-format
msgid "PID %d in cancel request did not match any process"
msgstr "il PID %d nella richiesta di annullamento non corrisponde ad alcun processo"
-#: postmaster/postmaster.c:2292
+#: postmaster/postmaster.c:2294
#, c-format
msgid "received SIGHUP, reloading configuration files"
msgstr "SIGHUP ricevuto, sto ricaricando i file di configurazione"
-#: postmaster/postmaster.c:2318
+#: postmaster/postmaster.c:2320
#, c-format
msgid "pg_hba.conf not reloaded"
msgstr "pg_hba.conf non è stato ricaricato"
-#: postmaster/postmaster.c:2322
+#: postmaster/postmaster.c:2324
#, c-format
msgid "pg_ident.conf not reloaded"
msgstr "pg_ident.conf non è stato ricaricato"
-#: postmaster/postmaster.c:2363
+#: postmaster/postmaster.c:2365
#, c-format
msgid "received smart shutdown request"
msgstr "richiesta di arresto smart ricevuta"
-#: postmaster/postmaster.c:2416
+#: postmaster/postmaster.c:2418
#, c-format
msgid "received fast shutdown request"
msgstr "richiesta di arresto fast ricevuta"
-#: postmaster/postmaster.c:2442
+#: postmaster/postmaster.c:2444
#, c-format
msgid "aborting any active transactions"
msgstr "interruzione di tutte le transazioni attive"
-#: postmaster/postmaster.c:2472
+#: postmaster/postmaster.c:2474
#, c-format
msgid "received immediate shutdown request"
msgstr "richiesta di arresto immediate ricevuta"
-#: postmaster/postmaster.c:2543 postmaster/postmaster.c:2564
+#: postmaster/postmaster.c:2545 postmaster/postmaster.c:2566
msgid "startup process"
msgstr "avvio del processo"
-#: postmaster/postmaster.c:2546
+#: postmaster/postmaster.c:2548
#, c-format
msgid "aborting startup due to startup process failure"
msgstr "avvio interrotto a causa del fallimento del processo di avvio"
-#: postmaster/postmaster.c:2603
+#: postmaster/postmaster.c:2605
#, c-format
msgid "database system is ready to accept connections"
msgstr "il database è pronto ad accettare connessioni"
-#: postmaster/postmaster.c:2618
+#: postmaster/postmaster.c:2620
msgid "background writer process"
msgstr "processo di scrittura in background"
-#: postmaster/postmaster.c:2672
+#: postmaster/postmaster.c:2674
msgid "checkpointer process"
msgstr "processo di creazione checkpoint"
-#: postmaster/postmaster.c:2688
+#: postmaster/postmaster.c:2690
msgid "WAL writer process"
msgstr "processo di scrittura WAL"
-#: postmaster/postmaster.c:2702
+#: postmaster/postmaster.c:2704
msgid "WAL receiver process"
msgstr "processo di ricezione WAL"
-#: postmaster/postmaster.c:2717
+#: postmaster/postmaster.c:2719
msgid "autovacuum launcher process"
msgstr "processo del lanciatore di autovacuum"
-#: postmaster/postmaster.c:2732
+#: postmaster/postmaster.c:2734
msgid "archiver process"
msgstr "processo di archiviazione"
-#: postmaster/postmaster.c:2748
+#: postmaster/postmaster.c:2750
msgid "statistics collector process"
msgstr "processo del raccoglitore di statistiche"
-#: postmaster/postmaster.c:2762
+#: postmaster/postmaster.c:2764
msgid "system logger process"
msgstr "processo del logger di sistema"
-#: postmaster/postmaster.c:2824
+#: postmaster/postmaster.c:2826
msgid "worker process"
msgstr "processo di lavoro"
-#: postmaster/postmaster.c:2894 postmaster/postmaster.c:2913
-#: postmaster/postmaster.c:2920 postmaster/postmaster.c:2938
+#: postmaster/postmaster.c:2896 postmaster/postmaster.c:2915
+#: postmaster/postmaster.c:2922 postmaster/postmaster.c:2940
msgid "server process"
msgstr "processo del server"
-#: postmaster/postmaster.c:2974
+#: postmaster/postmaster.c:2976
#, c-format
msgid "terminating any other active server processes"
msgstr "interruzione di tutti gli altri processi attivi del server"
#. translator: %s is a noun phrase describing a child process, such as
#. "server process"
-#: postmaster/postmaster.c:3219
+#: postmaster/postmaster.c:3221
#, c-format
msgid "%s (PID %d) exited with exit code %d"
msgstr "%s (PID %d) è uscito con codice di uscita %d"
-#: postmaster/postmaster.c:3221 postmaster/postmaster.c:3232
-#: postmaster/postmaster.c:3243 postmaster/postmaster.c:3252
-#: postmaster/postmaster.c:3262
+#: postmaster/postmaster.c:3223 postmaster/postmaster.c:3234
+#: postmaster/postmaster.c:3245 postmaster/postmaster.c:3254
+#: postmaster/postmaster.c:3264
#, c-format
msgid "Failed process was running: %s"
msgstr "Il processo fallito stava eseguendo: %s"
#. translator: %s is a noun phrase describing a child process, such as
#. "server process"
-#: postmaster/postmaster.c:3229
+#: postmaster/postmaster.c:3231
#, c-format
msgid "%s (PID %d) was terminated by exception 0x%X"
msgstr "%s (PID %d) è stato terminato dall'eccezione 0x%X"
#. translator: %s is a noun phrase describing a child process, such as
#. "server process"
-#: postmaster/postmaster.c:3239
+#: postmaster/postmaster.c:3241
#, c-format
msgid "%s (PID %d) was terminated by signal %d: %s"
msgstr "%s (PID %d) è stato terminato dal segnale %d: %s"
#. translator: %s is a noun phrase describing a child process, such as
#. "server process"
-#: postmaster/postmaster.c:3250
+#: postmaster/postmaster.c:3252
#, c-format
msgid "%s (PID %d) was terminated by signal %d"
msgstr "%s (PID %d) è stato terminato dal segnale %d"
#. translator: %s is a noun phrase describing a child process, such as
#. "server process"
-#: postmaster/postmaster.c:3260
+#: postmaster/postmaster.c:3262
#, c-format
msgid "%s (PID %d) exited with unrecognized status %d"
msgstr "%s (PID %d) uscito con stato sconosciuto %d"
-#: postmaster/postmaster.c:3445
+#: postmaster/postmaster.c:3447
#, c-format
msgid "abnormal database system shutdown"
msgstr "spegnimento anormale del database"
-#: postmaster/postmaster.c:3484
+#: postmaster/postmaster.c:3486
#, c-format
msgid "all server processes terminated; reinitializing"
msgstr "tutti i processi server sono terminati; re-inizializzazione"
-#: postmaster/postmaster.c:3700
+#: postmaster/postmaster.c:3702
#, c-format
msgid "could not fork new process for connection: %m"
msgstr "fork del nuovo processo per la connessione fallito: %m"
-#: postmaster/postmaster.c:3742
+#: postmaster/postmaster.c:3744
msgid "could not fork new process for connection: "
msgstr "fork del nuovo processo per la connessione fallito: "
-#: postmaster/postmaster.c:3849
+#: postmaster/postmaster.c:3851
#, c-format
msgid "connection received: host=%s port=%s"
msgstr "connessione ricevuta: host=%s porta=%s"
-#: postmaster/postmaster.c:3854
+#: postmaster/postmaster.c:3856
#, c-format
msgid "connection received: host=%s"
msgstr "connessione ricevuta: host=%s"
-#: postmaster/postmaster.c:4129
+#: postmaster/postmaster.c:4131
#, c-format
msgid "could not execute server process \"%s\": %m"
msgstr "esecuzione del processo del server \"%s\" fallita: %m"
-#: postmaster/postmaster.c:4668
+#: postmaster/postmaster.c:4670
#, c-format
msgid "database system is ready to accept read only connections"
msgstr "il database è pronto ad accettare connessioni in sola lettura"
-#: postmaster/postmaster.c:4979
+#: postmaster/postmaster.c:4981
#, c-format
msgid "could not fork startup process: %m"
msgstr "fork del processo di avvio fallito: %m"
-#: postmaster/postmaster.c:4983
+#: postmaster/postmaster.c:4985
#, c-format
msgid "could not fork background writer process: %m"
msgstr "fork del processo di scrittura in background fallito: %m"
-#: postmaster/postmaster.c:4987
+#: postmaster/postmaster.c:4989
#, c-format
msgid "could not fork checkpointer process: %m"
msgstr "fork del processo di creazione dei checkpoint fallito: %m"
-#: postmaster/postmaster.c:4991
+#: postmaster/postmaster.c:4993
#, c-format
msgid "could not fork WAL writer process: %m"
msgstr "fork del processo di scrittura dei WAL fallito: %m"
-#: postmaster/postmaster.c:4995
+#: postmaster/postmaster.c:4997
#, c-format
msgid "could not fork WAL receiver process: %m"
msgstr "fork del processo di ricezione dei WAL fallito: %m"
-#: postmaster/postmaster.c:4999
+#: postmaster/postmaster.c:5001
#, c-format
msgid "could not fork process: %m"
msgstr "fork del processo fallito: %m"
-#: postmaster/postmaster.c:5178
+#: postmaster/postmaster.c:5180
#, c-format
msgid "registering background worker \"%s\""
msgstr "registrazione del processo di lavoro in background \"%s\""
-#: postmaster/postmaster.c:5185
+#: postmaster/postmaster.c:5187
#, c-format
msgid "background worker \"%s\": must be registered in shared_preload_libraries"
msgstr "processo di lavoro in background \"%s\": deve essere registrato in shared_preload_libraries"
-#: postmaster/postmaster.c:5198
+#: postmaster/postmaster.c:5200
#, c-format
msgid "background worker \"%s\": must attach to shared memory in order to be able to request a database connection"
msgstr "processo di lavoro in background \"%s\": deve essere attaccato alla memoria condivisa per poter richiedere una connessione di database"
-#: postmaster/postmaster.c:5208
+#: postmaster/postmaster.c:5210
#, c-format
msgid "background worker \"%s\": cannot request database access if starting at postmaster start"
msgstr "processo di lavoro in background \"%s\": non è possibile richiedere accesso al database se avviato all'avvio di postmaster"
-#: postmaster/postmaster.c:5223
+#: postmaster/postmaster.c:5225
#, c-format
msgid "background worker \"%s\": invalid restart interval"
msgstr "processo di lavoro in background \"%s\": intervallo di riavvio non valido"
-#: postmaster/postmaster.c:5239
+#: postmaster/postmaster.c:5241
#, c-format
msgid "too many background workers"
msgstr "troppi processi di lavoro in background"
-#: postmaster/postmaster.c:5240
+#: postmaster/postmaster.c:5242
#, c-format
msgid "Up to %d background worker can be registered with the current settings."
msgid_plural "Up to %d background workers can be registered with the current settings."
msgstr[0] "Le impostazioni correnti consentono la registrazione di un massimo di %d processi di lavoro in background."
msgstr[1] "Le impostazioni correnti consentono la registrazione di un massimo di %d processi di lavoro in background."
-#: postmaster/postmaster.c:5283
+#: postmaster/postmaster.c:5285
#, c-format
msgid "database connection requirement not indicated during registration"
msgstr "requisiti di connessione a database non indicati durante la registrazione"
-#: postmaster/postmaster.c:5290
+#: postmaster/postmaster.c:5292
#, c-format
msgid "invalid processing mode in background worker"
msgstr "modalità di processo non valida nel processo di lavoro in background"
-#: postmaster/postmaster.c:5364
+#: postmaster/postmaster.c:5366
#, c-format
msgid "terminating background worker \"%s\" due to administrator command"
msgstr "interruzione del processo di lavoro in background \"%s\" a causa di comando amministrativo"
-#: postmaster/postmaster.c:5581
+#: postmaster/postmaster.c:5583
#, c-format
msgid "starting background worker process \"%s\""
msgstr "avvio del processo di lavoro in background \"%s\""
-#: postmaster/postmaster.c:5592
+#: postmaster/postmaster.c:5594
#, c-format
msgid "could not fork worker process: %m"
msgstr "fork del processo di lavoro in background fallito: %m"
-#: postmaster/postmaster.c:5944
+#: postmaster/postmaster.c:5946
#, c-format
msgid "could not duplicate socket %d for use in backend: error code %d"
msgstr "duplicazione del socket %d da usare nel backend fallita: codice errore %d"
-#: postmaster/postmaster.c:5976
+#: postmaster/postmaster.c:5978
#, c-format
msgid "could not create inherited socket: error code %d\n"
msgstr "creazione del socket ereditato fallita: codice errore %d\n"
-#: postmaster/postmaster.c:6005 postmaster/postmaster.c:6012
+#: postmaster/postmaster.c:6007 postmaster/postmaster.c:6014
#, c-format
msgid "could not read from backend variables file \"%s\": %s\n"
msgstr "lettura dal file delle variabili del backend \"%s\" fallita: %s\n"
-#: postmaster/postmaster.c:6021
+#: postmaster/postmaster.c:6023
#, c-format
msgid "could not remove file \"%s\": %s\n"
msgstr "rimozione del file \"%s\" fallita: %s\n"
-#: postmaster/postmaster.c:6038
+#: postmaster/postmaster.c:6040
#, c-format
msgid "could not map view of backend variables: error code %lu\n"
msgstr "non è stato possibile mappare la vista delle variabili del backend: codice errore %lu\n"
-#: postmaster/postmaster.c:6047
+#: postmaster/postmaster.c:6049
#, c-format
msgid "could not unmap view of backend variables: error code %lu\n"
msgstr "non è stato possibile rimuovere la mappa della vista delle variabili del backend: codice errore %lu\n"
-#: postmaster/postmaster.c:6054
+#: postmaster/postmaster.c:6056
#, c-format
msgid "could not close handle to backend parameter variables: error code %lu\n"
msgstr "chiusura dell'handle dei parametri variabili del backend fallita: codice errore %lu\n"
-#: postmaster/postmaster.c:6210
+#: postmaster/postmaster.c:6212
#, c-format
msgid "could not read exit code for process\n"
msgstr "lettura del codice di uscita del processo fallita\n"
-#: postmaster/postmaster.c:6215
+#: postmaster/postmaster.c:6217
#, c-format
msgid "could not post child completion status\n"
msgstr "invio dello stato di completamento del figlio fallito\n"
@@ -12667,13 +12663,13 @@ msgstr "rotazione automatica disabilitata (usa SIGHUP per abilitarla di nuovo)"
msgid "could not determine which collation to use for regular expression"
msgstr "non è stato possibile determinare quale ordinamento usare per le espressioni regolari"
-#: replication/basebackup.c:135 replication/basebackup.c:893
+#: replication/basebackup.c:135 replication/basebackup.c:901
#: utils/adt/misc.c:360
#, c-format
msgid "could not read symbolic link \"%s\": %m"
msgstr "lettura del link simbolico \"%s\" fallita: %m"
-#: replication/basebackup.c:142 replication/basebackup.c:897
+#: replication/basebackup.c:142 replication/basebackup.c:905
#: utils/adt/misc.c:364
#, c-format
msgid "symbolic link \"%s\" target is too long"
@@ -12684,40 +12680,45 @@ msgstr "la destinazione del link simbolico \"%s\" è troppo lunga"
msgid "could not stat control file \"%s\": %m"
msgstr "non è stato possibile ottenere informazioni sul file di controllo \"%s\": %m"
-#: replication/basebackup.c:317 replication/basebackup.c:331
-#: replication/basebackup.c:340
+#: replication/basebackup.c:312
+#, c-format
+msgid "could not find any WAL files"
+msgstr "nessun file WAL trovato"
+
+#: replication/basebackup.c:325 replication/basebackup.c:339
+#: replication/basebackup.c:348
#, c-format
msgid "could not find WAL file \"%s\""
msgstr "file WAL \"%s\" non trovato"
-#: replication/basebackup.c:379 replication/basebackup.c:402
+#: replication/basebackup.c:387 replication/basebackup.c:410
#, c-format
msgid "unexpected WAL file size \"%s\""
msgstr "dimensione inaspettata del file WAL \"%s\""
-#: replication/basebackup.c:390 replication/basebackup.c:1011
+#: replication/basebackup.c:398 replication/basebackup.c:1019
#, c-format
msgid "base backup could not send data, aborting backup"
msgstr "invio dati da parte del backup di base fallito, backup interrotto"
-#: replication/basebackup.c:474 replication/basebackup.c:483
-#: replication/basebackup.c:492 replication/basebackup.c:501
-#: replication/basebackup.c:510
+#: replication/basebackup.c:482 replication/basebackup.c:491
+#: replication/basebackup.c:500 replication/basebackup.c:509
+#: replication/basebackup.c:518
#, c-format
msgid "duplicate option \"%s\""
msgstr "opzione duplicata \"%s\""
-#: replication/basebackup.c:763 replication/basebackup.c:847
+#: replication/basebackup.c:771 replication/basebackup.c:855
#, c-format
msgid "could not stat file or directory \"%s\": %m"
msgstr "non è stato possibile ottenere informazioni sul file o directory \"%s\": %m"
-#: replication/basebackup.c:947
+#: replication/basebackup.c:955
#, c-format
msgid "skipping special file \"%s\""
msgstr "file speciale \"%s\" saltato"
-#: replication/basebackup.c:1001
+#: replication/basebackup.c:1009
#, c-format
msgid "archive member \"%s\" too large for tar format"
msgstr "il membro \"%s\" dell'archivio è troppo grande per il formato tar"
@@ -13418,7 +13419,7 @@ msgstr "La dimensione di ShmemIndex è errata per la struttura di dati \"%s\": a
msgid "requested shared memory size overflows size_t"
msgstr "la dimensione richiesta di memoria condivisa supera size_t"
-#: storage/ipc/standby.c:499 tcop/postgres.c:2936
+#: storage/ipc/standby.c:499 tcop/postgres.c:2943
#, c-format
msgid "canceling statement due to conflict with recovery"
msgstr "annullamento dell'istruzione a causa di un conflitto con il ripristino"
@@ -13428,17 +13429,17 @@ msgstr "annullamento dell'istruzione a causa di un conflitto con il ripristino"
msgid "User transaction caused buffer deadlock with recovery."
msgstr "La transazione utente ha causato un deadlock del buffer con il ripristino."
-#: storage/large_object/inv_api.c:270
+#: storage/large_object/inv_api.c:259
#, c-format
msgid "invalid flags for opening a large object: %d"
msgstr "flag non validi per l'apertura di un large object: %d"
-#: storage/large_object/inv_api.c:410
+#: storage/large_object/inv_api.c:418
#, c-format
msgid "invalid whence setting: %d"
msgstr "impostazione \"da dove\" non valida: %d"
-#: storage/large_object/inv_api.c:573
+#: storage/large_object/inv_api.c:581
#, c-format
msgid "invalid large object write request size: %d"
msgstr "dimensione della richiesta di scrittura large object non valida: %d"
@@ -13808,7 +13809,7 @@ msgid "incorrect binary data format in function argument %d"
msgstr "formato dei dati binari non corretto nell'argomento %d della funzione"
#: tcop/postgres.c:426 tcop/postgres.c:438 tcop/postgres.c:449
-#: tcop/postgres.c:461 tcop/postgres.c:4223
+#: tcop/postgres.c:461 tcop/postgres.c:4230
#, c-format
msgid "invalid frontend message type %d"
msgstr "messaggio frontend di tipo %d non valido"
@@ -13931,137 +13932,137 @@ msgstr "L'utente potrebbe aver avuto bisogno di vedere versioni di righe che dev
msgid "User was connected to a database that must be dropped."
msgstr "L'utente era connesso ad un database che deve essere eliminato."
-#: tcop/postgres.c:2542
+#: tcop/postgres.c:2549
#, c-format
msgid "terminating connection because of crash of another server process"
msgstr "la connessione è stata terminata a causa del crash di un altro processo del server"
-#: tcop/postgres.c:2543
+#: tcop/postgres.c:2550
#, c-format
msgid "The postmaster has commanded this server process to roll back the current transaction and exit, because another server process exited abnormally and possibly corrupted shared memory."
msgstr "Il postmaster ha obbligato questo processo del server di attuare il roll back della transazione corrente e di uscire, perché un altro processo del server è terminato anormalmente e con possibile corruzione della memoria condivisa."
-#: tcop/postgres.c:2547 tcop/postgres.c:2931
+#: tcop/postgres.c:2554 tcop/postgres.c:2938
#, c-format
msgid "In a moment you should be able to reconnect to the database and repeat your command."
msgstr "In un momento sarai in grado di riconnetterti al database e di ripetere il comando."
-#: tcop/postgres.c:2660
+#: tcop/postgres.c:2667
#, c-format
msgid "floating-point exception"
msgstr "eccezione floating-point"
-#: tcop/postgres.c:2661
+#: tcop/postgres.c:2668
#, c-format
msgid "An invalid floating-point operation was signaled. This probably means an out-of-range result or an invalid operation, such as division by zero."
msgstr "Un'operazione in floating-point non valida è stata segnalata. Questo probabilmente sta a significare che il risultato è un valore fuori limite o l'operazione non è valida, ad esempio una divisione per zero."
-#: tcop/postgres.c:2835
+#: tcop/postgres.c:2842
#, c-format
msgid "terminating autovacuum process due to administrator command"
msgstr "interruzione del processo autovacuum su comando dell'amministratore"
-#: tcop/postgres.c:2841 tcop/postgres.c:2851 tcop/postgres.c:2929
+#: tcop/postgres.c:2848 tcop/postgres.c:2858 tcop/postgres.c:2936
#, c-format
msgid "terminating connection due to conflict with recovery"
msgstr "interruzione della connessione a causa di conflitto con il ripristino"
-#: tcop/postgres.c:2857
+#: tcop/postgres.c:2864
#, c-format
msgid "terminating connection due to administrator command"
msgstr "interruzione della connessione su comando dell'amministratore"
-#: tcop/postgres.c:2869
+#: tcop/postgres.c:2876
#, c-format
msgid "connection to client lost"
msgstr "connessione al client persa"
-#: tcop/postgres.c:2884
+#: tcop/postgres.c:2891
#, c-format
msgid "canceling authentication due to timeout"
msgstr "annullamento dell'autenticazione a causa di timeout"
-#: tcop/postgres.c:2899
+#: tcop/postgres.c:2906
#, c-format
msgid "canceling statement due to lock timeout"
msgstr "annullamento dell'istruzione a causa di timeout di lock"
-#: tcop/postgres.c:2908
+#: tcop/postgres.c:2915
#, c-format
msgid "canceling statement due to statement timeout"
msgstr "annullamento dell'istruzione a causa di timeout"
-#: tcop/postgres.c:2917
+#: tcop/postgres.c:2924
#, c-format
msgid "canceling autovacuum task"
msgstr "annullamento del task di autovacuum"
-#: tcop/postgres.c:2952
+#: tcop/postgres.c:2959
#, c-format
msgid "canceling statement due to user request"
msgstr "annullamento dell'istruzione su richiesta dell'utente"
-#: tcop/postgres.c:3080 tcop/postgres.c:3102
+#: tcop/postgres.c:3087 tcop/postgres.c:3109
#, c-format
msgid "stack depth limit exceeded"
msgstr "limite di profondità dello stack superato"
-#: tcop/postgres.c:3081 tcop/postgres.c:3103
+#: tcop/postgres.c:3088 tcop/postgres.c:3110
#, c-format
msgid "Increase the configuration parameter \"max_stack_depth\" (currently %dkB), after ensuring the platform's stack depth limit is adequate."
msgstr "Incrementa il parametro di configurazione \"max_stack_depth\" (attualmente %dkB), dopo esserti assicurato che il limite dello stack della piattaforma sia adeguato."
-#: tcop/postgres.c:3119
+#: tcop/postgres.c:3126
#, c-format
msgid "\"max_stack_depth\" must not exceed %ldkB."
msgstr "\"max_stack_depth\" non deve superare %ldkB"
-#: tcop/postgres.c:3121
+#: tcop/postgres.c:3128
#, c-format
msgid "Increase the platform's stack depth limit via \"ulimit -s\" or local equivalent."
msgstr "Incrementa il limite dello stack della piattaforma usando \"ulimit -s\" on un comando equivalente."
-#: tcop/postgres.c:3485
+#: tcop/postgres.c:3492
#, c-format
msgid "invalid command-line argument for server process: %s"
msgstr "argomento della riga di comando non valido per il processo server: %s"
-#: tcop/postgres.c:3486 tcop/postgres.c:3492
+#: tcop/postgres.c:3493 tcop/postgres.c:3499
#, c-format
msgid "Try \"%s --help\" for more information."
msgstr "Prova \"%s --help\" per maggiori informazioni."
-#: tcop/postgres.c:3490
+#: tcop/postgres.c:3497
#, c-format
msgid "%s: invalid command-line argument: %s"
msgstr "%s: argomento della riga di comando non valido: %s"
-#: tcop/postgres.c:3577
+#: tcop/postgres.c:3584
#, c-format
msgid "%s: no database nor user name specified"
msgstr "%s: nessun database né nome utente specificato"
-#: tcop/postgres.c:4131
+#: tcop/postgres.c:4138
#, c-format
msgid "invalid CLOSE message subtype %d"
msgstr "sottotipo %d del messaggio CLOSE non valido"
-#: tcop/postgres.c:4166
+#: tcop/postgres.c:4173
#, c-format
msgid "invalid DESCRIBE message subtype %d"
msgstr "sottotipo %d del messaggio DESCRIBE non valido"
-#: tcop/postgres.c:4244
+#: tcop/postgres.c:4251
#, c-format
msgid "fastpath function calls not supported in a replication connection"
msgstr "le chiamate di funzione fastpath non sono supportate in una connessione di replica"
-#: tcop/postgres.c:4248
+#: tcop/postgres.c:4255
#, c-format
msgid "extended query protocol not supported in a replication connection"
msgstr "il protocollo di query esteso non è supportato in una connessione di replica"
-#: tcop/postgres.c:4418
+#: tcop/postgres.c:4425
#, c-format
msgid "disconnection: session time: %d:%02d:%02d.%03d user=%s database=%s host=%s%s%s"
msgstr "disconnessione: tempo della sessione: %d:%02d:%02d.%03d utente=%s database=%s host=%s%s%s"
@@ -14624,7 +14625,7 @@ msgstr "in questo contesto non è consentito un elemento di array nullo"
msgid "cannot compare arrays of different element types"
msgstr "non è possibile confrontare array con elementi di tipo diverso"
-#: utils/adt/arrayfuncs.c:3568 utils/adt/rangetypes.c:1206
+#: utils/adt/arrayfuncs.c:3568 utils/adt/rangetypes.c:1212
#, c-format
msgid "could not identify a hash function for type %s"
msgstr "non è stato possibile trovare una funzione di hash per il tipo %s"
@@ -16105,57 +16106,57 @@ msgstr "il risultato della differenza di intervalli non sarebbe continuo"
msgid "result of range union would not be contiguous"
msgstr "il risultato dell'unione di intervalli non sarebbe continuo"
-#: utils/adt/rangetypes.c:1496
+#: utils/adt/rangetypes.c:1502
#, c-format
msgid "range lower bound must be less than or equal to range upper bound"
msgstr "il limite inferiore dell'intervallo dev'essere minore o uguale del limite superiore"
-#: utils/adt/rangetypes.c:1879 utils/adt/rangetypes.c:1892
-#: utils/adt/rangetypes.c:1906
+#: utils/adt/rangetypes.c:1885 utils/adt/rangetypes.c:1898
+#: utils/adt/rangetypes.c:1912
#, c-format
msgid "invalid range bound flags"
msgstr "flag di limiti dell'intervallo non valido"
-#: utils/adt/rangetypes.c:1880 utils/adt/rangetypes.c:1893
-#: utils/adt/rangetypes.c:1907
+#: utils/adt/rangetypes.c:1886 utils/adt/rangetypes.c:1899
+#: utils/adt/rangetypes.c:1913
#, c-format
msgid "Valid values are \"[]\", \"[)\", \"(]\", and \"()\"."
msgstr "I valori validi sono \"[]\", \"[)\", \"(]\" e \"()\"."
-#: utils/adt/rangetypes.c:1972 utils/adt/rangetypes.c:1989
-#: utils/adt/rangetypes.c:2002 utils/adt/rangetypes.c:2020
-#: utils/adt/rangetypes.c:2031 utils/adt/rangetypes.c:2075
-#: utils/adt/rangetypes.c:2083
+#: utils/adt/rangetypes.c:1978 utils/adt/rangetypes.c:1995
+#: utils/adt/rangetypes.c:2008 utils/adt/rangetypes.c:2026
+#: utils/adt/rangetypes.c:2037 utils/adt/rangetypes.c:2081
+#: utils/adt/rangetypes.c:2089
#, c-format
msgid "malformed range literal: \"%s\""
msgstr "letterale di intervallo non definito correttamente: \"%s\""
-#: utils/adt/rangetypes.c:1974
+#: utils/adt/rangetypes.c:1980
#, c-format
msgid "Junk after \"empty\" key word."
msgstr "Dati spuri dopo la parola chiave \"empty\"."
-#: utils/adt/rangetypes.c:1991
+#: utils/adt/rangetypes.c:1997
#, c-format
msgid "Missing left parenthesis or bracket."
msgstr "Manca la parentesi aperta."
-#: utils/adt/rangetypes.c:2004
+#: utils/adt/rangetypes.c:2010
#, c-format
msgid "Missing comma after lower bound."
msgstr "Manca la virgola dopo il limite inferiore."
-#: utils/adt/rangetypes.c:2022
+#: utils/adt/rangetypes.c:2028
#, c-format
msgid "Too many commas."
msgstr "Troppe virgole."
-#: utils/adt/rangetypes.c:2033
+#: utils/adt/rangetypes.c:2039
#, c-format
msgid "Junk after right parenthesis or bracket."
msgstr "Caratteri spuri dopo la parentesi chiusa."
-#: utils/adt/rangetypes.c:2077 utils/adt/rangetypes.c:2085
+#: utils/adt/rangetypes.c:2083 utils/adt/rangetypes.c:2091
#: utils/adt/rowtypes.c:206 utils/adt/rowtypes.c:214
#, c-format
msgid "Unexpected end of input."
@@ -16949,7 +16950,7 @@ msgstr "nessuna funzione di input disponibile per il tipo %s"
msgid "no output function available for type %s"
msgstr "nessuna funzione di output disponibile per il tipo %s"
-#: utils/cache/plancache.c:695
+#: utils/cache/plancache.c:696
#, c-format
msgid "cached plan must not change result type"
msgstr "il cached plan non deve cambiare il tipo del risultato"
@@ -17382,11 +17383,6 @@ msgstr "Potrebbe essere necessario eseguire initdb."
msgid "The data directory was initialized by PostgreSQL version %ld.%ld, which is not compatible with this version %s."
msgstr "La directory dati è stata inizializzata da PostgreSQL versione %ld.%ld, che non è compatibile con questa versione %s."
-#: utils/init/miscinit.c:1259
-#, c-format
-msgid "invalid list syntax in parameter \"%s\""
-msgstr "sintassi di lista non valida nel parametro \"%s\""
-
#: utils/init/miscinit.c:1296
#, c-format
msgid "loaded library \"%s\""
diff --git a/src/backend/po/zh_TW.po b/src/backend/po/zh_TW.po
index e8770437f3..cae113b811 100644
--- a/src/backend/po/zh_TW.po
+++ b/src/backend/po/zh_TW.po
@@ -9,10 +9,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-12 00:49+0000\n"
-"PO-Revision-Date: 2011-05-16 13:37+0800\n"
+"PO-Revision-Date: 2013-09-03 23:24-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
-"Language: \n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/initdb/po/cs.po b/src/bin/initdb/po/cs.po
index a5b0337c8c..a4c4075944 100644
--- a/src/bin/initdb/po/cs.po
+++ b/src/bin/initdb/po/cs.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: postgresql-8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:47+0000\n"
-"PO-Revision-Date: 2013-03-17 21:26+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:19+0000\n"
+"PO-Revision-Date: 2013-09-24 20:25+0200\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -129,108 +129,108 @@ msgstr "potomek byl ukončen signálem %d"
msgid "child process exited with unrecognized status %d"
msgstr "potomek skončil s nerozponaným stavem %d"
-#: initdb.c:325
+#: initdb.c:327
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: nedostatek paměti\n"
-#: initdb.c:435 initdb.c:1538
+#: initdb.c:437 initdb.c:1543
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: nelze otevřít soubor \"%s\" pro čtení: %s\n"
-#: initdb.c:491 initdb.c:1033 initdb.c:1062
+#: initdb.c:493 initdb.c:1036 initdb.c:1065
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: nelze otevřít soubor \"%s\" pro zápis: %s\n"
-#: initdb.c:499 initdb.c:507 initdb.c:1040 initdb.c:1068
+#: initdb.c:501 initdb.c:509 initdb.c:1043 initdb.c:1071
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
-#: initdb.c:529
+#: initdb.c:531
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s : nelze otevřít adresář \"%s\": %s\n"
-#: initdb.c:546
+#: initdb.c:548
#, c-format
msgid "%s: could not stat file \"%s\": %s\n"
msgstr "%s: nelze provést stat souboru \"%s\": %s\n"
-#: initdb.c:568
+#: initdb.c:571
#, c-format
msgid "%s: could not read directory \"%s\": %s\n"
msgstr "%s: nelze načíst adresář \"%s\": %s\n"
-#: initdb.c:605 initdb.c:657
+#: initdb.c:608 initdb.c:660
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: nelze otevřít soubor \"%s\": %s\n"
-#: initdb.c:673
+#: initdb.c:676
#, c-format
msgid "%s: could not fsync file \"%s\": %s\n"
msgstr "%s: nelze provést fsync souboru \"%s\": %s\n"
-#: initdb.c:694
+#: initdb.c:697
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: nelze vykonat příkaz \"%s\": %s\n"
-#: initdb.c:710
+#: initdb.c:713
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: odstraňuji datový adresář \"%s\"\n"
-#: initdb.c:713
+#: initdb.c:716
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: selhalo odstranění datového adresáře\n"
-#: initdb.c:719
+#: initdb.c:722
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: odstraňuji obsah datového adresáře \"%s\"\n"
-#: initdb.c:722
+#: initdb.c:725
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: selhalo odstranění obsahu datového adresáře\n"
-#: initdb.c:728
+#: initdb.c:731
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: odstraňuji adresář s transakčním logem \"%s\"\n"
-#: initdb.c:731
+#: initdb.c:734
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: selhalo odstraňení adresáře s transakčním logem\n"
-#: initdb.c:737
+#: initdb.c:740
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: odstraňuji obsah adresáře s transakčním logem \"%s\"\n"
-#: initdb.c:740
+#: initdb.c:743
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: selhalo odstranění obsahu adresáře s transakčním logem\n"
-#: initdb.c:749
+#: initdb.c:752
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: datový adresář \"%s\" nebyl na žádost uživatele odstraněn\n"
-#: initdb.c:754
+#: initdb.c:757
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr ""
"%s: adresář s transakčním logem \"%s\" nebyl na žádost uživatele odstraněn\n"
-#: initdb.c:776
+#: initdb.c:779
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -241,32 +241,32 @@ msgstr ""
"Prosím přihlaste se jako (neprivilegovaný) uživatel, který bude vlastníkem\n"
"serverového procesu (například pomocí příkazu \"su\").\n"
-#: initdb.c:788
+#: initdb.c:791
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: nelze získat informace o aktualním uživateli: %s\n"
-#: initdb.c:805
+#: initdb.c:808
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: nelze získat jméno aktuálního uživatele: %s\n"
-#: initdb.c:836
+#: initdb.c:839
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: \"%s\" není platný název kódování znaků\n"
-#: initdb.c:953 initdb.c:3238
+#: initdb.c:956 initdb.c:3246
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: nelze vytvořít adresář \"%s\": %s\n"
-#: initdb.c:983
+#: initdb.c:986
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: soubor \"%s\" neexistuje\n"
-#: initdb.c:985 initdb.c:994 initdb.c:1004
+#: initdb.c:988 initdb.c:997 initdb.c:1007
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -275,36 +275,36 @@ msgstr ""
"To znamená, že vaše instalace je poškozena, nebo jste\n"
"zadal chybný adresář v parametru -L při spuštění.\n"
-#: initdb.c:991
+#: initdb.c:994
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: nelze přistupit k souboru \"%s\": %s\n"
-#: initdb.c:1002
+#: initdb.c:1005
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: soubor \"%s\" není běžný soubor\n"
-#: initdb.c:1110
+#: initdb.c:1113
#, c-format
msgid "selecting default max_connections ... "
msgstr "vybírám implicitní nastavení max_connections ... "
-#: initdb.c:1139
+#: initdb.c:1142
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "vybírám implicitní nastavení shared_buffers ... "
-#: initdb.c:1183
+#: initdb.c:1186
msgid "creating configuration files ... "
msgstr "vytvářím konfigurační soubory ... "
-#: initdb.c:1378
+#: initdb.c:1381
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "vytvářím databázi template1 v %s/base/1 ... "
-#: initdb.c:1394
+#: initdb.c:1397
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -314,142 +314,142 @@ msgstr ""
"Zkontrolujte si vaši instalaci nebo zadejte platnou cestu pomocí\n"
"parametru -L.\n"
-#: initdb.c:1479
+#: initdb.c:1484
msgid "initializing pg_authid ... "
msgstr "inicializuji pg_authid ... "
-#: initdb.c:1513
+#: initdb.c:1518
msgid "Enter new superuser password: "
msgstr "Zadejte nové heslo pro superuživatele: "
-#: initdb.c:1514
+#: initdb.c:1519
msgid "Enter it again: "
msgstr "Zadejte ho znovu: "
-#: initdb.c:1517
+#: initdb.c:1522
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Hesla nesouhlasí.\n"
-#: initdb.c:1544
+#: initdb.c:1549
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: nemohu přečíst heslo ze souboru \"%s\": %s\n"
-#: initdb.c:1557
+#: initdb.c:1562
#, c-format
msgid "setting password ... "
msgstr "nastavuji heslo ... "
-#: initdb.c:1657
+#: initdb.c:1662
msgid "initializing dependencies ... "
msgstr "inicializuji závislosti ... "
-#: initdb.c:1685
+#: initdb.c:1690
msgid "creating system views ... "
msgstr "vytvářím systémové pohledy ... "
-#: initdb.c:1721
+#: initdb.c:1726
msgid "loading system objects' descriptions ... "
msgstr "nahrávám popisy systémových objektů ... "
-#: initdb.c:1827
+#: initdb.c:1832
msgid "creating collations ... "
msgstr "vytvářím collations ... "
-#: initdb.c:1860
+#: initdb.c:1865
#, c-format
msgid "%s: locale name too long, skipped: \"%s\"\n"
msgstr "%s: jméno locale je příliš dlouhé, přeskakuji: %s\n"
-#: initdb.c:1885
+#: initdb.c:1890
#, c-format
msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
msgstr "%s: jméno locale obsahuje ne-ASCII znaky, přeskakuji: %s\n"
-#: initdb.c:1948
+#: initdb.c:1953
#, c-format
msgid "No usable system locales were found.\n"
msgstr ""
"Nebylo nalezené žádné použitelné systémové nárovní nastavení (locales).\n"
-#: initdb.c:1949
+#: initdb.c:1954
#, c-format
msgid "Use the option \"--debug\" to see details.\n"
msgstr "Pro více detailů použijte volbu \"--debug\".\n"
-#: initdb.c:1952
+#: initdb.c:1957
#, c-format
msgid "not supported on this platform\n"
msgstr "na této platformě není podporováno\n"
-#: initdb.c:1967
+#: initdb.c:1972
msgid "creating conversions ... "
msgstr "vytvářím konverze ... "
-#: initdb.c:2002
+#: initdb.c:2007
msgid "creating dictionaries ... "
msgstr "vytvářím adresáře ... "
-#: initdb.c:2056
+#: initdb.c:2061
msgid "setting privileges on built-in objects ... "
msgstr "nastavuji oprávnění pro vestavěné objekty ... "
-#: initdb.c:2114
+#: initdb.c:2119
msgid "creating information schema ... "
msgstr "vytvářím informační schéma ... "
-#: initdb.c:2170
+#: initdb.c:2175
msgid "loading PL/pgSQL server-side language ... "
msgstr "načítám PL/pgSQL jazyk ... "
-#: initdb.c:2195
+#: initdb.c:2200
msgid "vacuuming database template1 ... "
msgstr "pouštím VACUUM na databázi template1 ... "
-#: initdb.c:2251
+#: initdb.c:2256
msgid "copying template1 to template0 ... "
msgstr "kopíruji template1 do template0 ... "
-#: initdb.c:2283
+#: initdb.c:2288
msgid "copying template1 to postgres ... "
msgstr "kopíruji template1 do postgres ... "
-#: initdb.c:2309
+#: initdb.c:2314
msgid "syncing data to disk ... "
msgstr "zapisuji data na disk ... "
-#: initdb.c:2381
+#: initdb.c:2386
#, c-format
msgid "caught signal\n"
msgstr "signál obdržen\n"
-#: initdb.c:2387
+#: initdb.c:2392
#, c-format
msgid "could not write to child process: %s\n"
msgstr "nemohu zapsat do potomka: %s\n"
-#: initdb.c:2395
+#: initdb.c:2400
#, c-format
msgid "ok\n"
msgstr "ok\n"
-#: initdb.c:2498
+#: initdb.c:2503
#, c-format
msgid "%s: failed to restore old locale \"%s\"\n"
msgstr "%s: selhala obnova původní locale \"%s\"\n"
-#: initdb.c:2504
+#: initdb.c:2509
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: neplatný název národního nastavení (locale) \"%s\"\n"
-#: initdb.c:2531
+#: initdb.c:2536
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: nesouhlasí kódování znaků\n"
-#: initdb.c:2533
+#: initdb.c:2538
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -464,32 +464,32 @@ msgstr ""
"spusťte znovu %s a buď nespecifikujte kódování znaků explicitně, nebo\n"
"vyberte takovou kombinaci, která si odpovídá.\n"
-#: initdb.c:2652
+#: initdb.c:2657
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: WARNING: na této platformě nelze vytvářet vyhrazené tokeny\n"
-#: initdb.c:2661
+#: initdb.c:2666
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s: nelze otevřít token procesu: chybový kód %lu\n"
-#: initdb.c:2674
+#: initdb.c:2679
#, c-format
msgid "%s: could not to allocate SIDs: error code %lu\n"
msgstr "%s: nelze alokovat SIDs: chybový kód %lu\n"
-#: initdb.c:2693
+#: initdb.c:2698
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: nelze vytvořit vyhrazený token: chybový kód %lu\n"
-#: initdb.c:2714
+#: initdb.c:2719
#, c-format
msgid "%s: could not start process for command \"%s\": error code %lu\n"
msgstr "%s: nelze nastartovat proces pro příkaz \"%s\": chybový kód %lu\n"
-#: initdb.c:2728
+#: initdb.c:2733
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -498,17 +498,17 @@ msgstr ""
"%s inicializuji PostgreSQL klastr\n"
"\n"
-#: initdb.c:2729
+#: initdb.c:2734
#, c-format
msgid "Usage:\n"
msgstr "Použití:\n"
-#: initdb.c:2730
+#: initdb.c:2735
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [PŘEPÍNAČ]... [DATAADR]\n"
-#: initdb.c:2731
+#: initdb.c:2736
#, c-format
msgid ""
"\n"
@@ -517,7 +517,7 @@ msgstr ""
"\n"
"Přepínače:\n"
-#: initdb.c:2732
+#: initdb.c:2737
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
@@ -525,7 +525,7 @@ msgid ""
msgstr ""
" -A, --auth=METODA výchozí autentizační metoda pro lokální spojení\n"
-#: initdb.c:2733
+#: initdb.c:2738
#, c-format
msgid ""
" --auth-host=METHOD default authentication method for local TCP/IP "
@@ -534,7 +534,7 @@ msgstr ""
" --auth-host=METHOD výchozí autentikační metoda pro lokální TCP/IP "
"spojení\n"
-#: initdb.c:2734
+#: initdb.c:2739
#, c-format
msgid ""
" --auth-local=METHOD default authentication method for local-socket "
@@ -543,25 +543,25 @@ msgstr ""
" --auth-local=METHOD výchozí autentikační metoda pro spojení pro "
"lokální socket\n"
-#: initdb.c:2735
+#: initdb.c:2740
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " [-D, --pgdata=]DATAADR umístění tohoto databázového klastru\n"
-#: initdb.c:2736
+#: initdb.c:2741
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr ""
" -E, --encoding=KÓDOVÁNÍ nastavení výchozího kódování pro nové databáze\n"
-#: initdb.c:2737
+#: initdb.c:2742
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr ""
" --locale=LOCALE nastavení implicitního národního nastavení pro "
"novou databázi\n"
-#: initdb.c:2738
+#: initdb.c:2743
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -576,12 +576,12 @@ msgstr ""
" v příslušných kategoriích (výchozí hodnoty se \n"
" vezmou z nastavení prostředí)\n"
-#: initdb.c:2742
+#: initdb.c:2747
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale ekvivalent --locale=C\n"
-#: initdb.c:2743
+#: initdb.c:2748
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
@@ -589,7 +589,7 @@ msgstr ""
" --pwfile=SOUBOR načti heslo pro nového superuživatele ze "
"souboru\n"
-#: initdb.c:2744
+#: initdb.c:2749
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -599,25 +599,25 @@ msgstr ""
" implicitní configurace fulltextového "
"vyhledávání\n"
-#: initdb.c:2746
+#: initdb.c:2751
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=JMÉNO jméno databázového superuživatele\n"
-#: initdb.c:2747
+#: initdb.c:2752
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
msgstr ""
" -W, --pwprompt zeptej se na heslo pro nového superuživatele\n"
-#: initdb.c:2748
+#: initdb.c:2753
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr " -X, --xlogdir=XLOGDIR umístění adresáře s transakčním logem\n"
-#: initdb.c:2749
+#: initdb.c:2754
#, c-format
msgid ""
"\n"
@@ -626,39 +626,44 @@ msgstr ""
"\n"
"Méně často používané přepínače:\n"
-#: initdb.c:2750
+#: initdb.c:2755
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug generuj spoustu ladicích informací\n"
-#: initdb.c:2751
+#: initdb.c:2756
+#, c-format
+msgid " -k, --data-checksums use data page checksums\n"
+msgstr " -k, --data-checksums použij kontrolní součty datových stránek\n"
+
+#: initdb.c:2757
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L DIRECTORY kde se nalézají vstupní soubory\n"
-#: initdb.c:2752
+#: initdb.c:2758
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean neuklízet po chybě\n"
-#: initdb.c:2753
+#: initdb.c:2759
#, c-format
msgid ""
" -N, --nosync do not wait for changes to be written safely to "
"disk\n"
msgstr " -N, --nosync nečekat na bezpečné zapsání změn na disk\n"
-#: initdb.c:2754
+#: initdb.c:2760
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show ukaž interní nastavení\n"
-#: initdb.c:2755
+#: initdb.c:2761
#, c-format
msgid " -S, --sync-only only sync data directory\n"
msgstr " -S, --sync-only pouze provést sync datového adresáře\n"
-#: initdb.c:2756
+#: initdb.c:2762
#, c-format
msgid ""
"\n"
@@ -667,17 +672,17 @@ msgstr ""
"\n"
"Ostatní přepínače:\n"
-#: initdb.c:2757
+#: initdb.c:2763
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version vypiš informace o verzi, potom skonči\n"
-#: initdb.c:2758
+#: initdb.c:2764
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help ukaž tuto nápovědu, potom skonči\n"
-#: initdb.c:2759
+#: initdb.c:2765
#, c-format
msgid ""
"\n"
@@ -688,7 +693,7 @@ msgstr ""
"Pokud není specifikován datový adresář, použije se proměnná\n"
"prostředí PGDATA.\n"
-#: initdb.c:2761
+#: initdb.c:2767
#, c-format
msgid ""
"\n"
@@ -697,7 +702,7 @@ msgstr ""
"\n"
"Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
-#: initdb.c:2769
+#: initdb.c:2775
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -709,29 +714,29 @@ msgstr ""
"Toto můžete změnit upravením pg_hba.conf nebo použitím volby -A,\n"
"nebo --auth-local a --auth-host, při dalším spuštění initdb.\n"
-#: initdb.c:2791
+#: initdb.c:2797
#, c-format
msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
msgstr "%s: neplatná autentikační metoda \"%s\" pro \"%s\" spojení\n"
-#: initdb.c:2805
+#: initdb.c:2811
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
msgstr ""
"%s: musíte zadat heslo superuživatele pro použití autentizace typu %s.\n"
-#: initdb.c:2837
+#: initdb.c:2844
#, c-format
msgid "%s: could not re-execute with restricted token: error code %lu\n"
msgstr "%s: nelze znovu spustit s vyhrazeným tokenem: chybový kód %lu\n"
-#: initdb.c:2852
+#: initdb.c:2859
#, c-format
msgid "%s: could not get exit code from subprocess: error code %lu\n"
msgstr "%s: nelze získat návratový kód z podprovesu: chybový kód %lu\n"
-#: initdb.c:2877
+#: initdb.c:2885
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -744,7 +749,7 @@ msgstr ""
"Učiňte tak buď použitím přepínače -D nebo nastavením proměnné\n"
"prostředí PGDATA.\n"
-#: initdb.c:2916
+#: initdb.c:2924
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -755,7 +760,7 @@ msgstr ""
"adresáři jako \"%s\".\n"
"Zkontrolujte vaši instalaci.\n"
-#: initdb.c:2923
+#: initdb.c:2931
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -766,17 +771,17 @@ msgstr ""
"ale nebyl ve stejné verzi jako %s.\n"
"Zkontrolujte vaši instalaci.\n"
-#: initdb.c:2942
+#: initdb.c:2950
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: cesta k umístění vstupního souboru musí být absolutní\n"
-#: initdb.c:2961
+#: initdb.c:2969
#, c-format
msgid "The database cluster will be initialized with locale \"%s\".\n"
msgstr "Databázový klastr bude inicializován s locale %s.\n"
-#: initdb.c:2964
+#: initdb.c:2972
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -795,22 +800,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:2988
+#: initdb.c:2996
#, c-format
msgid "%s: could not find suitable encoding for locale \"%s\"\n"
msgstr "%s: nemohu najít vhodné kódování pro locale %s\n"
-#: initdb.c:2990
+#: initdb.c:2998
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "Spusťte znovu %s s přepínačem -E.\n"
-#: initdb.c:2991 initdb.c:3548 initdb.c:3569
+#: initdb.c:2999 initdb.c:3561 initdb.c:3582
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Zkuste \"%s --help\" pro více informací.\n"
-#: initdb.c:3003
+#: initdb.c:3011
#, c-format
msgid ""
"Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -819,12 +824,12 @@ msgstr ""
"Kódování %s vyplývající z locale není povoleno jako kódování na serveru.\n"
"Implicitní kódování databáze bude nastaveno na %s.\n"
-#: initdb.c:3011
+#: initdb.c:3019
#, c-format
msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
msgstr "%s: národní prostředí %s vyžaduje nepodporované kódování %s\n"
-#: initdb.c:3014
+#: initdb.c:3022
#, c-format
msgid ""
"Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -833,19 +838,19 @@ msgstr ""
"Kódování %s není povoleno jako kódování na serveru.\n"
"Pusťte znovu %s s jiným nastavením locale.\n"
-#: initdb.c:3023
+#: initdb.c:3031
#, c-format
msgid "The default database encoding has accordingly been set to \"%s\".\n"
msgstr ""
"Výchozí kódování pro databáze bylo odpovídajícím způsobem nastaveno na %s.\n"
-#: initdb.c:3094
+#: initdb.c:3102
#, c-format
msgid ""
"%s: could not find suitable text search configuration for locale \"%s\"\n"
msgstr "%s: nemohu najít vhodnou konfiguraci fulltextového vyhledávání %s\n"
-#: initdb.c:3105
+#: initdb.c:3113
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale \"%s\" is "
@@ -854,7 +859,7 @@ msgstr ""
"%s: varování: vhodná konfigurace fulltextového vyhledávání pro locale %s "
"není známa\n"
-#: initdb.c:3110
+#: initdb.c:3118
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
@@ -863,33 +868,33 @@ msgstr ""
"%s: varování: zvolená konfigurace fulltextového vyhledávání \"%s\" nemusí "
"souhlasit s locale %s\n"
-#: initdb.c:3115
+#: initdb.c:3123
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr ""
"Implicitní konfigurace fulltextového vyhledávání bude nastavena na \"%s\".\n"
-#: initdb.c:3154 initdb.c:3232
+#: initdb.c:3162 initdb.c:3240
#, c-format
msgid "creating directory %s ... "
msgstr "vytvářím adresář %s ... "
-#: initdb.c:3168 initdb.c:3250
+#: initdb.c:3176 initdb.c:3258
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "opravuji oprávnění pro existující adresář %s ... "
-#: initdb.c:3174 initdb.c:3256
+#: initdb.c:3182 initdb.c:3264
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: nelze změnit práva adresáře \"%s\": %s\n"
-#: initdb.c:3189 initdb.c:3271
+#: initdb.c:3197 initdb.c:3279
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: adresář \"%s\" existuje, ale není prázdný\n"
-#: initdb.c:3195
+#: initdb.c:3203
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -900,17 +905,17 @@ msgstr ""
"vyprázdněte adresář \"%s\" nebo spusťte %s\n"
"s argumentem jiným než \"%s\".\n"
-#: initdb.c:3203 initdb.c:3284
+#: initdb.c:3211 initdb.c:3292
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: nelze přístoupit k adresáři \"%s\": %s\n"
-#: initdb.c:3223
+#: initdb.c:3231
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr "%s: cesta k umístění adresáře transakčního logu musí být absolutní\n"
-#: initdb.c:3277
+#: initdb.c:3285
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
@@ -919,17 +924,17 @@ msgstr ""
"Pokud chcete v tomto adresáři ukládat transakční log odstraňte nebo\n"
"vyprázdněte adresář \"%s\".\n"
-#: initdb.c:3296
+#: initdb.c:3304
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: nelze vytvořit symbolický link \"%s\": %s\n"
-#: initdb.c:3301
+#: initdb.c:3309
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: na této platformě nejsou podporovány symbolické linky"
-#: initdb.c:3313
+#: initdb.c:3321
#, c-format
msgid ""
"It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
@@ -938,43 +943,47 @@ msgstr ""
"Obsahuje neviditelný soubor / soubor s tečkou na začátku názvu, možná proto "
"že se jedná o mount point.\n"
-#: initdb.c:3316
+#: initdb.c:3324
#, c-format
msgid ""
"It contains a lost+found directory, perhaps due to it being a mount point.\n"
msgstr "Obsahuje lost+found adresář, možná proto že se jedná o mount point.\n"
-#: initdb.c:3319
+#: initdb.c:3327
#, c-format
-msgid "Using the top-level directory of a mount point is not recommended.\n"
-msgstr "Použití top-level adresáře mount pointu se nedoporučuje.\n"
+msgid ""
+"Using a mount point directly as the data directory is not recommended.\n"
+"Create a subdirectory under the mount point.\n"
+msgstr ""
+"Použití mount pointu přímo jako datového adresáře se nedoporučuje.\n"
+"Vytvořte v mount pointu podadresář.\n"
-#: initdb.c:3337
+#: initdb.c:3346
#, c-format
msgid "creating subdirectories ... "
msgstr "vytvářím adresáře ... "
-#: initdb.c:3495
+#: initdb.c:3505
#, c-format
msgid "Running in debug mode.\n"
msgstr "Běžím v ladicím režimu.\n"
-#: initdb.c:3499
+#: initdb.c:3509
#, c-format
msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
msgstr "Běžím v režimu \"noclean\". Chybné kroky nebudou uklizeny.\n"
-#: initdb.c:3567
+#: initdb.c:3580
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: příliš mnoho argumentů v příkazové řádce (první je \"%s\")\n"
-#: initdb.c:3584
+#: initdb.c:3597
#, c-format
msgid "%s: password prompt and password file cannot be specified together\n"
msgstr "%s: dotaz na heslo a soubor s heslem nemohou být vyžadovány najednou\n"
-#: initdb.c:3606
+#: initdb.c:3619
#, c-format
msgid ""
"The files belonging to this database system will be owned by user \"%s\".\n"
@@ -985,7 +994,17 @@ msgstr ""
"Tento uživatel musí být také vlastníkem serverového procesu.\n"
"\n"
-#: initdb.c:3626
+#: initdb.c:3635
+#, c-format
+msgid "Data page checksums are enabled.\n"
+msgstr "Kontrolní součty datových stránek jsou zapnuty.\n"
+
+#: initdb.c:3637
+#, c-format
+msgid "Data page checksums are disabled.\n"
+msgstr "Kontrolní součty datových stránek jsou vypnuty.\n"
+
+#: initdb.c:3646
#, c-format
msgid ""
"\n"
@@ -996,7 +1015,7 @@ msgstr ""
"Zápis na disk přeskočen.\n"
"Datový adresář může být v případě pádu operačního systému poškozený.\n"
-#: initdb.c:3635
+#: initdb.c:3655
#, c-format
msgid ""
"\n"
@@ -1015,6 +1034,9 @@ msgstr ""
" %s%s%s/pg_ctl%s -D %s%s%s -l soubor_logu start\n"
"\n"
+#~ msgid "Using the top-level directory of a mount point is not recommended.\n"
+#~ msgstr "Použití top-level adresáře mount pointu se nedoporučuje.\n"
+
#~ msgid "%s: could not determine valid short version string\n"
#~ msgstr "%s: nemohu zjistit platné krátké označení verze\n"
diff --git a/src/bin/initdb/po/zh_CN.po b/src/bin/initdb/po/zh_CN.po
index 73845229f1..391431c30e 100644
--- a/src/bin/initdb/po/zh_CN.po
+++ b/src/bin/initdb/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: initdb (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:46+0000\n"
-"PO-Revision-Date: 2012-10-19 12:46+0800\n"
+"POT-Creation-Date: 2013-09-02 00:27+0000\n"
+"PO-Revision-Date: 2013-09-02 10:57+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,174 +16,227 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../../port/dirmod.c:79 ../../port/dirmod.c:92 ../../port/dirmod.c:109
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
#, c-format
msgid "out of memory\n"
msgstr "内存溢出\n"
-#: ../../port/dirmod.c:294
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
+#: ../../port/dirmod.c:220
#, c-format
msgid "could not set junction for \"%s\": %s\n"
msgstr "无法为 \"%s\"设置连接: %s\n"
-#: ../../port/dirmod.c:369
+#: ../../port/dirmod.c:295
#, c-format
msgid "could not get junction for \"%s\": %s\n"
msgstr "无法为\"%s\"得到连接: %s\n"
-#: ../../port/dirmod.c:451
+#: ../../port/dirmod.c:377
#, c-format
msgid "could not open directory \"%s\": %s\n"
msgstr "无法打开目录 \"%s\": %s\n"
-#: ../../port/dirmod.c:488
+#: ../../port/dirmod.c:414
#, c-format
msgid "could not read directory \"%s\": %s\n"
msgstr "无法读取目录 \"%s\": %s\n"
-#: ../../port/dirmod.c:571
+#: ../../port/dirmod.c:497
#, c-format
msgid "could not stat file or directory \"%s\": %s\n"
msgstr "无法获取文件或目录 \"%s\"的状态: %s\n"
-#: ../../port/dirmod.c:598 ../../port/dirmod.c:615
+#: ../../port/dirmod.c:524 ../../port/dirmod.c:541
#, c-format
msgid "could not remove file or directory \"%s\": %s\n"
msgstr "无法删除文件或目录 \"%s\": %s\n"
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:144
+#: ../../port/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:193
+#: ../../port/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:200
+#: ../../port/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:255 ../../port/exec.c:291
+#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "无法进入目录 \"%s\""
+#| msgid "could not change directory to \"%s\": %m"
+msgid "could not change directory to \"%s\": %s"
+msgstr "无法跳转到目录 \"%s\" 中: %s"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:526
+#: ../../port/exec.c:523
+#, c-format
+#| msgid "query failed: %s"
+msgid "pclose failed: %s"
+msgstr "pclose调用失败: %s"
+
+#: ../../port/wait_error.c:47
+#, c-format
+#| msgid "could not execute plan"
+msgid "command not executable"
+msgstr "命令无法执行"
+
+#: ../../port/wait_error.c:51
+#, c-format
+#| msgid "case not found"
+msgid "command not found"
+msgstr "命令没有找到"
+
+#: ../../port/wait_error.c:56
#, c-format
msgid "child process exited with exit code %d"
msgstr "子进程已退出, 退出码为 %d"
-#: ../../port/exec.c:530
+#: ../../port/wait_error.c:63
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/exec.c:539
+#: ../../port/wait_error.c:73
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子进程被信号 %s 终止"
-#: ../../port/exec.c:542
+#: ../../port/wait_error.c:77
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子进程被信号 %d 终止"
-#: ../../port/exec.c:546
+#: ../../port/wait_error.c:82
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子进程已退出, 未知状态 %d"
-#: initdb.c:294 initdb.c:308
+#: initdb.c:327
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: 内存溢出\n"
-#: initdb.c:418 initdb.c:1336
+#: initdb.c:437 initdb.c:1543
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 为了读取, 无法打开文件 \"%s\": %s\n"
-#: initdb.c:474 initdb.c:840 initdb.c:869
+#: initdb.c:493 initdb.c:1036 initdb.c:1065
#, c-format
msgid "%s: could not open file \"%s\" for writing: %s\n"
msgstr "%s: 为了写, 无法打开文件 \"%s\": %s\n"
-#: initdb.c:482 initdb.c:490 initdb.c:847 initdb.c:875
+#: initdb.c:501 initdb.c:509 initdb.c:1043 initdb.c:1071
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: 无法写文件 \"%s\": %s\n"
-#: initdb.c:509
+#: initdb.c:531
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: 无法打开目录 \"%s\": %s\n"
+
+#: initdb.c:548
+#, c-format
+msgid "%s: could not stat file \"%s\": %s\n"
+msgstr "%s: 无法统计文件: \"%s\": %s\n"
+
+#: initdb.c:571
+#, c-format
+#| msgid "%s: could not create directory \"%s\": %s\n"
+msgid "%s: could not read directory \"%s\": %s\n"
+msgstr "%s: 无法读取目录 \"%s\": %s\n"
+
+#: initdb.c:608 initdb.c:660
+#, c-format
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: 无法打开文件 \"%s\": %s\n"
+
+#: initdb.c:676
+#, c-format
+msgid "%s: could not fsync file \"%s\": %s\n"
+msgstr "%s: 无法对文件 \"%s\"进行fsync同步: %s\n"
+
+#: initdb.c:697
#, c-format
msgid "%s: could not execute command \"%s\": %s\n"
msgstr "%s: 无法执行命令 \"%s\": %s\n"
-#: initdb.c:525
+#: initdb.c:713
#, c-format
msgid "%s: removing data directory \"%s\"\n"
msgstr "%s: 删除数据目录 \"%s\"\n"
-#: initdb.c:528
+#: initdb.c:716
#, c-format
msgid "%s: failed to remove data directory\n"
msgstr "%s: 删除数据目录失败\n"
-#: initdb.c:534
+#: initdb.c:722
#, c-format
msgid "%s: removing contents of data directory \"%s\"\n"
msgstr "%s: 删除数据目录 \"%s\" 的内容\n"
-#: initdb.c:537
+#: initdb.c:725
#, c-format
msgid "%s: failed to remove contents of data directory\n"
msgstr "%s: 删除数据目录内容失败\n"
-#: initdb.c:543
+#: initdb.c:731
#, c-format
msgid "%s: removing transaction log directory \"%s\"\n"
msgstr "%s: 正在删除事务日志文件目录 \"%s\"\n"
-#: initdb.c:546
+#: initdb.c:734
#, c-format
msgid "%s: failed to remove transaction log directory\n"
msgstr "%s: 删除数据目录失败\n"
-#: initdb.c:552
+#: initdb.c:740
#, c-format
msgid "%s: removing contents of transaction log directory \"%s\"\n"
msgstr "%s: 删除事务日志目录 \"%s\" 的内容\n"
-#: initdb.c:555
+#: initdb.c:743
#, c-format
msgid "%s: failed to remove contents of transaction log directory\n"
msgstr "%s: 删除事务日志目录的内容失败\n"
-#: initdb.c:564
+#: initdb.c:752
#, c-format
msgid "%s: data directory \"%s\" not removed at user's request\n"
msgstr "%s: 在用户的要求下数据库目录 \"%s\" 不被删除\n"
-#: initdb.c:569
+#: initdb.c:757
#, c-format
msgid "%s: transaction log directory \"%s\" not removed at user's request\n"
msgstr "%s: 在用户的要求下不删除事务日志目录 \"%s\"\n"
-#: initdb.c:591
+#: initdb.c:779
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -194,32 +247,32 @@ msgstr ""
"请以服务器进程所有者的用户 (无特权) 身份\n"
"登陆 (使用, e.g., \"su\").\n"
-#: initdb.c:603
+#: initdb.c:791
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: 无法获得当前用户的信息: %s\n"
-#: initdb.c:620
+#: initdb.c:808
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: 无法获取当前用户名称: %s\n"
-#: initdb.c:651
+#: initdb.c:839
#, c-format
msgid "%s: \"%s\" is not a valid server encoding name\n"
msgstr "%s: \"%s\" 不是一个有效的服务器编码名字\n"
-#: initdb.c:760 initdb.c:3194
+#: initdb.c:956 initdb.c:3246
#, c-format
msgid "%s: could not create directory \"%s\": %s\n"
msgstr "%s: 无法创建目录 \"%s\": %s\n"
-#: initdb.c:790
+#: initdb.c:986
#, c-format
msgid "%s: file \"%s\" does not exist\n"
msgstr "%s: 文件 \"%s\" 不存在\n"
-#: initdb.c:792 initdb.c:801 initdb.c:811
+#: initdb.c:988 initdb.c:997 initdb.c:1007
#, c-format
msgid ""
"This might mean you have a corrupted installation or identified\n"
@@ -228,36 +281,36 @@ msgstr ""
"这意味着您的安装发生了错误或\n"
"使用 -L 选项指定了错误的路径.\n"
-#: initdb.c:798
+#: initdb.c:994
#, c-format
msgid "%s: could not access file \"%s\": %s\n"
msgstr "%s: 无法访问文件 \"%s\": %s\n"
-#: initdb.c:809
+#: initdb.c:1005
#, c-format
msgid "%s: file \"%s\" is not a regular file\n"
msgstr "%s: 文件 \"%s\" 不是常规文件\n"
-#: initdb.c:917
+#: initdb.c:1113
#, c-format
msgid "selecting default max_connections ... "
msgstr "选择默认最大联接数 (max_connections) ... "
-#: initdb.c:946
+#: initdb.c:1142
#, c-format
msgid "selecting default shared_buffers ... "
msgstr "选择默认共享缓冲区大小 (shared_buffers) ... "
-#: initdb.c:990
+#: initdb.c:1186
msgid "creating configuration files ... "
msgstr "创建配置文件 ... "
-#: initdb.c:1176
+#: initdb.c:1381
#, c-format
msgid "creating template1 database in %s/base/1 ... "
msgstr "在 %s/base/1 中创建 template1 数据库 ... "
-#: initdb.c:1192
+#: initdb.c:1397
#, c-format
msgid ""
"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -266,138 +319,142 @@ msgstr ""
"%s: 输入文件 \"%s\" 不属于 PostgreSQL %s\n"
"检查你的安装或使用 -L 选项指定正确的路径.\n"
-#: initdb.c:1277
+#: initdb.c:1484
msgid "initializing pg_authid ... "
msgstr "初始化 pg_authid ... "
-#: initdb.c:1311
+#: initdb.c:1518
msgid "Enter new superuser password: "
msgstr "输入新的超级用户口令: "
-#: initdb.c:1312
+#: initdb.c:1519
msgid "Enter it again: "
msgstr "再输入一遍: "
-#: initdb.c:1315
+#: initdb.c:1522
#, c-format
msgid "Passwords didn't match.\n"
msgstr "口令不匹配.\n"
-#: initdb.c:1342
+#: initdb.c:1549
#, c-format
msgid "%s: could not read password from file \"%s\": %s\n"
msgstr "%s: 无法从文件 \"%s\" 读取口令: %s\n"
-#: initdb.c:1355
+#: initdb.c:1562
#, c-format
msgid "setting password ... "
msgstr "设置口令 ... "
-#: initdb.c:1455
+#: initdb.c:1662
msgid "initializing dependencies ... "
msgstr "初始化dependencies ... "
-#: initdb.c:1483
+#: initdb.c:1690
msgid "creating system views ... "
msgstr "创建系统视图 ... "
-#: initdb.c:1519
+#: initdb.c:1726
msgid "loading system objects' descriptions ... "
msgstr "正在加载系统对象描述 ..."
-#: initdb.c:1625
+#: initdb.c:1832
msgid "creating collations ... "
msgstr "创建(字符集)校对规则 ... "
-#: initdb.c:1658
+#: initdb.c:1865
#, c-format
msgid "%s: locale name too long, skipped: \"%s\"\n"
msgstr "%s: 本地化名称太长, 跳过: \"%s\"\n"
-#: initdb.c:1683
+#: initdb.c:1890
#, c-format
msgid "%s: locale name has non-ASCII characters, skipped: \"%s\"\n"
msgstr "%s: 本地化名称带有非ASCII字符, 跳过: \"%s\"\n"
# describe.c:1542
-#: initdb.c:1746
+#: initdb.c:1953
#, c-format
msgid "No usable system locales were found.\n"
msgstr "没有找到可用的系统本地化名称.\n"
-#: initdb.c:1747
+#: initdb.c:1954
#, c-format
msgid "Use the option \"--debug\" to see details.\n"
msgstr "使用选项 \"--debug\" 获取细节.\n"
-#: initdb.c:1750
+#: initdb.c:1957
#, c-format
msgid "not supported on this platform\n"
msgstr "在此平台上不支持\n"
-#: initdb.c:1765
+#: initdb.c:1972
msgid "creating conversions ... "
msgstr "创建字符集转换 ... "
-#: initdb.c:1800
+#: initdb.c:2007
msgid "creating dictionaries ... "
msgstr "正在创建字典 ... "
-#: initdb.c:1854
+#: initdb.c:2061
msgid "setting privileges on built-in objects ... "
msgstr "对内建对象设置权限 ... "
-#: initdb.c:1912
+#: initdb.c:2119
msgid "creating information schema ... "
msgstr "创建信息模式 ... "
-#: initdb.c:1968
+#: initdb.c:2175
msgid "loading PL/pgSQL server-side language ... "
msgstr "正在装载PL/pgSQL服务器端编程语言..."
-#: initdb.c:1993
+#: initdb.c:2200
msgid "vacuuming database template1 ... "
msgstr "清理数据库 template1 ... "
-#: initdb.c:2049
+#: initdb.c:2256
msgid "copying template1 to template0 ... "
msgstr "拷贝 template1 到 template0 ... "
-#: initdb.c:2081
+#: initdb.c:2288
msgid "copying template1 to postgres ... "
msgstr "拷贝 template1 到 template0 ... "
-#: initdb.c:2138
+#: initdb.c:2314
+msgid "syncing data to disk ... "
+msgstr "同步数据到磁盘..."
+
+#: initdb.c:2386
#, c-format
msgid "caught signal\n"
msgstr "捕获信号\n"
-#: initdb.c:2144
+#: initdb.c:2392
#, c-format
msgid "could not write to child process: %s\n"
msgstr "无法写到子进程: %s\n"
-#: initdb.c:2152
+#: initdb.c:2400
#, c-format
msgid "ok\n"
msgstr "成功\n"
-#: initdb.c:2284
+#: initdb.c:2503
#, c-format
msgid "%s: failed to restore old locale \"%s\"\n"
msgstr "%s: 无法恢复旧的本地化文件 \"%s\"\n"
-#: initdb.c:2290
+#: initdb.c:2509
#, c-format
msgid "%s: invalid locale name \"%s\"\n"
msgstr "%s: 无效的 locale 名字 \"%s\"\n"
-#: initdb.c:2317
+#: initdb.c:2536
#, c-format
msgid "%s: encoding mismatch\n"
msgstr "%s: 警告: 编码不匹配\n"
-#: initdb.c:2319
+#: initdb.c:2538
#, c-format
msgid ""
"The encoding you selected (%s) and the encoding that the\n"
@@ -412,32 +469,32 @@ msgstr ""
"组合类型.\n"
"\n"
-#: initdb.c:2438
+#: initdb.c:2657
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: WARNING: 无法为该平台创建受限制的令牌\n"
-#: initdb.c:2447
+#: initdb.c:2666
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s:无法打开进程令牌 (token): 错误码 %lu\n"
-#: initdb.c:2460
+#: initdb.c:2679
#, c-format
msgid "%s: could not to allocate SIDs: error code %lu\n"
msgstr "%s: 无法分配SID: 错误码为 %lu\n"
-#: initdb.c:2479
+#: initdb.c:2698
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: 无法创建受限令牌: 错误码为 %lu\n"
-#: initdb.c:2500
+#: initdb.c:2719
#, c-format
msgid "%s: could not start process for command \"%s\": error code %lu\n"
msgstr "%s: 无法为命令 \"%s\"创建进程: 错误码 %lu\n"
-#: initdb.c:2514
+#: initdb.c:2733
#, c-format
msgid ""
"%s initializes a PostgreSQL database cluster.\n"
@@ -446,17 +503,17 @@ msgstr ""
"%s 初始化一个 PostgreSQL 数据库簇.\n"
"\n"
-#: initdb.c:2515
+#: initdb.c:2734
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: initdb.c:2516
+#: initdb.c:2735
#, c-format
msgid " %s [OPTION]... [DATADIR]\n"
msgstr " %s [选项]... [DATADIR]\n"
-#: initdb.c:2517
+#: initdb.c:2736
#, c-format
msgid ""
"\n"
@@ -465,43 +522,43 @@ msgstr ""
"\n"
"选项:\n"
-#: initdb.c:2518
+#: initdb.c:2737
#, c-format
msgid ""
" -A, --auth=METHOD default authentication method for local "
"connections\n"
msgstr " -A, --auth=METHOD 本地连接的默认认证方法\n"
-#: initdb.c:2519
+#: initdb.c:2738
#, c-format
msgid ""
" --auth-host=METHOD default authentication method for local TCP/IP "
"connections\n"
msgstr " --auth-host=METHOD 本地的TCP/IP连接的默认认证方法\n"
-#: initdb.c:2520
+#: initdb.c:2739
#, c-format
msgid ""
" --auth-local=METHOD default authentication method for local-socket "
"connections\n"
msgstr " --auth-local=METHOD 本地socket连接的默认认证方法\n"
-#: initdb.c:2521
+#: initdb.c:2740
#, c-format
msgid " [-D, --pgdata=]DATADIR location for this database cluster\n"
msgstr " -D, --pgdata=DATADIR 当前数据库簇的位置\n"
-#: initdb.c:2522
+#: initdb.c:2741
#, c-format
msgid " -E, --encoding=ENCODING set default encoding for new databases\n"
msgstr " -E, --encoding=ENCODING 为新数据库设置默认编码\n"
-#: initdb.c:2523
+#: initdb.c:2742
#, c-format
msgid " --locale=LOCALE set default locale for new databases\n"
msgstr " --locale=LOCALE 为新数据库设置默认语言环境\n"
-#: initdb.c:2524
+#: initdb.c:2743
#, c-format
msgid ""
" --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -516,18 +573,18 @@ msgstr ""
" 设定缺省语言环境(默认使用环境变\n"
" 量)\n"
-#: initdb.c:2528
+#: initdb.c:2747
#, c-format
msgid " --no-locale equivalent to --locale=C\n"
msgstr " --no-locale 等同于 --locale=C\n"
-#: initdb.c:2529
+#: initdb.c:2748
#, c-format
msgid ""
" --pwfile=FILE read password for the new superuser from file\n"
msgstr " --pwfile=文件名 对于新的超级用户从文件读取口令\n"
-#: initdb.c:2530
+#: initdb.c:2749
#, c-format
msgid ""
" -T, --text-search-config=CFG\n"
@@ -536,24 +593,24 @@ msgstr ""
" -T, --text-search-config=CFG\n"
" 缺省的文本搜索配置\n"
-#: initdb.c:2532
+#: initdb.c:2751
#, c-format
msgid " -U, --username=NAME database superuser name\n"
msgstr " -U, --username=NAME 数据库超级用户名\n"
-#: initdb.c:2533
+#: initdb.c:2752
#, c-format
msgid ""
" -W, --pwprompt prompt for a password for the new superuser\n"
msgstr " -W, --pwprompt 对于新的超级用户提示输入口令\n"
-#: initdb.c:2534
+#: initdb.c:2753
#, c-format
msgid ""
" -X, --xlogdir=XLOGDIR location for the transaction log directory\n"
msgstr " -X, --xlogdir=XLOGDIR 当前事务日志目录的位置\n"
-#: initdb.c:2535
+#: initdb.c:2754
#, c-format
msgid ""
"\n"
@@ -562,27 +619,46 @@ msgstr ""
"\n"
"非普通使用选项:\n"
-#: initdb.c:2536
+#: initdb.c:2755
#, c-format
msgid " -d, --debug generate lots of debugging output\n"
msgstr " -d, --debug 产生大量的除错信息\n"
-#: initdb.c:2537
+#: initdb.c:2756
+#, c-format
+msgid " -k, --data-checksums use data page checksums\n"
+msgstr " -k, --data-checksums 使用数据页产生效验和\n"
+
+#: initdb.c:2757
#, c-format
msgid " -L DIRECTORY where to find the input files\n"
msgstr " -L DIRECTORY 输入文件的位置\n"
-#: initdb.c:2538
+#: initdb.c:2758
#, c-format
msgid " -n, --noclean do not clean up after errors\n"
msgstr " -n, --noclean 出错后不清理\n"
-#: initdb.c:2539
+#: initdb.c:2759
+#, c-format
+#| msgid " -n, --noclean do not clean up after errors\n"
+msgid ""
+" -N, --nosync do not wait for changes to be written safely to "
+"disk\n"
+msgstr " -n, --nosync 不用等待变化安全写入磁盘\n"
+
+#: initdb.c:2760
#, c-format
msgid " -s, --show show internal settings\n"
msgstr " -s, --show 显示内部设置\n"
-#: initdb.c:2540
+#: initdb.c:2761
+#, c-format
+#| msgid " -s, --schema-only dump only the schema, no data\n"
+msgid " -S, --sync-only only sync data directory\n"
+msgstr " -S, --sync-only 只同步数据目录\n"
+
+#: initdb.c:2762
#, c-format
msgid ""
"\n"
@@ -591,17 +667,17 @@ msgstr ""
"\n"
"其它选项:\n"
-#: initdb.c:2541
+#: initdb.c:2763
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: initdb.c:2542
+#: initdb.c:2764
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: initdb.c:2543
+#: initdb.c:2765
#, c-format
msgid ""
"\n"
@@ -611,7 +687,7 @@ msgstr ""
"\n"
"如果没有指定数据目录, 将使用环境变量 PGDATA\n"
-#: initdb.c:2545
+#: initdb.c:2767
#, c-format
msgid ""
"\n"
@@ -620,7 +696,7 @@ msgstr ""
"\n"
"报告错误至 <pgql-bugs@postgresql.org>.\n"
-#: initdb.c:2553
+#: initdb.c:2775
msgid ""
"\n"
"WARNING: enabling \"trust\" authentication for local connections\n"
@@ -632,43 +708,28 @@ msgstr ""
"你可以通过编辑 pg_hba.conf 更改或你下次\n"
"行 initdb 时使用 -A或者--auth-local和--auth-host选项.\n"
-#: initdb.c:2575
+#: initdb.c:2797
#, c-format
msgid "%s: invalid authentication method \"%s\" for \"%s\" connections\n"
msgstr "%s: 无效认证方法 \"%s\" 用于 \"%s\" 连接\n"
-#: initdb.c:2589
+#: initdb.c:2811
#, c-format
msgid ""
"%s: must specify a password for the superuser to enable %s authentication\n"
msgstr "%s: 为了启动 %s 认证, 你需要为超级用户指定一个口令\n"
-#: initdb.c:2720
+#: initdb.c:2844
#, c-format
-msgid "Running in debug mode.\n"
-msgstr "运行在除错模式中. \n"
-
-#: initdb.c:2724
-#, c-format
-msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
-msgstr "运行在 noclean 模式中. 错误将不被清理.\n"
-
-#: initdb.c:2767 initdb.c:2788 initdb.c:3017
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-
-#: initdb.c:2786
-#, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
+msgid "%s: could not re-execute with restricted token: error code %lu\n"
+msgstr "%s: 无法使用受限令牌再次执行: 错误码 %lu\n"
-#: initdb.c:2795
+#: initdb.c:2859
#, c-format
-msgid "%s: password prompt and password file cannot be specified together\n"
-msgstr "%s: 口令提示和口令文件不能同时都指定\n"
+msgid "%s: could not get exit code from subprocess: error code %lu\n"
+msgstr "%s: 无法从子进程得到退出码: 错误码 %lu\n"
-#: initdb.c:2818
+#: initdb.c:2885
#, c-format
msgid ""
"%s: no data directory specified\n"
@@ -681,17 +742,7 @@ msgstr ""
"存在. 使用 -D 选项或者\n"
"环境变量 PGDATA.\n"
-#: initdb.c:2851
-#, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s: 无法使用受限令牌再次执行: 错误码 %lu\n"
-
-#: initdb.c:2866
-#, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: 无法从子进程得到退出码: 错误码 %lu\n"
-
-#: initdb.c:2894
+#: initdb.c:2924
#, c-format
msgid ""
"The program \"postgres\" is needed by %s but was not found in the\n"
@@ -702,7 +753,7 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: initdb.c:2901
+#: initdb.c:2931
#, c-format
msgid ""
"The program \"postgres\" was found by \"%s\"\n"
@@ -713,27 +764,17 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: initdb.c:2920
+#: initdb.c:2950
#, c-format
msgid "%s: input file location must be an absolute path\n"
msgstr "%s: 输入文件位置必须为绝对路径\n"
-#: initdb.c:2977
-#, c-format
-msgid ""
-"The files belonging to this database system will be owned by user \"%s\".\n"
-"This user must also own the server process.\n"
-"\n"
-msgstr ""
-"属于此数据库系统的文件宿主为用户 \"%s\".\n"
-"此用户也必须为服务器进程的宿主.\n"
-
-#: initdb.c:2987
+#: initdb.c:2969
#, c-format
msgid "The database cluster will be initialized with locale \"%s\".\n"
msgstr "数据库簇将使用本地化语言 \"%s\"进行初始化.\n"
-#: initdb.c:2990
+#: initdb.c:2972
#, c-format
msgid ""
"The database cluster will be initialized with locales\n"
@@ -752,17 +793,22 @@ msgstr ""
" NUMERIC: %s\n"
" TIME: %s\n"
-#: initdb.c:3014
+#: initdb.c:2996
#, c-format
msgid "%s: could not find suitable encoding for locale \"%s\"\n"
msgstr "%s: 无法为locale(本地化语言)\"%s\"找到合适的编码\n"
-#: initdb.c:3016
+#: initdb.c:2998
#, c-format
msgid "Rerun %s with the -E option.\n"
msgstr "带 -E 选项重新运行 %s.\n"
-#: initdb.c:3029
+#: initdb.c:2999 initdb.c:3561 initdb.c:3582
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "请用 \"%s --help\" 获取更多的信息.\n"
+
+#: initdb.c:3011
#, c-format
msgid ""
"Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -771,12 +817,12 @@ msgstr ""
"本地化隐含的编码 \"%s\" 不允许作为服务器端的编码.\n"
"默认的数据库编码将采用 \"%s\" 作为代替.\n"
-#: initdb.c:3037
+#: initdb.c:3019
#, c-format
msgid "%s: locale \"%s\" requires unsupported encoding \"%s\"\n"
msgstr "%s: 本地化语言环境 \"%s\"要求使用不支持的编码\"%s\"\n"
-#: initdb.c:3040
+#: initdb.c:3022
#, c-format
msgid ""
"Encoding \"%s\" is not allowed as a server-side encoding.\n"
@@ -785,57 +831,57 @@ msgstr ""
"不允许将编码\"%s\"作为服务器端编码.\n"
"使用一个不同的本地化语言环境重新运行%s.\n"
-#: initdb.c:3049
+#: initdb.c:3031
#, c-format
msgid "The default database encoding has accordingly been set to \"%s\".\n"
msgstr "默认的数据库编码已经相应的设置为 \"%s\".\n"
-#: initdb.c:3066
+#: initdb.c:3102
#, c-format
msgid ""
"%s: could not find suitable text search configuration for locale \"%s\"\n"
msgstr "%s: 无法为本地化语言环境\"%s\"找到合适的文本搜索配置\n"
-#: initdb.c:3077
+#: initdb.c:3113
#, c-format
msgid ""
"%s: warning: suitable text search configuration for locale \"%s\" is "
"unknown\n"
msgstr "%s: 警告: 对于本地化语言环境\"%s\"合适的文本搜索配置未知\n"
-#: initdb.c:3082
+#: initdb.c:3118
#, c-format
msgid ""
"%s: warning: specified text search configuration \"%s\" might not match "
"locale \"%s\"\n"
msgstr "%s: 警告: 所指定的文本搜索配置\"%s\"可能与本地语言环境\"%s\"不匹配\n"
-#: initdb.c:3087
+#: initdb.c:3123
#, c-format
msgid "The default text search configuration will be set to \"%s\".\n"
msgstr "缺省的文本搜索配置将会被设置到\"%s\"\n"
-#: initdb.c:3121 initdb.c:3188
+#: initdb.c:3162 initdb.c:3240
#, c-format
msgid "creating directory %s ... "
msgstr "创建目录 %s ... "
-#: initdb.c:3135 initdb.c:3206
+#: initdb.c:3176 initdb.c:3258
#, c-format
msgid "fixing permissions on existing directory %s ... "
msgstr "修复已存在目录 %s 的权限 ... "
-#: initdb.c:3141 initdb.c:3212
+#: initdb.c:3182 initdb.c:3264
#, c-format
msgid "%s: could not change permissions of directory \"%s\": %s\n"
msgstr "%s: 无法改变目录 \"%s\" 的权限: %s\n"
-#: initdb.c:3154 initdb.c:3225
+#: initdb.c:3197 initdb.c:3279
#, c-format
msgid "%s: directory \"%s\" exists but is not empty\n"
msgstr "%s: 目录\"%s\"已存在,但不是空的\n"
-#: initdb.c:3157
+#: initdb.c:3203
#, c-format
msgid ""
"If you want to create a new database system, either remove or empty\n"
@@ -846,39 +892,112 @@ msgstr ""
"目录 \"%s\" 或者运行带参数的 %s\n"
"而不是 \"%s\".\n"
-#: initdb.c:3165 initdb.c:3235
+#: initdb.c:3211 initdb.c:3292
#, c-format
msgid "%s: could not access directory \"%s\": %s\n"
msgstr "%s: 无法访问目录 \"%s\": %s\n"
-#: initdb.c:3179
+#: initdb.c:3231
#, c-format
msgid "%s: transaction log directory location must be an absolute path\n"
msgstr "%s: 事务日志目录的位置必须为绝对路径\n"
-#: initdb.c:3228
+#: initdb.c:3285
#, c-format
msgid ""
"If you want to store the transaction log there, either\n"
"remove or empty the directory \"%s\".\n"
msgstr "如果您要存储事务日志,需要删除或者清空目录\"%s\".\n"
-#: initdb.c:3247
+#: initdb.c:3304
#, c-format
msgid "%s: could not create symbolic link \"%s\": %s\n"
msgstr "%s: 无法创建符号链接 \"%s\": %s\n"
-#: initdb.c:3252
+#: initdb.c:3309
#, c-format
msgid "%s: symlinks are not supported on this platform"
msgstr "%s: 在这个平台上不支持使用符号链接"
-#: initdb.c:3258
+#: initdb.c:3321
+#, c-format
+msgid ""
+"It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
+"point.\n"
+msgstr "它包含一个不可见的带固定点的文件,可能因为它是一个装载点。\n"
+
+#: initdb.c:3324
+#, c-format
+msgid ""
+"It contains a lost+found directory, perhaps due to it being a mount point.\n"
+msgstr "它包含名为lost+found的目录,可能因为它是一个加载点.\n"
+
+#: initdb.c:3327
+#, c-format
+msgid ""
+"Using a mount point directly as the data directory is not recommended.\n"
+"Create a subdirectory under the mount point.\n"
+msgstr ""
+"不推荐将加载点作为数据目录.\n"
+"通常在加载点下边创建一个子目录.\n"
+
+#: initdb.c:3346
#, c-format
msgid "creating subdirectories ... "
msgstr "正在创建子目录 ... "
-#: initdb.c:3324
+#: initdb.c:3505
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr "运行在除错模式中. \n"
+
+#: initdb.c:3509
+#, c-format
+msgid "Running in noclean mode. Mistakes will not be cleaned up.\n"
+msgstr "运行在 noclean 模式中. 错误将不被清理.\n"
+
+#: initdb.c:3580
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
+
+#: initdb.c:3597
+#, c-format
+msgid "%s: password prompt and password file cannot be specified together\n"
+msgstr "%s: 口令提示和口令文件不能同时都指定\n"
+
+#: initdb.c:3619
+#, c-format
+msgid ""
+"The files belonging to this database system will be owned by user \"%s\".\n"
+"This user must also own the server process.\n"
+"\n"
+msgstr ""
+"属于此数据库系统的文件宿主为用户 \"%s\".\n"
+"此用户也必须为服务器进程的宿主.\n"
+
+#: initdb.c:3635
+#, c-format
+msgid "Data page checksums are enabled.\n"
+msgstr "允许生成数据页校验和.\n"
+
+#: initdb.c:3637
+#, c-format
+msgid "Data page checksums are disabled.\n"
+msgstr "禁止为数据页生成校验和.\n"
+
+#: initdb.c:3646
+#, c-format
+msgid ""
+"\n"
+"Sync to disk skipped.\n"
+"The data directory might become corrupt if the operating system crashes.\n"
+msgstr ""
+"\n"
+"跳过同步到磁盘操作.\n"
+"如果操作系统宕机,数据目录可能会毁坏.\n"
+
+#: initdb.c:3655
#, c-format
msgid ""
"\n"
@@ -897,23 +1016,26 @@ msgstr ""
" %s%s%s%spg_ctl -D %s%s%s -l logfile start\n"
"\n"
-#~ msgid "creating directory %s/%s ... "
-#~ msgstr "创建目录 %s/%s ... "
+#~ msgid "%s: unrecognized authentication method \"%s\"\n"
+#~ msgstr "%s: 未知认证方法 \"%s\".\n"
#~ msgid ""
-#~ " --locale=LOCALE initialize database cluster with given "
-#~ "locale\n"
-#~ msgstr " --locale=LOCALE 初始化数据库簇的 locale\n"
-
-#~ msgid "enabling unlimited row size for system tables ... "
-#~ msgstr "启动不限制系统表行大小 ... "
+#~ "%s: The password file was not generated. Please report this problem.\n"
+#~ msgstr "%s: 口令文件没有生成. 请报告这个问题.\n"
#~ msgid "%s: could not determine valid short version string\n"
#~ msgstr "%s: 无法确定有效的短版本字符串\n"
+#~ msgid "enabling unlimited row size for system tables ... "
+#~ msgstr "启动不限制系统表行大小 ... "
+
#~ msgid ""
-#~ "%s: The password file was not generated. Please report this problem.\n"
-#~ msgstr "%s: 口令文件没有生成. 请报告这个问题.\n"
+#~ " --locale=LOCALE initialize database cluster with given "
+#~ "locale\n"
+#~ msgstr " --locale=LOCALE 初始化数据库簇的 locale\n"
-#~ msgid "%s: unrecognized authentication method \"%s\"\n"
-#~ msgstr "%s: 未知认证方法 \"%s\".\n"
+#~ msgid "creating directory %s/%s ... "
+#~ msgstr "创建目录 %s/%s ... "
+
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "无法进入目录 \"%s\""
diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk
index fdd1b5470c..e1c96dd4c4 100644
--- a/src/bin/pg_basebackup/nls.mk
+++ b/src/bin/pg_basebackup/nls.mk
@@ -1,4 +1,4 @@
# src/bin/pg_basebackup/nls.mk
CATALOG_NAME = pg_basebackup
-AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru
+AVAIL_LANGUAGES = cs de es fr it ja pl pt_BR ru zh_CN
GETTEXT_FILES = pg_basebackup.c pg_receivexlog.c receivelog.c streamutil.c ../../common/fe_memutils.c
diff --git a/src/bin/pg_basebackup/po/cs.po b/src/bin/pg_basebackup/po/cs.po
index 89f536a4fb..57a8226b98 100644
--- a/src/bin/pg_basebackup/po/cs.po
+++ b/src/bin/pg_basebackup/po/cs.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.2\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:47+0000\n"
-"PO-Revision-Date: 2013-03-17 22:40+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:18+0000\n"
+"PO-Revision-Date: 2013-10-07 14:23-0400\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgid ""
" time between status packets sent to server (in "
"seconds)\n"
msgstr ""
-" -s, --statusint=INTERVAL\n"
+" -s, --status-interval=INTERVAL\n"
" čas mezi zasíláním packetů se stavem na server (ve "
"vteřinách)\n"
@@ -218,8 +218,8 @@ msgstr ""
msgid "%s: could not read from ready pipe: %s\n"
msgstr "%s: nelze číst z ready roury: %s\n"
-#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1482
-#: pg_receivexlog.c:254
+#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
+#: pg_receivexlog.c:290
#, c-format
msgid "%s: could not parse transaction log location \"%s\"\n"
msgstr "%s: nelze naparsovat koncovou pozici v transakčním logu \"%s\"\n"
@@ -283,7 +283,7 @@ msgstr[2] "%*s/%s kB (%d%%), %d/%d tablespaces"
msgid "%s: could not write to compressed file \"%s\": %s\n"
msgstr "%s: nelze zapsat do komprimovaného souboru \"%s\": %s\n"
-#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1212
+#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
#, c-format
msgid "%s: could not write to file \"%s\": %s\n"
msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
@@ -298,7 +298,7 @@ msgstr "%s: nelze nastavit úroveň komprese %d: %s\n"
msgid "%s: could not create compressed file \"%s\": %s\n"
msgstr "%s: nelze vytvořit komprimovaný soubor \"%s\": %s\n"
-#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1205
+#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
#, c-format
msgid "%s: could not create file \"%s\": %s\n"
msgstr "%s: nelze vytvořit soubor \"%s\": %s\n"
@@ -313,12 +313,12 @@ msgstr "%s: nelze získat COPY data stream: %s"
msgid "%s: could not close compressed file \"%s\": %s\n"
msgstr "%s: nelze uzavřít komprimovaný soubor \"%s\": %s\n"
-#: pg_basebackup.c:720 receivelog.c:158 receivelog.c:346 receivelog.c:675
+#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:352 receivelog.c:724
#, c-format
msgid "%s: could not close file \"%s\": %s\n"
msgstr "%s: nelze uzavřít soubor \"%s\": %s\n"
-#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:835
+#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:937
#, c-format
msgid "%s: could not read COPY data: %s"
msgstr "%s: nelze číst COPY data: %s"
@@ -363,19 +363,24 @@ msgstr "%s: nelze nastavit přístupová práva na souboru \"%s\": %s\n"
msgid "%s: COPY stream ended before last file was finished\n"
msgstr "%s: COPY stream skončil před dokončením posledního souboru\n"
-#: pg_basebackup.c:1119 pg_basebackup.c:1137 pg_basebackup.c:1144
-#: pg_basebackup.c:1182
+#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
+#: pg_basebackup.c:1257
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: nedostatek paměti\n"
-#: pg_basebackup.c:1253 pg_basebackup.c:1281 pg_receivexlog.c:239
-#: receivelog.c:500 receivelog.c:545 receivelog.c:584
+#: pg_basebackup.c:1333
+#, c-format
+msgid "%s: incompatible server version %s\n"
+msgstr "%s: nekompatibilní verze serveru %s\n"
+
+#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:275
+#: receivelog.c:531 receivelog.c:576 receivelog.c:615
#, c-format
msgid "%s: could not send replication command \"%s\": %s"
msgstr "%s: nelze zaslat replikační příkaz \"%s\": %s"
-#: pg_basebackup.c:1260 pg_receivexlog.c:246 receivelog.c:508
+#: pg_basebackup.c:1367 pg_receivexlog.c:282 receivelog.c:539
#, c-format
msgid ""
"%s: could not identify system: got %d rows and %d fields, expected %d rows "
@@ -384,12 +389,12 @@ msgstr ""
"%s: nelze identifikovat systém, načteno %d řádek a %d položek, očekáváno %d "
"řádek a %d položek\n"
-#: pg_basebackup.c:1292
+#: pg_basebackup.c:1400
#, c-format
msgid "%s: could not initiate base backup: %s"
msgstr "%s: nelze inicializovat base backup: %s"
-#: pg_basebackup.c:1299
+#: pg_basebackup.c:1407
#, c-format
msgid ""
"%s: server returned unexpected response to BASE_BACKUP command; got %d rows "
@@ -398,153 +403,153 @@ msgstr ""
"%s: server vrátil neočekávanou odpověď na BASE_BACKUP příkaz; přišlo %d "
"řádeka %d položek, ořekáváno %d řádek a %d položek\n"
-#: pg_basebackup.c:1311
+#: pg_basebackup.c:1427
#, c-format
msgid "transaction log start point: %s on timeline %u\n"
msgstr "transaction log start point: %s v timeline %u\n"
-#: pg_basebackup.c:1320
+#: pg_basebackup.c:1436
#, c-format
msgid "%s: could not get backup header: %s"
msgstr "%s: nelze získat hlavičku zálohy: %s"
-#: pg_basebackup.c:1326
+#: pg_basebackup.c:1442
#, c-format
msgid "%s: no data returned from server\n"
msgstr "%s: ze serveru nebyla vrácena žádná data\n"
-#: pg_basebackup.c:1355
+#: pg_basebackup.c:1471
#, c-format
msgid "%s: can only write single tablespace to stdout, database has %d\n"
msgstr "%s: na stdout lze zapsat jen jeden tablespace, databáze má %d\n"
-#: pg_basebackup.c:1367
+#: pg_basebackup.c:1483
#, c-format
msgid "%s: starting background WAL receiver\n"
msgstr "%s: starting background WAL receiver\n"
-#: pg_basebackup.c:1397
+#: pg_basebackup.c:1513
#, c-format
msgid "%s: could not get transaction log end position from server: %s"
msgstr "%s: ze serveru nelze získat koncovou pozici v transakčním logu: %s"
-#: pg_basebackup.c:1404
+#: pg_basebackup.c:1520
#, c-format
msgid "%s: no transaction log end position returned from server\n"
msgstr ""
"%s: ze serveru nebyla vrácena žádná koncová pozice v transakčním logu\n"
-#: pg_basebackup.c:1416
+#: pg_basebackup.c:1532
#, c-format
msgid "%s: final receive failed: %s"
msgstr "%s: závěrečný receive selhal: %s"
-#: pg_basebackup.c:1434
+#: pg_basebackup.c:1550
#, c-format
msgid "%s: waiting for background process to finish streaming ...\n"
msgstr "%s: čekám na background proces pro ukočení streamování ...\n"
-#: pg_basebackup.c:1440
+#: pg_basebackup.c:1556
#, c-format
msgid "%s: could not send command to background pipe: %s\n"
msgstr "%s: nelze zaslat příkaz přes background rouru: %s\n"
-#: pg_basebackup.c:1449
+#: pg_basebackup.c:1565
#, c-format
msgid "%s: could not wait for child process: %s\n"
msgstr "%s: nelze počkat na podřízený (child) proces: %s\n"
-#: pg_basebackup.c:1455
+#: pg_basebackup.c:1571
#, c-format
msgid "%s: child %d died, expected %d\n"
msgstr "%s: potomek %d zemřel, očekáváno %d\n"
-#: pg_basebackup.c:1461
+#: pg_basebackup.c:1577
#, c-format
msgid "%s: child process did not exit normally\n"
msgstr "%s: podřízený proces neskončil standardně\n"
-#: pg_basebackup.c:1467
+#: pg_basebackup.c:1583
#, c-format
msgid "%s: child process exited with error %d\n"
msgstr "%s: podřízený proces skončil s chybou %d\n"
-#: pg_basebackup.c:1494
+#: pg_basebackup.c:1610
#, c-format
msgid "%s: could not wait for child thread: %s\n"
msgstr "%s: nelze počkat na podřízené (child) vlákno: %s\n"
-#: pg_basebackup.c:1501
+#: pg_basebackup.c:1617
#, c-format
msgid "%s: could not get child thread exit status: %s\n"
msgstr "%s: nelze získat návratový kód podřízeného vlákna: %s\n"
-#: pg_basebackup.c:1507
+#: pg_basebackup.c:1623
#, c-format
msgid "%s: child thread exited with error %u\n"
msgstr "%s: podřízené vlákno skončilo s chybou %u\n"
-#: pg_basebackup.c:1593
+#: pg_basebackup.c:1709
#, c-format
msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
msgstr "%s: chybný formát výstupu \"%s\", musí být \"plain\" nebo \"tar\"\n"
-#: pg_basebackup.c:1605 pg_basebackup.c:1617
+#: pg_basebackup.c:1721 pg_basebackup.c:1733
#, c-format
msgid "%s: cannot specify both --xlog and --xlog-method\n"
msgstr "%s: volby --xlog a --xlog-method nelze zadat společně\n"
-#: pg_basebackup.c:1632
+#: pg_basebackup.c:1748
#, c-format
msgid ""
"%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
msgstr "%s: neplatná xlog-metoda \"%s\", musí být \"fetch\" nebo \"stream\"\n"
-#: pg_basebackup.c:1651
+#: pg_basebackup.c:1767
#, c-format
msgid "%s: invalid compression level \"%s\"\n"
msgstr "%s: chybná úroveň komprese \"%s\"\n"
-#: pg_basebackup.c:1663
+#: pg_basebackup.c:1779
#, c-format
msgid ""
"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
msgstr ""
"%s: chybný checkpoint argument \"%s\", musí být \"fast\" nebo \"spread\"\n"
-#: pg_basebackup.c:1690 pg_receivexlog.c:380
+#: pg_basebackup.c:1806 pg_receivexlog.c:416
#, c-format
msgid "%s: invalid status interval \"%s\"\n"
msgstr "%s: neplatný interval zasílání stavu \"%s\"\n"
-#: pg_basebackup.c:1706 pg_basebackup.c:1720 pg_basebackup.c:1731
-#: pg_basebackup.c:1744 pg_basebackup.c:1754 pg_receivexlog.c:396
-#: pg_receivexlog.c:410 pg_receivexlog.c:421
+#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
+#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:432
+#: pg_receivexlog.c:446 pg_receivexlog.c:457
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Zkuste \"%s --help\" pro více informací.\n"
-#: pg_basebackup.c:1718 pg_receivexlog.c:408
+#: pg_basebackup.c:1834 pg_receivexlog.c:444
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: příliš mnoho argumentů v příkazové řádce (první je \"%s\")\n"
-#: pg_basebackup.c:1730 pg_receivexlog.c:420
+#: pg_basebackup.c:1846 pg_receivexlog.c:456
#, c-format
msgid "%s: no target directory specified\n"
msgstr "%s: nebyl zadán cílový adresář\n"
-#: pg_basebackup.c:1742
+#: pg_basebackup.c:1858
#, c-format
msgid "%s: only tar mode backups can be compressed\n"
msgstr "%s: pouze tar zálohy mohou být komprimované\n"
-#: pg_basebackup.c:1752
+#: pg_basebackup.c:1868
#, c-format
msgid "%s: WAL streaming can only be used in plain mode\n"
msgstr "%s: WAL streaming lze použít pouze v plain módu\n"
-#: pg_basebackup.c:1763
+#: pg_basebackup.c:1879
#, c-format
msgid "%s: this build does not support compression\n"
msgstr "%s: tento build nepodporuje kompresi\n"
@@ -572,7 +577,7 @@ msgstr ""
msgid ""
" -D, --directory=DIR receive transaction log files into this directory\n"
msgstr ""
-" -D, --dir=directory soubory transakčního logu ukládej do tohoto "
+" -D, --directory=DIR soubory transakčního logu ukládej do tohoto "
"adresáře\n"
#: pg_receivexlog.c:57
@@ -586,134 +591,137 @@ msgstr ""
msgid "%s: finished segment at %X/%X (timeline %u)\n"
msgstr "%s: dokončen segment na %X/%X (timeline %u)\n"
-#: pg_receivexlog.c:92
+#: pg_receivexlog.c:94
#, c-format
msgid "%s: switched to timeline %u at %X/%X\n"
msgstr "%s: přepnuto na timeline %u v %X/%X\n"
-#: pg_receivexlog.c:101
+#: pg_receivexlog.c:103
#, c-format
msgid "%s: received interrupt signal, exiting\n"
msgstr "%s: přijat signál k přerušení, ukončuji.\n"
-#: pg_receivexlog.c:126
+#: pg_receivexlog.c:129
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: nelze otevřít adresář \"%s\": %s\n"
-#: pg_receivexlog.c:155
+#: pg_receivexlog.c:170
#, c-format
msgid "%s: could not parse transaction log file name \"%s\"\n"
msgstr "%s: nelze naparsovat jméno souboru transakčního logu \"%s\"\n"
-#: pg_receivexlog.c:165
+#: pg_receivexlog.c:188
#, c-format
msgid "%s: could not stat file \"%s\": %s\n"
msgstr "%s: nelze načíst stav souboru \"%s\": %s\n"
-#: pg_receivexlog.c:183
+#: pg_receivexlog.c:196
#, c-format
msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
msgstr "%s: segment soubor \"%s\" má neplatnou velikost %d, přeskakuji\n"
-#: pg_receivexlog.c:281
+#: pg_receivexlog.c:317
#, c-format
msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
msgstr "%s: začínám streamování logu na %X/%X (timeline %u)\n"
-#: pg_receivexlog.c:361
+#: pg_receivexlog.c:397
#, c-format
msgid "%s: invalid port number \"%s\"\n"
msgstr "%s: neplatné číslo portu \"%s\"\n"
-#: pg_receivexlog.c:443
+#: pg_receivexlog.c:479
#, c-format
msgid "%s: disconnected\n"
msgstr "%s: odpojeno.\n"
#. translator: check source for value for %d
-#: pg_receivexlog.c:450
+#: pg_receivexlog.c:486
#, c-format
msgid "%s: disconnected; waiting %d seconds to try again\n"
msgstr "%s: odpojeno; čekám %d vteřin pro další pokus\n"
-#: receivelog.c:66
+#: receivelog.c:69
#, c-format
msgid "%s: could not open transaction log file \"%s\": %s\n"
msgstr "%s: nelze otevřít souboru transakčního logu \"%s\": %s\n"
-#: receivelog.c:78
+#: receivelog.c:81
#, c-format
msgid "%s: could not stat transaction log file \"%s\": %s\n"
msgstr "%s: nelze udělat stat souboru transakčního logu \"%s\": %s\n"
-#: receivelog.c:92
+#: receivelog.c:95
#, c-format
msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
msgstr "%s: soubor transakčního logu \"%s\" má %d bytů, měl by mít 0 nebo %d\n"
-#: receivelog.c:105
+#: receivelog.c:108
#, c-format
msgid "%s: could not pad transaction log file \"%s\": %s\n"
msgstr "%s: nelze doplnit soubor transakčního logu \"%s\": %s\n"
-#: receivelog.c:118
+#: receivelog.c:121
#, c-format
msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
msgstr ""
"%s: nelze skočit zpět na začátek souboru transakčního logu \"%s\": %s\n"
-#: receivelog.c:144
+#: receivelog.c:147
#, c-format
msgid "%s: could not determine seek position in file \"%s\": %s\n"
msgstr "%s: nelze určit pozici pro seek v souboru \"%s\": %s\n"
-#: receivelog.c:151 receivelog.c:339
+#: receivelog.c:154 receivelog.c:345
#, c-format
msgid "%s: could not fsync file \"%s\": %s\n"
msgstr "%s: nelze provést fsync souboru \"%s\": %s\n"
-#: receivelog.c:178
+#: receivelog.c:180
#, c-format
msgid "%s: could not rename file \"%s\": %s\n"
msgstr "%s: nelze přejmenovat soubor \"%s\": %s\n"
-#: receivelog.c:185
+#: receivelog.c:187
#, c-format
msgid "%s: not renaming \"%s%s\", segment is not complete\n"
msgstr "%s: nepřejmenovávám \"%s%s\", segment není kompletní.\n"
-#: receivelog.c:274
+#: receivelog.c:276
#, c-format
-msgid "%s: could not open timeline history file \"%s\": %s"
-msgstr "%s: nelze otevřít soubor s timeline historií \"%s\": %s"
+#| msgid "%s: could not open timeline history file \"%s\": %s"
+msgid "%s: could not open timeline history file \"%s\": %s\n"
+msgstr "%s: nelze otevřít soubor s historií timeline \"%s\": %s\n"
-#: receivelog.c:301
+#: receivelog.c:303
#, c-format
-msgid "%s: server reported unexpected history file name for timeline %u: %s"
-msgstr "%s: server ohlásil neočekávané názvu s historií pro timeline %u: %s"
+#| msgid "%s: server reported unexpected history file name for timeline %u: %s"
+msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
+msgstr ""
+"%s: server ohlásil neočekávané jméno souboru s historií pro timeline %u: %s\n"
-#: receivelog.c:316
+#: receivelog.c:320
#, c-format
msgid "%s: could not create timeline history file \"%s\": %s\n"
msgstr "%s: nelze vytvořit soubor s timeline historií \"%s\": %s\n"
-#: receivelog.c:332
+#: receivelog.c:337
#, c-format
msgid "%s: could not write timeline history file \"%s\": %s\n"
msgstr "%s: nelze zapsat do souboru s timeline historií \"%s\": %s\n"
-#: receivelog.c:358
+#: receivelog.c:362
#, c-format
msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
msgstr "%s: nelze přejmenovat soubor \"%s\" na \"%s\": %s\n"
-#: receivelog.c:431
+#: receivelog.c:435
#, c-format
msgid "%s: could not send feedback packet: %s"
msgstr "%s: nelze zaslat packet se zpětnou vazbou: %s"
-#: receivelog.c:486
+#: receivelog.c:469
#, c-format
msgid ""
"%s: incompatible server version %s; streaming is only supported with server "
@@ -722,7 +730,7 @@ msgstr ""
"%s: nekompatibilní verze serveru %s; streaming je podporování pouze se "
"serverem version %s\n"
-#: receivelog.c:516
+#: receivelog.c:547
#, c-format
msgid ""
"%s: system identifier does not match between base backup and streaming "
@@ -731,12 +739,12 @@ msgstr ""
"%s: identifikátor systému mezi base backupem a streamovacím spojením "
"neodpovídá\n"
-#: receivelog.c:524
+#: receivelog.c:555
#, c-format
msgid "%s: starting timeline %u is not present in the server\n"
msgstr "%s: počáteční timeline %u není přitomna na serveru\n"
-#: receivelog.c:558
+#: receivelog.c:589
#, c-format
msgid ""
"%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
@@ -745,77 +753,112 @@ msgstr ""
"%s: neočekávaná odpověď na TIMELINE_HISTORY příkaz: načteno %d řádek a %d "
"položek, očekáváno %d řádek a %d položek\n"
-#: receivelog.c:632 receivelog.c:667
+#: receivelog.c:662
+#, c-format
+#| msgid "%s: server reported unexpected history file name for timeline %u: %s"
+msgid ""
+"%s: server reported unexpected next timeline %u, following timeline %u\n"
+msgstr ""
+"%s: server ohlásil neočekávanou další timeline %u, následující timeline %u\n"
+
+#: receivelog.c:669
+#, c-format
+msgid ""
+"%s: server stopped streaming timeline %u at %X/%X, but reported next "
+"timeline %u to begin at %X/%X\n"
+msgstr ""
+"%s: server přestal streamovat timeline %u at %X/%X, ale začátek další timeline"
+"oznámil %u na %X/%X\n"
+
+#: receivelog.c:681 receivelog.c:716
#, c-format
msgid "%s: unexpected termination of replication stream: %s"
msgstr "%s: neočekávané ukončení replikačního streamu: %s"
-#: receivelog.c:658
+#: receivelog.c:707
#, c-format
msgid "%s: replication stream was terminated before stop point\n"
msgstr "%s: replikační stream byl ukončen před bodem zastavení (stop point)\n"
-#: receivelog.c:726 receivelog.c:822 receivelog.c:985
+#: receivelog.c:755
+#, c-format
+#| msgid ""
+#| "%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
+#| "fields, expected %d rows and %d fields\n"
+msgid ""
+"%s: unexpected result set after end-of-timeline: got %d rows and %d fields, "
+"expected %d rows and %d fields\n"
+msgstr ""
+"%s: neočekávaný výsledek po konci timeline: získáno %d řádek a %d položek, "
+"očekáváno %d řádek a %d položek\n"
+
+#: receivelog.c:765
+#, c-format
+#| msgid "%s: could not parse transaction log location \"%s\"\n"
+msgid "%s: could not parse next timeline's starting point \"%s\"\n"
+msgstr "%s: nelze naparsovat počáteční bod další timeline \"%s\"\n"
+
+#: receivelog.c:820 receivelog.c:922 receivelog.c:1087
#, c-format
msgid "%s: could not send copy-end packet: %s"
msgstr "%s: nelze zaslat ukončovací packet: %s"
-#: receivelog.c:793
+#: receivelog.c:887
#, c-format
msgid "%s: select() failed: %s\n"
msgstr "%s: select() selhal: %s\n"
-#: receivelog.c:801
+#: receivelog.c:895
#, c-format
msgid "%s: could not receive data from WAL stream: %s"
msgstr "%s: nelze získat data z WAL streamu: %s"
-#: receivelog.c:857 receivelog.c:892
+#: receivelog.c:959 receivelog.c:994
#, c-format
msgid "%s: streaming header too small: %d\n"
msgstr "%s: hlavička streamu je příliš malá: %d\n"
-#: receivelog.c:911
+#: receivelog.c:1013
#, c-format
msgid "%s: received transaction log record for offset %u with no file open\n"
msgstr ""
"%s: přijat záznam z transakčního logu pro offset %u bez otevřeného souboru\n"
-#: receivelog.c:923
+#: receivelog.c:1025
#, c-format
msgid "%s: got WAL data offset %08x, expected %08x\n"
msgstr "%s: získán WAL data offset %08x, očekáván %08x\n"
-#: receivelog.c:960
+#: receivelog.c:1062
#, c-format
msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
msgstr "%s: nelze zapsat %u bytů do WAL souboru %s: %s\n"
-#: receivelog.c:998
+#: receivelog.c:1100
#, c-format
msgid "%s: unrecognized streaming header: \"%c\"\n"
msgstr "%s: nerozpoznaná hlavička streamu: \"%c\"\n"
-#: streamutil.c:136
+#: streamutil.c:135
msgid "Password: "
msgstr "Heslo: "
-#: streamutil.c:149
+#: streamutil.c:148
#, c-format
msgid "%s: could not connect to server\n"
msgstr "%s: nelze se připojit k serveru\n"
-#: streamutil.c:165
+#: streamutil.c:164
#, c-format
msgid "%s: could not connect to server: %s\n"
msgstr "%s: nelze se připojit k serveru: %s\n"
-#: streamutil.c:189
+#: streamutil.c:188
#, c-format
msgid "%s: could not determine server setting for integer_datetimes\n"
msgstr "%s: nelze zjistit nastavení volby integer_datetimes na serveru\n"
-#: streamutil.c:202
+#: streamutil.c:201
#, c-format
msgid "%s: integer_datetimes compile flag does not match server\n"
msgstr "%s: integer_datetimes přepínač kompilace neodpovídá serveru\n"
@@ -828,9 +871,6 @@ msgstr "%s: integer_datetimes přepínač kompilace neodpovídá serveru\n"
#~ msgstr ""
#~ "%s: timeline mezi base backupem a streamovacím spojením neodpovídá\n"
-#~ msgid "%s: keepalive message has incorrect size %d\n"
-#~ msgstr "%s: keepalive zpráva má neplatnou velikost: %d\n"
-
#~ msgid " --help show this help, then exit\n"
#~ msgstr " --help zobraz tuto nápovědu, poté skonči\n"
diff --git a/src/bin/pg_basebackup/po/zh_CN.po b/src/bin/pg_basebackup/po/zh_CN.po
new file mode 100644
index 0000000000..50fe601e8b
--- /dev/null
+++ b/src/bin/pg_basebackup/po/zh_CN.po
@@ -0,0 +1,878 @@
+# LANGUAGE message translation file for pg_basebackup
+# Copyright (C) 2012 PostgreSQL Global Development Group
+# This file is distributed under the same license as the PostgreSQL package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pg_basebackup (PostgreSQL) 9.2\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
+"POT-Creation-Date: 2013-09-02 00:26+0000\n"
+"PO-Revision-Date: 2013-09-02 13:16+0800\n"
+"Last-Translator: Xiong He <iihero@qq.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
+#, c-format
+msgid "out of memory\n"
+msgstr "内存溢出\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
+#: pg_basebackup.c:106
+#, c-format
+msgid ""
+"%s takes a base backup of a running PostgreSQL server.\n"
+"\n"
+msgstr ""
+"%s 在运行的PostgreSQL服务器上执行基础备份.\n"
+"\n"
+
+#: pg_basebackup.c:108 pg_receivexlog.c:53
+#, c-format
+msgid "Usage:\n"
+msgstr "使用方法:\n"
+
+#: pg_basebackup.c:109 pg_receivexlog.c:54
+#, c-format
+msgid " %s [OPTION]...\n"
+msgstr " %s [选项]...\n"
+
+#: pg_basebackup.c:110
+#, c-format
+msgid ""
+"\n"
+"Options controlling the output:\n"
+msgstr ""
+"\n"
+"控制输出的选项:\n"
+
+#: pg_basebackup.c:111
+#, c-format
+msgid " -D, --pgdata=DIRECTORY receive base backup into directory\n"
+msgstr " -D, --pgdata=DIRECTORY 接收基础备份到指定目录\n"
+
+#: pg_basebackup.c:112
+#, c-format
+msgid " -F, --format=p|t output format (plain (default), tar)\n"
+msgstr " -F, --format=p|t 输出格式 (纯文本 (缺省值), tar压缩格式)\n"
+
+# help.c:121
+#: pg_basebackup.c:113
+#, c-format
+#| msgid ""
+#| " -0, --record-separator-zero\n"
+#| " set record separator to zero byte\n"
+msgid ""
+" -R, --write-recovery-conf\n"
+" write recovery.conf after backup\n"
+msgstr ""
+" -R, --write-recovery-conf\n"
+" 备份后对文件recovery.conf进行写操作\n"
+
+#: pg_basebackup.c:115
+#, c-format
+msgid ""
+" -x, --xlog include required WAL files in backup (fetch mode)\n"
+msgstr " -x, --xlog 在备份中包含必需的WAL文件(fetch 模式)\n"
+
+#: pg_basebackup.c:116
+#, c-format
+msgid ""
+" -X, --xlog-method=fetch|stream\n"
+" include required WAL files with specified method\n"
+msgstr ""
+" -X, --xlog-method=fetch|stream\n"
+" 按指定的模式包含必需的WAL日志文件\n"
+
+#: pg_basebackup.c:118
+#, c-format
+msgid " -z, --gzip compress tar output\n"
+msgstr " -z, --gzip 对tar文件进行压缩输出\n"
+
+#: pg_basebackup.c:119
+#, c-format
+msgid ""
+" -Z, --compress=0-9 compress tar output with given compression level\n"
+msgstr " -Z, --compress=0-9 按给定的压缩级别对tar文件进行压缩输出\n"
+
+#: pg_basebackup.c:120
+#, c-format
+msgid ""
+"\n"
+"General options:\n"
+msgstr ""
+"\n"
+"一般选项:\n"
+
+#: pg_basebackup.c:121
+#, c-format
+msgid ""
+" -c, --checkpoint=fast|spread\n"
+" set fast or spread checkpointing\n"
+msgstr ""
+" -c, --checkpoint=fast|spread\n"
+" 设置检查点方式(fast或者spread)\n"
+
+#: pg_basebackup.c:123
+#, c-format
+msgid " -l, --label=LABEL set backup label\n"
+msgstr " -l, --label=LABEL 设置备份标签\n"
+
+#: pg_basebackup.c:124
+#, c-format
+msgid " -P, --progress show progress information\n"
+msgstr " -P, --progress 显示进度信息\n"
+
+#: pg_basebackup.c:125 pg_receivexlog.c:58
+#, c-format
+msgid " -v, --verbose output verbose messages\n"
+msgstr " -v, --verbose 输出详细的消息\n"
+
+#: pg_basebackup.c:126 pg_receivexlog.c:59
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version 输出版本信息, 然后退出\n"
+
+#: pg_basebackup.c:127 pg_receivexlog.c:60
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help 显示帮助, 然后退出\n"
+
+#: pg_basebackup.c:128 pg_receivexlog.c:61
+#, c-format
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"联接选项:\n"
+
+#: pg_basebackup.c:129 pg_receivexlog.c:62
+#, c-format
+#| msgid " -d, --dbname=NAME connect to database name\n"
+msgid " -d, --dbname=CONNSTR connection string\n"
+msgstr " -d, --dbname=CONNSTR 连接串\n"
+
+#: pg_basebackup.c:130 pg_receivexlog.c:63
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr " -h, --host=HOSTNAME 数据库服务器主机或者是socket目录\n"
+
+#: pg_basebackup.c:131 pg_receivexlog.c:64
+#, c-format
+msgid " -p, --port=PORT database server port number\n"
+msgstr " -p, --port=PORT 数据库服务器端口号\n"
+
+#: pg_basebackup.c:132 pg_receivexlog.c:65
+#, c-format
+msgid ""
+" -s, --status-interval=INTERVAL\n"
+" time between status packets sent to server (in "
+"seconds)\n"
+msgstr ""
+" -s, --status-interval=INTERVAL\n"
+" 发往服务器的状态包的时间间隔 (以秒计)\n"
+
+#: pg_basebackup.c:134 pg_receivexlog.c:67
+#, c-format
+msgid " -U, --username=NAME connect as specified database user\n"
+msgstr " -U, --username=NAME 指定连接所需的数据库用户名\n"
+
+#: pg_basebackup.c:135 pg_receivexlog.c:68
+#, c-format
+msgid " -w, --no-password never prompt for password\n"
+msgstr " -w, --no-password 禁用输入密码的提示\n"
+
+#: pg_basebackup.c:136 pg_receivexlog.c:69
+#, c-format
+msgid ""
+" -W, --password force password prompt (should happen "
+"automatically)\n"
+msgstr " -W, --password 强制提示输入密码 (应该自动发生)\n"
+
+#: pg_basebackup.c:137 pg_receivexlog.c:70
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"错误报告至 <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_basebackup.c:180
+#, c-format
+msgid "%s: could not read from ready pipe: %s\n"
+msgstr "%s: 无法从准备就绪的管道: %s读\n"
+
+#: pg_basebackup.c:188 pg_basebackup.c:280 pg_basebackup.c:1598
+#: pg_receivexlog.c:266
+#, c-format
+msgid "%s: could not parse transaction log location \"%s\"\n"
+msgstr "%s: 无法解析来自 \"%s\"的事务日志\n"
+
+#: pg_basebackup.c:293
+#, c-format
+msgid "%s: could not create pipe for background process: %s\n"
+msgstr "%s: 无法为后台进程: %s创建管道\n"
+
+#: pg_basebackup.c:326
+#, c-format
+msgid "%s: could not create background process: %s\n"
+msgstr "%s: 无法创建后台进程: %s\n"
+
+#: pg_basebackup.c:338
+#, c-format
+msgid "%s: could not create background thread: %s\n"
+msgstr "%s: 无法创建后台线程: %s\n"
+
+#: pg_basebackup.c:363 pg_basebackup.c:989
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: 无法创建目录 \"%s\": %s\n"
+
+#: pg_basebackup.c:382
+#, c-format
+msgid "%s: directory \"%s\" exists but is not empty\n"
+msgstr "%s: 目录\"%s\"已存在,但不是空的\n"
+
+#: pg_basebackup.c:390
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: 无法访问目录 \"%s\": %s\n"
+
+#: pg_basebackup.c:438
+#, c-format
+#| msgid "%s/%s kB (100%%), %d/%d tablespace %35s"
+#| msgid_plural "%s/%s kB (100%%), %d/%d tablespaces %35s"
+msgid "%*s/%s kB (100%%), %d/%d tablespace %*s"
+msgid_plural "%*s/%s kB (100%%), %d/%d tablespaces %*s"
+msgstr[0] "%*s/%s kB (100%%), %d/%d 表空间 %*s"
+
+#: pg_basebackup.c:450
+#, c-format
+#| msgid "%s/%s kB (%d%%), %d/%d tablespace (%-30.30s)"
+#| msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces (%-30.30s)"
+msgid "%*s/%s kB (%d%%), %d/%d tablespace (%s%-*.*s)"
+msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces (%s%-*.*s)"
+msgstr[0] "%*s/%s kB (%d%%), %d/%d 表空间 (%s%-*.*s)"
+
+#: pg_basebackup.c:466
+#, c-format
+#| msgid "%s/%s kB (%d%%), %d/%d tablespace"
+#| msgid_plural "%s/%s kB (%d%%), %d/%d tablespaces"
+msgid "%*s/%s kB (%d%%), %d/%d tablespace"
+msgid_plural "%*s/%s kB (%d%%), %d/%d tablespaces"
+msgstr[0] "%*s/%s kB (%d%%), %d/%d 表空间"
+
+#: pg_basebackup.c:493
+#, c-format
+msgid "%s: could not write to compressed file \"%s\": %s\n"
+msgstr "%s: 无法往压缩文件里写\"%s\": %s\n"
+
+#: pg_basebackup.c:503 pg_basebackup.c:1071 pg_basebackup.c:1289
+#, c-format
+msgid "%s: could not write to file \"%s\": %s\n"
+msgstr "%s: 无法写文件 \"%s\": %s\n"
+
+#: pg_basebackup.c:558 pg_basebackup.c:578 pg_basebackup.c:606
+#, c-format
+msgid "%s: could not set compression level %d: %s\n"
+msgstr "%s: 无法设置压缩级别 %d: %s\n"
+
+#: pg_basebackup.c:627
+#, c-format
+msgid "%s: could not create compressed file \"%s\": %s\n"
+msgstr "%s: 无法创建压缩文件 \"%s\": %s\n"
+
+#: pg_basebackup.c:638 pg_basebackup.c:1031 pg_basebackup.c:1282
+#, c-format
+msgid "%s: could not create file \"%s\": %s\n"
+msgstr "%s: 无法创建文件 \"%s\": %s\n"
+
+#: pg_basebackup.c:650 pg_basebackup.c:893
+#, c-format
+msgid "%s: could not get COPY data stream: %s"
+msgstr "%s: 无法得到复制数据流: %s"
+
+#: pg_basebackup.c:707
+#, c-format
+msgid "%s: could not close compressed file \"%s\": %s\n"
+msgstr "%s: 无法关闭压缩文件 \"%s\": %s\n"
+
+#: pg_basebackup.c:720 receivelog.c:161 receivelog.c:351 receivelog.c:725
+#, c-format
+msgid "%s: could not close file \"%s\": %s\n"
+msgstr "%s: 无法关闭文件 \"%s\": %s\n"
+
+#: pg_basebackup.c:731 pg_basebackup.c:922 receivelog.c:938
+#, c-format
+msgid "%s: could not read COPY data: %s"
+msgstr "%s: 无法读取复制数据: %s"
+
+#: pg_basebackup.c:936
+#, c-format
+msgid "%s: invalid tar block header size: %d\n"
+msgstr "%s: 无效的tar压缩块头大小: %d\n"
+
+#: pg_basebackup.c:944
+#, c-format
+msgid "%s: could not parse file size\n"
+msgstr "%s: 无法解析文件大小\n"
+
+#: pg_basebackup.c:952
+#, c-format
+msgid "%s: could not parse file mode\n"
+msgstr "%s: 无法解析文件模式\n"
+
+#: pg_basebackup.c:997
+#, c-format
+msgid "%s: could not set permissions on directory \"%s\": %s\n"
+msgstr "%s: 无法设置目录权限 \"%s\": %s\n"
+
+#: pg_basebackup.c:1010
+#, c-format
+msgid "%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"
+msgstr "%s: 无法创建从 \"%s\" 到 \"%s\"的符号链接: %s\n"
+
+#: pg_basebackup.c:1018
+#, c-format
+msgid "%s: unrecognized link indicator \"%c\"\n"
+msgstr "%s: 无法识别的链接标识符 \"%c\"\n"
+
+#: pg_basebackup.c:1038
+#, c-format
+msgid "%s: could not set permissions on file \"%s\": %s\n"
+msgstr "%s: 无法设置文件 \"%s\"的访问权限: %s\n"
+
+#: pg_basebackup.c:1097
+#, c-format
+msgid "%s: COPY stream ended before last file was finished\n"
+msgstr "%s: 复制流在最后一个文件结束前终止\n"
+
+#: pg_basebackup.c:1183 pg_basebackup.c:1203 pg_basebackup.c:1210
+#: pg_basebackup.c:1257
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: 内存溢出\n"
+
+#: pg_basebackup.c:1333
+#, c-format
+#| msgid "%s: could not parse server version \"%s\"\n"
+msgid "%s: incompatible server version %s\n"
+msgstr "%s: 不兼容的服务器版本号 %s\n"
+
+#: pg_basebackup.c:1360 pg_basebackup.c:1389 pg_receivexlog.c:251
+#: receivelog.c:532 receivelog.c:577 receivelog.c:616
+#, c-format
+msgid "%s: could not send replication command \"%s\": %s"
+msgstr "%s: 无法发送复制命令 \"%s\": %s"
+
+#: pg_basebackup.c:1367 pg_receivexlog.c:258 receivelog.c:540
+#, c-format
+msgid ""
+"%s: could not identify system: got %d rows and %d fields, expected %d rows "
+"and %d fields\n"
+msgstr "%s: 无法识别系统: 得到 %d 行和 %d 列, 期望值为: %d 行和 %d 列\n"
+
+#: pg_basebackup.c:1400
+#, c-format
+msgid "%s: could not initiate base backup: %s"
+msgstr "%s: 无法发起基础备份: %s"
+
+#: pg_basebackup.c:1407
+#, c-format
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: server returned unexpected response to BASE_BACKUP command; got %d rows "
+"and %d fields, expected %d rows and %d fields\n"
+msgstr ""
+"%s: 服务器对BASE_BACKUP命令返回意外的响应; 得到 %d 行和 %d 列, 期望值为: %d "
+"行和 %d 列\n"
+
+#: pg_basebackup.c:1427
+#, c-format
+#| msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
+msgid "transaction log start point: %s on timeline %u\n"
+msgstr "事务日志起始于时间点: %s, 基于时间表%u \n"
+
+#: pg_basebackup.c:1436
+#, c-format
+msgid "%s: could not get backup header: %s"
+msgstr "%s: 无法得到备份头: %s"
+
+#: pg_basebackup.c:1442
+#, c-format
+msgid "%s: no data returned from server\n"
+msgstr "%s: 服务器没有数据返回\n"
+
+# Here, we need to understand what's the content "database has"?
+# Is it the stdout fd? or anything else? Please correct me here.
+#: pg_basebackup.c:1471
+#, c-format
+msgid "%s: can only write single tablespace to stdout, database has %d\n"
+msgstr "%s: 只能把表空间写往标准输出, 数据库拥有标准输出: %d\n"
+
+#: pg_basebackup.c:1483
+#, c-format
+msgid "%s: starting background WAL receiver\n"
+msgstr "%s: 启动后台 WAL 接收进程\n"
+
+#: pg_basebackup.c:1513
+#, c-format
+msgid "%s: could not get transaction log end position from server: %s"
+msgstr "%s: 无法得到来自服务器的事务日志终止位置: %s"
+
+#: pg_basebackup.c:1520
+#, c-format
+msgid "%s: no transaction log end position returned from server\n"
+msgstr "%s: 服务器端没有返回事务日志的终止位置\n"
+
+#: pg_basebackup.c:1532
+#, c-format
+msgid "%s: final receive failed: %s"
+msgstr "%s: 最终接收失败: %s"
+
+#: pg_basebackup.c:1550
+#, c-format
+#| msgid "%s: waiting for background process to finish streaming...\n"
+msgid "%s: waiting for background process to finish streaming ...\n"
+msgstr "%s: 等待后台进程结束流操作...\n"
+
+#: pg_basebackup.c:1556
+#, c-format
+msgid "%s: could not send command to background pipe: %s\n"
+msgstr "%s: 无法发送命令到后台管道: %s\n"
+
+#: pg_basebackup.c:1565
+#, c-format
+msgid "%s: could not wait for child process: %s\n"
+msgstr "%s: 无法等待子进程: %s\n"
+
+#: pg_basebackup.c:1571
+#, c-format
+msgid "%s: child %d died, expected %d\n"
+msgstr "%s: 子进程 %d 已终止, 期望值为 %d\n"
+
+#: pg_basebackup.c:1577
+#, c-format
+msgid "%s: child process did not exit normally\n"
+msgstr "%s: 子进程没有正常退出\n"
+
+#: pg_basebackup.c:1583
+#, c-format
+msgid "%s: child process exited with error %d\n"
+msgstr "%s: 子进程退出, 错误码为: %d\n"
+
+#: pg_basebackup.c:1610
+#, c-format
+msgid "%s: could not wait for child thread: %s\n"
+msgstr "%s: 无法等待子线程: %s\n"
+
+#: pg_basebackup.c:1617
+#, c-format
+msgid "%s: could not get child thread exit status: %s\n"
+msgstr "%s: 无法得到子线程退出状态: %s\n"
+
+#: pg_basebackup.c:1623
+#, c-format
+msgid "%s: child thread exited with error %u\n"
+msgstr "%s: 子线程退出, 错误码为: %u\n"
+
+#: pg_basebackup.c:1709
+#, c-format
+msgid "%s: invalid output format \"%s\", must be \"plain\" or \"tar\"\n"
+msgstr "%s: 无效输出格式: \"%s\", 有效值为: \"plain\" 或者 \"tar\"\n"
+
+#: pg_basebackup.c:1721 pg_basebackup.c:1733
+#, c-format
+msgid "%s: cannot specify both --xlog and --xlog-method\n"
+msgstr "%s: 不能同时指定两个选项: --xlog and --xlog-method\n"
+
+#: pg_basebackup.c:1748
+#, c-format
+msgid ""
+"%s: invalid xlog-method option \"%s\", must be \"fetch\" or \"stream\"\n"
+msgstr ""
+"%s: 无效的xlog-method 选项: \"%s\", 必须是: \"fetch\" 或者 \"stream\"\n"
+
+#: pg_basebackup.c:1767
+#, c-format
+msgid "%s: invalid compression level \"%s\"\n"
+msgstr "%s: 无效的压缩级别值: \"%s\"\n"
+
+#: pg_basebackup.c:1779
+#, c-format
+msgid ""
+"%s: invalid checkpoint argument \"%s\", must be \"fast\" or \"spread\"\n"
+msgstr "%s: 无效的检查点参数: \"%s\", 必须是: \"fast\" 或 \"spread\"\n"
+
+#: pg_basebackup.c:1806 pg_receivexlog.c:392
+#, c-format
+msgid "%s: invalid status interval \"%s\"\n"
+msgstr "%s: 无效的状态间隔值: \"%s\"\n"
+
+#: pg_basebackup.c:1822 pg_basebackup.c:1836 pg_basebackup.c:1847
+#: pg_basebackup.c:1860 pg_basebackup.c:1870 pg_receivexlog.c:408
+#: pg_receivexlog.c:422 pg_receivexlog.c:433
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "请用 \"%s --help\" 获取更多的信息.\n"
+
+#: pg_basebackup.c:1834 pg_receivexlog.c:420
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
+
+#: pg_basebackup.c:1846 pg_receivexlog.c:432
+#, c-format
+msgid "%s: no target directory specified\n"
+msgstr "%s: 没有指定目标目录\n"
+
+#: pg_basebackup.c:1858
+#, c-format
+msgid "%s: only tar mode backups can be compressed\n"
+msgstr "%s: 只有tar模式备份才能进行压缩\n"
+
+#: pg_basebackup.c:1868
+#, c-format
+#| msgid "%s: wal streaming can only be used in plain mode\n"
+msgid "%s: WAL streaming can only be used in plain mode\n"
+msgstr "%s: WAL 流操作只能在plain模式下使用\n"
+
+#: pg_basebackup.c:1879
+#, c-format
+msgid "%s: this build does not support compression\n"
+msgstr "%s: 这个编译版本不支持压缩\n"
+
+#: pg_receivexlog.c:51
+#, c-format
+msgid ""
+"%s receives PostgreSQL streaming transaction logs.\n"
+"\n"
+msgstr ""
+"%s 接收PostgreSQL的流事务日志.\n"
+"\n"
+
+#: pg_receivexlog.c:55
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"选项:\n"
+
+#: pg_receivexlog.c:56
+#, c-format
+msgid ""
+" -D, --directory=DIR receive transaction log files into this directory\n"
+msgstr " -D, --directory=DIR 接收事务日志到指定的目录\n"
+
+#: pg_receivexlog.c:57
+#, c-format
+msgid " -n, --no-loop do not loop on connection lost\n"
+msgstr " -n, --no-loop 连接丢失时不进行循环处理\n"
+
+#: pg_receivexlog.c:81
+#, c-format
+msgid "%s: finished segment at %X/%X (timeline %u)\n"
+msgstr "%s: finished segment at %X/%X (timeline %u)\n"
+
+#: pg_receivexlog.c:94
+#, c-format
+msgid "%s: switched to timeline %u at %X/%X\n"
+msgstr "%s: 切换到时间表 %u 在 %X/%X\n"
+
+#: pg_receivexlog.c:103
+#, c-format
+#| msgid "%s: received interrupt signal, exiting.\n"
+msgid "%s: received interrupt signal, exiting\n"
+msgstr "%s: 接收到终断信号, 正在退出\n"
+
+#: pg_receivexlog.c:128
+#, c-format
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: 无法打开目录 \"%s\": %s\n"
+
+#: pg_receivexlog.c:157
+#, c-format
+msgid "%s: could not parse transaction log file name \"%s\"\n"
+msgstr "%s: 无法解析事务日志文件名: \"%s\"\n"
+
+#: pg_receivexlog.c:167
+#, c-format
+msgid "%s: could not stat file \"%s\": %s\n"
+msgstr "%s: 无法统计文件: \"%s\": %s\n"
+
+#: pg_receivexlog.c:185
+#, c-format
+msgid "%s: segment file \"%s\" has incorrect size %d, skipping\n"
+msgstr "%s: 段文件 \"%s\" 大小值: %d不正确, 跳过\n"
+
+#: pg_receivexlog.c:293
+#, c-format
+msgid "%s: starting log streaming at %X/%X (timeline %u)\n"
+msgstr "%s: 在时间点: %X/%X (时间安排%u)启动日志的流操作 \n"
+
+#: pg_receivexlog.c:373
+#, c-format
+msgid "%s: invalid port number \"%s\"\n"
+msgstr "%s: 无效端口号 \"%s\"\n"
+
+#: pg_receivexlog.c:455
+#, fuzzy, c-format
+#| msgid "%s: disconnected.\n"
+msgid "%s: disconnected\n"
+msgstr "%s: 连接已断开.\n"
+
+#. translator: check source for value for %d
+#: pg_receivexlog.c:462
+#, c-format
+#| msgid "%s: disconnected. Waiting %d seconds to try again.\n"
+msgid "%s: disconnected; waiting %d seconds to try again\n"
+msgstr "%s: 连接已断开, 将于%d 秒后尝试重连.\n"
+
+#: receivelog.c:69
+#, c-format
+msgid "%s: could not open transaction log file \"%s\": %s\n"
+msgstr "%s: 无法打开事务日志文件 \"%s\": %s\n"
+
+#: receivelog.c:81
+#, c-format
+msgid "%s: could not stat transaction log file \"%s\": %s\n"
+msgstr "%s: 无法统计事务日志文件 \"%s\": %s\n"
+
+#: receivelog.c:95
+#, c-format
+msgid "%s: transaction log file \"%s\" has %d bytes, should be 0 or %d\n"
+msgstr "%s: 事务日志文件 \"%s\" 大小为 %d 字节, 正确值应该是 0 或 %d字节\n"
+
+#: receivelog.c:108
+#, c-format
+msgid "%s: could not pad transaction log file \"%s\": %s\n"
+msgstr "%s: 无法填充事务日志文件 \"%s\": %s\n"
+
+#: receivelog.c:121
+#, c-format
+msgid "%s: could not seek to beginning of transaction log file \"%s\": %s\n"
+msgstr "%s: 无法定位事务日志文件 \"%s\"的开始位置: %s\n"
+
+#: receivelog.c:147
+#, c-format
+msgid "%s: could not determine seek position in file \"%s\": %s\n"
+msgstr "%s: 无法确定文件 \"%s\"的当前位置: %s\n"
+
+#: receivelog.c:154 receivelog.c:344
+#, c-format
+msgid "%s: could not fsync file \"%s\": %s\n"
+msgstr "%s: 无法对文件 \"%s\"进行fsync同步: %s\n"
+
+#: receivelog.c:181
+#, c-format
+msgid "%s: could not rename file \"%s\": %s\n"
+msgstr "%s: 无法重命名文件 \"%s\": %s\n"
+
+#: receivelog.c:188
+#, c-format
+#| msgid "%s: not renaming \"%s\", segment is not complete\n"
+msgid "%s: not renaming \"%s%s\", segment is not complete\n"
+msgstr "%s: 没有重命名 \"%s%s\", 段不完整\n"
+
+# command.c:1148
+#: receivelog.c:277
+#, c-format
+#| msgid "%s: could not open log file \"%s\": %s\n"
+msgid "%s: could not open timeline history file \"%s\": %s\n"
+msgstr "%s:无法打开时间表历史文件\"%s\":%s\n"
+
+#: receivelog.c:304
+#, c-format
+msgid "%s: server reported unexpected history file name for timeline %u: %s\n"
+msgstr "%s: 服务器为时间表报告生成的意外历史文件名 %u:%s\n"
+
+#: receivelog.c:319
+#, c-format
+#| msgid "%s: could not create file \"%s\": %s\n"
+msgid "%s: could not create timeline history file \"%s\": %s\n"
+msgstr "%s: 无法创建时间表历史文件 \"%s\": %s\n"
+
+#: receivelog.c:336
+#, c-format
+#| msgid "%s: could not write to file \"%s\": %s\n"
+msgid "%s: could not write timeline history file \"%s\": %s\n"
+msgstr "%s: 无法写时间表历史文件 \"%s\": %s\n"
+
+#: receivelog.c:363
+#, c-format
+#| msgid "could not rename file \"%s\" to \"%s\": %m"
+msgid "%s: could not rename file \"%s\" to \"%s\": %s\n"
+msgstr "%s: 无法将文件 \"%s\" 重命名为 \"%s\":%s\n"
+
+#: receivelog.c:436
+#, c-format
+msgid "%s: could not send feedback packet: %s"
+msgstr "%s: 无法发送回馈包: %s"
+
+#: receivelog.c:470
+#, c-format
+#| msgid "No per-database role settings support in this server version.\n"
+msgid ""
+"%s: incompatible server version %s; streaming is only supported with server "
+"version %s\n"
+msgstr "%s: 不兼容的服备器版本号 %s; 只有在版本为%s的服务器中才支持流操作\n"
+
+#: receivelog.c:548
+#, c-format
+msgid ""
+"%s: system identifier does not match between base backup and streaming "
+"connection\n"
+msgstr "%s: 基础备份和流连接的系统标识符不匹配\n"
+
+#: receivelog.c:556
+#, c-format
+msgid "%s: starting timeline %u is not present in the server\n"
+msgstr "%s: 服务器上没有起始时间表 %u\n"
+
+#: receivelog.c:590
+#, c-format
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: unexpected response to TIMELINE_HISTORY command: got %d rows and %d "
+"fields, expected %d rows and %d fields\n"
+msgstr ""
+"%s: 获得命令TIMELINE_HISTORY的意外响应: 得到 %d 行和 %d 列, 期望值为: %d 行"
+"和 %d 列\n"
+
+#: receivelog.c:663
+#, c-format
+msgid ""
+"%s: server reported unexpected next timeline %u, following timeline %u\n"
+msgstr "%s: 服务器报出的下次意外时间表 %u, 紧跟时间表 %u之后\n"
+
+#: receivelog.c:670
+#, c-format
+msgid ""
+"%s: server stopped streaming timeline %u at %X/%X, but reported next "
+"timeline %u to begin at %X/%X\n"
+msgstr ""
+"%s: 服务器在%X/%X时停止流操作时间表%u, 但是报出将在%X/%X时开始下一个时间"
+"表%u\n"
+
+#: receivelog.c:682 receivelog.c:717
+#, c-format
+msgid "%s: unexpected termination of replication stream: %s"
+msgstr "%s: 流复制异常终止: %s"
+
+#: receivelog.c:708
+#, c-format
+msgid "%s: replication stream was terminated before stop point\n"
+msgstr "%s: 流复制在停止点之前异常终止\n"
+
+#: receivelog.c:756
+#, c-format
+#| msgid ""
+#| "%s: could not identify system: got %d rows and %d fields, expected %d "
+#| "rows and %d fields\n"
+msgid ""
+"%s: unexpected result set after end-of-timeline: got %d rows and %d fields, "
+"expected %d rows and %d fields\n"
+msgstr ""
+"%s: 终点时间表的意外结果集: 得到 %d 行和 %d 列, 期望值为: %d 行和 %d 列\n"
+
+#: receivelog.c:766
+#, c-format
+#| msgid "%s: could not parse transaction log location \"%s\"\n"
+msgid "%s: could not parse next timeline's starting point \"%s\"\n"
+msgstr "%s: 无法解析下次时间表的起始点\"%s\"\n"
+
+#: receivelog.c:821 receivelog.c:923 receivelog.c:1088
+#, c-format
+#| msgid "%s: could not send feedback packet: %s"
+msgid "%s: could not send copy-end packet: %s"
+msgstr "%s: 无法发送副本结束包: %s"
+
+#: receivelog.c:888
+#, c-format
+msgid "%s: select() failed: %s\n"
+msgstr "%s: select() 失败: %s\n"
+
+#: receivelog.c:896
+#, c-format
+msgid "%s: could not receive data from WAL stream: %s"
+msgstr "%s: 无法接收来自WAL流的数据: %s"
+
+#: receivelog.c:960 receivelog.c:995
+#, c-format
+msgid "%s: streaming header too small: %d\n"
+msgstr "%s: 流头大小: %d 值太小\n"
+
+#: receivelog.c:1014
+#, c-format
+msgid "%s: received transaction log record for offset %u with no file open\n"
+msgstr "%s: 偏移位置 %u 处接收到的事务日志记录没有打开文件\n"
+
+#: receivelog.c:1026
+#, c-format
+msgid "%s: got WAL data offset %08x, expected %08x\n"
+msgstr "%s: 得到WAL数据偏移 %08x, 期望值为 %08x\n"
+
+#: receivelog.c:1063
+#, c-format
+msgid "%s: could not write %u bytes to WAL file \"%s\": %s\n"
+msgstr "%s: 无法写入 %u 字节到 WAL 文件 \"%s\": %s\n"
+
+#: receivelog.c:1101
+#, c-format
+msgid "%s: unrecognized streaming header: \"%c\"\n"
+msgstr "%s: 无法识别的流头: \"%c\"\n"
+
+#: streamutil.c:135
+msgid "Password: "
+msgstr "口令: "
+
+#: streamutil.c:148
+#, c-format
+msgid "%s: could not connect to server\n"
+msgstr "%s: 无法连接到服务器\n"
+
+#: streamutil.c:164
+#, c-format
+msgid "%s: could not connect to server: %s\n"
+msgstr "%s: 无法连接到服务器: %s\n"
+
+#: streamutil.c:188
+#, c-format
+msgid "%s: could not determine server setting for integer_datetimes\n"
+msgstr "%s: 无法确定服务器上integer_datetimes的配置\n"
+
+#: streamutil.c:201
+#, c-format
+msgid "%s: integer_datetimes compile flag does not match server\n"
+msgstr "%s: integer_datetimes编译开关与服务器端不匹配\n"
+
+#~ msgid "%s: keepalive message has incorrect size %d\n"
+#~ msgstr "%s: keepalive(保持活连接)的消息大小 %d 不正确 \n"
+
+#~ msgid ""
+#~ "%s: timeline does not match between base backup and streaming connection\n"
+#~ msgstr "%s: 基础备份和流连接的时间安排不匹配\n"
+
+#~ msgid "%s: no start point returned from server\n"
+#~ msgstr "%s: 服务器没有返回起始点\n"
diff --git a/src/bin/pg_config/po/ko.po b/src/bin/pg_config/po/ko.po
index 6369661b90..6a974aa6bb 100644
--- a/src/bin/pg_config/po/ko.po
+++ b/src/bin/pg_config/po/ko.po
@@ -6,9 +6,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-09-09 16:34+0000\n"
-"PO-Revision-Date: 2010-09-24 12:26-0400\n"
+"PO-Revision-Date: 2013-09-05 22:34-0400\n"
"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=euc-kr\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/pg_config/po/nb.po b/src/bin/pg_config/po/nb.po
index c42b48919c..05af975ccd 100644
--- a/src/bin/pg_config/po/nb.po
+++ b/src/bin/pg_config/po/nb.po
@@ -2,9 +2,10 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 8.1\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2006-05-24 18:13+0100\n"
+"PO-Revision-Date: 2013-09-05 22:56-0400\n"
"Last-Translator: Erik B. Ottesen <erikbagg@stud.ntnu.no>\n"
"Language-Team: \n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/pg_config/po/ro.po b/src/bin/pg_config/po/ro.po
index 283cc115ec..9b5461b112 100644
--- a/src/bin/pg_config/po/ro.po
+++ b/src/bin/pg_config/po/ro.po
@@ -6,9 +6,10 @@ msgstr ""
"Project-Id-Version: pg_config-ro\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-09-02 18:00+0000\n"
-"PO-Revision-Date: 2010-09-04 21:44-0000\n"
+"PO-Revision-Date: 2013-09-05 23:01-0400\n"
"Last-Translator: Max <max@oceanline.co.uk>\n"
"Language-Team: Română <max@oceanline.co.uk>\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/pg_config/po/ta.po b/src/bin/pg_config/po/ta.po
index 36e94d17b7..0ffdbf2d86 100644
--- a/src/bin/pg_config/po/ta.po
+++ b/src/bin/pg_config/po/ta.po
@@ -7,9 +7,10 @@ msgstr ""
"Project-Id-Version: போஸ்ட்கிரெஸ் தமிழாக்கக் குழு\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-09-22 03:19-0300\n"
-"PO-Revision-Date: 2007-10-19 00:01+0530\n"
+"PO-Revision-Date: 2013-09-04 22:09-0400\n"
"Last-Translator: ஆமாச்சு <amachu@ubuntu.com>\n"
"Language-Team: தமிழ் <ubuntu-l10n-tam@lists.ubuntu.com>\n"
+"Language: ta\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/pg_config/po/tr.po b/src/bin/pg_config/po/tr.po
index 477e33b8f4..c7e21305bf 100644
--- a/src/bin/pg_config/po/tr.po
+++ b/src/bin/pg_config/po/tr.po
@@ -7,9 +7,10 @@ msgstr ""
"Project-Id-Version: pg_config-tr\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-08-31 20:02+0000\n"
-"PO-Revision-Date: 2010-09-01 11:05+0200\n"
+"PO-Revision-Date: 2013-09-04 20:49-0400\n"
"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
"Language-Team: Turkish <ceviri@postgresql.org.tr>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/pg_config/po/zh_CN.po b/src/bin/pg_config/po/zh_CN.po
index 8514259230..faa24598a4 100644
--- a/src/bin/pg_config/po/zh_CN.po
+++ b/src/bin/pg_config/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_config (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:45+0000\n"
-"PO-Revision-Date: 2012-10-19 13:16+0800\n"
+"POT-Creation-Date: 2013-09-02 00:26+0000\n"
+"PO-Revision-Date: 2013-09-02 13:17+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,62 +16,44 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:144
+#: ../../port/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:193
+#: ../../port/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:200
+#: ../../port/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:255 ../../port/exec.c:291
+#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "无法进入目录 \"%s\""
+#| msgid "could not change directory to \"%s\": %m"
+msgid "could not change directory to \"%s\": %s"
+msgstr "无法跳转到目录 \"%s\" 中: %s"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:526
+#: ../../port/exec.c:523
#, c-format
-msgid "child process exited with exit code %d"
-msgstr "子进程已退出, 退出码为 %d"
-
-#: ../../port/exec.c:530
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "子进程被例外(exception) 0x%X 终止"
-
-#: ../../port/exec.c:539
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "子进程被信号 %s 终止"
-
-#: ../../port/exec.c:542
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "子进程被信号 %d 终止"
-
-#: ../../port/exec.c:546
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "子进程已退出, 未知状态 %d"
+#| msgid "query failed: %s"
+msgid "pclose failed: %s"
+msgstr "pclose调用失败: %s"
#: pg_config.c:243 pg_config.c:259 pg_config.c:275 pg_config.c:291
#: pg_config.c:307 pg_config.c:323 pg_config.c:339 pg_config.c:355
@@ -280,18 +262,10 @@ msgstr "%s: 无法找到执行文件\n"
msgid "%s: invalid argument: %s\n"
msgstr "%s: 无效参数: %s\n"
-#~ msgid "%s: could not find own executable\n"
-#~ msgstr "%s: 找不到执行文件\n"
-
-#~ msgid "%s: argument required\n"
-#~ msgstr "%s: 需要参数\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Try \"%s --help\" for more information\n"
+#~ msgid " --help show this help, then exit\n"
#~ msgstr ""
+#~ " --help 显示此帮助信息, 然后退出\n"
#~ "\n"
-#~ "试用 \"%s --help\" 获取更多的信息\n"
#~ msgid ""
#~ " %s OPTION...\n"
@@ -300,7 +274,33 @@ msgstr "%s: 无效参数: %s\n"
#~ " %s 选项...\n"
#~ "\n"
-#~ msgid " --help show this help, then exit\n"
+#~ msgid ""
+#~ "\n"
+#~ "Try \"%s --help\" for more information\n"
#~ msgstr ""
-#~ " --help 显示此帮助信息, 然后退出\n"
#~ "\n"
+#~ "试用 \"%s --help\" 获取更多的信息\n"
+
+#~ msgid "%s: argument required\n"
+#~ msgstr "%s: 需要参数\n"
+
+#~ msgid "%s: could not find own executable\n"
+#~ msgstr "%s: 找不到执行文件\n"
+
+#~ msgid "child process exited with unrecognized status %d"
+#~ msgstr "子进程已退出, 未知状态 %d"
+
+#~ msgid "child process was terminated by signal %d"
+#~ msgstr "子进程被信号 %d 终止"
+
+#~ msgid "child process was terminated by signal %s"
+#~ msgstr "子进程被信号 %s 终止"
+
+#~ msgid "child process was terminated by exception 0x%X"
+#~ msgstr "子进程被例外(exception) 0x%X 终止"
+
+#~ msgid "child process exited with exit code %d"
+#~ msgstr "子进程已退出, 退出码为 %d"
+
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "无法进入目录 \"%s\""
diff --git a/src/bin/pg_config/po/zh_TW.po b/src/bin/pg_config/po/zh_TW.po
index 05d685bffb..d7780000c2 100644
--- a/src/bin/pg_config/po/zh_TW.po
+++ b/src/bin/pg_config/po/zh_TW.po
@@ -8,11 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-11 20:40+0000\n"
-"PO-Revision-Date: 2011-05-09 13:55+0800\n"
+"PO-Revision-Date: 2013-09-03 23:27-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
-"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
-"com>\n"
-"Language: \n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/pg_controldata/po/cs.po b/src/bin/pg_controldata/po/cs.po
index 453c238f89..86626496d0 100644
--- a/src/bin/pg_controldata/po/cs.po
+++ b/src/bin/pg_controldata/po/cs.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.2\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:48+0000\n"
-"PO-Revision-Date: 2013-03-17 21:52+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:20+0000\n"
+"PO-Revision-Date: 2013-09-24 20:38+0200\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -201,7 +201,6 @@ msgstr "Poslední umístění REDO checkpointu: %X/%X\n"
#: pg_controldata.c:214
#, c-format
-#| msgid "Latest checkpoint's REDO location: %X/%X\n"
msgid "Latest checkpoint's REDO WAL file: %s\n"
msgstr "REDO WAL file posledního checkpointu: %s\n"
@@ -212,7 +211,6 @@ msgstr "TimeLineID posledního checkpointu: %u\n"
#: pg_controldata.c:218
#, c-format
-#| msgid "Latest checkpoint's TimeLineID: %u\n"
msgid "Latest checkpoint's PrevTimeLineID: %u\n"
msgstr "PrevTimeLineID posledního checkpointu: %u\n"
@@ -266,13 +264,11 @@ msgstr "oldestActiveXID posledního checkpointu: %u\n"
#: pg_controldata.c:237
#, c-format
-#| msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgid "Latest checkpoint's oldestMultiXid: %u\n"
msgstr "oldestMultiXid posledního checkpointu: %u\n"
#: pg_controldata.c:239
#, c-format
-#| msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgid "Latest checkpoint's oldestMulti's DB: %u\n"
msgstr "oldestMulti's DB posledního checkpointu: %u\n"
@@ -293,9 +289,8 @@ msgstr "Minimální pozice ukončení obnovy: %X/%X\n"
#: pg_controldata.c:249
#, c-format
-#| msgid "Minimum recovery ending location: %X/%X\n"
msgid "Min recovery ending loc's timeline: %u\n"
-msgstr ""
+msgstr "Timeline minimální pozice ukončení obnovy: %u\n"
#: pg_controldata.c:251
#, c-format
@@ -411,6 +406,12 @@ msgstr "hodnotou"
msgid "Float8 argument passing: %s\n"
msgstr "Způsob předávání float8 hodnot: %s\n"
+#: pg_controldata.c:290
+#, c-format
+#| msgid "Catalog version number: %u\n"
+msgid "Data page checksum version: %u\n"
+msgstr "Verze kontrolních součtů datových stránek: %u\n"
+
#~ msgid ""
#~ "Usage:\n"
#~ " %s [OPTION] [DATADIR]\n"
diff --git a/src/bin/pg_controldata/po/zh_CN.po b/src/bin/pg_controldata/po/zh_CN.po
index 98a2ada4a2..e33866ecb8 100644
--- a/src/bin/pg_controldata/po/zh_CN.po
+++ b/src/bin/pg_controldata/po/zh_CN.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_controldata (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:47+0000\n"
-"PO-Revision-Date: 2012-10-19 14:39+0800\n"
+"POT-Creation-Date: 2013-09-02 00:28+0000\n"
+"PO-Revision-Date: 2013-09-02 14:28+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: pg_controldata.c:33
+#: pg_controldata.c:34
#, c-format
msgid ""
"%s displays control information of a PostgreSQL database cluster.\n"
@@ -24,17 +24,17 @@ msgstr ""
"%s 显示 PostgreSQL 数据库簇控制信息.\n"
"\n"
-#: pg_controldata.c:34
+#: pg_controldata.c:35
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: pg_controldata.c:35
+#: pg_controldata.c:36
#, c-format
msgid " %s [OPTION] [DATADIR]\n"
msgstr " %s [选项][DATADIR]\n"
-#: pg_controldata.c:36
+#: pg_controldata.c:37
#, c-format
msgid ""
"\n"
@@ -43,17 +43,17 @@ msgstr ""
"\n"
"选项:\n"
-#: pg_controldata.c:37
+#: pg_controldata.c:38
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息,然后退出\n"
-#: pg_controldata.c:38
+#: pg_controldata.c:39
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示帮助信息,然后退出\n"
-#: pg_controldata.c:39
+#: pg_controldata.c:40
#, c-format
msgid ""
"\n"
@@ -67,68 +67,68 @@ msgstr ""
"环境变量PGDATA.\n"
"\n"
-#: pg_controldata.c:41
+#: pg_controldata.c:42
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "报告错误至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_controldata.c:51
+#: pg_controldata.c:52
msgid "starting up"
msgstr "正在启动"
-#: pg_controldata.c:53
+#: pg_controldata.c:54
msgid "shut down"
msgstr "关闭"
-#: pg_controldata.c:55
+#: pg_controldata.c:56
msgid "shut down in recovery"
msgstr "在恢复过程中关闭数据库"
-#: pg_controldata.c:57
+#: pg_controldata.c:58
msgid "shutting down"
msgstr "正在关闭"
-#: pg_controldata.c:59
+#: pg_controldata.c:60
msgid "in crash recovery"
msgstr "在恢复中"
-#: pg_controldata.c:61
+#: pg_controldata.c:62
msgid "in archive recovery"
msgstr "正在归档恢复"
-#: pg_controldata.c:63
+#: pg_controldata.c:64
msgid "in production"
msgstr "在运行中"
-#: pg_controldata.c:65
+#: pg_controldata.c:66
msgid "unrecognized status code"
msgstr "不被认可的状态码"
-#: pg_controldata.c:80
+#: pg_controldata.c:81
msgid "unrecognized wal_level"
msgstr "参数wal_level的值无法识别"
-#: pg_controldata.c:123
+#: pg_controldata.c:126
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: 没有指定数据目录\n"
-#: pg_controldata.c:124
+#: pg_controldata.c:127
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "用 \"%s --help\" 显示更多的信息.\n"
-#: pg_controldata.c:132
+#: pg_controldata.c:135
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
-#: pg_controldata.c:139
+#: pg_controldata.c:142
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: 无法读取文件 \"%s\": %s\n"
-#: pg_controldata.c:153
+#: pg_controldata.c:156
#, c-format
msgid ""
"WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -141,12 +141,12 @@ msgstr ""
"下面的结果是不可靠的.\n"
"\n"
-#: pg_controldata.c:180
+#: pg_controldata.c:190
#, c-format
msgid "pg_control version number: %u\n"
msgstr "pg_control 版本: %u\n"
-#: pg_controldata.c:183
+#: pg_controldata.c:193
#, c-format
msgid ""
"WARNING: possible byte ordering mismatch\n"
@@ -160,234 +160,260 @@ msgstr ""
"在那种情况下结果将会是不正确的,并且所安装的PostgreSQL\n"
"将会与这个数据目录不兼容\n"
-#: pg_controldata.c:187
+#: pg_controldata.c:197
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Catalog 版本: %u\n"
-#: pg_controldata.c:189
+#: pg_controldata.c:199
#, c-format
msgid "Database system identifier: %s\n"
msgstr "数据库系统标识符: %s\n"
-#: pg_controldata.c:191
+#: pg_controldata.c:201
#, c-format
msgid "Database cluster state: %s\n"
msgstr "数据库簇状态: %s\n"
-#: pg_controldata.c:193
+#: pg_controldata.c:203
#, c-format
msgid "pg_control last modified: %s\n"
msgstr "pg_control 最后修改: %s\n"
-#: pg_controldata.c:195
+#: pg_controldata.c:205
#, c-format
msgid "Latest checkpoint location: %X/%X\n"
msgstr "最新检查点位置: %X/%X\n"
-#: pg_controldata.c:198
+#: pg_controldata.c:208
#, c-format
msgid "Prior checkpoint location: %X/%X\n"
msgstr "优先检查点位置: %X/%X\n"
-#: pg_controldata.c:201
+#: pg_controldata.c:211
#, c-format
msgid "Latest checkpoint's REDO location: %X/%X\n"
msgstr "最新检查点的 REDO 位置: %X/%X\n"
-#: pg_controldata.c:204
+#: pg_controldata.c:214
+#, c-format
+#| msgid "Latest checkpoint's REDO location: %X/%X\n"
+msgid "Latest checkpoint's REDO WAL file: %s\n"
+msgstr "最新检查点的重做日志文件: %s\n"
+
+#: pg_controldata.c:216
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "最新检查点的 TimeLineID: %u\n"
-#: pg_controldata.c:206
+#: pg_controldata.c:218
+#, c-format
+#| msgid "Latest checkpoint's TimeLineID: %u\n"
+msgid "Latest checkpoint's PrevTimeLineID: %u\n"
+msgstr "最新检查点的PrevTimeLineID: %u\n"
+
+#: pg_controldata.c:220
#, c-format
msgid "Latest checkpoint's full_page_writes: %s\n"
msgstr "最新检查点的full_page_writes: %s\n"
# help.c:48
-#: pg_controldata.c:207
+#: pg_controldata.c:221
msgid "off"
msgstr "关闭"
# help.c:48
-#: pg_controldata.c:207
+#: pg_controldata.c:221
msgid "on"
msgstr "开启"
-#: pg_controldata.c:208
+#: pg_controldata.c:222
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "最新检查点的 NextXID: %u/%u\n"
-#: pg_controldata.c:211
+#: pg_controldata.c:225
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "最新检查点的 NextOID: %u\n"
-#: pg_controldata.c:213
+#: pg_controldata.c:227
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "最新检查点的NextMultiXactId: %u\n"
-#: pg_controldata.c:215
+#: pg_controldata.c:229
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "最新检查点的NextMultiOffsetD: %u\n"
-#: pg_controldata.c:217
+#: pg_controldata.c:231
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
msgstr "最新检查点的oldestXID: %u\n"
-#: pg_controldata.c:219
+#: pg_controldata.c:233
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgstr "最新检查点的oldestXID所在的数据库:%u\n"
-#: pg_controldata.c:221
+#: pg_controldata.c:235
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgstr "最新检查点检查oldestActiveXID: %u\n"
-#: pg_controldata.c:223
+#: pg_controldata.c:237
+#, c-format
+#| msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgid "Latest checkpoint's oldestMultiXid: %u\n"
+msgstr "最新检查点检查oldestMultiXid: %u\n"
+
+#: pg_controldata.c:239
+#, c-format
+#| msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgid "Latest checkpoint's oldestMulti's DB: %u\n"
+msgstr "最新检查点的oldestMulti所在的数据库:%u\n"
+
+#: pg_controldata.c:241
#, c-format
msgid "Time of latest checkpoint: %s\n"
msgstr "最新检查点的时间: %s\n"
-#: pg_controldata.c:225
+#: pg_controldata.c:243
+#, c-format
+msgid "Fake LSN counter for unlogged rels: %X/%X\n"
+msgstr "不带日志的关系: %X/%X使用虚假的LSN计数器\n"
+
+#: pg_controldata.c:246
#, c-format
msgid "Minimum recovery ending location: %X/%X\n"
msgstr "最小恢复结束位置: %X/%X\n"
-#: pg_controldata.c:228
+#: pg_controldata.c:249
+#, c-format
+#| msgid "Minimum recovery ending location: %X/%X\n"
+msgid "Min recovery ending loc's timeline: %u\n"
+msgstr "最小恢复结束位置时间表: %u\n"
+
+#: pg_controldata.c:251
#, c-format
msgid "Backup start location: %X/%X\n"
msgstr "开始进行备份的点位置: %X/%X\n"
-#: pg_controldata.c:231
+#: pg_controldata.c:254
#, c-format
msgid "Backup end location: %X/%X\n"
msgstr "备份的最终位置: %X/%X\n"
-#: pg_controldata.c:234
+#: pg_controldata.c:257
#, c-format
msgid "End-of-backup record required: %s\n"
msgstr "需要终止备份的记录: %s\n"
-#: pg_controldata.c:235
+#: pg_controldata.c:258
msgid "no"
msgstr "否"
-#: pg_controldata.c:235
+#: pg_controldata.c:258
msgid "yes"
msgstr "是"
-#: pg_controldata.c:236
+#: pg_controldata.c:259
#, c-format
msgid "Current wal_level setting: %s\n"
msgstr "参数wal_level的当前设置: %s\n"
-#: pg_controldata.c:238
+#: pg_controldata.c:261
#, c-format
msgid "Current max_connections setting: %d\n"
msgstr "参数max_connections的当前设置: %d\n"
-#: pg_controldata.c:240
+#: pg_controldata.c:263
#, c-format
msgid "Current max_prepared_xacts setting: %d\n"
msgstr "参数 max_prepared_xacts的当前设置: %d\n"
-#: pg_controldata.c:242
+#: pg_controldata.c:265
#, c-format
msgid "Current max_locks_per_xact setting: %d\n"
msgstr "参数max_locks_per_xact setting的当前设置: %d\n"
-#: pg_controldata.c:244
+#: pg_controldata.c:267
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "最大数据校准: %u\n"
-#: pg_controldata.c:247
+#: pg_controldata.c:270
#, c-format
msgid "Database block size: %u\n"
msgstr "数据库块大小: %u\n"
-#: pg_controldata.c:249
+#: pg_controldata.c:272
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "大关系的每段块数: %u\n"
-#: pg_controldata.c:251
+#: pg_controldata.c:274
#, c-format
msgid "WAL block size: %u\n"
msgstr "WAL的块大小: %u\n"
-#: pg_controldata.c:253
+#: pg_controldata.c:276
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "每一个 WAL 段字节数: %u\n"
-#: pg_controldata.c:255
+#: pg_controldata.c:278
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "标识符的最大长度: %u\n"
-#: pg_controldata.c:257
+#: pg_controldata.c:280
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "在索引中可允许使用最大的列数: %u\n"
-#: pg_controldata.c:259
+#: pg_controldata.c:282
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "TOAST区块的最大长度: %u\n"
-#: pg_controldata.c:261
+#: pg_controldata.c:284
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "日期/时间 类型存储: %s\n"
-#: pg_controldata.c:262
+#: pg_controldata.c:285
msgid "64-bit integers"
msgstr "64位整数"
-#: pg_controldata.c:262
+#: pg_controldata.c:285
msgid "floating-point numbers"
msgstr "浮点数"
-#: pg_controldata.c:263
+#: pg_controldata.c:286
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "正在传递Flloat4类型的参数: %s\n"
-#: pg_controldata.c:264 pg_controldata.c:266
+#: pg_controldata.c:287 pg_controldata.c:289
msgid "by reference"
msgstr "由引用"
-#: pg_controldata.c:264 pg_controldata.c:266
+#: pg_controldata.c:287 pg_controldata.c:289
msgid "by value"
msgstr "由值"
-#: pg_controldata.c:265
+#: pg_controldata.c:288
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "正在传递Flloat8类型的参数: %s\n"
-#~ msgid "Latest checkpoint's StartUpID: %u\n"
-#~ msgstr "最新检查点的 StartUpID: %u\n"
-
-#~ msgid "LC_CTYPE: %s\n"
-#~ msgstr "LC_CTYPE: %s\n"
-
-#~ msgid "LC_COLLATE: %s\n"
-#~ msgstr "LC_COLLATE: %s\n"
-
-#~ msgid "Maximum number of function arguments: %u\n"
-#~ msgstr "函数参数的最大个数: %u\n"
-
-#~ msgid "Latest checkpoint's UNDO location: %X/%X\n"
-#~ msgstr "最新检查点的 UNDO 位置: %X/%X\n"
+#: pg_controldata.c:290
+#, c-format
+#| msgid "Catalog version number: %u\n"
+msgid "Data page checksum version: %u\n"
+msgstr "数据页校验和版本: %u\n"
#~ msgid ""
#~ "Usage:\n"
@@ -403,3 +429,18 @@ msgstr "正在传递Flloat8类型的参数: %s\n"
#~ "选项:\n"
#~ " --help 显示此帮助信息, 然后退出\n"
#~ " --version 显示 pg_controldata 的版本, 然后退出\n"
+
+#~ msgid "Latest checkpoint's UNDO location: %X/%X\n"
+#~ msgstr "最新检查点的 UNDO 位置: %X/%X\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "函数参数的最大个数: %u\n"
+
+#~ msgid "LC_COLLATE: %s\n"
+#~ msgstr "LC_COLLATE: %s\n"
+
+#~ msgid "LC_CTYPE: %s\n"
+#~ msgstr "LC_CTYPE: %s\n"
+
+#~ msgid "Latest checkpoint's StartUpID: %u\n"
+#~ msgstr "最新检查点的 StartUpID: %u\n"
diff --git a/src/bin/pg_ctl/po/cs.po b/src/bin/pg_ctl/po/cs.po
index 42e3cdbd53..f61c7c04dc 100644
--- a/src/bin/pg_ctl/po/cs.po
+++ b/src/bin/pg_ctl/po/cs.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.2\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:46+0000\n"
-"PO-Revision-Date: 2013-03-17 21:57+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:18+0000\n"
+"PO-Revision-Date: 2013-10-07 14:23-0400\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,6 @@ msgstr ""
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
#: ../../common/fe_memutils.c:83
#, c-format
-#| msgid "%s: out of memory\n"
msgid "out of memory\n"
msgstr "nedostatek paměti\n"
@@ -52,7 +51,6 @@ msgstr "nelze najít spustitelný soubor \"%s\""
#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-#| msgid "could not change directory to \"%s\""
msgid "could not change directory to \"%s\": %s"
msgstr "nelze změnit adresář na \"%s\" : %s"
@@ -108,7 +106,6 @@ msgstr "%s: nelze otevřít PID soubor \"%s\": %s\n"
#: pg_ctl.c:262
#, c-format
-#| msgid "%s: PID file \"%s\" does not exist\n"
msgid "%s: the PID file \"%s\" is empty\n"
msgstr "%s: PID soubor \"%s\" je prázdný\n"
@@ -117,7 +114,7 @@ msgstr "%s: PID soubor \"%s\" je prázdný\n"
msgid "%s: invalid data in PID file \"%s\"\n"
msgstr "%s: neplatná data v PID souboru \"%s\"\n"
-#: pg_ctl.c:476
+#: pg_ctl.c:477
#, c-format
msgid ""
"\n"
@@ -126,7 +123,7 @@ msgstr ""
"\n"
"%s: -w volba není podporována při startu pre-9.1 serveru\n"
-#: pg_ctl.c:546
+#: pg_ctl.c:547
#, c-format
msgid ""
"\n"
@@ -135,7 +132,7 @@ msgstr ""
"\n"
"%s: -w volba nemůže používat relativně zadaný adresář socketu\n"
-#: pg_ctl.c:594
+#: pg_ctl.c:595
#, c-format
msgid ""
"\n"
@@ -144,22 +141,22 @@ msgstr ""
"\n"
"%s: zdá se že v tomto datovém adresáři již běží existující postmaster\n"
-#: pg_ctl.c:644
+#: pg_ctl.c:645
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
msgstr "%s: nelze nastavit limit pro core soubor; zakázáno hard limitem\n"
-#: pg_ctl.c:669
+#: pg_ctl.c:670
#, c-format
msgid "%s: could not read file \"%s\"\n"
msgstr "%s: nelze číst soubor \"%s\"\n"
-#: pg_ctl.c:674
+#: pg_ctl.c:675
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
msgstr "%s: soubor s volbami \"%s\" musí mít přesně jednu řádku\n"
-#: pg_ctl.c:722
+#: pg_ctl.c:723
#, c-format
msgid ""
"The program \"%s\" is needed by %s but was not found in the\n"
@@ -170,7 +167,7 @@ msgstr ""
"adresáři jako \"%s\".\n"
"Zkontrolujte vaši instalaci.\n"
-#: pg_ctl.c:728
+#: pg_ctl.c:729
#, c-format
msgid ""
"The program \"%s\" was found by \"%s\"\n"
@@ -181,42 +178,42 @@ msgstr ""
"ale nebyl ve stejné verzi jako %s.\n"
"Zkontrolujte vaši instalaci.\n"
-#: pg_ctl.c:761
+#: pg_ctl.c:762
#, c-format
msgid "%s: database system initialization failed\n"
msgstr "%s: inicializace databáze selhala\n"
-#: pg_ctl.c:776
+#: pg_ctl.c:777
#, c-format
msgid "%s: another server might be running; trying to start server anyway\n"
msgstr "%s: další server možná běží; i tak zkouším start\n"
-#: pg_ctl.c:813
+#: pg_ctl.c:814
#, c-format
msgid "%s: could not start server: exit code was %d\n"
msgstr "%s: nelze nastartovat server: návratový kód byl %d\n"
-#: pg_ctl.c:820
+#: pg_ctl.c:821
msgid "waiting for server to start..."
msgstr "čekám na start serveru ..."
-#: pg_ctl.c:825 pg_ctl.c:926 pg_ctl.c:1017
+#: pg_ctl.c:826 pg_ctl.c:927 pg_ctl.c:1018
msgid " done\n"
msgstr " hotovo\n"
-#: pg_ctl.c:826
+#: pg_ctl.c:827
msgid "server started\n"
msgstr "server spuštěn\n"
-#: pg_ctl.c:829 pg_ctl.c:833
+#: pg_ctl.c:830 pg_ctl.c:834
msgid " stopped waiting\n"
msgstr " přestávám čekat\n"
-#: pg_ctl.c:830
+#: pg_ctl.c:831
msgid "server is still starting up\n"
msgstr "server stále startuje\n"
-#: pg_ctl.c:834
+#: pg_ctl.c:835
#, c-format
msgid ""
"%s: could not start server\n"
@@ -225,44 +222,44 @@ msgstr ""
"%s: nelze spustit server\n"
"Zkontrolujte záznam v logu.\n"
-#: pg_ctl.c:840 pg_ctl.c:918 pg_ctl.c:1008
+#: pg_ctl.c:841 pg_ctl.c:919 pg_ctl.c:1009
msgid " failed\n"
msgstr " selhalo\n"
-#: pg_ctl.c:841
+#: pg_ctl.c:842
#, c-format
msgid "%s: could not wait for server because of misconfiguration\n"
msgstr "%s: nelze čekat na server kvůli chybné konfiguraci\n"
-#: pg_ctl.c:847
+#: pg_ctl.c:848
msgid "server starting\n"
msgstr "server startuje\n"
-#: pg_ctl.c:862 pg_ctl.c:948 pg_ctl.c:1038 pg_ctl.c:1078
+#: pg_ctl.c:863 pg_ctl.c:949 pg_ctl.c:1039 pg_ctl.c:1079
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
msgstr "%s: PID soubor \"%s\" neexistuje\n"
-#: pg_ctl.c:863 pg_ctl.c:950 pg_ctl.c:1039 pg_ctl.c:1079
+#: pg_ctl.c:864 pg_ctl.c:951 pg_ctl.c:1040 pg_ctl.c:1080
msgid "Is server running?\n"
msgstr "Běží server?\n"
-#: pg_ctl.c:869
+#: pg_ctl.c:870
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: nemohu zastavit server; postgres běží v single-user módu (PID: %ld)\n"
-#: pg_ctl.c:877 pg_ctl.c:972
+#: pg_ctl.c:878 pg_ctl.c:973
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
msgstr "%s: nelze poslat stop signál (PID: %ld): %s\n"
-#: pg_ctl.c:884
+#: pg_ctl.c:885
msgid "server shutting down\n"
msgstr "server se ukončuje\n"
-#: pg_ctl.c:899 pg_ctl.c:987
+#: pg_ctl.c:900 pg_ctl.c:988
msgid ""
"WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -272,16 +269,16 @@ msgstr ""
"Shutdown nebude ukončen dokud nebude zavolán pg_stop_backup().\n"
"\n"
-#: pg_ctl.c:903 pg_ctl.c:991
+#: pg_ctl.c:904 pg_ctl.c:992
msgid "waiting for server to shut down..."
msgstr "čekám na ukončení serveru ..."
-#: pg_ctl.c:920 pg_ctl.c:1010
+#: pg_ctl.c:921 pg_ctl.c:1011
#, c-format
msgid "%s: server does not shut down\n"
msgstr "%s: server se neukončuje\n"
-#: pg_ctl.c:922 pg_ctl.c:1012
+#: pg_ctl.c:923 pg_ctl.c:1013
msgid ""
"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
"waiting for session-initiated disconnection.\n"
@@ -289,191 +286,191 @@ msgstr ""
"TIP: Volba \"-m fast\" okamžitě ukončí sezení namísto aby čekala\n"
"na odpojení iniciované přímo session.\n"
-#: pg_ctl.c:928 pg_ctl.c:1018
+#: pg_ctl.c:929 pg_ctl.c:1019
msgid "server stopped\n"
msgstr "server zastaven\n"
-#: pg_ctl.c:951 pg_ctl.c:1024
+#: pg_ctl.c:952 pg_ctl.c:1025
msgid "starting server anyway\n"
msgstr "přesto server spouštím\n"
-#: pg_ctl.c:960
+#: pg_ctl.c:961
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: nemohu restartovat server; postgres běží v single-user módu (PID: %ld)\n"
-#: pg_ctl.c:963 pg_ctl.c:1048
+#: pg_ctl.c:964 pg_ctl.c:1049
msgid "Please terminate the single-user server and try again.\n"
msgstr "Prosím ukončete single-user postgres a zkuste to znovu.\n"
-#: pg_ctl.c:1022
+#: pg_ctl.c:1023
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
msgstr "%s: starý proces serveru (PID: %ld) zřejmě skončil\n"
-#: pg_ctl.c:1045
+#: pg_ctl.c:1046
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: nemohu znovunačíst server; server běží v single-user módu (PID: %ld)\n"
-#: pg_ctl.c:1054
+#: pg_ctl.c:1055
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
msgstr "%s: nelze poslat signál pro reload (PID: %ld): %s\n"
-#: pg_ctl.c:1059
+#: pg_ctl.c:1060
msgid "server signaled\n"
msgstr "server obdržel signál\n"
-#: pg_ctl.c:1085
+#: pg_ctl.c:1086
#, c-format
msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: nelze povýšit (promote) server; server běží v single-user módu (PID: "
"%ld)\n"
-#: pg_ctl.c:1094
+#: pg_ctl.c:1095
#, c-format
msgid "%s: cannot promote server; server is not in standby mode\n"
msgstr "%s: nelze povýšit (promote) server; server není ve standby módu\n"
-#: pg_ctl.c:1111
+#: pg_ctl.c:1110
#, c-format
msgid "%s: could not create promote signal file \"%s\": %s\n"
msgstr "%s: nelze vytvořit signální soubor pro povýšení (promote) \"%s\": %s\n"
-#: pg_ctl.c:1117
+#: pg_ctl.c:1116
#, c-format
msgid "%s: could not write promote signal file \"%s\": %s\n"
msgstr ""
"%s: nelze zapsat do signálního souboru pro povýšení (promote) \"%s\": %s\n"
-#: pg_ctl.c:1125
+#: pg_ctl.c:1124
#, c-format
msgid "%s: could not send promote signal (PID: %ld): %s\n"
msgstr "%s: nelze poslat signál pro povýšení (promote, PID: %ld): %s\n"
-#: pg_ctl.c:1128
+#: pg_ctl.c:1127
#, c-format
msgid "%s: could not remove promote signal file \"%s\": %s\n"
msgstr ""
"%s: nelze odstranit signální soubor pro povýšení (promote) \"%s\": %s\n"
-#: pg_ctl.c:1133
+#: pg_ctl.c:1132
msgid "server promoting\n"
msgstr "server je povyšován (promote)\n"
-#: pg_ctl.c:1180
+#: pg_ctl.c:1179
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
msgstr "%s: server běží v single-user módu (PID: %ld)\n"
-#: pg_ctl.c:1192
+#: pg_ctl.c:1191
#, c-format
msgid "%s: server is running (PID: %ld)\n"
msgstr "%s: server běží (PID: %ld)\n"
-#: pg_ctl.c:1203
+#: pg_ctl.c:1202
#, c-format
msgid "%s: no server running\n"
msgstr "%s: žádný server neběží\n"
-#: pg_ctl.c:1221
+#: pg_ctl.c:1220
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
msgstr "%s: nelze poslat signál pro reload %d (PID: %ld): %s\n"
-#: pg_ctl.c:1255
+#: pg_ctl.c:1254
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: nelze najít vlastní spustitelný soubor\n"
-#: pg_ctl.c:1265
+#: pg_ctl.c:1264
#, c-format
msgid "%s: could not find postgres program executable\n"
msgstr "%s: nelze najít spustitelný program postgres\n"
-#: pg_ctl.c:1330 pg_ctl.c:1362
+#: pg_ctl.c:1329 pg_ctl.c:1361
#, c-format
msgid "%s: could not open service manager\n"
msgstr "%s: nelze otevřít manažera služeb\n"
-#: pg_ctl.c:1336
+#: pg_ctl.c:1335
#, c-format
msgid "%s: service \"%s\" already registered\n"
msgstr "%s: služba \"%s\" je již registrována\n"
-#: pg_ctl.c:1347
+#: pg_ctl.c:1346
#, c-format
msgid "%s: could not register service \"%s\": error code %lu\n"
msgstr "%s: nelze zaregistrovat službu \"%s\": chybový kód %lu\n"
-#: pg_ctl.c:1368
+#: pg_ctl.c:1367
#, c-format
msgid "%s: service \"%s\" not registered\n"
msgstr "%s: služba \"%s\" není registrována\n"
-#: pg_ctl.c:1375
+#: pg_ctl.c:1374
#, c-format
msgid "%s: could not open service \"%s\": error code %lu\n"
msgstr "%s: nelze otevřít službu \"%s\": chybový kód %lu\n"
-#: pg_ctl.c:1382
+#: pg_ctl.c:1381
#, c-format
msgid "%s: could not unregister service \"%s\": error code %lu\n"
msgstr "%s: nelze odregistrovat službu \"%s\": chybový kód %lu\n"
-#: pg_ctl.c:1467
+#: pg_ctl.c:1466
msgid "Waiting for server startup...\n"
msgstr "čekám na start serveru ...\n"
-#: pg_ctl.c:1470
+#: pg_ctl.c:1469
msgid "Timed out waiting for server startup\n"
msgstr "Časový limit pro čekání na start serveru vypršel\n"
-#: pg_ctl.c:1474
+#: pg_ctl.c:1473
msgid "Server started and accepting connections\n"
msgstr "Server nastartoval a přijímá spojení\n"
-#: pg_ctl.c:1518
+#: pg_ctl.c:1517
#, c-format
msgid "%s: could not start service \"%s\": error code %lu\n"
msgstr "%s: nelze nastartovat službu \"%s\": chybový kód %lu\n"
-#: pg_ctl.c:1590
+#: pg_ctl.c:1589
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: VAROVÁNÍ: na této platformě nelze vytvořit tajné tokeny\n"
-#: pg_ctl.c:1599
+#: pg_ctl.c:1598
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s: nelze otevřít token procesu: chybový kód %lu\n"
-#: pg_ctl.c:1612
+#: pg_ctl.c:1611
#, c-format
msgid "%s: could not allocate SIDs: error code %lu\n"
msgstr "%s: nelze alokovat SIDs: chybový kód %lu\n"
-#: pg_ctl.c:1631
+#: pg_ctl.c:1630
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: nelze vytvořit vyhrazený token: chybový kód %lu\n"
-#: pg_ctl.c:1669
+#: pg_ctl.c:1668
#, c-format
msgid "%s: WARNING: could not locate all job object functions in system API\n"
msgstr ""
"%s: VAROVÁNÍ: v systémovém API nelze najít všechny \"job object\" funkce\n"
-#: pg_ctl.c:1755
+#: pg_ctl.c:1754
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Zkuste \"%s --help\" pro více informací.\n"
-#: pg_ctl.c:1763
+#: pg_ctl.c:1762
#, c-format
msgid ""
"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -483,17 +480,17 @@ msgstr ""
"PostgreSQL serveru.\n"
"\n"
-#: pg_ctl.c:1764
+#: pg_ctl.c:1763
#, c-format
msgid "Usage:\n"
msgstr "Použití:\n"
-#: pg_ctl.c:1765
+#: pg_ctl.c:1764
#, c-format
msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
msgstr " %s init[db] [-D ADRESÁŘ] [-s] [-o \"PŘEPÍNAČE\"]\n"
-#: pg_ctl.c:1766
+#: pg_ctl.c:1765
#, c-format
msgid ""
" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -502,12 +499,12 @@ msgstr ""
" %s start [-w] [-t SECS] [-D ADRESÁŘ] [-s] [-l SOUBOR] [-o \"PŘEPÍNAČE"
"\"]\n"
-#: pg_ctl.c:1767
+#: pg_ctl.c:1766
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
msgstr " %s stop [-W] [-t SECS] [-D ADRESÁŘ] [-s] [-m MÓD-UKONČENÍ]\n"
-#: pg_ctl.c:1768
+#: pg_ctl.c:1767
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -516,28 +513,28 @@ msgstr ""
" %s restart [-w] [-t SECS] [-D ADRESÁŘ] [-s] [-m MÓD-UKONČENÍ]\n"
" [-o \"PŘEPÍNAČE\"]\n"
-#: pg_ctl.c:1770
+#: pg_ctl.c:1769
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
msgstr " %s reload [-D ADRESÁŘ] [-s]\n"
-#: pg_ctl.c:1771
+#: pg_ctl.c:1770
#, c-format
msgid " %s status [-D DATADIR]\n"
msgstr " %s status [-D ADRESÁŘ]\n"
-#: pg_ctl.c:1772
+#: pg_ctl.c:1771
#, c-format
-#| msgid " %s promote [-D DATADIR] [-s]\n"
-msgid " %s promote [-D DATADIR] [-s] [-m PROMOTION-MODE]\n"
-msgstr " %s promote [-D ADRESÁŘ] [-s] [-m PROMOTION-MÓD]\n"
+#| msgid " %s reload [-D DATADIR] [-s]\n"
+msgid " %s promote [-D DATADIR] [-s]\n"
+msgstr " %s promote [-D ADRESÁŘ] [-s]\n"
-#: pg_ctl.c:1773
+#: pg_ctl.c:1772
#, c-format
msgid " %s kill SIGNALNAME PID\n"
msgstr " %s kill SIGNÁL IDPROCESU\n"
-#: pg_ctl.c:1775
+#: pg_ctl.c:1774
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -546,12 +543,12 @@ msgstr ""
" %s register [-N NÁZEVSLUŽBY] [-U UŽIVATEL] [-P HESLO] [-D ADRESÁŘ]\n"
" [-w] [-o \"VOLBY\"]\n"
-#: pg_ctl.c:1777
+#: pg_ctl.c:1776
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
msgstr " %s unregister [-N SERVICENAME]\n"
-#: pg_ctl.c:1780
+#: pg_ctl.c:1779
#, c-format
msgid ""
"\n"
@@ -560,44 +557,44 @@ msgstr ""
"\n"
"Společné přepínače:\n"
-#: pg_ctl.c:1781
+#: pg_ctl.c:1780
#, c-format
msgid " -D, --pgdata=DATADIR location of the database storage area\n"
msgstr " -D, --pgdata=ADRESÁŘ umístění úložiště databáze\n"
-#: pg_ctl.c:1782
+#: pg_ctl.c:1781
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
msgstr ""
" -s, --silent vypisuj jen chyby, žádné informativní zprávy\n"
-#: pg_ctl.c:1783
+#: pg_ctl.c:1782
#, c-format
msgid " -t, --timeout=SECS seconds to wait when using -w option\n"
msgstr ""
" -t, --timeout=SECS počet vteřin pro čekání při využití volby -w\n"
-#: pg_ctl.c:1784
+#: pg_ctl.c:1783
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version vypsat informace o verzi, potom skončit\n"
-#: pg_ctl.c:1785
+#: pg_ctl.c:1784
#, c-format
msgid " -w wait until operation completes\n"
msgstr " -w čekat na dokončení operace\n"
-#: pg_ctl.c:1786
+#: pg_ctl.c:1785
#, c-format
msgid " -W do not wait until operation completes\n"
msgstr " -W nečekat na dokončení operace\n"
-#: pg_ctl.c:1787
+#: pg_ctl.c:1786
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help vypsat tuto nápovědu, potom skončit\n"
-#: pg_ctl.c:1788
+#: pg_ctl.c:1787
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -606,12 +603,12 @@ msgstr ""
"(Implicitní chování je čekat na ukončení, ale ne při startu nebo restartu.)\n"
"\n"
-#: pg_ctl.c:1789
+#: pg_ctl.c:1788
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
msgstr "Pokud je vynechán parametr -D, použije se proměnná prostředí PGDATA.\n"
-#: pg_ctl.c:1791
+#: pg_ctl.c:1790
#, c-format
msgid ""
"\n"
@@ -620,24 +617,24 @@ msgstr ""
"\n"
"Přepínače pro start nebo restart:\n"
-#: pg_ctl.c:1793
+#: pg_ctl.c:1792
#, c-format
msgid " -c, --core-files allow postgres to produce core files\n"
msgstr " -c, --core-files povolit postgresu vytvářet core soubory\n"
-#: pg_ctl.c:1795
+#: pg_ctl.c:1794
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
msgstr " -c, --core-files nepoužitelné pro tuto platformu\n"
-#: pg_ctl.c:1797
+#: pg_ctl.c:1796
#, c-format
msgid " -l, --log=FILENAME write (or append) server log to FILENAME\n"
msgstr ""
" -l, --log=SOUBOR zapisuj (nebo připoj na konec) log serveru do "
"SOUBORU.\n"
-#: pg_ctl.c:1798
+#: pg_ctl.c:1797
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
@@ -646,16 +643,13 @@ msgstr ""
" -o PŘEPÍNAČE přepínače, které budou předány postgresu\n"
" (spustitelnému souboru PostgreSQL) či initdb\n"
-#: pg_ctl.c:1800
+#: pg_ctl.c:1799
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
msgstr " -p CESTA-K-POSTGRESU za normálních okolností není potřeba\n"
-#: pg_ctl.c:1801
+#: pg_ctl.c:1800
#, c-format
-#| msgid ""
-#| "\n"
-#| "Options for stop or restart:\n"
msgid ""
"\n"
"Options for stop, restart, or promote:\n"
@@ -663,14 +657,14 @@ msgstr ""
"\n"
"Přepínače pro zastavení, restart a promote:\n"
-#: pg_ctl.c:1802
+#: pg_ctl.c:1801
#, c-format
msgid ""
" -m, --mode=MODE MODE can be \"smart\", \"fast\", or \"immediate\"\n"
msgstr ""
" -m, --mode=MODE může být \"smart\", \"fast\", or \"immediate\"\n"
-#: pg_ctl.c:1804
+#: pg_ctl.c:1803
#, c-format
msgid ""
"\n"
@@ -679,17 +673,17 @@ msgstr ""
"\n"
"Módy ukončení jsou:\n"
-#: pg_ctl.c:1805
+#: pg_ctl.c:1804
#, c-format
msgid " smart quit after all clients have disconnected\n"
msgstr " smart skonči potom, co se odpojí všichni klienti\n"
-#: pg_ctl.c:1806
+#: pg_ctl.c:1805
#, c-format
msgid " fast quit directly, with proper shutdown\n"
msgstr " fast skonči okamžitě, s korektním zastavením serveru\n"
-#: pg_ctl.c:1807
+#: pg_ctl.c:1806
#, c-format
msgid ""
" immediate quit without complete shutdown; will lead to recovery on "
@@ -698,30 +692,7 @@ msgstr ""
" immediate skonči bez kompletního zastavení; další start "
"provede obnovu po pádu (crash recovery)\n"
-#: pg_ctl.c:1809
-#, c-format
-#| msgid ""
-#| "\n"
-#| "Shutdown modes are:\n"
-msgid ""
-"\n"
-"Promotion modes are:\n"
-msgstr ""
-"\n"
-"Módy promote jsou:\n"
-
-#: pg_ctl.c:1810
-#, c-format
-msgid " smart promote after performing a checkpoint\n"
-msgstr " smart promote po provedení checkpointu\n"
-
-#: pg_ctl.c:1811
-#, c-format
-msgid ""
-" fast promote quickly without waiting for checkpoint completion\n"
-msgstr " fast promote rychlé bez čekání na dokončení checkpointu\n"
-
-#: pg_ctl.c:1813
+#: pg_ctl.c:1808
#, c-format
msgid ""
"\n"
@@ -730,7 +701,7 @@ msgstr ""
"\n"
"Povolené signály pro \"kill\":\n"
-#: pg_ctl.c:1817
+#: pg_ctl.c:1812
#, c-format
msgid ""
"\n"
@@ -739,30 +710,30 @@ msgstr ""
"\n"
"Přepínače pro register nebo unregister:\n"
-#: pg_ctl.c:1818
+#: pg_ctl.c:1813
#, c-format
msgid ""
" -N SERVICENAME service name with which to register PostgreSQL server\n"
msgstr ""
" -N SERVICENAME jméno služby, pod kterým registrovat PostgreSQL server\n"
-#: pg_ctl.c:1819
+#: pg_ctl.c:1814
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
msgstr " -P PASSWORD heslo k účtu pro registraci PostgreSQL serveru\n"
-#: pg_ctl.c:1820
+#: pg_ctl.c:1815
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
msgstr " -U USERNAME uživatelské jméno pro registraci PostgreSQL server\n"
-#: pg_ctl.c:1821
+#: pg_ctl.c:1816
#, c-format
msgid " -S START-TYPE service start type to register PostgreSQL server\n"
msgstr ""
" -S TYP-STARTU typ spuštění služby pro registraci PostgreSQL serveru\n"
-#: pg_ctl.c:1823
+#: pg_ctl.c:1818
#, c-format
msgid ""
"\n"
@@ -771,19 +742,19 @@ msgstr ""
"\n"
"Módy spuštění jsou:\n"
-#: pg_ctl.c:1824
+#: pg_ctl.c:1819
#, c-format
msgid ""
" auto start service automatically during system startup (default)\n"
msgstr ""
" auto spusť službu automaticky během startu systému (implicitní)\n"
-#: pg_ctl.c:1825
+#: pg_ctl.c:1820
#, c-format
msgid " demand start service on demand\n"
msgstr " demand spusť službu na vyžádání\n"
-#: pg_ctl.c:1828
+#: pg_ctl.c:1823
#, c-format
msgid ""
"\n"
@@ -792,27 +763,27 @@ msgstr ""
"\n"
"Chyby hlaste na adresu <pgsql-bugs@postgresql.org>.\n"
-#: pg_ctl.c:1853
+#: pg_ctl.c:1848
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
msgstr "%s: neplatný mód ukončení mode \"%s\"\n"
-#: pg_ctl.c:1885
+#: pg_ctl.c:1880
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
msgstr "%s: neplatné jméno signálu \"%s\"\n"
-#: pg_ctl.c:1902
+#: pg_ctl.c:1897
#, c-format
msgid "%s: unrecognized start type \"%s\"\n"
msgstr "%s: neplatný typ spuštění \"%s\"\n"
-#: pg_ctl.c:1955
+#: pg_ctl.c:1950
#, c-format
msgid "%s: could not determine the data directory using command \"%s\"\n"
msgstr "%s: nelze najít datový adresář pomocí příkazu \"%s\"\n"
-#: pg_ctl.c:2028
+#: pg_ctl.c:2023
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -823,32 +794,32 @@ msgstr ""
"Prosím přihlaste se jako (neprivilegovaný) uživatel, který bude vlastníkem\n"
"serverového procesu (například pomocí příkazu \"su\").\n"
-#: pg_ctl.c:2099
+#: pg_ctl.c:2094
#, c-format
msgid "%s: -S option not supported on this platform\n"
msgstr "%s: -S nepoužitelné pro tuto platformu\n"
-#: pg_ctl.c:2141
+#: pg_ctl.c:2136
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: příliš mnoho argumentů v příkazové řádce (první je \"%s\")\n"
-#: pg_ctl.c:2165
+#: pg_ctl.c:2160
#, c-format
msgid "%s: missing arguments for kill mode\n"
msgstr "%s: chýbějící parametr pro \"kill\" mód\n"
-#: pg_ctl.c:2183
+#: pg_ctl.c:2178
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
msgstr "%s: neplatný mód operace \"%s\"\n"
-#: pg_ctl.c:2193
+#: pg_ctl.c:2188
#, c-format
msgid "%s: no operation specified\n"
msgstr "%s: není specifikována operace\n"
-#: pg_ctl.c:2214
+#: pg_ctl.c:2209
#, c-format
msgid ""
"%s: no database directory specified and environment variable PGDATA unset\n"
@@ -856,3 +827,9 @@ msgstr ""
"%s: není zadán datový adresář a ani není nastavena proměnná prostředí "
"PGDATA\n"
+#~ msgid " smart promote after performing a checkpoint\n"
+#~ msgstr " smart promote po provedení checkpointu\n"
+
+#~ msgid ""
+#~ " fast promote quickly without waiting for checkpoint completion\n"
+#~ msgstr " fast promote rychlé bez čekání na dokončení checkpointu\n"
diff --git a/src/bin/pg_ctl/po/zh_CN.po b/src/bin/pg_ctl/po/zh_CN.po
index ccba81d291..1c4a811790 100644
--- a/src/bin/pg_ctl/po/zh_CN.po
+++ b/src/bin/pg_ctl/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_ctl (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:46+0000\n"
-"PO-Revision-Date: 2012-10-19 15:51+0800\n"
+"POT-Creation-Date: 2013-09-02 00:26+0000\n"
+"PO-Revision-Date: 2013-09-02 14:39+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,79 +16,112 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
+#, c-format
+msgid "out of memory\n"
+msgstr "内存溢出\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
+#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:144
+#: ../../port/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:193
+#: ../../port/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:200
+#: ../../port/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:255 ../../port/exec.c:291
+#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "无法进入目录 \"%s\""
+#| msgid "could not change directory to \"%s\": %m"
+msgid "could not change directory to \"%s\": %s"
+msgstr "无法跳转到目录 \"%s\" 中: %s"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:526
+#: ../../port/exec.c:523
+#, c-format
+#| msgid "query failed: %s"
+msgid "pclose failed: %s"
+msgstr "pclose调用失败: %s"
+
+#: ../../port/wait_error.c:47
+#, c-format
+#| msgid "could not execute plan"
+msgid "command not executable"
+msgstr "无法执行命令"
+
+#: ../../port/wait_error.c:51
+#, c-format
+#| msgid "case not found"
+msgid "command not found"
+msgstr "没有找到命令"
+
+#: ../../port/wait_error.c:56
#, c-format
msgid "child process exited with exit code %d"
msgstr "子进程已退出, 退出码为 %d"
-#: ../../port/exec.c:530
+#: ../../port/wait_error.c:63
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/exec.c:539
+#: ../../port/wait_error.c:73
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子进程被信号 %s 终止"
-#: ../../port/exec.c:542
+#: ../../port/wait_error.c:77
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子进程被信号 %d 终止"
-#: ../../port/exec.c:546
+#: ../../port/wait_error.c:82
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子进程已退出, 未知状态 %d"
-#: pg_ctl.c:243 pg_ctl.c:258 pg_ctl.c:2137
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: 内存溢出\n"
-
-#: pg_ctl.c:292
+#: pg_ctl.c:253
#, c-format
msgid "%s: could not open PID file \"%s\": %s\n"
msgstr "%s: 无法打开 PID 文件 \"%s\": %s\n"
-#: pg_ctl.c:299
+#: pg_ctl.c:262
+#, c-format
+#| msgid "%s: PID file \"%s\" does not exist\n"
+msgid "%s: the PID file \"%s\" is empty\n"
+msgstr "%s: PID 文件 \"%s\" 为空\n"
+
+#: pg_ctl.c:265
#, c-format
msgid "%s: invalid data in PID file \"%s\"\n"
msgstr "%s: PID文件 \"%s\" 中存在无效数据\n"
-#: pg_ctl.c:510
+#: pg_ctl.c:477
#, c-format
msgid ""
"\n"
@@ -97,7 +130,7 @@ msgstr ""
"\n"
"%s: -w 选项不能用于9.1以前版本的服务器启动\n"
-#: pg_ctl.c:580
+#: pg_ctl.c:547
#, c-format
msgid ""
"\n"
@@ -106,7 +139,7 @@ msgstr ""
"\n"
"%s: -w 选项不能用于相对套接字目录\n"
-#: pg_ctl.c:628
+#: pg_ctl.c:595
#, c-format
msgid ""
"\n"
@@ -115,22 +148,22 @@ msgstr ""
"\n"
"%s: 数据目录里可能正在运行着一个已经存在的postmaster进程\n"
-#: pg_ctl.c:678
+#: pg_ctl.c:645
#, c-format
msgid "%s: cannot set core file size limit; disallowed by hard limit\n"
msgstr "%s: 不能设置核心文件大小的限制;磁盘限额不允许\n"
-#: pg_ctl.c:703
+#: pg_ctl.c:670
#, c-format
msgid "%s: could not read file \"%s\"\n"
msgstr "%s: 无法读取文件 \"%s\"\n"
-#: pg_ctl.c:708
+#: pg_ctl.c:675
#, c-format
msgid "%s: option file \"%s\" must have exactly one line\n"
msgstr "%s: 选项文件 \"%s\" 只能有一行\n"
-#: pg_ctl.c:756
+#: pg_ctl.c:723
#, c-format
msgid ""
"The program \"%s\" is needed by %s but was not found in the\n"
@@ -141,7 +174,7 @@ msgstr ""
"\n"
"请检查您的安装.\n"
-#: pg_ctl.c:762
+#: pg_ctl.c:729
#, c-format
msgid ""
"The program \"%s\" was found by \"%s\"\n"
@@ -152,42 +185,42 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: pg_ctl.c:795
+#: pg_ctl.c:762
#, c-format
msgid "%s: database system initialization failed\n"
msgstr "%s: 数据库系统初始化失败\n"
-#: pg_ctl.c:810
+#: pg_ctl.c:777
#, c-format
msgid "%s: another server might be running; trying to start server anyway\n"
msgstr "%s: 其他服务器进程可能正在运行; 尝试启动服务器进程\n"
-#: pg_ctl.c:847
+#: pg_ctl.c:814
#, c-format
msgid "%s: could not start server: exit code was %d\n"
msgstr "%s: 无法启动服务器进程: 退出码为 %d\n"
-#: pg_ctl.c:854
+#: pg_ctl.c:821
msgid "waiting for server to start..."
msgstr "等待服务器进程启动 ..."
-#: pg_ctl.c:859 pg_ctl.c:960 pg_ctl.c:1051
+#: pg_ctl.c:826 pg_ctl.c:927 pg_ctl.c:1018
msgid " done\n"
msgstr " 完成\n"
-#: pg_ctl.c:860
+#: pg_ctl.c:827
msgid "server started\n"
msgstr "服务器进程已经启动\n"
-#: pg_ctl.c:863 pg_ctl.c:867
+#: pg_ctl.c:830 pg_ctl.c:834
msgid " stopped waiting\n"
msgstr " 已停止等待\n"
-#: pg_ctl.c:864
+#: pg_ctl.c:831
msgid "server is still starting up\n"
msgstr "服务器仍在启动过程中\n"
-#: pg_ctl.c:868
+#: pg_ctl.c:835
#, c-format
msgid ""
"%s: could not start server\n"
@@ -196,43 +229,43 @@ msgstr ""
"%s: 无法启动服务器进程\n"
"检查日志输出.\n"
-#: pg_ctl.c:874 pg_ctl.c:952 pg_ctl.c:1042
+#: pg_ctl.c:841 pg_ctl.c:919 pg_ctl.c:1009
msgid " failed\n"
msgstr " 失败\n"
-#: pg_ctl.c:875
+#: pg_ctl.c:842
#, c-format
msgid "%s: could not wait for server because of misconfiguration\n"
msgstr "%s: 因为配制错误,而无法等待服务器\n"
-#: pg_ctl.c:881
+#: pg_ctl.c:848
msgid "server starting\n"
msgstr "正在启动服务器进程\n"
-#: pg_ctl.c:896 pg_ctl.c:982 pg_ctl.c:1072 pg_ctl.c:1112
+#: pg_ctl.c:863 pg_ctl.c:949 pg_ctl.c:1039 pg_ctl.c:1079
#, c-format
msgid "%s: PID file \"%s\" does not exist\n"
msgstr "%s: PID 文件 \"%s\" 不存在\n"
-#: pg_ctl.c:897 pg_ctl.c:984 pg_ctl.c:1073 pg_ctl.c:1113
+#: pg_ctl.c:864 pg_ctl.c:951 pg_ctl.c:1040 pg_ctl.c:1080
msgid "Is server running?\n"
msgstr "服务器进程是否正在运行?\n"
-#: pg_ctl.c:903
+#: pg_ctl.c:870
#, c-format
msgid "%s: cannot stop server; single-user server is running (PID: %ld)\n"
msgstr "%s: 无法停止服务器进程; 正在运行 单用户模式服务器进程(PID: %ld)\n"
-#: pg_ctl.c:911 pg_ctl.c:1006
+#: pg_ctl.c:878 pg_ctl.c:973
#, c-format
msgid "%s: could not send stop signal (PID: %ld): %s\n"
msgstr "%s: 无法发送停止信号 (PID: %ld): %s\n"
-#: pg_ctl.c:918
+#: pg_ctl.c:885
msgid "server shutting down\n"
msgstr "正在关闭服务器进程\n"
-#: pg_ctl.c:933 pg_ctl.c:1021
+#: pg_ctl.c:900 pg_ctl.c:988
msgid ""
"WARNING: online backup mode is active\n"
"Shutdown will not complete until pg_stop_backup() is called.\n"
@@ -241,16 +274,16 @@ msgstr ""
"警告: 在线备份模式处于激活状态\n"
"关闭命令将不会完成,直到调用了pg_stop_backup().\n"
-#: pg_ctl.c:937 pg_ctl.c:1025
+#: pg_ctl.c:904 pg_ctl.c:992
msgid "waiting for server to shut down..."
msgstr "等待服务器进程关闭 ..."
-#: pg_ctl.c:954 pg_ctl.c:1044
+#: pg_ctl.c:921 pg_ctl.c:1011
#, c-format
msgid "%s: server does not shut down\n"
msgstr "%s: server进程没有关闭\n"
-#: pg_ctl.c:956 pg_ctl.c:1046
+#: pg_ctl.c:923 pg_ctl.c:1013
msgid ""
"HINT: The \"-m fast\" option immediately disconnects sessions rather than\n"
"waiting for session-initiated disconnection.\n"
@@ -258,186 +291,186 @@ msgstr ""
"提示: \"-m fast\" 选项可以立即断开会话, 而不用\n"
"等待会话发起的断连.\n"
-#: pg_ctl.c:962 pg_ctl.c:1052
+#: pg_ctl.c:929 pg_ctl.c:1019
msgid "server stopped\n"
msgstr "服务器进程已经关闭\n"
-#: pg_ctl.c:985 pg_ctl.c:1058
+#: pg_ctl.c:952 pg_ctl.c:1025
msgid "starting server anyway\n"
msgstr "正在启动服务器进程\n"
-#: pg_ctl.c:994
+#: pg_ctl.c:961
#, c-format
msgid "%s: cannot restart server; single-user server is running (PID: %ld)\n"
msgstr "%s: 无法重启服务器进程; 单用户模式服务器进程正在运行 (PID: %ld)\n"
-#: pg_ctl.c:997 pg_ctl.c:1082
+#: pg_ctl.c:964 pg_ctl.c:1049
msgid "Please terminate the single-user server and try again.\n"
msgstr "请终止单用户模式服务器进程,然后再重试.\n"
-#: pg_ctl.c:1056
+#: pg_ctl.c:1023
#, c-format
msgid "%s: old server process (PID: %ld) seems to be gone\n"
msgstr "%s: 原有的进程(PID: %ld)可能已经不存在了\n"
-#: pg_ctl.c:1079
+#: pg_ctl.c:1046
#, c-format
msgid "%s: cannot reload server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: 无法重新加载服务器进程;正在运行单用户模式的服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:1088
+#: pg_ctl.c:1055
#, c-format
msgid "%s: could not send reload signal (PID: %ld): %s\n"
msgstr "%s: 无法发送重载信号 (PID: %ld): %s\n"
-#: pg_ctl.c:1093
+#: pg_ctl.c:1060
msgid "server signaled\n"
msgstr "服务器进程发出信号\n"
-#: pg_ctl.c:1119
+#: pg_ctl.c:1086
#, c-format
msgid "%s: cannot promote server; single-user server is running (PID: %ld)\n"
msgstr ""
"%s: 无法重新加载服务器进程;正在运行单用户模式的服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:1128
+#: pg_ctl.c:1095
#, c-format
msgid "%s: cannot promote server; server is not in standby mode\n"
msgstr "%s: 无法重新加载服务器进程;服务器没有运行在standby模式下\n"
-#: pg_ctl.c:1136
+#: pg_ctl.c:1110
#, c-format
msgid "%s: could not create promote signal file \"%s\": %s\n"
msgstr "%s: 无法创建重新加载信号文件 \"%s\": %s\n"
-#: pg_ctl.c:1142
+#: pg_ctl.c:1116
#, c-format
msgid "%s: could not write promote signal file \"%s\": %s\n"
msgstr "%s: 无法写入重新加载文件 \"%s\": %s\n"
-#: pg_ctl.c:1150
+#: pg_ctl.c:1124
#, c-format
msgid "%s: could not send promote signal (PID: %ld): %s\n"
msgstr "%s: 无法发送重载信号(PID: %ld): %s\n"
-#: pg_ctl.c:1153
+#: pg_ctl.c:1127
#, c-format
msgid "%s: could not remove promote signal file \"%s\": %s\n"
msgstr "%s: 无法移动重新加载信号文件 \"%s\": %s\n"
-#: pg_ctl.c:1158
+#: pg_ctl.c:1132
msgid "server promoting\n"
msgstr "服务器重新加载中\n"
-#: pg_ctl.c:1205
+#: pg_ctl.c:1179
#, c-format
msgid "%s: single-user server is running (PID: %ld)\n"
msgstr "%s: 正在运行单用户模式服务器进程 (PID: %ld)\n"
-#: pg_ctl.c:1217
+#: pg_ctl.c:1191
#, c-format
msgid "%s: server is running (PID: %ld)\n"
msgstr "%s: 正在运行服务器进程(PID: %ld)\n"
-#: pg_ctl.c:1228
+#: pg_ctl.c:1202
#, c-format
msgid "%s: no server running\n"
msgstr "%s:没有服务器进程正在运行\n"
-#: pg_ctl.c:1246
+#: pg_ctl.c:1220
#, c-format
msgid "%s: could not send signal %d (PID: %ld): %s\n"
msgstr "%s: 无法发送信号 %d (PID: %ld): %s\n"
-#: pg_ctl.c:1280
+#: pg_ctl.c:1254
#, c-format
msgid "%s: could not find own program executable\n"
msgstr "%s: 无法找到执行文件\n"
-#: pg_ctl.c:1290
+#: pg_ctl.c:1264
#, c-format
msgid "%s: could not find postgres program executable\n"
msgstr "%s: 无法找到postgres程序的执行文件\n"
-#: pg_ctl.c:1355 pg_ctl.c:1387
+#: pg_ctl.c:1329 pg_ctl.c:1361
#, c-format
msgid "%s: could not open service manager\n"
msgstr "%s: 无法打开服务管理器\n"
-#: pg_ctl.c:1361
+#: pg_ctl.c:1335
#, c-format
msgid "%s: service \"%s\" already registered\n"
msgstr "%s: 服务 \"%s\" 已经注册了\n"
-#: pg_ctl.c:1372
+#: pg_ctl.c:1346
#, c-format
msgid "%s: could not register service \"%s\": error code %lu\n"
msgstr "%s: 无法注册服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1393
+#: pg_ctl.c:1367
#, c-format
msgid "%s: service \"%s\" not registered\n"
msgstr "%s: 服务 \"%s\" 没有注册\n"
-#: pg_ctl.c:1400
+#: pg_ctl.c:1374
#, c-format
msgid "%s: could not open service \"%s\": error code %lu\n"
msgstr "%s: 无法打开服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1407
+#: pg_ctl.c:1381
#, c-format
msgid "%s: could not unregister service \"%s\": error code %lu\n"
msgstr "%s: 无法注销服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1492
+#: pg_ctl.c:1466
msgid "Waiting for server startup...\n"
msgstr "等待服务器进程启动 ...\n"
-#: pg_ctl.c:1495
+#: pg_ctl.c:1469
msgid "Timed out waiting for server startup\n"
msgstr "在等待服务器启动时超时\n"
-#: pg_ctl.c:1499
+#: pg_ctl.c:1473
msgid "Server started and accepting connections\n"
msgstr "服务器进程已启动并且接受连接\n"
-#: pg_ctl.c:1543
+#: pg_ctl.c:1517
#, c-format
msgid "%s: could not start service \"%s\": error code %lu\n"
msgstr "%s: 无法启动服务 \"%s\": 错误码 %lu\n"
-#: pg_ctl.c:1615
+#: pg_ctl.c:1589
#, c-format
msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
msgstr "%s: 警告: 该平台上无法创建受限令牌\n"
-#: pg_ctl.c:1624
+#: pg_ctl.c:1598
#, c-format
msgid "%s: could not open process token: error code %lu\n"
msgstr "%s: 无法打开进程令牌 (token): 错误码 %lu\n"
-#: pg_ctl.c:1637
+#: pg_ctl.c:1611
#, c-format
msgid "%s: could not allocate SIDs: error code %lu\n"
msgstr "%s: 无法分配SID: 错误码 %lu\n"
-#: pg_ctl.c:1656
+#: pg_ctl.c:1630
#, c-format
msgid "%s: could not create restricted token: error code %lu\n"
msgstr "%s: 无法创建继承套接字: 错误码为 %lu\n"
-#: pg_ctl.c:1694
+#: pg_ctl.c:1668
#, c-format
msgid "%s: WARNING: could not locate all job object functions in system API\n"
msgstr "%s: 警告: 系统API中无法定位所有工作对象函数\n"
-#: pg_ctl.c:1780
+#: pg_ctl.c:1754
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "试用 \"%s --help\" 获取更多的信息.\n"
-#: pg_ctl.c:1788
+#: pg_ctl.c:1762
#, c-format
msgid ""
"%s is a utility to initialize, start, stop, or control a PostgreSQL server.\n"
@@ -446,17 +479,17 @@ msgstr ""
"%s 是一个用于初始化、启动、停止或控制PostgreSQL服务器的工具.\n"
"\n"
-#: pg_ctl.c:1789
+#: pg_ctl.c:1763
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: pg_ctl.c:1790
+#: pg_ctl.c:1764
#, c-format
msgid " %s init[db] [-D DATADIR] [-s] [-o \"OPTIONS\"]\n"
msgstr " %s init[db] [-D 数据目录] [-s] [-o \"选项\"]\n"
-#: pg_ctl.c:1791
+#: pg_ctl.c:1765
#, c-format
msgid ""
" %s start [-w] [-t SECS] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS"
@@ -464,12 +497,12 @@ msgid ""
msgstr ""
" %s start [-w] [-t 秒数] [-D 数据目录] [-s] [-l 文件名] [-o \"选项\"]\n"
-#: pg_ctl.c:1792
+#: pg_ctl.c:1766
#, c-format
msgid " %s stop [-W] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
msgstr " %s stop [-w] [-t 秒数] [-D 数据目录] [-s] [-m 关闭模式]\n"
-#: pg_ctl.c:1793
+#: pg_ctl.c:1767
#, c-format
msgid ""
" %s restart [-w] [-t SECS] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
@@ -478,27 +511,27 @@ msgstr ""
" %s restart [-w] [-t 秒数] [-D 数据目录] [-s] [-m 关闭模式]\n"
" [-o \"选项\"]\n"
-#: pg_ctl.c:1795
+#: pg_ctl.c:1769
#, c-format
msgid " %s reload [-D DATADIR] [-s]\n"
msgstr " %s reload [-D 数据目录] [-s]\n"
-#: pg_ctl.c:1796
+#: pg_ctl.c:1770
#, c-format
msgid " %s status [-D DATADIR]\n"
msgstr " %s status [-D 数据目录]\n"
-#: pg_ctl.c:1797
+#: pg_ctl.c:1771
#, c-format
msgid " %s promote [-D DATADIR] [-s]\n"
msgstr " %s promote [-D 数据目录] [-s]\n"
-#: pg_ctl.c:1798
+#: pg_ctl.c:1772
#, c-format
msgid " %s kill SIGNALNAME PID\n"
msgstr " %s kill 信号名称 进程号\n"
-#: pg_ctl.c:1800
+#: pg_ctl.c:1774
#, c-format
msgid ""
" %s register [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
@@ -507,12 +540,12 @@ msgstr ""
" %s register [-N 服务名称] [-U 用户名] [-P 口令] [-D 数据目录]\n"
" [-S 启动类型] [-w] [-t 秒数] [-o \"选项\"]\n"
-#: pg_ctl.c:1802
+#: pg_ctl.c:1776
#, c-format
msgid " %s unregister [-N SERVICENAME]\n"
msgstr " %s unregister [-N 服务名称]\n"
-#: pg_ctl.c:1805
+#: pg_ctl.c:1779
#, c-format
msgid ""
"\n"
@@ -521,42 +554,42 @@ msgstr ""
"\n"
"普通选项:\n"
-#: pg_ctl.c:1806
+#: pg_ctl.c:1780
#, c-format
msgid " -D, --pgdata=DATADIR location of the database storage area\n"
msgstr " -D, --pgdata=数据目录 数据库存储区域的位置\n"
-#: pg_ctl.c:1807
+#: pg_ctl.c:1781
#, c-format
msgid " -s, --silent only print errors, no informational messages\n"
msgstr " -s, --silent 只打印错误信息, 没有其他信息\n"
-#: pg_ctl.c:1808
+#: pg_ctl.c:1782
#, c-format
msgid " -t, --timeout=SECS seconds to wait when using -w option\n"
msgstr " -t, --timeout=SECS 当使用-w 选项时需要等待的秒数\n"
-#: pg_ctl.c:1809
+#: pg_ctl.c:1783
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: pg_ctl.c:1810
+#: pg_ctl.c:1784
#, c-format
msgid " -w wait until operation completes\n"
msgstr " -w 等待直到操作完成\n"
-#: pg_ctl.c:1811
+#: pg_ctl.c:1785
#, c-format
msgid " -W do not wait until operation completes\n"
msgstr " -W 不用等待操作完成\n"
-#: pg_ctl.c:1812
+#: pg_ctl.c:1786
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: pg_ctl.c:1813
+#: pg_ctl.c:1787
#, c-format
msgid ""
"(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -565,12 +598,12 @@ msgstr ""
"(默认为关闭等待, 但不是启动或重启.)\n"
"\n"
-#: pg_ctl.c:1814
+#: pg_ctl.c:1788
#, c-format
msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
msgstr "如果省略了 -D 选项, 将使用 PGDATA 环境变量.\n"
-#: pg_ctl.c:1816
+#: pg_ctl.c:1790
#, c-format
msgid ""
"\n"
@@ -579,22 +612,22 @@ msgstr ""
"\n"
"启动或重启的选项:\n"
-#: pg_ctl.c:1818
+#: pg_ctl.c:1792
#, c-format
msgid " -c, --core-files allow postgres to produce core files\n"
msgstr " -c, --core-files 允许postgres进程产生核心文件\n"
-#: pg_ctl.c:1820
+#: pg_ctl.c:1794
#, c-format
msgid " -c, --core-files not applicable on this platform\n"
msgstr " -c, --core-files 在这种平台上不可用\n"
-#: pg_ctl.c:1822
+#: pg_ctl.c:1796
#, c-format
msgid " -l, --log=FILENAME write (or append) server log to FILENAME\n"
msgstr " -l, --log=FILENAME 写入 (或追加) 服务器日志到文件FILENAME\n"
-#: pg_ctl.c:1823
+#: pg_ctl.c:1797
#, c-format
msgid ""
" -o OPTIONS command line options to pass to postgres\n"
@@ -603,28 +636,31 @@ msgstr ""
" -o OPTIONS 传递给postgres的命令行选项\n"
" (PostgreSQL 服务器执行文件)或initdb\n"
-#: pg_ctl.c:1825
+#: pg_ctl.c:1799
#, c-format
msgid " -p PATH-TO-POSTGRES normally not necessary\n"
msgstr " -p PATH-TO-POSTMASTER 正常情况不必要\n"
-#: pg_ctl.c:1826
+#: pg_ctl.c:1800
#, c-format
+#| msgid ""
+#| "\n"
+#| "Options for stop or restart:\n"
msgid ""
"\n"
-"Options for stop or restart:\n"
+"Options for stop, restart, or promote:\n"
msgstr ""
"\n"
-"停止或重启的选项:\n"
+"停止、重启或者提升的选项:\n"
-#: pg_ctl.c:1827
+#: pg_ctl.c:1801
#, c-format
msgid ""
" -m, --mode=MODE MODE can be \"smart\", \"fast\", or \"immediate\"\n"
msgstr ""
" -m, --mode=MODE 可以是 \"smart\", \"fast\", 或者 \"immediate\"\n"
-#: pg_ctl.c:1829
+#: pg_ctl.c:1803
#, c-format
msgid ""
"\n"
@@ -633,24 +669,24 @@ msgstr ""
"\n"
"关闭模式有如下几种:\n"
-#: pg_ctl.c:1830
+#: pg_ctl.c:1804
#, c-format
msgid " smart quit after all clients have disconnected\n"
msgstr " smart 所有客户端断开连接后退出\n"
-#: pg_ctl.c:1831
+#: pg_ctl.c:1805
#, c-format
msgid " fast quit directly, with proper shutdown\n"
msgstr " fast 直接退出, 正确的关闭\n"
-#: pg_ctl.c:1832
+#: pg_ctl.c:1806
#, c-format
msgid ""
" immediate quit without complete shutdown; will lead to recovery on "
"restart\n"
msgstr " immediate 不完全的关闭退出; 重启后恢复\n"
-#: pg_ctl.c:1834
+#: pg_ctl.c:1808
#, c-format
msgid ""
"\n"
@@ -659,7 +695,7 @@ msgstr ""
"\n"
"允许关闭的信号名称:\n"
-#: pg_ctl.c:1838
+#: pg_ctl.c:1812
#, c-format
msgid ""
"\n"
@@ -668,28 +704,28 @@ msgstr ""
"\n"
"注册或注销的选项:\n"
-#: pg_ctl.c:1839
+#: pg_ctl.c:1813
#, c-format
msgid ""
" -N SERVICENAME service name with which to register PostgreSQL server\n"
msgstr " -N 服务名称 注册到 PostgreSQL 服务器的服务名称\n"
-#: pg_ctl.c:1840
+#: pg_ctl.c:1814
#, c-format
msgid " -P PASSWORD password of account to register PostgreSQL server\n"
msgstr " -P 口令 注册到 PostgreSQL 服务器帐户的口令\n"
-#: pg_ctl.c:1841
+#: pg_ctl.c:1815
#, c-format
msgid " -U USERNAME user name of account to register PostgreSQL server\n"
msgstr " -U 用户名 注册到 PostgreSQL 服务器帐户的用户名\n"
-#: pg_ctl.c:1842
+#: pg_ctl.c:1816
#, c-format
msgid " -S START-TYPE service start type to register PostgreSQL server\n"
msgstr " -S START-TYPE 注册到PostgreSQL服务器的服务启动类型\n"
-#: pg_ctl.c:1844
+#: pg_ctl.c:1818
#, c-format
msgid ""
"\n"
@@ -698,18 +734,18 @@ msgstr ""
"\n"
"启动类型有:\n"
-#: pg_ctl.c:1845
+#: pg_ctl.c:1819
#, c-format
msgid ""
" auto start service automatically during system startup (default)\n"
msgstr " auto 在系统启动时自动启动服务(默认选项)\n"
-#: pg_ctl.c:1846
+#: pg_ctl.c:1820
#, c-format
msgid " demand start service on demand\n"
msgstr " demand 按需启动服务\n"
-#: pg_ctl.c:1849
+#: pg_ctl.c:1823
#, c-format
msgid ""
"\n"
@@ -718,27 +754,27 @@ msgstr ""
"\n"
"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_ctl.c:1874
+#: pg_ctl.c:1848
#, c-format
msgid "%s: unrecognized shutdown mode \"%s\"\n"
msgstr "%s: 无效的关闭模式 \"%s\"\n"
-#: pg_ctl.c:1906
+#: pg_ctl.c:1880
#, c-format
msgid "%s: unrecognized signal name \"%s\"\n"
msgstr "%s: 无效信号名称 \"%s\"\n"
-#: pg_ctl.c:1923
+#: pg_ctl.c:1897
#, c-format
msgid "%s: unrecognized start type \"%s\"\n"
msgstr "%s: 无法识别的启动类型 \"%s\"\n"
-#: pg_ctl.c:1976
+#: pg_ctl.c:1950
#, c-format
msgid "%s: could not determine the data directory using command \"%s\"\n"
msgstr "%s: 使用命令 \"%s\"无法确定数据目录\n"
-#: pg_ctl.c:2049
+#: pg_ctl.c:2023
#, c-format
msgid ""
"%s: cannot be run as root\n"
@@ -749,79 +785,85 @@ msgstr ""
"请以服务器进程所属用户 (非特权用户) 登录 (或使用 \"su\")\n"
"\n"
-#: pg_ctl.c:2120
+#: pg_ctl.c:2094
#, c-format
msgid "%s: -S option not supported on this platform\n"
msgstr "%s: -S 选项在该平台上不支持\n"
-#: pg_ctl.c:2167
+#: pg_ctl.c:2136
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
-#: pg_ctl.c:2191
+#: pg_ctl.c:2160
#, c-format
msgid "%s: missing arguments for kill mode\n"
msgstr "%s: 缺少 kill 模式参数\n"
-#: pg_ctl.c:2209
+#: pg_ctl.c:2178
#, c-format
msgid "%s: unrecognized operation mode \"%s\"\n"
msgstr "%s: 无效的操作模式 \"%s\"\n"
-#: pg_ctl.c:2219
+#: pg_ctl.c:2188
#, c-format
msgid "%s: no operation specified\n"
msgstr "%s: 没有指定操作\n"
-#: pg_ctl.c:2240
+#: pg_ctl.c:2209
#, c-format
msgid ""
"%s: no database directory specified and environment variable PGDATA unset\n"
msgstr "%s: 没有指定数据目录, 并且没有设置 PGDATA 环境变量\n"
-#~ msgid "%s: invalid option %s\n"
-#~ msgstr "%s: 无效选项 %s\n"
+#~ msgid ""
+#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
+#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
+#~ "process.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "%s 是一个启动, 停止, 重启, 重载配置文件, 报告 PostgreSQL 服务器状态,\n"
+#~ "或者杀掉 PostgreSQL 进程的工具\n"
+#~ "\n"
-#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
-#~ msgstr "%s: 一个独立的后端 \"postgres\" 正在运行 (PID: %ld)\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "%s: neither postmaster nor postgres running\n"
-#~ msgstr "%s: postmaster 或者 postgres 没有运行\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 显示版本信息, 然后退出\n"
+
+#~ msgid "could not start server\n"
+#~ msgstr "无法启动服务器进程\n"
#~ msgid ""
-#~ "The program \"postmaster\" was found by \"%s\"\n"
-#~ "but was not the same version as %s.\n"
+#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
+#~ "same directory as \"%s\".\n"
#~ "Check your installation.\n"
#~ msgstr ""
-#~ "%s 找到程序 \"postmaster\", 但版本和 \"%s\" 不一致.\n"
+#~ "程序 \"postmaster\" 是 %s 需要的, 但没有在同一个目录 \"%s\" 发现.\n"
#~ "\n"
#~ "检查您的安装.\n"
#~ msgid ""
-#~ "The program \"postmaster\" is needed by %s but was not found in the\n"
-#~ "same directory as \"%s\".\n"
+#~ "The program \"postmaster\" was found by \"%s\"\n"
+#~ "but was not the same version as %s.\n"
#~ "Check your installation.\n"
#~ msgstr ""
-#~ "程序 \"postmaster\" 是 %s 需要的, 但没有在同一个目录 \"%s\" 发现.\n"
+#~ "%s 找到程序 \"postmaster\", 但版本和 \"%s\" 不一致.\n"
#~ "\n"
#~ "检查您的安装.\n"
-#~ msgid "could not start server\n"
-#~ msgstr "无法启动服务器进程\n"
+#~ msgid "%s: neither postmaster nor postgres running\n"
+#~ msgstr "%s: postmaster 或者 postgres 没有运行\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 显示版本信息, 然后退出\n"
+#~ msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+#~ msgstr "%s: 一个独立的后端 \"postgres\" 正在运行 (PID: %ld)\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: invalid option %s\n"
+#~ msgstr "%s: 无效选项 %s\n"
-#~ msgid ""
-#~ "%s is a utility to start, stop, restart, reload configuration files,\n"
-#~ "report the status of a PostgreSQL server, or signal a PostgreSQL "
-#~ "process.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "%s 是一个启动, 停止, 重启, 重载配置文件, 报告 PostgreSQL 服务器状态,\n"
-#~ "或者杀掉 PostgreSQL 进程的工具\n"
-#~ "\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s: 内存溢出\n"
+
+#~ msgid "could not change directory to \"%s\""
+#~ msgstr "无法进入目录 \"%s\""
diff --git a/src/bin/pg_ctl/po/zh_TW.po b/src/bin/pg_ctl/po/zh_TW.po
index f9bf7ae02a..9a04995003 100644
--- a/src/bin/pg_ctl/po/zh_TW.po
+++ b/src/bin/pg_ctl/po/zh_TW.po
@@ -8,11 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-11 20:40+0000\n"
-"PO-Revision-Date: 2011-05-09 16:37+0800\n"
+"PO-Revision-Date: 2013-09-03 23:26-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
-"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
-"com>\n"
-"Language: \n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/pg_dump/po/cs.po b/src/bin/pg_dump/po/cs.po
index 83b4d5ad21..6a24e49836 100644
--- a/src/bin/pg_dump/po/cs.po
+++ b/src/bin/pg_dump/po/cs.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.2\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:48+0000\n"
-"PO-Revision-Date: 2013-03-17 22:00+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:19+0000\n"
+"PO-Revision-Date: 2013-09-24 20:53+0200\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -19,15 +19,14 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83 pg_backup_db.c:148 pg_backup_db.c:203
-#: pg_backup_db.c:247 pg_backup_db.c:293
+#: ../../common/fe_memutils.c:83 pg_backup_db.c:134 pg_backup_db.c:189
+#: pg_backup_db.c:233 pg_backup_db.c:279
#, c-format
msgid "out of memory\n"
msgstr "nedostatek paměti\n"
#: ../../common/fe_memutils.c:77
#, c-format
-#| msgid "cannot duplicate null pointer\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "nelze duplikovat null pointer (interní chyba)\n"
@@ -53,7 +52,6 @@ msgstr "nelze najít spustitelný soubor \"%s\""
#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-#| msgid "could not change directory to \"%s\""
msgid "could not change directory to \"%s\": %s"
msgstr "nelze změnit adresář na \"%s\" : %s"
@@ -64,279 +62,393 @@ msgstr "nelze číst symbolický link \"%s\""
#: ../../port/exec.c:523
#, c-format
-#| msgid "query failed: %s"
msgid "pclose failed: %s"
msgstr "volání pclose selhalo: %s"
-#: common.c:104
+#: common.c:105
#, c-format
msgid "reading schemas\n"
msgstr "čtu schémata\n"
-#: common.c:115
+#: common.c:116
#, c-format
msgid "reading user-defined tables\n"
msgstr "čtu uživatelem definované tabulky\n"
-#: common.c:123
+#: common.c:124
#, c-format
msgid "reading extensions\n"
msgstr "čtu rozšíření\n"
-#: common.c:127
+#: common.c:128
#, c-format
msgid "reading user-defined functions\n"
msgstr "čtu uživatelem definované funkce\n"
-#: common.c:133
+#: common.c:134
#, c-format
msgid "reading user-defined types\n"
msgstr "čtu uživatelem definované typy\n"
-#: common.c:139
+#: common.c:140
#, c-format
msgid "reading procedural languages\n"
msgstr "čtu procedurální jazyky\n"
-#: common.c:143
+#: common.c:144
#, c-format
msgid "reading user-defined aggregate functions\n"
msgstr "čtu uživatelem definované agregátní funkce\n"
-#: common.c:147
+#: common.c:148
#, c-format
msgid "reading user-defined operators\n"
msgstr "čtu uživatelem definované operátory\n"
-#: common.c:152
+#: common.c:153
#, c-format
msgid "reading user-defined operator classes\n"
msgstr "čtu uživatelem definované třídy operátorů\n"
-#: common.c:156
+#: common.c:157
#, c-format
msgid "reading user-defined operator families\n"
msgstr "čtu uživatelem definované rodiny operátorů\n"
-#: common.c:160
+#: common.c:161
#, c-format
msgid "reading user-defined text search parsers\n"
msgstr "čtu uživatelem definované fulltextové parsery\n"
-#: common.c:164
+#: common.c:165
#, c-format
msgid "reading user-defined text search templates\n"
msgstr "čtu uživatelem definované fulltextové šablony\n"
-#: common.c:168
+#: common.c:169
#, c-format
msgid "reading user-defined text search dictionaries\n"
msgstr "čtu uživatelem definované fulltextové slovníky\n"
-#: common.c:172
+#: common.c:173
#, c-format
msgid "reading user-defined text search configurations\n"
msgstr "čtu uživatelské fulltextového konfigurace\n"
-#: common.c:176
+#: common.c:177
#, c-format
msgid "reading user-defined foreign-data wrappers\n"
msgstr "čtu uživatelem definované foreign-data wrappery\n"
-#: common.c:180
+#: common.c:181
#, c-format
msgid "reading user-defined foreign servers\n"
msgstr "čtu uživatelem definované foreign servery\n"
-#: common.c:184
+#: common.c:185
#, c-format
msgid "reading default privileges\n"
msgstr "čtu implicitní přístupová práva\n"
-#: common.c:188
+#: common.c:189
#, c-format
msgid "reading user-defined collations\n"
msgstr "čtu uživatelem definované collations\n"
-#: common.c:193
+#: common.c:194
#, c-format
msgid "reading user-defined conversions\n"
msgstr "čtu uživatelem definované konverze\n"
-#: common.c:197
+#: common.c:198
#, c-format
msgid "reading type casts\n"
msgstr "čtu přetypování\n"
-#: common.c:201
+#: common.c:202
#, c-format
msgid "reading table inheritance information\n"
msgstr "čtu informace dědičnosti tabulky\n"
-#: common.c:205
+#: common.c:206
#, c-format
-msgid "reading rewrite rules\n"
-msgstr "čtu přepisovací pravidla\n"
+msgid "reading event triggers\n"
+msgstr "čtu event triggery\n"
-#: common.c:214
+#: common.c:215
#, c-format
msgid "finding extension members\n"
msgstr "hledám složky rozšíření\n"
-#: common.c:219
+#: common.c:220
#, c-format
msgid "finding inheritance relationships\n"
msgstr "hledám informace o dědičnosti\n"
-#: common.c:223
+#: common.c:224
#, c-format
msgid "reading column info for interesting tables\n"
msgstr "čtu informace o sloupci pro tabulky\n"
-#: common.c:227
+#: common.c:228
#, c-format
msgid "flagging inherited columns in subtables\n"
msgstr "označuji zděděné sloupce v pod-tabulkách\n"
-#: common.c:231
+#: common.c:232
#, c-format
msgid "reading indexes\n"
msgstr "čtu indexy\n"
-#: common.c:235
+#: common.c:236
#, c-format
msgid "reading constraints\n"
msgstr "čtu omezení\n"
-#: common.c:239
+#: common.c:240
#, c-format
msgid "reading triggers\n"
msgstr "čtu triggery\n"
-#: common.c:243
+#: common.c:244
#, c-format
-#| msgid "reading triggers\n"
-msgid "reading event triggers\n"
-msgstr "čtu event triggery\n"
+msgid "reading rewrite rules\n"
+msgstr "čtu přepisovací pravidla\n"
-#: common.c:791
+#: common.c:792
#, c-format
msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
msgstr ""
"selhala kontrola, rodičovské OID %u tabulky \"%s\" (OID %u) nelze najít\n"
-#: common.c:833
+#: common.c:834
#, c-format
msgid "could not parse numeric array \"%s\": too many numbers\n"
msgstr "nemohu zpracovat numerické pole \"%s\": příliš mnoho čísel\n"
-#: common.c:848
+#: common.c:849
#, c-format
msgid "could not parse numeric array \"%s\": invalid character in number\n"
msgstr "nemohu zpracovat numerické pole \"%s\": neplatný znak v čísle\n"
#. translator: this is a module name
-#: compress_io.c:77
+#: compress_io.c:78
msgid "compress_io"
msgstr "compress_io"
-#: compress_io.c:113
+#: compress_io.c:114
#, c-format
msgid "invalid compression code: %d\n"
msgstr "neplatný kompresní kód: %d\n"
-#: compress_io.c:137 compress_io.c:173 compress_io.c:191 compress_io.c:518
-#: compress_io.c:545
+#: compress_io.c:138 compress_io.c:174 compress_io.c:195 compress_io.c:528
+#: compress_io.c:555
#, c-format
msgid "not built with zlib support\n"
msgstr "nezkompilováno s podporou zlib\n"
-#: compress_io.c:239 compress_io.c:348
+#: compress_io.c:243 compress_io.c:352
#, c-format
msgid "could not initialize compression library: %s\n"
msgstr "nelze inicializovat kompresní knihovnu: %s\n"
-#: compress_io.c:260
+#: compress_io.c:264
#, c-format
msgid "could not close compression stream: %s\n"
msgstr "nelze uzavřít kompresní stream: %s\n"
-#: compress_io.c:278
+#: compress_io.c:282
#, c-format
msgid "could not compress data: %s\n"
msgstr "nelze komprimovat data: %s\n"
-#: compress_io.c:299 compress_io.c:430 pg_backup_archiver.c:1475
-#: pg_backup_archiver.c:1498 pg_backup_custom.c:649 pg_backup_directory.c:479
-#: pg_backup_tar.c:591 pg_backup_tar.c:1080 pg_backup_tar.c:1301
+#: compress_io.c:303 compress_io.c:440 pg_backup_archiver.c:1437
+#: pg_backup_archiver.c:1460 pg_backup_custom.c:661 pg_backup_directory.c:529
+#: pg_backup_tar.c:598 pg_backup_tar.c:1087 pg_backup_tar.c:1308
#, c-format
msgid "could not write to output file: %s\n"
msgstr "nelze zapsat do výstupního souboru: %s\n"
-#: compress_io.c:365 compress_io.c:381
+#: compress_io.c:372 compress_io.c:388
#, c-format
msgid "could not uncompress data: %s\n"
msgstr "nelze dekomprimovat data: %s\n"
-#: compress_io.c:389
+#: compress_io.c:396
#, c-format
msgid "could not close compression library: %s\n"
msgstr "nelze uzavřít kompresní knihovnu: %s\n"
-#: dumputils.c:1266
+#: parallel.c:77
+#| msgid "tar archiver"
+msgid "parallel archiver"
+msgstr "paralelní archivář"
+
+#: parallel.c:143
#, c-format
-msgid "%s: unrecognized section name: \"%s\"\n"
-msgstr "%s: neznámý název sekce \"%s\"\n"
+#| msgid "%s: query failed: %s"
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s: WSAStartup selhal: %d\n"
-#: dumputils.c:1268 pg_dump.c:525 pg_dump.c:542 pg_dumpall.c:301
-#: pg_dumpall.c:311 pg_dumpall.c:321 pg_dumpall.c:330 pg_dumpall.c:339
-#: pg_dumpall.c:397 pg_restore.c:280 pg_restore.c:296 pg_restore.c:308
+#: parallel.c:343
#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Zkuste \"%s --help\" pro více informací.\n"
+msgid "worker is terminating\n"
+msgstr "worker končí\n"
-#: dumputils.c:1329
+#: parallel.c:535
#, c-format
-msgid "out of on_exit_nicely slots\n"
-msgstr "vyčerpáno on_exit_nicely slotů\n"
+#| msgid "could not create directory \"%s\": %s\n"
+msgid "could not create communication channels: %s\n"
+msgstr "nelze vytvořit komunikační kanály: %s\n"
+
+#: parallel.c:605
+#, c-format
+msgid "could not create worker process: %s\n"
+msgstr "nelze vytvořit worker proces: %s\n"
+
+#: parallel.c:822
+#, c-format
+#| msgid "could not set session user to \"%s\": %s"
+msgid "could not get relation name for OID %u: %s\n"
+msgstr "nelze získat jméno relace pro OID %u: %s\n"
+
+#: parallel.c:839
+#, c-format
+msgid ""
+"could not obtain lock on relation \"%s\"\n"
+"This usually means that someone requested an ACCESS EXCLUSIVE lock on the "
+"table after the pg_dump parent process had gotten the initial ACCESS SHARE "
+"lock on the table.\n"
+msgstr ""
+"nelze získat zámek na relaci \"%s\"\n"
+"Toto obvykle znamená že někdo si vyžádal ACCESS EXCLUSIVE zámek na tabulce "
+"poté co rodičovský pg_dump proces získal výchozí ACCESS SHARE zámek na dané "
+"tabulce.\n"
+
+#: parallel.c:923
+#, c-format
+#| msgid "%s: unrecognized section name: \"%s\"\n"
+msgid "unrecognized command on communication channel: %s\n"
+msgstr "nerozpoznaný příkaz na komunikačním kanálu: %s\n"
+
+#: parallel.c:956
+#, c-format
+#| msgid "worker process failed: exit code %d\n"
+msgid "a worker process died unexpectedly\n"
+msgstr "pracovní proces neočekávaně selhal\n"
+
+#: parallel.c:983 parallel.c:992
+#, c-format
+#| msgid "Error message from server: %s"
+msgid "invalid message received from worker: %s\n"
+msgstr "z pracovního procesu dorazila neplatná zpráva: %s\n"
+
+#: parallel.c:989 pg_backup_db.c:336
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: parallel.c:1041 parallel.c:1085
+#, c-format
+msgid "error processing a parallel work item\n"
+msgstr "chyba při paralelním zpracovávání položky\n"
+
+#: parallel.c:1113 parallel.c:1251
+#, c-format
+#| msgid "could not write to output file: %s\n"
+msgid "could not write to the communication channel: %s\n"
+msgstr "nelze zapsat do komunikačního kanálu: %s\n"
+
+#: parallel.c:1162
+#, c-format
+msgid "terminated by user\n"
+msgstr "ukončeno uživatelem\n"
+
+#: parallel.c:1214
+#, c-format
+#| msgid "error during file seek: %s\n"
+msgid "error in ListenToWorkers(): %s\n"
+msgstr "chyba v ListenToWorkers(): %s\n"
+
+#: parallel.c:1325
+#, c-format
+#| msgid "could not create worker process: %s\n"
+msgid "pgpipe: could not create socket: error code %d\n"
+msgstr "pgpipe: nelze vytvořit soket: chybový kód %d\n"
+
+#: parallel.c:1336
+#, c-format
+#| msgid "could not find entry for ID %d\n"
+msgid "pgpipe: could not bind: error code %d\n"
+msgstr "pgpipe: nelze provést bind: chybový kód %d\n"
+
+#: parallel.c:1343
+#, c-format
+#| msgid "could not find entry for ID %d\n"
+msgid "pgpipe: could not listen: error code %d\n"
+msgstr "pgpipe: nelze poslouchat: chybový kód %d\n"
+
+#: parallel.c:1350
+#, c-format
+#| msgid "worker process failed: exit code %d\n"
+msgid "pgpipe: getsockname() failed: error code %d\n"
+msgstr "pgpipe: getsockname() selhal: chybový kód %d\n"
+
+#: parallel.c:1357
+#, c-format
+#| msgid "could not create worker process: %s\n"
+msgid "pgpipe: could not create second socket: error code %d\n"
+msgstr "pgpipe: nelze vytvořit druhý soket: chybový kód %d\n"
+
+#: parallel.c:1365
+#, c-format
+#| msgid "%s: could not connect to database \"%s\"\n"
+msgid "pgpipe: could not connect socket: error code %d\n"
+msgstr "pgpipe: nelze se připojit k soketu: chybový kód %d\n"
+
+#: parallel.c:1372
+#, c-format
+#| msgid "%s: could not connect to database \"%s\"\n"
+msgid "pgpipe: could not accept connection: error code %d\n"
+msgstr "pgpipe: nelze přijmout spojení: chybový kód %d\n"
#. translator: this is a module name
-#: pg_backup_archiver.c:115
+#: pg_backup_archiver.c:51
msgid "archiver"
msgstr "archivář"
-#: pg_backup_archiver.c:231 pg_backup_archiver.c:1338
+#: pg_backup_archiver.c:169 pg_backup_archiver.c:1300
#, c-format
msgid "could not close output file: %s\n"
msgstr "nelze zavřít výstupní soubor: %s\n"
-#: pg_backup_archiver.c:266 pg_backup_archiver.c:271
+#: pg_backup_archiver.c:204 pg_backup_archiver.c:209
#, c-format
msgid "WARNING: archive items not in correct section order\n"
msgstr "WARNING: archivované položky v nesprávném pořadí sekcí\n"
-#: pg_backup_archiver.c:277
+#: pg_backup_archiver.c:215
#, c-format
msgid "unexpected section code %d\n"
msgstr "neočekávaný kód sekce %d\n"
-#: pg_backup_archiver.c:309
+#: pg_backup_archiver.c:247
#, c-format
msgid "-C and -1 are incompatible options\n"
msgstr "-C a -1 jsou nekompatibilní přepínače\n"
-#: pg_backup_archiver.c:319
+#: pg_backup_archiver.c:257
#, c-format
msgid "parallel restore is not supported with this archive file format\n"
msgstr "paralelní obnova není pro tento formát archivu podporována\n"
-#: pg_backup_archiver.c:323
+#: pg_backup_archiver.c:261
#, c-format
msgid ""
"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
msgstr "paralelní obnova není podporována s archivy z pre-8.0 verzí pg_dump\n"
-#: pg_backup_archiver.c:341
+#: pg_backup_archiver.c:279
#, c-format
msgid ""
"cannot restore from compressed archive (compression not supported in this "
@@ -344,75 +456,73 @@ msgid ""
msgstr ""
"nelze obnovit z komprimovaného archivu (není nastavena podpora komprese)\n"
-#: pg_backup_archiver.c:358
+#: pg_backup_archiver.c:296
#, c-format
msgid "connecting to database for restore\n"
msgstr "navazováno spojení s databází pro obnovu\n"
-#: pg_backup_archiver.c:360
+#: pg_backup_archiver.c:298
#, c-format
msgid "direct database connections are not supported in pre-1.3 archives\n"
msgstr ""
"přímé spojení s databází nejsou podporovány v archivech před verzí 1.3\n"
-#: pg_backup_archiver.c:401
+#: pg_backup_archiver.c:339
#, c-format
msgid "implied data-only restore\n"
msgstr "předpokládána pouze obnova dat\n"
-#: pg_backup_archiver.c:470
+#: pg_backup_archiver.c:408
#, c-format
msgid "dropping %s %s\n"
msgstr "odstraňuji %s %s\n"
-#: pg_backup_archiver.c:519
+#: pg_backup_archiver.c:475
#, c-format
msgid "setting owner and privileges for %s %s\n"
msgstr "nastavuji vlastníka a přístupová práva pro %s %s\n"
-#: pg_backup_archiver.c:585 pg_backup_archiver.c:587
+#: pg_backup_archiver.c:541 pg_backup_archiver.c:543
#, c-format
msgid "warning from original dump file: %s\n"
msgstr "varování z originálního dump souboru: %s\n"
-#: pg_backup_archiver.c:594
+#: pg_backup_archiver.c:550
#, c-format
msgid "creating %s %s\n"
msgstr "vytvářím %s %s\n"
-#: pg_backup_archiver.c:638
+#: pg_backup_archiver.c:594
#, c-format
msgid "connecting to new database \"%s\"\n"
msgstr "připojuji se k nové databázi \"%s\"\n"
-#: pg_backup_archiver.c:666
+#: pg_backup_archiver.c:622
#, c-format
-#| msgid "restoring %s\n"
msgid "processing %s\n"
msgstr "zpracovávám %s\n"
-#: pg_backup_archiver.c:680
+#: pg_backup_archiver.c:636
#, c-format
-#| msgid "restoring data for table \"%s\"\n"
msgid "processing data for table \"%s\"\n"
msgstr "zpracovávám data pro tabulku \"%s\"\n"
-#: pg_backup_archiver.c:742
+#: pg_backup_archiver.c:698
#, c-format
msgid "executing %s %s\n"
msgstr "vykonávám %s %s\n"
-#: pg_backup_archiver.c:776
+#: pg_backup_archiver.c:735
#, c-format
msgid "disabling triggers for %s\n"
msgstr "vypínám triggery pro %s\n"
-#: pg_backup_archiver.c:802
+#: pg_backup_archiver.c:761
#, c-format
msgid "enabling triggers for %s\n"
msgstr "zapínám triggery pro %s\n"
-#: pg_backup_archiver.c:832
+#: pg_backup_archiver.c:791
#, c-format
msgid ""
"internal error -- WriteData cannot be called outside the context of a "
@@ -420,12 +530,12 @@ msgid ""
msgstr ""
"interní chyba -- WriteData není možno volat mimo kontext rutiny DataDumper\n"
-#: pg_backup_archiver.c:986
+#: pg_backup_archiver.c:948
#, c-format
msgid "large-object output not supported in chosen format\n"
msgstr "\"large object\" výstup není podporován ve vybraném formátu\n"
-#: pg_backup_archiver.c:1040
+#: pg_backup_archiver.c:1002
#, c-format
msgid "restored %d large object\n"
msgid_plural "restored %d large objects\n"
@@ -433,55 +543,55 @@ msgstr[0] "obnoven %d large objekt\n"
msgstr[1] "obnoveny %d large objekty\n"
msgstr[2] "obnoveny %d large objektů\n"
-#: pg_backup_archiver.c:1061 pg_backup_tar.c:724
+#: pg_backup_archiver.c:1023 pg_backup_tar.c:731
#, c-format
msgid "restoring large object with OID %u\n"
msgstr "obnovován \"large object\" s OID %u\n"
-#: pg_backup_archiver.c:1073
+#: pg_backup_archiver.c:1035
#, c-format
msgid "could not create large object %u: %s"
msgstr "nelze vytvořit \"large object\" %u: %s"
-#: pg_backup_archiver.c:1078 pg_dump.c:2558
+#: pg_backup_archiver.c:1040 pg_dump.c:2662
#, c-format
msgid "could not open large object %u: %s"
msgstr "nelze otevřít \"large object\" %u:%s"
-#: pg_backup_archiver.c:1135
+#: pg_backup_archiver.c:1097
#, c-format
msgid "could not open TOC file \"%s\": %s\n"
msgstr "nelze otevřít TOC soubor \"%s\": %s\n"
-#: pg_backup_archiver.c:1176
+#: pg_backup_archiver.c:1138
#, c-format
msgid "WARNING: line ignored: %s\n"
msgstr "VAROVÁNÍ: řádka ignorována: %s\n"
-#: pg_backup_archiver.c:1183
+#: pg_backup_archiver.c:1145
#, c-format
msgid "could not find entry for ID %d\n"
msgstr "nelze najít záznam ID %d\n"
-#: pg_backup_archiver.c:1204 pg_backup_directory.c:179
-#: pg_backup_directory.c:540
+#: pg_backup_archiver.c:1166 pg_backup_directory.c:222
+#: pg_backup_directory.c:595
#, c-format
msgid "could not close TOC file: %s\n"
msgstr "nelze zavřít TOC soubor: %s\n"
-#: pg_backup_archiver.c:1308 pg_backup_custom.c:149 pg_backup_directory.c:290
-#: pg_backup_directory.c:526 pg_backup_directory.c:570
-#: pg_backup_directory.c:590
+#: pg_backup_archiver.c:1270 pg_backup_custom.c:161 pg_backup_directory.c:333
+#: pg_backup_directory.c:581 pg_backup_directory.c:639
+#: pg_backup_directory.c:659
#, c-format
msgid "could not open output file \"%s\": %s\n"
msgstr "nelze otevřít výstupní soubor \"%s\": %s\n"
-#: pg_backup_archiver.c:1311 pg_backup_custom.c:156
+#: pg_backup_archiver.c:1273 pg_backup_custom.c:168
#, c-format
msgid "could not open output file: %s\n"
msgstr "nelze otevřít výstupní soubor: %s\n"
-#: pg_backup_archiver.c:1411
+#: pg_backup_archiver.c:1373
#, c-format
msgid "wrote %lu byte of large object data (result = %lu)\n"
msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
@@ -489,182 +599,182 @@ msgstr[0] "zapsán %lu byte dat large objektů (result = %lu)\n"
msgstr[1] "zapsán %lu byty dat large objektů (result = %lu)\n"
msgstr[2] "zapsán %lu bytů dat large objektů (result = %lu)\n"
-#: pg_backup_archiver.c:1417
+#: pg_backup_archiver.c:1379
#, c-format
msgid "could not write to large object (result: %lu, expected: %lu)\n"
msgstr "nelze zapsat \"large object\" (výsledek = %lu, očekáváno: %lu)\n"
-#: pg_backup_archiver.c:1483
+#: pg_backup_archiver.c:1445
#, c-format
msgid "could not write to custom output routine\n"
msgstr "nelze zapsat do vlastní výstupní rutiny\n"
-#: pg_backup_archiver.c:1521
+#: pg_backup_archiver.c:1483
#, c-format
msgid "Error while INITIALIZING:\n"
msgstr "Chyba během INICIALIZACE:\n"
-#: pg_backup_archiver.c:1526
+#: pg_backup_archiver.c:1488
#, c-format
msgid "Error while PROCESSING TOC:\n"
msgstr "Chyba během ZPRACOVÁNÍ TOC:\n"
-#: pg_backup_archiver.c:1531
+#: pg_backup_archiver.c:1493
#, c-format
msgid "Error while FINALIZING:\n"
msgstr "Chyba během FINALIZACE:\n"
-#: pg_backup_archiver.c:1536
+#: pg_backup_archiver.c:1498
#, c-format
msgid "Error from TOC entry %d; %u %u %s %s %s\n"
msgstr "Chyba v TOC záznamu %d; %u %u %s %s %s\n"
-#: pg_backup_archiver.c:1609
+#: pg_backup_archiver.c:1571
#, c-format
msgid "bad dumpId\n"
msgstr "neplatné dumpId\n"
-#: pg_backup_archiver.c:1630
+#: pg_backup_archiver.c:1592
#, c-format
msgid "bad table dumpId for TABLE DATA item\n"
msgstr "špatné dumpId tabulky pro TABLE DATA položku\n"
-#: pg_backup_archiver.c:1722
+#: pg_backup_archiver.c:1684
#, c-format
msgid "unexpected data offset flag %d\n"
msgstr "Neočekávaný příznak datového offsetu %d\n"
-#: pg_backup_archiver.c:1735
+#: pg_backup_archiver.c:1697
#, c-format
msgid "file offset in dump file is too large\n"
msgstr "offset souboru v dumpu je příliš velký\n"
-#: pg_backup_archiver.c:1829 pg_backup_archiver.c:3267 pg_backup_custom.c:627
-#: pg_backup_directory.c:462 pg_backup_tar.c:780
+#: pg_backup_archiver.c:1791 pg_backup_archiver.c:3247 pg_backup_custom.c:639
+#: pg_backup_directory.c:509 pg_backup_tar.c:787
#, c-format
msgid "unexpected end of file\n"
msgstr "neočekávaný konec souboru\n"
-#: pg_backup_archiver.c:1846
+#: pg_backup_archiver.c:1808
#, c-format
msgid "attempting to ascertain archive format\n"
msgstr "pokouším se zjistit formát archivu\n"
-#: pg_backup_archiver.c:1872 pg_backup_archiver.c:1882
+#: pg_backup_archiver.c:1834 pg_backup_archiver.c:1844
#, c-format
msgid "directory name too long: \"%s\"\n"
msgstr "jméno adresáře je příliš dlouhé: \"%s\"\n"
-#: pg_backup_archiver.c:1890
+#: pg_backup_archiver.c:1852
#, c-format
msgid ""
"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
"exist)\n"
msgstr "adresář \"%s\" zřejmě není platným archivem (\"toc.dat\" neexistuje)\n"
-#: pg_backup_archiver.c:1898 pg_backup_custom.c:168 pg_backup_custom.c:759
-#: pg_backup_directory.c:163 pg_backup_directory.c:348
+#: pg_backup_archiver.c:1860 pg_backup_custom.c:180 pg_backup_custom.c:771
+#: pg_backup_directory.c:206 pg_backup_directory.c:394
#, c-format
msgid "could not open input file \"%s\": %s\n"
msgstr "nelze otevřít vstupní soubor \"%s\": %s\n"
-#: pg_backup_archiver.c:1906 pg_backup_custom.c:175
+#: pg_backup_archiver.c:1868 pg_backup_custom.c:187
#, c-format
msgid "could not open input file: %s\n"
msgstr "nelze otevřít vstupní soubor: %s\n"
-#: pg_backup_archiver.c:1915
+#: pg_backup_archiver.c:1877
#, c-format
msgid "could not read input file: %s\n"
msgstr "nelze číst vstupní soubor: %s\n"
-#: pg_backup_archiver.c:1917
+#: pg_backup_archiver.c:1879
#, c-format
msgid "input file is too short (read %lu, expected 5)\n"
msgstr "vstupní soubor je příliš krátký (čteno %lu, očekáváno 5)\n"
-#: pg_backup_archiver.c:1982
+#: pg_backup_archiver.c:1944
#, c-format
msgid "input file appears to be a text format dump. Please use psql.\n"
msgstr ""
"vstupní soubor se zdá být dump v textovém formátu. Použijte prosím psql.\n"
-#: pg_backup_archiver.c:1986
+#: pg_backup_archiver.c:1948
#, c-format
msgid "input file does not appear to be a valid archive (too short?)\n"
msgstr "vstupní soubor se nezdá být korektním archivem (příliš krátký?)\n"
-#: pg_backup_archiver.c:1989
+#: pg_backup_archiver.c:1951
#, c-format
msgid "input file does not appear to be a valid archive\n"
msgstr "vstupní soubor se nezdá být korektním archivem\n"
-#: pg_backup_archiver.c:2009
+#: pg_backup_archiver.c:1971
#, c-format
msgid "could not close input file: %s\n"
msgstr "nelze zavřít výstupní soubor: %s\n"
-#: pg_backup_archiver.c:2026
+#: pg_backup_archiver.c:1988
#, c-format
msgid "allocating AH for %s, format %d\n"
msgstr "alokován AH pro %s, formát %d\n"
-#: pg_backup_archiver.c:2129
+#: pg_backup_archiver.c:2093
#, c-format
msgid "unrecognized file format \"%d\"\n"
msgstr "neznámý formát souboru \"%d\"\n"
-#: pg_backup_archiver.c:2263
+#: pg_backup_archiver.c:2243
#, c-format
msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
msgstr "ID záznamu %d je mimo rozsah -- možná je poškozena TOC\n"
-#: pg_backup_archiver.c:2379
+#: pg_backup_archiver.c:2359
#, c-format
msgid "read TOC entry %d (ID %d) for %s %s\n"
msgstr "přečetl jsem TOC záznam %d (ID %d) pro %s %s\n"
-#: pg_backup_archiver.c:2413
+#: pg_backup_archiver.c:2393
#, c-format
msgid "unrecognized encoding \"%s\"\n"
msgstr "neplatné kódování \"%s\"\n"
-#: pg_backup_archiver.c:2418
+#: pg_backup_archiver.c:2398
#, c-format
msgid "invalid ENCODING item: %s\n"
msgstr "chybná položka ENCODING: %s\n"
-#: pg_backup_archiver.c:2436
+#: pg_backup_archiver.c:2416
#, c-format
msgid "invalid STDSTRINGS item: %s\n"
msgstr "chybná položka STDSTRINGS: %s\n"
-#: pg_backup_archiver.c:2653
+#: pg_backup_archiver.c:2633
#, c-format
msgid "could not set session user to \"%s\": %s"
msgstr "nelze nastavit uživatele session na \"%s\": %s"
-#: pg_backup_archiver.c:2685
+#: pg_backup_archiver.c:2665
#, c-format
msgid "could not set default_with_oids: %s"
msgstr "nelze nastavit default_with_oids: %s"
-#: pg_backup_archiver.c:2823
+#: pg_backup_archiver.c:2803
#, c-format
msgid "could not set search_path to \"%s\": %s"
msgstr "nelze nastavit search_path na \"%s\": %s"
-#: pg_backup_archiver.c:2884
+#: pg_backup_archiver.c:2864
#, c-format
msgid "could not set default_tablespace to %s: %s"
msgstr "nelze nastavit default_tablespace na %s: %s"
-#: pg_backup_archiver.c:2994 pg_backup_archiver.c:3177
+#: pg_backup_archiver.c:2974 pg_backup_archiver.c:3157
#, c-format
msgid "WARNING: don't know how to set owner for object type %s\n"
msgstr "VAROVÁNÍ: nevím jak nastavit vlastníka pro typ %s\n"
-#: pg_backup_archiver.c:3230
+#: pg_backup_archiver.c:3210
#, c-format
msgid ""
"WARNING: requested compression not available in this installation -- archive "
@@ -673,22 +783,22 @@ msgstr ""
"VAROVÁNÍ: požadovaná komprese není v této instalaci dostupná -- archiv bude "
"nekomprimovaný\n"
-#: pg_backup_archiver.c:3270
+#: pg_backup_archiver.c:3250
#, c-format
msgid "did not find magic string in file header\n"
msgstr "nelze najít identifikační řetězec v hlavičce souboru\n"
-#: pg_backup_archiver.c:3283
+#: pg_backup_archiver.c:3263
#, c-format
msgid "unsupported version (%d.%d) in file header\n"
msgstr "nepodporovaná verze (%d.%d) v hlavičce souboru\n"
-#: pg_backup_archiver.c:3288
+#: pg_backup_archiver.c:3268
#, c-format
msgid "sanity check on integer size (%lu) failed\n"
msgstr "selhala kontrola velikosti integeru (%lu)\n"
-#: pg_backup_archiver.c:3292
+#: pg_backup_archiver.c:3272
#, c-format
msgid ""
"WARNING: archive was made on a machine with larger integers, some operations "
@@ -697,13 +807,13 @@ msgstr ""
"VAROVÁNÍ: archiv byl vytvořen na stroji s většími celými čísly (integer), "
"některé operace mohou selhat\n"
-#: pg_backup_archiver.c:3302
+#: pg_backup_archiver.c:3282
#, c-format
msgid "expected format (%d) differs from format found in file (%d)\n"
msgstr ""
"očekávaný formát (%d) se liší se od formátu nalezeného v souboru (%d)\n"
-#: pg_backup_archiver.c:3318
+#: pg_backup_archiver.c:3298
#, c-format
msgid ""
"WARNING: archive is compressed, but this installation does not support "
@@ -712,122 +822,114 @@ msgstr ""
"VAROVÁNÍ: archiv je komprimován, ale tato instalace nepodporuje kompresi -- "
"data nebudou dostupná\n"
-#: pg_backup_archiver.c:3336
+#: pg_backup_archiver.c:3316
#, c-format
msgid "WARNING: invalid creation date in header\n"
msgstr "VAROVÁNÍ: v hlavičce je neplatné datum vytvoření\n"
-#: pg_backup_archiver.c:3496
+#: pg_backup_archiver.c:3405
#, c-format
-msgid "entering restore_toc_entries_parallel\n"
-msgstr "vstupuji do restore_toc_entries_parallel\n"
+#| msgid "entering restore_toc_entries_parallel\n"
+msgid "entering restore_toc_entries_prefork\n"
+msgstr "vstupuji do restore_toc_entries_prefork\n"
-#: pg_backup_archiver.c:3547
+#: pg_backup_archiver.c:3449
#, c-format
msgid "processing item %d %s %s\n"
msgstr "zpracovávám položku %d %s %s\n"
-#: pg_backup_archiver.c:3628
+#: pg_backup_archiver.c:3501
+#, c-format
+msgid "entering restore_toc_entries_parallel\n"
+msgstr "vstupuji do restore_toc_entries_parallel\n"
+
+#: pg_backup_archiver.c:3549
#, c-format
msgid "entering main parallel loop\n"
msgstr "vstupuji do hlavní paralelní smyčky\n"
-#: pg_backup_archiver.c:3640
+#: pg_backup_archiver.c:3560
#, c-format
msgid "skipping item %d %s %s\n"
msgstr "přeskakuji položku %d %s %s\n"
-#: pg_backup_archiver.c:3656
+#: pg_backup_archiver.c:3570
#, c-format
msgid "launching item %d %s %s\n"
msgstr "spouštím položku %d %s %s\n"
-#: pg_backup_archiver.c:3694
-#, c-format
-msgid "worker process crashed: status %d\n"
-msgstr "worker proces selhal: status %d\n"
-
-#: pg_backup_archiver.c:3699
+#: pg_backup_archiver.c:3628
#, c-format
msgid "finished main parallel loop\n"
msgstr "ukončuji hlavní paralelní smyčku\n"
-#: pg_backup_archiver.c:3723
-#, c-format
-msgid "processing missed item %d %s %s\n"
-msgstr "zpracování vynechalo položku %d %s %s\n"
-
-#: pg_backup_archiver.c:3749
+#: pg_backup_archiver.c:3637
#, c-format
-msgid "parallel_restore should not return\n"
-msgstr "parallel_restore by neměl skončit\n"
+#| msgid "entering restore_toc_entries_parallel\n"
+msgid "entering restore_toc_entries_postfork\n"
+msgstr "vstupuji do restore_toc_entries_postfork\n"
-#: pg_backup_archiver.c:3755
+#: pg_backup_archiver.c:3655
#, c-format
-msgid "could not create worker process: %s\n"
-msgstr "nelze vytvořit worker proces: %s\n"
-
-#: pg_backup_archiver.c:3763
-#, c-format
-msgid "could not create worker thread: %s\n"
-msgstr "nelze vytvořit worker thread: %s\n"
+msgid "processing missed item %d %s %s\n"
+msgstr "zpracování vynechalo položku %d %s %s\n"
-#: pg_backup_archiver.c:3987
+#: pg_backup_archiver.c:3804
#, c-format
msgid "no item ready\n"
msgstr "žádná položka není připravena\n"
-#: pg_backup_archiver.c:4084
+#: pg_backup_archiver.c:3854
#, c-format
msgid "could not find slot of finished worker\n"
msgstr "nelze najít slot ukončeného workera\n"
-#: pg_backup_archiver.c:4086
+#: pg_backup_archiver.c:3856
#, c-format
msgid "finished item %d %s %s\n"
msgstr "dokončena položka %d %s %s\n"
-#: pg_backup_archiver.c:4099
+#: pg_backup_archiver.c:3869
#, c-format
msgid "worker process failed: exit code %d\n"
msgstr "worker proces selhal: exit kód %d\n"
-#: pg_backup_archiver.c:4261
+#: pg_backup_archiver.c:4031
#, c-format
msgid "transferring dependency %d -> %d to %d\n"
msgstr "přenáším závislost %d -> %d to %d\n"
-#: pg_backup_archiver.c:4330
+#: pg_backup_archiver.c:4100
#, c-format
msgid "reducing dependencies for %d\n"
msgstr "redukuji závislosti pro %d\n"
-#: pg_backup_archiver.c:4369
+#: pg_backup_archiver.c:4139
#, c-format
msgid "table \"%s\" could not be created, will not restore its data\n"
msgstr "tabulku \"%s\" nelze vytvořit, její data nebudou obnovena\n"
#. translator: this is a module name
-#: pg_backup_custom.c:88
+#: pg_backup_custom.c:93
msgid "custom archiver"
msgstr "vlastní archivář"
-#: pg_backup_custom.c:370 pg_backup_null.c:151
+#: pg_backup_custom.c:382 pg_backup_null.c:152
#, c-format
msgid "invalid OID for large object\n"
msgstr "neplatné OID pro \"large object\"\n"
-#: pg_backup_custom.c:441
+#: pg_backup_custom.c:453
#, c-format
msgid "unrecognized data block type (%d) while searching archive\n"
msgstr "nepřípustný typ datového bloku (%d) během prohledávání archivu\n"
-#: pg_backup_custom.c:452
+#: pg_backup_custom.c:464
#, c-format
msgid "error during file seek: %s\n"
msgstr "chyba během posunu v souboru: %s\n"
-#: pg_backup_custom.c:462
+#: pg_backup_custom.c:474
#, c-format
msgid ""
"could not find block ID %d in archive -- possibly due to out-of-order "
@@ -838,7 +940,7 @@ msgstr ""
"požadavku, který nemohl být vyřízen kvůli chybějícím datovým offsetům v "
"archivu\n"
-#: pg_backup_custom.c:467
+#: pg_backup_custom.c:479
#, c-format
msgid ""
"could not find block ID %d in archive -- possibly due to out-of-order "
@@ -847,359 +949,355 @@ msgstr ""
"v archivu nelze najít blok ID %d -- možná kvůli out-of-order restore "
"požadavku, který nemohl být vyřízen kvůli non-seekable vstupnímu souboru\n"
-#: pg_backup_custom.c:472
+#: pg_backup_custom.c:484
#, c-format
msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
msgstr "v archivu nelze najít blok %d -- archiv může být poškozen\n"
-#: pg_backup_custom.c:479
+#: pg_backup_custom.c:491
#, c-format
msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
msgstr "nalezeno neočekávané ID bloku (%d) při čtení dat - očekáváno %d\n"
-#: pg_backup_custom.c:493
+#: pg_backup_custom.c:505
#, c-format
msgid "unrecognized data block type %d while restoring archive\n"
msgstr "nepřípustný typ datového bloku %d během obnovení archivu\n"
-#: pg_backup_custom.c:575 pg_backup_custom.c:909
+#: pg_backup_custom.c:587 pg_backup_custom.c:995
#, c-format
msgid "could not read from input file: end of file\n"
msgstr "nelze číst vstupní soubor: end of file\n"
-#: pg_backup_custom.c:578 pg_backup_custom.c:912
+#: pg_backup_custom.c:590 pg_backup_custom.c:998
#, c-format
msgid "could not read from input file: %s\n"
msgstr "nelze číst vstupní soubor: %s\n"
-#: pg_backup_custom.c:607
+#: pg_backup_custom.c:619
#, c-format
msgid "could not write byte: %s\n"
msgstr "nelze zapsat byte: %s\n"
-#: pg_backup_custom.c:715 pg_backup_custom.c:753
+#: pg_backup_custom.c:727 pg_backup_custom.c:765
#, c-format
msgid "could not close archive file: %s\n"
msgstr "nelze uzavřít archivní soubor: %s\n"
-#: pg_backup_custom.c:734
+#: pg_backup_custom.c:746
#, c-format
msgid "can only reopen input archives\n"
msgstr "vstupní archivy lze pouze znovu otevřít\n"
-#: pg_backup_custom.c:741
+#: pg_backup_custom.c:753
#, c-format
msgid "parallel restore from standard input is not supported\n"
msgstr "paralelní obnova ze standardního vstupnu není podporována\n"
-#: pg_backup_custom.c:743
+#: pg_backup_custom.c:755
#, c-format
msgid "parallel restore from non-seekable file is not supported\n"
msgstr "paralelní obnova z neseekovatelného souboru není podporována\n"
-#: pg_backup_custom.c:748
+#: pg_backup_custom.c:760
#, c-format
msgid "could not determine seek position in archive file: %s\n"
msgstr "nelze určit seek pozici v archivním souboru: %s\n"
-#: pg_backup_custom.c:763
+#: pg_backup_custom.c:775
#, c-format
msgid "could not set seek position in archive file: %s\n"
msgstr "nelze nastavit seek pozici v archivním souboru: %s\n"
-#: pg_backup_custom.c:781
+#: pg_backup_custom.c:793
#, c-format
msgid "compressor active\n"
msgstr "compressor aktivní\n"
-#: pg_backup_custom.c:817
+#: pg_backup_custom.c:903
#, c-format
msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
msgstr "VAROVÁNÍ: ftell neodpovídá očekávané pozici -- použit ftell\n"
#. translator: this is a module name
-#: pg_backup_db.c:26
+#: pg_backup_db.c:28
msgid "archiver (db)"
msgstr "archivář (db)"
-#: pg_backup_db.c:39 pg_dump.c:594
-#, c-format
-msgid "could not parse version string \"%s\"\n"
-msgstr "neplatný formát řetězce s verzí \"%s\"\n"
-
-#: pg_backup_db.c:55
+#: pg_backup_db.c:43
#, c-format
msgid "could not get server_version from libpq\n"
msgstr "nelze získat server_version z libpq\n"
-#: pg_backup_db.c:68 pg_dumpall.c:1900
+#: pg_backup_db.c:54 pg_dumpall.c:1896
#, c-format
msgid "server version: %s; %s version: %s\n"
msgstr "verze serveru: %s; %s verze: %s\n"
-#: pg_backup_db.c:70 pg_dumpall.c:1902
+#: pg_backup_db.c:56 pg_dumpall.c:1898
#, c-format
msgid "aborting because of server version mismatch\n"
msgstr "končím kvůli rozdílnosti verzí serverů\n"
-#: pg_backup_db.c:141
+#: pg_backup_db.c:127
#, c-format
msgid "connecting to database \"%s\" as user \"%s\"\n"
msgstr "připojuji se k databázi \"%s\" jako uživatel \"%s\"\n"
-#: pg_backup_db.c:146 pg_backup_db.c:198 pg_backup_db.c:245 pg_backup_db.c:291
-#: pg_dumpall.c:1724 pg_dumpall.c:1832
+#: pg_backup_db.c:132 pg_backup_db.c:184 pg_backup_db.c:231 pg_backup_db.c:277
+#: pg_dumpall.c:1726 pg_dumpall.c:1834
msgid "Password: "
msgstr "Heslo: "
-#: pg_backup_db.c:179
+#: pg_backup_db.c:165
#, c-format
msgid "failed to reconnect to database\n"
msgstr "selhalo znovunavázání spojení s databází\n"
-#: pg_backup_db.c:184
+#: pg_backup_db.c:170
#, c-format
msgid "could not reconnect to database: %s"
msgstr "nelze znovu navázat spojení s databází: %s"
-#: pg_backup_db.c:200
+#: pg_backup_db.c:186
#, c-format
msgid "connection needs password\n"
msgstr "spojení vyžaduje heslo\n"
-#: pg_backup_db.c:241
+#: pg_backup_db.c:227
#, c-format
msgid "already connected to a database\n"
msgstr "spojení s databází již existuje\n"
-#: pg_backup_db.c:283
+#: pg_backup_db.c:269
#, c-format
msgid "failed to connect to database\n"
msgstr "selhalo spojení s databází\n"
-#: pg_backup_db.c:302
+#: pg_backup_db.c:288
#, c-format
msgid "connection to database \"%s\" failed: %s"
msgstr "spojení s databází \"%s\" selhalo: %s"
-#: pg_backup_db.c:332
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:339
+#: pg_backup_db.c:343
#, c-format
msgid "query failed: %s"
msgstr "dotaz selhal: %s"
-#: pg_backup_db.c:341
+#: pg_backup_db.c:345
#, c-format
msgid "query was: %s\n"
msgstr "dotaz byl: %s\n"
-#: pg_backup_db.c:405
+#: pg_backup_db.c:409
#, c-format
msgid "%s: %s Command was: %s\n"
msgstr "%s: %s Příkaz byl: %s\n"
-#: pg_backup_db.c:456 pg_backup_db.c:527 pg_backup_db.c:534
+#: pg_backup_db.c:460 pg_backup_db.c:531 pg_backup_db.c:538
msgid "could not execute query"
msgstr "nelze provést dotaz"
-#: pg_backup_db.c:507
+#: pg_backup_db.c:511
#, c-format
msgid "error returned by PQputCopyData: %s"
msgstr "PQputCopyData vrátilo chybu: %s"
-#: pg_backup_db.c:553
+#: pg_backup_db.c:557
#, c-format
msgid "error returned by PQputCopyEnd: %s"
msgstr "PQputCopyEnd vrátilo chybu: %s"
-#: pg_backup_db.c:559
+#: pg_backup_db.c:563
#, c-format
msgid "COPY failed for table \"%s\": %s"
msgstr "COPY selhal pro tabulku \"%s\": %s"
-#: pg_backup_db.c:570
+#: pg_backup_db.c:574
msgid "could not start database transaction"
msgstr "nelze spustit databázovou transakci"
-#: pg_backup_db.c:576
+#: pg_backup_db.c:580
msgid "could not commit database transaction"
msgstr "nelze provést commit transakce"
#. translator: this is a module name
-#: pg_backup_directory.c:61
+#: pg_backup_directory.c:63
msgid "directory archiver"
msgstr "directory archiver"
-#: pg_backup_directory.c:143
+#: pg_backup_directory.c:161
#, c-format
msgid "no output directory specified\n"
msgstr "nezadán žádný výstupní adresář\n"
-#: pg_backup_directory.c:150
+#: pg_backup_directory.c:193
#, c-format
msgid "could not create directory \"%s\": %s\n"
msgstr "nelze vytvořit adresář \"%s\": %s\n"
-#: pg_backup_directory.c:359
+#: pg_backup_directory.c:405
#, c-format
msgid "could not close data file: %s\n"
msgstr "nelze uzavřít datový soubor: %s\n"
-#: pg_backup_directory.c:399
+#: pg_backup_directory.c:446
#, c-format
msgid "could not open large object TOC file \"%s\" for input: %s\n"
msgstr "nelze otevřít TOC soubor pro large objekty \"%s\" pro vstup: %s\n"
-#: pg_backup_directory.c:409
+#: pg_backup_directory.c:456
#, c-format
msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
msgstr "neplatný řádek v TOC souboru pro large objekty \"%s\" : \"%s\"\n"
-#: pg_backup_directory.c:418
+#: pg_backup_directory.c:465
#, c-format
msgid "error reading large object TOC file \"%s\"\n"
msgstr "chyba při čtení TOC souboru pro large objekty \"%s\"\n"
-#: pg_backup_directory.c:422
+#: pg_backup_directory.c:469
#, c-format
msgid "could not close large object TOC file \"%s\": %s\n"
msgstr "nelze uzavřít TOC soubor pro large objekty \"%s\": %s\n"
-#: pg_backup_directory.c:443
+#: pg_backup_directory.c:490
#, c-format
msgid "could not write byte\n"
msgstr "nelze zapsat byte\n"
-#: pg_backup_directory.c:613
+#: pg_backup_directory.c:682
#, c-format
msgid "could not write to blobs TOC file\n"
msgstr "nelze zapsat do TOC souboru pro bloby\n"
-#: pg_backup_directory.c:641
+#: pg_backup_directory.c:714
#, c-format
msgid "file name too long: \"%s\"\n"
msgstr "jméno souboru je příliš dlouhé: \"%s\"\n"
-#: pg_backup_null.c:76
+#: pg_backup_directory.c:800
+#, c-format
+#| msgid "error during file seek: %s\n"
+msgid "error during backup\n"
+msgstr "chyba během zálohování\n"
+
+#: pg_backup_null.c:77
#, c-format
msgid "this format cannot be read\n"
msgstr "tento formát nelze číst\n"
#. translator: this is a module name
-#: pg_backup_tar.c:108
+#: pg_backup_tar.c:109
msgid "tar archiver"
msgstr "tar archivář"
-#: pg_backup_tar.c:183
+#: pg_backup_tar.c:190
#, c-format
msgid "could not open TOC file \"%s\" for output: %s\n"
msgstr "nelze otevřít TOC soubor \"%s\" pro výstup: %s\n"
-#: pg_backup_tar.c:191
+#: pg_backup_tar.c:198
#, c-format
msgid "could not open TOC file for output: %s\n"
msgstr "nelze otevřít TOC soubor pro výstup: %s\n"
-#: pg_backup_tar.c:219 pg_backup_tar.c:375
+#: pg_backup_tar.c:226 pg_backup_tar.c:382
#, c-format
msgid "compression is not supported by tar archive format\n"
msgstr "komprese není podporována v \"tar\" výstupním formátu\n"
-#: pg_backup_tar.c:227
+#: pg_backup_tar.c:234
#, c-format
msgid "could not open TOC file \"%s\" for input: %s\n"
msgstr "nelze otevřít TOC soubor \"%s\" pro vstup: %s\n"
-#: pg_backup_tar.c:234
+#: pg_backup_tar.c:241
#, c-format
msgid "could not open TOC file for input: %s\n"
msgstr "nelze otevřít TOC soubor pro vstup: %s\n"
-#: pg_backup_tar.c:361
+#: pg_backup_tar.c:368
#, c-format
msgid "could not find file \"%s\" in archive\n"
msgstr "v archivu nelze najít soubor \"%s\"\n"
-#: pg_backup_tar.c:417
+#: pg_backup_tar.c:424
#, c-format
msgid "could not generate temporary file name: %s\n"
msgstr "nelze vygenerovat jméno dočasného souboru: %s\n"
-#: pg_backup_tar.c:426
+#: pg_backup_tar.c:433
#, c-format
msgid "could not open temporary file\n"
msgstr "nelze otevřít dočasný soubor\n"
-#: pg_backup_tar.c:453
+#: pg_backup_tar.c:460
#, c-format
msgid "could not close tar member\n"
msgstr "nelze zavřít tar položku\n"
-#: pg_backup_tar.c:553
+#: pg_backup_tar.c:560
#, c-format
msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
msgstr "interní chyba -- ani th ani fh nespecifikován v tarReadRaw()\n"
-#: pg_backup_tar.c:679
+#: pg_backup_tar.c:686
#, c-format
msgid "unexpected COPY statement syntax: \"%s\"\n"
msgstr "neočekávaná syntaxe příkazu COPY: \"%s\"\n"
-#: pg_backup_tar.c:882
+#: pg_backup_tar.c:889
#, c-format
msgid "could not write null block at end of tar archive\n"
msgstr "nelze zapsat null blok na konec tar archivu\n"
-#: pg_backup_tar.c:937
+#: pg_backup_tar.c:944
#, c-format
msgid "invalid OID for large object (%u)\n"
msgstr "neplatné OID pro \"large object\" (%u)\n"
-#: pg_backup_tar.c:1071
+#: pg_backup_tar.c:1078
#, c-format
msgid "archive member too large for tar format\n"
msgstr "položka archivu je příliš velká pro formát tar\n"
-#: pg_backup_tar.c:1086
+#: pg_backup_tar.c:1093
#, c-format
msgid "could not close temporary file: %s\n"
msgstr "nelze otevřít dočasný soubor: %s\n"
-#: pg_backup_tar.c:1096
+#: pg_backup_tar.c:1103
#, c-format
msgid "actual file length (%s) does not match expected (%s)\n"
msgstr "skutečná délka souboru (%s) není stejná jako očekávaná (%s)\n"
-#: pg_backup_tar.c:1104
+#: pg_backup_tar.c:1111
#, c-format
msgid "could not output padding at end of tar member\n"
msgstr "nelze zapsat vycpávku (padding) na konec položky taru\n"
-#: pg_backup_tar.c:1133
+#: pg_backup_tar.c:1140
#, c-format
msgid "moving from position %s to next member at file position %s\n"
msgstr "přecházím z pozice %s na následujícího položky na pozici souboru %s\n"
-#: pg_backup_tar.c:1144
+#: pg_backup_tar.c:1151
#, c-format
msgid "now at file position %s\n"
msgstr "nyní na pozici souboru %s\n"
-#: pg_backup_tar.c:1153 pg_backup_tar.c:1183
+#: pg_backup_tar.c:1160 pg_backup_tar.c:1190
#, c-format
msgid "could not find header for file \"%s\" in tar archive\n"
msgstr "nelze najít hlavičku pro soubor %s v tar archivu\n"
-#: pg_backup_tar.c:1167
+#: pg_backup_tar.c:1174
#, c-format
msgid "skipping tar member %s\n"
msgstr "přeskakován tar člen %s\n"
-#: pg_backup_tar.c:1171
+#: pg_backup_tar.c:1178
#, c-format
msgid ""
"restoring data out of order is not supported in this archive format: \"%s\" "
@@ -1208,12 +1306,12 @@ msgstr ""
"dump dat mimo pořadí není podporováno v tomto formátu archivu: %s je "
"vyžadován, ale předchází %s.\n"
-#: pg_backup_tar.c:1217
+#: pg_backup_tar.c:1224
#, c-format
msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
msgstr "aktuální a předpokládaná pozice souboru se neshodují (%s vs. %s)\n"
-#: pg_backup_tar.c:1232
+#: pg_backup_tar.c:1239
#, c-format
msgid "incomplete tar header found (%lu byte)\n"
msgid_plural "incomplete tar header found (%lu bytes)\n"
@@ -1221,12 +1319,12 @@ msgstr[0] "nalezena nekompletní tar hlavička (%lu byte)\n"
msgstr[1] "nalezena nekompletní tar hlavička (%lu byty)\n"
msgstr[2] "nalezena nekompletní tar hlavička (%lu bytů)\n"
-#: pg_backup_tar.c:1270
+#: pg_backup_tar.c:1277
#, c-format
msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
msgstr "TOC záznam %s na %s (délka %lu, kontrolní součet %d)\n"
-#: pg_backup_tar.c:1280
+#: pg_backup_tar.c:1287
#, c-format
msgid ""
"corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
@@ -1234,53 +1332,93 @@ msgstr ""
"nalezena poškozená tar hlavička v %s (předpokládáno %d, vypočteno %d) pozice "
"souboru %s\n"
-#: pg_dump.c:540 pg_dumpall.c:309 pg_restore.c:294
+#: pg_backup_utils.c:54
+#, c-format
+msgid "%s: unrecognized section name: \"%s\"\n"
+msgstr "%s: neznámý název sekce \"%s\"\n"
+
+#: pg_backup_utils.c:56 pg_dump.c:540 pg_dump.c:557 pg_dumpall.c:303
+#: pg_dumpall.c:313 pg_dumpall.c:323 pg_dumpall.c:332 pg_dumpall.c:341
+#: pg_dumpall.c:399 pg_restore.c:282 pg_restore.c:298 pg_restore.c:310
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
+
+#: pg_backup_utils.c:101
+#, c-format
+msgid "out of on_exit_nicely slots\n"
+msgstr "vyčerpáno on_exit_nicely slotů\n"
+
+#: pg_dump.c:555 pg_dumpall.c:311 pg_restore.c:296
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: příliš mnoho argumentů v příkazové řádce (první je \"%s\")\n"
-#: pg_dump.c:552
+#: pg_dump.c:567
#, c-format
msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
msgstr "volby -s/--schema-only a -a/--data-only nelze používat společně\n"
-#: pg_dump.c:555
+#: pg_dump.c:570
#, c-format
msgid "options -c/--clean and -a/--data-only cannot be used together\n"
msgstr "volby -c/--clean a -a/--data-only nelze používat společně\n"
-#: pg_dump.c:559
+#: pg_dump.c:574
#, c-format
msgid ""
"options --inserts/--column-inserts and -o/--oids cannot be used together\n"
msgstr "volby --inserts/--column-inserts a -o/--oids nelze používat společně\n"
-#: pg_dump.c:560
+#: pg_dump.c:575
#, c-format
msgid "(The INSERT command cannot set OIDs.)\n"
msgstr "(Příkaz INSERT nemůže nastavovat OID.)\n"
-#: pg_dump.c:587
+#: pg_dump.c:605
+#, c-format
+#| msgid "invalid column number %d for table \"%s\"\n"
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s: neplatný počet paralelních jobů\n"
+
+#: pg_dump.c:609
+#, c-format
+#| msgid "parallel restore is not supported with this archive file format\n"
+msgid "parallel backup only supported by the directory format\n"
+msgstr "paralelní záloha je podporována pouze directory formátem\n"
+
+#: pg_dump.c:619
#, c-format
msgid "could not open output file \"%s\" for writing\n"
msgstr "nelze otevřít výstupní soubor \"%s\" pro zápis\n"
#: pg_dump.c:678
#, c-format
+msgid ""
+"Synchronized snapshots are not supported by this server version.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"Synchronizované snapshoty nejsou na této verzi serveru podporovány.\n"
+"Pokud nepotřebujete synchronizované snapshoty, použijte přepínač\n"
+"--no-synchronized-snapshots.\n"
+
+#: pg_dump.c:691
+#, c-format
msgid "last built-in OID is %u\n"
msgstr "poslední vestavěné OID je %u\n"
-#: pg_dump.c:687
+#: pg_dump.c:700
#, c-format
msgid "No matching schemas were found\n"
msgstr "Nebyla nalezena žádná odovídající schémata.\n"
-#: pg_dump.c:699
+#: pg_dump.c:712
#, c-format
msgid "No matching tables were found\n"
msgstr "Nebyla nalezena žádná odpovídající tabulka.\n"
-#: pg_dump.c:839
+#: pg_dump.c:856
#, c-format
msgid ""
"%s dumps a database as a text file or to other formats.\n"
@@ -1289,17 +1427,17 @@ msgstr ""
"%s vytvoří dump databáze jako textový soubor nebo v jiném formátu.\n"
"\n"
-#: pg_dump.c:840 pg_dumpall.c:539 pg_restore.c:400
+#: pg_dump.c:857 pg_dumpall.c:541 pg_restore.c:414
#, c-format
msgid "Usage:\n"
msgstr "Použití:\n"
-#: pg_dump.c:841
+#: pg_dump.c:858
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [PŘEPÍNAČ]... [DATABÁZE]\n"
-#: pg_dump.c:843 pg_dumpall.c:542 pg_restore.c:403
+#: pg_dump.c:860 pg_dumpall.c:544 pg_restore.c:417
#, c-format
msgid ""
"\n"
@@ -1308,12 +1446,12 @@ msgstr ""
"\n"
"Obecné volby:\n"
-#: pg_dump.c:844
+#: pg_dump.c:861
#, c-format
msgid " -f, --file=FILENAME output file or directory name\n"
msgstr " -f, --file=SOUBOR výstupní soubor nebo adresář\n"
-#: pg_dump.c:845
+#: pg_dump.c:862
#, c-format
msgid ""
" -F, --format=c|d|t|p output file format (custom, directory, tar,\n"
@@ -1323,17 +1461,26 @@ msgstr ""
"tar,\n"
" plain text (výchozí))\n"
-#: pg_dump.c:847
+#: pg_dump.c:864
+#, c-format
+#| msgid ""
+#| " -j, --jobs=NUM use this many parallel jobs to restore\n"
+msgid " -j, --jobs=NUM use this many parallel jobs to dump\n"
+msgstr ""
+" -j, --jobs=NUM použij tento počet paralelních jobů pro "
+"zálohu\n"
+
+#: pg_dump.c:865
#, c-format
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose vypisovat více informací\n"
-#: pg_dump.c:848 pg_dumpall.c:544
+#: pg_dump.c:866 pg_dumpall.c:546
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version zobraz informaci o verzi, poté skonči\n"
-#: pg_dump.c:849
+#: pg_dump.c:867
#, c-format
msgid ""
" -Z, --compress=0-9 compression level for compressed formats\n"
@@ -1341,7 +1488,7 @@ msgstr ""
" -Z, --compress=0-9 úroveň komprese při použití komprimovaného "
"formátu\n"
-#: pg_dump.c:850 pg_dumpall.c:545
+#: pg_dump.c:868 pg_dumpall.c:547
#, c-format
msgid ""
" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
@@ -1349,12 +1496,12 @@ msgstr ""
" --lock-wait-timeout=TIMEOUT selže po uplynutí TIMEOUT čekáním na zámek "
"tabulky\n"
-#: pg_dump.c:851 pg_dumpall.c:546
+#: pg_dump.c:869 pg_dumpall.c:548
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help zobraz tuto nápovědu, poté skonči\n"
-#: pg_dump.c:853 pg_dumpall.c:547
+#: pg_dump.c:871 pg_dumpall.c:549
#, c-format
msgid ""
"\n"
@@ -1363,18 +1510,18 @@ msgstr ""
"\n"
"Přepínače ovlivňující výstup:\n"
-#: pg_dump.c:854 pg_dumpall.c:548
+#: pg_dump.c:872 pg_dumpall.c:550
#, c-format
msgid " -a, --data-only dump only the data, not the schema\n"
msgstr ""
" -a, --data-only dump pouze dat bez definic databázových objektů\n"
-#: pg_dump.c:855
+#: pg_dump.c:873
#, c-format
msgid " -b, --blobs include large objects in dump\n"
msgstr " -b, --blobs zahrnout \"large objects\" do dumpu\n"
-#: pg_dump.c:856 pg_restore.c:414
+#: pg_dump.c:874 pg_restore.c:428
#, c-format
msgid ""
" -c, --clean clean (drop) database objects before "
@@ -1382,35 +1529,35 @@ msgid ""
msgstr ""
" -c, --clean odstranit (drop) databázi před jejím vytvořením\n"
-#: pg_dump.c:857
+#: pg_dump.c:875
#, c-format
msgid ""
" -C, --create include commands to create database in dump\n"
msgstr ""
" -C, --create zahrnout příkazy pro vytvoření databáze do dumpu\n"
-#: pg_dump.c:858
+#: pg_dump.c:876
#, c-format
msgid " -E, --encoding=ENCODING dump the data in encoding ENCODING\n"
msgstr " -E, --encoding=KÓDOVÁNÍ kódování znaků databáze\n"
-#: pg_dump.c:859
+#: pg_dump.c:877
#, c-format
msgid " -n, --schema=SCHEMA dump the named schema(s) only\n"
msgstr ""
" -n, --schema=SCHEMA vytvořit dump pouze specifikovaného schématu\n"
-#: pg_dump.c:860
+#: pg_dump.c:878
#, c-format
msgid " -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
msgstr " -N, --exclude-schema=SCHEMA nedumpuj uvedené schéma(ta)\n"
-#: pg_dump.c:861 pg_dumpall.c:551
+#: pg_dump.c:879 pg_dumpall.c:553
#, c-format
msgid " -o, --oids include OIDs in dump\n"
msgstr " -o, --oids zahrnout OID do dumpu\n"
-#: pg_dump.c:862
+#: pg_dump.c:880
#, c-format
msgid ""
" -O, --no-owner skip restoration of object ownership in\n"
@@ -1420,14 +1567,14 @@ msgstr ""
"objektu\n"
" v čistě textovém formátu\n"
-#: pg_dump.c:864 pg_dumpall.c:554
+#: pg_dump.c:882 pg_dumpall.c:556
#, c-format
msgid " -s, --schema-only dump only the schema, no data\n"
msgstr ""
" -s, --schema-only dump pouze definic databázových objektů\n"
" (tabulek apod.) bez dat\n"
-#: pg_dump.c:865
+#: pg_dump.c:883
#, c-format
msgid ""
" -S, --superuser=NAME superuser user name to use in plain-text "
@@ -1436,29 +1583,29 @@ msgstr ""
" -S, --superuser=JMÉNO uživatelské jméno superuživatele použité při "
"dumpu\n"
-#: pg_dump.c:866
+#: pg_dump.c:884
#, c-format
msgid " -t, --table=TABLE dump the named table(s) only\n"
msgstr " -t, --table=TABULKA provést dump pouze uvedené tabulky\n"
-#: pg_dump.c:867
+#: pg_dump.c:885
#, c-format
msgid " -T, --exclude-table=TABLE do NOT dump the named table(s)\n"
msgstr " -T, --exclude-table=TABLE neprováděj dump uvedených tabulek\n"
-#: pg_dump.c:868 pg_dumpall.c:557
+#: pg_dump.c:886 pg_dumpall.c:559
#, c-format
msgid " -x, --no-privileges do not dump privileges (grant/revoke)\n"
msgstr ""
" -x, --no-privileges neprovádět dump přístupových práv (grant/revoke)\n"
-#: pg_dump.c:869 pg_dumpall.c:558
+#: pg_dump.c:887 pg_dumpall.c:560
#, c-format
msgid " --binary-upgrade for use by upgrade utilities only\n"
msgstr ""
" --binary-upgrade pouze pro použití upgradovacími nástroji\n"
-#: pg_dump.c:870 pg_dumpall.c:559
+#: pg_dump.c:888 pg_dumpall.c:561
#, c-format
msgid ""
" --column-inserts dump data as INSERT commands with column "
@@ -1467,7 +1614,7 @@ msgstr ""
" --column-inserts použije pro dump dat příkaz INSERT se jmény "
"sloupců\n"
-#: pg_dump.c:871 pg_dumpall.c:560
+#: pg_dump.c:889 pg_dumpall.c:562
#, c-format
msgid ""
" --disable-dollar-quoting disable dollar quoting, use SQL standard "
@@ -1477,20 +1624,20 @@ msgstr ""
"používat\n"
" standardní SQL uvozování\n"
-#: pg_dump.c:872 pg_dumpall.c:561 pg_restore.c:430
+#: pg_dump.c:890 pg_dumpall.c:563 pg_restore.c:444
#, c-format
msgid ""
" --disable-triggers disable triggers during data-only restore\n"
msgstr ""
" --disable-triggers zakázat volání triggerů během obnovy dat\n"
-#: pg_dump.c:873
+#: pg_dump.c:891
#, c-format
msgid ""
" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n"
msgstr " --exclude-table-data=TABLE NEdumpuj data pro vyjmenované tabulky\n"
-#: pg_dump.c:874 pg_dumpall.c:562
+#: pg_dump.c:892 pg_dumpall.c:564
#, c-format
msgid ""
" --inserts dump data as INSERT commands, rather than "
@@ -1498,22 +1645,32 @@ msgid ""
msgstr ""
" --inserts použít pro dump dat příkazy INSERT místo COPY\n"
-#: pg_dump.c:875 pg_dumpall.c:563
+#: pg_dump.c:893 pg_dumpall.c:565
#, c-format
msgid " --no-security-labels do not dump security label assignments\n"
msgstr " --no-security-labels neprovádět dump bezpečnostních štítků\n"
-#: pg_dump.c:876 pg_dumpall.c:564
+#: pg_dump.c:894
+#, c-format
+msgid ""
+" --no-synchronized-snapshots do not use synchronized snapshots in parallel "
+"jobs\n"
+msgstr ""
+" --no-synchronized-snapshots nepoužívat synchronizované snapshoty v "
+"paralelních "
+"jobech\n"
+
+#: pg_dump.c:895 pg_dumpall.c:566
#, c-format
msgid " --no-tablespaces do not dump tablespace assignments\n"
msgstr " --no-tablespaces neprovádět dump přiřazení tablespaces\n"
-#: pg_dump.c:877 pg_dumpall.c:565
+#: pg_dump.c:896 pg_dumpall.c:567
#, c-format
msgid " --no-unlogged-table-data do not dump unlogged table data\n"
msgstr " --no-unlogged-table-data nedumpuj data unlogged tabulek\n"
-#: pg_dump.c:878 pg_dumpall.c:566
+#: pg_dump.c:897 pg_dumpall.c:568
#, c-format
msgid ""
" --quote-all-identifiers quote all identifiers, even if not key words\n"
@@ -1521,7 +1678,7 @@ msgstr ""
" --quote-all-identifiers všechny identifikátory uveď v uvozovkách, i "
"když se nejedná o klíčová slova\n"
-#: pg_dump.c:879
+#: pg_dump.c:898
#, c-format
msgid ""
" --section=SECTION dump named section (pre-data, data, or post-"
@@ -1530,7 +1687,7 @@ msgstr ""
" --section=SECTION dump pojmenované sekce (pre-data, data, nebo "
"post-data)\n"
-#: pg_dump.c:880
+#: pg_dump.c:899
#, c-format
msgid ""
" --serializable-deferrable wait until the dump can run without "
@@ -1539,7 +1696,7 @@ msgstr ""
" --serializable-deferrable počkej než bude možné provést dump bez "
"anomálií\n"
-#: pg_dump.c:881 pg_dumpall.c:567 pg_restore.c:436
+#: pg_dump.c:900 pg_dumpall.c:569 pg_restore.c:450
#, c-format
msgid ""
" --use-set-session-authorization\n"
@@ -1547,12 +1704,12 @@ msgid ""
"instead of\n"
" ALTER OWNER commands to set ownership\n"
msgstr ""
-" -use-set-session-authorization\n"
+" --use-set-session-authorization\n"
" používat příkaz SET SESSION AUTHORIZATION "
"namísto\n"
" příkazu ALTER OWNER pro nastavení vlastníka\n"
-#: pg_dump.c:885 pg_dumpall.c:571 pg_restore.c:440
+#: pg_dump.c:904 pg_dumpall.c:573 pg_restore.c:454
#, c-format
msgid ""
"\n"
@@ -1561,35 +1718,34 @@ msgstr ""
"\n"
"Volby spojení:\n"
-#: pg_dump.c:886
+#: pg_dump.c:905
#, c-format
-#| msgid " -d, --dbname=NAME connect to database name\n"
msgid " -d, --dbname=DBNAME database to dump\n"
msgstr " -d, --dbname=JMÉNO jméno zdrojové databáze\n"
-#: pg_dump.c:887 pg_dumpall.c:573 pg_restore.c:441
+#: pg_dump.c:906 pg_dumpall.c:575 pg_restore.c:455
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr ""
" -h, --host=HOSTNAME host databázového serveru nebo adresář se "
"sockety\n"
-#: pg_dump.c:888 pg_dumpall.c:575 pg_restore.c:442
+#: pg_dump.c:907 pg_dumpall.c:577 pg_restore.c:456
#, c-format
msgid " -p, --port=PORT database server port number\n"
msgstr " -p, --port=PORT port databázového serveru\n"
-#: pg_dump.c:889 pg_dumpall.c:576 pg_restore.c:443
+#: pg_dump.c:908 pg_dumpall.c:578 pg_restore.c:457
#, c-format
msgid " -U, --username=NAME connect as specified database user\n"
msgstr " -U, --username=JMÉNO připoj se jako uvedený uživatel\n"
-#: pg_dump.c:890 pg_dumpall.c:577 pg_restore.c:444
+#: pg_dump.c:909 pg_dumpall.c:579 pg_restore.c:458
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password nikdy se neptej na heslo\n"
-#: pg_dump.c:891 pg_dumpall.c:578 pg_restore.c:445
+#: pg_dump.c:910 pg_dumpall.c:580 pg_restore.c:459
#, c-format
msgid ""
" -W, --password force password prompt (should happen "
@@ -1597,12 +1753,12 @@ msgid ""
msgstr ""
" -W, --password zeptej se na heslo (mělo by se dít automaticky)\n"
-#: pg_dump.c:892 pg_dumpall.c:579
+#: pg_dump.c:911 pg_dumpall.c:581
#, c-format
msgid " --role=ROLENAME do SET ROLE before dump\n"
msgstr " --role=ROLENAME před dumpem proveď SET ROLE\n"
-#: pg_dump.c:894
+#: pg_dump.c:913
#, c-format
msgid ""
"\n"
@@ -1615,143 +1771,143 @@ msgstr ""
"PGDATABASE.\n"
"\n"
-#: pg_dump.c:896 pg_dumpall.c:583 pg_restore.c:449
+#: pg_dump.c:915 pg_dumpall.c:585 pg_restore.c:463
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "Oznámení o chybách zasílejte na <pgsql-bugs@postgresql.org>.\n"
-#: pg_dump.c:909
+#: pg_dump.c:933
#, c-format
msgid "invalid client encoding \"%s\" specified\n"
msgstr "specifikováno neplatné klientské kódování \"%s\"\n"
-#: pg_dump.c:1000
+#: pg_dump.c:1095
#, c-format
msgid "invalid output format \"%s\" specified\n"
msgstr "specifikován neplatný formát \"%s\" výstupu\n"
-#: pg_dump.c:1022
+#: pg_dump.c:1117
#, c-format
msgid "server version must be at least 7.3 to use schema selection switches\n"
msgstr ""
"verze serveru musí být alespoň 7.3 pro použití přepínačů prů výběr schématu\n"
-#: pg_dump.c:1292
+#: pg_dump.c:1393
#, c-format
msgid "dumping contents of table %s\n"
msgstr "dumpuji obsah tabulky %s\n"
-#: pg_dump.c:1414
+#: pg_dump.c:1516
#, c-format
msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
msgstr "Dumpování obsahu tabulky \"%s\" selhalo: PQgetCopyData() selhal.\n"
-#: pg_dump.c:1415 pg_dump.c:1425
+#: pg_dump.c:1517 pg_dump.c:1527
#, c-format
msgid "Error message from server: %s"
msgstr "Chybová zpráva ze serveru: %s"
-#: pg_dump.c:1416 pg_dump.c:1426
+#: pg_dump.c:1518 pg_dump.c:1528
#, c-format
msgid "The command was: %s\n"
msgstr "Příkaz byl: %s\n"
-#: pg_dump.c:1424
+#: pg_dump.c:1526
#, c-format
msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
msgstr "Dumpuji obsahu tabulky \"%s\" selhal: PQgetResult() selhal.\n"
-#: pg_dump.c:2032
+#: pg_dump.c:2136
#, c-format
msgid "saving database definition\n"
msgstr "ukládám definice databáze\n"
-#: pg_dump.c:2329
+#: pg_dump.c:2433
#, c-format
msgid "saving encoding = %s\n"
msgstr "ukládám kódování znaků = %s\n"
-#: pg_dump.c:2356
+#: pg_dump.c:2460
#, c-format
msgid "saving standard_conforming_strings = %s\n"
msgstr "ukládám standard_conforming_strings = %s\n"
-#: pg_dump.c:2389
+#: pg_dump.c:2493
#, c-format
msgid "reading large objects\n"
msgstr "čtu \"large objects\"\n"
-#: pg_dump.c:2521
+#: pg_dump.c:2625
#, c-format
msgid "saving large objects\n"
msgstr "ukládám \"large objects\"\n"
-#: pg_dump.c:2568
+#: pg_dump.c:2672
#, c-format
msgid "error reading large object %u: %s"
msgstr "chyba při čtení large objektu %u: %s"
-#: pg_dump.c:2761
+#: pg_dump.c:2865
#, c-format
msgid "could not find parent extension for %s\n"
msgstr "nelze najít nadřízené rozšíření pro %s\n"
-#: pg_dump.c:2864
+#: pg_dump.c:2968
#, c-format
msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník schématu \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:2907
+#: pg_dump.c:3011
#, c-format
msgid "schema with OID %u does not exist\n"
msgstr "schéma s OID %u neexistuje\n"
-#: pg_dump.c:3257
+#: pg_dump.c:3361
#, c-format
msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník datového typu \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:3368
+#: pg_dump.c:3472
#, c-format
msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník operátoru \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:3625
+#: pg_dump.c:3729
#, c-format
msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník třídy operátorů \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:3713
+#: pg_dump.c:3817
#, c-format
msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník rodiny operátorů \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:3872
+#: pg_dump.c:3976
#, c-format
msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník agregační funkce \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:4076
+#: pg_dump.c:4180
#, c-format
msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník funkce \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:4617
+#: pg_dump.c:4734
#, c-format
msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
msgstr "VAROVÁNÍ: vlastník tabulky \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:4767
+#: pg_dump.c:4885
#, c-format
msgid "reading indexes for table \"%s\"\n"
msgstr "čtu indexy pro tabulku \"%s\"\n"
-#: pg_dump.c:5086
+#: pg_dump.c:5218
#, c-format
msgid "reading foreign key constraints for table \"%s\"\n"
msgstr "čtu cizí klíče pro tabulku \"%s\"\n"
-#: pg_dump.c:5331
+#: pg_dump.c:5463
#, c-format
msgid ""
"failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
@@ -1760,12 +1916,12 @@ msgstr ""
"selhala kontrola, OID %u rodičovské tabulky u pg_rewrite položky OID %u "
"nelze najít\n"
-#: pg_dump.c:5424
+#: pg_dump.c:5556
#, c-format
msgid "reading triggers for table \"%s\"\n"
msgstr "čtu triggery pro tabulku \"%s\"\n"
-#: pg_dump.c:5585
+#: pg_dump.c:5717
#, c-format
msgid ""
"query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -1774,32 +1930,32 @@ msgstr ""
"dotaz vrátil prázdné jméno referencované tabulky pro trigger \"%s\" cizího "
"klíče pro tabulku \"%s\" (OID tabulky: %u)\n"
-#: pg_dump.c:6035
+#: pg_dump.c:6169
#, c-format
msgid "finding the columns and types of table \"%s\"\n"
msgstr "hledám sloupce a typy pro tabulku \"%s\"\n"
-#: pg_dump.c:6213
+#: pg_dump.c:6347
#, c-format
msgid "invalid column numbering in table \"%s\"\n"
msgstr "neplatné číslování sloupců v tabulce \"%s\"\n"
-#: pg_dump.c:6247
+#: pg_dump.c:6381
#, c-format
msgid "finding default expressions of table \"%s\"\n"
msgstr "hledám DEFAULT výrazy pro tabulku \"%s\"\n"
-#: pg_dump.c:6299
+#: pg_dump.c:6433
#, c-format
msgid "invalid adnum value %d for table \"%s\"\n"
msgstr "neplatná \"adnum\" hodnota %d pro tabulku \"%s\"\n"
-#: pg_dump.c:6371
+#: pg_dump.c:6505
#, c-format
msgid "finding check constraints for table \"%s\"\n"
msgstr "hledám CHECK omezení pro tabulku \"%s\"\n"
-#: pg_dump.c:6466
+#: pg_dump.c:6600
#, c-format
msgid "expected %d check constraint on table \"%s\" but found %d\n"
msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
@@ -1807,63 +1963,63 @@ msgstr[0] "očekáván %d check constraint na tabulce \"%s\" nalezeno %d\n"
msgstr[1] "očekávány %d check constrainty na tabulce \"%s\" nalezeno %d\n"
msgstr[2] "očekáváno %d check constraintů na tabulce \"%s\" nalezeno %d\n"
-#: pg_dump.c:6470
+#: pg_dump.c:6604
#, c-format
msgid "(The system catalogs might be corrupted.)\n"
msgstr "(Systémové katalogy mohou být poškozeny.)\n"
-#: pg_dump.c:7836
+#: pg_dump.c:7970
#, c-format
msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
msgstr "WARNING: typtype datového typu \"%s\" se zdá být neplatný\n"
-#: pg_dump.c:9285
+#: pg_dump.c:9419
#, c-format
msgid "WARNING: bogus value in proargmodes array\n"
msgstr "VAROVÁNÍ: nesmyslná hodnota v \"proargmodes\" poli\n"
-#: pg_dump.c:9613
+#: pg_dump.c:9747
#, c-format
msgid "WARNING: could not parse proallargtypes array\n"
msgstr "VAROVÁNÍ: nelze naparsovat pole \"proallargtypes\"\n"
-#: pg_dump.c:9629
+#: pg_dump.c:9763
#, c-format
msgid "WARNING: could not parse proargmodes array\n"
msgstr "VAROVÁNÍ: nelze naparsovat pole \"proargmodes\"\n"
-#: pg_dump.c:9643
+#: pg_dump.c:9777
#, c-format
msgid "WARNING: could not parse proargnames array\n"
msgstr "VAROVÁNÍ: nelze naparsovat pole \"proargnames\"\n"
-#: pg_dump.c:9654
+#: pg_dump.c:9788
#, c-format
msgid "WARNING: could not parse proconfig array\n"
msgstr "VAROVÁNÍ: nelze naparsovat pole \"proconfig\"\n"
-#: pg_dump.c:9711
+#: pg_dump.c:9845
#, c-format
msgid "unrecognized provolatile value for function \"%s\"\n"
msgstr "nerozpoznaná \"provolatile\" hodnota pro funkci \"%s\"\n"
-#: pg_dump.c:9931
+#: pg_dump.c:10065
#, c-format
msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
msgstr ""
"WARNING: chybná hodnota v položce pg_cast.castfunc nebo pg_cast.castmethod\n"
-#: pg_dump.c:9934
+#: pg_dump.c:10068
#, c-format
msgid "WARNING: bogus value in pg_cast.castmethod field\n"
msgstr "VAROVÁNÍ: nesmyslná hodnota v položce \"pg_cast.castmethod\"\n"
-#: pg_dump.c:10303
+#: pg_dump.c:10437
#, c-format
msgid "WARNING: could not find operator with OID %s\n"
msgstr "VAROVÁNÍ: nelze najít operátor s OID %s\n"
-#: pg_dump.c:11365
+#: pg_dump.c:11499
#, c-format
msgid ""
"WARNING: aggregate function %s could not be dumped correctly for this "
@@ -1872,53 +2028,53 @@ msgstr ""
"VAROVÁNÍ: agregační funkce %s nelze dumpovat korektně pro tuto verzi "
"databáze; ignorováno\n"
-#: pg_dump.c:12141
+#: pg_dump.c:12275
#, c-format
msgid "unrecognized object type in default privileges: %d\n"
msgstr "neznámý typ objektu (%d) ve výchozích privilegiích\n"
-#: pg_dump.c:12156
+#: pg_dump.c:12290
#, c-format
msgid "could not parse default ACL list (%s)\n"
msgstr "nelze zpracovat seznam oprávnění ACL (%s)\n"
-#: pg_dump.c:12211
+#: pg_dump.c:12345
#, c-format
msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
msgstr "nelze zpracovat seznam oprávnění ACL (%s) pro objekt \"%s\" (%s)\n"
-#: pg_dump.c:12630
+#: pg_dump.c:12764
#, c-format
msgid "query to obtain definition of view \"%s\" returned no data\n"
msgstr "dotaz na získání definice view \"%s\" nevrátil žádná data\n"
-#: pg_dump.c:12633
+#: pg_dump.c:12767
#, c-format
msgid ""
"query to obtain definition of view \"%s\" returned more than one definition\n"
msgstr "dotaz na získání definice view \"%s\" vrátil více jak jednu definici\n"
-#: pg_dump.c:12640
+#: pg_dump.c:12774
#, c-format
msgid "definition of view \"%s\" appears to be empty (length zero)\n"
msgstr "definice view \"%s\" se zdá být prázdná (nulová délka)\n"
-#: pg_dump.c:13321
+#: pg_dump.c:13482
#, c-format
msgid "invalid column number %d for table \"%s\"\n"
msgstr "neplatné číslo sloupce %d pro tabulku \"%s\"\n"
-#: pg_dump.c:13431
+#: pg_dump.c:13597
#, c-format
msgid "missing index for constraint \"%s\"\n"
msgstr "chybí index pro omezení \"%s\"\n"
-#: pg_dump.c:13618
+#: pg_dump.c:13784
#, c-format
msgid "unrecognized constraint type: %c\n"
msgstr "neočekávaný typ omezení: %c\n"
-#: pg_dump.c:13767 pg_dump.c:13931
+#: pg_dump.c:13933 pg_dump.c:14097
#, c-format
msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
msgid_plural ""
@@ -1930,22 +2086,22 @@ msgstr[1] ""
msgstr[2] ""
"dotaz pro načtení dat sekvence \"%s\" vrátil %d řádek (expected 1)\n"
-#: pg_dump.c:13778
+#: pg_dump.c:13944
#, c-format
msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
msgstr "dotaz na získání dat sekvence \"%s\" vrátil jméno \"%s\"\n"
-#: pg_dump.c:14018
+#: pg_dump.c:14184
#, c-format
msgid "unexpected tgtype value: %d\n"
msgstr "neočekávaná hodnota tgtype: %d\n"
-#: pg_dump.c:14100
+#: pg_dump.c:14266
#, c-format
msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
msgstr "neplatný řetězec argumentů (%s) pro trigger \"%s\" tabulky \"%s\"\n"
-#: pg_dump.c:14280
+#: pg_dump.c:14446
#, c-format
msgid ""
"query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
@@ -1954,12 +2110,12 @@ msgstr ""
"dotaz k získání pravidla (RULE) \"%s\" pro tabulku \"%s\" selhal: vrácen "
"chybný počet řádků\n"
-#: pg_dump.c:14552
+#: pg_dump.c:14747
#, c-format
msgid "reading dependency data\n"
msgstr "čtu data o závislostech\n"
-#: pg_dump.c:15135
+#: pg_dump.c:15292
#, c-format
msgid "query returned %d row instead of one: %s\n"
msgid_plural "query returned %d rows instead of one: %s\n"
@@ -1968,37 +2124,37 @@ msgstr[1] "dotaz vrátil %d řádky namísto jedné: %s\n"
msgstr[2] "dotaz vrátil %d řádek namísto jedné: %s\n"
#. translator: this is a module name
-#: pg_dump_sort.c:20
+#: pg_dump_sort.c:21
msgid "sorter"
msgstr "sorter"
-#: pg_dump_sort.c:374
+#: pg_dump_sort.c:465
#, c-format
msgid "invalid dumpId %d\n"
msgstr "neplatné dumpId %d\n"
-#: pg_dump_sort.c:380
+#: pg_dump_sort.c:471
#, c-format
msgid "invalid dependency %d\n"
msgstr "neplatná závislost %d\n"
-#: pg_dump_sort.c:594
+#: pg_dump_sort.c:685
#, c-format
msgid "could not identify dependency loop\n"
msgstr "nelze identifikovat smyčku závislostí\n"
-#: pg_dump_sort.c:1044
+#: pg_dump_sort.c:1135
#, c-format
msgid ""
"NOTICE: there are circular foreign-key constraints among these table(s):\n"
msgstr "NOTICE: mezi těmito tabulkami existuje cyklus cizích klíčů:\n"
-#: pg_dump_sort.c:1046 pg_dump_sort.c:1066
+#: pg_dump_sort.c:1137 pg_dump_sort.c:1157
#, c-format
msgid " %s\n"
msgstr " %s\n"
-#: pg_dump_sort.c:1047
+#: pg_dump_sort.c:1138
#, c-format
msgid ""
"You might not be able to restore the dump without using --disable-triggers "
@@ -2007,7 +2163,7 @@ msgstr ""
"Bez zadání volby --disable-triggers nebo dočasného vypnutí constraintů "
"zřejmě nebudete schopni tento dump obnovit.\n"
-#: pg_dump_sort.c:1048
+#: pg_dump_sort.c:1139
#, c-format
msgid ""
"Consider using a full dump instead of a --data-only dump to avoid this "
@@ -2016,12 +2172,12 @@ msgstr ""
"Zvažte použití kompletního (full) dumpu namísto --data-only dumpu pro "
"odstranění tohoto problému.\n"
-#: pg_dump_sort.c:1060
+#: pg_dump_sort.c:1151
#, c-format
msgid "WARNING: could not resolve dependency loop among these items:\n"
msgstr "WARNING: nelze vyřešit smyčku závislostí mezi těmito položkami:\n"
-#: pg_dumpall.c:178
+#: pg_dumpall.c:180
#, c-format
msgid ""
"The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -2032,7 +2188,7 @@ msgstr ""
"adresáři jako \"%s\".\n"
"Zkontrolujte vaši instalaci.\n"
-#: pg_dumpall.c:185
+#: pg_dumpall.c:187
#, c-format
msgid ""
"The program \"pg_dump\" was found by \"%s\"\n"
@@ -2043,14 +2199,14 @@ msgstr ""
"který ale není stejné verze jako %s.\n"
"Zkontrolujte vaši instalaci.\n"
-#: pg_dumpall.c:319
+#: pg_dumpall.c:321
#, c-format
msgid ""
"%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
msgstr ""
"%s: volby -g/--globals-only a -r/--roles-only nelze používat společně\n"
-#: pg_dumpall.c:328
+#: pg_dumpall.c:330
#, c-format
msgid ""
"%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
@@ -2058,7 +2214,7 @@ msgid ""
msgstr ""
"%s: volby -g/--globals-only a -t/--tablespaces-only nelze používat společně\n"
-#: pg_dumpall.c:337
+#: pg_dumpall.c:339
#, c-format
msgid ""
"%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
@@ -2066,12 +2222,12 @@ msgid ""
msgstr ""
"%s: volby -r/--roles-only a -t/--tablespaces-only nelze používat společně\n"
-#: pg_dumpall.c:379 pg_dumpall.c:1821
+#: pg_dumpall.c:381 pg_dumpall.c:1823
#, c-format
msgid "%s: could not connect to database \"%s\"\n"
msgstr "%s: nelze navázat spojení s databází \"%s\"\n"
-#: pg_dumpall.c:394
+#: pg_dumpall.c:396
#, c-format
msgid ""
"%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2080,12 +2236,12 @@ msgstr ""
"%s: nelze navázat spojení s databází \"postgres\" nebo \"template1\"\n"
"Zadejte prosím alternativní databázi.\n"
-#: pg_dumpall.c:411
+#: pg_dumpall.c:413
#, c-format
msgid "%s: could not open the output file \"%s\": %s\n"
msgstr "%s: nelze otevřít výstupní soubor \"%s\": %s\n"
-#: pg_dumpall.c:538
+#: pg_dumpall.c:540
#, c-format
msgid ""
"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2094,68 +2250,67 @@ msgstr ""
"%s extrahuje PostgreSQL databázi do souboru s SQL skriptem.\n"
"\n"
-#: pg_dumpall.c:540
+#: pg_dumpall.c:542
#, c-format
msgid " %s [OPTION]...\n"
msgstr " %s [VOLBA]...\n"
-#: pg_dumpall.c:543
+#: pg_dumpall.c:545
#, c-format
msgid " -f, --file=FILENAME output file name\n"
msgstr " -f, --file=SOUBOR výstupní soubor\n"
-#: pg_dumpall.c:549
+#: pg_dumpall.c:551
#, c-format
msgid ""
" -c, --clean clean (drop) databases before recreating\n"
msgstr ""
" -c, --clean odstranit (drop) databázi před jejím vytvořením\n"
-#: pg_dumpall.c:550
+#: pg_dumpall.c:552
#, c-format
msgid " -g, --globals-only dump only global objects, no databases\n"
msgstr ""
" -g, --globals-only dump pouze globálních objektů, ne databáze\n"
-#: pg_dumpall.c:552 pg_restore.c:422
+#: pg_dumpall.c:554 pg_restore.c:436
#, c-format
msgid " -O, --no-owner skip restoration of object ownership\n"
msgstr ""
" -O, --no-owner nevypisuje příkazy k nastavení vlastníka objektů\n"
-#: pg_dumpall.c:553
+#: pg_dumpall.c:555
#, c-format
msgid ""
" -r, --roles-only dump only roles, no databases or tablespaces\n"
msgstr ""
" -r, --roles-only dump pouze rolí, ne databází nebo tablespaců\n"
-#: pg_dumpall.c:555
+#: pg_dumpall.c:557
#, c-format
msgid " -S, --superuser=NAME superuser user name to use in the dump\n"
msgstr ""
" -S, --superuser=JMÉNO uživatelské jméno superuživatele použité při "
"dumpu\n"
-#: pg_dumpall.c:556
+#: pg_dumpall.c:558
#, c-format
msgid ""
" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"
msgstr ""
" -t, --tablespaces-only dump pouze tablespaců, ne databází nebo rolí\n"
-#: pg_dumpall.c:572
+#: pg_dumpall.c:574
#, c-format
-#| msgid " -d, --dbname=NAME connect to database name\n"
msgid " -d, --dbname=CONNSTR connect using connection string\n"
msgstr " -d, --dbname=CONNSTR specifikace připojení do databáze\n"
-#: pg_dumpall.c:574
+#: pg_dumpall.c:576
#, c-format
msgid " -l, --database=DBNAME alternative default database\n"
msgstr " -l, --database=DBNAME alternativní výchozí databáze\n"
-#: pg_dumpall.c:581
+#: pg_dumpall.c:583
#, c-format
msgid ""
"\n"
@@ -2170,94 +2325,94 @@ msgstr ""
"výstup.\n"
"\n"
-#: pg_dumpall.c:1081
+#: pg_dumpall.c:1083
#, c-format
msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
msgstr "%s: nelze zpracovat ACL seznam (%s) pro prostor tabulek \"%s\"\n"
-#: pg_dumpall.c:1385
+#: pg_dumpall.c:1387
#, c-format
msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
msgstr "%s: nelze zpracovat ACL seznam (%s) pro databázi \"%s\"\n"
-#: pg_dumpall.c:1597
+#: pg_dumpall.c:1599
#, c-format
msgid "%s: dumping database \"%s\"...\n"
msgstr "%s: dumpuji databázi \"%s\"...\n"
-#: pg_dumpall.c:1607
+#: pg_dumpall.c:1609
#, c-format
msgid "%s: pg_dump failed on database \"%s\", exiting\n"
msgstr "%s: pg_dump selhal při zpracovávání databáze \"%s\", ukončuji se\n"
-#: pg_dumpall.c:1616
+#: pg_dumpall.c:1618
#, c-format
msgid "%s: could not re-open the output file \"%s\": %s\n"
msgstr "%s: nelze otevřít logovací soubor \"%s\": %s\n"
-#: pg_dumpall.c:1663
+#: pg_dumpall.c:1665
#, c-format
msgid "%s: running \"%s\"\n"
msgstr "%s: běží \"%s\"\n"
-#: pg_dumpall.c:1843
+#: pg_dumpall.c:1845
#, c-format
msgid "%s: could not connect to database \"%s\": %s\n"
msgstr "%s: nelze navázat spojení s databází \"%s\": %s\n"
-#: pg_dumpall.c:1873
+#: pg_dumpall.c:1875
#, c-format
msgid "%s: could not get server version\n"
msgstr "%s: nelze získat verzi serveru\n"
-#: pg_dumpall.c:1879
+#: pg_dumpall.c:1881
#, c-format
msgid "%s: could not parse server version \"%s\"\n"
msgstr "%s: nelze zpracovat verzi serveru \"%s\"\n"
-#: pg_dumpall.c:1887
-#, c-format
-msgid "%s: could not parse version \"%s\"\n"
-msgstr "%s: nelze zpracovat verzi serveru \"%s\"\n"
-
-#: pg_dumpall.c:1963 pg_dumpall.c:1989
+#: pg_dumpall.c:1959 pg_dumpall.c:1985
#, c-format
msgid "%s: executing %s\n"
msgstr "%s: vykonávám %s\n"
-#: pg_dumpall.c:1969 pg_dumpall.c:1995
+#: pg_dumpall.c:1965 pg_dumpall.c:1991
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: dotaz selhal: %s"
-#: pg_dumpall.c:1971 pg_dumpall.c:1997
+#: pg_dumpall.c:1967 pg_dumpall.c:1993
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: dotaz byl: %s\n"
-#: pg_restore.c:306
+#: pg_restore.c:308
#, c-format
msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
msgstr "%s: volby -d/--dbname a -f/--file nelze používat společně\n"
-#: pg_restore.c:318
+#: pg_restore.c:320
#, c-format
msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
msgstr "%s: nelze zadat --single-transaction a několik úloh\n"
-#: pg_restore.c:349
+#: pg_restore.c:351
#, c-format
msgid ""
"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
msgstr ""
"neznámý formát archivu \"%s\"; zadejte prosím \"c\", \"d\" nebo \"t\"\n"
-#: pg_restore.c:385
+#: pg_restore.c:381
+#, c-format
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: maximální počet paralelních jobů je %d\n"
+
+#: pg_restore.c:399
#, c-format
msgid "WARNING: errors ignored on restore: %d\n"
msgstr "VAROVÁNÍ: chyby ignorovány při obnovení: %d\n"
-#: pg_restore.c:399
+#: pg_restore.c:413
#, c-format
msgid ""
"%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2266,49 +2421,49 @@ msgstr ""
"%s obnovuje PostgreSQL databázi z archivu vytvořeného pomocí pg_dump.\n"
"\n"
-#: pg_restore.c:401
+#: pg_restore.c:415
#, c-format
msgid " %s [OPTION]... [FILE]\n"
msgstr " %s [PŘEPÍNAČ]... [SOUBOR]\n"
-#: pg_restore.c:404
+#: pg_restore.c:418
#, c-format
msgid " -d, --dbname=NAME connect to database name\n"
msgstr " -d, --dbname=JMÉNO jméno cílové databáze\n"
-#: pg_restore.c:405
+#: pg_restore.c:419
#, c-format
msgid " -f, --file=FILENAME output file name\n"
msgstr " -f, --file=SOUBOR výstupní soubor\n"
-#: pg_restore.c:406
+#: pg_restore.c:420
#, c-format
msgid " -F, --format=c|d|t backup file format (should be automatic)\n"
msgstr ""
" -F, --format=c|d|t formát záložního souboru (měl by být "
"automatický)\n"
-#: pg_restore.c:407
+#: pg_restore.c:421
#, c-format
msgid " -l, --list print summarized TOC of the archive\n"
msgstr " -l, --list zobrazit sumarizovaný obsah (TOC) archivu\n"
-#: pg_restore.c:408
+#: pg_restore.c:422
#, c-format
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose vypisovat více informací\n"
-#: pg_restore.c:409
+#: pg_restore.c:423
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version zobraz informaci o verzi, poté skonči\n"
-#: pg_restore.c:410
+#: pg_restore.c:424
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help zobraz tuto nápovědu, poté skonči\n"
-#: pg_restore.c:412
+#: pg_restore.c:426
#, c-format
msgid ""
"\n"
@@ -2317,35 +2472,35 @@ msgstr ""
"\n"
"Přepínače ovlivňující obnovu:\n"
-#: pg_restore.c:413
+#: pg_restore.c:427
#, c-format
msgid " -a, --data-only restore only the data, no schema\n"
msgstr ""
" -a, --data-only obnovit pouze data, ne definice databázových "
"objektů\n"
-#: pg_restore.c:415
+#: pg_restore.c:429
#, c-format
msgid " -C, --create create the target database\n"
msgstr " -C, --create vypíše příkazy pro vytvoření databáze\n"
-#: pg_restore.c:416
+#: pg_restore.c:430
#, c-format
msgid " -e, --exit-on-error exit on error, default is to continue\n"
msgstr " -e, --exit-on-error ukončit při chybě, implicitně pokračuje\n"
-#: pg_restore.c:417
+#: pg_restore.c:431
#, c-format
msgid " -I, --index=NAME restore named index\n"
msgstr " -I, --index=JMÉNO obnovit jmenovaný index\n"
-#: pg_restore.c:418
+#: pg_restore.c:432
#, c-format
msgid " -j, --jobs=NUM use this many parallel jobs to restore\n"
msgstr ""
" -j, --jobs=NUM použij pro obnovu daný počet paralelních jobů\n"
-#: pg_restore.c:419
+#: pg_restore.c:433
#, c-format
msgid ""
" -L, --use-list=FILENAME use table of contents from this file for\n"
@@ -2354,24 +2509,24 @@ msgstr ""
" -L, --use-list=SOUBOR použít specifikovaný obsah (TOC) pro řazení\n"
" výstupu z tohoto souboru\n"
-#: pg_restore.c:421
+#: pg_restore.c:435
#, c-format
msgid " -n, --schema=NAME restore only objects in this schema\n"
msgstr " -n, --schema=NAME obnovit pouze objekty v tomto schématu\n"
-#: pg_restore.c:423
+#: pg_restore.c:437
#, c-format
msgid " -P, --function=NAME(args) restore named function\n"
msgstr ""
" -P, --function=JMÉNO(args)\n"
" obnovit funkci daného jména\n"
-#: pg_restore.c:424
+#: pg_restore.c:438
#, c-format
msgid " -s, --schema-only restore only the schema, no data\n"
msgstr " -s, --schema-only obnovit pouze definice objektů, bez dat\n"
-#: pg_restore.c:425
+#: pg_restore.c:439
#, c-format
msgid ""
" -S, --superuser=NAME superuser user name to use for disabling "
@@ -2380,18 +2535,17 @@ msgstr ""
" -S, --superuser=JMÉNO jméno superuživatele použité pro\n"
" zakázaní triggerů\n"
-#: pg_restore.c:426
+#: pg_restore.c:440
#, c-format
-#| msgid " -t, --table=NAME restore named table\n"
msgid " -t, --table=NAME restore named table(s)\n"
msgstr " -t, --table=JMÉNO obnovit pouze jmenovanou tabulku\n"
-#: pg_restore.c:427
+#: pg_restore.c:441
#, c-format
msgid " -T, --trigger=NAME restore named trigger\n"
msgstr " -T, --trigger=JMÉNO obnovit pouze jmenovaný trigger\n"
-#: pg_restore.c:428
+#: pg_restore.c:442
#, c-format
msgid ""
" -x, --no-privileges skip restoration of access privileges (grant/"
@@ -2400,14 +2554,14 @@ msgstr ""
" -x, --no-privileges přeskočit obnovu přístupových práv (grant/"
"revoke)\n"
-#: pg_restore.c:429
+#: pg_restore.c:443
#, c-format
msgid " -1, --single-transaction restore as a single transaction\n"
msgstr ""
" -1, --single-transaction\n"
" zpracuj soubor v rámci jedné transakce\n"
-#: pg_restore.c:431
+#: pg_restore.c:445
#, c-format
msgid ""
" --no-data-for-failed-tables do not restore data of tables that could not "
@@ -2418,17 +2572,17 @@ msgstr ""
" neobnovuj data tabulek které nemohly být "
"vytvořeny\n"
-#: pg_restore.c:433
+#: pg_restore.c:447
#, c-format
msgid " --no-security-labels do not restore security labels\n"
-msgstr " --no-tablespaces neobnovuj bezpečnostní štítky\n"
+msgstr " --no-security-labels neobnovuj bezpečnostní štítky\n"
-#: pg_restore.c:434
+#: pg_restore.c:448
#, c-format
msgid " --no-tablespaces do not restore tablespace assignments\n"
msgstr " --no-tablespaces neobnovuj přiřazení tablespaces\n"
-#: pg_restore.c:435
+#: pg_restore.c:449
#, c-format
msgid ""
" --section=SECTION restore named section (pre-data, data, or "
@@ -2437,12 +2591,12 @@ msgstr ""
" --section=SECTION obnov pojmenovanou sekci (pre-data, data, nebo "
"post-data)\n"
-#: pg_restore.c:446
+#: pg_restore.c:460
#, c-format
msgid " --role=ROLENAME do SET ROLE before restore\n"
msgstr " --role=ROLENAME před obnovou proveď SET ROLE\n"
-#: pg_restore.c:448
+#: pg_restore.c:462
#, c-format
msgid ""
"\n"
@@ -2453,6 +2607,21 @@ msgstr ""
"Není-li definován vstupní soubor, je použit standardní vstup.\n"
"\n"
+#~ msgid "worker process crashed: status %d\n"
+#~ msgstr "worker proces selhal: status %d\n"
+
+#~ msgid "parallel_restore should not return\n"
+#~ msgstr "parallel_restore by neměl skončit\n"
+
+#~ msgid "could not create worker thread: %s\n"
+#~ msgstr "nelze vytvořit worker thread: %s\n"
+
+#~ msgid "could not parse version string \"%s\"\n"
+#~ msgstr "neplatný formát řetězce s verzí \"%s\"\n"
+
+#~ msgid "%s: could not parse version \"%s\"\n"
+#~ msgstr "%s: nelze zpracovat verzi serveru \"%s\"\n"
+
#~ msgid "child process exited with exit code %d"
#~ msgstr "potomek skončil s návratovým kódem %d"
diff --git a/src/bin/pg_dump/po/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po
index 7d9ba3b69a..f277b35713 100644
--- a/src/bin/pg_dump/po/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_dump (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:47+0000\n"
-"PO-Revision-Date: 2012-12-17 13:06+0800\n"
+"POT-Creation-Date: 2013-09-02 00:27+0000\n"
+"PO-Revision-Date: 2013-09-02 15:51+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,62 +16,58 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.5.4\n"
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83 pg_backup_db.c:134 pg_backup_db.c:189
+#: pg_backup_db.c:233 pg_backup_db.c:279
+#, c-format
+msgid "out of memory\n"
+msgstr "内存用尽\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
+#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "无法确认当前目录: %s"
# command.c:122
-#: ../../port/exec.c:144
+#: ../../port/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:193
+#: ../../port/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:200
+#: ../../port/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-#: ../../port/exec.c:255 ../../port/exec.c:291
+#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "无法进入目录 \"%s\""
+#| msgid "could not change directory to \"%s\": %m"
+msgid "could not change directory to \"%s\": %s"
+msgstr "无法跳转到目录 \"%s\" 中: %s"
-#: ../../port/exec.c:270
+#: ../../port/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号链结 \"%s\""
-#: ../../port/exec.c:526
+#: ../../port/exec.c:523
#, c-format
-msgid "child process exited with exit code %d"
-msgstr "子进程已退出, 退出码为 %d"
-
-#: ../../port/exec.c:530
-#, c-format
-msgid "child process was terminated by exception 0x%X"
-msgstr "子进程被例外(exception) 0x%X 终止"
-
-#: ../../port/exec.c:539
-#, c-format
-msgid "child process was terminated by signal %s"
-msgstr "子进程被信号 %s 终止"
-
-#: ../../port/exec.c:542
-#, c-format
-msgid "child process was terminated by signal %d"
-msgstr "子进程被信号 %d 终止"
-
-#: ../../port/exec.c:546
-#, c-format
-msgid "child process exited with unrecognized status %d"
-msgstr "子进程已退出, 未知状态 %d"
+#| msgid "query failed: %s"
+msgid "pclose failed: %s"
+msgstr "pclose调用失败: %s"
#: common.c:105
#, c-format
@@ -181,8 +177,9 @@ msgstr "读取表继承信息\n"
#: common.c:206
#, c-format
-msgid "reading rewrite rules\n"
-msgstr "读取重写规则\n"
+#| msgid "reading triggers\n"
+msgid "reading event triggers\n"
+msgstr "读取事件触发器\n"
#: common.c:215
#, c-format
@@ -219,17 +216,22 @@ msgstr "读取约束\n"
msgid "reading triggers\n"
msgstr "读取触发器\n"
-#: common.c:786
+#: common.c:244
+#, c-format
+msgid "reading rewrite rules\n"
+msgstr "读取重写规则\n"
+
+#: common.c:792
#, c-format
msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
msgstr "健全检查失败, 未找到表 \"%2$s\" (OID %3$u) 的 OID 为 %1$u 的父辈\n"
-#: common.c:828
+#: common.c:834
#, c-format
msgid "could not parse numeric array \"%s\": too many numbers\n"
msgstr "无法分析数值数组\"%s\": 数字太多\n"
-#: common.c:843
+#: common.c:849
#, c-format
msgid "could not parse numeric array \"%s\": invalid character in number\n"
msgstr "无法分析数值数组\"%s\": 出现无效字符\n"
@@ -244,588 +246,686 @@ msgstr "压缩IO"
msgid "invalid compression code: %d\n"
msgstr "无效的压缩码: %d\n"
-#: compress_io.c:138 compress_io.c:174 compress_io.c:192 compress_io.c:519
-#: compress_io.c:546
+#: compress_io.c:138 compress_io.c:174 compress_io.c:195 compress_io.c:528
+#: compress_io.c:555
#, c-format
msgid "not built with zlib support\n"
msgstr "没有编译成带有zlib库支持的版本\n"
-#: compress_io.c:240 compress_io.c:349
+#: compress_io.c:243 compress_io.c:352
#, c-format
msgid "could not initialize compression library: %s\n"
msgstr "无法初始化压缩库: %s\n"
-#: compress_io.c:261
+#: compress_io.c:264
#, c-format
msgid "could not close compression stream: %s\n"
msgstr "无法关闭压缩流: %s\n"
-#: compress_io.c:279
+#: compress_io.c:282
#, c-format
msgid "could not compress data: %s\n"
msgstr "无法压缩数据: %s\n"
-#: compress_io.c:300 compress_io.c:431 pg_backup_archiver.c:1476
-#: pg_backup_archiver.c:1499 pg_backup_custom.c:650 pg_backup_directory.c:480
-#: pg_backup_tar.c:589 pg_backup_tar.c:1096 pg_backup_tar.c:1389
+#: compress_io.c:303 compress_io.c:440 pg_backup_archiver.c:1437
+#: pg_backup_archiver.c:1460 pg_backup_custom.c:661 pg_backup_directory.c:529
+#: pg_backup_tar.c:598 pg_backup_tar.c:1087 pg_backup_tar.c:1308
#, c-format
msgid "could not write to output file: %s\n"
msgstr "无法写到输出文件: %s\n"
-#: compress_io.c:366 compress_io.c:382
+#: compress_io.c:372 compress_io.c:388
#, c-format
msgid "could not uncompress data: %s\n"
msgstr "无法解压缩数据: %s\n"
-#: compress_io.c:390
+#: compress_io.c:396
#, c-format
msgid "could not close compression library: %s\n"
msgstr "无法关闭压缩库: %s\n"
-# fe-exec.c:737
-#: dumpmem.c:33
+#: parallel.c:77
+#| msgid "tar archiver"
+msgid "parallel archiver"
+msgstr "并行归档"
+
+#: parallel.c:143
#, c-format
-msgid "cannot duplicate null pointer\n"
-msgstr "无法重复空指针\n"
+msgid "%s: WSAStartup failed: %d\n"
+msgstr "%s: WSAStartup 失败: %d\n"
-#: dumpmem.c:36 dumpmem.c:50 dumpmem.c:61 dumpmem.c:75 pg_backup_db.c:149
-#: pg_backup_db.c:204 pg_backup_db.c:248 pg_backup_db.c:294
+#: parallel.c:343
#, c-format
-msgid "out of memory\n"
-msgstr "内存用尽\n"
+#| msgid "server is still starting up\n"
+msgid "worker is terminating\n"
+msgstr "工作者进程正在终止\n"
-#: dumputils.c:1266
+#: parallel.c:535
#, c-format
-msgid "%s: unrecognized section name: \"%s\"\n"
-msgstr "%s: 无法识别的节名称: \"%s\"\n"
+#| msgid "could not create SSL context: %s\n"
+msgid "could not create communication channels: %s\n"
+msgstr "无法创建通信通道: %s\n"
-#: dumputils.c:1268 pg_dump.c:517 pg_dump.c:531 pg_dumpall.c:298
-#: pg_dumpall.c:308 pg_dumpall.c:318 pg_dumpall.c:327 pg_dumpall.c:336
-#: pg_dumpall.c:394 pg_restore.c:281 pg_restore.c:297 pg_restore.c:309
+# fe-connect.c:891
+#: parallel.c:605
#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "输入 \"%s --help\" 获取更多的信息.\n"
+msgid "could not create worker process: %s\n"
+msgstr "无法创建工作进程: %s\n"
-#: dumputils.c:1329
+#: parallel.c:822
#, c-format
-msgid "out of on_exit_nicely slots\n"
-msgstr "超出on_exit_nicely槽\n"
+#| msgid "could not get junction for \"%s\": %s\n"
+msgid "could not get relation name for OID %u: %s\n"
+msgstr "无法获取OID值为%u:%s的关系名\n"
+
+#: parallel.c:839
+#, c-format
+msgid ""
+"could not obtain lock on relation \"%s\"\n"
+"This usually means that someone requested an ACCESS EXCLUSIVE lock on the "
+"table after the pg_dump parent process had gotten the initial ACCESS SHARE "
+"lock on the table.\n"
+msgstr ""
+"无法获取关系 \"%s\"上的锁\n"
+"这通常意味着在父进程pg_dump已经得到表的共享访问锁之后,仍有人请求该表的排它访"
+"问锁.\n"
+
+#: parallel.c:923
+#, c-format
+#| msgid "unrecognized authentication option name: \"%s\""
+msgid "unrecognized command on communication channel: %s\n"
+msgstr "无法识别通信通上的命令:%s\n"
+
+#: parallel.c:956
+#, c-format
+#| msgid "worker process failed: exit code %d\n"
+msgid "a worker process died unexpectedly\n"
+msgstr "一工作者进程意外退出\n"
+
+# fe-misc.c:515 fe-misc.c:595
+#: parallel.c:983 parallel.c:992
+#, c-format
+#| msgid "could not receive data from server: %s\n"
+msgid "invalid message received from worker: %s\n"
+msgstr "接收到来自工作者进程的无效消息: %s\n"
+
+#: parallel.c:989 pg_backup_db.c:336
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: parallel.c:1041 parallel.c:1085
+#, c-format
+msgid "error processing a parallel work item\n"
+msgstr "错误处理一个并行工作项\n"
+
+#: parallel.c:1113 parallel.c:1251
+#, c-format
+#| msgid "could not write to output file: %s\n"
+msgid "could not write to the communication channel: %s\n"
+msgstr "无法写入通信通道: %s\n"
+
+#: parallel.c:1162
+#, c-format
+#| msgid "unterminated quoted string\n"
+msgid "terminated by user\n"
+msgstr "已被用户终止\n"
+
+#: parallel.c:1214
+#, c-format
+#| msgid "error during file seek: %s\n"
+msgid "error in ListenToWorkers(): %s\n"
+msgstr "调用ListenToWorkers()时出错: %s\n"
+
+#: parallel.c:1325
+#, c-format
+#| msgid "could not create inherited socket: error code %d\n"
+msgid "pgpipe: could not create socket: error code %d\n"
+msgstr "pgpipe: 无法创建套接字: 错误码为 %d\n"
+
+#: parallel.c:1336
+#, c-format
+#| msgid "could not initialize LDAP: error code %d"
+msgid "pgpipe: could not bind: error code %d\n"
+msgstr "pgpipe: 无法绑定: 错误码为%d\n"
+
+#: parallel.c:1343
+#, c-format
+#| msgid "%s: could not allocate SIDs: error code %lu\n"
+msgid "pgpipe: could not listen: error code %d\n"
+msgstr "pgpipe: 无法监听: 错误码为 %d\n"
+
+#: parallel.c:1350
+#, c-format
+#| msgid "worker process failed: exit code %d\n"
+msgid "pgpipe: getsockname() failed: error code %d\n"
+msgstr "pgpipe: getsockname()调用失败: 错误码为 %d\n"
+
+#: parallel.c:1357
+#, c-format
+#| msgid "could not create inherited socket: error code %d\n"
+msgid "pgpipe: could not create second socket: error code %d\n"
+msgstr "pgpipe: 无法创建继承套接字: 错误码为 %d\n"
+
+#: parallel.c:1365
+#, c-format
+#| msgid "could not create inherited socket: error code %d\n"
+msgid "pgpipe: could not connect socket: error code %d\n"
+msgstr "pgpipe: 无法连接套接字: 错误码为 %d\n"
+
+#: parallel.c:1372
+#, c-format
+#| msgid "could not accept SSL connection: %m"
+msgid "pgpipe: could not accept connection: error code %d\n"
+msgstr "pgpipe: 无法接受连接: 错误码为 %d\n"
#. translator: this is a module name
-#: pg_backup_archiver.c:116
+#: pg_backup_archiver.c:51
msgid "archiver"
msgstr "归档"
-#: pg_backup_archiver.c:232 pg_backup_archiver.c:1339
+#: pg_backup_archiver.c:169 pg_backup_archiver.c:1300
#, c-format
msgid "could not close output file: %s\n"
msgstr "无法关闭输出文件: %s\n"
-#: pg_backup_archiver.c:267 pg_backup_archiver.c:272
+#: pg_backup_archiver.c:204 pg_backup_archiver.c:209
#, c-format
msgid "WARNING: archive items not in correct section order\n"
msgstr "警告: 归档项的序号不正确\n"
-#: pg_backup_archiver.c:278
+#: pg_backup_archiver.c:215
#, c-format
msgid "unexpected section code %d\n"
msgstr "意外的节码 %d\n"
-#: pg_backup_archiver.c:310
+#: pg_backup_archiver.c:247
#, c-format
msgid "-C and -1 are incompatible options\n"
msgstr "-C 和 -c 是互不兼容的选项\n"
# input.c:213
-#: pg_backup_archiver.c:320
+#: pg_backup_archiver.c:257
#, c-format
msgid "parallel restore is not supported with this archive file format\n"
msgstr "不支持以这种归档文件格式进行并行恢复\n"
-#: pg_backup_archiver.c:324
+#: pg_backup_archiver.c:261
#, c-format
msgid ""
"parallel restore is not supported with archives made by pre-8.0 pg_dump\n"
msgstr "不支持使用8.0版本以前的pg_dump命令产生的存档文件进行并行恢复\n"
-#: pg_backup_archiver.c:342
+#: pg_backup_archiver.c:279
#, c-format
msgid ""
"cannot restore from compressed archive (compression not supported in this "
"installation)\n"
msgstr "无法从压缩的归档中恢复 (未配置压缩支持)\n"
-#: pg_backup_archiver.c:359
+#: pg_backup_archiver.c:296
#, c-format
msgid "connecting to database for restore\n"
msgstr "为恢复数据库与数据库联接\n"
-#: pg_backup_archiver.c:361
+#: pg_backup_archiver.c:298
#, c-format
msgid "direct database connections are not supported in pre-1.3 archives\n"
msgstr "1.3 以前的归档里不支持直接数据库联接\n"
-#: pg_backup_archiver.c:402
+#: pg_backup_archiver.c:339
#, c-format
msgid "implied data-only restore\n"
msgstr "隐含的只恢复数据\n"
-#: pg_backup_archiver.c:471
+#: pg_backup_archiver.c:408
#, c-format
msgid "dropping %s %s\n"
msgstr "删除 %s %s\n"
-#: pg_backup_archiver.c:520
+#: pg_backup_archiver.c:475
#, c-format
msgid "setting owner and privileges for %s %s\n"
msgstr "为 %s %s 设置属主和权限\n"
-#: pg_backup_archiver.c:586 pg_backup_archiver.c:588
+#: pg_backup_archiver.c:541 pg_backup_archiver.c:543
#, c-format
msgid "warning from original dump file: %s\n"
msgstr "来自原始转储文件的警告: %s\n"
-#: pg_backup_archiver.c:595
+#: pg_backup_archiver.c:550
#, c-format
msgid "creating %s %s\n"
msgstr "创建 %s %s\n"
-#: pg_backup_archiver.c:639
+#: pg_backup_archiver.c:594
#, c-format
msgid "connecting to new database \"%s\"\n"
msgstr "联接到新数据库 \"%s\"\n"
-#: pg_backup_archiver.c:667
+#: pg_backup_archiver.c:622
#, c-format
-msgid "restoring %s\n"
-msgstr "正在恢复%s\n"
+#| msgid "restoring %s\n"
+msgid "processing %s\n"
+msgstr "正在处理 %s\n"
-#: pg_backup_archiver.c:681
+#: pg_backup_archiver.c:636
#, c-format
-msgid "restoring data for table \"%s\"\n"
-msgstr "为表 \"%s\" 恢复数据\n"
+#| msgid "restoring data for table \"%s\"\n"
+msgid "processing data for table \"%s\"\n"
+msgstr "为表 \"%s\" 处理数据\n"
-#: pg_backup_archiver.c:743
+#: pg_backup_archiver.c:698
#, c-format
msgid "executing %s %s\n"
msgstr "执行 %s %s\n"
-#: pg_backup_archiver.c:777
+#: pg_backup_archiver.c:735
#, c-format
msgid "disabling triggers for %s\n"
msgstr "为%s禁用触发器\n"
-#: pg_backup_archiver.c:803
+#: pg_backup_archiver.c:761
#, c-format
msgid "enabling triggers for %s\n"
msgstr "为%s启用触发器\n"
-#: pg_backup_archiver.c:833
+#: pg_backup_archiver.c:791
#, c-format
msgid ""
"internal error -- WriteData cannot be called outside the context of a "
"DataDumper routine\n"
msgstr "内部错误 -- WriteData 不能在 DataDumper 过程的环境之外调用\n"
-#: pg_backup_archiver.c:987
+#: pg_backup_archiver.c:948
#, c-format
msgid "large-object output not supported in chosen format\n"
msgstr "选定的格式不支持大对象输出\n"
-#: pg_backup_archiver.c:1041
+#: pg_backup_archiver.c:1002
#, c-format
msgid "restored %d large object\n"
msgid_plural "restored %d large objects\n"
msgstr[0] "恢复%d个大对象\n"
-#: pg_backup_archiver.c:1062 pg_backup_tar.c:722
+#: pg_backup_archiver.c:1023 pg_backup_tar.c:731
#, c-format
msgid "restoring large object with OID %u\n"
msgstr "恢复带有OID %u 的大对象\n"
-#: pg_backup_archiver.c:1074
+#: pg_backup_archiver.c:1035
#, c-format
msgid "could not create large object %u: %s"
msgstr "无法创建大对象%u: %s"
-#: pg_backup_archiver.c:1079 pg_dump.c:2379
+#: pg_backup_archiver.c:1040 pg_dump.c:2662
#, c-format
msgid "could not open large object %u: %s"
msgstr "无法打开大对象%u: %s"
# fe-lobj.c:400 fe-lobj.c:483
-#: pg_backup_archiver.c:1136
+#: pg_backup_archiver.c:1097
#, c-format
msgid "could not open TOC file \"%s\": %s\n"
msgstr "无法打开TOC文件 \"%s\": %s\n"
-#: pg_backup_archiver.c:1177
+#: pg_backup_archiver.c:1138
#, c-format
msgid "WARNING: line ignored: %s\n"
msgstr "警告: 忽略的行: %s\n"
-#: pg_backup_archiver.c:1184
+#: pg_backup_archiver.c:1145
#, c-format
msgid "could not find entry for ID %d\n"
msgstr "无法为 ID %d 找到记录\n"
-#: pg_backup_archiver.c:1205 pg_backup_directory.c:180
-#: pg_backup_directory.c:541
+#: pg_backup_archiver.c:1166 pg_backup_directory.c:222
+#: pg_backup_directory.c:595
#, c-format
msgid "could not close TOC file: %s\n"
msgstr "无法关闭 TOC 文件: %s\n"
-#: pg_backup_archiver.c:1309 pg_backup_custom.c:150 pg_backup_directory.c:291
-#: pg_backup_directory.c:527 pg_backup_directory.c:571
-#: pg_backup_directory.c:591
+#: pg_backup_archiver.c:1270 pg_backup_custom.c:161 pg_backup_directory.c:333
+#: pg_backup_directory.c:581 pg_backup_directory.c:639
+#: pg_backup_directory.c:659
#, c-format
msgid "could not open output file \"%s\": %s\n"
msgstr "无法打开输出文件\"%s\": %s\n"
-#: pg_backup_archiver.c:1312 pg_backup_custom.c:157
+#: pg_backup_archiver.c:1273 pg_backup_custom.c:168
#, c-format
msgid "could not open output file: %s\n"
msgstr "无法打开输出文件: %s\n"
-#: pg_backup_archiver.c:1412
+#: pg_backup_archiver.c:1373
#, c-format
msgid "wrote %lu byte of large object data (result = %lu)\n"
msgid_plural "wrote %lu bytes of large object data (result = %lu)\n"
msgstr[0] "已经写入了大对象的%lu字节(结果 = %lu)\n"
-#: pg_backup_archiver.c:1418
+#: pg_backup_archiver.c:1379
#, c-format
msgid "could not write to large object (result: %lu, expected: %lu)\n"
msgstr "无法写入大对象 (结果: %lu, 预期: %lu)\n"
-#: pg_backup_archiver.c:1484
+#: pg_backup_archiver.c:1445
#, c-format
msgid "could not write to custom output routine\n"
msgstr "无法写出到客户输出过程\n"
-#: pg_backup_archiver.c:1522
+#: pg_backup_archiver.c:1483
#, c-format
msgid "Error while INITIALIZING:\n"
msgstr "INITIALIZING 时错误:\n"
-#: pg_backup_archiver.c:1527
+#: pg_backup_archiver.c:1488
#, c-format
msgid "Error while PROCESSING TOC:\n"
msgstr "PROCESSING TOC 时错误:\n"
-#: pg_backup_archiver.c:1532
+#: pg_backup_archiver.c:1493
#, c-format
msgid "Error while FINALIZING:\n"
msgstr "FINALIZING 时错误:\n"
-#: pg_backup_archiver.c:1537
+#: pg_backup_archiver.c:1498
#, c-format
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:1610
+#: pg_backup_archiver.c:1571
#, c-format
msgid "bad dumpId\n"
msgstr "错误的dumpId号\n"
-#: pg_backup_archiver.c:1631
+#: pg_backup_archiver.c:1592
#, c-format
msgid "bad table dumpId for TABLE DATA item\n"
msgstr "TABLE DATA 项的表dumpId错误\n"
-#: pg_backup_archiver.c:1723
+#: pg_backup_archiver.c:1684
#, c-format
msgid "unexpected data offset flag %d\n"
msgstr "意外的数据偏移标志 %d\n"
-#: pg_backup_archiver.c:1736
+#: pg_backup_archiver.c:1697
#, c-format
msgid "file offset in dump file is too large\n"
msgstr "在转储文件中的文件偏移量太大\n"
-#: pg_backup_archiver.c:1830 pg_backup_archiver.c:3263 pg_backup_custom.c:628
-#: pg_backup_directory.c:463 pg_backup_tar.c:778
+#: pg_backup_archiver.c:1791 pg_backup_archiver.c:3247 pg_backup_custom.c:639
+#: pg_backup_directory.c:509 pg_backup_tar.c:787
#, c-format
msgid "unexpected end of file\n"
msgstr "意外的文件结尾\n"
-#: pg_backup_archiver.c:1847
+#: pg_backup_archiver.c:1808
#, c-format
msgid "attempting to ascertain archive format\n"
msgstr "试图确认归档格式\n"
-#: pg_backup_archiver.c:1873 pg_backup_archiver.c:1883
+#: pg_backup_archiver.c:1834 pg_backup_archiver.c:1844
#, c-format
msgid "directory name too long: \"%s\"\n"
msgstr "字典名字太长: \"%s\"\n"
-#: pg_backup_archiver.c:1891
+#: pg_backup_archiver.c:1852
#, c-format
msgid ""
"directory \"%s\" does not appear to be a valid archive (\"toc.dat\" does not "
"exist)\n"
msgstr "目录 \"%s\" 看上去不像一个有效的归档 (\"toc.dat\" 不存在)\n"
-#: pg_backup_archiver.c:1899 pg_backup_custom.c:169 pg_backup_custom.c:760
-#: pg_backup_directory.c:164 pg_backup_directory.c:349
+#: pg_backup_archiver.c:1860 pg_backup_custom.c:180 pg_backup_custom.c:771
+#: pg_backup_directory.c:206 pg_backup_directory.c:394
#, c-format
msgid "could not open input file \"%s\": %s\n"
msgstr "无法打开输入文件 \"%s\": %s\n"
-#: pg_backup_archiver.c:1907 pg_backup_custom.c:176
+#: pg_backup_archiver.c:1868 pg_backup_custom.c:187
#, c-format
msgid "could not open input file: %s\n"
msgstr "无法打开输入文件: %s\n"
-#: pg_backup_archiver.c:1916
+#: pg_backup_archiver.c:1877
#, c-format
msgid "could not read input file: %s\n"
msgstr "无法读取输入文件: %s\n"
-#: pg_backup_archiver.c:1918
+#: pg_backup_archiver.c:1879
#, c-format
msgid "input file is too short (read %lu, expected 5)\n"
msgstr "输入文件太短 (读了 %lu, 预期 5)\n"
-#: pg_backup_archiver.c:1983
+#: pg_backup_archiver.c:1944
#, c-format
msgid "input file appears to be a text format dump. Please use psql.\n"
msgstr "输入文件看起来像是文本格式的dump. 请使用psql.\n"
-#: pg_backup_archiver.c:1987
+#: pg_backup_archiver.c:1948
#, c-format
msgid "input file does not appear to be a valid archive (too short?)\n"
msgstr "输入文件看上去不象有效的归档 (太短?)\n"
-#: pg_backup_archiver.c:1990
+#: pg_backup_archiver.c:1951
#, c-format
msgid "input file does not appear to be a valid archive\n"
msgstr "输入文件看上去不象有效的归档\n"
-#: pg_backup_archiver.c:2010
+#: pg_backup_archiver.c:1971
#, c-format
msgid "could not close input file: %s\n"
msgstr "无法关闭输入文件: %s\n"
-#: pg_backup_archiver.c:2027
+#: pg_backup_archiver.c:1988
#, c-format
msgid "allocating AH for %s, format %d\n"
msgstr "为 %s 分配 AH, 格式 %d\n"
-#: pg_backup_archiver.c:2130
+#: pg_backup_archiver.c:2093
#, c-format
msgid "unrecognized file format \"%d\"\n"
msgstr "不可识别的文件格式 \"%d\"\n"
-#: pg_backup_archiver.c:2264
+#: pg_backup_archiver.c:2243
#, c-format
msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
msgstr "记录 ID %d 超出范围 - 可能是损坏了的 TOC\n"
-#: pg_backup_archiver.c:2380
+#: pg_backup_archiver.c:2359
#, c-format
msgid "read TOC entry %d (ID %d) for %s %s\n"
msgstr "为 %3$s %4$s 读取 TOC 记录 %1$d (ID %2$d)\n"
-#: pg_backup_archiver.c:2414
+#: pg_backup_archiver.c:2393
#, c-format
msgid "unrecognized encoding \"%s\"\n"
msgstr "未知编码: \"%s\"\n"
-#: pg_backup_archiver.c:2419
+#: pg_backup_archiver.c:2398
#, c-format
msgid "invalid ENCODING item: %s\n"
msgstr "无效的ENCODING成员:%s\n"
-#: pg_backup_archiver.c:2437
+#: pg_backup_archiver.c:2416
#, c-format
msgid "invalid STDSTRINGS item: %s\n"
msgstr "无效的STDSTRINGS成员:%s\n"
-#: pg_backup_archiver.c:2651
+#: pg_backup_archiver.c:2633
#, c-format
msgid "could not set session user to \"%s\": %s"
msgstr "无法设置会话用户为 \"%s\": %s"
-#: pg_backup_archiver.c:2683
+#: pg_backup_archiver.c:2665
#, c-format
msgid "could not set default_with_oids: %s"
msgstr "无法设置 default_with_oids: %s"
-#: pg_backup_archiver.c:2821
+#: pg_backup_archiver.c:2803
#, c-format
msgid "could not set search_path to \"%s\": %s"
msgstr "无法设置search_path值为\"%s\": %s"
-#: pg_backup_archiver.c:2882
+#: pg_backup_archiver.c:2864
#, c-format
msgid "could not set default_tablespace to %s: %s"
msgstr "无法设置default_tablespace为 %s: %s"
-#: pg_backup_archiver.c:2991 pg_backup_archiver.c:3173
+#: pg_backup_archiver.c:2974 pg_backup_archiver.c:3157
#, c-format
msgid "WARNING: don't know how to set owner for object type %s\n"
msgstr "警告: 不知道如何为对象类型%s设置属主\n"
-#: pg_backup_archiver.c:3226
+#: pg_backup_archiver.c:3210
#, c-format
msgid ""
"WARNING: requested compression not available in this installation -- archive "
"will be uncompressed\n"
msgstr "警告: 所要求的压缩无法在本次安装中获取 - 归档将不被压缩\n"
-#: pg_backup_archiver.c:3266
+#: pg_backup_archiver.c:3250
#, c-format
msgid "did not find magic string in file header\n"
msgstr "在文件头中没有找到魔术字串\n"
-#: pg_backup_archiver.c:3279
+#: pg_backup_archiver.c:3263
#, c-format
msgid "unsupported version (%d.%d) in file header\n"
msgstr "在文件头中有不支持的版本 (%d.%d)\n"
-#: pg_backup_archiver.c:3284
+#: pg_backup_archiver.c:3268
#, c-format
msgid "sanity check on integer size (%lu) failed\n"
msgstr "整数尺寸 (%lu) 的健全检查失败\n"
-#: pg_backup_archiver.c:3288
+#: pg_backup_archiver.c:3272
#, c-format
msgid ""
"WARNING: archive was made on a machine with larger integers, some operations "
"might fail\n"
msgstr "警告: 归档不是在支持更大范围整数的主机上产生的, 有些操作可能失败\n"
-#: pg_backup_archiver.c:3298
+#: pg_backup_archiver.c:3282
#, c-format
msgid "expected format (%d) differs from format found in file (%d)\n"
msgstr "预期的格式 (%d) 和在文件里找到的格式 (%d) 不同\n"
-#: pg_backup_archiver.c:3314
+#: pg_backup_archiver.c:3298
#, c-format
msgid ""
"WARNING: archive is compressed, but this installation does not support "
"compression -- no data will be available\n"
msgstr "警告: 归档是压缩过的, 但是当前安装不支持压缩 - 数据将不可使用\n"
-#: pg_backup_archiver.c:3332
+#: pg_backup_archiver.c:3316
#, c-format
msgid "WARNING: invalid creation date in header\n"
msgstr "警告: 在头中的创建日期无效\n"
-#: pg_backup_archiver.c:3492
+#: pg_backup_archiver.c:3405
#, c-format
-msgid "entering restore_toc_entries_parallel\n"
-msgstr "正在进入restore_toc_entries_parallel\n"
+#| msgid "entering restore_toc_entries_parallel\n"
+msgid "entering restore_toc_entries_prefork\n"
+msgstr "正在进入restore_toc_entries_prefork\n"
-#: pg_backup_archiver.c:3543
+#: pg_backup_archiver.c:3449
#, c-format
msgid "processing item %d %s %s\n"
msgstr "正在处理成员%d %s %s\n"
-#: pg_backup_archiver.c:3624
+#: pg_backup_archiver.c:3501
+#, c-format
+msgid "entering restore_toc_entries_parallel\n"
+msgstr "正在进入restore_toc_entries_parallel\n"
+
+#: pg_backup_archiver.c:3549
#, c-format
msgid "entering main parallel loop\n"
msgstr "正在进入主并行循环\n"
-#: pg_backup_archiver.c:3636
+#: pg_backup_archiver.c:3560
#, c-format
msgid "skipping item %d %s %s\n"
msgstr "忽略成员%d %s %s\n"
-#: pg_backup_archiver.c:3652
+#: pg_backup_archiver.c:3570
#, c-format
msgid "launching item %d %s %s\n"
msgstr "正在启动成员%d %s %s\n"
-#: pg_backup_archiver.c:3690
-#, c-format
-msgid "worker process crashed: status %d\n"
-msgstr "工作进程崩溃: 状态 %d\n"
-
-#: pg_backup_archiver.c:3695
+#: pg_backup_archiver.c:3628
#, c-format
msgid "finished main parallel loop\n"
msgstr "已完成主并行循环\n"
-#: pg_backup_archiver.c:3719
-#, c-format
-msgid "processing missed item %d %s %s\n"
-msgstr "正在处理丢失的成员%d %s %s\n"
-
-#: pg_backup_archiver.c:3745
-#, c-format
-msgid "parallel_restore should not return\n"
-msgstr "parallel_restore不应返回\n"
-
-# fe-connect.c:891
-#: pg_backup_archiver.c:3751
+#: pg_backup_archiver.c:3637
#, c-format
-msgid "could not create worker process: %s\n"
-msgstr "无法创建工作进程: %s\n"
+#| msgid "entering restore_toc_entries_parallel\n"
+msgid "entering restore_toc_entries_postfork\n"
+msgstr "正在进入restore_toc_entries_postfork\n"
-# fe-connect.c:891
-#: pg_backup_archiver.c:3759
+#: pg_backup_archiver.c:3655
#, c-format
-msgid "could not create worker thread: %s\n"
-msgstr "无法创建工作线程: %s\n"
+msgid "processing missed item %d %s %s\n"
+msgstr "正在处理丢失的成员%d %s %s\n"
-#: pg_backup_archiver.c:3983
+#: pg_backup_archiver.c:3804
#, c-format
msgid "no item ready\n"
msgstr "没有成员准备好\n"
-#: pg_backup_archiver.c:4080
+#: pg_backup_archiver.c:3854
#, c-format
msgid "could not find slot of finished worker\n"
msgstr "无法找到已完成的工作进程的位置\n"
-#: pg_backup_archiver.c:4082
+#: pg_backup_archiver.c:3856
#, c-format
msgid "finished item %d %s %s\n"
msgstr "已完成的成员%d %s %s\n"
-#: pg_backup_archiver.c:4095
+#: pg_backup_archiver.c:3869
#, c-format
msgid "worker process failed: exit code %d\n"
msgstr "子进程已退出, 退出码为 %d\n"
-#: pg_backup_archiver.c:4257
+#: pg_backup_archiver.c:4031
#, c-format
msgid "transferring dependency %d -> %d to %d\n"
msgstr "传输依赖关系从%d -> %d 到%d\n"
-#: pg_backup_archiver.c:4326
+#: pg_backup_archiver.c:4100
#, c-format
msgid "reducing dependencies for %d\n"
msgstr "为%d减少依赖关系\n"
-#: pg_backup_archiver.c:4365
+#: pg_backup_archiver.c:4139
#, c-format
msgid "table \"%s\" could not be created, will not restore its data\n"
msgstr "无法创建表\"%s\" , 这样无法恢复它的数据\n"
#. translator: this is a module name
-#: pg_backup_custom.c:89
+#: pg_backup_custom.c:93
msgid "custom archiver"
msgstr "客户归档"
-#: pg_backup_custom.c:371 pg_backup_null.c:152
+#: pg_backup_custom.c:382 pg_backup_null.c:152
#, c-format
msgid "invalid OID for large object\n"
msgstr "大对象的无效 OID\n"
-#: pg_backup_custom.c:442
+#: pg_backup_custom.c:453
#, c-format
msgid "unrecognized data block type (%d) while searching archive\n"
msgstr "搜索归档是碰到不识别的数据块类型 (%d)\n"
-#: pg_backup_custom.c:453
+#: pg_backup_custom.c:464
#, c-format
msgid "error during file seek: %s\n"
msgstr "在文件内定位时出错: %s\n"
-#: pg_backup_custom.c:463
+#: pg_backup_custom.c:474
#, c-format
msgid ""
"could not find block ID %d in archive -- possibly due to out-of-order "
@@ -835,7 +935,7 @@ msgstr ""
"在归档中无法找到数据块ID %d -- 这可能是由于不正常的恢复引起的,这种不正常的恢"
"复通常因为在归档中缺少数据偏移量而无法处理\n"
-#: pg_backup_custom.c:468
+#: pg_backup_custom.c:479
#, c-format
msgid ""
"could not find block ID %d in archive -- possibly due to out-of-order "
@@ -844,364 +944,360 @@ msgstr ""
"在归档中无法找到数据块ID %d -- 这可能是由于不正常的恢复引起的,这种不正常的恢"
"复通常因为缺少的输入文件而无法处理\n"
-#: pg_backup_custom.c:473
+#: pg_backup_custom.c:484
#, c-format
msgid "could not find block ID %d in archive -- possibly corrupt archive\n"
msgstr "无法在归档中找到ID为%d的数据块--这可能是因为归档文件损坏\n"
-#: pg_backup_custom.c:480
+#: pg_backup_custom.c:491
#, c-format
msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
msgstr "读取数据时发现意外块 ID (%d) - 预期是 %d\n"
-#: pg_backup_custom.c:494
+#: pg_backup_custom.c:505
#, c-format
msgid "unrecognized data block type %d while restoring archive\n"
msgstr "恢复归档时碰到不识别的数据块类型 %d\n"
# input.c:210
-#: pg_backup_custom.c:576 pg_backup_custom.c:910
+#: pg_backup_custom.c:587 pg_backup_custom.c:995
#, c-format
msgid "could not read from input file: end of file\n"
msgstr "无法从输入文件中读取:文件的结尾\n"
# input.c:210
-#: pg_backup_custom.c:579 pg_backup_custom.c:913
+#: pg_backup_custom.c:590 pg_backup_custom.c:998
#, c-format
msgid "could not read from input file: %s\n"
msgstr "无法从输入档案读取:%s\n"
-#: pg_backup_custom.c:608
+#: pg_backup_custom.c:619
#, c-format
msgid "could not write byte: %s\n"
msgstr "无法写字节: %s\n"
-#: pg_backup_custom.c:716 pg_backup_custom.c:754
+#: pg_backup_custom.c:727 pg_backup_custom.c:765
#, c-format
msgid "could not close archive file: %s\n"
msgstr "无法关闭归档文件: %s\n"
-#: pg_backup_custom.c:735
+#: pg_backup_custom.c:746
#, c-format
msgid "can only reopen input archives\n"
msgstr "只能重新打开输入归档\n"
-#: pg_backup_custom.c:742
+#: pg_backup_custom.c:753
#, c-format
msgid "parallel restore from standard input is not supported\n"
msgstr "不支持从标准输入进行并行恢复\n"
-#: pg_backup_custom.c:744
+#: pg_backup_custom.c:755
#, c-format
msgid "parallel restore from non-seekable file is not supported\n"
msgstr "不支持从不可随机寻址的文件里并行恢复\n"
-#: pg_backup_custom.c:749
+#: pg_backup_custom.c:760
#, c-format
msgid "could not determine seek position in archive file: %s\n"
msgstr "无法在归档文件中确定查找位置: %s\n"
-#: pg_backup_custom.c:764
+#: pg_backup_custom.c:775
#, c-format
msgid "could not set seek position in archive file: %s\n"
msgstr "无法在归档文件中设置查找位置: %s\n"
-#: pg_backup_custom.c:782
+#: pg_backup_custom.c:793
#, c-format
msgid "compressor active\n"
msgstr "压缩程序已激活\n"
-#: pg_backup_custom.c:818
+#: pg_backup_custom.c:903
#, c-format
msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
msgstr "警告: ftell 和预期位置不匹配 -- 使用 ftell\n"
#. translator: this is a module name
-#: pg_backup_db.c:27
+#: pg_backup_db.c:28
msgid "archiver (db)"
msgstr "归档 (db)"
-#: pg_backup_db.c:40 pg_dump.c:583
-#, c-format
-msgid "could not parse version string \"%s\"\n"
-msgstr "无法分析版本字串 \"%s\"\n"
-
-#: pg_backup_db.c:56
+#: pg_backup_db.c:43
#, c-format
msgid "could not get server_version from libpq\n"
msgstr "无法从 libpq 获取服务器版本\n"
-#: pg_backup_db.c:69 pg_dumpall.c:1793
+#: pg_backup_db.c:54 pg_dumpall.c:1896
#, c-format
msgid "server version: %s; %s version: %s\n"
msgstr "服务器版本: %s; %s 版本: %s\n"
-#: pg_backup_db.c:71 pg_dumpall.c:1795
+#: pg_backup_db.c:56 pg_dumpall.c:1898
#, c-format
msgid "aborting because of server version mismatch\n"
msgstr "因为服务器版本不匹配而终止\n"
-#: pg_backup_db.c:142
+#: pg_backup_db.c:127
#, c-format
msgid "connecting to database \"%s\" as user \"%s\"\n"
msgstr "以用户 \"%2$s\" 的身份联接到数据库 \"%1$s\"\n"
-#: pg_backup_db.c:147 pg_backup_db.c:199 pg_backup_db.c:246 pg_backup_db.c:292
-#: pg_dumpall.c:1695 pg_dumpall.c:1741
+#: pg_backup_db.c:132 pg_backup_db.c:184 pg_backup_db.c:231 pg_backup_db.c:277
+#: pg_dumpall.c:1726 pg_dumpall.c:1834
msgid "Password: "
msgstr "口令: "
-#: pg_backup_db.c:180
+#: pg_backup_db.c:165
#, c-format
msgid "failed to reconnect to database\n"
msgstr "与数据库重新联接失败\n"
-#: pg_backup_db.c:185
+#: pg_backup_db.c:170
#, c-format
msgid "could not reconnect to database: %s"
msgstr "无法与数据库重新联接: %s"
# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: pg_backup_db.c:201
+#: pg_backup_db.c:186
#, c-format
msgid "connection needs password\n"
msgstr "在连接时需要输入口令\n"
-#: pg_backup_db.c:242
+#: pg_backup_db.c:227
#, c-format
msgid "already connected to a database\n"
msgstr "已经与一个数据库联接\n"
-#: pg_backup_db.c:284
+#: pg_backup_db.c:269
#, c-format
msgid "failed to connect to database\n"
msgstr "与数据库联接失败\n"
-#: pg_backup_db.c:303
+#: pg_backup_db.c:288
#, c-format
msgid "connection to database \"%s\" failed: %s"
msgstr "与数据库 \"%s\" 联接失败: %s"
-#: pg_backup_db.c:332
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: pg_backup_db.c:339
+#: pg_backup_db.c:343
#, c-format
msgid "query failed: %s"
msgstr "查询失败: %s"
-#: pg_backup_db.c:341
+#: pg_backup_db.c:345
#, c-format
msgid "query was: %s\n"
msgstr "查询是: %s\n"
-#: pg_backup_db.c:405
+#: pg_backup_db.c:409
#, c-format
msgid "%s: %s Command was: %s\n"
msgstr "%s: %s 命令是: %s\n"
-#: pg_backup_db.c:456 pg_backup_db.c:527 pg_backup_db.c:534
+#: pg_backup_db.c:460 pg_backup_db.c:531 pg_backup_db.c:538
msgid "could not execute query"
msgstr "无法执行查询"
-#: pg_backup_db.c:507
+#: pg_backup_db.c:511
#, c-format
msgid "error returned by PQputCopyData: %s"
msgstr "PQputCopyData返回错误: %s"
-#: pg_backup_db.c:553
+#: pg_backup_db.c:557
#, c-format
msgid "error returned by PQputCopyEnd: %s"
msgstr "PQputCopyEnd返回错误: %s"
# describe.c:933
-#: pg_backup_db.c:559
+#: pg_backup_db.c:563
#, c-format
msgid "COPY failed for table \"%s\": %s"
msgstr "复制表 \"%s\"失败: %s"
-#: pg_backup_db.c:570
+#: pg_backup_db.c:574
msgid "could not start database transaction"
msgstr "无法开始数据库事务"
-#: pg_backup_db.c:576
+#: pg_backup_db.c:580
msgid "could not commit database transaction"
msgstr "无法提交数据库事务"
#. translator: this is a module name
-#: pg_backup_directory.c:62
+#: pg_backup_directory.c:63
msgid "directory archiver"
msgstr "目录归档器"
-#: pg_backup_directory.c:144
+#: pg_backup_directory.c:161
#, c-format
msgid "no output directory specified\n"
msgstr "没有指定输出目录\n"
-#: pg_backup_directory.c:151
+#: pg_backup_directory.c:193
#, c-format
msgid "could not create directory \"%s\": %s\n"
msgstr "无法创建目录 \"%s\": %s\n"
-#: pg_backup_directory.c:360
+#: pg_backup_directory.c:405
#, c-format
msgid "could not close data file: %s\n"
msgstr "无法关闭数据文件: %s\n"
-#: pg_backup_directory.c:400
+#: pg_backup_directory.c:446
#, c-format
msgid "could not open large object TOC file \"%s\" for input: %s\n"
msgstr "无法为输入: %s打开大对象文件\"%s\"\n"
-#: pg_backup_directory.c:410
+#: pg_backup_directory.c:456
#, c-format
msgid "invalid line in large object TOC file \"%s\": \"%s\"\n"
msgstr "无效行存在于大对象文件\"%s\": \"%s\"\n"
-#: pg_backup_directory.c:419
+#: pg_backup_directory.c:465
#, c-format
msgid "error reading large object TOC file \"%s\"\n"
msgstr "在读取大对象文件\"%s\"时发生错误\n"
-#: pg_backup_directory.c:423
+#: pg_backup_directory.c:469
#, c-format
msgid "could not close large object TOC file \"%s\": %s\n"
msgstr "无法关闭大对象 TOC 文件\"%s\": %s\n"
-#: pg_backup_directory.c:444
+#: pg_backup_directory.c:490
#, c-format
msgid "could not write byte\n"
msgstr "无法写字节\n"
-#: pg_backup_directory.c:614
+#: pg_backup_directory.c:682
#, c-format
msgid "could not write to blobs TOC file\n"
msgstr "无法写入BLOB到大对象TOC文件\n"
-#: pg_backup_directory.c:642
+#: pg_backup_directory.c:714
#, c-format
msgid "file name too long: \"%s\"\n"
msgstr "文件名超长: \"%s\"\n"
+#: pg_backup_directory.c:800
+#, c-format
+#| msgid "error during file seek: %s\n"
+msgid "error during backup\n"
+msgstr "在备份过程中出错\n"
+
#: pg_backup_null.c:77
#, c-format
msgid "this format cannot be read\n"
msgstr "无法读取这个格式\n"
#. translator: this is a module name
-#: pg_backup_tar.c:105
+#: pg_backup_tar.c:109
msgid "tar archiver"
msgstr "tar 归档"
-#: pg_backup_tar.c:181
+#: pg_backup_tar.c:190
#, c-format
msgid "could not open TOC file \"%s\" for output: %s\n"
msgstr "无法为输出打开TOC文件\"%s\": %s\n"
-#: pg_backup_tar.c:189
+#: pg_backup_tar.c:198
#, c-format
msgid "could not open TOC file for output: %s\n"
msgstr "无法为输出打开 TOC 文件: %s\n"
-#: pg_backup_tar.c:217 pg_backup_tar.c:373
+#: pg_backup_tar.c:226 pg_backup_tar.c:382
#, c-format
msgid "compression is not supported by tar archive format\n"
msgstr "不支持tar归档格式的压缩\n"
-#: pg_backup_tar.c:225
+#: pg_backup_tar.c:234
#, c-format
msgid "could not open TOC file \"%s\" for input: %s\n"
msgstr "无法为输入打开TOC文件\"%s\": %s\n"
-#: pg_backup_tar.c:232
+#: pg_backup_tar.c:241
#, c-format
msgid "could not open TOC file for input: %s\n"
msgstr "无法为输入打开 TOC 文件: %s\n"
-#: pg_backup_tar.c:359
+#: pg_backup_tar.c:368
#, c-format
msgid "could not find file \"%s\" in archive\n"
msgstr "无法在归档中找到文件\"%s\"\n"
-#: pg_backup_tar.c:415
+#: pg_backup_tar.c:424
#, c-format
msgid "could not generate temporary file name: %s\n"
msgstr "无法生成临时文件名: %s\n"
-#: pg_backup_tar.c:424
+#: pg_backup_tar.c:433
#, c-format
msgid "could not open temporary file\n"
msgstr "无法打开临时文件\n"
-#: pg_backup_tar.c:451
+#: pg_backup_tar.c:460
#, c-format
msgid "could not close tar member\n"
msgstr "无法关闭 tar 成员\n"
-#: pg_backup_tar.c:551
+#: pg_backup_tar.c:560
#, c-format
msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
msgstr "内部错误 -- 在 tarReadRaw() 里既未声明 th 也未声明 fh\n"
-#: pg_backup_tar.c:677
+#: pg_backup_tar.c:686
#, c-format
msgid "unexpected COPY statement syntax: \"%s\"\n"
msgstr "意外的COPY语句语法: \"%s\"\n"
-#: pg_backup_tar.c:880
+#: pg_backup_tar.c:889
#, c-format
msgid "could not write null block at end of tar archive\n"
msgstr "无法在 tar 归档末尾写 null 块\n"
-#: pg_backup_tar.c:935
+#: pg_backup_tar.c:944
#, c-format
msgid "invalid OID for large object (%u)\n"
msgstr "用于大对象的非法 OID (%u)\n"
-#: pg_backup_tar.c:1087
+#: pg_backup_tar.c:1078
#, c-format
msgid "archive member too large for tar format\n"
msgstr "在 tar 格式中归档成员太大\n"
# command.c:1148
-#: pg_backup_tar.c:1102
+#: pg_backup_tar.c:1093
#, c-format
msgid "could not close temporary file: %s\n"
msgstr "无法关闭临时文件: %s\n"
-#: pg_backup_tar.c:1112
+#: pg_backup_tar.c:1103
#, c-format
msgid "actual file length (%s) does not match expected (%s)\n"
msgstr "实际文件长度 (%s) 不匹配预期的长度 (%s)\n"
-#: pg_backup_tar.c:1120
+#: pg_backup_tar.c:1111
#, c-format
msgid "could not output padding at end of tar member\n"
msgstr "无法在 tar 成员尾部输出填充内容\n"
-#: pg_backup_tar.c:1149
+#: pg_backup_tar.c:1140
#, c-format
msgid "moving from position %s to next member at file position %s\n"
msgstr "从位置 %s 移动到文件位置 %s 的下一个成员\n"
-#: pg_backup_tar.c:1160
+#: pg_backup_tar.c:1151
#, c-format
msgid "now at file position %s\n"
msgstr "现在在文件的位置 %s\n"
-#: pg_backup_tar.c:1169 pg_backup_tar.c:1199
+#: pg_backup_tar.c:1160 pg_backup_tar.c:1190
#, c-format
msgid "could not find header for file \"%s\" in tar archive\n"
msgstr "无法在tar归档中为文件\"%s\"找到标题头\n"
-#: pg_backup_tar.c:1183
+#: pg_backup_tar.c:1174
#, c-format
msgid "skipping tar member %s\n"
msgstr "忽略 tar 成员 %s\n"
-#: pg_backup_tar.c:1187
+#: pg_backup_tar.c:1178
#, c-format
msgid ""
"restoring data out of order is not supported in this archive format: \"%s\" "
@@ -1210,78 +1306,119 @@ msgstr ""
"这个归档格式里不支持不按照顺序转储数据: 要求\"%s\" ,但它在归档文件里位于\"%s"
"\"前面.\n"
-#: pg_backup_tar.c:1233
+#: pg_backup_tar.c:1224
#, c-format
msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
msgstr "实际文件位置和预期文件位置不匹配 (%s 对 %s)\n"
-#: pg_backup_tar.c:1248
+#: pg_backup_tar.c:1239
#, c-format
msgid "incomplete tar header found (%lu byte)\n"
msgid_plural "incomplete tar header found (%lu bytes)\n"
msgstr[0] "找到未完成的tar文件头(%lu个字节)\n"
-#: pg_backup_tar.c:1286
+#: pg_backup_tar.c:1277
#, c-format
msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
msgstr "在 %2$s 的 TOC 记录 %1$s (长度 %3$lu, 校验和 %4$d)\n"
-#: pg_backup_tar.c:1296
+#: pg_backup_tar.c:1287
#, c-format
msgid ""
"corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
msgstr ""
"在文件 %1$s 的位置 %4$s 发现崩溃的 tar 头(预计在 %2$d, 计算出来在 %3$d)\n"
-#: pg_dump.c:529 pg_dumpall.c:306 pg_restore.c:295
+#: pg_backup_utils.c:54
+#, c-format
+msgid "%s: unrecognized section name: \"%s\"\n"
+msgstr "%s: 无法识别的节名称: \"%s\"\n"
+
+#: pg_backup_utils.c:56 pg_dump.c:540 pg_dump.c:557 pg_dumpall.c:303
+#: pg_dumpall.c:313 pg_dumpall.c:323 pg_dumpall.c:332 pg_dumpall.c:341
+#: pg_dumpall.c:399 pg_restore.c:282 pg_restore.c:298 pg_restore.c:310
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "输入 \"%s --help\" 获取更多的信息.\n"
+
+#: pg_backup_utils.c:101
+#, c-format
+msgid "out of on_exit_nicely slots\n"
+msgstr "超出on_exit_nicely槽\n"
+
+#: pg_dump.c:555 pg_dumpall.c:311 pg_restore.c:296
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
-#: pg_dump.c:541
+#: pg_dump.c:567
#, c-format
msgid "options -s/--schema-only and -a/--data-only cannot be used together\n"
msgstr "选项 -s/--schema-only和-a/--data-only 不能同时使用.\n"
-#: pg_dump.c:544
+#: pg_dump.c:570
#, c-format
msgid "options -c/--clean and -a/--data-only cannot be used together\n"
msgstr "选项 -c/--clean和 -a/--data-only不能同时使用.\n"
-#: pg_dump.c:548
+#: pg_dump.c:574
#, c-format
msgid ""
"options --inserts/--column-inserts and -o/--oids cannot be used together\n"
msgstr "选项--inserts/--column-inserts和-o/--oids不能同时使用.\n"
-#: pg_dump.c:549
+#: pg_dump.c:575
#, c-format
msgid "(The INSERT command cannot set OIDs.)\n"
msgstr "(INSERT 命令无法设置对象标识(oid).)\n"
-#: pg_dump.c:576
+#: pg_dump.c:605
+#, c-format
+#| msgid "%s: invalid port number \"%s\"\n"
+msgid "%s: invalid number of parallel jobs\n"
+msgstr "%s: 无效的并行工作数\n"
+
+# input.c:213
+#: pg_dump.c:609
+#, c-format
+#| msgid "parallel restore is not supported with this archive file format\n"
+msgid "parallel backup only supported by the directory format\n"
+msgstr "并行备份只被目录格式支持\n"
+
+#: pg_dump.c:619
#, c-format
msgid "could not open output file \"%s\" for writing\n"
msgstr "无法打开输出文件 \"%s\" 用于写出\n"
-#: pg_dump.c:660
+#: pg_dump.c:678
+#, c-format
+msgid ""
+"Synchronized snapshots are not supported by this server version.\n"
+"Run with --no-synchronized-snapshots instead if you do not need\n"
+"synchronized snapshots.\n"
+msgstr ""
+"当前服务器版本不支持同步快照.\n"
+"如果不需要同步快照功能,\n"
+"可以带参数 --no-synchronized-snapshots运行.\n"
+
+#: pg_dump.c:691
#, c-format
msgid "last built-in OID is %u\n"
msgstr "最后的内置 OID 是 %u\n"
# describe.c:1542
-#: pg_dump.c:669
+#: pg_dump.c:700
#, c-format
msgid "No matching schemas were found\n"
msgstr "没有找到符合的关联。\n"
# describe.c:1542
-#: pg_dump.c:681
+#: pg_dump.c:712
#, c-format
msgid "No matching tables were found\n"
msgstr "没有找到符合的关联。\n"
-#: pg_dump.c:820
+#: pg_dump.c:856
#, c-format
msgid ""
"%s dumps a database as a text file or to other formats.\n"
@@ -1290,17 +1427,17 @@ msgstr ""
"%s 把一个数据库转储为纯文本文件或者是其它格式.\n"
"\n"
-#: pg_dump.c:821 pg_dumpall.c:536 pg_restore.c:401
+#: pg_dump.c:857 pg_dumpall.c:541 pg_restore.c:414
#, c-format
msgid "Usage:\n"
msgstr "用法:\n"
-#: pg_dump.c:822
+#: pg_dump.c:858
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [选项]... [数据库名字]\n"
-#: pg_dump.c:824 pg_dumpall.c:539 pg_restore.c:404
+#: pg_dump.c:860 pg_dumpall.c:544 pg_restore.c:417
#, c-format
msgid ""
"\n"
@@ -1309,12 +1446,12 @@ msgstr ""
"\n"
"一般选项:\n"
-#: pg_dump.c:825
+#: pg_dump.c:861
#, c-format
msgid " -f, --file=FILENAME output file or directory name\n"
msgstr " -f, --file=FILENAME 输出文件或目录名\n"
-#: pg_dump.c:826
+#: pg_dump.c:862
#, c-format
msgid ""
" -F, --format=c|d|t|p output file format (custom, directory, tar,\n"
@@ -1323,34 +1460,41 @@ msgstr ""
" -F, --format=c|d|t|p 输出文件格式 (定制, 目录, tar)\n"
" 明文 (默认值))\n"
-#: pg_dump.c:828
+#: pg_dump.c:864
+#, c-format
+#| msgid ""
+#| " -j, --jobs=NUM use this many parallel jobs to restore\n"
+msgid " -j, --jobs=NUM use this many parallel jobs to dump\n"
+msgstr " -j, --jobs=NUM 执行多个并行任务进行备份转储工作\n"
+
+#: pg_dump.c:865
#, c-format
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详细模式\n"
-#: pg_dump.c:829 pg_dumpall.c:541
+#: pg_dump.c:866 pg_dumpall.c:546
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息,然后退出\n"
-#: pg_dump.c:830
+#: pg_dump.c:867
#, c-format
msgid ""
" -Z, --compress=0-9 compression level for compressed formats\n"
msgstr " -Z, --compress=0-9 被压缩格式的压缩级别\n"
-#: pg_dump.c:831 pg_dumpall.c:542
+#: pg_dump.c:868 pg_dumpall.c:547
#, c-format
msgid ""
" --lock-wait-timeout=TIMEOUT fail after waiting TIMEOUT for a table lock\n"
msgstr " --lock-wait-timeout=TIMEOUT 在等待表锁超时后操作失败\n"
-#: pg_dump.c:832 pg_dumpall.c:543
+#: pg_dump.c:869 pg_dumpall.c:548
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: pg_dump.c:834 pg_dumpall.c:544
+#: pg_dump.c:871 pg_dumpall.c:549
#, c-format
msgid ""
"\n"
@@ -1359,17 +1503,17 @@ msgstr ""
"\n"
"控制输出内容选项:\n"
-#: pg_dump.c:835 pg_dumpall.c:545
+#: pg_dump.c:872 pg_dumpall.c:550
#, c-format
msgid " -a, --data-only dump only the data, not the schema\n"
msgstr " -a, --data-only 只转储数据,不包括模式\n"
-#: pg_dump.c:836
+#: pg_dump.c:873
#, c-format
msgid " -b, --blobs include large objects in dump\n"
msgstr " -b, --blobs 在转储中包括大对象\n"
-#: pg_dump.c:837 pg_restore.c:415
+#: pg_dump.c:874 pg_restore.c:428
#, c-format
msgid ""
" -c, --clean clean (drop) database objects before "
@@ -1377,33 +1521,33 @@ msgid ""
msgstr ""
" -c, --clean 在重新创建之前,先清除(删除)数据库对象\n"
-#: pg_dump.c:838
+#: pg_dump.c:875
#, c-format
msgid ""
" -C, --create include commands to create database in dump\n"
msgstr " -C, --create 在转储中包括命令,以便创建数据库\n"
-#: pg_dump.c:839
+#: pg_dump.c:876
#, c-format
msgid " -E, --encoding=ENCODING dump the data in encoding ENCODING\n"
msgstr " -E, --encoding=ENCODING 转储以ENCODING形式编码的数据\n"
-#: pg_dump.c:840
+#: pg_dump.c:877
#, c-format
msgid " -n, --schema=SCHEMA dump the named schema(s) only\n"
msgstr " -n, --schema=SCHEMA 只转储指定名称的模式\n"
-#: pg_dump.c:841
+#: pg_dump.c:878
#, c-format
msgid " -N, --exclude-schema=SCHEMA do NOT dump the named schema(s)\n"
msgstr " -N, --exclude-schema=SCHEMA 不转储已命名的模式\n"
-#: pg_dump.c:842 pg_dumpall.c:548
+#: pg_dump.c:879 pg_dumpall.c:553
#, c-format
msgid " -o, --oids include OIDs in dump\n"
msgstr " -o, --oids 在转储中包括 OID\n"
-#: pg_dump.c:843
+#: pg_dump.c:880
#, c-format
msgid ""
" -O, --no-owner skip restoration of object ownership in\n"
@@ -1412,46 +1556,46 @@ msgstr ""
" -O, --no-owner 在明文格式中, 忽略恢复对象所属者\n"
"\n"
-#: pg_dump.c:845 pg_dumpall.c:551
+#: pg_dump.c:882 pg_dumpall.c:556
#, c-format
msgid " -s, --schema-only dump only the schema, no data\n"
msgstr " -s, --schema-only 只转储模式, 不包括数据\n"
-#: pg_dump.c:846
+#: pg_dump.c:883
#, c-format
msgid ""
" -S, --superuser=NAME superuser user name to use in plain-text "
"format\n"
msgstr " -S, --superuser=NAME 在明文格式中使用指定的超级用户名\n"
-#: pg_dump.c:847
+#: pg_dump.c:884
#, c-format
msgid " -t, --table=TABLE dump the named table(s) only\n"
msgstr " -t, --table=TABLE 只转储指定名称的表\n"
-#: pg_dump.c:848
+#: pg_dump.c:885
#, c-format
msgid " -T, --exclude-table=TABLE do NOT dump the named table(s)\n"
msgstr " -T, --exclude-table=TABLE 不转储指定名称的表\n"
-#: pg_dump.c:849 pg_dumpall.c:554
+#: pg_dump.c:886 pg_dumpall.c:559
#, c-format
msgid " -x, --no-privileges do not dump privileges (grant/revoke)\n"
msgstr " -x, --no-privileges 不要转储权限 (grant/revoke)\n"
-#: pg_dump.c:850 pg_dumpall.c:555
+#: pg_dump.c:887 pg_dumpall.c:560
#, c-format
msgid " --binary-upgrade for use by upgrade utilities only\n"
msgstr " --binary-upgrade 只能由升级工具使用\n"
-#: pg_dump.c:851 pg_dumpall.c:556
+#: pg_dump.c:888 pg_dumpall.c:561
#, c-format
msgid ""
" --column-inserts dump data as INSERT commands with column "
"names\n"
msgstr " --column-inserts 以带有列名的INSERT命令形式转储数据\n"
-#: pg_dump.c:852 pg_dumpall.c:557
+#: pg_dump.c:889 pg_dumpall.c:562
#, c-format
msgid ""
" --disable-dollar-quoting disable dollar quoting, use SQL standard "
@@ -1459,19 +1603,19 @@ msgid ""
msgstr ""
" --disable-dollar-quoting 取消美元 (符号) 引号, 使用 SQL 标准引号\n"
-#: pg_dump.c:853 pg_dumpall.c:558 pg_restore.c:431
+#: pg_dump.c:890 pg_dumpall.c:563 pg_restore.c:444
#, c-format
msgid ""
" --disable-triggers disable triggers during data-only restore\n"
msgstr " --disable-triggers 在只恢复数据的过程中禁用触发器\n"
-#: pg_dump.c:854
+#: pg_dump.c:891
#, c-format
msgid ""
" --exclude-table-data=TABLE do NOT dump data for the named table(s)\n"
msgstr " --exclude-table-data=TABLE 不转储指定名称的表中的数据\n"
-#: pg_dump.c:855 pg_dumpall.c:559
+#: pg_dump.c:892 pg_dumpall.c:564
#, c-format
msgid ""
" --inserts dump data as INSERT commands, rather than "
@@ -1479,28 +1623,35 @@ msgid ""
msgstr ""
" --inserts 以INSERT命令,而不是COPY命令的形式转储数据\n"
-#: pg_dump.c:856 pg_dumpall.c:560
+#: pg_dump.c:893 pg_dumpall.c:565
#, c-format
msgid " --no-security-labels do not dump security label assignments\n"
msgstr " --no-security-labels 不转储安全标签的分配\n"
-#: pg_dump.c:857 pg_dumpall.c:561
+#: pg_dump.c:894
+#, c-format
+msgid ""
+" --no-synchronized-snapshots do not use synchronized snapshots in parallel "
+"jobs\n"
+msgstr " --no-synchronized-snapshots 在并行工作集中不使用同步快照\n"
+
+#: pg_dump.c:895 pg_dumpall.c:566
#, c-format
msgid " --no-tablespaces do not dump tablespace assignments\n"
msgstr " --no-tablespaces 不转储表空间分配信息\n"
-#: pg_dump.c:858 pg_dumpall.c:562
+#: pg_dump.c:896 pg_dumpall.c:567
#, c-format
msgid " --no-unlogged-table-data do not dump unlogged table data\n"
msgstr " --no-unlogged-table-data 不转储没有日志的表数据\n"
-#: pg_dump.c:859 pg_dumpall.c:563
+#: pg_dump.c:897 pg_dumpall.c:568
#, c-format
msgid ""
" --quote-all-identifiers quote all identifiers, even if not key words\n"
msgstr " --quote-all-identifiers 所有标识符加引号,即使不是关键字\n"
-#: pg_dump.c:860
+#: pg_dump.c:898
#, c-format
msgid ""
" --section=SECTION dump named section (pre-data, data, or post-"
@@ -1508,14 +1659,14 @@ msgid ""
msgstr ""
" --section=SECTION 备份命名的节 (数据前, 数据, 及 数据后)\n"
-#: pg_dump.c:861
+#: pg_dump.c:899
#, c-format
msgid ""
" --serializable-deferrable wait until the dump can run without "
"anomalies\n"
msgstr " --serializable-deferrable 等到备份可以无异常运行\n"
-#: pg_dump.c:862 pg_dumpall.c:564 pg_restore.c:437
+#: pg_dump.c:900 pg_dumpall.c:569 pg_restore.c:450
#, c-format
msgid ""
" --use-set-session-authorization\n"
@@ -1527,7 +1678,7 @@ msgstr ""
" 使用 SESSION AUTHORIZATION 命令代替\n"
" ALTER OWNER 命令来设置所有权\n"
-#: pg_dump.c:866 pg_dumpall.c:568 pg_restore.c:441
+#: pg_dump.c:904 pg_dumpall.c:573 pg_restore.c:454
#, c-format
msgid ""
"\n"
@@ -1536,39 +1687,45 @@ msgstr ""
"\n"
"联接选项:\n"
-#: pg_dump.c:867 pg_dumpall.c:569 pg_restore.c:442
+#: pg_dump.c:905
+#, c-format
+#| msgid " -d, --dbname=DBNAME database to cluster\n"
+msgid " -d, --dbname=DBNAME database to dump\n"
+msgstr " -d, --dbname=DBNAME 对数据库 DBNAME备份\n"
+
+#: pg_dump.c:906 pg_dumpall.c:575 pg_restore.c:455
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=主机名 数据库服务器的主机名或套接字目录\n"
-#: pg_dump.c:868 pg_dumpall.c:571 pg_restore.c:443
+#: pg_dump.c:907 pg_dumpall.c:577 pg_restore.c:456
#, c-format
msgid " -p, --port=PORT database server port number\n"
msgstr " -p, --port=端口号 数据库服务器的端口号\n"
-#: pg_dump.c:869 pg_dumpall.c:572 pg_restore.c:444
+#: pg_dump.c:908 pg_dumpall.c:578 pg_restore.c:457
#, c-format
msgid " -U, --username=NAME connect as specified database user\n"
msgstr " -U, --username=名字 以指定的数据库用户联接\n"
-#: pg_dump.c:870 pg_dumpall.c:573 pg_restore.c:445
+#: pg_dump.c:909 pg_dumpall.c:579 pg_restore.c:458
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, --no-password 永远不提示输入口令\n"
-#: pg_dump.c:871 pg_dumpall.c:574 pg_restore.c:446
+#: pg_dump.c:910 pg_dumpall.c:580 pg_restore.c:459
#, c-format
msgid ""
" -W, --password force password prompt (should happen "
"automatically)\n"
msgstr " -W, --password 强制口令提示 (自动)\n"
-#: pg_dump.c:872 pg_dumpall.c:575
+#: pg_dump.c:911 pg_dumpall.c:581
#, c-format
msgid " --role=ROLENAME do SET ROLE before dump\n"
msgstr " --role=ROLENAME 在转储前运行SET ROLE\n"
-#: pg_dump.c:874
+#: pg_dump.c:913
#, c-format
msgid ""
"\n"
@@ -1581,154 +1738,154 @@ msgstr ""
"的数值.\n"
"\n"
-#: pg_dump.c:876 pg_dumpall.c:579 pg_restore.c:450
+#: pg_dump.c:915 pg_dumpall.c:585 pg_restore.c:463
#, c-format
msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "报告错误至 <pgsql-bugs@postgresql.org>.\n"
-#: pg_dump.c:889
+#: pg_dump.c:933
#, c-format
msgid "invalid client encoding \"%s\" specified\n"
msgstr "声明了无效的输出格式 \"%s\"\n"
-#: pg_dump.c:978
+#: pg_dump.c:1095
#, c-format
msgid "invalid output format \"%s\" specified\n"
msgstr "声明了非法的输出格式 \"%s\"\n"
-#: pg_dump.c:1000
+#: pg_dump.c:1117
#, c-format
msgid "server version must be at least 7.3 to use schema selection switches\n"
msgstr "服务器版本必须至少是7.3才能使用模式选择转换\n"
-#: pg_dump.c:1270
+#: pg_dump.c:1393
#, c-format
msgid "dumping contents of table %s\n"
msgstr "正在转储表 %s 的内容\n"
-#: pg_dump.c:1392
+#: pg_dump.c:1516
#, c-format
msgid "Dumping the contents of table \"%s\" failed: PQgetCopyData() failed.\n"
msgstr "转储表 \"%s\" 的内容的 SQL 命令失败: PQendcopy() 失败.\n"
-#: pg_dump.c:1393 pg_dump.c:1403
+#: pg_dump.c:1517 pg_dump.c:1527
#, c-format
msgid "Error message from server: %s"
msgstr "来自服务器的错误信息: %s"
-#: pg_dump.c:1394 pg_dump.c:1404
+#: pg_dump.c:1518 pg_dump.c:1528
#, c-format
msgid "The command was: %s\n"
msgstr "命令是: %s\n"
-#: pg_dump.c:1402
+#: pg_dump.c:1526
#, c-format
msgid "Dumping the contents of table \"%s\" failed: PQgetResult() failed.\n"
msgstr "转储表 \"%s\" 的内容失败: PQgetResult() 失败.\n"
-#: pg_dump.c:1853
+#: pg_dump.c:2136
#, c-format
msgid "saving database definition\n"
msgstr "保存数据库定义\n"
-#: pg_dump.c:2150
+#: pg_dump.c:2433
#, c-format
msgid "saving encoding = %s\n"
msgstr "正在保存encoding = %s\n"
-#: pg_dump.c:2177
+#: pg_dump.c:2460
#, c-format
msgid "saving standard_conforming_strings = %s\n"
msgstr "正在保存standard_conforming_strings = %s\n"
-#: pg_dump.c:2210
+#: pg_dump.c:2493
#, c-format
msgid "reading large objects\n"
msgstr "正在读取大对象\n"
-#: pg_dump.c:2342
+#: pg_dump.c:2625
#, c-format
msgid "saving large objects\n"
msgstr "保存大对象\n"
-#: pg_dump.c:2389
+#: pg_dump.c:2672
#, c-format
msgid "error reading large object %u: %s"
msgstr "在读取大对象时发生错误%u: %s"
-#: pg_dump.c:2582
+#: pg_dump.c:2865
#, c-format
msgid "could not find parent extension for %s\n"
msgstr "无法找到父扩展%s\n"
-#: pg_dump.c:2685
+#: pg_dump.c:2968
#, c-format
msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
msgstr "警告: 模式 \"%s\" 的所有者非法\n"
-#: pg_dump.c:2728
+#: pg_dump.c:3011
#, c-format
msgid "schema with OID %u does not exist\n"
msgstr "OID %u 的模式不存在\n"
-#: pg_dump.c:3078
+#: pg_dump.c:3361
#, c-format
msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
msgstr "警告: 数据类型 \"%s\" 的所有者非法\n"
-#: pg_dump.c:3189
+#: pg_dump.c:3472
#, c-format
msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
msgstr "警告: 操作符 \"%s\" 的所有者非法\n"
-#: pg_dump.c:3446
+#: pg_dump.c:3729
#, c-format
msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
msgstr "警告: 操作符表 \"%s\" 无效\n"
-#: pg_dump.c:3534
+#: pg_dump.c:3817
#, c-format
msgid "WARNING: owner of operator family \"%s\" appears to be invalid\n"
msgstr "警告: 操作符 \"%s\" 的所有者无效\n"
-#: pg_dump.c:3672
+#: pg_dump.c:3976
#, c-format
msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
msgstr "警告: 聚集函数 \"%s\" 的所有者非法\n"
-#: pg_dump.c:3854
+#: pg_dump.c:4180
#, c-format
msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
msgstr "警告: 函数 \"%s\" 的所有者非法\n"
-#: pg_dump.c:4356
+#: pg_dump.c:4734
#, c-format
msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
msgstr "警告: 数据表 \"%s\" 的所有者非法\n"
-#: pg_dump.c:4503
+#: pg_dump.c:4885
#, c-format
msgid "reading indexes for table \"%s\"\n"
msgstr "为表 \"%s\" 读取索引\n"
-#: pg_dump.c:4822
+#: pg_dump.c:5218
#, c-format
msgid "reading foreign key constraints for table \"%s\"\n"
msgstr "为表 \"%s\" 读取外键约束\n"
-#: pg_dump.c:5067
+#: pg_dump.c:5463
#, c-format
msgid ""
"failed sanity check, parent table OID %u of pg_rewrite entry OID %u not "
"found\n"
msgstr "健全检查失败,pg_rewrite项OID %2$u 的源表 OID%1$u 未找到\n"
-#: pg_dump.c:5158
+#: pg_dump.c:5556
#, c-format
msgid "reading triggers for table \"%s\"\n"
msgstr "为表 \"%s\" 读取触发器\n"
-#: pg_dump.c:5319
+#: pg_dump.c:5717
#, c-format
msgid ""
"query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -1737,181 +1894,181 @@ msgstr ""
"对在表 \"%2$s\" 上的外键触发器 \"%1$s\" 上的查询生成了 NULL 个引用表(表的 "
"OID 是: %3$u)\n"
-#: pg_dump.c:5688
+#: pg_dump.c:6169
#, c-format
msgid "finding the columns and types of table \"%s\"\n"
msgstr "正在查找表 \"%s\" 的字段和类型\n"
-#: pg_dump.c:5866
+#: pg_dump.c:6347
#, c-format
msgid "invalid column numbering in table \"%s\"\n"
msgstr "在表 \"%s\" 中的字段个数是无效的\n"
-#: pg_dump.c:5900
+#: pg_dump.c:6381
#, c-format
msgid "finding default expressions of table \"%s\"\n"
msgstr "正在查找表 \"%s\" 的默认表达式\n"
-#: pg_dump.c:5952
+#: pg_dump.c:6433
#, c-format
msgid "invalid adnum value %d for table \"%s\"\n"
msgstr "表 \"%2$s\" 的无效 adnum 值 %1$d\n"
-#: pg_dump.c:6024
+#: pg_dump.c:6505
#, c-format
msgid "finding check constraints for table \"%s\"\n"
msgstr "正在为表 \"%s\" 查找检查约束\n"
-#: pg_dump.c:6119
+#: pg_dump.c:6600
#, c-format
msgid "expected %d check constraint on table \"%s\" but found %d\n"
msgid_plural "expected %d check constraints on table \"%s\" but found %d\n"
msgstr[0] "在表\"%2$s\"上期望有%1$d个检查约束,但是找到了%3$d个\n"
-#: pg_dump.c:6123
+#: pg_dump.c:6604
#, c-format
msgid "(The system catalogs might be corrupted.)\n"
msgstr "(系统表可能损坏了.)\n"
-#: pg_dump.c:7483
+#: pg_dump.c:7970
#, c-format
msgid "WARNING: typtype of data type \"%s\" appears to be invalid\n"
msgstr "警告: 数据类型 \"%s\" 的所有者看起来无效\n"
-#: pg_dump.c:8932
+#: pg_dump.c:9419
#, c-format
msgid "WARNING: bogus value in proargmodes array\n"
msgstr "警告: 无法分析 proargmodes 数组\n"
-#: pg_dump.c:9260
+#: pg_dump.c:9747
#, c-format
msgid "WARNING: could not parse proallargtypes array\n"
msgstr "警告: 无法分析 proallargtypes 数组\n"
-#: pg_dump.c:9276
+#: pg_dump.c:9763
#, c-format
msgid "WARNING: could not parse proargmodes array\n"
msgstr "警告: 无法分析 proargmodes 数组\n"
-#: pg_dump.c:9290
+#: pg_dump.c:9777
#, c-format
msgid "WARNING: could not parse proargnames array\n"
msgstr "警告: 无法分析 proargnames 数组\n"
-#: pg_dump.c:9301
+#: pg_dump.c:9788
#, c-format
msgid "WARNING: could not parse proconfig array\n"
msgstr "警告: 无法解析 proconfig 数组\n"
-#: pg_dump.c:9358
+#: pg_dump.c:9845
#, c-format
msgid "unrecognized provolatile value for function \"%s\"\n"
msgstr "函数 \"%s\" 的意外正向易失值\n"
-#: pg_dump.c:9578
+#: pg_dump.c:10065
#, c-format
msgid "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n"
msgstr "警告: 在pg_cast.castfunc或者pg_cast.castmethod字段中的是假值\n"
-#: pg_dump.c:9581
+#: pg_dump.c:10068
#, c-format
msgid "WARNING: bogus value in pg_cast.castmethod field\n"
msgstr "警告: 在pg_cast.castmethod字段中的是假值\n"
-#: pg_dump.c:9950
+#: pg_dump.c:10437
#, c-format
msgid "WARNING: could not find operator with OID %s\n"
msgstr "警告: 未找到 OID 为 %s 的操作符\n"
-#: pg_dump.c:11012
+#: pg_dump.c:11499
#, c-format
msgid ""
"WARNING: aggregate function %s could not be dumped correctly for this "
"database version; ignored\n"
msgstr "警告: 无法为此版本的数据库正确转储聚集函数 \"%s\"; 忽略\n"
-#: pg_dump.c:11788
+#: pg_dump.c:12275
#, c-format
msgid "unrecognized object type in default privileges: %d\n"
msgstr "缺省权限中存在未知对象类型: %d\n"
-#: pg_dump.c:11803
+#: pg_dump.c:12290
#, c-format
msgid "could not parse default ACL list (%s)\n"
msgstr "无法解析缺省ACL列表(%s)\n"
-#: pg_dump.c:11858
+#: pg_dump.c:12345
#, c-format
msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
msgstr "无法为对象 \"%2$s\" 分析 ACL 列表 (%1$s) (%3$s)\n"
-#: pg_dump.c:12299
+#: pg_dump.c:12764
#, c-format
msgid "query to obtain definition of view \"%s\" returned no data\n"
msgstr "获取视图 \"%s\" 定义的查询没有返回数据\n"
-#: pg_dump.c:12302
+#: pg_dump.c:12767
#, c-format
msgid ""
"query to obtain definition of view \"%s\" returned more than one definition\n"
msgstr "获取视图 \"%s\" 定义的查询返回超过一个定义\n"
-#: pg_dump.c:12309
+#: pg_dump.c:12774
#, c-format
msgid "definition of view \"%s\" appears to be empty (length zero)\n"
msgstr "视图 \"%s\" 的定义是空的(零长)\n"
-#: pg_dump.c:12920
+#: pg_dump.c:13482
#, c-format
msgid "invalid column number %d for table \"%s\"\n"
msgstr "对于表 \"%2$s\" 字段个数 %1$d 是无效的\n"
-#: pg_dump.c:13030
+#: pg_dump.c:13597
#, c-format
msgid "missing index for constraint \"%s\"\n"
msgstr "对于约束 \"%s\" 缺少索引\n"
-#: pg_dump.c:13217
+#: pg_dump.c:13784
#, c-format
msgid "unrecognized constraint type: %c\n"
msgstr "未知的约束类型: %c\n"
-#: pg_dump.c:13366 pg_dump.c:13530
+#: pg_dump.c:13933 pg_dump.c:14097
#, c-format
msgid "query to get data of sequence \"%s\" returned %d row (expected 1)\n"
msgid_plural ""
"query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
msgstr[0] "查询得到了序列\"%s\"的数据,返回了%d条记录(期望一条)\n"
-#: pg_dump.c:13377
+#: pg_dump.c:13944
#, c-format
msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
msgstr "获取序列 \"%s\" 的数据的查询返回了名字 \"%s\"\n"
# fe-exec.c:1371
-#: pg_dump.c:13617
+#: pg_dump.c:14184
#, c-format
msgid "unexpected tgtype value: %d\n"
msgstr "意外的tgtype值: %d\n"
-#: pg_dump.c:13699
+#: pg_dump.c:14266
#, c-format
msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
msgstr "给表 \"%3$s\" 上的触发器 \"%2$s\" 的错误参数 (%1$s)\n"
-#: pg_dump.c:13816
+#: pg_dump.c:14446
#, c-format
msgid ""
"query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
"returned\n"
msgstr "获取表 \"%2$s\" 的规则 \"%1$s\" 查询失败: 返回了错误的行数\n"
-#: pg_dump.c:14088
+#: pg_dump.c:14747
#, c-format
msgid "reading dependency data\n"
msgstr "读取从属数据\n"
-#: pg_dump.c:14669
+#: pg_dump.c:15292
#, c-format
msgid "query returned %d row instead of one: %s\n"
msgid_plural "query returned %d rows instead of one: %s\n"
@@ -1922,33 +2079,33 @@ msgstr[0] "查询返回了%d条记录,而不是一条记录: %s\n"
msgid "sorter"
msgstr "排序器"
-#: pg_dump_sort.c:367
+#: pg_dump_sort.c:465
#, c-format
msgid "invalid dumpId %d\n"
msgstr "无效的dumpId %d\n"
-#: pg_dump_sort.c:373
+#: pg_dump_sort.c:471
#, c-format
msgid "invalid dependency %d\n"
msgstr "无效的依赖 %d\n"
-#: pg_dump_sort.c:587
+#: pg_dump_sort.c:685
#, c-format
msgid "could not identify dependency loop\n"
msgstr "无法标识循环依赖\n"
-#: pg_dump_sort.c:1037
+#: pg_dump_sort.c:1135
#, c-format
msgid ""
"NOTICE: there are circular foreign-key constraints among these table(s):\n"
msgstr "注意: 这些表之间存在循环外键约束依赖:\n"
-#: pg_dump_sort.c:1039 pg_dump_sort.c:1059
+#: pg_dump_sort.c:1137 pg_dump_sort.c:1157
#, c-format
msgid " %s\n"
msgstr " %s\n"
-#: pg_dump_sort.c:1040
+#: pg_dump_sort.c:1138
#, c-format
msgid ""
"You might not be able to restore the dump without using --disable-triggers "
@@ -1956,19 +2113,19 @@ msgid ""
msgstr ""
"不使用 --disable-triggers 选项或者临时删除约束,你将不能对备份进行恢复 .\n"
-#: pg_dump_sort.c:1041
+#: pg_dump_sort.c:1139
#, c-format
msgid ""
"Consider using a full dump instead of a --data-only dump to avoid this "
"problem.\n"
msgstr "考虑使用完全备份代替 --data-only选项进行备份以避免此问题.\n"
-#: pg_dump_sort.c:1053
+#: pg_dump_sort.c:1151
#, c-format
msgid "WARNING: could not resolve dependency loop among these items:\n"
msgstr "WARNING: 无法解析这些项的循环依赖:\n"
-#: pg_dumpall.c:173
+#: pg_dumpall.c:180
#, c-format
msgid ""
"The program \"pg_dump\" is needed by %s but was not found in the\n"
@@ -1979,7 +2136,7 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: pg_dumpall.c:180
+#: pg_dumpall.c:187
#, c-format
msgid ""
"The program \"pg_dump\" was found by \"%s\"\n"
@@ -1990,32 +2147,32 @@ msgstr ""
"\n"
"检查您的安装.\n"
-#: pg_dumpall.c:316
+#: pg_dumpall.c:321
#, c-format
msgid ""
"%s: options -g/--globals-only and -r/--roles-only cannot be used together\n"
msgstr "%s: 选项-g/--globals-only和-r/--roles-only不能同时使用.\n"
-#: pg_dumpall.c:325
+#: pg_dumpall.c:330
#, c-format
msgid ""
"%s: options -g/--globals-only and -t/--tablespaces-only cannot be used "
"together\n"
msgstr "%s: 选项 -g/--globals-only和-t/--tablespaces-only不能同时使用.\n"
-#: pg_dumpall.c:334
+#: pg_dumpall.c:339
#, c-format
msgid ""
"%s: options -r/--roles-only and -t/--tablespaces-only cannot be used "
"together\n"
msgstr "%s: 选项 -r/--roles-only和 -t/--tablespaces-only不能同时使用.\n"
-#: pg_dumpall.c:376 pg_dumpall.c:1730
+#: pg_dumpall.c:381 pg_dumpall.c:1823
#, c-format
msgid "%s: could not connect to database \"%s\"\n"
msgstr "%s: 无法与数据库 \"%s\" 联接\n"
-#: pg_dumpall.c:391
+#: pg_dumpall.c:396
#, c-format
msgid ""
"%s: could not connect to databases \"postgres\" or \"template1\"\n"
@@ -2025,12 +2182,12 @@ msgstr ""
"请指定另外一个数据库.\n"
# command.c:1148
-#: pg_dumpall.c:408
+#: pg_dumpall.c:413
#, c-format
msgid "%s: could not open the output file \"%s\": %s\n"
msgstr "%s:无法打开输出文件 \"%s\":%s\n"
-#: pg_dumpall.c:535
+#: pg_dumpall.c:540
#, c-format
msgid ""
"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2039,55 +2196,61 @@ msgstr ""
"%s 抽取一个 PostgreSQL 数据库簇进一个 SQL 脚本文件.\n"
"\n"
-#: pg_dumpall.c:537
+#: pg_dumpall.c:542
#, c-format
msgid " %s [OPTION]...\n"
msgstr " %s [选项]...\n"
-#: pg_dumpall.c:540
+#: pg_dumpall.c:545
#, c-format
msgid " -f, --file=FILENAME output file name\n"
msgstr " -f, --file=FILENAME 输出文件名\n"
-#: pg_dumpall.c:546
+#: pg_dumpall.c:551
#, c-format
msgid ""
" -c, --clean clean (drop) databases before recreating\n"
msgstr " -c, --clean 在重新创建数据库前先清除(删除)数据库\n"
-#: pg_dumpall.c:547
+#: pg_dumpall.c:552
#, c-format
msgid " -g, --globals-only dump only global objects, no databases\n"
msgstr " -g, --globals-only 只转储全局对象, 不包括数据库\n"
-#: pg_dumpall.c:549 pg_restore.c:423
+#: pg_dumpall.c:554 pg_restore.c:436
#, c-format
msgid " -O, --no-owner skip restoration of object ownership\n"
msgstr " -O, --no-owner 不恢复对象所属者\n"
-#: pg_dumpall.c:550
+#: pg_dumpall.c:555
#, c-format
msgid ""
" -r, --roles-only dump only roles, no databases or tablespaces\n"
msgstr " -r, --roles-only 只转储角色,不包括数据库或表空间\n"
-#: pg_dumpall.c:552
+#: pg_dumpall.c:557
#, c-format
msgid " -S, --superuser=NAME superuser user name to use in the dump\n"
msgstr " -S, --superuser=NAME 在转储中, 指定的超级用户名\n"
-#: pg_dumpall.c:553
+#: pg_dumpall.c:558
#, c-format
msgid ""
" -t, --tablespaces-only dump only tablespaces, no databases or roles\n"
msgstr " -t, --tablespaces-only 只转储表空间,而不转储数据库或角色\n"
-#: pg_dumpall.c:570
+#: pg_dumpall.c:574
+#, c-format
+#| msgid " -d, --dbname=NAME connect to database name\n"
+msgid " -d, --dbname=CONNSTR connect using connection string\n"
+msgstr " -d, --dbname=CONNSTR 连接数据库使用的连接串\n"
+
+#: pg_dumpall.c:576
#, c-format
msgid " -l, --database=DBNAME alternative default database\n"
msgstr " -l, --database=DBNAME 另一个缺省数据库\n"
-#: pg_dumpall.c:577
+#: pg_dumpall.c:583
#, c-format
msgid ""
"\n"
@@ -2101,94 +2264,95 @@ msgstr ""
".\n"
"\n"
-#: pg_dumpall.c:1068
+#: pg_dumpall.c:1083
#, c-format
msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
msgstr "%1$s: 无法为表空间 \"%3$s\" 分析 ACL 列表 (%2$s)\n"
-#: pg_dumpall.c:1372
+#: pg_dumpall.c:1387
#, c-format
msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
msgstr "%1$s: 无法为数据库 \"%3$s\" 分析 ACL 列表 (%2$s)\n"
-#: pg_dumpall.c:1584
+#: pg_dumpall.c:1599
#, c-format
msgid "%s: dumping database \"%s\"...\n"
msgstr "%s: 正在转储数据库 \"%s\"...\n"
-#: pg_dumpall.c:1594
+#: pg_dumpall.c:1609
#, c-format
msgid "%s: pg_dump failed on database \"%s\", exiting\n"
msgstr "%s: pg_dump 失败在数据库 \"%s\", 正在退出\n"
# command.c:1148
-#: pg_dumpall.c:1603
+#: pg_dumpall.c:1618
#, c-format
msgid "%s: could not re-open the output file \"%s\": %s\n"
msgstr "%s:无法重新打开输出文件 \"%s\":%s\n"
-#: pg_dumpall.c:1642
+#: pg_dumpall.c:1665
#, c-format
msgid "%s: running \"%s\"\n"
msgstr "%s: 正在运行 \"%s\"\n"
-#: pg_dumpall.c:1752
+#: pg_dumpall.c:1845
#, c-format
msgid "%s: could not connect to database \"%s\": %s\n"
msgstr "%s: 无法与数据库 \"%s\" 联接: %s\n"
-#: pg_dumpall.c:1766
+#: pg_dumpall.c:1875
#, c-format
msgid "%s: could not get server version\n"
msgstr "%s: 无法从服务器获取版本\n"
-#: pg_dumpall.c:1772
+#: pg_dumpall.c:1881
#, c-format
msgid "%s: could not parse server version \"%s\"\n"
msgstr "%s: 无法分析版本字串 \"%s\"\n"
-#: pg_dumpall.c:1780
-#, c-format
-msgid "%s: could not parse version \"%s\"\n"
-msgstr "%s: 无法解析版本 \"%s\"\n"
-
-#: pg_dumpall.c:1819 pg_dumpall.c:1845
+#: pg_dumpall.c:1959 pg_dumpall.c:1985
#, c-format
msgid "%s: executing %s\n"
msgstr "%s: 执行 %s\n"
-#: pg_dumpall.c:1825 pg_dumpall.c:1851
+#: pg_dumpall.c:1965 pg_dumpall.c:1991
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: 查询失败: %s"
-#: pg_dumpall.c:1827 pg_dumpall.c:1853
+#: pg_dumpall.c:1967 pg_dumpall.c:1993
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: 查询是: %s\n"
-#: pg_restore.c:307
+#: pg_restore.c:308
#, c-format
msgid "%s: options -d/--dbname and -f/--file cannot be used together\n"
msgstr "%s: 选项 -d/--dbname和-f/--file不能同时使用.\n"
-#: pg_restore.c:319
+#: pg_restore.c:320
#, c-format
msgid "%s: cannot specify both --single-transaction and multiple jobs\n"
msgstr "%s: 不能同时指定选项--single-transaction和多个任务\n"
-#: pg_restore.c:350
+#: pg_restore.c:351
#, c-format
msgid ""
"unrecognized archive format \"%s\"; please specify \"c\", \"d\", or \"t\"\n"
msgstr "不可识别的归档格式\"%s\"; 请指定 \"c\", \"d\", 或 \"t\"\n"
-#: pg_restore.c:386
+#: pg_restore.c:381
+#, c-format
+#| msgid "maximum number of prepared transactions reached"
+msgid "%s: maximum number of parallel jobs is %d\n"
+msgstr "%s: 已经达到并行工作集的最大数 %d\n"
+
+#: pg_restore.c:399
#, c-format
msgid "WARNING: errors ignored on restore: %d\n"
msgstr "警告: 恢复中忽略错误: %d\n"
-#: pg_restore.c:400
+#: pg_restore.c:413
#, c-format
msgid ""
"%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -2197,47 +2361,47 @@ msgstr ""
"%s 从一个归档中恢复一个由 pg_dump 创建的 PostgreSQL 数据库.\n"
"\n"
-#: pg_restore.c:402
+#: pg_restore.c:415
#, c-format
msgid " %s [OPTION]... [FILE]\n"
msgstr " %s [选项]... [文件名]\n"
-#: pg_restore.c:405
+#: pg_restore.c:418
#, c-format
msgid " -d, --dbname=NAME connect to database name\n"
msgstr " -d, --dbname=名字 连接数据库名字\n"
-#: pg_restore.c:406
+#: pg_restore.c:419
#, c-format
msgid " -f, --file=FILENAME output file name\n"
msgstr " -f, --file=文件名 输出文件名\n"
-#: pg_restore.c:407
+#: pg_restore.c:420
#, c-format
msgid " -F, --format=c|d|t backup file format (should be automatic)\n"
msgstr " -F, --format=c|d|t 备份文件格式(应该自动进行)\n"
-#: pg_restore.c:408
+#: pg_restore.c:421
#, c-format
msgid " -l, --list print summarized TOC of the archive\n"
msgstr " -l, --list 打印归档文件的 TOC 概述\n"
-#: pg_restore.c:409
+#: pg_restore.c:422
#, c-format
msgid " -v, --verbose verbose mode\n"
msgstr " -v, --verbose 详细模式\n"
-#: pg_restore.c:410
+#: pg_restore.c:423
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: pg_restore.c:411
+#: pg_restore.c:424
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: pg_restore.c:413
+#: pg_restore.c:426
#, c-format
msgid ""
"\n"
@@ -2246,32 +2410,32 @@ msgstr ""
"\n"
"恢复控制选项:\n"
-#: pg_restore.c:414
+#: pg_restore.c:427
#, c-format
msgid " -a, --data-only restore only the data, no schema\n"
msgstr " -a, --data-only 只恢复数据, 不包括模式\n"
-#: pg_restore.c:416
+#: pg_restore.c:429
#, c-format
msgid " -C, --create create the target database\n"
msgstr " -C, --create 创建目标数据库\n"
-#: pg_restore.c:417
+#: pg_restore.c:430
#, c-format
msgid " -e, --exit-on-error exit on error, default is to continue\n"
msgstr " -e, --exit-on-error 发生错误退出, 默认为继续\n"
-#: pg_restore.c:418
+#: pg_restore.c:431
#, c-format
msgid " -I, --index=NAME restore named index\n"
msgstr " -I, --index=NAME 恢复指定名称的索引\n"
-#: pg_restore.c:419
+#: pg_restore.c:432
#, c-format
msgid " -j, --jobs=NUM use this many parallel jobs to restore\n"
msgstr " -j, --jobs=NUM 执行多个并行任务进行恢复工作\n"
-#: pg_restore.c:420
+#: pg_restore.c:433
#, c-format
msgid ""
" -L, --use-list=FILENAME use table of contents from this file for\n"
@@ -2280,51 +2444,52 @@ msgstr ""
" -L, --use-list=FILENAME 从这个文件中使用指定的内容表排序\n"
" 输出\n"
-#: pg_restore.c:422
+#: pg_restore.c:435
#, c-format
msgid " -n, --schema=NAME restore only objects in this schema\n"
msgstr " -n, --schema=NAME 在这个模式中只恢复对象\n"
-#: pg_restore.c:424
+#: pg_restore.c:437
#, c-format
msgid " -P, --function=NAME(args) restore named function\n"
msgstr " -P, --function=NAME(args) 恢复指定名字的函数\n"
-#: pg_restore.c:425
+#: pg_restore.c:438
#, c-format
msgid " -s, --schema-only restore only the schema, no data\n"
msgstr " -s, --schema-only 只恢复模式, 不包括数据\n"
-#: pg_restore.c:426
+#: pg_restore.c:439
#, c-format
msgid ""
" -S, --superuser=NAME superuser user name to use for disabling "
"triggers\n"
msgstr " -S, --superuser=NAME 使用指定的超级用户来禁用触发器\n"
-#: pg_restore.c:427
-#, c-format
-msgid " -t, --table=NAME restore named table\n"
+#: pg_restore.c:440
+#, fuzzy, c-format
+#| msgid " -t, --table=NAME restore named table\n"
+msgid " -t, --table=NAME restore named table(s)\n"
msgstr " -t, --table=NAME 恢复指定名字的表\n"
-#: pg_restore.c:428
+#: pg_restore.c:441
#, c-format
msgid " -T, --trigger=NAME restore named trigger\n"
msgstr " -T, --trigger=NAME 恢复指定名字的触发器\n"
-#: pg_restore.c:429
+#: pg_restore.c:442
#, c-format
msgid ""
" -x, --no-privileges skip restoration of access privileges (grant/"
"revoke)\n"
msgstr " -x, --no-privileges 跳过处理权限的恢复 (grant/revoke)\n"
-#: pg_restore.c:430
+#: pg_restore.c:443
#, c-format
msgid " -1, --single-transaction restore as a single transaction\n"
msgstr " -1, --single-transaction 作为单个事务恢复\n"
-#: pg_restore.c:432
+#: pg_restore.c:445
#, c-format
msgid ""
" --no-data-for-failed-tables do not restore data of tables that could not "
@@ -2334,29 +2499,29 @@ msgstr ""
" --no-data-for-failed-tables 对那些无法创建的表不进行\n"
" 数据恢复\n"
-#: pg_restore.c:434
+#: pg_restore.c:447
#, c-format
msgid " --no-security-labels do not restore security labels\n"
msgstr " --no-security-labels 不恢复安全标签信息\n"
-#: pg_restore.c:435
+#: pg_restore.c:448
#, c-format
msgid " --no-tablespaces do not restore tablespace assignments\n"
msgstr " --no-tablespaces 不恢复表空间的分配信息\n"
-#: pg_restore.c:436
+#: pg_restore.c:449
#, c-format
msgid ""
" --section=SECTION restore named section (pre-data, data, or "
"post-data)\n"
msgstr " --section=SECTION 恢复命名节 (数据前、数据及数据后)\n"
-#: pg_restore.c:447
+#: pg_restore.c:460
#, c-format
msgid " --role=ROLENAME do SET ROLE before restore\n"
msgstr " --role=ROLENAME 在恢复前执行SET ROLE操作\n"
-#: pg_restore.c:449
+#: pg_restore.c:462
#, c-format
msgid ""
"\n"
@@ -2367,352 +2532,358 @@ msgstr ""
"如果没有提供输入文件名, 则使用标准输入.\n"
"\n"
-#~ msgid "%s: invalid -X option -- %s\n"
-#~ msgstr "%s: 无效的 -X 选项 -- %s\n"
+#~ msgid "-C and -c are incompatible options\n"
+#~ msgstr "-C 和 -c 是互不兼容的选项\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid ""
+#~ " -O, --no-owner do not output commands to set object "
+#~ "ownership\n"
+#~ msgstr ""
+#~ " -O, --no-owner 设置对象的所属者时不输出\n"
+#~ " 命令\n"
#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --versoin 输出版本信息, 然后退出\n"
+#~ " -i, --ignore-version proceed even when server version mismatches\n"
+#~ " pg_dumpall version\n"
+#~ msgstr ""
+#~ " -i, --ignore-version 当服务器版本与 pg_dumpall 不匹配时\n"
+#~ " 继续运行\n"
-#~ msgid "*** aborted because of error\n"
-#~ msgstr "*** 因为错误退出\n"
+#~ msgid ""
+#~ " -i, --ignore-version proceed even when server version mismatches\n"
+#~ msgstr " -i, --ignore-version 当服务器版本不匹配时继续运行\n"
-#~ msgid "missing pg_database entry for database \"%s\"\n"
-#~ msgstr "缺少用于 \"%s\" 的 pg_database 记录\n"
+#~ msgid "could not write tar header\n"
+#~ msgstr "无法写 tar 头\n"
-#~ msgid ""
-#~ "query returned more than one (%d) pg_database entry for database \"%s\"\n"
-#~ msgstr "查询为数据库 \"%2$s\" 返回了超过一条 (%1$d) pg_database 记录\n"
+#~ msgid "could not close tar member: %s\n"
+#~ msgstr "无法关闭 tar 成员: %s\n"
-#~ msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
-#~ msgstr "dumpDatabase(): 无法找到pg_largeobject.relfrozenxid\n"
+#~ msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
+#~ msgstr "向 tar 归档附加时写错误 (写了 %lu, 试图写 %lu)\n"
-#~ msgid "query returned no rows: %s\n"
-#~ msgstr "查询放弃, 没有记录: %s\n"
+#~ msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
+#~ msgstr "无法写入 tar 成员 (写了 %lu, 企图写 %lu)\n"
-#~ msgid "missing pg_database entry for this database\n"
-#~ msgstr "缺少此数据库的 pg_database 记录\n"
+#~ msgid "requested %d bytes, got %d from lookahead and %d from file\n"
+#~ msgstr "要求 %d 字节, 从预览中获取 %d, 从文件中获取 %d\n"
-#~ msgid "found more than one pg_database entry for this database\n"
-#~ msgstr "找到此数据库的多于一条的 pg_database 记录\n"
+#~ msgid "could not open large object file\n"
+#~ msgstr "无法打开大对象文件\n"
-#~ msgid "could not find entry for pg_indexes in pg_class\n"
-#~ msgstr "在 pg_class 中无法为 pg_indexes 找到记录\n"
+#~ msgid "could not open data file for input\n"
+#~ msgstr "无法为输入打开数据文件\n"
-#~ msgid "found more than one entry for pg_indexes in pg_class\n"
-#~ msgstr "在 pg_class 表中找到多条 pg_indexes 的记录\n"
+#~ msgid "could not open data file for output\n"
+#~ msgstr "无法为输出打开数据文件\n"
-#~ msgid "SQL command failed\n"
-#~ msgstr "SQL 命令失败\n"
+#~ msgid "could not commit transaction for large object cross-references"
+#~ msgstr "无法为大对象交叉引用提交事务"
-#~ msgid "cannot reopen stdin\n"
-#~ msgstr "无法重新打开stdin\n"
+#~ msgid "could not start transaction for large object cross-references"
+#~ msgstr "无法为大对象交叉引用启动事务"
-#~ msgid "cannot reopen non-seekable file\n"
-#~ msgstr "无法重新打开不可查找的文件\n"
+#~ msgid "could not create large object cross-reference entry"
+#~ msgstr "无法创建大对象交叉引用记录"
-#~ msgid "file archiver"
-#~ msgstr "文件归档"
+#~ msgid "could not create index on large object cross-reference table"
+#~ msgstr "无法在大对象交叉引用表上创建索引"
-#~ msgid ""
-#~ "WARNING:\n"
-#~ " This format is for demonstration purposes; it is not intended for\n"
-#~ " normal use. Files will be written in the current working directory.\n"
-#~ msgstr ""
-#~ "警告:\n"
-#~ " 这个格式仅用于演示; 并非用于一般用途.\n"
-#~ " 文件将写入当前工作目录.\n"
+#~ msgid "creating index for large object cross-references\n"
+#~ msgstr "为大对象交叉引用创建索引\n"
-#~ msgid "could not close data file after reading\n"
-#~ msgstr "读取之后无法关闭数据文件\n"
+#~ msgid "could not create large object cross-reference table"
+#~ msgstr "无法创建大对象交叉引用表"
-#~ msgid "could not open large object TOC for input: %s\n"
-#~ msgstr "无法打开大对象 TOC 进行输入: %s\n"
+#~ msgid "creating table for large object cross-references\n"
+#~ msgstr "为大对象交叉引用创建表\n"
-#~ msgid "could not open large object TOC for output: %s\n"
-#~ msgstr "无法打开大对象 TOC 进行输出: %s\n"
+#~ msgid "error while updating column \"%s\" of table \"%s\": %s"
+#~ msgstr "更新表 \"%2$s\" 的字段 \"%1$s\" 时出错: %3$s"
-#~ msgid "could not close large object file\n"
-#~ msgstr "无法关闭大对象文件\n"
+#~ msgid "could not update column \"%s\" of table \"%s\": %s"
+#~ msgstr "无法更新表 \"%2$s\" 的字段 \"%1$s\": %3$s"
-#~ msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
-#~ msgstr "COPY 语句错 -- 无法在字串 \"%s\" 中找到 \"copy\"\n"
+#~ msgid "SQL: %s\n"
+#~ msgstr "SQL: %s\n"
-#~ msgid ""
-#~ "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
-#~ "starting at position %lu\n"
-#~ msgstr ""
-#~ "COPY 语句错 -- 无法在从 %2$lu 位置开始的字串 \"%1$s\" 里找到 \"from stdin"
-#~ "\" 字样\n"
+#~ msgid "fixing large object cross-references for %s.%s\n"
+#~ msgstr "为 %s.%s 修补大对象交叉引用\n"
-#~ msgid "restoring large object OID %u\n"
-#~ msgstr "恢复 OID %u 的大对象\n"
+#~ msgid "no OID type columns in table %s\n"
+#~ msgstr "表 %s 中没有 OID 类型字段\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "could not find OID columns of table \"%s\": %s"
+#~ msgstr "无法寻找表 \"%s\" 的 OID 字段: %s"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 输出版本信息, 然后退出\n"
+#~ msgid "error returned by PQendcopy\n"
+#~ msgstr "PQendcopy 返回错误\n"
-#~ msgid ""
-#~ " -c, --clean clean (drop) database objects before "
-#~ "recreating\n"
-#~ msgstr ""
-#~ " -c, --clean 在重新创建数据库对象之前需要清除(删除)数据库"
-#~ "对象\n"
+#~ msgid "COPY command executed in non-primary connection\n"
+#~ msgstr "COPY 命令在没有主联接的环境下执行\n"
-#~ msgid " -O, --no-owner skip restoration of object ownership\n"
-#~ msgstr " -O, --no-owner 忽略恢复对象所属者\n"
+#~ msgid "%s: no result from server\n"
+#~ msgstr "%s: 没有来自服务器的结果\n"
#~ msgid ""
-#~ " --disable-triggers disable triggers during data-only restore\n"
-#~ msgstr " --disable-triggers 在只恢复数据的过程中禁用触发器\n"
+#~ "aborting because of version mismatch (Use the -i option to proceed "
+#~ "anyway.)\n"
+#~ msgstr "因版本差异退出 (用 -i 选项忽略差异继续处理.)\n"
-#~ msgid ""
-#~ " --use-set-session-authorization\n"
-#~ " use SET SESSION AUTHORIZATION commands instead "
-#~ "of\n"
-#~ " ALTER OWNER commands to set ownership\n"
-#~ msgstr ""
-#~ " --use-set-session-authorization\n"
-#~ " 使用 SESSION AUTHORIZATION 命令代替\n"
-#~ " ALTER OWNER命令来设置对象所有权\n"
+#~ msgid "could not write uncompressed chunk\n"
+#~ msgstr "无法写入未压缩的块\n"
-#~ msgid "%s: out of memory\n"
-#~ msgstr "%s: 内存溢出\n"
+#~ msgid "could not write compressed chunk\n"
+#~ msgstr "无法写入压缩的块\n"
-#~ msgid "dumpBlobs(): could not open large object: %s"
-#~ msgstr "dumpBlobs(): 无法打开大对象: %s"
+#~ msgid "write error in _WriteBuf (%lu != %lu)\n"
+#~ msgstr "在 _WriteBuf 里的写错误 (%lu != %lu)\n"
-#~ msgid "saving large object comments\n"
-#~ msgstr "正在保存大对象注释\n"
+#~ msgid "could not read data block -- expected %lu, got %lu\n"
+#~ msgstr "无法读取数据块 - 预期 %lu, 实际 %lu\n"
-#~ msgid "no label definitions found for enum ID %u\n"
-#~ msgstr "对于枚举 ID %u没有找到标签定义\n"
+#~ msgid "large objects cannot be loaded without a database connection\n"
+#~ msgstr "没有数据库联接时无法装载大对象\n"
-#~ msgid ""
-#~ "dumping a specific TOC data block out of order is not supported without "
-#~ "ID on this input stream (fseek required)\n"
-#~ msgstr ""
-#~ "如果在此输入流中没有ID(标识)(fseek 要求的), 那么是不支持非顺序转储特定TOC"
-#~ "数据块的\n"
+#~ msgid "could not open archive file \"%s\": %s\n"
+#~ msgstr "无法打开归档文件 \"%s\": %s\n"
-#~ msgid "compression support is disabled in this format\n"
-#~ msgstr "在这个格式里, 压缩支持时被关闭了的\n"
+#~ msgid "archive format is %d\n"
+#~ msgstr "归档格式是 %d\n"
-#~ msgid "User name: "
-#~ msgstr "用户名: "
+#~ msgid "could not close the input file after reading header: %s\n"
+#~ msgstr "读取头之后无法关闭输入文件: %s\n"
-#~ msgid "large-object output not supported for a single table\n"
-#~ msgstr "不支持单个表的大对象输出.\n"
+#~ msgid "read %lu bytes into lookahead buffer\n"
+#~ msgstr "读取 %lu 字节到预览缓冲区\n"
-#~ msgid "use a full dump instead\n"
-#~ msgstr "使用完整转储替代.\n"
+#~ msgid "could not write to output file (%lu != %lu)\n"
+#~ msgstr "无法写出到输出文件 (%lu != %lu)\n"
-#~ msgid "large-object output not supported for a single schema\n"
-#~ msgstr "不支持单个模式的大对象输出.\n"
+#~ msgid "could not write to compressed archive\n"
+#~ msgstr "无法写入压缩的归档\n"
-#~ msgid "INSERT (-d, -D) and OID (-o) options cannot be used together\n"
-#~ msgstr "INSERT (-d, -D) 和 OID (-o) 选项不能同时使用.\n"
+#~ msgid "could not open TOC file\n"
+#~ msgstr "无法打开 TOC 文件\n"
-#~ msgid "large-object output is not supported for plain-text dump files\n"
-#~ msgstr "纯文本转储文件不支持输出大对象.\n"
+#~ msgid "wrote remaining %lu bytes of large-object data (result = %lu)\n"
+#~ msgstr "写剩下了 %lu 字节的大对象数据 (结果 = %lu)\n"
-#~ msgid "(Use a different output format.)\n"
-#~ msgstr "(使用不同的输出格式.)\n"
+#~ msgid "restoring large object with OID %u as %u\n"
+#~ msgstr "把 OID 为 %u 的大对象恢复为 %u\n"
-#~ msgid ""
-#~ " -i, --ignore-version proceed even when server version mismatches\n"
-#~ " pg_dump version\n"
-#~ msgstr ""
-#~ " -i, --ignore-version 当服务器的版本号与 pg_dump 的版本号不匹配时\n"
-#~ " 仍继续运行\n"
+#~ msgid "starting large-object transactions\n"
+#~ msgstr "开始大对象事务\n"
-#~ msgid " -c, --clean clean (drop) schema prior to create\n"
-#~ msgstr " -c, --clean 先清楚(删除)预先的模式,再建立\n"
+#~ msgid "cannot restore large objects without a database connection\n"
+#~ msgstr "没有数据库联接时无法恢复大对象\n"
-#~ msgid ""
-#~ " -S, --superuser=NAME specify the superuser user name to use in\n"
-#~ " plain text format\n"
-#~ msgstr ""
-#~ " -S, --superuser=NAME 在明文格式中, 使用指定的超级用户\n"
-#~ " 名称\n"
+#~ msgid "committing large-object transactions\n"
+#~ msgstr "提交大对象事务\n"
-#~ msgid "specified schema \"%s\" does not exist\n"
-#~ msgstr "指定的模式 \"%s\" 不存在\n"
+#~ msgid "fixing up large-object cross-reference for \"%s\"\n"
+#~ msgstr "为 \"%s\" 修复大对象的交叉引用\n"
-#~ msgid "specified table \"%s\" does not exist\n"
-#~ msgstr "指定的表 \"%s\" 不存在\n"
+#~ msgid "WARNING: skipping large-object restoration\n"
+#~ msgstr "警告: 忽略大对象的恢复\n"
-#~ msgid "expected %d triggers on table \"%s\" but found %d\n"
-#~ msgstr "预期在表 \"%2$s\" 上有触发器 %1$d , 却发现 %3$d\n"
+#~ msgid "could not close output archive file\n"
+#~ msgstr "无法关闭输出归档文件\n"
-#~ msgid "Got %d rows instead of one from: %s"
-#~ msgstr "已得到 %d 条记录替代来自 %s 的一条"
+#~ msgid "maximum system OID is %u\n"
+#~ msgstr "最大系统 OID 是 %u\n"
#~ msgid "inserted invalid OID\n"
#~ msgstr "插入了非法 OID\n"
-#~ msgid "maximum system OID is %u\n"
-#~ msgstr "最大系统 OID 是 %u\n"
+#~ msgid "Got %d rows instead of one from: %s"
+#~ msgstr "已得到 %d 条记录替代来自 %s 的一条"
-#~ msgid "could not close output archive file\n"
-#~ msgstr "无法关闭输出归档文件\n"
+#~ msgid "expected %d triggers on table \"%s\" but found %d\n"
+#~ msgstr "预期在表 \"%2$s\" 上有触发器 %1$d , 却发现 %3$d\n"
-#~ msgid "WARNING: skipping large-object restoration\n"
-#~ msgstr "警告: 忽略大对象的恢复\n"
+#~ msgid "specified table \"%s\" does not exist\n"
+#~ msgstr "指定的表 \"%s\" 不存在\n"
-#~ msgid "fixing up large-object cross-reference for \"%s\"\n"
-#~ msgstr "为 \"%s\" 修复大对象的交叉引用\n"
+#~ msgid "specified schema \"%s\" does not exist\n"
+#~ msgstr "指定的模式 \"%s\" 不存在\n"
-#~ msgid "committing large-object transactions\n"
-#~ msgstr "提交大对象事务\n"
+#~ msgid ""
+#~ " -S, --superuser=NAME specify the superuser user name to use in\n"
+#~ " plain text format\n"
+#~ msgstr ""
+#~ " -S, --superuser=NAME 在明文格式中, 使用指定的超级用户\n"
+#~ " 名称\n"
-#~ msgid "cannot restore large objects without a database connection\n"
-#~ msgstr "没有数据库联接时无法恢复大对象\n"
+#~ msgid " -c, --clean clean (drop) schema prior to create\n"
+#~ msgstr " -c, --clean 先清楚(删除)预先的模式,再建立\n"
-#~ msgid "starting large-object transactions\n"
-#~ msgstr "开始大对象事务\n"
+#~ msgid ""
+#~ " -i, --ignore-version proceed even when server version mismatches\n"
+#~ " pg_dump version\n"
+#~ msgstr ""
+#~ " -i, --ignore-version 当服务器的版本号与 pg_dump 的版本号不匹配时\n"
+#~ " 仍继续运行\n"
-#~ msgid "restoring large object with OID %u as %u\n"
-#~ msgstr "把 OID 为 %u 的大对象恢复为 %u\n"
+#~ msgid "(Use a different output format.)\n"
+#~ msgstr "(使用不同的输出格式.)\n"
-#~ msgid "wrote remaining %lu bytes of large-object data (result = %lu)\n"
-#~ msgstr "写剩下了 %lu 字节的大对象数据 (结果 = %lu)\n"
+#~ msgid "large-object output is not supported for plain-text dump files\n"
+#~ msgstr "纯文本转储文件不支持输出大对象.\n"
-#~ msgid "could not open TOC file\n"
-#~ msgstr "无法打开 TOC 文件\n"
+#~ msgid "INSERT (-d, -D) and OID (-o) options cannot be used together\n"
+#~ msgstr "INSERT (-d, -D) 和 OID (-o) 选项不能同时使用.\n"
-#~ msgid "could not write to compressed archive\n"
-#~ msgstr "无法写入压缩的归档\n"
+#~ msgid "large-object output not supported for a single schema\n"
+#~ msgstr "不支持单个模式的大对象输出.\n"
-#~ msgid "could not write to output file (%lu != %lu)\n"
-#~ msgstr "无法写出到输出文件 (%lu != %lu)\n"
+#~ msgid "use a full dump instead\n"
+#~ msgstr "使用完整转储替代.\n"
-#~ msgid "read %lu bytes into lookahead buffer\n"
-#~ msgstr "读取 %lu 字节到预览缓冲区\n"
+#~ msgid "large-object output not supported for a single table\n"
+#~ msgstr "不支持单个表的大对象输出.\n"
-#~ msgid "could not close the input file after reading header: %s\n"
-#~ msgstr "读取头之后无法关闭输入文件: %s\n"
+#~ msgid "User name: "
+#~ msgstr "用户名: "
-#~ msgid "archive format is %d\n"
-#~ msgstr "归档格式是 %d\n"
+#~ msgid "compression support is disabled in this format\n"
+#~ msgstr "在这个格式里, 压缩支持时被关闭了的\n"
-#~ msgid "could not open archive file \"%s\": %s\n"
-#~ msgstr "无法打开归档文件 \"%s\": %s\n"
+#~ msgid ""
+#~ "dumping a specific TOC data block out of order is not supported without "
+#~ "ID on this input stream (fseek required)\n"
+#~ msgstr ""
+#~ "如果在此输入流中没有ID(标识)(fseek 要求的), 那么是不支持非顺序转储特定TOC"
+#~ "数据块的\n"
-#~ msgid "large objects cannot be loaded without a database connection\n"
-#~ msgstr "没有数据库联接时无法装载大对象\n"
+#~ msgid "no label definitions found for enum ID %u\n"
+#~ msgstr "对于枚举 ID %u没有找到标签定义\n"
-#~ msgid "could not read data block -- expected %lu, got %lu\n"
-#~ msgstr "无法读取数据块 - 预期 %lu, 实际 %lu\n"
+#~ msgid "saving large object comments\n"
+#~ msgstr "正在保存大对象注释\n"
-#~ msgid "write error in _WriteBuf (%lu != %lu)\n"
-#~ msgstr "在 _WriteBuf 里的写错误 (%lu != %lu)\n"
+#~ msgid "dumpBlobs(): could not open large object: %s"
+#~ msgstr "dumpBlobs(): 无法打开大对象: %s"
-#~ msgid "could not write compressed chunk\n"
-#~ msgstr "无法写入压缩的块\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s: 内存溢出\n"
-#~ msgid "could not write uncompressed chunk\n"
-#~ msgstr "无法写入未压缩的块\n"
+#~ msgid ""
+#~ " --use-set-session-authorization\n"
+#~ " use SET SESSION AUTHORIZATION commands instead "
+#~ "of\n"
+#~ " ALTER OWNER commands to set ownership\n"
+#~ msgstr ""
+#~ " --use-set-session-authorization\n"
+#~ " 使用 SESSION AUTHORIZATION 命令代替\n"
+#~ " ALTER OWNER命令来设置对象所有权\n"
#~ msgid ""
-#~ "aborting because of version mismatch (Use the -i option to proceed "
-#~ "anyway.)\n"
-#~ msgstr "因版本差异退出 (用 -i 选项忽略差异继续处理.)\n"
+#~ " --disable-triggers disable triggers during data-only restore\n"
+#~ msgstr " --disable-triggers 在只恢复数据的过程中禁用触发器\n"
-#~ msgid "%s: no result from server\n"
-#~ msgstr "%s: 没有来自服务器的结果\n"
+#~ msgid " -O, --no-owner skip restoration of object ownership\n"
+#~ msgstr " -O, --no-owner 忽略恢复对象所属者\n"
-#~ msgid "COPY command executed in non-primary connection\n"
-#~ msgstr "COPY 命令在没有主联接的环境下执行\n"
+#~ msgid ""
+#~ " -c, --clean clean (drop) database objects before "
+#~ "recreating\n"
+#~ msgstr ""
+#~ " -c, --clean 在重新创建数据库对象之前需要清除(删除)数据库"
+#~ "对象\n"
-#~ msgid "error returned by PQendcopy\n"
-#~ msgstr "PQendcopy 返回错误\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 输出版本信息, 然后退出\n"
-#~ msgid "could not find OID columns of table \"%s\": %s"
-#~ msgstr "无法寻找表 \"%s\" 的 OID 字段: %s"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "no OID type columns in table %s\n"
-#~ msgstr "表 %s 中没有 OID 类型字段\n"
+#~ msgid "restoring large object OID %u\n"
+#~ msgstr "恢复 OID %u 的大对象\n"
-#~ msgid "fixing large object cross-references for %s.%s\n"
-#~ msgstr "为 %s.%s 修补大对象交叉引用\n"
+#~ msgid ""
+#~ "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
+#~ "starting at position %lu\n"
+#~ msgstr ""
+#~ "COPY 语句错 -- 无法在从 %2$lu 位置开始的字串 \"%1$s\" 里找到 \"from stdin"
+#~ "\" 字样\n"
-#~ msgid "SQL: %s\n"
-#~ msgstr "SQL: %s\n"
+#~ msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
+#~ msgstr "COPY 语句错 -- 无法在字串 \"%s\" 中找到 \"copy\"\n"
-#~ msgid "could not update column \"%s\" of table \"%s\": %s"
-#~ msgstr "无法更新表 \"%2$s\" 的字段 \"%1$s\": %3$s"
+#~ msgid "could not close large object file\n"
+#~ msgstr "无法关闭大对象文件\n"
-#~ msgid "error while updating column \"%s\" of table \"%s\": %s"
-#~ msgstr "更新表 \"%2$s\" 的字段 \"%1$s\" 时出错: %3$s"
+#~ msgid "could not open large object TOC for output: %s\n"
+#~ msgstr "无法打开大对象 TOC 进行输出: %s\n"
-#~ msgid "creating table for large object cross-references\n"
-#~ msgstr "为大对象交叉引用创建表\n"
+#~ msgid "could not open large object TOC for input: %s\n"
+#~ msgstr "无法打开大对象 TOC 进行输入: %s\n"
-#~ msgid "could not create large object cross-reference table"
-#~ msgstr "无法创建大对象交叉引用表"
+#~ msgid "could not close data file after reading\n"
+#~ msgstr "读取之后无法关闭数据文件\n"
-#~ msgid "creating index for large object cross-references\n"
-#~ msgstr "为大对象交叉引用创建索引\n"
+#~ msgid ""
+#~ "WARNING:\n"
+#~ " This format is for demonstration purposes; it is not intended for\n"
+#~ " normal use. Files will be written in the current working directory.\n"
+#~ msgstr ""
+#~ "警告:\n"
+#~ " 这个格式仅用于演示; 并非用于一般用途.\n"
+#~ " 文件将写入当前工作目录.\n"
-#~ msgid "could not create index on large object cross-reference table"
-#~ msgstr "无法在大对象交叉引用表上创建索引"
+#~ msgid "file archiver"
+#~ msgstr "文件归档"
-#~ msgid "could not create large object cross-reference entry"
-#~ msgstr "无法创建大对象交叉引用记录"
+#~ msgid "cannot reopen non-seekable file\n"
+#~ msgstr "无法重新打开不可查找的文件\n"
-#~ msgid "could not start transaction for large object cross-references"
-#~ msgstr "无法为大对象交叉引用启动事务"
+#~ msgid "cannot reopen stdin\n"
+#~ msgstr "无法重新打开stdin\n"
-#~ msgid "could not commit transaction for large object cross-references"
-#~ msgstr "无法为大对象交叉引用提交事务"
+#~ msgid "SQL command failed\n"
+#~ msgstr "SQL 命令失败\n"
-#~ msgid "could not open data file for output\n"
-#~ msgstr "无法为输出打开数据文件\n"
+#~ msgid "found more than one entry for pg_indexes in pg_class\n"
+#~ msgstr "在 pg_class 表中找到多条 pg_indexes 的记录\n"
-#~ msgid "could not open data file for input\n"
-#~ msgstr "无法为输入打开数据文件\n"
+#~ msgid "could not find entry for pg_indexes in pg_class\n"
+#~ msgstr "在 pg_class 中无法为 pg_indexes 找到记录\n"
-#~ msgid "could not open large object file\n"
-#~ msgstr "无法打开大对象文件\n"
+#~ msgid "found more than one pg_database entry for this database\n"
+#~ msgstr "找到此数据库的多于一条的 pg_database 记录\n"
-#~ msgid "requested %d bytes, got %d from lookahead and %d from file\n"
-#~ msgstr "要求 %d 字节, 从预览中获取 %d, 从文件中获取 %d\n"
+#~ msgid "missing pg_database entry for this database\n"
+#~ msgstr "缺少此数据库的 pg_database 记录\n"
-#~ msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
-#~ msgstr "无法写入 tar 成员 (写了 %lu, 企图写 %lu)\n"
+#~ msgid "query returned no rows: %s\n"
+#~ msgstr "查询放弃, 没有记录: %s\n"
-#~ msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
-#~ msgstr "向 tar 归档附加时写错误 (写了 %lu, 试图写 %lu)\n"
+#~ msgid "dumpDatabase(): could not find pg_largeobject.relfrozenxid\n"
+#~ msgstr "dumpDatabase(): 无法找到pg_largeobject.relfrozenxid\n"
-#~ msgid "could not close tar member: %s\n"
-#~ msgstr "无法关闭 tar 成员: %s\n"
+#~ msgid ""
+#~ "query returned more than one (%d) pg_database entry for database \"%s\"\n"
+#~ msgstr "查询为数据库 \"%2$s\" 返回了超过一条 (%1$d) pg_database 记录\n"
-#~ msgid "could not write tar header\n"
-#~ msgstr "无法写 tar 头\n"
+#~ msgid "missing pg_database entry for database \"%s\"\n"
+#~ msgstr "缺少用于 \"%s\" 的 pg_database 记录\n"
-#~ msgid ""
-#~ " -i, --ignore-version proceed even when server version mismatches\n"
-#~ msgstr " -i, --ignore-version 当服务器版本不匹配时继续运行\n"
+#~ msgid "*** aborted because of error\n"
+#~ msgstr "*** 因为错误退出\n"
#~ msgid ""
-#~ " -i, --ignore-version proceed even when server version mismatches\n"
-#~ " pg_dumpall version\n"
-#~ msgstr ""
-#~ " -i, --ignore-version 当服务器版本与 pg_dumpall 不匹配时\n"
-#~ " 继续运行\n"
+#~ " --version output version information, then exit\n"
+#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid ""
-#~ " -O, --no-owner do not output commands to set object "
-#~ "ownership\n"
-#~ msgstr ""
-#~ " -O, --no-owner 设置对象的所属者时不输出\n"
-#~ " 命令\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "-C and -c are incompatible options\n"
-#~ msgstr "-C 和 -c 是互不兼容的选项\n"
+#~ msgid "%s: invalid -X option -- %s\n"
+#~ msgstr "%s: 无效的 -X 选项 -- %s\n"
+
+#~ msgid "%s: could not parse version \"%s\"\n"
+#~ msgstr "%s: 无法解析版本 \"%s\"\n"
+
+#~ msgid "could not parse version string \"%s\"\n"
+#~ msgstr "无法分析版本字串 \"%s\"\n"
diff --git a/src/bin/pg_resetxlog/po/cs.po b/src/bin/pg_resetxlog/po/cs.po
index e41e918769..a5d65d5d44 100644
--- a/src/bin/pg_resetxlog/po/cs.po
+++ b/src/bin/pg_resetxlog/po/cs.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.2\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:47+0000\n"
-"PO-Revision-Date: 2013-03-17 22:41+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:18+0000\n"
+"PO-Revision-Date: 2013-10-07 14:23-0400\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
#: pg_resetxlog.c:133
#, c-format
msgid "%s: invalid argument for option -e\n"
-msgstr "%s: neplatný argument pro volbu -x\n"
+msgstr "%s: neplatný argument pro volbu -e\n"
#: pg_resetxlog.c:134 pg_resetxlog.c:149 pg_resetxlog.c:164 pg_resetxlog.c:179
-#: pg_resetxlog.c:187 pg_resetxlog.c:212 pg_resetxlog.c:226 pg_resetxlog.c:233
-#: pg_resetxlog.c:241
+#: pg_resetxlog.c:187 pg_resetxlog.c:213 pg_resetxlog.c:227 pg_resetxlog.c:234
+#: pg_resetxlog.c:242
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Zkuste \"%s --help\" pro více informací.\n"
@@ -33,7 +33,7 @@ msgstr "Zkuste \"%s --help\" pro více informací.\n"
#: pg_resetxlog.c:139
#, c-format
msgid "%s: transaction ID epoch (-e) must not be -1\n"
-msgstr "%s: ID transakce (-x) nesmí být 0\n"
+msgstr "%s: epocha ID transakce (-e) nesmí být -1\n"
#: pg_resetxlog.c:148
#, c-format
@@ -58,60 +58,59 @@ msgstr "%s: OID (-o) nesmí být 0\n"
#: pg_resetxlog.c:178 pg_resetxlog.c:186
#, c-format
msgid "%s: invalid argument for option -m\n"
-msgstr "%s: neplatný argument pro volbu -x\n"
+msgstr "%s: neplatný argument pro volbu -m\n"
#: pg_resetxlog.c:192
#, c-format
msgid "%s: multitransaction ID (-m) must not be 0\n"
-msgstr "%s: ID transakce (-x) nesmí být 0\n"
+msgstr "%s: ID transakce (-m) nesmí být 0\n"
-#: pg_resetxlog.c:201
+#: pg_resetxlog.c:202
#, c-format
-#| msgid "%s: multitransaction ID (-m) must not be 0\n"
msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
msgstr "%s: ID nejstarší multitransakce (-m) nesmí být 0\n"
-#: pg_resetxlog.c:211
+#: pg_resetxlog.c:212
#, c-format
msgid "%s: invalid argument for option -O\n"
-msgstr "%s: neplatný argument pro volbu -x\n"
+msgstr "%s: neplatný argument pro volbu -O\n"
-#: pg_resetxlog.c:217
+#: pg_resetxlog.c:218
#, c-format
msgid "%s: multitransaction offset (-O) must not be -1\n"
-msgstr "%s: ID transakce (-x) nesmí být 0\n"
+msgstr "%s: ID transakce (-O) nesmí být -1\n"
-#: pg_resetxlog.c:225
+#: pg_resetxlog.c:226
#, c-format
msgid "%s: invalid argument for option -l\n"
msgstr "%s: neplatný argument pro volbu -l\n"
-#: pg_resetxlog.c:240
+#: pg_resetxlog.c:241
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: není specifikován datový adresář\n"
-#: pg_resetxlog.c:254
+#: pg_resetxlog.c:255
#, c-format
msgid "%s: cannot be executed by \"root\"\n"
msgstr "%s: nemůže být spuštěn uživatelem \"root\"\n"
-#: pg_resetxlog.c:256
+#: pg_resetxlog.c:257
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "Musíte spustit %s jako PostgreSQL superuživatel.\n"
-#: pg_resetxlog.c:266
+#: pg_resetxlog.c:267
#, c-format
msgid "%s: could not change directory to \"%s\": %s\n"
msgstr "%s: nelze změnit adresář na \"%s\": %s\n"
-#: pg_resetxlog.c:279 pg_resetxlog.c:413
+#: pg_resetxlog.c:280 pg_resetxlog.c:414
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: nelze otevřít soubor \"%s\" pro čtení: %s\n"
-#: pg_resetxlog.c:286
+#: pg_resetxlog.c:287
#, c-format
msgid ""
"%s: lock file \"%s\" exists\n"
@@ -120,7 +119,7 @@ msgstr ""
"%s: soubor se zámkem \"%s\" existuje\n"
"Neběží již server? Jestliže ne, smažte soubor se zámkem a zkuste to znova.\n"
-#: pg_resetxlog.c:361
+#: pg_resetxlog.c:362
#, c-format
msgid ""
"\n"
@@ -130,7 +129,7 @@ msgstr ""
"Jestliže tyto hodnoty vypadají akceptovatelně, použijte -f pro vynucený "
"reset.\n"
-#: pg_resetxlog.c:373
+#: pg_resetxlog.c:374
#, c-format
msgid ""
"The database server was not shut down cleanly.\n"
@@ -141,12 +140,12 @@ msgstr ""
"Resetování transakčního logu může způsobit ztrátu dat.\n"
"Jestliže i přesto chcete pokračovat, použijte -f pro vynucený reset.\n"
-#: pg_resetxlog.c:387
+#: pg_resetxlog.c:388
#, c-format
msgid "Transaction log reset\n"
msgstr "Transakční log resetován\n"
-#: pg_resetxlog.c:416
+#: pg_resetxlog.c:417
#, c-format
msgid ""
"If you are sure the data directory path is correct, execute\n"
@@ -157,25 +156,25 @@ msgstr ""
" touch %s\n"
"a zkuste to znovu.\n"
-#: pg_resetxlog.c:429
+#: pg_resetxlog.c:430
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: nelze číst soubor \"%s\": %s\n"
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:453
#, c-format
msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
msgstr ""
"%s: pg_control existuje, ale s neplatným kontrolním součtem CRC; postupujte "
"opatrně\n"
-#: pg_resetxlog.c:461
+#: pg_resetxlog.c:462
#, c-format
msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
msgstr ""
"%s: pg_control existuje, ale je poškozen nebo neznámé verze; ignoruji to\n"
-#: pg_resetxlog.c:560
+#: pg_resetxlog.c:561
#, c-format
msgid ""
"Guessed pg_control values:\n"
@@ -184,7 +183,7 @@ msgstr ""
"Odhadnuté hodnoty pg_controlu:\n"
"\n"
-#: pg_resetxlog.c:562
+#: pg_resetxlog.c:563
#, c-format
msgid ""
"pg_control values:\n"
@@ -193,164 +192,167 @@ msgstr ""
"Hodnoty pg_controlu:\n"
"\n"
-#: pg_resetxlog.c:573
+#: pg_resetxlog.c:574
#, c-format
-#| msgid "First log file segment after reset: %u\n"
msgid "First log segment after reset: %s\n"
msgstr "První log segment po resetu: %s\n"
-#: pg_resetxlog.c:575
+#: pg_resetxlog.c:576
#, c-format
msgid "pg_control version number: %u\n"
msgstr "číslo verze pg_controlu: %u\n"
-#: pg_resetxlog.c:577
+#: pg_resetxlog.c:578
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Číslo verze katalogu: %u\n"
-#: pg_resetxlog.c:579
+#: pg_resetxlog.c:580
#, c-format
msgid "Database system identifier: %s\n"
msgstr "Identifikátor databázového systému: %s\n"
-#: pg_resetxlog.c:581
+#: pg_resetxlog.c:582
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "TimeLineID posledního checkpointu: %u\n"
-#: pg_resetxlog.c:583
+#: pg_resetxlog.c:584
#, c-format
msgid "Latest checkpoint's full_page_writes: %s\n"
msgstr "Poslední full_page_writes checkpointu: %s\n"
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:585
msgid "off"
msgstr "vypnuto"
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:585
msgid "on"
msgstr "zapnuto"
-#: pg_resetxlog.c:585
+#: pg_resetxlog.c:586
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "Poslední umístění NextXID checkpointu: %u/%u\n"
-#: pg_resetxlog.c:588
+#: pg_resetxlog.c:589
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "Poslední umístění NextOID checkpointu: %u\n"
-#: pg_resetxlog.c:590
+#: pg_resetxlog.c:591
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "NextMultiXactId posledního checkpointu: %u\n"
-#: pg_resetxlog.c:592
+#: pg_resetxlog.c:593
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "NextMultiOffset posledního checkpointu: %u\n"
-#: pg_resetxlog.c:594
+#: pg_resetxlog.c:595
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
msgstr "oldestXID posledního checkpointu: %u\n"
-#: pg_resetxlog.c:596
+#: pg_resetxlog.c:597
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgstr "DB k oldestXID posledního checkpointu: %u\n"
-#: pg_resetxlog.c:598
+#: pg_resetxlog.c:599
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgstr "oldestActiveXID posledního checkpointu: %u\n"
-#: pg_resetxlog.c:600
+#: pg_resetxlog.c:601
#, c-format
-#| msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgid "Latest checkpoint's oldestMultiXid: %u\n"
msgstr "oldestMultiXid posledního checkpointu: %u\n"
-#: pg_resetxlog.c:602
+#: pg_resetxlog.c:603
#, c-format
-#| msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgid "Latest checkpoint's oldestMulti's DB: %u\n"
msgstr "oldestMulti's DB posledního checkpointu: %u\n"
-#: pg_resetxlog.c:604
+#: pg_resetxlog.c:605
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "Maximální zarovnání dat: %u\n"
-#: pg_resetxlog.c:607
+#: pg_resetxlog.c:608
#, c-format
msgid "Database block size: %u\n"
msgstr "Velikost databázového bloku: %u\n"
-#: pg_resetxlog.c:609
+#: pg_resetxlog.c:610
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "Bloků v segmentu velké relace: %u\n"
-#: pg_resetxlog.c:611
+#: pg_resetxlog.c:612
#, c-format
msgid "WAL block size: %u\n"
msgstr "Velikost WAL bloku: %u\n"
-#: pg_resetxlog.c:613
+#: pg_resetxlog.c:614
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "Bytů ve WAL segmentu: %u\n"
-#: pg_resetxlog.c:615
+#: pg_resetxlog.c:616
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "Maximální délka identifikátorů: %u\n"
-#: pg_resetxlog.c:617
+#: pg_resetxlog.c:618
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "Maximální počet sloupců v indexu: %u\n"
-#: pg_resetxlog.c:619
+#: pg_resetxlog.c:620
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "Maximální velikost úseku TOAST: %u\n"
-#: pg_resetxlog.c:621
+#: pg_resetxlog.c:622
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "Způsob uložení typu date/time: %s\n"
-#: pg_resetxlog.c:622
+#: pg_resetxlog.c:623
msgid "64-bit integers"
msgstr "64-bitová čísla"
-#: pg_resetxlog.c:622
+#: pg_resetxlog.c:623
msgid "floating-point numbers"
msgstr "čísla s plovoucí řádovou čárkou"
-#: pg_resetxlog.c:623
+#: pg_resetxlog.c:624
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "Způsob předávání float4 hodnot: %s\n"
-#: pg_resetxlog.c:624 pg_resetxlog.c:626
+#: pg_resetxlog.c:625 pg_resetxlog.c:627
msgid "by reference"
msgstr "odkazem"
-#: pg_resetxlog.c:624 pg_resetxlog.c:626
+#: pg_resetxlog.c:625 pg_resetxlog.c:627
msgid "by value"
msgstr "hodnotou"
-#: pg_resetxlog.c:625
+#: pg_resetxlog.c:626
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "Způsob předávání float8 hodnot: %s\n"
-#: pg_resetxlog.c:687
+#: pg_resetxlog.c:628
+#, c-format
+#| msgid "Catalog version number: %u\n"
+msgid "Data page checksum version: %u\n"
+msgstr "Verze kontrolních součtů datových stránek: %u\n"
+
+#: pg_resetxlog.c:690
#, c-format
msgid ""
"%s: internal error -- sizeof(ControlFileData) is too large ... fix "
@@ -359,47 +361,47 @@ msgstr ""
"%s: interní chyba -- sizeof(ControlFileData) je příliš velký ... opravte "
"PG_CONTROL_SIZE\n"
-#: pg_resetxlog.c:702
+#: pg_resetxlog.c:705
#, c-format
msgid "%s: could not create pg_control file: %s\n"
msgstr "%s: nelze vytvořit pg_control soubor: %s\n"
-#: pg_resetxlog.c:713
+#: pg_resetxlog.c:716
#, c-format
msgid "%s: could not write pg_control file: %s\n"
msgstr "%s: nelze zapsat pg_control soubor: %s\n"
-#: pg_resetxlog.c:720 pg_resetxlog.c:1019
+#: pg_resetxlog.c:723 pg_resetxlog.c:1022
#, c-format
msgid "%s: fsync error: %s\n"
msgstr "%s: fsync chyba: %s\n"
-#: pg_resetxlog.c:760 pg_resetxlog.c:831 pg_resetxlog.c:887
+#: pg_resetxlog.c:763 pg_resetxlog.c:834 pg_resetxlog.c:890
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: nelze otevřít adresář \"%s\": %s\n"
-#: pg_resetxlog.c:802 pg_resetxlog.c:864 pg_resetxlog.c:921
+#: pg_resetxlog.c:805 pg_resetxlog.c:867 pg_resetxlog.c:924
#, c-format
msgid "%s: could not read from directory \"%s\": %s\n"
msgstr "%s: nelze číst z adresáře \"%s\": %s\n"
-#: pg_resetxlog.c:845 pg_resetxlog.c:902
+#: pg_resetxlog.c:848 pg_resetxlog.c:905
#, c-format
msgid "%s: could not delete file \"%s\": %s\n"
msgstr "%s: nelze smazat soubor \"%s\": %s\n"
-#: pg_resetxlog.c:986
+#: pg_resetxlog.c:989
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: nelze otevřít soubor \"%s\": %s\n"
-#: pg_resetxlog.c:997 pg_resetxlog.c:1011
+#: pg_resetxlog.c:1000 pg_resetxlog.c:1014
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
-#: pg_resetxlog.c:1030
+#: pg_resetxlog.c:1033
#, c-format
msgid ""
"%s resets the PostgreSQL transaction log.\n"
@@ -408,7 +410,7 @@ msgstr ""
"%s resetuje PostgreSQL transakční log.\n"
"\n"
-#: pg_resetxlog.c:1031
+#: pg_resetxlog.c:1034
#, c-format
msgid ""
"Usage:\n"
@@ -419,41 +421,37 @@ msgstr ""
" %s [VOLBA]... ADRESÁŘ\n"
"\n"
-#: pg_resetxlog.c:1032
+#: pg_resetxlog.c:1035
#, c-format
msgid "Options:\n"
msgstr "Přepínače:\n"
-#: pg_resetxlog.c:1033
+#: pg_resetxlog.c:1036
#, c-format
msgid " -e XIDEPOCH set next transaction ID epoch\n"
msgstr " -e XIDEPOCH nastaví epochu následujícího ID transakce\n"
-#: pg_resetxlog.c:1034
+#: pg_resetxlog.c:1037
#, c-format
msgid " -f force update to be done\n"
msgstr " -f vynutí provedení update\n"
-#: pg_resetxlog.c:1035
+#: pg_resetxlog.c:1038
#, c-format
-#| msgid ""
-#| " -l TLI,FILE,SEG force minimum WAL starting location for new "
-#| "transaction log\n"
msgid ""
" -l XLOGFILE force minimum WAL starting location for new transaction "
"log\n"
msgstr ""
-" -l XLOGFILE vynutí minimální počáteční WAL pozici pro nový "
-"transakční log\n"
+" -l XLOGFILE vynutí minimální počáteční WAL pozici pro nový transakční "
+"log\n"
-#: pg_resetxlog.c:1036
+#: pg_resetxlog.c:1039
#, c-format
-#| msgid " -m XID set next multitransaction ID\n"
-msgid " -m XID,OLDEST set next multitransaction ID and oldest value\n"
-msgstr ""
-" -m XID,OLDEST nastaví ID následující multitransakce a nejstarší hodnotu\n"
+#| msgid " -x XID set next transaction ID\n"
+msgid " -m MXID,MXID set next and oldest multitransaction ID\n"
+msgstr " -m MXID,MXID nastav další a nejstarší ID multitransakce\n"
-#: pg_resetxlog.c:1037
+#: pg_resetxlog.c:1040
#, c-format
msgid ""
" -n no update, just show extracted control values (for "
@@ -462,32 +460,32 @@ msgstr ""
" -n bez změny, jen ukáže získané kontrolní hodnoty (pro "
"testování)\n"
-#: pg_resetxlog.c:1038
+#: pg_resetxlog.c:1041
#, c-format
msgid " -o OID set next OID\n"
msgstr " -o OID nastaví následující OID\n"
-#: pg_resetxlog.c:1039
+#: pg_resetxlog.c:1042
#, c-format
msgid " -O OFFSET set next multitransaction offset\n"
msgstr " -O OFFSET nastaví offset následující multitransakce\n"
-#: pg_resetxlog.c:1040
+#: pg_resetxlog.c:1043
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version ukáže informace o verzi a skončí\n"
-#: pg_resetxlog.c:1041
+#: pg_resetxlog.c:1044
#, c-format
msgid " -x XID set next transaction ID\n"
msgstr " -x XID nastaví ID následující transakce\n"
-#: pg_resetxlog.c:1042
+#: pg_resetxlog.c:1045
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help ukáže tuto nápovědu a skončí\n"
-#: pg_resetxlog.c:1043
+#: pg_resetxlog.c:1046
#, c-format
msgid ""
"\n"
diff --git a/src/bin/pg_resetxlog/po/zh_CN.po b/src/bin/pg_resetxlog/po/zh_CN.po
index 5591f063c1..9b236e7b82 100644
--- a/src/bin/pg_resetxlog/po/zh_CN.po
+++ b/src/bin/pg_resetxlog/po/zh_CN.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_resetxlog (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:46+0000\n"
-"PO-Revision-Date: 2012-10-19 17:10+0800\n"
+"POT-Creation-Date: 2013-09-02 00:26+0000\n"
+"PO-Revision-Date: 2013-09-02 16:18+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -15,95 +15,101 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
-#: pg_resetxlog.c:134
+#: pg_resetxlog.c:133
#, c-format
msgid "%s: invalid argument for option -e\n"
msgstr "%s: 对于选项-e 参数无效\n"
-#: pg_resetxlog.c:135 pg_resetxlog.c:150 pg_resetxlog.c:165 pg_resetxlog.c:180
-#: pg_resetxlog.c:195 pg_resetxlog.c:210 pg_resetxlog.c:217 pg_resetxlog.c:224
-#: pg_resetxlog.c:230 pg_resetxlog.c:238
+#: pg_resetxlog.c:134 pg_resetxlog.c:149 pg_resetxlog.c:164 pg_resetxlog.c:179
+#: pg_resetxlog.c:187 pg_resetxlog.c:213 pg_resetxlog.c:227 pg_resetxlog.c:234
+#: pg_resetxlog.c:242
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "输入 \"%s --help\" 获取更多的信息.\n"
-#: pg_resetxlog.c:140
+#: pg_resetxlog.c:139
#, c-format
msgid "%s: transaction ID epoch (-e) must not be -1\n"
msgstr "%s: 事务ID epoch(-e) 不能为 -1\n"
-#: pg_resetxlog.c:149
+#: pg_resetxlog.c:148
#, c-format
msgid "%s: invalid argument for option -x\n"
msgstr "%s: 为 -x 选项的无效参数\n"
-#: pg_resetxlog.c:155
+#: pg_resetxlog.c:154
#, c-format
msgid "%s: transaction ID (-x) must not be 0\n"
msgstr "%s: 事务 ID (-x) 不能为 0\n"
-#: pg_resetxlog.c:164
+#: pg_resetxlog.c:163
#, c-format
msgid "%s: invalid argument for option -o\n"
msgstr "%s: 为 -o 选项的无效参数\n"
-#: pg_resetxlog.c:170
+#: pg_resetxlog.c:169
#, c-format
msgid "%s: OID (-o) must not be 0\n"
msgstr "%s: OID (-o) 不能为 0\n"
-#: pg_resetxlog.c:179
+#: pg_resetxlog.c:178 pg_resetxlog.c:186
#, c-format
msgid "%s: invalid argument for option -m\n"
msgstr "%s: 对于选项-m 参数无效\n"
-#: pg_resetxlog.c:185
+#: pg_resetxlog.c:192
#, c-format
msgid "%s: multitransaction ID (-m) must not be 0\n"
msgstr "%s: 多事务 ID (-m) 不能为 0\n"
-#: pg_resetxlog.c:194
+#: pg_resetxlog.c:202
+#, c-format
+#| msgid "%s: multitransaction ID (-m) must not be 0\n"
+msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
+msgstr "%s: 最老的多事务 ID (-m) 不能为 0\n"
+
+#: pg_resetxlog.c:212
#, c-format
msgid "%s: invalid argument for option -O\n"
msgstr "%s: 对于选项-O 参数无效\n"
-#: pg_resetxlog.c:200
+#: pg_resetxlog.c:218
#, c-format
msgid "%s: multitransaction offset (-O) must not be -1\n"
msgstr "%s: 多事务 偏移 (-O) 不能为-1\n"
-#: pg_resetxlog.c:209 pg_resetxlog.c:216 pg_resetxlog.c:223
+#: pg_resetxlog.c:226
#, c-format
msgid "%s: invalid argument for option -l\n"
msgstr "%s: 为 -l 选项的无效参数\n"
-#: pg_resetxlog.c:237
+#: pg_resetxlog.c:241
#, c-format
msgid "%s: no data directory specified\n"
msgstr "%s: 没有指定数据目录\n"
-#: pg_resetxlog.c:251
+#: pg_resetxlog.c:255
#, c-format
msgid "%s: cannot be executed by \"root\"\n"
msgstr "%s:不能由\"root\"执行\n"
-#: pg_resetxlog.c:253
+#: pg_resetxlog.c:257
#, c-format
msgid "You must run %s as the PostgreSQL superuser.\n"
msgstr "您现在作为PostgreSQL超级用户运行%s.\n"
# command.c:256
-#: pg_resetxlog.c:263
+#: pg_resetxlog.c:267
#, c-format
msgid "%s: could not change directory to \"%s\": %s\n"
msgstr "%s: 无法切换目录至 \"%s\": %s\n"
-#: pg_resetxlog.c:276 pg_resetxlog.c:405
+#: pg_resetxlog.c:280 pg_resetxlog.c:414
#, c-format
msgid "%s: could not open file \"%s\" for reading: %s\n"
msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
-#: pg_resetxlog.c:283
+#: pg_resetxlog.c:287
#, c-format
msgid ""
"%s: lock file \"%s\" exists\n"
@@ -112,7 +118,7 @@ msgstr ""
"%s: 锁文件 \"%s\" 已经存在\n"
"是否有一个服务正在运行? 如果没有, 删除那个锁文件然后再试一次.\n"
-#: pg_resetxlog.c:353
+#: pg_resetxlog.c:362
#, c-format
msgid ""
"\n"
@@ -121,7 +127,7 @@ msgstr ""
"\n"
"如果这些值可接受, 用 -f 强制重置.\n"
-#: pg_resetxlog.c:365
+#: pg_resetxlog.c:374
#, c-format
msgid ""
"The database server was not shut down cleanly.\n"
@@ -132,12 +138,12 @@ msgstr ""
"重置事务日志有可能会引起丢失数据.\n"
"如果你仍想继续, 用 -f 强制重置.\n"
-#: pg_resetxlog.c:379
+#: pg_resetxlog.c:388
#, c-format
msgid "Transaction log reset\n"
msgstr "事务日志重置\n"
-#: pg_resetxlog.c:408
+#: pg_resetxlog.c:417
#, c-format
msgid ""
"If you are sure the data directory path is correct, execute\n"
@@ -148,22 +154,22 @@ msgstr ""
" touch %s\n"
"然后再试一次.\n"
-#: pg_resetxlog.c:421
+#: pg_resetxlog.c:430
#, c-format
msgid "%s: could not read file \"%s\": %s\n"
msgstr "%s: 无法读取文件 \"%s\": %s\n"
-#: pg_resetxlog.c:444
+#: pg_resetxlog.c:453
#, c-format
msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
msgstr "%s: pg_control 已经存在, 但有无效的CRC; 带有警告的继续运行\n"
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:462
#, c-format
msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
msgstr "%s: pg_control 已经存在, 但已破坏或无效版本; 忽略它\n"
-#: pg_resetxlog.c:548
+#: pg_resetxlog.c:561
#, c-format
msgid ""
"Guessed pg_control values:\n"
@@ -172,7 +178,7 @@ msgstr ""
"猜测的 pg_control 值:\n"
"\n"
-#: pg_resetxlog.c:550
+#: pg_resetxlog.c:563
#, c-format
msgid ""
"pg_control values:\n"
@@ -181,205 +187,219 @@ msgstr ""
"pg_control 值:\n"
"\n"
-#: pg_resetxlog.c:559
+#: pg_resetxlog.c:574
#, c-format
-msgid "First log file ID after reset: %u\n"
-msgstr "重置后的第一个日志文件ID: %u\n"
+#| msgid "First log file segment after reset: %u\n"
+msgid "First log segment after reset: %s\n"
+msgstr "重置后的第一个日志段: %s\n"
-#: pg_resetxlog.c:561
-#, c-format
-msgid "First log file segment after reset: %u\n"
-msgstr "重置后的第一个日志文件段: %u\n"
-
-#: pg_resetxlog.c:563
+#: pg_resetxlog.c:576
#, c-format
msgid "pg_control version number: %u\n"
msgstr "pg_control 版本: %u\n"
-#: pg_resetxlog.c:565
+#: pg_resetxlog.c:578
#, c-format
msgid "Catalog version number: %u\n"
msgstr "Catalog 版本: %u\n"
-#: pg_resetxlog.c:567
+#: pg_resetxlog.c:580
#, c-format
msgid "Database system identifier: %s\n"
msgstr "数据库系统标识符: %s\n"
-#: pg_resetxlog.c:569
+#: pg_resetxlog.c:582
#, c-format
msgid "Latest checkpoint's TimeLineID: %u\n"
msgstr "最新检查点的 TimeLineID: %u\n"
-#: pg_resetxlog.c:571
+#: pg_resetxlog.c:584
#, c-format
msgid "Latest checkpoint's full_page_writes: %s\n"
msgstr "最新检查点的full_page_writes: %s\n"
# help.c:48
-#: pg_resetxlog.c:572
+#: pg_resetxlog.c:585
msgid "off"
msgstr "关闭"
# help.c:48
-#: pg_resetxlog.c:572
+#: pg_resetxlog.c:585
msgid "on"
msgstr "开启"
-#: pg_resetxlog.c:573
+#: pg_resetxlog.c:586
#, c-format
msgid "Latest checkpoint's NextXID: %u/%u\n"
msgstr "最新检查点的 NextXID: %u/%u\n"
-#: pg_resetxlog.c:576
+#: pg_resetxlog.c:589
#, c-format
msgid "Latest checkpoint's NextOID: %u\n"
msgstr "最新检查点的 NextOID: %u\n"
-#: pg_resetxlog.c:578
+#: pg_resetxlog.c:591
#, c-format
msgid "Latest checkpoint's NextMultiXactId: %u\n"
msgstr "最新检查点的 NextMultiXactId: %u\n"
-#: pg_resetxlog.c:580
+#: pg_resetxlog.c:593
#, c-format
msgid "Latest checkpoint's NextMultiOffset: %u\n"
msgstr "最新检查点的 NextMultiOffset: %u\n"
-#: pg_resetxlog.c:582
+#: pg_resetxlog.c:595
#, c-format
msgid "Latest checkpoint's oldestXID: %u\n"
msgstr "最新检查点的oldestXID: %u\n"
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:597
#, c-format
msgid "Latest checkpoint's oldestXID's DB: %u\n"
msgstr "最新检查点的oldestXID所在的数据库: %u\n"
-#: pg_resetxlog.c:586
+#: pg_resetxlog.c:599
#, c-format
msgid "Latest checkpoint's oldestActiveXID: %u\n"
msgstr "最新检查点的oldestActiveXID: %u\n"
-#: pg_resetxlog.c:588
+#: pg_resetxlog.c:601
+#, c-format
+#| msgid "Latest checkpoint's oldestActiveXID: %u\n"
+msgid "Latest checkpoint's oldestMultiXid: %u\n"
+msgstr "最新检查点的oldestMultiXid: %u\n"
+
+#: pg_resetxlog.c:603
+#, c-format
+#| msgid "Latest checkpoint's oldestXID's DB: %u\n"
+msgid "Latest checkpoint's oldestMulti's DB: %u\n"
+msgstr "最新检查点的oldestMulti所在的数据库: %u\n"
+
+#: pg_resetxlog.c:605
#, c-format
msgid "Maximum data alignment: %u\n"
msgstr "最大的数据校准: %u\n"
-#: pg_resetxlog.c:591
+#: pg_resetxlog.c:608
#, c-format
msgid "Database block size: %u\n"
msgstr "数据库块大小: %u\n"
-#: pg_resetxlog.c:593
+#: pg_resetxlog.c:610
#, c-format
msgid "Blocks per segment of large relation: %u\n"
msgstr "大关系的每段块数: %u\n"
-#: pg_resetxlog.c:595
+#: pg_resetxlog.c:612
#, c-format
msgid "WAL block size: %u\n"
msgstr "WAL块大小: %u\n"
-#: pg_resetxlog.c:597
+#: pg_resetxlog.c:614
#, c-format
msgid "Bytes per WAL segment: %u\n"
msgstr "每一个 WAL 段字节数: %u\n"
-#: pg_resetxlog.c:599
+#: pg_resetxlog.c:616
#, c-format
msgid "Maximum length of identifiers: %u\n"
msgstr "标示符的最大长度: %u\n"
-#: pg_resetxlog.c:601
+#: pg_resetxlog.c:618
#, c-format
msgid "Maximum columns in an index: %u\n"
msgstr "在索引中最多可用的列数: %u\n"
-#: pg_resetxlog.c:603
+#: pg_resetxlog.c:620
#, c-format
msgid "Maximum size of a TOAST chunk: %u\n"
msgstr "一个TOAST区块的最大空间: %u\n"
-#: pg_resetxlog.c:605
+#: pg_resetxlog.c:622
#, c-format
msgid "Date/time type storage: %s\n"
msgstr "日期/时间类型存储: %s\n"
-#: pg_resetxlog.c:606
+#: pg_resetxlog.c:623
msgid "64-bit integers"
msgstr "64位整型"
-#: pg_resetxlog.c:606
+#: pg_resetxlog.c:623
msgid "floating-point numbers"
msgstr "浮点数"
-#: pg_resetxlog.c:607
+#: pg_resetxlog.c:624
#, c-format
msgid "Float4 argument passing: %s\n"
msgstr "正在传递Float4类型的参数: %s\n"
-#: pg_resetxlog.c:608 pg_resetxlog.c:610
+#: pg_resetxlog.c:625 pg_resetxlog.c:627
msgid "by reference"
msgstr "由引用"
-#: pg_resetxlog.c:608 pg_resetxlog.c:610
+#: pg_resetxlog.c:625 pg_resetxlog.c:627
msgid "by value"
msgstr "由值"
-#: pg_resetxlog.c:609
+#: pg_resetxlog.c:626
#, c-format
msgid "Float8 argument passing: %s\n"
msgstr "正在传递Float8类型的参数: %s\n"
-#: pg_resetxlog.c:675
+#: pg_resetxlog.c:628
+#, c-format
+#| msgid "Catalog version number: %u\n"
+msgid "Data page checksum version: %u\n"
+msgstr "数据页检验和版本: %u\n"
+
+#: pg_resetxlog.c:690
#, c-format
msgid ""
"%s: internal error -- sizeof(ControlFileData) is too large ... fix "
"PG_CONTROL_SIZE\n"
msgstr "%s: 内部错误 -- sizeof(ControlFileData) 太大 ... 修复 xlog.c\n"
-#: pg_resetxlog.c:690
+#: pg_resetxlog.c:705
#, c-format
msgid "%s: could not create pg_control file: %s\n"
msgstr "%s: 无法创建 pg_control 文件: %s\n"
-#: pg_resetxlog.c:701
+#: pg_resetxlog.c:716
#, c-format
msgid "%s: could not write pg_control file: %s\n"
msgstr "%s: 无法写 pg_control 文件: %s\n"
-#: pg_resetxlog.c:708 pg_resetxlog.c:1015
+#: pg_resetxlog.c:723 pg_resetxlog.c:1022
#, c-format
msgid "%s: fsync error: %s\n"
msgstr "%s: fsync 错误: %s\n"
-#: pg_resetxlog.c:746 pg_resetxlog.c:821 pg_resetxlog.c:877
+#: pg_resetxlog.c:763 pg_resetxlog.c:834 pg_resetxlog.c:890
#, c-format
msgid "%s: could not open directory \"%s\": %s\n"
msgstr "%s: 无法打开目录 \"%s\": %s\n"
-#: pg_resetxlog.c:790 pg_resetxlog.c:854 pg_resetxlog.c:911
+#: pg_resetxlog.c:805 pg_resetxlog.c:867 pg_resetxlog.c:924
#, c-format
msgid "%s: could not read from directory \"%s\": %s\n"
msgstr "%s: 无法从目录 \"%s\" 中读取: %s\n"
-#: pg_resetxlog.c:835 pg_resetxlog.c:892
+#: pg_resetxlog.c:848 pg_resetxlog.c:905
#, c-format
msgid "%s: could not delete file \"%s\": %s\n"
msgstr "%s: 无法删除文件 \"%s\": %s\n"
-#: pg_resetxlog.c:982
+#: pg_resetxlog.c:989
#, c-format
msgid "%s: could not open file \"%s\": %s\n"
msgstr "%s: 无法打开文件 \"%s\": %s\n"
-#: pg_resetxlog.c:993 pg_resetxlog.c:1007
+#: pg_resetxlog.c:1000 pg_resetxlog.c:1014
#, c-format
msgid "%s: could not write file \"%s\": %s\n"
msgstr "%s: 无法写文件 \"%s\": %s\n"
-#: pg_resetxlog.c:1026
+#: pg_resetxlog.c:1033
#, c-format
msgid ""
"%s resets the PostgreSQL transaction log.\n"
@@ -388,7 +408,7 @@ msgstr ""
"%s 重置 PostgreSQL 事务日志.\n"
"\n"
-#: pg_resetxlog.c:1027
+#: pg_resetxlog.c:1034
#, c-format
msgid ""
"Usage:\n"
@@ -399,66 +419,70 @@ msgstr ""
" %s [选项]... 数据目录\n"
"\n"
-#: pg_resetxlog.c:1028
+#: pg_resetxlog.c:1035
#, c-format
msgid "Options:\n"
msgstr "选项:\n"
-#: pg_resetxlog.c:1029
+#: pg_resetxlog.c:1036
#, c-format
msgid " -e XIDEPOCH set next transaction ID epoch\n"
msgstr " -e XIDEPOCH 设置下一个事务ID时间单元(epoch)\n"
-#: pg_resetxlog.c:1030
+#: pg_resetxlog.c:1037
#, c-format
msgid " -f force update to be done\n"
msgstr " -f 强制更新\n"
-#: pg_resetxlog.c:1031
+#: pg_resetxlog.c:1038
#, c-format
+#| msgid ""
+#| " -l TLI,FILE,SEG force minimum WAL starting location for new "
+#| "transaction log\n"
msgid ""
-" -l TLI,FILE,SEG force minimum WAL starting location for new transaction "
+" -l XLOGFILE force minimum WAL starting location for new transaction "
"log\n"
-msgstr " -l TLI,FILE,SEG 在新的事务日志中强制最小 WAL 起始位置\n"
+msgstr " -l XLOGFILE 为新的事务日志强制使用最小WAL日志起始位置\n"
-#: pg_resetxlog.c:1032
+#: pg_resetxlog.c:1039
#, c-format
-msgid " -m XID set next multitransaction ID\n"
-msgstr " -m XID 设置下一个多事务(multitransaction)ID\n"
+#| msgid " -m XID set next multitransaction ID\n"
+msgid " -m MXID,MXID set next and oldest multitransaction ID\n"
+msgstr " -m MXID,MXID  设置下一个事务和最老的事务ID\n"
-#: pg_resetxlog.c:1033
+#: pg_resetxlog.c:1040
#, c-format
msgid ""
" -n no update, just show extracted control values (for "
"testing)\n"
msgstr " -n 未更新, 只显示抽取的控制值 (测试用途)\n"
-#: pg_resetxlog.c:1034
+#: pg_resetxlog.c:1041
#, c-format
msgid " -o OID set next OID\n"
msgstr " -o OID 设置下一个 OID\n"
-#: pg_resetxlog.c:1035
+#: pg_resetxlog.c:1042
#, c-format
msgid " -O OFFSET set next multitransaction offset\n"
msgstr " -O OFFSET 设置下一个多事务(multitransaction)偏移\n"
-#: pg_resetxlog.c:1036
+#: pg_resetxlog.c:1043
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息,然后退出\n"
-#: pg_resetxlog.c:1037
+#: pg_resetxlog.c:1044
#, c-format
msgid " -x XID set next transaction ID\n"
msgstr " -x XID 设置下一个事务 ID\n"
-#: pg_resetxlog.c:1038
+#: pg_resetxlog.c:1045
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示帮助信息,然后退出\n"
-#: pg_resetxlog.c:1039
+#: pg_resetxlog.c:1046
#, c-format
msgid ""
"\n"
@@ -467,32 +491,35 @@ msgstr ""
"\n"
"报告错误至 <pgsql-bugs@postgresql.org>.\n"
-#~ msgid "%s: invalid argument for -o option\n"
-#~ msgstr "%s: 为 -o 选项的无效参数\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid "%s: invalid argument for -x option\n"
-#~ msgstr "%s: 为 -x 选项的无效参数\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 输出版本信息, 然后退出\n"
-#~ msgid "Latest checkpoint's StartUpID: %u\n"
-#~ msgstr "最新检查点的 StartUpID: %u\n"
+#~ msgid "%s: invalid LC_COLLATE setting\n"
+#~ msgstr "%s: 无效的 LC_COLLATE 设置\n"
-#~ msgid "LC_CTYPE: %s\n"
-#~ msgstr "LC_CTYPE: %s\n"
+#~ msgid "%s: invalid LC_CTYPE setting\n"
+#~ msgstr "%s: 无效的 LC_CTYPE 设置\n"
+
+#~ msgid "Maximum number of function arguments: %u\n"
+#~ msgstr "函数参数的最大个数: %u\n"
#~ msgid "LC_COLLATE: %s\n"
#~ msgstr "LC_COLLATE: %s\n"
-#~ msgid "Maximum number of function arguments: %u\n"
-#~ msgstr "函数参数的最大个数: %u\n"
+#~ msgid "LC_CTYPE: %s\n"
+#~ msgstr "LC_CTYPE: %s\n"
-#~ msgid "%s: invalid LC_CTYPE setting\n"
-#~ msgstr "%s: 无效的 LC_CTYPE 设置\n"
+#~ msgid "Latest checkpoint's StartUpID: %u\n"
+#~ msgstr "最新检查点的 StartUpID: %u\n"
-#~ msgid "%s: invalid LC_COLLATE setting\n"
-#~ msgstr "%s: 无效的 LC_COLLATE 设置\n"
+#~ msgid "%s: invalid argument for -x option\n"
+#~ msgstr "%s: 为 -x 选项的无效参数\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 输出版本信息, 然后退出\n"
+#~ msgid "%s: invalid argument for -o option\n"
+#~ msgstr "%s: 为 -o 选项的无效参数\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "First log file ID after reset: %u\n"
+#~ msgstr "重置后的第一个日志文件ID: %u\n"
diff --git a/src/bin/psql/po/cs.po b/src/bin/psql/po/cs.po
index 5d9f9044b4..31b6807b60 100644
--- a/src/bin/psql/po/cs.po
+++ b/src/bin/psql/po/cs.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: postgresql 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:46+0000\n"
-"PO-Revision-Date: 2013-03-17 22:42+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:17+0000\n"
+"PO-Revision-Date: 2013-09-24 21:01+0200\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -20,15 +20,14 @@ msgstr ""
"X-Generator: Lokalize 1.5\n"
#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
-#: ../../common/fe_memutils.c:83 command.c:1128 input.c:204 mainloop.c:72
-#: mainloop.c:234 tab-complete.c:3821
+#: ../../common/fe_memutils.c:83 command.c:1130 input.c:204 mainloop.c:72
+#: mainloop.c:234 tab-complete.c:3827
#, c-format
msgid "out of memory\n"
msgstr "nedostatek paměti\n"
#: ../../common/fe_memutils.c:77
#, c-format
-#| msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "nelze duplikovat null pointer (interní chyba)\n"
@@ -54,7 +53,6 @@ msgstr "nelze najít spustitelný soubor \"%s\""
#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-#| msgid "could not change directory to \"%s\""
msgid "could not change directory to \"%s\": %s"
msgstr "nelze změnit adresář na \"%s\" : %s"
@@ -103,37 +101,37 @@ msgstr "potomek byl ukončen signálem %d"
msgid "child process exited with unrecognized status %d"
msgstr "potomek skončil s nerozponaným stavem %d"
-#: command.c:113
+#: command.c:115
#, c-format
msgid "Invalid command \\%s. Try \\? for help.\n"
msgstr "Neplatný příkaz \\%s. Použijte \\? pro nápovědu.\n"
-#: command.c:115
+#: command.c:117
#, c-format
msgid "invalid command \\%s\n"
msgstr "neplatný příkaz \\%s\n"
-#: command.c:126
+#: command.c:128
#, c-format
msgid "\\%s: extra argument \"%s\" ignored\n"
msgstr "\\%s: nadbytečný argument \"%s\" ignorován\n"
-#: command.c:268
+#: command.c:270
#, c-format
msgid "could not get home directory: %s\n"
msgstr "nelze získat domácí adresář: %s\n"
-#: command.c:284
+#: command.c:286
#, c-format
msgid "\\%s: could not change directory to \"%s\": %s\n"
msgstr "\\%s: nelze změnit adresář na \"%s\": %s\n"
-#: command.c:305 common.c:446 common.c:851
+#: command.c:307 common.c:446 common.c:851
#, c-format
msgid "You are currently not connected to a database.\n"
msgstr "Aktuálně nejste připojeni k databázi.\n"
-#: command.c:312
+#: command.c:314
#, c-format
msgid ""
"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
@@ -142,7 +140,7 @@ msgstr ""
"Jste připojeni k databázi \"%s\" jako uživatel \"%s\" přes socket v \"%s\" "
"naportu \"%s\".\n"
-#: command.c:315
+#: command.c:317
#, c-format
msgid ""
"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
@@ -151,118 +149,118 @@ msgstr ""
"Nyní jste připojeni k databázi \"%s\" jako uživatel \"%s\" na serveru \"%s\" "
"na portu\"%s\".\n"
-#: command.c:514 command.c:584 command.c:1380
+#: command.c:516 command.c:586 command.c:1382
#, c-format
msgid "no query buffer\n"
msgstr "v historii není žádný dotaz\n"
-#: command.c:547 command.c:2680
+#: command.c:549 command.c:2826
#, c-format
msgid "invalid line number: %s\n"
msgstr "neplatné číslo řádky: %s\n"
-#: command.c:578
+#: command.c:580
#, c-format
msgid "The server (version %d.%d) does not support editing function source.\n"
msgstr "Server (verze %d.%d) nepodporuje editaci zdrojového kódu funkce.\n"
-#: command.c:658
+#: command.c:660
msgid "No changes"
msgstr "Žádné změny"
-#: command.c:712
+#: command.c:714
#, c-format
msgid "%s: invalid encoding name or conversion procedure not found\n"
msgstr "%s: neplatné jméno kódování nebo nenalezena konverzní funkce\n"
-#: command.c:808 command.c:858 command.c:872 command.c:889 command.c:996
-#: command.c:1046 command.c:1156 command.c:1360 command.c:1391
+#: command.c:810 command.c:860 command.c:874 command.c:891 command.c:998
+#: command.c:1048 command.c:1158 command.c:1362 command.c:1393
#, c-format
msgid "\\%s: missing required argument\n"
msgstr "\\%s: chybí požadovaný argument\n"
-#: command.c:921
+#: command.c:923
msgid "Query buffer is empty."
msgstr "Buffer dotazů je prázdný."
-#: command.c:931
+#: command.c:933
msgid "Enter new password: "
msgstr "Zadejte nové heslo: "
-#: command.c:932
+#: command.c:934
msgid "Enter it again: "
msgstr "Zadejte znova: "
-#: command.c:936
+#: command.c:938
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Hesla se neshodují.\n"
-#: command.c:954
+#: command.c:956
#, c-format
msgid "Password encryption failed.\n"
msgstr "Zašifrování hesla selhalo.\n"
-#: command.c:1025 command.c:1137 command.c:1365
+#: command.c:1027 command.c:1139 command.c:1367
#, c-format
msgid "\\%s: error while setting variable\n"
msgstr "\\%s: chyba při nastavování proměnné\n"
-#: command.c:1066
+#: command.c:1068
msgid "Query buffer reset (cleared)."
msgstr "Buffer dotazů vyprázdněn."
-#: command.c:1090
+#: command.c:1092
#, c-format
msgid "Wrote history to file \"%s/%s\".\n"
msgstr "Historie zapsána do souboru: \"%s/%s\".\n"
-#: command.c:1161
+#: command.c:1163
#, c-format
msgid "\\%s: environment variable name must not contain \"=\"\n"
msgstr "\\%s: název proměnné prostředí nesmí obsahovat '='\n"
-#: command.c:1204
+#: command.c:1206
#, c-format
msgid "The server (version %d.%d) does not support showing function source.\n"
msgstr "Server (verze %d.%d) nepodporuje zobrazování zdrojového kódu funkce.\n"
-#: command.c:1210
+#: command.c:1212
#, c-format
msgid "function name is required\n"
msgstr "je vyžadováno jméno funkce\n"
-#: command.c:1345
+#: command.c:1347
msgid "Timing is on."
msgstr "Sledování času je zapnuto."
-#: command.c:1347
+#: command.c:1349
msgid "Timing is off."
msgstr "Sledování času je vypnuto."
-#: command.c:1408 command.c:1428 command.c:2002 command.c:2009 command.c:2018
-#: command.c:2028 command.c:2037 command.c:2051 command.c:2068 command.c:2127
-#: common.c:74 copy.c:342 copy.c:393 copy.c:408 psqlscan.l:1674
+#: command.c:1410 command.c:1430 command.c:2027 command.c:2034 command.c:2043
+#: command.c:2053 command.c:2062 command.c:2076 command.c:2093 command.c:2152
+#: common.c:74 copy.c:342 copy.c:395 copy.c:410 psqlscan.l:1674
#: psqlscan.l:1685 psqlscan.l:1695
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
-#: command.c:1484
+#: command.c:1509
#, c-format
msgid "+ opt(%d) = |%s|\n"
msgstr "+ opt(%d) = |%s|\n"
-#: command.c:1510 startup.c:188
+#: command.c:1535 startup.c:185
msgid "Password: "
msgstr "Heslo: "
-#: command.c:1517 startup.c:191 startup.c:193
+#: command.c:1542 startup.c:188 startup.c:190
#, c-format
msgid "Password for user %s: "
msgstr "Heslo pro uživatele %s: "
-#: command.c:1562
+#: command.c:1587
#, c-format
msgid ""
"All connection parameters must be supplied because no database connection "
@@ -271,24 +269,24 @@ msgstr ""
"Všechny parametry musí být zadány protože žádné připojení k databázi "
"neexistuje\n"
-#: command.c:1648 command.c:2714 common.c:120 common.c:413 common.c:478
-#: common.c:894 common.c:919 common.c:1016 copy.c:502 copy.c:689
+#: command.c:1673 command.c:2860 common.c:120 common.c:413 common.c:478
+#: common.c:894 common.c:919 common.c:1016 copy.c:504 copy.c:691
#: large_obj.c:158 large_obj.c:193 large_obj.c:255 psqlscan.l:1946
#, c-format
msgid "%s"
msgstr "%s"
-#: command.c:1652
+#: command.c:1677
#, c-format
msgid "Previous connection kept\n"
msgstr "Předchozí spojení zachováno\n"
-#: command.c:1656
+#: command.c:1681
#, c-format
msgid "\\connect: %s"
msgstr "\\connect: %s"
-#: command.c:1689
+#: command.c:1714
#, c-format
msgid ""
"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
@@ -297,7 +295,7 @@ msgstr ""
"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
"at port \"%s\".\n"
-#: command.c:1692
+#: command.c:1717
#, c-format
msgid ""
"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
@@ -306,21 +304,18 @@ msgstr ""
"Nyní jste připojeni k databázi \"%s\" jako uživatel \"%s\" na serveru \"%s\" "
"na portu\"%s\".\n"
-#: command.c:1696
+#: command.c:1721
#, c-format
msgid "You are now connected to database \"%s\" as user \"%s\".\n"
msgstr "Nyní jste připojeni k databázi \"%s\" jako uživatel \"%s\".\n"
-#: command.c:1730
+#: command.c:1755
#, c-format
msgid "%s (%s, server %s)\n"
msgstr "%s (%s, server %s)\n"
-#: command.c:1738
+#: command.c:1763
#, c-format
-#| msgid ""
-#| "WARNING: %s version %d.%d, server version %d.%d.\n"
-#| " Some psql features might not work.\n"
msgid ""
"WARNING: %s major version %d.%d, server major version %d.%d.\n"
" Some psql features might not work.\n"
@@ -328,17 +323,17 @@ msgstr ""
"VAROVÁNÍ: %s major verze %d.%d, major verze serveru %d.%d.\n"
" Některé vlastnosti psql nemusí fungovat.\n"
-#: command.c:1768
+#: command.c:1793
#, c-format
msgid "SSL connection (cipher: %s, bits: %d)\n"
msgstr "SSL spojení (šifra: %s, bitů: %d)\n"
-#: command.c:1778
+#: command.c:1803
#, c-format
msgid "SSL connection (unknown cipher)\n"
msgstr "SSL spojení (neznámá šifra)\n"
-#: command.c:1799
+#: command.c:1824
#, c-format
msgid ""
"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -350,7 +345,7 @@ msgstr ""
" informace najdete v manuálu k psql na stránce \"Poznámky pro\n"
" uživatele Windows.\"\n"
-#: command.c:1883
+#: command.c:1908
#, c-format
msgid ""
"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
@@ -359,27 +354,27 @@ msgstr ""
"proměnná prostředí PSQL_EDITOR_LINENUMBER_ARG musí být nastavena pro "
"zadáníčísla řádky\n"
-#: command.c:1920
+#: command.c:1945
#, c-format
msgid "could not start editor \"%s\"\n"
msgstr "nelze spustit editor \"%s\"\n"
-#: command.c:1922
+#: command.c:1947
#, c-format
msgid "could not start /bin/sh\n"
msgstr "nelze spustit /bin/sh\n"
-#: command.c:1960
+#: command.c:1985
#, c-format
msgid "could not locate temporary directory: %s\n"
msgstr "nelze najít dočasný adresář: %s\n"
-#: command.c:1987
+#: command.c:2012
#, c-format
msgid "could not open temporary file \"%s\": %s\n"
msgstr "nelze otevřít dočasný soubor \"%s\": %s\n"
-#: command.c:2249
+#: command.c:2274
#, c-format
msgid ""
"\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
@@ -388,142 +383,162 @@ msgstr ""
"\\pset: dovolené formáty jsou: unaligned, aligned, wrapped, html, latex, "
"troff-ms\n"
-#: command.c:2254
+#: command.c:2279
#, c-format
msgid "Output format is %s.\n"
msgstr "Výstupní formát je %s.\n"
-#: command.c:2270
+#: command.c:2295
#, c-format
msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
msgstr "\\pset: povolené styly řádek jsou ascii, old-ascii, unicode\n"
-#: command.c:2275
+#: command.c:2300
#, c-format
msgid "Line style is %s.\n"
msgstr "Styl čar je %s.\n"
-#: command.c:2286
+#: command.c:2311
#, c-format
msgid "Border style is %d.\n"
msgstr "Styl rámečků je %d.\n"
-#: command.c:2301
+#: command.c:2326
#, c-format
msgid "Expanded display is on.\n"
msgstr "Rozšířené zobrazení zapnuto.\n"
-#: command.c:2303
+#: command.c:2328
#, c-format
msgid "Expanded display is used automatically.\n"
msgstr "Rozšířené zobrazení je zapnuto automaticky.\n"
-#: command.c:2305
+#: command.c:2330
#, c-format
msgid "Expanded display is off.\n"
msgstr "Rozšířené zobrazení vypnuto.\n"
-#: command.c:2319
+#: command.c:2344
msgid "Showing locale-adjusted numeric output."
msgstr "Zobrazí číselný výstup dle národního nastavení."
-#: command.c:2321
+#: command.c:2346
msgid "Locale-adjusted numeric output is off."
msgstr "Zobrazení číselného výstupu dle národního nastavení je vypnuto."
-#: command.c:2334
+#: command.c:2359
#, c-format
msgid "Null display is \"%s\".\n"
msgstr "Null je zobrazován jako '\"%s\"'.\n"
-#: command.c:2349 command.c:2361
+#: command.c:2374 command.c:2386
#, c-format
msgid "Field separator is zero byte.\n"
msgstr "Oddělovač polí je nulový byte.\n"
-#: command.c:2351
+#: command.c:2376
#, c-format
msgid "Field separator is \"%s\".\n"
msgstr "Oddělovač polí je '\"%s\"'.\n"
-#: command.c:2376 command.c:2390
+#: command.c:2401 command.c:2415
#, c-format
msgid "Record separator is zero byte.\n"
msgstr "Oddělovač záznamů je nulový byte.\n"
-#: command.c:2378
+#: command.c:2403
#, c-format
msgid "Record separator is <newline>."
msgstr "Oddělovač záznamů je <newline>."
-#: command.c:2380
+#: command.c:2405
#, c-format
msgid "Record separator is \"%s\".\n"
msgstr "Oddělovač záznamů je '\"%s\"'.\n"
-#: command.c:2403
+#: command.c:2428
msgid "Showing only tuples."
msgstr "Zobrazovány jsou pouze záznamy."
-#: command.c:2405
+#: command.c:2430
msgid "Tuples only is off."
msgstr "Zobrazování pouze záznamů je vypnuto."
-#: command.c:2421
+#: command.c:2446
#, c-format
msgid "Title is \"%s\".\n"
msgstr "Nadpis je \"%s\".\n"
-#: command.c:2423
+#: command.c:2448
#, c-format
msgid "Title is unset.\n"
msgstr "Nadpis není nastaven.\n"
-#: command.c:2439
+#: command.c:2464
#, c-format
msgid "Table attribute is \"%s\".\n"
msgstr "Atribut tabulky je \"%s\".\n"
-#: command.c:2441
+#: command.c:2466
#, c-format
msgid "Table attributes unset.\n"
msgstr "Atributy tabulky nejsou nastaveny.\n"
-#: command.c:2462
+#: command.c:2487
msgid "Pager is used for long output."
msgstr "Stránkování je zapnuto pro dlouhé výstupy."
-#: command.c:2464
+#: command.c:2489
msgid "Pager is always used."
msgstr "Stránkování je vždy použito."
-#: command.c:2466
+#: command.c:2491
msgid "Pager usage is off."
msgstr "Stránkování je vypnuto."
-#: command.c:2480
+#: command.c:2505
msgid "Default footer is on."
msgstr "Implicitní zápatí je zapnuto."
-#: command.c:2482
+#: command.c:2507
msgid "Default footer is off."
msgstr "Implicitní zápatí je vypnuto."
-#: command.c:2493
+#: command.c:2518
#, c-format
msgid "Target width is %d.\n"
msgstr "Cílová šířka je %d.\n"
-#: command.c:2498
+#: command.c:2523
#, c-format
msgid "\\pset: unknown option: %s\n"
msgstr "\\pset: neznámá volba: %s\n"
-#: command.c:2552
+#: command.c:2577
#, c-format
msgid "\\!: failed\n"
msgstr "\\!: selhal\n"
+#: command.c:2597 command.c:2656
+#, c-format
+msgid "\\watch cannot be used with an empty query\n"
+msgstr "\\watch neze použít s prázdným dotazem\n"
+
+#: command.c:2619
+#, c-format
+msgid "Watch every %lds\t%s"
+msgstr "Zkontroluj každých %lds\t%s"
+
+#: command.c:2663
+#, c-format
+msgid "\\watch cannot be used with COPY\n"
+msgstr "\\watch nelze použít s COPY\n"
+
+#: command.c:2669
+#, c-format
+msgid "unexpected result status for \\watch\n"
+msgstr "neočekávaný stav výsledku pro \\watch\n"
+
#: common.c:287
#, c-format
msgid "connection to server was lost\n"
@@ -589,7 +604,6 @@ msgstr "více než jedna řádka vrácena pro \\gset\n"
#: common.c:611
#, c-format
-#| msgid "%s: could not set variable \"%s\"\n"
msgid "could not set variable \"%s\"\n"
msgstr "nelze nastavit proměnnou \"%s\"\n"
@@ -642,7 +656,6 @@ msgstr "\\copy: chyba na konci řádku\n"
#: copy.c:339
#, c-format
-#| msgid "could not open temporary file \"%s\": %s\n"
msgid "could not execute command \"%s\": %s\n"
msgstr "nelze spustit příkaz \"%s\": %s\n"
@@ -651,28 +664,27 @@ msgstr "nelze spustit příkaz \"%s\": %s\n"
msgid "%s: cannot copy from/to a directory\n"
msgstr "%s: nelze kopírovat z/do adresáře\n"
-#: copy.c:388
+#: copy.c:389
#, c-format
-#| msgid "could not get current user name: %s\n"
msgid "could not close pipe to external command: %s\n"
msgstr "nelze zavřít rouru (pipe) pro externí příkaz: %s\n"
-#: copy.c:455 copy.c:465
+#: copy.c:457 copy.c:467
#, c-format
msgid "could not write COPY data: %s\n"
msgstr "nelze zapsat data příkazu COPY: %s\n"
-#: copy.c:472
+#: copy.c:474
#, c-format
msgid "COPY data transfer failed: %s"
msgstr "přenos dat příkazem COPY selhal: %s"
-#: copy.c:542
+#: copy.c:544
msgid "canceled by user"
msgstr "zrušeno na žádost uživatele"
# common.c:485
-#: copy.c:552
+#: copy.c:554
msgid ""
"Enter data to be copied followed by a newline.\n"
"End with a backslash and a period on a line by itself."
@@ -680,11 +692,11 @@ msgstr ""
"Zadejte data pro kopírování následovaná novým řádkem.\n"
"Ukončete zpětným lomítkem a tečkou na samostatném řádku."
-#: copy.c:665
+#: copy.c:667
msgid "aborted because of read failure"
msgstr "přerušeno z důvodu chyby čtení"
-#: copy.c:685
+#: copy.c:687
msgid "trying to exit copy mode"
msgstr "pokouším se opustit copy mód"
@@ -780,7 +792,6 @@ msgid "Type"
msgstr "Typ"
#: describe.c:343
-#| msgid "define a cursor"
msgid "definer"
msgstr "definer"
@@ -970,7 +981,6 @@ msgstr "Pohled \"%s.%s\""
#: describe.c:1367
#, c-format
-#| msgid "Unlogged table \"%s.%s\""
msgid "Unlogged materialized view \"%s.%s\""
msgstr "Unlogged materializovaný pohled \"%s.%s\""
@@ -1060,11 +1070,11 @@ msgstr "implicitně %s"
#: describe.c:1613
msgid "primary key, "
-msgstr "primární klíč,"
+msgstr "primární klíč, "
#: describe.c:1615
msgid "unique, "
-msgstr "unikátní,"
+msgstr "unikátní, "
#: describe.c:1621
#, c-format
@@ -1250,12 +1260,10 @@ msgid "Password valid until "
msgstr "Heslo platné do "
#: describe.c:2572
-#| msgid "Role name"
msgid "Role"
msgstr "Role"
#: describe.c:2573
-#| msgid "database_name"
msgid "Database"
msgstr "Databáze"
@@ -1361,12 +1369,10 @@ msgid "List of conversions"
msgstr "Seznam konverzí"
#: describe.c:3039
-#| msgid "event"
msgid "Event"
msgstr "Událost"
#: describe.c:3041
-#| msgid "table"
msgid "Enabled"
msgstr "Povoleno"
@@ -1379,7 +1385,6 @@ msgid "Tags"
msgstr "Tagy"
#: describe.c:3062
-#| msgid "List of settings"
msgid "List of event triggers"
msgstr "Seznam event triggerů"
@@ -1724,9 +1729,6 @@ msgstr " -X, --no-psqlrc nečíst inicializační soubor (~/.psqlrc)\n
#: help.c:99
#, c-format
-#| msgid ""
-#| " -1 (\"one\"), --single-transaction\n"
-#| " execute command file as a single transaction\n"
msgid ""
" -1 (\"one\"), --single-transaction\n"
" execute as a single transaction (if non-"
@@ -1982,9 +1984,6 @@ msgstr ""
#: help.c:175
#, c-format
-#| msgid ""
-#| " \\g [FILE] or ; execute query (and send results to file or |"
-#| "pipe)\n"
msgid ""
" \\gset [PREFIX] execute query and store results in psql variables\n"
msgstr ""
@@ -2004,12 +2003,17 @@ msgstr ""
msgid " \\q quit psql\n"
msgstr " \\q ukončení psql\n"
-#: help.c:180
+#: help.c:178
+#, c-format
+msgid " \\watch [SEC] execute query every SEC seconds\n"
+msgstr " \\watch [SEC] každých SEC vteřin spusť dotaz\n"
+
+#: help.c:181
#, c-format
msgid "Query Buffer\n"
msgstr "Paměť dotazu\n"
-#: help.c:181
+#: help.c:182
#, c-format
msgid ""
" \\e [FILE] [LINE] edit the query buffer (or file) with external "
@@ -2018,7 +2022,7 @@ msgstr ""
" \\e [SOUBOR] [ŘÁDEK] editace aktuálního dotazu (nebo souboru) v "
"externím editoru\n"
-#: help.c:182
+#: help.c:183
#, c-format
msgid ""
" \\ef [FUNCNAME [LINE]] edit function definition with external editor\n"
@@ -2026,49 +2030,49 @@ msgstr ""
" \\ef [JMENOFUNKCE [ŘÁDEK]] editace definice funkce v externím "
"editoru\n"
-#: help.c:183
+#: help.c:184
#, c-format
msgid " \\p show the contents of the query buffer\n"
msgstr " \\p ukázat současný obsah paměti s dotazem\n"
-#: help.c:184
+#: help.c:185
#, c-format
msgid " \\r reset (clear) the query buffer\n"
msgstr " \\r vyprázdnění paměti s dotazy\n"
-#: help.c:186
+#: help.c:187
#, c-format
msgid " \\s [FILE] display history or save it to file\n"
msgstr " \\s [SOUBOR] vytiskne historii nebo ji uloží do souboru\n"
-#: help.c:188
+#: help.c:189
#, c-format
msgid " \\w FILE write query buffer to file\n"
msgstr " \\w SOUBOR zapsání paměti s dotazem do souboru\n"
-#: help.c:191
+#: help.c:192
#, c-format
msgid "Input/Output\n"
msgstr "Vstup/Výstup\n"
-#: help.c:192
+#: help.c:193
#, c-format
msgid ""
" \\copy ... perform SQL COPY with data stream to the client "
"host\n"
msgstr " \\copy ... provede SQL COPY s tokem dat na klienta\n"
-#: help.c:193
+#: help.c:194
#, c-format
msgid " \\echo [STRING] write string to standard output\n"
msgstr " \\echo [TEXT] vypsání textu na standardní výstup\n"
-#: help.c:194
+#: help.c:195
#, c-format
msgid " \\i FILE execute commands from file\n"
msgstr " \\i SOUBOR provedení příkazů ze souboru\n"
-#: help.c:195
+#: help.c:196
#, c-format
msgid ""
" \\ir FILE as \\i, but relative to location of current "
@@ -2077,167 +2081,166 @@ msgstr ""
" \\ir FILE jako \\i, ale relativně k pozici v aktuálním "
"skriptu\n"
-#: help.c:196
+#: help.c:197
#, c-format
msgid " \\o [FILE] send all query results to file or |pipe\n"
msgstr ""
" \\o [SOUBOR] přesměrování výsledků dotazu do souboru nebo |"
"roury\n"
-#: help.c:197
+#: help.c:198
#, c-format
msgid ""
" \\qecho [STRING] write string to query output stream (see \\o)\n"
msgstr " \\qecho [ŘETĚZEC] vypsání textu na výstup dotazů (viz. \\o)\n"
-#: help.c:200
+#: help.c:201
#, c-format
msgid "Informational\n"
msgstr "Informační\n"
-#: help.c:201
+#: help.c:202
#, c-format
msgid " (options: S = show system objects, + = additional detail)\n"
msgstr " (volby: S = zobraz systémové objekty, + = další detaily)\n"
-#: help.c:202
+#: help.c:203
#, c-format
msgid " \\d[S+] list tables, views, and sequences\n"
-msgstr " \\dp[S+] seznam tabulek, pohledů a sekvencí\n"
+msgstr " \\d[S+] seznam tabulek, pohledů a sekvencí\n"
-#: help.c:203
+#: help.c:204
#, c-format
msgid " \\d[S+] NAME describe table, view, sequence, or index\n"
msgstr ""
" \\d[S+] JMÉNO popis tabulky, pohledů, sekvence nebo indexu\n"
-#: help.c:204
+#: help.c:205
#, c-format
msgid " \\da[S] [PATTERN] list aggregates\n"
-msgstr " \\da[+] [VZOR] seznam agregačních funkcí\n"
+msgstr " \\da[S] [VZOR] seznam agregačních funkcí\n"
-#: help.c:205
+#: help.c:206
#, c-format
msgid " \\db[+] [PATTERN] list tablespaces\n"
msgstr " \\db[+] [VZOR] seznam tablespaces\n"
-#: help.c:206
+#: help.c:207
#, c-format
msgid " \\dc[S+] [PATTERN] list conversions\n"
msgstr " \\dc[S+] [PATTERN] seznam konverzí\n"
-#: help.c:207
+#: help.c:208
#, c-format
msgid " \\dC[+] [PATTERN] list casts\n"
msgstr " \\dC[+] [PATTERN] seznam přetypování\n"
-#: help.c:208
+#: help.c:209
#, c-format
msgid ""
" \\dd[S] [PATTERN] show object descriptions not displayed elsewhere\n"
msgstr " \\dd[S] [PATTERN] zobrazí popis objektů nezobrazených jinde\n"
-#: help.c:209
+#: help.c:210
#, c-format
msgid " \\ddp [PATTERN] list default privileges\n"
-msgstr " \\dC [VZOR] seznam implicitních výrazů\n"
+msgstr " \\ddp [VZOR] seznam implicitních privilegií\n"
-#: help.c:210
+#: help.c:211
#, c-format
msgid " \\dD[S+] [PATTERN] list domains\n"
msgstr " \\dD[S+] [PATTERN] seznam domén\n"
-#: help.c:211
+#: help.c:212
#, c-format
msgid " \\det[+] [PATTERN] list foreign tables\n"
msgstr " \\det[+] [VZOR] seznam foreign tabulek\n"
-#: help.c:212
+#: help.c:213
#, c-format
msgid " \\des[+] [PATTERN] list foreign servers\n"
msgstr " \\des[+] [VZOR] seznam foreign serverů\n"
-#: help.c:213
+#: help.c:214
#, c-format
msgid " \\deu[+] [PATTERN] list user mappings\n"
msgstr " \\deu[+] [VZOR] seznam mapování uživatelů\n"
-#: help.c:214
+#: help.c:215
#, c-format
msgid " \\dew[+] [PATTERN] list foreign-data wrappers\n"
msgstr " \\dew[+] [VZOR] seznam foreign-data wrapperů\n"
-#: help.c:215
+#: help.c:216
#, c-format
msgid ""
" \\df[antw][S+] [PATRN] list [only agg/normal/trigger/window] functions\n"
msgstr ""
" \\df[antw][S+] [VZOR] seznam [pouze agg/normal/trigger/window] funkcí\n"
-#: help.c:216
+#: help.c:217
#, c-format
msgid " \\dF[+] [PATTERN] list text search configurations\n"
msgstr ""
" \\dF[+] [VZOR] seznam konfigurací fulltextového vyhledávání\n"
-#: help.c:217
+#: help.c:218
#, c-format
msgid " \\dFd[+] [PATTERN] list text search dictionaries\n"
msgstr " \\dFd[+] [VZOR] seznam slovníků fulltextového vyhledávání\n"
-#: help.c:218
+#: help.c:219
#, c-format
msgid " \\dFp[+] [PATTERN] list text search parsers\n"
msgstr " \\dFp[+] [VZOR] seznam parserů fulltextového vyhledávání\n"
-#: help.c:219
+#: help.c:220
#, c-format
msgid " \\dFt[+] [PATTERN] list text search templates\n"
msgstr " \\dFt[+] [VZOR] seznam šablon fulltextového vyhledávání\n"
-#: help.c:220
+#: help.c:221
#, c-format
msgid " \\dg[+] [PATTERN] list roles\n"
msgstr " \\dg[+] [VZOR] seznam rolí\n"
-#: help.c:221
+#: help.c:222
#, c-format
msgid " \\di[S+] [PATTERN] list indexes\n"
msgstr " \\di[S+] [VZOR] seznam indexů\n"
-#: help.c:222
+#: help.c:223
#, c-format
msgid " \\dl list large objects, same as \\lo_list\n"
msgstr ""
" \\dl seznam \"large object\" stejné jako \\lo_list\n"
-#: help.c:223
+#: help.c:224
#, c-format
msgid " \\dL[S+] [PATTERN] list procedural languages\n"
msgstr " \\dL[S+] [VZOR] seznam procedurálních jazyků\n"
-#: help.c:224
+#: help.c:225
#, c-format
-#| msgid " \\dv[S+] [PATTERN] list views\n"
msgid " \\dm[S+] [PATTERN] list materialized views\n"
msgstr " \\dm[S+] [PATTERN] seznam materializovaných pohledů\n"
-#: help.c:225
+#: help.c:226
#, c-format
msgid " \\dn[S+] [PATTERN] list schemas\n"
-msgstr " \\dn[+] [VZOR] seznam schémat\n"
+msgstr " \\dn[S+] [VZOR] seznam schémat\n"
-#: help.c:226
+#: help.c:227
#, c-format
msgid " \\do[S] [PATTERN] list operators\n"
msgstr " \\do[S] [VZOR] seznam operátorů\n"
-#: help.c:227
+#: help.c:228
#, c-format
msgid " \\dO[S+] [PATTERN] list collations\n"
msgstr " \\dO[S+] [VZOR] seznam collations\n"
-#: help.c:228
+#: help.c:229
#, c-format
msgid ""
" \\dp [PATTERN] list table, view, and sequence access privileges\n"
@@ -2245,75 +2248,73 @@ msgstr ""
" \\dp [VZOR] seznam přístupových práv tabulek, pohledů a "
"sekvencí\n"
-#: help.c:229
+#: help.c:230
#, c-format
msgid " \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
msgstr ""
" \\drds [VZOR1 [VZOR2]] seznam nastavení rolí pro jednotlivé databáze\n"
-#: help.c:230
+#: help.c:231
#, c-format
msgid " \\ds[S+] [PATTERN] list sequences\n"
msgstr " \\ds[S+] [VZOR] seznam sekvencí\n"
-#: help.c:231
+#: help.c:232
#, c-format
msgid " \\dt[S+] [PATTERN] list tables\n"
msgstr " \\dt[S+] [VZOR] seznam tabulek\n"
-#: help.c:232
+#: help.c:233
#, c-format
msgid " \\dT[S+] [PATTERN] list data types\n"
msgstr " \\dT[S+] [VZOR] seznam datových typů\n"
-#: help.c:233
+#: help.c:234
#, c-format
msgid " \\du[+] [PATTERN] list roles\n"
msgstr " \\du[+] [VZOR] seznam rolí (uživatelů)\n"
-#: help.c:234
+#: help.c:235
#, c-format
msgid " \\dv[S+] [PATTERN] list views\n"
msgstr " \\dv[S+] [VZOR] seznam pohledů\n"
-#: help.c:235
+#: help.c:236
#, c-format
msgid " \\dE[S+] [PATTERN] list foreign tables\n"
msgstr " \\dE[S+] [VZOR] seznam foreign tabulek\n"
-#: help.c:236
+#: help.c:237
#, c-format
msgid " \\dx[+] [PATTERN] list extensions\n"
msgstr " \\dx[+] [VZOR] seznam rozšíření\n"
-#: help.c:237
+#: help.c:238
#, c-format
-#| msgid " \\ddp [PATTERN] list default privileges\n"
msgid " \\dy [PATTERN] list event triggers\n"
msgstr " \\dy [PATTERN] seznam event triggerů\n"
-#: help.c:238
+#: help.c:239
#, c-format
-#| msgid " \\dt[S+] [PATTERN] list tables\n"
msgid " \\l[+] [PATTERN] list databases\n"
msgstr " \\l[+] [PATTERN] seznam databází\n"
-#: help.c:239
+#: help.c:240
#, c-format
msgid " \\sf[+] FUNCNAME show a function's definition\n"
msgstr " \\sf[+] [JMENOFUNKCE] zobrazí definici funkce\n"
-#: help.c:240
+#: help.c:241
#, c-format
msgid " \\z [PATTERN] same as \\dp\n"
msgstr " \\z [VZOR] stejné jako \\dp\n"
-#: help.c:243
+#: help.c:244
#, c-format
msgid "Formatting\n"
msgstr "Formátování\n"
-#: help.c:244
+#: help.c:245
#, c-format
msgid ""
" \\a toggle between unaligned and aligned output mode\n"
@@ -2321,14 +2322,14 @@ msgstr ""
" \\a přepíná mezi 'unaligned' a 'aligned' modem "
"výstupu\n"
-#: help.c:245
+#: help.c:246
#, c-format
msgid " \\C [STRING] set table title, or unset if none\n"
msgstr ""
" \\C [ŘETĚZEC] nastaví titulek tabulky nebo odnastaví pokud není "
"definován řetězec\n"
-#: help.c:246
+#: help.c:247
#, c-format
msgid ""
" \\f [STRING] show or set field separator for unaligned query "
@@ -2337,12 +2338,12 @@ msgstr ""
" \\f [ŘETĚZEC] nastaví nebo zobrazí oddělovače polí pro "
"nezarovnaný výstup dotazů\n"
-#: help.c:247
+#: help.c:248
#, c-format
msgid " \\H toggle HTML output mode (currently %s)\n"
msgstr " \\H zapne HTML mód výstupu (nyní %s)\n"
-#: help.c:249
+#: help.c:250
#, c-format
msgid ""
" \\pset NAME [VALUE] set table output option\n"
@@ -2357,28 +2358,28 @@ msgstr ""
" numericlocale|recordsep|recordsep_zero|tuples_only|"
"title|tableattr|pager})\n"
-#: help.c:252
+#: help.c:253
#, c-format
msgid " \\t [on|off] show only rows (currently %s)\n"
msgstr " \\t [on|off] ukazovat pouze řádky (nyní %s)\n"
-#: help.c:254
+#: help.c:255
#, c-format
msgid ""
" \\T [STRING] set HTML <table> tag attributes, or unset if none\n"
msgstr " \\T [ŘETĚZEC] nastavení atributů HTML tagu <table>\n"
-#: help.c:255
+#: help.c:256
#, c-format
msgid " \\x [on|off|auto] toggle expanded output (currently %s)\n"
msgstr " \\x [on|off|auto] zapne rozšířený mód výstupu (nyní %s)\n"
-#: help.c:259
+#: help.c:260
#, c-format
msgid "Connection\n"
msgstr "Spojení\n"
-#: help.c:261
+#: help.c:262
#, c-format
msgid ""
" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -2387,11 +2388,8 @@ msgstr ""
" \\c[onnect] [DATABÁZE|- UŽIVATEL|- HOST|- PORT|-]]\n"
" vytvoří spojení do nové databáze (současná \"%s\")\n"
-#: help.c:265
+#: help.c:266
#, c-format
-#| msgid ""
-#| " \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
-#| " connect to new database (currently \"%s\")\n"
msgid ""
" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
" connect to new database (currently no connection)\n"
@@ -2400,43 +2398,43 @@ msgstr ""
" vytvoří spojení do nové databáze (současně žádné "
"spojení)\n"
-#: help.c:267
+#: help.c:268
#, c-format
msgid " \\encoding [ENCODING] show or set client encoding\n"
msgstr " \\encoding [KÓDOVÁNÍ] zobrazení nebo nastavení kódování klienta\n"
-#: help.c:268
+#: help.c:269
#, c-format
msgid " \\password [USERNAME] securely change the password for a user\n"
msgstr " \\password [UŽIVATEL] bezpečná změna hesla uživatele\n"
-#: help.c:269
+#: help.c:270
#, c-format
msgid ""
" \\conninfo display information about current connection\n"
msgstr " \\conninfo zobrazí informace o aktuálním spojení\n"
-#: help.c:272
+#: help.c:273
#, c-format
msgid "Operating System\n"
msgstr "Operační systém\n"
-#: help.c:273
+#: help.c:274
#, c-format
msgid " \\cd [DIR] change the current working directory\n"
msgstr " \\cd [ADRESÁŘ] změna aktuálního pracovního adresář\n"
-#: help.c:274
+#: help.c:275
#, c-format
msgid " \\setenv NAME [VALUE] set or unset environment variable\n"
msgstr " \\setenv NAME [VALUE] nastaví nebo zruší proměnnou prostředí\n"
-#: help.c:275
+#: help.c:276
#, c-format
msgid " \\timing [on|off] toggle timing of commands (currently %s)\n"
msgstr " \\timing [on|off] použít sledování času u příkazů (nyní %s)\n"
-#: help.c:277
+#: help.c:278
#, c-format
msgid ""
" \\! [COMMAND] execute command in shell or start interactive "
@@ -2445,18 +2443,18 @@ msgstr ""
" \\! [PŘÍKAZ] provedení příkazu v shellu nebo nastartuje "
"interaktivní shell\n"
-#: help.c:280
+#: help.c:281
#, c-format
msgid "Variables\n"
msgstr "Proměnné\n"
-#: help.c:281
+#: help.c:282
#, c-format
msgid " \\prompt [TEXT] NAME prompt user to set internal variable\n"
msgstr ""
" \\prompt [TEXT] PROMĚNÁ vyzve uživatele, aby zadal hodnotu proměnné\n"
-#: help.c:282
+#: help.c:283
#, c-format
msgid ""
" \\set [NAME [VALUE]] set internal variable, or list all if no "
@@ -2467,17 +2465,17 @@ msgstr ""
"zobrazí\n"
" seznam všech proměnných\n"
-#: help.c:283
+#: help.c:284
#, c-format
msgid " \\unset NAME unset (delete) internal variable\n"
msgstr " \\unset JMÉNO zrušení interní proměnné\n"
-#: help.c:286
+#: help.c:287
#, c-format
msgid "Large Objects\n"
msgstr "Velké objekty (LO)\n"
-#: help.c:287
+#: help.c:288
#, c-format
msgid ""
" \\lo_export LOBOID FILE\n"
@@ -2490,11 +2488,11 @@ msgstr ""
" \\lo_list\n"
" \\lo_unlink LOBOID operace s \"large\" objekty\n"
-#: help.c:334
+#: help.c:335
msgid "Available help:\n"
msgstr "Dostupná nápověda:\n"
-#: help.c:418
+#: help.c:419
#, c-format
msgid ""
"Command: %s\n"
@@ -2509,7 +2507,7 @@ msgstr ""
"%s\n"
"\n"
-#: help.c:434
+#: help.c:435
#, c-format
msgid ""
"No help available for \"%s\".\n"
@@ -3848,7 +3846,6 @@ msgid "change the definition of a domain"
msgstr "změní definici domény"
#: sql_help.h:225
-#| msgid "change the definition of a trigger"
msgid "change the definition of an event trigger"
msgstr "změní definici event triggeru"
@@ -3885,7 +3882,6 @@ msgid "change the definition of a large object"
msgstr "změní definici large objektu"
#: sql_help.h:270
-#| msgid "change the definition of a view"
msgid "change the definition of a materialized view"
msgstr "změní definici materializovaného pohledu"
@@ -3906,7 +3902,6 @@ msgid "change a database role"
msgstr "změní databázovou roli"
#: sql_help.h:295
-#| msgid "change the definition of a table"
msgid "change the definition of a rule"
msgstr "změní definici pravidla"
@@ -4025,7 +4020,6 @@ msgid "define a new domain"
msgstr "definuje novou atributovou doménu"
#: sql_help.h:445
-#| msgid "define a new trigger"
msgid "define a new event trigger"
msgstr "definuje nový event trigger"
@@ -4058,7 +4052,6 @@ msgid "define a new procedural language"
msgstr "definuje nový procedurální jazyk"
#: sql_help.h:485
-#| msgid "define a new view"
msgid "define a new materialized view"
msgstr "definuje nový materializovaný pohled"
@@ -4179,7 +4172,6 @@ msgid "remove a domain"
msgstr "odstraní doménu"
#: sql_help.h:645
-#| msgid "remove a trigger"
msgid "remove an event trigger"
msgstr "odstraní event trigger"
@@ -4212,7 +4204,6 @@ msgid "remove a procedural language"
msgstr "odstraní procedurální jazyk"
#: sql_help.h:685
-#| msgid "remove a view"
msgid "remove a materialized view"
msgstr "odstraní materializovaný pohled"
@@ -4428,22 +4419,17 @@ msgstr "provede úklid a případně analýzu databáze"
msgid "compute a set of rows"
msgstr "spočítá množinu řádek"
-#: startup.c:168
+#: startup.c:167
#, c-format
msgid "%s: -1 can only be used in non-interactive mode\n"
msgstr "%s: -1 může být použito pouze pro neinteraktivní módy\n"
-#: startup.c:170
-#, c-format
-msgid "%s: -1 is incompatible with -c and -l\n"
-msgstr "%s: -1 je nekompatibilní s -c a -l\n"
-
-#: startup.c:272
+#: startup.c:269
#, c-format
msgid "%s: could not open log file \"%s\": %s\n"
msgstr "%s: nelze otevřít logovací soubor \"%s\": %s\n"
-#: startup.c:334
+#: startup.c:331
#, c-format
msgid ""
"Type \"help\" for help.\n"
@@ -4452,32 +4438,32 @@ msgstr ""
"Pro získání nápovědy napište \"help\".\n"
"\n"
-#: startup.c:479
+#: startup.c:476
#, c-format
msgid "%s: could not set printing parameter \"%s\"\n"
msgstr "%s: nelze nastavit parametr zobrazení \"%s\"\n"
-#: startup.c:519
+#: startup.c:516
#, c-format
msgid "%s: could not delete variable \"%s\"\n"
msgstr "%s: nelze smazat proměnnou \"%s\"\n"
-#: startup.c:529
+#: startup.c:526
#, c-format
msgid "%s: could not set variable \"%s\"\n"
msgstr "%s: nelze nastavit proměnnou \"%s\"\n"
-#: startup.c:572 startup.c:578
+#: startup.c:569 startup.c:575
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Zkuste \"%s --help\" pro více informací.\n"
-#: startup.c:595
+#: startup.c:592
#, c-format
msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
msgstr "%s: varování: nadbytečný parametr příkazové řádky \"%s\" ignorován\n"
-#: tab-complete.c:3956
+#: tab-complete.c:3962
#, c-format
msgid ""
"tab completion query failed: %s\n"
@@ -4493,6 +4479,9 @@ msgstr ""
msgid "unrecognized Boolean value; assuming \"on\"\n"
msgstr "nerozpoznaná boolean hodnota; předpokládám \"on\".\n"
+#~ msgid "%s: -1 is incompatible with -c and -l\n"
+#~ msgstr "%s: -1 je nekompatibilní s -c a -l\n"
+
#~ msgid " \\l[+] list all databases\n"
#~ msgstr " \\l[+] seznam databází\n"
diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index bc6491f9bd..58c6550048 100644
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: psql (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:45+0000\n"
-"PO-Revision-Date: 2012-12-17 13:11+0800\n"
+"POT-Creation-Date: 2013-09-02 00:25+0000\n"
+"PO-Revision-Date: 2013-09-02 16:48+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -15,104 +15,140 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.5.4\n"
+# command.c:681
+# common.c:85
+# common.c:99
+# mainloop.c:71
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83 command.c:1130 input.c:204 mainloop.c:72
+#: mainloop.c:234 tab-complete.c:3827
+#, c-format
+msgid "out of memory\n"
+msgstr "记忆体用尽\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
# command.c:240
-#: ../../port/exec.c:125 ../../port/exec.c:239 ../../port/exec.c:282
+#: ../../port/exec.c:127 ../../port/exec.c:241 ../../port/exec.c:284
#, c-format
msgid "could not identify current directory: %s"
msgstr "无法识别目前的目录:%s"
# command.c:122
-#: ../../port/exec.c:144
+#: ../../port/exec.c:146
#, c-format
msgid "invalid binary \"%s\""
msgstr "无效的二进制码 \"%s\""
# command.c:1103
-#: ../../port/exec.c:193
+#: ../../port/exec.c:195
#, c-format
msgid "could not read binary \"%s\""
msgstr "无法读取二进制码 \"%s\""
-#: ../../port/exec.c:200
+#: ../../port/exec.c:202
#, c-format
msgid "could not find a \"%s\" to execute"
msgstr "未能找到一个 \"%s\" 来执行"
-# command.c:256
-#: ../../port/exec.c:255 ../../port/exec.c:291
+#: ../../port/exec.c:257 ../../port/exec.c:293
#, c-format
-msgid "could not change directory to \"%s\""
-msgstr "无法切换目录至 \"%s\""
+#| msgid "could not change directory to \"%s\": %m"
+msgid "could not change directory to \"%s\": %s"
+msgstr "无法跳转到目录 \"%s\" 中: %s"
# command.c:1103
-#: ../../port/exec.c:270
+#: ../../port/exec.c:272
#, c-format
msgid "could not read symbolic link \"%s\""
msgstr "无法读取符号连结 \"%s\""
-#: ../../port/exec.c:526
+#: ../../port/exec.c:523
+#, c-format
+#| msgid "query failed: %s"
+msgid "pclose failed: %s"
+msgstr "pclose调用失败: %s"
+
+#: ../../port/wait_error.c:47
+#, c-format
+#| msgid "could not execute plan"
+msgid "command not executable"
+msgstr "无法执行命令"
+
+#: ../../port/wait_error.c:51
+#, c-format
+#| msgid "case not found"
+msgid "command not found"
+msgstr "没有找到命令"
+
+#: ../../port/wait_error.c:56
#, c-format
msgid "child process exited with exit code %d"
msgstr "子进程结束,结束代码 %d"
-#: ../../port/exec.c:530
+#: ../../port/wait_error.c:63
#, c-format
msgid "child process was terminated by exception 0x%X"
msgstr "子进程被例外(exception) 0x%X 终止"
-#: ../../port/exec.c:539
+#: ../../port/wait_error.c:73
#, c-format
msgid "child process was terminated by signal %s"
msgstr "子进程被信号 %s 终止"
-#: ../../port/exec.c:542
+#: ../../port/wait_error.c:77
#, c-format
msgid "child process was terminated by signal %d"
msgstr "子进程被信号 %d 终止"
-#: ../../port/exec.c:546
+#: ../../port/wait_error.c:82
#, c-format
msgid "child process exited with unrecognized status %d"
msgstr "子进程结束,不明状态代码 %d"
# command.c:120
-#: command.c:113
+#: command.c:115
#, c-format
msgid "Invalid command \\%s. Try \\? for help.\n"
msgstr "无效的命令 \\%s,用 \\? 显示说明。\n"
# command.c:122
-#: command.c:115
+#: command.c:117
#, c-format
msgid "invalid command \\%s\n"
msgstr "无效的命令 \\%s\n"
# command.c:131
-#: command.c:126
+#: command.c:128
#, c-format
msgid "\\%s: extra argument \"%s\" ignored\n"
msgstr "\\%s:忽略多余的参数 \"%s\" \n"
# command.c:240
-#: command.c:268
+#: command.c:270
#, c-format
msgid "could not get home directory: %s\n"
msgstr "无法取得 home 目录:%s\n"
# command.c:256
-#: command.c:284
+#: command.c:286
#, c-format
msgid "\\%s: could not change directory to \"%s\": %s\n"
msgstr "\\%s: 无法切换目录至 \"%s\": %s\n"
# common.c:636
# common.c:871
-#: command.c:305 common.c:511 common.c:857
+#: command.c:307 common.c:446 common.c:851
#, c-format
msgid "You are currently not connected to a database.\n"
msgstr "你目前没有与资料库连线。\n"
-#: command.c:312
+#: command.c:314
#, c-format
msgid ""
"You are connected to database \"%s\" as user \"%s\" via socket in \"%s\" at "
@@ -121,7 +157,7 @@ msgstr ""
"以用户 \"%2$s\" 的身份,通过套接字\"%3$s\"在端口\"%4$s\"连接到数据库 \"%1$s"
"\"\n"
-#: command.c:315
+#: command.c:317
#, c-format
msgid ""
"You are connected to database \"%s\" as user \"%s\" on host \"%s\" at port "
@@ -131,28 +167,28 @@ msgstr ""
# command.c:370
# command.c:760
-#: command.c:509 command.c:579 command.c:1347
+#: command.c:516 command.c:586 command.c:1382
#, c-format
msgid "no query buffer\n"
msgstr "没有查询缓存区\n"
-#: command.c:542 command.c:2628
+#: command.c:549 command.c:2826
#, c-format
msgid "invalid line number: %s\n"
msgstr "无效行号: %s\n"
# describe.c:117
-#: command.c:573
+#: command.c:580
#, c-format
msgid "The server (version %d.%d) does not support editing function source.\n"
msgstr "服务器(版本%d.%d)不支持编辑函数源码.\n"
-#: command.c:653
+#: command.c:660
msgid "No changes"
msgstr "没有发生"
# command.c:433
-#: command.c:707
+#: command.c:714
#, c-format
msgid "%s: invalid encoding name or conversion procedure not found\n"
msgstr "%s:无效的编码名称或找不到转换程序\n"
@@ -164,14 +200,14 @@ msgstr "%s:无效的编码名称或找不到转换程序\n"
# command.c:612
# command.c:740
# command.c:771
-#: command.c:787 command.c:825 command.c:839 command.c:856 command.c:963
-#: command.c:1013 command.c:1123 command.c:1327 command.c:1358
+#: command.c:810 command.c:860 command.c:874 command.c:891 command.c:998
+#: command.c:1048 command.c:1158 command.c:1362 command.c:1393
#, c-format
msgid "\\%s: missing required argument\n"
msgstr "\\%s:缺少所需参数\n"
# command.c:598
-#: command.c:888
+#: command.c:923
msgid "Query buffer is empty."
msgstr "查询缓存区是空的。"
@@ -179,75 +215,65 @@ msgstr "查询缓存区是空的。"
# command.c:939
# startup.c:187
# startup.c:205
-#: command.c:898
+#: command.c:933
msgid "Enter new password: "
msgstr "输入新的密码:"
-#: command.c:899
+#: command.c:934
msgid "Enter it again: "
msgstr "再次键入:"
-#: command.c:903
+#: command.c:938
#, c-format
msgid "Passwords didn't match.\n"
msgstr "Passwords didn't match.\n"
-#: command.c:921
+#: command.c:956
#, c-format
msgid "Password encryption failed.\n"
msgstr "密码加密失败.\n"
# startup.c:502
-#: command.c:992 command.c:1104 command.c:1332
+#: command.c:1027 command.c:1139 command.c:1367
#, c-format
msgid "\\%s: error while setting variable\n"
msgstr "\\%s: 设定变量值时出错\n"
# command.c:632
-#: command.c:1033
+#: command.c:1068
msgid "Query buffer reset (cleared)."
msgstr "查询缓存区重置(清空)。"
# command.c:646
-#: command.c:1057
+#: command.c:1092
#, c-format
msgid "Wrote history to file \"%s/%s\".\n"
msgstr "书写历程到档案 \"%s/%s\".\n"
-# command.c:681
-# common.c:85
-# common.c:99
-# mainloop.c:71
-#: command.c:1095 common.c:52 common.c:69 common.c:93 input.c:204
-#: mainloop.c:72 mainloop.c:234 print.c:145 print.c:159 tab-complete.c:3505
-#, c-format
-msgid "out of memory\n"
-msgstr "记忆体用尽\n"
-
-#: command.c:1128
+#: command.c:1163
#, c-format
msgid "\\%s: environment variable name must not contain \"=\"\n"
msgstr "\\%s: 环境变量不能包含 \"=\"\n"
# describe.c:117
-#: command.c:1171
+#: command.c:1206
#, c-format
msgid "The server (version %d.%d) does not support showing function source.\n"
msgstr "服务器(版本%d.%d)不支持显示函数源码.\n"
# copy.c:122
-#: command.c:1177
+#: command.c:1212
#, c-format
msgid "function name is required\n"
msgstr "需要函数名\n"
# command.c:726
-#: command.c:1312
+#: command.c:1347
msgid "Timing is on."
msgstr "启用计时功能."
# command.c:728
-#: command.c:1314
+#: command.c:1349
msgid "Timing is off."
msgstr "停止计时功能."
@@ -264,19 +290,24 @@ msgstr "停止计时功能."
# common.c:170
# copy.c:530
# copy.c:575
-#: command.c:1375 command.c:1395 command.c:1957 command.c:1964 command.c:1973
-#: command.c:1983 command.c:1992 command.c:2006 command.c:2023 command.c:2080
-#: common.c:140 copy.c:288 copy.c:327 psqlscan.l:1652 psqlscan.l:1663
-#: psqlscan.l:1673
+#: command.c:1410 command.c:1430 command.c:2027 command.c:2034 command.c:2043
+#: command.c:2053 command.c:2062 command.c:2076 command.c:2093 command.c:2152
+#: common.c:74 copy.c:342 copy.c:395 copy.c:410 psqlscan.l:1674
+#: psqlscan.l:1685 psqlscan.l:1695
#, c-format
msgid "%s: %s\n"
msgstr "%s: %s\n"
+#: command.c:1509
+#, c-format
+msgid "+ opt(%d) = |%s|\n"
+msgstr "+ opt(%d) = |%s|\n"
+
# command.c:915
# command.c:939
# startup.c:187
# startup.c:205
-#: command.c:1477 startup.c:167
+#: command.c:1535 startup.c:185
msgid "Password: "
msgstr "口令:"
@@ -284,36 +315,44 @@ msgstr "口令:"
# command.c:939
# startup.c:187
# startup.c:205
-#: command.c:1484 startup.c:170 startup.c:172
+#: command.c:1542 startup.c:188 startup.c:190
#, c-format
msgid "Password for user %s: "
msgstr "用户 %s 的口令:"
+#: command.c:1587
+#, c-format
+msgid ""
+"All connection parameters must be supplied because no database connection "
+"exists\n"
+msgstr "没有可用的数据库连接,所以必须提供所有的连接参数\n"
+
# command.c:953
# common.c:216
# common.c:605
# common.c:660
# common.c:903
-#: command.c:1603 command.c:2662 common.c:186 common.c:478 common.c:543
-#: common.c:900 common.c:925 common.c:1022 copy.c:420 copy.c:607
-#: psqlscan.l:1924
+#: command.c:1673 command.c:2860 common.c:120 common.c:413 common.c:478
+#: common.c:894 common.c:919 common.c:1016 copy.c:504 copy.c:691
+#: large_obj.c:158 large_obj.c:193 large_obj.c:255 psqlscan.l:1946
#, c-format
msgid "%s"
msgstr "%s"
# command.c:957
-#: command.c:1607
+#: command.c:1677
+#, c-format
msgid "Previous connection kept\n"
msgstr "保留上一次连线\n"
# command.c:969
-#: command.c:1611
+#: command.c:1681
#, c-format
msgid "\\connect: %s"
msgstr "\\连线:%s"
# command.c:981
-#: command.c:1644
+#: command.c:1714
#, c-format
msgid ""
"You are now connected to database \"%s\" as user \"%s\" via socket in \"%s\" "
@@ -323,7 +362,7 @@ msgstr ""
"\".\n"
# command.c:981
-#: command.c:1647
+#: command.c:1717
#, c-format
msgid ""
"You are now connected to database \"%s\" as user \"%s\" on host \"%s\" at "
@@ -332,38 +371,41 @@ msgstr ""
"您现在已经连线到数据库 \"%s\", 用户 \"%s\",主机 \"%s\",端口号 \"%s\".\n"
# command.c:981
-#: command.c:1651
+#: command.c:1721
#, c-format
msgid "You are now connected to database \"%s\" as user \"%s\".\n"
msgstr "您现在已经连线到数据库 \"%s\",用户 \"%s\".\n"
-#: command.c:1685
+#: command.c:1755
#, c-format
msgid "%s (%s, server %s)\n"
msgstr "%s (%s, 服务器 %s)\n"
-#: command.c:1693
+#: command.c:1763
#, c-format
+#| msgid ""
+#| "WARNING: %s version %d.%d, server version %d.%d.\n"
+#| " Some psql features might not work.\n"
msgid ""
-"WARNING: %s version %d.%d, server version %d.%d.\n"
+"WARNING: %s major version %d.%d, server major version %d.%d.\n"
" Some psql features might not work.\n"
msgstr ""
-"警告:%s 版本%d.%d, 服务器版本%d.%d.\n"
-"一些psql功能可能无法工作.\n"
+"警告:%s 主版本%d.%d,服务器主版本为%d.%d.\n"
+" 一些psql功能可能无法工作.\n"
# startup.c:652
-#: command.c:1723
+#: command.c:1793
#, c-format
msgid "SSL connection (cipher: %s, bits: %d)\n"
msgstr "SSL连接 (加密:%s,二进制位: %d)\n"
# startup.c:652
-#: command.c:1733
+#: command.c:1803
#, c-format
msgid "SSL connection (unknown cipher)\n"
msgstr "SSL连接 (未知加密)\n"
-#: command.c:1754
+#: command.c:1824
#, c-format
msgid ""
"WARNING: Console code page (%u) differs from Windows code page (%u)\n"
@@ -374,7 +416,7 @@ msgstr ""
" 8-bit 字元可能无法正常工作。查阅 psql 参考\n"
" 页 \"Windows 用户注意事项\" 的详细说明。\n"
-#: command.c:1838
+#: command.c:1908
#, c-format
msgid ""
"environment variable PSQL_EDITOR_LINENUMBER_ARG must be set to specify a "
@@ -382,31 +424,31 @@ msgid ""
msgstr "必须设置环境变量 PSQL_EDITOR_LINENUMBER_ARG,用于指定行号\n"
# command.c:1103
-#: command.c:1875
+#: command.c:1945
#, c-format
msgid "could not start editor \"%s\"\n"
msgstr "无法启动编辑器 \"%s\"\n"
# command.c:1105
-#: command.c:1877
+#: command.c:1947
#, c-format
msgid "could not start /bin/sh\n"
msgstr "无法启动 /bin/sh\n"
# command.c:1148
-#: command.c:1915
+#: command.c:1985
#, c-format
msgid "could not locate temporary directory: %s\n"
msgstr "找不到暂存目录:%s\n"
# command.c:1148
-#: command.c:1942
+#: command.c:2012
#, c-format
msgid "could not open temporary file \"%s\": %s\n"
msgstr "无法开启暂存档 \"%s\": %s\n"
# command.c:1340
-#: command.c:2197
+#: command.c:2274
#, c-format
msgid ""
"\\pset: allowed formats are unaligned, aligned, wrapped, html, latex, troff-"
@@ -415,200 +457,219 @@ msgstr ""
"\\pset:可以使用的格式有unaligned, aligned, wrapped, html, latex, troff-ms\n"
# command.c:1345
-#: command.c:2202
+#: command.c:2279
#, c-format
msgid "Output format is %s.\n"
msgstr "输出格式是 %s。\n"
-#: command.c:2218
+#: command.c:2295
#, c-format
msgid "\\pset: allowed line styles are ascii, old-ascii, unicode\n"
msgstr "\\pset: 所允许使用的文本风格是ASCII, OLD-ASCII, UNICODE\n"
# command.c:1355
-#: command.c:2223
+#: command.c:2300
#, c-format
msgid "Line style is %s.\n"
msgstr "文本的风格是%s. \n"
# command.c:1355
-#: command.c:2234
+#: command.c:2311
#, c-format
msgid "Border style is %d.\n"
msgstr "边界风格是 %d。\n"
# command.c:1364
-#: command.c:2249
+#: command.c:2326
#, c-format
msgid "Expanded display is on.\n"
msgstr "扩展显示已打开。\n"
# command.c:1364
-#: command.c:2251
+#: command.c:2328
#, c-format
msgid "Expanded display is used automatically.\n"
msgstr "扩展显示已自动打开。\n"
# command.c:1365
-#: command.c:2253
+#: command.c:2330
#, c-format
msgid "Expanded display is off.\n"
msgstr "扩展显示已关闭。\n"
-#: command.c:2267
+#: command.c:2344
msgid "Showing locale-adjusted numeric output."
msgstr "显示语言环境调整后的数字输出。"
-#: command.c:2269
+#: command.c:2346
msgid "Locale-adjusted numeric output is off."
msgstr "语言环境调整后的数值输出关闭。"
# command.c:1377
-#: command.c:2282
+#: command.c:2359
#, c-format
msgid "Null display is \"%s\".\n"
msgstr " \"%s\" 是空值显示。\n"
# command.c:1389
-#: command.c:2297 command.c:2309
+#: command.c:2374 command.c:2386
#, c-format
msgid "Field separator is zero byte.\n"
msgstr "栏位分隔符号是0字节\n"
# command.c:1389
-#: command.c:2299
+#: command.c:2376
#, c-format
msgid "Field separator is \"%s\".\n"
msgstr "栏位分隔符号是 \"%s\"。\n"
# command.c:1405
-#: command.c:2324 command.c:2338
+#: command.c:2401 command.c:2415
#, c-format
msgid "Record separator is zero byte.\n"
msgstr "记录分隔符号是 0字节。\n"
# command.c:1403
-#: command.c:2326
+#: command.c:2403
#, c-format
msgid "Record separator is <newline>."
msgstr "记录分隔符号是 <newline>。"
# command.c:1405
-#: command.c:2328
+#: command.c:2405
#, c-format
msgid "Record separator is \"%s\".\n"
msgstr "记录分隔符号是 \"%s\"。\n"
# command.c:1416
-#: command.c:2351
+#: command.c:2428
msgid "Showing only tuples."
msgstr "只显示 Tuples。"
# command.c:1418
-#: command.c:2353
+#: command.c:2430
msgid "Tuples only is off."
msgstr "关闭只显示 Tuples。"
# command.c:1434
-#: command.c:2369
+#: command.c:2446
#, c-format
msgid "Title is \"%s\".\n"
msgstr "标题是 \"%s\"。\n"
# command.c:1436
-#: command.c:2371
+#: command.c:2448
#, c-format
msgid "Title is unset.\n"
msgstr "无标题。\n"
# command.c:1452
-#: command.c:2387
+#: command.c:2464
#, c-format
msgid "Table attribute is \"%s\".\n"
msgstr "资料表属性是 \"%s\"。\n"
# command.c:1454
-#: command.c:2389
+#: command.c:2466
#, c-format
msgid "Table attributes unset.\n"
msgstr "未设置资料表属性。\n"
# command.c:1470
-#: command.c:2410
+#: command.c:2487
msgid "Pager is used for long output."
msgstr "显示大量资料时使用分页器。"
# command.c:1472
-#: command.c:2412
+#: command.c:2489
msgid "Pager is always used."
msgstr "总是使用分页器。"
# command.c:1474
-#: command.c:2414
+#: command.c:2491
msgid "Pager usage is off."
msgstr "不使用分页器。"
# command.c:1485
-#: command.c:2428
+#: command.c:2505
msgid "Default footer is on."
msgstr "打开预设步进器(Footer)。"
# command.c:1487
-#: command.c:2430
+#: command.c:2507
msgid "Default footer is off."
msgstr "关闭预设步进器(Footer)。"
-#: command.c:2441
+#: command.c:2518
#, c-format
msgid "Target width is %d.\n"
msgstr "目标宽度为 %d.\n"
# command.c:1493
-#: command.c:2446
+#: command.c:2523
#, c-format
msgid "\\pset: unknown option: %s\n"
msgstr "\\pset: 不明选项: %s\n"
# command.c:1532
-#: command.c:2500
+#: command.c:2577
#, c-format
msgid "\\!: failed\n"
msgstr "\\!:失败\n"
-# common.c:78
-#: common.c:45
+#: command.c:2597 command.c:2656
+#, c-format
+msgid "\\watch cannot be used with an empty query\n"
+msgstr "\\watch命令不能用于空查询\n"
+
+#: command.c:2619
+#, c-format
+msgid "Watch every %lds\t%s"
+msgstr "Watch命令每%lds\t%s调用一次"
+
+#: command.c:2663
+#, c-format
+msgid "\\watch cannot be used with COPY\n"
+msgstr "\\watch不能用于COPY命令中\n"
+
+# fe-exec.c:1371
+#: command.c:2669
#, c-format
-msgid "%s: pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgstr "%s:pg_strdup : 无法复制空指标 (内部错误)\n"
+#| msgid "unexpected PQresultStatus: %d\n"
+msgid "unexpected result status for \\watch\n"
+msgstr "\\Watch出现意外的结果状态\n"
# common.c:298
-#: common.c:352
+#: common.c:287
#, c-format
msgid "connection to server was lost\n"
msgstr "与资料库的连线遗失\n"
# common.c:302
-#: common.c:356
+#: common.c:291
+#, c-format
msgid "The connection to the server was lost. Attempting reset: "
msgstr "与伺服器的连线已遗失,尝试重置: "
# common.c:307
-#: common.c:361
+#: common.c:296
+#, c-format
msgid "Failed.\n"
msgstr "失败。\n"
# common.c:314
-#: common.c:368
+#: common.c:303
+#, c-format
msgid "Succeeded.\n"
msgstr "完成。\n"
# fe-exec.c:1371
-#: common.c:468 common.c:692 common.c:822
+#: common.c:403 common.c:683 common.c:816
#, c-format
msgid "unexpected PQresultStatus: %d\n"
msgstr "意外的 PQresultStatus: %d\n"
-#: common.c:517 common.c:524 common.c:883
+#: common.c:452 common.c:459 common.c:877
#, c-format
msgid ""
"********* QUERY **********\n"
@@ -622,7 +683,7 @@ msgstr ""
"\n"
# common.c:691
-#: common.c:578
+#: common.c:513
#, c-format
msgid ""
"Asynchronous notification \"%s\" with payload \"%s\" received from server "
@@ -631,14 +692,33 @@ msgstr ""
"从PID为%3$d的服务器进程接收到带有字节流量\"%2$s\"的异步通知消息\"%1$s\".\n"
# common.c:691
-#: common.c:581
+#: common.c:516
#, c-format
msgid ""
"Asynchronous notification \"%s\" received from server process with PID %d.\n"
msgstr "收到来自伺服器 \"%s\" 进程 PID %d 非同步通知。\n"
+#: common.c:578
+#, c-format
+#| msgid "%s: no data returned from server\n"
+msgid "no rows returned for \\gset\n"
+msgstr "\\gset没有记录行返回\n"
+
+#: common.c:583
+#, c-format
+#| msgid "more than one operator named %s"
+msgid "more than one row returned for \\gset\n"
+msgstr "\\gset返回超过1个记录行\n"
+
+# startup.c:502
+#: common.c:611
+#, c-format
+#| msgid "%s: could not set variable \"%s\"\n"
+msgid "could not set variable \"%s\"\n"
+msgstr "无法设定变量 \"%s\"\n"
+
# common.c:879
-#: common.c:865
+#: common.c:859
#, c-format
msgid ""
"***(Single step mode: verify command)"
@@ -653,7 +733,7 @@ msgstr ""
"***(按 Enter 键继续或键入 x 来取消)********************\n"
# describe.c:117
-#: common.c:916
+#: common.c:910
#, c-format
msgid ""
"The server (version %d.%d) does not support savepoints for "
@@ -661,58 +741,70 @@ msgid ""
msgstr "服务器(版本 %d.%d)不支持保存点(Savepoint)ON_ERROR_ROLLBACK。\n"
# large_obj.c:58
-#: common.c:1010
+#: common.c:1004
#, c-format
msgid "unexpected transaction status (%d)\n"
msgstr "意外的事务状态值 (%d)\n"
# common.c:930
-#: common.c:1037
+#: common.c:1032
#, c-format
msgid "Time: %.3f ms\n"
msgstr "时间:%.3f ms\n"
# copy.c:122
-#: copy.c:96
+#: copy.c:100
#, c-format
msgid "\\copy: arguments required\n"
msgstr "\\copy:需要参数\n"
# copy.c:408
-#: copy.c:228
+#: copy.c:255
#, c-format
msgid "\\copy: parse error at \"%s\"\n"
msgstr "\\copy:在 \"%s\" 发生解读错误\n"
# copy.c:410
-#: copy.c:230
+#: copy.c:257
#, c-format
msgid "\\copy: parse error at end of line\n"
msgstr "\\copy:在行尾发生解读错误\n"
+#: copy.c:339
+#, c-format
+#| msgid "%s: could not execute command \"%s\": %s\n"
+msgid "could not execute command \"%s\": %s\n"
+msgstr "无法执行命令 \"%s\": %s\n"
+
# copy.c:541
-#: copy.c:299
+#: copy.c:355
#, c-format
msgid "%s: cannot copy from/to a directory\n"
msgstr "%s:无法从目录复制或复制到目录\n"
+#: copy.c:389
+#, c-format
+#| msgid "could not close compression stream: %s\n"
+msgid "could not close pipe to external command: %s\n"
+msgstr "无法为外部命令: %s关闭管道\n"
+
# command.c:1103
-#: copy.c:373 copy.c:383
+#: copy.c:457 copy.c:467
#, c-format
msgid "could not write COPY data: %s\n"
msgstr "无法写入 COPY 资料:%s\n"
-#: copy.c:390
+#: copy.c:474
#, c-format
msgid "COPY data transfer failed: %s"
msgstr "COPY 资料转换失败:%s"
-#: copy.c:460
+#: copy.c:544
msgid "canceled by user"
msgstr "依用户取消"
# copy.c:668
-#: copy.c:470
+#: copy.c:554
msgid ""
"Enter data to be copied followed by a newline.\n"
"End with a backslash and a period on a line by itself."
@@ -720,11 +812,11 @@ msgstr ""
"输入要复制的资料并且换行。\n"
"在独立的一行上输入一个反斜线和一个句点结束。"
-#: copy.c:583
+#: copy.c:667
msgid "aborted because of read failure"
msgstr "因读取失败已被中止"
-#: copy.c:603
+#: copy.c:687
msgid "trying to exit copy mode"
msgstr "正在尝试退出"
@@ -737,11 +829,11 @@ msgstr "正在尝试退出"
# describe.c:1476
# describe.c:1585
# describe.c:1633
-#: describe.c:71 describe.c:247 describe.c:474 describe.c:601 describe.c:722
-#: describe.c:804 describe.c:873 describe.c:2619 describe.c:2820
-#: describe.c:2909 describe.c:3086 describe.c:3222 describe.c:3449
-#: describe.c:3521 describe.c:3532 describe.c:3591 describe.c:3999
-#: describe.c:4078
+#: describe.c:71 describe.c:247 describe.c:478 describe.c:605 describe.c:737
+#: describe.c:822 describe.c:891 describe.c:2666 describe.c:2870
+#: describe.c:2959 describe.c:3197 describe.c:3333 describe.c:3560
+#: describe.c:3632 describe.c:3643 describe.c:3702 describe.c:4110
+#: describe.c:4189
msgid "Schema"
msgstr "架构模式"
@@ -757,12 +849,12 @@ msgstr "架构模式"
# describe.c:1586
# describe.c:1634
# describe.c:1727
-#: describe.c:72 describe.c:149 describe.c:157 describe.c:248 describe.c:475
-#: describe.c:602 describe.c:652 describe.c:723 describe.c:874 describe.c:2620
-#: describe.c:2742 describe.c:2821 describe.c:2910 describe.c:3087
-#: describe.c:3150 describe.c:3223 describe.c:3450 describe.c:3522
-#: describe.c:3533 describe.c:3592 describe.c:3781 describe.c:3862
-#: describe.c:4076
+#: describe.c:72 describe.c:149 describe.c:157 describe.c:248 describe.c:479
+#: describe.c:606 describe.c:656 describe.c:738 describe.c:892 describe.c:2667
+#: describe.c:2792 describe.c:2871 describe.c:2960 describe.c:3038
+#: describe.c:3198 describe.c:3261 describe.c:3334 describe.c:3561
+#: describe.c:3633 describe.c:3644 describe.c:3703 describe.c:3892
+#: describe.c:3973 describe.c:4187
msgid "Name"
msgstr "名称"
@@ -786,13 +878,14 @@ msgstr "参数资料型别"
# describe.c:1488
# describe.c:1733
# large_obj.c:256
-#: describe.c:98 describe.c:170 describe.c:349 describe.c:517 describe.c:606
-#: describe.c:677 describe.c:876 describe.c:1413 describe.c:2437
-#: describe.c:2652 describe.c:2773 describe.c:2847 describe.c:2919
-#: describe.c:3003 describe.c:3094 describe.c:3159 describe.c:3224
-#: describe.c:3360 describe.c:3399 describe.c:3466 describe.c:3525
-#: describe.c:3534 describe.c:3593 describe.c:3807 describe.c:3884
-#: describe.c:4013 describe.c:4079 large_obj.c:291 large_obj.c:301
+#: describe.c:98 describe.c:170 describe.c:353 describe.c:521 describe.c:610
+#: describe.c:681 describe.c:894 describe.c:1442 describe.c:2471
+#: describe.c:2700 describe.c:2823 describe.c:2897 describe.c:2969
+#: describe.c:3047 describe.c:3114 describe.c:3205 describe.c:3270
+#: describe.c:3335 describe.c:3471 describe.c:3510 describe.c:3577
+#: describe.c:3636 describe.c:3645 describe.c:3704 describe.c:3918
+#: describe.c:3995 describe.c:4124 describe.c:4190 large_obj.c:291
+#: large_obj.c:301
msgid "Description"
msgstr "描述"
@@ -812,9 +905,9 @@ msgstr "服务器(版本%d.%d) 不支持使用表空间.\n"
# describe.c:362
# describe.c:1478
# describe.c:1727
-#: describe.c:150 describe.c:158 describe.c:346 describe.c:653 describe.c:803
-#: describe.c:2628 describe.c:2746 describe.c:3151 describe.c:3782
-#: describe.c:3863 large_obj.c:290
+#: describe.c:150 describe.c:158 describe.c:350 describe.c:657 describe.c:821
+#: describe.c:2676 describe.c:2796 describe.c:3040 describe.c:3262
+#: describe.c:3893 describe.c:3974 large_obj.c:290
msgid "Owner"
msgstr "拥有者"
@@ -848,7 +941,7 @@ msgid "window"
msgstr "窗口"
# describe.c:575
-#: describe.c:265 describe.c:310 describe.c:327 describe.c:987
+#: describe.c:265 describe.c:310 describe.c:327 describe.c:1005
msgid "trigger"
msgstr "触发器"
@@ -861,94 +954,108 @@ msgstr "常规"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: describe.c:267 describe.c:312 describe.c:329 describe.c:726 describe.c:813
-#: describe.c:1385 describe.c:2627 describe.c:2822 describe.c:3881
+#: describe.c:267 describe.c:312 describe.c:329 describe.c:744 describe.c:831
+#: describe.c:1411 describe.c:2675 describe.c:2872 describe.c:3992
msgid "Type"
msgstr "型别"
+# sql_help.h:221
+#: describe.c:343
+#| msgid "define a cursor"
+msgid "definer"
+msgstr "定义者"
+
+#: describe.c:344
+msgid "invoker"
+msgstr "调用者"
+
+#: describe.c:345
+msgid "Security"
+msgstr "安全"
+
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:342
+#: describe.c:346
msgid "immutable"
msgstr "不可改变"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:343
+#: describe.c:347
msgid "stable"
msgstr "稳定"
-#: describe.c:344
+#: describe.c:348
msgid "volatile"
msgstr "不稳定性"
-#: describe.c:345
+#: describe.c:349
msgid "Volatility"
msgstr "挥发性"
# describe.c:186
-#: describe.c:347
+#: describe.c:351
msgid "Language"
msgstr "程序语言"
# describe.c:187
-#: describe.c:348
+#: describe.c:352
msgid "Source code"
msgstr "原始程式"
# describe.c:221
-#: describe.c:446
+#: describe.c:450
msgid "List of functions"
msgstr "函数列表"
# describe.c:257
-#: describe.c:485
+#: describe.c:489
msgid "Internal name"
msgstr "内部名称"
# describe.c:257
-#: describe.c:486 describe.c:669 describe.c:2644 describe.c:2648
+#: describe.c:490 describe.c:673 describe.c:2692 describe.c:2696
msgid "Size"
msgstr "大小"
-#: describe.c:507
+#: describe.c:511
msgid "Elements"
msgstr "成员"
# describe.c:289
-#: describe.c:557
+#: describe.c:561
msgid "List of data types"
msgstr "资料型别列表"
# describe.c:321
-#: describe.c:603
+#: describe.c:607
msgid "Left arg type"
msgstr "左参数型别"
# describe.c:321
-#: describe.c:604
+#: describe.c:608
msgid "Right arg type"
msgstr "右参数型别"
# describe.c:322
-#: describe.c:605
+#: describe.c:609
msgid "Result type"
msgstr "结果型别"
# describe.c:336
-#: describe.c:624
+#: describe.c:628
msgid "List of operators"
msgstr "运算子列表"
# describe.c:365
-#: describe.c:654
+#: describe.c:658
msgid "Encoding"
msgstr "字元编码"
# describe.c:128
-#: describe.c:659 describe.c:3088
+#: describe.c:663 describe.c:3199
msgid "Collate"
msgstr "校对规则"
@@ -956,69 +1063,73 @@ msgstr "校对规则"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: describe.c:660 describe.c:3089
+#: describe.c:664 describe.c:3200
msgid "Ctype"
msgstr "Ctype"
# describe.c:1342
-#: describe.c:673
+#: describe.c:677
msgid "Tablespace"
msgstr "表空间"
# describe.c:381
-#: describe.c:690
+#: describe.c:699
msgid "List of databases"
msgstr "资料库列表"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:724 describe.c:808 describe.c:2624
-msgid "sequence"
-msgstr "序列数"
-
-# describe.c:415
-# describe.c:543
-# describe.c:1477
-#: describe.c:724 describe.c:806 describe.c:2621
+#: describe.c:739 describe.c:824 describe.c:2668
msgid "table"
msgstr "资料表"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:724 describe.c:2622
+#: describe.c:740 describe.c:2669
msgid "view"
msgstr "视观表"
+#: describe.c:741 describe.c:2670
+msgid "materialized view"
+msgstr "物化视图"
+
+# describe.c:415
+# describe.c:543
+# describe.c:1477
+#: describe.c:742 describe.c:826 describe.c:2672
+msgid "sequence"
+msgstr "序列数"
+
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:725 describe.c:2626
+#: describe.c:743 describe.c:2674
msgid "foreign table"
msgstr "所引用的外表"
# sql_help.h:325
-#: describe.c:737
+#: describe.c:755
msgid "Column access privileges"
msgstr "列访问权限"
# describe.c:133
# describe.c:415
# describe.c:1733
-#: describe.c:763 describe.c:4223 describe.c:4227
+#: describe.c:781 describe.c:4334 describe.c:4338
msgid "Access privileges"
msgstr "存取权限"
# describe.c:117
-#: describe.c:791
+#: describe.c:809
#, c-format
msgid ""
"The server (version %d.%d) does not support altering default privileges.\n"
msgstr "服务器(版本%d.%d)不支持修改缺省权限.\n"
# describe.c:498
-#: describe.c:810
+#: describe.c:828
msgid "function"
msgstr "函数"
@@ -1026,670 +1137,729 @@ msgstr "函数"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: describe.c:812
+#: describe.c:830
msgid "type"
msgstr "类型Ctype"
# sql_help.h:325
-#: describe.c:836
+#: describe.c:854
msgid "Default access privileges"
msgstr "缺省的访问权限"
# describe.c:469
-#: describe.c:875
+#: describe.c:893
msgid "Object"
msgstr "物件"
-#: describe.c:889 sql_help.c:1351
+#: describe.c:907 sql_help.c:1447
msgid "constraint"
msgstr "约束"
-#: describe.c:916
+#: describe.c:934
msgid "operator class"
msgstr "操作符类"
# sql_help.h:269
-#: describe.c:945
+#: describe.c:963
msgid "operator family"
msgstr "操作符家族"
# describe.c:559
-#: describe.c:967
+#: describe.c:985
msgid "rule"
msgstr "规则"
# describe.c:593
-#: describe.c:1009
+#: describe.c:1027
msgid "Object descriptions"
msgstr "物件描述"
# describe.c:641
-#: describe.c:1062
+#: describe.c:1080
#, c-format
msgid "Did not find any relation named \"%s\".\n"
msgstr "没有找到任何名称为 \"%s\" 的关联。\n"
# describe.c:728
-#: describe.c:1235
+#: describe.c:1253
#, c-format
msgid "Did not find any relation with OID %s.\n"
msgstr "没有找到任何OID为 %s 的关联。\n"
# describe.c:933
-#: describe.c:1337
+#: describe.c:1355
#, c-format
msgid "Unlogged table \"%s.%s\""
msgstr "不记录日志的表 \"%s.%s\""
# describe.c:859
-#: describe.c:1340
+#: describe.c:1358
#, c-format
msgid "Table \"%s.%s\""
msgstr "资料表 \"%s.%s\""
# describe.c:863
-#: describe.c:1344
+#: describe.c:1362
#, c-format
msgid "View \"%s.%s\""
msgstr "视观表 \"%s.%s\""
+# describe.c:933
+#: describe.c:1367
+#, c-format
+#| msgid "Unlogged table \"%s.%s\""
+msgid "Unlogged materialized view \"%s.%s\""
+msgstr "不记录日志的物化视图 \"%s.%s\""
+
+#: describe.c:1370
+#, c-format
+#| msgid "analyzing \"%s.%s\""
+msgid "Materialized view \"%s.%s\""
+msgstr "物化视图 \"%s.%s\""
+
# describe.c:867
-#: describe.c:1348
+#: describe.c:1374
#, c-format
msgid "Sequence \"%s.%s\""
msgstr "序列数 \"%s.%s\""
# describe.c:871
-#: describe.c:1353
+#: describe.c:1379
#, c-format
msgid "Unlogged index \"%s.%s\""
msgstr "不记录日志的索引 \"%s.%s\""
# describe.c:871
-#: describe.c:1356
+#: describe.c:1382
#, c-format
msgid "Index \"%s.%s\""
msgstr "索引 \"%s.%s\""
# describe.c:875
-#: describe.c:1361
+#: describe.c:1387
#, c-format
msgid "Special relation \"%s.%s\""
msgstr "特殊关联 \"%s.%s\""
# describe.c:879
-#: describe.c:1365
+#: describe.c:1391
#, c-format
msgid "TOAST table \"%s.%s\""
msgstr "TOAST 资料表 \"%s.%s\""
# describe.c:883
-#: describe.c:1369
+#: describe.c:1395
#, c-format
msgid "Composite type \"%s.%s\""
msgstr "合成型别 \"%s.%s\""
# describe.c:933
-#: describe.c:1373
+#: describe.c:1399
#, c-format
msgid "Foreign table \"%s.%s\""
msgstr "引用的外部表 \"%s.%s\""
# describe.c:744
-#: describe.c:1384
+#: describe.c:1410
msgid "Column"
msgstr "栏位"
# describe.c:752
-#: describe.c:1392
+#: describe.c:1419
msgid "Modifiers"
msgstr "修饰词"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: describe.c:1397
+#: describe.c:1424
msgid "Value"
msgstr "值"
# describe.c:1636
-#: describe.c:1400
+#: describe.c:1427
msgid "Definition"
msgstr "定义"
-#: describe.c:1403 describe.c:3802 describe.c:3883 describe.c:3951
-#: describe.c:4012
+#: describe.c:1430 describe.c:3913 describe.c:3994 describe.c:4062
+#: describe.c:4123
msgid "FDW Options"
msgstr "FDW选项"
# describe.c:1635
-#: describe.c:1407
+#: describe.c:1434
msgid "Storage"
msgstr "存储"
-#: describe.c:1409
+#: describe.c:1437
msgid "Stats target"
msgstr "统计目标"
-#: describe.c:1458
+#: describe.c:1487
#, c-format
msgid "collate %s"
msgstr "校对%s"
-#: describe.c:1466
+#: describe.c:1495
msgid "not null"
msgstr "非空"
# describe.c:1639
#. translator: default values of column definitions
-#: describe.c:1476
+#: describe.c:1505
#, c-format
msgid "default %s"
msgstr "缺省 %s"
# describe.c:925
-#: describe.c:1582
+#: describe.c:1613
msgid "primary key, "
msgstr "主键(PK),"
# describe.c:927
-#: describe.c:1584
+#: describe.c:1615
msgid "unique, "
msgstr "唯一的,"
# describe.c:933
-#: describe.c:1590
+#: describe.c:1621
#, c-format
msgid "for table \"%s.%s\""
msgstr "给资料表 \"%s.%s\""
# describe.c:937
-#: describe.c:1594
+#: describe.c:1625
#, c-format
msgid ", predicate (%s)"
msgstr ", 叙述 (%s)"
# describe.c:940
-#: describe.c:1597
+#: describe.c:1628
msgid ", clustered"
msgstr ", 已丛集"
-#: describe.c:1600
+#: describe.c:1631
msgid ", invalid"
msgstr ", 无效的"
-#: describe.c:1603
+#: describe.c:1634
msgid ", deferrable"
msgstr ",可延迟"
-#: describe.c:1606
+#: describe.c:1637
msgid ", initially deferred"
msgstr ",开始被延迟"
-# describe.c:977
-#: describe.c:1620
-msgid "View definition:"
-msgstr "视图定义:"
-
-# describe.c:983
-# describe.c:1204
-#: describe.c:1637 describe.c:1959
-msgid "Rules:"
-msgstr "规则:"
-
-#: describe.c:1679
+#: describe.c:1672
#, c-format
msgid "Owned by: %s"
msgstr "属于: %s"
# describe.c:1138
-#: describe.c:1734
+#: describe.c:1728
msgid "Indexes:"
msgstr "索引:"
# describe.c:1174
-#: describe.c:1815
+#: describe.c:1809
msgid "Check constraints:"
msgstr "检查约束限制"
# describe.c:1189
-#: describe.c:1846
+#: describe.c:1840
msgid "Foreign-key constraints:"
msgstr "外部键(FK)限制:"
-#: describe.c:1877
+#: describe.c:1871
msgid "Referenced by:"
msgstr "由引用:"
-#: describe.c:1962
+# describe.c:983
+# describe.c:1204
+#: describe.c:1953 describe.c:2003
+msgid "Rules:"
+msgstr "规则:"
+
+#: describe.c:1956
msgid "Disabled rules:"
msgstr "已停用规则:"
-#: describe.c:1965
+#: describe.c:1959
msgid "Rules firing always:"
msgstr "永远触发规则"
-#: describe.c:1968
+#: describe.c:1962
msgid "Rules firing on replica only:"
msgstr "只有在复制时触发规则:"
+# describe.c:977
+#: describe.c:1986
+msgid "View definition:"
+msgstr "视图定义:"
+
# describe.c:1223
-#: describe.c:2076
+#: describe.c:2109
msgid "Triggers:"
msgstr "触发器:"
-#: describe.c:2079
+#: describe.c:2112
msgid "Disabled triggers:"
msgstr "停用触发器:"
-#: describe.c:2082
+#: describe.c:2115
msgid "Triggers firing always:"
msgstr "永远激活触发器"
-#: describe.c:2085
+#: describe.c:2118
msgid "Triggers firing on replica only:"
msgstr "只有在复制时激活触发器"
# describe.c:1245
-#: describe.c:2163
+#: describe.c:2197
msgid "Inherits"
msgstr "继承"
-#: describe.c:2202
+#: describe.c:2236
#, c-format
msgid "Number of child tables: %d (Use \\d+ to list them.)"
msgstr "子表的数量:%d(可以使用 \\d+ 来列出它们)"
-#: describe.c:2209
+#: describe.c:2243
msgid "Child tables"
msgstr "子表"
-#: describe.c:2231
+#: describe.c:2265
#, c-format
msgid "Typed table of type: %s"
msgstr "类型的已确定类型表(typed table):%s"
# describe.c:1259
-#: describe.c:2238
+#: describe.c:2272
msgid "Has OIDs"
msgstr "有 OIDs"
# describe.c:1262
# describe.c:1638
# describe.c:1692
-#: describe.c:2241 describe.c:2913 describe.c:2995
+#: describe.c:2275 describe.c:2963 describe.c:3106
msgid "no"
msgstr "否"
# describe.c:1262
# describe.c:1637
# describe.c:1694
-#: describe.c:2241 describe.c:2913 describe.c:2997
+#: describe.c:2275 describe.c:2963 describe.c:3108
msgid "yes"
msgstr "是"
-#: describe.c:2254
+#: describe.c:2288
msgid "Options"
msgstr "选项"
# describe.c:1342
-#: describe.c:2332
+#: describe.c:2366
#, c-format
msgid "Tablespace: \"%s\""
msgstr "表空间:\"%s\""
# describe.c:1342
-#: describe.c:2345
+#: describe.c:2379
#, c-format
msgid ", tablespace \"%s\""
msgstr ", 表空间 \"%s\""
# describe.c:1431
-#: describe.c:2430
+#: describe.c:2464
msgid "List of roles"
msgstr "角色列表"
# describe.c:1375
-#: describe.c:2432
+#: describe.c:2466
msgid "Role name"
msgstr "角色名称"
-#: describe.c:2433
+#: describe.c:2467
msgid "Attributes"
msgstr "属性"
-#: describe.c:2434
+#: describe.c:2468
msgid "Member of"
msgstr "成员属于"
# describe.c:1377
-#: describe.c:2445
+#: describe.c:2479
msgid "Superuser"
msgstr "超级用户"
-#: describe.c:2448
+#: describe.c:2482
msgid "No inheritance"
msgstr "没有继承"
-#: describe.c:2451
+#: describe.c:2485
msgid "Create role"
msgstr "建立角色"
-#: describe.c:2454
+#: describe.c:2488
msgid "Create DB"
msgstr "建立 DB"
-#: describe.c:2457
+#: describe.c:2491
msgid "Cannot login"
msgstr "无法登录"
# describe.c:1636
-#: describe.c:2461
+#: describe.c:2495
msgid "Replication"
msgstr "复制"
# help.c:123
-#: describe.c:2470
+#: describe.c:2504
msgid "No connections"
msgstr "没有连接"
# help.c:123
-#: describe.c:2472
+#: describe.c:2506
#, c-format
msgid "%d connection"
msgid_plural "%d connections"
msgstr[0] "%d个连接"
-#: describe.c:2482
+#: describe.c:2516
msgid "Password valid until "
msgstr "密码有效直至"
-#: describe.c:2547
+# describe.c:1375
+#: describe.c:2572
+#, fuzzy
+#| msgid "Role name"
+msgid "Role"
+msgstr "角色名称"
+
+#: describe.c:2573
+#| msgid "database %s"
+msgid "Database"
+msgstr "数据库"
+
+#: describe.c:2574
+msgid "Settings"
+msgstr "设置"
+
+#: describe.c:2584
#, c-format
msgid "No per-database role settings support in this server version.\n"
msgstr "在这个版本的服务器中不支持对每个数据库的角色进行设定.\n"
# describe.c:1542
-#: describe.c:2558
+#: describe.c:2595
#, c-format
msgid "No matching settings found.\n"
msgstr "没有找到所匹配的设置.\n"
# describe.c:1544
-#: describe.c:2560
+#: describe.c:2597
#, c-format
msgid "No settings found.\n"
msgstr "没有找到设置.\n"
# describe.c:1549
-#: describe.c:2565
+#: describe.c:2602
msgid "List of settings"
msgstr "设置的列表"
# describe.c:543
# describe.c:1477
-#: describe.c:2623
+#: describe.c:2671
msgid "index"
msgstr "索引"
# describe.c:1478
-#: describe.c:2625
+#: describe.c:2673
msgid "special"
msgstr "特殊"
# describe.c:1483
-#: describe.c:2633 describe.c:4000
+#: describe.c:2681 describe.c:4111
msgid "Table"
msgstr "资料表"
# describe.c:1542
-#: describe.c:2707
+#: describe.c:2757
#, c-format
msgid "No matching relations found.\n"
msgstr "没有找到符合的关联。\n"
# describe.c:1544
-#: describe.c:2709
+#: describe.c:2759
#, c-format
msgid "No relations found.\n"
msgstr "找不到关联。\n"
# describe.c:1549
-#: describe.c:2714
+#: describe.c:2764
msgid "List of relations"
msgstr "关联列表"
-#: describe.c:2750
+#: describe.c:2800
msgid "Trusted"
msgstr "信任"
# describe.c:257
-#: describe.c:2758
+#: describe.c:2808
msgid "Internal Language"
msgstr "内部语言"
-#: describe.c:2759
+#: describe.c:2809
msgid "Call Handler"
msgstr "调用函数"
-#: describe.c:2760 describe.c:3789
+#: describe.c:2810 describe.c:3900
msgid "Validator"
msgstr "验证"
-#: describe.c:2763
+#: describe.c:2813
msgid "Inline Handler"
msgstr "内联函数"
# describe.c:1431
-#: describe.c:2791
+#: describe.c:2841
msgid "List of languages"
msgstr "语言列表"
# describe.c:1588
-#: describe.c:2835
+#: describe.c:2885
msgid "Modifier"
msgstr "修饰词"
-#: describe.c:2836
+#: describe.c:2886
msgid "Check"
msgstr "检查"
# describe.c:1602
-#: describe.c:2878
+#: describe.c:2928
msgid "List of domains"
msgstr "共同值域列表"
# describe.c:1635
-#: describe.c:2911
+#: describe.c:2961
msgid "Source"
msgstr "来源"
# describe.c:1636
-#: describe.c:2912
+#: describe.c:2962
msgid "Destination"
msgstr "目的地"
# describe.c:1639
-#: describe.c:2914
+#: describe.c:2964
msgid "Default?"
msgstr "预设?"
# describe.c:1653
-#: describe.c:2951
+#: describe.c:3001
msgid "List of conversions"
msgstr "字元编码转换列表"
+#: describe.c:3039
+#, fuzzy
+#| msgid "event"
+msgid "Event"
+msgstr "事件"
+
+# describe.c:415
+# describe.c:543
+# describe.c:1477
+#: describe.c:3041
+#| msgid "table"
+msgid "Enabled"
+msgstr "使能"
+
+#: describe.c:3042
+#, fuzzy
+#| msgid "Procedural Languages"
+msgid "Procedure"
+msgstr "过程语言"
+
+#: describe.c:3043
+msgid "Tags"
+msgstr "标签"
+
+# describe.c:1549
+#: describe.c:3062
+#| msgid "List of settings"
+msgid "List of event triggers"
+msgstr "事件触发器列表"
+
# describe.c:1688
-#: describe.c:2992
+#: describe.c:3103
msgid "Source type"
msgstr "来源型别"
# describe.c:1689
-#: describe.c:2993
+#: describe.c:3104
msgid "Target type"
msgstr "目标型别"
# describe.c:1691
-#: describe.c:2994 describe.c:3359
+#: describe.c:3105 describe.c:3470
msgid "Function"
msgstr "函数"
# describe.c:1693
-#: describe.c:2996
+#: describe.c:3107
msgid "in assignment"
msgstr "在指派中"
# describe.c:1695
-#: describe.c:2998
+#: describe.c:3109
msgid "Implicit?"
msgstr "隐含的?"
# describe.c:1703
-#: describe.c:3049
+#: describe.c:3160
msgid "List of casts"
msgstr "型别转换列表"
# describe.c:117
-#: describe.c:3074
+#: describe.c:3185
#, c-format
msgid "The server (version %d.%d) does not support collations.\n"
msgstr "服务器(版本%d.%d)不支持排序校对。\n"
# describe.c:1549
-#: describe.c:3124
+#: describe.c:3235
msgid "List of collations"
msgstr "校对列表"
# describe.c:1753
-#: describe.c:3182
+#: describe.c:3293
msgid "List of schemas"
msgstr "架构模式列表"
# describe.c:117
-#: describe.c:3205 describe.c:3438 describe.c:3506 describe.c:3574
+#: describe.c:3316 describe.c:3549 describe.c:3617 describe.c:3685
#, c-format
msgid "The server (version %d.%d) does not support full text search.\n"
msgstr "服务器(版本%d.%d)不支持使用全文搜索.\n"
# describe.c:150
-#: describe.c:3239
+#: describe.c:3350
msgid "List of text search parsers"
msgstr "文本剖析器列表"
# describe.c:641
-#: describe.c:3282
+#: describe.c:3393
#, c-format
msgid "Did not find any text search parser named \"%s\".\n"
msgstr "没有找到任何命名为 \"%s\" 的文本剖析器。\n"
-#: describe.c:3357
+#: describe.c:3468
msgid "Start parse"
msgstr "开始剖析"
-#: describe.c:3358
+#: describe.c:3469
msgid "Method"
msgstr "方法"
-#: describe.c:3362
+#: describe.c:3473
msgid "Get next token"
msgstr "取得下一个标志符"
-#: describe.c:3364
+#: describe.c:3475
msgid "End parse"
msgstr "结束剖析"
-#: describe.c:3366
+#: describe.c:3477
msgid "Get headline"
msgstr "取得首行"
-#: describe.c:3368
+#: describe.c:3479
msgid "Get token types"
msgstr "取得标志符型别"
-#: describe.c:3378
+#: describe.c:3489
#, c-format
msgid "Text search parser \"%s.%s\""
msgstr "文本搜寻剖析器 \"%s.%s\""
-#: describe.c:3380
+#: describe.c:3491
#, c-format
msgid "Text search parser \"%s\""
msgstr "文本搜寻剖析器 \"%s\""
# describe.c:1375
-#: describe.c:3398
+#: describe.c:3509
msgid "Token name"
msgstr "标志名称"
-#: describe.c:3409
+#: describe.c:3520
#, c-format
msgid "Token types for parser \"%s.%s\""
msgstr "标志符别型给剖析器 \"%s.%s\""
-#: describe.c:3411
+#: describe.c:3522
#, c-format
msgid "Token types for parser \"%s\""
msgstr "标志符型别给剖析器 \"%s\""
-#: describe.c:3460
+#: describe.c:3571
msgid "Template"
msgstr "模版"
# help.c:88
-#: describe.c:3461
+#: describe.c:3572
msgid "Init options"
msgstr "初始选项"
# describe.c:1549
-#: describe.c:3483
+#: describe.c:3594
msgid "List of text search dictionaries"
msgstr "文本搜寻字典列表"
-#: describe.c:3523
+#: describe.c:3634
msgid "Init"
msgstr "初始化"
# describe.c:257
-#: describe.c:3524
+#: describe.c:3635
msgid "Lexize"
msgstr "词汇"
# describe.c:1753
-#: describe.c:3551
+#: describe.c:3662
msgid "List of text search templates"
msgstr "文本搜寻样式列表"
# describe.c:97
-#: describe.c:3608
+#: describe.c:3719
msgid "List of text search configurations"
msgstr "文本搜寻组态列表"
# describe.c:641
-#: describe.c:3652
+#: describe.c:3763
#, c-format
msgid "Did not find any text search configuration named \"%s\".\n"
msgstr "没有找到任何命名为 \"%s\" 的文本搜寻组态。\n"
-#: describe.c:3718
+#: describe.c:3829
msgid "Token"
msgstr "标志符"
-#: describe.c:3719
+#: describe.c:3830
msgid "Dictionaries"
msgstr "字典"
-#: describe.c:3730
+#: describe.c:3841
#, c-format
msgid "Text search configuration \"%s.%s\""
msgstr "文本搜寻组态 \"%s.%s\""
-#: describe.c:3733
+#: describe.c:3844
#, c-format
msgid "Text search configuration \"%s\""
msgstr "文本搜寻组态 \"%s\""
# describe.c:859
-#: describe.c:3737
+#: describe.c:3848
#, c-format
msgid ""
"\n"
@@ -1699,7 +1869,7 @@ msgstr ""
"剖析器:\"%s.%s\""
# describe.c:1342
-#: describe.c:3740
+#: describe.c:3851
#, c-format
msgid ""
"\n"
@@ -1709,99 +1879,99 @@ msgstr ""
"剖析器:\"%s\""
# describe.c:117
-#: describe.c:3772
+#: describe.c:3883
#, c-format
msgid "The server (version %d.%d) does not support foreign-data wrappers.\n"
msgstr "服务器(版本%d.%d)不支持使用外部数据封装器。\n"
-#: describe.c:3786
+#: describe.c:3897
msgid "Handler"
msgstr "处理函数"
# describe.c:289
-#: describe.c:3829
+#: describe.c:3940
msgid "List of foreign-data wrappers"
msgstr "外部数据封装器列表"
# describe.c:117
-#: describe.c:3852
+#: describe.c:3963
#, c-format
msgid "The server (version %d.%d) does not support foreign servers.\n"
msgstr "服务器(版本%d.%d)不支持使用外部服务器.\n"
-#: describe.c:3864
+#: describe.c:3975
msgid "Foreign-data wrapper"
msgstr "外部数据封装器"
-#: describe.c:3882 describe.c:4077
+#: describe.c:3993 describe.c:4188
msgid "Version"
msgstr "版本"
# describe.c:1653
-#: describe.c:3908
+#: describe.c:4019
msgid "List of foreign servers"
msgstr "外部服务器列表"
# describe.c:117
-#: describe.c:3931
+#: describe.c:4042
#, c-format
msgid "The server (version %d.%d) does not support user mappings.\n"
msgstr "服务器(版本%d.%d)不支持使用用户映射。\n"
# describe.c:1377
-#: describe.c:3940 describe.c:4001
+#: describe.c:4051 describe.c:4112
msgid "Server"
msgstr "服务器"
-#: describe.c:3941
+#: describe.c:4052
msgid "User name"
msgstr "用户名: "
# describe.c:1602
-#: describe.c:3966
+#: describe.c:4077
msgid "List of user mappings"
msgstr "列出用户映射"
# describe.c:117
-#: describe.c:3989
+#: describe.c:4100
#, c-format
msgid "The server (version %d.%d) does not support foreign tables.\n"
msgstr "服务器(版本%d.%d)不支持使用引用表.\n"
# describe.c:1653
-#: describe.c:4040
+#: describe.c:4151
msgid "List of foreign tables"
msgstr "引用表列表"
# describe.c:117
-#: describe.c:4063 describe.c:4117
+#: describe.c:4174 describe.c:4228
#, c-format
msgid "The server (version %d.%d) does not support extensions.\n"
msgstr "服务器(版本%d.%d) 不支持使用扩展.\n"
# describe.c:1653
-#: describe.c:4094
+#: describe.c:4205
msgid "List of installed extensions"
msgstr "已安装扩展列表"
# describe.c:641
-#: describe.c:4144
+#: describe.c:4255
#, c-format
msgid "Did not find any extension named \"%s\".\n"
msgstr "没有找到任何名称为 \"%s\" 的扩展。\n"
# describe.c:641
-#: describe.c:4147
+#: describe.c:4258
#, c-format
msgid "Did not find any extensions.\n"
msgstr "没有找到任何扩展.\n"
# describe.c:593
-#: describe.c:4191
+#: describe.c:4302
msgid "Object Description"
msgstr "对象描述"
-#: describe.c:4200
+#: describe.c:4311
#, c-format
msgid "Objects in extension \"%s\""
msgstr "对象用于扩展 \"%s\""
@@ -1898,12 +2068,16 @@ msgstr " -X, --no-psqlrc 不读取启动文档(~/.psqlrc)\n"
#: help.c:99
#, c-format
+#| msgid ""
+#| " -1 (\"one\"), --single-transaction\n"
+#| " execute command file as a single transaction\n"
msgid ""
" -1 (\"one\"), --single-transaction\n"
-" execute command file as a single transaction\n"
+" execute as a single transaction (if non-"
+"interactive)\n"
msgstr ""
" -1 (\"one\"), --single-transaction\n"
-" 作为一个单一事务来执行命令文件\n"
+" 作为一个单一事务来执行命令文件(如果是非交互型的)\n"
#: help.c:101
#, c-format
@@ -2139,27 +2313,37 @@ msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
msgstr "臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
# help.c:174
-#: help.c:174
+#: help.c:172
#, c-format
msgid "General\n"
msgstr "一般性\n"
# help.c:179
-#: help.c:175
+#: help.c:173
#, c-format
msgid ""
" \\copyright show PostgreSQL usage and distribution terms\n"
msgstr " \\copyright 显示PostgreSQL的使用和发行许可条款\n"
# help.c:194
-#: help.c:176
+#: help.c:174
#, c-format
msgid ""
" \\g [FILE] or ; execute query (and send results to file or |pipe)\n"
msgstr " \\g [文件] or; 执行查询 (并把结果写入文件或 |管道)\n"
+# help.c:194
+#: help.c:175
+#, c-format
+#| msgid ""
+#| " \\g [FILE] or ; execute query (and send results to file or |"
+#| "pipe)\n"
+msgid ""
+" \\gset [PREFIX] execute query and store results in psql variables\n"
+msgstr " \\gset [PREFIX] 执行查询并把结果存到psql变量中\n"
+
# help.c:182
-#: help.c:177
+#: help.c:176
#, c-format
msgid ""
" \\h [NAME] help on syntax of SQL commands, * for all "
@@ -2167,11 +2351,16 @@ msgid ""
msgstr " \\h [名称] SQL命令语法上的说明,用*显示全部命令的语法说明\n"
# help.c:183
-#: help.c:178
+#: help.c:177
#, c-format
msgid " \\q quit psql\n"
msgstr " \\q 退出 psql\n"
+#: help.c:178
+#, c-format
+msgid " \\watch [SEC] execute query every SEC seconds\n"
+msgstr " \\watch [SEC] 每隔SEC秒执行一次查询\n"
+
# help.c:192
#: help.c:181
#, c-format
@@ -2412,113 +2601,129 @@ msgstr " \\dL[S+] [PATTERN] 列出所有过程语言\n"
# help.c:228
#: help.c:225
#, c-format
+#| msgid " \\dv[S+] [PATTERN] list views\n"
+msgid " \\dm[S+] [PATTERN] list materialized views\n"
+msgstr " \\dm[S+] [PATTERN] 列出所有物化视图\n"
+
+# help.c:228
+#: help.c:226
+#, c-format
msgid " \\dn[S+] [PATTERN] list schemas\n"
msgstr " \\dn[S+] [PATTERN] 列出所有模式\n"
# help.c:224
-#: help.c:226
+#: help.c:227
#, c-format
msgid " \\do[S] [PATTERN] list operators\n"
msgstr " \\do[S] [模式] 列出运算符\n"
# help.c:220
-#: help.c:227
+#: help.c:228
#, c-format
msgid " \\dO[S+] [PATTERN] list collations\n"
msgstr " \\dO[S+] [PATTERN] 列出所有校对规则\n"
# help.c:226
-#: help.c:228
+#: help.c:229
#, c-format
msgid ""
" \\dp [PATTERN] list table, view, and sequence access privileges\n"
msgstr " \\dp [模式] 列出表,视图和序列的访问权限\n"
-#: help.c:229
+#: help.c:230
#, c-format
msgid " \\drds [PATRN1 [PATRN2]] list per-database role settings\n"
msgstr " \\drds [模式1 [模式2]] 列出每个数据库的角色设置\n"
# help.c:228
-#: help.c:230
+#: help.c:231
#, c-format
msgid " \\ds[S+] [PATTERN] list sequences\n"
msgstr " \\ds[S+] [模式] 列出序列\n"
# help.c:228
-#: help.c:231
+#: help.c:232
#, c-format
msgid " \\dt[S+] [PATTERN] list tables\n"
msgstr " \\dt[S+] [模式] 列出表\n"
# help.c:220
-#: help.c:232
+#: help.c:233
#, c-format
msgid " \\dT[S+] [PATTERN] list data types\n"
msgstr " \\dT[S+] [模式] 列出数据类型\n"
# help.c:228
-#: help.c:233
+#: help.c:234
#, c-format
msgid " \\du[+] [PATTERN] list roles\n"
msgstr " \\du[+] [PATTERN] 列出角色\n"
# help.c:228
-#: help.c:234
+#: help.c:235
#, c-format
msgid " \\dv[S+] [PATTERN] list views\n"
msgstr " \\dv[S+] [模式] 列出视图\n"
# help.c:228
-#: help.c:235
+#: help.c:236
#, c-format
msgid " \\dE[S+] [PATTERN] list foreign tables\n"
msgstr " \\dE[S+] [PATTERN] 列出引用表\n"
# help.c:217
-#: help.c:236
+#: help.c:237
#, c-format
msgid " \\dx[+] [PATTERN] list extensions\n"
msgstr " \\dx[+] [PATTERN] 列出扩展\n"
-#: help.c:237
+# help.c:218
+#: help.c:238
+#, c-format
+#| msgid " \\ddp [PATTERN] list default privileges\n"
+msgid " \\dy [PATTERN] list event triggers\n"
+msgstr " \\dy [PATTERN] 列出所有事件触发器\n"
+
+# help.c:228
+#: help.c:239
#, c-format
-msgid " \\l[+] list all databases\n"
-msgstr " \\l[+] 列出所有的数据库\n"
+#| msgid " \\dt[S+] [PATTERN] list tables\n"
+msgid " \\l[+] [PATTERN] list databases\n"
+msgstr " \\l[+] [PATTERN] 列出所有数据库\n"
# help.c:193
-#: help.c:238
+#: help.c:240
#, c-format
msgid " \\sf[+] FUNCNAME show a function's definition\n"
msgstr " \\sf[+] FUNCNAME 显示函数定义\n"
# help.c:218
-#: help.c:239
+#: help.c:241
#, c-format
msgid " \\z [PATTERN] same as \\dp\n"
msgstr " \\z [模式] 和\\dp的功能相同\n"
# help.c:233
-#: help.c:242
+#: help.c:244
#, c-format
msgid "Formatting\n"
msgstr "格式化\n"
# help.c:234
-#: help.c:243
+#: help.c:245
#, c-format
msgid ""
" \\a toggle between unaligned and aligned output mode\n"
msgstr " \\a 在非对齐模式和对齐模式之间切换\n"
# help.c:235
-#: help.c:244
+#: help.c:246
#, c-format
msgid " \\C [STRING] set table title, or unset if none\n"
msgstr " \\C [字符串] 设置表的标题,或如果没有的标题就取消\n"
# help.c:236
-#: help.c:245
+#: help.c:247
#, c-format
msgid ""
" \\f [STRING] show or set field separator for unaligned query "
@@ -2526,13 +2731,13 @@ msgid ""
msgstr " \\f [字符串] 显示或设定非对齐模式查询输出的字段分隔符\n"
# help.c:237
-#: help.c:246
+#: help.c:248
#, c-format
msgid " \\H toggle HTML output mode (currently %s)\n"
msgstr " \\H 切换HTML输出模式 (目前是 %s)\n"
# help.c:239
-#: help.c:248
+#: help.c:250
#, c-format
msgid ""
" \\pset NAME [VALUE] set table output option\n"
@@ -2548,13 +2753,13 @@ msgstr ""
"title|tableattr|pager})\n"
# help.c:243
-#: help.c:251
+#: help.c:253
#, c-format
msgid " \\t [on|off] show only rows (currently %s)\n"
msgstr " \\t [开|关] 只显示记录 (目前是 %s)\n"
# help.c:245
-#: help.c:253
+#: help.c:255
#, c-format
msgid ""
" \\T [STRING] set HTML <table> tag attributes, or unset if none\n"
@@ -2562,19 +2767,19 @@ msgstr ""
" \\T [字符串] 设置HTML <表格>标签属性, 或者如果没有的话取消设置\n"
# help.c:246
-#: help.c:254
+#: help.c:256
#, c-format
msgid " \\x [on|off|auto] toggle expanded output (currently %s)\n"
msgstr " \\x [on|off|auto] 切换扩展输出模式(目前是 %s)\n"
# help.c:123
-#: help.c:258
+#: help.c:260
#, c-format
msgid "Connection\n"
msgstr "连接\n"
# help.c:175
-#: help.c:259
+#: help.c:262
#, c-format
msgid ""
" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
@@ -2583,67 +2788,80 @@ msgstr ""
" \\c[onnect] [数据库名称|- 用户名称|- 主机|- 端口|-]\n"
" 连接到新的数据库(目前是 \"%s\")\n"
+# help.c:175
+#: help.c:266
+#, c-format
+#| msgid ""
+#| " \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
+#| " connect to new database (currently \"%s\")\n"
+msgid ""
+" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
+" connect to new database (currently no connection)\n"
+msgstr ""
+" \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
+" 连接到新的数据库(当前没有连接)\n"
+
# help.c:180
-#: help.c:262
+#: help.c:268
#, c-format
msgid " \\encoding [ENCODING] show or set client encoding\n"
msgstr " \\encoding [编码名称] 显示或设定客户端编码\n"
-#: help.c:263
+#: help.c:269
#, c-format
msgid " \\password [USERNAME] securely change the password for a user\n"
msgstr " \\password [USERNAME] 安全地为用户改变口令\n"
-#: help.c:264
+#: help.c:270
#, c-format
msgid ""
" \\conninfo display information about current connection\n"
msgstr " \\conninfo 显示当前连接的相关信息\n"
-#: help.c:267
+#: help.c:273
#, c-format
msgid "Operating System\n"
msgstr "操作系统\n"
# help.c:178
-#: help.c:268
+#: help.c:274
#, c-format
msgid " \\cd [DIR] change the current working directory\n"
msgstr " \\cd [目录] 改变目前的工作目录\n"
# help.c:188
-#: help.c:269
+#: help.c:275
#, c-format
msgid " \\setenv NAME [VALUE] set or unset environment variable\n"
msgstr " \\setenv NAME [VALUE] 设置或清空环境变量\n"
# help.c:186
-#: help.c:270
+#: help.c:276
#, c-format
msgid " \\timing [on|off] toggle timing of commands (currently %s)\n"
msgstr " \\timing [开|关] 切换命令计时开关 (目前是 %s)\n"
# help.c:189
-#: help.c:272
+#: help.c:278
#, c-format
msgid ""
" \\! [COMMAND] execute command in shell or start interactive "
"shell\n"
msgstr " \\! [命令] 在 shell中执行命令或启动一个交互式shell\n"
-#: help.c:275
+#: help.c:281
#, c-format
msgid "Variables\n"
msgstr "变量\n"
# help.c:188
-#: help.c:276
+#: help.c:282
#, c-format
msgid " \\prompt [TEXT] NAME prompt user to set internal variable\n"
msgstr " \\prompt [文本] 名称 提示用户设定内部变量\n"
# help.c:184
-#: help.c:277
+#: help.c:283
#, c-format
msgid ""
" \\set [NAME [VALUE]] set internal variable, or list all if no "
@@ -2651,19 +2869,19 @@ msgid ""
msgstr " \\set [名称 [值数]] 设定内部变量,若无参数则列出全部变量\n"
# help.c:188
-#: help.c:278
+#: help.c:284
#, c-format
msgid " \\unset NAME unset (delete) internal variable\n"
msgstr " \\unset 名称 清空(删除)内部变量\n"
# large_obj.c:264
-#: help.c:281
+#: help.c:287
#, c-format
msgid "Large Objects\n"
msgstr "大对象\n"
# help.c:252
-#: help.c:282
+#: help.c:288
#, c-format
msgid ""
" \\lo_export LOBOID FILE\n"
@@ -2677,12 +2895,12 @@ msgstr ""
" \\lo_unlink LOBOID 大对象运算\n"
# help.c:285
-#: help.c:329
+#: help.c:335
msgid "Available help:\n"
msgstr "可用的说明:\n"
# help.c:344
-#: help.c:413
+#: help.c:419
#, c-format
msgid ""
"Command: %s\n"
@@ -2698,7 +2916,7 @@ msgstr ""
"\n"
# help.c:357
-#: help.c:429
+#: help.c:435
#, c-format
msgid ""
"No help available for \"%s\".\n"
@@ -2779,54 +2997,54 @@ msgstr ""
" \\q 退出\n"
# print.c:1202
-#: print.c:305
+#: print.c:272
#, c-format
msgid "(%lu row)"
msgid_plural "(%lu rows)"
msgstr[0] "(%lu 行记录)"
# print.c:428
-#: print.c:1204
+#: print.c:1175
#, c-format
msgid "(No rows)\n"
msgstr "(无资料列)\n"
-#: print.c:2110
+#: print.c:2239
#, c-format
msgid "Interrupted\n"
msgstr "已中断\n"
-#: print.c:2179
+#: print.c:2305
#, c-format
msgid "Cannot add header to table content: column count of %d exceeded.\n"
msgstr "无法对表的内容增加标题:已经超过%d列的数量.\n"
-#: print.c:2219
+#: print.c:2345
#, c-format
msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
msgstr "无法对表的内容添加单元: 总共有%d个单元超过.\n"
-#: print.c:2439
+#: print.c:2571
#, c-format
msgid "invalid output format (internal error): %d"
msgstr "无效的输出格式 (内部错误): %d"
-#: psqlscan.l:704
+#: psqlscan.l:726
#, c-format
msgid "skipping recursive expansion of variable \"%s\"\n"
msgstr "跳过变量 \"%s\"的递归扩展\n"
-#: psqlscan.l:1579
+#: psqlscan.l:1601
#, c-format
msgid "unterminated quoted string\n"
msgstr "未结束的引用字符串\n"
-#: psqlscan.l:1679
+#: psqlscan.l:1701
#, c-format
msgid "%s: out of memory\n"
msgstr "%s: 内存溢出\n"
-#: psqlscan.l:1908
+#: psqlscan.l:1930
#, c-format
msgid "can't escape without active connection\n"
msgstr "没有数据库连接时无法escape\n"
@@ -2848,118 +3066,124 @@ msgstr "没有数据库连接时无法escape\n"
#: sql_help.c:91 sql_help.c:93 sql_help.c:95 sql_help.c:97 sql_help.c:100
#: sql_help.c:102 sql_help.c:104 sql_help.c:197 sql_help.c:199 sql_help.c:200
#: sql_help.c:202 sql_help.c:204 sql_help.c:207 sql_help.c:209 sql_help.c:211
-#: sql_help.c:213 sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:256
-#: sql_help.c:302 sql_help.c:307 sql_help.c:309 sql_help.c:338 sql_help.c:340
-#: sql_help.c:343 sql_help.c:345 sql_help.c:393 sql_help.c:398 sql_help.c:403
-#: sql_help.c:408 sql_help.c:446 sql_help.c:448 sql_help.c:450 sql_help.c:453
-#: sql_help.c:463 sql_help.c:465 sql_help.c:484 sql_help.c:488 sql_help.c:501
-#: sql_help.c:504 sql_help.c:507 sql_help.c:527 sql_help.c:539 sql_help.c:547
-#: sql_help.c:550 sql_help.c:553 sql_help.c:583 sql_help.c:589 sql_help.c:591
-#: sql_help.c:595 sql_help.c:598 sql_help.c:601 sql_help.c:611 sql_help.c:613
-#: sql_help.c:630 sql_help.c:639 sql_help.c:641 sql_help.c:643 sql_help.c:655
-#: sql_help.c:659 sql_help.c:661 sql_help.c:722 sql_help.c:724 sql_help.c:727
-#: sql_help.c:730 sql_help.c:732 sql_help.c:790 sql_help.c:792 sql_help.c:794
-#: sql_help.c:797 sql_help.c:818 sql_help.c:821 sql_help.c:824 sql_help.c:827
-#: sql_help.c:831 sql_help.c:833 sql_help.c:835 sql_help.c:837 sql_help.c:851
-#: sql_help.c:854 sql_help.c:856 sql_help.c:858 sql_help.c:868 sql_help.c:870
-#: sql_help.c:880 sql_help.c:882 sql_help.c:891 sql_help.c:912 sql_help.c:914
-#: sql_help.c:916 sql_help.c:919 sql_help.c:921 sql_help.c:923 sql_help.c:961
-#: sql_help.c:967 sql_help.c:969 sql_help.c:972 sql_help.c:974 sql_help.c:976
-#: sql_help.c:1003 sql_help.c:1006 sql_help.c:1008 sql_help.c:1010
-#: sql_help.c:1012 sql_help.c:1014 sql_help.c:1017 sql_help.c:1057
-#: sql_help.c:1240 sql_help.c:1248 sql_help.c:1292 sql_help.c:1296
-#: sql_help.c:1306 sql_help.c:1324 sql_help.c:1347 sql_help.c:1379
-#: sql_help.c:1426 sql_help.c:1468 sql_help.c:1490 sql_help.c:1510
-#: sql_help.c:1511 sql_help.c:1528 sql_help.c:1548 sql_help.c:1570
-#: sql_help.c:1598 sql_help.c:1619 sql_help.c:1649 sql_help.c:1830
-#: sql_help.c:1843 sql_help.c:1860 sql_help.c:1876 sql_help.c:1899
-#: sql_help.c:1950 sql_help.c:1954 sql_help.c:1956 sql_help.c:1962
-#: sql_help.c:1980 sql_help.c:2007 sql_help.c:2041 sql_help.c:2053
-#: sql_help.c:2062 sql_help.c:2106 sql_help.c:2124 sql_help.c:2132
-#: sql_help.c:2140 sql_help.c:2148 sql_help.c:2156 sql_help.c:2164
-#: sql_help.c:2172 sql_help.c:2181 sql_help.c:2192 sql_help.c:2200
-#: sql_help.c:2208 sql_help.c:2216 sql_help.c:2226 sql_help.c:2235
-#: sql_help.c:2244 sql_help.c:2252 sql_help.c:2260 sql_help.c:2269
-#: sql_help.c:2277 sql_help.c:2285 sql_help.c:2293 sql_help.c:2301
-#: sql_help.c:2309 sql_help.c:2317 sql_help.c:2325 sql_help.c:2333
-#: sql_help.c:2341 sql_help.c:2350 sql_help.c:2358 sql_help.c:2375
-#: sql_help.c:2390 sql_help.c:2596 sql_help.c:2647 sql_help.c:2674
-#: sql_help.c:3040 sql_help.c:3088 sql_help.c:3196
+#: sql_help.c:213 sql_help.c:225 sql_help.c:226 sql_help.c:227 sql_help.c:229
+#: sql_help.c:268 sql_help.c:270 sql_help.c:272 sql_help.c:274 sql_help.c:322
+#: sql_help.c:327 sql_help.c:329 sql_help.c:360 sql_help.c:362 sql_help.c:365
+#: sql_help.c:367 sql_help.c:420 sql_help.c:425 sql_help.c:430 sql_help.c:435
+#: sql_help.c:473 sql_help.c:475 sql_help.c:477 sql_help.c:480 sql_help.c:490
+#: sql_help.c:492 sql_help.c:530 sql_help.c:532 sql_help.c:535 sql_help.c:537
+#: sql_help.c:562 sql_help.c:566 sql_help.c:579 sql_help.c:582 sql_help.c:585
+#: sql_help.c:605 sql_help.c:617 sql_help.c:625 sql_help.c:628 sql_help.c:631
+#: sql_help.c:661 sql_help.c:667 sql_help.c:669 sql_help.c:673 sql_help.c:676
+#: sql_help.c:679 sql_help.c:688 sql_help.c:699 sql_help.c:701 sql_help.c:718
+#: sql_help.c:727 sql_help.c:729 sql_help.c:731 sql_help.c:743 sql_help.c:747
+#: sql_help.c:749 sql_help.c:810 sql_help.c:812 sql_help.c:815 sql_help.c:818
+#: sql_help.c:820 sql_help.c:878 sql_help.c:880 sql_help.c:882 sql_help.c:885
+#: sql_help.c:906 sql_help.c:909 sql_help.c:912 sql_help.c:915 sql_help.c:919
+#: sql_help.c:921 sql_help.c:923 sql_help.c:925 sql_help.c:939 sql_help.c:942
+#: sql_help.c:944 sql_help.c:946 sql_help.c:956 sql_help.c:958 sql_help.c:968
+#: sql_help.c:970 sql_help.c:979 sql_help.c:1000 sql_help.c:1002
+#: sql_help.c:1004 sql_help.c:1007 sql_help.c:1009 sql_help.c:1011
+#: sql_help.c:1049 sql_help.c:1055 sql_help.c:1057 sql_help.c:1060
+#: sql_help.c:1062 sql_help.c:1064 sql_help.c:1091 sql_help.c:1094
+#: sql_help.c:1096 sql_help.c:1098 sql_help.c:1100 sql_help.c:1102
+#: sql_help.c:1105 sql_help.c:1145 sql_help.c:1336 sql_help.c:1344
+#: sql_help.c:1388 sql_help.c:1392 sql_help.c:1402 sql_help.c:1420
+#: sql_help.c:1443 sql_help.c:1461 sql_help.c:1489 sql_help.c:1548
+#: sql_help.c:1590 sql_help.c:1612 sql_help.c:1632 sql_help.c:1633
+#: sql_help.c:1668 sql_help.c:1688 sql_help.c:1710 sql_help.c:1738
+#: sql_help.c:1759 sql_help.c:1794 sql_help.c:1975 sql_help.c:1988
+#: sql_help.c:2005 sql_help.c:2021 sql_help.c:2044 sql_help.c:2095
+#: sql_help.c:2099 sql_help.c:2101 sql_help.c:2107 sql_help.c:2125
+#: sql_help.c:2152 sql_help.c:2186 sql_help.c:2198 sql_help.c:2207
+#: sql_help.c:2251 sql_help.c:2269 sql_help.c:2277 sql_help.c:2285
+#: sql_help.c:2293 sql_help.c:2301 sql_help.c:2309 sql_help.c:2317
+#: sql_help.c:2325 sql_help.c:2334 sql_help.c:2345 sql_help.c:2353
+#: sql_help.c:2361 sql_help.c:2369 sql_help.c:2377 sql_help.c:2387
+#: sql_help.c:2396 sql_help.c:2405 sql_help.c:2413 sql_help.c:2421
+#: sql_help.c:2430 sql_help.c:2438 sql_help.c:2446 sql_help.c:2454
+#: sql_help.c:2462 sql_help.c:2470 sql_help.c:2478 sql_help.c:2486
+#: sql_help.c:2494 sql_help.c:2502 sql_help.c:2511 sql_help.c:2519
+#: sql_help.c:2536 sql_help.c:2551 sql_help.c:2757 sql_help.c:2808
+#: sql_help.c:2836 sql_help.c:2844 sql_help.c:3214 sql_help.c:3262
+#: sql_help.c:3370
msgid "name"
msgstr "名称"
# describe.c:1689
-#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:271 sql_help.c:396
-#: sql_help.c:401 sql_help.c:406 sql_help.c:411 sql_help.c:1127
-#: sql_help.c:1429 sql_help.c:2107 sql_help.c:2184 sql_help.c:2888
+#: sql_help.c:27 sql_help.c:30 sql_help.c:33 sql_help.c:290 sql_help.c:423
+#: sql_help.c:428 sql_help.c:433 sql_help.c:438 sql_help.c:1218
+#: sql_help.c:1551 sql_help.c:2252 sql_help.c:2337 sql_help.c:3061
msgid "argtype"
msgstr "参数类型"
#: sql_help.c:28 sql_help.c:45 sql_help.c:60 sql_help.c:92 sql_help.c:212
-#: sql_help.c:310 sql_help.c:344 sql_help.c:402 sql_help.c:435 sql_help.c:447
-#: sql_help.c:464 sql_help.c:503 sql_help.c:549 sql_help.c:590 sql_help.c:612
-#: sql_help.c:642 sql_help.c:662 sql_help.c:731 sql_help.c:791 sql_help.c:834
-#: sql_help.c:855 sql_help.c:869 sql_help.c:881 sql_help.c:893 sql_help.c:920
-#: sql_help.c:968 sql_help.c:1011
+#: sql_help.c:230 sql_help.c:330 sql_help.c:366 sql_help.c:429 sql_help.c:462
+#: sql_help.c:474 sql_help.c:491 sql_help.c:536 sql_help.c:581 sql_help.c:627
+#: sql_help.c:668 sql_help.c:690 sql_help.c:700 sql_help.c:730 sql_help.c:750
+#: sql_help.c:819 sql_help.c:879 sql_help.c:922 sql_help.c:943 sql_help.c:957
+#: sql_help.c:969 sql_help.c:981 sql_help.c:1008 sql_help.c:1056
+#: sql_help.c:1099
msgid "new_name"
msgstr "新的名称"
#: sql_help.c:31 sql_help.c:47 sql_help.c:62 sql_help.c:94 sql_help.c:210
-#: sql_help.c:308 sql_help.c:364 sql_help.c:407 sql_help.c:466 sql_help.c:475
-#: sql_help.c:487 sql_help.c:506 sql_help.c:552 sql_help.c:614 sql_help.c:640
-#: sql_help.c:660 sql_help.c:775 sql_help.c:793 sql_help.c:836 sql_help.c:857
-#: sql_help.c:915 sql_help.c:1009
+#: sql_help.c:228 sql_help.c:328 sql_help.c:391 sql_help.c:434 sql_help.c:493
+#: sql_help.c:502 sql_help.c:552 sql_help.c:565 sql_help.c:584 sql_help.c:630
+#: sql_help.c:702 sql_help.c:728 sql_help.c:748 sql_help.c:863 sql_help.c:881
+#: sql_help.c:924 sql_help.c:945 sql_help.c:1003 sql_help.c:1097
msgid "new_owner"
msgstr "新的属主"
-#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:214 sql_help.c:253
-#: sql_help.c:346 sql_help.c:412 sql_help.c:491 sql_help.c:509 sql_help.c:555
-#: sql_help.c:644 sql_help.c:733 sql_help.c:838 sql_help.c:859 sql_help.c:871
-#: sql_help.c:883 sql_help.c:922 sql_help.c:1013
+#: sql_help.c:34 sql_help.c:49 sql_help.c:64 sql_help.c:214 sql_help.c:271
+#: sql_help.c:368 sql_help.c:439 sql_help.c:538 sql_help.c:569 sql_help.c:587
+#: sql_help.c:633 sql_help.c:732 sql_help.c:821 sql_help.c:926 sql_help.c:947
+#: sql_help.c:959 sql_help.c:971 sql_help.c:1010 sql_help.c:1101
msgid "new_schema"
msgstr "新的模式"
-#: sql_help.c:88 sql_help.c:305 sql_help.c:362 sql_help.c:365 sql_help.c:584
-#: sql_help.c:657 sql_help.c:852 sql_help.c:962 sql_help.c:988 sql_help.c:1199
-#: sql_help.c:1204 sql_help.c:1382 sql_help.c:1399 sql_help.c:1402
-#: sql_help.c:1469 sql_help.c:1599 sql_help.c:1670 sql_help.c:1845
-#: sql_help.c:2008 sql_help.c:2030 sql_help.c:2409
+#: sql_help.c:88 sql_help.c:325 sql_help.c:389 sql_help.c:392 sql_help.c:662
+#: sql_help.c:745 sql_help.c:940 sql_help.c:1050 sql_help.c:1076
+#: sql_help.c:1293 sql_help.c:1299 sql_help.c:1492 sql_help.c:1516
+#: sql_help.c:1521 sql_help.c:1591 sql_help.c:1739 sql_help.c:1815
+#: sql_help.c:1990 sql_help.c:2153 sql_help.c:2175 sql_help.c:2570
msgid "option"
msgstr "选项"
-#: sql_help.c:89 sql_help.c:585 sql_help.c:963 sql_help.c:1470 sql_help.c:1600
-#: sql_help.c:2009
+#: sql_help.c:89 sql_help.c:663 sql_help.c:1051 sql_help.c:1592
+#: sql_help.c:1740 sql_help.c:2154
msgid "where option can be:"
msgstr "选项可以是"
-#: sql_help.c:90 sql_help.c:586 sql_help.c:964 sql_help.c:1331 sql_help.c:1601
-#: sql_help.c:2010
+#: sql_help.c:90 sql_help.c:664 sql_help.c:1052 sql_help.c:1427
+#: sql_help.c:1741 sql_help.c:2155
msgid "connlimit"
msgstr "连接限制"
# describe.c:1342
-#: sql_help.c:96 sql_help.c:776
+#: sql_help.c:96 sql_help.c:553 sql_help.c:864
msgid "new_tablespace"
msgstr "新的表空间"
# sql_help.h:366
-#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:416 sql_help.c:418
-#: sql_help.c:419 sql_help.c:593 sql_help.c:597 sql_help.c:600 sql_help.c:970
-#: sql_help.c:973 sql_help.c:975 sql_help.c:1437 sql_help.c:2691
-#: sql_help.c:3029
+#: sql_help.c:98 sql_help.c:101 sql_help.c:103 sql_help.c:443 sql_help.c:445
+#: sql_help.c:446 sql_help.c:671 sql_help.c:675 sql_help.c:678 sql_help.c:1058
+#: sql_help.c:1061 sql_help.c:1063 sql_help.c:1559 sql_help.c:2861
+#: sql_help.c:3203
msgid "configuration_parameter"
msgstr "配置参数"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:99 sql_help.c:306 sql_help.c:358 sql_help.c:363 sql_help.c:366
-#: sql_help.c:417 sql_help.c:452 sql_help.c:594 sql_help.c:658 sql_help.c:752
-#: sql_help.c:770 sql_help.c:796 sql_help.c:853 sql_help.c:971 sql_help.c:989
-#: sql_help.c:1383 sql_help.c:1400 sql_help.c:1403 sql_help.c:1438
-#: sql_help.c:1439 sql_help.c:1498 sql_help.c:1671 sql_help.c:1745
-#: sql_help.c:1753 sql_help.c:1785 sql_help.c:1807 sql_help.c:1846
-#: sql_help.c:2031 sql_help.c:3030 sql_help.c:3031
+#: sql_help.c:99 sql_help.c:326 sql_help.c:385 sql_help.c:390 sql_help.c:393
+#: sql_help.c:444 sql_help.c:479 sql_help.c:544 sql_help.c:550 sql_help.c:672
+#: sql_help.c:746 sql_help.c:840 sql_help.c:858 sql_help.c:884 sql_help.c:941
+#: sql_help.c:1059 sql_help.c:1077 sql_help.c:1493 sql_help.c:1517
+#: sql_help.c:1522 sql_help.c:1560 sql_help.c:1561 sql_help.c:1620
+#: sql_help.c:1652 sql_help.c:1816 sql_help.c:1890 sql_help.c:1898
+#: sql_help.c:1930 sql_help.c:1952 sql_help.c:1991 sql_help.c:2176
+#: sql_help.c:3204 sql_help.c:3205
msgid "value"
msgstr "值"
@@ -2967,9 +3191,9 @@ msgstr "值"
msgid "target_role"
msgstr "目标角色"
-#: sql_help.c:162 sql_help.c:1366 sql_help.c:1634 sql_help.c:2516
-#: sql_help.c:2523 sql_help.c:2537 sql_help.c:2543 sql_help.c:2786
-#: sql_help.c:2793 sql_help.c:2807 sql_help.c:2813
+#: sql_help.c:162 sql_help.c:1476 sql_help.c:1776 sql_help.c:1781
+#: sql_help.c:2677 sql_help.c:2684 sql_help.c:2698 sql_help.c:2704
+#: sql_help.c:2956 sql_help.c:2963 sql_help.c:2977 sql_help.c:2983
msgid "schema_name"
msgstr "模式名称"
@@ -2983,30 +3207,30 @@ msgstr "简写形式的可授予或回收权限是下列内容之一"
# describe.c:1375
#: sql_help.c:165 sql_help.c:166 sql_help.c:167 sql_help.c:168 sql_help.c:169
-#: sql_help.c:170 sql_help.c:171 sql_help.c:172 sql_help.c:1473
-#: sql_help.c:1474 sql_help.c:1475 sql_help.c:1476 sql_help.c:1477
-#: sql_help.c:1604 sql_help.c:1605 sql_help.c:1606 sql_help.c:1607
-#: sql_help.c:1608 sql_help.c:2013 sql_help.c:2014 sql_help.c:2015
-#: sql_help.c:2016 sql_help.c:2017 sql_help.c:2517 sql_help.c:2521
-#: sql_help.c:2524 sql_help.c:2526 sql_help.c:2528 sql_help.c:2530
-#: sql_help.c:2532 sql_help.c:2538 sql_help.c:2540 sql_help.c:2542
-#: sql_help.c:2544 sql_help.c:2546 sql_help.c:2548 sql_help.c:2549
-#: sql_help.c:2550 sql_help.c:2787 sql_help.c:2791 sql_help.c:2794
-#: sql_help.c:2796 sql_help.c:2798 sql_help.c:2800 sql_help.c:2802
-#: sql_help.c:2808 sql_help.c:2810 sql_help.c:2812 sql_help.c:2814
-#: sql_help.c:2816 sql_help.c:2818 sql_help.c:2819 sql_help.c:2820
-#: sql_help.c:3050
+#: sql_help.c:170 sql_help.c:171 sql_help.c:172 sql_help.c:1595
+#: sql_help.c:1596 sql_help.c:1597 sql_help.c:1598 sql_help.c:1599
+#: sql_help.c:1744 sql_help.c:1745 sql_help.c:1746 sql_help.c:1747
+#: sql_help.c:1748 sql_help.c:2158 sql_help.c:2159 sql_help.c:2160
+#: sql_help.c:2161 sql_help.c:2162 sql_help.c:2678 sql_help.c:2682
+#: sql_help.c:2685 sql_help.c:2687 sql_help.c:2689 sql_help.c:2691
+#: sql_help.c:2693 sql_help.c:2699 sql_help.c:2701 sql_help.c:2703
+#: sql_help.c:2705 sql_help.c:2707 sql_help.c:2709 sql_help.c:2710
+#: sql_help.c:2711 sql_help.c:2957 sql_help.c:2961 sql_help.c:2964
+#: sql_help.c:2966 sql_help.c:2968 sql_help.c:2970 sql_help.c:2972
+#: sql_help.c:2978 sql_help.c:2980 sql_help.c:2982 sql_help.c:2984
+#: sql_help.c:2986 sql_help.c:2988 sql_help.c:2989 sql_help.c:2990
+#: sql_help.c:3224
msgid "role_name"
msgstr "角色名称"
-#: sql_help.c:198 sql_help.c:743 sql_help.c:745 sql_help.c:1005
-#: sql_help.c:1350 sql_help.c:1354 sql_help.c:1494 sql_help.c:1757
-#: sql_help.c:1767 sql_help.c:1789 sql_help.c:2564 sql_help.c:2934
-#: sql_help.c:2935 sql_help.c:2939 sql_help.c:2944 sql_help.c:3004
-#: sql_help.c:3005 sql_help.c:3010 sql_help.c:3015 sql_help.c:3140
-#: sql_help.c:3141 sql_help.c:3145 sql_help.c:3150 sql_help.c:3222
-#: sql_help.c:3224 sql_help.c:3255 sql_help.c:3297 sql_help.c:3298
-#: sql_help.c:3302 sql_help.c:3307
+#: sql_help.c:198 sql_help.c:378 sql_help.c:831 sql_help.c:833 sql_help.c:1093
+#: sql_help.c:1446 sql_help.c:1450 sql_help.c:1616 sql_help.c:1902
+#: sql_help.c:1912 sql_help.c:1934 sql_help.c:2725 sql_help.c:3108
+#: sql_help.c:3109 sql_help.c:3113 sql_help.c:3118 sql_help.c:3178
+#: sql_help.c:3179 sql_help.c:3184 sql_help.c:3189 sql_help.c:3314
+#: sql_help.c:3315 sql_help.c:3319 sql_help.c:3324 sql_help.c:3396
+#: sql_help.c:3398 sql_help.c:3429 sql_help.c:3471 sql_help.c:3472
+#: sql_help.c:3476 sql_help.c:3481
msgid "expression"
msgstr "表达式"
@@ -3014,204 +3238,227 @@ msgstr "表达式"
msgid "domain_constraint"
msgstr "域_约束"
-#: sql_help.c:203 sql_help.c:205 sql_help.c:208 sql_help.c:728 sql_help.c:758
-#: sql_help.c:759 sql_help.c:778 sql_help.c:1116 sql_help.c:1353
-#: sql_help.c:1756 sql_help.c:1766
+#: sql_help.c:203 sql_help.c:205 sql_help.c:208 sql_help.c:816 sql_help.c:846
+#: sql_help.c:847 sql_help.c:866 sql_help.c:1206 sql_help.c:1449
+#: sql_help.c:1524 sql_help.c:1901 sql_help.c:1911
msgid "constraint_name"
msgstr "约束名称"
-#: sql_help.c:206 sql_help.c:729
+#: sql_help.c:206 sql_help.c:817
msgid "new_constraint_name"
msgstr "new_constraint_name(新约束名)"
-#: sql_help.c:251 sql_help.c:656
+#: sql_help.c:269 sql_help.c:744
msgid "new_version"
msgstr "新版本"
-#: sql_help.c:255 sql_help.c:257
+#: sql_help.c:273 sql_help.c:275
msgid "member_object"
msgstr "member_object"
-#: sql_help.c:258
+#: sql_help.c:276
msgid "where member_object is:"
msgstr "member_object的位置:"
-#: sql_help.c:259 sql_help.c:1109 sql_help.c:2880
+#: sql_help.c:277 sql_help.c:1199 sql_help.c:3052
msgid "agg_name"
msgstr "聚合函数名称"
# describe.c:1689
-#: sql_help.c:260 sql_help.c:1110 sql_help.c:2881
+#: sql_help.c:278 sql_help.c:1200 sql_help.c:3053
msgid "agg_type"
msgstr "聚合函数操作数据的类型"
# describe.c:1688
-#: sql_help.c:261 sql_help.c:1111 sql_help.c:1272 sql_help.c:1276
-#: sql_help.c:1278 sql_help.c:2115
+#: sql_help.c:279 sql_help.c:1201 sql_help.c:1368 sql_help.c:1372
+#: sql_help.c:1374 sql_help.c:2260
msgid "source_type"
msgstr "类型指派中的源数据类型"
# describe.c:1689
-#: sql_help.c:262 sql_help.c:1112 sql_help.c:1273 sql_help.c:1277
-#: sql_help.c:1279 sql_help.c:2116
+#: sql_help.c:280 sql_help.c:1202 sql_help.c:1369 sql_help.c:1373
+#: sql_help.c:1375 sql_help.c:2261
msgid "target_type"
msgstr "类型指派中的目标数据类型"
# describe.c:1375
-#: sql_help.c:263 sql_help.c:264 sql_help.c:265 sql_help.c:266 sql_help.c:267
-#: sql_help.c:275 sql_help.c:277 sql_help.c:279 sql_help.c:280 sql_help.c:281
-#: sql_help.c:282 sql_help.c:283 sql_help.c:284 sql_help.c:285 sql_help.c:286
-#: sql_help.c:287 sql_help.c:288 sql_help.c:289 sql_help.c:1113
-#: sql_help.c:1118 sql_help.c:1119 sql_help.c:1120 sql_help.c:1121
-#: sql_help.c:1122 sql_help.c:1123 sql_help.c:1128 sql_help.c:1133
-#: sql_help.c:1135 sql_help.c:1137 sql_help.c:1138 sql_help.c:1141
-#: sql_help.c:1142 sql_help.c:1143 sql_help.c:1144 sql_help.c:1145
-#: sql_help.c:1146 sql_help.c:1147 sql_help.c:1148 sql_help.c:1149
-#: sql_help.c:1152 sql_help.c:1153 sql_help.c:2877 sql_help.c:2882
-#: sql_help.c:2883 sql_help.c:2884 sql_help.c:2890 sql_help.c:2891
-#: sql_help.c:2892 sql_help.c:2893 sql_help.c:2894 sql_help.c:2895
-#: sql_help.c:2896
+#: sql_help.c:281 sql_help.c:282 sql_help.c:283 sql_help.c:284 sql_help.c:285
+#: sql_help.c:286 sql_help.c:291 sql_help.c:295 sql_help.c:297 sql_help.c:299
+#: sql_help.c:300 sql_help.c:301 sql_help.c:302 sql_help.c:303 sql_help.c:304
+#: sql_help.c:305 sql_help.c:306 sql_help.c:307 sql_help.c:308 sql_help.c:309
+#: sql_help.c:1203 sql_help.c:1208 sql_help.c:1209 sql_help.c:1210
+#: sql_help.c:1211 sql_help.c:1212 sql_help.c:1213 sql_help.c:1214
+#: sql_help.c:1219 sql_help.c:1221 sql_help.c:1225 sql_help.c:1227
+#: sql_help.c:1229 sql_help.c:1230 sql_help.c:1233 sql_help.c:1234
+#: sql_help.c:1235 sql_help.c:1236 sql_help.c:1237 sql_help.c:1238
+#: sql_help.c:1239 sql_help.c:1240 sql_help.c:1241 sql_help.c:1244
+#: sql_help.c:1245 sql_help.c:3049 sql_help.c:3054 sql_help.c:3055
+#: sql_help.c:3056 sql_help.c:3057 sql_help.c:3063 sql_help.c:3064
+#: sql_help.c:3065 sql_help.c:3066 sql_help.c:3067 sql_help.c:3068
+#: sql_help.c:3069 sql_help.c:3070
msgid "object_name"
msgstr "对象_名称"
# describe.c:498
-#: sql_help.c:268 sql_help.c:537 sql_help.c:1124 sql_help.c:1274
-#: sql_help.c:1309 sql_help.c:1529 sql_help.c:1560 sql_help.c:1904
-#: sql_help.c:2533 sql_help.c:2803 sql_help.c:2885 sql_help.c:2960
-#: sql_help.c:2965 sql_help.c:3166 sql_help.c:3171 sql_help.c:3323
-#: sql_help.c:3328
+#: sql_help.c:287 sql_help.c:615 sql_help.c:1215 sql_help.c:1370
+#: sql_help.c:1405 sql_help.c:1464 sql_help.c:1669 sql_help.c:1700
+#: sql_help.c:2049 sql_help.c:2694 sql_help.c:2973 sql_help.c:3058
+#: sql_help.c:3134 sql_help.c:3139 sql_help.c:3340 sql_help.c:3345
+#: sql_help.c:3497 sql_help.c:3502
msgid "function_name"
msgstr "函数名称"
-#: sql_help.c:269 sql_help.c:394 sql_help.c:399 sql_help.c:404 sql_help.c:409
-#: sql_help.c:1125 sql_help.c:1427 sql_help.c:2182 sql_help.c:2534
-#: sql_help.c:2804 sql_help.c:2886
+#: sql_help.c:288 sql_help.c:421 sql_help.c:426 sql_help.c:431 sql_help.c:436
+#: sql_help.c:1216 sql_help.c:1549 sql_help.c:2335 sql_help.c:2695
+#: sql_help.c:2974 sql_help.c:3059
msgid "argmode"
msgstr "参数模式"
# describe.c:480
-#: sql_help.c:270 sql_help.c:395 sql_help.c:400 sql_help.c:405 sql_help.c:410
-#: sql_help.c:1126 sql_help.c:1428 sql_help.c:2183 sql_help.c:2887
+#: sql_help.c:289 sql_help.c:422 sql_help.c:427 sql_help.c:432 sql_help.c:437
+#: sql_help.c:1217 sql_help.c:1550 sql_help.c:2336 sql_help.c:3060
msgid "argname"
msgstr "参数名称"
# describe.c:512
-#: sql_help.c:272 sql_help.c:530 sql_help.c:1130 sql_help.c:1553
+#: sql_help.c:292 sql_help.c:608 sql_help.c:1222 sql_help.c:1693
msgid "operator_name"
msgstr "操作符名称"
# describe.c:321
-#: sql_help.c:273 sql_help.c:485 sql_help.c:489 sql_help.c:1131
-#: sql_help.c:1530 sql_help.c:2217
+#: sql_help.c:293 sql_help.c:563 sql_help.c:567 sql_help.c:1223
+#: sql_help.c:1670 sql_help.c:2378
msgid "left_type"
msgstr "操作符左边操作数的类型"
# describe.c:321
-#: sql_help.c:274 sql_help.c:486 sql_help.c:490 sql_help.c:1132
-#: sql_help.c:1531 sql_help.c:2218
+#: sql_help.c:294 sql_help.c:564 sql_help.c:568 sql_help.c:1224
+#: sql_help.c:1671 sql_help.c:2379
msgid "right_type"
msgstr "操作符右边操作数的类型"
-#: sql_help.c:276 sql_help.c:278 sql_help.c:502 sql_help.c:505 sql_help.c:508
-#: sql_help.c:528 sql_help.c:540 sql_help.c:548 sql_help.c:551 sql_help.c:554
-#: sql_help.c:1134 sql_help.c:1136 sql_help.c:1550 sql_help.c:1571
-#: sql_help.c:1772 sql_help.c:2227 sql_help.c:2236
+#: sql_help.c:296 sql_help.c:298 sql_help.c:580 sql_help.c:583 sql_help.c:586
+#: sql_help.c:606 sql_help.c:618 sql_help.c:626 sql_help.c:629 sql_help.c:632
+#: sql_help.c:1226 sql_help.c:1228 sql_help.c:1690 sql_help.c:1711
+#: sql_help.c:1917 sql_help.c:2388 sql_help.c:2397
msgid "index_method"
msgstr "访问索引的方法"
# describe.c:498
-#: sql_help.c:303 sql_help.c:1380
+#: sql_help.c:323 sql_help.c:1490
msgid "handler_function"
msgstr "handler_function(处理_函数)"
# describe.c:498
-#: sql_help.c:304 sql_help.c:1381
+#: sql_help.c:324 sql_help.c:1491
msgid "validator_function"
msgstr "validator_function(验证_函数)"
# describe.c:128
-#: sql_help.c:339 sql_help.c:397 sql_help.c:723 sql_help.c:913 sql_help.c:1763
-#: sql_help.c:1764 sql_help.c:1780 sql_help.c:1781
+#: sql_help.c:361 sql_help.c:424 sql_help.c:531 sql_help.c:811 sql_help.c:1001
+#: sql_help.c:1908 sql_help.c:1909 sql_help.c:1925 sql_help.c:1926
msgid "action"
msgstr "操作"
# describe.c:1375
-#: sql_help.c:341 sql_help.c:348 sql_help.c:350 sql_help.c:351 sql_help.c:353
-#: sql_help.c:354 sql_help.c:356 sql_help.c:359 sql_help.c:361 sql_help.c:638
-#: sql_help.c:725 sql_help.c:735 sql_help.c:739 sql_help.c:740 sql_help.c:744
-#: sql_help.c:746 sql_help.c:747 sql_help.c:748 sql_help.c:750 sql_help.c:753
-#: sql_help.c:755 sql_help.c:1004 sql_help.c:1007 sql_help.c:1027
-#: sql_help.c:1115 sql_help.c:1197 sql_help.c:1201 sql_help.c:1213
-#: sql_help.c:1214 sql_help.c:1397 sql_help.c:1432 sql_help.c:1493
-#: sql_help.c:1656 sql_help.c:1736 sql_help.c:1749 sql_help.c:1768
-#: sql_help.c:1770 sql_help.c:1777 sql_help.c:1788 sql_help.c:1805
-#: sql_help.c:1907 sql_help.c:2042 sql_help.c:2518 sql_help.c:2519
-#: sql_help.c:2563 sql_help.c:2788 sql_help.c:2789 sql_help.c:2879
-#: sql_help.c:2975 sql_help.c:3181 sql_help.c:3221 sql_help.c:3223
-#: sql_help.c:3240 sql_help.c:3243 sql_help.c:3338
+#: sql_help.c:363 sql_help.c:370 sql_help.c:374 sql_help.c:375 sql_help.c:377
+#: sql_help.c:379 sql_help.c:380 sql_help.c:381 sql_help.c:383 sql_help.c:386
+#: sql_help.c:388 sql_help.c:533 sql_help.c:540 sql_help.c:542 sql_help.c:545
+#: sql_help.c:547 sql_help.c:726 sql_help.c:813 sql_help.c:823 sql_help.c:827
+#: sql_help.c:828 sql_help.c:832 sql_help.c:834 sql_help.c:835 sql_help.c:836
+#: sql_help.c:838 sql_help.c:841 sql_help.c:843 sql_help.c:1092
+#: sql_help.c:1095 sql_help.c:1115 sql_help.c:1205 sql_help.c:1290
+#: sql_help.c:1295 sql_help.c:1309 sql_help.c:1310 sql_help.c:1514
+#: sql_help.c:1554 sql_help.c:1615 sql_help.c:1650 sql_help.c:1801
+#: sql_help.c:1881 sql_help.c:1894 sql_help.c:1913 sql_help.c:1915
+#: sql_help.c:1922 sql_help.c:1933 sql_help.c:1950 sql_help.c:2052
+#: sql_help.c:2187 sql_help.c:2679 sql_help.c:2680 sql_help.c:2724
+#: sql_help.c:2958 sql_help.c:2959 sql_help.c:3051 sql_help.c:3149
+#: sql_help.c:3355 sql_help.c:3395 sql_help.c:3397 sql_help.c:3414
+#: sql_help.c:3417 sql_help.c:3512
msgid "column_name"
msgstr "列名称"
# describe.c:1375
-#: sql_help.c:342 sql_help.c:726
+#: sql_help.c:364 sql_help.c:534 sql_help.c:814
msgid "new_column_name"
msgstr "new_column_name(新列名)"
-#: sql_help.c:347 sql_help.c:413 sql_help.c:734 sql_help.c:926
+#: sql_help.c:369 sql_help.c:440 sql_help.c:539 sql_help.c:822 sql_help.c:1014
msgid "where action is one of:"
msgstr "操作可以是下列选项之一"
# describe.c:526
-#: sql_help.c:349 sql_help.c:352 sql_help.c:736 sql_help.c:741 sql_help.c:928
-#: sql_help.c:932 sql_help.c:1348 sql_help.c:1398 sql_help.c:1549
-#: sql_help.c:1737 sql_help.c:1952 sql_help.c:2648
+#: sql_help.c:371 sql_help.c:376 sql_help.c:824 sql_help.c:829 sql_help.c:1016
+#: sql_help.c:1020 sql_help.c:1444 sql_help.c:1515 sql_help.c:1689
+#: sql_help.c:1882 sql_help.c:2097 sql_help.c:2809
msgid "data_type"
msgstr "数据_类型"
-#: sql_help.c:355 sql_help.c:749
+# describe.c:128
+#: sql_help.c:372 sql_help.c:825 sql_help.c:830 sql_help.c:1017
+#: sql_help.c:1021 sql_help.c:1445 sql_help.c:1518 sql_help.c:1617
+#: sql_help.c:1883 sql_help.c:2098 sql_help.c:2104
+msgid "collation"
+msgstr "校对规则"
+
+#: sql_help.c:373 sql_help.c:826 sql_help.c:1519 sql_help.c:1884
+#: sql_help.c:1895
+msgid "column_constraint"
+msgstr "列约束"
+
+#: sql_help.c:382 sql_help.c:541 sql_help.c:837
msgid "integer"
msgstr "整数"
-#: sql_help.c:357 sql_help.c:360 sql_help.c:751 sql_help.c:754
+#: sql_help.c:384 sql_help.c:387 sql_help.c:543 sql_help.c:546 sql_help.c:839
+#: sql_help.c:842
msgid "attribute_option"
msgstr "属性选项"
-#: sql_help.c:414 sql_help.c:1435
+#: sql_help.c:441 sql_help.c:1557
msgid "execution_cost"
msgstr "执行函数的开销"
-#: sql_help.c:415 sql_help.c:1436
+#: sql_help.c:442 sql_help.c:1558
msgid "result_rows"
msgstr "返回记录的数量"
-#: sql_help.c:430 sql_help.c:432 sql_help.c:434
+#: sql_help.c:457 sql_help.c:459 sql_help.c:461
msgid "group_name"
msgstr "组名称"
-#: sql_help.c:431 sql_help.c:433 sql_help.c:986 sql_help.c:1325
-#: sql_help.c:1635 sql_help.c:1637 sql_help.c:1818 sql_help.c:2028
-#: sql_help.c:2366 sql_help.c:3060
+#: sql_help.c:458 sql_help.c:460 sql_help.c:1074 sql_help.c:1421
+#: sql_help.c:1777 sql_help.c:1779 sql_help.c:1782 sql_help.c:1783
+#: sql_help.c:1963 sql_help.c:2173 sql_help.c:2527 sql_help.c:3234
msgid "user_name"
msgstr "用户名"
# describe.c:1342
-#: sql_help.c:449 sql_help.c:1330 sql_help.c:1499 sql_help.c:1746
-#: sql_help.c:1754 sql_help.c:1786 sql_help.c:1808 sql_help.c:1817
-#: sql_help.c:2545 sql_help.c:2815
+#: sql_help.c:476 sql_help.c:1426 sql_help.c:1621 sql_help.c:1653
+#: sql_help.c:1891 sql_help.c:1899 sql_help.c:1931 sql_help.c:1953
+#: sql_help.c:1962 sql_help.c:2706 sql_help.c:2985
msgid "tablespace_name"
msgstr "表空间的名称"
-#: sql_help.c:451 sql_help.c:454 sql_help.c:769 sql_help.c:771 sql_help.c:1497
-#: sql_help.c:1744 sql_help.c:1752 sql_help.c:1784 sql_help.c:1806
+#: sql_help.c:478 sql_help.c:481 sql_help.c:549 sql_help.c:551 sql_help.c:857
+#: sql_help.c:859 sql_help.c:1619 sql_help.c:1651 sql_help.c:1889
+#: sql_help.c:1897 sql_help.c:1929 sql_help.c:1951
msgid "storage_parameter"
msgstr "存储参数"
# large_obj.c:264
-#: sql_help.c:474 sql_help.c:1129 sql_help.c:2889
+#: sql_help.c:501 sql_help.c:1220 sql_help.c:3062
msgid "large_object_oid"
msgstr "大对象的OID"
-#: sql_help.c:529 sql_help.c:541 sql_help.c:1552
+# describe.c:543
+# describe.c:1477
+#: sql_help.c:548 sql_help.c:856 sql_help.c:867 sql_help.c:1155
+msgid "index_name"
+msgstr "索引名称"
+
+#: sql_help.c:607 sql_help.c:619 sql_help.c:1692
msgid "strategy_number"
msgstr "访问索引所用方法的编号"
@@ -3219,22 +3466,22 @@ msgstr "访问索引所用方法的编号"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: sql_help.c:531 sql_help.c:532 sql_help.c:535 sql_help.c:536 sql_help.c:542
-#: sql_help.c:543 sql_help.c:545 sql_help.c:546 sql_help.c:1554
-#: sql_help.c:1555 sql_help.c:1558 sql_help.c:1559
+#: sql_help.c:609 sql_help.c:610 sql_help.c:613 sql_help.c:614 sql_help.c:620
+#: sql_help.c:621 sql_help.c:623 sql_help.c:624 sql_help.c:1694
+#: sql_help.c:1695 sql_help.c:1698 sql_help.c:1699
msgid "op_type"
msgstr "操作数类型"
-#: sql_help.c:533 sql_help.c:1556
+#: sql_help.c:611 sql_help.c:1696
msgid "sort_family_name"
msgstr "sort_family_name(排序家族名)"
-#: sql_help.c:534 sql_help.c:544 sql_help.c:1557
+#: sql_help.c:612 sql_help.c:622 sql_help.c:1697
msgid "support_number"
msgstr "访问索引所使用函数的编号"
# describe.c:1689
-#: sql_help.c:538 sql_help.c:1275 sql_help.c:1561
+#: sql_help.c:616 sql_help.c:1371 sql_help.c:1701
msgid "argument_type"
msgstr "参数类型"
@@ -3242,281 +3489,272 @@ msgstr "参数类型"
# command.c:939
# startup.c:187
# startup.c:205
-#: sql_help.c:587 sql_help.c:965 sql_help.c:1471 sql_help.c:1602
-#: sql_help.c:2011
+#: sql_help.c:665 sql_help.c:1053 sql_help.c:1593 sql_help.c:1742
+#: sql_help.c:2156
msgid "password"
msgstr "口令"
-#: sql_help.c:588 sql_help.c:966 sql_help.c:1472 sql_help.c:1603
-#: sql_help.c:2012
+#: sql_help.c:666 sql_help.c:1054 sql_help.c:1594 sql_help.c:1743
+#: sql_help.c:2157
msgid "timestamp"
msgstr "时间戳"
-#: sql_help.c:592 sql_help.c:596 sql_help.c:599 sql_help.c:602 sql_help.c:2525
-#: sql_help.c:2795
+#: sql_help.c:670 sql_help.c:674 sql_help.c:677 sql_help.c:680 sql_help.c:2686
+#: sql_help.c:2965
msgid "database_name"
msgstr "数据库名称"
-#: sql_help.c:631 sql_help.c:1650
+# describe.c:415
+# describe.c:543
+# describe.c:1477
+#: sql_help.c:689 sql_help.c:725 sql_help.c:980 sql_help.c:1114
+#: sql_help.c:1154 sql_help.c:1207 sql_help.c:1232 sql_help.c:1243
+#: sql_help.c:1289 sql_help.c:1294 sql_help.c:1513 sql_help.c:1613
+#: sql_help.c:1649 sql_help.c:1761 sql_help.c:1800 sql_help.c:1880
+#: sql_help.c:1892 sql_help.c:1949 sql_help.c:2046 sql_help.c:2221
+#: sql_help.c:2422 sql_help.c:2503 sql_help.c:2676 sql_help.c:2681
+#: sql_help.c:2723 sql_help.c:2955 sql_help.c:2960 sql_help.c:3050
+#: sql_help.c:3123 sql_help.c:3125 sql_help.c:3155 sql_help.c:3194
+#: sql_help.c:3329 sql_help.c:3331 sql_help.c:3361 sql_help.c:3393
+#: sql_help.c:3413 sql_help.c:3415 sql_help.c:3416 sql_help.c:3486
+#: sql_help.c:3488 sql_help.c:3518
+msgid "table_name"
+msgstr "表名"
+
+#: sql_help.c:719 sql_help.c:1795
msgid "increment"
msgstr "增量"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:632 sql_help.c:1651
+#: sql_help.c:720 sql_help.c:1796
msgid "minvalue"
msgstr "最小值"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:633 sql_help.c:1652
+#: sql_help.c:721 sql_help.c:1797
msgid "maxvalue"
msgstr "最大值"
-#: sql_help.c:634 sql_help.c:1653 sql_help.c:2947 sql_help.c:3018
-#: sql_help.c:3153 sql_help.c:3259 sql_help.c:3310
+#: sql_help.c:722 sql_help.c:1798 sql_help.c:3121 sql_help.c:3192
+#: sql_help.c:3327 sql_help.c:3433 sql_help.c:3484
msgid "start"
msgstr "起始值"
-#: sql_help.c:635
+#: sql_help.c:723
msgid "restart"
msgstr "重新启动后的序列值"
-#: sql_help.c:636 sql_help.c:1654
+#: sql_help.c:724 sql_help.c:1799
msgid "cache"
msgstr "缓存"
-# describe.c:415
-# describe.c:543
-# describe.c:1477
-#: sql_help.c:637 sql_help.c:892 sql_help.c:1026 sql_help.c:1066
-#: sql_help.c:1117 sql_help.c:1140 sql_help.c:1151 sql_help.c:1196
-#: sql_help.c:1200 sql_help.c:1396 sql_help.c:1491 sql_help.c:1621
-#: sql_help.c:1655 sql_help.c:1735 sql_help.c:1747 sql_help.c:1804
-#: sql_help.c:1901 sql_help.c:2076 sql_help.c:2261 sql_help.c:2342
-#: sql_help.c:2515 sql_help.c:2520 sql_help.c:2562 sql_help.c:2785
-#: sql_help.c:2790 sql_help.c:2878 sql_help.c:2949 sql_help.c:2951
-#: sql_help.c:2981 sql_help.c:3020 sql_help.c:3155 sql_help.c:3157
-#: sql_help.c:3187 sql_help.c:3219 sql_help.c:3239 sql_help.c:3241
-#: sql_help.c:3242 sql_help.c:3312 sql_help.c:3314 sql_help.c:3344
-msgid "table_name"
-msgstr "表名"
-
-# describe.c:128
-#: sql_help.c:737 sql_help.c:742 sql_help.c:929 sql_help.c:933 sql_help.c:1349
-#: sql_help.c:1495 sql_help.c:1738 sql_help.c:1953 sql_help.c:1959
-msgid "collation"
-msgstr "校对规则"
-
-#: sql_help.c:738 sql_help.c:1739 sql_help.c:1750
-msgid "column_constraint"
-msgstr "列约束"
-
-#: sql_help.c:756 sql_help.c:1740 sql_help.c:1751
+#: sql_help.c:844 sql_help.c:1885 sql_help.c:1896
msgid "table_constraint"
msgstr "表约束"
-#: sql_help.c:757
+#: sql_help.c:845
msgid "table_constraint_using_index"
msgstr "table_constraint_using_index(表约束使用索引)"
# describe.c:575
-#: sql_help.c:760 sql_help.c:761 sql_help.c:762 sql_help.c:763 sql_help.c:1150
+#: sql_help.c:848 sql_help.c:849 sql_help.c:850 sql_help.c:851 sql_help.c:1242
msgid "trigger_name"
msgstr "触发器_名称"
-#: sql_help.c:764 sql_help.c:765 sql_help.c:766 sql_help.c:767
+#: sql_help.c:852 sql_help.c:853 sql_help.c:854 sql_help.c:855
msgid "rewrite_rule_name"
msgstr "重写规则名称"
-# describe.c:543
-# describe.c:1477
-#: sql_help.c:768 sql_help.c:779 sql_help.c:1067
-msgid "index_name"
-msgstr "索引名称"
-
-#: sql_help.c:772 sql_help.c:773 sql_help.c:1743
+#: sql_help.c:860 sql_help.c:861 sql_help.c:1888
msgid "parent_table"
msgstr "父表"
-#: sql_help.c:774 sql_help.c:1748 sql_help.c:2547 sql_help.c:2817
+#: sql_help.c:862 sql_help.c:1893 sql_help.c:2708 sql_help.c:2987
msgid "type_name"
msgstr "类型名称"
-#: sql_help.c:777
+#: sql_help.c:865
msgid "and table_constraint_using_index is:"
msgstr "table_constraint_using_index 是:"
# describe.c:1342
-#: sql_help.c:795 sql_help.c:798
+#: sql_help.c:883 sql_help.c:886
msgid "tablespace_option"
msgstr "表空间_选项"
-#: sql_help.c:819 sql_help.c:822 sql_help.c:828 sql_help.c:832
+#: sql_help.c:907 sql_help.c:910 sql_help.c:916 sql_help.c:920
msgid "token_type"
msgstr "符号类型"
-#: sql_help.c:820 sql_help.c:823
+#: sql_help.c:908 sql_help.c:911
msgid "dictionary_name"
msgstr "字典名称"
-#: sql_help.c:825 sql_help.c:829
+#: sql_help.c:913 sql_help.c:917
msgid "old_dictionary"
msgstr "旧的字典"
-#: sql_help.c:826 sql_help.c:830
+#: sql_help.c:914 sql_help.c:918
msgid "new_dictionary"
msgstr "新的字典"
-#: sql_help.c:917 sql_help.c:927 sql_help.c:930 sql_help.c:931 sql_help.c:1951
+#: sql_help.c:1005 sql_help.c:1015 sql_help.c:1018 sql_help.c:1019
+#: sql_help.c:2096
msgid "attribute_name"
msgstr "属性_名称"
-#: sql_help.c:918
+#: sql_help.c:1006
msgid "new_attribute_name"
msgstr "new_attribute_name(新属性名)"
-#: sql_help.c:924
+#: sql_help.c:1012
msgid "new_enum_value"
msgstr "new_enum_value(新枚举名)"
-#: sql_help.c:925
+#: sql_help.c:1013
msgid "existing_enum_value"
msgstr "existing_enum_value"
-#: sql_help.c:987 sql_help.c:1401 sql_help.c:1666 sql_help.c:2029
-#: sql_help.c:2367 sql_help.c:2531 sql_help.c:2801
+#: sql_help.c:1075 sql_help.c:1520 sql_help.c:1811 sql_help.c:2174
+#: sql_help.c:2528 sql_help.c:2692 sql_help.c:2971
msgid "server_name"
msgstr "服务器名称"
# help.c:88
-#: sql_help.c:1015 sql_help.c:1018 sql_help.c:2043
+#: sql_help.c:1103 sql_help.c:1106 sql_help.c:2188
msgid "view_option_name"
msgstr "view_option_name(视图选项名)"
# help.c:88
-#: sql_help.c:1016 sql_help.c:2044
+#: sql_help.c:1104 sql_help.c:2189
msgid "view_option_value"
msgstr "view_option_value(视图选项值)"
-#: sql_help.c:1041 sql_help.c:3076 sql_help.c:3078 sql_help.c:3102
+#: sql_help.c:1129 sql_help.c:3250 sql_help.c:3252 sql_help.c:3276
msgid "transaction_mode"
msgstr "事务模式"
-#: sql_help.c:1042 sql_help.c:3079 sql_help.c:3103
+#: sql_help.c:1130 sql_help.c:3253 sql_help.c:3277
msgid "where transaction_mode is one of:"
msgstr "事务模式可以是下列选项之一:"
-#: sql_help.c:1114
+#: sql_help.c:1204
msgid "relation_name"
msgstr "relation_name(关系名)"
# describe.c:1375
-#: sql_help.c:1139
+#: sql_help.c:1231
msgid "rule_name"
msgstr "规则_名称"
-#: sql_help.c:1154
+#: sql_help.c:1246
msgid "text"
msgstr "文本"
-#: sql_help.c:1169 sql_help.c:2657 sql_help.c:2835
+#: sql_help.c:1261 sql_help.c:2818 sql_help.c:3005
msgid "transaction_id"
msgstr "事务_ID"
# describe.c:1375
-#: sql_help.c:1198 sql_help.c:1203 sql_help.c:2583
+#: sql_help.c:1291 sql_help.c:1297 sql_help.c:2744
msgid "filename"
msgstr "文件名"
-#: sql_help.c:1202 sql_help.c:1809 sql_help.c:2045 sql_help.c:2063
-#: sql_help.c:2565
+#: sql_help.c:1292 sql_help.c:1298 sql_help.c:1763 sql_help.c:1764
+#: sql_help.c:1765
+msgid "command"
+msgstr "命令"
+
+#: sql_help.c:1296 sql_help.c:1654 sql_help.c:1954 sql_help.c:2190
+#: sql_help.c:2208 sql_help.c:2726
msgid "query"
msgstr "查询"
-#: sql_help.c:1205 sql_help.c:2412
+#: sql_help.c:1300 sql_help.c:2573
msgid "where option can be one of:"
msgstr "选项可以是下列内容之一:"
# help.c:211
-#: sql_help.c:1206
+#: sql_help.c:1301
msgid "format_name"
msgstr "格式_名称"
-#: sql_help.c:1207 sql_help.c:1210 sql_help.c:2413 sql_help.c:2414
-#: sql_help.c:2415 sql_help.c:2416 sql_help.c:2417
+#: sql_help.c:1302 sql_help.c:1303 sql_help.c:1306 sql_help.c:2574
+#: sql_help.c:2575 sql_help.c:2576 sql_help.c:2577 sql_help.c:2578
msgid "boolean"
msgstr "布尔"
-#: sql_help.c:1208
+#: sql_help.c:1304
msgid "delimiter_character"
msgstr "分隔字符"
-#: sql_help.c:1209
+#: sql_help.c:1305
msgid "null_string"
msgstr "空字符串"
-#: sql_help.c:1211
+#: sql_help.c:1307
msgid "quote_character"
msgstr "引用字符"
-#: sql_help.c:1212
+#: sql_help.c:1308
msgid "escape_character"
msgstr "转义字符"
# describe.c:365
-#: sql_help.c:1215
+#: sql_help.c:1311
msgid "encoding_name"
msgstr "encoding_name(编码名)"
# describe.c:526
-#: sql_help.c:1241
+#: sql_help.c:1337
msgid "input_data_type"
msgstr "输入数据类型"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:1242 sql_help.c:1250
+#: sql_help.c:1338 sql_help.c:1346
msgid "sfunc"
msgstr "状态转换函数名称"
# describe.c:526
-#: sql_help.c:1243 sql_help.c:1251
+#: sql_help.c:1339 sql_help.c:1347
msgid "state_data_type"
msgstr "状态值的数据类型"
# describe.c:498
-#: sql_help.c:1244 sql_help.c:1252
+#: sql_help.c:1340 sql_help.c:1348
msgid "ffunc"
msgstr "计算最终结果集的函数名称"
-#: sql_help.c:1245 sql_help.c:1253
+#: sql_help.c:1341 sql_help.c:1349
msgid "initial_condition"
msgstr "初始条件"
# describe.c:512
-#: sql_help.c:1246 sql_help.c:1254
+#: sql_help.c:1342 sql_help.c:1350
msgid "sort_operator"
msgstr "排序_操作符"
-#: sql_help.c:1247
+#: sql_help.c:1343
msgid "or the old syntax"
msgstr "或者是旧的语法"
# describe.c:1689
-#: sql_help.c:1249
+#: sql_help.c:1345
msgid "base_type"
msgstr "基础_类型"
# help.c:127
-#: sql_help.c:1293
+#: sql_help.c:1389
msgid "locale"
msgstr "本地化语言"
-#: sql_help.c:1294 sql_help.c:1328
+#: sql_help.c:1390 sql_help.c:1424
msgid "lc_collate"
msgstr "排序规则"
@@ -3524,294 +3762,294 @@ msgstr "排序规则"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: sql_help.c:1295 sql_help.c:1329
+#: sql_help.c:1391 sql_help.c:1425
msgid "lc_ctype"
msgstr "字符分类"
# describe.c:1636
-#: sql_help.c:1297
+#: sql_help.c:1393
msgid "existing_collation"
msgstr "existing_collation(当前的本地化语言)"
# describe.c:187
-#: sql_help.c:1307
+#: sql_help.c:1403
msgid "source_encoding"
msgstr "源_编码"
# describe.c:365
-#: sql_help.c:1308
+#: sql_help.c:1404
msgid "dest_encoding"
msgstr "目的_编码"
-#: sql_help.c:1326 sql_help.c:1844
+#: sql_help.c:1422 sql_help.c:1989
msgid "template"
msgstr "模版"
# describe.c:365
-#: sql_help.c:1327
+#: sql_help.c:1423
msgid "encoding"
msgstr "字符集编码"
# describe.c:1174
-#: sql_help.c:1352
+#: sql_help.c:1448
msgid "where constraint is:"
msgstr "约束是:"
+#: sql_help.c:1462 sql_help.c:1760 sql_help.c:2045
+msgid "event"
+msgstr "事件"
+
+#: sql_help.c:1463
+msgid "filter_variable"
+msgstr "过滤器变量"
+
# describe.c:498
-#: sql_help.c:1365
+#: sql_help.c:1475
msgid "extension_name"
msgstr "extension_name(扩展名)"
-#: sql_help.c:1367
+#: sql_help.c:1477
msgid "version"
msgstr "version(版本)"
-#: sql_help.c:1368
+#: sql_help.c:1478
msgid "old_version"
msgstr "老版本"
+# describe.c:1174
+#: sql_help.c:1523 sql_help.c:1900
+msgid "where column_constraint is:"
+msgstr "列的约束是:"
+
# describe.c:1639
-#: sql_help.c:1430 sql_help.c:1758
+#: sql_help.c:1525 sql_help.c:1552 sql_help.c:1903
msgid "default_expr"
msgstr "缺省_表达式"
# describe.c:1689
-#: sql_help.c:1431
+#: sql_help.c:1553
msgid "rettype"
msgstr "返回类型"
-#: sql_help.c:1433
+#: sql_help.c:1555
msgid "column_type"
msgstr "列的类型"
-#: sql_help.c:1434 sql_help.c:2097 sql_help.c:2539 sql_help.c:2809
+#: sql_help.c:1556 sql_help.c:2242 sql_help.c:2700 sql_help.c:2979
msgid "lang_name"
msgstr "语言名称"
# describe.c:977
-#: sql_help.c:1440
+#: sql_help.c:1562
msgid "definition"
msgstr "定义"
-#: sql_help.c:1441
+#: sql_help.c:1563
msgid "obj_file"
msgstr "目标文件"
-#: sql_help.c:1442
+#: sql_help.c:1564
msgid "link_symbol"
msgstr "链接_符号"
-#: sql_help.c:1443
+#: sql_help.c:1565
msgid "attribute"
msgstr "属性"
-#: sql_help.c:1478 sql_help.c:1609 sql_help.c:2018
+#: sql_help.c:1600 sql_help.c:1749 sql_help.c:2163
msgid "uid"
msgstr "uid"
-#: sql_help.c:1492
+#: sql_help.c:1614
msgid "method"
msgstr "方法"
-#: sql_help.c:1496 sql_help.c:1790
+#: sql_help.c:1618 sql_help.c:1935
msgid "opclass"
msgstr "操作符类型的名称"
# describe.c:937
-#: sql_help.c:1500 sql_help.c:1776
+#: sql_help.c:1622 sql_help.c:1921
msgid "predicate"
msgstr "述词"
-#: sql_help.c:1512
+#: sql_help.c:1634
msgid "call_handler"
msgstr "调用函数"
-#: sql_help.c:1513
+#: sql_help.c:1635
msgid "inline_handler"
msgstr "匿名代码块"
# describe.c:498
-#: sql_help.c:1514
+#: sql_help.c:1636
msgid "valfunction"
msgstr "验证函数"
-#: sql_help.c:1532
+#: sql_help.c:1672
msgid "com_op"
msgstr "交换操作符"
-#: sql_help.c:1533
+#: sql_help.c:1673
msgid "neg_op"
msgstr "取负操作符"
-#: sql_help.c:1534
+#: sql_help.c:1674
msgid "res_proc"
msgstr "限制选择性估算函数"
-#: sql_help.c:1535
+#: sql_help.c:1675
msgid "join_proc"
msgstr "连接选择性估算函数"
-#: sql_help.c:1551
+#: sql_help.c:1691
msgid "family_name"
msgstr "操作符群的名称"
# describe.c:1635
-#: sql_help.c:1562
+#: sql_help.c:1702
msgid "storage_type"
msgstr "存储类型"
-#: sql_help.c:1620 sql_help.c:1900
-msgid "event"
-msgstr "事件"
-
# help.c:123
-#: sql_help.c:1622 sql_help.c:1903 sql_help.c:2079 sql_help.c:2938
-#: sql_help.c:2940 sql_help.c:3009 sql_help.c:3011 sql_help.c:3144
-#: sql_help.c:3146 sql_help.c:3226 sql_help.c:3301 sql_help.c:3303
+#: sql_help.c:1762 sql_help.c:2048 sql_help.c:2224 sql_help.c:3112
+#: sql_help.c:3114 sql_help.c:3183 sql_help.c:3185 sql_help.c:3318
+#: sql_help.c:3320 sql_help.c:3400 sql_help.c:3475 sql_help.c:3477
msgid "condition"
msgstr "条件"
-#: sql_help.c:1623 sql_help.c:1624 sql_help.c:1625
-msgid "command"
-msgstr "命令"
-
-#: sql_help.c:1636 sql_help.c:1638
+#: sql_help.c:1778 sql_help.c:1780
msgid "schema_element"
msgstr "模式中对象"
-#: sql_help.c:1667
+#: sql_help.c:1812
msgid "server_type"
msgstr "服务器类型"
-#: sql_help.c:1668
+#: sql_help.c:1813
msgid "server_version"
msgstr "服务器版本"
-#: sql_help.c:1669 sql_help.c:2529 sql_help.c:2799
+#: sql_help.c:1814 sql_help.c:2690 sql_help.c:2969
msgid "fdw_name"
msgstr "外部数据封装器的名称"
# describe.c:1688
-#: sql_help.c:1741
+#: sql_help.c:1886
msgid "source_table"
msgstr "源表"
# help.c:88
-#: sql_help.c:1742
+#: sql_help.c:1887
msgid "like_option"
msgstr "like选项"
-# describe.c:1174
-#: sql_help.c:1755
-msgid "where column_constraint is:"
-msgstr "列的约束是:"
-
-#: sql_help.c:1759 sql_help.c:1760 sql_help.c:1769 sql_help.c:1771
-#: sql_help.c:1775
+#: sql_help.c:1904 sql_help.c:1905 sql_help.c:1914 sql_help.c:1916
+#: sql_help.c:1920
msgid "index_parameters"
msgstr "索引参数"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:1761 sql_help.c:1778
+#: sql_help.c:1906 sql_help.c:1923
msgid "reftable"
msgstr "所引用的表"
# describe.c:744
-#: sql_help.c:1762 sql_help.c:1779
+#: sql_help.c:1907 sql_help.c:1924
msgid "refcolumn"
msgstr "所引用的列"
-#: sql_help.c:1765
+#: sql_help.c:1910
msgid "and table_constraint is:"
msgstr "表约束是:"
-#: sql_help.c:1773
+#: sql_help.c:1918
msgid "exclude_element"
msgstr "排除项"
# describe.c:512
-#: sql_help.c:1774 sql_help.c:2945 sql_help.c:3016 sql_help.c:3151
-#: sql_help.c:3257 sql_help.c:3308
+#: sql_help.c:1919 sql_help.c:3119 sql_help.c:3190 sql_help.c:3325
+#: sql_help.c:3431 sql_help.c:3482
msgid "operator"
msgstr "运算子"
-#: sql_help.c:1782
+#: sql_help.c:1927
msgid "and like_option is:"
msgstr "like_选项是"
-#: sql_help.c:1783
+#: sql_help.c:1928
msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
msgstr "在UNIQUE, PRIMARY KEY和EXCLUDE中的索引参数是:"
-#: sql_help.c:1787
+#: sql_help.c:1932
msgid "exclude_element in an EXCLUDE constraint is:"
msgstr "在EXCLUDE约束中的排除项是:"
-#: sql_help.c:1819
+#: sql_help.c:1964
msgid "directory"
msgstr "目录"
-#: sql_help.c:1831
+#: sql_help.c:1976
msgid "parser_name"
msgstr "解析器名称 "
-#: sql_help.c:1832
+#: sql_help.c:1977
msgid "source_config"
msgstr "已存在的文本搜索配置名称"
# describe.c:498
-#: sql_help.c:1861
+#: sql_help.c:2006
msgid "start_function"
msgstr "启动_函数"
# sql_help.h:249
-#: sql_help.c:1862
+#: sql_help.c:2007
msgid "gettoken_function"
msgstr "获取下一个符号函数的名称"
# describe.c:498
-#: sql_help.c:1863
+#: sql_help.c:2008
msgid "end_function"
msgstr "结束_函数"
# describe.c:498
-#: sql_help.c:1864
+#: sql_help.c:2009
msgid "lextypes_function"
msgstr "语义类型_函数"
# describe.c:498
-#: sql_help.c:1865
+#: sql_help.c:2010
msgid "headline_function"
msgstr "标题_函数"
# describe.c:498
-#: sql_help.c:1877
+#: sql_help.c:2022
msgid "init_function"
msgstr "初始化_函数"
# describe.c:498
-#: sql_help.c:1878
+#: sql_help.c:2023
msgid "lexize_function"
msgstr "LEXIZE函数"
-#: sql_help.c:1902
+#: sql_help.c:2047
msgid "referenced_table_name"
msgstr "被引用表的名称"
-#: sql_help.c:1905
+#: sql_help.c:2050
msgid "arguments"
msgstr "参数"
-#: sql_help.c:1906
+#: sql_help.c:2051
msgid "where event can be one of:"
msgstr "事件可以下述之一:"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:1955 sql_help.c:2897
+#: sql_help.c:2100 sql_help.c:3071
msgid "label"
msgstr "标签"
@@ -3819,1030 +4057,1082 @@ msgstr "标签"
# describe.c:745
# describe.c:1478
# describe.c:1587
-#: sql_help.c:1957
+#: sql_help.c:2102
msgid "subtype"
msgstr "子类型"
# describe.c:512
-#: sql_help.c:1958
+#: sql_help.c:2103
msgid "subtype_operator_class"
msgstr "subtype_operator_class(子类型_操作符_类)"
# describe.c:498
-#: sql_help.c:1960
+#: sql_help.c:2105
msgid "canonical_function"
msgstr "标准_函数"
# describe.c:498
-#: sql_help.c:1961
+#: sql_help.c:2106
msgid "subtype_diff_function"
msgstr "subtype_diff_function(子类型_区分_函数)"
# describe.c:498
-#: sql_help.c:1963
+#: sql_help.c:2108
msgid "input_function"
msgstr "输入_函数"
# describe.c:498
-#: sql_help.c:1964
+#: sql_help.c:2109
msgid "output_function"
msgstr "输出_函数"
# sql_help.h:249
-#: sql_help.c:1965
+#: sql_help.c:2110
msgid "receive_function"
msgstr "接收_函数"
# describe.c:498
-#: sql_help.c:1966
+#: sql_help.c:2111
msgid "send_function"
msgstr "发送_函数"
-#: sql_help.c:1967
+#: sql_help.c:2112
msgid "type_modifier_input_function"
msgstr "类型修改器数组输入函数名称"
-#: sql_help.c:1968
+#: sql_help.c:2113
msgid "type_modifier_output_function"
msgstr "类型修改器输出函数名称"
# describe.c:498
-#: sql_help.c:1969
+#: sql_help.c:2114
msgid "analyze_function"
msgstr "分析_函数"
-#: sql_help.c:1970
+#: sql_help.c:2115
msgid "internallength"
msgstr "内部长度"
# describe.c:1693
-#: sql_help.c:1971
+#: sql_help.c:2116
msgid "alignment"
msgstr "顺序排列(alignment)"
# describe.c:1635
-#: sql_help.c:1972
+#: sql_help.c:2117
msgid "storage"
msgstr "存储"
-#: sql_help.c:1973
+#: sql_help.c:2118
msgid "like_type"
msgstr "LIKE类型(like_type)"
-#: sql_help.c:1974
+#: sql_help.c:2119
msgid "category"
msgstr "类型"
-#: sql_help.c:1975
+#: sql_help.c:2120
msgid "preferred"
msgstr "优先"
# describe.c:1639
-#: sql_help.c:1976
+#: sql_help.c:2121
msgid "default"
msgstr "缺省"
-#: sql_help.c:1977
+#: sql_help.c:2122
msgid "element"
msgstr "成员项"
-#: sql_help.c:1978
+#: sql_help.c:2123
msgid "delimiter"
msgstr "分隔符"
-#: sql_help.c:1979
+#: sql_help.c:2124
msgid "collatable"
msgstr "要校对的"
-#: sql_help.c:2075 sql_help.c:2561 sql_help.c:2933 sql_help.c:3003
-#: sql_help.c:3139 sql_help.c:3218 sql_help.c:3296
+#: sql_help.c:2220 sql_help.c:2722 sql_help.c:3107 sql_help.c:3177
+#: sql_help.c:3313 sql_help.c:3392 sql_help.c:3470
msgid "with_query"
msgstr "with查询语句(with_query)"
-#: sql_help.c:2077 sql_help.c:2952 sql_help.c:2955 sql_help.c:2958
-#: sql_help.c:2962 sql_help.c:3158 sql_help.c:3161 sql_help.c:3164
-#: sql_help.c:3168 sql_help.c:3220 sql_help.c:3315 sql_help.c:3318
-#: sql_help.c:3321 sql_help.c:3325
+#: sql_help.c:2222 sql_help.c:3126 sql_help.c:3129 sql_help.c:3132
+#: sql_help.c:3136 sql_help.c:3332 sql_help.c:3335 sql_help.c:3338
+#: sql_help.c:3342 sql_help.c:3394 sql_help.c:3489 sql_help.c:3492
+#: sql_help.c:3495 sql_help.c:3499
msgid "alias"
msgstr "化名"
-#: sql_help.c:2078
+#: sql_help.c:2223
msgid "using_list"
msgstr "USING列表(using_list)"
-#: sql_help.c:2080 sql_help.c:2443 sql_help.c:2624 sql_help.c:3227
+#: sql_help.c:2225 sql_help.c:2604 sql_help.c:2785 sql_help.c:3401
msgid "cursor_name"
msgstr "游标名称"
-#: sql_help.c:2081 sql_help.c:2566 sql_help.c:3228
+#: sql_help.c:2226 sql_help.c:2727 sql_help.c:3402
msgid "output_expression"
msgstr "输出表达式"
-#: sql_help.c:2082 sql_help.c:2567 sql_help.c:2936 sql_help.c:3006
-#: sql_help.c:3142 sql_help.c:3229 sql_help.c:3299
+#: sql_help.c:2227 sql_help.c:2728 sql_help.c:3110 sql_help.c:3180
+#: sql_help.c:3316 sql_help.c:3403 sql_help.c:3473
msgid "output_name"
msgstr "输出名称"
-#: sql_help.c:2098
+#: sql_help.c:2243
msgid "code"
msgstr "编码"
-#: sql_help.c:2391
+#: sql_help.c:2552
msgid "parameter"
msgstr "参数"
-#: sql_help.c:2410 sql_help.c:2411 sql_help.c:2649
+#: sql_help.c:2571 sql_help.c:2572 sql_help.c:2810
msgid "statement"
msgstr "语句"
# help.c:123
-#: sql_help.c:2442 sql_help.c:2623
+#: sql_help.c:2603 sql_help.c:2784
msgid "direction"
msgstr "方向"
-#: sql_help.c:2444 sql_help.c:2625
+#: sql_help.c:2605 sql_help.c:2786
msgid "where direction can be empty or one of:"
msgstr "方向可以为空或者是下列选项之一:"
-#: sql_help.c:2445 sql_help.c:2446 sql_help.c:2447 sql_help.c:2448
-#: sql_help.c:2449 sql_help.c:2626 sql_help.c:2627 sql_help.c:2628
-#: sql_help.c:2629 sql_help.c:2630 sql_help.c:2946 sql_help.c:2948
-#: sql_help.c:3017 sql_help.c:3019 sql_help.c:3152 sql_help.c:3154
-#: sql_help.c:3258 sql_help.c:3260 sql_help.c:3309 sql_help.c:3311
+#: sql_help.c:2606 sql_help.c:2607 sql_help.c:2608 sql_help.c:2609
+#: sql_help.c:2610 sql_help.c:2787 sql_help.c:2788 sql_help.c:2789
+#: sql_help.c:2790 sql_help.c:2791 sql_help.c:3120 sql_help.c:3122
+#: sql_help.c:3191 sql_help.c:3193 sql_help.c:3326 sql_help.c:3328
+#: sql_help.c:3432 sql_help.c:3434 sql_help.c:3483 sql_help.c:3485
msgid "count"
msgstr "查询所用返回记录的最大数量"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:2522 sql_help.c:2792
+#: sql_help.c:2683 sql_help.c:2962
msgid "sequence_name"
msgstr "序列名称"
# describe.c:1375
-#: sql_help.c:2527 sql_help.c:2797
+#: sql_help.c:2688 sql_help.c:2967
msgid "domain_name"
msgstr "域_名称"
-#: sql_help.c:2535 sql_help.c:2805
+#: sql_help.c:2696 sql_help.c:2975
msgid "arg_name"
msgstr "参数名称"
# describe.c:1689
-#: sql_help.c:2536 sql_help.c:2806
+#: sql_help.c:2697 sql_help.c:2976
msgid "arg_type"
msgstr "参数类型"
-#: sql_help.c:2541 sql_help.c:2811
+#: sql_help.c:2702 sql_help.c:2981
msgid "loid"
msgstr "loid"
-#: sql_help.c:2575 sql_help.c:2638 sql_help.c:3204
+#: sql_help.c:2736 sql_help.c:2799 sql_help.c:3378
msgid "channel"
msgstr "通道"
-#: sql_help.c:2597
+#: sql_help.c:2758
msgid "lockmode"
msgstr "锁模式"
-#: sql_help.c:2598
+#: sql_help.c:2759
msgid "where lockmode is one of:"
msgstr "锁模式可以是下列选项之一:"
-#: sql_help.c:2639
+#: sql_help.c:2800
msgid "payload"
msgstr "消息中负载流量(payload)"
-#: sql_help.c:2665
+#: sql_help.c:2826
msgid "old_role"
msgstr "旧的角色"
-#: sql_help.c:2666
+#: sql_help.c:2827
msgid "new_role"
msgstr "新的角色"
# sql_help.h:382
-#: sql_help.c:2682 sql_help.c:2843 sql_help.c:2851
+#: sql_help.c:2852 sql_help.c:3013 sql_help.c:3021
msgid "savepoint_name"
msgstr "保存点名称"
-#: sql_help.c:2876
+#: sql_help.c:3048
msgid "provider"
msgstr "provider(提供者)"
-#: sql_help.c:2937 sql_help.c:2968 sql_help.c:2970 sql_help.c:3008
-#: sql_help.c:3143 sql_help.c:3174 sql_help.c:3176 sql_help.c:3300
-#: sql_help.c:3331 sql_help.c:3333
+#: sql_help.c:3111 sql_help.c:3142 sql_help.c:3144 sql_help.c:3182
+#: sql_help.c:3317 sql_help.c:3348 sql_help.c:3350 sql_help.c:3474
+#: sql_help.c:3505 sql_help.c:3507
msgid "from_item"
msgstr "from列表中项"
-#: sql_help.c:2941 sql_help.c:3012 sql_help.c:3147 sql_help.c:3304
+#: sql_help.c:3115 sql_help.c:3186 sql_help.c:3321 sql_help.c:3478
msgid "window_name"
msgstr "窗口名称"
# describe.c:977
-#: sql_help.c:2942 sql_help.c:3013 sql_help.c:3148 sql_help.c:3305
+#: sql_help.c:3116 sql_help.c:3187 sql_help.c:3322 sql_help.c:3479
msgid "window_definition"
msgstr "窗口定义"
-#: sql_help.c:2943 sql_help.c:2954 sql_help.c:2976 sql_help.c:3014
-#: sql_help.c:3149 sql_help.c:3160 sql_help.c:3182 sql_help.c:3306
-#: sql_help.c:3317 sql_help.c:3339
+#: sql_help.c:3117 sql_help.c:3128 sql_help.c:3150 sql_help.c:3188
+#: sql_help.c:3323 sql_help.c:3334 sql_help.c:3356 sql_help.c:3480
+#: sql_help.c:3491 sql_help.c:3513
msgid "select"
msgstr "查询"
-#: sql_help.c:2950 sql_help.c:3156 sql_help.c:3313
+#: sql_help.c:3124 sql_help.c:3330 sql_help.c:3487
msgid "where from_item can be one of:"
msgstr "from 列表中的项可以是下列内容之一"
-#: sql_help.c:2953 sql_help.c:2956 sql_help.c:2959 sql_help.c:2963
-#: sql_help.c:3159 sql_help.c:3162 sql_help.c:3165 sql_help.c:3169
-#: sql_help.c:3316 sql_help.c:3319 sql_help.c:3322 sql_help.c:3326
+#: sql_help.c:3127 sql_help.c:3130 sql_help.c:3133 sql_help.c:3137
+#: sql_help.c:3333 sql_help.c:3336 sql_help.c:3339 sql_help.c:3343
+#: sql_help.c:3490 sql_help.c:3493 sql_help.c:3496 sql_help.c:3500
msgid "column_alias"
msgstr "列的化名"
-#: sql_help.c:2957 sql_help.c:2974 sql_help.c:3163 sql_help.c:3180
-#: sql_help.c:3320 sql_help.c:3337
+#: sql_help.c:3131 sql_help.c:3148 sql_help.c:3337 sql_help.c:3354
+#: sql_help.c:3494 sql_help.c:3511
msgid "with_query_name"
msgstr "WITH查询语句名称(with_query_name)"
-#: sql_help.c:2961 sql_help.c:2966 sql_help.c:3167 sql_help.c:3172
-#: sql_help.c:3324 sql_help.c:3329
+#: sql_help.c:3135 sql_help.c:3140 sql_help.c:3341 sql_help.c:3346
+#: sql_help.c:3498 sql_help.c:3503
msgid "argument"
msgstr "参数"
# describe.c:977
-#: sql_help.c:2964 sql_help.c:2967 sql_help.c:3170 sql_help.c:3173
-#: sql_help.c:3327 sql_help.c:3330
+#: sql_help.c:3138 sql_help.c:3141 sql_help.c:3344 sql_help.c:3347
+#: sql_help.c:3501 sql_help.c:3504
msgid "column_definition"
msgstr "列定义"
-#: sql_help.c:2969 sql_help.c:3175 sql_help.c:3332
+#: sql_help.c:3143 sql_help.c:3349 sql_help.c:3506
msgid "join_type"
msgstr "连接操作的类型"
-#: sql_help.c:2971 sql_help.c:3177 sql_help.c:3334
+#: sql_help.c:3145 sql_help.c:3351 sql_help.c:3508
msgid "join_condition"
msgstr "用连接操作的条件"
-#: sql_help.c:2972 sql_help.c:3178 sql_help.c:3335
+#: sql_help.c:3146 sql_help.c:3352 sql_help.c:3509
msgid "join_column"
msgstr "用于连接操作的列"
-#: sql_help.c:2973 sql_help.c:3179 sql_help.c:3336
+#: sql_help.c:3147 sql_help.c:3353 sql_help.c:3510
msgid "and with_query is:"
msgstr "with查询语句是:"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:2977 sql_help.c:3183 sql_help.c:3340
+#: sql_help.c:3151 sql_help.c:3357 sql_help.c:3514
msgid "values"
msgstr "值"
-#: sql_help.c:2978 sql_help.c:3184 sql_help.c:3341
+#: sql_help.c:3152 sql_help.c:3358 sql_help.c:3515
msgid "insert"
msgstr "insert"
-#: sql_help.c:2979 sql_help.c:3185 sql_help.c:3342
+#: sql_help.c:3153 sql_help.c:3359 sql_help.c:3516
msgid "update"
msgstr "update"
-#: sql_help.c:2980 sql_help.c:3186 sql_help.c:3343
+#: sql_help.c:3154 sql_help.c:3360 sql_help.c:3517
msgid "delete"
msgstr "delete"
# describe.c:415
# describe.c:543
# describe.c:1477
-#: sql_help.c:3007
+#: sql_help.c:3181
msgid "new_table"
msgstr "新的表"
-#: sql_help.c:3032
+#: sql_help.c:3206
msgid "timezone"
msgstr "时间区域"
-#: sql_help.c:3077
+#: sql_help.c:3251
msgid "snapshot_id"
msgstr "snapshot_id"
-#: sql_help.c:3225
+#: sql_help.c:3399
msgid "from_list"
msgstr "from列表(from_list)"
-#: sql_help.c:3256
+#: sql_help.c:3430
msgid "sort_expression"
msgstr "排序表达式"
# sql_help.h:25
# sql_help.h:373
-#: sql_help.h:182 sql_help.h:837
+#: sql_help.h:190 sql_help.h:885
msgid "abort the current transaction"
msgstr "中止目前的交易"
# sql_help.h:29
-#: sql_help.h:187
+#: sql_help.h:195
msgid "change the definition of an aggregate function"
msgstr "更改聚集函数的定义"
# sql_help.h:45
-#: sql_help.h:192
+#: sql_help.h:200
msgid "change the definition of a collation"
msgstr "更改校对规则的定义"
# sql_help.h:33
-#: sql_help.h:197
+#: sql_help.h:205
msgid "change the definition of a conversion"
msgstr "更改一个字元编码转换的定义"
# sql_help.h:37
-#: sql_help.h:202
+#: sql_help.h:210
msgid "change a database"
msgstr "更改一个资料库"
# sql_help.h:325
-#: sql_help.h:207
+#: sql_help.h:215
msgid "define default access privileges"
msgstr "定义缺省的访问权限"
# sql_help.h:41
-#: sql_help.h:212
+#: sql_help.h:220
msgid "change the definition of a domain"
msgstr "更改共同值域的定义"
+# sql_help.h:85
+#: sql_help.h:225
+#| msgid "change the definition of a trigger"
+msgid "change the definition of an event trigger"
+msgstr "更改事件触发器的定义"
+
# sql_help.h:33
-#: sql_help.h:217
+#: sql_help.h:230
msgid "change the definition of an extension"
msgstr "更改扩展的定义"
# sql_help.h:85
-#: sql_help.h:222
+#: sql_help.h:235
msgid "change the definition of a foreign-data wrapper"
msgstr "更改外部数据封装器的定义"
# sql_help.h:85
-#: sql_help.h:227
+#: sql_help.h:240
msgid "change the definition of a foreign table"
msgstr "更改外部表的定义"
# sql_help.h:45
-#: sql_help.h:232
+#: sql_help.h:245
msgid "change the definition of a function"
msgstr "更改函数的定义"
-#: sql_help.h:237
+#: sql_help.h:250
msgid "change role name or membership"
msgstr "更改角色名称或会员"
# sql_help.h:53
-#: sql_help.h:242
+#: sql_help.h:255
msgid "change the definition of an index"
msgstr "更改索引的定义"
# sql_help.h:57
-#: sql_help.h:247
+#: sql_help.h:260
msgid "change the definition of a procedural language"
msgstr "更改程序语言的定义"
# sql_help.h:77
-#: sql_help.h:252
+#: sql_help.h:265
msgid "change the definition of a large object"
msgstr "改变大对象的定义"
+# sql_help.h:53
+#: sql_help.h:270
+#| msgid "change the definition of a view"
+msgid "change the definition of a materialized view"
+msgstr "更改物化视图的定义"
+
# sql_help.h:65
-#: sql_help.h:257
+#: sql_help.h:275
msgid "change the definition of an operator"
msgstr "更改运算子的定义"
# sql_help.h:61
-#: sql_help.h:262
+#: sql_help.h:280
msgid "change the definition of an operator class"
msgstr "更改运算子类别的定义"
# sql_help.h:65
-#: sql_help.h:267
+#: sql_help.h:285
msgid "change the definition of an operator family"
msgstr "更改一个运算子家族的识别"
# sql_help.h:37
-#: sql_help.h:272 sql_help.h:332
+#: sql_help.h:290 sql_help.h:355
msgid "change a database role"
msgstr "变更资料库角色"
+# sql_help.h:77
+#: sql_help.h:295
+#| msgid "change the definition of a table"
+msgid "change the definition of a rule"
+msgstr "更改规则的定义"
+
# sql_help.h:69
-#: sql_help.h:277
+#: sql_help.h:300
msgid "change the definition of a schema"
msgstr "更改架构模式的定义"
# sql_help.h:73
-#: sql_help.h:282
+#: sql_help.h:305
msgid "change the definition of a sequence generator"
msgstr "更改序列数产生器的定义"
# sql_help.h:85
-#: sql_help.h:287
+#: sql_help.h:310
msgid "change the definition of a foreign server"
msgstr "更改外部服务器的定义"
# sql_help.h:77
-#: sql_help.h:292
+#: sql_help.h:315
msgid "change the definition of a table"
msgstr "更改资料表的定义"
# sql_help.h:81
-#: sql_help.h:297
+#: sql_help.h:320
msgid "change the definition of a tablespace"
msgstr "更改表空间的定义"
# sql_help.h:33
-#: sql_help.h:302
+#: sql_help.h:325
msgid "change the definition of a text search configuration"
msgstr "更改一个文本搜寻组态的定义"
# sql_help.h:45
-#: sql_help.h:307
+#: sql_help.h:330
msgid "change the definition of a text search dictionary"
msgstr "更改一个文本搜寻字典的定义"
# sql_help.h:81
-#: sql_help.h:312
+#: sql_help.h:335
msgid "change the definition of a text search parser"
msgstr "更改一个文本搜寻剖析器的定义"
# sql_help.h:69
-#: sql_help.h:317
+#: sql_help.h:340
msgid "change the definition of a text search template"
msgstr "更改一个文本搜寻模版的定义"
# sql_help.h:85
-#: sql_help.h:322
+#: sql_help.h:345
msgid "change the definition of a trigger"
msgstr "更改触发器的定义"
# sql_help.h:89
-#: sql_help.h:327
+#: sql_help.h:350
msgid "change the definition of a type"
msgstr "更改资料型别的定义"
# sql_help.h:41
-#: sql_help.h:337
+#: sql_help.h:360
msgid "change the definition of a user mapping"
msgstr "更改用户映射的定义"
# sql_help.h:53
-#: sql_help.h:342
+#: sql_help.h:365
msgid "change the definition of a view"
msgstr "更改视观表的定义"
# sql_help.h:97
-#: sql_help.h:347
+#: sql_help.h:370
msgid "collect statistics about a database"
msgstr "关于资料库的收集统计"
# sql_help.h:101
# sql_help.h:413
-#: sql_help.h:352 sql_help.h:902
+#: sql_help.h:375 sql_help.h:950
msgid "start a transaction block"
msgstr "开始一个事物交易区块"
# sql_help.h:105
-#: sql_help.h:357
+#: sql_help.h:380
msgid "force a transaction log checkpoint"
msgstr "强制事物交易日志检查点"
# sql_help.h:109
-#: sql_help.h:362
+#: sql_help.h:385
msgid "close a cursor"
msgstr "关闭 cursor"
# sql_help.h:113
-#: sql_help.h:367
+#: sql_help.h:390
msgid "cluster a table according to an index"
msgstr "丛集一个资料表根据一个索引"
# sql_help.h:117
-#: sql_help.h:372
+#: sql_help.h:395
msgid "define or change the comment of an object"
msgstr "定义或更改一个物件的注解"
# sql_help.h:121
# sql_help.h:309
-#: sql_help.h:377 sql_help.h:747
+#: sql_help.h:400 sql_help.h:790
msgid "commit the current transaction"
msgstr "确认目前的事物交易"
-#: sql_help.h:382
+#: sql_help.h:405
msgid "commit a transaction that was earlier prepared for two-phase commit"
msgstr "提交一项事务交易这是两阶段提交的先前准备"
# sql_help.h:125
-#: sql_help.h:387
+#: sql_help.h:410
msgid "copy data between a file and a table"
msgstr "在档案和资料表间复制资料"
# sql_help.h:129
-#: sql_help.h:392
+#: sql_help.h:415
msgid "define a new aggregate function"
msgstr "定义一个新的聚集函数"
# sql_help.h:133
-#: sql_help.h:397
+#: sql_help.h:420
msgid "define a new cast"
msgstr "建立新的型别转换"
# sql_help.h:153
-#: sql_help.h:402
+#: sql_help.h:425
msgid "define a new collation"
msgstr "建立新的校对规则"
# sql_help.h:141
-#: sql_help.h:407
+#: sql_help.h:430
msgid "define a new encoding conversion"
msgstr "定义一个新的字元编码转换"
# sql_help.h:145
-#: sql_help.h:412
+#: sql_help.h:435
msgid "create a new database"
msgstr "建立新的资料库"
# sql_help.h:149
-#: sql_help.h:417
+#: sql_help.h:440
msgid "define a new domain"
msgstr "建立新的共同值域"
-#: sql_help.h:422
+# sql_help.h:201
+#: sql_help.h:445
+#| msgid "define a new trigger"
+msgid "define a new event trigger"
+msgstr "定义新的事件触发器"
+
+#: sql_help.h:450
msgid "install an extension"
msgstr "安装一个扩展"
# sql_help.h:205
-#: sql_help.h:427
+#: sql_help.h:455
msgid "define a new foreign-data wrapper"
msgstr "定义一个新的外部数据封装器"
# sql_help.h:201
-#: sql_help.h:432
+#: sql_help.h:460
msgid "define a new foreign table"
msgstr "建立新的外部表"
# sql_help.h:153
-#: sql_help.h:437
+#: sql_help.h:465
msgid "define a new function"
msgstr "建立新的函数"
# sql_help.h:189
-#: sql_help.h:442 sql_help.h:472 sql_help.h:542
+#: sql_help.h:470 sql_help.h:505 sql_help.h:575
msgid "define a new database role"
msgstr "定义一个新资料库角色"
# sql_help.h:161
-#: sql_help.h:447
+#: sql_help.h:475
msgid "define a new index"
msgstr "建立新的索引"
# sql_help.h:165
-#: sql_help.h:452
+#: sql_help.h:480
msgid "define a new procedural language"
msgstr "建立新的程序语言"
+# sql_help.h:213
+#: sql_help.h:485
+#| msgid "define a new view"
+msgid "define a new materialized view"
+msgstr "建立新的物化视图"
+
# sql_help.h:173
-#: sql_help.h:457
+#: sql_help.h:490
msgid "define a new operator"
msgstr "建立新的运算子"
# sql_help.h:169
-#: sql_help.h:462
+#: sql_help.h:495
msgid "define a new operator class"
msgstr "建立新的运算子类别"
# sql_help.h:173
-#: sql_help.h:467
+#: sql_help.h:500
msgid "define a new operator family"
msgstr "定义一个新的运算子家族"
# sql_help.h:177
-#: sql_help.h:477
+#: sql_help.h:510
msgid "define a new rewrite rule"
msgstr "建立新的重写规则"
# sql_help.h:181
-#: sql_help.h:482
+#: sql_help.h:515
msgid "define a new schema"
msgstr "建立新的架构模式"
# sql_help.h:185
-#: sql_help.h:487
+#: sql_help.h:520
msgid "define a new sequence generator"
msgstr "建立新的序列数产生器"
# sql_help.h:201
-#: sql_help.h:492
+#: sql_help.h:525
msgid "define a new foreign server"
msgstr "建立新的触发器"
# sql_help.h:189
-#: sql_help.h:497
+#: sql_help.h:530
msgid "define a new table"
msgstr "建立新的资料表"
# sql_help.h:193
# sql_help.h:389
-#: sql_help.h:502 sql_help.h:867
+#: sql_help.h:535 sql_help.h:915
msgid "define a new table from the results of a query"
msgstr "以查询结果建立新的资料表"
# sql_help.h:197
-#: sql_help.h:507
+#: sql_help.h:540
msgid "define a new tablespace"
msgstr "建立新的表空间"
# sql_help.h:129
-#: sql_help.h:512
+#: sql_help.h:545
msgid "define a new text search configuration"
msgstr "定义一个新文本搜寻组态"
# sql_help.h:129
-#: sql_help.h:517
+#: sql_help.h:550
msgid "define a new text search dictionary"
msgstr "定义一个新文本搜寻字典"
# sql_help.h:197
-#: sql_help.h:522
+#: sql_help.h:555
msgid "define a new text search parser"
msgstr "定义一个新文本搜寻剖析器"
# sql_help.h:181
-#: sql_help.h:527
+#: sql_help.h:560
msgid "define a new text search template"
msgstr "定义一个新文本搜寻模版"
# sql_help.h:201
-#: sql_help.h:532
+#: sql_help.h:565
msgid "define a new trigger"
msgstr "建立新的触发器"
# sql_help.h:205
-#: sql_help.h:537
+#: sql_help.h:570
msgid "define a new data type"
msgstr "建立新的资料型别"
-#: sql_help.h:547
+#: sql_help.h:580
msgid "define a new mapping of a user to a foreign server"
msgstr "将用户的新映射定义到一个外部服务器"
# sql_help.h:213
-#: sql_help.h:552
+#: sql_help.h:585
msgid "define a new view"
msgstr "建立新的视观表"
# sql_help.h:217
-#: sql_help.h:557
+#: sql_help.h:590
msgid "deallocate a prepared statement"
msgstr "释放一个已预备好的叙述区块"
# sql_help.h:221
-#: sql_help.h:562
+#: sql_help.h:595
msgid "define a cursor"
msgstr "建立一个 cursor"
# sql_help.h:225
-#: sql_help.h:567
+#: sql_help.h:600
msgid "delete rows of a table"
msgstr "删除资料表中的资料列"
-#: sql_help.h:572
+#: sql_help.h:605
msgid "discard session state"
msgstr "抛弃 session 状态"
-#: sql_help.h:577
+#: sql_help.h:610
msgid "execute an anonymous code block"
msgstr "执行一个匿名代码块"
# sql_help.h:229
-#: sql_help.h:582
+#: sql_help.h:615
msgid "remove an aggregate function"
msgstr "移除一个聚集函数"
# sql_help.h:233
-#: sql_help.h:587
+#: sql_help.h:620
msgid "remove a cast"
msgstr "移除一个型别转换"
# sql_help.h:249
-#: sql_help.h:592
+#: sql_help.h:625
msgid "remove a collation"
msgstr "移除一个校对规则"
# sql_help.h:237
-#: sql_help.h:597
+#: sql_help.h:630
msgid "remove a conversion"
msgstr "移除一个字元编码转换"
# sql_help.h:241
-#: sql_help.h:602
+#: sql_help.h:635
msgid "remove a database"
msgstr "移除资料库"
# sql_help.h:245
-#: sql_help.h:607
+#: sql_help.h:640
msgid "remove a domain"
msgstr "移除一个共同值域"
+# sql_help.h:293
+#: sql_help.h:645
+#| msgid "remove a trigger"
+msgid "remove an event trigger"
+msgstr "移除事件触发器"
+
# sql_help.h:237
-#: sql_help.h:612
+#: sql_help.h:650
msgid "remove an extension"
msgstr "移除一个扩展"
# sql_help.h:297
-#: sql_help.h:617
+#: sql_help.h:655
msgid "remove a foreign-data wrapper"
msgstr "删除一个外部数据封装器"
# sql_help.h:285
-#: sql_help.h:622
+#: sql_help.h:660
msgid "remove a foreign table"
msgstr "移除外部引用表"
# sql_help.h:249
-#: sql_help.h:627
+#: sql_help.h:665
msgid "remove a function"
msgstr "移除函数"
# sql_help.h:241
-#: sql_help.h:632 sql_help.h:667 sql_help.h:732
+#: sql_help.h:670 sql_help.h:710 sql_help.h:775
msgid "remove a database role"
msgstr "移除一个资料库成员"
# sql_help.h:257
-#: sql_help.h:637
+#: sql_help.h:675
msgid "remove an index"
msgstr "移除一个索引"
# sql_help.h:261
-#: sql_help.h:642
+#: sql_help.h:680
msgid "remove a procedural language"
msgstr "移除一个程序语言"
+# sql_help.h:305
+#: sql_help.h:685
+#| msgid "remove a view"
+msgid "remove a materialized view"
+msgstr "移除一个物化视图"
+
# sql_help.h:269
-#: sql_help.h:647
+#: sql_help.h:690
msgid "remove an operator"
msgstr "移除运算子"
# sql_help.h:265
-#: sql_help.h:652
+#: sql_help.h:695
msgid "remove an operator class"
msgstr "移除一个运算子类别"
# sql_help.h:269
-#: sql_help.h:657
+#: sql_help.h:700
msgid "remove an operator family"
msgstr "移除一个运算子家族"
-#: sql_help.h:662
+#: sql_help.h:705
msgid "remove database objects owned by a database role"
msgstr "依照一个资料库角色拥有的资料库物件来移除"
# sql_help.h:273
-#: sql_help.h:672
+#: sql_help.h:715
msgid "remove a rewrite rule"
msgstr "移除一个重写规则"
# sql_help.h:277
-#: sql_help.h:677
+#: sql_help.h:720
msgid "remove a schema"
msgstr "移除一个架构模式"
# sql_help.h:281
-#: sql_help.h:682
+#: sql_help.h:725
msgid "remove a sequence"
msgstr "移除序列数"
# sql_help.h:237
-#: sql_help.h:687
+#: sql_help.h:730
msgid "remove a foreign server descriptor"
msgstr "删除一个外部服务器描述符"
# sql_help.h:285
-#: sql_help.h:692
+#: sql_help.h:735
msgid "remove a table"
msgstr "移除资料表"
# sql_help.h:289
-#: sql_help.h:697
+#: sql_help.h:740
msgid "remove a tablespace"
msgstr "移除一个表空间"
# sql_help.h:301
-#: sql_help.h:702
+#: sql_help.h:745
msgid "remove a text search configuration"
msgstr "移除一个文本搜寻组态"
# sql_help.h:301
-#: sql_help.h:707
+#: sql_help.h:750
msgid "remove a text search dictionary"
msgstr "移除一个文本搜寻字典"
# sql_help.h:289
-#: sql_help.h:712
+#: sql_help.h:755
msgid "remove a text search parser"
msgstr "移除一个文本搜寻剖析器"
# sql_help.h:277
-#: sql_help.h:717
+#: sql_help.h:760
msgid "remove a text search template"
msgstr "移除一个文本搜寻模版"
# sql_help.h:293
-#: sql_help.h:722
+#: sql_help.h:765
msgid "remove a trigger"
msgstr "移除触发器"
# sql_help.h:297
-#: sql_help.h:727
+#: sql_help.h:770
msgid "remove a data type"
msgstr "移除资料型别"
-#: sql_help.h:737
+#: sql_help.h:780
msgid "remove a user mapping for a foreign server"
msgstr "为外部服务器删除用户映射"
# sql_help.h:305
-#: sql_help.h:742
+#: sql_help.h:785
msgid "remove a view"
msgstr "移除一个视观表"
# sql_help.h:313
-#: sql_help.h:752
+#: sql_help.h:795
msgid "execute a prepared statement"
msgstr "执行一个已准备好的叙述区块"
# sql_help.h:317
-#: sql_help.h:757
+#: sql_help.h:800
msgid "show the execution plan of a statement"
msgstr "显示一个叙述区块的执行计划"
# sql_help.h:321
-#: sql_help.h:762
+#: sql_help.h:805
msgid "retrieve rows from a query using a cursor"
msgstr "从使用 cursor 的查询读取资料"
# sql_help.h:325
-#: sql_help.h:767
+#: sql_help.h:810
msgid "define access privileges"
msgstr "建立存取权限"
# sql_help.h:329
-#: sql_help.h:772
+#: sql_help.h:815
msgid "create new rows in a table"
msgstr "在资料表中建立资料"
# sql_help.h:333
-#: sql_help.h:777
+#: sql_help.h:820
msgid "listen for a notification"
msgstr "等待通知"
# sql_help.h:337
-#: sql_help.h:782
+#: sql_help.h:825
msgid "load a shared library file"
msgstr "加载一个共享库文件"
# sql_help.h:341
-#: sql_help.h:787
+#: sql_help.h:830
msgid "lock a table"
msgstr "锁住资料表"
# sql_help.h:345
-#: sql_help.h:792
+#: sql_help.h:835
msgid "position a cursor"
msgstr "移动游标位置"
# sql_help.h:349
-#: sql_help.h:797
+#: sql_help.h:840
msgid "generate a notification"
msgstr "产生通告"
# sql_help.h:353
-#: sql_help.h:802
+#: sql_help.h:845
msgid "prepare a statement for execution"
msgstr "预先编译叙述以执行"
# sql_help.h:25
# sql_help.h:373
-#: sql_help.h:807
+#: sql_help.h:850
msgid "prepare the current transaction for two-phase commit"
msgstr "预备当前事务交易的二段式提交"
-#: sql_help.h:812
+#: sql_help.h:855
msgid "change the ownership of database objects owned by a database role"
msgstr "依照一个资料库角色拥有的的资料库物件来更变所有权"
+#: sql_help.h:860
+msgid "replace the contents of a materialized view"
+msgstr "替换物化视图的内容"
+
# sql_help.h:357
-#: sql_help.h:817
+#: sql_help.h:865
msgid "rebuild indexes"
msgstr "重新建构索引"
# sql_help.h:361
-#: sql_help.h:822
+#: sql_help.h:870
msgid "destroy a previously defined savepoint"
msgstr "删除先前建立的储存点(Savepoint)"
# sql_help.h:365
-#: sql_help.h:827
+#: sql_help.h:875
msgid "restore the value of a run-time parameter to the default value"
msgstr "将执行时期参数还原成预设值"
# sql_help.h:369
-#: sql_help.h:832
+#: sql_help.h:880
msgid "remove access privileges"
msgstr "移除存取权限"
-#: sql_help.h:842
+#: sql_help.h:890
msgid "cancel a transaction that was earlier prepared for two-phase commit"
msgstr "取消一个可以为两阶段提交容易配置的事务"
# sql_help.h:377
-#: sql_help.h:847
+#: sql_help.h:895
msgid "roll back to a savepoint"
msgstr "还原至一个储存点(Savepoint)"
# sql_help.h:381
-#: sql_help.h:852
+#: sql_help.h:900
msgid "define a new savepoint within the current transaction"
msgstr "在目前的事物交易中建立新的储存点(Savepoint)"
# sql_help.h:117
-#: sql_help.h:857
+#: sql_help.h:905
msgid "define or change a security label applied to an object"
msgstr "定义或更改一个对象的安全标签"
# sql_help.h:385
-#: sql_help.h:862 sql_help.h:907 sql_help.h:937
+#: sql_help.h:910 sql_help.h:955 sql_help.h:985
msgid "retrieve rows from a table or view"
msgstr "从资料表或视观表读取资料"
# sql_help.h:393
-#: sql_help.h:872
+#: sql_help.h:920
msgid "change a run-time parameter"
msgstr "更改一个执行时期参数"
# sql_help.h:397
-#: sql_help.h:877
+#: sql_help.h:925
msgid "set constraint check timing for the current transaction"
msgstr "为当前事务设定约束限制检查的时间模式"
# sql_help.h:405
-#: sql_help.h:882
+#: sql_help.h:930
msgid "set the current user identifier of the current session"
msgstr "设置当前 session 的当前用户的身份标识"
# sql_help.h:401
-#: sql_help.h:887
+#: sql_help.h:935
msgid ""
"set the session user identifier and the current user identifier of the "
"current session"
msgstr "设置会话用户标识符和当前会话的当前用户标识符"
# sql_help.h:405
-#: sql_help.h:892
+#: sql_help.h:940
msgid "set the characteristics of the current transaction"
msgstr "设定目前事物交易属性"
# sql_help.h:409
-#: sql_help.h:897
+#: sql_help.h:945
msgid "show the value of a run-time parameter"
msgstr "显示执行时期的参数值"
# sql_help.h:425
-#: sql_help.h:912
+#: sql_help.h:960
msgid "empty a table or set of tables"
msgstr "空的资料表或资料表设置"
# sql_help.h:421
-#: sql_help.h:917
+#: sql_help.h:965
msgid "stop listening for a notification"
msgstr "停止倾听通告"
# sql_help.h:425
-#: sql_help.h:922
+#: sql_help.h:970
msgid "update rows of a table"
msgstr "更新资料表中的资料列"
# sql_help.h:429
-#: sql_help.h:927
+#: sql_help.h:975
msgid "garbage-collect and optionally analyze a database"
msgstr "垃圾收集(GC)并选择性的分析资料库"
-#: sql_help.h:932
+#: sql_help.h:980
msgid "compute a set of rows"
msgstr "计算一个资料列的集合"
+#: startup.c:167
+#, c-format
+#| msgid "%s can only be used in transaction blocks"
+msgid "%s: -1 can only be used in non-interactive mode\n"
+msgstr "%s: -1 只能用于非交互模式下\n"
+
# command.c:1148
-#: startup.c:251
+#: startup.c:269
#, c-format
msgid "%s: could not open log file \"%s\": %s\n"
msgstr "%s:无法开启日志档 \"%s\":%s\n"
-#: startup.c:313
+#: startup.c:331
#, c-format
msgid ""
"Type \"help\" for help.\n"
@@ -4852,37 +5142,37 @@ msgstr ""
"\n"
# startup.c:446
-#: startup.c:460
+#: startup.c:476
#, c-format
msgid "%s: could not set printing parameter \"%s\"\n"
msgstr "%s:无法设定列印参数 \"%s\"\n"
# startup.c:492
-#: startup.c:500
+#: startup.c:516
#, c-format
msgid "%s: could not delete variable \"%s\"\n"
msgstr "%s:无法删除变数 \"%s\"\n"
# startup.c:502
-#: startup.c:510
+#: startup.c:526
#, c-format
msgid "%s: could not set variable \"%s\"\n"
msgstr "%s:无法设定变数 \"%s\"\n"
# startup.c:533
# startup.c:539
-#: startup.c:553 startup.c:559
+#: startup.c:569 startup.c:575
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "尝试 \"%s --help\" 以得到更多资讯。\n"
# startup.c:557
-#: startup.c:576
+#: startup.c:592
#, c-format
msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
msgstr "%s:警告:忽略多余的命令列参数 \"%s\"\n"
-#: tab-complete.c:3640
+#: tab-complete.c:3962
#, c-format
msgid ""
"tab completion query failed: %s\n"
@@ -4897,3 +5187,6 @@ msgstr ""
#, c-format
msgid "unrecognized Boolean value; assuming \"on\"\n"
msgstr "不能识别的布尔型值; 假定值为 \"on\"\n"
+
+#~ msgid " \\l[+] list all databases\n"
+#~ msgstr " \\l[+] 列出所有的数据库\n"
diff --git a/src/bin/psql/po/zh_TW.po b/src/bin/psql/po/zh_TW.po
index a34946253e..4a7c05a97d 100644
--- a/src/bin/psql/po/zh_TW.po
+++ b/src/bin/psql/po/zh_TW.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-16 04:41+0000\n"
-"PO-Revision-Date: 2011-05-16 15:22+0800\n"
+"PO-Revision-Date: 2013-09-03 23:23-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
"Language-Team: The PostgreSQL Global Development Group <Kuo.ChaoYi@gmail.com>\n"
-"Language: \n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/bin/scripts/po/cs.po b/src/bin/scripts/po/cs.po
index 962b25c3d7..7ab0fc1877 100644
--- a/src/bin/scripts/po/cs.po
+++ b/src/bin/scripts/po/cs.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: postgresql-8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:47+0000\n"
-"PO-Revision-Date: 2013-03-17 22:24+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:19+0000\n"
+"PO-Revision-Date: 2013-09-24 21:07+0200\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -28,7 +28,6 @@ msgstr "paměť vyčerpána\n"
#: ../../common/fe_memutils.c:77
#, c-format
-#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
msgid "cannot duplicate null pointer (internal error)\n"
msgstr "nelze duplikovat nulový ukazatel (interní chyba)\n"
@@ -36,13 +35,15 @@ msgstr "nelze duplikovat nulový ukazatel (interní chyba)\n"
#: createlang.c:89 createlang.c:119 createlang.c:172 createuser.c:163
#: createuser.c:178 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
#: droplang.c:118 droplang.c:172 dropuser.c:89 dropuser.c:104 dropuser.c:115
-#: reindexdb.c:120 reindexdb.c:139 vacuumdb.c:134 vacuumdb.c:154
+#: pg_isready.c:92 pg_isready.c:106 reindexdb.c:120 reindexdb.c:139
+#: vacuumdb.c:134 vacuumdb.c:154
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "Zkuste \"%s --help\" pro více informací.\n"
#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:176
-#: dropdb.c:109 droplang.c:116 dropuser.c:102 reindexdb.c:137 vacuumdb.c:152
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:104 reindexdb.c:137
+#: vacuumdb.c:152
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: příliš mnoho parametrů příkazové řádky (první je \"%s\")\n"
@@ -56,7 +57,6 @@ msgstr ""
#: clusterdb.c:146
#, c-format
-#| msgid "%s: cannot cluster a specific table in all databases\n"
msgid "%s: cannot cluster specific table(s) in all databases\n"
msgstr "%s: nelze provést cluster specifické tabulky ve všech databázích\n"
@@ -85,7 +85,8 @@ msgstr ""
"\n"
#: clusterdb.c:262 createdb.c:252 createlang.c:234 createuser.c:329
-#: dropdb.c:155 droplang.c:235 dropuser.c:156 reindexdb.c:342 vacuumdb.c:358
+#: dropdb.c:155 droplang.c:235 dropuser.c:156 pg_isready.c:210 reindexdb.c:342
+#: vacuumdb.c:358
#, c-format
msgid "Usage:\n"
msgstr "Použití:\n"
@@ -96,7 +97,8 @@ msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [PŘEPÍNAČ]... [DATABÁZE]\n"
#: clusterdb.c:264 createdb.c:254 createlang.c:236 createuser.c:331
-#: dropdb.c:157 droplang.c:237 dropuser.c:158 reindexdb.c:344 vacuumdb.c:360
+#: dropdb.c:157 droplang.c:237 dropuser.c:158 pg_isready.c:213 reindexdb.c:344
+#: vacuumdb.c:360
#, c-format
msgid ""
"\n"
@@ -129,7 +131,6 @@ msgstr " -q, --quiet nevypisovat žádné zprávy\n"
#: clusterdb.c:269
#, c-format
-#| msgid " -t, --table=TABLE cluster specific table only\n"
msgid " -t, --table=TABLE cluster specific table(s) only\n"
msgstr " -t, --table=TABULKA provést cluster pro danou tabulku\n"
@@ -151,7 +152,8 @@ msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help ukáže tuto nápovědu a skončí\n"
#: clusterdb.c:273 createdb.c:265 createlang.c:242 createuser.c:354
-#: dropdb.c:163 droplang.c:243 dropuser.c:165 reindexdb.c:354 vacuumdb.c:373
+#: dropdb.c:163 droplang.c:243 dropuser.c:165 pg_isready.c:219 reindexdb.c:354
+#: vacuumdb.c:373
#, c-format
msgid ""
"\n"
@@ -207,7 +209,8 @@ msgstr ""
"Pro detaily čtěte popis SQL příkazu CLUSTER.\n"
#: clusterdb.c:281 createdb.c:273 createlang.c:248 createuser.c:360
-#: dropdb.c:170 droplang.c:249 dropuser.c:171 reindexdb.c:362 vacuumdb.c:381
+#: dropdb.c:170 droplang.c:249 dropuser.c:171 pg_isready.c:224 reindexdb.c:362
+#: vacuumdb.c:381
#, c-format
msgid ""
"\n"
@@ -760,6 +763,76 @@ msgid ""
msgstr ""
" -U, --username=UŽIVATEL jméno uživatele pro spojení (ne pro odstranění)\n"
+#: pg_isready.c:138
+#, c-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: pg_isready.c:146
+#, c-format
+msgid "%s: could not fetch default options\n"
+msgstr "%s: nelze načíst výchozí volby\n"
+
+#: pg_isready.c:209
+#, c-format
+msgid ""
+"%s issues a connection check to a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s provede kontrolu spojení k PostgreSQL databázi.\n"
+"\n"
+
+#: pg_isready.c:211
+#, c-format
+msgid " %s [OPTION]...\n"
+msgstr " %s [PŘEPÍNAČ]...\n"
+
+#: pg_isready.c:214
+#, c-format
+msgid " -d, --dbname=DBNAME database name\n"
+msgstr " -d, --dbname=DATABÁZE databáze k reindexaci\n"
+
+#: pg_isready.c:215
+#, c-format
+msgid " -q, --quiet run quietly\n"
+msgstr " -q, --quiet nevypisovat žádné zprávy\n"
+
+#: pg_isready.c:216
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version ukáže informaci o verzi a skončí\n"
+
+#: pg_isready.c:217
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help ukáže tuto nápovědu a skončí\n"
+
+#: pg_isready.c:220
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr ""
+" -h, --host=HOSTNAME jméno databázového serveru nebo adresáře se "
+"soketem\n"
+
+#: pg_isready.c:221
+#, c-format
+msgid " -p, --port=PORT database server port\n"
+msgstr " -p, --port=PORT port databázového serveru\n"
+
+#: pg_isready.c:222
+#, c-format
+msgid ""
+" -t, --timeout=SECS seconds to wait when attempting connection, 0 "
+"disables (default: %s)\n"
+msgstr ""
+" -t, --timeout=SECS počet vteřin čekání při pokusu o spojení, 0 toto "
+"omezení vypne (výchozí: %s)\n"
+
+#: pg_isready.c:223
+#, c-format
+msgid " -U, --username=USERNAME user name to connect as\n"
+msgstr " -U, --username=UŽIVATEL jméno uživatele pro připojení\n"
+
#: reindexdb.c:149
#, c-format
msgid "%s: cannot reindex all databases and a specific one at the same time\n"
@@ -772,28 +845,22 @@ msgstr "%s: nelze reindexovat všechny databáze a současně systemový katalog
#: reindexdb.c:159
#, c-format
-#| msgid "%s: cannot reindex a specific table in all databases\n"
msgid "%s: cannot reindex specific table(s) in all databases\n"
msgstr "%s: nelze reindexovat vybranou tabulku ve všech databázích\n"
#: reindexdb.c:164
#, c-format
-#| msgid "%s: cannot reindex a specific index in all databases\n"
msgid "%s: cannot reindex specific index(es) in all databases\n"
msgstr "%s: nelze reindexovat vybraný index ve všech databázích\n"
#: reindexdb.c:175
#, c-format
-#| msgid ""
-#| "%s: cannot reindex a specific table and system catalogs at the same time\n"
msgid ""
"%s: cannot reindex specific table(s) and system catalogs at the same time\n"
msgstr "%s: nelze reindexovat vybranou tabulku a současně sytémové katalogy\n"
#: reindexdb.c:180
#, c-format
-#| msgid ""
-#| "%s: cannot reindex a specific index and system catalogs at the same time\n"
msgid ""
"%s: cannot reindex specific index(es) and system catalogs at the same time\n"
msgstr "%s: nelze reindexovat vybraný index a současně sytémový katalog\n"
@@ -844,7 +911,6 @@ msgstr " -d, --dbname=DATABÁZE databáze k reindexaci\n"
#: reindexdb.c:348
#, c-format
-#| msgid " -i, --index=INDEX recreate specific index only\n"
msgid " -i, --index=INDEX recreate specific index(es) only\n"
msgstr " -i, --index=JMÉNO obnovit pouze vybraný index\n"
@@ -855,7 +921,6 @@ msgstr " -s, --system reindexace systémového katalogu\n"
#: reindexdb.c:351
#, c-format
-#| msgid " -t, --table=TABLE reindex specific table only\n"
msgid " -t, --table=TABLE reindex specific table(s) only\n"
msgstr " -t, --table=TABULKA reidexace pouze vybranou tabulku\n"
@@ -886,7 +951,6 @@ msgstr ""
#: vacuumdb.c:187
#, c-format
-#| msgid "%s: cannot vacuum a specific table in all databases\n"
msgid "%s: cannot vacuum specific table(s) in all databases\n"
msgstr "%s: nelze provést VACUUM specifické tabulky ve všech databázích\n"
@@ -950,7 +1014,6 @@ msgstr " -q, --quiet tichý mód\n"
#: vacuumdb.c:367
#, c-format
-#| msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table only\n"
msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
msgstr ""
" -t, --table='TABULKA[(SLOUPCE)]' provést VACUUM pouze u specifikované "
diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index ab8009ba6c..d17693e5e0 100644
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pgscripts (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:47+0000\n"
-"PO-Revision-Date: 2012-10-19 17:22+0800\n"
+"POT-Creation-Date: 2013-09-02 00:27+0000\n"
+"PO-Revision-Date: 2013-09-02 16:30+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -16,17 +16,32 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.4\n"
+#: ../../common/fe_memutils.c:33 ../../common/fe_memutils.c:60
+#: ../../common/fe_memutils.c:83
+#, c-format
+msgid "out of memory\n"
+msgstr "内存溢出\n"
+
+# common.c:78
+#: ../../common/fe_memutils.c:77
+#, c-format
+#| msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
+msgid "cannot duplicate null pointer (internal error)\n"
+msgstr "无法复制空指针 (内部错误)\n"
+
#: clusterdb.c:110 clusterdb.c:129 createdb.c:119 createdb.c:138
#: createlang.c:89 createlang.c:119 createlang.c:172 createuser.c:163
#: createuser.c:178 dropdb.c:94 dropdb.c:103 dropdb.c:111 droplang.c:88
#: droplang.c:118 droplang.c:172 dropuser.c:89 dropuser.c:104 dropuser.c:115
-#: reindexdb.c:120 reindexdb.c:139 vacuumdb.c:133 vacuumdb.c:153
+#: pg_isready.c:92 pg_isready.c:106 reindexdb.c:120 reindexdb.c:139
+#: vacuumdb.c:134 vacuumdb.c:154
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
#: clusterdb.c:127 createdb.c:136 createlang.c:117 createuser.c:176
-#: dropdb.c:109 droplang.c:116 dropuser.c:102 reindexdb.c:137 vacuumdb.c:151
+#: dropdb.c:109 droplang.c:116 dropuser.c:102 pg_isready.c:104 reindexdb.c:137
+#: vacuumdb.c:152
#, c-format
msgid "%s: too many command-line arguments (first is \"%s\")\n"
msgstr "%s: 太多的命令行参数 (第一个是 \"%s\")\n"
@@ -36,27 +51,28 @@ msgstr "%s: 太多的命令行参数 (第一个是 \"%s\")\n"
msgid "%s: cannot cluster all databases and a specific one at the same time\n"
msgstr "%s: 无法对所有数据库和一个指定的数据库同时建簇\n"
-#: clusterdb.c:145
+#: clusterdb.c:146
#, c-format
-msgid "%s: cannot cluster a specific table in all databases\n"
-msgstr "%s: 无法在所有数据库中对一个指定的表进行建簇\n"
+#| msgid "%s: cannot cluster a specific table in all databases\n"
+msgid "%s: cannot cluster specific table(s) in all databases\n"
+msgstr "%s: 无法在所有数据库中对指定表进行建簇\n"
-#: clusterdb.c:198
+#: clusterdb.c:211
#, c-format
msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 建簇失败: %4$s"
-#: clusterdb.c:201
+#: clusterdb.c:214
#, c-format
msgid "%s: clustering of database \"%s\" failed: %s"
msgstr "%s: 数据库 \"%s\" 建簇失败: %s"
-#: clusterdb.c:232
+#: clusterdb.c:245
#, c-format
msgid "%s: clustering database \"%s\"\n"
msgstr "%s: 对数据库 \"%s\" 进行建簇\n"
-#: clusterdb.c:248
+#: clusterdb.c:261
#, c-format
msgid ""
"%s clusters all previously clustered tables in a database.\n"
@@ -65,19 +81,21 @@ msgstr ""
"%s 对一个数据库中先前已经建过簇的表进行建簇.\n"
"\n"
-#: clusterdb.c:249 createdb.c:252 createlang.c:234 createuser.c:329
-#: dropdb.c:155 droplang.c:235 dropuser.c:156 reindexdb.c:328 vacuumdb.c:342
+#: clusterdb.c:262 createdb.c:252 createlang.c:234 createuser.c:329
+#: dropdb.c:155 droplang.c:235 dropuser.c:156 pg_isready.c:210 reindexdb.c:342
+#: vacuumdb.c:358
#, c-format
msgid "Usage:\n"
msgstr "使用方法:\n"
-#: clusterdb.c:250 reindexdb.c:329 vacuumdb.c:343
+#: clusterdb.c:263 reindexdb.c:343 vacuumdb.c:359
#, c-format
msgid " %s [OPTION]... [DBNAME]\n"
msgstr " %s [选项]... [数据库名]\n"
-#: clusterdb.c:251 createdb.c:254 createlang.c:236 createuser.c:331
-#: dropdb.c:157 droplang.c:237 dropuser.c:158 reindexdb.c:330 vacuumdb.c:344
+#: clusterdb.c:264 createdb.c:254 createlang.c:236 createuser.c:331
+#: dropdb.c:157 droplang.c:237 dropuser.c:158 pg_isready.c:213 reindexdb.c:344
+#: vacuumdb.c:360
#, c-format
msgid ""
"\n"
@@ -86,52 +104,54 @@ msgstr ""
"\n"
"选项:\n"
-#: clusterdb.c:252
+#: clusterdb.c:265
#, c-format
msgid " -a, --all cluster all databases\n"
msgstr " -a, --all 对所有数据库建簇\n"
-#: clusterdb.c:253
+#: clusterdb.c:266
#, c-format
msgid " -d, --dbname=DBNAME database to cluster\n"
msgstr " -d, --dbname=DBNAME 对数据库 DBNAME 建簇\n"
-#: clusterdb.c:254 createlang.c:238 createuser.c:335 dropdb.c:158
-#: droplang.c:239 dropuser.c:159 reindexdb.c:333
+#: clusterdb.c:267 createlang.c:238 createuser.c:335 dropdb.c:158
+#: droplang.c:239 dropuser.c:159 reindexdb.c:347
#, c-format
msgid ""
" -e, --echo show the commands being sent to the server\n"
msgstr " -e, --echo 显示发送到服务端的命令\n"
-#: clusterdb.c:255 reindexdb.c:335
+#: clusterdb.c:268 reindexdb.c:349
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet 不写任何信息\n"
-#: clusterdb.c:256
+#: clusterdb.c:269
#, c-format
-msgid " -t, --table=TABLE cluster specific table only\n"
-msgstr " -t, --table=TABLE 只对指定的表 TABLE 建簇\n"
+#| msgid " -t, --table=TABLE cluster specific table only\n"
+msgid " -t, --table=TABLE cluster specific table(s) only\n"
+msgstr " -t, --table=TABLE 只对指定的表建簇\n"
-#: clusterdb.c:257
+#: clusterdb.c:270
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose 写大量的输出\n"
-#: clusterdb.c:258 createlang.c:240 createuser.c:348 dropdb.c:160
-#: droplang.c:241 dropuser.c:162 reindexdb.c:338
+#: clusterdb.c:271 createlang.c:240 createuser.c:348 dropdb.c:160
+#: droplang.c:241 dropuser.c:162 reindexdb.c:352
#, c-format
msgid " -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: clusterdb.c:259 createlang.c:241 createuser.c:353 dropdb.c:162
-#: droplang.c:242 dropuser.c:164 reindexdb.c:339
+#: clusterdb.c:272 createlang.c:241 createuser.c:353 dropdb.c:162
+#: droplang.c:242 dropuser.c:164 reindexdb.c:353
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助, 然后退出\n"
-#: clusterdb.c:260 createdb.c:265 createlang.c:242 createuser.c:354
-#: dropdb.c:163 droplang.c:243 dropuser.c:165 reindexdb.c:340 vacuumdb.c:357
+#: clusterdb.c:273 createdb.c:265 createlang.c:242 createuser.c:354
+#: dropdb.c:163 droplang.c:243 dropuser.c:165 pg_isready.c:219 reindexdb.c:354
+#: vacuumdb.c:373
#, c-format
msgid ""
"\n"
@@ -140,42 +160,42 @@ msgstr ""
"\n"
"联接选项:\n"
-#: clusterdb.c:261 createlang.c:243 createuser.c:355 dropdb.c:164
-#: droplang.c:244 dropuser.c:166 reindexdb.c:341 vacuumdb.c:358
+#: clusterdb.c:274 createlang.c:243 createuser.c:355 dropdb.c:164
+#: droplang.c:244 dropuser.c:166 reindexdb.c:355 vacuumdb.c:374
#, c-format
msgid " -h, --host=HOSTNAME database server host or socket directory\n"
msgstr " -h, --host=HOSTNAM 数据库服务器所在机器的主机名或套接字目录\n"
-#: clusterdb.c:262 createlang.c:244 createuser.c:356 dropdb.c:165
-#: droplang.c:245 dropuser.c:167 reindexdb.c:342 vacuumdb.c:359
+#: clusterdb.c:275 createlang.c:244 createuser.c:356 dropdb.c:165
+#: droplang.c:245 dropuser.c:167 reindexdb.c:356 vacuumdb.c:375
#, c-format
msgid " -p, --port=PORT database server port\n"
msgstr " -p, --port=PORT 数据库服务器端口号\n"
-#: clusterdb.c:263 createlang.c:245 dropdb.c:166 droplang.c:246
-#: reindexdb.c:343 vacuumdb.c:360
+#: clusterdb.c:276 createlang.c:245 dropdb.c:166 droplang.c:246
+#: reindexdb.c:357 vacuumdb.c:376
#, c-format
msgid " -U, --username=USERNAME user name to connect as\n"
msgstr " -U, --username=USERNAME 联接的用户名\n"
-#: clusterdb.c:264 createlang.c:246 createuser.c:358 dropdb.c:167
-#: droplang.c:247 dropuser.c:169 reindexdb.c:344 vacuumdb.c:361
+#: clusterdb.c:277 createlang.c:246 createuser.c:358 dropdb.c:167
+#: droplang.c:247 dropuser.c:169 reindexdb.c:358 vacuumdb.c:377
#, c-format
msgid " -w, --no-password never prompt for password\n"
msgstr " -w, -no-password 永远不提示输入口令\n"
-#: clusterdb.c:265 createlang.c:247 createuser.c:359 dropdb.c:168
-#: droplang.c:248 dropuser.c:170 reindexdb.c:345 vacuumdb.c:362
+#: clusterdb.c:278 createlang.c:247 createuser.c:359 dropdb.c:168
+#: droplang.c:248 dropuser.c:170 reindexdb.c:359 vacuumdb.c:378
#, c-format
msgid " -W, --password force password prompt\n"
msgstr " -W, --password 强制提示输入口令\n"
-#: clusterdb.c:266 dropdb.c:169 reindexdb.c:346 vacuumdb.c:363
+#: clusterdb.c:279 dropdb.c:169 reindexdb.c:360 vacuumdb.c:379
#, c-format
msgid " --maintenance-db=DBNAME alternate maintenance database\n"
msgstr " --maintenance-db=DBNAME 更改维护数据库\n"
-#: clusterdb.c:267
+#: clusterdb.c:280
#, c-format
msgid ""
"\n"
@@ -184,8 +204,9 @@ msgstr ""
"\n"
"阅读 SQL 命令 CLUSTER 的描述信息, 以便获得更详细的信息.\n"
-#: clusterdb.c:268 createdb.c:273 createlang.c:248 createuser.c:360
-#: dropdb.c:170 droplang.c:249 dropuser.c:171 reindexdb.c:348 vacuumdb.c:365
+#: clusterdb.c:281 createdb.c:273 createlang.c:248 createuser.c:360
+#: dropdb.c:170 droplang.c:249 dropuser.c:171 pg_isready.c:224 reindexdb.c:362
+#: vacuumdb.c:381
#, c-format
msgid ""
"\n"
@@ -194,85 +215,69 @@ msgstr ""
"\n"
"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
-#: common.c:45
+#: common.c:44
#, c-format
msgid "%s: could not obtain information about current user: %s\n"
msgstr "%s: 无法获得当前用户的信息: %s\n"
-#: common.c:56
+#: common.c:55
#, c-format
msgid "%s: could not get current user name: %s\n"
msgstr "%s: 无法获取当前用户名称: %s\n"
-#: common.c:103 common.c:155
+#: common.c:102 common.c:148
msgid "Password: "
msgstr "口令: "
-#: common.c:117
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: 内存溢出\n"
-
-#: common.c:144
+#: common.c:137
#, c-format
msgid "%s: could not connect to database %s\n"
msgstr "%s: 无法联接到数据库 %s\n"
-#: common.c:171
+#: common.c:164
#, c-format
msgid "%s: could not connect to database %s: %s"
msgstr "%s: 无法联接到数据库 %s: %s"
-#: common.c:220 common.c:248
+#: common.c:213 common.c:241
#, c-format
msgid "%s: query failed: %s"
msgstr "%s: 查询失败: %s"
-#: common.c:222 common.c:250
+#: common.c:215 common.c:243
#, c-format
msgid "%s: query was: %s\n"
msgstr "%s: 查询是: %s\n"
-# common.c:78
-#: common.c:296
-#, c-format
-msgid "pg_strdup: cannot duplicate null pointer (internal error)\n"
-msgstr "pg_strdup: 无法复制空指针 (内部错误)\n"
-
-#: common.c:302
-#, c-format
-msgid "out of memory\n"
-msgstr "内存溢出\n"
-
#. translator: abbreviation for "yes"
-#: common.c:313
+#: common.c:284
msgid "y"
msgstr "y"
#. translator: abbreviation for "no"
-#: common.c:315
+#: common.c:286
msgid "n"
msgstr "n"
#. translator: This is a question followed by the translated options for
#. "yes" and "no".
-#: common.c:325
+#: common.c:296
#, c-format
msgid "%s (%s/%s) "
msgstr "%s (%s/%s) "
-#: common.c:346
+#: common.c:317
#, c-format
msgid "Please answer \"%s\" or \"%s\".\n"
msgstr "请回答\"%s\"或\"%s\".\n"
-#: common.c:424 common.c:457
+#: common.c:395 common.c:428
#, c-format
msgid "Cancel request sent\n"
msgstr "取消发送的请求\n"
# fe-connect.c:1322
-#: common.c:426 common.c:459
+#: common.c:397 common.c:430
#, c-format
msgid "Could not send cancel request: %s"
msgstr "无法发送取消请求: %s"
@@ -740,6 +745,96 @@ msgid ""
" -U, --username=USERNAME user name to connect as (not the one to drop)\n"
msgstr " -U, --username=USERNAME 联接用户 (不是要删除的用户名)\n"
+# command.c:788
+# command.c:808
+# command.c:1163
+# command.c:1170
+# command.c:1180
+# command.c:1192
+# command.c:1205
+# command.c:1219
+# command.c:1241
+# command.c:1272
+# common.c:170
+# copy.c:530
+# copy.c:575
+#: pg_isready.c:138
+#, c-format
+#| msgid "%s: %s\n"
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: pg_isready.c:146
+#, c-format
+#| msgid "could not set default_with_oids: %s"
+msgid "%s: could not fetch default options\n"
+msgstr "%s: 无法取得缺省选项\n"
+
+#: pg_isready.c:209
+#, c-format
+#| msgid ""
+#| "%s creates a PostgreSQL database.\n"
+#| "\n"
+msgid ""
+"%s issues a connection check to a PostgreSQL database.\n"
+"\n"
+msgstr ""
+"%s 发起一个到指定 PostgreSQL数据库的连接检查.\n"
+"\n"
+
+#: pg_isready.c:211
+#, c-format
+msgid " %s [OPTION]...\n"
+msgstr " %s [选项]...\n"
+
+#: pg_isready.c:214
+#, c-format
+#| msgid " -d, --dbname=DBNAME database to reindex\n"
+msgid " -d, --dbname=DBNAME database name\n"
+msgstr " -d, --dbname=DBNAME 数据库名\n"
+
+#: pg_isready.c:215
+#, c-format
+#| msgid " -q, --quiet don't write any messages\n"
+msgid " -q, --quiet run quietly\n"
+msgstr " -q, --quiet 静默运行\n"
+
+#: pg_isready.c:216
+#, c-format
+msgid " -V, --version output version information, then exit\n"
+msgstr " -V, --version 输出版本信息, 然后退出\n"
+
+#: pg_isready.c:217
+#, c-format
+msgid " -?, --help show this help, then exit\n"
+msgstr " -?, --help 显示此帮助, 然后退出\n"
+
+#: pg_isready.c:220
+#, c-format
+msgid " -h, --host=HOSTNAME database server host or socket directory\n"
+msgstr " -h, --host=主机名 数据库服务器的主机名或套接字目录\n"
+
+#: pg_isready.c:221
+#, c-format
+#| msgid " -p, --port=PORT database server port\n"
+msgid " -p, --port=PORT database server port\n"
+msgstr " -p, --port=PORT 数据库服务器端口\n"
+
+#: pg_isready.c:222
+#, c-format
+#| msgid " -t, --timeout=SECS seconds to wait when using -w option\n"
+msgid ""
+" -t, --timeout=SECS seconds to wait when attempting connection, 0 "
+"disables (default: %s)\n"
+msgstr ""
+" -t, --timeout=SECS 尝试连接时要等待的秒数, 值为0表示禁用(缺省值: %s)\n"
+
+#: pg_isready.c:223
+#, c-format
+#| msgid " -U, --username=USERNAME user name to connect as\n"
+msgid " -U, --username=USERNAME user name to connect as\n"
+msgstr " -U, --username=USERNAME 连接的用户名\n"
+
#: reindexdb.c:149
#, c-format
msgid "%s: cannot reindex all databases and a specific one at the same time\n"
@@ -752,52 +847,58 @@ msgstr "%s: 无法对所有数据库和系统目录同时进行索引重建操
#: reindexdb.c:159
#, c-format
-msgid "%s: cannot reindex a specific table in all databases\n"
-msgstr "%s: 无法在所有数据库中对一张指定表上的索引进行重建\n"
+#| msgid "%s: cannot reindex a specific table in all databases\n"
+msgid "%s: cannot reindex specific table(s) in all databases\n"
+msgstr "%s: 无法在所有数据库中对指定表上的索引进行重建\n"
#: reindexdb.c:164
#, c-format
-msgid "%s: cannot reindex a specific index in all databases\n"
-msgstr "%s: 无法在所有数据库中对一个指定的索引进行重建\n"
+#| msgid "%s: cannot reindex a specific index in all databases\n"
+msgid "%s: cannot reindex specific index(es) in all databases\n"
+msgstr "%s: 无法在所有数据库中对指定的索引进行重建\n"
#: reindexdb.c:175
#, c-format
+#| msgid ""
+#| "%s: cannot reindex a specific table and system catalogs at the same time\n"
msgid ""
-"%s: cannot reindex a specific table and system catalogs at the same time\n"
-msgstr "%s: 无法对一张指定的表和系统视图同时进行索引重建操作\n"
+"%s: cannot reindex specific table(s) and system catalogs at the same time\n"
+msgstr "%s: 无法对指定的表和系统视图同时进行索引重建操作\n"
#: reindexdb.c:180
#, c-format
+#| msgid ""
+#| "%s: cannot reindex a specific index and system catalogs at the same time\n"
msgid ""
-"%s: cannot reindex a specific index and system catalogs at the same time\n"
-msgstr "%s: 无法对一个指定索引和系统视图同时进行索引重建操作\n"
+"%s: cannot reindex specific index(es) and system catalogs at the same time\n"
+msgstr "%s: 无法对指定索引和系统视图同时进行索引重建操作\n"
-#: reindexdb.c:250
+#: reindexdb.c:264
#, c-format
msgid "%s: reindexing of table \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库\"%3$s\"中对表\"%2$s\"上的索引重新创建失败: %4$s"
-#: reindexdb.c:253
+#: reindexdb.c:267
#, c-format
msgid "%s: reindexing of index \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库\"%3$s\"中对索引\"%2$s\"重新创建失败: %4$s"
-#: reindexdb.c:256
+#: reindexdb.c:270
#, c-format
msgid "%s: reindexing of database \"%s\" failed: %s"
msgstr "%s: 在数据库\"%s\"上重新创建索引失败: %s"
-#: reindexdb.c:287
+#: reindexdb.c:301
#, c-format
msgid "%s: reindexing database \"%s\"\n"
msgstr "%s: 对数据库 \"%s\" 重新创建索引\n"
-#: reindexdb.c:315
+#: reindexdb.c:329
#, c-format
msgid "%s: reindexing of system catalogs failed: %s"
msgstr "%s: 对目录视图重新创建索引失败: %s"
-#: reindexdb.c:327
+#: reindexdb.c:341
#, c-format
msgid ""
"%s reindexes a PostgreSQL database.\n"
@@ -806,32 +907,34 @@ msgstr ""
"%s 对一个PostgreSQL 数据库重新创建索引.\n"
"\n"
-#: reindexdb.c:331
+#: reindexdb.c:345
#, c-format
msgid " -a, --all reindex all databases\n"
msgstr " -a, --all 对所有数据库进行重建索引操作\n"
-#: reindexdb.c:332
+#: reindexdb.c:346
#, c-format
msgid " -d, --dbname=DBNAME database to reindex\n"
msgstr " -d, --dbname=数据库名称 对数据库中的索引进行重建\n"
-#: reindexdb.c:334
+#: reindexdb.c:348
#, c-format
-msgid " -i, --index=INDEX recreate specific index only\n"
-msgstr " -I, --index=索引名称 仅重新创建指定的索引\n"
+#| msgid " -i, --index=INDEX recreate specific index only\n"
+msgid " -i, --index=INDEX recreate specific index(es) only\n"
+msgstr " -I, --index=INDEX 仅重新创建指定的索引\n"
-#: reindexdb.c:336
+#: reindexdb.c:350
#, c-format
msgid " -s, --system reindex system catalogs\n"
msgstr " -s, --system 对系统视图重新创建索引\n"
-#: reindexdb.c:337
+#: reindexdb.c:351
#, c-format
-msgid " -t, --table=TABLE reindex specific table only\n"
-msgstr " -t, --table=表名 只对指定的表TABLE重新创建索引\n"
+#| msgid " -t, --table=TABLE reindex specific table only\n"
+msgid " -t, --table=TABLE reindex specific table(s) only\n"
+msgstr " -t, --table=表名 只对指定的表重新创建索引\n"
-#: reindexdb.c:347
+#: reindexdb.c:361
#, c-format
msgid ""
"\n"
@@ -840,42 +943,43 @@ msgstr ""
"\n"
"阅读SQL命令REINDEX的描述信息, 以便获得更详细的信息.\n"
-#: vacuumdb.c:161
+#: vacuumdb.c:162
#, c-format
msgid "%s: cannot use the \"full\" option when performing only analyze\n"
msgstr "%s: 在只执行分析的时候,无法使用选项\"full\"\n"
-#: vacuumdb.c:167
+#: vacuumdb.c:168
#, c-format
msgid "%s: cannot use the \"freeze\" option when performing only analyze\n"
msgstr "%s: 当只执行分析的时候,无法使用选项\"freeze\"\n"
-#: vacuumdb.c:180
+#: vacuumdb.c:181
#, c-format
msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
msgstr "%s: 无法对所有数据库和一个指定的数据库同时清理\n"
-#: vacuumdb.c:186
+#: vacuumdb.c:187
#, c-format
-msgid "%s: cannot vacuum a specific table in all databases\n"
-msgstr "%s: 无法在所有数据库中对一个指定的表进行清理\n"
+#| msgid "%s: cannot vacuum a specific table in all databases\n"
+msgid "%s: cannot vacuum specific table(s) in all databases\n"
+msgstr "%s: 无法在所有数据库中对指定的表进行清理\n"
-#: vacuumdb.c:290
+#: vacuumdb.c:306
#, c-format
msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
msgstr "%1$s: 在数据库 \"%3$s\" 中的表 \"%2$s\" 清理失败: %4$s"
-#: vacuumdb.c:293
+#: vacuumdb.c:309
#, c-format
msgid "%s: vacuuming of database \"%s\" failed: %s"
msgstr "%s: 数据库 \"%s\" 清理失败: %s"
-#: vacuumdb.c:325
+#: vacuumdb.c:341
#, c-format
msgid "%s: vacuuming database \"%s\"\n"
msgstr "%s: 清理数据库 \"%s\"\n"
-#: vacuumdb.c:341
+#: vacuumdb.c:357
#, c-format
msgid ""
"%s cleans and analyzes a PostgreSQL database.\n"
@@ -884,70 +988,71 @@ msgstr ""
"%s 清理并且优化一个 PostgreSQL 数据库.\n"
"\n"
-#: vacuumdb.c:345
+#: vacuumdb.c:361
#, c-format
msgid " -a, --all vacuum all databases\n"
msgstr " -a, --all 清理所有的数据库\n"
-#: vacuumdb.c:346
+#: vacuumdb.c:362
#, c-format
msgid " -d, --dbname=DBNAME database to vacuum\n"
msgstr " -d, --dbname=DBNAME 清理数据库 DBNAME\n"
-#: vacuumdb.c:347
+#: vacuumdb.c:363
#, c-format
msgid ""
" -e, --echo show the commands being sent to the "
"server\n"
msgstr " -e, --echo 显示发送到服务端的命令\n"
-#: vacuumdb.c:348
+#: vacuumdb.c:364
#, c-format
msgid " -f, --full do full vacuuming\n"
msgstr " -f, --full 完全清理\n"
-#: vacuumdb.c:349
+#: vacuumdb.c:365
#, c-format
msgid " -F, --freeze freeze row transaction information\n"
msgstr " -F, --freeze 冻结记录的事务信息\n"
-#: vacuumdb.c:350
+#: vacuumdb.c:366
#, c-format
msgid " -q, --quiet don't write any messages\n"
msgstr " -q, --quiet 不写任何信息\n"
-#: vacuumdb.c:351
+#: vacuumdb.c:367
#, c-format
-msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table only\n"
-msgstr " -t, --table='TABLE[(COLUMNS)]' 只清理指定的表 TABLE\n"
+#| msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table only\n"
+msgid " -t, --table='TABLE[(COLUMNS)]' vacuum specific table(s) only\n"
+msgstr " -t, --table='TABLE[(COLUMNS)]' 只清理指定的表\n"
-#: vacuumdb.c:352
+#: vacuumdb.c:368
#, c-format
msgid " -v, --verbose write a lot of output\n"
msgstr " -v, --verbose 写大量的输出\n"
-#: vacuumdb.c:353
+#: vacuumdb.c:369
#, c-format
msgid ""
" -V, --version output version information, then exit\n"
msgstr " -V, --version 输出版本信息, 然后退出\n"
-#: vacuumdb.c:354
+#: vacuumdb.c:370
#, c-format
msgid " -z, --analyze update optimizer statistics\n"
msgstr " -z, --anaylze 更新优化器的统计信息\n"
-#: vacuumdb.c:355
+#: vacuumdb.c:371
#, c-format
msgid " -Z, --analyze-only only update optimizer statistics\n"
msgstr " -z, --analyze-only 只更新优化器的统计信息\n"
-#: vacuumdb.c:356
+#: vacuumdb.c:372
#, c-format
msgid " -?, --help show this help, then exit\n"
msgstr " -?, --help 显示此帮助信息, 然后退出\n"
-#: vacuumdb.c:364
+#: vacuumdb.c:380
#, c-format
msgid ""
"\n"
@@ -956,65 +1061,68 @@ msgstr ""
"\n"
"阅读 SQL 命令 VACUUM 的描述信息, 以便获得更详细的信息.\n"
-#~ msgid ""
-#~ " -D, --location=PATH alternative place to store the database\n"
-#~ msgstr " -D, --location=PATH 选择一个地方存放数据库\n"
-
-#~ msgid " -W, --password prompt for password to connect\n"
-#~ msgstr " -W, --password 联接提示口令输入\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid " -i, --sysid=SYSID select sysid for new user\n"
-#~ msgstr " -i, --sysid=SYSID 选择一个 sysid 给新用户\n"
+#~ msgid ""
+#~ " --version output version information, then exit\n"
+#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid "%s: user ID must be a positive number\n"
-#~ msgstr "%s: 用户 ID 必需为一个正数\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
-#~ msgid ""
-#~ " -L, --pglib=DIRECTORY find language interpreter file in DIRECTORY\n"
-#~ msgstr " -L, --pglib=DIRECTORY 在 DIRECTORY 目录中查找语言翻译文件\n"
+#~ msgid " --version output version information, then exit\n"
+#~ msgstr " --version 输出版本信息, 然后退出\n"
#~ msgid ""
-#~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
-#~ "plpythonu.\n"
+#~ "\n"
+#~ "If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you "
+#~ "will\n"
+#~ "be prompted interactively.\n"
#~ msgstr ""
-#~ "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
+#~ "\n"
+#~ "如果 -d, -D, -r, -R, -s, -S 和 ROLENAME 一个都没有指定,将使用交互式提示\n"
+#~ "你.\n"
-#~ msgid "%s: unsupported language \"%s\"\n"
-#~ msgstr "%s: 不支持语言 \"%s\"\n"
+#~ msgid ""
+#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
+#~ msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
-#~ msgid " -q, --quiet don't write any messages\n"
-#~ msgstr " -q, --quiet 不写任何信息\n"
+#~ msgid " --help show this help, then exit\n"
+#~ msgstr " --help 显示此帮助信息, 然后退出\n"
#~ msgid ""
#~ " --version output version information, then exit\n"
#~ msgstr " --versoin 输出版本信息, 然后退出\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid " -q, --quiet don't write any messages\n"
+#~ msgstr " -q, --quiet 不写任何信息\n"
-#~ msgid ""
-#~ "%s: still %s functions declared in language \"%s\"; language not removed\n"
-#~ msgstr "%s: 函数 %s 是用语言 \"%s\" 声明的; 语言未被删除\n"
+#~ msgid "%s: unsupported language \"%s\"\n"
+#~ msgstr "%s: 不支持语言 \"%s\"\n"
#~ msgid ""
-#~ "\n"
-#~ "If one of -d, -D, -r, -R, -s, -S, and ROLENAME is not specified, you "
-#~ "will\n"
-#~ "be prompted interactively.\n"
+#~ "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
+#~ "plpythonu.\n"
#~ msgstr ""
-#~ "\n"
-#~ "如果 -d, -D, -r, -R, -s, -S 和 ROLENAME 一个都没有指定,将使用交互式提示\n"
-#~ "你.\n"
+#~ "已支持的语言有 plpgsql, pltcl, pltclu, plperl, plperlu, 和 plpythonu.\n"
-#~ msgid " --version output version information, then exit\n"
-#~ msgstr " --version 输出版本信息, 然后退出\n"
+#~ msgid ""
+#~ " -L, --pglib=DIRECTORY find language interpreter file in DIRECTORY\n"
+#~ msgstr " -L, --pglib=DIRECTORY 在 DIRECTORY 目录中查找语言翻译文件\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: user ID must be a positive number\n"
+#~ msgstr "%s: 用户 ID 必需为一个正数\n"
+
+#~ msgid " -i, --sysid=SYSID select sysid for new user\n"
+#~ msgstr " -i, --sysid=SYSID 选择一个 sysid 给新用户\n"
+
+#~ msgid " -W, --password prompt for password to connect\n"
+#~ msgstr " -W, --password 联接提示口令输入\n"
#~ msgid ""
-#~ " --version output version information, then exit\n"
-#~ msgstr " --versoin 输出版本信息, 然后退出\n"
+#~ " -D, --location=PATH alternative place to store the database\n"
+#~ msgstr " -D, --location=PATH 选择一个地方存放数据库\n"
-#~ msgid " --help show this help, then exit\n"
-#~ msgstr " --help 显示此帮助信息, 然后退出\n"
+#~ msgid "%s: out of memory\n"
+#~ msgstr "%s: 内存溢出\n"
diff --git a/src/interfaces/ecpg/ecpglib/po/de.po b/src/interfaces/ecpg/ecpglib/po/de.po
index 7f9bc6b911..0c9bf1860f 100644
--- a/src/interfaces/ecpg/ecpglib/po/de.po
+++ b/src/interfaces/ecpg/ecpglib/po/de.po
@@ -10,9 +10,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-03-18 17:23+0000\n"
-"PO-Revision-Date: 2013-03-04 21:16-0500\n"
+"PO-Revision-Date: 2013-09-04 20:30-0400\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: Peter Eisentraut <peter_e@gmx.net>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/ecpg/ecpglib/po/fr.po b/src/interfaces/ecpg/ecpglib/po/fr.po
index 3cc60b820a..f2621e409f 100644
--- a/src/interfaces/ecpg/ecpglib/po/fr.po
+++ b/src/interfaces/ecpg/ecpglib/po/fr.po
@@ -10,9 +10,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-03-06 17:22+0000\n"
-"PO-Revision-Date: 2010-03-06 19:06+0100\n"
+"PO-Revision-Date: 2013-09-04 20:31-0400\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: PostgreSQLfr <pgsql-fr-generale@postgresql.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/ecpg/ecpglib/po/ja.po b/src/interfaces/ecpg/ecpglib/po/ja.po
index 60c8b5b3c6..0e8575766e 100644
--- a/src/interfaces/ecpg/ecpglib/po/ja.po
+++ b/src/interfaces/ecpg/ecpglib/po/ja.po
@@ -8,9 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-07-20 12:52+0900\n"
-"PO-Revision-Date: 2010-07-15 18:00+0900\n"
+"PO-Revision-Date: 2013-09-04 20:34-0400\n"
"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
"Language-Team: Japanese\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/ecpg/ecpglib/po/tr.po b/src/interfaces/ecpg/ecpglib/po/tr.po
index dfa1d56ff6..1df67a5d59 100644
--- a/src/interfaces/ecpg/ecpglib/po/tr.po
+++ b/src/interfaces/ecpg/ecpglib/po/tr.po
@@ -8,9 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-08-31 20:08+0000\n"
-"PO-Revision-Date: 2010-09-01 10:51+0200\n"
+"PO-Revision-Date: 2013-09-04 20:47-0400\n"
"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
"Language-Team: TR <devrim@gunduz.org>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/ecpg/ecpglib/po/zh_CN.po b/src/interfaces/ecpg/ecpglib/po/zh_CN.po
index c3e5806780..73f698b45c 100644
--- a/src/interfaces/ecpg/ecpglib/po/zh_CN.po
+++ b/src/interfaces/ecpg/ecpglib/po/zh_CN.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: ecpglib (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2013-01-29 13:40+0000\n"
-"PO-Revision-Date: 2010-09-26 09:04+0800\n"
+"PO-Revision-Date: 2013-09-03 23:28-0400\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
"Language-Team: Chinese (Simplified)\n"
-"Language: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/ecpg/preproc/po/ko.po b/src/interfaces/ecpg/preproc/po/ko.po
index b096d7205d..4f11825df8 100644
--- a/src/interfaces/ecpg/preproc/po/ko.po
+++ b/src/interfaces/ecpg/preproc/po/ko.po
@@ -7,9 +7,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-09-09 16:34+0000\n"
-"PO-Revision-Date: 2010-09-09 17:00+0000\n"
+"PO-Revision-Date: 2013-09-05 22:33-0400\n"
"Last-Translator: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/ecpg/preproc/po/tr.po b/src/interfaces/ecpg/preproc/po/tr.po
index 0b639bd0be..853d45419c 100644
--- a/src/interfaces/ecpg/preproc/po/tr.po
+++ b/src/interfaces/ecpg/preproc/po/tr.po
@@ -8,9 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-08-31 20:08+0000\n"
-"PO-Revision-Date: 2010-09-01 11:20+0200\n"
+"PO-Revision-Date: 2013-09-04 20:48-0400\n"
"Last-Translator: Devrim GÜNDÜZ <devrim@gunduz.org>\n"
"Language-Team: Turkish <devrim@gunduz.org>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/ecpg/preproc/po/zh_TW.po b/src/interfaces/ecpg/preproc/po/zh_TW.po
index 6231f63a0c..9d94f8c1d1 100644
--- a/src/interfaces/ecpg/preproc/po/zh_TW.po
+++ b/src/interfaces/ecpg/preproc/po/zh_TW.po
@@ -6,11 +6,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-11 20:42+0000\n"
-"PO-Revision-Date: 2011-05-09 10:38+0800\n"
+"PO-Revision-Date: 2013-09-03 23:28-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
-"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
-"com>\n"
-"Language: \n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/interfaces/libpq/po/cs.po b/src/interfaces/libpq/po/cs.po
index 69b3ef31fa..b8e03930ec 100644
--- a/src/interfaces/libpq/po/cs.po
+++ b/src/interfaces/libpq/po/cs.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: postgresql-8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-03-17 18:40+0000\n"
-"PO-Revision-Date: 2013-03-17 21:36+0100\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2013-09-23 20:12+0000\n"
+"PO-Revision-Date: 2013-09-24 20:31+0200\n"
+"Last-Translator: Tomas Vondra\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -36,7 +36,8 @@ msgstr "Kerberos 5 autentizace odmítnuta: %*s\n"
#: fe-auth.c:288
#, c-format
-msgid "could not restore non-blocking mode on socket: %s\n"
+#| msgid "could not restore non-blocking mode on socket: %s\n"
+msgid "could not restore nonblocking mode on socket: %s\n"
msgstr "nelze obnovit neblokující mód soketu: %s\n"
#: fe-auth.c:400
@@ -55,11 +56,12 @@ msgstr "chyba importu jména GSSAPI"
msgid "SSPI continuation error"
msgstr "Přetrvávající chyba SSPI"
-#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:758 fe-connect.c:2004
-#: fe-connect.c:3392 fe-connect.c:3610 fe-connect.c:4022 fe-connect.c:4117
-#: fe-connect.c:4382 fe-connect.c:4451 fe-connect.c:4468 fe-connect.c:4559
-#: fe-connect.c:4909 fe-connect.c:5059 fe-exec.c:3296 fe-exec.c:3461
-#: fe-lobj.c:896 fe-protocol2.c:1181 fe-protocol3.c:1541 fe-secure.c:767
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:758 fe-connect.c:2005
+#: fe-connect.c:3393 fe-connect.c:3611 fe-connect.c:4023 fe-connect.c:4118
+#: fe-connect.c:4383 fe-connect.c:4452 fe-connect.c:4469 fe-connect.c:4560
+#: fe-connect.c:4910 fe-connect.c:5060 fe-exec.c:3296 fe-exec.c:3461
+#: fe-lobj.c:896 fe-protocol2.c:1181 fe-protocol3.c:1544 fe-secure.c:791
+#: fe-secure.c:1191
msgid "out of memory\n"
msgstr "nedostatek paměti\n"
@@ -201,8 +203,9 @@ msgstr "nelze vytvořit soket: %s\n"
#: fe-connect.c:1669
#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "nelze nastavit soket do neblokujícího módu: %s\n"
+#| msgid "could not set socket to non-blocking mode: %s\n"
+msgid "could not set socket to nonblocking mode: %s\n"
+msgstr "soket nelze nastavit do neblokujícího módu: %s\n"
#: fe-connect.c:1680
#, c-format
@@ -218,173 +221,173 @@ msgstr "parametr keepalives musí být celé číslo\n"
msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
msgstr "setsockopt(SO_KEEPALIVE) selhalo: %s\n"
-#: fe-connect.c:1848
+#: fe-connect.c:1849
#, c-format
msgid "could not get socket error status: %s\n"
msgstr "nelze obdržet chybový status soketu: %s\n"
-#: fe-connect.c:1882
+#: fe-connect.c:1883
#, c-format
msgid "could not get client address from socket: %s\n"
msgstr "nelze získat adresu klienta ze soketu: %s\n"
-#: fe-connect.c:1923
+#: fe-connect.c:1924
msgid "requirepeer parameter is not supported on this platform\n"
msgstr "parametr requirepeer není na této platformě podporován\n"
-#: fe-connect.c:1926
+#: fe-connect.c:1927
#, c-format
msgid "could not get peer credentials: %s\n"
msgstr "nelze získat informace (credentials) protistrany: %s\n"
-#: fe-connect.c:1936
+#: fe-connect.c:1937
#, c-format
msgid "local user with ID %d does not exist\n"
msgstr "lokální uživatel s ID %d neexistuje\n"
-#: fe-connect.c:1944
+#: fe-connect.c:1945
#, c-format
msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
msgstr "requirepeer obsahuje \"%s\", ale skutečné jméno peera je \"%s\"\n"
-#: fe-connect.c:1978
+#: fe-connect.c:1979
#, c-format
msgid "could not send SSL negotiation packet: %s\n"
msgstr "nelze poslat SSL \"negotiation paket\": %s\n"
-#: fe-connect.c:2017
+#: fe-connect.c:2018
#, c-format
msgid "could not send startup packet: %s\n"
msgstr "nelze poslat počáteční paket: %s\n"
-#: fe-connect.c:2087
+#: fe-connect.c:2088
msgid "server does not support SSL, but SSL was required\n"
msgstr "server nepodporuje SSL, leč SSL je vyžadováno\n"
-#: fe-connect.c:2113
+#: fe-connect.c:2114
#, c-format
msgid "received invalid response to SSL negotiation: %c\n"
msgstr "přijata neplatná odpověď na SSL negotiation: %c\n"
-#: fe-connect.c:2188 fe-connect.c:2221
+#: fe-connect.c:2189 fe-connect.c:2222
#, c-format
msgid "expected authentication request from server, but received %c\n"
msgstr "očekáván byl autentizační dotaz ze serveru, ale přijat byl %c\n"
-#: fe-connect.c:2388
+#: fe-connect.c:2389
#, c-format
msgid "out of memory allocating GSSAPI buffer (%d)"
msgstr "při alokace GSSAPI bufferu došla paměť (%d)"
-#: fe-connect.c:2473
+#: fe-connect.c:2474
msgid "unexpected message from server during startup\n"
msgstr "neočekávaná zpráva ze serveru během startu\n"
-#: fe-connect.c:2567
+#: fe-connect.c:2568
#, c-format
msgid "invalid connection state %d, probably indicative of memory corruption\n"
msgstr "neplatný stav spojení %d, pravděpodobně způsobený poškozením paměti\n"
-#: fe-connect.c:3000 fe-connect.c:3060
+#: fe-connect.c:3001 fe-connect.c:3061
#, c-format
msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
msgstr "PGEventProc \"%s\" selhalo během události PGEVT_CONNRESET\n"
-#: fe-connect.c:3405
+#: fe-connect.c:3406
#, c-format
msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
msgstr "naplatné LDAP URL \"%s\": schéma musí být ldap://\n"
-#: fe-connect.c:3420
+#: fe-connect.c:3421
#, c-format
msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
msgstr "neplatné LDAP URL \"%s\": chybí rozlišující jméno\n"
-#: fe-connect.c:3431 fe-connect.c:3484
+#: fe-connect.c:3432 fe-connect.c:3485
#, c-format
msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
msgstr "neplatné LDAP URL \"%s\": musí mít právě jeden atribut\n"
-#: fe-connect.c:3441 fe-connect.c:3498
+#: fe-connect.c:3442 fe-connect.c:3499
#, c-format
msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
msgstr "naplatné LDAP URL \"%s\": musí mít vyhledávací rozsah (base/one/sub)\n"
-#: fe-connect.c:3452
+#: fe-connect.c:3453
#, c-format
msgid "invalid LDAP URL \"%s\": no filter\n"
msgstr "naplatné LDAP URL \"%s\": není filter\n"
-#: fe-connect.c:3473
+#: fe-connect.c:3474
#, c-format
msgid "invalid LDAP URL \"%s\": invalid port number\n"
msgstr "naplatné LDAP URL \"%s\": neplatný číslo portu\n"
-#: fe-connect.c:3507
+#: fe-connect.c:3508
msgid "could not create LDAP structure\n"
msgstr "nelze vytvořit LDAP strukturu\n"
-#: fe-connect.c:3549
+#: fe-connect.c:3550
#, c-format
msgid "lookup on LDAP server failed: %s\n"
msgstr "vyhledávání na LDAP serveru selhalo: %s\n"
-#: fe-connect.c:3560
+#: fe-connect.c:3561
msgid "more than one entry found on LDAP lookup\n"
msgstr "nalezen více jak jeden záznam při LDAP vyhledávání\n"
-#: fe-connect.c:3561 fe-connect.c:3573
+#: fe-connect.c:3562 fe-connect.c:3574
msgid "no entry found on LDAP lookup\n"
msgstr "nebyl nalezen žádný záznam při LDAP vyhledávání\n"
-#: fe-connect.c:3584 fe-connect.c:3597
+#: fe-connect.c:3585 fe-connect.c:3598
msgid "attribute has no values on LDAP lookup\n"
msgstr "atribut nemá žádnou hodnotu při LDAP vyhledávání\n"
-#: fe-connect.c:3649 fe-connect.c:3668 fe-connect.c:4156
+#: fe-connect.c:3650 fe-connect.c:3669 fe-connect.c:4157
#, c-format
msgid "missing \"=\" after \"%s\" in connection info string\n"
msgstr "chybné \"=\" po \"%s\" v informačním řetězci spojení\n"
-#: fe-connect.c:3732 fe-connect.c:4336 fe-connect.c:5041
+#: fe-connect.c:3733 fe-connect.c:4337 fe-connect.c:5042
#, c-format
msgid "invalid connection option \"%s\"\n"
msgstr "neplatný parametr spojení \"%s\"\n"
-#: fe-connect.c:3748 fe-connect.c:4205
+#: fe-connect.c:3749 fe-connect.c:4206
msgid "unterminated quoted string in connection info string\n"
msgstr "neukončený řetězec v uvozovkách v informačním řetězci spojení\n"
-#: fe-connect.c:3787
+#: fe-connect.c:3788
msgid "could not get home directory to locate service definition file"
msgstr "nelze získat domovský adresář pro nalezení kořenového certifikátu"
-#: fe-connect.c:3820
+#: fe-connect.c:3821
#, c-format
msgid "definition of service \"%s\" not found\n"
msgstr "definice služby \"%s\" nenalezena\n"
-#: fe-connect.c:3843
+#: fe-connect.c:3844
#, c-format
msgid "service file \"%s\" not found\n"
msgstr "soubor se seznamem služeb \"%s\" nebyl nalezen\n"
-#: fe-connect.c:3856
+#: fe-connect.c:3857
#, c-format
msgid "line %d too long in service file \"%s\"\n"
msgstr "řádek %d v souboru se seznamem služeb \"%s\" je příliš dlouhý\n"
-#: fe-connect.c:3927 fe-connect.c:3954
+#: fe-connect.c:3928 fe-connect.c:3955
#, c-format
msgid "syntax error in service file \"%s\", line %d\n"
msgstr "syntaktická chyba v souboru se seznamu služeb \"%s\", řádek %d\n"
-#: fe-connect.c:4569
+#: fe-connect.c:4570
#, c-format
msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
msgstr "neplatné URI propagované do interní procedury parseru: \"%s\"\n"
-#: fe-connect.c:4639
+#: fe-connect.c:4640
#, c-format
msgid ""
"end of string reached when looking for matching \"]\" in IPv6 host address "
@@ -393,12 +396,12 @@ msgstr ""
"při hledání odpovídajícího znaku \"]\" v IPv6 adrese hostitele byl dosažen "
"konec řetězce URI: \"%s\"\n"
-#: fe-connect.c:4646
+#: fe-connect.c:4647
#, c-format
msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
msgstr "IPv6 adresa hostitele v URI nesmí být prázdná: \"%s\"\n"
-#: fe-connect.c:4661
+#: fe-connect.c:4662
#, c-format
msgid ""
"unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): "
@@ -407,43 +410,43 @@ msgstr ""
"neočekávaný znak \"%c\" na pozici %d v URI (očekáváno \":\" nebo \"/\"): \"%s"
"\"\n"
-#: fe-connect.c:4775
+#: fe-connect.c:4776
#, c-format
msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
msgstr ""
"přebytečný oddělovač klíče/hodnoty \"=\" v URI parametru dotazu: \"%s\"\n"
-#: fe-connect.c:4795
+#: fe-connect.c:4796
#, c-format
msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
msgstr ""
"chybějící oddělovač klíče/hodnoty \"=\" v URI parametru dotazu: \"%s\"\n"
-#: fe-connect.c:4866
+#: fe-connect.c:4867
#, c-format
msgid "invalid URI query parameter: \"%s\"\n"
msgstr "neplatný parametr v URI dotazu: \"%s\"\n"
-#: fe-connect.c:4936
+#: fe-connect.c:4937
#, c-format
msgid "invalid percent-encoded token: \"%s\"\n"
msgstr "neplatný procenty-kódovaný token \"%s\"\n"
-#: fe-connect.c:4946
+#: fe-connect.c:4947
#, c-format
msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
msgstr "zakázaná hodnota %%00 v procenty-k´odované hodnotě: \"%s\"\n"
-#: fe-connect.c:5269
+#: fe-connect.c:5270
msgid "connection pointer is NULL\n"
msgstr "pointer spojení je NULL\n"
-#: fe-connect.c:5546
+#: fe-connect.c:5547
#, c-format
msgid "WARNING: password file \"%s\" is not a plain file\n"
msgstr "VAROVÁNÍ: soubor s hesly \"%s\" není prostý (plain) soubor\n"
-#: fe-connect.c:5555
+#: fe-connect.c:5556
#, c-format
msgid ""
"WARNING: password file \"%s\" has group or world access; permissions should "
@@ -452,7 +455,7 @@ msgstr ""
"UPOZORNĚNÍ: Soubor s hesly \"%s\" má přístupová práva pro čtení pro skupinu "
"nebo všechny uživatele; práva by měla být u=rw (0600)\n"
-#: fe-connect.c:5655
+#: fe-connect.c:5656
#, c-format
msgid "password retrieved from file \"%s\"\n"
msgstr "heslo načteno ze souboru \"%s\"\n"
@@ -516,7 +519,7 @@ msgid "PQexec not allowed during COPY BOTH\n"
msgstr "PQexec není povoleno během COPY BOTH\n"
#: fe-exec.c:2185 fe-exec.c:2252 fe-exec.c:2342 fe-protocol2.c:1327
-#: fe-protocol3.c:1677
+#: fe-protocol3.c:1683
msgid "no COPY in progress\n"
msgstr "COPY se neprovádí\n"
@@ -649,8 +652,8 @@ msgstr "pqPutInt nepodporuje integer velikosti %lu"
msgid "connection not open\n"
msgstr "spojení není otevřeno\n"
-#: fe-misc.c:736 fe-secure.c:363 fe-secure.c:443 fe-secure.c:524
-#: fe-secure.c:633
+#: fe-misc.c:736 fe-secure.c:387 fe-secure.c:467 fe-secure.c:548
+#: fe-secure.c:657
msgid ""
"server closed the connection unexpectedly\n"
"\tThis probably means the server terminated abnormally\n"
@@ -721,7 +724,7 @@ msgstr "neočekávaná odpověď serveru; předchozí znak byl \"%c\"\n"
msgid "out of memory for query result"
msgstr "nedostatek paměti pro výsledek dotazu"
-#: fe-protocol2.c:1370 fe-protocol3.c:1745
+#: fe-protocol2.c:1370 fe-protocol3.c:1752
#, c-format
msgid "%s"
msgstr "%s"
@@ -731,7 +734,7 @@ msgstr "%s"
msgid "lost synchronization with server, resetting connection"
msgstr "ztráta synchronizace se serverem, resetuji spojení"
-#: fe-protocol2.c:1516 fe-protocol2.c:1548 fe-protocol3.c:1948
+#: fe-protocol2.c:1516 fe-protocol2.c:1548 fe-protocol3.c:1955
#, c-format
msgid "protocol error: id=0x%x\n"
msgstr "chyba protokolu: id=0x%x\n"
@@ -845,107 +848,113 @@ msgstr "%s:%s"
msgid "LINE %d: "
msgstr "ŘÁDKA %d: "
-#: fe-protocol3.c:1573
+#: fe-protocol3.c:1577
msgid "PQgetline: not doing text COPY OUT\n"
msgstr "PQgetline: not doing text COPY OUT\n"
-#: fe-secure.c:264
+#: fe-secure.c:270 fe-secure.c:1128 fe-secure.c:1348
+#, c-format
+#| msgid "could not create SSL context: %s\n"
+msgid "could not acquire mutex: %s\n"
+msgstr "nelze získat mutex: %s\n"
+
+#: fe-secure.c:282
#, c-format
msgid "could not establish SSL connection: %s\n"
msgstr "nelze vytvořit SSL spojení: %s\n"
-#: fe-secure.c:368 fe-secure.c:529 fe-secure.c:1396
+#: fe-secure.c:392 fe-secure.c:553 fe-secure.c:1477
#, c-format
msgid "SSL SYSCALL error: %s\n"
msgstr "SSL SYSCALL chyba: %s\n"
-#: fe-secure.c:375 fe-secure.c:536 fe-secure.c:1400
+#: fe-secure.c:399 fe-secure.c:560 fe-secure.c:1481
msgid "SSL SYSCALL error: EOF detected\n"
msgstr "SSL SYSCALL chyba: detekován EOF\n"
-#: fe-secure.c:386 fe-secure.c:547 fe-secure.c:1409
+#: fe-secure.c:410 fe-secure.c:571 fe-secure.c:1490
#, c-format
msgid "SSL error: %s\n"
msgstr "SSL chyba: %s\n"
-#: fe-secure.c:401 fe-secure.c:562
+#: fe-secure.c:425 fe-secure.c:586
msgid "SSL connection has been closed unexpectedly\n"
msgstr "SSL spojení bylo neočekávaně ukončeno\n"
-#: fe-secure.c:407 fe-secure.c:568 fe-secure.c:1418
+#: fe-secure.c:431 fe-secure.c:592 fe-secure.c:1499
#, c-format
msgid "unrecognized SSL error code: %d\n"
msgstr "neznámý chybový kód SSL: %d\n"
-#: fe-secure.c:451
+#: fe-secure.c:475
#, c-format
msgid "could not receive data from server: %s\n"
msgstr "nelze přijmout data ze serveru: %s\n"
-#: fe-secure.c:640
+#: fe-secure.c:664
#, c-format
msgid "could not send data to server: %s\n"
msgstr "nelze poslat data na server: %s\n"
-#: fe-secure.c:760 fe-secure.c:777
+#: fe-secure.c:784 fe-secure.c:801
msgid "could not get server common name from server certificate\n"
-msgstr "ze serverového certifikátu nelze získat common name serveru: %s\n"
+msgstr "ze serverového certifikátu nelze získat common name serveru\n"
-#: fe-secure.c:790
+#: fe-secure.c:814
msgid "SSL certificate's common name contains embedded null\n"
msgstr "Veřejné jméno SSL certifikátu obsahuje vloženou null hodnotu\n"
-#: fe-secure.c:802
+#: fe-secure.c:826
msgid "host name must be specified for a verified SSL connection\n"
msgstr "host musí být specifikován pro ověřené SSL spojení\n"
-#: fe-secure.c:816
+#: fe-secure.c:840
#, c-format
msgid "server common name \"%s\" does not match host name \"%s\"\n"
msgstr ""
"veřejné jméno serveru \"%s\" nesouhlasí s jménem serveru (host name) \"%s\"\n"
-#: fe-secure.c:951
+#: fe-secure.c:975
#, c-format
msgid "could not create SSL context: %s\n"
msgstr "nelze vytvořit SSL kontext: %s\n"
-#: fe-secure.c:1073
+#: fe-secure.c:1098
#, c-format
msgid "could not open certificate file \"%s\": %s\n"
msgstr "nelze otevřít soubor s certifikátem \"%s\": %s\n"
-#: fe-secure.c:1098 fe-secure.c:1108
+#: fe-secure.c:1137 fe-secure.c:1152
#, c-format
msgid "could not read certificate file \"%s\": %s\n"
msgstr "nelze číst soubor s certifikátem \"%s\": %s\n"
-#: fe-secure.c:1145
+#: fe-secure.c:1207
#, c-format
msgid "could not load SSL engine \"%s\": %s\n"
msgstr "nelze nahrát SSL engine \"%s\": %s\n"
-#: fe-secure.c:1157
+#: fe-secure.c:1219
#, c-format
msgid "could not initialize SSL engine \"%s\": %s\n"
msgstr "nelze inicializovat SSL engine \"%s\": %s\n"
-#: fe-secure.c:1173
+#: fe-secure.c:1235
#, c-format
msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
msgstr "nelze číst soubor privátního klíče \"%s\" z enginu \"%s\": %s\n"
-#: fe-secure.c:1187
+#: fe-secure.c:1249
#, c-format
msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
msgstr "nelze načíst soubor privátního klíče \"%s\" z enginu \"%s\": %s\n"
-#: fe-secure.c:1224
+#: fe-secure.c:1286
#, c-format
msgid "certificate present, but not private key file \"%s\"\n"
msgstr "certifikát je přítomen, ale soubor privátního klíče ne \"%s\"\n"
-#: fe-secure.c:1232
+#: fe-secure.c:1294
#, c-format
msgid ""
"private key file \"%s\" has group or world access; permissions should be "
@@ -954,38 +963,37 @@ msgstr ""
"soubor s privátním klíčem \"%s\" má povolená přístupová práva pro skupinu "
"nebo všechny uživatele; práva by měla být u=rw (0600) nebo přísnější\n"
-#: fe-secure.c:1243
+#: fe-secure.c:1305
#, c-format
msgid "could not load private key file \"%s\": %s\n"
msgstr "nelze načíst soubor privátního klíče \"%s\": %s\n"
-#: fe-secure.c:1257
+#: fe-secure.c:1319
#, c-format
msgid "certificate does not match private key file \"%s\": %s\n"
msgstr "certifikát nesouhlasí se souborem privátního klíče \"%s\": %s\n"
-#: fe-secure.c:1285
+#: fe-secure.c:1357
#, c-format
msgid "could not read root certificate file \"%s\": %s\n"
msgstr "nelze číst soubor s kořenovým certifikátem \"%s\": %s\n"
-#: fe-secure.c:1312
+#: fe-secure.c:1387
#, c-format
msgid "SSL library does not support CRL certificates (file \"%s\")\n"
msgstr "knihovna SSL nepodporuje CRL certifikáty (file \"%s\")\n"
-#: fe-secure.c:1339
+#: fe-secure.c:1420
msgid ""
"could not get home directory to locate root certificate file\n"
"Either provide the file or change sslmode to disable server certificate "
"verification.\n"
msgstr ""
-"nelze určit domácí adresář pro nalezení souboru s kořenovým certifikátem \"%s"
-"\"\n"
+"nelze určit domácí adresář pro nalezení souboru s kořenovým certifikátem\n"
"Buď poskytněte soubor nebo změňte ssl mód tak, aby neověřoval certifkát "
"serveru.\n"
-#: fe-secure.c:1343
+#: fe-secure.c:1424
#, c-format
msgid ""
"root certificate file \"%s\" does not exist\n"
@@ -996,17 +1004,17 @@ msgstr ""
"poskytněnte soubor nebo změntě ssl mód tak, aby neověřoval certifkát "
"serveru.\n"
-#: fe-secure.c:1437
+#: fe-secure.c:1518
#, c-format
msgid "certificate could not be obtained: %s\n"
msgstr "certifikát nelze získat: %s\n"
-#: fe-secure.c:1514
+#: fe-secure.c:1614
#, c-format
msgid "no SSL error reported"
msgstr "žádný chybový kód SSL nebyl hlášený"
-#: fe-secure.c:1523
+#: fe-secure.c:1623
#, c-format
msgid "SSL error code %lu"
msgstr "SSL chybový kód %lu"
diff --git a/src/interfaces/libpq/po/it.po b/src/interfaces/libpq/po/it.po
index fc534ce51a..19ddcc1acc 100644
--- a/src/interfaces/libpq/po/it.po
+++ b/src/interfaces/libpq/po/it.po
@@ -40,8 +40,8 @@ msgid ""
msgstr ""
"Project-Id-Version: libpq (PostgreSQL) 9.3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-08-16 22:12+0000\n"
-"PO-Revision-Date: 2013-08-18 19:36+0100\n"
+"POT-Creation-Date: 2013-10-03 02:42+0000\n"
+"PO-Revision-Date: 2013-10-04 01:18+0100\n"
"Last-Translator: Daniele Varrazzo <daniele.varrazzo@gmail.com>\n"
"Language-Team: Gruppo traduzioni ITPUG <traduzioni@itpug.org>\n"
"Language: it\n"
@@ -50,7 +50,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.5.4\n"
#: fe-auth.c:210 fe-auth.c:429 fe-auth.c:656
msgid "host name must be specified\n"
@@ -93,8 +93,8 @@ msgstr "SSPI errore di continuazione"
#: fe-connect.c:3393 fe-connect.c:3611 fe-connect.c:4023 fe-connect.c:4118
#: fe-connect.c:4383 fe-connect.c:4452 fe-connect.c:4469 fe-connect.c:4560
#: fe-connect.c:4910 fe-connect.c:5060 fe-exec.c:3296 fe-exec.c:3461
-#: fe-lobj.c:896 fe-protocol2.c:1181 fe-protocol3.c:1544 fe-secure.c:786
-#: fe-secure.c:1184
+#: fe-lobj.c:896 fe-protocol2.c:1181 fe-protocol3.c:1544 fe-secure.c:791
+#: fe-secure.c:1191
msgid "out of memory\n"
msgstr "memoria esaurita\n"
@@ -672,8 +672,8 @@ msgstr "intero di dimensione %lu non supportato da pqPutInt"
msgid "connection not open\n"
msgstr "connessione non aperta\n"
-#: fe-misc.c:736 fe-secure.c:382 fe-secure.c:462 fe-secure.c:543
-#: fe-secure.c:652
+#: fe-misc.c:736 fe-secure.c:387 fe-secure.c:467 fe-secure.c:548
+#: fe-secure.c:657
msgid ""
"server closed the connection unexpectedly\n"
"\tThis probably means the server terminated abnormally\n"
@@ -858,131 +858,132 @@ msgstr "RIGA %d: "
msgid "PQgetline: not doing text COPY OUT\n"
msgstr "PQgetline: COPY OUT testuale ignorato\n"
-#: fe-secure.c:266 fe-secure.c:1121 fe-secure.c:1339
-msgid "unable to acquire mutex\n"
-msgstr "impossibile acquisire il mutex\n"
+#: fe-secure.c:270 fe-secure.c:1128 fe-secure.c:1348
+#, c-format
+msgid "could not acquire mutex: %s\n"
+msgstr "acquisizione del mutex fallita: %s\n"
-#: fe-secure.c:278
+#: fe-secure.c:282
#, c-format
msgid "could not establish SSL connection: %s\n"
msgstr "non è stato possibile stabilire una connessione SSL: %s\n"
-#: fe-secure.c:387 fe-secure.c:548 fe-secure.c:1468
+#: fe-secure.c:392 fe-secure.c:553 fe-secure.c:1477
#, c-format
msgid "SSL SYSCALL error: %s\n"
msgstr "errore SSL SYSCALL: %s\n"
-#: fe-secure.c:394 fe-secure.c:555 fe-secure.c:1472
+#: fe-secure.c:399 fe-secure.c:560 fe-secure.c:1481
msgid "SSL SYSCALL error: EOF detected\n"
msgstr "errore SSL SYSCALL: rilevato EOF\n"
-#: fe-secure.c:405 fe-secure.c:566 fe-secure.c:1481
+#: fe-secure.c:410 fe-secure.c:571 fe-secure.c:1490
#, c-format
msgid "SSL error: %s\n"
msgstr "errore SSL: %s\n"
-#: fe-secure.c:420 fe-secure.c:581
+#: fe-secure.c:425 fe-secure.c:586
msgid "SSL connection has been closed unexpectedly\n"
msgstr "la connessione SSL è stata chiusa inaspettatamente\n"
-#: fe-secure.c:426 fe-secure.c:587 fe-secure.c:1490
+#: fe-secure.c:431 fe-secure.c:592 fe-secure.c:1499
#, c-format
msgid "unrecognized SSL error code: %d\n"
msgstr "codice di errore SSL sconosciuto: %d\n"
-#: fe-secure.c:470
+#: fe-secure.c:475
#, c-format
msgid "could not receive data from server: %s\n"
msgstr "ricezione dati dal server fallita: %s\n"
-#: fe-secure.c:659
+#: fe-secure.c:664
#, c-format
msgid "could not send data to server: %s\n"
msgstr "invio dati al server fallito: %s\n"
-#: fe-secure.c:779 fe-secure.c:796
+#: fe-secure.c:784 fe-secure.c:801
msgid "could not get server common name from server certificate\n"
msgstr "non è stato possibile ottenere in nome comune del server per il certificato del server\n"
-#: fe-secure.c:809
+#: fe-secure.c:814
msgid "SSL certificate's common name contains embedded null\n"
msgstr "Il nome comune del certificato SSL contiene un null\n"
-#: fe-secure.c:821
+#: fe-secure.c:826
msgid "host name must be specified for a verified SSL connection\n"
msgstr "il nome dell'host dev'essere specificato per una connessione SSL verificata\n"
-#: fe-secure.c:835
+#: fe-secure.c:840
#, c-format
msgid "server common name \"%s\" does not match host name \"%s\"\n"
msgstr "il nome comune del server \"%s\" non corrisponde al nome dell'host \"%s\"\n"
-#: fe-secure.c:970
+#: fe-secure.c:975
#, c-format
msgid "could not create SSL context: %s\n"
msgstr "creazione del contesto SSL fallita: %s\n"
-#: fe-secure.c:1093
+#: fe-secure.c:1098
#, c-format
msgid "could not open certificate file \"%s\": %s\n"
msgstr "apertura del file di certificato \"%s\" fallita: %s\n"
-#: fe-secure.c:1130 fe-secure.c:1145
+#: fe-secure.c:1137 fe-secure.c:1152
#, c-format
msgid "could not read certificate file \"%s\": %s\n"
msgstr "lettura del file di certificato \"%s\" fallita: %s\n"
-#: fe-secure.c:1200
+#: fe-secure.c:1207
#, c-format
msgid "could not load SSL engine \"%s\": %s\n"
msgstr "caricamento del motore SSL \"%s\" fallito: %s\n"
-#: fe-secure.c:1212
+#: fe-secure.c:1219
#, c-format
msgid "could not initialize SSL engine \"%s\": %s\n"
msgstr "inizializzazione del motore SSL \"%s\" fallita: %s\n"
-#: fe-secure.c:1228
+#: fe-secure.c:1235
#, c-format
msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
msgstr "lettura del file della chiave privata SSL \"%s\" dal motore \"%s\" fallita: %s\n"
-#: fe-secure.c:1242
+#: fe-secure.c:1249
#, c-format
msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
msgstr "caricamento della chiave privata SSL \"%s\" dal motore \"%s\" fallito: %s\n"
-#: fe-secure.c:1279
+#: fe-secure.c:1286
#, c-format
msgid "certificate present, but not private key file \"%s\"\n"
msgstr "certificato trovato, ma non la chiave privata \"%s\"\n"
-#: fe-secure.c:1287
+#: fe-secure.c:1294
#, c-format
msgid "private key file \"%s\" has group or world access; permissions should be u=rw (0600) or less\n"
msgstr "Il file della chiave privata \"%s\" ha privilegi di accesso in lettura e scrittura per tutti; i permessi dovrebbero essere u=rw (0600) o inferiori\n"
-#: fe-secure.c:1298
+#: fe-secure.c:1305
#, c-format
msgid "could not load private key file \"%s\": %s\n"
msgstr "caricamento del file della chiave privata \"%s\" fallito: %s\n"
-#: fe-secure.c:1312
+#: fe-secure.c:1319
#, c-format
msgid "certificate does not match private key file \"%s\": %s\n"
msgstr "il certificato non corrisponde con il file della chiave privata \"%s\": %s\n"
-#: fe-secure.c:1348
+#: fe-secure.c:1357
#, c-format
msgid "could not read root certificate file \"%s\": %s\n"
msgstr "lettura del file di certificato radice \"%s\" fallita: %s\n"
-#: fe-secure.c:1378
+#: fe-secure.c:1387
#, c-format
msgid "SSL library does not support CRL certificates (file \"%s\")\n"
msgstr "la libreria SSL non supporta i certificati di tipo CRL (file \"%s\")\n"
-#: fe-secure.c:1411
+#: fe-secure.c:1420
msgid ""
"could not get home directory to locate root certificate file\n"
"Either provide the file or change sslmode to disable server certificate verification.\n"
@@ -990,7 +991,7 @@ msgstr ""
"directory utente non trovata per la locazione del file di certificato radice\n"
"Per favore fornisci il file oppure cambia sslmode per disabilitare la verifica del certificato del server.\n"
-#: fe-secure.c:1415
+#: fe-secure.c:1424
#, c-format
msgid ""
"root certificate file \"%s\" does not exist\n"
@@ -999,17 +1000,17 @@ msgstr ""
"il file \"%s\" del certificato radice non esiste\n"
"Per favore fornisci il file oppure cambia sslmode per disabilitare la verifica del certificato del server.\n"
-#: fe-secure.c:1509
+#: fe-secure.c:1518
#, c-format
msgid "certificate could not be obtained: %s\n"
msgstr "non è stato possibile possibile ottenere il certificato: %s\n"
-#: fe-secure.c:1586
+#: fe-secure.c:1614
#, c-format
msgid "no SSL error reported"
msgstr "nessun errore SSL riportato"
-#: fe-secure.c:1595
+#: fe-secure.c:1623
#, c-format
msgid "SSL error code %lu"
msgstr "codice di errore SSL: %lu"
diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index edc5a6b10b..d33fbb1320 100644
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: libpq (PostgreSQL 9.0)\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:40+0000\n"
-"PO-Revision-Date: 2012-12-17 13:04+0800\n"
+"POT-Creation-Date: 2013-09-02 00:16+0000\n"
+"PO-Revision-Date: 2013-09-02 11:06+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Chinese (Simplified)\n"
"Language: zh_CN\n"
@@ -29,13 +29,14 @@ msgstr "无法将套接字设置为阻塞模式: %s\n"
#: fe-auth.c:258 fe-auth.c:262
#, c-format
msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "kerberos 5 认证拒绝: %*s\n"
+msgstr "kerberos 5 认证被拒绝: %*s\n"
# fe-auth.c:440
#: fe-auth.c:288
#, c-format
-msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "无法在套接字: %s 上恢复非阻塞模式\n"
+#| msgid "could not restore non-blocking mode on socket: %s\n"
+msgid "could not restore nonblocking mode on socket: %s\n"
+msgstr "无法为套接字:%s恢复非阻塞模式\n"
#: fe-auth.c:400
msgid "GSSAPI continuation error"
@@ -55,11 +56,12 @@ msgstr "SSPI连续出现错误"
# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
# fe-lobj.c:536
-#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:758 fe-connect.c:2011
-#: fe-connect.c:3429 fe-connect.c:3647 fe-connect.c:4053 fe-connect.c:4140
-#: fe-connect.c:4405 fe-connect.c:4474 fe-connect.c:4491 fe-connect.c:4582
-#: fe-connect.c:4932 fe-connect.c:5068 fe-exec.c:3271 fe-exec.c:3436
-#: fe-lobj.c:712 fe-protocol2.c:1181 fe-protocol3.c:1515 fe-secure.c:768
+#: fe-auth.c:553 fe-auth.c:627 fe-auth.c:662 fe-auth.c:758 fe-connect.c:2005
+#: fe-connect.c:3393 fe-connect.c:3611 fe-connect.c:4023 fe-connect.c:4118
+#: fe-connect.c:4383 fe-connect.c:4452 fe-connect.c:4469 fe-connect.c:4560
+#: fe-connect.c:4910 fe-connect.c:5060 fe-exec.c:3296 fe-exec.c:3461
+#: fe-lobj.c:896 fe-protocol2.c:1181 fe-protocol3.c:1544 fe-secure.c:790
+#: fe-secure.c:1190
msgid "out of memory\n"
msgstr "内存用尽\n"
@@ -103,24 +105,24 @@ msgstr "不支持Crypt认证\n"
msgid "authentication method %u not supported\n"
msgstr "不支持 %u 认证方式\n"
-#: fe-connect.c:788
+#: fe-connect.c:798
#, c-format
msgid "invalid sslmode value: \"%s\"\n"
msgstr "无效的 sslmode 值: \"%s\"\n"
-#: fe-connect.c:809
+#: fe-connect.c:819
#, c-format
msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
msgstr "无效的 sslmode 值 \"%s\" 当没有把 SSL 支持编译进来时\n"
# fe-connect.c:732
-#: fe-connect.c:1013
+#: fe-connect.c:1023
#, c-format
msgid "could not set socket to TCP no delay mode: %s\n"
msgstr "无法将套接字设置为 TCP 无延迟模式: %s\n"
# fe-connect.c:752
-#: fe-connect.c:1043
+#: fe-connect.c:1053
#, c-format
msgid ""
"could not connect to server: %s\n"
@@ -132,7 +134,7 @@ msgstr ""
"\t\"%s\"上准备接受联接?\n"
# fe-connect.c:761
-#: fe-connect.c:1098
+#: fe-connect.c:1108
#, c-format
msgid ""
"could not connect to server: %s\n"
@@ -144,7 +146,7 @@ msgstr ""
"%s 上的 TCP/IP 联接?\n"
# fe-connect.c:761
-#: fe-connect.c:1107
+#: fe-connect.c:1117
#, c-format
msgid ""
"could not connect to server: %s\n"
@@ -155,276 +157,277 @@ msgstr ""
"\t服务器是否在主机 \"%s\" 上运行并且准备接受在端口\n"
"%s 上的 TCP/IP 联接?\n"
-#: fe-connect.c:1158
+#: fe-connect.c:1168
#, c-format
msgid "setsockopt(TCP_KEEPIDLE) failed: %s\n"
msgstr "执行setsockopt(TCP_KEEPIDLE)失败: %s\n"
-#: fe-connect.c:1171
+#: fe-connect.c:1181
#, c-format
msgid "setsockopt(TCP_KEEPALIVE) failed: %s\n"
msgstr "执行setsockopt(TCP_KEEPALIVE)失败: %s\n"
-#: fe-connect.c:1203
+#: fe-connect.c:1213
#, c-format
msgid "setsockopt(TCP_KEEPINTVL) failed: %s\n"
msgstr "执行setsockopt(TCP_KEEPINTVL)失败: %s\n"
-#: fe-connect.c:1235
+#: fe-connect.c:1245
#, c-format
msgid "setsockopt(TCP_KEEPCNT) failed: %s\n"
msgstr "执行setsockopt(TCP_KEEPCNT) 失败: %s\n"
-#: fe-connect.c:1283
+#: fe-connect.c:1293
#, c-format
msgid "WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"
msgstr "执行WSAIoctl(SIO_KEEPALIVE_VALS)失败:%u\n"
-#: fe-connect.c:1335
+#: fe-connect.c:1345
#, c-format
msgid "invalid port number: \"%s\"\n"
msgstr "无效端口号: \"%s\"\n"
-#: fe-connect.c:1368
+#: fe-connect.c:1378
#, c-format
msgid "Unix-domain socket path \"%s\" is too long (maximum %d bytes)\n"
msgstr "Unix域的套接字路径\"%s\"超长(最大为%d字节)\n"
# fe-misc.c:702
-#: fe-connect.c:1387
+#: fe-connect.c:1397
#, c-format
msgid "could not translate host name \"%s\" to address: %s\n"
msgstr "无法解释主机名 \"%s\" 到地址: %s\n"
# fe-misc.c:702
-#: fe-connect.c:1391
+#: fe-connect.c:1401
#, c-format
msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
msgstr "无法解释 Unix-domian 套接字路径 \"%s\" 到地址: %s\n"
# fe-connect.c:1232
-#: fe-connect.c:1601
+#: fe-connect.c:1606
msgid "invalid connection state, probably indicative of memory corruption\n"
msgstr "无效的联接状态, 可能是存储器数据被破坏的标志\n"
# fe-connect.c:891
-#: fe-connect.c:1642
+#: fe-connect.c:1647
#, c-format
msgid "could not create socket: %s\n"
msgstr "无法创建套接字: %s\n"
# fe-connect.c:708
-#: fe-connect.c:1665
+#: fe-connect.c:1669
#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "无法将套接字设置为非阻塞模式: %s\n"
+#| msgid "could not set socket to non-blocking mode: %s\n"
+msgid "could not set socket to nonblocking mode: %s\n"
+msgstr "无法设置套接字为非阻塞模式: %s\n"
# fe-auth.c:395
-#: fe-connect.c:1677
+#: fe-connect.c:1680
#, c-format
msgid "could not set socket to close-on-exec mode: %s\n"
msgstr "无法将套接字设置为执行时关闭 (close-on-exec) 模式: %s\n"
-#: fe-connect.c:1697
+#: fe-connect.c:1699
msgid "keepalives parameter must be an integer\n"
msgstr "参数keepalives必须是一个整数\n"
-#: fe-connect.c:1710
+#: fe-connect.c:1712
#, c-format
msgid "setsockopt(SO_KEEPALIVE) failed: %s\n"
msgstr "执行setsockopt(SO_KEEPALIVE) 失败: %s\n"
# fe-connect.c:1263
-#: fe-connect.c:1851
+#: fe-connect.c:1849
#, c-format
msgid "could not get socket error status: %s\n"
msgstr "无法获取套接字错误状态: %s\n"
# fe-connect.c:1283
-#: fe-connect.c:1889
+#: fe-connect.c:1883
#, c-format
msgid "could not get client address from socket: %s\n"
msgstr "无法从套接字获取客户端地址: %s\n"
-#: fe-connect.c:1930
+#: fe-connect.c:1924
msgid "requirepeer parameter is not supported on this platform\n"
msgstr "在此平台上不支持requirepeer参数\n"
-#: fe-connect.c:1933
+#: fe-connect.c:1927
#, c-format
msgid "could not get peer credentials: %s\n"
msgstr "无法获得对等(peer)证书:%s\n"
-#: fe-connect.c:1943
+#: fe-connect.c:1937
#, c-format
msgid "local user with ID %d does not exist\n"
msgstr "ID 为 %d 的本地用户不存在\n"
-#: fe-connect.c:1951
+#: fe-connect.c:1945
#, c-format
msgid "requirepeer specifies \"%s\", but actual peer user name is \"%s\"\n"
msgstr "期望对方用户指定值为 \"%s\", 但实际的对方用户名为 \"%s\"\n"
# fe-connect.c:959
-#: fe-connect.c:1985
+#: fe-connect.c:1979
#, c-format
msgid "could not send SSL negotiation packet: %s\n"
msgstr "无法发送 SSL 握手包: %s\n"
# fe-connect.c:1322
-#: fe-connect.c:2024
+#: fe-connect.c:2018
#, c-format
msgid "could not send startup packet: %s\n"
msgstr "无法发送启动包: %s\n"
# fe-connect.c:1010
-#: fe-connect.c:2094
+#: fe-connect.c:2088
msgid "server does not support SSL, but SSL was required\n"
msgstr "服务器不支持 SSL, 但是要求使用 SSL\n"
# fe-connect.c:1001
-#: fe-connect.c:2120
+#: fe-connect.c:2114
#, c-format
msgid "received invalid response to SSL negotiation: %c\n"
msgstr "收到对 SSL 握手的无效响应: %c\n"
# fe-connect.c:1378
-#: fe-connect.c:2199 fe-connect.c:2232
+#: fe-connect.c:2189 fe-connect.c:2222
#, c-format
msgid "expected authentication request from server, but received %c\n"
msgstr "期待来自服务器的认证请求, 却收到 %c\n"
-#: fe-connect.c:2413
+#: fe-connect.c:2389
#, c-format
msgid "out of memory allocating GSSAPI buffer (%d)"
msgstr "在分配GSSAPI缓冲区(%d)时内存用尽"
# fe-connect.c:1490
-#: fe-connect.c:2498
+#: fe-connect.c:2474
msgid "unexpected message from server during startup\n"
msgstr "启动过程中收到来自服务器的非预期信息\n"
# fe-connect.c:1549
-#: fe-connect.c:2597
+#: fe-connect.c:2568
#, c-format
msgid "invalid connection state %d, probably indicative of memory corruption\n"
msgstr "无效的连接状态 %d, 这可能表示内存出现问题\n"
-#: fe-connect.c:3037 fe-connect.c:3097
+#: fe-connect.c:3001 fe-connect.c:3061
#, c-format
msgid "PGEventProc \"%s\" failed during PGEVT_CONNRESET event\n"
msgstr "在PGEVT_CONNRESET事件触发期间执行PGEventProc \"%s\"错误\n"
-#: fe-connect.c:3442
+#: fe-connect.c:3406
#, c-format
msgid "invalid LDAP URL \"%s\": scheme must be ldap://\n"
msgstr "无效LDAP URL\"%s\": 模式必须是ldap://\n"
-#: fe-connect.c:3457
+#: fe-connect.c:3421
#, c-format
msgid "invalid LDAP URL \"%s\": missing distinguished name\n"
msgstr "无效LDAP URL \"%s\": 丢失可区分的名称\n"
-#: fe-connect.c:3468 fe-connect.c:3521
+#: fe-connect.c:3432 fe-connect.c:3485
#, c-format
msgid "invalid LDAP URL \"%s\": must have exactly one attribute\n"
msgstr "无效LDAP URL \"%s\": 只能有一个属性\n"
-#: fe-connect.c:3478 fe-connect.c:3535
+#: fe-connect.c:3442 fe-connect.c:3499
#, c-format
msgid "invalid LDAP URL \"%s\": must have search scope (base/one/sub)\n"
msgstr "无效LDAP URL \"%s\": 必须有搜索范围(base/one/sub)\n"
-#: fe-connect.c:3489
+#: fe-connect.c:3453
#, c-format
msgid "invalid LDAP URL \"%s\": no filter\n"
msgstr "无效的 LDAP URL \"%s\": 没有过滤器\n"
-#: fe-connect.c:3510
+#: fe-connect.c:3474
#, c-format
msgid "invalid LDAP URL \"%s\": invalid port number\n"
msgstr "无效LDAP URL \"%s\": 无效端口号\n"
-#: fe-connect.c:3544
+#: fe-connect.c:3508
msgid "could not create LDAP structure\n"
msgstr "无法创建LDAP结构: %s\n"
-#: fe-connect.c:3586
+#: fe-connect.c:3550
#, c-format
msgid "lookup on LDAP server failed: %s\n"
msgstr "在LDAP服务器上的查找失败: %s\n"
-#: fe-connect.c:3597
+#: fe-connect.c:3561
msgid "more than one entry found on LDAP lookup\n"
msgstr "在LDAP搜索上找到多个入口\n"
-#: fe-connect.c:3598 fe-connect.c:3610
+#: fe-connect.c:3562 fe-connect.c:3574
msgid "no entry found on LDAP lookup\n"
msgstr "在LDAP查找上没有发现入口\n"
-#: fe-connect.c:3621 fe-connect.c:3634
+#: fe-connect.c:3585 fe-connect.c:3598
msgid "attribute has no values on LDAP lookup\n"
msgstr "在LDAP查找上的属性没有值\n"
# fe-connect.c:2475
-#: fe-connect.c:3686 fe-connect.c:3705 fe-connect.c:4179
+#: fe-connect.c:3650 fe-connect.c:3669 fe-connect.c:4157
#, c-format
msgid "missing \"=\" after \"%s\" in connection info string\n"
msgstr "在联接信息字串里的 \"%s\" 后面缺少 \"=\"\n"
# fe-connect.c:2558
-#: fe-connect.c:3769 fe-connect.c:4359 fe-connect.c:5050
+#: fe-connect.c:3733 fe-connect.c:4337 fe-connect.c:5042
#, c-format
msgid "invalid connection option \"%s\"\n"
msgstr "非法联接选项 \"%s\"\n"
# fe-connect.c:2524
-#: fe-connect.c:3785 fe-connect.c:4228
+#: fe-connect.c:3749 fe-connect.c:4206
msgid "unterminated quoted string in connection info string\n"
msgstr "联接信息字串中未结束的引号字串\n"
-#: fe-connect.c:3824
+#: fe-connect.c:3788
msgid "could not get home directory to locate service definition file"
msgstr "无法进入home目录来定位服务定义文件"
-#: fe-connect.c:3857
+#: fe-connect.c:3821
#, c-format
msgid "definition of service \"%s\" not found\n"
msgstr "错误:没有找到服务\"%s\"的定义\n"
-#: fe-connect.c:3880
+#: fe-connect.c:3844
#, c-format
msgid "service file \"%s\" not found\n"
msgstr "错误:没有找到服务文件\"%s\"\n"
-#: fe-connect.c:3893
+#: fe-connect.c:3857
#, c-format
msgid "line %d too long in service file \"%s\"\n"
msgstr "在服务文件\"%2$s\"中的第%1$d行的长度太长\n"
-#: fe-connect.c:3964 fe-connect.c:3991
+#: fe-connect.c:3928 fe-connect.c:3955
#, c-format
msgid "syntax error in service file \"%s\", line %d\n"
msgstr "在服务文件\"%s\"的第%d行出现语法错误\n"
-#: fe-connect.c:4592
+#: fe-connect.c:4570
#, c-format
msgid "invalid URI propagated to internal parser routine: \"%s\"\n"
msgstr "无效的URI传入内部解析器处理程序: \"%s\"\n"
-#: fe-connect.c:4662
+#: fe-connect.c:4640
#, c-format
msgid ""
"end of string reached when looking for matching \"]\" in IPv6 host address "
"in URI: \"%s\"\n"
msgstr "在 URI: \"%s\"中的IPv6主机地址里查找匹配符\"]\"时遇到了字符串结束符\n"
-#: fe-connect.c:4669
+#: fe-connect.c:4647
#, c-format
msgid "IPv6 host address may not be empty in URI: \"%s\"\n"
msgstr "URI:\"%s\"中的IPv6主机地址可能不为空\n"
-#: fe-connect.c:4684
+#: fe-connect.c:4662
#, c-format
msgid ""
"unexpected character \"%c\" at position %d in URI (expected \":\" or \"/\"): "
@@ -432,51 +435,51 @@ msgid ""
msgstr ""
"非预期的字符\"%c\"出现在在位置%d, URI (expected \":\" or \"/\"):\"%s\"\n"
-#: fe-connect.c:4798
+#: fe-connect.c:4776
#, c-format
msgid "extra key/value separator \"=\" in URI query parameter: \"%s\"\n"
msgstr "遇到多余的键/值分隔符\"=\"在URI查询参数里: \"%s\"\n"
-#: fe-connect.c:4818
+#: fe-connect.c:4796
#, c-format
msgid "missing key/value separator \"=\" in URI query parameter: \"%s\"\n"
msgstr "缺少相应的键/值分隔符\"=\"在URI查询参数里: \"%s\"\n"
-#: fe-connect.c:4889
+#: fe-connect.c:4867
#, c-format
msgid "invalid URI query parameter: \"%s\"\n"
msgstr "无效的URI查询参数: \"%s\"\n"
# fe-connect.c:2558
-#: fe-connect.c:4959
+#: fe-connect.c:4937
#, c-format
msgid "invalid percent-encoded token: \"%s\"\n"
msgstr "无效的百分号编码令牌: \"%s\"\n"
-#: fe-connect.c:4969
+#: fe-connect.c:4947
#, c-format
msgid "forbidden value %%00 in percent-encoded value: \"%s\"\n"
msgstr "在百分值编码的值: \"%s\"里禁止使用 %%00\n"
# fe-connect.c:2744
-#: fe-connect.c:5234
+#: fe-connect.c:5270
msgid "connection pointer is NULL\n"
msgstr "联接指针是 NULL\n"
-#: fe-connect.c:5511
+#: fe-connect.c:5547
#, c-format
msgid "WARNING: password file \"%s\" is not a plain file\n"
msgstr "警告: 口令文件\"%s\"不是普通文本文件\n"
# fe-connect.c:2953
-#: fe-connect.c:5520
+#: fe-connect.c:5556
#, c-format
msgid ""
"WARNING: password file \"%s\" has group or world access; permissions should "
"be u=rw (0600) or less\n"
msgstr "警告: 口令文件\"%s\"的访问权限过大; 权限应设置 为 u=rw (0600)或更少\n"
-#: fe-connect.c:5620
+#: fe-connect.c:5656
#, c-format
msgid "password retrieved from file \"%s\"\n"
msgstr "从文件\"%s\"中获取口令\n"
@@ -486,197 +489,235 @@ msgid "NOTICE"
msgstr "注意"
# fe-exec.c:737
-#: fe-exec.c:1119 fe-exec.c:1176 fe-exec.c:1216
+#: fe-exec.c:1120 fe-exec.c:1178 fe-exec.c:1224
msgid "command string is a null pointer\n"
msgstr "命令字串是一个空指针\n"
+#: fe-exec.c:1184 fe-exec.c:1230 fe-exec.c:1325
+#| msgid "interval(%d) precision must be between %d and %d"
+msgid "number of parameters must be between 0 and 65535\n"
+msgstr "参数的个数必须介于0到65535之间\n"
+
# fe-exec.c:737
-#: fe-exec.c:1209 fe-exec.c:1304
+#: fe-exec.c:1218 fe-exec.c:1319
msgid "statement name is a null pointer\n"
msgstr "声明名字是一个空指针\n"
-#: fe-exec.c:1224 fe-exec.c:1381 fe-exec.c:2075 fe-exec.c:2273
+#: fe-exec.c:1238 fe-exec.c:1402 fe-exec.c:2096 fe-exec.c:2295
msgid "function requires at least protocol version 3.0\n"
msgstr "函数至少需要 3.0 版本的协议\n"
# fe-exec.c:745
-#: fe-exec.c:1335
+#: fe-exec.c:1356
msgid "no connection to the server\n"
msgstr "没有到服务器的联接\n"
# fe-exec.c:752
-#: fe-exec.c:1342
+#: fe-exec.c:1363
msgid "another command is already in progress\n"
msgstr "已经有另外一条命令在处理\n"
-#: fe-exec.c:1457
+#: fe-exec.c:1478
msgid "length must be given for binary parameter\n"
msgstr "对于2进制参数必须指定长度\n"
# fe-exec.c:1371
-#: fe-exec.c:1735
+#: fe-exec.c:1756
#, c-format
msgid "unexpected asyncStatus: %d\n"
msgstr "意外的 asyncStatus(异步状态): %d\n"
-#: fe-exec.c:1755
+#: fe-exec.c:1776
#, c-format
msgid "PGEventProc \"%s\" failed during PGEVT_RESULTCREATE event\n"
msgstr "在PGEVT_CONNRESET事件触发期间执行PGEventProc \"%s\"错误\n"
-#: fe-exec.c:1885
+#: fe-exec.c:1906
msgid "COPY terminated by new PQexec"
msgstr "COPY 被一个新的 PQexec 终止"
# fe-exec.c:1421
-#: fe-exec.c:1893
+#: fe-exec.c:1914
msgid "COPY IN state must be terminated first\n"
msgstr "COPY IN 状态必须先结束\n"
# fe-exec.c:1421
-#: fe-exec.c:1913
+#: fe-exec.c:1934
msgid "COPY OUT state must be terminated first\n"
msgstr "COPY OUT 状态必须先结束\n"
-#: fe-exec.c:1921
+#: fe-exec.c:1942
msgid "PQexec not allowed during COPY BOTH\n"
msgstr "在 COPY BOTH时不允许调用PQexec\n"
# fe-exec.c:1780
-#: fe-exec.c:2164 fe-exec.c:2230 fe-exec.c:2317 fe-protocol2.c:1327
-#: fe-protocol3.c:1651
+#: fe-exec.c:2185 fe-exec.c:2252 fe-exec.c:2342 fe-protocol2.c:1327
+#: fe-protocol3.c:1683
msgid "no COPY in progress\n"
msgstr "没有正在处理的 COPY\n"
# fe-exec.c:1884
-#: fe-exec.c:2509
+#: fe-exec.c:2534
msgid "connection in wrong state\n"
msgstr "联接处于错误状态\n"
# fe-exec.c:2055
-#: fe-exec.c:2540
+#: fe-exec.c:2565
msgid "invalid ExecStatusType code"
msgstr "非法 ExecStatusType 代码"
# fe-exec.c:2108 fe-exec.c:2141
-#: fe-exec.c:2604 fe-exec.c:2627
+#: fe-exec.c:2629 fe-exec.c:2652
#, c-format
msgid "column number %d is out of range 0..%d"
msgstr "列号码 %d 超出了范围 0..%d"
# fe-exec.c:2130
-#: fe-exec.c:2620
+#: fe-exec.c:2645
#, c-format
msgid "row number %d is out of range 0..%d"
msgstr "行号码 %d 超出了范围 0..%d"
# fe-exec.c:2130
-#: fe-exec.c:2642
+#: fe-exec.c:2667
#, c-format
msgid "parameter number %d is out of range 0..%d"
msgstr "参数号%d超出了范围 0..%d"
# fe-exec.c:2325
-#: fe-exec.c:2930
+#: fe-exec.c:2955
#, c-format
msgid "could not interpret result from server: %s"
msgstr "无法解释来自服务器的结果: %s"
-#: fe-exec.c:3169 fe-exec.c:3253
+#: fe-exec.c:3194 fe-exec.c:3278
msgid "incomplete multibyte character\n"
msgstr "无效的多字节字符\n"
# fe-lobj.c:616
-#: fe-lobj.c:150
+#: fe-lobj.c:155
msgid "cannot determine OID of function lo_truncate\n"
msgstr "无法确定函数 lo_creat 的 OID\n"
+#: fe-lobj.c:171
+#| msgid "Value exceeds integer range."
+msgid "argument of lo_truncate exceeds integer range\n"
+msgstr "lo_truncate的参数超出整数范围\n"
+
# fe-lobj.c:616
-#: fe-lobj.c:378
+#: fe-lobj.c:222
+#| msgid "cannot determine OID of function lo_truncate\n"
+msgid "cannot determine OID of function lo_truncate64\n"
+msgstr "无法确定函数lo_truncate64的OID值\n"
+
+#: fe-lobj.c:280
+#| msgid "Value exceeds integer range."
+msgid "argument of lo_read exceeds integer range\n"
+msgstr "lo_read的参数值已超出整数范围\n"
+
+#: fe-lobj.c:335
+#| msgid "Value exceeds integer range."
+msgid "argument of lo_write exceeds integer range\n"
+msgstr "lo_write的参数值已超出整数范围\n"
+
+# fe-lobj.c:630
+#: fe-lobj.c:426
+#| msgid "cannot determine OID of function lo_lseek\n"
+msgid "cannot determine OID of function lo_lseek64\n"
+msgstr "无法确定函数lo_lseek64的OID值\n"
+
+# fe-lobj.c:616
+#: fe-lobj.c:522
msgid "cannot determine OID of function lo_create\n"
msgstr "无法确定函数 lo_creat 的 OID\n"
+# fe-lobj.c:637
+#: fe-lobj.c:601
+#| msgid "cannot determine OID of function lo_tell\n"
+msgid "cannot determine OID of function lo_tell64\n"
+msgstr "无法确定函数lo_tell64的OID值\n"
+
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-lobj.c:523 fe-lobj.c:632
+#: fe-lobj.c:707 fe-lobj.c:816
#, c-format
msgid "could not open file \"%s\": %s\n"
msgstr "无法打开文件 \"%s\": %s\n"
-#: fe-lobj.c:578
+#: fe-lobj.c:762
#, c-format
msgid "could not read from file \"%s\": %s\n"
msgstr "无法读取文件 \"%s\": %s\n"
-#: fe-lobj.c:652 fe-lobj.c:676
+#: fe-lobj.c:836 fe-lobj.c:860
#, c-format
msgid "could not write to file \"%s\": %s\n"
msgstr "无法写入文件 \"%s\": %s\n"
# fe-lobj.c:564
-#: fe-lobj.c:760
+#: fe-lobj.c:947
msgid "query to initialize large object functions did not return data\n"
msgstr "初始化大对象函数的查询没有返回数据\n"
# fe-lobj.c:602
-#: fe-lobj.c:801
+#: fe-lobj.c:996
msgid "cannot determine OID of function lo_open\n"
msgstr "无法判断函数 lo_open 的 OID\n"
# fe-lobj.c:609
-#: fe-lobj.c:808
+#: fe-lobj.c:1003
msgid "cannot determine OID of function lo_close\n"
msgstr "无法判断函数 lo_close 的 OID\n"
# fe-lobj.c:616
-#: fe-lobj.c:815
+#: fe-lobj.c:1010
msgid "cannot determine OID of function lo_creat\n"
msgstr "无法判断函数 lo_creat 的 OID\n"
# fe-lobj.c:623
-#: fe-lobj.c:822
+#: fe-lobj.c:1017
msgid "cannot determine OID of function lo_unlink\n"
msgstr "无法判断函数 lo_unlink 的 OID\n"
# fe-lobj.c:630
-#: fe-lobj.c:829
+#: fe-lobj.c:1024
msgid "cannot determine OID of function lo_lseek\n"
msgstr "无法判断函数 lo_lseek 的 OID\n"
# fe-lobj.c:637
-#: fe-lobj.c:836
+#: fe-lobj.c:1031
msgid "cannot determine OID of function lo_tell\n"
msgstr "无法判断函数 lo_tell 的 OID\n"
# fe-lobj.c:644
-#: fe-lobj.c:843
+#: fe-lobj.c:1038
msgid "cannot determine OID of function loread\n"
msgstr "无法判断函数 loread 的 OID\n"
# fe-lobj.c:651
-#: fe-lobj.c:850
+#: fe-lobj.c:1045
msgid "cannot determine OID of function lowrite\n"
msgstr "无法判断函数 lowrite 的 OID\n"
# fe-misc.c:303
-#: fe-misc.c:296
+#: fe-misc.c:295
#, c-format
msgid "integer of size %lu not supported by pqGetInt"
msgstr "pgGetInt 不支持大小为 %lu 的整数"
# fe-misc.c:341
-#: fe-misc.c:332
+#: fe-misc.c:331
#, c-format
msgid "integer of size %lu not supported by pqPutInt"
msgstr "pgPutInt 不支持大小为 %lu 的整数"
# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: fe-misc.c:611 fe-misc.c:810
+#: fe-misc.c:610 fe-misc.c:806
msgid "connection not open\n"
msgstr "联接未打开\n"
# fe-misc.c:612 fe-misc.c:686
-#: fe-misc.c:737 fe-secure.c:364 fe-secure.c:444 fe-secure.c:525
-#: fe-secure.c:634
+#: fe-misc.c:736 fe-secure.c:386 fe-secure.c:466 fe-secure.c:547
+#: fe-secure.c:656
msgid ""
"server closed the connection unexpectedly\n"
"\tThis probably means the server terminated abnormally\n"
@@ -686,17 +727,17 @@ msgstr ""
"\t这种现象通常意味着服务器在处理请求之前\n"
"或者正在处理请求的时候意外中止\n"
-#: fe-misc.c:974
+#: fe-misc.c:970
msgid "timeout expired\n"
msgstr "超时满\n"
# fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: fe-misc.c:1019
+#: fe-misc.c:1015
msgid "socket not open\n"
msgstr "套接字未打开\n"
# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
-#: fe-misc.c:1042
+#: fe-misc.c:1038
#, c-format
msgid "select() failed: %s\n"
msgstr "select() 失败: %s\n"
@@ -749,11 +790,11 @@ msgstr "来自服务器意外的回执, 第一个收到的字符是 \"%c\"\n"
# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
# fe-lobj.c:536
-#: fe-protocol2.c:747 fe-protocol2.c:922 fe-protocol3.c:602 fe-protocol3.c:784
+#: fe-protocol2.c:747 fe-protocol2.c:922 fe-protocol3.c:600 fe-protocol3.c:782
msgid "out of memory for query result"
msgstr "查询结果时内存耗尽"
-#: fe-protocol2.c:1370 fe-protocol3.c:1719
+#: fe-protocol2.c:1370 fe-protocol3.c:1752
#, c-format
msgid "%s"
msgstr "%s"
@@ -763,7 +804,7 @@ msgstr "%s"
msgid "lost synchronization with server, resetting connection"
msgstr "失去与服务器同步, 重置连接"
-#: fe-protocol2.c:1516 fe-protocol2.c:1548 fe-protocol3.c:1922
+#: fe-protocol2.c:1516 fe-protocol2.c:1548 fe-protocol3.c:1955
#, c-format
msgid "protocol error: id=0x%x\n"
msgstr "协议错误: id=0x%x\n"
@@ -786,209 +827,244 @@ msgstr "在消息类型 \"%c\" 中, 消息内容与长度不匹配\n"
msgid "lost synchronization with server: got message type \"%c\", length %d\n"
msgstr "失去与服务器同步: 获取到消息类型 \"%c\", 长度 %d\n"
-#: fe-protocol3.c:480 fe-protocol3.c:520
+#: fe-protocol3.c:478 fe-protocol3.c:518
msgid "insufficient data in \"T\" message"
msgstr "\"T\"消息中剩下的数据不够"
-#: fe-protocol3.c:553
+#: fe-protocol3.c:551
msgid "extraneous data in \"T\" message"
msgstr "\"T\"消息中已经没有数据了"
-#: fe-protocol3.c:692 fe-protocol3.c:724 fe-protocol3.c:742
+#: fe-protocol3.c:690 fe-protocol3.c:722 fe-protocol3.c:740
msgid "insufficient data in \"D\" message"
msgstr "\"D\"消息中剩下的数据不够"
-#: fe-protocol3.c:698
+#: fe-protocol3.c:696
msgid "unexpected field count in \"D\" message"
msgstr "在 \"D\" 消息中, 意外的字段个数"
-#: fe-protocol3.c:751
+#: fe-protocol3.c:749
msgid "extraneous data in \"D\" message"
msgstr "\"D\"消息中已经没有数据了"
#. translator: %s represents a digit string
-#: fe-protocol3.c:880 fe-protocol3.c:899
+#: fe-protocol3.c:878 fe-protocol3.c:897
#, c-format
msgid " at character %s"
msgstr " 在字符 %s"
-#: fe-protocol3.c:912
+#: fe-protocol3.c:910
#, c-format
msgid "DETAIL: %s\n"
msgstr "描述: %s\n"
-#: fe-protocol3.c:915
+#: fe-protocol3.c:913
#, c-format
msgid "HINT: %s\n"
msgstr "提示: %s\n"
-#: fe-protocol3.c:918
+#: fe-protocol3.c:916
#, c-format
msgid "QUERY: %s\n"
msgstr "查询: %s\n"
-#: fe-protocol3.c:921
+#: fe-protocol3.c:919
#, c-format
msgid "CONTEXT: %s\n"
msgstr "背景: %s\n"
-#: fe-protocol3.c:933
+#: fe-protocol3.c:926
+#, c-format
+#| msgid "CONTEXT: %s\n"
+msgid "SCHEMA NAME: %s\n"
+msgstr "方案名: %s\n"
+
+#: fe-protocol3.c:930
+#, c-format
+#| msgid "DETAIL: %s\n"
+msgid "TABLE NAME: %s\n"
+msgstr "表名: %s\n"
+
+#: fe-protocol3.c:934
+#, c-format
+#| msgid "CONTEXT: %s\n"
+msgid "COLUMN NAME: %s\n"
+msgstr "列名: %s\n"
+
+#: fe-protocol3.c:938
+#, c-format
+msgid "DATATYPE NAME: %s\n"
+msgstr "数据类型名: %s\n"
+
+#: fe-protocol3.c:942
+#, c-format
+#| msgid "CONTEXT: %s\n"
+msgid "CONSTRAINT NAME: %s\n"
+msgstr "约束名: %s\n"
+
+#: fe-protocol3.c:954
msgid "LOCATION: "
msgstr "位置: "
-#: fe-protocol3.c:935
+#: fe-protocol3.c:956
#, c-format
msgid "%s, "
msgstr "%s, "
-#: fe-protocol3.c:937
+#: fe-protocol3.c:958
#, c-format
msgid "%s:%s"
msgstr "%s:%s"
-#: fe-protocol3.c:1161
+#: fe-protocol3.c:1182
#, c-format
msgid "LINE %d: "
msgstr "第%d行"
-#: fe-protocol3.c:1547
+#: fe-protocol3.c:1577
msgid "PQgetline: not doing text COPY OUT\n"
msgstr "PQgetline: not doing text COPY OUT\n"
-#: fe-secure.c:265
+#: fe-secure.c:270 fe-secure.c:1127 fe-secure.c:1347
+#, c-format
+#| msgid "could not create SSL context: %s\n"
+msgid "could not acquire mutex: %s\n"
+msgstr "无法获取互斥锁(mutex): %s\n"
+
+#: fe-secure.c:282
#, c-format
msgid "could not establish SSL connection: %s\n"
msgstr "无法建立 SSL 联接: %s\n"
-#: fe-secure.c:369 fe-secure.c:530 fe-secure.c:1397
+#: fe-secure.c:391 fe-secure.c:552 fe-secure.c:1476
#, c-format
msgid "SSL SYSCALL error: %s\n"
msgstr "SSL SYSCALL 错误: %s\n"
-#: fe-secure.c:376 fe-secure.c:537 fe-secure.c:1401
+#: fe-secure.c:398 fe-secure.c:559 fe-secure.c:1480
msgid "SSL SYSCALL error: EOF detected\n"
msgstr "SSL SYSCALL 错误: 发现结束符\n"
# fe-auth.c:232
-#: fe-secure.c:387 fe-secure.c:548 fe-secure.c:1410
+#: fe-secure.c:409 fe-secure.c:570 fe-secure.c:1489
#, c-format
msgid "SSL error: %s\n"
msgstr "SSL 错误: %s\n"
-#: fe-secure.c:402 fe-secure.c:563
+#: fe-secure.c:424 fe-secure.c:585
msgid "SSL connection has been closed unexpectedly\n"
msgstr "SSL连接异常关闭\n"
-#: fe-secure.c:408 fe-secure.c:569 fe-secure.c:1419
+#: fe-secure.c:430 fe-secure.c:591 fe-secure.c:1498
#, c-format
msgid "unrecognized SSL error code: %d\n"
msgstr "未知的 SSL 错误码: %d\n"
# fe-misc.c:515 fe-misc.c:595
-#: fe-secure.c:452
+#: fe-secure.c:474
#, c-format
msgid "could not receive data from server: %s\n"
msgstr "无法从服务器接收数据: %s\n"
# fe-misc.c:702
-#: fe-secure.c:641
+#: fe-secure.c:663
#, c-format
msgid "could not send data to server: %s\n"
msgstr "无法向服务器发送数据: %s\n"
-#: fe-secure.c:761 fe-secure.c:778
+#: fe-secure.c:783 fe-secure.c:800
msgid "could not get server common name from server certificate\n"
msgstr "从服务器证书中无法得到服务器的CN值(common name)\n"
-#: fe-secure.c:791
+#: fe-secure.c:813
msgid "SSL certificate's common name contains embedded null\n"
msgstr "SSL认证的普通名称包含了嵌入的空值\n"
-#: fe-secure.c:803
+#: fe-secure.c:825
msgid "host name must be specified for a verified SSL connection\n"
msgstr "必须为一个已验证的SSL连接指定主机名\n"
-#: fe-secure.c:817
+#: fe-secure.c:839
#, c-format
msgid "server common name \"%s\" does not match host name \"%s\"\n"
msgstr "服务器名字 \"%s\"与主机名不匹配\"%s\"\n"
-#: fe-secure.c:952
+#: fe-secure.c:974
#, c-format
msgid "could not create SSL context: %s\n"
msgstr "无法创建 SSL 环境: %s\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:1074
+#: fe-secure.c:1097
#, c-format
msgid "could not open certificate file \"%s\": %s\n"
msgstr "无法打开证书文件 \"%s\": %s\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:1099 fe-secure.c:1109
+#: fe-secure.c:1136 fe-secure.c:1151
#, c-format
msgid "could not read certificate file \"%s\": %s\n"
msgstr "无法读取证书文件 \"%s\": %s\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:1146
+#: fe-secure.c:1206
#, c-format
msgid "could not load SSL engine \"%s\": %s\n"
msgstr "无法加载SSL引擎 \"%s\": %s\n"
-#: fe-secure.c:1158
+#: fe-secure.c:1218
#, c-format
msgid "could not initialize SSL engine \"%s\": %s\n"
msgstr "无法初始化SSL引擎\"%s\": %s\n"
# fe-connect.c:891
-#: fe-secure.c:1174
+#: fe-secure.c:1234
#, c-format
msgid "could not read private SSL key \"%s\" from engine \"%s\": %s\n"
msgstr "无法从引擎\"%2$s\"读取私有SSL钥\"%1$s\": %3$s\n"
# fe-connect.c:891
-#: fe-secure.c:1188
+#: fe-secure.c:1248
#, c-format
msgid "could not load private SSL key \"%s\" from engine \"%s\": %s\n"
msgstr "无法从引擎\"%2$s\"读取私有SSL钥\"%1$s\": %3$s\n"
-#: fe-secure.c:1225
+#: fe-secure.c:1285
#, c-format
msgid "certificate present, but not private key file \"%s\"\n"
msgstr "有证书, 但不是私钥文件 \"%s\"\n"
# fe-connect.c:2953
-#: fe-secure.c:1233
+#: fe-secure.c:1293
#, c-format
msgid ""
"private key file \"%s\" has group or world access; permissions should be "
"u=rw (0600) or less\n"
msgstr "警告: 私钥文件 \"%s\"的访问权限过大; 权限应设置 为 u=rw (0600)或更小\n"
-#: fe-secure.c:1244
+#: fe-secure.c:1304
#, c-format
msgid "could not load private key file \"%s\": %s\n"
msgstr "无法装载私钥文件 \"%s\": %s\n"
-#: fe-secure.c:1258
+#: fe-secure.c:1318
#, c-format
msgid "certificate does not match private key file \"%s\": %s\n"
msgstr "证书不匹配私钥文件 \"%s\": %s\n"
# fe-connect.c:891
-#: fe-secure.c:1286
+#: fe-secure.c:1356
#, c-format
msgid "could not read root certificate file \"%s\": %s\n"
msgstr "无法读取根证书文件 \"%s\": %s\n"
# fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:1313
+#: fe-secure.c:1386
#, c-format
msgid "SSL library does not support CRL certificates (file \"%s\")\n"
msgstr "SSL库不支持CRL认证(文件 \"%s\")\n"
-#: fe-secure.c:1340
+#: fe-secure.c:1419
msgid ""
"could not get home directory to locate root certificate file\n"
"Either provide the file or change sslmode to disable server certificate "
@@ -997,7 +1073,7 @@ msgstr ""
"无法获取home目录以定位根认证文件\n"
"可以提供该文件或者将sslmode改为禁用服务器证书认证.\n"
-#: fe-secure.c:1344
+#: fe-secure.c:1423
#, c-format
msgid ""
"root certificate file \"%s\" does not exist\n"
@@ -1007,17 +1083,17 @@ msgstr ""
"根认证文件\"%s\"不存在\n"
"可以提供这个文件或者将sslmode改为禁用服务器认证检验.\n"
-#: fe-secure.c:1438
+#: fe-secure.c:1517
#, c-format
msgid "certificate could not be obtained: %s\n"
msgstr "无法获得证书: %s\n"
-#: fe-secure.c:1515
+#: fe-secure.c:1594
#, c-format
msgid "no SSL error reported"
msgstr "没有报告SSL错误"
-#: fe-secure.c:1524
+#: fe-secure.c:1603
#, c-format
msgid "SSL error code %lu"
msgstr "SSL 错误代码 %lu"
diff --git a/src/interfaces/libpq/po/zh_TW.po b/src/interfaces/libpq/po/zh_TW.po
index cd54bee5ea..7d90c9e640 100644
--- a/src/interfaces/libpq/po/zh_TW.po
+++ b/src/interfaces/libpq/po/zh_TW.po
@@ -8,11 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-11 20:43+0000\n"
-"PO-Revision-Date: 2011-05-09 12:51+0800\n"
+"PO-Revision-Date: 2013-09-03 23:27-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
-"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
-"com>\n"
-"Language: \n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/plperl/po/ro.po b/src/pl/plperl/po/ro.po
index 4162314e01..98431a8290 100644
--- a/src/pl/plperl/po/ro.po
+++ b/src/pl/plperl/po/ro.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-11-09 20:39+0000\n"
-"PO-Revision-Date: 2011-11-22 11:32-0000\n"
+"PO-Revision-Date: 2013-09-05 23:03-0400\n"
"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
"Language-Team: ROMANA <xsoftware.consultancy@gmail.com>\n"
-"Language: \n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/plperl/po/zh_TW.po b/src/pl/plperl/po/zh_TW.po
index 00cdf1f8a4..9f2d1d53df 100644
--- a/src/pl/plperl/po/zh_TW.po
+++ b/src/pl/plperl/po/zh_TW.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-13 20:38+0000\n"
-"PO-Revision-Date: 2011-05-12 14:30+0800\n"
+"PO-Revision-Date: 2013-09-03 23:25-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
"Language-Team: Traditional Chinese\n"
-"Language: \n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/plpgsql/src/po/ro.po b/src/pl/plpgsql/src/po/ro.po
index 6ab83a5f1f..2d874c8c63 100644
--- a/src/pl/plpgsql/src/po/ro.po
+++ b/src/pl/plpgsql/src/po/ro.po
@@ -6,10 +6,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-11-09 20:39+0000\n"
-"PO-Revision-Date: 2011-11-22 11:32-0000\n"
+"PO-Revision-Date: 2013-09-05 23:03-0400\n"
"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
"Language-Team: ROMÂNĂ <xsoftware.consultancy@gmail.com>\n"
-"Language: \n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/plpgsql/src/po/zh_CN.po b/src/pl/plpgsql/src/po/zh_CN.po
index dc59a109b9..14e6dcfd1f 100644
--- a/src/pl/plpgsql/src/po/zh_CN.po
+++ b/src/pl/plpgsql/src/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PostgreSQL 9.0\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2013-01-29 13:40+0000\n"
-"PO-Revision-Date: 2012-10-19 17:39+0800\n"
+"POT-Creation-Date: 2013-09-02 00:15+0000\n"
+"PO-Revision-Date: 2013-09-02 16:31+0800\n"
"Last-Translator: Xiong He <iihero@qq.com>\n"
"Language-Team: Weibin <ssmei_2000@yahoo.com>\n"
"Language: zh_CN\n"
@@ -18,721 +18,469 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.5.4\n"
-#: gram.y:439
-#, c-format
-msgid "block label must be placed before DECLARE, not after"
-msgstr "代码块标签必须放在DECLARE的前面,而不是后面"
-
-#: gram.y:459
-#, c-format
-msgid "collations are not supported by type %s"
-msgstr "类型 %s不支持校对函数"
-
-#: gram.y:474
-#, c-format
-msgid "row or record variable cannot be CONSTANT"
-msgstr "记录或者记录类型变量不能是CONSTANT类型"
-
-#: gram.y:484
-#, c-format
-msgid "row or record variable cannot be NOT NULL"
-msgstr "记录或者记录类型变量不能是NOT NULL"
-
-#: gram.y:495
-#, c-format
-msgid "default value for row or record variable is not supported"
-msgstr "不支持为记录或记录类型变量设置缺省值"
-
-#: gram.y:640 gram.y:666
-#, c-format
-msgid "variable \"%s\" does not exist"
-msgstr "变量 \"%s\" 不存在"
-
-#: gram.y:684 gram.y:697
-msgid "duplicate declaration"
-msgstr "重复声明"
-
-#: gram.y:870
-#, c-format
-msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
-msgstr "诊断项 %s 不允许出现在GET STACKED DIAGNOSTICS的结果中"
-
-#: gram.y:883
-#, c-format
-msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
-msgstr "诊断项 %s 不允许出现在GET CURRENT DIAGNOSTICS的结果中"
-
-#: gram.y:960
-msgid "unrecognized GET DIAGNOSTICS item"
-msgstr "无法识别的项GET DIAGNOSTICS"
-
-#: gram.y:971 gram.y:3172
-#, c-format
-msgid "\"%s\" is not a scalar variable"
-msgstr "\"%s\" 不是一个标量变量"
-
-#: gram.y:1223 gram.y:1417
-#, c-format
-msgid ""
-"loop variable of loop over rows must be a record or row variable or list of "
-"scalar variables"
-msgstr "在记录集上进行循环的循环变量必须是记录或记录类型变量或标量变量的列表"
-
-#: gram.y:1257
-#, c-format
-msgid "cursor FOR loop must have only one target variable"
-msgstr "游标的FOR循环只能有一个目标变量"
-
-#: gram.y:1264
-#, c-format
-msgid "cursor FOR loop must use a bound cursor variable"
-msgstr "游标的FOR循环必须使用有界游标变量"
-
-#: gram.y:1348
-#, c-format
-msgid "integer FOR loop must have only one target variable"
-msgstr "整数FOR循环必须只能有一个目标变量"
-
-#: gram.y:1384
-#, c-format
-msgid "cannot specify REVERSE in query FOR loop"
-msgstr "无法在查询FOR循环中指定REVERSE "
-
-#: gram.y:1531
-#, c-format
-msgid "loop variable of FOREACH must be a known variable or list of variables"
-msgstr "FOREACH的循环变量必须是已知类型或者是变量列表"
-
-#: gram.y:1583 gram.y:1620 gram.y:1668 gram.y:2622 gram.y:2703 gram.y:2814
-#: gram.y:3573
-msgid "unexpected end of function definition"
-msgstr "在函数定义中意外出现的结束标志"
-
-#: gram.y:1688 gram.y:1712 gram.y:1724 gram.y:1731 gram.y:1820 gram.y:1828
-#: gram.y:1842 gram.y:1937 gram.y:2118 gram.y:2197 gram.y:2319 gram.y:2903
-#: gram.y:2967 gram.y:3415 gram.y:3476 gram.y:3554
-msgid "syntax error"
-msgstr "语法错误"
-
-#: gram.y:1716 gram.y:1718 gram.y:2122 gram.y:2124
-msgid "invalid SQLSTATE code"
-msgstr "无效的SQLSTATE代码"
-
-#: gram.y:1884
-msgid "syntax error, expected \"FOR\""
-msgstr "语法错误,期望\"FOR\""
-
-#: gram.y:1946
-#, c-format
-msgid "FETCH statement cannot return multiple rows"
-msgstr "FETCH语句无法返回多条记录"
-
-#: gram.y:2002
-#, c-format
-msgid "cursor variable must be a simple variable"
-msgstr "游标变量必须是一个简单变量"
-
-#: gram.y:2008
-#, c-format
-msgid "variable \"%s\" must be of type cursor or refcursor"
-msgstr "变量\"%s\" 必须属于游标类型或refcursor类型"
-
-#: gram.y:2176
-msgid "label does not exist"
-msgstr "标签不存在"
-
-#: gram.y:2290 gram.y:2301
-#, c-format
-msgid "\"%s\" is not a known variable"
-msgstr "\"%s\" 不是一个已知变量"
-
-#: gram.y:2405 gram.y:2415 gram.y:2546
-msgid "mismatched parentheses"
-msgstr "括号不匹配"
-
-#: gram.y:2419
-#, c-format
-msgid "missing \"%s\" at end of SQL expression"
-msgstr "在SQL表达式的结尾处丢失\"%s\""
-
-#: gram.y:2425
-#, c-format
-msgid "missing \"%s\" at end of SQL statement"
-msgstr "在SQL语句的结尾处丢失\"%s\""
-
-#: gram.y:2442
-msgid "missing expression"
-msgstr "缺少表达式"
-
-#: gram.y:2444
-msgid "missing SQL statement"
-msgstr "缺少SQL语句"
-
-#: gram.y:2548
-msgid "incomplete data type declaration"
-msgstr "未完成的数据类型声明"
-
-#: gram.y:2571
-msgid "missing data type declaration"
-msgstr "丢失数据类型声明"
-
-#: gram.y:2627
-msgid "INTO specified more than once"
-msgstr "多次指定INTO"
-
-#: gram.y:2795
-msgid "expected FROM or IN"
-msgstr "期望关键字FROM或IN"
-
-#: gram.y:2855
-#, c-format
-msgid "RETURN cannot have a parameter in function returning set"
-msgstr "在返回为集合的函数中RETURN不能带有参数"
-
-#: gram.y:2856
-#, c-format
-msgid "Use RETURN NEXT or RETURN QUERY."
-msgstr "使用RETURN NEXT或RETURN QUERY."
-
-#: gram.y:2864
-#, c-format
-msgid "RETURN cannot have a parameter in function with OUT parameters"
-msgstr "在带有输出参数的函数中RETURN不能有参数"
-
-#: gram.y:2873
-#, c-format
-msgid "RETURN cannot have a parameter in function returning void"
-msgstr "在返回为空的函数中RETURN不能有参数"
-
-#: gram.y:2891 gram.y:2898
-#, c-format
-msgid "RETURN must specify a record or row variable in function returning row"
-msgstr "在返回记录的函数中RETURN必须制定一个记录或记录类型变量"
-
-#: gram.y:2926 pl_exec.c:2415
-#, c-format
-msgid "cannot use RETURN NEXT in a non-SETOF function"
-msgstr "无法在非SETOF函数中使用RETURN NEXT"
-
-#: gram.y:2940
-#, c-format
-msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
-msgstr "在带有输出参数的函数中RETURN NEXT不能有参数"
-
-#: gram.y:2955 gram.y:2962
-#, c-format
-msgid ""
-"RETURN NEXT must specify a record or row variable in function returning row"
-msgstr "在返回记录的函数中RETURN NEXT必须指定记录或记录类型变量"
-
-#: gram.y:2985 pl_exec.c:2562
-#, c-format
-msgid "cannot use RETURN QUERY in a non-SETOF function"
-msgstr "无法在非SETOF函数中使用RETURN QUERY"
-
-#: gram.y:3041
-#, c-format
-msgid "\"%s\" is declared CONSTANT"
-msgstr "\"%s\"被声明为常量"
-
-#: gram.y:3103 gram.y:3115
-#, c-format
-msgid "record or row variable cannot be part of multiple-item INTO list"
-msgstr "记录或行类型变量不能作为带有多个项的INTO列表中的一部分"
-
-#: gram.y:3160
-#, c-format
-msgid "too many INTO variables specified"
-msgstr "在INTO后面指定了太多的变量"
-
-#: gram.y:3368
-#, c-format
-msgid "end label \"%s\" specified for unlabelled block"
-msgstr "为没有标签的代码块指定结束标签\"%s\" "
-
-#: gram.y:3375
-#, c-format
-msgid "end label \"%s\" differs from block's label \"%s\""
-msgstr "结束标签\"%s\" 与代码块标签\"%s\"不同"
-
-#: gram.y:3410
-#, c-format
-msgid "cursor \"%s\" has no arguments"
-msgstr "游标\"%s\" 没有参数"
-
-#: gram.y:3424
-#, c-format
-msgid "cursor \"%s\" has arguments"
-msgstr "游标\"%s\"有参数"
-
-#: gram.y:3466
-#, c-format
-msgid "cursor \"%s\" has no argument named \"%s\""
-msgstr "游标\"%s\" 没有名为 \"%s\"的参数"
-
-#: gram.y:3486
-#, c-format
-msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
-msgstr "游标\"%2$s\"中的参数值\"%1$s\"指定了多次"
-
-#: gram.y:3511
-#, c-format
-msgid "not enough arguments for cursor \"%s\""
-msgstr "游标 \"%s\"没有足够的参数"
-
-#: gram.y:3518
-#, c-format
-msgid "too many arguments for cursor \"%s\""
-msgstr "游标 \"%s\"给定的参数太多"
-
-#: gram.y:3590
-msgid "unrecognized RAISE statement option"
-msgstr "无法识别的RAISE语句选项"
-
-#: gram.y:3594
-msgid "syntax error, expected \"=\""
-msgstr "语法错误,期望\"=\""
-
-#: pl_comp.c:424 pl_handler.c:266
+#: pl_comp.c:432 pl_handler.c:276
#, c-format
msgid "PL/pgSQL functions cannot accept type %s"
msgstr "PL/pgSQL函数不使用类型%s"
-#: pl_comp.c:505
+#: pl_comp.c:513
#, c-format
msgid "could not determine actual return type for polymorphic function \"%s\""
msgstr "无法确定多态函数\"%s\"的实际返回类型"
-#: pl_comp.c:535
+#: pl_comp.c:543
#, c-format
msgid "trigger functions can only be called as triggers"
msgstr "触发器函数只能以触发器的形式调用"
-#: pl_comp.c:539 pl_handler.c:251
+#: pl_comp.c:547 pl_handler.c:261
#, c-format
msgid "PL/pgSQL functions cannot return type %s"
msgstr "PL/pgSQL函数不能返回类型%s"
-#: pl_comp.c:582
+#: pl_comp.c:590
#, c-format
msgid "trigger functions cannot have declared arguments"
msgstr "触发器函数不能有已声明的参数"
-#: pl_comp.c:583
+#: pl_comp.c:591
#, c-format
msgid ""
"The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV "
"instead."
msgstr "触发器的参数可以通过TG_NARGS和TG_ARGV进行访问."
-#: pl_comp.c:911
+#: pl_comp.c:693
+#, c-format
+#| msgid "trigger functions cannot have declared arguments"
+msgid "event trigger functions cannot have declared arguments"
+msgstr "事件触发器函数不能有已声明的参数"
+
+#: pl_comp.c:950
#, c-format
msgid "compilation of PL/pgSQL function \"%s\" near line %d"
msgstr "在第%2$d行附件编译PL/pgSQL函数\"%1$s\""
-#: pl_comp.c:934
+#: pl_comp.c:973
#, c-format
msgid "parameter name \"%s\" used more than once"
msgstr "多次使用参数名称 \"%s\""
-#: pl_comp.c:1044
+#: pl_comp.c:1083
#, c-format
msgid "column reference \"%s\" is ambiguous"
msgstr "字段关联 \"%s\" 是不明确的"
-#: pl_comp.c:1046
+#: pl_comp.c:1085
#, c-format
msgid "It could refer to either a PL/pgSQL variable or a table column."
msgstr "可以指向一个PL/pgSQL变量或表中的列"
-#: pl_comp.c:1226 pl_comp.c:1254 pl_exec.c:3923 pl_exec.c:4278 pl_exec.c:4364
-#: pl_exec.c:4455
+#: pl_comp.c:1265 pl_comp.c:1293 pl_exec.c:4097 pl_exec.c:4452 pl_exec.c:4538
+#: pl_exec.c:4629
#, c-format
msgid "record \"%s\" has no field \"%s\""
msgstr "记录\"%s\"没有字段\"%s\""
-#: pl_comp.c:1783
+#: pl_comp.c:1824
#, c-format
msgid "relation \"%s\" does not exist"
msgstr "关系 \"%s\" 不存在"
-#: pl_comp.c:1892
+#: pl_comp.c:1933
#, c-format
msgid "variable \"%s\" has pseudo-type %s"
msgstr "变量\"%s\"具有伪类型%s"
-#: pl_comp.c:1954
+#: pl_comp.c:1999
#, c-format
msgid "relation \"%s\" is not a table"
msgstr "关系 \"%s\"不是一张表"
-#: pl_comp.c:2114
+#: pl_comp.c:2159
#, c-format
msgid "type \"%s\" is only a shell"
msgstr "类型 \"%s\" 只是一个 shell"
-#: pl_comp.c:2188 pl_comp.c:2241
+#: pl_comp.c:2233 pl_comp.c:2286
#, c-format
msgid "unrecognized exception condition \"%s\""
msgstr "不可识别的异常条件\"%s\""
-#: pl_comp.c:2399
+#: pl_comp.c:2444
#, c-format
msgid ""
"could not determine actual argument type for polymorphic function \"%s\""
msgstr "无法确定多态函数\"%s\"的实际参数类型"
-#: pl_exec.c:247 pl_exec.c:522
+#: pl_exec.c:254 pl_exec.c:514 pl_exec.c:793
msgid "during initialization of execution state"
msgstr "在执行状态的初始化期间"
-#: pl_exec.c:254
+#: pl_exec.c:261
msgid "while storing call arguments into local variables"
msgstr "在将调用的参数存储到本地变量时"
-#: pl_exec.c:311 pl_exec.c:679
+#: pl_exec.c:303 pl_exec.c:671
msgid "during function entry"
msgstr "在进入函数期间"
-#: pl_exec.c:342 pl_exec.c:710
+#: pl_exec.c:334 pl_exec.c:702 pl_exec.c:834
#, c-format
msgid "CONTINUE cannot be used outside a loop"
msgstr "在循环的外部不能使用CONTINUE"
-#: pl_exec.c:346
+#: pl_exec.c:338
#, c-format
msgid "control reached end of function without RETURN"
msgstr "控制流程到达函数的结束部分,但是没有看到RETURN"
-#: pl_exec.c:353
+#: pl_exec.c:345
msgid "while casting return value to function's return type"
msgstr "正在将返回值强行指派为函数的返回类型"
-#: pl_exec.c:366 pl_exec.c:2634
+#: pl_exec.c:358 pl_exec.c:2810
#, c-format
msgid "set-valued function called in context that cannot accept a set"
msgstr "集值函数在不接受使用集合的环境中调用"
-#: pl_exec.c:404
+#: pl_exec.c:396 pl_exec.c:2653
msgid "returned record type does not match expected record type"
msgstr "所返回的记录类型与所期待的记录类型不匹配"
-#: pl_exec.c:464 pl_exec.c:718
+#: pl_exec.c:456 pl_exec.c:710 pl_exec.c:842
msgid "during function exit"
msgstr "在函数退出期间"
-#: pl_exec.c:714
+#: pl_exec.c:706 pl_exec.c:838
#, c-format
msgid "control reached end of trigger procedure without RETURN"
msgstr "控制流程到达触发器/存储过程的结束部分,但是没有看到RETURN"
-#: pl_exec.c:723
+#: pl_exec.c:715
#, c-format
msgid "trigger procedure cannot return a set"
msgstr "触发器存储过程无法返回集合"
-#: pl_exec.c:745
+#: pl_exec.c:737
msgid ""
"returned row structure does not match the structure of the triggering table"
msgstr "所返回的记录结构与触发表的结构不匹配"
-#: pl_exec.c:808
+#: pl_exec.c:893
#, c-format
msgid "PL/pgSQL function %s line %d %s"
msgstr "PL/pgSQL 函数%s在第%d行%s"
-#: pl_exec.c:819
+#: pl_exec.c:904
#, c-format
msgid "PL/pgSQL function %s %s"
msgstr "PL/pgSQL 函数%s %s"
#. translator: last %s is a plpgsql statement type name
-#: pl_exec.c:827
+#: pl_exec.c:912
#, c-format
msgid "PL/pgSQL function %s line %d at %s"
msgstr "在%3$s的第%2$d行的PL/pgSQL函数%1$s"
-#: pl_exec.c:833
+#: pl_exec.c:918
#, c-format
msgid "PL/pgSQL function %s"
msgstr "PL/pgSQL函数 %s"
-#: pl_exec.c:942
+#: pl_exec.c:1027
msgid "during statement block local variable initialization"
msgstr "在初始化语句块的局部变量期间"
-#: pl_exec.c:984
+#: pl_exec.c:1069
#, c-format
msgid "variable \"%s\" declared NOT NULL cannot default to NULL"
msgstr "声明为NOT NULL的变量\"%s\"无法将缺省值设为NULL"
-#: pl_exec.c:1034
+#: pl_exec.c:1119
msgid "during statement block entry"
msgstr "在进入语句块期间"
-#: pl_exec.c:1055
+#: pl_exec.c:1140
msgid "during statement block exit"
msgstr "在退出语句块期间"
-#: pl_exec.c:1098
+#: pl_exec.c:1183
msgid "during exception cleanup"
msgstr "在清理异常期间"
-#: pl_exec.c:1445
+#: pl_exec.c:1536
#, c-format
msgid "GET STACKED DIAGNOSTICS cannot be used outside an exception handler"
msgstr "GET STACKED DIAGNOSTICS不能用于异常处理之外"
-#: pl_exec.c:1611
+#: pl_exec.c:1727
#, c-format
msgid "case not found"
msgstr "没有找到CASE"
-#: pl_exec.c:1612
+#: pl_exec.c:1728
#, c-format
msgid "CASE statement is missing ELSE part."
msgstr "在CASE语句结构中丢失ELSE部分"
-#: pl_exec.c:1766
+#: pl_exec.c:1880
#, c-format
msgid "lower bound of FOR loop cannot be null"
msgstr "FOR循环的低位边界不能为空"
-#: pl_exec.c:1781
+#: pl_exec.c:1895
#, c-format
msgid "upper bound of FOR loop cannot be null"
msgstr "FOR循环的高位边界不能为空"
-#: pl_exec.c:1798
+#: pl_exec.c:1912
#, c-format
msgid "BY value of FOR loop cannot be null"
msgstr "FOR循环的BY值不能为空"
-#: pl_exec.c:1804
+#: pl_exec.c:1918
#, c-format
msgid "BY value of FOR loop must be greater than zero"
msgstr "FOR循环的BY值必须大于0"
-#: pl_exec.c:1974 pl_exec.c:3437
+#: pl_exec.c:2088 pl_exec.c:3648
#, c-format
msgid "cursor \"%s\" already in use"
msgstr "游标\"%s\"已经在使用"
-#: pl_exec.c:1997 pl_exec.c:3499
+#: pl_exec.c:2111 pl_exec.c:3710
#, c-format
msgid "arguments given for cursor without arguments"
msgstr "给不带有参数的游标指定参数"
-#: pl_exec.c:2016 pl_exec.c:3518
+#: pl_exec.c:2130 pl_exec.c:3729
#, c-format
msgid "arguments required for cursor"
msgstr "游标需要参数"
-#: pl_exec.c:2103
+#: pl_exec.c:2217
#, c-format
msgid "FOREACH expression must not be null"
msgstr "FOREACH表达式不能为空"
-#: pl_exec.c:2109
+#: pl_exec.c:2223
#, c-format
msgid "FOREACH expression must yield an array, not type %s"
msgstr "FOREACH表达式的结果必须是数组, 而不是类型 %s"
-#: pl_exec.c:2126
+#: pl_exec.c:2240
#, c-format
msgid "slice dimension (%d) is out of the valid range 0..%d"
msgstr "索引维数(%d)超出有效范围: 0..%d"
-#: pl_exec.c:2153
+#: pl_exec.c:2267
#, c-format
msgid "FOREACH ... SLICE loop variable must be of an array type"
msgstr "FOREACH ... SLICE循环变量必须属于数组类型"
-#: pl_exec.c:2157
+#: pl_exec.c:2271
#, c-format
msgid "FOREACH loop variable must not be of an array type"
msgstr "FOREACH循环变量不能为数组类型"
-#: pl_exec.c:2439 pl_exec.c:2507
+#: pl_exec.c:2492 pl_exec.c:2645
+#, c-format
+#| msgid "while casting return value to function's return type"
+msgid ""
+"cannot return non-composite value from function returning composite type"
+msgstr "返回值为组合类型的函数不能返回非组合型的值"
+
+#: pl_exec.c:2536 pl_gram.y:3012
+#, c-format
+msgid "cannot use RETURN NEXT in a non-SETOF function"
+msgstr "无法在非SETOF函数中使用RETURN NEXT"
+
+#: pl_exec.c:2564 pl_exec.c:2687
#, c-format
msgid "wrong result type supplied in RETURN NEXT"
msgstr "在RETURN NEXT中提供了错误的结果类型"
-#: pl_exec.c:2462 pl_exec.c:3910 pl_exec.c:4236 pl_exec.c:4271 pl_exec.c:4338
-#: pl_exec.c:4357 pl_exec.c:4425 pl_exec.c:4448
+#: pl_exec.c:2587 pl_exec.c:4084 pl_exec.c:4410 pl_exec.c:4445 pl_exec.c:4512
+#: pl_exec.c:4531 pl_exec.c:4599 pl_exec.c:4622
#, c-format
msgid "record \"%s\" is not assigned yet"
msgstr "记录 \"%s\"还没有分配"
-#: pl_exec.c:2464 pl_exec.c:3912 pl_exec.c:4238 pl_exec.c:4273 pl_exec.c:4340
-#: pl_exec.c:4359 pl_exec.c:4427 pl_exec.c:4450
+#: pl_exec.c:2589 pl_exec.c:4086 pl_exec.c:4412 pl_exec.c:4447 pl_exec.c:4514
+#: pl_exec.c:4533 pl_exec.c:4601 pl_exec.c:4624
#, c-format
msgid "The tuple structure of a not-yet-assigned record is indeterminate."
msgstr "未分配记录的元组结构未确定."
-#: pl_exec.c:2468 pl_exec.c:2488
+#: pl_exec.c:2593 pl_exec.c:2613
#, c-format
msgid "wrong record type supplied in RETURN NEXT"
msgstr "在RETURN NEXT中提供了错误的记录类型"
-#: pl_exec.c:2529
+#: pl_exec.c:2705
#, c-format
msgid "RETURN NEXT must have a parameter"
msgstr "RETURN NEXT必须有一个参数"
-#: pl_exec.c:2582
+#: pl_exec.c:2738 pl_gram.y:3070
+#, c-format
+msgid "cannot use RETURN QUERY in a non-SETOF function"
+msgstr "无法在非SETOF函数中使用RETURN QUERY"
+
+#: pl_exec.c:2758
msgid "structure of query does not match function result type"
msgstr "查询的结构与函数的返回类型不匹配"
-#: pl_exec.c:2680
+#: pl_exec.c:2838 pl_exec.c:2970
+#, c-format
+msgid "RAISE option already specified: %s"
+msgstr "已经指定了RAISE选项:%s"
+
+#: pl_exec.c:2871
#, c-format
msgid "RAISE without parameters cannot be used outside an exception handler"
msgstr "不带有参数的RAISE不能在异常处理的外部使用"
-#: pl_exec.c:2721
+#: pl_exec.c:2912
#, c-format
msgid "too few parameters specified for RAISE"
msgstr "为RAISE子句指定参数过少"
-#: pl_exec.c:2749
+#: pl_exec.c:2940
#, c-format
msgid "too many parameters specified for RAISE"
msgstr "为RAISE子句指定参数过多"
-#: pl_exec.c:2769
+#: pl_exec.c:2960
#, c-format
msgid "RAISE statement option cannot be null"
msgstr "RAISE语句选项不能为空"
-#: pl_exec.c:2779 pl_exec.c:2788 pl_exec.c:2796 pl_exec.c:2804
-#, c-format
-msgid "RAISE option already specified: %s"
-msgstr "已经指定了RAISE选项:%s"
-
-#: pl_exec.c:2840
+#: pl_exec.c:3031
#, c-format
msgid "%s"
msgstr "%s"
-#: pl_exec.c:2990 pl_exec.c:3127 pl_exec.c:3300
+#: pl_exec.c:3201 pl_exec.c:3338 pl_exec.c:3511
#, c-format
msgid "cannot COPY to/from client in PL/pgSQL"
msgstr "无法在PL/pgSQL中从客户端或向客户端使用COPY命令"
-#: pl_exec.c:2994 pl_exec.c:3131 pl_exec.c:3304
+#: pl_exec.c:3205 pl_exec.c:3342 pl_exec.c:3515
#, c-format
msgid "cannot begin/end transactions in PL/pgSQL"
msgstr "无法在PL/pgSQL中无法使用begin/end事务"
-#: pl_exec.c:2995 pl_exec.c:3132 pl_exec.c:3305
+#: pl_exec.c:3206 pl_exec.c:3343 pl_exec.c:3516
#, c-format
msgid "Use a BEGIN block with an EXCEPTION clause instead."
msgstr "使用带有一个EXCEPTION子句的BEGIN代码块."
-#: pl_exec.c:3155 pl_exec.c:3329
+#: pl_exec.c:3366 pl_exec.c:3540
#, c-format
msgid "INTO used with a command that cannot return data"
msgstr "使用了带有无法返回数据的命令的INTO"
-#: pl_exec.c:3175 pl_exec.c:3349
+#: pl_exec.c:3386 pl_exec.c:3560
#, c-format
msgid "query returned no rows"
msgstr "查询没有返回记录"
-#: pl_exec.c:3184 pl_exec.c:3358
+#: pl_exec.c:3395 pl_exec.c:3569
#, c-format
msgid "query returned more than one row"
msgstr "查询返回多条记录"
-#: pl_exec.c:3199
+#: pl_exec.c:3410
#, c-format
msgid "query has no destination for result data"
msgstr "对于结果数据,查询没有目标"
-#: pl_exec.c:3200
+#: pl_exec.c:3411
#, c-format
msgid "If you want to discard the results of a SELECT, use PERFORM instead."
msgstr "如果您想要放弃SELECT语句的结果,请使用PERFORM."
-#: pl_exec.c:3233 pl_exec.c:6146
+#: pl_exec.c:3444 pl_exec.c:6407
#, c-format
msgid "query string argument of EXECUTE is null"
msgstr "EXECUTE的查询字符串参数是空值"
-#: pl_exec.c:3292
+#: pl_exec.c:3503
#, c-format
msgid "EXECUTE of SELECT ... INTO is not implemented"
msgstr "没有执行EXECUTE of SELECT ... INTO "
-#: pl_exec.c:3293
+#: pl_exec.c:3504
#, c-format
msgid ""
"You might want to use EXECUTE ... INTO or EXECUTE CREATE TABLE ... AS "
"instead."
msgstr "您可以使用EXECUTE ... INTO或者EXECUTE CREATE TABLE ... AS语句来替代"
-#: pl_exec.c:3581 pl_exec.c:3673
+#: pl_exec.c:3792 pl_exec.c:3884
#, c-format
msgid "cursor variable \"%s\" is null"
msgstr "游标变量\"%s\"是空的"
-#: pl_exec.c:3588 pl_exec.c:3680
+#: pl_exec.c:3799 pl_exec.c:3891
#, c-format
msgid "cursor \"%s\" does not exist"
msgstr "游标 \"%s\" 不存在"
-#: pl_exec.c:3602
+#: pl_exec.c:3813
#, c-format
msgid "relative or absolute cursor position is null"
msgstr "游标的相对或绝对位置是空的"
-#: pl_exec.c:3769
+#: pl_exec.c:3980
#, c-format
msgid "null value cannot be assigned to variable \"%s\" declared NOT NULL"
msgstr "不能将声明为NOT NULL的变量\"%s\" 分配空值"
-#: pl_exec.c:3822
+#: pl_exec.c:4027
#, c-format
msgid "cannot assign non-composite value to a row variable"
msgstr "无法将非组合值分配给记录变量"
-#: pl_exec.c:3864
+#: pl_exec.c:4051
#, c-format
msgid "cannot assign non-composite value to a record variable"
msgstr "无法将非组合值分配给记录类型变量"
-#: pl_exec.c:4022
+#: pl_exec.c:4196
#, c-format
msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)"
msgstr "数组维数(%d)超过了最大允许值(%d)"
-#: pl_exec.c:4054
+#: pl_exec.c:4228
#, c-format
msgid "subscripted object is not an array"
msgstr "下标对象不是一个数组"
-#: pl_exec.c:4091
+#: pl_exec.c:4265
#, c-format
msgid "array subscript in assignment must not be null"
msgstr "在赋值中数组下标不能为空"
-#: pl_exec.c:4563
+#: pl_exec.c:4737
#, c-format
msgid "query \"%s\" did not return data"
msgstr "查询\"%s\"没有返回数据"
-#: pl_exec.c:4571
+#: pl_exec.c:4745
#, c-format
msgid "query \"%s\" returned %d column"
msgid_plural "query \"%s\" returned %d columns"
msgstr[0] "查询\"%s\"返回%d列"
-#: pl_exec.c:4597
+#: pl_exec.c:4771
#, c-format
msgid "query \"%s\" returned more than one row"
msgstr "查询\"%s\"返回多条数据"
-#: pl_exec.c:4654
+#: pl_exec.c:4828
#, c-format
msgid "query \"%s\" is not a SELECT"
msgstr "查询 \"%s\"不是SELECT语句"
@@ -773,115 +521,378 @@ msgstr "EXECUTE 语句"
msgid "FOR over EXECUTE statement"
msgstr "在EXECUTE语句上的FOR语句"
-#: pl_handler.c:60
+#: pl_gram.y:449
+#, c-format
+msgid "block label must be placed before DECLARE, not after"
+msgstr "代码块标签必须放在DECLARE的前面,而不是后面"
+
+#: pl_gram.y:469
+#, c-format
+msgid "collations are not supported by type %s"
+msgstr "类型 %s不支持校对函数"
+
+#: pl_gram.y:484
+#, c-format
+msgid "row or record variable cannot be CONSTANT"
+msgstr "记录或者记录类型变量不能是CONSTANT类型"
+
+#: pl_gram.y:494
+#, c-format
+msgid "row or record variable cannot be NOT NULL"
+msgstr "记录或者记录类型变量不能是NOT NULL"
+
+#: pl_gram.y:505
+#, c-format
+msgid "default value for row or record variable is not supported"
+msgstr "不支持为记录或记录类型变量设置缺省值"
+
+#: pl_gram.y:650 pl_gram.y:665 pl_gram.y:691
+#, c-format
+msgid "variable \"%s\" does not exist"
+msgstr "变量 \"%s\" 不存在"
+
+#: pl_gram.y:709 pl_gram.y:722
+msgid "duplicate declaration"
+msgstr "重复声明"
+
+#: pl_gram.y:900
+#, c-format
+msgid "diagnostics item %s is not allowed in GET STACKED DIAGNOSTICS"
+msgstr "诊断项 %s 不允许出现在GET STACKED DIAGNOSTICS的结果中"
+
+#: pl_gram.y:918
+#, c-format
+msgid "diagnostics item %s is not allowed in GET CURRENT DIAGNOSTICS"
+msgstr "诊断项 %s 不允许出现在GET CURRENT DIAGNOSTICS的结果中"
+
+#: pl_gram.y:1010
+msgid "unrecognized GET DIAGNOSTICS item"
+msgstr "无法识别的项GET DIAGNOSTICS"
+
+#: pl_gram.y:1021 pl_gram.y:3257
+#, c-format
+msgid "\"%s\" is not a scalar variable"
+msgstr "\"%s\" 不是一个标量变量"
+
+#: pl_gram.y:1273 pl_gram.y:1467
+#, c-format
+msgid ""
+"loop variable of loop over rows must be a record or row variable or list of "
+"scalar variables"
+msgstr "在记录集上进行循环的循环变量必须是记录或记录类型变量或标量变量的列表"
+
+#: pl_gram.y:1307
+#, c-format
+msgid "cursor FOR loop must have only one target variable"
+msgstr "游标的FOR循环只能有一个目标变量"
+
+#: pl_gram.y:1314
+#, c-format
+msgid "cursor FOR loop must use a bound cursor variable"
+msgstr "游标的FOR循环必须使用有界游标变量"
+
+#: pl_gram.y:1398
+#, c-format
+msgid "integer FOR loop must have only one target variable"
+msgstr "整数FOR循环必须只能有一个目标变量"
+
+#: pl_gram.y:1434
+#, c-format
+msgid "cannot specify REVERSE in query FOR loop"
+msgstr "无法在查询FOR循环中指定REVERSE "
+
+#: pl_gram.y:1581
+#, c-format
+msgid "loop variable of FOREACH must be a known variable or list of variables"
+msgstr "FOREACH的循环变量必须是已知类型或者是变量列表"
+
+#: pl_gram.y:1633 pl_gram.y:1670 pl_gram.y:1718 pl_gram.y:2713 pl_gram.y:2794
+#: pl_gram.y:2905 pl_gram.y:3658
+msgid "unexpected end of function definition"
+msgstr "在函数定义中意外出现的结束标志"
+
+#: pl_gram.y:1738 pl_gram.y:1762 pl_gram.y:1778 pl_gram.y:1784 pl_gram.y:1873
+#: pl_gram.y:1881 pl_gram.y:1895 pl_gram.y:1990 pl_gram.y:2171 pl_gram.y:2254
+#: pl_gram.y:2386 pl_gram.y:3500 pl_gram.y:3561 pl_gram.y:3639
+msgid "syntax error"
+msgstr "语法错误"
+
+#: pl_gram.y:1766 pl_gram.y:1768 pl_gram.y:2175 pl_gram.y:2177
+msgid "invalid SQLSTATE code"
+msgstr "无效的SQLSTATE代码"
+
+#: pl_gram.y:1937
+msgid "syntax error, expected \"FOR\""
+msgstr "语法错误,期望\"FOR\""
+
+#: pl_gram.y:1999
+#, c-format
+msgid "FETCH statement cannot return multiple rows"
+msgstr "FETCH语句无法返回多条记录"
+
+#: pl_gram.y:2055
+#, c-format
+msgid "cursor variable must be a simple variable"
+msgstr "游标变量必须是一个简单变量"
+
+#: pl_gram.y:2061
+#, c-format
+msgid "variable \"%s\" must be of type cursor or refcursor"
+msgstr "变量\"%s\" 必须属于游标类型或refcursor类型"
+
+#: pl_gram.y:2229
+msgid "label does not exist"
+msgstr "标签不存在"
+
+#: pl_gram.y:2357 pl_gram.y:2368
+#, c-format
+msgid "\"%s\" is not a known variable"
+msgstr "\"%s\" 不是一个已知变量"
+
+#: pl_gram.y:2472 pl_gram.y:2482 pl_gram.y:2637
+msgid "mismatched parentheses"
+msgstr "括号不匹配"
+
+#: pl_gram.y:2486
+#, c-format
+msgid "missing \"%s\" at end of SQL expression"
+msgstr "在SQL表达式的结尾处丢失\"%s\""
+
+#: pl_gram.y:2492
+#, c-format
+msgid "missing \"%s\" at end of SQL statement"
+msgstr "在SQL语句的结尾处丢失\"%s\""
+
+#: pl_gram.y:2509
+msgid "missing expression"
+msgstr "缺少表达式"
+
+#: pl_gram.y:2511
+msgid "missing SQL statement"
+msgstr "缺少SQL语句"
+
+#: pl_gram.y:2639
+msgid "incomplete data type declaration"
+msgstr "未完成的数据类型声明"
+
+#: pl_gram.y:2662
+msgid "missing data type declaration"
+msgstr "丢失数据类型声明"
+
+#: pl_gram.y:2718
+msgid "INTO specified more than once"
+msgstr "多次指定INTO"
+
+#: pl_gram.y:2886
+msgid "expected FROM or IN"
+msgstr "期望关键字FROM或IN"
+
+#: pl_gram.y:2946
+#, c-format
+msgid "RETURN cannot have a parameter in function returning set"
+msgstr "在返回为集合的函数中RETURN不能带有参数"
+
+#: pl_gram.y:2947
+#, c-format
+msgid "Use RETURN NEXT or RETURN QUERY."
+msgstr "使用RETURN NEXT或RETURN QUERY."
+
+#: pl_gram.y:2955
+#, c-format
+msgid "RETURN cannot have a parameter in function with OUT parameters"
+msgstr "在带有输出参数的函数中RETURN不能有参数"
+
+#: pl_gram.y:2964
+#, c-format
+msgid "RETURN cannot have a parameter in function returning void"
+msgstr "在返回为空的函数中RETURN不能有参数"
+
+#: pl_gram.y:3026
+#, c-format
+msgid "RETURN NEXT cannot have a parameter in function with OUT parameters"
+msgstr "在带有输出参数的函数中RETURN NEXT不能有参数"
+
+#: pl_gram.y:3126
+#, c-format
+msgid "\"%s\" is declared CONSTANT"
+msgstr "\"%s\"被声明为常量"
+
+#: pl_gram.y:3188 pl_gram.y:3200
+#, c-format
+msgid "record or row variable cannot be part of multiple-item INTO list"
+msgstr "记录或行类型变量不能作为带有多个项的INTO列表中的一部分"
+
+#: pl_gram.y:3245
+#, c-format
+msgid "too many INTO variables specified"
+msgstr "在INTO后面指定了太多的变量"
+
+#: pl_gram.y:3453
+#, c-format
+msgid "end label \"%s\" specified for unlabelled block"
+msgstr "为没有标签的代码块指定结束标签\"%s\" "
+
+#: pl_gram.y:3460
+#, c-format
+msgid "end label \"%s\" differs from block's label \"%s\""
+msgstr "结束标签\"%s\" 与代码块标签\"%s\"不同"
+
+#: pl_gram.y:3495
+#, c-format
+msgid "cursor \"%s\" has no arguments"
+msgstr "游标\"%s\" 没有参数"
+
+#: pl_gram.y:3509
+#, c-format
+msgid "cursor \"%s\" has arguments"
+msgstr "游标\"%s\"有参数"
+
+#: pl_gram.y:3551
+#, c-format
+msgid "cursor \"%s\" has no argument named \"%s\""
+msgstr "游标\"%s\" 没有名为 \"%s\"的参数"
+
+#: pl_gram.y:3571
+#, c-format
+msgid "value for parameter \"%s\" of cursor \"%s\" specified more than once"
+msgstr "游标\"%2$s\"中的参数值\"%1$s\"指定了多次"
+
+#: pl_gram.y:3596
+#, c-format
+msgid "not enough arguments for cursor \"%s\""
+msgstr "游标 \"%s\"没有足够的参数"
+
+#: pl_gram.y:3603
+#, c-format
+msgid "too many arguments for cursor \"%s\""
+msgstr "游标 \"%s\"给定的参数太多"
+
+#: pl_gram.y:3690
+msgid "unrecognized RAISE statement option"
+msgstr "无法识别的RAISE语句选项"
+
+#: pl_gram.y:3694
+msgid "syntax error, expected \"=\""
+msgstr "语法错误,期望\"=\""
+
+#: pl_handler.c:61
msgid ""
"Sets handling of conflicts between PL/pgSQL variable names and table column "
"names."
msgstr "设置在PL/pgSQL变量名称和表中列名冲突时的处理原则"
#. translator: %s is typically the translation of "syntax error"
-#: pl_scanner.c:504
+#: pl_scanner.c:552
#, c-format
msgid "%s at end of input"
msgstr "%s 在输入的末尾"
#. translator: first %s is typically the translation of "syntax error"
-#: pl_scanner.c:520
+#: pl_scanner.c:568
#, c-format
msgid "%s at or near \"%s\""
msgstr "%s 在 \"%s\" 或附近的"
-#~ msgid "unterminated dollar-quoted string"
-#~ msgstr "未结束的$引用字符串"
+#~ msgid "relation \"%s.%s\" does not exist"
+#~ msgstr "关系 \"%s.%s\" 不存在"
-#~ msgid "unterminated quoted string"
-#~ msgstr "未结束的引用字符串"
+#~ msgid "expected \"[\""
+#~ msgstr "期望 \"[\""
-#~ msgid "unterminated /* comment"
-#~ msgstr "/* 注释没有结束"
+#~ msgid "row \"%s\" has no field \"%s\""
+#~ msgstr "记录\"%s\"没有字段\"%s\""
-#~ msgid "unterminated quoted identifier"
-#~ msgstr "未结束的引用标识符"
+#~ msgid "row \"%s.%s\" has no field \"%s\""
+#~ msgstr "记录\"%s.%s\"没有字段\"%s\""
-#~ msgid "qualified identifier cannot be used here: %s"
-#~ msgstr "在这里不能使用限定标识符:%s"
+#~ msgid "type of \"%s\" does not match that when preparing the plan"
+#~ msgstr " \"%s\"类型与正在准备计划时的类型不匹配"
-#~ msgid "unterminated \" in identifier: %s"
-#~ msgstr "在标识符中未结束的\":%s"
+#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
+#~ msgstr " \"%s.%s\"类型与正在准备计划时的类型不匹配"
-#~ msgid "variable \"%s\" does not exist in the current block"
-#~ msgstr "在当前代码块中不存在变量 \"%s\""
+#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
+#~ msgstr "tg_argv[%d]的类型与正在准备计划时的类型不匹配"
-#~ msgid "expected \")\""
-#~ msgstr "期望\")\""
+#~ msgid "N/A (dropped column)"
+#~ msgstr "N/A (已删除的列)"
-#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
-#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的字符串常量"
+#~ msgid ""
+#~ "Number of returned columns (%d) does not match expected column count (%d)."
+#~ msgstr "所返回列的数量(%d列)与所期望列的数量(%d)不匹配."
-#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
-#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的SQL语句"
+#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
+#~ msgstr "所返回的类型%1$s与列\"%3$s\"中期待的类型%2$s不匹配."
-#~ msgid ""
-#~ "Expected record variable, row variable, or list of scalar variables "
-#~ "following INTO."
-#~ msgstr "在INTO后期望记录类型变量,记录变量或标量变量的列表."
+#~ msgid "only positional parameters can be aliased"
+#~ msgstr "只有已定位的参数能使用化名"
-#~ msgid "cannot assign to tg_argv"
-#~ msgstr "无法分配到tg_argv"
+#~ msgid "function has no parameter \"%s\""
+#~ msgstr "函数中没有参数\"%s\""
-#~ msgid ""
-#~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
-#~ "or RETURN QUERY"
-#~ msgstr "在返回集合的函数中RETURN不能有参数;使用RETURN NEXT或RETURN QUERY"
+#~ msgid "expected an integer variable"
+#~ msgstr "期望一个整型变量"
-#~ msgid "too many variables specified in SQL statement"
-#~ msgstr "在SQL语句中指定了太多的变量"
+#~ msgid "syntax error at \"%s\""
+#~ msgstr "在\"%s\"上出现语法错误"
+
+#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
+#~ msgstr "期望\"FOR\"来为无界游标变量打开游标"
#~ msgid "expected a cursor or refcursor variable"
#~ msgstr "期望游标或refcursor类型变量"
-#~ msgid "Expected \"FOR\", to open a cursor for an unbound cursor variable."
-#~ msgstr "期望\"FOR\"来为无界游标变量打开游标"
+#~ msgid "too many variables specified in SQL statement"
+#~ msgstr "在SQL语句中指定了太多的变量"
-#~ msgid "syntax error at \"%s\""
-#~ msgstr "在\"%s\"上出现语法错误"
+#~ msgid ""
+#~ "RETURN cannot have a parameter in function returning set; use RETURN NEXT "
+#~ "or RETURN QUERY"
+#~ msgstr "在返回集合的函数中RETURN不能有参数;使用RETURN NEXT或RETURN QUERY"
-#~ msgid "expected an integer variable"
-#~ msgstr "期望一个整型变量"
+#~ msgid "cannot assign to tg_argv"
+#~ msgstr "无法分配到tg_argv"
-#~ msgid "function has no parameter \"%s\""
-#~ msgstr "函数中没有参数\"%s\""
+#~ msgid ""
+#~ "Expected record variable, row variable, or list of scalar variables "
+#~ "following INTO."
+#~ msgstr "在INTO后期望记录类型变量,记录变量或标量变量的列表."
-#~ msgid "only positional parameters can be aliased"
-#~ msgstr "只有已定位的参数能使用化名"
+#~ msgid "SQL statement in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的SQL语句"
-#~ msgid "Returned type %s does not match expected type %s in column \"%s\"."
-#~ msgstr "所返回的类型%1$s与列\"%3$s\"中期待的类型%2$s不匹配."
+#~ msgid "string literal in PL/PgSQL function \"%s\" near line %d"
+#~ msgstr "在PL/PgSQL函数 \"%s\" 第%d行附近的字符串常量"
-#~ msgid ""
-#~ "Number of returned columns (%d) does not match expected column count (%d)."
-#~ msgstr "所返回列的数量(%d列)与所期望列的数量(%d)不匹配."
+#~ msgid "expected \")\""
+#~ msgstr "期望\")\""
-#~ msgid "N/A (dropped column)"
-#~ msgstr "N/A (已删除的列)"
+#~ msgid "variable \"%s\" does not exist in the current block"
+#~ msgstr "在当前代码块中不存在变量 \"%s\""
-#~ msgid "type of tg_argv[%d] does not match that when preparing the plan"
-#~ msgstr "tg_argv[%d]的类型与正在准备计划时的类型不匹配"
+#~ msgid "unterminated \" in identifier: %s"
+#~ msgstr "在标识符中未结束的\":%s"
-#~ msgid "type of \"%s.%s\" does not match that when preparing the plan"
-#~ msgstr " \"%s.%s\"类型与正在准备计划时的类型不匹配"
+#~ msgid "qualified identifier cannot be used here: %s"
+#~ msgstr "在这里不能使用限定标识符:%s"
-#~ msgid "type of \"%s\" does not match that when preparing the plan"
-#~ msgstr " \"%s\"类型与正在准备计划时的类型不匹配"
+#~ msgid "unterminated quoted identifier"
+#~ msgstr "未结束的引用标识符"
-#~ msgid "row \"%s.%s\" has no field \"%s\""
-#~ msgstr "记录\"%s.%s\"没有字段\"%s\""
+#~ msgid "unterminated /* comment"
+#~ msgstr "/* 注释没有结束"
-#~ msgid "row \"%s\" has no field \"%s\""
-#~ msgstr "记录\"%s\"没有字段\"%s\""
+#~ msgid "unterminated quoted string"
+#~ msgstr "未结束的引用字符串"
-#~ msgid "expected \"[\""
-#~ msgstr "期望 \"[\""
+#~ msgid "unterminated dollar-quoted string"
+#~ msgstr "未结束的$引用字符串"
-#~ msgid "relation \"%s.%s\" does not exist"
-#~ msgstr "关系 \"%s.%s\" 不存在"
+#~ msgid ""
+#~ "RETURN NEXT must specify a record or row variable in function returning "
+#~ "row"
+#~ msgstr "在返回记录的函数中RETURN NEXT必须指定记录或记录类型变量"
+
+#~ msgid ""
+#~ "RETURN must specify a record or row variable in function returning row"
+#~ msgstr "在返回记录的函数中RETURN必须制定一个记录或记录类型变量"
diff --git a/src/pl/plpgsql/src/po/zh_TW.po b/src/pl/plpgsql/src/po/zh_TW.po
index ee473cd678..9e738a7e33 100644
--- a/src/pl/plpgsql/src/po/zh_TW.po
+++ b/src/pl/plpgsql/src/po/zh_TW.po
@@ -7,11 +7,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-13 20:38+0000\n"
-"PO-Revision-Date: 2011-05-12 15:24+0800\n"
+"PO-Revision-Date: 2013-09-03 23:25-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
-"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb."
-"com>\n"
-"Language: \n"
+"Language-Team: EnterpriseDB translation team <dev-escalations@enterprisedb.com>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/plpython/po/ro.po b/src/pl/plpython/po/ro.po
index 04d2313013..ec9bb7b805 100644
--- a/src/pl/plpython/po/ro.po
+++ b/src/pl/plpython/po/ro.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-11-09 20:40+0000\n"
-"PO-Revision-Date: 2011-11-22 11:36-0000\n"
+"PO-Revision-Date: 2013-09-05 23:03-0400\n"
"Last-Translator: Gheorge Rosca Codreanu <max@oceanline.co.uk>\n"
"Language-Team: Română <xsoftware.consultancy@gmail.com>\n"
-"Language: \n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/tcl/po/de.po b/src/pl/tcl/po/de.po
index 140a055c5a..167934db7b 100644
--- a/src/pl/tcl/po/de.po
+++ b/src/pl/tcl/po/de.po
@@ -8,9 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2009-01-14 21:58+0200\n"
-"PO-Revision-Date: 2013-03-04 21:48-0500\n"
+"PO-Revision-Date: 2013-09-04 20:30-0400\n"
"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
"Language-Team: German <peter_e@gmx.net>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/tcl/po/fr.po b/src/pl/tcl/po/fr.po
index b3e24669d2..21291267d3 100644
--- a/src/pl/tcl/po/fr.po
+++ b/src/pl/tcl/po/fr.po
@@ -9,9 +9,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2009-04-05 05:22+0000\n"
-"PO-Revision-Date: 2009-04-05 13:46+0100\n"
+"PO-Revision-Date: 2013-09-04 20:32-0400\n"
"Last-Translator: Guillaume Lelarge <guillaume@lelarge.info>\n"
"Language-Team: French <guillaume@lelarge.info>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/tcl/po/ja.po b/src/pl/tcl/po/ja.po
index cc2aa3a1ec..64a43f5df4 100644
--- a/src/pl/tcl/po/ja.po
+++ b/src/pl/tcl/po/ja.po
@@ -8,9 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.0 beta 3\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-07-20 12:58+0900\n"
-"PO-Revision-Date: 2010-07-17 18:29+0900\n"
+"PO-Revision-Date: 2013-09-04 20:34-0400\n"
"Last-Translator: HOTTA Michihide <hotta@net-newbie.com>\n"
"Language-Team: Japan PostgreSQL Users Group <jpug-doc@ml.postgresql.jp>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/tcl/po/ro.po b/src/pl/tcl/po/ro.po
index a6b59cdcfc..a2928e38f6 100644
--- a/src/pl/tcl/po/ro.po
+++ b/src/pl/tcl/po/ro.po
@@ -8,9 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.0\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2010-09-04 19:59+0000\n"
-"PO-Revision-Date: 2010-09-15 13:14-0000\n"
+"PO-Revision-Date: 2013-09-05 23:03-0400\n"
"Last-Translator: Max <max@oceanline.co.uk>\n"
"Language-Team: ROMÂNĂ <max@oceanline.co.uk>\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/tcl/po/tr.po b/src/pl/tcl/po/tr.po
index 370e4034aa..373a289420 100644
--- a/src/pl/tcl/po/tr.po
+++ b/src/pl/tcl/po/tr.po
@@ -8,9 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 8.4\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2009-04-29 07:08+0000\n"
-"PO-Revision-Date: 2009-04-29 15:06+0200\n"
+"PO-Revision-Date: 2013-09-04 20:50-0400\n"
"Last-Translator: Devrim GÜNDÜZ <devrim@commandprompt.com>\n"
"Language-Team: TR <devrim@commandprompt.com>>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/tcl/po/zh_CN.po b/src/pl/tcl/po/zh_CN.po
index 4544fcb75f..c7b55c6dbf 100644
--- a/src/pl/tcl/po/zh_CN.po
+++ b/src/pl/tcl/po/zh_CN.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.0\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2013-01-29 13:39+0000\n"
-"PO-Revision-Date: 2010-09-26 09:08+0800\n"
+"PO-Revision-Date: 2013-09-03 23:28-0400\n"
"Last-Translator: Weibin <ssmei_2000@yahoo.com>\n"
"Language-Team: Weibin <ssmei_2000@yahoo.com>\n"
-"Language: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/src/pl/tcl/po/zh_TW.po b/src/pl/tcl/po/zh_TW.po
index 3a75b13cdc..5932f05d2b 100644
--- a/src/pl/tcl/po/zh_TW.po
+++ b/src/pl/tcl/po/zh_TW.po
@@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: PostgreSQL 9.1\n"
"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
"POT-Creation-Date: 2011-05-13 20:39+0000\n"
-"PO-Revision-Date: 2011-05-12 16:15+0800\n"
+"PO-Revision-Date: 2013-09-03 23:24-0400\n"
"Last-Translator: Zhenbang Wei <znbang@gmail.com>\n"
"Language-Team: Traditional Chinese\n"
-"Language: \n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"