diff --git a/src/backend/nls.mk b/src/backend/nls.mk
index 84b39e160553e52f247032e78b063623a18a4e18..1a2688f3962bc7cc541ed5f76f017b1c9ea41f78 100644
--- a/src/backend/nls.mk
+++ b/src/backend/nls.mk
@@ -1,5 +1,6 @@
+# $Header: /cvsroot/pgsql/src/backend/nls.mk,v 1.4 2003/06/28 22:30:59 petere Exp $
 CATALOG_NAME	:= postgres
-AVAIL_LANGUAGES	:= cs de es hu ru sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es hr hu ru sv tr zh_CN zh_TW
 GETTEXT_FILES	:= + gettext-files
 GETTEXT_TRIGGERS:= elog:2 postmaster_error yyerror
 
diff --git a/src/backend/po/de.po b/src/backend/po/de.po
index f4dcc26d79a89d93342536293ba091d2ef9e2271..076046b8ef7be890c0b55a3ee3b8433768cd0f2a 100644
--- a/src/backend/po/de.po
+++ b/src/backend/po/de.po
@@ -1,1222 +1,1288 @@
 # German message translation file for PostgreSQL server
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
 #
-# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.7 2002/11/19 17:21:37 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.8 2003/06/28 22:31:00 petere Exp $
 #
 # Use these quotes: �%s�
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-11-30 18:19+0100\n"
-"PO-Revision-Date: 2001-11-30 19:03+0100\n"
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-11-13 20:46+0100\n"
+"PO-Revision-Date: 2002-11-13 22:31+0100\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../access/common/heaptuple.c:171
+#: access/common/heaptuple.c:179
 msgid "heap_attisnull: zero attnum disallowed"
 msgstr ""
 
-#: ../access/common/heaptuple.c:174
+#: access/common/heaptuple.c:182
 msgid "heap_attisnull: undefined negative attnum"
 msgstr ""
 
-#: ../access/common/heaptuple.c:457
+#: access/common/heaptuple.c:460
 #, c-format
 msgid "heap_getsysattr: invalid attnum %d"
 msgstr ""
 
-#: ../access/common/heaptuple.c:582
+#: access/common/heaptuple.c:584
 #, c-format
-msgid "heap_formtuple: numberOfAttributes of %d > %d"
+msgid "heap_formtuple: numberOfAttributes %d exceeds limit %d"
 msgstr ""
 
-#: ../access/common/heaptuple.c:685
-#, c-format
+#: access/common/heaptuple.c:687
+#, c-format, ycp-format
 msgid "heap_modifytuple: repl is \\%3d"
 msgstr ""
 
-#: ../access/common/indextuple.c:55
+#: access/common/indextuple.c:55
 #, c-format
 msgid "index_formtuple: numberOfAttributes %d > %d"
 msgstr ""
 
-#: ../access/common/indextuple.c:162
+#: access/common/indextuple.c:162
 #, c-format
 msgid "index_formtuple: data takes %lu bytes, max is %d"
 msgstr ""
 
-#: ../access/common/printtup.c:49
+#: access/common/tupdesc.c:421
 #, c-format
-msgid "getTypeOutputInfo: Cache lookup of type %u failed"
-msgstr ""
+msgid "Unable to look up type id %u"
+msgstr "kann Typ-OID %u nicht im Katalog finden"
 
-#: ../access/common/tupdesc.c:596
+#: access/common/tupdesc.c:647 executor/nodeFunctionscan.c:200
+#: parser/parse_relation.c:931 parser/parse_relation.c:1286
+#: parser/parse_relation.c:1596
 #, c-format
-msgid "DefineRelation: no such type %s"
+msgid "Invalid typrelid for complex type %u"
+msgstr ""
+
+#: access/common/tupdesc.c:661 access/common/tupdesc.c:684
+msgid "TypeGetTupleDesc: number of aliases does not match number of attributes"
+msgstr ""
+
+#: access/common/tupdesc.c:680
+msgid "TypeGetTupleDesc: no column alias was provided"
 msgstr ""
 
-#: ../access/gist/gist.c:173 ../access/hash/hash.c:72
-#: ../access/nbtree/nbtree.c:129 ../access/rtree/rtree.c:128
+#: access/common/tupdesc.c:699
+msgid "Unable to determine tuple description for function returning \"record\""
+msgstr ""
+
+#: access/common/tupdesc.c:701 catalog/pg_proc.c:463
+#: executor/nodeFunctionscan.c:230 parser/parse_relation.c:1383
+#: parser/parse_relation.c:1637
+msgid "Unknown kind of return type specified for function"
+msgstr ""
+
+#: access/gist/gist.c:171 access/hash/hash.c:72 access/nbtree/nbtree.c:129
+#: access/rtree/rtree.c:128
 #, c-format
 msgid "%s already contains data"
 msgstr ""
 
-#: ../access/gist/gist.c:400 ../access/gist/gist.c:599
+#: access/gist/gist.c:399 access/gist/gist.c:606
 #, c-format
 msgid "gist: failed to add index item to %s"
 msgstr ""
 
-#: ../access/gist/gist.c:1655
+#: access/gist/gist.c:1668
 #, c-format
 msgid "initGISTstate: numberOfAttributes %d > %d"
 msgstr ""
 
-#: ../access/gist/gist.c:1917
+#: access/gist/gist.c:1930
 #, c-format
 msgid "%sPage: %d %s blk: %d maxoff: %d free: %d"
 msgstr ""
 
-#: ../access/gist/gist.c:1927
+#: access/gist/gist.c:1940
 #, c-format
 msgid "%s  Tuple. blk: %d size: %d"
 msgstr ""
 
-#: ../access/gist/gist.c:1942
+#: access/gist/gist.c:1955
 msgid "gist_redo: unimplemented"
 msgstr ""
 
-#: ../access/gist/gist.c:1948
+#: access/gist/gist.c:1961
 msgid "gist_undo: unimplemented"
 msgstr ""
 
-#: ../access/gist/gistscan.c:273
+#: access/gist/gistscan.c:254
 #, c-format
 msgid "GiST scan list corrupted -- cannot find 0x%p"
 msgstr ""
 
-#: ../access/gist/gistscan.c:409
+#: access/gist/gistscan.c:390
 #, c-format
 msgid "Bad operation in GiST scan adjust: %d"
 msgstr ""
 
-#: ../access/hash/hash.c:471
+#: access/hash/hash.c:504
 msgid "hash_redo: unimplemented"
 msgstr ""
 
-#: ../access/hash/hash.c:477
+#: access/hash/hash.c:510
 msgid "hash_undo: unimplemented"
 msgstr ""
 
-#: ../access/hash/hashinsert.c:51
+#: access/hash/hashinsert.c:51
 msgid "Hash indices valid for only one index key."
 msgstr ""
 
-#: ../access/hash/hashinsert.c:166
+#: access/hash/hashinsert.c:166
 msgid "hash item too large"
 msgstr ""
 
-#: ../access/hash/hashinsert.c:231
+#: access/hash/hashinsert.c:231
 #, c-format
 msgid "_hash_pgaddtup: failed to add index item to %s"
 msgstr ""
 
-#: ../access/hash/hashovfl.c:61
+#: access/hash/hashovfl.c:61
 msgid "_hash_addovflpage: problem with _hash_getovfladdr."
 msgstr ""
 
-#: ../access/hash/hashovfl.c:196
+#: access/hash/hashovfl.c:196
 msgid "overflow_page: problem with _hash_initbitmap."
 msgstr ""
 
-#: ../access/hash/hashovfl.c:568
+#: access/hash/hashovfl.c:568
 #, c-format
 msgid "_hash_squeezebucket: failed to add index item to %s"
 msgstr ""
 
-#: ../access/hash/hashpage.c:93
+#: access/hash/hashpage.c:93
 #, c-format
 msgid "Cannot initialize non-empty hash table %s"
 msgstr ""
 
-#: ../access/hash/hashpage.c:151
+#: access/hash/hashpage.c:151
 msgid "Problem with _hash_initbitmap."
 msgstr ""
 
-#: ../access/hash/hashpage.c:196
+#: access/hash/hashpage.c:196
 msgid "_hash_getbuf: internal error: hash AM does not use P_NEW"
 msgstr ""
 
-#: ../access/hash/hashpage.c:204
+#: access/hash/hashpage.c:204
 #, c-format
 msgid "_hash_getbuf: invalid access (%d) on new blk: %s"
 msgstr ""
 
-#: ../access/hash/hashpage.c:231
+#: access/hash/hashpage.c:231
 #, c-format
 msgid "_hash_relbuf: invalid access (%d) on blk %x: %s"
 msgstr ""
 
-#: ../access/hash/hashpage.c:290
+#: access/hash/hashpage.c:290
 #, c-format
 msgid "_hash_chgbufaccess: invalid access (%d) on blk %x: %s"
 msgstr ""
 
-#: ../access/hash/hashpage.c:335
+#: access/hash/hashpage.c:325
 #, c-format
 msgid "_hash_setpagelock: invalid access (%d) on blk %x: %s"
 msgstr ""
 
-#: ../access/hash/hashpage.c:359
+#: access/hash/hashpage.c:349
 #, c-format
 msgid "_hash_unsetpagelock: invalid access (%d) on blk %x: %s"
 msgstr ""
 
-#: ../access/hash/hashpage.c:547 ../access/hash/hashpage.c:684
+#: access/hash/hashpage.c:537 access/hash/hashpage.c:674
 #, c-format
 msgid "_hash_splitpage: empty overflow page %d"
 msgstr ""
 
-#: ../access/hash/hashpage.c:586
+#: access/hash/hashpage.c:576
 #, c-format
 msgid "_hash_splitpage: empty ovfl page %d!"
 msgstr ""
 
-#: ../access/hash/hashpage.c:639
+#: access/hash/hashpage.c:629
 #, c-format
 msgid "_hash_splitpage: failed to add index item to %s"
 msgstr ""
 
-#: ../access/hash/hashscan.c:103
+#: access/hash/hashscan.c:105
 #, c-format
 msgid "hash scan list trashed; can't find 0x%p"
 msgstr ""
 
-#: ../access/hash/hashutil.c:81
+#: access/hash/hashutil.c:81
 msgid "hash indices cannot include null keys"
 msgstr ""
 
-#: ../access/heap/heapam.c:145
+#: access/heap/heapam.c:144
 #, c-format
 msgid "heapgettup(%s, tid=0x%x[%d,%d], dir=%d, ...)"
 msgstr ""
 
-#: ../access/heap/heapam.c:151
+#: access/heap/heapam.c:150
 #, c-format
 msgid "heapgettup(%s, tid=0x%x, dir=%d, ...)"
 msgstr ""
 
-#: ../access/heap/heapam.c:154
+#: access/heap/heapam.c:153
 #, c-format
 msgid "heapgettup(..., b=0x%x, nkeys=%d, key=0x%x"
 msgstr ""
 
-#: ../access/heap/heapam.c:156
+#: access/heap/heapam.c:155
 #, c-format
 msgid "heapgettup: relation(%c)=`%s', %p"
 msgstr ""
 
-#: ../access/heap/heapam.c:204 ../access/heap/heapam.c:239
-#: ../access/heap/heapam.c:280 ../access/heap/heapam.c:373
+#: access/heap/heapam.c:203 access/heap/heapam.c:238 access/heap/heapam.c:278
+#: access/heap/heapam.c:372
 msgid "heapgettup: failed ReadBuffer"
 msgstr ""
 
-#: ../access/heap/heapam.c:475
+#: access/heap/heapam.c:474
 #, c-format
 msgid "Relation %u does not exist"
 msgstr ""
 
-#: ../access/heap/heapam.c:521 ../catalog/heap.c:963
+#: access/heap/heapam.c:553 catalog/namespace.c:189 tcop/utility.c:153
 #, c-format
 msgid "Relation \"%s\" does not exist"
 msgstr ""
 
-#: ../access/heap/heapam.c:573 ../access/heap/heapam.c:598
+#: access/heap/heapam.c:605 access/heap/heapam.c:634 access/heap/heapam.c:663
 #, c-format
 msgid "%s is an index relation"
 msgstr ""
 
-#: ../access/heap/heapam.c:576 ../access/heap/heapam.c:601
+#: access/heap/heapam.c:608 access/heap/heapam.c:637 access/heap/heapam.c:666
 #, c-format
 msgid "%s is a special relation"
 msgstr ""
 
-#: ../access/heap/heapam.c:633
+#: access/heap/heapam.c:611 access/heap/heapam.c:640 access/heap/heapam.c:669
+#, c-format
+msgid "%s is a composite type"
+msgstr ""
+
+#: access/heap/heapam.c:698
 msgid "heap_beginscan: !RelationIsValid(relation)"
 msgstr ""
 
-#: ../access/heap/heapam.c:748
+#: access/heap/heapam.c:812
 #, c-format
-msgid "heap_getnext([%s,nkeys=%d],backw=%d) called"
+msgid "heap_getnext([%s,nkeys=%d],dir=%d) called"
 msgstr ""
 
-#: ../access/heap/heapam.c:752
+#: access/heap/heapam.c:816
 msgid "heap_getnext returning EOS"
 msgstr ""
 
-#: ../access/heap/heapam.c:755
+#: access/heap/heapam.c:819
 msgid "heap_getnext returning tuple"
 msgstr ""
 
-#: ../access/heap/heapam.c:778
+#: access/heap/heapam.c:842
 msgid "heap_getnext: NULL relscan"
 msgstr ""
 
-#: ../access/heap/heapam.c:876
+#: access/heap/heapam.c:932
 #, c-format
-msgid "heap_fetch: %s relation: ReadBuffer(%lx) failed"
+msgid "heap_fetch: ReadBuffer(%s, %lu) failed"
 msgstr ""
 
-#: ../access/heap/heapam.c:965
+#: access/heap/heapam.c:1042
 #, c-format
 msgid "heap_get_latest_tid: %s relation: ReadBuffer(%lx) failed"
 msgstr ""
 
-#: ../access/heap/heapam.c:1168
+#: access/heap/heapam.c:1284
 msgid "heap_delete: failed ReadBuffer"
 msgstr ""
 
-#: ../access/heap/heapam.c:1187
+#: access/heap/heapam.c:1303
 msgid "heap_delete: (am)invalid tid"
 msgstr ""
 
-#: ../access/heap/heapam.c:1307
+#: access/heap/heapam.c:1436
 msgid "simple_heap_delete: tuple already updated by self"
 msgstr ""
 
-#: ../access/heap/heapam.c:1315
+#: access/heap/heapam.c:1444
 msgid "simple_heap_delete: tuple concurrently updated"
 msgstr ""
 
-#: ../access/heap/heapam.c:1319 ../executor/execMain.c:1349
+#: access/heap/heapam.c:1448 executor/execMain.c:1334
 #, c-format
 msgid "Unknown status %u from heap_delete"
 msgstr ""
 
-#: ../access/heap/heapam.c:1354
+#: access/heap/heapam.c:1482
 msgid "heap_update: failed ReadBuffer"
 msgstr ""
 
-#: ../access/heap/heapam.c:1379
+#: access/heap/heapam.c:1507
 msgid "heap_update: (am)invalid tid"
 msgstr ""
 
-#: ../access/heap/heapam.c:1624
+#: access/heap/heapam.c:1770
 msgid "simple_heap_update: tuple already updated by self"
 msgstr ""
 
-#: ../access/heap/heapam.c:1632
+#: access/heap/heapam.c:1778
 msgid "simple_heap_update: tuple concurrently updated"
 msgstr ""
 
-#: ../access/heap/heapam.c:1636 ../executor/execMain.c:1485
+#: access/heap/heapam.c:1782 executor/execMain.c:1473
 #, c-format
 msgid "Unknown status %u from heap_update"
 msgstr ""
 
-#: ../access/heap/heapam.c:1659
+#: access/heap/heapam.c:1806
 msgid "heap_mark4update: failed ReadBuffer"
 msgstr ""
 
-#: ../access/heap/heapam.c:1676
+#: access/heap/heapam.c:1823
 msgid "heap_mark4update: (am)invalid tid"
 msgstr ""
 
-#: ../access/heap/heapam.c:1961
+#: access/heap/heapam.c:2123
 msgid "heap_clean_redo: no block"
 msgstr ""
 
-#: ../access/heap/heapam.c:1965
+#: access/heap/heapam.c:2127
 msgid "heap_clean_redo: uninitialized page"
 msgstr ""
 
-#: ../access/heap/heapam.c:2018
+#: access/heap/heapam.c:2185
 #, c-format
 msgid "heap_delete_%sdo: no block"
 msgstr ""
 
-#: ../access/heap/heapam.c:2022
+#: access/heap/heapam.c:2189
 #, c-format
 msgid "heap_delete_%sdo: uninitialized page"
 msgstr ""
 
-#: ../access/heap/heapam.c:2034
+#: access/heap/heapam.c:2201
 msgid "heap_delete_undo: bad page LSN"
 msgstr ""
 
-#: ../access/heap/heapam.c:2041
+#: access/heap/heapam.c:2208
 #, c-format
 msgid "heap_delete_%sdo: invalid lp"
 msgstr ""
 
-#: ../access/heap/heapam.c:2057
+#: access/heap/heapam.c:2228
 msgid "heap_delete_undo: unimplemented"
 msgstr ""
 
-#: ../access/heap/heapam.c:2083
+#: access/heap/heapam.c:2256
 #, c-format
 msgid "heap_insert_%sdo: uninitialized page"
 msgstr ""
 
-#: ../access/heap/heapam.c:2110
+#: access/heap/heapam.c:2280
 msgid "heap_insert_redo: invalid max offset number"
 msgstr ""
 
-#: ../access/heap/heapam.c:2134
+#: access/heap/heapam.c:2304
 msgid "heap_insert_redo: failed to add tuple"
 msgstr ""
 
-#: ../access/heap/heapam.c:2144
+#: access/heap/heapam.c:2314
 msgid "heap_insert_undo: bad page LSN"
 msgstr ""
 
-#: ../access/heap/heapam.c:2146
+#: access/heap/heapam.c:2316
 msgid "heap_insert_undo: unimplemented"
 msgstr ""
 
-#: ../access/heap/heapam.c:2177
+#: access/heap/heapam.c:2347
 #, c-format
 msgid "heap_update_%sdo: no block"
 msgstr ""
 
-#: ../access/heap/heapam.c:2181
+#: access/heap/heapam.c:2351
 #, c-format
 msgid "heap_update_%sdo: uninitialized old page"
 msgstr ""
 
-#: ../access/heap/heapam.c:2195
+#: access/heap/heapam.c:2365
 msgid "heap_update_undo: bad old tuple page LSN"
 msgstr ""
 
-#: ../access/heap/heapam.c:2202
+#: access/heap/heapam.c:2372
 #, c-format
 msgid "heap_update_%sdo: invalid lp"
 msgstr ""
 
-#: ../access/heap/heapam.c:2230 ../access/heap/heapam.c:2335
+#: access/heap/heapam.c:2407 access/heap/heapam.c:2507
 msgid "heap_update_undo: unimplemented"
 msgstr ""
 
-#: ../access/heap/heapam.c:2251
+#: access/heap/heapam.c:2428
 #, c-format
 msgid "heap_update_%sdo: uninitialized page"
 msgstr ""
 
-#: ../access/heap/heapam.c:2278
+#: access/heap/heapam.c:2452
 msgid "heap_update_redo: invalid max offset number"
 msgstr ""
 
-#: ../access/heap/heapam.c:2324
+#: access/heap/heapam.c:2496
 msgid "heap_update_redo: failed to add tuple"
 msgstr ""
 
-#: ../access/heap/heapam.c:2333
+#: access/heap/heapam.c:2505
 msgid "heap_update_undo: bad new tuple page LSN"
 msgstr ""
 
-#: ../access/heap/heapam.c:2351
+#: access/heap/heapam.c:2523
 msgid "_heap_unlock_tuple: can't open relation"
 msgstr ""
 
-#: ../access/heap/heapam.c:2356
+#: access/heap/heapam.c:2528
 msgid "_heap_unlock_tuple: can't read buffer"
 msgstr ""
 
-#: ../access/heap/heapam.c:2360
+#: access/heap/heapam.c:2532
 msgid "_heap_unlock_tuple: uninitialized page"
 msgstr ""
 
-#: ../access/heap/heapam.c:2364
+#: access/heap/heapam.c:2536
 msgid "_heap_unlock_tuple: invalid itemid"
 msgstr ""
 
-#: ../access/heap/heapam.c:2368
+#: access/heap/heapam.c:2540
 msgid "_heap_unlock_tuple: unused/deleted tuple in rollback"
 msgstr ""
 
-#: ../access/heap/heapam.c:2374
-msgid "_heap_unlock_tuple: invalid xmax/cmax in rollback"
+#: access/heap/heapam.c:2545
+msgid "_heap_unlock_tuple: invalid xmax in rollback"
 msgstr ""
 
-#: ../access/heap/heapam.c:2398
+#: access/heap/heapam.c:2569
 #, c-format
 msgid "heap_redo: unknown op code %u"
 msgstr ""
 
-#: ../access/heap/heapam.c:2418
+#: access/heap/heapam.c:2589
 #, c-format
 msgid "heap_undo: unknown op code %u"
 msgstr ""
 
-#: ../access/heap/hio.c:53
+#: access/heap/hio.c:53
 msgid "RelationPutHeapTuple: failed to add tuple"
 msgstr ""
 
-#: ../access/heap/hio.c:112
+#: access/heap/hio.c:113
 #, c-format
 msgid "Tuple is too big: size %lu, max size %ld"
 msgstr ""
 
-#: ../access/heap/hio.c:273
+#: access/heap/hio.c:277
 #, c-format
 msgid "Tuple is too big: size %lu"
 msgstr ""
 
-#: ../access/heap/tuptoaster.c:838
+#: access/heap/tuptoaster.c:899
 msgid "Failed to build TOAST tuple"
 msgstr ""
 
-#: ../access/heap/tuptoaster.c:854
+#: access/heap/tuptoaster.c:915
 msgid "Failed to insert index entry for TOAST tuple"
 msgstr ""
 
-#: ../access/heap/tuptoaster.c:1037
+#: access/heap/tuptoaster.c:1074 access/heap/tuptoaster.c:1254
 #, c-format
-msgid "unexpected chunk number %d for toast value %u"
+msgid "unexpected chunk number %d (expected %d) for toast value %u"
 msgstr ""
 
-#: ../access/heap/tuptoaster.c:1043 ../access/heap/tuptoaster.c:1050
+#: access/heap/tuptoaster.c:1080 access/heap/tuptoaster.c:1087
+#: access/heap/tuptoaster.c:1260 access/heap/tuptoaster.c:1267
 #, c-format
 msgid "unexpected chunk size %d in chunk %d for toast value %u"
 msgstr ""
 
-#: ../access/heap/tuptoaster.c:1055
+#: access/heap/tuptoaster.c:1092
 #, c-format
-msgid "chunk %d for toast value %u appears multiple times"
+msgid "unexpected chunk number %d for toast value %u"
 msgstr ""
 
-#: ../access/heap/tuptoaster.c:1073
+#: access/heap/tuptoaster.c:1110 access/heap/tuptoaster.c:1294
 #, c-format
-msgid "not all toast chunks found for value %u"
+msgid "missing chunk number %d for toast value %u"
 msgstr ""
 
-#: ../access/index/genam.c:103
+#: access/index/genam.c:74
 msgid "RelationGetIndexScan: relation invalid"
 msgstr ""
 
-#: ../access/index/genam.c:148
+#: access/index/genam.c:136
 msgid "IndexScanEnd: invalid scan"
 msgstr ""
 
-#: ../access/index/genam.c:176
-msgid "IndexScanRestart: invalid scan"
-msgstr ""
-
-#: ../access/index/genam.c:237
-msgid "IndexScanRestorePosition: no mark to restore"
-msgstr ""
-
-#: ../access/index/indexam.c:90 ../access/index/indexam.c:99
+#: access/index/indexam.c:91 access/index/indexam.c:100
 #, c-format
 msgid "index_%s: invalid %s regproc"
 msgstr ""
 
-#: ../access/index/indexam.c:130 ../access/index/indexam.c:152
+#: access/index/indexam.c:131 access/index/indexam.c:154
+#: access/index/indexam.c:177
 #, c-format
 msgid "%s is not an index relation"
 msgstr ""
 
-#: ../access/index/istrat.c:248
+#: access/index/indexam.c:652
+#, c-format
+msgid "Missing support function %d for attribute %d of index %s"
+msgstr ""
+
+#: access/index/istrat.c:238
 #, c-format
 msgid "StrategyTermEvaluate: impossible case %d"
 msgstr ""
 
-#: ../access/index/istrat.c:323
+#: access/index/istrat.c:313
 #, c-format
 msgid "RelationGetStrategy: impossible case %d"
 msgstr ""
 
-#: ../access/index/istrat.c:329
+#: access/index/istrat.c:319
 msgid "RelationGetStrategy: corrupted evaluation"
 msgstr ""
 
-#: ../access/index/istrat.c:448
+#: access/index/istrat.c:438
 #, c-format
 msgid "RelationInvokeStrategy: cannot evaluate strategy %d"
 msgstr ""
 
-#: ../access/index/istrat.c:472
-#, c-format
-msgid "FillScanKeyEntry: unknown operator %u"
-msgstr ""
-
-#: ../access/index/istrat.c:482
-#, c-format
-msgid "FillScanKeyEntry: no procedure for operator %u"
-msgstr ""
-
-#: ../access/index/istrat.c:527
-#, c-format
-msgid "IndexSupportInitialize: no pg_index entry for index %u"
-msgstr ""
-
-#: ../access/index/istrat.c:541
-msgid "IndexSupportInitialize: bogus pg_index tuple"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:747
-#, c-format
-msgid ""
-"_bt_restscan: my bits moved right off the end of the world!\n"
-"\tRecreate index %s."
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:777
-msgid "_bt_restore_page: can't add item to page"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:800
-msgid "btree_delete_redo: block unfound"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:803
-msgid "btree_delete_redo: uninitialized page"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:839
-#, c-format
-msgid "btree_insert_%sdo: block unfound"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:842
-#, c-format
-msgid "btree_insert_%sdo: uninitialized page"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:856
-msgid "btree_insert_redo: failed to add item"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:865
-msgid "btree_insert_undo: bad page LSN"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:873
-msgid "btree_insert_undo: unimplemented"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:900
-#, c-format
-msgid "btree_split_%s: lost left sibling"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:906
-msgid "btree_split_undo: uninitialized left sibling"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:929
-msgid "btree_split_undo: bad left sibling LSN"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:930 ../access/nbtree/nbtree.c:969
-msgid "btree_split_undo: unimplemented"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:938
-#, c-format
-msgid "btree_split_%s: lost right sibling"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:944
-msgid "btree_split_undo: uninitialized right sibling"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:968
-msgid "btree_split_undo: bad right sibling LSN"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:982
-msgid "btree_split_redo: lost next right page"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:986
-msgid "btree_split_redo: uninitialized next right page"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:1023
-msgid "btree_newroot_redo: no root page"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:1026
-msgid "btree_newroot_redo: no metapage"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:1080
-#, c-format
-msgid "btree_redo: unknown op code %u"
-msgstr ""
-
-#: ../access/nbtree/nbtree.c:1100
-#, c-format
-msgid "btree_undo: unknown op code %u"
-msgstr ""
-
-#: ../access/nbtree/nbtinsert.c:246
+#: access/nbtree/nbtinsert.c:250
 #, c-format
 msgid "Cannot insert a duplicate key into unique index %s"
 msgstr "Duplizierter Wert kann nicht in �Unique�-Index %s eingef�gt werden"
 
-#: ../access/nbtree/nbtinsert.c:362
+#: access/nbtree/nbtinsert.c:389
 #, c-format
 msgid "btree: index item size %lu exceeds maximum %lu"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:492
+#: access/nbtree/nbtinsert.c:525
 msgid "btree: concurrent ROOT page split"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:502
+#: access/nbtree/nbtinsert.c:535
 #, c-format
 msgid "bt_insertonpg[%s]: no root page found"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:505
+#: access/nbtree/nbtinsert.c:538
 #, c-format
 msgid "bt_insertonpg[%s]: root page unfound - fixing upper levels"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:552
+#: access/nbtree/nbtinsert.c:585
 #, c-format
 msgid ""
 "_bt_getstackbuf: my bits moved right off the end of the world!\n"
 "\tRecreate index %s."
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:555
+#: access/nbtree/nbtinsert.c:588
 #, c-format
 msgid "bt_insertonpg[%s]: parent page unfound - fixing branch"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:720
+#: access/nbtree/nbtinsert.c:756
 msgid "btree: failed to add hikey to the right sibling"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:746
+#: access/nbtree/nbtinsert.c:782
 msgid "btree: failed to add hikey to the left sibling"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1075
+#: access/nbtree/nbtinsert.c:1112
 #, c-format
 msgid "_bt_findsplitloc: can't find a feasible split point for %s"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1302
+#: access/nbtree/nbtinsert.c:1339
 msgid "btree: failed to add leftkey to new root page"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1319
+#: access/nbtree/nbtinsert.c:1356
 msgid "btree: failed to add rightkey to new root page"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1403
+#: access/nbtree/nbtinsert.c:1442
 msgid "bt_fixroot: not valid old root page"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1534
+#: access/nbtree/nbtinsert.c:1573
 #, c-format
 msgid "bt_fixtree[%s]: invalid start page (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1560
+#: access/nbtree/nbtinsert.c:1599
 #, c-format
 msgid "bt_fixtree[%s]: fixing root page"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1608
+#: access/nbtree/nbtinsert.c:1647
 #, c-format
 msgid "bt_fixlevel[%s]: invalid maxoff on start page (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1615
+#: access/nbtree/nbtinsert.c:1654
 #, c-format
 msgid ""
 "bt_fixtlevel[%s]: non-leftmost child page of leftmost parent (need to "
 "recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1618
+#: access/nbtree/nbtinsert.c:1657
 #, c-format
 msgid "bt_fixtlevel[%s]: invalid start child (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1644
+#: access/nbtree/nbtinsert.c:1683
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(1) (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1676
+#: access/nbtree/nbtinsert.c:1715
 #, c-format
 msgid "bt_fixlevel[%s]: pointer disappeared (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1695
+#: access/nbtree/nbtinsert.c:1734
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(2) (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1709
+#: access/nbtree/nbtinsert.c:1748
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(3) (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1839
+#: access/nbtree/nbtinsert.c:1878
 #, c-format
 msgid "bt_fixbranch[%s]: left pointer unfound (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1846
+#: access/nbtree/nbtinsert.c:1885
 #, c-format
 msgid "bt_fixbranch[%s]: invalid item order (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1855
+#: access/nbtree/nbtinsert.c:1894
 #, c-format
 msgid "bt_fixbranch[%s]: right pointer unfound(1) (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1863
+#: access/nbtree/nbtinsert.c:1902
 #, c-format
 msgid "bt_fixbranch[%s]: right pointer unfound(2) (need to recreate index)"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1911
+#: access/nbtree/nbtinsert.c:1950
 #, c-format
 msgid "bt_fixbranch[%s]: fixing upper levels"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1942
+#: access/nbtree/nbtinsert.c:1981
 #, c-format
 msgid "bt_fixup[%s]: checking/fixing upper levels"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:1957
+#: access/nbtree/nbtinsert.c:1996
 #, c-format
 msgid "bt_fixup[%s]: fixing root page"
 msgstr ""
 
-#: ../access/nbtree/nbtinsert.c:2020
+#: access/nbtree/nbtinsert.c:2059
 #, c-format
 msgid "btree: failed to add item to the %s for %s"
 msgstr ""
 
-#: ../access/nbtree/nbtpage.c:66
+#: access/nbtree/nbtpage.c:66
 #, c-format
 msgid "Cannot initialize non-empty btree %s"
 msgstr ""
 
-#: ../access/nbtree/nbtpage.c:127
+#: access/nbtree/nbtpage.c:127
 #, c-format
 msgid "Index %s is not a btree"
 msgstr ""
 
-#: ../access/nbtree/nbtpage.c:131
+#: access/nbtree/nbtpage.c:131
 #, c-format
 msgid "Version mismatch on %s: version %d file, version %d code"
 msgstr ""
 
-#: ../access/nbtree/nbtpage.c:256
+#: access/nbtree/nbtpage.c:258
 #, c-format
 msgid "bt_getroot[%s]: fixing root page"
 msgstr ""
 
-#: ../access/nbtree/nbtsearch.c:546
+#: access/nbtree/nbtree.c:806
+#, c-format
+msgid ""
+"_bt_restscan: my bits moved right off the end of the world!\n"
+"\tRecreate index %s."
+msgstr ""
+
+#: access/nbtree/nbtree.c:836
+msgid "_bt_restore_page: can't add item to page"
+msgstr ""
+
+#: access/nbtree/nbtree.c:859
+msgid "btree_delete_redo: block unfound"
+msgstr ""
+
+#: access/nbtree/nbtree.c:862
+msgid "btree_delete_redo: uninitialized page"
+msgstr ""
+
+#: access/nbtree/nbtree.c:898
+#, c-format
+msgid "btree_insert_%sdo: block unfound"
+msgstr ""
+
+#: access/nbtree/nbtree.c:901
+#, c-format
+msgid "btree_insert_%sdo: uninitialized page"
+msgstr ""
+
+#: access/nbtree/nbtree.c:915
+msgid "btree_insert_redo: failed to add item"
+msgstr ""
+
+#: access/nbtree/nbtree.c:924
+msgid "btree_insert_undo: bad page LSN"
+msgstr ""
+
+#: access/nbtree/nbtree.c:932
+msgid "btree_insert_undo: unimplemented"
+msgstr ""
+
+#: access/nbtree/nbtree.c:959
+#, c-format
+msgid "btree_split_%s: lost left sibling"
+msgstr ""
+
+#: access/nbtree/nbtree.c:965
+msgid "btree_split_undo: uninitialized left sibling"
+msgstr ""
+
+#: access/nbtree/nbtree.c:988
+msgid "btree_split_undo: bad left sibling LSN"
+msgstr ""
+
+#: access/nbtree/nbtree.c:989 access/nbtree/nbtree.c:1028
+msgid "btree_split_undo: unimplemented"
+msgstr ""
+
+#: access/nbtree/nbtree.c:997
+#, c-format
+msgid "btree_split_%s: lost right sibling"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1003
+msgid "btree_split_undo: uninitialized right sibling"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1027
+msgid "btree_split_undo: bad right sibling LSN"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1041
+msgid "btree_split_redo: lost next right page"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1045
+msgid "btree_split_redo: uninitialized next right page"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1082
+msgid "btree_newroot_redo: no root page"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1085
+msgid "btree_newroot_redo: no metapage"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1139
+#, c-format
+msgid "btree_redo: unknown op code %u"
+msgstr ""
+
+#: access/nbtree/nbtree.c:1159
+#, c-format
+msgid "btree_undo: unknown op code %u"
+msgstr ""
+
+#: access/nbtree/nbtsearch.c:545
 msgid "_bt_first: btree doesn't support is(not)null, yet"
 msgstr ""
 
-#: ../access/nbtree/nbtsearch.c:694
+#: access/nbtree/nbtsearch.c:693
 msgid "_bt_first: equal items disappeared?"
 msgstr ""
 
-#: ../access/nbtree/nbtsearch.c:1004
+#: access/nbtree/nbtsearch.c:1004
 #, c-format
 msgid "Illegal scan direction %d"
 msgstr ""
 
-#: ../access/nbtree/nbtsort.c:285
+#: access/nbtree/nbtsort.c:292
 msgid "btree: failed to add item to the page in _bt_sort"
 msgstr ""
 
-#: ../access/nbtree/nbtsort.c:350
+#: access/nbtree/nbtsort.c:357
 #, c-format
 msgid "btree: index item size %lu exceeds maximum %ld"
 msgstr ""
 
-#: ../access/nbtree/nbtutils.c:219
+#: access/nbtree/nbtutils.c:230
 msgid "_bt_orderkeys: key(s) for attribute 1 missed"
 msgstr ""
 
-#: ../access/nbtree/nbtutils.c:286
+#: access/nbtree/nbtutils.c:308
 #, c-format
 msgid "_bt_orderkeys: key(s) for attribute %d missed"
 msgstr ""
 
-#: ../access/nbtree/nbtutils.c:402
+#: access/nbtree/nbtutils.c:465
 #, c-format
-msgid "_bt_orderkeys: unable to identify operator %u"
+msgid "_bt_getstrategynumber: unable to identify operator %u"
 msgstr ""
 
-#: ../access/rtree/rtree.c:330
+#: access/rtree/rtree.c:331
 #, c-format
 msgid "rtdoinsert: failed to add index item to %s"
 msgstr ""
 
-#: ../access/rtree/rtree.c:522 ../access/rtree/rtree.c:546
+#: access/rtree/rtree.c:523 access/rtree/rtree.c:547
 #, c-format
 msgid "rtdosplit: failed to add index item to %s"
 msgstr ""
 
-#: ../access/rtree/rtree.c:642
+#: access/rtree/rtree.c:643
 msgid "Variable-length rtree keys are not supported."
 msgstr ""
 
-#: ../access/rtree/rtree.c:662
+#: access/rtree/rtree.c:663
 #, c-format
 msgid "rtintinsert: failed to add index item to %s"
 msgstr ""
 
-#: ../access/rtree/rtree.c:688 ../access/rtree/rtree.c:693
+#: access/rtree/rtree.c:689 access/rtree/rtree.c:694
 #, c-format
 msgid "rtnewroot: failed to add index item to %s"
 msgstr ""
 
-#: ../access/rtree/rtree.c:780
+#: access/rtree/rtree.c:781
 #, c-format
 msgid "rtree: index item size %lu exceeds maximum %lu"
 msgstr ""
 
-#: ../access/rtree/rtree.c:1065
+#: access/rtree/rtree.c:1068
 msgid "rtpicksplit: failed to find a workable page split"
 msgstr ""
 
-#: ../access/rtree/rtree.c:1348
+#: access/rtree/rtree.c:1347
 msgid "rtree_redo: unimplemented"
 msgstr ""
 
-#: ../access/rtree/rtree.c:1354
+#: access/rtree/rtree.c:1353
 msgid "rtree_undo: unimplemented"
 msgstr ""
 
-#: ../access/rtree/rtscan.c:270
+#: access/rtree/rtscan.c:255
 #, c-format
 msgid "rtree scan list corrupted -- cannot find 0x%p"
 msgstr ""
 
-#: ../access/rtree/rtscan.c:406
+#: access/rtree/rtscan.c:391
 #, c-format
 msgid "Bad operation in rtree scan adjust: %d"
 msgstr ""
 
-#: ../access/transam/xact.c:439
+#: access/transam/clog.c:546 access/transam/clog.c:598
+#, c-format
+msgid "open of %s failed: %m"
+msgstr "konnte %s nicht �ffnen: %m"
+
+#: access/transam/clog.c:547
+#, c-format
+msgid "clog file %s doesn't exist, reading as zeroes"
+msgstr ""
+
+#: access/transam/clog.c:553 access/transam/clog.c:606
+#, c-format
+msgid "lseek of clog file %u, offset %u failed: %m"
+msgstr ""
+
+#: access/transam/clog.c:558
+#, c-format
+msgid "read of clog file %u, offset %u failed: %m"
+msgstr ""
+
+#: access/transam/clog.c:602 access/transam/xlog.c:1379
+#, c-format
+msgid "creation of file %s failed: %m"
+msgstr ""
+
+#: access/transam/clog.c:615
+#, c-format
+msgid "write of clog file %u, offset %u failed: %m"
+msgstr ""
+
+#: access/transam/clog.c:834
+msgid "unable to truncate commit log: apparent wraparound"
+msgstr ""
+
+#: access/transam/clog.c:889
+#, c-format
+msgid "could not open transaction-commit log directory (%s): %m"
+msgstr ""
+
+#: access/transam/clog.c:905
+#, c-format
+msgid "removing commit log file %s"
+msgstr "entferne Commit-Logdatei %s"
+
+#: access/transam/clog.c:914
+#, c-format
+msgid "could not read transaction-commit log directory (%s): %m"
+msgstr ""
+
+#: access/transam/xact.c:425
 msgid "You may only have 2^32-1 commands per transaction"
 msgstr ""
 
-#: ../access/transam/xact.c:923
+#: access/transam/xact.c:715
+#, c-format
+msgid "RecordTransactionAbort: xact %u already committed"
+msgstr ""
+
+#: access/transam/xact.c:944
 msgid "CommitTransaction and not in in-progress state"
 msgstr ""
 
-#: ../access/transam/xact.c:1047
+#: access/transam/xact.c:1079
 msgid "AbortTransaction and not in in-progress state"
 msgstr ""
 
-#: ../access/transam/xact.c:1126
+#: access/transam/xact.c:1164
 msgid "CleanupTransaction and not in abort state"
 msgstr ""
 
-#: ../access/transam/xact.c:1166
+#: access/transam/xact.c:1196
+msgid "StartTransactionCommand: can't prevent chain"
+msgstr "StartTransactionCommand: kann Verkettung nicht verhindern"
+
+#: access/transam/xact.c:1215
 msgid "StartTransactionCommand: unexpected TBLOCK_BEGIN"
 msgstr ""
 
-#: ../access/transam/xact.c:1187
+#: access/transam/xact.c:1236
 msgid "StartTransactionCommand: unexpected TBLOCK_END"
 msgstr ""
 
-#: ../access/transam/xact.c:1210
+#: access/transam/xact.c:1259
 msgid "StartTransactionCommand: unexpected TBLOCK_ENDABORT"
 msgstr ""
 
-#: ../access/transam/xact.c:1390
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1475
+#, c-format
+msgid "%s cannot run inside a transaction block"
+msgstr "%s kann nicht in einem Transaktionsblock laufen"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1485
+#, c-format
+msgid "%s cannot be executed from a function"
+msgstr ""
+
+#: access/transam/xact.c:1489
+msgid "PreventTransactionChain: can't prevent chain"
+msgstr ""
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1496
+#, c-format
+msgid "%s will be committed automatically"
+msgstr ""
+
+#: access/transam/xact.c:1518
 msgid "BEGIN: already a transaction in progress"
 msgstr "BEGIN: eine Transaktion is bereits begonnen"
 
-#: ../access/transam/xact.c:1451
+#: access/transam/xact.c:1582
 msgid "COMMIT: no transaction in progress"
 msgstr "COMMIT: keine Transaktion offen"
 
-#: ../access/transam/xact.c:1488 ../access/transam/xact.c:1535
+#: access/transam/xact.c:1619 access/transam/xact.c:1666
 msgid "ROLLBACK: no transaction in progress"
 msgstr "ROLLBACK: keine Transaktion offen"
 
-#: ../access/transam/xact.c:1609 ../access/transam/xact.c:1620
+#: access/transam/xact.c:1740 access/transam/xact.c:1751
 #, c-format
 msgid "xact_redo: unknown op code %u"
 msgstr ""
 
-#: ../access/transam/xact.c:1618
+#: access/transam/xact.c:1749
 msgid "xact_undo: can't undo committed xaction"
 msgstr ""
 
-#: ../access/transam/xact.c:1655
+#: access/transam/xact.c:1786
 msgid "XactPushRollback: already installed"
 msgstr ""
 
-#: ../access/transam/xlog.c:492
+#: access/transam/xlog.c:506
 #, c-format
 msgid "XLogInsert: invalid info mask %02X"
 msgstr ""
 
-#: ../access/transam/xlog.c:597
+#: access/transam/xlog.c:611
 #, c-format
 msgid "XLogInsert: can backup %d blocks at most"
 msgstr ""
 
-#: ../access/transam/xlog.c:615
+#: access/transam/xlog.c:629
 #, c-format
 msgid "XLogInsert: invalid record length %u"
 msgstr ""
 
-#: ../access/transam/xlog.c:763 ../access/transam/xlog.c:2550
-#: ../tcop/postgres.c:489 ../utils/adt/varchar.c:87 ../utils/adt/varchar.c:431
-#: ../utils/adt/varlena.c:192 scan.l:59
+#: access/transam/xlog.c:786 access/transam/xlog.c:2626 scan.l:36
+#: utils/adt/name.c:52 utils/adt/varchar.c:83 utils/adt/varchar.c:357
+#: utils/adt/varlena.c:225
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../access/transam/xlog.c:995
+#: access/transam/xlog.c:1030
 #, c-format
 msgid "XLogWrite: write request %X/%X is past end of log %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1012 ../access/transam/xlog.c:1126
-#: ../access/transam/xlog.c:3241
+#: access/transam/xlog.c:1047 access/transam/xlog.c:1157
+#: access/transam/xlog.c:3330
 #, c-format
 msgid "close of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1025
-msgid "XLogWrite: new log file created - consider increasing WAL_FILES"
-msgstr ""
-
-#: ../access/transam/xlog.c:1051
+#: access/transam/xlog.c:1082
 msgid "XLogWrite: time for a checkpoint, signaling postmaster"
 msgstr ""
 
-#: ../access/transam/xlog.c:1070
+#: access/transam/xlog.c:1101
 #, c-format
 msgid "lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1082
+#: access/transam/xlog.c:1113
 #, c-format
 msgid "write of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1173
+#: access/transam/xlog.c:1209
 #, c-format
-msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X\n"
+msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1238
+#: access/transam/xlog.c:1314
 #, c-format
 msgid "XLogFlush: request %X/%X is not satisfied --- flushed only to %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1286 ../access/transam/xlog.c:1367
-#: ../access/transam/xlog.c:1477 ../access/transam/xlog.c:1481
+#: access/transam/xlog.c:1357 access/transam/xlog.c:1438
+#: access/transam/xlog.c:1548 access/transam/xlog.c:1552
 #, c-format
 msgid "open of %s (log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: ../access/transam/clog.c:603 ../access/transam/xlog.c:1308
-#, c-format
-msgid "creation of file %s failed: %m"
-msgstr ""
-
-#: ../access/transam/xlog.c:1335
+#: access/transam/xlog.c:1406
 #, c-format
 msgid "ZeroFill failed to write %s: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1340
+#: access/transam/xlog.c:1411
 #, c-format
 msgid "fsync of file %s failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1445
+#: access/transam/xlog.c:1516
 #, c-format
 msgid ""
 "link from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1450
+#: access/transam/xlog.c:1521
 #, c-format
 msgid ""
 "rename from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1542
+#: access/transam/xlog.c:1602
 #, c-format
 msgid "could not open transaction log directory (%s): %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1557
+#: access/transam/xlog.c:1617
 #, c-format
 msgid "archiving transaction log file %s"
 msgstr ""
 
-#: ../access/transam/xlog.c:1559
+#: access/transam/xlog.c:1619
 msgid "archiving log files is not implemented!"
 msgstr ""
 
-#: ../access/transam/xlog.c:1573
+#: access/transam/xlog.c:1633
 #, c-format
 msgid "recycled transaction log file %s"
 msgstr ""
 
-#: ../access/transam/xlog.c:1579
+#: access/transam/xlog.c:1639
 #, c-format
 msgid "removing transaction log file %s"
 msgstr "entferne Transaktionslogdatei %s"
 
-#: ../access/transam/xlog.c:1588
+#: access/transam/xlog.c:1648
 #, c-format
 msgid "could not read transaction log directory (%s): %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1661
+#: access/transam/xlog.c:1721
 #, c-format
 msgid "ReadRecord: bad resource manager data checksum in record at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1683
+#: access/transam/xlog.c:1743
 #, c-format
 msgid "ReadRecord: bad checksum of backup block %d in record at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1752
+#: access/transam/xlog.c:1812
 #, c-format
 msgid "ReadRecord: invalid record offset at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1775
+#: access/transam/xlog.c:1835
 #, c-format
 msgid "ReadRecord: lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1781 ../access/transam/xlog.c:1865
+#: access/transam/xlog.c:1841 access/transam/xlog.c:1925
 #, c-format
 msgid "ReadRecord: read of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:1791
+#: access/transam/xlog.c:1851
 #, c-format
 msgid "ReadRecord: contrecord is requested by %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1805
+#: access/transam/xlog.c:1865
 #, c-format
 msgid "ReadRecord: record with zero length at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1829
+#: access/transam/xlog.c:1889
 #, c-format
 msgid "ReadRecord: record length %u at %X/%X too long"
 msgstr ""
 
-#: ../access/transam/xlog.c:1835
+#: access/transam/xlog.c:1895
 #, c-format
 msgid "ReadRecord: invalid resource manager id %u at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:1873
+#: access/transam/xlog.c:1933
 #, c-format
 msgid ""
 "ReadRecord: there is no ContRecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: ../access/transam/xlog.c:1881
+#: access/transam/xlog.c:1941
 #, c-format
 msgid ""
 "ReadRecord: invalid ContRecord length %u in log file %u, segment %u, offset %"
 "u"
 msgstr ""
 
-#: ../access/transam/xlog.c:1945
+#: access/transam/xlog.c:2005
 #, c-format
 msgid ""
 "ReadRecord: invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: ../access/transam/xlog.c:1951
+#: access/transam/xlog.c:2011
 #, c-format
 msgid ""
 "ReadRecord: invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: ../access/transam/xlog.c:1959
+#: access/transam/xlog.c:2019
 #, c-format
 msgid ""
 "ReadRecord: unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
 
 #. translator: SUI = startup id
-#: ../access/transam/xlog.c:1981
+#: access/transam/xlog.c:2041
 #, c-format
 msgid ""
 "ReadRecord: out-of-sequence SUI %u (after %u) in log file %u, segment %u, "
 "offset %u"
 msgstr ""
 
-#: ../access/transam/xlog.c:2033
+#: access/transam/xlog.c:2100
 msgid "invalid LC_COLLATE setting"
 msgstr ""
 
-#: ../access/transam/xlog.c:2037
+#: access/transam/xlog.c:2104
 msgid "invalid LC_CTYPE setting"
 msgstr ""
 
-#: ../access/transam/xlog.c:2046
-#, c-format
-msgid ""
-"Initializing database with %s collation order.\n"
-"\tThis locale setting will prevent use of index optimization for\n"
-"\tLIKE and regexp searches.  If you are concerned about speed of\n"
-"\tsuch queries, you may wish to set LC_COLLATE to \"C\" and\n"
-"\tre-initdb.  For more information see the Administrator's Guide."
-msgstr ""
-
-#: ../access/transam/xlog.c:2072
+#: access/transam/xlog.c:2122
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr ""
 
-#: ../access/transam/xlog.c:2080
+#: access/transam/xlog.c:2130
 #, c-format
 msgid "WriteControlFile: could not create control file (%s): %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2089
+#: access/transam/xlog.c:2139
 #, c-format
 msgid "WriteControlFile: write to control file failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2093
+#: access/transam/xlog.c:2143
 #, c-format
 msgid "WriteControlFile: fsync of control file failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2109 ../access/transam/xlog.c:2206
+#: access/transam/xlog.c:2159 access/transam/xlog.c:2282
 #, c-format
 msgid "could not open control file (%s): %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2112
+#: access/transam/xlog.c:2162
 #, c-format
 msgid "read from control file failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2124
+#: access/transam/xlog.c:2174
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d,\n"
@@ -1224,11 +1290,11 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: ../access/transam/xlog.c:2137
+#: access/transam/xlog.c:2187
 msgid "invalid checksum in control file"
 msgstr ""
 
-#: ../access/transam/xlog.c:2153
+#: access/transam/xlog.c:2203
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d,\n"
@@ -1236,7 +1302,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: ../access/transam/xlog.c:2159
+#: access/transam/xlog.c:2209
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d,\n"
@@ -1244,307 +1310,288 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: ../access/transam/xlog.c:2165
+#: access/transam/xlog.c:2215
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d,\n"
 "\tbut the backend was compiled with RELSEG_SIZE %d.\n"
-"\tIt looks like you need to initdb."
+"\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: ../access/transam/xlog.c:2172
+#: access/transam/xlog.c:2222
 #, c-format
 msgid ""
-"The database cluster was initialized with LC_COLLATE '%s',\n"
-"\twhich is not recognized by setlocale().\n"
-"\tIt looks like you need to initdb."
+"The database cluster was initialized with NAMEDATALEN %d,\n"
+"\tbut the backend was compiled with NAMEDATALEN %d.\n"
+"\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: ../access/transam/xlog.c:2178
+#: access/transam/xlog.c:2229
 #, c-format
 msgid ""
-"The database cluster was initialized with LC_CTYPE '%s',\n"
-"\twhich is not recognized by setlocale().\n"
-"\tIt looks like you need to initdb."
+"The database cluster was initialized with FUNC_MAX_ARGS %d,\n"
+"\tbut the backend was compiled with FUNC_MAX_ARGS %d.\n"
+"\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: ../access/transam/xlog.c:2186
+#: access/transam/xlog.c:2237
+msgid ""
+"The database cluster was initialized without HAVE_INT64_TIMESTAMP\n"
+"\tbut the backend was compiled with HAVE_INT64_TIMESTAMP.\n"
+"\tIt looks like you need to recompile or initdb."
+msgstr ""
+
+#: access/transam/xlog.c:2243
+msgid ""
+"The database cluster was initialized with HAVE_INT64_TIMESTAMP\n"
+"\tbut the backend was compiled without HAVE_INT64_TIMESTAMP.\n"
+"\tIt looks like you need to recompile or initdb."
+msgstr ""
+
+#: access/transam/xlog.c:2250
+#, c-format
+msgid ""
+"The database cluster was initialized with LOCALE_NAME_BUFLEN %d,\n"
+"\tbut the backend was compiled with LOCALE_NAME_BUFLEN %d.\n"
+"\tIt looks like you need to initdb."
+msgstr ""
+
+#: access/transam/xlog.c:2257
+#, c-format
+msgid ""
+"The database cluster was initialized with LC_COLLATE '%s',\n"
+"\twhich is not recognized by setlocale().\n"
+"\tIt looks like you need to initdb."
+msgstr ""
+
+#: access/transam/xlog.c:2263
 #, c-format
 msgid ""
-"The database cluster was initialized with LC_COLLATE '%s' and\n"
-"\tLC_CTYPE '%s', but the server was compiled without locale support.\n"
-"\tIt looks like you need to initdb or recompile."
+"The database cluster was initialized with LC_CTYPE '%s',\n"
+"\twhich is not recognized by setlocale().\n"
+"\tIt looks like you need to initdb."
 msgstr ""
 
-#: ../access/transam/xlog.c:2214
+#: access/transam/xlog.c:2290
 #, c-format
 msgid "write to control file failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2218
+#: access/transam/xlog.c:2294
 #, c-format
 msgid "fsync of control file failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2358
+#: access/transam/xlog.c:2434
 #, c-format
 msgid "BootStrapXLOG failed to write log file: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2362
+#: access/transam/xlog.c:2438
 #, c-format
 msgid "BootStrapXLOG failed to fsync log file: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:2428
+#: access/transam/xlog.c:2504
 msgid "control file context is broken"
 msgstr ""
 
-#: ../access/transam/xlog.c:2431
+#: access/transam/xlog.c:2507
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "Datenbanksystem wurde am %s heruntergefahren"
 
-#: ../access/transam/xlog.c:2434
+#: access/transam/xlog.c:2510
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr "Datenbanksystem wurde am %s w�hrend des Herunterfahrens unterbrochen"
 
-#: ../access/transam/xlog.c:2437
+#: access/transam/xlog.c:2513
 #, c-format
 msgid ""
 "database system was interrupted being in recovery at %s\n"
-"\tThis propably means that some data blocks are corrupted\n"
+"\tThis probably means that some data blocks are corrupted\n"
 "\tand you will have to use the last backup for recovery."
 msgstr ""
 
-#: ../access/transam/xlog.c:2442
+#: access/transam/xlog.c:2518
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr "Datenbanksystem wurde am %s unterbrochen"
 
-#: ../access/transam/xlog.c:2453
+#: access/transam/xlog.c:2529
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "Checkpoint-Eintrag ist bei %X/%X"
 
-#: ../access/transam/xlog.c:2462
+#: access/transam/xlog.c:2538
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "Checkpoint-Eintrag ist bei %X/%X"
 
-#: ../access/transam/xlog.c:2467
+#: access/transam/xlog.c:2543
 msgid "unable to locate a valid checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2473
+#: access/transam/xlog.c:2549
 #, c-format
 msgid "redo record is at %X/%X; undo record is at %X/%X; shutdown %s"
 msgstr "Redo-Eintrag ist bei %X/%X; Undo-Eintrag ist bei %X/%X; Shutdown %s"
 
-#: ../access/transam/xlog.c:2477
+#: access/transam/xlog.c:2553
 #, c-format
 msgid "next transaction id: %u; next oid: %u"
 msgstr "n�chste Transaktions-Id: %u; n�chste Oid: %u"
 
-#: ../access/transam/xlog.c:2480
+#: access/transam/xlog.c:2556
 msgid "invalid next transaction id"
 msgstr ""
 
-#: ../access/transam/xlog.c:2491
+#: access/transam/xlog.c:2567
 msgid "invalid redo in checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2499
+#: access/transam/xlog.c:2575
 msgid "invalid redo/undo record in shutdown checkpoint"
 msgstr ""
 
-#: ../access/transam/xlog.c:2508
+#: access/transam/xlog.c:2584
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 
-#: ../access/transam/xlog.c:2528
+#: access/transam/xlog.c:2604
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:2559
+#: access/transam/xlog.c:2635
 #, c-format
 msgid "redo done at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:2565
+#: access/transam/xlog.c:2641
 msgid "redo is not required"
 msgstr ""
 
-#: ../access/transam/xlog.c:2647
+#: access/transam/xlog.c:2723
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:2657
+#: access/transam/xlog.c:2733
 #, c-format
 msgid "undo done at %X/%X"
 msgstr ""
 
-#: ../access/transam/xlog.c:2661
+#: access/transam/xlog.c:2737
 msgid "undo is not required"
 msgstr ""
 
-#: ../access/transam/xlog.c:2695
+#: access/transam/xlog.c:2771
 msgid "database system is ready"
 msgstr "Datenbanksystem is bereit"
 
-#: ../access/transam/xlog.c:2727
+#: access/transam/xlog.c:2803
 msgid "invalid primary checkpoint link in control file"
 msgstr ""
 
-#: ../access/transam/xlog.c:2728
+#: access/transam/xlog.c:2804
 msgid "invalid secondary checkpoint link in control file"
 msgstr ""
 
-#: ../access/transam/xlog.c:2737
+#: access/transam/xlog.c:2813
 msgid "invalid primary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2738
+#: access/transam/xlog.c:2814
 msgid "invalid secondary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2744
+#: access/transam/xlog.c:2820
 msgid "invalid resource manager id in primary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2745
+#: access/transam/xlog.c:2821
 msgid "invalid resource manager id in secondary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2752
+#: access/transam/xlog.c:2828
 msgid "invalid xl_info in primary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2753
+#: access/transam/xlog.c:2829
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2759
+#: access/transam/xlog.c:2835
 msgid "invalid length of primary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2760
+#: access/transam/xlog.c:2836
 msgid "invalid length of secondary checkpoint record"
 msgstr ""
 
-#: ../access/transam/xlog.c:2808
+#: access/transam/xlog.c:2899
 msgid "shutting down"
 msgstr "fahre herunter"
 
-#: ../access/transam/xlog.c:2819
+#: access/transam/xlog.c:2912
 msgid "database system is shut down"
 msgstr "Datenbanksystem ist heruntergefahren"
 
-#: ../access/transam/xlog.c:2837
+#: access/transam/xlog.c:2933
 msgid "CreateCheckPoint: cannot be called inside transaction block"
 msgstr ""
 
-#: ../access/transam/xlog.c:2935
+#: access/transam/xlog.c:3048
 msgid "active transaction while database system is shutting down"
 msgstr ""
 
-#: ../access/transam/xlog.c:2982
+#: access/transam/xlog.c:3094
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
-#: ../access/transam/xlog.c:3220
-#, c-format
-msgid "bogus wal_sync_method %s"
-msgstr ""
-
-#: ../access/transam/xlog.c:3236 ../access/transam/xlog.c:3262
+#: access/transam/xlog.c:3325 access/transam/xlog.c:3353
 #, c-format
 msgid "fsync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:3268
+#: access/transam/xlog.c:3359
 #, c-format
 msgid "fdatasync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: ../access/transam/xlog.c:3276
+#: access/transam/xlog.c:3367
 #, c-format
 msgid "bogus wal_sync_method %d"
 msgstr ""
 
-#: ../access/transam/xlogutils.c:252
+#: access/transam/xlogutils.c:253
 msgid "_xl_remove_hash_entry: file was not found in cache"
 msgstr ""
 
-#: ../access/transam/xlogutils.c:349
+#: access/transam/xlogutils.c:350
 msgid "XLogOpenRelation: out of memory for cache"
 msgstr ""
 
-#: ../access/transam/xlogutils.c:352
+#: access/transam/xlogutils.c:353
 msgid "XLogOpenRelation: file found on insert into cache"
 msgstr ""
 
-#: ../access/transam/clog.c:547 ../access/transam/clog.c:599
-#, c-format
-msgid "open of %s failed: %m"
-msgstr "konnte %s nicht �ffnen: %m"
-
-#: ../access/transam/clog.c:548
-#, c-format
-msgid "clog file %s doesn't exist, reading as zeroes"
-msgstr ""
-
-#: ../access/transam/clog.c:554 ../access/transam/clog.c:607
-#, c-format
-msgid "lseek of clog file %u, offset %u failed: %m"
-msgstr ""
-
-#: ../access/transam/clog.c:559
-#, c-format
-msgid "read of clog file %u, offset %u failed: %m"
-msgstr ""
-
-#: ../access/transam/clog.c:616
-#, c-format
-msgid "write of clog file %u, offset %u failed: %m"
-msgstr ""
-
-#: ../access/transam/clog.c:835
-msgid "unable to truncate commit log: apparent wraparound"
-msgstr ""
-
-#: ../access/transam/clog.c:890
-#, c-format
-msgid "could not open transaction-commit log directory (%s): %m"
-msgstr ""
-
-#: ../access/transam/clog.c:906
-#, c-format
-msgid "removing commit log file %s"
-msgstr "entferne Commit-Logdatei %s"
-
-#: ../access/transam/clog.c:915
-#, c-format
-msgid "could not read transaction-commit log directory (%s): %m"
-msgstr ""
-
-#: ../bootstrap/bootstrap.c:190
+#: bootstrap/bootstrap.c:193
 msgid ""
 "Usage:\n"
-"  postgres -boot [-d] [-D datadir] [-F] [-o file] [-x num] dbname\n"
-"  -d               debug mode\n"
+"  postgres -boot [-d level] [-D datadir] [-F] [-o file] [-x num] dbname\n"
+"  -d 1-5           debug mode\n"
 "  -D datadir       data directory\n"
 "  -F               turn off fsync\n"
 "  -o file          send debug output to file\n"
 "  -x num           internal use\n"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:297 ../postmaster/postmaster.c:288
+#: bootstrap/bootstrap.c:307 postmaster/postmaster.c:308
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -1559,121 +1606,121 @@ msgstr ""
 "Umgebungsvariable PGDATA setzen.\n"
 "\n"
 
-#: ../bootstrap/bootstrap.c:395
+#: bootstrap/bootstrap.c:407
 #, c-format
 msgid "Unsupported XLOG op %d"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:499
+#: bootstrap/bootstrap.c:510
 #, c-format
 msgid "open relation %s, attrsize %d"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:528
+#: bootstrap/bootstrap.c:526
 #, c-format
 msgid "create attribute %d name %s len %d num %d type %u"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:548
+#: bootstrap/bootstrap.c:545
 #, c-format
 msgid "closerel: close of '%s' when '%s' was expected"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:552
+#: bootstrap/bootstrap.c:549
 #, c-format
 msgid "closerel: close of '%s' before any relation was opened"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:558
+#: bootstrap/bootstrap.c:554
 msgid "no open relation to close"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:562
+#: bootstrap/bootstrap.c:557
 #, c-format
 msgid "close relation %s"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:586
+#: bootstrap/bootstrap.c:581
 msgid "warning: no open relations allowed with 'create' command"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:598 ../bootstrap/bootstrap.c:610
+#: bootstrap/bootstrap.c:590
 #, c-format
 msgid "column %s %s"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:659
+#: bootstrap/bootstrap.c:680
 #, c-format
 msgid "inserting row oid %u, %d columns"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:670
+#: bootstrap/bootstrap.c:692
 msgid "row inserted"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:693
+#: bootstrap/bootstrap.c:714
 #, c-format
 msgid "inserting column %d value '%s'"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:700
+#: bootstrap/bootstrap.c:720
 msgid "Typ != NULL"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:707
+#: bootstrap/bootstrap.c:727
 #, c-format
 msgid "unable to find atttypid %u in Typ list"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:719 ../bootstrap/bootstrap.c:742
+#: bootstrap/bootstrap.c:738 bootstrap/bootstrap.c:759
 #, c-format
 msgid " -> %s"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:730
+#: bootstrap/bootstrap.c:749
 #, c-format
 msgid "type oid %u not found"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:732
+#: bootstrap/bootstrap.c:750
 #, c-format
 msgid "Typ == NULL, typeindex = %u"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:746
+#: bootstrap/bootstrap.c:762
 msgid "inserted"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:757
+#: bootstrap/bootstrap.c:772
 #, c-format
 msgid "inserting column %d NULL"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:804
+#: bootstrap/bootstrap.c:819
 msgid "Memory manager fault: cleanup called twice.\n"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:845
+#: bootstrap/bootstrap.c:866
 #, c-format
 msgid "external type: %s"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:869
+#: bootstrap/bootstrap.c:890
 #, c-format
 msgid "Error: unknown type '%s'.\n"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:885
+#: bootstrap/bootstrap.c:906
 msgid "AllocateAttribute: malloc failed"
 msgstr ""
 
-#: ../bootstrap/bootstrap.c:1036
+#: bootstrap/bootstrap.c:1057
 msgid ""
 "There are too many string constants and identifiers for the compiler to "
 "handle."
 msgstr ""
 
-#: bootparse.y:58
+#: bootparse.y:59
 msgid "start transaction"
 msgstr ""
 
@@ -1681,1524 +1728,2596 @@ msgstr ""
 msgid "commit transaction"
 msgstr ""
 
-#: bootparse.y:160
-#, c-format
-msgid "creating bootstrap relation %s..."
-msgstr ""
-
-#: bootparse.y:163
+#: bootparse.y:158
 #, c-format
-msgid "creating relation %s..."
+msgid "creating%s%s relation %s..."
 msgstr ""
 
-#: bootparse.y:182
+#: bootparse.y:179
 msgid "create bootstrap: warning, open relation exists, closing first"
 msgstr ""
 
-#: bootparse.y:191
+#: bootparse.y:189
 msgid "bootstrap relation created"
 msgstr ""
 
-#: bootparse.y:206
+#: bootparse.y:201
 #, c-format
 msgid "relation created with oid %u"
 msgstr "Relation erstellt mit OID %u"
 
-#: bootparse.y:219
+#: bootparse.y:212
 #, c-format
 msgid "inserting row with oid %u..."
 msgstr ""
 
-#: bootparse.y:221
+#: bootparse.y:214
 msgid "inserting row..."
 msgstr ""
 
-#: bootparse.y:228
+#: bootparse.y:220
 #, c-format
 msgid "incorrect number of columns in row (expected %d, got %d)"
 msgstr ""
 
-#: bootparse.y:232
+#: bootparse.y:224
 msgid "relation not open"
 msgstr "Relation nicht offen"
 
-#: bootparse.y:303
+#: bootparse.y:305
 msgid "too many columns"
 msgstr ""
 
-#: bootscanner.l:127
+#: bootscanner.l:128
 #, c-format
 msgid "syntax error at line %d: unexpected character %s"
 msgstr ""
 
-#: bootscanner.l:143
+#: bootscanner.l:138
 #, c-format
 msgid "syntax error at line %d: unexpected token %s"
 msgstr ""
 
-#: ../catalog/aclchk.c:56
+#: catalog/aclchk.c:60
 #, c-format
 msgid "acl size = %d, # acls = %d"
 msgstr ""
 
-#: ../catalog/aclchk.c:60
+#: catalog/aclchk.c:64
 #, c-format
 msgid "\tacl[%d]: %s"
 msgstr ""
 
-#: ../catalog/aclchk.c:97 ../commands/trigger.c:80 ../tcop/utility.c:375
-#: ../tcop/utility.c:692 ../tcop/utility.c:851 ../utils/init/miscinit.c:494
-#: ../utils/misc/guc.c:931
-msgid "permission denied"
-msgstr "keine Berechtigung"
+#: catalog/aclchk.c:153
+#, c-format
+msgid "bogus GrantStmt.objtype %d"
+msgstr ""
 
-#: ../catalog/aclchk.c:107
+#: catalog/aclchk.c:173
 #, c-format
-msgid "relation \"%s\" not found"
+msgid "invalid privilege type %s for table object"
 msgstr ""
 
-#: ../catalog/aclchk.c:113
+#: catalog/aclchk.c:202
+#, c-format
+msgid "relation %u not found"
+msgstr "Relation %u nicht gefunden"
+
+#: catalog/aclchk.c:209
 #, c-format
 msgid "\"%s\" is an index"
 msgstr ""
 
-#: ../catalog/aclchk.c:209
+#: catalog/aclchk.c:268
 #, c-format
-msgid "non-existent group \"%s\""
+msgid "invalid privilege type %s for database object"
 msgstr ""
 
-#: ../catalog/aclchk.c:279
+#: catalog/aclchk.c:298
 #, c-format
-msgid "in_group: group %u not found"
-msgstr ""
+msgid "database \"%s\" not found"
+msgstr "Datenbank �%s� nicht gefunden"
 
-#: ../catalog/aclchk.c:306
-msgid "aclcheck: null ACL, returning OK"
-msgstr ""
+#: catalog/aclchk.c:302 catalog/aclchk.c:474 catalog/pg_conversion.c:146
+#: commands/dbcommands.c:535 commands/user.c:911 tcop/utility.c:827
+#: utils/init/miscinit.c:616
+msgid "permission denied"
+msgstr "keine Berechtigung"
 
-#: ../catalog/aclchk.c:321
-msgid "aclcheck: zero-length ACL, returning OK"
+#: catalog/aclchk.c:359
+#, c-format
+msgid "invalid privilege type %s for function object"
 msgstr ""
 
-#: ../catalog/aclchk.c:330
-msgid "aclcheck: first entry in ACL is not 'world' entry"
-msgstr ""
+#: catalog/aclchk.c:389 parser/parse_func.c:891 parser/parse_func.c:1339
+#, c-format
+msgid "function %u not found"
+msgstr "Funktion %u nicht gefunden"
 
-#: ../catalog/aclchk.c:334
+#: catalog/aclchk.c:452
 #, c-format
-msgid "aclcheck: using world=%d"
+msgid "invalid privilege type %s for language object"
 msgstr ""
 
-#: ../catalog/aclchk.c:350
+#: catalog/aclchk.c:481
 #, c-format
-msgid "aclcheck: found user %u/%d"
-msgstr ""
+msgid "language \"%s\" not found"
+msgstr "Sprache �%s� nicht gefunden"
 
-#: ../catalog/aclchk.c:367 ../catalog/aclchk.c:388
+#: catalog/aclchk.c:485
 #, c-format
-msgid "aclcheck: found group %u/%d"
-msgstr ""
+msgid "language \"%s\" is not trusted"
+msgstr "Sprache �%s� ist nicht �trusted�"
 
-#: ../catalog/aclchk.c:400
+#: catalog/aclchk.c:542
 #, c-format
-msgid "aclcheck: bogus ACL id type: %d"
+msgid "invalid privilege type %s for namespace object"
 msgstr ""
 
-#: ../catalog/aclchk.c:430
+#: catalog/aclchk.c:568
 #, c-format
-msgid "pg_aclcheck: invalid user id %u"
-msgstr "pg_aclcheck: ung�ltige Benutzer-ID %u"
+msgid "namespace \"%s\" not found"
+msgstr "Namespace �%s� nicht gefunden"
 
-#: ../catalog/aclchk.c:446
+#: catalog/aclchk.c:644
 #, c-format
-msgid "pg_aclcheck: catalog update to \"%s\": permission denied"
+msgid "privilege_to_string: unrecognized privilege %d"
 msgstr ""
 
-#: ../catalog/aclchk.c:459
+#: catalog/aclchk.c:666
 #, c-format
-msgid "pg_aclcheck: \"%s\" is superuser"
+msgid "non-existent group \"%s\""
 msgstr ""
 
-#: ../catalog/aclchk.c:476
+#: catalog/aclchk.c:736
 #, c-format
-msgid "pg_aclcheck: class \"%s\" not found"
+msgid "in_group: group %u not found"
 msgstr ""
 
-#: ../catalog/aclchk.c:526
-#, c-format
-msgid "pg_ownercheck: invalid user id %u"
+#: catalog/aclchk.c:764
+msgid "aclcheck: null ACL, returning OK"
 msgstr ""
 
-#: ../catalog/aclchk.c:536 ../catalog/aclchk.c:598 ../catalog/aclchk.c:649
-#, c-format
-msgid "pg_ownercheck: user \"%s\" is superuser"
+#: catalog/aclchk.c:779
+msgid "aclcheck: zero-length ACL, returning OK"
 msgstr ""
 
-#: ../catalog/aclchk.c:553
-#, c-format
-msgid "pg_ownercheck: class \"%s\" not found"
+#: catalog/aclchk.c:788
+msgid "aclcheck: first entry in ACL is not 'world' entry"
 msgstr ""
 
-#: ../catalog/aclchk.c:559
+#: catalog/aclchk.c:792
 #, c-format
-msgid "pg_ownercheck: type \"%s\" not found"
+msgid "aclcheck: using world=%d"
 msgstr ""
 
-#: ../catalog/aclchk.c:564
+#: catalog/aclchk.c:808
 #, c-format
-msgid "pg_ownercheck: invalid cache id: %d"
+msgid "aclcheck: found user %u/%d"
 msgstr ""
 
-#: ../catalog/aclchk.c:588
+#: catalog/aclchk.c:825 catalog/aclchk.c:846
 #, c-format
-msgid "pg_oper_ownercheck: invalid user id %u"
+msgid "aclcheck: found group %u/%d"
 msgstr ""
 
-#: ../catalog/aclchk.c:612
+#: catalog/aclchk.c:858
 #, c-format
-msgid "pg_ownercheck: operator %u not found"
+msgid "aclcheck: bogus ACL id type: %d"
 msgstr ""
 
-#: ../catalog/aclchk.c:639
+#: catalog/aclchk.c:879 commands/user.c:1299
 #, c-format
-msgid "pg_func_ownercheck: invalid user id %u"
-msgstr ""
+msgid "%s: permission denied"
+msgstr "%s: keine Berechtigung"
 
-#: ../catalog/aclchk.c:691
+#: catalog/aclchk.c:882
 #, c-format
-msgid "pg_aggr_ownercheck: invalid user id %u"
+msgid "%s: must be owner"
 msgstr ""
 
-#: ../catalog/aclchk.c:701
+#: catalog/aclchk.c:885
 #, c-format
-msgid "pg_aggr_ownercheck: user \"%s\" is superuser"
+msgid "%s: unexpected AclResult %d"
 msgstr ""
 
-#: ../catalog/indexing.c:162
+#: catalog/aclchk.c:913
 #, c-format
-msgid "CatalogIndexInsert: index %u not found"
-msgstr "CatalogIndexInsert: Index %u nicht gefunden"
+msgid "pg_class_aclcheck: invalid user id %u"
+msgstr "pg_class_aclcheck: ung�ltige Benutzer-ID %u"
 
-#: ../catalog/index.c:117
+#: catalog/aclchk.c:928
 #, c-format
-msgid "index named \"%s\" already exists"
-msgstr "Index mit Namen �%s� existiert bereits"
+msgid "pg_class_aclcheck: relation %u not found"
+msgstr "pg_class_aclcheck: Relation %u nicht gefunden"
 
-#: ../catalog/index.c:123
-#, c-format
-msgid "cannot create index on non-existent relation \"%s\""
-msgstr "kann keinen Index f�r nicht existierende Relation �%s� erstellen"
+#: catalog/aclchk.c:941
+msgid "pg_class_aclcheck: catalog update: permission denied"
+msgstr ""
 
-#: ../catalog/index.c:153
+#: catalog/aclchk.c:953
 #, c-format
-msgid "Function %u does not exist"
-msgstr "Funktion %u existiert nicht"
+msgid "pg_class_aclcheck: %u is superuser"
+msgstr ""
 
-#: ../catalog/index.c:172 ../catalog/index.c:306
+#: catalog/aclchk.c:1021
 #, c-format
-msgid "Opclass %u does not exist"
-msgstr "Opclass %u existiert nicht"
+msgid "pg_database_aclcheck: database %u not found"
+msgstr ""
 
-#: ../catalog/index.c:186 ../catalog/index.c:319
+#: catalog/aclchk.c:1076
 #, c-format
-msgid "Type %u does not exist"
-msgstr "Typ %u existiert nicht"
+msgid "pg_proc_aclcheck: function %u not found"
+msgstr "pg_proc_aclcheck: Funktion %u nicht gefunden"
 
-#: ../catalog/index.c:266
+#: catalog/aclchk.c:1129
 #, c-format
-msgid "cannot create index: column %d does not exist"
-msgstr "kann Index nicht erstellen: Spalte %d existiert nicht"
-
-#: ../catalog/index.c:679
-msgid "must index at least one column"
-msgstr "mindestens eine Spalte mu� indiziert werden"
+msgid "pg_language_aclcheck: language %u not found"
+msgstr ""
 
-#: ../catalog/index.c:683
-msgid "User-defined indexes on system catalogs are not supported"
+#: catalog/aclchk.c:1186
+#, c-format
+msgid "pg_namespace_aclcheck: namespace %u not found"
 msgstr ""
-"benutzerdefinierte Indizies f�r Systemkataloge werden nicht unterst�tzt"
 
-#: ../catalog/index.c:864 ../catalog/index.c:912
+#: catalog/aclchk.c:1234
 #, c-format
-msgid "index_drop: cache lookup failed for index %u"
-msgstr "index_drop: Cachesuche nach Index %u fehlgeschlagen"
+msgid "pg_class_ownercheck: relation %u not found"
+msgstr "pg_class_ownercheck: Relation %u nicht gefunden"
 
-#: ../catalog/index.c:924
+#: catalog/aclchk.c:1260
 #, c-format
-msgid "index_drop: FlushRelationBuffers returned %d"
-msgstr "index_drop: FlushRelationBuffers ergab %d"
+msgid "pg_type_ownercheck: type %u not found"
+msgstr "pg_type_ownercheck: Typ %u nicht gefunden"
 
-#: ../catalog/index.c:1142
+#: catalog/aclchk.c:1286
 #, c-format
-msgid "LockClassinfoForUpdate couldn't lock relid %u"
-msgstr "LockClassinfoForUpdate: konnte relid %u nicht sperren"
+msgid "pg_oper_ownercheck: operator %u not found"
+msgstr "pg_oper_ownercheck: Operator %u nicht gefunden"
 
-#: ../catalog/index.c:1153
-msgid "The tuple isn't committed"
+#: catalog/aclchk.c:1312
+#, c-format
+msgid "pg_proc_ownercheck: function %u not found"
 msgstr ""
 
-#: ../catalog/index.c:1156
-msgid "The tuple is already deleted"
+#: catalog/aclchk.c:1338
+#, c-format
+msgid "pg_namespace_ownercheck: namespace %u not found"
 msgstr ""
 
-#: ../catalog/index.c:1177
+#: catalog/aclchk.c:1365
 #, c-format
-msgid "IndexesAreActive couldn't lock %u"
-msgstr "IndexesAreActive konnte %u nicht sperren"
+msgid "pg_opclass_ownercheck: operator class %u not found"
+msgstr "pg_opclass_ownercheck: Operatorklasse %u nicht gefunden"
 
-#: ../catalog/index.c:1180
+#: catalog/dependency.c:162
 #, c-format
-msgid "relation %u isn't an indexable relation"
-msgstr "Relation %u ist nicht indizierbar"
+msgid ""
+"Cannot drop %s because other objects depend on it\n"
+"\tUse DROP ... CASCADE to drop the dependent objects too"
+msgstr ""
 
-#: ../catalog/index.c:1252
+#: catalog/dependency.c:252 catalog/dependency.c:571
 #, c-format
-msgid "setRelhasindex: cannot find relation %u in pg_class"
-msgstr "setRelhasindex: kann Relation %u nicht in pg_class finden"
-
-#: ../catalog/index.c:1325
-msgid "setNewRelfilenode impossible to lock class tuple"
+msgid "Cannot drop %s because it is required by the database system"
 msgstr ""
 
-#: ../catalog/index.c:1455
+#: catalog/dependency.c:256
 #, c-format
-msgid "UpdateStats: cannot find relation %u in pg_class"
-msgstr "UpdateStats: kann Relation %u nicht in pg_class finden"
-
-#: ../catalog/index.c:1726
-msgid "IndexBuildHeapScan: concurrent insert in progress"
+msgid "findAutoDeletableObjects: unknown dependency type '%c' for %s"
 msgstr ""
 
-#: ../catalog/index.c:1740
-msgid "IndexBuildHeapScan: concurrent delete in progress"
+#: catalog/dependency.c:385
+#, c-format
+msgid ""
+"Cannot drop %s because %s requires it\n"
+"\tYou may drop %s instead"
 msgstr ""
 
-#: ../catalog/index.c:1745 ../commands/vacuum.c:1133
-#: ../commands/vacuumlazy.c:356 ../commands/vacuumlazy.c:835
-msgid "Unexpected HeapTupleSatisfiesVacuum result"
-msgstr "unerwartetes Ergebnis von HeapTupleSatisfiesVacuum"
-
-#: ../catalog/index.c:1832
+#: catalog/dependency.c:411
 #, c-format
-msgid "IndexGetRelation: can't find index id %u"
-msgstr "IndexGetRelation: kann Index %u nicht finden"
-
-#: ../catalog/index.c:1881
-msgid "REINDEX cannot run inside a transaction block"
-msgstr "REINDEX kann nicht in einem Transaktionsblock laufen"
-
-#: ../catalog/index.c:1895
-msgid "reindex_index: can't open index relation"
+msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
 msgstr ""
 
-#: ../catalog/index.c:1907
+#: catalog/dependency.c:423
 #, c-format
-msgid "reindex_index: index %u not found in pg_index"
-msgstr "reindex_index: Index %u nicht in pg_index gefunden"
-
-#: ../catalog/index.c:1921
-msgid "reindex_index: can't open heap relation"
+msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
 msgstr ""
 
-#: ../catalog/index.c:2045
+#: catalog/dependency.c:427 catalog/dependency.c:575
 #, c-format
-msgid "the target relation %u is nailed"
+msgid "recursiveDeletion: unknown dependency type '%c' for %s"
 msgstr ""
 
-#: ../catalog/index.c:2061
+#: catalog/dependency.c:453 catalog/dependency.c:531 catalog/dependency.c:557
 #, c-format
-msgid "the target relation %u is shared"
+msgid "Drop auto-cascades to %s"
 msgstr ""
 
-#: ../catalog/pg_aggregate.c:75
-msgid "no aggregate name supplied"
-msgstr "kein Name f�r Aggregatfunktion angegeben"
-
-#: ../catalog/pg_aggregate.c:78
-msgid "aggregate must have a transition function"
-msgstr "Aggregatfunktion mu� eine �bergangsfunktion haben"
-
-#: ../catalog/pg_aggregate.c:91
+#: catalog/dependency.c:457 catalog/dependency.c:535
 #, c-format
-msgid "data type %s does not exist"
-msgstr "Datentyp %s existiert nicht"
+msgid "%s depends on %s"
+msgstr ""
 
-#: ../catalog/pg_aggregate.c:102
+#: catalog/dependency.c:463 catalog/dependency.c:541
 #, c-format
-msgid "aggregate function \"%s\" with base type %s already exists"
-msgstr "Aggregatfunktion �%s� mit Basistyp %s existiert bereits"
+msgid "Drop cascades to %s"
+msgstr ""
 
-#: ../catalog/pg_aggregate.c:110
+#: catalog/dependency.c:692
 #, c-format
-msgid "data type %s does not exit"
-msgstr "Datentyp %s existiert nicht"
+msgid "doDeletion: Unsupported object class %u"
+msgstr ""
 
-#: ../catalog/pg_aggregate.c:133
+#: catalog/dependency.c:775
 #, c-format
-msgid "return type of transition function %s is not %s"
-msgstr "R�ckgabetyp der �bergangsfunktion %s ist nicht %s"
-
-#: ../catalog/pg_aggregate.c:146
-msgid ""
-"must not omit initval when transfn is strict and transtype is not compatible "
-"with input type"
+msgid "find_expr_references_walker: bogus varlevelsup %d"
 msgstr ""
-"Der Anfangswert darf nicht ausgelassen werden wenn die �bergangsfunktion "
-"strikt ist und der �bergangstyp nicht mit dem Eingabetyp kompatibel ist"
 
-#: ../catalog/pg_aggregate.c:203
-msgid "AggregateCreate: heap_formtuple failed"
-msgstr "AggregateCreate: heap_formtuple fehlgeschlagen"
-
-#: ../catalog/pg_aggregate.c:205
-msgid "AggregateCreate: heap_insert failed"
-msgstr "AggregateCreate: heap_insert fehlgeschlagen"
-
-#: ../catalog/pg_aggregate.c:238
+#: catalog/dependency.c:779
 #, c-format
-msgid "AggNameGetInitVal: cache lookup failed for aggregate '%s'"
+msgid "find_expr_references_walker: bogus varno %d"
 msgstr ""
-"AggNameGetInitVal: Cachesuche nach Aggregatfunktion �%s� fehlgeschlagen"
 
-#: ../catalog/pg_aggregate.c:263
+#: catalog/dependency.c:794
 #, c-format
-msgid ""
-"AggNameGetInitVal: cache lookup failed on aggregate transition function "
-"return type %u"
+msgid "find_expr_references_walker: bogus varattno %d"
 msgstr ""
-"AggNameGetInitVal: Cachesuche fehlgeschlagen f�r R�ckgabetyp %u der "
-"�bergangsfunktion"
 
-#: ../catalog/pg_operator.c:229
-#, c-format
-msgid "left type \"%s\" of operator %s does not exist"
-msgstr "linker Typ �%s� des Operators %s existiert nicht"
+#: catalog/dependency.c:833
+msgid "find_expr_references_walker: already-planned subqueries not supported"
+msgstr ""
 
-#: ../catalog/pg_operator.c:238
+#: catalog/dependency.c:1169
 #, c-format
-msgid "right type \"%s\" of operator %s does not exist"
-msgstr "rechter Typ �%s� des Operators %s existiert nicht"
+msgid "getObjectClass: Unknown object class %u"
+msgstr ""
 
-#: ../catalog/pg_operator.c:244
+#: catalog/dependency.c:1226
 #, c-format
-msgid "operator %s must have at least one operand type"
-msgstr "Operator %s mu� mindestens einen Operandentyp haben"
+msgid "getObjectDescription: Cast %u does not exist"
+msgstr "getObjectDescription: Cast %u existiert nicht"
 
-#: ../catalog/pg_operator.c:299 ../catalog/pg_operator.c:517
+#: catalog/dependency.c:1260
 #, c-format
-msgid "\"%s\" is not a valid operator name"
-msgstr ""
+msgid "getObjectDescription: Constraint %u does not exist"
+msgstr "getObjectDescription: Constraint %u existiert nicht"
 
-#: ../catalog/pg_operator.c:312
-msgid "OperatorShellMake: the operand types are not valid"
-msgstr "OperatorShellMake: die Operandentypen sind ung�ltig"
-
-#: ../catalog/pg_operator.c:505
+#: catalog/dependency.c:1290
 #, c-format
-msgid "OperatorDef: operator \"%s\" already defined"
-msgstr "OperatorDef: Operator %s ist bereits definiert"
+msgid "getObjectDescription: Conversion %u does not exist"
+msgstr "getObjectDescription: Umwandlung %u existiert nicht"
 
-#: ../catalog/pg_operator.c:529
+#: catalog/dependency.c:1319
 #, c-format
-msgid "left type \"%s\" does not exist"
-msgstr "linker Typ �%s� existiert bereits"
+msgid "getObjectDescription: Default %u does not exist"
+msgstr "getObjectDescription: Default %u existiert nicht"
 
-#: ../catalog/pg_operator.c:538
+#: catalog/dependency.c:1344
 #, c-format
-msgid "right type \"%s\" does not exist"
-msgstr "rechter Typ �%s� existiert bereits"
-
-#: ../catalog/pg_operator.c:544
-msgid "operator must have at least one operand type"
-msgstr "Operator mu� mindestens einen Operandentyp haben"
+msgid "getObjectDescription: Language %u does not exist"
+msgstr "getObjectDescription: Sprache %u existiert nicht"
 
-#: ../catalog/pg_operator.c:739
+#: catalog/dependency.c:1369
 #, c-format
-msgid "OperatorDef: can't create operator shell \"%s\""
-msgstr "OperatorDef: kann Operatorh�lle %s nicht erstellen"
-
-#: ../catalog/pg_operator.c:751
-msgid "operator cannot be its own negator or sort operator"
-msgstr "Operator kann nicht sein eigener Negator oder Sortierungsoperator sein"
+msgid "cache lookup of opclass %u failed"
+msgstr "Cachesuche nach Operatorklasse %u fehlgeschlagen"
 
-#: ../catalog/pg_operator.c:806
+#: catalog/dependency.c:1387 utils/adt/ruleutils.c:425
 #, c-format
-msgid "OperatorDef: operator %u not found"
-msgstr "OperatorDef: Operator %u nicht gefunden"
-
-#: ../catalog/pg_operator.c:1057
-msgid "at least one of leftarg or rightarg must be specified"
-msgstr "entweder leftarg oder rightarg (oder beides) mu� angegeben werden"
-
-#: ../catalog/pg_operator.c:1063
-msgid "only binary operators can have commutators"
-msgstr "nur bin�re Operatoren k�nnen Kommutatoren haben"
+msgid "syscache lookup for AM %u failed"
+msgstr "Syscache-Suche nach AM %u fehlgeschlagen"
 
-#: ../catalog/pg_operator.c:1065
-msgid "only binary operators can have join selectivity"
-msgstr "nur bin�re Operatoren k�nnen Join-Selectivity haben"
+#: catalog/dependency.c:1419
+#, c-format
+msgid "getObjectDescription: Rule %u does not exist"
+msgstr "getObjectDescription: Regel %u existiert nicht"
 
-#: ../catalog/pg_operator.c:1067
-msgid "only binary operators can hash"
-msgstr "nur bin�re Operatoren k�nnen eine Hash-Funktion haben"
+#: catalog/dependency.c:1453
+#, c-format
+msgid "getObjectDescription: Trigger %u does not exist"
+msgstr "getObjectDescription: Trigger %u existiert nicht"
 
-#: ../catalog/pg_operator.c:1069
-msgid "only binary operators can have sort links"
-msgstr "nur bin�re Operatoren k�nnen Sortierverbindungen haben"
+#: catalog/dependency.c:1473
+#, c-format
+msgid "getObjectDescription: Schema %u does not exist"
+msgstr "getObjectDescription: Schema %u existiert nicht"
 
-#: ../catalog/pg_proc.c:89
+#: catalog/dependency.c:1505 catalog/heap.c:1635 catalog/pg_constraint.c:445
+#: utils/adt/ruleutils.c:3120
 #, c-format
-msgid "language '%s' does not exist"
-msgstr "Sprache �%s� existiert nicht"
+msgid "cache lookup of relation %u failed"
+msgstr "Cachesuche nach Relation %u fehlgeschlagen"
 
-#: ../catalog/pg_proc.c:99 ../commands/comment.c:636 ../commands/remove.c:298
+#: catalog/heap.c:155 catalog/heap.c:158
 #, c-format
-msgid "functions cannot have more than %d arguments"
-msgstr "Funktionen k�nnen nicht mehr als %d Argumente haben"
+msgid "SystemAttributeDefinition: invalid attribute number %d"
+msgstr "SystemAttributeDefinition: ung�ltige Attributnummer %d"
 
-#: ../catalog/pg_proc.c:105
-msgid "SQL functions cannot have arguments of type \"opaque\""
-msgstr "SQL-Funktionen k�nnen keine Argument vom Typ �opaque� haben"
+#: catalog/heap.c:225
+#, c-format
+msgid ""
+"cannot create %s.%s: system catalog modifications are currently disallowed"
+msgstr ""
 
-#: ../catalog/pg_proc.c:113
+#: catalog/heap.c:362
 #, c-format
-msgid "argument type %s does not exist"
-msgstr "Argumenttyp %s existiert nicht"
+msgid "name of column \"%s\" conflicts with an existing system column"
+msgstr ""
+"Name der Spalte �%s� steht im Konflikt mit einer bestehenden Systemspalte"
 
-#: ../catalog/pg_proc.c:116
+#: catalog/heap.c:376
 #, c-format
-msgid "argument type %s is only a shell"
-msgstr "Argumenttyp %s ist nur eine H�lle"
+msgid "column name \"%s\" is duplicated"
+msgstr "Spaltenname �%s� besteht mehrfach"
 
-#: ../catalog/pg_proc.c:121
-msgid "functions cannot accept set arguments"
-msgstr "Funktionen k�nnen keine SET Argumente haben"
+#: catalog/heap.c:398
+#, c-format
+msgid ""
+"Attribute \"%s\" has an unknown type\n"
+"\tProceeding with relation creation anyway"
+msgstr ""
 
-#: ../catalog/pg_proc.c:159
-msgid "lookup for procedure by source needs fix (Jan)"
-msgstr "Suche nach Prozedur mit Quelltext mu� erst noch repariert werden (Jan)"
+#: catalog/heap.c:402
+#, c-format
+msgid "Attribute \"%s\" has pseudo-type %s"
+msgstr ""
 
-#: ../catalog/pg_proc.c:167
-msgid "SQL functions cannot return type \"opaque\""
-msgstr "SQL-Funktionen k�nnen keinen R�ckgabetyp �opaque� haben"
+#: catalog/heap.c:410
+#, c-format
+msgid "Attribute \"%s\" has composite type %s"
+msgstr ""
 
-#: ../catalog/pg_proc.c:176
+#: catalog/heap.c:691
 #, c-format
-msgid "ProcedureCreate: type %s is not yet defined"
-msgstr "ProcedureCreate: Typ %s ist noch nicht definiert"
+msgid "Number of columns is out of range (1 to %d)"
+msgstr "Anzahl der Spalten ist au�erhalb des zul�ssigen Bereichs (1 bis %d)"
 
-#: ../catalog/pg_proc.c:180
+#: catalog/heap.c:697
 #, c-format
-msgid "could not create type %s"
-msgstr "konnte Typ %s nicht erstellen"
+msgid "Relation '%s' already exists"
+msgstr "Relation �%s� existiert bereits"
 
-#: ../catalog/pg_proc.c:184
+#: catalog/heap.c:848
 #, c-format
-msgid "return type %s is only a shell"
-msgstr "R�ckgabetyp %s ist nur eine H�lle"
+msgid "DeleteRelationTuple: cache lookup failed for relation %u"
+msgstr "DeleteRelationTuple: Cachesuche nach Relation %u fehlgeschlagen"
 
-#: ../catalog/pg_proc.c:197
+#: catalog/heap.c:927
 #, c-format
-msgid "method %s already an attribute of type %s"
-msgstr "Methode %s ist schon ein Attribut von Typ %s"
+msgid "RemoveAttributeById: Failed to find attribute %d in relation %u"
+msgstr "RemoveAttributeById: Cachesuche nach Attribut %d von Relation %u fehlgeschlagen"
 
-#: ../catalog/pg_proc.c:232
+#: catalog/heap.c:1006
 #, c-format
-msgid "there is no built-in function named \"%s\""
-msgstr "Es gibt keine eingebaute Funktion namens %s"
+msgid "RemoveAttrDefault: no default found for rel %u attnum %d"
+msgstr ""
 
-#: ../catalog/pg_proc.c:308
+#: catalog/heap.c:1042
 #, c-format
-msgid "function %s already exists with same argument types"
-msgstr "Funktion %s existiert bereits mit den selben Argumenttypen"
+msgid "RemoveAttrDefaultById: cache lookup failed for attrdef %u"
+msgstr "RemoveAttrDefaultById: Cachesuche nach Attrdef %u fehlgeschlagen"
 
-#: ../catalog/pg_proc.c:311
+#: catalog/heap.c:1065
 #, c-format
-msgid "ProcedureCreate: you do not have permission to replace function %s"
+msgid "RemoveAttrDefaultById: cache lookup failed for rel %u attr %d"
 msgstr ""
 
-#: ../catalog/pg_proc.c:320
-msgid ""
-"ProcedureCreate: cannot change return type of existing function.\n"
-"\tUse DROP FUNCTION first."
-msgstr ""
+#: catalog/heap.c:1120
+#, c-format
+msgid "heap_drop_with_catalog: FlushRelationBuffers returned %d"
+msgstr "heap_drop_with_catalog: FlushRelationBuffers ergab %d"
 
-#: ../catalog/pg_proc.c:381
+#: catalog/heap.c:1236 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3277
 #, c-format
-msgid "function declared to return %s, but no SELECT provided"
-msgstr "Funktion mit R�ckgabetyp %s deklariert, aber enth�lt kein SELECT"
+msgid "cache lookup of attribute %d in relation %u failed"
+msgstr "Cachesuche nach Attribut %d von Relation %u fehlgeschlagen"
 
-#: ../catalog/pg_proc.c:399
-msgid "function declared with no return type, but final statement is a SELECT"
-msgstr "Funktion ohne R�ckgabetyp deklariert, aber letzte Anweisung ist SELECT"
+#: catalog/heap.c:1493 commands/tablecmds.c:2620 commands/tablecmds.c:2656
+#, c-format
+msgid "constraint \"%s\" already exists for relation \"%s\""
+msgstr "Constraint �%s� existiert bereits in Tabelle �%s�"
 
-#: ../catalog/pg_proc.c:405
+#: catalog/heap.c:1507 commands/tablecmds.c:184
+#, c-format
+msgid "Duplicate CHECK constraint name: '%s'"
+msgstr "doppelter CHECK-Constraint-Name: %s"
+
+#: catalog/heap.c:1566
+#, c-format
+msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
+msgstr ""
+"Nur Referenzen auf Tabelle �%s� sind im CHECK-Constraint-Ausdruck zugelassen"
+
+#: catalog/heap.c:1573 commands/tablecmds.c:2737
+msgid "cannot use subselect in CHECK constraint expression"
+msgstr ""
+"Subselects k�nnen nicht in CHECK-Constraint-Ausdr�cken verwendet werden"
+
+#: catalog/heap.c:1575 commands/tablecmds.c:2739
+msgid "cannot use aggregate function in CHECK constraint expression"
+msgstr ""
+"Aggregatfunktionen k�nnen nicht in CHECK-Constraint-Ausdr�cken verwendet "
+"werden"
+
+#: catalog/heap.c:1690
+msgid "cannot use column references in DEFAULT clause"
+msgstr "Spaltenreferenzen k�nnen nicht in DEFAULT-Klausel verwendet werden"
+
+#: catalog/heap.c:1696
+msgid "DEFAULT clause must not return a set"
+msgstr ""
+
+#: catalog/heap.c:1702
+msgid "cannot use subselects in DEFAULT clause"
+msgstr "Subselects k�nnen nicht in DEFAULT-Klausel verwendet werden"
+
+#: catalog/heap.c:1704
+msgid "cannot use aggregate functions in DEFAULT clause"
+msgstr "Aggregatfunktionen k�nnen nicht in DEFAULT-Klausel verwendet werden"
+
+#: catalog/heap.c:1725 rewrite/rewriteHandler.c:485
+#, c-format
+msgid ""
+"Column \"%s\" is of type %s but default expression is of type %s\n"
+"\tYou will need to rewrite or cast the expression"
+msgstr ""
+"Spalte �%s� hat Typ %s, aber der Default-Ausdruck hat Typ %s\n"
+"\tSie m�ssen den Ausdruck umschreiben oder ein Typumwandlung vornehmen"
+
+#: catalog/index.c:125
+#, c-format
+msgid "Function %u does not exist"
+msgstr "Funktion %u existiert nicht"
+
+#: catalog/index.c:144 catalog/index.c:281
+#, c-format
+msgid "Opclass %u does not exist"
+msgstr "Opclass %u existiert nicht"
+
+#: catalog/index.c:158 catalog/index.c:294
+#, c-format
+msgid "Type %u does not exist"
+msgstr "Typ %u existiert nicht"
+
+#: catalog/index.c:239
+#, c-format
+msgid "cannot create index: column %d does not exist"
+msgstr "kann Index nicht erstellen: Spalte %d existiert nicht"
+
+#: catalog/index.c:544
+msgid "must index at least one column"
+msgstr "mindestens eine Spalte mu� indiziert werden"
+
+#: catalog/index.c:549
+msgid "User-defined indexes on system catalogs are not supported"
+msgstr ""
+"benutzerdefinierte Indizies f�r Systemkataloge werden nicht unterst�tzt"
+
+#: catalog/index.c:559
+msgid "Shared indexes cannot be created after initdb"
+msgstr ""
+
+#: catalog/index.c:562
+#, c-format
+msgid "relation named \"%s\" already exists"
+msgstr "Relation mit Namen �%s� existiert bereits"
+
+#: catalog/index.c:675
+msgid "index_create: constraint must be PRIMARY or UNIQUE"
+msgstr ""
+
+#: catalog/index.c:825
+#, c-format
+msgid "index_drop: cache lookup failed for index %u"
+msgstr "index_drop: Cachesuche nach Index %u fehlgeschlagen"
+
+#: catalog/index.c:838
+#, c-format
+msgid "index_drop: FlushRelationBuffers returned %d"
+msgstr "index_drop: FlushRelationBuffers ergab %d"
+
+#: catalog/index.c:1036
+#, c-format
+msgid "relation %s isn't an indexable relation"
+msgstr "Relation %s ist nicht indizierbar"
+
+#: catalog/index.c:1107
+#, c-format
+msgid "setRelhasindex: cannot find relation %u in pg_class"
+msgstr "setRelhasindex: kann Relation %u nicht in pg_class finden"
+
+#: catalog/index.c:1223
+#, c-format
+msgid "setNewRelfilenode: cannot find relation %u in pg_class"
+msgstr "setNewRelfilenode: kann Relation %u nicht in pg_class finden"
+
+#: catalog/index.c:1335
+#, c-format
+msgid "UpdateStats: cannot find relation %u in pg_class"
+msgstr "UpdateStats: kann Relation %u nicht in pg_class finden"
+
+#: catalog/index.c:1599
+msgid "IndexBuildHeapScan: concurrent insert in progress"
+msgstr ""
+
+#: catalog/index.c:1614
+msgid "IndexBuildHeapScan: concurrent delete in progress"
+msgstr ""
+
+#: catalog/index.c:1619 commands/vacuum.c:1207 commands/vacuumlazy.c:360
+#: commands/vacuumlazy.c:847
+msgid "Unexpected HeapTupleSatisfiesVacuum result"
+msgstr "unerwartetes Ergebnis von HeapTupleSatisfiesVacuum"
+
+#: catalog/index.c:1706
+#, c-format
+msgid "IndexGetRelation: can't find index id %u"
+msgstr "IndexGetRelation: kann Index %u nicht finden"
+
+#: catalog/index.c:1755
+msgid "reindex_index: can't open index relation"
+msgstr ""
+
+#: catalog/index.c:1766
+msgid "reindex_index: can't open heap relation"
+msgstr ""
+
+#: catalog/index.c:1780 catalog/index.c:1903
+#, c-format
+msgid "the target relation %u is shared"
+msgstr ""
+
+#: catalog/index.c:1786
+#, c-format
+msgid "the target relation %u is nailed"
+msgstr ""
+
+#: catalog/namespace.c:168 catalog/namespace.c:215 catalog/namespace.c:1072
+#: parser/parse_expr.c:826 parser/parse_target.c:147
+msgid "Cross-database references are not implemented"
+msgstr ""
+
+#: catalog/namespace.c:186
+#, c-format
+msgid "Relation \"%s\".\"%s\" does not exist"
+msgstr "Relation �%s.%s� existiert nicht"
+
+#: catalog/namespace.c:222
+msgid "TEMP tables may not specify a namespace"
+msgstr ""
+
+#: catalog/namespace.c:236 catalog/namespace.c:1101 catalog/namespace.c:1136
+#: catalog/namespace.c:1721
+#, c-format
+msgid "Namespace \"%s\" does not exist"
+msgstr "Namespace �%s� existiert nicht"
+
+#: catalog/namespace.c:246 catalog/namespace.c:1146
+msgid "No namespace has been selected to create in"
+msgstr ""
+
+#: catalog/namespace.c:298
+#, c-format
+msgid "Cache lookup failed for relation %u"
+msgstr "Cachesuche nach Relation %u fehlgeschlagen"
+
+#: catalog/namespace.c:380
+#, c-format
+msgid "Cache lookup failed for type %u"
+msgstr ""
+
+#: catalog/namespace.c:581
+#, c-format
+msgid "Cache lookup failed for procedure %u"
+msgstr ""
+
+#: catalog/namespace.c:793
+#, c-format
+msgid "Cache lookup failed for operator %u"
+msgstr "Cachesuche nach Operator %u fehlgeschlagen"
+
+#: catalog/namespace.c:1006
+#, c-format
+msgid "Cache lookup failed for opclass %u"
+msgstr "Cachesuche nach Operatorklasse %u fehlgeschlagen"
+
+#: catalog/namespace.c:1075 gram.y:2270 gram.y:6772
+#, c-format
+msgid "Improper qualified name (too many dotted names): %s"
+msgstr ""
+
+#: catalog/namespace.c:1179
+msgid "Improper relation name (too many dotted names)"
+msgstr ""
+
+#: catalog/namespace.c:1391
+msgid "recomputeNamespacePath: invalid list syntax"
+msgstr ""
+
+#: catalog/namespace.c:1520
+#, c-format
+msgid "%s: not authorized to create temp tables"
+msgstr ""
+
+#: catalog/pg_aggregate.c:62
+msgid "no aggregate name supplied"
+msgstr "kein Name f�r Aggregatfunktion angegeben"
+
+#: catalog/pg_aggregate.c:65
+msgid "aggregate must have a transition function"
+msgstr "Aggregatfunktion mu� eine �bergangsfunktion haben"
+
+#: catalog/pg_aggregate.c:87
+#, c-format
+msgid "return type of transition function %s is not %s"
+msgstr "R�ckgabetyp der �bergangsfunktion %s ist nicht %s"
+
+#: catalog/pg_aggregate.c:99
+msgid ""
+"must not omit initval when transfn is strict and transtype is not compatible "
+"with input type"
+msgstr ""
+"Der Anfangswert darf nicht ausgelassen werden wenn die �bergangsfunktion "
+"strikt ist und der �bergangstyp nicht mit dem Eingabetyp kompatibel ist"
+
+#: catalog/pg_constraint.c:413
+#, c-format
+msgid "RemoveConstraintById: constraint %u not found"
+msgstr "RemoveConstraintById: Constraint %u nicht gefunden"
+
+#: catalog/pg_constraint.c:450
+#, c-format
+msgid "RemoveConstraintById: relation %s has relchecks = 0"
+msgstr ""
+
+#: catalog/pg_conversion.c:57
+msgid "no conversion name supplied"
+msgstr "kein Name f�r Umwandlung angegeben"
+
+#: catalog/pg_conversion.c:64
+#, c-format
+msgid "conversion name \"%s\" already exists"
+msgstr "Umwandlung mit Namen �%s� existiert bereits"
+
+#: catalog/pg_conversion.c:75
+#, c-format
+msgid "default conversion for %s to %s already exists"
+msgstr "Standardumwandlung von %s nach %s existiert bereits"
+
+#: catalog/pg_conversion.c:141 catalog/pg_conversion.c:308
+#, c-format
+msgid "Conversion %u search from syscache failed"
+msgstr ""
+
+#: catalog/pg_conversion.c:192
+#, c-format
+msgid "conversion %u does not exist"
+msgstr "Umwandlung %u existiert nicht"
+
+#: catalog/pg_conversion.c:302 commands/conversioncmds.c:97
+#, c-format
+msgid "conversion %s not found"
+msgstr "Umwandlung %s nicht gefunden"
+
+#: catalog/pg_largeobject.c:108
+#, c-format
+msgid "LargeObjectDrop: large object %u not found"
+msgstr "LargeObjectDrop: Large Object %u nicht gefunden"
+
+#: catalog/pg_namespace.c:43
+msgid "no namespace name supplied"
+msgstr "kein Namespace-Namen angegeben"
+
+#: catalog/pg_namespace.c:49
+#, c-format
+msgid "namespace \"%s\" already exists"
+msgstr "Namespace �%s� existiert bereits"
+
+#: catalog/pg_operator.c:215 catalog/pg_operator.c:401
+#, c-format
+msgid "\"%s\" is not a valid operator name"
+msgstr ""
+
+#: catalog/pg_operator.c:404
+msgid "at least one of leftarg or rightarg must be specified"
+msgstr "entweder leftarg oder rightarg (oder beides) mu� angegeben werden"
+
+#: catalog/pg_operator.c:410
+msgid "only binary operators can have commutators"
+msgstr "nur bin�re Operatoren k�nnen Kommutatoren haben"
+
+#: catalog/pg_operator.c:412
+msgid "only binary operators can have join selectivity"
+msgstr "nur bin�re Operatoren k�nnen Join-Selectivity haben"
+
+#: catalog/pg_operator.c:414
+msgid "only binary operators can hash"
+msgstr "nur bin�re Operatoren k�nnen eine Hash-Funktion haben"
+
+#: catalog/pg_operator.c:416
+msgid "only binary operators can mergejoin"
+msgstr "nur bin�re Operatoren k�nnen mergejoinen"
+
+#: catalog/pg_operator.c:426
+#, c-format
+msgid "OperatorDef: operator \"%s\" already defined"
+msgstr "OperatorDef: Operator %s ist bereits definiert"
+
+#: catalog/pg_operator.c:623
+#, c-format
+msgid "OperatorDef: operator %u not found"
+msgstr "OperatorDef: Operator %u nicht gefunden"
+
+#: catalog/pg_operator.c:711
+msgid "operator cannot be its own negator or sort operator"
+msgstr "Operator kann nicht sein eigener Negator oder Sortierungsoperator sein"
+
+#: catalog/pg_operator.c:728
+#, c-format
+msgid "OperatorDef: can't create operator shell \"%s\""
+msgstr "OperatorDef: kann Operatorh�lle %s nicht erstellen"
+
+#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1400
+#, c-format
+msgid "functions cannot have more than %d arguments"
+msgstr "Funktionen k�nnen nicht mehr als %d Argumente haben"
+
+#: catalog/pg_proc.c:127
+msgid "lookup for procedure by source needs fix (Jan)"
+msgstr "Suche nach Prozedur mit Quelltext mu� erst noch repariert werden (Jan)"
+
+#: catalog/pg_proc.c:139
+#, c-format
+msgid "method %s already an attribute of type %s"
+msgstr "Methode %s ist schon ein Attribut von Typ %s"
+
+#: catalog/pg_proc.c:189
+#, c-format
+msgid "function %s already exists with same argument types"
+msgstr "Funktion %s existiert bereits mit den selben Argumenttypen"
+
+#: catalog/pg_proc.c:192
+#, c-format
+msgid "ProcedureCreate: you do not have permission to replace function %s"
+msgstr ""
+
+#: catalog/pg_proc.c:201
+msgid ""
+"ProcedureCreate: cannot change return type of existing function.\n"
+"\tUse DROP FUNCTION first."
+msgstr ""
+
+#: catalog/pg_proc.c:208
+#, c-format
+msgid "function %s is an aggregate"
+msgstr "Funktion %s ist eine Aggregatfunktion"
+
+#: catalog/pg_proc.c:211
+#, c-format
+msgid "function %s is not an aggregate"
+msgstr "Funktion %s ist keine Aggregatfunktion"
+
+#: catalog/pg_proc.c:323
+#, c-format
+msgid "function declared to return %s, but no SELECT provided"
+msgstr "Funktion mit R�ckgabetyp %s deklariert, aber enth�lt kein SELECT"
+
+#: catalog/pg_proc.c:341
+msgid "function declared to return void, but final statement is a SELECT"
+msgstr "Funktion mit R�ckgabetyp void deklariert, aber letzte Anweisung ist ein SELECT"
+
+#: catalog/pg_proc.c:347
 #, c-format
 msgid "function declared to return %s, but final statement is not a SELECT"
 msgstr ""
-"Funktion mit R�ckgabetyp %s deklariert, aber letzte Anweisung ist kein SELECT"
+"Funktion mit R�ckgabetyp %s deklariert, aber letzte Anweisung ist kein SELECT"
+
+#: catalog/pg_proc.c:368
+#, c-format
+msgid "function declared to return %s returns multiple columns in final SELECT"
+msgstr ""
+"Funktion ist mit R�ckgabetyp %s deklariert, aber letztes SELECT ergibt mehr "
+"als eine Spalte"
+
+#: catalog/pg_proc.c:373
+#, c-format
+msgid "return type mismatch in function: declared to return %s, returns %s"
+msgstr ""
+"R�ckgabetyp stimmt nicht �berein: deklariert als %s, aber tats�chlich %s"
+
+#: catalog/pg_proc.c:421 catalog/pg_proc.c:447
+#, c-format
+msgid ""
+"function declared to return %s does not SELECT the right number of columns (%"
+"d)"
+msgstr ""
+"Funktion deklariert mit R�ckgabetyp %s, aber die Abfrage ergibt nicht die "
+"richtige Anzahl Spalten (%d)"
+
+#: catalog/pg_proc.c:430
+#, c-format
+msgid "function declared to return %s returns %s instead of %s at column %d"
+msgstr ""
+"Funktion mit deklariertem R�ckgabetyp %s ergibt %s statt %s in Spalte %d"
+
+#: catalog/pg_proc.c:486 catalog/pg_proc.c:525 catalog/pg_proc.c:568
+#: commands/functioncmds.c:739 utils/adt/ruleutils.c:3162
+#, c-format
+msgid "cache lookup of function %u failed"
+msgstr "Cachesuche nach Funktion %u fehlgeschlagen"
+
+#: catalog/pg_proc.c:491 catalog/pg_proc.c:530 catalog/pg_proc.c:590
+msgid "null prosrc"
+msgstr ""
+
+#: catalog/pg_proc.c:495
+#, c-format
+msgid "there is no built-in function named \"%s\""
+msgstr "Es gibt keine eingebaute Funktion namens %s"
+
+#: catalog/pg_proc.c:535
+msgid "null probin"
+msgstr ""
+
+#: catalog/pg_proc.c:578
+#, c-format
+msgid "SQL functions cannot return type %s"
+msgstr "SQL-Funktionen k�nnen keinen R�ckgabetyp �%s� haben"
+
+#: catalog/pg_proc.c:584
+#, c-format
+msgid "SQL functions cannot have arguments of type %s"
+msgstr "SQL-Funktionen k�nnen keine Argumente vom Typ �%s� haben"
+
+#: catalog/pg_type.c:171 catalog/pg_type.c:175
+#, c-format
+msgid "TypeCreate: invalid type internal size %d"
+msgstr ""
+
+#: catalog/pg_type.c:180
+msgid "TypeCreate: fixed size types must have storage PLAIN"
+msgstr ""
+
+#: catalog/pg_type.c:257
+#, c-format
+msgid "type %s already exists"
+msgstr "Typ %s existiert bereits"
+
+#: catalog/pg_type.c:399
+#, c-format
+msgid "type %s does not exist"
+msgstr "Typ %s existiert bereits"
+
+#: catalog/pg_type.c:405
+#, c-format
+msgid "type named %s already exists"
+msgstr "Typ namens %s existiert bereits"
+
+#: commands/functioncmds.c:81
+#, c-format
+msgid "SQL function cannot return shell type \"%s\""
+msgstr "SQL-Funktionen k�nnen keinen H�llen-R�ckgabetyp �%s� haben"
+
+#: commands/functioncmds.c:84
+#, c-format
+msgid "Return type \"%s\" is only a shell"
+msgstr "R�ckgabetyp %s ist nur eine H�lle"
+
+#: commands/functioncmds.c:103 commands/functioncmds.c:159
+#: commands/typecmds.c:322 commands/typecmds.c:329 commands/typecmds.c:647
+#: parser/parse_func.c:1410 parser/parse_oper.c:98 parser/parse_oper.c:107
+#: parser/parse_type.c:191 parser/parse_type.c:213 parser/parse_type.c:219
+#, c-format
+msgid "Type \"%s\" does not exist"
+msgstr "Typ %s existiert nicht"
+
+#: commands/functioncmds.c:106
+#, c-format
+msgid "ProcedureCreate: type %s is not yet defined"
+msgstr "ProcedureCreate: Typ %s ist noch nicht definiert"
+
+#: commands/functioncmds.c:116
+#, c-format
+msgid "could not create type %s"
+msgstr "konnte Typ %s nicht erstellen"
+
+#: commands/functioncmds.c:150
+#, c-format
+msgid "SQL function cannot accept shell type \"%s\""
+msgstr "SQL-Funktionen k�nnen keinen H�llen-R�ckgabetyp �%s� haben"
+
+#: commands/functioncmds.c:153
+#, c-format
+msgid "Argument type \"%s\" is only a shell"
+msgstr "Argumenttyp %s ist nur eine H�lle"
+
+#: commands/functioncmds.c:164
+msgid "Functions cannot accept set arguments"
+msgstr "Funktionen k�nnen keine SET Argumente haben"
+
+#: commands/functioncmds.c:200 commands/functioncmds.c:206
+#: commands/functioncmds.c:212 commands/functioncmds.c:218
+#: commands/functioncmds.c:224
+msgid "conflicting or redundant options"
+msgstr ""
+
+#: commands/functioncmds.c:228
+msgid "invalid CREATE FUNCTION option"
+msgstr ""
+
+#: commands/functioncmds.c:234
+msgid "no function body specified"
+msgstr "kein Funktionsk�rper angegeben"
+
+#: commands/functioncmds.c:239
+msgid "no language specified"
+msgstr ""
+
+#: commands/functioncmds.c:250
+msgid "invalid volatility"
+msgstr ""
+
+#: commands/functioncmds.c:297
+#, c-format
+msgid "Unrecognized function attribute '%s' ignored"
+msgstr ""
+
+#: commands/functioncmds.c:339
+#, c-format
+msgid "CREATE FUNCTION: only one AS item needed for %s language"
+msgstr ""
+
+#: commands/functioncmds.c:399 utils/adt/acl.c:1443
+#, c-format
+msgid "language \"%s\" does not exist"
+msgstr "Sprache �%s� existiert nicht"
+
+#: commands/functioncmds.c:505
+#, c-format
+msgid "RemoveFunction: couldn't find tuple for function %s"
+msgstr ""
+
+#: commands/functioncmds.c:515
+#, c-format
+msgid ""
+"RemoveFunction: function '%s' is an aggregate\n"
+"\tUse DROP AGGREGATE to remove it"
+msgstr ""
+
+#: commands/functioncmds.c:522
+#, c-format
+msgid "Removing built-in function \"%s\""
+msgstr "eingebaute Funktion �%s� wird entfernt"
+
+#: commands/functioncmds.c:560
+#, c-format
+msgid "RemoveFunctionById: couldn't find tuple for function %u"
+msgstr ""
+
+#: commands/functioncmds.c:582
+#, c-format
+msgid "RemoveFunctionById: couldn't find pg_aggregate tuple for %u"
+msgstr ""
+
+#: commands/functioncmds.c:614
+#, c-format
+msgid "SetFunctionReturnType: couldn't find tuple for function %u"
+msgstr ""
+
+#: commands/functioncmds.c:619
+#, c-format
+msgid "SetFunctionReturnType: function %u doesn't return OPAQUE"
+msgstr ""
+
+#: commands/functioncmds.c:652
+#, c-format
+msgid "SetFunctionArgType: couldn't find tuple for function %u"
+msgstr ""
+
+#: commands/functioncmds.c:658
+#, c-format
+msgid "SetFunctionArgType: function %u doesn't take OPAQUE"
+msgstr ""
+
+#: commands/functioncmds.c:693 commands/functioncmds.c:884
+#, c-format
+msgid "source data type %s does not exist"
+msgstr "Quelldatentyp %s existiert nicht"
+
+#: commands/functioncmds.c:698 commands/functioncmds.c:889
+#, c-format
+msgid "target data type %s does not exist"
+msgstr "Zieldatentyp %s existiert nicht"
+
+#: commands/functioncmds.c:702
+msgid "source data type and target data type are the same"
+msgstr "Quelldatentyp und Zieldatentyp sind der selbe"
+
+#: commands/functioncmds.c:706
+#, c-format
+msgid "source data type %s is only a shell"
+msgstr "Quelldatentyp %s ist nur eine H�lle"
+
+#: commands/functioncmds.c:710
+#, c-format
+msgid "target data type %s is only a shell"
+msgstr "Zieldatentyp %s ist nur eine H�lle"
+
+#: commands/functioncmds.c:714
+#, c-format
+msgid "source data type %s is a pseudo-type"
+msgstr ""
+
+#: commands/functioncmds.c:718
+#, c-format
+msgid "target data type %s is a pseudo-type"
+msgstr "Zieldatentyp %s ist ein Pseudotyp"
+
+#: commands/functioncmds.c:723 commands/functioncmds.c:904
+#, c-format
+msgid "must be owner of type %s or type %s"
+msgstr ""
+
+#: commands/functioncmds.c:743
+msgid "cast function must take 1 argument"
+msgstr ""
+
+#: commands/functioncmds.c:745
+msgid "argument of cast function must match source data type"
+msgstr ""
+
+#: commands/functioncmds.c:747
+msgid "return data type of cast function must match target data type"
+msgstr ""
+
+#: commands/functioncmds.c:749
+msgid "cast function must not be volatile"
+msgstr ""
+
+#: commands/functioncmds.c:751
+msgid "cast function must not be an aggregate function"
+msgstr ""
+
+#: commands/functioncmds.c:753
+msgid "cast function must not return a set"
+msgstr ""
+
+#: commands/functioncmds.c:774
+msgid "Must be superuser to create a cast WITHOUT FUNCTION"
+msgstr ""
+
+#: commands/functioncmds.c:787
+msgid "source and target datatypes are not physically compatible"
+msgstr ""
+
+#: commands/functioncmds.c:803
+#, c-format
+msgid "CreateCast: bogus CoercionContext %c"
+msgstr ""
+
+#: commands/functioncmds.c:820
+#, c-format
+msgid "cast from data type %s to data type %s already exists"
+msgstr ""
+
+#: commands/functioncmds.c:897
+#, c-format
+msgid "cast from type %s to type %s does not exist"
+msgstr ""
+
+#: commands/functioncmds.c:940
+#, c-format
+msgid "could not find tuple for cast %u"
+msgstr ""
+
+#: commands/aggregatecmds.c:93
+#, c-format
+msgid "DefineAggregate: attribute \"%s\" not recognized"
+msgstr ""
+
+#: commands/aggregatecmds.c:101
+msgid "Define: \"basetype\" unspecified"
+msgstr "Define: �basetype� nicht angegeben"
+
+#: commands/aggregatecmds.c:103
+msgid "Define: \"stype\" unspecified"
+msgstr "Define: �stype� nicht angegeben"
+
+#: commands/aggregatecmds.c:105
+msgid "Define: \"sfunc\" unspecified"
+msgstr "Define: �sfunc� nicht angegeben"
+
+#: commands/aggregatecmds.c:123
+#, c-format
+msgid "Aggregate transition datatype cannot be %s"
+msgstr ""
+
+#: commands/aggregatecmds.c:174
+#, c-format
+msgid "RemoveAggregate: couldn't find pg_proc tuple for %s"
+msgstr ""
+
+#: commands/analyze.c:199
+#, c-format
+msgid "Skipping \"%s\" --- only table or database owner can ANALYZE it"
+msgstr ""
+
+#: commands/analyze.c:213 commands/vacuum.c:784
+#, c-format
+msgid ""
+"Skipping \"%s\" --- can not process indexes, views or special system tables"
+msgstr ""
+
+#: commands/analyze.c:242
+#, c-format
+msgid "Analyzing %s.%s"
+msgstr ""
+
+#: commands/analyze.c:435 utils/adt/ruleutils.c:2496
+#, c-format
+msgid "cache lookup of type %u failed"
+msgstr ""
+
+#: commands/analyze.c:645
+#, c-format
+msgid "acquire_sample_rows: ReadBuffer(%s,%u) failed"
+msgstr ""
+
+#: commands/async.c:153
+#, c-format
+msgid "Async_Notify: %s"
+msgstr ""
+
+#: commands/async.c:201
+#, c-format
+msgid "Async_Listen: %s"
+msgstr ""
+
+#: commands/async.c:224
+#, c-format
+msgid "Async_Listen: We are already listening on %s"
+msgstr ""
+
+#: commands/async.c:296
+#, c-format
+msgid "Async_Unlisten %s"
+msgstr ""
+
+#: commands/async.c:354
+msgid "Async_UnlistenAll"
+msgstr ""
+
+#: commands/async.c:456
+msgid "AtCommit_Notify"
+msgstr ""
+
+#: commands/async.c:488
+msgid "AtCommit_Notify: notifying self"
+msgstr ""
+
+#: commands/async.c:495
+#, c-format
+msgid "AtCommit_Notify: notifying pid %d"
+msgstr ""
+
+#: commands/async.c:544
+msgid "AtCommit_Notify: done"
+msgstr ""
+
+#: commands/async.c:621
+msgid "Async_NotifyHandler: perform async notify"
+msgstr ""
+
+#: commands/async.c:626
+msgid "Async_NotifyHandler: done"
+msgstr ""
+
+#: commands/async.c:693
+msgid "EnableNotifyInterrupt: perform async notify"
+msgstr ""
+
+#: commands/async.c:698
+msgid "EnableNotifyInterrupt: done"
+msgstr ""
+
+#: commands/async.c:749
+msgid "ProcessIncomingNotify"
+msgstr ""
+
+#: commands/async.c:785
+#, c-format
+msgid "ProcessIncomingNotify: received %s from %d"
+msgstr ""
+
+#: commands/async.c:820
+msgid "ProcessIncomingNotify: done"
+msgstr ""
+
+#: commands/async.c:847
+#, c-format
+msgid "NOTIFY for %s"
+msgstr ""
+
+#: commands/cluster.c:99
+#, c-format
+msgid "CLUSTER: cannot find index \"%s\" for table \"%s\""
+msgstr "CLUSTER: kann Index �%s� f�r Tabelle �%s� nicht finden"
+
+#: commands/cluster.c:109
+#, c-format
+msgid "CLUSTER: \"%s\" is not an index for table \"%s\""
+msgstr "CLUSTER: �%s� ist kein Index f�r Tabelle �%s�"
+
+#: commands/cluster.c:121
+#, c-format
+msgid "CLUSTER: cannot cluster system relation \"%s\""
+msgstr ""
+
+#: commands/cluster.c:300 commands/cluster.c:318
+#, c-format
+msgid "Cache lookup failed for index %u"
+msgstr "Cachesuche nach Index %u fehlgeschlagen"
+
+#: commands/cluster.c:385
+#, c-format
+msgid "cache lookup failed for index %u"
+msgstr "Cachesuche nach Index %u fehlgeschlagen"
+
+#: commands/cluster.c:437 commands/cluster.c:444
+#, c-format
+msgid "CLUSTER: Cannot find tuple for relation %u"
+msgstr ""
+
+#: commands/cluster.c:456 commands/cluster.c:462
+#, c-format
+msgid "CLUSTER: FlushRelationBuffers returned %d"
+msgstr "CLUSTER: FlushRelationBuffers ergab %d"
+
+#: commands/cluster.c:524
+msgid "CLUSTER: expected both swapped tables to have TOAST tables"
+msgstr ""
+
+#: commands/cluster.c:530 commands/cluster.c:535
+#, c-format
+msgid "CLUSTER: expected one dependency record for TOAST table, found %ld"
+msgstr ""
+
+#: commands/comment.c:111
+#, c-format
+msgid "An attempt was made to comment on a unknown type: %d"
+msgstr ""
+
+#: commands/comment.c:306
+#, c-format
+msgid "relation \"%s\" is not an index"
+msgstr "Relation �%s� ist kein Index"
+
+#: commands/comment.c:311
+#, c-format
+msgid "relation \"%s\" is not a sequence"
+msgstr "Relation �%s� ist keine Sequenz"
+
+#: commands/comment.c:316
+#, c-format
+msgid "relation \"%s\" is not a table"
+msgstr "Relation �%s� ist keine Tabelle"
+
+#: commands/comment.c:321
+#, c-format
+msgid "relation \"%s\" is not a view"
+msgstr "Relation �%s� ist keine Sicht"
+
+#: commands/comment.c:357
+msgid "CommentAttribute: must specify relation.attribute"
+msgstr ""
+
+#: commands/comment.c:374 commands/tablecmds.c:1940 commands/tablecmds.c:2074
+#: commands/tablecmds.c:2192 commands/tablecmds.c:2409
+#: optimizer/prep/prepunion.c:804 parser/parse_func.c:1183
+#: parser/parse_relation.c:1551 parser/parse_relation.c:1614
+#: parser/parse_relation.c:1770 parser/parse_type.c:88
+#, c-format
+msgid "Relation \"%s\" has no column \"%s\""
+msgstr "Relation �%s� hat keine Spalte �%s�"
+
+#: commands/comment.c:403
+msgid "CommentDatabase: database name may not be qualified"
+msgstr ""
+
+#: commands/comment.c:409 commands/dbcommands.c:531 utils/adt/acl.c:1039
+#, c-format
+msgid "database \"%s\" does not exist"
+msgstr "Datenbank �%s� existiert nicht"
+
+#: commands/comment.c:414
+#, c-format
+msgid "you are not permitted to comment on database \"%s\""
+msgstr ""
+
+#: commands/comment.c:419
+msgid "Database comments may only be applied to the current database"
+msgstr ""
+
+#: commands/comment.c:442
+msgid "CommentSchema: schema name may not be qualified"
+msgstr ""
+
+#: commands/comment.c:449
+#, c-format
+msgid "CommentSchema: Schema \"%s\" could not be found"
+msgstr ""
+
+#: commands/comment.c:521 commands/comment.c:555
+#, c-format
+msgid "rule \"%s\" does not exist"
+msgstr "Regel �%s� existiert nicht"
+
+#: commands/comment.c:527
+#, c-format
+msgid ""
+"There are multiple rules \"%s\"\n"
+"\tPlease specify a relation name as well as a rule name"
+msgstr ""
+
+#: commands/comment.c:732
+msgid "CommentTrigger: must specify relation and trigger"
+msgstr ""
+
+#: commands/comment.c:765
+#, c-format
+msgid "trigger \"%s\" for relation \"%s\" does not exist"
+msgstr ""
+
+#: commands/comment.c:807
+msgid "CommentConstraint: must specify relation and constraint"
+msgstr ""
+
+#: commands/comment.c:841
+#, c-format
+msgid "Relation \"%s\" has multiple constraints named \"%s\""
+msgstr ""
+
+#: commands/comment.c:851
+#, c-format
+msgid "constraint \"%s\" for relation \"%s\" does not exist"
+msgstr ""
+
+#: commands/conversioncmds.c:58
+#, c-format
+msgid "Invalid for encoding name: %s"
+msgstr ""
+
+#: commands/conversioncmds.c:62
+#, c-format
+msgid "Invalid to encoding name: %s"
+msgstr "ung�ltiger Kodierungsname: %s"
+
+#: commands/copy.c:126
+#, c-format
+msgid "CopySendData: %m"
+msgstr ""
+
+#: commands/copy.c:301
+msgid "COPY: BINARY option appears more than once"
+msgstr ""
+
+#: commands/copy.c:308
+msgid "COPY: OIDS option appears more than once"
+msgstr ""
+
+#: commands/copy.c:315
+msgid "COPY: DELIMITER string may only be defined once in query"
+msgstr ""
+
+#: commands/copy.c:322
+msgid "COPY: NULL representation may only be defined once in query"
+msgstr ""
+
+#: commands/copy.c:327
+#, c-format
+msgid "COPY: option \"%s\" not recognized"
+msgstr ""
+
+#: commands/copy.c:332
+msgid "You can not specify the DELIMITER in BINARY mode."
+msgstr ""
+
+#: commands/copy.c:335
+msgid "You can not specify NULL in BINARY mode."
+msgstr ""
+
+#: commands/copy.c:355
+msgid ""
+"You must have Postgres superuser privilege to do a COPY directly to or from "
+"a file.  Anyone can COPY to stdout or from stdin.  Psql's \\copy command "
+"also works for anyone."
+msgstr ""
+
+#: commands/copy.c:364
+msgid "COPY BINARY is not supported to stdout or from stdin"
+msgstr ""
+
+#: commands/copy.c:370
+msgid "COPY delimiter must be a single character"
+msgstr ""
+
+#: commands/copy.c:376
+#, c-format
+msgid "COPY: table \"%s\" does not have OIDs"
+msgstr "COPY: Tabelle %s hat keine OIDs"
+
+#: commands/copy.c:397 commands/copy.c:442
+#, c-format
+msgid "You cannot copy view %s"
+msgstr ""
+
+#: commands/copy.c:400
+#, c-format
+msgid "You cannot change sequence relation %s"
+msgstr ""
+
+#: commands/copy.c:403 commands/copy.c:448
+#, c-format
+msgid "You cannot copy object %s"
+msgstr ""
+
+#: commands/copy.c:423
+#, c-format
+msgid ""
+"COPY command, running in backend with effective uid %d, could not open file "
+"'%s' for reading.  Errno = %s (%d)."
+msgstr ""
+
+#: commands/copy.c:432 commands/copy.c:488
+#, c-format
+msgid "COPY: %s is a directory"
+msgstr ""
+
+#: commands/copy.c:445
+#, c-format
+msgid "You cannot copy sequence %s"
+msgstr ""
+
+#: commands/copy.c:472
+msgid "Relative path not allowed for server side COPY command"
+msgstr ""
+
+#: commands/copy.c:480
+#, c-format
+msgid ""
+"COPY command, running in backend with effective uid %d, could not open file "
+"'%s' for writing.  Errno = %s (%d)."
+msgstr ""
+
+#: commands/copy.c:557
+#, c-format
+msgid "COPY: couldn't lookup info for type %u"
+msgstr ""
+
+#: commands/copy.c:561 commands/copy.c:827
+msgid "COPY BINARY: cstring not supported"
+msgstr ""
+
+#: commands/copy.c:894
+msgid "COPY BINARY: file signature not recognized"
+msgstr ""
+
+#: commands/copy.c:898
+msgid "COPY BINARY: incompatible integer layout"
+msgstr ""
+
+#: commands/copy.c:902
+msgid "COPY BINARY: bogus file header (missing flags)"
+msgstr ""
+
+#: commands/copy.c:906
+msgid "COPY BINARY: unrecognized critical flags in header"
+msgstr ""
+
+#: commands/copy.c:910
+msgid "COPY BINARY: bogus file header (missing length)"
+msgstr ""
+
+#: commands/copy.c:916
+msgid "COPY BINARY: bogus file header (wrong length)"
+msgstr ""
+
+#: commands/copy.c:965
+msgid "NULL Oid"
+msgstr ""
 
-#: ../catalog/pg_proc.c:422
+#: commands/copy.c:971
+msgid "Invalid Oid"
+msgstr ""
+
+#: commands/copy.c:988
 #, c-format
-msgid "function declared to return %s returns multiple columns in final SELECT"
+msgid "Missing data for column \"%s\""
+msgstr ""
+
+#: commands/copy.c:1020
+msgid "Extra data after last expected column"
 msgstr ""
-"Funktion ist mit R�ckgabetyp %s deklariert, aber letztes SELECT ergibt mehr "
-"als eine Spalte"
 
-#: ../catalog/pg_proc.c:427
+#: commands/copy.c:1044
 #, c-format
-msgid "return type mismatch in function: declared to return %s, returns %s"
+msgid "COPY BINARY: tuple field count is %d, expected %d"
+msgstr ""
+
+#: commands/copy.c:1051 commands/copy.c:1057 commands/copy.c:1072
+#: commands/copy.c:1086 commands/copy.c:1095 commands/copy.c:1107
+#: commands/copy.c:1122
+msgid "COPY BINARY: unexpected EOF"
 msgstr ""
-"R�ckgabetyp stimmt nicht �berein: deklariert als %s, aber tats�chlich %s"
 
-#: ../catalog/pg_proc.c:458 ../catalog/pg_proc.c:484
+#: commands/copy.c:1053
 #, c-format
-msgid ""
-"function declared to return %s does not SELECT the right number of columns (%"
-"d)"
+msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
+msgstr ""
+
+#: commands/copy.c:1059
+msgid "COPY BINARY: Invalid Oid"
 msgstr ""
-"Funktion deklariert mit R�ckgabetyp %s, aber die Abfrage ergibt nicht die "
-"richtige Anzahl Spalten (%d)"
 
-#: ../catalog/pg_proc.c:474
+#: commands/copy.c:1076
 #, c-format
-msgid "function declared to return %s returns %s instead of %s at column %d"
+msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
+msgstr ""
+
+#: commands/copy.c:1088
+msgid "COPY BINARY: bogus varlena length"
 msgstr ""
-"Funktion mit deklariertem R�ckgabetyp %s ergibt %s statt %s in Spalte %d"
 
-#: ../catalog/pg_type.c:307 ../catalog/pg_type.c:538
+#: commands/copy.c:1264
 #, c-format
-msgid "type named %s already exists"
-msgstr "Typ namens %s existiert bereits"
+msgid "GetInputFunction: Cache lookup of type %u failed"
+msgstr ""
 
-#: ../catalog/pg_type.c:317 ../catalog/pg_type.c:533
+#: commands/copy.c:1280
 #, c-format
-msgid "type %s does not exist"
-msgstr "Typ %s existiert bereits"
+msgid "GetTypeElement: Cache lookup of type %u failed"
+msgstr ""
 
-#: ../catalog/pg_type.c:325
+#: commands/copy.c:1422
+msgid "CopyReadAttribute: end of record marker corrupted"
+msgstr ""
+
+#: commands/copy.c:1582
 #, c-format
-msgid "TypeCreate: invalid type internal size %d"
+msgid "Attribute \"%s\" specified more than once"
 msgstr ""
 
-#: ../catalog/pg_type.c:328
+#: commands/dbcommands.c:99 commands/dbcommands.c:105
+#: commands/dbcommands.c:111 commands/dbcommands.c:117
+msgid "CREATE DATABASE: conflicting options"
+msgstr ""
+
+#: commands/dbcommands.c:121
 #, c-format
-msgid "TypeCreate: invalid type external size %d"
+msgid "CREATE DATABASE: option \"%s\" not recognized"
 msgstr ""
 
-#: ../catalog/pg_type.c:332
-msgid "TypeCreate: fixed size types must have storage PLAIN"
+#: commands/dbcommands.c:141
+#, c-format
+msgid "%d is not a valid encoding code"
 msgstr ""
 
-#: ../catalog/pg_type.c:467
+#: commands/dbcommands.c:147
 #, c-format
-msgid "type %s already exists"
-msgstr "Typ %s existiert bereits"
+msgid "%s is not a valid encoding name"
+msgstr ""
+
+#: commands/dbcommands.c:151
+msgid "CREATE DATABASE: bogus encoding parameter"
+msgstr ""
+
+#: commands/dbcommands.c:164 commands/dbcommands.c:171
+msgid "CREATE DATABASE: permission denied"
+msgstr "CREATE DATABASE: keine Berechtigung"
 
-#: ../catalog/pg_largeobject.c:128
+#: commands/dbcommands.c:186 commands/dbcommands.c:326
 #, c-format
-msgid "LargeObjectDrop: large object %u not found"
-msgstr "LargeObjectDrop: Large Object %u nicht gefunden"
+msgid "CREATE DATABASE: database \"%s\" already exists"
+msgstr "CREATE DATABASE: Datenbank �%s� existiert bereits"
 
-#: ../catalog/heap.c:160 ../catalog/heap.c:163
+#: commands/dbcommands.c:198
 #, c-format
-msgid "SystemAttributeDefinition: invalid attribute number %d"
-msgstr "SystemAttributeDefinition: ung�ltige Attributnummer %d"
+msgid "CREATE DATABASE: template \"%s\" does not exist"
+msgstr "CREATE DATABASE: Schablone �%s� existiert nicht"
+
+#: commands/dbcommands.c:208
+#, c-format
+msgid "CREATE DATABASE: permission to copy \"%s\" denied"
+msgstr "CREATE DATABASE: keine Berechtigung um �%s� zu kopieren"
 
-#: ../catalog/heap.c:234
+#: commands/dbcommands.c:227
 #, c-format
 msgid ""
-"invalid relation name \"%s\"; the 'pg_' name prefix is reserved for system "
-"catalogs"
+"CREATE DATABASE: source database \"%s\" is being accessed by other users"
+msgstr ""
+"CREATE DATABASE: auf Quelldatenbank �%s� wird gerade von anderen Benutzern "
+"zugegriffen"
+
+#: commands/dbcommands.c:235
+msgid "CREATE DATABASE: invalid backend encoding"
 msgstr ""
-"ung�ltiger Relationsname �%s�; der Pr�fix �pg_� ist f�r die Systemkataloge "
-"reserviert"
 
-#: ../catalog/heap.c:380
+#: commands/dbcommands.c:263 commands/dbcommands.c:265
+#: commands/dbcommands.c:267
+msgid "database path may not contain single quotes"
+msgstr ""
+
+#: commands/dbcommands.c:290
 #, c-format
-msgid "name of column \"%s\" conflicts with an existing system column"
+msgid "CREATE DATABASE: unable to create database directory '%s': %m"
+msgstr "CREATE DATABASE: konnte Datenbankverzeichnis �%s� nicht erstellen: %m"
+
+#: commands/dbcommands.c:293
+#, c-format
+msgid "CREATE DATABASE: unable to remove temp directory '%s': %m"
 msgstr ""
-"Name der Spalte �%s� steht im Konflikt mit einer bestehenden Systemspalte"
 
-#: ../catalog/heap.c:383
+#: commands/dbcommands.c:300
 #, c-format
+msgid "CREATE DATABASE: could not link '%s' to '%s': %m"
+msgstr ""
+
+#: commands/dbcommands.c:310
+msgid "CREATE DATABASE: could not initialize database directory"
+msgstr "CREATE DATABASE: konnte Datenbankverzeichnis nicht initialisieren"
+
+#: commands/dbcommands.c:312
 msgid ""
-"Attribute '%s' has an unknown type\n"
-"\tProceeding with relation creation anyway"
+"CREATE DATABASE: could not initialize database directory; delete failed as "
+"well"
+msgstr ""
+"CREATE DATABASE: konnte Datenbankverzeichnis nicht initialisieren; L�schen "
+"schlug auch fehl"
+
+#: commands/dbcommands.c:402
+msgid "DROP DATABASE: cannot be executed on the currently open database"
 msgstr ""
+"DROP DATABASE: kann nicht auf aktuell ge�ffnete Datenbank verwendet werden"
 
-#: ../catalog/heap.c:397
+#: commands/dbcommands.c:419
 #, c-format
-msgid "column name \"%s\" is duplicated"
-msgstr "Spaltenname �%s� besteht mehrfach"
+msgid "DROP DATABASE: database \"%s\" does not exist"
+msgstr "DROP DATABASE: Datenbank �%s� existiert nicht"
 
-#: ../catalog/heap.c:734
+#: commands/dbcommands.c:422
+msgid "DROP DATABASE: permission denied"
+msgstr "DROP DATABASE: keine Berechtigung"
+
+#: commands/dbcommands.c:430
+msgid "DROP DATABASE: database is marked as a template"
+msgstr "DROP DATABASE: Datenbank ist als Schablone gekennzeichnet"
+
+#: commands/dbcommands.c:439
 #, c-format
-msgid "Number of columns is out of range (1 to %d)"
-msgstr "Anzahl der Spalten ist au�erhalb des zul�ssigen Bereichs (1 bis %d)"
+msgid "DROP DATABASE: database \"%s\" is being accessed by other users"
+msgstr ""
+"DROP DATABASE: auf Datenbank �%s� wird von anderen Benutzern zugegriffen"
 
-#: ../catalog/heap.c:742
+#: commands/dbcommands.c:456
 #, c-format
-msgid "Relation '%s' already exists"
-msgstr "Relation �%s� existiert bereits"
+msgid ""
+"DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the "
+"contrary"
+msgstr ""
+"DROP DATABASE: Datenbank �%s� existiert nicht, trotz fr�herer gegenteiliger "
+"Meldungen"
+
+#: commands/dbcommands.c:697
+msgid "Relative paths are not allowed as database locations"
+msgstr ""
+
+#: commands/dbcommands.c:699
+msgid "Absolute paths are not allowed as database locations"
+msgstr ""
 
-#: ../catalog/heap.c:877
+#: commands/dbcommands.c:709
 #, c-format
-msgid "Relation \"%s\" inherits from \"%s\""
-msgstr "Relation �%s� ist von �%s� abgeleitet"
+msgid "Postmaster environment variable '%s' not set"
+msgstr ""
 
-#: ../catalog/heap.c:880
+#: commands/dbcommands.c:711
 #, c-format
-msgid "Relation %u inherits from \"%s\""
-msgstr "Relation %u ist von �%s� abgeleitet"
+msgid "Postmaster environment variable '%s' must be absolute path"
+msgstr ""
 
-#: ../catalog/heap.c:1076
-msgid "TRUNCATE TABLE cannot run inside a transaction block"
-msgstr "TRUNCATE TABLE kann nicht in einem Transaktionsblock laufen"
+#: commands/dbcommands.c:717
+msgid "Alternate path is too long"
+msgstr ""
 
-#: ../catalog/heap.c:1186
+#: commands/dbcommands.c:746
 #, c-format
-msgid "DeleteTypeTuple: type \"%s\" does not exist"
-msgstr "DeleteTypeTuple: Typ �%s� existiert nicht"
+msgid "could not remove '%s': %m"
+msgstr "konnte �%s� nicht l�schen: %m"
 
-#: ../catalog/heap.c:1226
+#: commands/dbcommands.c:755
 #, c-format
-msgid "DeleteTypeTuple: column of type %s exists in relation %u"
-msgstr "DeleteTypeTuple: Spalte des Typs %s existiert in Relation %u"
+msgid "database directory '%s' could not be removed"
+msgstr "Datenbankverzeichnis �%s� konnte nicht entfernt werden"
 
-#: ../catalog/heap.c:1297
+#: commands/dbcommands.c:827 commands/vacuum.c:581
 #, c-format
-msgid "System relation \"%s\" may not be dropped"
-msgstr "Systemrelation �%s� darf nicht entfernt werden"
+msgid "database %u does not exist"
+msgstr ""
 
-#: ../catalog/heap.c:1306
+#: commands/define.c:68 commands/define.c:157 commands/define.c:185
+#: commands/define.c:215
 #, c-format
-msgid "heap_drop_with_catalog: FlushRelationBuffers returned %d"
-msgstr "heap_drop_with_catalog: FlushRelationBuffers ergab %d"
+msgid "Define: \"%s\" requires a parameter"
+msgstr ""
 
-#: ../catalog/heap.c:1448 ../parser/parse_relation.c:923
-#: ../utils/adt/ruleutils.c:2737
+#: commands/define.c:93 commands/define.c:239
 #, c-format
-msgid "cache lookup of attribute %d in relation %u failed"
-msgstr "Cachesuche nach Attribut %d von Relation %u fehlgeschlagen"
+msgid "Define: cannot interpret argument of \"%s\""
+msgstr ""
 
-#: ../catalog/heap.c:1639
-msgid "cannot use column references in DEFAULT clause"
-msgstr "Spaltenreferenzen k�nnen nicht in DEFAULT-Klausel verwendet werden"
+#: commands/define.c:106 commands/define.c:115 commands/define.c:128
+#: commands/define.c:144
+#, c-format
+msgid "Define: \"%s\" requires a numeric value"
+msgstr ""
 
-#: ../catalog/heap.c:1645
-msgid "cannot use subselects in DEFAULT clause"
-msgstr "Subselects k�nnen nicht in DEFAULT-Klausel verwendet werden"
+#: commands/define.c:169
+#, c-format
+msgid "Define: argument of \"%s\" must be a name"
+msgstr ""
 
-#: ../catalog/heap.c:1647
-msgid "cannot use aggregate functions in DEFAULT clause"
-msgstr "Aggregatfunktionen k�nnen nicht in DEFAULT-Klausel verwendet werden"
+#: commands/define.c:201
+#, c-format
+msgid "Define: argument of \"%s\" must be a type name"
+msgstr ""
+
+#: commands/define.c:222
+#, c-format
+msgid "Define: \"%s\" requires an integral value"
+msgstr ""
+
+#: commands/define.c:242
+#, c-format
+msgid "Define: invalid argument for \"%s\": \"%s\""
+msgstr ""
 
-#: ../catalog/heap.c:1669 ../optimizer/prep/preptlist.c:402
+#: commands/explain.c:815
 #, c-format
+msgid "show_sort_keys: no tlist entry for key %d"
+msgstr ""
+
+#: commands/proclang.c:61
 msgid ""
-"Column \"%s\" is of type %s but default expression is of type %s\n"
-"\tYou will need to rewrite or cast the expression"
+"Only users with superuser privilege are permitted to create procedural "
+"languages"
 msgstr ""
-"Spalte �%s� hat Typ %s, aber der Default-Ausdruck hat Typ %s\n"
-"\tSie m�ssen den Ausdruck umschreiben oder ein Typumwandlung vornehmen"
 
-#: ../catalog/heap.c:1719 ../catalog/heap.c:1733 ../commands/creatinh.c:110
+#: commands/proclang.c:73
 #, c-format
-msgid "Duplicate CHECK constraint name: '%s'"
-msgstr "doppelter CHECK-Constraint-Name: %s"
+msgid "Language %s already exists"
+msgstr ""
 
-#: ../catalog/heap.c:1800
+#: commands/proclang.c:82
 #, c-format
-msgid "CHECK constraint expression '%s' does not yield boolean result"
-msgstr "CHECK-Constraint-Ausdruck %s ergibt kein Resultat vom Typ boolean"
+msgid "function %s() doesn't exist"
+msgstr "Funktion %s() existiert nicht"
 
-#: ../catalog/heap.c:1807
+#: commands/proclang.c:94
 #, c-format
-msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
+msgid ""
+"CreateProceduralLanguage: changing return type of function %s() from OPAQUE "
+"to LANGUAGE_HANDLER"
 msgstr ""
-"Nur Referenzen auf Tabelle �%s� sind im CHECK-Constraint-Ausdruck zugelassen"
 
-#: ../catalog/heap.c:1814
-msgid "cannot use subselect in CHECK constraint expression"
+#: commands/proclang.c:99
+#, c-format
+msgid "CreateProceduralLanguage: function %s() must return LANGUAGE_HANDLER"
 msgstr ""
-"Subselects k�nnen nicht in CHECK-Constraint-Ausdr�cken verwendet werden"
 
-#: ../catalog/heap.c:1816
-msgid "cannot use aggregate function in CHECK constraint expression"
+#: commands/proclang.c:109
+#, c-format
+msgid "function %s(oid) doesn't exist"
+msgstr "Funktion %s(oid) existiert nicht"
+
+#: commands/proclang.c:183
+msgid ""
+"Only users with superuser privilege are permitted to drop procedural "
+"languages"
 msgstr ""
-"Aggregatfunktionen k�nnen nicht in CHECK-Constraint-Ausdr�cken verwendet "
-"werden"
 
-#: ../catalog/heap.c:1857 ../catalog/heap.c:2044 ../utils/adt/ruleutils.c:2713
+#: commands/proclang.c:196
 #, c-format
-msgid "cache lookup of relation %u failed"
-msgstr "Cachesuche nach Relation %u fehlgeschlagen"
+msgid "Language %s doesn't exist"
+msgstr ""
+
+#: commands/proclang.c:225
+#, c-format
+msgid "DropProceduralLanguageById: language %u not found"
+msgstr ""
+
+#: commands/indexcmds.c:92
+msgid "DefineIndex: must specify at least one attribute"
+msgstr ""
+
+#: commands/indexcmds.c:94
+#, c-format
+msgid "Cannot use more than %d attributes in an index"
+msgstr ""
+
+#: commands/indexcmds.c:105
+#, c-format
+msgid "DefineIndex: relation \"%s\" is not a table"
+msgstr "DefineIndex: Relation �%s� ist keine Tabelle"
+
+#: commands/indexcmds.c:114
+msgid "Existing indexes are inactive. REINDEX first"
+msgstr ""
+
+#: commands/indexcmds.c:142
+#, c-format
+msgid "DefineIndex: access method \"%s\" not found"
+msgstr ""
+
+#: commands/indexcmds.c:148
+#, c-format
+msgid "DefineIndex: access method \"%s\" does not support UNIQUE indexes"
+msgstr ""
+
+#: commands/indexcmds.c:151
+#, c-format
+msgid "DefineIndex: access method \"%s\" does not support multi-column indexes"
+msgstr ""
+
+#: commands/indexcmds.c:185
+msgid "Functional index can only have one attribute"
+msgstr ""
 
-#: ../catalog/heap.c:2037
-msgid "check count became negative"
-msgstr "Anzahl der CHECK-Constraints wurde negativ"
+#: commands/indexcmds.c:189
+#, c-format
+msgid "Index function can take at most %d arguments"
+msgstr "Indexfunktion kann h�chstens %d Argumente haben"
+
+#: commands/indexcmds.c:244
+msgid "Partial-index predicates may refer only to the base relation"
+msgstr "Indexpr�dikat kann nur auf die zu indizierende Tabelle Bezug nehmen"
+
+#: commands/indexcmds.c:252
+msgid "Cannot use subselect in index predicate"
+msgstr "Subselects k�nnen nicht im Indexpr�dikat verwendet werden"
+
+#: commands/indexcmds.c:254
+msgid "Cannot use aggregate in index predicate"
+msgstr "Aggregatfunktionen k�nnen nicht im Indexpr�dikat verwendet werden"
 
-#: ../commands/_deadcode/recipe.c:42
-msgid "You must compile with TIOGA defined in order to use recipes\n"
+#: commands/indexcmds.c:261
+msgid "Functions in index predicate must be marked isImmutable"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:179
-msgid "beginRecipe: Currently eyes cannot have more than one input"
+#: commands/indexcmds.c:299 commands/indexcmds.c:389
+#, c-format
+msgid "DefineIndex: attribute \"%s\" not found"
+msgstr "DefineIndex: Attribut �%s� nicht gefunden"
+
+#: commands/indexcmds.c:324
+msgid "DefineIndex: functional index may not use an aggregate function"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:188
-#, c-format
-msgid "beginRecipe: eyes[%d] = %s\n"
+#: commands/indexcmds.c:326
+msgid ""
+"DefineIndex: functional index must use a real function, not a type coercion\n"
+"\tTry specifying the index opclass you want to use, instead"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:240
-#, c-format
-msgid "adding tee plan node to the root of the %s\n"
+#: commands/indexcmds.c:334
+msgid "DefineIndex: cannot index on a function returning a set"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:288
-#, c-format
-msgid "beginRecipe: cursor named %s is now available"
-msgstr ""
+#: commands/indexcmds.c:350
+msgid "DefineIndex: index function must be marked isImmutable"
+msgstr "DefineIndex: Indexfunktion mu� als �isImmutable� markiert werden"
 
-#: ../commands/_deadcode/recipe.c:393
-msgid "tg_rewriteQuery: Whoa! why is my qual a List???"
+#: commands/indexcmds.c:385
+msgid "missing attribute for define index"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:502
+#: commands/indexcmds.c:418
 #, c-format
-msgid "tg_replaceNumberedParam: unexpected paramkind value of %d"
+msgid ""
+"data type %s has no default operator class for access method \"%s\"\n"
+"\tYou must specify an operator class for the index or define a\n"
+"\tdefault operator class for the data type"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:613
+#: commands/indexcmds.c:449 commands/indexcmds.c:457
 #, c-format
 msgid ""
-"tg_rewriteParamsInExpr:can't substitute for parameter %d when that input is "
-"unconnected"
+"DefineIndex: operator class \"%s\" not supported by access method \"%s\""
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:627
+#: commands/indexcmds.c:468
 #, c-format
-msgid "tg_rewriteParamsInExpr: unexpected paramkind value of %d"
-msgstr ""
+msgid "operator class \"%s\" does not accept data type %s"
+msgstr "Operatorklasse �%s� akzeptiert Datentyp %s nicht"
 
-#: ../commands/_deadcode/recipe.c:698
+#: commands/indexcmds.c:522
 #, c-format
-msgid "getParamTypes: Ingredients cannot take > %d arguments"
+msgid "pg_opclass contains multiple default opclasses for data type %s"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:704
-msgid "getParamTypes: Ingredient functions cannot take type 'opaque'"
-msgstr ""
+#: commands/indexcmds.c:544 commands/indexcmds.c:576 commands/indexcmds.c:619
+#, c-format
+msgid "relation \"%s\" is of type \"%c\""
+msgstr "Relation �%s� hat Typ �%c�"
 
-#: ../commands/_deadcode/recipe.c:710
+#: commands/indexcmds.c:573
 #, c-format
-msgid "getParamTypes: arg type '%s' is not defined"
-msgstr ""
+msgid "index \"%s\" does not exist"
+msgstr "Index �%s� existiert nicht"
 
-#: ../commands/_deadcode/recipe.c:712
+#: commands/indexcmds.c:584
 #, c-format
-msgid "getParamTypes: arg type '%s' is only a shell"
+msgid ""
+"\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
+"options"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:837 ../commands/_deadcode/recipe.c:880
+#: commands/indexcmds.c:587
 #, c-format
-msgid "calling parser with %s"
+msgid ""
+"\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
+"options"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:847 ../commands/_deadcode/recipe.c:887
-msgid "tg_parseSubQuery: parser produced > 1 query tree"
-msgstr ""
+#: commands/indexcmds.c:602
+#, c-format
+msgid "index \"%s\" wasn't reindexed"
+msgstr "Index �%s� wurde nicht neu indiziert"
 
-#: ../commands/_deadcode/recipe.c:892
-msgid "tg_parseSubQuery: can't parse recipe graph ingredients yet!"
-msgstr ""
+#: commands/indexcmds.c:634
+#, c-format
+msgid "table \"%s\" wasn't reindexed"
+msgstr "Tabelle �%s� wurde nicht neu indiziert"
 
-#: ../commands/_deadcode/recipe.c:895
-msgid "tg_parseSubQuery: can't parse compiled ingredients yet!"
+#: commands/indexcmds.c:658
+msgid "REINDEX DATABASE: Can be executed only on the currently open database."
 msgstr ""
+"REINDEX DATABASE kann nur auf die aktuelle Datenbank angewendet werden."
 
-#: ../commands/_deadcode/recipe.c:898
-#, c-format
-msgid "tg_parseSubQuery: unknown srcLang: %d"
-msgstr ""
+#: commands/indexcmds.c:661
+msgid "REINDEX DATABASE: Permission denied."
+msgstr "REINDEX DATABASE: keine Berechtigung"
 
-#: ../commands/_deadcode/recipe.c:940
-msgid "tg_parseSubQuery: can't handle eye nodes yet"
+#: commands/indexcmds.c:664
+msgid "must be called under standalone postgres with -O -P options"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:1034
-msgid "tg_parseSubQuery: unexpected result from TupleDescInitEntry"
+#: commands/indexcmds.c:666
+msgid "must be called under standalone postgres with -P -O options"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:1045
-msgid "tg_parseSubQuery: can't handle embedded recipes yet!"
-msgstr ""
+#: commands/indexcmds.c:732
+#, c-format
+msgid "relation %u was reindexed"
+msgstr "Relation %u wurde neu indiziert"
 
-#: ../commands/_deadcode/recipe.c:1047
+#: commands/lockcmds.c:65
 #, c-format
-msgid "unknown nodeType: %d"
-msgstr ""
+msgid "LOCK TABLE: %s is not a table"
+msgstr "LOCK TABLE: %s ist keine Tabelle"
 
-#: ../commands/_deadcode/recipe.c:1158
+#: commands/opclasscmds.c:88
 #, c-format
-msgid "appendTeeQuery: teeNodeName '%s' not found in teeInfo"
+msgid "DefineOpClass: access method \"%s\" not found"
 msgstr ""
 
-#: ../commands/_deadcode/recipe.c:1304
-msgid "replaceTeeScans didn't find the corresponding tee plan"
+#: commands/opclasscmds.c:107
+msgid "Must be superuser to create an operator class"
 msgstr ""
 
-#: ../commands/_deadcode/version.c:185
-msgid "Unable to expand all -- amopenr failed "
+#: commands/opclasscmds.c:149
+#, c-format
+msgid "DefineOpClass: invalid operator number %d, must be between 1 and %d"
 msgstr ""
 
-#: ../commands/async.c:153
+#: commands/opclasscmds.c:153
 #, c-format
-msgid "Async_Notify: %s"
+msgid "DefineOpClass: operator number %d appears more than once"
 msgstr ""
 
-#: ../commands/async.c:201
+#: commands/opclasscmds.c:170
 #, c-format
-msgid "Async_Listen: %s"
+msgid "DefineOpClass: Operator '%s' for types '%s' and '%s' does not exist"
 msgstr ""
 
-#: ../commands/async.c:224
+#: commands/opclasscmds.c:186
 #, c-format
-msgid "Async_Listen: We are already listening on %s"
+msgid "DefineOpClass: invalid procedure number %d, must be between 1 and %d"
 msgstr ""
 
-#: ../commands/async.c:303
+#: commands/opclasscmds.c:190
 #, c-format
-msgid "Async_Unlisten %s"
+msgid "DefineOpClass: procedure number %d appears more than once"
 msgstr ""
 
-#: ../commands/async.c:361
-msgid "Async_UnlistenAll"
+#: commands/opclasscmds.c:203
+msgid "DefineOpClass: storage type specified more than once"
 msgstr ""
 
-#: ../commands/async.c:463
-msgid "AtCommit_Notify"
+#: commands/opclasscmds.c:207
+#, c-format
+msgid "DefineOpClass: bogus item type %d"
 msgstr ""
 
-#: ../commands/async.c:495
-msgid "AtCommit_Notify: notifying self"
+#: commands/opclasscmds.c:229
+#, c-format
+msgid "Storage type may not be different from datatype for access method %s"
 msgstr ""
 
-#: ../commands/async.c:502
+#: commands/opclasscmds.c:245
 #, c-format
-msgid "AtCommit_Notify: notifying pid %d"
+msgid "Operator class \"%s\" already exists for access method \"%s\""
 msgstr ""
 
-#: ../commands/async.c:558
-msgid "AtCommit_Notify: done"
+#: commands/opclasscmds.c:269
+#, c-format
+msgid ""
+"Can't add class \"%s\" as default for type %s\n"
+"\tclass \"%s\" already is the default"
 msgstr ""
 
-#: ../commands/async.c:631
-msgid "Async_NotifyHandler: perform async notify"
+#: commands/opclasscmds.c:477
+#, c-format
+msgid "RemoveOpClass: access method \"%s\" not found"
 msgstr ""
 
-#: ../commands/async.c:636
-msgid "Async_NotifyHandler: done"
+#: commands/opclasscmds.c:504 commands/opclasscmds.c:512
+#, c-format
+msgid ""
+"RemoveOpClass: operator class \"%s\" not supported by access method \"%s\""
 msgstr ""
 
-#: ../commands/async.c:703
-msgid "EnableNotifyInterrupt: perform async notify"
+#: commands/opclasscmds.c:556
+#, c-format
+msgid "RemoveOpClassById: couldn't find pg_class entry %u"
 msgstr ""
 
-#: ../commands/async.c:708
-msgid "EnableNotifyInterrupt: done"
+#: commands/operatorcmds.c:103
+msgid "setof type not implemented for leftarg"
 msgstr ""
 
-#: ../commands/async.c:759
-msgid "ProcessIncomingNotify"
+#: commands/operatorcmds.c:109
+msgid "setof type not implemented for rightarg"
 msgstr ""
 
-#: ../commands/async.c:795
+#: commands/operatorcmds.c:135
 #, c-format
-msgid "ProcessIncomingNotify: received %s from %d"
+msgid "DefineOperator: attribute \"%s\" not recognized"
 msgstr ""
 
-#: ../commands/async.c:837
-msgid "ProcessIncomingNotify: done"
-msgstr ""
+#: commands/operatorcmds.c:144
+msgid "Define: \"procedure\" unspecified"
+msgstr "Define: �procedure� nicht angegeben"
 
-#: ../commands/async.c:864
+#: commands/operatorcmds.c:215
 #, c-format
-msgid "NOTIFY for %s"
+msgid "RemoveOperator: failed to find tuple for operator '%s'"
 msgstr ""
 
-#: ../commands/cluster.c:97
-#, c-format
-msgid "CLUSTER: no pg_index entry for index %u"
-msgstr "CLUSTER: kein pg_index-Eintrag f�r Index %u"
-
-#: ../commands/cluster.c:100
+#: commands/operatorcmds.c:251
 #, c-format
-msgid "CLUSTER: \"%s\" is not an index for table \"%s\""
-msgstr "CLUSTER: �%s� ist kein Index f�r Tabelle �%s�"
+msgid "RemoveOperatorById: failed to find tuple for operator %u"
+msgstr ""
 
-#: ../commands/command.c:113
+#: commands/portalcmds.c:88
 msgid "PerformPortalFetch: missing portal name"
 msgstr "PerformPortalFetch: Portalname fehlt"
 
-#: ../commands/command.c:123
+#: commands/portalcmds.c:98
 #, c-format
 msgid "PerformPortalFetch: portal \"%s\" not found"
 msgstr "PerformPortalFetch: Portal �%s� nicht gefunden"
 
-#: ../commands/command.c:245
+#: commands/portalcmds.c:201
 msgid "PerformPortalClose: missing portal name"
 msgstr "PerformPortalClose: Portalname fehlt"
 
-#: ../commands/command.c:255
+#: commands/portalcmds.c:211
 #, c-format
 msgid "PerformPortalClose: portal \"%s\" not found"
 msgstr "PerformPortalClose: Portal �%s� nicht gefunden"
 
-#: ../commands/command.c:325 ../commands/command.c:548
-#: ../commands/command.c:1054 ../tcop/utility.c:372
-#, c-format
-msgid "ALTER TABLE: relation \"%s\" is a system catalog"
-msgstr "ALTER TABLE: Relation �%s� ist ein Systemkatalog"
-
-#: ../commands/command.c:328 ../commands/command.c:552
-#: ../commands/command.c:721 ../commands/command.c:1058
-#: ../commands/command.c:1195 ../commands/command.c:1677
-#: ../commands/command.c:1750 ../commands/command.c:1828
-msgid "ALTER TABLE: permission denied"
-msgstr "ALTER TABLE: keine Berechtigung"
-
-#: ../commands/command.c:337 ../commands/command.c:558
-#: ../commands/command.c:727 ../commands/command.c:1068
-#: ../commands/command.c:1205 ../commands/command.c:1696
-#: ../commands/command.c:1838
+#: commands/trigger.c:132
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" is not a table"
-msgstr "ALTER TABLE: Relation �%s� ist keine Tabelle"
-
-#: ../commands/command.c:394
-msgid ""
-"Adding columns with defaults is not implemented.\n"
-"\tAdd the column, then use ALTER TABLE SET DEFAULT."
-msgstr ""
-
-#: ../commands/command.c:398
-msgid ""
-"Adding NOT NULL columns is not implemented.\n"
-"\tAdd the column, then use ALTER TABLE ADD CONSTRAINT."
+msgid "Unable to find table for constraint \"%s\""
 msgstr ""
 
-#: ../commands/command.c:409 ../commands/command.c:1088
-#: ../commands/command.c:1766 ../commands/command.c:1852
-#, c-format
-msgid "ALTER TABLE: relation \"%s\" not found"
-msgstr "ALTER TABLE: Relation �%s� nicht gefunden"
-
-#: ../commands/command.c:416
-#, c-format
-msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
-msgstr "ALTER TABLE: Spaltenname �%s� existiert bereits in Tabelle �%s�"
-
-#: ../commands/command.c:422
-#, c-format
-msgid "ALTER TABLE: relations limited to %d columns"
-msgstr "ALTER TABLE: Relationen sind auf %d Spalten beschr�nkt"
-
-#: ../commands/command.c:443
-#, c-format
-msgid "ALTER TABLE: type \"%s\" does not exist"
-msgstr "ALTER TABLE: Typ �%s� existiert nicht"
-
-#: ../commands/command.c:606 ../commands/command.c:780
+#: commands/trigger.c:137
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
-msgstr "ALTER TABLE: Relation �%s� hat keine Spalte �%s�"
+msgid "CreateTrigger: relation \"%s\" is not a table"
+msgstr "CreateTrigger: Relation �%s� ist keine Tabelle"
 
-#: ../commands/command.c:784
+#: commands/trigger.c:141
 #, c-format
-msgid "ALTER TABLE: cannot change system attribute \"%s\""
-msgstr "ALTER TABLE: Systemattribut �%s� kann nicht ge�ndert werden"
-
-#: ../commands/command.c:966
-msgid "target column is used in a constraint"
-msgstr "Zielspalte wird in einem Constraint verwendet"
-
-#: ../commands/command.c:1001
-msgid "target column is used in an index"
-msgstr "Zielspalte wird in einem Index verwendet"
-
-#: ../commands/command.c:1045
-msgid "ALTER TABLE / DROP COLUMN with inherit option is not supported yet"
+msgid "CreateTrigger: can't create trigger for system relation %s"
 msgstr ""
 
-#: ../commands/command.c:1078
-msgid "ALTER TABLE: cannot drop a column on table that is inherited from"
+#: commands/trigger.c:199
+msgid "CreateTrigger: STATEMENT triggers are unimplemented, yet"
 msgstr ""
 
-#: ../commands/command.c:1099 ../commands/command.c:1863
-msgid "couldn't lock pg_class tuple"
-msgstr "konnte pg_class-Reihe nicht sperren"
-
-#: ../commands/command.c:1114
-#, c-format
-msgid "ALTER TABLE: column name \"%s\" doesn't exist in table \"%s\""
-msgstr "ALTER TABLE: Spaltenname �%s� existiert nicht in Tabelle �%s�"
-
-#: ../commands/command.c:1120
-#, c-format
-msgid "ALTER TABLE: column name \"%s\" was already dropped"
-msgstr "ALTER TABLE: Spalte �%s� wurde bereits entfernt"
-
-#: ../commands/command.c:1129
-msgid "the column is referenced"
+#: commands/trigger.c:207
+msgid "CreateTrigger: double INSERT event specified"
 msgstr ""
 
-#: ../commands/command.c:1176
-msgid "ALTER TABLE / DROP COLUMN is not implemented"
-msgstr "ALTER TABLE / DROP COLUMN ist nicht implementiert"
-
-#: ../commands/command.c:1291
-#, c-format
-msgid "CHECK '%s' does not yield boolean result"
-msgstr "CHECK �%s� ergibt kein boolesches Resultat"
-
-#: ../commands/command.c:1299
-#, c-format
-msgid "Only relation '%s' can be referenced in CHECK"
+#: commands/trigger.c:212
+msgid "CreateTrigger: double DELETE event specified"
 msgstr ""
 
-#: ../commands/command.c:1342
-#, c-format
-msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
-msgstr "AlterTableAddConstraint: wegen CHECK-Constraint �%s� abgelehnt"
-
-#: ../commands/command.c:1442
-#, c-format
-msgid "ALTER TABLE / ADD CONSTRAINT: Index \"%u\" not found"
-msgstr "ALTER TABLE / ADD CONSTRAINT: Index %u nicht gefunden"
-
-#: ../commands/command.c:1501
-#, c-format
-msgid "Unique primary key already defined on relation \"%s\""
+#: commands/trigger.c:217
+msgid "CreateTrigger: double UPDATE event specified"
 msgstr ""
 
-#: ../commands/command.c:1503
-#, c-format
-msgid ""
-"Unique constraint already defined on the specified attributes in relation \"%"
-"s\""
+#: commands/trigger.c:221
+msgid "CreateTrigger: unknown event specified"
 msgstr ""
 
-#: ../commands/command.c:1520
+#: commands/trigger.c:247
 #, c-format
-msgid "ALTER TABLE / ADD UNIQUE will create implicit index '%s' for table '%s'"
+msgid "CreateTrigger: trigger %s already defined on relation %s"
 msgstr ""
 
-#: ../commands/command.c:1523
+#: commands/trigger.c:259
 #, c-format
-msgid ""
-"Unique constraint supercedes existing index on relation \"%s\".  Drop the "
-"existing index to remove redundancy."
-msgstr ""
-
-#: ../commands/command.c:1529
-msgid ""
-"ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
-msgstr ""
-"ALTER TABLE / ADD CONSTRAINT ist f�r diesen Constraint-Typ nicht "
-"implementiert."
-
-#: ../commands/command.c:1545
-msgid ""
-"ALTER TABLE / ADD CONSTRAINT: Unable to reference temporary table from "
-"permanent table constraint."
+msgid "CreateTrigger: function %s() does not exist"
 msgstr ""
-"ALTER TABLE / ADD CONSTRAINT: Tempor�re Tabelle kann nicht in permanentem "
-"Constraint benutzt werden"
 
-#: ../commands/command.c:1554
+#: commands/trigger.c:270
 #, c-format
-msgid "referenced table \"%s\" not a relation"
-msgstr ""
-
-#: ../commands/command.c:1651
 msgid ""
-"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
+"CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
 msgstr ""
 
-#: ../commands/command.c:1685
-msgid "ALTER TABLE / DROP CONSTRAINT does not support the CASCADE keyword"
-msgstr ""
-
-#: ../commands/command.c:1726
+#: commands/trigger.c:275
 #, c-format
-msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
-msgstr ""
-
-#: ../commands/command.c:1730
-msgid "Multiple constraints dropped"
+msgid "CreateTrigger: function %s() must return TRIGGER"
 msgstr ""
 
-#: ../commands/command.c:1778
+#: commands/trigger.c:375
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" is not a table, index, view, or sequence"
+msgid "CreateTrigger: relation %s not found in pg_class"
 msgstr ""
-"ALTER TABLE: Relation �%s� ist weder Tabelle, Index, Sicht noch Sequenz"
-
-#: ../commands/command.c:1881
-#, c-format
-msgid "ALTER TABLE: relation \"%s\" already has a toast table"
-msgstr "ALTER TABLE: Relation �%s� hat schon eine TOAST-Tabelle"
 
-#: ../commands/command.c:1898
+#: commands/trigger.c:460
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
-msgstr "ALTER TABLE: Relation �%s� braucht keine TOAST-Tabelle"
-
-#: ../commands/command.c:2083
-msgid "LOCK TABLE: permission denied"
-msgstr "LOCK TABLE: keine Berechtigung"
+msgid "DropTrigger: there is no trigger %s on relation %s"
+msgstr ""
 
-#: ../commands/command.c:2089
+#: commands/trigger.c:509
 #, c-format
-msgid "LOCK TABLE: %s is not a table"
-msgstr "LOCK TABLE: %s ist keine Tabelle"
+msgid "RemoveTriggerById: Trigger %u does not exist"
+msgstr "RemoveTriggerById: Trigger %u existiert nicht"
 
-#: ../commands/comment.c:112
+#: commands/trigger.c:520
 #, c-format
-msgid "An attempt was made to comment on a unknown type: %d"
-msgstr ""
+msgid "DropTrigger: relation \"%s\" is not a table"
+msgstr "DropTrigger: Relation �%s� ist keine Tabelle"
 
-#: ../commands/comment.c:332 ../commands/comment.c:393
+#: commands/trigger.c:524
 #, c-format
-msgid "you are not permitted to comment on class '%s'"
+msgid "DropTrigger: can't drop trigger for system relation %s"
 msgstr ""
 
-#: ../commands/comment.c:348
+#: commands/trigger.c:549
 #, c-format
-msgid "relation '%s' is not an index"
+msgid "DropTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: ../commands/comment.c:352
+#: commands/trigger.c:554
 #, c-format
-msgid "relation '%s' is not a table"
+msgid "DropTrigger: relation %s has reltriggers = 0"
 msgstr ""
 
-#: ../commands/comment.c:356
+#: commands/trigger.c:625
 #, c-format
-msgid "relation '%s' is not a view"
+msgid "renametrig: trigger %s already defined on relation %s"
 msgstr ""
 
-#: ../commands/comment.c:360
+#: commands/trigger.c:666
 #, c-format
-msgid "relation '%s' is not a sequence"
+msgid "renametrig: trigger %s not defined on relation %s"
 msgstr ""
 
-#: ../commands/comment.c:403
+#: commands/trigger.c:729
 #, c-format
-msgid "'%s' is not an attribute of class '%s'"
+msgid "RelationBuildTriggers: unexpected record found for rel %s"
 msgstr ""
 
-#: ../commands/comment.c:447
+#: commands/trigger.c:757
 #, c-format
-msgid "database '%s' does not exist"
+msgid "RelationBuildTriggers: tgargs IS NULL for rel %s"
 msgstr ""
 
-#: ../commands/comment.c:453
+#: commands/trigger.c:777
 #, c-format
-msgid "you are not permitted to comment on database '%s'"
+msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
 msgstr ""
 
-#: ../commands/comment.c:489
+#: commands/trigger.c:1129
 #, c-format
-msgid "you are not permitted to comment on rule '%s'"
+msgid "ExecCallTriggerFunc: function %u returned NULL"
 msgstr ""
 
-#: ../commands/comment.c:498
-#, c-format
-msgid "rule '%s' does not exist"
+#: commands/trigger.c:1368 executor/execMain.c:1044 executor/execMain.c:1318
+#: executor/execMain.c:1453
+msgid "Can't serialize access due to concurrent update"
 msgstr ""
 
-#: ../commands/comment.c:531
+#: commands/trigger.c:1391 executor/execMain.c:1065
 #, c-format
-msgid "you are not permitted to comment on type '%s'"
+msgid "Unknown status %u from heap_mark4update"
 msgstr ""
 
-#: ../commands/comment.c:540 ../commands/comment.c:574
-#, c-format
-msgid "type '%s' does not exist"
+#: commands/trigger.c:1403
+msgid "GetTupleForTrigger: failed ReadBuffer"
 msgstr ""
 
-#: ../commands/comment.c:584
-#, c-format
-msgid "you are not permitted to comment on aggregate '%s' for all types"
+#: commands/trigger.c:1591
+msgid "DeferredTriggerExecute: failed to fetch old tuple"
 msgstr ""
 
-#: ../commands/comment.c:587
-#, c-format
-msgid "you are not permitted to comment on aggregate '%s' for type %s"
+#: commands/trigger.c:1598
+msgid "DeferredTriggerExecute: failed to fetch new tuple"
 msgstr ""
 
-#: ../commands/comment.c:653
+#: commands/trigger.c:1619
 #, c-format
-msgid "CommentProc: type '%s' not found"
+msgid "DeferredTriggerExecute: can't find trigger %u"
 msgstr ""
 
-#: ../commands/comment.c:660
+#: commands/trigger.c:1765
 #, c-format
-msgid "you are not permitted to comment on function '%s'"
+msgid "deferredTriggerInvokeEvents: relation %u has no triggers"
 msgstr ""
 
-#: ../commands/comment.c:723
-#, c-format
-msgid "left type '%s' does not exist"
+#: commands/trigger.c:1876
+msgid "DeferredTriggerBeginXact() called while inside transaction"
 msgstr ""
 
-#: ../commands/comment.c:732
-#, c-format
-msgid "right type '%s' does not exist"
+#: commands/trigger.c:2052
+msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: ../commands/comment.c:744
+#: commands/trigger.c:2083
 #, c-format
-msgid "operator '%s' is of an illegal type'"
+msgid "Constraint '%s' is not deferrable"
 msgstr ""
 
-#: ../commands/comment.c:754
+#: commands/trigger.c:2097
 #, c-format
-msgid "operator '%s' does not exist"
+msgid "Constraint '%s' does not exist"
 msgstr ""
 
-#: ../commands/comment.c:761
-#, c-format
-msgid "you are not permitted to comment on operator '%s'"
+#: commands/trigger.c:2174
+msgid "DeferredTriggerSaveEvent() called outside of transaction"
 msgstr ""
 
-#: ../commands/comment.c:769
+#: commands/schemacmds.c:79
 #, c-format
-msgid "operator '%s' does not have an underlying function"
+msgid ""
+"CREATE SCHEMA: permission denied\n"
+"\t\"%s\" is not a superuser, so cannot create a schema for \"%s\""
 msgstr ""
 
-#: ../commands/comment.c:802
+#: commands/schemacmds.c:92
 #, c-format
-msgid "you are not permitted to comment on trigger '%s' %s '%s'"
-msgstr ""
+msgid ""
+"CREATE SCHEMA: Illegal schema name: \"%s\" -- pg_ is reserved for system "
+"schemas"
+msgstr "CREATE SCHEMA: illegaler Schemaname: �%s� -- pg_ is f�r Systemschemas reserviert"
 
-#: ../commands/comment.c:821
-#, c-format
-msgid "trigger '%s' defined for relation '%s' does not exist"
+#: commands/schemacmds.c:162
+msgid "Schema name may not be qualified"
 msgstr ""
 
-#: ../commands/copy.c:116
+#: commands/schemacmds.c:169
 #, c-format
-msgid "CopySendData: %m"
-msgstr ""
+msgid "Schema \"%s\" does not exist"
+msgstr "Schema �%s� existiert nicht"
 
-#: ../commands/copy.c:284 ../commands/trigger.c:319 ../executor/execMain.c:424
-#: ../executor/execMain.c:454 ../storage/ipc/shmqueue.c:234
-#: ../storage/ipc/shmqueue.c:254 ../tcop/utility.c:273 ../tcop/utility.c:554
-#: ../tcop/utility.c:876 ../tcop/utility.c:891
+#: commands/schemacmds.c:206
 #, c-format
-msgid "%s: %s"
-msgstr ""
+msgid "RemoveSchemaById: schema %u not found"
+msgstr "RemoveSchemaById: Schema %u nicht gefunden"
 
-#: ../commands/copy.c:286
-msgid ""
-"You must have Postgres superuser privilege to do a COPY directly to or from "
-"a file.  Anyone can COPY to stdout or from stdin.  Psql's \\copy command "
-"also works for anyone."
+#: commands/sequence.c:207
+msgid "DefineSequence: ReadBuffer failed"
 msgstr ""
 
-#: ../commands/copy.c:295
-msgid "COPY BINARY is not supported to stdout or from stdin"
-msgstr ""
+#: commands/sequence.c:334
+#, c-format
+msgid "%s.nextval: you don't have permissions to set sequence %s"
+msgstr "%s.nextval: keine Berechtigung um Sequenz %s zu setzen"
 
-#: ../commands/copy.c:311 ../commands/copy.c:343
+#: commands/sequence.c:409
 #, c-format
-msgid "You cannot copy view %s"
+msgid "%s.nextval: reached MAXVALUE (%s)"
 msgstr ""
 
-#: ../commands/copy.c:313
+#: commands/sequence.c:430
 #, c-format
-msgid "You cannot change sequence relation %s"
+msgid "%s.nextval: reached MINVALUE (%s)"
 msgstr ""
 
-#: ../commands/copy.c:315 ../commands/copy.c:347
+#: commands/sequence.c:520
 #, c-format
-msgid "You cannot copy object %s"
-msgstr ""
+msgid "%s.currval: you don't have permissions to read sequence %s"
+msgstr "%s.curval: keine Berechtigung um Sequenz %s zu lesen"
 
-#: ../commands/copy.c:331
+#: commands/sequence.c:524
 #, c-format
-msgid ""
-"COPY command, running in backend with effective uid %d, could not open file "
-"'%s' for reading.  Errno = %s (%d)."
-msgstr ""
+msgid "%s.currval is not yet defined in this session"
+msgstr "%s.currval ist in dieser Sitzung noch nicht definiert"
 
-#: ../commands/copy.c:345
+#: commands/sequence.c:559
 #, c-format
-msgid "You cannot copy sequence %s"
-msgstr ""
+msgid "%s.setval: you don't have permissions to set sequence %s"
+msgstr "%s.setval: keine Berechtigung um Sequenz %s zu lesen"
 
-#: ../commands/copy.c:369
-msgid "Relative path not allowed for server side COPY command."
+#: commands/sequence.c:574
+#, c-format
+msgid "%s.setval: value %s is out of bounds (%s,%s)"
 msgstr ""
 
-#: ../commands/copy.c:377
+#: commands/sequence.c:700
 #, c-format
-msgid ""
-"COPY command, running in backend with effective uid %d, could not open file "
-"'%s' for writing.  Errno = %s (%d)."
+msgid "%s.%s: %s is not a sequence"
 msgstr ""
 
-#: ../commands/copy.c:426
-#, c-format
-msgid "COPY: table %s does not have OIDs"
-msgstr "COPY: Tabelle %s hat keine OIDs"
+#: commands/sequence.c:718
+msgid "Memory exhausted in init_sequence"
+msgstr ""
 
-#: ../commands/copy.c:446
+#: commands/sequence.c:746
 #, c-format
-msgid "COPY: couldn't lookup info for type %u"
+msgid "%s.%s: invalid number of blocks in sequence"
 msgstr ""
 
-#: ../commands/copy.c:693
-msgid "COPY BINARY: file signature not recognized"
+#: commands/sequence.c:751
+#, c-format
+msgid "%s.%s: ReadBuffer failed"
 msgstr ""
 
-#: ../commands/copy.c:698
-msgid "COPY BINARY: incompatible integer layout"
+#: commands/sequence.c:760
+#, c-format
+msgid "%s.%s: bad magic (%08X)"
 msgstr ""
 
-#: ../commands/copy.c:702
-msgid "COPY BINARY: bogus file header (missing flags)"
+#: commands/sequence.c:803
+msgid "DefineSequence: CYCLE ??"
 msgstr ""
 
-#: ../commands/copy.c:706
-msgid "COPY BINARY: unrecognized critical flags in header"
+#: commands/sequence.c:807
+#, c-format
+msgid "DefineSequence: option \"%s\" not recognized"
 msgstr ""
 
-#: ../commands/copy.c:711
-msgid "COPY BINARY: bogus file header (missing length)"
+#: commands/sequence.c:814
+msgid "DefineSequence: can't INCREMENT by 0"
 msgstr ""
 
-#: ../commands/copy.c:717
-msgid "COPY BINARY: bogus file header (wrong length)"
+#: commands/sequence.c:843
+#, c-format
+msgid "DefineSequence: MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr ""
 
-#: ../commands/copy.c:756
-msgid "COPY TEXT: NULL Oid"
+#: commands/sequence.c:864
+#, c-format
+msgid "DefineSequence: START value (%s) can't be less than MINVALUE (%s)"
 msgstr ""
 
-#: ../commands/copy.c:764
-msgid "COPY TEXT: Invalid Oid"
+#: commands/sequence.c:874
+#, c-format
+msgid "DefineSequence: START value (%s) can't be greater than MAXVALUE (%s)"
 msgstr ""
 
-#: ../commands/copy.c:802
+#: commands/sequence.c:885
 #, c-format
-msgid "COPY BINARY: tuple field count is %d, expected %d"
+msgid "DefineSequence: CACHE (%s) can't be <= 0"
 msgstr ""
 
-#: ../commands/copy.c:809 ../commands/copy.c:815 ../commands/copy.c:824
-#: ../commands/copy.c:838 ../commands/copy.c:847 ../commands/copy.c:859
-#: ../commands/copy.c:875
-msgid "COPY BINARY: unexpected EOF"
+#: commands/sequence.c:905
+#, c-format
+msgid "seq_redo: unknown op code %u"
 msgstr ""
 
-#: ../commands/copy.c:811
+#: commands/sequence.c:913
 #, c-format
-msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
+msgid "seq_redo: can't read block of %u/%u"
 msgstr ""
 
-#: ../commands/copy.c:817
-msgid "COPY BINARY: Invalid Oid"
+#: commands/sequence.c:929
+msgid "seq_redo: failed to add item to page"
 msgstr ""
 
-#: ../commands/copy.c:828
-#, c-format
-msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
+#: commands/tablecmds.c:152
+msgid "DefineRelation: please inherit from a relation or define an attribute"
 msgstr ""
 
-#: ../commands/copy.c:840
-msgid "COPY BINARY: bogus varlena length"
+#: commands/tablecmds.c:360
+#, c-format
+msgid "TRUNCATE cannot be used on sequences. '%s' is a sequence"
 msgstr ""
 
-#: ../commands/copy.c:973
+#: commands/tablecmds.c:363
 #, c-format
-msgid "GetInputFunction: Cache lookup of type %u failed"
+msgid "TRUNCATE cannot be used on views. '%s' is a view"
 msgstr ""
 
-#: ../commands/copy.c:989
+#: commands/tablecmds.c:366
 #, c-format
-msgid "GetTypeElement: Cache lookup of type %u failed"
+msgid "TRUNCATE can only be used on tables. '%s' is not a table"
 msgstr ""
 
-#: ../commands/copy.c:1005
-msgid "CopyReadNewline: extra fields ignored"
+#: commands/tablecmds.c:372
+#, c-format
+msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
 msgstr ""
 
-#: ../commands/copy.c:1140
-msgid "CopyReadAttribute: end of record marker corrupted"
+#: commands/tablecmds.c:393
+msgid "TRUNCATE cannot be used on temp tables of other processes"
 msgstr ""
 
-#: ../commands/creatinh.c:81
-msgid "DefineRelation: please inherit from a relation or define an attribute"
+#: commands/tablecmds.c:417
+#, c-format
+msgid ""
+"TRUNCATE cannot be used as table %s references this one via foreign key "
+"constraint %s"
 msgstr ""
 
-#: ../commands/creatinh.c:329
+#: commands/tablecmds.c:527
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" duplicated"
 msgstr "CREATE TABLE: Attribut �%s� ist doppelt angegeben"
 
-#: ../commands/creatinh.c:344
-#, c-format
-msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
-msgstr "CREATE TABLE: vererbte Relation �%s� ist doppelt angegeben"
-
-#: ../commands/creatinh.c:367
+#: commands/tablecmds.c:550
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" is not a table"
 msgstr "CREATE TABLE: vererbte Relation �%s� ist keine Tabelle"
 
-#: ../commands/creatinh.c:370
+#: commands/tablecmds.c:554
 #, c-format
 msgid "CREATE TABLE: cannot inherit from temp relation \"%s\""
 msgstr "CREATE TABLE: von tempor�rer Relation �%s� kann nicht vererbt werden"
 
-#: ../commands/creatinh.c:377
+#: commands/tablecmds.c:569
 #, c-format
-msgid "you do not own table \"%s\""
-msgstr "Sie sind nicht der Eigent�mer von Tabelle �%s�"
-
-#: ../commands/creatinh.c:413
-#, c-format
-msgid "CREATE TABLE: cache lookup failed for type %u"
-msgstr ""
+msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
+msgstr "CREATE TABLE: vererbte Relation �%s� ist doppelt angegeben"
 
-#: ../commands/creatinh.c:428
+#: commands/tablecmds.c:621
 #, c-format
 msgid ""
 "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
 msgstr ""
 "CREATE TABLE: geerbte Definitionen von Attribut �%s� werden verschmolzen"
 
-#: ../commands/creatinh.c:433
+#: commands/tablecmds.c:626
 #, c-format
 msgid "CREATE TABLE: inherited attribute \"%s\" type conflict (%s and %s)"
 msgstr "CREATE TABLE: Typenkonflikt bei geerbten Attribut �%s� (%s und %s)"
 
-#: ../commands/creatinh.c:567
+#: commands/tablecmds.c:772
 #, c-format
 msgid "CREATE TABLE: merging attribute \"%s\" with inherited definition"
 msgstr "CREATE TABLE: Attribut �%s� wird mit geerbter Definition verschmolzen"
 
-#: ../commands/creatinh.c:572
+#: commands/tablecmds.c:777
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" type conflict (%s and %s)"
 msgstr "CREATE TABLE: Typenkonflikt bei Attribut �%s� (%s und %s)"
 
-#: ../commands/creatinh.c:606
+#: commands/tablecmds.c:815
 #, c-format
 msgid ""
 "CREATE TABLE: attribute \"%s\" inherits conflicting default values\n"
@@ -3207,2096 +4326,1980 @@ msgstr ""
 "CREATE TABLE: Attribut �%s� erbt widerspr�chliche Default-Werte\n"
 "Um den Konflikt zu l�sen, mu� ein Default-Wert angegeben werden"
 
-#: ../commands/creatinh.c:843
+#: commands/tablecmds.c:1059
 #, c-format
 msgid "setRelhassubclassInRelation: cache lookup failed for relation %u"
 msgstr ""
 
-#: ../commands/dbcommands.c:84 ../commands/dbcommands.c:317
-msgid "current user name is invalid"
-msgstr "aktueller Benutzername ist ung�ltig"
-
-#: ../commands/dbcommands.c:87
-msgid "CREATE DATABASE: permission denied"
-msgstr "CREATE DATABASE: keine Berechtigung"
-
-#: ../commands/dbcommands.c:91
-msgid "CREATE DATABASE: may not be called in a transaction block"
-msgstr ""
-"CREATE DATABASE: kann nicht in einem Transaktionsblock aufgerufen werden"
-
-#: ../commands/dbcommands.c:102 ../commands/dbcommands.c:233
-#, c-format
-msgid "CREATE DATABASE: database \"%s\" already exists"
-msgstr "CREATE DATABASE: Datenbank �%s� existiert bereits"
-
-#: ../commands/dbcommands.c:114
-#, c-format
-msgid "CREATE DATABASE: template \"%s\" does not exist"
-msgstr "CREATE DATABASE: Schablone �%s� existiert nicht"
-
-#: ../commands/dbcommands.c:124
+#: commands/tablecmds.c:1114
 #, c-format
-msgid "CREATE DATABASE: permission to copy \"%s\" denied"
-msgstr "CREATE DATABASE: keine Berechtigung um �%s� zu kopieren"
+msgid "renameatt: class \"%s\" is a system catalog"
+msgstr "renameatt: Klasse �%s� ist ein Systemkatalog"
 
-#: ../commands/dbcommands.c:143
+#: commands/tablecmds.c:1160
 #, c-format
-msgid ""
-"CREATE DATABASE: source database \"%s\" is being accessed by other users"
-msgstr ""
-"CREATE DATABASE: auf Quelldatenbank �%s� wird gerade von anderen Benutzern "
-"zugegriffen"
-
-#: ../commands/dbcommands.c:152
-msgid "CREATE DATABASE: invalid backend encoding"
-msgstr ""
-
-#: ../commands/dbcommands.c:172 ../commands/dbcommands.c:174
-#: ../commands/dbcommands.c:176
-msgid "database path may not contain single quotes"
+msgid "Inherited attribute \"%s\" must be renamed in child tables too"
 msgstr ""
 
-#: ../commands/dbcommands.c:199
+#: commands/tablecmds.c:1168
 #, c-format
-msgid "CREATE DATABASE: unable to create database directory '%s': %m"
-msgstr "CREATE DATABASE: konnte Datenbankverzeichnis �%s� nicht erstellen: %m"
+msgid "renameatt: attribute \"%s\" does not exist"
+msgstr "renameatt: Attribut �%s� existiert nicht"
 
-#: ../commands/dbcommands.c:207
+#: commands/tablecmds.c:1173
 #, c-format
-msgid "CREATE DATABASE: could not link '%s' to '%s': %m"
-msgstr ""
-
-#: ../commands/dbcommands.c:217
-msgid "CREATE DATABASE: could not initialize database directory"
-msgstr "CREATE DATABASE: konnte Datenbankverzeichnis nicht initialisieren"
-
-#: ../commands/dbcommands.c:219
-msgid ""
-"CREATE DATABASE: could not initialize database directory; delete failed as "
-"well"
-msgstr ""
-"CREATE DATABASE: konnte Datenbankverzeichnis nicht initialisieren; L�schen "
-"schlug auch fehl"
+msgid "renameatt: system attribute \"%s\" may not be renamed"
+msgstr "renameatt: Systemattribut �%s� kann nicht umbenannt werden"
 
-#: ../commands/dbcommands.c:311
-msgid "DROP DATABASE: cannot be executed on the currently open database"
+#: commands/tablecmds.c:1181
+#, c-format
+msgid "renameatt: inherited attribute \"%s\" may not be renamed"
 msgstr ""
-"DROP DATABASE: kann nicht auf aktuell ge�ffnete Datenbank verwendet werden"
 
-#: ../commands/dbcommands.c:314
-msgid "DROP DATABASE: may not be called in a transaction block"
-msgstr "DROP DATABASE: kann nicht in einem Transaktionsblock verwendet werden"
-
-#: ../commands/dbcommands.c:332
+#: commands/tablecmds.c:1190
 #, c-format
-msgid "DROP DATABASE: database \"%s\" does not exist"
-msgstr "DROP DATABASE: Datenbank �%s� existiert nicht"
-
-#: ../commands/dbcommands.c:335
-msgid "DROP DATABASE: permission denied"
-msgstr "DROP DATABASE: keine Berechtigung"
-
-#: ../commands/dbcommands.c:343
-msgid "DROP DATABASE: database is marked as a template"
-msgstr "DROP DATABASE: Datenbank ist als Schablone gekennzeichnet"
+msgid "renameatt: attribute \"%s\" exists"
+msgstr "renameatt: Attribut �%s� existiert bereits"
 
-#: ../commands/dbcommands.c:352
+#: commands/tablecmds.c:1220
 #, c-format
-msgid "DROP DATABASE: database \"%s\" is being accessed by other users"
+msgid "renameatt: can't find index id %u"
 msgstr ""
-"DROP DATABASE: auf Datenbank �%s� wird von anderen Benutzern zugegriffen"
 
-#: ../commands/dbcommands.c:369
+#: commands/tablecmds.c:1305
 #, c-format
-msgid ""
-"DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the "
-"contrary"
-msgstr ""
-"DROP DATABASE: Datenbank �%s� existiert nicht, trotz fr�herer gegenteiliger "
-"Meldungen"
-
-#: ../commands/dbcommands.c:532
-msgid "Relative paths are not allowed as database locations"
-msgstr ""
-
-#: ../commands/dbcommands.c:534
-msgid "Absolute paths are not allowed as database locations"
-msgstr ""
+msgid "renamerel: system relation \"%s\" may not be renamed"
+msgstr "renamerel: Systemrelation �%s� darf nicht umbenannt werden"
 
-#: ../commands/dbcommands.c:544
+#: commands/tablecmds.c:1321
 #, c-format
-msgid "Postmaster environment variable '%s' not set"
-msgstr ""
+msgid "renamerel: relation \"%s\" does not exist"
+msgstr "renamerel: Relation �%s� existiert nicht"
 
-#: ../commands/dbcommands.c:546
+#: commands/tablecmds.c:1325
 #, c-format
-msgid "Postmaster environment variable '%s' must be absolute path"
-msgstr ""
+msgid "renamerel: relation \"%s\" exists"
+msgstr "renamerel: Relation �%s� existiert bereits"
 
-#: ../commands/dbcommands.c:578
+#: commands/tablecmds.c:1623 commands/tablecmds.c:1895
+#: commands/tablecmds.c:2029 commands/tablecmds.c:2244
+#: commands/tablecmds.c:2393 commands/tablecmds.c:2563
+#: commands/tablecmds.c:3525 commands/tablecmds.c:3700
 #, c-format
-msgid "could not remove '%s': %m"
-msgstr "konnte �%s� nicht l�schen: %m"
+msgid "ALTER TABLE: relation \"%s\" is not a table"
+msgstr "ALTER TABLE: Relation �%s� ist keine Tabelle"
 
-#: ../commands/dbcommands.c:587
+#: commands/tablecmds.c:1634 commands/tablecmds.c:1900
+#: commands/tablecmds.c:2034 commands/tablecmds.c:2152
+#: commands/tablecmds.c:2251 commands/tablecmds.c:2398
+#: commands/tablecmds.c:2568 commands/tablecmds.c:3530
 #, c-format
-msgid "database directory '%s' could not be removed"
-msgstr "Datenbankverzeichnis �%s� konnte nicht entfernt werden"
+msgid "ALTER TABLE: relation \"%s\" is a system catalog"
+msgstr "ALTER TABLE: Relation �%s� ist ein Systemkatalog"
 
-#: ../commands/define.c:149
-msgid "untrusted function has been decommissioned."
+#: commands/tablecmds.c:1687
+#, c-format
+msgid "ALTER TABLE: child table \"%s\" has different type for column \"%s\""
 msgstr ""
 
-#: ../commands/define.c:160
+#: commands/tablecmds.c:1695
 #, c-format
-msgid "Unrecognized function attribute '%s' ignored"
+msgid "ALTER TABLE: merging definition of column \"%s\" for child %s"
 msgstr ""
 
-#: ../commands/define.c:202
-#, c-format
-msgid "CREATE FUNCTION: only one AS item needed for %s language"
+#: commands/tablecmds.c:1725
+msgid "Attribute must be added to child tables too"
 msgstr ""
 
-#: ../commands/define.c:261
-#, c-format
+#: commands/tablecmds.c:1742
 msgid ""
-"Only users with Postgres superuser privilege are permitted to create a "
-"function in the '%s' language.\n"
-"\tOthers may use the 'sql' language or the created procedural languages."
+"Adding columns with defaults is not implemented.\n"
+"\tAdd the column, then use ALTER TABLE SET DEFAULT."
 msgstr ""
 
-#: ../commands/define.c:282
-#, c-format
+#: commands/tablecmds.c:1746
 msgid ""
-"Unrecognized language specified in a CREATE FUNCTION: '%s'.\n"
-"\tPre-installed languages are SQL, C, and internal.\n"
-"\tAdditional languages may be installed using 'createlang'."
+"Adding NOT NULL columns is not implemented.\n"
+"\tAdd the column, then use ALTER TABLE ... SET NOT NULL."
 msgstr ""
 
-#: ../commands/define.c:292
+#: commands/tablecmds.c:1755 commands/tablecmds.c:3840
 #, c-format
-msgid "Language '%s' isn't defined as PL"
-msgstr ""
+msgid "ALTER TABLE: relation \"%s\" not found"
+msgstr "ALTER TABLE: Relation �%s� nicht gefunden"
 
-#: ../commands/define.c:299
+#: commands/tablecmds.c:1767
 #, c-format
-msgid ""
-"Only users with Postgres superuser privilege are permitted to create a "
-"function in the '%s' language."
-msgstr ""
-
-#: ../commands/define.c:387
-msgid "setof type not implemented for leftarg"
-msgstr ""
-
-#: ../commands/define.c:394
-msgid "setof type not implemented for rightarg"
-msgstr ""
-
-#: ../commands/define.c:401
-msgid "CREATE OPERATOR: precedence not implemented"
-msgstr ""
-
-#: ../commands/define.c:406
-msgid "CREATE OPERATOR: associativity not implemented"
-msgstr ""
+msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
+msgstr "ALTER TABLE: Spaltenname �%s� existiert bereits in Tabelle �%s�"
 
-#: ../commands/define.c:432
+#: commands/tablecmds.c:1773
 #, c-format
-msgid "DefineOperator: attribute \"%s\" not recognized"
-msgstr ""
-
-#: ../commands/define.c:441
-msgid "Define: \"procedure\" unspecified"
-msgstr "Define: �procedure� nicht angegeben"
+msgid "ALTER TABLE: relations limited to %d columns"
+msgstr "ALTER TABLE: Relationen sind auf %d Spalten beschr�nkt"
 
-#: ../commands/define.c:503
+#: commands/tablecmds.c:1945 commands/tablecmds.c:2079
+#: commands/tablecmds.c:2197
 #, c-format
-msgid "DefineAggregate: attribute \"%s\" not recognized"
-msgstr ""
-
-#: ../commands/define.c:511
-msgid "Define: \"basetype\" unspecified"
-msgstr "Define: �basetype� nicht angegeben"
-
-#: ../commands/define.c:513
-msgid "Define: \"stype\" unspecified"
-msgstr "Define: �stype� nicht angegeben"
+msgid "ALTER TABLE: Cannot alter system attribute \"%s\""
+msgstr "ALTER TABLE: Systemattribut �%s� kann nicht ge�ndert werden"
 
-#: ../commands/define.c:515
-msgid "Define: \"sfunc\" unspecified"
-msgstr "Define: �sfunc� nicht angegeben"
+#: commands/tablecmds.c:1966
+#, c-format
+msgid "ALTER TABLE: Index %u not found"
+msgstr "ALTER TABLE: Index %u nicht gefunden"
 
-#: ../commands/define.c:556
+#: commands/tablecmds.c:1981
 #, c-format
-msgid "DefineType: type names must be %d characters or less"
+msgid "ALTER TABLE: Attribute \"%s\" is in a primary key"
 msgstr ""
 
-#: ../commands/define.c:610
+#: commands/tablecmds.c:1997 commands/tablecmds.c:2111
+#: commands/tablecmds.c:2339
 #, c-format
-msgid "DefineType: \"%s\" alignment not recognized"
-msgstr ""
+msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
+msgstr "ALTER TABLE: Relation �%s� hat keine Spalte �%s�"
 
-#: ../commands/define.c:626
+#: commands/tablecmds.c:2098
 #, c-format
-msgid "DefineType: \"%s\" storage not recognized"
+msgid "ALTER TABLE: Attribute \"%s\" contains NULL values"
 msgstr ""
 
-#: ../commands/define.c:631
+#: commands/tablecmds.c:2147
 #, c-format
-msgid "DefineType: attribute \"%s\" not recognized"
-msgstr ""
+msgid "ALTER TABLE: relation \"%s\" is not a table or view"
+msgstr "ALTER TABLE: Relation �%s� ist keine Tabelle oder Sicht"
 
-#: ../commands/define.c:640
-msgid "Define: \"input\" unspecified"
+#: commands/tablecmds.c:2271
+#, c-format
+msgid "ALTER TABLE: statistics target %d is too low"
 msgstr ""
 
-#: ../commands/define.c:642
-msgid "Define: \"output\" unspecified"
+#: commands/tablecmds.c:2276
+msgid "ALTER TABLE: lowering statistics target to 1000"
 msgstr ""
 
-#: ../commands/define.c:697 ../commands/define.c:749
+#: commands/tablecmds.c:2297
 #, c-format
-msgid "Define: \"%s\" requires a parameter"
+msgid "ALTER TABLE: \"%s\" storage not recognized"
 msgstr ""
 
-#: ../commands/define.c:720 ../commands/define.c:770
+#: commands/tablecmds.c:2302
 #, c-format
-msgid "Define: cannot interpret argument of \"%s\""
+msgid "ALTER TABLE: Invalid column flag: %c"
 msgstr ""
 
-#: ../commands/define.c:730 ../commands/define.c:739
+#: commands/tablecmds.c:2344
 #, c-format
-msgid "Define: \"%s\" requires a numeric value"
-msgstr ""
+msgid "ALTER TABLE: cannot change system attribute \"%s\""
+msgstr "ALTER TABLE: Systemattribut �%s� kann nicht ge�ndert werden"
 
-#: ../commands/define.c:756
+#: commands/tablecmds.c:2361
 #, c-format
-msgid "Define: \"%s\" requires an integral value"
+msgid "ALTER TABLE: Column datatype %s can only have storage \"plain\""
 msgstr ""
 
-#: ../commands/define.c:773
+#: commands/tablecmds.c:2415
 #, c-format
-msgid "Define: invalid argument for \"%s\""
-msgstr ""
+msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
+msgstr "ALTER TABLE: Systemattribut �%s� kann nicht entfernt werden"
 
-#: ../commands/explain.c:54
+#: commands/tablecmds.c:2421
 #, c-format
-msgid "(transaction aborted): %s"
+msgid "ALTER TABLE: Cannot drop inherited column \"%s\""
 msgstr ""
 
-#: ../commands/explain.c:62
-msgid "Utility statements have no plan structure"
-msgstr ""
+#: commands/tablecmds.c:2450 commands/tablecmds.c:2501
+#, c-format
+msgid "ALTER TABLE: relation %u has no column \"%s\""
+msgstr "ALTER TABLE: Relation %u hat keine Spalte �%s�"
 
-#: ../commands/explain.c:72
-msgid "Query rewrites to nothing"
+#: commands/tablecmds.c:2455 commands/tablecmds.c:2506
+#, c-format
+msgid "ALTER TABLE: relation %u has non-inherited column \"%s\""
 msgstr ""
 
-#: ../commands/explain.c:97
+#: commands/tablecmds.c:2640
 msgid ""
-"QUERY PLAN:\n"
-"\n"
-"NOTIFY\n"
+"ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
 msgstr ""
+"ALTER TABLE / ADD CONSTRAINT ist f�r diesen Constraint-Typ nicht "
+"implementiert."
 
-#: ../commands/explain.c:99
+#: commands/tablecmds.c:2670
 msgid ""
-"QUERY PLAN:\n"
-"\n"
-"UTILITY\n"
+"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
 msgstr ""
 
-#: ../commands/explain.c:155
+#: commands/tablecmds.c:2730
 #, c-format
-msgid ""
-"QUERY DUMP:\n"
-"\n"
-"%s"
+msgid "Only relation '%s' can be referenced in CHECK"
 msgstr ""
 
-#: ../commands/explain.c:168
+#: commands/tablecmds.c:2779
 #, c-format
-msgid ""
-"QUERY PLAN:\n"
-"\n"
-"%s"
-msgstr ""
+msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
+msgstr "AlterTableAddConstraint: wegen CHECK-Constraint �%s� abgelehnt"
 
-#: ../commands/indexcmds.c:87
-msgid "DefineIndex: must specify at least one attribute"
+#: commands/tablecmds.c:2835
+#, c-format
+msgid "referenced relation \"%s\" is not a table"
 msgstr ""
 
-#: ../commands/indexcmds.c:89
+#: commands/tablecmds.c:2840
 #, c-format
-msgid "Cannot use more than %d attributes in an index"
-msgstr ""
+msgid "%s: relation \"%s\" is a system catalog"
+msgstr "%s: Relation �%s� ist ein Systemkatalog"
 
-#: ../commands/indexcmds.c:96
+#: commands/tablecmds.c:2855
 #, c-format
-msgid "DefineIndex: relation \"%s\" not found"
-msgstr ""
+msgid "%s: Unable to reference temporary table from permanent table constraint"
+msgstr "%s: Tempor�re Tabelle kann nicht in permanentem Constraint benutzt werden"
 
-#: ../commands/indexcmds.c:107
+#: commands/tablecmds.c:2897
 #, c-format
-msgid "DefineIndex: access method \"%s\" not found"
+msgid ""
+"%s: number of referencing and referenced attributes for foreign key disagree"
 msgstr ""
 
-#: ../commands/indexcmds.c:113
+#: commands/tablecmds.c:2978
 #, c-format
-msgid "DefineIndex: access method \"%s\" does not support UNIQUE indexes"
-msgstr ""
+msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
+msgstr "%s: Spalte �%s�, die im Foreign-Key verwendet wird, existiert nicht"
 
-#: ../commands/indexcmds.c:116
+#: commands/tablecmds.c:2981
 #, c-format
-msgid "DefineIndex: access method \"%s\" does not support multi-column indexes"
+msgid "Can only have %d keys in a foreign key"
 msgstr ""
 
-#: ../commands/indexcmds.c:135
-msgid "Existing indexes are inactive. REINDEX first"
+#: commands/tablecmds.c:3025
+#, c-format
+msgid "transformFkeyGetPrimaryKey: index %u not found"
 msgstr ""
 
-#: ../commands/indexcmds.c:153
-msgid "Functional index can only have one attribute"
+#: commands/tablecmds.c:3043
+#, c-format
+msgid "PRIMARY KEY for referenced table \"%s\" not found"
 msgstr ""
 
-#: ../commands/indexcmds.c:157
+#: commands/tablecmds.c:3099
 #, c-format
-msgid "Index function can take at most %d arguments"
-msgstr "Indexfunktion kann h�chstens %d Argumente haben"
-
-#: ../commands/indexcmds.c:212
-msgid "Partial-index predicates may refer only to the base relation"
-msgstr "Indexpr�dikat kann nur auf die zu indizierende Tabelle Bezug nehmen"
-
-#: ../commands/indexcmds.c:220
-msgid "Cannot use subselect in index predicate"
-msgstr "Subselects k�nnen nicht im Indexpr�dikat verwendet werden"
-
-#: ../commands/indexcmds.c:222
-msgid "Cannot use aggregate in index predicate"
-msgstr "Aggregatfunktionen k�nnen nicht im Indexpr�dikat verwendet werden"
+msgid "transformFkeyCheckAttrs: index %u not found"
+msgstr "transformFkeyCheckAttrs: Index %u nicht gefunden"
 
-#: ../commands/indexcmds.c:229
-msgid "Cannot use non-cachable function in index predicate"
+#: commands/tablecmds.c:3157
+#, c-format
+msgid ""
+"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
 msgstr ""
 
-#: ../commands/indexcmds.c:270 ../commands/indexcmds.c:361
+#: commands/tablecmds.c:3324
 #, c-format
-msgid "DefineIndex: attribute \"%s\" not found"
-msgstr "DefineIndex: Attribut �%s� nicht gefunden"
-
-#: ../commands/indexcmds.c:295
 msgid ""
-"DefineIndex: functional index must use a real function, not a type coercion\n"
-"\tTry specifying the index opclass you want to use, instead"
+"number of key attributes in referenced table must be equal to foreign key\n"
+"\tIllegal FOREIGN KEY definition references \"%s\""
 msgstr ""
 
-#: ../commands/indexcmds.c:302
-msgid "DefineIndex: cannot index on a function returning a set"
+#: commands/tablecmds.c:3384
+msgid "Unrecognized ON DELETE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: ../commands/indexcmds.c:319
-msgid "DefineIndex: index function must be marked iscachable"
-msgstr "DefineIndex: Indexfunktion mu� als �iscachable� markiert werden"
-
-#: ../commands/indexcmds.c:354
-msgid "missing attribute for define index"
+#: commands/tablecmds.c:3455
+msgid "Unrecognized ON UPDATE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: ../commands/indexcmds.c:388
+#: commands/tablecmds.c:3500
 #, c-format
-msgid ""
-"data type %s has no default operator class for access method \"%s\"\n"
-"\tYou must specify an operator class for the index or define a\n"
-"\tdefault operator class for the data type"
+msgid "fkMatchTypeToString: Unknown MATCH TYPE '%c'"
 msgstr ""
 
-#: ../commands/indexcmds.c:404
+#: commands/tablecmds.c:3576
 #, c-format
-msgid ""
-"DefineIndex: operator class \"%s\" not supported by access method \"%s\""
+msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
 msgstr ""
 
-#: ../commands/indexcmds.c:412
-#, c-format
-msgid "operator class \"%s\" does not accept data type %s"
-msgstr "Operatorklasse �%s� akzeptiert Datentyp %s nicht"
-
-#: ../commands/indexcmds.c:476
-#, c-format
-msgid "pg_opclass contains multiple default opclasses for data tyype %s"
+#: commands/tablecmds.c:3580
+msgid "Multiple constraints dropped"
 msgstr ""
 
-#: ../commands/indexcmds.c:502 ../commands/indexcmds.c:539
+#: commands/tablecmds.c:3605
 #, c-format
-msgid "index \"%s\" does not exist"
-msgstr "Index �%s� existiert nicht"
+msgid "ALTER TABLE: relation %u not found"
+msgstr "ALTER TABLE: Relation %u nicht gefunden"
 
-#: ../commands/indexcmds.c:505 ../commands/indexcmds.c:542
-#: ../commands/indexcmds.c:581
+#: commands/tablecmds.c:3667
 #, c-format
-msgid "relation \"%s\" is of type \"%c\""
-msgstr "Relation �%s� hat Typ �%c�"
-
-#: ../commands/indexcmds.c:533 ../commands/indexcmds.c:572
-msgid "REINDEX cannot run inside a BEGIN/END block"
-msgstr "REINDEX kann nicht in einem BEGIN/END-Block verwendet werden"
+msgid ""
+"ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or "
+"sequence"
+msgstr "ALTER TABLE: Relation �%s� ist weder Tabelle, TOAST-Tabelle, Index, Sicht noch Sequenz"
 
-#: ../commands/indexcmds.c:548
-#, c-format
-msgid "index \"%s\" wasn't reindexed"
-msgstr "Index �%s� wurde nicht neu indiziert"
+#: commands/tablecmds.c:3717
+msgid "Shared relations cannot be toasted after initdb"
+msgstr ""
 
-#: ../commands/indexcmds.c:578
+#: commands/tablecmds.c:3730
 #, c-format
-msgid "table \"%s\" does not exist"
-msgstr "Tabelle �%s� existiert nicht"
+msgid "ALTER TABLE: relation \"%s\" already has a toast table"
+msgstr "ALTER TABLE: Relation �%s� hat schon eine TOAST-Tabelle"
 
-#: ../commands/indexcmds.c:585
+#: commands/tablecmds.c:3745
 #, c-format
-msgid "table \"%s\" wasn't reindexed"
-msgstr "Tabelle �%s� wurde nicht neu indiziert"
+msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
+msgstr "ALTER TABLE: Relation �%s� braucht keine TOAST-Tabelle"
 
-#: ../commands/indexcmds.c:615
-msgid "REINDEX DATABASE: Can be executed only on the currently open database."
+#: commands/prepare.c:66
+msgid "No statement name given"
 msgstr ""
-"REINDEX DATABASE kann nur auf die aktuelle Datenbank angewendet werden."
 
-#: ../commands/indexcmds.c:618
-msgid "REINDEX DATABASE: Permission denied."
-msgstr "REINDEX DATABASE: keine Berechtigung"
+#: commands/prepare.c:69
+msgid "Utility statements cannot be prepared"
+msgstr ""
 
-#: ../commands/indexcmds.c:626
-msgid "REINDEX DATABASE cannot run inside a BEGIN/END block"
-msgstr "REINDEX DATABASE kann nicht in einem BEGIN/END-Block verwendet werden."
+#: commands/prepare.c:117
+msgid "ExecuteQuery: wrong number of arguments"
+msgstr ""
 
-#: ../commands/indexcmds.c:680
-#, c-format
-msgid "relation %u was reindexed"
-msgstr "Relation %u wurde neu indiziert"
+#: commands/prepare.c:168
+msgid "INTO clause specified for non-SELECT query"
+msgstr ""
 
-#: ../commands/proclang.c:72
-msgid ""
-"Only users with Postgres superuser privilege are permitted to create "
-"procedural languages"
+#: commands/prepare.c:211
+msgid "InitQueryHashTable: unable to create hash table"
 msgstr ""
 
-#: ../commands/proclang.c:84
+#: commands/prepare.c:241
 #, c-format
-msgid "Language %s already exists"
+msgid "Prepared statement with name \"%s\" already exists"
 msgstr ""
 
-#: ../commands/proclang.c:97
+#: commands/prepare.c:271
 #, c-format
-msgid "PL handler function %s() doesn't exist"
+msgid "Unable to store prepared statement \"%s\"!"
 msgstr ""
 
-#: ../commands/proclang.c:100
+#: commands/prepare.c:297 commands/prepare.c:314 commands/prepare.c:367
+#: commands/prepare.c:391
 #, c-format
-msgid "PL handler function %s() isn't of return type Opaque"
+msgid "Prepared statement with name \"%s\" does not exist"
 msgstr ""
 
-#: ../commands/proclang.c:157
-msgid ""
-"Only users with Postgres superuser privilege are permitted to drop "
-"procedural languages"
+#: commands/typecmds.c:94
+#, c-format
+msgid "DefineType: type names must be %d characters or less"
 msgstr ""
 
-#: ../commands/proclang.c:172
+#: commands/typecmds.c:124
 #, c-format
-msgid "Language %s doesn't exist"
+msgid "Array element type cannot be %s"
 msgstr ""
 
-#: ../commands/proclang.c:175
+#: commands/typecmds.c:155
 #, c-format
-msgid "Language %s isn't a created procedural language"
+msgid "DefineType: \"%s\" alignment not recognized"
 msgstr ""
 
-#: ../commands/remove.c:59 ../commands/remove.c:66
+#: commands/typecmds.c:171
 #, c-format
-msgid "RemoveOperator: type '%s' does not exist"
-msgstr "RemoveOperator: Typ �%s� existiert nicht"
+msgid "DefineType: \"%s\" storage not recognized"
+msgstr ""
 
-#: ../commands/remove.c:87
+#: commands/typecmds.c:176
 #, c-format
-msgid "RemoveOperator: operator '%s': permission denied"
-msgstr "RemoveOperator: Operator �%s�: keine Berechtigung"
+msgid "DefineType: attribute \"%s\" not recognized"
+msgstr ""
 
-#: ../commands/remove.c:100
-#, c-format
-msgid ""
-"RemoveOperator: binary operator '%s' taking '%s' and '%s' does not exist"
+#: commands/typecmds.c:185
+msgid "Define: \"input\" unspecified"
 msgstr ""
-"RemoveOperator: bin�rer Operator �%s� mit Operanden %s und %s existiert nicht"
 
-#: ../commands/remove.c:107
-#, c-format
-msgid "RemoveOperator: right unary operator '%s' taking '%s' does not exist"
+#: commands/typecmds.c:187
+msgid "Define: \"output\" unspecified"
 msgstr ""
-"RemoveOperator: rechter un�rer Operator �%s� mit Operand %s existiert nicht"
 
-#: ../commands/remove.c:113
+#: commands/typecmds.c:220
 #, c-format
-msgid "RemoveOperator: left unary operator '%s' taking '%s' does not exist"
+msgid "TypeCreate: changing return type of function %s from OPAQUE to %s"
 msgstr ""
-"RemoveOperator: linker un�rer Operator �%s� mit Operand %s existiert nicht"
 
-#: ../commands/remove.c:245
+#: commands/typecmds.c:225
 #, c-format
-msgid "RemoveType: type '%s': permission denied"
-msgstr "RemoveType: Typ �%s�: keine Berechtigung"
+msgid "Type input function %s must return %s"
+msgstr ""
 
-#: ../commands/remove.c:254 ../commands/remove.c:269
+#: commands/typecmds.c:233
 #, c-format
-msgid "RemoveType: type '%s' does not exist"
-msgstr "RemoveType: Typ �%s� existiert nicht"
+msgid "TypeCreate: changing return type of function %s from OPAQUE to CSTRING"
+msgstr ""
 
-#: ../commands/remove.c:316
+#: commands/typecmds.c:238
 #, c-format
-msgid "RemoveFunction: type '%s' not found"
-msgstr "RemoveFunction: Typ �%s� nicht gefunden"
+msgid "Type output function %s must return cstring"
+msgstr ""
 
-#: ../commands/remove.c:322
+#: commands/typecmds.c:366
 #, c-format
-msgid "RemoveFunction: function '%s': permission denied"
-msgstr "RemoveFunction: Funktion �%s�: keine Berechtigung"
+msgid "RemoveTypeById: type %u not found"
+msgstr "RemoveTypeById: Typ %u nicht gefunden"
 
-#: ../commands/remove.c:340
+#: commands/typecmds.c:426
 #, c-format
-msgid "Removing built-in function \"%s\""
-msgstr "eingebaute Funktion �%s� wird entfernt"
+msgid "CREATE DOMAIN: domain names must be %d characters or less"
+msgstr ""
 
-#: ../commands/remove.c:374
+#: commands/typecmds.c:445
 #, c-format
-msgid "RemoveAggregate: type '%s' does not exist"
-msgstr "RemoveAggregate: Typ �%s� existiert nicht"
+msgid "DefineDomain: %s is not a basetype"
+msgstr ""
 
-#: ../commands/remove.c:382
-#, c-format
-msgid "RemoveAggregate: aggregate '%s' for all types: permission denied"
+#: commands/typecmds.c:509
+msgid "CREATE DOMAIN has multiple DEFAULT expressions"
 msgstr ""
-"RemoveAggregate: Aggregatfunktion �%s� f�r alle Typen: keine Berechtigung"
 
-#: ../commands/remove.c:385
-#, c-format
-msgid "RemoveAggregate: aggregate '%s' for type %s: permission denied"
+#: commands/typecmds.c:539 commands/typecmds.c:546
+msgid "CREATE DOMAIN has conflicting NULL / NOT NULL constraint"
 msgstr ""
-"RemoveAggregate: Aggregatfunction �%s� f�r Typen %s: keine Berechtigung"
 
-#: ../commands/rename.c:91
-#, c-format
-msgid "renameatt: class \"%s\" is a system catalog"
-msgstr "renameatt: Klasse �%s� ist ein Systemkatalog"
+#: commands/typecmds.c:552
+msgid "CREATE DOMAIN / UNIQUE indexes not supported"
+msgstr ""
 
-#: ../commands/rename.c:95
-#, c-format
-msgid "renameatt: you do not own class \"%s\""
-msgstr "renameatt: Sie sind nicht der Eigent�mer von Klasse �%s�"
+#: commands/typecmds.c:556
+msgid "CREATE DOMAIN / PRIMARY KEY indexes not supported"
+msgstr ""
 
-#: ../commands/rename.c:139
-#, c-format
-msgid "renameatt: can't find catalog entry for inheriting class with oid %u"
+#: commands/typecmds.c:560
+msgid "DefineDomain: CHECK Constraints not supported"
 msgstr ""
 
-#: ../commands/rename.c:159
-#, c-format
-msgid "renameatt: attribute \"%s\" does not exist"
-msgstr "renameatt: Attribut �%s� existiert nicht"
+#: commands/typecmds.c:567
+msgid ""
+"DefineDomain: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
+"supported"
+msgstr ""
 
-#: ../commands/rename.c:162
-#, c-format
-msgid "renameatt: system attribute \"%s\" not renamed"
-msgstr "renameatt: Systemattribut �%s� wurde nicht umbenannt"
+#: commands/typecmds.c:571
+msgid "DefineDomain: unrecognized constraint node type"
+msgstr ""
 
-#: ../commands/rename.c:169
+#: commands/typecmds.c:654
 #, c-format
-msgid "renameatt: attribute \"%s\" exists"
-msgstr "renameatt: Attribut �%s� existiert bereits"
+msgid "RemoveDomain: type \"%s\" does not exist"
+msgstr "RemoveDomain: Typ �%s� existiert nicht"
 
-#: ../commands/rename.c:206
+#: commands/typecmds.c:667
 #, c-format
-msgid "renameatt: can't find index id %u"
+msgid "%s is not a domain"
 msgstr ""
 
-#: ../commands/rename.c:281
+#: commands/typecmds.c:736
 #, c-format
-msgid "renamerel: system relation \"%s\" may not be renamed"
-msgstr "renamerel: Systemrelation �%s� darf nicht umbenannt werden"
+msgid "TypeCreate: changing argument type of function %s from OPAQUE to %s"
+msgstr ""
 
-#: ../commands/rename.c:285
+#: commands/typecmds.c:795
 #, c-format
 msgid ""
-"renamerel: Illegal class name: \"%s\" -- pg_ is reserved for system catalogs"
-msgstr "illegaler Klassenname: �%s� -- pg_ is f�r Systemkataloge reserviert"
+"TypeCreate: changing argument type of function %s from OPAQUE to CSTRING"
+msgstr ""
 
-#: ../commands/rename.c:331
-#, c-format
-msgid "renamerel: relation \"%s\" does not exist"
-msgstr "renamerel: Relation �%s� existiert nicht"
+#: commands/typecmds.c:837
+msgid "attempted to define composite type relation with no attrs"
+msgstr ""
 
-#: ../commands/rename.c:334
+#: commands/user.c:147
 #, c-format
-msgid "renamerel: relation \"%s\" exists"
-msgstr "renamerel: Relation �%s� existiert bereits"
+msgid "write_group_file: unable to write %s: %m"
+msgstr ""
 
-#: ../commands/sequence.c:189
-msgid "DefineSequence: ReadBuffer failed"
+#: commands/user.c:181
+#, c-format
+msgid "Invalid group name '%s'"
 msgstr ""
 
-#: ../commands/sequence.c:268
+#: commands/user.c:211 commands/user.c:335
 #, c-format
-msgid "%s.nextval: you don't have permissions to set sequence %s"
-msgstr "%s.nextval: keine Berechtigung um Sequenz %s zu setzen"
+msgid "Invalid user name '%s'"
+msgstr ""
 
-#: ../commands/sequence.c:320
+#: commands/user.c:242 commands/user.c:364
 #, c-format
-msgid "%s.nextval: reached MAXVALUE ("
+msgid "%s: %m"
 msgstr ""
 
-#: ../commands/sequence.c:320 ../commands/sequence.c:336
-#: ../commands/sequence.c:461 ../commands/sequence.c:785
-#: ../commands/sequence.c:799 ../commands/sequence.c:802
-msgid ")"
+#: commands/user.c:250 commands/user.c:372
+#, c-format
+msgid "rename %s to %s: %m"
 msgstr ""
 
-#: ../commands/sequence.c:336
+#: commands/user.c:286
 #, c-format
-msgid "%s.nextval: reached MINVALUE ("
+msgid "write_user_file: unable to write %s: %m"
 msgstr ""
 
-#: ../commands/sequence.c:400
+#: commands/user.c:341
 #, c-format
-msgid "%s.nextval: WriteBuffer failed"
+msgid "Invalid user password '%s'"
+msgstr ""
+
+#: commands/user.c:505 commands/user.c:515 commands/user.c:521
+#: commands/user.c:527 commands/user.c:533 commands/user.c:539
+msgid "CREATE USER: conflicting options"
 msgstr ""
 
-#: ../commands/sequence.c:414
+#: commands/user.c:543
 #, c-format
-msgid "%s.currval: you don't have permissions to read sequence %s"
-msgstr "%s.curval: keine Berechtigung um Sequenz %s zu lesen"
+msgid "CREATE USER: option \"%s\" not recognized"
+msgstr ""
+
+#: commands/user.c:555
+msgid "user id must be positive"
+msgstr ""
+
+#: commands/user.c:570
+msgid "CREATE USER: permission denied"
+msgstr "CREATE USER: keine Berechtigung"
 
-#: ../commands/sequence.c:421
+#: commands/user.c:573
 #, c-format
-msgid "%s.currval is not yet defined in this session"
-msgstr "%s.currval ist in dieser Sitzung noch nicht definiert"
+msgid "CREATE USER: user name \"%s\" is reserved"
+msgstr "CREATE USER: Benutzername �%s� ist reserviert"
 
-#: ../commands/sequence.c:452
+#: commands/user.c:608
 #, c-format
-msgid "%s.setval: you don't have permissions to set sequence %s"
-msgstr "%s.setval: keine Berechtigung um Sequenz %s zu lesen"
+msgid "CREATE USER: user name \"%s\" already exists"
+msgstr "CREATE USER: Benutzername �%s� existiert bereits"
 
-#: ../commands/sequence.c:461
+#: commands/user.c:611
 #, c-format
-msgid "%s.setval: value "
+msgid "CREATE USER: sysid %d is already assigned"
 msgstr ""
 
-#: ../commands/sequence.c:461
-msgid " is out of bounds ("
+#: commands/user.c:642 commands/user.c:843
+msgid "CREATE USER: password encryption failed"
 msgstr ""
 
-#: ../commands/sequence.c:461
-msgid ","
+#: commands/user.c:733 commands/user.c:743 commands/user.c:749
+#: commands/user.c:755
+msgid "ALTER USER: conflicting options"
 msgstr ""
 
-#: ../commands/sequence.c:505
+#: commands/user.c:759
 #, c-format
-msgid "%s.setval: WriteBuffer failed"
+msgid "ALTER USER: option \"%s\" not recognized"
 msgstr ""
 
-#: ../commands/sequence.c:607
-#, c-format
-msgid "%s.%s: invalid number of blocks in sequence"
-msgstr ""
+#: commands/user.c:782
+msgid "ALTER USER: permission denied"
+msgstr "ALTER USER: keine Berechtigung"
 
-#: ../commands/sequence.c:612
+#: commands/user.c:796
 #, c-format
-msgid "%s.%s: ReadBuffer failed"
+msgid "ALTER USER: user \"%s\" does not exist"
 msgstr ""
 
-#: ../commands/sequence.c:620
+#: commands/user.c:907 commands/variable.c:549 utils/cache/lsyscache.c:1507
+#: utils/init/miscinit.c:556
 #, c-format
-msgid "%s.%s: bad magic (%08X)"
+msgid "user \"%s\" does not exist"
 msgstr ""
 
-#: ../commands/sequence.c:657
+#: commands/user.c:963
+msgid "DROP USER: permission denied"
+msgstr "DROP USER: keine Berechtigung"
+
+#: commands/user.c:990
 #, c-format
-msgid "%s.%s: %s is not a sequence"
+msgid "DROP USER: user \"%s\" does not exist (no users removed)"
 msgstr ""
 
-#: ../commands/sequence.c:668
+#: commands/user.c:992
 #, c-format
-msgid "%s.%s: sequence was re-created"
-msgstr ""
+msgid "DROP USER: user \"%s\" does not exist"
+msgstr "DROP USER: Benutzer �%s� existiert nicht"
 
-#: ../commands/sequence.c:682 ../commands/sequence.c:685
-msgid "Memory exhausted in init_sequence"
-msgstr ""
+#: commands/user.c:998
+msgid "current user cannot be dropped"
+msgstr "aktueller Benutzer kann nicht entfernt werden"
 
-#: ../commands/sequence.c:751
-msgid "DefineSequence: CYCLE ??"
-msgstr ""
+#: commands/user.c:1000
+msgid "session user cannot be dropped"
+msgstr "aktueller Sitzungsbenutzer kann nicht entfernt werden"
 
-#: ../commands/sequence.c:755
+#: commands/user.c:1024
 #, c-format
-msgid "DefineSequence: option \"%s\" not recognized"
+msgid "DROP USER: user \"%s\" owns database \"%s\", cannot be removed%s"
 msgstr ""
 
-#: ../commands/sequence.c:762
-msgid "DefineSequence: can't INCREMENT by 0"
+#: commands/user.c:1104
+#, c-format
+msgid "CheckPgUserAclNotNull: \"%s\" not found"
 msgstr ""
 
-#: ../commands/sequence.c:785
-msgid "DefineSequence: MINVALUE ("
+#: commands/user.c:1109
+#, c-format
+msgid ""
+"To use passwords, you have to revoke permissions on %s so normal users "
+"cannot read the passwords. Try 'REVOKE ALL ON \"%s\" FROM PUBLIC'."
 msgstr ""
 
-#: ../commands/sequence.c:785
-msgid ") can't be >= MAXVALUE ("
+#: commands/user.c:1151 commands/user.c:1157
+msgid "CREATE GROUP: conflicting options"
 msgstr ""
 
-#: ../commands/sequence.c:799 ../commands/sequence.c:802
-msgid "DefineSequence: START value ("
+#: commands/user.c:1161
+#, c-format
+msgid "CREATE GROUP: option \"%s\" not recognized"
 msgstr ""
 
-#: ../commands/sequence.c:799
-msgid ") can't be < MINVALUE ("
+#: commands/user.c:1169
+msgid "group id must be positive"
 msgstr ""
 
-#: ../commands/sequence.c:802
-msgid ") can't be > MAXVALUE ("
-msgstr ""
+#: commands/user.c:1180
+msgid "CREATE GROUP: permission denied"
+msgstr "CREATE GROUP: keine Berechtigung"
 
-#: ../commands/sequence.c:808
-msgid "DefineSequence: CACHE ("
-msgstr ""
+#: commands/user.c:1183
+#, c-format
+msgid "CREATE GROUP: group name \"%s\" is reserved"
+msgstr "CREATE GROUP: Gruppenname �%s� ist reserviert"
 
-#: ../commands/sequence.c:808
-msgid ") can't be <= 0"
+#: commands/user.c:1218
+#, c-format
+msgid "CREATE GROUP: group name \"%s\" already exists"
 msgstr ""
 
-#: ../commands/sequence.c:817
+#: commands/user.c:1221
 #, c-format
-msgid "DefineSequence: \"%s\" value unspecified"
+msgid "CREATE GROUP: group sysid %d is already assigned"
 msgstr ""
 
-#: ../commands/sequence.c:831
+#: commands/user.c:1314
 #, c-format
-msgid "DefineSequence: \"%s\" value must be integer"
-msgstr ""
+msgid "%s: group \"%s\" does not exist"
+msgstr "%s: Gruppe �%s� existiert nicht"
 
-#: ../commands/sequence.c:848
+#: commands/user.c:1355
 #, c-format
-msgid "seq_redo: unknown op code %u"
+msgid "AlterGroup: unknown tag %s"
 msgstr ""
 
-#: ../commands/sequence.c:856
+#: commands/user.c:1367
 #, c-format
-msgid "seq_redo: can't read block of %u/%u"
-msgstr ""
+msgid "%s: user \"%s\" is already in group \"%s\""
+msgstr "%s: Benutzer �%s� ist schon in Gruppe �%s�"
 
-#: ../commands/sequence.c:870
-msgid "seq_redo: failed to add item to page"
-msgstr ""
+#: commands/user.c:1382
+#, c-format
+msgid "ALTER GROUP: group \"%s\" does not have any members"
+msgstr "ALTER GROUP: Gruppe �%s� hat keine Mitglieder"
 
-#: ../commands/trigger.c:75
+#: commands/user.c:1407
 #, c-format
-msgid "CreateTrigger: can't create trigger for system relation %s"
-msgstr ""
+msgid "ALTER GROUP: user \"%s\" is not in group \"%s\""
+msgstr "ALTER GROUP: Benutzer �%s� ist nicht in Gruppe �%s�"
 
-#: ../commands/trigger.c:114
-msgid "CreateTrigger: STATEMENT triggers are unimplemented, yet"
+#: commands/user.c:1536
+msgid "DROP GROUP: permission denied"
+msgstr "DROP GROUP: keine Berechtigung"
+
+#: commands/user.c:1549
+#, c-format
+msgid "DROP GROUP: group \"%s\" does not exist"
 msgstr ""
 
-#: ../commands/trigger.c:122
-msgid "CreateTrigger: double INSERT event specified"
+#: commands/vacuum.c:459
+msgid ""
+"oldest Xmin is far in the past --- close open transactions soon to avoid "
+"wraparound problems"
 msgstr ""
 
-#: ../commands/trigger.c:127
-msgid "CreateTrigger: double DELETE event specified"
+#: commands/vacuum.c:505 commands/vacuum.c:512
+#, c-format
+msgid "pg_class entry for relid %u vanished during vacuuming"
 msgstr ""
 
-#: ../commands/trigger.c:132
-msgid "CreateTrigger: double UPDATE event specified"
+#: commands/vacuum.c:665
+msgid ""
+"Some databases have not been vacuumed in over 2 billion transactions.\n"
+"\tYou may have already suffered transaction-wraparound data loss."
 msgstr ""
 
-#: ../commands/trigger.c:136
-msgid "CreateTrigger: unknown event specified"
+#: commands/vacuum.c:676
+msgid ""
+"Some databases have not been vacuumed in over 1 billion transactions.\n"
+"\tBetter vacuum them soon, or you may have a wraparound failure."
 msgstr ""
 
-#: ../commands/trigger.c:156
+#: commands/vacuum.c:683
 #, c-format
-msgid "CreateTrigger: trigger %s already defined on relation %s"
+msgid ""
+"Some databases have not been vacuumed in %d transactions.\n"
+"\tBetter vacuum them within %d transactions,\n"
+"\tor you may have a wraparound failure."
 msgstr ""
 
-#: ../commands/trigger.c:172
+#: commands/vacuum.c:771
 #, c-format
-msgid "CreateTrigger: function %s() does not exist"
+msgid "Skipping \"%s\" --- only table or database owner can VACUUM it"
 msgstr ""
 
-#: ../commands/trigger.c:175
+#: commands/vacuum.c:977
 #, c-format
-msgid "CreateTrigger: function %s() must return OPAQUE"
+msgid "VACUUM (full_vacuum_rel): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: ../commands/trigger.c:189
+#: commands/vacuum.c:1044 commands/vacuumlazy.c:211
 #, c-format
-msgid "CreateTrigger: cache lookup for language %u failed"
+msgid "--Relation %s.%s--"
 msgstr ""
 
-#: ../commands/trigger.c:192
-msgid "CreateTrigger: only internal, C and PL functions are supported"
+#: commands/vacuum.c:1078 commands/vacuumlazy.c:269
+#, c-format
+msgid "Rel %s: Uninitialized page %u - fixing"
 msgstr ""
 
-#: ../commands/trigger.c:284
+#: commands/vacuum.c:1192
 #, c-format
-msgid "CreateTrigger: relation %s not found in pg_class"
+msgid ""
+"Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
-#: ../commands/trigger.c:350
+#: commands/vacuum.c:1202
 #, c-format
-msgid "DropTrigger: there is no trigger %s on relation %s"
+msgid ""
+"Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
-#: ../commands/trigger.c:353
+#: commands/vacuum.c:1220 commands/vacuumlazy.c:373
 #, c-format
-msgid "DropTrigger: found (and deleted) %d triggers %s on relation %s"
+msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
 msgstr ""
 
-#: ../commands/trigger.c:368
+#: commands/vacuum.c:1358
 #, c-format
-msgid "DropTrigger: relation %s not found in pg_class"
+msgid ""
+"Pages %u: Changed %u, reaped %u, Empty %u, New %u; Tup %.0f: Vac %.0f, Keep/"
+"VTL %.0f/%u, UnUsed %.0f, MinLen %lu, MaxLen %lu; Re-using: Free/Avail. "
+"Space %.0f/%.0f; EndEmpty/Avail. Pages %u/%u.\n"
+"\t%s"
 msgstr ""
 
-#: ../commands/trigger.c:439
-#, c-format
-msgid "RelationRemoveTriggers: relation %u not found in pg_class"
+#: commands/vacuum.c:1581
+msgid "HEAP_MOVED_IN was not expected"
 msgstr ""
 
-#: ../commands/trigger.c:475
-#, c-format
-msgid ""
-"DROP TABLE implicitly drops referential integrity trigger from table \"%s\""
+#: commands/vacuum.c:1591
+msgid "Invalid XVAC in tuple header"
 msgstr ""
 
-#: ../commands/trigger.c:566
-#, c-format
-msgid "RelationBuildTriggers: unexpected record found for rel %s"
+#: commands/vacuum.c:1616
+msgid "HEAP_MOVED_OFF was expected"
 msgstr ""
 
-#: ../commands/trigger.c:601
-#, c-format
-msgid "RelationBuildTriggers: tgargs IS NULL for rel %s"
+#: commands/vacuum.c:1670 commands/vacuum.c:1792
+msgid "Parent item in update-chain not found - can't continue repair_frag"
+msgstr ""
+
+#: commands/vacuum.c:1707
+msgid ""
+"Child itemid in update-chain marked as unused - can't continue repair_frag"
+msgstr ""
+
+#: commands/vacuum.c:1804
+msgid "Parent itemid marked as unused"
+msgstr ""
+
+#: commands/vacuum.c:1828
+msgid "Too old parent tuple found - can't continue repair_frag"
 msgstr ""
 
-#: ../commands/trigger.c:623
+#: commands/vacuum.c:1957
 #, c-format
-msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
+msgid "moving chain: failed to add item with len = %lu to page %u"
 msgstr ""
 
-#: ../commands/trigger.c:882
+#: commands/vacuum.c:2101
 #, c-format
-msgid "ExecCallTriggerFunc: function %u returned NULL"
+msgid ""
+"failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %"
+"u)"
 msgstr ""
 
-#: ../commands/trigger.c:1119 ../executor/execMain.c:1062
-#: ../executor/execMain.c:1333 ../executor/execMain.c:1465
-msgid "Can't serialize access due to concurrent update"
+#: commands/vacuum.c:2190
+msgid "HEAP_MOVED_IN was not expected (2)"
 msgstr ""
 
-#: ../commands/trigger.c:1142 ../executor/execMain.c:1083
-#, c-format
-msgid "Unknown status %u from heap_mark4update"
+#: commands/vacuum.c:2194
+msgid "Invalid XVAC in tuple header (4)"
 msgstr ""
 
-#: ../commands/trigger.c:1154
-msgid "GetTupleForTrigger: failed ReadBuffer"
+#: commands/vacuum.c:2219
+msgid "HEAP_MOVED_OFF was expected (2)"
 msgstr ""
 
-#: ../commands/trigger.c:1345
-msgid "DeferredTriggerExecute: failed to fetch old tuple"
+#: commands/vacuum.c:2330
+msgid "HEAP_MOVED_OFF/HEAP_MOVED_IN was expected"
 msgstr ""
 
-#: ../commands/trigger.c:1353
-msgid "DeferredTriggerExecute: failed to fetch new tuple"
+#: commands/vacuum.c:2332
+msgid "Invalid XVAC in tuple header (2)"
 msgstr ""
 
-#: ../commands/trigger.c:1374
+#: commands/vacuum.c:2350
 #, c-format
-msgid "DeferredTriggerExecute: can't find trigger %u"
+msgid ""
+"Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n"
+"\t%s"
 msgstr ""
 
-#: ../commands/trigger.c:1619
-msgid "DeferredTriggerBeginXact() called while inside transaction"
+#: commands/vacuum.c:2412
+msgid "Invalid XVAC in tuple header (3)"
 msgstr ""
 
-#: ../commands/trigger.c:1827
-msgid "unnamed constraints cannot be set explicitly"
+#: commands/vacuum.c:2417
+msgid "HEAP_MOVED_OFF was expected (3)"
 msgstr ""
 
-#: ../commands/trigger.c:1878
+#: commands/vacuum.c:2467
 #, c-format
-msgid "Constraint '%s' is not deferrable"
+msgid "VACUUM (repair_frag): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: ../commands/trigger.c:1893
+#: commands/vacuum.c:2531
 #, c-format
-msgid "Constraint '%s' does not exist"
+msgid "VACUUM (vacuum_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: ../commands/trigger.c:2008
-msgid "DeferredTriggerSaveEvent() called outside of transaction"
+#: commands/vacuum.c:2537
+#, c-format
+msgid "Rel %s: Pages: %u --> %u."
 msgstr ""
 
-#: ../commands/user.c:81
+#: commands/vacuum.c:2622 commands/vacuumlazy.c:600
 #, c-format
-msgid "write_password_file: unable to write %s: %m"
+msgid ""
+"Index %s: Pages %u; Tuples %.0f.\n"
+"\t%s"
 msgstr ""
 
-#: ../commands/user.c:130
+#: commands/vacuum.c:2635 commands/vacuum.c:2689
 #, c-format
-msgid "Invalid user name '%s'"
+msgid ""
+"Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\n"
+"\tRecreate the index."
 msgstr ""
 
-#: ../commands/user.c:133
+#: commands/vacuum.c:2676 commands/vacuumlazy.c:647
 #, c-format
-msgid "Invalid user password '%s'"
+msgid ""
+"Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
+"\t%s"
 msgstr ""
 
-#: ../commands/user.c:168
+#: commands/vacuumlazy.c:435
 #, c-format
-msgid "%s: %m"
+msgid ""
+"Pages %u: Changed %u, Empty %u; Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n"
+"\tTotal %s"
 msgstr ""
 
-#: ../commands/user.c:176
+#: commands/vacuumlazy.c:485
 #, c-format
-msgid "rename %s to %s: %m"
+msgid ""
+"Removed %d tuples in %d pages.\n"
+"\t%s"
 msgstr ""
 
-#: ../commands/user.c:252 ../commands/user.c:262 ../commands/user.c:268
-#: ../commands/user.c:274 ../commands/user.c:280 ../commands/user.c:286
-msgid "CREATE USER: conflicting options"
+#: commands/vacuumlazy.c:721
+#, c-format
+msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: ../commands/user.c:290
+#: commands/vacuumlazy.c:756
 #, c-format
-msgid "CREATE USER: option \"%s\" not recognized"
+msgid ""
+"Truncated %u --> %u pages.\n"
+"\t%s"
 msgstr ""
 
-#: ../commands/user.c:302
-msgid "user id must be positive"
+#: commands/variable.c:62
+msgid "SET DATESTYLE: invalid list syntax"
 msgstr ""
 
-#: ../commands/user.c:317
-msgid "CREATE USER: permission denied"
-msgstr "CREATE USER: keine Berechtigung"
-
-#: ../commands/user.c:356
-#, c-format
-msgid "CREATE USER: user name \"%s\" already exists"
-msgstr "CREATE USER: Benutzername �%s� existiert bereits"
-
-#: ../commands/user.c:359
+#: commands/variable.c:141
 #, c-format
-msgid "CREATE USER: sysid %d is already assigned"
+msgid "SET DATESTYLE: unrecognized keyword %s"
 msgstr ""
 
-#: ../commands/user.c:389 ../commands/user.c:627
-msgid "CREATE USER: password encryption failed"
+#: commands/variable.c:156
+msgid "SET DATESTYLE: conflicting specifications"
 msgstr ""
 
-#: ../commands/user.c:494 ../commands/user.c:504 ../commands/user.c:510
-#: ../commands/user.c:516
-msgid "ALTER USER: conflicting options"
+#: commands/variable.c:288
+msgid "SET TIME ZONE: illegal INTERVAL; month not allowed"
 msgstr ""
 
-#: ../commands/user.c:520
-#, c-format
-msgid "ALTER USER: option \"%s\" not recognized"
+#: commands/variable.c:331
+msgid "Unable to clear TZ environment variable"
 msgstr ""
 
-#: ../commands/user.c:543
-msgid "ALTER USER: permission denied"
-msgstr "ALTER USER: keine Berechtigung"
+#: commands/variable.c:351
+msgid "assign_timezone: putenv failed"
+msgstr ""
 
-#: ../commands/user.c:547
-msgid "ALTER USER: password changes cannot be rolled back"
+#: commands/variable.c:420
+msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr ""
 
-#: ../commands/user.c:561
+#: commands/variable.c:495
 #, c-format
-msgid "ALTER USER: user \"%s\" does not exist"
+msgid "Conversion between %s and %s is not supported"
 msgstr ""
 
-#: ../commands/user.c:698
-msgid "DROP USER: permission denied"
-msgstr "DROP USER: keine Berechtigung"
+#: commands/variable.c:507
+msgid "SET SERVER_ENCODING is not supported"
+msgstr ""
 
-#: ../commands/user.c:701
-msgid "DROP USER cannot be rolled back completely"
+#: commands/view.c:87
+msgid "attempted to define virtual relation with no attrs"
 msgstr ""
 
-#: ../commands/user.c:728
+#: commands/view.c:109
 #, c-format
-msgid "DROP USER: user \"%s\" does not exist%s"
+msgid "%s is not a view"
 msgstr ""
 
-#: ../commands/user.c:734
-msgid "current user cannot be dropped"
-msgstr "aktueller Benutzer kann nicht entfernt werden"
-
-#: ../commands/user.c:736
-msgid "session user cannot be dropped"
-msgstr "aktueller Sitzungsbenutzer kann nicht entfernt werden"
-
-#: ../commands/user.c:763
-#, c-format
-msgid "DROP USER: user \"%s\" owns database \"%s\", cannot be removed%s"
+#: commands/view.c:161 commands/view.c:171
+msgid "Cannot change number of columns in view"
 msgstr ""
 
-#: ../commands/user.c:843
+#: commands/view.c:174
 #, c-format
-msgid "CheckPgUserAclNotNull: \"%s\" not found"
+msgid "Cannot change name of view column \"%s\""
 msgstr ""
 
-#: ../commands/user.c:848
+#: commands/view.c:179
 #, c-format
-msgid ""
-"To use passwords, you have to revoke permissions on %s so normal users "
-"cannot read the passwords. Try 'REVOKE ALL ON \"%s\" FROM PUBLIC'."
+msgid "Cannot change datatype of view column \"%s\""
 msgstr ""
 
-#: ../commands/user.c:890 ../commands/user.c:896
-msgid "CREATE GROUP: conflicting options"
+#: executor/execAmi.c:161
+#, c-format
+msgid "ExecReScan: node type %d not supported"
 msgstr ""
 
-#: ../commands/user.c:900
+#: executor/execAmi.c:213
 #, c-format
-msgid "CREATE GROUP: option \"%s\" not recognized"
+msgid "ExecMarkPos: node type %d not supported"
 msgstr ""
 
-#: ../commands/user.c:908
-msgid "group id must be positive"
+#: executor/execAmi.c:254
+#, c-format
+msgid "ExecRestrPos: node type %d not supported"
 msgstr ""
 
-#: ../commands/user.c:919
-msgid "CREATE GROUP: permission denied"
-msgstr "CREATE GROUP: keine Berechtigung"
-
-#: ../commands/user.c:952
+#: executor/execMain.c:408
 #, c-format
-msgid "CREATE GROUP: group name \"%s\" already exists"
+msgid "ExecCheckRTEPerms: bogus operation %d"
 msgstr ""
 
-#: ../commands/user.c:955
+#: executor/execMain.c:782
 #, c-format
-msgid "CREATE GROUP: group sysid %d is already assigned"
+msgid "You can't change sequence relation %s"
 msgstr ""
 
-#: ../commands/user.c:1045
+#: executor/execMain.c:786
 #, c-format
-msgid "%s: permission denied"
-msgstr "%s: keine Berechtigung"
+msgid "You can't change toast relation %s"
+msgstr ""
 
-#: ../commands/user.c:1057
+#: executor/execMain.c:790
 #, c-format
-msgid "%s: group \"%s\" does not exist"
-msgstr "%s: Gruppe �%s� existiert nicht"
+msgid "You can't change view relation %s"
+msgstr ""
 
-#: ../commands/user.c:1121
-#, c-format
-msgid "AlterGroup: unknown tag %s"
+#: executor/execMain.c:992
+msgid "ExecutePlan: NO (junk) `ctid' was found!"
 msgstr ""
 
-#: ../commands/user.c:1133
-#, c-format
-msgid "%s: user \"%s\" is already in group \"%s\""
-msgstr "%s: Benutzer �%s� ist schon in Gruppe �%s�"
+#: executor/execMain.c:996
+msgid "ExecutePlan: (junk) `ctid' is NULL!"
+msgstr ""
 
-#: ../commands/user.c:1185
+#: executor/execMain.c:1021
 #, c-format
-msgid "ALTER GROUP: group \"%s\" does not have any members"
-msgstr "ALTER GROUP: Gruppe �%s� hat keine Mitglieder"
+msgid "ExecutePlan: NO (junk) `%s' was found!"
+msgstr ""
 
-#: ../commands/user.c:1238
+#: executor/execMain.c:1026
 #, c-format
-msgid "ALTER GROUP: user \"%s\" is not in group \"%s\""
-msgstr "ALTER GROUP: Benutzer �%s� ist nicht in Gruppe �%s�"
+msgid "ExecutePlan: (junk) `%s' is NULL!"
+msgstr ""
 
-#: ../commands/user.c:1304
-msgid "DROP GROUP: permission denied"
-msgstr "DROP GROUP: keine Berechtigung"
+#: executor/execMain.c:1115
+msgid "ExecutePlan: unknown operation in queryDesc"
+msgstr ""
 
-#: ../commands/user.c:1333
-#, c-format
-msgid "DROP GROUP: group \"%s\" does not exist"
+#: executor/execMain.c:1383
+msgid "ExecUpdate: UPDATE can't run without transactions"
 msgstr ""
 
-#: ../commands/vacuum.c:187
+#: executor/execMain.c:1583
 #, c-format
-msgid "%s cannot run inside a BEGIN/END block"
+msgid "%s: Fail to add null value in not null attribute %s"
 msgstr ""
 
-#: ../commands/vacuum.c:403
+#: executor/execMain.c:1593
 #, c-format
-msgid "%s: can not process indexes, views or special system tables"
-msgstr ""
+msgid "%s: rejected due to CHECK constraint \"%s\" on \"%s\""
+msgstr "%s: wegen CHECK-Constraint �%s� an �%s� abgelehnt"
 
-#: ../commands/vacuum.c:427
+#: executor/execMain.c:1637
 #, c-format
-msgid "%s: table not found"
+msgid "EvalPlanQual: can't find RTE %d"
 msgstr ""
 
-#: ../commands/vacuum.c:471
-msgid ""
-"oldest Xmin is far in the past --- close open transactions soon to avoid "
-"wraparound problems"
+#: executor/execMain.c:1655
+msgid "EvalPlanQual: t_xmin is uncommitted ?!"
 msgstr ""
 
-#: ../commands/vacuum.c:517
+#: executor/execProcnode.c:228
 #, c-format
-msgid "pg_class entry for relid %u vanished during vacuuming"
+msgid "ExecInitNode: node type %d unsupported"
 msgstr ""
 
-#: ../commands/vacuum.c:584 ../utils/misc/superuser.c:73
+#: executor/execProcnode.c:361
 #, c-format
-msgid "database %u does not exist"
+msgid "ExecProcNode: node type %d unsupported"
 msgstr ""
 
-#: ../commands/vacuum.c:655
+#: executor/execProcnode.c:448
 #, c-format
-msgid ""
-"Some databases have not been vacuumed in %d transactions.\n"
-"\tBetter vacuum them within %d transactions,\n"
-"\tor you may have a wraparound failure."
+msgid "ExecCountSlotsNode: node type %d unsupported"
 msgstr ""
 
-#: ../commands/vacuum.c:735
+#: executor/execProcnode.c:574
 #, c-format
-msgid "Skipping \"%s\" --- only table or database owner can VACUUM it"
+msgid "ExecEndNode: node type %d unsupported"
 msgstr ""
 
-#: ../commands/vacuum.c:907
+#: executor/execProcnode.c:753
 #, c-format
-msgid "VACUUM (full_vacuum_rel): FlushRelationBuffers returned %d"
+msgid "ExecGetTupType: node type %d unsupported"
 msgstr ""
 
-#: ../commands/vacuum.c:974 ../commands/vacuumlazy.c:211
+#: executor/execQual.c:150 executor/execQual.c:172
 #, c-format
-msgid "--Relation %s--"
+msgid "ExecEvalArrayRef: can only handle %d dimensions"
 msgstr ""
 
-#: ../commands/vacuum.c:1004 ../commands/vacuumlazy.c:265
-#, c-format
-msgid "Rel %s: Uninitialized page %u - fixing"
+#: executor/execQual.c:194
+msgid "ExecEvalArrayRef: upper and lower indices mismatch"
 msgstr ""
 
-#: ../commands/vacuum.c:1118
-#, c-format
-msgid ""
-"Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation"
+#: executor/execQual.c:275
+msgid "ExecEvalAggref: no aggregates in this expression context"
 msgstr ""
 
-#: ../commands/vacuum.c:1128
-#, c-format
-msgid ""
-"Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
+#: executor/execQual.c:477
+msgid "ExecEvalParam: new/old params with same id & diff names"
 msgstr ""
 
-#: ../commands/vacuum.c:1146 ../commands/vacuumlazy.c:369
+#: executor/execQual.c:486
 #, c-format
-msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
+msgid "ExecEvalParam: invalid paramkind %d"
 msgstr ""
 
-#: ../commands/vacuum.c:1283
+#: executor/execQual.c:500
 #, c-format
-msgid ""
-"Pages %u: Changed %u, reaped %u, Empty %u, New %u; Tup %.0f: Vac %.0f, Keep/"
-"VTL %.0f/%u, UnUsed %.0f, MinLen %lu, MaxLen %lu; Re-using: Free/Avail. "
-"Space %.0f/%.0f; EndEmpty/Avail. Pages %u/%u.\n"
-"\t%s"
+msgid "ExecEvalParam: Unknown value for parameter %s"
 msgstr ""
 
-#: ../commands/vacuum.c:1504
-msgid "Invalid XID in t_cmin"
+#: executor/execQual.c:534
+msgid "GetAttributeByNum: Invalid attribute number"
 msgstr ""
 
-#: ../commands/vacuum.c:1506
-msgid "HEAP_MOVED_IN was not expected"
+#: executor/execQual.c:537
+msgid "GetAttributeByNum: cannot access system attributes here"
 msgstr ""
 
-#: ../commands/vacuum.c:1539
-msgid "HEAP_MOVED_OFF was expected"
+#: executor/execQual.c:540
+msgid "GetAttributeByNum: a NULL isNull flag was passed"
 msgstr ""
 
-#: ../commands/vacuum.c:1569
-msgid "No one parent tuple was found"
+#: executor/execQual.c:568
+msgid "GetAttributeByName: Invalid attribute name"
 msgstr ""
 
-#: ../commands/vacuum.c:1607
-msgid ""
-"Child itemid in update-chain marked as unused - can't continue repair_frag"
+#: executor/execQual.c:571
+msgid "GetAttributeByName: a NULL isNull flag was passed"
 msgstr ""
 
-#: ../commands/vacuum.c:1686
-msgid "Parent tuple was not found"
+#: executor/execQual.c:593
+#, c-format
+msgid "GetAttributeByName: attribute %s not found"
 msgstr ""
 
-#: ../commands/vacuum.c:1694
-msgid "Parent itemid marked as unused"
+#: executor/execQual.c:638
+msgid "Functions and operators can take only one set argument"
 msgstr ""
 
-#: ../commands/vacuum.c:1726
-msgid "Too old parent tuple found - can't continue repair_frag"
+#: executor/execQual.c:688 executor/execQual.c:730 executor/execQual.c:904
+#: executor/execQual.c:2068 executor/functions.c:531 executor/functions.c:566
+#: utils/adt/sets.c:200
+msgid "Set-valued function called in context that cannot accept a set"
 msgstr ""
 
-#: ../commands/vacuum.c:1855
-#, c-format
-msgid "moving chain: failed to add item with len = %lu to page %u"
+#: executor/execQual.c:875
+msgid "ExecMakeTableFunctionResult: expression is not a function call"
 msgstr ""
 
-#: ../commands/vacuum.c:1978
-#, c-format
+#: executor/execQual.c:996 executor/execQual.c:1029
 msgid ""
-"failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %"
-"u)"
-msgstr ""
-
-#: ../commands/vacuum.c:2046
-msgid "Invalid XID in t_cmin (4)"
+"ExecMakeTableFunctionResult: Invalid result from function returning tuple"
 msgstr ""
 
-#: ../commands/vacuum.c:2048
-msgid "HEAP_MOVED_IN was not expected (2)"
+#: executor/execQual.c:1054
+msgid "ExecMakeTableFunctionResult: Materialize-mode protocol not followed"
 msgstr ""
 
-#: ../commands/vacuum.c:2182
-msgid "Invalid XID in t_cmin (2)"
+#: executor/execQual.c:1059
+#, c-format
+msgid "ExecMakeTableFunctionResult: unknown returnMode %d"
 msgstr ""
 
-#: ../commands/vacuum.c:2191
-msgid "HEAP_MOVED_OFF/HEAP_MOVED_IN was expected"
+#: executor/execQual.c:1468
+#, c-format
+msgid "ExecEvalNullTest: unexpected nulltesttype %d"
 msgstr ""
 
-#: ../commands/vacuum.c:2201
+#: executor/execQual.c:1548
 #, c-format
-msgid ""
-"Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n"
-"\t%s"
+msgid "ExecEvalBooleanTest: unexpected booltesttype %d"
 msgstr ""
 
-#: ../commands/vacuum.c:2261
-msgid "Invalid XID in t_cmin (3)"
+#: executor/execQual.c:1573
+#, c-format
+msgid "Domain %s does not allow NULL values"
 msgstr ""
 
-#: ../commands/vacuum.c:2268
-msgid "HEAP_MOVED_OFF was expected (2)"
+#: executor/execQual.c:1578
+msgid "Domain CHECK Constraints not yet implemented"
 msgstr ""
 
-#: ../commands/vacuum.c:2303
-#, c-format
-msgid "VACUUM (repair_frag): FlushRelationBuffers returned %d"
+#: executor/execQual.c:1581
+msgid "ExecEvalConstraintTest: Constraint type unknown"
 msgstr ""
 
-#: ../commands/vacuum.c:2366
+#: executor/execQual.c:1737 executor/execQual.c:1782
 #, c-format
-msgid "VACUUM (vacuum_heap): FlushRelationBuffers returned %d"
+msgid "ExecEvalExpr: unknown expression type %d"
 msgstr ""
 
-#: ../commands/vacuum.c:2372
-#, c-format
-msgid "Rel %s: Pages: %u --> %u."
+#: executor/execQual.c:2128
+msgid "ExecTargetList: fjoin nodes not currently supported"
 msgstr ""
 
-#: ../commands/vacuum.c:2446 ../commands/vacuumlazy.c:588
-#, c-format
+#: executor/execTuples.c:259
 msgid ""
-"Index %s: Pages %u; Tuples %.0f.\n"
-"\t%s"
+"Plan requires more slots than are available\n"
+"\tsend mail to your local executor guru to fix this"
 msgstr ""
 
-#: ../commands/vacuum.c:2459 ../commands/vacuum.c:2513
+#: executor/functions.c:171
 #, c-format
-msgid ""
-"Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\n"
-"\tRecreate the index."
+msgid "init_sql_fcache: Cache lookup failed for procedure %u"
 msgstr ""
 
-#: ../commands/vacuum.c:2500 ../commands/vacuumlazy.c:635
+#: executor/functions.c:183
 #, c-format
-msgid ""
-"Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
-"\t%s"
+msgid "init_sql_fcache: Cache lookup failed for type %u"
 msgstr ""
 
-#: ../commands/vacuum.c:2828
+#: executor/functions.c:242
 #, c-format
-msgid "vac_is_partial_index: index %u not found"
+msgid "init_sql_fcache: null prosrc for procedure %u"
 msgstr ""
 
-#: ../commands/variable.c:113
-#, c-format
-msgid "Syntax error near \"%s\": empty setting"
+#: executor/instrument.c:40
+msgid "InstrStartTimer called twice in a row"
 msgstr ""
 
-#: ../commands/variable.c:140 ../commands/variable.c:174
-#, c-format
-msgid "Syntax error near \"%s\""
+#: executor/instrument.c:56
+msgid "InstrStopNode without start"
 msgstr ""
 
-#: ../commands/variable.c:150
-#, c-format
-msgid "Syntax error near \"=%s\""
+#: executor/nodeAgg.c:774
+msgid "ExecInitAgg: could not find any aggregate functions"
 msgstr ""
 
-#: ../commands/variable.c:249
+#: executor/nodeAgg.c:872
 #, c-format
-msgid "Bad value for date style (%s)"
-msgstr ""
-
-#: ../commands/variable.c:253
-msgid "Conflicting settings for date"
+msgid "ExecAgg: cache lookup failed for aggregate %u"
 msgstr ""
 
-#: ../commands/variable.c:402
-msgid "SET TIME ZONE illegal INTERVAL; month not allowed"
+#: executor/nodeAgg.c:927
+#, c-format
+msgid "Aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 
-#: ../commands/variable.c:426
-msgid "Unable to process SET TIME ZONE command; internal coding error"
+#: executor/nodeAgg.c:950 executor/nodeGroup.c:496
+#, c-format
+msgid "Unable to identify an equality operator for type %s"
 msgstr ""
 
-#: ../commands/variable.c:455 ../commands/variable.c:519
+#: executor/nodeAgg.c:978
 #, c-format
-msgid "Unable to set TZ environment variable to %s"
+msgid ""
+"GetAggInitVal: cache lookup failed on aggregate transition function return "
+"type %u"
 msgstr ""
 
-#: ../commands/variable.c:485
+#: executor/nodeAgg.c:1060
 #, c-format
-msgid "Time zone is '%s'"
+msgid "Aggregate function %u called as normal function"
 msgstr ""
 
-#: ../commands/variable.c:487
-msgid "Time zone is unset"
+#: executor/nodeAppend.c:295
+msgid "ExecProcAppend: subnode is NULL"
 msgstr ""
 
-#: ../commands/variable.c:531
-msgid "Unable to clear TZ environment variable"
+#: executor/nodeFunctionscan.c:93
+msgid ""
+"Query-specified return tuple and actual function return tuple do not match"
 msgstr ""
 
-#: ../commands/variable.c:560 ../commands/variable.c:591
-msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
+#: executor/nodeHash.c:66
+msgid "ExecHash: hash table is NULL."
 msgstr ""
 
-#: ../commands/variable.c:569
-#, c-format
-msgid "invalid transaction isolation level: %s"
-msgstr "ung�ltiges Transaktionsisolationslevel: %s"
-
-#: ../commands/variable.c:579
-msgid "TRANSACTION ISOLATION LEVEL is SERIALIZABLE"
+#: executor/nodeHash.c:311 executor/nodeHash.c:490 executor/nodeHash.c:732
+msgid "Insufficient memory for hash table."
 msgstr ""
 
-#: ../commands/variable.c:581
-msgid "TRANSACTION ISOLATION LEVEL is READ COMMITTED"
+#: executor/nodeHash.c:684
+#, c-format
+msgid "hashFunc: Invalid typLen %d"
 msgstr ""
 
-#: ../commands/variable.c:626
-msgid "Seed for random number generator is unavailable"
+#: executor/nodeHashjoin.c:357
+#, c-format
+msgid "ExecInitHashJoin: unsupported join type %d"
 msgstr ""
 
-#: ../commands/variable.c:670
-#, c-format
-msgid "Client encoding '%s' is not supported"
+#: executor/nodeHashjoin.c:529 executor/nodeHashjoin.c:537
+msgid "Read from hashjoin temp file failed"
 msgstr ""
 
-#: ../commands/variable.c:672
-msgid "No client encoding is specified"
+#: executor/nodeHashjoin.c:593 executor/nodeHashjoin.c:598
+msgid "Failed to rewind hash temp file"
 msgstr ""
 
-#: ../commands/variable.c:678
-#, c-format
-msgid "Conversion between %s and %s is not supported"
+#: executor/nodeHashjoin.c:669 executor/nodeHashjoin.c:672
+msgid "Write to hashjoin temp file failed"
 msgstr ""
 
-#: ../commands/variable.c:685
-#, c-format
-msgid "Client encoding %s is not supported"
+#: executor/nodeIndexscan.c:747
+msgid "ExecInitIndexScan: indxqual not an opclause!"
 msgstr ""
 
-#: ../commands/variable.c:693
+#: executor/nodeIndexscan.c:873 executor/nodeIndexscan.c:936
 #, c-format
-msgid "Current client encoding is '%s'"
-msgstr ""
-
-#: ../commands/variable.c:730
-msgid "SET SERVER_ENCODING is not supported"
+msgid "ExecInitIndexScan: %s"
 msgstr ""
 
-#: ../commands/variable.c:737
+#: executor/nodeIndexscan.c:1009
 #, c-format
-msgid "Current server encoding is '%s'"
+msgid "indexes of the relation %u was inactivated"
 msgstr ""
 
-#: ../commands/variable.c:744
-msgid "RESET SERVER_ENCODING is not supported"
+#: executor/nodeMergejoin.c:131
+msgid "MJFormSkipQuals: op not an Oper!"
 msgstr ""
 
-#: ../commands/variable.c:817 ../utils/misc/guc.c:1228
+#: executor/nodeMergejoin.c:395
 #, c-format
-msgid "%s is %s"
+msgid "ExecMergeJoin: unsupported join type %d"
 msgstr ""
 
-#: ../commands/view.c:80
-msgid "attempted to define virtual relation with no attrs"
+#: executor/nodeMergejoin.c:1379
+#, c-format
+msgid "ExecMergeJoin: invalid join state %d, aborting"
 msgstr ""
 
-#: ../commands/analyze.c:210
-#, c-format
-msgid "Skipping \"%s\" --- only table or database owner can ANALYZE it"
+#: executor/nodeMergejoin.c:1458
+msgid "RIGHT JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: ../commands/analyze.c:217
-#, c-format
-msgid "Analyzing %s"
+#: executor/nodeMergejoin.c:1473 optimizer/path/joinpath.c:935
+msgid "FULL JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: ../commands/analyze.c:244
+#: executor/nodeMergejoin.c:1476
 #, c-format
-msgid "ANALYZE: there is no attribute %s in %s"
+msgid "ExecInitMergeJoin: unsupported join type %d"
 msgstr ""
 
-#: ../commands/analyze.c:417 ../utils/adt/ruleutils.c:1880
-#: ../utils/adt/ruleutils.c:1915 ../utils/adt/ruleutils.c:2237
+#: executor/nodeNestloop.c:318
 #, c-format
-msgid "cache lookup of type %u failed"
+msgid "ExecInitNestLoop: unsupported join type %d"
 msgstr ""
 
-#: ../commands/analyze.c:620
+#: executor/nodeSetOp.c:174
 #, c-format
-msgid "acquire_sample_rows: ReadBuffer(%s,%u) failed"
+msgid "ExecSetOp: bogus command code %d"
 msgstr ""
 
-#: ../commands/vacuumlazy.c:431
-#, c-format
-msgid ""
-"Pages %u: Changed %u, Empty %u; Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n"
-"\tTotal %s"
+#: executor/nodeSort.c:52
+msgid "ExtractSortKeys: keycount <= 0"
 msgstr ""
 
-#: ../commands/vacuumlazy.c:480
-#, c-format
-msgid ""
-"Removed %d tuples in %d pages.\n"
-"\t%s"
+#: executor/nodeSubplan.c:53
+msgid "ExecSubPlan: can't set parent params from subquery"
 msgstr ""
 
-#: ../commands/vacuumlazy.c:710
-#, c-format
-msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
+#: executor/nodeSubplan.c:120 executor/nodeSubplan.c:142
+#: executor/nodeSubplan.c:385
+msgid "More than one tuple returned by a subselect used as an expression."
 msgstr ""
 
-#: ../commands/vacuumlazy.c:745
-#, c-format
-msgid ""
-"Truncated %u --> %u pages.\n"
-"\t%s"
+#: executor/nodeSubplan.c:180
+msgid "ExecSubPlan: failed to find placeholder for subplan result"
 msgstr ""
 
-#: ../executor/_deadcode/nodeTee.c:325
-msgid "A Tee node can only be executed from its left or right parent\n"
+#: executor/nodeSubplan.c:358
+msgid "ExecSetParamPlan: ANY/ALL subselect unsupported"
 msgstr ""
 
-#: ../executor/execAmi.c:161
-msgid "ExecBeginScan: scanDesc = NULL, heap_beginscan failed."
+#: executor/nodeSubplan.c:468
+msgid "ExecReScanSetParamPlan: direct correlated subquery unsupported, yet"
 msgstr ""
 
-#: ../executor/execAmi.c:198
-msgid "ExecCloseR: not a scan node!"
+#: executor/nodeSubplan.c:470
+msgid "ExecReScanSetParamPlan: setParam list is NULL"
 msgstr ""
 
-#: ../executor/execAmi.c:365
-#, c-format
-msgid "ExecReScan: node type %d not supported"
+#: executor/nodeSubplan.c:472
+msgid "ExecReScanSetParamPlan: extParam list of plan is NULL"
 msgstr ""
 
-#: ../executor/execAmi.c:434
-#, c-format
-msgid "ExecMarkPos: node type %d not supported"
+#: executor/spi.c:70
+msgid "SPI_connect: no connection(s) expected"
 msgstr ""
 
-#: ../executor/execAmi.c:471
-#, c-format
-msgid "ExecRestrPos: node type %d not supported"
+#: executor/spi.c:76
+msgid "SPI_connect: some connection(s) expected"
 msgstr ""
 
-#: ../executor/execMain.c:242
-#, c-format
-msgid "ExecutorRun: Unknown feature %d"
+#: executor/spi.c:82
+msgid "Memory exhausted in SPI_connect"
 msgstr ""
 
-#: ../executor/execMain.c:448
-#, c-format
-msgid "ExecCheckRTEPerms: bogus operation %d"
+#: executor/spi.c:148
+msgid "Memory exhausted in SPI_finish"
 msgstr ""
 
-#: ../executor/execMain.c:805
-#, c-format
-msgid "You can't change sequence relation %s"
+#: executor/spi.c:313 executor/spi.c:340 executor/spi.c:369 executor/spi.c:407
+#: executor/spi.c:651 executor/spi.c:1427
+msgid "SPI: stack corrupted"
 msgstr ""
 
-#: ../executor/execMain.c:809
-#, c-format
-msgid "You can't change toast relation %s"
+#: executor/spi.c:718
+msgid "cannot open multi-query plan as cursor"
 msgstr ""
 
-#: ../executor/execMain.c:813
-#, c-format
-msgid "You can't change view relation %s"
+#: executor/spi.c:723
+msgid "plan in SPI_cursor_open() is not a SELECT"
 msgstr ""
 
-#: ../executor/execMain.c:1014
-msgid "ExecutePlan: NO (junk) `ctid' was found!"
+#: executor/spi.c:725
+msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
 msgstr ""
 
-#: ../executor/execMain.c:1018
-msgid "ExecutePlan: (junk) `ctid' is NULL!"
+#: executor/spi.c:727
+msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
 msgstr ""
 
-#: ../executor/execMain.c:1043
+#: executor/spi.c:758
 #, c-format
-msgid "ExecutePlan: NO (junk) `%s' was found!"
+msgid "cursor \"%s\" already in use"
 msgstr ""
 
-#: ../executor/execMain.c:1048
+#: executor/spi.c:764
 #, c-format
-msgid "ExecutePlan: (junk) `%s' is NULL!"
+msgid "failed to create portal \"%s\""
 msgstr ""
 
-#: ../executor/execMain.c:1134
-msgid "ExecutePlan: unknown operation in queryDesc"
+#: executor/spi.c:877 executor/spi.c:1333
+msgid "invalid portal in SPI cursor operation"
 msgstr ""
 
-#: ../executor/execMain.c:1398
-msgid "ExecReplace: replace can't run without transactions"
+#: executor/spi.c:902
+msgid "SPI: improper call to spi_printtup"
 msgstr ""
 
-#: ../executor/execMain.c:1595
-#, c-format
-msgid "%s: Fail to add null value in not null attribute %s"
+#: executor/spi.c:904
+msgid "SPI: stack corrupted in spi_printtup"
 msgstr ""
 
-#: ../executor/execMain.c:1605
-#, c-format
-msgid "%s: rejected due to CHECK constraint %s"
-msgstr "%s: wegen CHECK-Constraint �%s� abgelehnt"
-
-#: ../executor/execMain.c:1649
-#, c-format
-msgid "EvalPlanQual: can't find RTE %d"
+#: executor/spi.c:1284
+msgid "SPI_select: retrieve into portal not implemented"
 msgstr ""
 
-#: ../executor/execMain.c:1668
-msgid "EvalPlanQual: t_xmin is uncommitted ?!"
+#: executor/spi.c:1294
+msgid "SPI_select: # of processed tuples check failed"
 msgstr ""
 
-#: ../executor/execProcnode.c:222
-#, c-format
-msgid "ExecInitNode: node type %d unsupported"
+#: executor/spi.c:1393
+msgid "SPI_fetch: # of processed tuples check failed"
 msgstr ""
 
-#: ../executor/execProcnode.c:351
-#, c-format
-msgid "ExecProcNode: node type %d unsupported"
+#: lib/dllist.c:41
+msgid "Memory exhausted in DLNewList"
 msgstr ""
 
-#: ../executor/execProcnode.c:435
-#, c-format
-msgid "ExecCountSlotsNode: node type %d unsupported"
+#: lib/dllist.c:84
+msgid "Memory exhausted in DLNewElem"
 msgstr ""
 
-#: ../executor/execProcnode.c:557
+#: libpq/pqcomm.c:196
 #, c-format
-msgid "ExecEndNode: node type %d unsupported"
+msgid "StreamServerPort: socket() failed: %m"
 msgstr ""
 
-#: ../executor/execProcnode.c:728
+#: libpq/pqcomm.c:205
 #, c-format
-msgid "ExecGetTupType: node type %d unsupported"
+msgid "StreamServerPort: setsockopt(SO_REUSEADDR) failed: %m"
 msgstr ""
 
-#: ../executor/execQual.c:143 ../executor/execQual.c:165
+#: libpq/pqcomm.c:246
 #, c-format
-msgid "ExecEvalArrayRef: can only handle %d dimensions"
+msgid "StreamServerPort: gethostbyname(%s) failed"
 msgstr ""
 
-#: ../executor/execQual.c:187
-msgid "ExecEvalArrayRef: upper and lower indices mismatch"
+#: libpq/pqcomm.c:262
+#, c-format
+msgid ""
+"StreamServerPort: bind() failed: %m\n"
+"\tIs another postmaster already running on port %d?\n"
+"\tIf not, remove socket node (%s) and retry."
 msgstr ""
 
-#: ../executor/execQual.c:265
-msgid "ExecEvalAggref: no aggregates in this expression context"
+#: libpq/pqcomm.c:267
+#, c-format
+msgid ""
+"StreamServerPort: bind() failed: %m\n"
+"\tIs another postmaster already running on port %d?\n"
+"\tIf not, wait a few seconds and retry."
 msgstr ""
 
-#: ../executor/execQual.c:467
-msgid "ExecEvalParam: new/old params with same id & diff names"
+#: libpq/pqcomm.c:306
+#, c-format
+msgid "No such group as '%s'"
 msgstr ""
 
-#: ../executor/execQual.c:476
+#: libpq/pqcomm.c:314
 #, c-format
-msgid "ExecEvalParam: invalid paramkind %d"
+msgid "Could not set group of %s: %m"
 msgstr ""
 
-#: ../executor/execQual.c:490
+#: libpq/pqcomm.c:322
 #, c-format
-msgid "ExecEvalParam: Unknown value for parameter %s"
+msgid "Could not set permissions on %s: %m"
 msgstr ""
 
-#: ../executor/execQual.c:524
-msgid "GetAttributeByNum: Invalid attribute number"
+#: libpq/pqcomm.c:341
+#, c-format
+msgid "StreamServerPort: listen() failed: %m"
 msgstr ""
 
-#: ../executor/execQual.c:527
-msgid "GetAttributeByNum: cannot access system attributes here"
+#: libpq/pqcomm.c:371
+#, c-format
+msgid "StreamConnection: accept() failed: %m"
 msgstr ""
 
-#: ../executor/execQual.c:530
-msgid "GetAttributeByNum: a NULL isNull flag was passed"
+#: libpq/pqcomm.c:390
+#, c-format
+msgid "StreamConnection: getsockname() failed: %m"
 msgstr ""
 
-#: ../executor/execQual.c:558
-msgid "GetAttributeByName: Invalid attribute name"
+#: libpq/pqcomm.c:402
+#, c-format
+msgid "StreamConnection: setsockopt(TCP_NODELAY) failed: %m"
 msgstr ""
 
-#: ../executor/execQual.c:561
-msgid "GetAttributeByName: a NULL isNull flag was passed"
+#: libpq/pqcomm.c:408
+#, c-format
+msgid "StreamConnection: setsockopt(SO_KEEPALIVE) failed: %m"
 msgstr ""
 
-#: ../executor/execQual.c:583
+#: libpq/pqcomm.c:476
 #, c-format
-msgid "GetAttributeByName: attribute %s not found"
-msgstr ""
+msgid "pq_recvbuf: recv() failed: %m"
+msgstr "pq_recvbuf(): recv() fehlgeschlagen: %m"
 
-#: ../executor/execQual.c:628
-msgid "Functions and operators can take only one set argument"
+#: libpq/pqcomm.c:482
+msgid "pq_recvbuf: unexpected EOF on client connection"
 msgstr ""
 
-#: ../executor/execQual.c:681 ../executor/execQual.c:716
-#: ../executor/execQual.c:1707 ../executor/functions.c:546
-#: ../executor/functions.c:572 ../utils/adt/sets.c:203
-msgid "Set-valued function called in context that cannot accept a set"
-msgstr ""
+#: libpq/pqcomm.c:680
+#, c-format
+msgid "pq_flush: send() failed: %m"
+msgstr "pq_flush(): send() fehlgeschlagen: %m"
 
-#: ../executor/execQual.c:1146
+#: libpq/pqcomm.c:714
 #, c-format
-msgid "ExecEvalNullTest: unexpected nulltesttype %d"
-msgstr ""
+msgid "pq_eof: recv() failed: %m"
+msgstr "pq_eof(): recv() fehlgeschlagen: %m"
 
-#: ../executor/execQual.c:1226
+#: libpq/auth.c:106
 #, c-format
-msgid "ExecEvalBooleanTest: unexpected booltesttype %d"
+msgid "pg_krb4_recvauth: kerberos error: %s"
 msgstr ""
 
-#: ../executor/execQual.c:1382 ../executor/execQual.c:1421
+#: libpq/auth.c:112
 #, c-format
-msgid "ExecEvalExpr: unknown expression type %d"
+msgid "pg_krb4_recvauth: protocol version \"%s\" != \"%s\""
 msgstr ""
 
-#: ../executor/execQual.c:1767
-msgid "ExecTargetList: fjoin nodes not currently supported"
+#: libpq/auth.c:118
+#, c-format
+msgid "pg_krb4_recvauth: name \"%s\" != \"%s\""
 msgstr ""
 
-#: ../executor/execTuples.c:258
-msgid ""
-"Plan requires more slots than are available\n"
-"\tsend mail to your local executor guru to fix this"
+#: libpq/auth.c:130
+msgid "pg_krb4_recvauth: Kerberos not implemented on this server"
 msgstr ""
 
-#: ../executor/execUtils.c:534
+#: libpq/auth.c:190
 #, c-format
-msgid "ExecOpenIndices: index %u not found"
+msgid "pg_krb5_init: krb5_init_context returned Kerberos error %d"
 msgstr ""
 
-#: ../executor/functions.c:172
+#: libpq/auth.c:199
 #, c-format
-msgid "init_sql_fcache: Cache lookup failed for procedure %u"
+msgid "pg_krb5_init: krb5_kt_resolve returned Kerberos error %d"
 msgstr ""
 
-#: ../executor/functions.c:184
+#: libpq/auth.c:211
 #, c-format
-msgid "init_sql_fcache: Cache lookup failed for type %u"
+msgid "pg_krb5_init: krb5_sname_to_principal returned Kerberos error %d"
 msgstr ""
 
-#: ../executor/functions.c:241
+#: libpq/auth.c:255
 #, c-format
-msgid "init_sql_fcache: null prosrc for procedure %u"
+msgid "pg_krb5_recvauth: krb5_recvauth returned Kerberos error %d"
 msgstr ""
 
-#: ../executor/nodeAgg.c:760
-msgid "ExecInitAgg: could not find any aggregate functions"
+#: libpq/auth.c:279
+#, c-format
+msgid "pg_krb5_recvauth: krb5_unparse_name returned Kerberos error %d"
 msgstr ""
 
-#: ../executor/nodeAgg.c:858
+#: libpq/auth.c:290
 #, c-format
-msgid "ExecAgg: cache lookup failed for aggregate %s(%s)"
+msgid "pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\""
 msgstr ""
 
-#: ../executor/nodeAgg.c:901
-#, c-format
-msgid "Aggregate %s needs to have compatible input type and transition type"
+#: libpq/auth.c:309
+msgid "pg_krb5_recvauth: Kerberos not implemented on this server"
 msgstr ""
 
-#: ../executor/nodeAgg.c:923 ../executor/nodeGroup.c:495
+#: libpq/auth.c:374
 #, c-format
-msgid "Unable to identify an equality operator for type '%s'"
+msgid "%s authentication failed for user \"%s\""
 msgstr ""
 
-#: ../executor/nodeAppend.c:293
-msgid "ExecProcAppend: subnode is NULL"
+#: libpq/auth.c:396
+msgid "Missing or erroneous pg_hba.conf file, see postmaster log for details"
 msgstr ""
 
-#: ../executor/nodeHash.c:66
-msgid "ExecHash: hash table is NULL."
+#: libpq/auth.c:417
+#, c-format
+msgid "No pg_hba.conf entry for host %s, user %s, database %s"
 msgstr ""
 
-#: ../executor/nodeHash.c:312 ../executor/nodeHash.c:491
-#: ../executor/nodeHash.c:725
-msgid "Insufficient memory for hash table."
+#: libpq/auth.c:450
+#, c-format
+msgid "pg_local_sendauth: can't do setsockopt: %m"
 msgstr ""
 
-#: ../executor/nodeHashjoin.c:358
+#: libpq/auth.c:539
 #, c-format
-msgid "ExecInitHashJoin: unsupported join type %d"
+msgid "pam_passwd_conv_proc: Error from underlying PAM layer: '%s'"
 msgstr ""
 
-#: ../executor/nodeHashjoin.c:530 ../executor/nodeHashjoin.c:538
-msgid "Read from hashjoin temp file failed"
+#: libpq/auth.c:543
+#, c-format
+msgid "pam_passwd_conv_proc: Unexpected PAM conversation %d/'%s'"
 msgstr ""
 
-#: ../executor/nodeHashjoin.c:594 ../executor/nodeHashjoin.c:599
-msgid "Failed to rewind hash temp file"
+#: libpq/auth.c:573
+msgid "received PAM packet"
 msgstr ""
 
-#: ../executor/nodeHashjoin.c:670 ../executor/nodeHashjoin.c:673
-msgid "Write to hashjoin temp file failed"
+#: libpq/auth.c:577
+msgid "pam_passwd_conv_proc: no password"
 msgstr ""
 
-#: ../executor/nodeIndexscan.c:726
-msgid "ExecInitIndexScan: indxqual not an opclause!"
+#: libpq/auth.c:590
+msgid "pam_passwd_conv_proc: Out of memory!"
 msgstr ""
 
-#: ../executor/nodeIndexscan.c:852 ../executor/nodeIndexscan.c:915
+#: libpq/auth.c:634
 #, c-format
-msgid "ExecInitIndexScan: %s"
+msgid "CheckPAMAuth: Failed to create PAM authenticator: '%s'"
 msgstr ""
 
-#: ../executor/nodeIndexscan.c:1002
+#: libpq/auth.c:644
 #, c-format
-msgid "indexes of the relation %u was inactivated"
-msgstr ""
-
-#: ../executor/nodeMergejoin.c:137
-msgid "MJFormSkipQual: op not an Oper!"
+msgid "CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'"
 msgstr ""
 
-#: ../executor/nodeMergejoin.c:151
+#: libpq/auth.c:654
 #, c-format
-msgid "MJFormSkipQual: operator %u not found"
+msgid "CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'"
 msgstr ""
 
-#: ../executor/nodeMergejoin.c:168
+#: libpq/auth.c:664
 #, c-format
-msgid "MJFormSkipQual: mergejoin operator %u has no matching %s op"
+msgid "CheckPAMAuth: pam_authenticate failed: '%s'"
 msgstr ""
 
-#: ../executor/nodeMergejoin.c:430
+#: libpq/auth.c:674
 #, c-format
-msgid "ExecMergeJoin: unsupported join type %d"
+msgid "CheckPAMAuth: pam_acct_mgmt failed: '%s'"
 msgstr ""
 
-#: ../executor/nodeMergejoin.c:1414
+#: libpq/auth.c:684
 #, c-format
-msgid "ExecMergeJoin: invalid join state %d, aborting"
+msgid "CheckPAMAuth: Failed to release PAM authenticator: '%s'"
 msgstr ""
 
-#: ../executor/nodeMergejoin.c:1494
-msgid "RIGHT JOIN is only supported with mergejoinable join conditions"
+#: libpq/auth.c:724
+#, c-format
+msgid "unexpected password packet size: read %d, expected %d"
 msgstr ""
 
-#: ../executor/nodeMergejoin.c:1509 ../optimizer/path/joinpath.c:939
-msgid "FULL JOIN is only supported with mergejoinable join conditions"
+#: libpq/auth.c:728
+msgid "received password packet"
 msgstr ""
 
-#: ../executor/nodeMergejoin.c:1512
+#: libpq/be-fsstubs.c:84
 #, c-format
-msgid "ExecInitMergeJoin: unsupported join type %d"
+msgid "lo_open(%u,%d)"
 msgstr ""
 
-#: ../executor/nodeNestloop.c:318
+#: libpq/be-fsstubs.c:102
 #, c-format
-msgid "ExecInitNestLoop: unsupported join type %d"
+msgid "cannot open large object %u"
 msgstr ""
 
-#: ../executor/nodeSort.c:52
-msgid "ExtractSortKeys: keycount <= 0"
+#: libpq/be-fsstubs.c:122
+#, c-format
+msgid "lo_close: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: ../executor/nodeSubplan.c:53
-msgid "ExecSubPlan: can't set parent params from subquery"
+#: libpq/be-fsstubs.c:126
+#, c-format
+msgid "lo_close(%d)"
 msgstr ""
 
-#: ../executor/nodeSubplan.c:120 ../executor/nodeSubplan.c:142
-#: ../executor/nodeSubplan.c:385
-msgid "More than one tuple returned by a subselect used as an expression."
+#: libpq/be-fsstubs.c:158
+#, c-format
+msgid "lo_read: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: ../executor/nodeSubplan.c:180
-msgid "ExecSubPlan: failed to find placeholder for subplan result"
+#: libpq/be-fsstubs.c:180
+#, c-format
+msgid "lo_write: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: ../executor/nodeSubplan.c:358
-msgid "ExecSetParamPlan: ANY/ALL subselect unsupported"
+#: libpq/be-fsstubs.c:206
+#, c-format
+msgid "lo_lseek: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: ../executor/nodeSubplan.c:468
-msgid "ExecReScanSetParamPlan: direct correlated subquery unsupported, yet"
+#: libpq/be-fsstubs.c:261
+#, c-format
+msgid "lo_tell: invalid large object descriptor (%d)"
 msgstr ""
 
-#: ../executor/nodeSubplan.c:470
-msgid "ExecReScanSetParamPlan: setParam list is NULL"
+#: libpq/be-fsstubs.c:363
+msgid ""
+"You must have Postgres superuser privilege to use server-side lo_import().\n"
+"\tAnyone can use the client-side lo_import() provided by libpq."
 msgstr ""
 
-#: ../executor/nodeSubplan.c:472
-msgid "ExecReScanSetParamPlan: extParam list of plan is NULL"
+#: libpq/be-fsstubs.c:378
+#, c-format
+msgid "lo_import: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: ../executor/spi.c:69
-msgid "SPI_connect: no connection(s) expected"
+#: libpq/be-fsstubs.c:386
+#, c-format
+msgid "lo_import: can't create inv object for \"%s\""
 msgstr ""
 
-#: ../executor/spi.c:75
-msgid "SPI_connect: some connection(s) expected"
+#: libpq/be-fsstubs.c:397
+#, c-format
+msgid "lo_import: error while reading \"%s\""
 msgstr ""
 
-#: ../executor/spi.c:81
-msgid "Memory exhausted in SPI_connect"
+#: libpq/be-fsstubs.c:426
+msgid ""
+"You must have Postgres superuser privilege to use server-side lo_export().\n"
+"\tAnyone can use the client-side lo_export() provided by libpq."
 msgstr ""
 
-#: ../executor/spi.c:154
-msgid "Memory exhausted in SPI_finish"
+#: libpq/be-fsstubs.c:436
+#, c-format
+msgid "lo_export: can't open inv object %u"
 msgstr ""
 
-#: ../executor/spi.c:320 ../executor/spi.c:347 ../executor/spi.c:376
-#: ../executor/spi.c:415 ../executor/spi.c:655 ../executor/spi.c:1300
-msgid "SPI: stack corrupted"
+#: libpq/be-fsstubs.c:454
+#, c-format
+msgid "lo_export: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: ../executor/spi.c:722
-msgid "cannot open multi-query plan as cursor"
+#: libpq/be-fsstubs.c:464
+#, c-format
+msgid "lo_export: error while writing \"%s\""
 msgstr ""
 
-#: ../executor/spi.c:727
-msgid "plan in SPI_cursor_open() is not a SELECT"
+#: libpq/be-secure.c:291 libpq/be-secure.c:340
+#, c-format
+msgid "SSL SYSCALL error: %s"
 msgstr ""
 
-#: ../executor/spi.c:729
-msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
+#: libpq/be-secure.c:294 libpq/be-secure.c:343
+#, c-format
+msgid "SSL error: %s"
 msgstr ""
 
-#: ../executor/spi.c:731
-msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
+#: libpq/be-secure.c:395
+#, c-format
+msgid "DH errors (%s): %d bits expected, %d bits found"
 msgstr ""
 
-#: ../executor/spi.c:761
+#: libpq/be-secure.c:405
 #, c-format
-msgid "cursor \"%s\" already in use"
+msgid "DH_check error (%s): %s"
 msgstr ""
 
-#: ../executor/spi.c:766
+#: libpq/be-secure.c:410
 #, c-format
-msgid "failed to create portal \"%s\""
+msgid "DH error (%s): p is not prime"
 msgstr ""
 
-#: ../executor/spi.c:860 ../executor/spi.c:1213
-msgid "invalid portal in SPI cursor operation"
+#: libpq/be-secure.c:417
+#, c-format
+msgid "DH error (%s): neither suitable generator or safe prime"
 msgstr ""
 
-#: ../executor/spi.c:885
-msgid "SPI: improper call to spi_printtup"
+#: libpq/be-secure.c:443
+#, c-format
+msgid "DH load buffer: %s"
 msgstr ""
 
-#: ../executor/spi.c:887
-msgid "SPI: stack corrupted in spi_printtup"
+#: libpq/be-secure.c:515
+#, c-format
+msgid "DH: generating parameters (%d bits)...."
 msgstr ""
 
-#: ../executor/spi.c:1165
-msgid "SPI_select: retrieve into portal not implemented"
+#: libpq/be-secure.c:549
+msgid "SSL: handshake start"
 msgstr ""
 
-#: ../executor/spi.c:1175
-msgid "SPI_select: # of processed tuples check failed"
+#: libpq/be-secure.c:552
+msgid "SSL: handshake done"
 msgstr ""
 
-#: ../executor/spi.c:1266
-msgid "SPI_fetch: # of processed tuples check failed"
+#: libpq/be-secure.c:555
+msgid "SSL: accept loop"
 msgstr ""
 
-#: ../executor/nodeSetOp.c:174
+#: libpq/be-secure.c:558
 #, c-format
-msgid "ExecSetOp: bogus command code %d"
+msgid "SSL: accept exit (%d)"
 msgstr ""
 
-#: ../executor/instrument.c:40
-msgid "InstrStartTimer called twice in a row"
+#: libpq/be-secure.c:561
+msgid "SSL: connect loop"
 msgstr ""
 
-#: ../executor/instrument.c:56
-msgid "InstrStopNode without start"
+#: libpq/be-secure.c:564
+#, c-format
+msgid "SSL: connect exit (%d)"
 msgstr ""
 
-#: ../lib/dllist.c:41
-msgid "Memory exhausted in DLNewList"
+#: libpq/be-secure.c:567
+#, c-format
+msgid "SSL: read alert (0x%04x)"
 msgstr ""
 
-#: ../lib/dllist.c:84
-msgid "Memory exhausted in DLNewElem"
+#: libpq/be-secure.c:570
+#, c-format
+msgid "SSL: write alert (0x%04x)"
 msgstr ""
 
-#: ../libpq/pqcomm.c:511
+#: libpq/be-secure.c:591
 #, c-format
-msgid "pq_recvbuf: recv() failed: %m"
-msgstr "pq_recvbuf(): recv() fehlgeschlagen: %m"
-
-#: ../libpq/pqcomm.c:517
-msgid "pq_recvbuf: unexpected EOF on client connection"
-msgstr ""
+msgid "failed to create SSL context: %s"
+msgstr "konnte SSL-Kontext nicht erstellen: %s"
 
-#: ../libpq/pqcomm.c:691
+#: libpq/be-secure.c:602
 #, c-format
-msgid "pq_flush: send() failed: %m"
-msgstr "pq_flush(): send() fehlgeschlagen: %m"
+msgid "failed to load server certificate (%s): %s"
+msgstr "konnte Serverzertifikat (%s) nicht laden: %s"
 
-#: ../libpq/pqcomm.c:725
+#: libpq/be-secure.c:610
 #, c-format
-msgid "pq_eof: recv() failed: %m"
-msgstr "pq_eof(): recv() fehlgeschlagen: %m"
+msgid "failed to stat private key file (%s): %s"
+msgstr ""
 
-#: ../libpq/auth.c:473
+#: libpq/be-secure.c:617
 #, c-format
-msgid "%s authentication failed for user \"%s\""
+msgid "bad permissions on private key file (%s)"
 msgstr ""
 
-#: ../libpq/auth.c:495
-msgid "Missing or erroneous pg_hba.conf file, see postmaster log for details"
-msgstr ""
+#: libpq/be-secure.c:622
+#, c-format
+msgid "failed to load private key file (%s): %s"
+msgstr "konnte Private-Key-Datei (%s) nicht laden: %s"
 
-#: ../libpq/auth.c:526
+#: libpq/be-secure.c:628
 #, c-format
-msgid "No pg_hba.conf entry for host %s, user %s, database %s"
-msgstr ""
+msgid "check of private key failed: %s"
+msgstr "�berpr�fung des Private Key fehlgeschlagen: %s"
 
-#: ../libpq/auth.c:560
+#: libpq/be-secure.c:645
 #, c-format
-msgid "pg_local_sendauth: can't do setsockopt: %s\n"
+msgid "could not read root cert file (%s): %s"
 msgstr ""
 
-#: ../libpq/crypt.c:68
+#: libpq/be-secure.c:679
 #, c-format
-msgid "could not open %s: %m"
-msgstr "konnte %s nicht �ffnen: %m"
+msgid "failed to initialize SSL connection: %s"
+msgstr "konnte SSL-Verbindung nicht initialisieren: %s"
 
-#: ../libpq/be-fsstubs.c:85
+#: libpq/be-secure.c:701
 #, c-format
-msgid "lo_open(%u,%d)"
+msgid "secure connection from '%s'"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:103
-#, c-format
-msgid "cannot open large object %u"
+#: libpq/crypt.c:60
+msgid ""
+"Password is stored MD5 encrypted.  'password' and 'crypt' auth methods "
+"cannot be used."
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:123
+#: libpq/hba.c:123
 #, c-format
-msgid "lo_close: invalid large obj descriptor (%d)"
+msgid "Token too long in authentication file, skipping, %s"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:127
+#: libpq/hba.c:256
 #, c-format
-msgid "lo_close(%d)"
+msgid ""
+"tokenize_inc_file: Unable to open secondary authentication file \"@%s\" as "
+"\"%s\": %m"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:159
+#: libpq/hba.c:659
 #, c-format
-msgid "lo_read: invalid large obj descriptor (%d)"
+msgid "parse_hba: invalid syntax in pg_hba.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:181
+#: libpq/hba.c:712 libpq/hba.c:734
 #, c-format
-msgid "lo_write: invalid large obj descriptor (%d)"
-msgstr ""
+msgid "could not open %s: %m"
+msgstr "konnte %s nicht �ffnen: %m"
 
-#: ../libpq/be-fsstubs.c:207
+#: libpq/hba.c:845
 #, c-format
-msgid "lo_lseek: invalid large obj descriptor (%d)"
+msgid "load_hba: Unable to open authentication config file \"%s\": %m"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:262
+#: libpq/hba.c:908
 #, c-format
-msgid "lo_tell: invalid large object descriptor (%d)"
+msgid ""
+"parse_ident_usermap: invalid syntax in pg_ident.conf file at line %d, token "
+"\"%s\""
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:364
+#: libpq/hba.c:940
 msgid ""
-"You must have Postgres superuser privilege to use server-side lo_import().\n"
-"\tAnyone can use the client-side lo_import() provided by libpq."
+"check_ident_usermap: hba configuration file does not have the usermap field "
+"filled in in the entry that pertains to this connection.  That field is "
+"essential for Ident-based authentication."
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:379
+#: libpq/hba.c:990
 #, c-format
-msgid "lo_import: can't open unix file \"%s\": %m"
+msgid "load_ident: Unable to open usermap file \"%s\": %m"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:387
+#: libpq/hba.c:1112
 #, c-format
-msgid "lo_import: can't create inv object for \"%s\""
+msgid "Failed to create socket on which to talk to Ident server: %m"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:398
+#: libpq/hba.c:1148
 #, c-format
-msgid "lo_import: error while reading \"%s\""
+msgid ""
+"Unable to connect to Ident server on the host which is trying to connect to "
+"Postgres (IP address %s, Port %d): %s"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:427
+#: libpq/hba.c:1171
+#, c-format
 msgid ""
-"You must have Postgres superuser privilege to use server-side lo_export().\n"
-"\tAnyone can use the client-side lo_export() provided by libpq."
+"Unable to send query to Ident server on the host which is trying to connect "
+"to Postgres (Host %s, Port %d), even though we successfully connected to it: "
+"%s"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:437
+#: libpq/hba.c:1188
 #, c-format
-msgid "lo_export: can't open inv object %u"
+msgid ""
+"Unable to receive response from Ident server on the host which is trying to "
+"connect to Postgres (Host %s, Port %d), even though we successfully sent our "
+"query to it: %s"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:455
+#: libpq/hba.c:1230 libpq/hba.c:1295
 #, c-format
-msgid "lo_export: can't open unix file \"%s\": %m"
+msgid "ident_unix: error receiving credentials: %m"
 msgstr ""
 
-#: ../libpq/be-fsstubs.c:465
+#: libpq/hba.c:1238 libpq/hba.c:1304
 #, c-format
-msgid "lo_export: error while writing \"%s\""
+msgid "ident_unix: unknown local user with uid %d"
+msgstr ""
+
+#: libpq/hba.c:1314
+msgid "'ident' auth is not supported on local connections on this platform"
 msgstr ""
 
-#: ../libpq/pqformat.c:200
+#: libpq/pqformat.c:159
 #, c-format
 msgid "pq_sendint: unsupported size %d"
 msgstr ""
 
-#: ../main/main.c:85
+#: libpq/pqformat.c:241
+#, c-format
+msgid "pq_getint: unsupported size %d"
+msgstr ""
+
+#: main/main.c:84
 #, c-format
 msgid "%s: setsysinfo failed: %s\n"
 msgstr ""
 
-#: ../main/main.c:155
+#: main/main.c:173
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
 "\n"
@@ -5306,1279 +6309,1240 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../main/main.c:175
+#: main/main.c:193
 #, c-format
 msgid "%s: real and effective user ids must match\n"
 msgstr ""
 
-#: ../main/main.c:224
+#: main/main.c:228
 #, c-format
 msgid "%s: invalid current euid %d\n"
 msgstr ""
 
-#: ../nodes/outfuncs.c:1294
+#: nodes/copyfuncs.c:1564
 #, c-format
-msgid "_outValue: don't know how to print type %d "
+msgid "_copyAConst: unknown node type %d"
 msgstr ""
 
-#: ../nodes/outfuncs.c:1696
+#: nodes/copyfuncs.c:2720
 #, c-format
-msgid "_outNode: don't know how to print type %d "
+msgid "_copyValue: unknown node type %d"
 msgstr ""
 
-#: ../nodes/copyfuncs.c:2976
+#: nodes/copyfuncs.c:3232
 #, c-format
 msgid "copyObject: don't know how to copy node type %d"
 msgstr ""
 
-#: ../nodes/equalfuncs.c:201
+#: nodes/equalfuncs.c:204
 #, c-format
 msgid "_equalParam: Invalid paramkind value: %d"
 msgstr ""
 
-#: ../nodes/equalfuncs.c:2127
+#: nodes/equalfuncs.c:1987
 #, c-format
-msgid "equal: don't know whether nodes of type %d are equal"
+msgid "_equalValue: unknown node type %d"
 msgstr ""
 
-#: ../nodes/print.c:211
+#: nodes/equalfuncs.c:2438
 #, c-format
-msgid "Cache lookup for type %u failed"
-msgstr "Cachesuche nach Typ %u fehlgeschlagen"
-
-#: ../nodes/list.c:162
-msgid "tryout to nconc a list to itself"
-msgstr ""
-
-#: ../nodes/read.c:296
-msgid "nodeRead: did not find '}' at end of plan node"
+msgid "equal: don't know whether nodes of type %d are equal"
 msgstr ""
 
-#: ../nodes/read.c:376
-#, c-format
-msgid "nodeRead: Bad type %d"
+#: nodes/list.c:162
+msgid "tryout to nconc a list to itself"
 msgstr ""
 
-#: ../nodes/readfuncs.c:70
-msgid "toIntList: unexpected datatype"
+#: nodes/list.c:245
+msgid "llast: empty list"
 msgstr ""
 
-#: ../nodes/readfuncs.c:104
-msgid "toOidList: unexpected datatype"
+#: nodes/list.c:260
+msgid "llasti: empty list"
 msgstr ""
 
-#: ../nodes/readfuncs.c:797
+#: nodes/outfuncs.c:1026 nodes/readfuncs.c:1694
 #, c-format
-msgid "_readExpr: unknown opType \"%.*s\""
+msgid "bogus rte kind %d"
 msgstr ""
 
-#: ../nodes/readfuncs.c:2023
+#: nodes/outfuncs.c:1324
 #, c-format
-msgid "badly formatted planstring \"%.10s\"..."
+msgid "_outValue: don't know how to print type %d "
 msgstr ""
 
-#: ../nodes/readfuncs.c:2056 ../nodes/readfuncs.c:2088
+#: nodes/outfuncs.c:1782
 #, c-format
-msgid "readDatum: expected '%s', got '%s'; length = %lu"
+msgid "_outNode: don't know how to print type %d "
 msgstr ""
 
-#: ../nodes/readfuncs.c:2063
+#: nodes/print.c:85
 #, c-format
-msgid "readDatum: byval & length = %lu"
-msgstr ""
-
-#: ../optimizer/geqo/geqo_main.c:123
-msgid "geqo_main: using edge recombination crossover [ERX]"
+msgid ""
+"%s:\n"
+"%s"
 msgstr ""
+"%s:\n"
+"%s"
 
-#: ../optimizer/geqo/geqo_main.c:127
-msgid "geqo_main: using partially matched crossover [PMX]"
-msgstr ""
+#: nodes/print.c:353
+#, c-format
+msgid "Cache lookup for type %u failed"
+msgstr "Cachesuche nach Typ %u fehlgeschlagen"
 
-#: ../optimizer/geqo/geqo_main.c:131
-msgid "geqo_main: using cycle crossover [CX]"
+#: nodes/read.c:296
+msgid "nodeRead: did not find '}' at end of plan node"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_main.c:136
-msgid "geqo_main: using position crossover [PX]"
+#: nodes/read.c:376
+#, c-format
+msgid "nodeRead: Bad type %d"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_main.c:141
-msgid "geqo_main: using order crossover [OX1]"
+#: nodes/readfuncs.c:70
+msgid "toIntList: unexpected datatype"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_main.c:146
-msgid "geqo_main: using order crossover [OX2]"
+#: nodes/readfuncs.c:104
+msgid "toOidList: unexpected datatype"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_main.c:217
+#: nodes/readfuncs.c:823
 #, c-format
-msgid "[GEQO] failures: %d, average: %d"
+msgid "_readExpr: unknown opType \"%.*s\""
 msgstr ""
 
-#: ../optimizer/geqo/geqo_main.c:220
-msgid "[GEQO] No edge failures detected."
+#: nodes/readfuncs.c:2276
+#, c-format
+msgid "badly formatted planstring \"%.10s\"..."
 msgstr ""
 
-#: ../optimizer/geqo/geqo_main.c:226
+#: nodes/readfuncs.c:2309 nodes/readfuncs.c:2341
 #, c-format
-msgid "[GEQO] mutations: %d, generations: %d"
+msgid "readDatum: expected '%s', got '%s'; length = %lu"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_main.c:228
-msgid "[GEQO] No mutations processed."
+#: nodes/readfuncs.c:2316
+#, c-format
+msgid "readDatum: byval & length = %lu"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_erx.c:336
+#: optimizer/geqo/geqo_erx.c:336
 msgid "gimme_gene: Internal error - minimum_count not set"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_erx.c:362
+#: optimizer/geqo/geqo_erx.c:362
 msgid "gimme_gene: neither shared nor minimum number nor random edge found"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_erx.c:422
+#: optimizer/geqo/geqo_erx.c:422
 msgid "edge_failure(1): no edge found via random decision and total_edges == 4"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_erx.c:447
+#: optimizer/geqo/geqo_erx.c:447
 msgid "edge_failure(2): no edge found via random decision and remainig edges"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_erx.c:465
+#: optimizer/geqo/geqo_erx.c:465
 msgid "edge_failure(3): no edge found via looking for the last ununsed point"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_erx.c:470
+#: optimizer/geqo/geqo_erx.c:470
 msgid "edge_failure: no edge detected"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_eval.c:139
+#: optimizer/geqo/geqo_eval.c:139
 msgid "gimme_tree: failed to construct join rel"
 msgstr ""
 
-#: ../optimizer/geqo/geqo_misc.c:42
-msgid "avg_pool: pool_size of zero"
+#: optimizer/geqo/geqo_main.c:123
+msgid "geqo_main: using edge recombination crossover [ERX]"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/predmig.c:96
-msgid "Needed to do a second round of predmig!\n"
+#: optimizer/geqo/geqo_main.c:127
+msgid "geqo_main: using partially matched crossover [PMX]"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/predmig.c:130
-msgid "called xfunc_predmig with bad inputs"
+#: optimizer/geqo/geqo_main.c:131
+msgid "geqo_main: using cycle crossover [CX]"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/predmig.c:327
-msgid "Didn't find matching node in original stream"
+#: optimizer/geqo/geqo_main.c:136
+msgid "geqo_main: using position crossover [PX]"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/predmig.c:338
-msgid "pulling up in xfunc_predmig_pullup!"
+#: optimizer/geqo/geqo_main.c:141
+msgid "geqo_main: using order crossover [OX1]"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/predmig.c:385
-msgid "didn't succeed in pulling up in xfunc_prdmig_pullup"
+#: optimizer/geqo/geqo_main.c:146
+msgid "geqo_main: using order crossover [OX2]"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/predmig.c:780
-msgid "bad pointers in stream"
+#: optimizer/geqo/geqo_main.c:211
+#, c-format
+msgid "[GEQO] failures: %d, average: %d"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/predmig.c:787
-msgid "Joins got reordered!"
+#: optimizer/geqo/geqo_main.c:214
+msgid "[GEQO] No edge failures detected."
 msgstr ""
 
-#: ../optimizer/path/_deadcode/xfunc.c:455
-#: ../optimizer/path/_deadcode/xfunc.c:706
-#: ../optimizer/path/_deadcode/xfunc.c:843
-#: ../optimizer/path/_deadcode/xfunc.c:1178
-msgid "Clause node of undetermined type"
+#: optimizer/geqo/geqo_main.c:220
+#, c-format
+msgid "[GEQO] mutations: %d, generations: %d"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/xfunc.c:491
-msgid "Oper's function is undefined"
+#: optimizer/geqo/geqo_main.c:222
+msgid "[GEQO] No mutations processed."
 msgstr ""
 
-#: ../optimizer/path/_deadcode/xfunc.c:501
-#: ../optimizer/path/_deadcode/xfunc.c:677
-#: ../optimizer/path/_deadcode/xfunc.c:1306
-#, c-format
-msgid "Cache lookup failed for procedure %u"
+#: optimizer/geqo/geqo_misc.c:43
+msgid "avg_pool: pool_size of zero"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/xfunc.c:616
-#: ../optimizer/path/_deadcode/xfunc.c:1324
-#, c-format
-msgid "Cache lookup failed for type %u"
+#: optimizer/path/allpaths.c:204
+msgid "SELECT FOR UPDATE is not supported for inherit queries"
 msgstr ""
 
-#: ../optimizer/path/_deadcode/xfunc.c:1405
-msgid "xfunc_LispRemove: didn't find a match!"
+#: optimizer/path/allpaths.c:617
+#, c-format
+msgid "recurse_pushdown_safe: unexpected node %d"
 msgstr ""
 
-#: ../optimizer/path/allpaths.c:192
-msgid "SELECT FOR UPDATE is not supported for inherit queries"
+#: optimizer/path/allpaths.c:685
+#, c-format
+msgid "recurse_push_qual: unexpected node %d"
 msgstr ""
 
-#: ../optimizer/path/clausesel.c:522
+#: optimizer/path/clausesel.c:533
 #, c-format
 msgid "clause_selectivity: s1 %f"
 msgstr ""
 
-#: ../optimizer/path/costsize.c:1229
+#: optimizer/path/costsize.c:1312
 #, c-format
 msgid "set_joinrel_size_estimates: unsupported join type %d"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:506
+#: optimizer/path/indxpath.c:509
 msgid "extract_or_indexqual_conditions: no matching clause"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:1302
+#: optimizer/path/indxpath.c:1229
 msgid "pred_test_simple_clause: unknown test_op"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:1330
+#: optimizer/path/indxpath.c:1258
 msgid "pred_test_simple_clause: null test result"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:2008
+#: optimizer/path/indxpath.c:1903
 #, c-format
 msgid "prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:2019
+#: optimizer/path/indxpath.c:1919
 #, c-format
 msgid "prefix_quals: no = operator for type %u"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:2034
+#: optimizer/path/indxpath.c:1934
 #, c-format
 msgid "prefix_quals: no >= operator for type %u"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:2050
+#: optimizer/path/indxpath.c:1950
 #, c-format
 msgid "prefix_quals: no < operator for type %u"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:2099
+#: optimizer/path/indxpath.c:1997
 #, c-format
 msgid "network_prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:2112
+#: optimizer/path/indxpath.c:2010
 #, c-format
 msgid "network_prefix_quals: no %s operator for type %u"
 msgstr ""
 
-#: ../optimizer/path/indxpath.c:2127
+#: optimizer/path/indxpath.c:2025
 #, c-format
 msgid "network_prefix_quals: no <= operator for type %u"
 msgstr ""
 
-#: ../optimizer/path/joinpath.c:172
+#: optimizer/path/joinpath.c:172
 #, c-format
 msgid "sort_inner_and_outer: unexpected join type %d"
 msgstr ""
 
-#: ../optimizer/path/joinpath.c:343
+#: optimizer/path/joinpath.c:343
 #, c-format
 msgid "match_unsorted_outer: unexpected join type %d"
 msgstr ""
 
-#: ../optimizer/path/joinpath.c:602
+#: optimizer/path/joinpath.c:602
 #, c-format
 msgid "match_unsorted_inner: unexpected join type %d"
 msgstr ""
 
-#: ../optimizer/path/joinrels.c:226
+#: optimizer/path/joinrels.c:226
 #, c-format
 msgid "make_rels_by_joins: failed to build any %d-way joins"
 msgstr ""
 
-#: ../optimizer/path/joinrels.c:381
+#: optimizer/path/joinrels.c:381
 #, c-format
 msgid "make_jointree_rel: unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/path/joinrels.c:438
+#: optimizer/path/joinrels.c:438
 #, c-format
 msgid "make_join_rel: unsupported join type %d"
 msgstr ""
 
-#: ../optimizer/path/pathkeys.c:872
+#: optimizer/path/pathkeys.c:876
 msgid ""
 "make_pathkeys_for_mergeclauses: can't identify which side of mergeclause to "
 "use"
 msgstr ""
 
-#: ../optimizer/plan/createplan.c:133
+#: optimizer/plan/createplan.c:139
 #, c-format
 msgid "create_plan: unknown pathtype %d"
 msgstr ""
 
-#: ../optimizer/plan/createplan.c:202
+#: optimizer/plan/createplan.c:214
 #, c-format
 msgid "create_scan_plan: unknown node type: %d"
 msgstr ""
 
-#: ../optimizer/plan/createplan.c:282
+#: optimizer/plan/createplan.c:296
 #, c-format
 msgid "create_join_plan: unknown node type: %d"
 msgstr ""
 
-#: ../optimizer/plan/createplan.c:980
+#: optimizer/plan/createplan.c:1033
 msgid "fix_indxqual_sublist: indexqual clause is not binary opclause"
 msgstr ""
 
-#: ../optimizer/plan/createplan.c:1017
-msgid "fix_indxqual_sublist: failed to find substitute op"
-msgstr ""
-
-#: ../optimizer/plan/createplan.c:1079
+#: optimizer/plan/createplan.c:1122
 msgid "fix_indxqual_operand: var is not index attribute"
 msgstr ""
 
-#: ../optimizer/plan/createplan.c:1497
+#: optimizer/plan/createplan.c:1560
 msgid "make_sort_from_pathkeys: cannot find tlist item to sort"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:151
+#: optimizer/plan/initsplan.c:124
+msgid "SELECT FOR UPDATE cannot be applied to a join"
+msgstr ""
+
+#: optimizer/plan/initsplan.c:127
 #, c-format
-msgid "add_missing_rels_to_query: unexpected node type %d"
+msgid "add_base_rels_to_query: unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:274 ../optimizer/plan/planner.c:412
+#: optimizer/plan/initsplan.c:307 optimizer/plan/planner.c:457
 msgid "UNION JOIN is not implemented yet"
 msgstr "UNION JOIN ist noch nicht implementiert"
 
-#: ../optimizer/plan/initsplan.c:278
+#: optimizer/plan/initsplan.c:311
 #, c-format
 msgid "distribute_quals_to_rels: unsupported join type %d"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:288
+#: optimizer/plan/initsplan.c:321
 #, c-format
 msgid "distribute_quals_to_rels: unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:325
+#: optimizer/plan/initsplan.c:358
 msgid ""
 "SELECT FOR UPDATE cannot be applied to the nullable side of an OUTER JOIN"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:387
+#: optimizer/plan/initsplan.c:452
 msgid "JOIN qualification may not refer to other relations"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:545
+#: optimizer/plan/initsplan.c:611
 msgid "distribute_qual_to_rels: can't cope with variable-free clause"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:689
+#: optimizer/plan/initsplan.c:753
 #, c-format
 msgid "Unable to identify an equality operator for types '%s' and '%s'"
 msgstr ""
 
-#: ../optimizer/plan/initsplan.c:700
+#: optimizer/plan/initsplan.c:764
 #, c-format
 msgid ""
 "Equality operator for types '%s' and '%s' should be mergejoinable, but isn't"
 msgstr ""
 
-#: ../optimizer/plan/planmain.c:218
-#, c-format
-msgid "Internal error: no jointree entry for rel %s (%d)"
-msgstr ""
-
-#: ../optimizer/plan/planmain.c:241
+#: optimizer/plan/planmain.c:224
 msgid "subplanner: failed to construct a relation"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:415
+#: optimizer/plan/planner.c:460
 #, c-format
 msgid "pull_up_subqueries: unexpected join type %d"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:421
+#: optimizer/plan/planner.c:466
 #, c-format
 msgid "pull_up_subqueries: unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:442
+#: optimizer/plan/planner.c:487
 msgid "is_simple_subquery: subquery is bogus"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:517
+#: optimizer/plan/planner.c:602
 #, c-format
 msgid "resolvenew_in_jointree: unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:596
+#: optimizer/plan/planner.c:681
 #, c-format
 msgid "preprocess_jointree: unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:682
+#: optimizer/plan/planner.c:793
 #, c-format
 msgid "preprocess_qual_conditions: unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:797 ../parser/analyze.c:2067
-#: ../parser/analyze.c:2234 ../parser/analyze.c:2695
+#: optimizer/plan/planner.c:908 parser/analyze.c:1774 parser/analyze.c:1947
+#: parser/analyze.c:2444
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:850
+#: optimizer/plan/planner.c:961
 msgid "SELECT FOR UPDATE is not allowed in subselects"
 msgstr ""
 
-#: ../optimizer/plan/planner.c:1452 ../optimizer/plan/planner.c:1458
+#: optimizer/plan/planner.c:1563 optimizer/plan/planner.c:1569
 msgid "postprocess_setop_tlist: resjunk output columns not implemented"
 msgstr ""
 
-#: ../optimizer/plan/setrefs.c:192
+#: optimizer/plan/setrefs.c:215
 #, c-format
 msgid "set_plan_references: unknown plan type %d"
 msgstr ""
 
-#: ../optimizer/plan/setrefs.c:413
+#: optimizer/plan/setrefs.c:458
 msgid "join_references: variable not in subplan target lists"
 msgstr ""
 
-#: ../optimizer/plan/setrefs.c:474
+#: optimizer/plan/setrefs.c:519
 msgid "replace_vars_with_subplan_refs: variable not in subplan target list"
 msgstr ""
 
-#: ../optimizer/plan/subselect.c:140
+#: optimizer/plan/subselect.c:141
 msgid "make_subplan: invalid expression structure (SubLink already processed?)"
 msgstr ""
 
-#: ../optimizer/plan/subselect.c:142
+#: optimizer/plan/subselect.c:143
 msgid ""
 "make_subplan: invalid expression structure (subquery already processed?)"
 msgstr ""
 
-#: ../optimizer/plan/subselect.c:280 ../optimizer/plan/subselect.c:418
+#: optimizer/plan/subselect.c:281 optimizer/plan/subselect.c:430
 #, c-format
 msgid "cache lookup failed for operator %u"
 msgstr ""
 
-#: ../optimizer/plan/subselect.c:681
+#: optimizer/plan/subselect.c:705
 #, c-format
 msgid "SS_finalize_plan: node %d unsupported"
 msgstr ""
 
-#: ../optimizer/plan/subselect.c:702
+#: optimizer/plan/subselect.c:728
 msgid "SS_finalize_plan: plan shouldn't reference subplan's variable"
 msgstr ""
 
-#: ../optimizer/prep/preptlist.c:66
+#: optimizer/prep/preptlist.c:58
 msgid "preprocess_targetlist: subquery cannot be result relation"
 msgstr ""
 
-#: ../optimizer/prep/preptlist.c:213
+#: optimizer/prep/preptlist.c:212
 msgid "expand_targetlist: unexpected command_type"
 msgstr ""
 
-#: ../optimizer/prep/preptlist.c:246
-#, c-format
-msgid "Unexpected assignment to attribute \"%s\""
-msgstr ""
-
-#: ../optimizer/prep/preptlist.c:315 ../optimizer/prep/preptlist.c:327
-#, c-format
-msgid "Multiple assignments to same attribute \"%s\""
+#: optimizer/prep/preptlist.c:242
+msgid "expand_targetlist: targetlist is not sorted correctly"
 msgstr ""
 
-#: ../optimizer/prep/prepunion.c:194
+#: optimizer/prep/prepunion.c:193
 #, c-format
 msgid "recurse_set_operations: unexpected node %d"
 msgstr ""
 
-#: ../optimizer/prep/prepunion.c:314
+#: optimizer/prep/prepunion.c:309
 msgid "generate_nonunion_plan: bogus operation code"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:78
+#: optimizer/util/clauses.c:81
 #, c-format
 msgid "make_clause: unsupported type %d"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:441
+#: optimizer/util/clauses.c:445
 msgid "Aggregate function calls may not be nested"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:655
+#: optimizer/util/clauses.c:718
 #, c-format
 msgid "Sub-SELECT uses un-GROUPed attribute %s.%s from outer query"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:946
+#: optimizer/util/clauses.c:1062
 msgid "CommuteClause: applied to non-binary-operator clause"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:954
+#: optimizer/util/clauses.c:1070
 #, c-format
 msgid "CommuteClause: no commutator for operator %u"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:1179
+#: optimizer/util/clauses.c:1395
 #, c-format
 msgid "eval_const_expressions: unexpected opType %d"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:1445 ../utils/cache/lsyscache.c:536
-#: ../utils/cache/lsyscache.c:557
+#: optimizer/util/clauses.c:1631 utils/cache/lsyscache.c:581
+#: utils/cache/lsyscache.c:602 utils/cache/lsyscache.c:623
 #, c-format
 msgid "Function OID %u does not exist"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:1796
+#: optimizer/util/clauses.c:1981
 #, c-format
 msgid "expression_tree_walker: Unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/util/clauses.c:2171
+#: optimizer/util/clauses.c:2371
 #, c-format
 msgid "expression_tree_mutator: Unexpected node type %d"
 msgstr ""
 
-#: ../optimizer/util/pathnode.c:125
+#: optimizer/util/pathnode.c:125
 msgid "Unable to devise a query plan for the given query"
 msgstr ""
 
-#: ../optimizer/util/plancat.c:57
+#: optimizer/util/plancat.c:57
 #, c-format
 msgid "get_relation_info: Relation %u not found"
 msgstr ""
 
-#: ../optimizer/util/plancat.c:112
-#, c-format
-msgid "find_secondary_indexes: index %u not found"
-msgstr ""
-
-#: ../optimizer/util/plancat.c:185
-#, c-format
-msgid "find_secondary_indexes: no amop %u %d"
-msgstr ""
-
-#: ../optimizer/util/plancat.c:239
+#: optimizer/util/plancat.c:221
 #, c-format
 msgid "restriction_selectivity: bad value %f"
 msgstr ""
 
-#: ../optimizer/util/plancat.c:272
+#: optimizer/util/plancat.c:254
 #, c-format
 msgid "join_selectivity: bad value %f"
 msgstr ""
 
-#: ../optimizer/util/plancat.c:344
+#: optimizer/util/plancat.c:326
 #, c-format
 msgid "has_subclass: Relation %u not found"
 msgstr ""
 
-#: ../optimizer/util/relnode.c:68
+#: optimizer/util/relnode.c:60
+msgid "build_base_rel: rel already exists"
+msgstr ""
+
+#: optimizer/util/relnode.c:69
 msgid "build_base_rel: rel already exists as 'other' rel"
 msgstr ""
 
-#: ../optimizer/util/relnode.c:108
+#: optimizer/util/relnode.c:107
 msgid "build_other_rel: rel already exists as base rel"
 msgstr ""
 
-#: ../optimizer/util/relnode.c:201
+#: optimizer/util/relnode.c:180
+#, c-format
+msgid "make_base_rel: unsupported RTE kind %d"
+msgstr ""
+
+#: optimizer/util/relnode.c:216
 #, c-format
 msgid "find_base_rel: no relation entry for relid %d"
 msgstr ""
 
-#: ../optimizer/util/tlist.c:239
+#: optimizer/util/tlist.c:239
 msgid ""
 "get_sortgroupclause_tle: ORDER/GROUP BY expression not found in targetlist"
 msgstr ""
 
-#: ../parser/analyze.c:228
+#: parser/analyze.c:257
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr ""
 
-#: ../parser/analyze.c:413
+#: parser/analyze.c:448
 msgid "INSERT ... SELECT may not specify INTO"
 msgstr ""
 
-#: ../parser/analyze.c:497
+#: parser/analyze.c:531
 msgid "INSERT has more expressions than target columns"
 msgstr ""
 
-#: ../parser/analyze.c:707
+#: parser/analyze.c:563
+msgid "INSERT has more target columns than expressions"
+msgstr ""
+
+#: parser/analyze.c:759
 msgid "parser: unrecognized node (internal error)"
 msgstr ""
 
-#: ../parser/analyze.c:826
+#: parser/analyze.c:841
 #, c-format
 msgid "%s will create implicit sequence '%s' for SERIAL column '%s.%s'"
 msgstr "%s erstellt implizit eine Sequenz �%s� f�r die �SERIAL�-Spalte %s.%s"
 
-#: ../parser/analyze.c:867 ../parser/analyze.c:875
+#: parser/analyze.c:922 parser/analyze.c:930
 #, c-format
 msgid "%s/(NOT) NULL conflicting declaration for '%s.%s'"
 msgstr ""
 
-#: ../parser/analyze.c:883
+#: parser/analyze.c:938
 #, c-format
 msgid "%s/DEFAULT multiple values specified for '%s.%s'"
 msgstr ""
 
-#: ../parser/analyze.c:933 ../parser/analyze.c:972
+#: parser/analyze.c:980 parser/analyze.c:1019
 msgid "parser: unrecognized constraint (internal error)"
 msgstr ""
 
-#: ../parser/analyze.c:968
+#: parser/analyze.c:1015
 msgid "parser: illegal context for constraint (internal error)"
 msgstr ""
 
-#: ../parser/analyze.c:1012
+#: parser/analyze.c:1059
 #, c-format
 msgid "%s / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
 msgstr ""
 
-#: ../parser/analyze.c:1080 ../parser/analyze.c:3029
+#: parser/analyze.c:1127
 #, c-format
 msgid "inherited table \"%s\" is not a relation"
 msgstr ""
 
-#: ../parser/analyze.c:1107
+#: parser/analyze.c:1156
 #, c-format
 msgid ""
 "inherited attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
 "NOT NULL"
 msgstr ""
 
-#: ../parser/analyze.c:1136
+#: parser/analyze.c:1182
 #, c-format
 msgid ""
 "Existing attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
 "NOT NULL"
 msgstr ""
 
-#: ../parser/analyze.c:1143
+#: parser/analyze.c:1189
 #, c-format
 msgid "%s: column \"%s\" named in key does not exist"
 msgstr "%s: Spalte �%s�, die im Key verwendet wird, existiert nicht"
 
-#: ../parser/analyze.c:1151
+#: parser/analyze.c:1197
 #, c-format
 msgid "%s: column \"%s\" appears twice in %s constraint"
 msgstr ""
 
-#: ../parser/analyze.c:1238
+#: parser/analyze.c:1287
 #, c-format
 msgid "%s: failed to make implicit index name"
 msgstr ""
 
-#: ../parser/analyze.c:1241
+#: parser/analyze.c:1290
 #, c-format
 msgid "%s / %s%s will create implicit index '%s' for table '%s'"
 msgstr "%s / %s%s erstellt implizit einen Index �%s� f�r Tabelle �%s�"
 
-#: ../parser/analyze.c:1265
+#: parser/analyze.c:1304
 #, c-format
 msgid "%s will create implicit trigger(s) for FOREIGN KEY check(s)"
 msgstr "%s erstellt implizit Trigger f�r FOREIGN-KEY-Pr�fungen"
 
-#: ../parser/analyze.c:1293 ../parser/analyze.c:1324 ../parser/analyze.c:1381
-#, c-format
-msgid "Can only have %d keys in a foreign key"
-msgstr ""
-
-#: ../parser/analyze.c:1336 ../parser/analyze.c:2914
-#, c-format
-msgid "PRIMARY KEY for referenced table \"%s\" not found"
-msgstr ""
-
-#: ../parser/analyze.c:1398 ../parser/analyze.c:2854
-#, c-format
-msgid ""
-"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
-msgstr ""
-
-#: ../parser/analyze.c:1453
-#, c-format
-msgid ""
-"number of key attributes in referenced table must be equal to foreign key\n"
-"\tIllegal FOREIGN KEY definition references \"%s\""
-msgstr ""
-
-#: ../parser/analyze.c:1514
-msgid "Only one ON DELETE action can be specified for FOREIGN KEY constraint"
-msgstr ""
-
-#: ../parser/analyze.c:1586
-msgid "Only one ON UPDATE action can be specified for FOREIGN KEY constraint"
-msgstr ""
-
-#: ../parser/analyze.c:1732 ../parser/analyze.c:1849
+#: parser/analyze.c:1446 parser/analyze.c:1568
 #, c-format
 msgid "transformRuleStmt: unexpected event type %d"
 msgstr ""
 
-#: ../parser/analyze.c:1741
+#: parser/analyze.c:1455
 msgid "Rule WHERE condition may not contain references to other relations"
 msgstr ""
 
-#: ../parser/analyze.c:1809
+#: parser/analyze.c:1459
+msgid "Rule WHERE condition may not contain aggregate functions"
+msgstr ""
+
+#: parser/analyze.c:1528
 msgid ""
 "Rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE "
 "actions"
 msgstr ""
 
-#: ../parser/analyze.c:1833
+#: parser/analyze.c:1552
 msgid "ON SELECT rule may not use OLD"
 msgstr ""
 
-#: ../parser/analyze.c:1835
+#: parser/analyze.c:1554
 msgid "ON SELECT rule may not use NEW"
 msgstr ""
 
-#: ../parser/analyze.c:1842
+#: parser/analyze.c:1561
 msgid "ON INSERT rule may not use OLD"
 msgstr ""
 
-#: ../parser/analyze.c:1846
+#: parser/analyze.c:1565
 msgid "ON DELETE rule may not use NEW"
 msgstr ""
 
-#: ../parser/analyze.c:1911 ../parser/analyze.c:2131
+#: parser/analyze.c:1630 parser/analyze.c:1838
 msgid "DECLARE CURSOR must not specify INTO"
 msgstr ""
 
-#: ../parser/analyze.c:1913 ../parser/analyze.c:2133
+#: parser/analyze.c:1632 parser/analyze.c:1840
 msgid ""
 "DECLARE/UPDATE is not supported\n"
 "\tCursors must be READ ONLY"
 msgstr ""
 
-#: ../parser/analyze.c:1923 ../parser/analyze.c:2143
-msgid "DECLARE CURSOR may only be used in begin/end transaction blocks"
-msgstr ""
-
-#: ../parser/analyze.c:2195
+#: parser/analyze.c:1908
 msgid ""
 "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result "
 "columns"
 msgstr ""
 
-#: ../parser/analyze.c:2229
+#: parser/analyze.c:1942
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: ../parser/analyze.c:2231
+#: parser/analyze.c:1944
 msgid "Portal may not appear in UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: ../parser/analyze.c:2326
+#: parser/analyze.c:2038
 #, c-format
 msgid "Each %s query must have the same number of columns"
 msgstr ""
 
-#: ../parser/analyze.c:2384
+#: parser/analyze.c:2096
 #, c-format
 msgid "getSetColTypes: unexpected node %d"
 msgstr ""
 
-#: ../parser/analyze.c:2395
+#: parser/analyze.c:2107
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr ""
 
-#: ../parser/analyze.c:2478 ../parser/analyze.c:2487
+#: parser/analyze.c:2190 parser/analyze.c:2199
 msgid "UPDATE target count mismatch --- internal error"
 msgstr ""
 
-#: ../parser/analyze.c:2567
+#: parser/analyze.c:2285
 msgid "Unexpected node type in ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: ../parser/analyze.c:2640
-#, c-format
-msgid "Unsupported type %d in transformTypeRefs"
+#: parser/analyze.c:2368
+msgid "transformPrepareStmt: internal error"
 msgstr ""
 
-#: ../parser/analyze.c:2681
+#: parser/analyze.c:2395
 #, c-format
-msgid "unsupported expression in %%TYPE"
+msgid "Wrong number of parameters, expected %d but got %d"
+msgstr ""
+
+#: parser/analyze.c:2408
+msgid "Cannot use subselects in EXECUTE parameters"
+msgstr ""
+
+#: parser/analyze.c:2410
+msgid "Cannot use aggregates in EXECUTE parameters"
 msgstr ""
 
-#: ../parser/analyze.c:2684
+#: parser/analyze.c:2421
 #, c-format
-msgid "%s.%s%%TYPE converted to %s"
+msgid ""
+"Parameter $%d of type %s cannot be coerced into the expected type %s\n"
+"\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: ../parser/analyze.c:2697
+#: parser/analyze.c:2446
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr ""
 
-#: ../parser/analyze.c:2699
+#: parser/analyze.c:2448
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr ""
 
-#: ../parser/analyze.c:2701
+#: parser/analyze.c:2450
 msgid "SELECT FOR UPDATE is not allowed with AGGREGATE"
 msgstr ""
 
-#: ../parser/analyze.c:2766
+#: parser/analyze.c:2515
 #, c-format
 msgid "FOR UPDATE: relation \"%s\" not found in FROM clause"
 msgstr ""
 
-#: ../parser/analyze.c:2813
-#, c-format
-msgid "transformFkeyCheckAttrs: index %u not found"
-msgstr "transformFkeyCheckAttrs: Index %u nicht gefunden"
-
-#: ../parser/analyze.c:2899
-#, c-format
-msgid "transformFkeyGetPrimaryKey: index %u not found"
-msgstr ""
-
-#: ../parser/analyze.c:2970
+#: parser/analyze.c:2555
 #, c-format
 msgid "relationHasPrimaryKey: index %u not found"
 msgstr "relationHasPrimaryKey: Index %u nicht gefunden"
 
-#: ../parser/analyze.c:3010
-#, c-format
-msgid "Unable to lookup type %s"
-msgstr ""
-
-#: ../parser/analyze.c:3063
-#, c-format
-msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
-msgstr "%s: Spalte �%s�, die im Foreign-Key verwendet wird, existiert nicht"
-
-#: ../parser/analyze.c:3104
+#: parser/analyze.c:2606
 msgid "Misplaced DEFERRABLE clause"
 msgstr ""
 
-#: ../parser/analyze.c:3106 ../parser/analyze.c:3115
+#: parser/analyze.c:2608 parser/analyze.c:2617
 msgid "Multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr ""
 
-#: ../parser/analyze.c:3113
+#: parser/analyze.c:2615
 msgid "Misplaced NOT DEFERRABLE clause"
 msgstr ""
 
-#: ../parser/analyze.c:3120 ../parser/analyze.c:3138 gram.y:1914 gram.y:1927
+#: gram.y:2129 gram.y:2143 parser/analyze.c:2622 parser/analyze.c:2640
 msgid "INITIALLY DEFERRED constraint must be DEFERRABLE"
 msgstr ""
 
-#: ../parser/analyze.c:3125
+#: parser/analyze.c:2627
 msgid "Misplaced INITIALLY DEFERRED clause"
 msgstr ""
 
-#: ../parser/analyze.c:3127 ../parser/analyze.c:3145
+#: parser/analyze.c:2629 parser/analyze.c:2647
 msgid "Multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr ""
 
-#: ../parser/analyze.c:3143
+#: parser/analyze.c:2645
 msgid "Misplaced INITIALLY IMMEDIATE clause"
 msgstr ""
 
-#: ../parser/parse_agg.c:118
+#: parser/analyze.c:2754
+#, c-format
+msgid ""
+"New table specifies a schema (%s) different from the one being created (%s)"
+msgstr ""
+
+#: parser/analyze.c:2773
+#, c-format
+msgid ""
+"New view specifies a schema (%s) different from the one being created (%s)"
+msgstr ""
+
+#: parser/analyze.c:2790
+msgid "parser: unsupported schema node (internal error)"
+msgstr ""
+
+#: parser/parse_agg.c:112
 #, c-format
 msgid "Attribute %s.%s must be GROUPed or used in an aggregate function"
 msgstr ""
 "Attribut %s.%s mu� gruppiert werden (GROUP BY) oder in einer "
 "Aggregatfunktion verwendent werden"
 
-#: ../parser/parse_agg.c:156
+#: parser/parse_agg.c:150
 msgid "Aggregates not allowed in WHERE clause"
 msgstr ""
 
-#: ../parser/parse_agg.c:158
+#: parser/parse_agg.c:152
 msgid "Aggregates not allowed in JOIN conditions"
 msgstr ""
 
-#: ../parser/parse_agg.c:174
+#: parser/parse_agg.c:168
 msgid "Aggregates not allowed in GROUP BY clause"
 msgstr ""
 
-#: ../parser/parse_agg.c:249
-#, c-format
-msgid "%s: aggregate '%s' for all types does not exist"
+#: parser/parse_clause.c:194
+msgid "Bogus InhOption value"
 msgstr ""
 
-#: ../parser/parse_agg.c:252
+#: parser/parse_clause.c:341
 #, c-format
-msgid "%s: aggregate '%s' for type %s does not exist"
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
 msgstr ""
 
-#: ../parser/parse_clause.c:189
-msgid "Bogus InhOption value"
+#: parser/parse_clause.c:400
+msgid "sub-select in FROM must have an alias"
 msgstr ""
 
-#: ../parser/parse_clause.c:296
-#, c-format
-msgid "JOIN/USING clause must return type boolean, not type %s"
+#: parser/parse_clause.c:424 parser/parse_clause.c:427
+msgid "Unexpected parse analysis result for subselect in FROM"
 msgstr ""
 
-#: ../parser/parse_clause.c:332
-#, c-format
-msgid "JOIN/ON clause must return type boolean, not type %s"
+#: parser/parse_clause.c:430
+msgid "Expected SELECT query from subselect in FROM"
 msgstr ""
 
-#: ../parser/parse_clause.c:352
-#, c-format
-msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+#: parser/parse_clause.c:432
+msgid "Subselect in FROM may not have SELECT INTO"
 msgstr ""
 
-#: ../parser/parse_clause.c:412
-msgid "sub-select in FROM must have an alias"
+#: parser/parse_clause.c:493
+msgid ""
+"FROM function expression may not refer to other relations of same query level"
 msgstr ""
 
-#: ../parser/parse_clause.c:434 ../parser/parse_clause.c:437
-msgid "Unexpected parse analysis result for subselect in FROM"
+#: parser/parse_clause.c:502
+msgid "cannot use aggregate function in FROM function expression"
 msgstr ""
 
-#: ../parser/parse_clause.c:440
-msgid "Expected SELECT query from subselect in FROM"
+#: parser/parse_clause.c:514
+msgid "Coercion function not allowed in FROM clause"
 msgstr ""
 
-#: ../parser/parse_clause.c:442
-msgid "Subselect in FROM may not have SELECT INTO"
+#: parser/parse_clause.c:624 parser/parse_clause.c:636
+msgid "transformFromClauseItem: unexpected subtree type"
+msgstr ""
+
+#: parser/parse_clause.c:719
+#, c-format
+msgid "USING column name \"%s\" appears more than once"
 msgstr ""
 
-#: ../parser/parse_clause.c:642
+#: parser/parse_clause.c:731
 #, c-format
 msgid "Common column name \"%s\" appears more than once in left table"
 msgstr ""
 
-#: ../parser/parse_clause.c:648
+#: parser/parse_clause.c:737
 #, c-format
 msgid "JOIN/USING column \"%s\" not found in left table"
 msgstr ""
 
-#: ../parser/parse_clause.c:659
+#: parser/parse_clause.c:749
 #, c-format
 msgid "Common column name \"%s\" appears more than once in right table"
 msgstr ""
 
-#: ../parser/parse_clause.c:665
+#: parser/parse_clause.c:755
 #, c-format
 msgid "JOIN/USING column \"%s\" not found in right table"
 msgstr ""
 
-#: ../parser/parse_clause.c:743
+#: parser/parse_clause.c:804
 #, c-format
-msgid "Column alias list for \"%s\" has wrong number of entries (need %d)"
+msgid "Column alias list for \"%s\" has too many entries"
 msgstr ""
 
-#: ../parser/parse_clause.c:755
+#: parser/parse_clause.c:831
 #, c-format
 msgid ""
 "transformFromClauseItem: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: ../parser/parse_clause.c:777
+#: parser/parse_clause.c:942
 #, c-format
-msgid "WHERE clause must return type boolean, not type %s"
+msgid "buildMergedJoinVar: unexpected jointype %d"
 msgstr ""
 
-#: ../parser/parse_clause.c:873
+#: parser/parse_clause.c:1063
 #, c-format
 msgid "%s '%s' is ambiguous"
 msgstr ""
 
-#: ../parser/parse_clause.c:892
+#: parser/parse_clause.c:1082
 #, c-format
 msgid "Non-integer constant in %s"
 msgstr ""
 
-#: ../parser/parse_clause.c:905
+#: parser/parse_clause.c:1095
 #, c-format
 msgid "%s position %d is not in target list"
 msgstr ""
 
-#: ../parser/parse_clause.c:1047
+#: parser/parse_clause.c:1237
 msgid "For SELECT DISTINCT, ORDER BY expressions must appear in target list"
 msgstr ""
 
-#: ../parser/parse_clause.c:1085
+#: parser/parse_clause.c:1275
 msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
 msgstr ""
 
-#: ../parser/parse_clause.c:1109
+#: parser/parse_clause.c:1299
 msgid ""
 "transformDistinctClause: failed to add DISTINCT ON clause to target list"
 msgstr ""
 
-#: ../parser/parse_coerce.c:136
+#: parser/parse_coerce.c:288
 #, c-format
-msgid "coerce_type: conversion function %s produced %s"
+msgid "coerce_type: no conversion function from %s to %s"
 msgstr ""
 
-#: ../parser/parse_coerce.c:388
+#: parser/parse_coerce.c:414
 #, c-format
-msgid "%s types \"%s\" and \"%s\" not matched"
+msgid "coerce_type_constraints: failed to lookup type %u"
 msgstr ""
 
-#: ../parser/parse_coerce.c:443
+#. translator: first %s is name of a SQL construct, eg WHERE
+#: parser/parse_coerce.c:565
 #, c-format
-msgid "%s unable to convert to type \"%s\""
-msgstr ""
-
-#: ../parser/parse_expr.c:103
-#, c-format
-msgid "Expression too complex: nesting depth exceeds max_expr_depth = %d"
+msgid "Argument of %s must be type boolean, not type %s"
 msgstr ""
 
-#: ../parser/parse_expr.c:132
+#. translator: %s is name of a SQL construct, eg WHERE
+#: parser/parse_coerce.c:573
 #, c-format
-msgid "Parameter '$%d' is out of range"
+msgid "Argument of %s must not be a set function"
 msgstr ""
 
-#: ../parser/parse_expr.c:211
+#: parser/parse_coerce.c:620
 #, c-format
-msgid "left-hand side of AND is type '%s', not '%s'"
+msgid "%s types '%s' and '%s' not matched"
 msgstr ""
 
-#: ../parser/parse_expr.c:216
+#: parser/parse_coerce.c:672
 #, c-format
-msgid "right-hand side of AND is type '%s', not '%s'"
+msgid "%s unable to convert to type %s"
 msgstr ""
 
-#: ../parser/parse_expr.c:237
+#: parser/parse_coerce.c:954
 #, c-format
-msgid "left-hand side of OR is type '%s', not '%s'"
+msgid "find_coercion_pathway: bogus castcontext %c"
 msgstr ""
 
-#: ../parser/parse_expr.c:242
+#: parser/parse_expr.c:101
 #, c-format
-msgid "right-hand side of OR is type '%s', not '%s'"
+msgid "Expression too complex: nesting depth exceeds max_expr_depth = %d"
 msgstr ""
 
-#: ../parser/parse_expr.c:260
+#: parser/parse_expr.c:120
 #, c-format
-msgid "argument to NOT is type '%s', not '%s'"
+msgid "Parameter '$%d' is out of range"
 msgstr ""
 
-#: ../parser/parse_expr.c:311 ../parser/parse_expr.c:315
+#: parser/parse_expr.c:358 parser/parse_expr.c:362
 msgid "Bad query in subselect"
 msgstr ""
 
-#: ../parser/parse_expr.c:337
+#: parser/parse_expr.c:384
 msgid "Subselect must have a field"
 msgstr ""
 
-#: ../parser/parse_expr.c:341
+#: parser/parse_expr.c:388
 msgid "Subselect must have only one field"
 msgstr ""
 
-#: ../parser/parse_expr.c:370
+#: parser/parse_expr.c:418
 #, c-format
-msgid "Row comparison cannot use '%s'"
+msgid "Row comparison cannot use operator %s"
 msgstr ""
 
-#: ../parser/parse_expr.c:393
+#: parser/parse_expr.c:441
 msgid "Subselect has too many fields"
 msgstr ""
 
-#: ../parser/parse_expr.c:409
+#: parser/parse_expr.c:457
 #, c-format
 msgid ""
-"'%s' result type of '%s' must return '%s' to be used with quantified "
+"%s has result type of %s, but must return %s to be used with quantified "
 "predicate subquery"
 msgstr ""
 
-#: ../parser/parse_expr.c:421
-msgid "Subselect has too few fields"
+#: parser/parse_expr.c:463
+#, c-format
+msgid "%s must not return a set to be used with quantified predicate subquery"
 msgstr ""
 
-#: ../parser/parse_expr.c:461
-msgid "WHEN clause must have a boolean result"
+#: parser/parse_expr.c:475
+msgid "Subselect has too few fields"
 msgstr ""
 
-#: ../parser/parse_expr.c:574
+#: parser/parse_expr.c:615
 #, c-format
 msgid "transformExpr: unexpected booltesttype %d"
 msgstr ""
 
-#: ../parser/parse_expr.c:579
-#, c-format
-msgid "Argument of %s must be boolean"
-msgstr ""
-
-#: ../parser/parse_expr.c:609
+#: parser/parse_expr.c:652
 #, c-format
 msgid "transformExpr: does not know how to transform node %d (internal error)"
 msgstr ""
 
-#: ../parser/parse_expr.c:668
+#: parser/parse_expr.c:744
 #, c-format
-msgid "Attribute '%s' not found"
+msgid "Attribute \"%s\" not found"
 msgstr "Attribut �%s� nicht gefunden"
 
-#: ../parser/parse_expr.c:728
-msgid "Cannot get type for untransformed sublink"
-msgstr ""
-
-#: ../parser/parse_expr.c:756
-#, c-format
-msgid "Do not know how to get type for %d node"
-msgstr ""
-
-#: ../parser/parse_expr.c:902 ../utils/adt/ruleutils.c:447
-#: ../utils/adt/ruleutils.c:2050 ../utils/adt/ruleutils.c:2146
-#, c-format
-msgid "cache lookup for proc %u failed"
+#: parser/parse_expr.c:856 parser/parse_target.c:153
+msgid "Invalid qualified name syntax (too many names)"
 msgstr ""
 
-#: ../parser/parse_expr.c:927 ../utils/adt/ruleutils.c:2160
-#, c-format
-msgid "cache lookup for type %u failed"
+#: parser/parse_expr.c:913
+msgid "exprType: Cannot get type for untransformed sublink"
 msgstr ""
 
-#: ../parser/parse_expr.c:982
+#: parser/parse_expr.c:940
 #, c-format
-msgid "Cannot cast this expression to type '%s'"
+msgid "exprType: Do not know how to get type for %d node"
 msgstr ""
 
-#: ../parser/parse_expr.c:1032
+#: parser/parse_expr.c:1110
 #, c-format
-msgid "Cannot cast type '%s' to '%s'"
+msgid "Cannot cast type %s to %s"
 msgstr "kann Typ �%s� nicht in Typ �%s� umwandeln"
 
-#: ../parser/parse_func.c:154
+#: parser/parse_func.c:97
 #, c-format
 msgid "Cannot pass more than %d arguments to a function"
 msgstr ""
 
-#: ../parser/parse_func.c:161
+#: parser/parse_func.c:104
 #, c-format
 msgid "Function '%s' does not allow NULL input"
 msgstr ""
 
-#: ../parser/parse_func.c:204
+#: parser/parse_func.c:192
 #, c-format
-msgid "Type '%s' is not a relation type"
+msgid "Cannot find type OID for relation %u"
 msgstr ""
 
-#: ../parser/parse_func.c:211 ../parser/parse_func.c:483
+#: parser/parse_func.c:232
 #, c-format
-msgid "No such attribute or function '%s'"
+msgid "Cannot pass result of sub-select or join %s to a function"
 msgstr ""
 
-#: ../parser/parse_func.c:227
-msgid "Aggregate functions may only have one parameter"
+#: parser/parse_func.c:270
+#, c-format
+msgid "%s(*) specified, but %s is not an aggregate function"
 msgstr ""
 
-#: ../parser/parse_func.c:230
-msgid "Aggregate functions cannot be applied to relation names"
+#: parser/parse_func.c:273
+#, c-format
+msgid "DISTINCT specified, but %s is not an aggregate function"
 msgstr ""
 
-#: ../parser/parse_func.c:286
+#: parser/parse_func.c:296
 #, c-format
-msgid "Unable to select an aggregate function %s(%s)"
+msgid "Attribute notation .%s applied to type %s, which is not a complex type"
 msgstr ""
 
-#: ../parser/parse_func.c:297
+#: parser/parse_func.c:299
 #, c-format
-msgid "There is no aggregate function %s(%s)"
+msgid "Attribute \"%s\" not found in datatype %s"
+msgstr "Attribut �%s� nicht gefunden im Datentyp %s"
+
+#: parser/parse_func.c:348
+msgid "Aggregates may not return sets"
 msgstr ""
 
-#: ../parser/parse_func.c:350 ../parser/parse_func.c:395
+#: parser/parse_func.c:1264
 #, c-format
-msgid "No such attribute or function %s.%s"
+msgid "No such attribute %s.%s.%s"
 msgstr ""
 
-#: ../parser/parse_func.c:359
+#: parser/parse_func.c:1267
 #, c-format
-msgid "Cannot pass result of join %s to a function"
+msgid "No such attribute %s.%s"
 msgstr ""
 
-#: ../parser/parse_func.c:366
+#: parser/parse_func.c:1294
 #, c-format
-msgid "ParseFuncOrColumn: unexpected node type %d"
-msgstr ""
+msgid "Function %s(%s) does not exist%s%s"
+msgstr "Funktion %s(%s) existiert nicht%s%s"
 
-#: ../parser/parse_func.c:400
+#: parser/parse_func.c:1300
 #, c-format
-msgid "Cannot pass result of sub-select %s to a function"
-msgstr ""
+msgid "%s: function %s(%s) does not exist%s%s"
+msgstr "%s: Funktion %s(%s) existiert nicht%s%s"
 
-#: ../parser/parse_func.c:1714
+#: parser/parse_func.c:1326
 #, c-format
-msgid "Function '%s(%s)' does not exist%s%s"
-msgstr "Funktion %s(%s) existiert nicht%s%s"
+msgid "%s: aggregate %s(*) does not exist"
+msgstr ""
 
-#: ../parser/parse_func.c:1720
+#: parser/parse_func.c:1329
 #, c-format
-msgid "%s: function '%s(%s)' does not exist%s%s"
-msgstr "%s: Funktion %s(%s) existiert nicht%s%s"
+msgid "%s: aggregate %s(%s) does not exist"
+msgstr ""
 
-#: ../parser/parse_node.c:185
+#: parser/parse_func.c:1345
 #, c-format
-msgid "Relation %s does not have attribute %d"
-msgstr "Relation %s hat kein Attribut %d"
+msgid "%s: function %s(*) is not an aggregate"
+msgstr ""
 
-#: ../parser/parse_node.c:209
+#: parser/parse_func.c:1348
 #, c-format
-msgid "Subquery %s does not have attribute %d"
+msgid "%s: function %s(%s) is not an aggregate"
 msgstr ""
 
-#: ../parser/parse_node.c:263
+#: parser/parse_node.c:217
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array type %u"
 msgstr ""
 
-#: ../parser/parse_node.c:269
+#: parser/parse_node.c:223
 #, c-format
 msgid "transformArraySubscripts: type %s is not an array"
 msgstr ""
 
-#: ../parser/parse_node.c:277
+#: parser/parse_node.c:231
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array element type %u"
 msgstr ""
 
-#: ../parser/parse_node.c:332 ../parser/parse_node.c:352
+#: parser/parse_node.c:288 parser/parse_node.c:310
 msgid "array index expressions must be integers"
 msgstr ""
 
-#: ../parser/parse_node.c:373
+#: parser/parse_node.c:329
 #, c-format
 msgid ""
-"Array assignment requires type '%s' but expression is of type '%s'\n"
+"Array assignment requires type %s but expression is of type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: ../parser/parse_node.c:486
+#: parser/parse_node.c:439
 #, c-format
 msgid "make_const: unknown type %d"
 msgstr ""
 
-#: ../parser/parse_oper.c:50
+#: parser/parse_oper.c:116
+#, c-format
+msgid "%s: Prefix operator '%s' for type '%s' does not exist"
+msgstr ""
+
+#: parser/parse_oper.c:120
+#, c-format
+msgid "%s: Postfix operator '%s' for type '%s' does not exist"
+msgstr ""
+
+#: parser/parse_oper.c:124
+#, c-format
+msgid "%s: Operator '%s' for types '%s' and '%s' does not exist"
+msgstr ""
+
+#: parser/parse_oper.c:143
 #, c-format
 msgid ""
 "Unable to identify an ordering operator '%s' for type '%s'\n"
 "\tUse an explicit ordering operator or modify the query"
 msgstr ""
 
-#: ../parser/parse_oper.c:923
+#: parser/parse_oper.c:894
 #, c-format
 msgid ""
 "Left hand side of operator '%s' has an unknown type\n"
 "\tProbably a bad attribute name"
 msgstr ""
 
-#: ../parser/parse_oper.c:927
+#: parser/parse_oper.c:899
 #, c-format
 msgid ""
 "Right hand side of operator %s has an unknown type\n"
 "\tProbably a bad attribute name"
 msgstr ""
 
-#: ../parser/parse_oper.c:930
+#: parser/parse_oper.c:903
 #, c-format
 msgid ""
 "Unable to identify an operator '%s' for types '%s' and '%s'\n"
@@ -6587,478 +7551,755 @@ msgstr ""
 "Kann keinen Operator �%s� f�r Typen %s und %s finden\n"
 "\tDie Abfrage mu� mit einer ausdr�cklichen Typumwandlung umgeschrieben werden"
 
-#: ../parser/parse_oper.c:945
+#: parser/parse_oper.c:919
 #, c-format
 msgid ""
 "operand of prefix operator '%s' has an unknown type\n"
 "\t(probably an invalid column reference)"
 msgstr ""
 
-#: ../parser/parse_oper.c:949
+#: parser/parse_oper.c:923
 #, c-format
 msgid ""
 "operand of postfix operator '%s' has an unknown type\n"
 "\t(probably an invalid column reference)"
 msgstr ""
 
-#: ../parser/parse_oper.c:956
+#: parser/parse_oper.c:930
 #, c-format
 msgid ""
 "Unable to identify a prefix operator '%s' for type '%s'\n"
 "\tYou may need to add parentheses or an explicit cast"
 msgstr ""
 
-#: ../parser/parse_oper.c:960
+#: parser/parse_oper.c:934
 #, c-format
 msgid ""
 "Unable to identify a postfix operator '%s' for type '%s'\n"
 "\tYou may need to add parentheses or an explicit cast"
 msgstr ""
 
-#: ../parser/parse_relation.c:139
+#: parser/parse_relation.c:169 parser/parse_relation.c:181
+#, c-format
+msgid "Table reference \"%s\" is ambiguous"
+msgstr "Tabellenbezug �%s� ist nicht eindeutig"
+
+#: parser/parse_relation.c:185
 #, c-format
 msgid "scanNameSpaceForRefname: unexpected node type %d"
 msgstr ""
 
-#: ../parser/parse_relation.c:150
+#: parser/parse_relation.c:239 parser/parse_relation.c:251
 #, c-format
-msgid "Table name \"%s\" specified more than once"
+msgid "Table reference %u is ambiguous"
+msgstr "Tabellenbezug %u ist nicht eindeutig"
+
+#: parser/parse_relation.c:255
+#, c-format
+msgid "scanNameSpaceForRelid: unexpected node type %d"
 msgstr ""
 
-#: ../parser/parse_relation.c:203
+#: parser/parse_relation.c:319
 #, c-format
 msgid "checkNameSpaceConflicts: unexpected node type %d"
 msgstr ""
 
-#: ../parser/parse_relation.c:238
+#: parser/parse_relation.c:342 parser/parse_relation.c:352
+#, c-format
+msgid "Table name \"%s\" specified more than once"
+msgstr ""
+
+#: parser/parse_relation.c:373
+#, c-format
+msgid "scanNameSpaceForConflict: unexpected node type %d"
+msgstr ""
+
+#: parser/parse_relation.c:408
 msgid "RTERangeTablePosn: RTE not found (internal error)"
 msgstr ""
 
-#: ../parser/parse_relation.c:268 ../parser/parse_relation.c:330
-#: ../parser/parse_relation.c:396
+#: parser/parse_relation.c:460 parser/parse_relation.c:553
 #, c-format
 msgid "Column reference \"%s\" is ambiguous"
 msgstr "Spaltenname �%s� ist nicht eindeutig"
 
-#: ../parser/parse_relation.c:390
+#: parser/parse_relation.c:547
 #, c-format
 msgid "colnameToVar: unexpected node type %d"
 msgstr ""
 
-#: ../parser/parse_relation.c:444
+#: parser/parse_relation.c:646 parser/parse_relation.c:739
+#: parser/parse_relation.c:832 parser/parse_relation.c:946
+#, c-format
+msgid "Table \"%s\" has %d columns available but %d columns specified"
+msgstr ""
+
+#: parser/parse_relation.c:907
+msgid "A column definition list is only allowed for functions returning RECORD"
+msgstr ""
+
+#: parser/parse_relation.c:916
+msgid "A column definition list is required for functions returning RECORD"
+msgstr ""
+
+#: parser/parse_relation.c:972
 #, c-format
-msgid "qualifiedNameToVar: unexpected node type %d"
+msgid "Too many column aliases specified for function %s"
 msgstr ""
 
-#: ../parser/parse_relation.c:500 ../parser/parse_relation.c:593
+#: parser/parse_relation.c:993
 #, c-format
-msgid "Table \"%s\" has %d columns available but %d columns specified"
+msgid "Unknown kind of return type specified for function %s"
+msgstr ""
+
+#: parser/parse_relation.c:1425
+#, c-format
+msgid "expandRTE: unsupported RTE kind %d"
 msgstr ""
 
-#: ../parser/parse_relation.c:915
+#: parser/parse_relation.c:1515
 #, c-format
 msgid "Invalid attnum %d for rangetable entry %s"
 msgstr ""
 
-#: ../parser/parse_relation.c:951
+#: parser/parse_relation.c:1542 parser/parse_relation.c:1605
+#: parser/parse_relation.c:1683
+#, c-format
+msgid "Relation \"%s\" does not have attribute %d"
+msgstr "Relation %s hat kein Attribut %d"
+
+#: parser/parse_relation.c:1574
+#, c-format
+msgid "Subquery %s does not have attribute %d"
+msgstr ""
+
+#: parser/parse_relation.c:1655
+#, c-format
+msgid "get_rte_attribute_type: unsupported RTE kind %d"
+msgstr ""
+
+#: parser/parse_relation.c:1716
+#, c-format
+msgid "Relation %s does not have attribute %d"
+msgstr "Relation %s hat kein Attribut %d"
+
+#: parser/parse_relation.c:1732
 #, c-format
-msgid "Relation '%s' does not have attribute '%s'"
-msgstr "Relation �%s� hat kein Attribut �%s�"
+msgid "get_rte_attribute_is_dropped: unsupported RTE kind %d"
+msgstr ""
 
-#: ../parser/parse_relation.c:995
+#: parser/parse_relation.c:1815
 #, c-format
 msgid "attnumAttName: invalid attribute number %d"
 msgstr "attnumAttName: ung�ltige Attributnummer %d"
 
-#: ../parser/parse_relation.c:1017
+#: parser/parse_relation.c:1837
 #, c-format
 msgid "attnumTypeId: invalid attribute number %d"
 msgstr "attnumTypeId: ung�ltige Attributnummer %d"
 
-#: ../parser/parse_relation.c:1044
+#: parser/parse_relation.c:1864
 #, c-format
 msgid "Adding missing FROM-clause entry%s for table \"%s\""
 msgstr ""
 
-#: ../parser/parse_target.c:61
+#: parser/parse_target.c:62
 msgid "You can't use relation names alone in the target list, try relation.*."
 msgstr ""
 
-#: ../parser/parse_target.c:143
-#, c-format
-msgid "transformTargetList: unexpected node type %d"
-msgstr ""
-
-#: ../parser/parse_target.c:204
+#: parser/parse_target.c:236
 #, c-format
 msgid "Cannot assign to system attribute '%s'"
 msgstr ""
 
-#: ../parser/parse_target.c:264
+#: parser/parse_target.c:297
 #, c-format
 msgid ""
-"column \"%s\" is of type '%s' but expression is of type '%s'\n"
+"column \"%s\" is of type %s but expression is of type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: ../parser/parse_target.c:384
+#: parser/parse_target.c:370
 #, c-format
 msgid "Attribute '%s' specified more than once"
 msgstr ""
 
-#: ../parser/parse_target.c:434
+#: parser/parse_target.c:405
 #, c-format
 msgid ""
 "ExpandAllTables: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: ../parser/parse_target.c:440
+#: parser/parse_target.c:423
 msgid "Wildcard with no tables specified not allowed"
 msgstr ""
 
-#: ../parser/parse_type.c:50 ../parser/parse_type.c:221
+#: parser/parse_type.c:60
 #, c-format
-msgid "Unable to locate type oid %u in catalog"
-msgstr "kann Typ-OID %u nicht im Katalog finden"
+msgid "Improper %%TYPE reference (too few dotted names): %s"
+msgstr ""
+
+#: parser/parse_type.c:79
+#, c-format
+msgid "Improper %%TYPE reference (too many dotted names): %s"
+msgstr ""
 
-#: ../parser/parse_type.c:62
-msgid "typenameType: Null typename"
+#: parser/parse_type.c:96
+#, c-format
+msgid "%s converted to %s"
 msgstr ""
 
-#: ../parser/parse_type.c:68
+#: parser/parse_type.c:194 parser/parse_type.c:222
+#: utils/cache/lsyscache.c:1229
+#, c-format
+msgid "Type \"%s\" is only a shell"
+msgstr "Typ %s ist nur eine H�lle"
+
+#: parser/parse_type.c:247
 #, c-format
-msgid "Unable to locate type name '%s' in catalog"
-msgstr "kann Typnamen �%s� nicht im Katalog finden"
+msgid "Unable to locate type oid %u in catalog"
+msgstr "kann Typ-OID %u nicht im Katalog finden"
 
-#: ../parser/parse_type.c:77
+#: parser/parse_type.c:256
 msgid "typeTypeId() called with NULL type struct"
 msgstr ""
 
-#: ../parser/parse_type.c:200
+#: parser/parse_type.c:389
 #, c-format
 msgid "typeidOutfunc: Invalid type - oid = %u"
 msgstr ""
 
-#: ../parser/parse_type.c:246
+#: parser/parse_type.c:410
 #, c-format
 msgid "typeidTypeRelid: Invalid type - oid = %u"
 msgstr ""
 
-#: ../parser/parse_type.c:295 ../parser/parse_type.c:311
-#: ../parser/parse_type.c:313 ../parser/parse_type.c:319
-#: ../parser/parse_type.c:324 ../parser/parse_type.c:328
+#: parser/parse_type.c:447 parser/parse_type.c:463 parser/parse_type.c:465
+#: parser/parse_type.c:471 parser/parse_type.c:477 parser/parse_type.c:481
 #, c-format
 msgid "Invalid type name '%s'"
 msgstr ""
 
-#: gram.y:741
-msgid "ALTER SCHEMA not yet supported"
+#: scan.l:295
+msgid "unterminated /* comment"
+msgstr ""
+
+#: scan.l:323
+msgid "unterminated bit string literal"
+msgstr ""
+
+#: scan.l:342
+msgid "unterminated hexadecimal string literal"
+msgstr ""
+
+#: scan.l:388
+msgid "unterminated quoted string"
+msgstr ""
+
+#: scan.l:399
+msgid "zero-length delimited identifier"
+msgstr ""
+
+#: scan.l:406 scan.l:562
+#, c-format
+msgid "identifier \"%s\" will be truncated to \"%.*s\""
+msgstr ""
+
+#: scan.l:420
+msgid "unterminated quoted identifier"
+msgstr ""
+
+#: scan.l:580
+#, c-format
+msgid "parser: %s at end of input"
+msgstr ""
+
+#: scan.l:582
+#, c-format
+msgid "parser: %s at or near \"%s\" at character %d"
+msgstr ""
+
+#: y.tab.c:8502
+msgid "syntax error: cannot back up"
+msgstr ""
+
+#: gram.y:924
+msgid "SET TRANSACTION/READ ONLY not yet supported"
+msgstr ""
+
+#: gram.y:961 gram.y:978
+msgid "Time zone interval must be HOUR or HOUR TO MINUTE"
 msgstr ""
 
-#: gram.y:848
-msgid "SET must have at least one argument"
-msgstr "SET mu� mindestens ein Argument haben"
+#: gram.y:972 gram.y:4893 gram.y:6878 utils/adt/timestamp.c:701
+#, c-format
+msgid "INTERVAL(%d) precision must be between %d and %d"
+msgstr ""
 
-#: gram.y:1263 gram.y:1268 gram.y:3601 gram.y:3606
+#: gram.y:1414 gram.y:1420 gram.y:4295 gram.y:4302
 msgid "GLOBAL TEMPORARY TABLE is not currently supported"
 msgstr ""
 
-#: gram.y:1303
+#: gram.y:1458
 #, c-format
 msgid "CREATE TABLE / COLLATE %s not yet implemented; clause ignored"
 msgstr ""
 "CREATE TABLE / COLLATE %s ist noch nicht implementiert; Klausel ignoriert"
 
-#: gram.y:1559
+#: gram.y:1642
+msgid "LIKE in table definitions not yet supported"
+msgstr ""
+
+#: gram.y:1746
 msgid "FOREIGN KEY/MATCH PARTIAL not yet implemented"
 msgstr ""
 
-#: gram.y:1614
+#: gram.y:1820
 msgid "CREATE TABLE AS may not specify INTO"
 msgstr ""
 
-#: gram.y:2173
+#: gram.y:2193
+msgid "CREATE ASSERTION is not yet supported"
+msgstr ""
+
+#: gram.y:2207
+msgid "DROP ASSERTION is not yet supported"
+msgstr ""
+
+#: gram.y:2577
 msgid "FETCH / RELATIVE at current position is not supported"
 msgstr ""
 
-#: gram.y:2301
+#: gram.y:2705
 msgid "FETCH / ABSOLUTE not supported, using RELATIVE"
 msgstr ""
 
-#: gram.y:2418
-msgid ""
-"WITH GRANT OPTION is not supported.  Only relation owners can set privileges"
+#: gram.y:2867 gram.y:2875
+msgid "grant options are not implemented"
 msgstr ""
 
-#: gram.y:2607
+#: gram.y:3051
 msgid "CREATE FUNCTION / OUT parameters are not supported"
 msgstr ""
 
-#: gram.y:2612
+#: gram.y:3057
 msgid "CREATE FUNCTION / INOUT parameters are not supported"
 msgstr ""
 
-#: gram.y:2701
+#: gram.y:3209
 msgid "parser: argument type missing (use NONE for unary operators)"
 msgstr ""
 
-#: gram.y:2961
-msgid "COMMIT / CHAIN not yet supported"
-msgstr ""
-
-#: gram.y:3081
+#: gram.y:3706
 #, c-format
-msgid "%s is not a valid encoding name"
-msgstr ""
-
-#: ../utils/adt/ascii.c:33 gram.y:3084 gram.y:3096
-msgid "Multi-byte support is not enabled"
-msgstr ""
+msgid "CREATE DOMAIN / COLLATE %s not yet implemented; clause ignored"
+msgstr "CREATE DOMAIN / COLLATE %s ist noch nicht implementiert; Klausel ignoriert"
 
-#: gram.y:3093
-#, c-format
-msgid "%d is not a valid encoding code"
+#: gram.y:4381
+msgid ""
+"LIMIT #,# syntax not supported.\n"
+"\tUse separate LIMIT and OFFSET clauses."
 msgstr ""
 
-#: gram.y:3679
+#: gram.y:4397
 msgid "LIMIT must not be negative"
 msgstr "LIMIT darf nicht negativ sein"
 
-#: gram.y:3720
+#: gram.y:4439
 msgid "OFFSET must not be negative"
 msgstr "OFFSET darf nicht negativ sein"
 
-#: gram.y:3825
+#: gram.y:4583
 msgid ""
 "sub-SELECT in FROM must have an alias\n"
 "\tFor example, FROM (SELECT ...) [AS] foo"
 msgstr ""
 
-#: gram.y:4125
+#: gram.y:4987
 msgid "precision for FLOAT must be at least 1"
 msgstr ""
 
-#: gram.y:4131
+#: gram.y:4994
 msgid "precision for FLOAT must be less than 16"
 msgstr ""
 
-#: gram.y:4142 gram.y:4153
+#: gram.y:5007 gram.y:5020
 #, c-format
 msgid "NUMERIC precision %d must be between 1 and %d"
 msgstr ""
 
-#: gram.y:4145
+#: gram.y:5011
 #, c-format
 msgid "NUMERIC scale %d must be between 0 and precision %d"
 msgstr ""
 
-#: gram.y:4168 gram.y:4179
+#: gram.y:5037 gram.y:5050
 #, c-format
 msgid "DECIMAL precision %d must be between 1 and %d"
 msgstr ""
 
-#: gram.y:4171
+#: gram.y:5041
 #, c-format
 msgid "DECIMAL scale %d must be between 0 and precision %d"
 msgstr ""
 
-#: gram.y:4201 gram.y:4239
+#: gram.y:5096 gram.y:5170
 #, c-format
 msgid "length for type '%s' must be at least 1"
 msgstr ""
 
-#: gram.y:4204 gram.y:4242
+#: gram.y:5099 gram.y:5173
 #, c-format
 msgid "length for type '%s' cannot exceed %d"
 msgstr ""
 
-#: gram.y:4316
+#: gram.y:5250
 #, c-format
 msgid "TIMESTAMP(%d)%s precision must be between %d and %d"
 msgstr ""
 
-#: gram.y:4344
+#: gram.y:5282
 #, c-format
 msgid "TIME(%d)%s precision must be between %d and %d"
 msgstr ""
 
-#: gram.y:4471
-msgid "Wrong number of parameters on left side of OVERLAPS expression"
+#: gram.y:5432 gram.y:7433 gram.y:7485
+msgid "Unequal number of entries in row expression"
 msgstr ""
 
-#: gram.y:4476
-msgid "Wrong number of parameters on right side of OVERLAPS expression"
+#: gram.y:5846
+msgid "UNIQUE predicate is not yet implemented"
 msgstr ""
 
-#: gram.y:5037
+#: gram.y:6075
 #, c-format
 msgid "CURRENT_TIME(%d) precision must be between %d and %d"
 msgstr ""
 
-#: gram.y:5091
+#: gram.y:6120
 #, c-format
 msgid "CURRENT_TIMESTAMP(%d) precision must be between %d and %d"
 msgstr ""
 
-#: gram.y:6017
+#: gram.y:6165
+#, c-format
+msgid "LOCALTIME(%d) precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:6210
+#, c-format
+msgid "LOCALTIMESTAMP(%d) precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:7306
 msgid "OLD used in non-rule query"
 msgstr ""
 
-#: gram.y:6024
+#: gram.y:7313
 msgid "NEW used in non-rule query"
 msgstr ""
 
-#: gram.y:6108
-msgid "Unequal number of entries in row expression"
+#: y.tab.c:17187
+msgid "parse error; also virtual memory exhausted"
+msgstr ""
+
+#: y.tab.c:17191
+msgid "parse error"
+msgstr "Parsefehler"
+
+#: y.tab.c:17306
+msgid "parser stack overflow"
 msgstr ""
 
-#: gram.y:6136
+#: gram.y:7467
 #, c-format
 msgid "Operator '%s' not implemented for row expressions"
 msgstr ""
 
-#: gram.y:6171
+#: gram.y:7543
+msgid "Wrong number of parameters on left side of OVERLAPS expression"
+msgstr ""
+
+#: gram.y:7548
+msgid "Wrong number of parameters on right side of OVERLAPS expression"
+msgstr ""
+
+#: gram.y:7585
 msgid "Multiple ORDER BY clauses not allowed"
 msgstr ""
 
-#: gram.y:6177
+#: gram.y:7591
 msgid "Multiple FOR UPDATE clauses not allowed"
 msgstr ""
 
-#: gram.y:6183
+#: gram.y:7597
 msgid "Multiple OFFSET clauses not allowed"
 msgstr ""
 
-#: gram.y:6189
+#: gram.y:7603
 msgid "Multiple LIMIT clauses not allowed"
 msgstr ""
 
-#: scan.l:283
-msgid "Unterminated /* comment"
+#: port/ipc_test.c:93 storage/ipc/ipc.c:171
+msgid "Out of on_shmem_exit slots"
+msgstr ""
+
+#: port/pg_sema.c:319 port/posix_sema.c:168 port/sysv_sema.c:319
+msgid "Out of memory in PGReserveSemaphores"
+msgstr ""
+
+#: port/pg_sema.c:358 port/posix_sema.c:205 port/sysv_sema.c:358
+msgid "PGSemaphoreCreate: too many semaphores created"
+msgstr ""
+
+#: port/beos/sem.c:159
+msgid "beos : semctl error : GETNCNT not implemented"
+msgstr ""
+
+#: port/beos/sem.c:174
+msgid "beos : semctl error : unknown flag"
+msgstr ""
+
+#: port/beos/support.c:45
+msgid "Error loading BeOS support server : can't create communication ports"
+msgstr ""
+
+#: port/beos/support.c:71
+msgid "Can't load this add-on "
+msgstr ""
+
+#: port/beos/support.c:95
+msgid "Can't load this add-on : map text error"
+msgstr ""
+
+#: port/beos/support.c:111
+msgid "Can't load this add-on : map data error"
 msgstr ""
 
-#: scan.l:293
+#: port/beos/support.c:129
 #, c-format
-msgid "invalid bit string input: '%s'"
-msgstr "ung�ltiger Bitkettenwert: %s"
+msgid "loading symbol '%s' failed "
+msgstr ""
 
-#: scan.l:306
-msgid "unterminated bit string literal"
+#: port/dynloader/beos.c:55
+msgid "add-on not loaded correctly"
+msgstr ""
+
+#: port/dynloader/beos.c:66
+msgid "error while unloading add-on"
+msgstr ""
+
+#: port/dynloader.c:71 port/dynloader/bsdi.c:59 port/dynloader/linux.c:71
+msgid "dld: Cannot link C library!"
+msgstr ""
+
+#: port/dynloader.c:78 port/dynloader/bsdi.c:66 port/dynloader/linux.c:78
+msgid "dld: Cannot link math library!"
+msgstr ""
+
+#: port/dynloader.c:87 port/dynloader/bsdi.c:75 port/dynloader/linux.c:87
+msgid "dld: Undefined:"
 msgstr ""
 
-#: scan.l:325
+#: port/dynloader.c:90 port/dynloader/bsdi.c:78 port/dynloader/linux.c:90
+#: port/dynloader/ultrix4.c:61
 #, c-format
-msgid "Bad hexadecimal integer input '%s'"
+msgid "  %s"
 msgstr ""
 
-#: scan.l:330
-msgid "Unterminated hexadecimal integer"
+#: port/dynloader.c:35 port/dynloader/linux.c:35
+msgid "dynamic load not supported"
 msgstr ""
 
-#: scan.l:349
-msgid "Unterminated quoted string"
+#: port/dynloader/ultrix4.c:58
+msgid "dl: Undefined:"
 msgstr ""
 
-#: scan.l:359
-msgid "zero-length delimited identifier"
+#: postmaster/pgstat.c:178
+#, c-format
+msgid "PGSTAT: socket() failed: %m"
 msgstr ""
 
-#: scan.l:365 scan.l:369 scan.l:520 scan.l:524
+#: postmaster/pgstat.c:192
 #, c-format
-msgid "identifier \"%s\" will be truncated to \"%.*s\""
+msgid "PGSTAT: bind(127.0.0.1) failed: %m"
 msgstr ""
 
-#: scan.l:383
-msgid "Unterminated quoted identifier"
+#: postmaster/pgstat.c:197
+#, c-format
+msgid "PGSTAT: getsockname() failed: %m"
 msgstr ""
 
-#: scan.l:540
+#: postmaster/pgstat.c:209
 #, c-format
-msgid "parser: %s at or near \"%s\""
+msgid "PGSTAT: connect() failed: %m"
 msgstr ""
 
-#: scan.l:609
-msgid "Unput() failed.\n"
+#: postmaster/pgstat.c:221
+#, c-format
+msgid "PGSTAT: fcntl() failed: %m"
 msgstr ""
 
-#: ../port/beos/sem.c:159
-msgid "beos : semctl error : GETNCNT not implemented"
+#: postmaster/pgstat.c:230 postmaster/pgstat.c:1158
+#, c-format
+msgid "PGSTAT: pipe() failed: %m"
 msgstr ""
 
-#: ../port/beos/sem.c:174
-msgid "beos : semctl error : unknown flag"
+#: postmaster/pgstat.c:273
+msgid "PGSTAT: statistics collector startup skipped"
 msgstr ""
 
-#: ../port/beos/support.c:45
-msgid "Error loading BeOS support server : can't create communication ports"
+#: postmaster/pgstat.c:296 postmaster/pgstat.c:1165
+#, c-format
+msgid "PGSTAT: fork() failed: %m"
+msgstr "PGSTAT: fork fehlgeschlagen: %m"
+
+#: postmaster/pgstat.c:697
+msgid "Only database superusers can reset statistic counters"
+msgstr "Nur Superuser k�nnen Statistikz�hler zur�cksetzen"
+
+#: postmaster/pgstat.c:764 postmaster/pgstat.c:773 postmaster/pgstat.c:820
+#: postmaster/pgstat.c:830
+msgid "PGSTATBE: malloc() failed"
+msgstr "PGSTATBE: malloc() fehlgeschlagen"
+
+#: postmaster/pgstat.c:1219
+msgid "PGSTAT: Creation of dead backend hash table failed"
 msgstr ""
 
-#: ../port/beos/support.c:71
-msgid "Can't load this add-on "
+#: postmaster/pgstat.c:1230
+msgid "PGSTAT: Allocation of backend table failed"
 msgstr ""
 
-#: ../port/beos/support.c:95
-msgid "Can't load this add-on : map text error"
+#: postmaster/pgstat.c:1294
+#, c-format
+msgid "PGSTAT: select() failed: %m"
+msgstr "PGSTAT: select() fehlgeschlagen: %m"
+
+#: postmaster/pgstat.c:1334
+#, c-format
+msgid "PGSTAT: read() failed: %m"
+msgstr "PGSTAT: read() fehlgeschlagen: %m"
+
+#: postmaster/pgstat.c:1352
+msgid "PGSTAT: bogus message length"
 msgstr ""
 
-#: ../port/beos/support.c:111
-msgid "Can't load this add-on : map data error"
+#: postmaster/pgstat.c:1502
+#, c-format
+msgid "PGSTATBUFF: fcntl() failed: %m"
+msgstr ""
+
+#: postmaster/pgstat.c:1512
+msgid "PGSTATBUFF: malloc() failed"
+msgstr ""
+
+#: postmaster/pgstat.c:1539
+msgid "PGSTATBUFF: Warning - receive buffer full"
 msgstr ""
 
-#: ../port/beos/support.c:129
+#: postmaster/pgstat.c:1570
 #, c-format
-msgid "loading symbol '%s' failed "
+msgid "PGSTATBUFF: select() failed: %m"
+msgstr "PGSTATBUF: select() fehlgeschlagen: %m"
+
+#: postmaster/pgstat.c:1586
+#, c-format
+msgid "PGSTATBUFF: recvfrom() failed: %m"
+msgstr "PGSTATBUFF: recvfrom() fehlgeschlagen: %m"
+
+#: postmaster/pgstat.c:1661
+#, c-format
+msgid "PGSTATBUFF: write() failed: %m"
+msgstr "PGSTATBUFF: write() fehlgeschlagen: %m"
+
+#: postmaster/pgstat.c:1714
+#, c-format
+msgid "PGSTAT: Invalid backend ID %d"
 msgstr ""
 
-#: ../port/dynloader.c:67 ../port/dynloader/bsdi.c:59
-#: ../port/dynloader/linux.c:67
-msgid "dld: Cannot link C library!"
+#: postmaster/pgstat.c:1770
+msgid "PGSTAT: DB hash table out of memory - abort"
 msgstr ""
 
-#: ../port/dynloader.c:74 ../port/dynloader/bsdi.c:66
-#: ../port/dynloader/linux.c:74
-msgid "dld: Cannot link math library!"
+#: postmaster/pgstat.c:1799 postmaster/pgstat.c:2214 postmaster/pgstat.c:2221
+msgid "PGSTAT: failed to initialize hash table for new database entry"
 msgstr ""
 
-#: ../port/dynloader.c:83 ../port/dynloader/bsdi.c:75
-#: ../port/dynloader/linux.c:83
-msgid "dld: Undefined:"
+#: postmaster/pgstat.c:1851
+msgid "PGSTAT: dead backend hash table out of memory"
 msgstr ""
 
-#: ../port/dynloader.c:86 ../port/dynloader/bsdi.c:78
-#: ../port/dynloader/linux.c:86 ../port/dynloader/ultrix4.c:61
+#: postmaster/pgstat.c:1898
 #, c-format
-msgid "  %s"
+msgid "PGSTAT: cannot open temp stats file %s: %m"
 msgstr ""
 
-#: ../port/dynloader.c:31 ../port/dynloader/linux.c:31
-msgid "dynamic load not supported"
+#: postmaster/pgstat.c:1924
+msgid "PGSTAT: database hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: ../port/dynloader/ultrix4.c:58
-msgid "dl: Undefined:"
+#: postmaster/pgstat.c:1960
+#, c-format
+msgid ""
+"PGSTAT: tables hash table for database %d corrupted during cleanup - abort"
 msgstr ""
 
-#: ../port/dynloader/beos.c:55
-msgid "add-on not loaded correctly"
+#: postmaster/pgstat.c:2007
+#, c-format
+msgid "PGSTAT: Error closing temp stats file %s: %m"
 msgstr ""
 
-#: ../port/dynloader/beos.c:66
-msgid "error while unloading add-on"
+#: postmaster/pgstat.c:2014
+#, c-format
+msgid "PGSTAT: Cannot rename temp stats file %s: %m"
+msgstr ""
+
+#: postmaster/pgstat.c:2035
+msgid "PGSTAT: dead backend hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: ../postmaster/postmaster.c:302
+#: postmaster/pgstat.c:2100 postmaster/pgstat.c:2104
+msgid "PGSTAT: Creation of DB hash table failed"
+msgstr ""
+
+#: postmaster/pgstat.c:2142 postmaster/pgstat.c:2148 postmaster/pgstat.c:2177
+#: postmaster/pgstat.c:2183 postmaster/pgstat.c:2248 postmaster/pgstat.c:2254
+#: postmaster/pgstat.c:2287 postmaster/pgstat.c:2293 postmaster/pgstat.c:2316
+#: postmaster/pgstat.c:2322 postmaster/pgstat.c:2370 postmaster/pgstat.c:2376
+#: postmaster/pgstat.c:2411 postmaster/pgstat.c:2417
+msgid "PGSTAT: corrupted pgstat.stat file"
+msgstr ""
+
+#: postmaster/pgstat.c:2164 postmaster/pgstat.c:2170
+msgid "PGSTAT: DB hash table out of memory"
+msgstr ""
+
+#: postmaster/pgstat.c:2273 postmaster/pgstat.c:2279
+msgid "PGSTAT: Tab hash table out of memory"
+msgstr ""
+
+#: postmaster/pgstat.c:2526
+#, c-format
+msgid "PGSTAT: tables hash table out of memory for database %d - abort"
+msgstr ""
+
+#: postmaster/pgstat.c:2706
+msgid "PGSTAT: failed to reinitialize hash table for database entry"
+msgstr ""
+
+#: postmaster/postmaster.c:328
 #, c-format
 msgid "data directory %s was not found"
 msgstr "Datenverzeichnis %s nicht gefunden"
 
-#: ../postmaster/postmaster.c:304
+#: postmaster/postmaster.c:330
 #, c-format
 msgid "could not read permissions of directory %s: %m"
 msgstr "Zugriffsrechte von Verzeichnis %s konnten nicht gelesen werden: %m"
 
-#: ../postmaster/postmaster.c:309
+#: postmaster/postmaster.c:335
 #, c-format
 msgid ""
 "data directory %s has group or world access; permissions should be u=rwx "
@@ -7067,7 +8308,7 @@ msgstr ""
 "Datenverzeichnis %s erlaubt Zugriff von Gruppe oder Welt; Rechte sollten "
 "u=rwx (0700) sein"
 
-#: ../postmaster/postmaster.c:321
+#: postmaster/postmaster.c:348
 #, c-format
 msgid ""
 "%s does not find the database system.\n"
@@ -7080,32 +8321,32 @@ msgstr ""
 "aber die Datei �%s� konnte nicht ge�ffnet werden (%s).\n"
 "\n"
 
-#: ../postmaster/postmaster.c:421 ../postmaster/postmaster.c:432
-#: ../postmaster/postmaster.c:574 ../postmaster/postmaster.c:630
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Versuchen Sie �%s --help� f�r weitere Informationen.\n"
-
-#: ../postmaster/postmaster.c:431
-#, c-format
-msgid "invalid argument -- %s"
-msgstr "ung�ltiges Argument -- %s"
-
-#: ../postmaster/postmaster.c:458
+#: postmaster/postmaster.c:433
 msgid "Assert checking is not compiled in."
 msgstr "Assert-Pr�fungen sind bei der �bersetzung nicht konfiguriert worden."
 
-#: ../postmaster/postmaster.c:560 ../tcop/postgres.c:1431
+#: postmaster/postmaster.c:539 tcop/postgres.c:1574
 #, c-format
 msgid "--%s requires argument"
 msgstr "--%s ben�tigt ein Argument"
 
-#: ../postmaster/postmaster.c:562 ../tcop/postgres.c:1433
+#: postmaster/postmaster.c:541 tcop/postgres.c:1576
+#, c-format
+msgid "-c %s requires argument"
+msgstr "-c %s ben�tigt ein Argument"
+
+#: postmaster/postmaster.c:552 postmaster/postmaster.c:563
+#: postmaster/postmaster.c:628
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Versuchen Sie �%s --help� f�r weitere Informationen.\n"
+
+#: postmaster/postmaster.c:562
 #, c-format
-msgid "-c %s requires argument"
-msgstr "-c %s ben�tigt ein Argument"
+msgid "invalid argument -- %s"
+msgstr "ung�ltiges Argument -- %s"
 
-#: ../postmaster/postmaster.c:589
+#: postmaster/postmaster.c:578
 msgid ""
 "The number of buffers (-B) must be at least twice the number of allowed "
 "connections (-N) and at least 16."
@@ -7113,34 +8354,52 @@ msgstr ""
 "Die Zahl der Puffer (-B) mu� mindestens doppelt so hoch wie die Anzahl der "
 "erlaubten Verbindungen (-N) und mindestens 16 sein."
 
-#: ../postmaster/postmaster.c:620 ../tcop/postgres.c:1564
+#: postmaster/postmaster.c:591
+msgid "superuser_reserved_connections must be less than max_connections."
+msgstr ""
+
+#: postmaster/postmaster.c:607
+#, c-format
+msgid "%s: PostmasterMain: initial environ dump:"
+msgstr ""
+
+#: postmaster/postmaster.c:608 postmaster/postmaster.c:611
+msgid "-----------------------------------------"
+msgstr ""
+
+#: postmaster/postmaster.c:610 postmaster/postmaster.c:2285
+#, c-format
+msgid "\t%s"
+msgstr "\t%s"
+
+#: postmaster/postmaster.c:618 tcop/postgres.c:1719
 #, c-format
 msgid "%s: could not locate executable, bailing out..."
 msgstr ""
 
-#: ../postmaster/postmaster.c:629
+#: postmaster/postmaster.c:627
 msgid "For SSL, TCP/IP connections must be enabled."
 msgstr "F�r SSL m�ssen TCP/IP-Verbindungen aktiviert sein."
 
-#: ../postmaster/postmaster.c:676
+#: postmaster/postmaster.c:674
 msgid "cannot create INET stream port"
 msgstr ""
 
-#: ../postmaster/postmaster.c:688
+#: postmaster/postmaster.c:686
 msgid "cannot create UNIX stream port"
 msgstr ""
 
-#: ../postmaster/postmaster.c:780
+#: postmaster/postmaster.c:806
 #, c-format
 msgid "fork failed: %s"
 msgstr "fork fehlgeschlagen: %s"
 
-#: ../postmaster/postmaster.c:798
+#: postmaster/postmaster.c:828
 #, c-format
 msgid "cannot disassociate from controlling TTY: %s"
 msgstr ""
 
-#: ../postmaster/postmaster.c:818
+#: postmaster/postmaster.c:848
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -7149,83 +8408,91 @@ msgstr ""
 "%s ist der PostgreSQL-Server.\n"
 "\n"
 
-#: ../postmaster/postmaster.c:819
+#: postmaster/postmaster.c:849
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [options...]\n"
+"  %s [OPTION]...\n"
 "\n"
 msgstr ""
 "Benutzung:\n"
-"  %s [Optionen...]\n"
+"  %s [OPTION]...\n"
 "\n"
 
-#: ../postmaster/postmaster.c:820
+#: postmaster/postmaster.c:850
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: ../postmaster/postmaster.c:822
+#: postmaster/postmaster.c:852
 msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr "  -A 1|0          Assert-Pr�fungen ein-/ausschalten\n"
 
-#: ../postmaster/postmaster.c:824
+#: postmaster/postmaster.c:854
 #, c-format
 msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
 msgstr "  -B ZAHL         Anzahl der geteilten Puffer (Standard: %d)\n"
 
-#: ../postmaster/postmaster.c:825
+#: postmaster/postmaster.c:855
 msgid "  -c NAME=VALUE   set run-time parameter\n"
 msgstr "  -c NAME=WERT    setze Konfigurationsparameter\n"
 
-#: ../postmaster/postmaster.c:826
+#: postmaster/postmaster.c:856
 msgid "  -d 1-5          debugging level\n"
 msgstr "  -d 1-5          Debug-Level\n"
 
-#: ../postmaster/postmaster.c:827
+#: postmaster/postmaster.c:857
 msgid "  -D DATADIR      database directory\n"
 msgstr "  -D VERZEICHNIS  Datenbankverzeichnis\n"
 
-#: ../postmaster/postmaster.c:828
+#: postmaster/postmaster.c:858
 msgid "  -F              turn fsync off\n"
 msgstr "  -F              �fsync� ausschalten\n"
 
-#: ../postmaster/postmaster.c:829
+#: postmaster/postmaster.c:859
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
 msgstr "  -h HOSTNAME     horche auf Hostname oder IP-Adresse\n"
 
-#: ../postmaster/postmaster.c:830
+#: postmaster/postmaster.c:860
 msgid "  -i              enable TCP/IP connections\n"
 msgstr "  -i              erm�gliche TCP/IP-Verbindungen\n"
 
-#: ../postmaster/postmaster.c:831
+#: postmaster/postmaster.c:861
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
 msgstr "  -k VERZEICHNIS  Ort der Unix-Domain-Socket\n"
 
-#: ../postmaster/postmaster.c:833
+#: postmaster/postmaster.c:863
 msgid "  -l              enable SSL connections\n"
 msgstr "  -l              erm�gliche SSL-Verbindungen\n"
 
-#: ../postmaster/postmaster.c:835
+#: postmaster/postmaster.c:865
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
 msgstr "  -N ZAHL         Anzahl der erlaubten Verbindugen (Standard: %d)\n"
 
-#: ../postmaster/postmaster.c:837
+#: postmaster/postmaster.c:867
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
 msgstr "  -o OPTIONEN      �OPTIONEN� an Kindprozesse weiterreichen\n"
 
-#: ../postmaster/postmaster.c:838
+#: postmaster/postmaster.c:868
 #, c-format
 msgid "  -p PORT         port number to listen on (default %d)\n"
 msgstr "  -p PORT         auf dieser Portnummer horchen (Standard: %d)\n"
 
-#: ../postmaster/postmaster.c:839
+#: postmaster/postmaster.c:869
 msgid ""
 "  -S              silent mode (start in background without logging output)\n"
 msgstr ""
 "  -S              Stiller Modus (im Hintergrund starten, ohne Log-Ausgaben)\n"
 
-#: ../postmaster/postmaster.c:841
+#: postmaster/postmaster.c:870
+msgid "  --help          show this help, then exit\n"
+msgstr ""
+
+#: postmaster/postmaster.c:871
+msgid "  --version       output version information, then exit\n"
+msgstr ""
+
+#: postmaster/postmaster.c:873
 msgid ""
 "\n"
 "Developer options:\n"
@@ -7233,19 +8500,19 @@ msgstr ""
 "\n"
 "Entwickleroptionen:\n"
 
-#: ../postmaster/postmaster.c:842
+#: postmaster/postmaster.c:874
 msgid ""
 "  -n              do not reinitialize shared memory after abnormal exit\n"
 msgstr ""
 "  -n              Shared Memory nach abnormalem Ende nicht neu "
 "initialisieren\n"
 
-#: ../postmaster/postmaster.c:843
+#: postmaster/postmaster.c:875
 msgid "  -s              send SIGSTOP to all backend servers if one dies\n"
 msgstr ""
 "  -s              SIGSTOP an alle Kindprozesse senden wenn einer stirbt\n"
 
-#: ../postmaster/postmaster.c:845
+#: postmaster/postmaster.c:877
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -7261,1347 +8528,1352 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: ../postmaster/postmaster.c:927
+#: postmaster/postmaster.c:959
 #, c-format
 msgid "ServerLoop: select failed: %m"
 msgstr "ServerLoop: select fehlgeschlagen: %m"
 
-#: ../postmaster/postmaster.c:1053 ../postmaster/postmaster.c:1067
+#: postmaster/postmaster.c:1085 postmaster/postmaster.c:1102
 msgid "incomplete startup packet"
 msgstr "unvollst�ndiges Startpaket"
 
-#: ../postmaster/postmaster.c:1061
+#: postmaster/postmaster.c:1093
 msgid "invalid length of startup packet"
 msgstr "ung�ltige L�nge des Startpakets"
 
-#: ../postmaster/postmaster.c:1100
-#, c-format
-msgid "failed to send SSL negotiation response: %s"
-msgstr "konnte SSL-Verhandlungsantwort nicht senden: %s"
-
-#: ../postmaster/postmaster.c:1112
+#: postmaster/postmaster.c:1135
 #, c-format
-msgid "failed to initialize SSL connection: %s (%m)"
-msgstr "konnte SSL-Verbindung nicht initialisieren: %s (%m)"
+msgid "failed to send SSL negotiation response: %m"
+msgstr "konnte SSL-Verhandlungsantwort nicht senden: %m"
 
-#: ../postmaster/postmaster.c:1132
+#: postmaster/postmaster.c:1157
 msgid "unsupported frontend protocol"
 msgstr "nicht unterst�tztes Protokoll"
 
-#: ../postmaster/postmaster.c:1159
+#: postmaster/postmaster.c:1184
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr "kein PostgreSQL-Benutzername im Startpaket angegeben"
 
-#: ../postmaster/postmaster.c:1171
+#: postmaster/postmaster.c:1217
 msgid "The database system is starting up"
 msgstr "Das Datenbanksystem startet"
 
-#: ../postmaster/postmaster.c:1174
+#: postmaster/postmaster.c:1220
 msgid "The database system is shutting down"
 msgstr "Das Datenbanksystem f�hrt herunter"
 
-#: ../postmaster/postmaster.c:1177
+#: postmaster/postmaster.c:1223
 msgid "The database system is in recovery mode"
 msgstr "Das Datenbanksystem ist im Wiederherstellungsmodus"
 
-#: ../postmaster/postmaster.c:1180 ../storage/ipc/sinval.c:53
-#: ../storage/lmgr/proc.c:1091
+#: postmaster/postmaster.c:1226 storage/ipc/sinval.c:52
+#: storage/lmgr/proc.c:219
 msgid "Sorry, too many clients already"
 msgstr "Tut mir leid, schon zu viele Verbindungen"
 
-#: ../postmaster/postmaster.c:1211
+#: postmaster/postmaster.c:1256
 #, c-format
 msgid "processCancelRequest: CheckPointPID in cancel request for process %d"
 msgstr "processCancelRequest: CheckPointPID in Abbruchanfrage f�r Prozess %d"
 
-#: ../postmaster/postmaster.c:1226
+#: postmaster/postmaster.c:1270
 #, c-format
 msgid "processing cancel request: sending SIGINT to process %d"
 msgstr "bearbeite Abbruchanfrage: sende SIGINT an Prozess %d"
 
-#: ../postmaster/postmaster.c:1234
+#: postmaster/postmaster.c:1276
 #, c-format
 msgid "bad key in cancel request for process %d"
 msgstr "falscher Schl�ssel in Abbruchanfrage f�r Prozess %d"
 
-#: ../postmaster/postmaster.c:1243
+#: postmaster/postmaster.c:1283
 #, c-format
 msgid "bad pid in cancel request for process %d"
 msgstr "falsche Pid in Abbruchanfrage f�r Prozess %d"
 
-#: ../postmaster/postmaster.c:1286
+#: postmaster/postmaster.c:1326
 msgid "ConnCreate: malloc failed"
 msgstr "ConnCreate: malloc fehlgeschlagen"
 
-#: ../postmaster/postmaster.c:1408
+#: postmaster/postmaster.c:1421
+msgid "Received SIGHUP, reloading configuration files"
+msgstr ""
+
+#: postmaster/postmaster.c:1445
 #, c-format
 msgid "pmdie %d"
 msgstr "pmdie %d"
 
-#: ../postmaster/postmaster.c:1422
+#: postmaster/postmaster.c:1459
 msgid "smart shutdown request"
 msgstr ""
 
-#: ../postmaster/postmaster.c:1434 ../postmaster/postmaster.c:1478
+#: postmaster/postmaster.c:1471 postmaster/postmaster.c:1515
 #, c-format
 msgid "shutdown process %d already running"
 msgstr "Shutdown-Prozess %d l�uft bereits"
 
-#: ../postmaster/postmaster.c:1452
+#: postmaster/postmaster.c:1489
 msgid "fast shutdown request"
 msgstr "Schnelles Herunterfahren verlangt"
 
-#: ../postmaster/postmaster.c:1458
+#: postmaster/postmaster.c:1495
 msgid "aborting any active transactions"
 msgstr "etwaige aktive Transaktionen werden abgebrochen"
 
-#: ../postmaster/postmaster.c:1494
+#: postmaster/postmaster.c:1531
 msgid "immediate shutdown request"
 msgstr "Sofortiges Herunterfahren verlangt"
 
-#: ../postmaster/postmaster.c:1530
+#: postmaster/postmaster.c:1566
 msgid "reaping dead processes"
 msgstr "tote Prozesse werden eingesammelt"
 
-#: ../postmaster/postmaster.c:1547
+#: postmaster/postmaster.c:1583
 msgid "statistics collector process"
 msgstr "Statistiksammelprozess"
 
-#: ../postmaster/postmaster.c:1560
+#: postmaster/postmaster.c:1596
 msgid "shutdown process"
 msgstr "Shutdown-Prozess"
 
-#: ../postmaster/postmaster.c:1571
+#: postmaster/postmaster.c:1607
 msgid "startup process"
 msgstr "Start-Prozess"
 
-#: ../postmaster/postmaster.c:1573
+#: postmaster/postmaster.c:1609
 msgid "aborting startup due to startup process failure"
 msgstr "Serverstart abgebrochen wegen Start-Prozess-Fehler"
 
-#: ../postmaster/postmaster.c:1582
+#: postmaster/postmaster.c:1618
 #, c-format
 msgid "startup process %d died while shutdown process %d already running"
 msgstr "Start-Prozess %d endete als Shutdown-Prozess %d schon lief"
 
-#: ../postmaster/postmaster.c:1614
+#: postmaster/postmaster.c:1650
 msgid ""
 "all server processes terminated; reinitializing shared memory and semaphores"
 msgstr ""
 "alle Serverprozesse beendet; Shared Memory und Semaphoren werden neu "
 "initialisiert"
 
-#: ../postmaster/postmaster.c:1653
+#: postmaster/postmaster.c:1688
 msgid "child process"
 msgstr "Kindprozess"
 
-#: ../postmaster/postmaster.c:1698
+#: postmaster/postmaster.c:1733
 msgid "server process"
 msgstr "Serverprozess"
 
-#: ../postmaster/postmaster.c:1699
+#: postmaster/postmaster.c:1734
 msgid "terminating any other active server processes"
 msgstr "aktive Serverprozesse werden abgebrochen"
 
-#: ../postmaster/postmaster.c:1721
+#: postmaster/postmaster.c:1755
 #, c-format
 msgid "CleanupProc: sending %s to process %d"
 msgstr "CleanupProc: sende %s to Prozess %d"
 
-#: ../postmaster/postmaster.c:1766
+#: postmaster/postmaster.c:1799
 #, c-format
 msgid "%s (pid %d) exited with exit code %d"
 msgstr "%s (PID %d) beendete mit Status %d"
 
-#: ../postmaster/postmaster.c:1769
+#: postmaster/postmaster.c:1802
 #, c-format
 msgid "%s (pid %d) was terminated by signal %d"
 msgstr "%s (PID %d) wurde von Signal %d beendet"
 
-#: ../postmaster/postmaster.c:1772
+#: postmaster/postmaster.c:1805
 #, c-format
 msgid "%s (pid %d) exited with unexpected status %d"
 msgstr "%s (PID %d) beendete mit unerwartetem Status %d"
 
-#: ../postmaster/postmaster.c:1796
+#: postmaster/postmaster.c:1827
 #, c-format
 msgid "SignalChildren: sending signal %d to process %d"
 msgstr "SignalChildren: sende Signal %d an Prozess %d"
 
-#: ../postmaster/postmaster.c:1831
+#: postmaster/postmaster.c:1865
 msgid "out of memory; connection startup aborted"
 msgstr "Speicher aufgebraucht; Verbindungsaufbau abgebrochen"
 
-#: ../postmaster/postmaster.c:1866
+#: postmaster/postmaster.c:1916
 msgid "connection startup failed"
 msgstr "Verbindungsaufbau fehlgeschlagen"
 
-#: ../postmaster/postmaster.c:1881
+#: postmaster/postmaster.c:1933
 #, c-format
 msgid "connection startup failed (fork failure): %s"
 msgstr "Verbindungsaufbau fehlgeschlagen (fork-Fehler): %s"
 
-#: ../postmaster/postmaster.c:1888
+#: postmaster/postmaster.c:1940
 #, c-format
 msgid "BackendStartup: forked pid=%d socket=%d"
 msgstr ""
 
-#: ../postmaster/postmaster.c:2012
-msgid "DoBackend: Unable to set timer for auth timeout"
-msgstr ""
-
-#: ../postmaster/postmaster.c:2089
-msgid "DoBackend: Unable to disable timer for auth timeout"
+#: postmaster/postmaster.c:1974
+msgid "Server process fork() failed: "
 msgstr ""
 
-#: ../postmaster/postmaster.c:2093
+#: postmaster/postmaster.c:2121
 #, c-format
-msgid "connection: host=%s user=%s database=%s"
-msgstr "Verbindung: Host=%s Benutzer=%s Datenbank=%s"
+msgid "connection received: host=%s port=%hu"
+msgstr "Verbindung empfangen: Host=%s Port=%hu"
 
-#: ../postmaster/postmaster.c:2396
+#: postmaster/postmaster.c:2141
 #, c-format
-msgid "failed to create SSL context: %s"
-msgstr "konnte SSL-Kontext nicht erstellen: %s"
+msgid "connection received: host=%s"
+msgstr "Verbindung empfangen: Host=%s"
 
-#: ../postmaster/postmaster.c:2403
-#, c-format
-msgid "failed to load server certificate (%s): %s"
-msgstr "konnte Serverzertifikat (%s) nicht laden: %s"
+#: postmaster/postmaster.c:2161
+msgid "DoBackend: Unable to set timer for auth timeout"
+msgstr ""
+
+#: postmaster/postmaster.c:2190
+msgid "DoBackend: Unable to disable timer for auth timeout"
+msgstr ""
 
-#: ../postmaster/postmaster.c:2410
+#: postmaster/postmaster.c:2194
 #, c-format
-msgid "failed to load private key file (%s): %s"
-msgstr "konnte Private-Key-Datei (%s) nicht laden: %s"
+msgid "connection authorized: user=%s database=%s"
+msgstr "Verbindung authorisiert: Benutzer=%s Datenbank=%s"
 
-#: ../postmaster/postmaster.c:2416
+#: postmaster/postmaster.c:2283
 #, c-format
-msgid "check of private key failed: %s"
-msgstr "�berpr�fung des Private Key fehlgeschlagen: %s"
+msgid "%s child[%d]: starting with ("
+msgstr ""
+
+#: postmaster/postmaster.c:2286
+msgid ")"
+msgstr ""
 
-#: ../postmaster/postmaster.c:2545
+#: postmaster/postmaster.c:2585
 #, c-format
-msgid "could not launch startup process (fork failure): %s"
-msgstr "konnte Start-Prozess nicht starten (fork-Fehler): %s"
+msgid "could not launch startup process (fork failure): %m"
+msgstr "konnte Start-Prozess nicht starten (fork-Fehler): %m"
 
-#: ../postmaster/postmaster.c:2549
+#: postmaster/postmaster.c:2588
 #, c-format
-msgid "could not launch checkpoint process (fork failure): %s"
-msgstr "konnte Checkpoint-Prozess nicht starten (fork-Fehler): %s"
+msgid "could not launch checkpoint process (fork failure): %m"
+msgstr "konnte Checkpoint-Prozess nicht starten (fork-Fehler): %m"
 
-#: ../postmaster/postmaster.c:2554
+#: postmaster/postmaster.c:2591
 #, c-format
-msgid "could not launch shutdown process (fork failure): %s"
-msgstr "konnte Shutdown-Prozess nicht starten (fork-Fehler): %s"
+msgid "could not launch shutdown process (fork failure): %m"
+msgstr "konnte Shutdown-Prozess nicht starten (fork-Fehler): %m"
 
-#: ../postmaster/postmaster.c:2577
+#: postmaster/postmaster.c:2615
 msgid "CheckPointDataBase: malloc failed"
 msgstr ""
 
-#: ../postmaster/postmaster.c:2617
+#: postmaster/postmaster.c:2654
 #, c-format
 msgid "cannot create file %s: %s"
 msgstr "kann Datei %s nicht erstellen: %s"
 
-#: ../postmaster/postmaster.c:2629
+#: postmaster/postmaster.c:2666
 #, c-format
 msgid "writing file %s failed"
 msgstr "Datei %s konnte nicht geschrieben werden"
 
-#: ../postmaster/pgstat.c:697
-msgid "Only database superusers can reset statistic counters"
-msgstr "Nur Superuser k�nnen Statistikz�hler zur�cksetzen"
-
-#: ../postmaster/pgstat.c:2101
-msgid "PGSTAT: Creation of DB hash table failed"
-msgstr ""
-
-#: ../postmaster/pgstat.c:2147 ../postmaster/pgstat.c:2184
-#: ../postmaster/pgstat.c:2257 ../postmaster/pgstat.c:2298
-#: ../postmaster/pgstat.c:2329 ../postmaster/pgstat.c:2385
-#: ../postmaster/pgstat.c:2426
-msgid "PGSTAT: corrupted pgstat.stat file"
-msgstr ""
-
-#: ../postmaster/pgstat.c:2169
-msgid "PGSTAT: DB hash table out of memory"
-msgstr ""
-
-#: ../postmaster/pgstat.c:2222
-msgid "PGSTAT: failed to initialize hash table for new database entry\n"
-msgstr ""
-
-#: ../postmaster/pgstat.c:2282
-msgid "PGSTAT: Tab hash table out of memory"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:272
-msgid "ApplyRetrieveRule: expected just one rule action"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:274
-msgid "ApplyRetrieveRule: can't handle qualified ON SELECT rule"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:276
-msgid "ApplyRetrieveRule: can't handle per-attribute ON SELECT rule"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:490 ../rewrite/rewriteHandler.c:777
-#, c-format
-msgid "Relation \"%s\" with OID %u no longer exists"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:557
-msgid "fireRIRrules: failed to remove aggs from qual"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:829
-#, c-format
-msgid "query rewritten %d times, may contain cycles"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:953
-msgid "Cannot insert into a view without an appropriate rule"
+#: regex/regcomp.c:1758 regex/regcomp.c:1773
+msgid "cclass_init: out of memory"
 msgstr ""
 
-#: ../rewrite/rewriteHandler.c:956
-msgid "Cannot update a view without an appropriate rule"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:959
-msgid "Cannot delete from a view without an appropriate rule"
-msgstr ""
-
-#: ../rewrite/rewriteHandler.c:962
-#, c-format
-msgid "QueryRewrite: unexpected commandType %d"
-msgstr ""
-
-#: ../rewrite/rewriteDefine.c:62
+#: rewrite/rewriteDefine.c:100
 #, c-format
 msgid "Attempt to insert rule \"%s\" failed: already exists"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:129
-msgid "rules not allowed for insert or delete events to an attribute"
-msgstr ""
-
-#: ../rewrite/rewriteDefine.c:198
-msgid "attribute level rules currently not supported"
-msgstr ""
-
-#: ../rewrite/rewriteDefine.c:218
+#: rewrite/rewriteDefine.c:227
 msgid ""
 "rule actions on OLD currently not supported\n"
 "\tuse views or triggers instead"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:221
+#: rewrite/rewriteDefine.c:230
 msgid ""
 "rule actions on NEW currently not supported\n"
 "\tuse triggers instead"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:239
+#: rewrite/rewriteDefine.c:247
 msgid ""
 "instead nothing rules on select currently not supported\n"
 "\tuse views instead"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:247
+#: rewrite/rewriteDefine.c:255
 msgid "multiple action rules on select currently not supported"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:254
+#: rewrite/rewriteDefine.c:262
 msgid "only instead-select rules currently supported on select"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:260
+#: rewrite/rewriteDefine.c:268
 msgid "event qualifications not supported for rules on select"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:278
+#: rewrite/rewriteDefine.c:286
 msgid "select rule's target list has too many entries"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:284
+#: rewrite/rewriteDefine.c:300
+msgid "cannot convert relation containing dropped columns to view"
+msgstr ""
+
+#: rewrite/rewriteDefine.c:303
 #, c-format
 msgid "select rule's target entry %d has different column name from %s"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:287
+#: rewrite/rewriteDefine.c:306
 #, c-format
 msgid "select rule's target entry %d has different type from attribute %s"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:298
+#: rewrite/rewriteDefine.c:317
 #, c-format
 msgid "select rule's target entry %d has different size from attribute %s"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:302
+#: rewrite/rewriteDefine.c:321
 msgid "select rule's target list has too few entries"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:315
+#: rewrite/rewriteDefine.c:334
 #, c-format
 msgid "\"%s\" is already a view"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:326
+#: rewrite/rewriteDefine.c:356
 #, c-format
 msgid "view rule for \"%s\" must be named \"%s\""
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:345
+#: rewrite/rewriteDefine.c:373
 #, c-format
 msgid "Relation \"%s\" is not empty. Cannot convert it to view"
 msgstr ""
 
-#: ../rewrite/rewriteDefine.c:503
+#: rewrite/rewriteDefine.c:512
 #, c-format
 msgid "RenameRewriteRule: rule \"%s\" does not exist"
 msgstr "RenameRewriteRule: Rule �%s� existiert nicht"
 
-#: ../rewrite/rewriteDefine.c:507
+#: rewrite/rewriteDefine.c:516
 #, c-format
 msgid "Attempt to rename rule \"%s\" failed: \"%s\" already exists"
 msgstr ""
 
-#: ../rewrite/rewriteManip.c:557 ../rewrite/rewriteManip.c:564
-msgid "getInsertSelectQuery: expected to find SELECT subquery"
+#: rewrite/rewriteHandler.c:343
+#, c-format
+msgid "rewriteTargetList: bogus resno %d in targetlist"
 msgstr ""
 
-#: ../rewrite/rewriteManip.c:575
-msgid "getInsertSelectQuery: can't find rule placeholders"
+#: rewrite/rewriteHandler.c:385 rewrite/rewriteHandler.c:397
+#, c-format
+msgid "Multiple assignments to same attribute \"%s\""
 msgstr ""
 
-#: ../rewrite/rewriteManip.c:609 ../rewrite/rewriteManip.c:649
-msgid "Conditional utility statements are not implemented"
+#: rewrite/rewriteHandler.c:553
+msgid "ApplyRetrieveRule: expected just one rule action"
 msgstr ""
 
-#: ../rewrite/rewriteManip.c:772
-msgid "ResolveNew: can't handle whole-tuple reference"
+#: rewrite/rewriteHandler.c:555
+msgid "ApplyRetrieveRule: can't handle qualified ON SELECT rule"
+msgstr ""
+
+#: rewrite/rewriteHandler.c:557
+msgid "ApplyRetrieveRule: can't handle per-attribute ON SELECT rule"
+msgstr ""
+
+#: rewrite/rewriteHandler.c:835
+msgid "fireRIRrules: failed to remove aggs from qual"
 msgstr ""
 
-#: ../rewrite/rewriteRemove.c:44
+#: rewrite/rewriteHandler.c:1096
 #, c-format
-msgid "Rule or view \"%s\" not found"
-msgstr "Rule oder Sicht �%s� nicht gefunden"
+msgid "query rewritten %d times, may contain cycles"
+msgstr ""
+
+#: rewrite/rewriteHandler.c:1208
+msgid ""
+"Cannot insert into a view\n"
+"\tYou need an unconditional ON INSERT DO INSTEAD rule"
+msgstr ""
+
+#: rewrite/rewriteHandler.c:1212
+msgid ""
+"Cannot update a view\n"
+"\tYou need an unconditional ON UPDATE DO INSTEAD rule"
+msgstr ""
+
+#: rewrite/rewriteHandler.c:1216
+msgid ""
+"Cannot delete from a view\n"
+"\tYou need an unconditional ON DELETE DO INSTEAD rule"
+msgstr ""
 
-#: ../rewrite/rewriteRemove.c:53 ../utils/adt/tid.c:156
+#: rewrite/rewriteHandler.c:1220
 #, c-format
-msgid "Relation %u not found"
-msgstr "Relation %u nicht gefunden"
+msgid "QueryRewrite: unexpected commandType %d"
+msgstr ""
+
+#: rewrite/rewriteManip.c:583 rewrite/rewriteManip.c:590
+msgid "getInsertSelectQuery: expected to find SELECT subquery"
+msgstr ""
+
+#: rewrite/rewriteManip.c:601
+msgid "getInsertSelectQuery: can't find rule placeholders"
+msgstr ""
+
+#: rewrite/rewriteManip.c:635 rewrite/rewriteManip.c:675
+msgid "Conditional utility statements are not implemented"
+msgstr ""
 
-#: ../rewrite/rewriteRemove.c:93
+#: rewrite/rewriteManip.c:790
+msgid "ResolveNew: can't handle whole-tuple reference"
+msgstr ""
+
+#: rewrite/rewriteRemove.c:57
 #, c-format
 msgid "Rule \"%s\" not found"
 msgstr "Rule �%s� nicht gefunden"
 
-#: ../rewrite/rewriteRemove.c:114
-msgid "Cannot remove a view's SELECT rule"
-msgstr ""
+#: rewrite/rewriteRemove.c:113
+#, c-format
+msgid "RemoveRewriteRuleById: Rule %u does not exist"
+msgstr "RemoveRewriteRuleById: Rule %u existiert nicht"
 
-#: ../rewrite/rewriteSupport.c:100
+#: rewrite/rewriteSupport.c:68
 #, c-format
 msgid "SetRelationRuleStatus: cache lookup failed for relation %u"
 msgstr ""
 
-#: ../storage/buffer/buf_table.c:58
+#: storage/buffer/buf_table.c:58
 msgid "couldn't initialize shared buffer pool Hash Tbl"
 msgstr ""
 
-#: ../storage/buffer/buf_table.c:100
+#: storage/buffer/buf_table.c:100
 msgid "BufTableDelete: BufferLookup table corrupted"
 msgstr ""
 
-#: ../storage/buffer/buf_table.c:131
+#: storage/buffer/buf_table.c:131
 msgid "BufTableInsert: BufferLookup table out of memory"
 msgstr ""
 
-#: ../storage/buffer/buf_table.c:138
+#: storage/buffer/buf_table.c:138
 msgid "BufTableInsert: BufferLookup table corrupted"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:258
+#: storage/buffer/bufmgr.c:243
 msgid "BufRead: buffer table broken after IO error"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:428
+#: storage/buffer/bufmgr.c:413
 #, c-format
 msgid "BufferAlloc: cannot write block %u for %u/%u"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:446
+#: storage/buffer/bufmgr.c:431
 #, c-format
 msgid "BufferAlloc: content of block %u (%u/%u) changed while flushing"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:538
+#: storage/buffer/bufmgr.c:523
 msgid "buffer wasn't in the buffer table"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:546
+#: storage/buffer/bufmgr.c:531
 msgid "Buffer in lookup table twice"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:807
+#: storage/buffer/bufmgr.c:570
+#, c-format
+msgid "write_buffer: bad buffer %d"
+msgstr ""
+
+#: storage/buffer/bufmgr.c:782
 #, c-format
 msgid "BufferSync: cannot write %u for %u/%u"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:978
+#: storage/buffer/bufmgr.c:920
 #, c-format
 msgid ""
 "Buffer Leak: [%03d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, "
 "flags=0x%x, refcount=%d %ld)"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:1374 ../storage/buffer/bufmgr.c:1406
+#: storage/buffer/bufmgr.c:1167
+#, c-format
+msgid "DropRelFileNodeBuffers: block %u is referenced (private %ld, global %d)"
+msgstr ""
+
+#: storage/buffer/bufmgr.c:1270 storage/buffer/bufmgr.c:1304
 #, c-format
 msgid ""
 "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, flags=0x%x, "
 "refcount=%d %ld)"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:1507
+#: storage/buffer/bufmgr.c:1379
 #, c-format
 msgid ""
 "FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:1517
+#: storage/buffer/bufmgr.c:1389
 #, c-format
 msgid "FlushRelationBuffers(%s (local), %u): block %u is referenced (%ld)"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:1569
+#: storage/buffer/bufmgr.c:1441
 #, c-format
 msgid "FlushRelationBuffers: cannot write %u for %u/%u"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:1595
+#: storage/buffer/bufmgr.c:1467
 #, c-format
 msgid ""
 "FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:1825
+#: storage/buffer/bufmgr.c:1666
 msgid "buffer alloc trace error and can't open log file"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:2018
+#: storage/buffer/bufmgr.c:1765
+#, c-format
+msgid "SetBufferCommitInfoNeedsSave: bad buffer %d"
+msgstr ""
+
+#: storage/buffer/bufmgr.c:1859
 #, c-format
 msgid "LockBuffer: unknown lock mode %d"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:2049 ../storage/buffer/bufmgr.c:2056
+#: storage/buffer/bufmgr.c:1890 storage/buffer/bufmgr.c:1897
 msgid "LockBufferForCleanup: wrong local pin count"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:2078
+#: storage/buffer/bufmgr.c:1919
 msgid "Multiple backends attempting to wait for pincount 1"
 msgstr ""
 
-#: ../storage/buffer/bufmgr.c:2201
+#: storage/buffer/bufmgr.c:2042
 #, c-format
 msgid "write error may be permanent: cannot write block %u for %u/%u"
 msgstr ""
 
-#: ../storage/buffer/freelist.c:201
+#: storage/buffer/freelist.c:201
 msgid "out of free buffers: time to abort!"
 msgstr ""
 
-#: ../storage/buffer/localbuf.c:94
+#: storage/buffer/localbuf.c:83
 msgid "no empty local buffer."
 msgstr ""
 
-#: ../storage/buffer/localbuf.c:138
+#: storage/buffer/localbuf.c:120
 msgid "Out of memory in LocalBufferAlloc"
 msgstr ""
 
-#: ../storage/file/fd.c:273
+#: storage/buffer/localbuf.c:227
+#, c-format
+msgid ""
+"Local Buffer Leak: [%03d] (rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %"
+"ld)"
+msgstr ""
+
+#: storage/file/buffile.c:477
+#, c-format
+msgid "BufFileSeek: invalid whence: %d"
+msgstr ""
+
+#: storage/file/fd.c:272
 #, c-format
 msgid "BasicOpenFile: not enough descs, retry, er= %d"
 msgstr ""
 
-#: ../storage/file/fd.c:307
+#: storage/file/fd.c:306
 #, c-format
 msgid "pg_nofile: sysconf(_SC_OPEN_MAX) failed; using %ld"
 msgstr ""
 
-#: ../storage/file/fd.c:329
+#: storage/file/fd.c:328
 #, c-format
 msgid ""
 "pg_nofile: insufficient file descriptors available to start backend.\n"
 "\tSystem allows %ld, we need at least %d."
 msgstr ""
 
-#: ../storage/file/fd.c:367
+#: storage/file/fd.c:366
 #, c-format
 msgid "Delete %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:387
+#: storage/file/fd.c:385
 #, c-format
 msgid "LruDelete %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:422
+#: storage/file/fd.c:399
+#, c-format
+msgid "LruDelete: failed to close %s: %m"
+msgstr ""
+
+#: storage/file/fd.c:413
 #, c-format
 msgid "Insert %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:444
+#: storage/file/fd.c:434
 #, c-format
 msgid "LruInsert %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:466
+#: storage/file/fd.c:456
 #, c-format
 msgid "RE_OPEN FAILED: %d"
 msgstr ""
 
-#: ../storage/file/fd.c:471
+#: storage/file/fd.c:461
 msgid "RE_OPEN SUCCESS"
 msgstr ""
 
-#: ../storage/file/fd.c:495
+#: storage/file/fd.c:487
 #, c-format
 msgid "ReleaseLruFile. Opened %d"
 msgstr ""
 
-#: ../storage/file/fd.c:516
+#: storage/file/fd.c:508
 #, c-format
 msgid "AllocateVfd. Size %d"
 msgstr ""
 
-#: ../storage/file/fd.c:523
+#: storage/file/fd.c:515
 msgid "AllocateVfd: no room for VFD array"
 msgstr ""
 
-#: ../storage/file/fd.c:555
+#: storage/file/fd.c:547
 msgid "AllocateVfd: no room to enlarge VFD array"
 msgstr ""
 
-#: ../storage/file/fd.c:588
+#: storage/file/fd.c:580
 #, c-format
 msgid "FreeVfd: %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:638
+#: storage/file/fd.c:630
 #, c-format
 msgid "FileAccess %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:690
+#: storage/file/fd.c:682
 msgid "fileNameOpenFile: NULL fname"
 msgstr ""
 
-#: ../storage/file/fd.c:692
+#: storage/file/fd.c:684
 #, c-format
 msgid "fileNameOpenFile: %s %x %o"
 msgstr ""
 
-#: ../storage/file/fd.c:712
+#: storage/file/fd.c:704
 #, c-format
 msgid "fileNameOpenFile: success %d"
 msgstr ""
 
-#: ../storage/file/fd.c:719
+#: storage/file/fd.c:711
 msgid "fileNameOpenFile: no room to save VFD filename"
 msgstr ""
 
-#: ../storage/file/fd.c:812
+#: storage/file/fd.c:795
 #, c-format
 msgid "Failed to create temporary file %s"
 msgstr ""
 
-#: ../storage/file/fd.c:831
+#: storage/file/fd.c:814
 #, c-format
 msgid "FileClose: %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:880
+#: storage/file/fd.c:826
+#, c-format
+msgid "FileClose: failed to close %s: %m"
+msgstr ""
+
+#: storage/file/fd.c:841
+#, c-format
+msgid "FileClose: failed to unlink %s: %m"
+msgstr ""
+
+#: storage/file/fd.c:859
 #, c-format
 msgid "FileUnlink: %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:896
+#: storage/file/fd.c:875
 #, c-format
 msgid "FileRead: %d (%s) %ld %d %p"
 msgstr ""
 
-#: ../storage/file/fd.c:917
+#: storage/file/fd.c:896
 #, c-format
 msgid "FileWrite: %d (%s) %ld %d %p"
 msgstr ""
 
-#: ../storage/file/fd.c:943
+#: storage/file/fd.c:922
 #, c-format
 msgid "FileSeek: %d (%s) %ld %ld %d"
 msgstr ""
 
-#: ../storage/file/fd.c:953 ../storage/file/fd.c:974
+#: storage/file/fd.c:932 storage/file/fd.c:953
 #, c-format
 msgid "FileSeek: invalid offset: %ld"
 msgstr ""
 
-#: ../storage/file/fd.c:964 ../storage/file/fd.c:986
+#: storage/file/fd.c:943 storage/file/fd.c:965
 #, c-format
 msgid "FileSeek: invalid whence: %d"
 msgstr ""
 
-#: ../storage/file/fd.c:1001
+#: storage/file/fd.c:980
 #, c-format
 msgid "FileTell %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:1014
+#: storage/file/fd.c:993
 #, c-format
 msgid "FileTruncate %d (%s)"
 msgstr ""
 
-#: ../storage/file/fd.c:1113
-#, c-format
-msgid "FileMarkDirty: %d (%s)"
-msgstr ""
-
-#: ../storage/file/fd.c:1143
+#: storage/file/fd.c:1024
 #, c-format
 msgid "AllocateFile: Allocated %d"
 msgstr ""
 
-#: ../storage/file/fd.c:1146
+#: storage/file/fd.c:1027
 msgid "AllocateFile: too many private FDs demanded"
 msgstr ""
 
-#: ../storage/file/fd.c:1160
+#: storage/file/fd.c:1041
 #, c-format
 msgid "AllocateFile: not enough descs, retry, er= %d"
 msgstr ""
 
-#: ../storage/file/fd.c:1176
+#: storage/file/fd.c:1057
 #, c-format
 msgid "FreeFile: Allocated %d"
 msgstr ""
 
-#: ../storage/file/fd.c:1189
+#: storage/file/fd.c:1070
 msgid "FreeFile: file was not obtained from AllocateFile"
 msgstr ""
 
-#: ../storage/file/buffile.c:477
-#, c-format
-msgid "BufFileSeek: invalid whence: %d"
+#: storage/freespace/freespace.c:180 storage/freespace/freespace.c:195
+#: storage/freespace/freespace.c:203
+msgid "Insufficient shared memory for free space map"
+msgstr ""
+
+#: storage/freespace/freespace.c:421
+msgid "MultiRecordFreeSpace: data not in page order"
+msgstr ""
+
+#: storage/freespace/freespace.c:536
+msgid "FreeSpaceMap hashtable out of memory"
+msgstr ""
+
+#: storage/freespace/freespace.c:606
+msgid "FreeSpaceMap hashtable corrupted"
+msgstr ""
+
+#: storage/freespace/freespace.c:779
+msgid "fsm_record_free_space: unexpected match"
 msgstr ""
 
-#: ../storage/ipc/ipc.c:135
+#: storage/freespace/freespace.c:889
+msgid "insert_fsm_page_entry: entry already exists!"
+msgstr ""
+
+#: storage/ipc/ipc.c:95
 #, c-format
 msgid "proc_exit(%d)"
 msgstr ""
 
-#: ../storage/ipc/ipc.c:154
+#: storage/ipc/ipc.c:113
 #, c-format
 msgid "exit(%d)"
 msgstr ""
 
-#: ../storage/ipc/ipc.c:168
+#: storage/ipc/ipc.c:126
 #, c-format
 msgid "shmem_exit(%d)"
 msgstr ""
 
-#: ../storage/ipc/ipc.c:194
+#: storage/ipc/ipc.c:152
 msgid "Out of on_proc_exit slots"
 msgstr ""
 
-#: ../storage/ipc/ipc.c:213
-msgid "Out of on_shmem_exit slots"
+#: storage/ipc/ipci.c:73
+#, c-format
+msgid "invoking IpcMemoryCreate(size=%d)"
 msgstr ""
 
-#: ../storage/ipc/ipci.c:109
+#: storage/ipc/ipci.c:115
 msgid "Couldn't create the lock table"
 msgstr ""
 
-#: ../storage/ipc/shmem.c:157
+#: storage/ipc/shmem.c:161
 msgid "ShmemAlloc: out of memory"
 msgstr ""
 
-#: ../storage/ipc/shmem.c:203
+#: storage/ipc/shmem.c:207
 msgid "InitShmemIndex: couldn't initialize Shmem Index"
 msgstr ""
 
-#: ../storage/ipc/shmem.c:214
+#: storage/ipc/shmem.c:218
 msgid "InitShmemIndex: Shmem Index out of memory"
 msgstr ""
 
-#: ../storage/ipc/shmem.c:332
+#: storage/ipc/shmem.c:336
 msgid "ShmemInitStruct: Shmem Index out of memory"
 msgstr ""
 
-#: ../storage/ipc/shmem.c:347
+#: storage/ipc/shmem.c:351
 msgid "ShmemInitStruct: ShmemIndex entry size is wrong"
 msgstr ""
 
-#: ../storage/ipc/shmem.c:364
+#: storage/ipc/shmem.c:368
 #, c-format
 msgid "ShmemInitStruct: cannot allocate '%s'"
 msgstr ""
 
-#: ../storage/ipc/sinval.c:51
+#: storage/ipc/shmqueue.c:234 storage/ipc/shmqueue.c:254
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: storage/ipc/sinval.c:50
 msgid "Backend cache invalidation initialization failed"
 msgstr ""
 
-#: ../storage/ipc/sinval.c:69
+#: storage/ipc/sinval.c:68
 msgid "SendSharedInvalidMessage: SI buffer overflow"
 msgstr ""
 
-#: ../storage/ipc/sinval.c:111
+#: storage/ipc/sinval.c:111
 msgid "ReceiveSharedInvalidMessages: cache state reset"
 msgstr ""
 
-#: ../storage/ipc/sinval.c:312 ../storage/ipc/sinval.c:322
+#: storage/ipc/sinval.c:319 storage/ipc/sinval.c:329
 msgid "Memory exhausted in GetSnapshotData"
 msgstr ""
 
-#: ../storage/ipc/sinvaladt.c:122
+#: storage/ipc/sinvaladt.c:122
 #, c-format
 msgid "SIBackendInit: backend id %d"
 msgstr ""
 
-#: ../storage/ipc/sinvaladt.c:222
-#, c-format
+#: storage/ipc/sinvaladt.c:227
+#, c-format, ycp-format
 msgid "SIInsertDataEntry: table is 70%% full, signaling postmaster"
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:49
+#: storage/large_object/inv_api.c:48
 msgid "getbytealen: VARSIZE(data) < VARHDRSZ. This is internal error."
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:75
+#: storage/large_object/inv_api.c:74
 #, c-format
 msgid "inv_create: large object %u already exists. This is internal error."
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:108
+#: storage/large_object/inv_api.c:107
 #, c-format
 msgid "inv_create: invalid flags: %d"
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:127
+#: storage/large_object/inv_api.c:126
 #, c-format
 msgid "inv_open: large object %u not found"
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:145
+#: storage/large_object/inv_api.c:144
 #, c-format
 msgid "inv_open: invalid flags: %d"
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:254
+#: storage/large_object/inv_api.c:244
 #, c-format
 msgid "inv_getsize: large object %u not found"
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:267 ../storage/large_object/inv_api.c:272
-#: ../storage/large_object/inv_api.c:280
+#: storage/large_object/inv_api.c:257 storage/large_object/inv_api.c:262
+#: storage/large_object/inv_api.c:270
 #, c-format
 msgid "inv_seek: invalid offset: %d"
 msgstr ""
 
-#: ../storage/large_object/inv_api.c:285
+#: storage/large_object/inv_api.c:275
 #, c-format
 msgid "inv_seek: invalid whence: %d"
 msgstr ""
 
-#: ../storage/lmgr/lmgr.c:105
+#: storage/lmgr/deadlock.c:275
+msgid "DeadLockCheckRecurse: inconsistent results"
+msgstr ""
+
+#: storage/lmgr/lmgr.c:85
 msgid "InitLockTable: couldn't initialize lock table"
 msgstr ""
 
-#: ../storage/lmgr/lmgr.c:114
+#: storage/lmgr/lmgr.c:94
 msgid "InitLockTable: couldn't rename long-term lock table"
 msgstr ""
 
-#: ../storage/lmgr/lmgr.c:155
+#: storage/lmgr/lmgr.c:135
 msgid "LockRelation: LockAcquire failed"
 msgstr ""
 
-#: ../storage/lmgr/lmgr.c:244
+#: storage/lmgr/lmgr.c:224
 msgid "LockRelationForSession: LockAcquire failed"
 msgstr ""
 
-#: ../storage/lmgr/lmgr.c:282
+#: storage/lmgr/lmgr.c:262
 msgid "LockPage: LockAcquire failed"
 msgstr ""
 
-#: ../storage/lmgr/lmgr.c:323
+#: storage/lmgr/lmgr.c:303
 msgid "XactLockTableInsert: LockAcquire failed"
 msgstr ""
 
-#: ../storage/lmgr/lmgr.c:346
+#: storage/lmgr/lmgr.c:326
 msgid "XactLockTableWait: LockAcquire failed"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:111
+#: storage/lmgr/lock.c:110
 #, c-format
 msgid ""
 "%s: lock(%lx) tbl(%d) rel(%u) db(%u) obj(%u) grantMask(%x) req(%d,%d,%d,%d,%"
 "d,%d,%d)=%d grant(%d,%d,%d,%d,%d,%d,%d)=%d wait(%d) type(%s)"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:137
+#: storage/lmgr/lock.c:136
 #, c-format
 msgid ""
 "%s: holder(%lx) lock(%lx) tbl(%d) proc(%lx) xid(%u) hold(%d,%d,%d,%d,%d,%d,%"
 "d)=%d"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:251
+#: storage/lmgr/lock.c:245
 #, c-format
 msgid "LockMethodTableInit: too many lock types %d greater than %d"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:282 ../storage/lmgr/lock.c:323
-#: ../storage/lmgr/lock.c:343
+#: storage/lmgr/lock.c:264 storage/lmgr/lock.c:310 storage/lmgr/lock.c:330
 #, c-format
 msgid "LockMethodTableInit: couldn't initialize %s"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:464
+#: storage/lmgr/lock.c:451
 #, c-format
 msgid "LockAcquire: user lock [%u] %s"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:475
+#: storage/lmgr/lock.c:462
 #, c-format
 msgid "LockAcquire: bad lock table %d"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:493
+#: storage/lmgr/lock.c:480
 #, c-format
 msgid "LockAcquire: lock table %d is out of memory"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:540
+#: storage/lmgr/lock.c:527
 msgid "LockAcquire: holder table out of memory"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:585
+#: storage/lmgr/lock.c:572
 #, c-format
 msgid "Deadlock risk: raising lock level from %s to %s on object %u/%u/%u"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:665
+#: storage/lmgr/lock.c:652
 msgid "LockAcquire: remove holder, table corrupted"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:922
+#: storage/lmgr/lock.c:908
 msgid "deadlock detected"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1003
+#: storage/lmgr/lock.c:989
 #, c-format
 msgid "LockRelease: user lock tag [%u] %d"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1013
+#: storage/lmgr/lock.c:999
 msgid "lockMethodTable is null in LockRelease"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1035
+#: storage/lmgr/lock.c:1021
 msgid "LockRelease: no such lock"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1058
+#: storage/lmgr/lock.c:1044
 msgid "LockRelease: no lock with this tag"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1061
+#: storage/lmgr/lock.c:1047
 msgid "LockRelease: holder table corrupted"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1075
+#: storage/lmgr/lock.c:1061
 #, c-format
 msgid "LockRelease: you don't own a lock of type %s"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1129
+#: storage/lmgr/lock.c:1115
 msgid "LockRelease: remove lock, table corrupted"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1158
+#: storage/lmgr/lock.c:1144
 msgid "LockRelease: remove holder, table corrupted"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1199
+#: storage/lmgr/lock.c:1185
 #, c-format
 msgid "LockReleaseAll: lockmethod=%d, pid=%d"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1207
+#: storage/lmgr/lock.c:1193
 #, c-format
 msgid "LockReleaseAll: bad lockmethod %d"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1311
+#: storage/lmgr/lock.c:1297
 msgid "LockReleaseAll: holder table corrupted"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1329
+#: storage/lmgr/lock.c:1315
 msgid "LockReleaseAll: cannot remove lock from HTAB"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1344
+#: storage/lmgr/lock.c:1330
 msgid "LockReleaseAll: done"
 msgstr ""
 
-#: ../storage/lmgr/lock.c:1463
+#: storage/lmgr/lock.c:1517
 msgid "DumpAllLocks: holder->tag.lock = NULL"
 msgstr ""
 
-#: ../storage/lmgr/proc.c:212
-msgid "InitProcess: Proc Header uninitialized"
-msgstr ""
-
-#: ../storage/lmgr/proc.c:215
-msgid "InitProcess: you already exist"
-msgstr "InitProcess: Du existierst bereits"
-
-#: ../storage/lmgr/proc.c:238
-msgid "cannot create new proc: out of memory"
-msgstr ""
-
-#: ../storage/lmgr/proc.c:301
-msgid "InitDummyProcess: Proc Header uninitialized"
-msgstr ""
-
-#: ../storage/lmgr/proc.c:304
-msgid "InitDummyProcess: you already exist"
-msgstr "InitDummyProcess: Du existierst bereits"
-
-#: ../storage/lmgr/proc.c:310
+#: storage/lmgr/lwlock.c:71
 #, c-format
-msgid "InitDummyProcess: DummyProc is in use by PID %d"
-msgstr ""
-
-#: ../storage/lmgr/proc.c:696
-msgid "ProcSleep: Unable to set timer for process wakeup"
-msgstr ""
-
-#: ../storage/lmgr/proc.c:718
-msgid "ProcSleep: Unable to disable timer for process wakeup"
-msgstr ""
-
-#: ../storage/lmgr/deadlock.c:273
-msgid "DeadLockCheckRecurse: inconsistent results"
+msgid "%s(%d): excl %d shared %d head %p rOK %d"
 msgstr ""
 
-#: ../storage/lmgr/lwlock.c:70
+#: storage/lmgr/lwlock.c:81
 #, c-format
-msgid "%s(%d): excl %d shared %d head %p"
+msgid "%s(%d): %s"
 msgstr ""
 
-#: ../storage/lmgr/lwlock.c:173
+#: storage/lmgr/lwlock.c:184
 msgid "No more LWLockIds available"
 msgstr ""
 
-#: ../storage/lmgr/lwlock.c:242
-msgid "LWLockAcquire: can't wait without a PROC structure"
+#: storage/lmgr/lwlock.c:281
+msgid "LWLockAcquire: can't wait without a PGPROC structure"
 msgstr ""
 
-#: ../storage/lmgr/lwlock.c:389
+#: storage/lmgr/lwlock.c:427
 #, c-format
 msgid "LWLockRelease: lock %d is not held"
 msgstr ""
-
-#: ../storage/lmgr/spin.c:165
-msgid "s_init_lock_sema: not enough semaphores"
-msgstr ""
-
-#: ../storage/page/bufpage.c:112
-msgid "PageAddItem: tried overwrite after maxoff"
-msgstr ""
-
-#: ../storage/page/bufpage.c:121
-msgid "PageAddItem: tried overwrite of used ItemId"
-msgstr ""
-
-#: ../storage/page/bufpage.c:296
-#, c-format
-msgid ""
-"PageRepairFragmentation: corrupted page pointers: lower = %u, upper = %u, "
-"special = %u"
-msgstr ""
-
-#: ../storage/page/bufpage.c:338
-#, c-format
-msgid "PageRepairFragmentation: corrupted item pointer %u"
-msgstr ""
-
-#: ../storage/page/bufpage.c:351
-#, c-format
-msgid "PageRepairFragmentation: corrupted item lengths, total %u, avail %u"
-msgstr ""
-
-#: ../storage/smgr/smgr.c:135
-#, c-format
-msgid "initialization failed on %s: %m"
-msgstr ""
-
-#: ../storage/smgr/smgr.c:157
-#, c-format
-msgid "shutdown failed on %s: %m"
-msgstr ""
-
-#: ../storage/smgr/smgr.c:177
-#, c-format
-msgid "cannot create %s: %m"
-msgstr ""
-
-#: ../storage/smgr/smgr.c:247
-#, c-format
-msgid ""
-"cannot extend %s: %m.\n"
-"\tCheck free disk space."
+
+#: storage/lmgr/proc.c:151 storage/lmgr/proc.c:165
+msgid "cannot create new proc: out of memory"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:269 ../utils/init/miscinit.c:897
-#: ../utils/misc/database.c:149
-#, c-format
-msgid "cannot open %s: %m"
+#: storage/lmgr/proc.c:192
+msgid "InitProcess: Proc Header uninitialized"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:283
-#, c-format
-msgid "cannot close %s: %m"
+#: storage/lmgr/proc.c:195
+msgid "InitProcess: you already exist"
+msgstr "InitProcess: Du existierst bereits"
+
+#: storage/lmgr/proc.c:273
+msgid "InitDummyProcess: Proc Header uninitialized"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:306
+#: storage/lmgr/proc.c:276
+msgid "InitDummyProcess: you already exist"
+msgstr "InitDummyProcess: Du existierst bereits"
+
+#: storage/lmgr/proc.c:282
 #, c-format
-msgid "cannot read block %d of %s: %m"
+msgid "InitDummyProcess: DummyProc is in use by PID %d"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:328
-#, c-format
-msgid "cannot write block %d of %s: %m"
+#: storage/lmgr/proc.c:657
+msgid "ProcSleep: Unable to set timer for process wakeup"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:345
-#, c-format
-msgid "cannot flush block %d of %s to stable store: %m"
+#: storage/lmgr/proc.c:679
+msgid "ProcSleep: Unable to disable timer for process wakeup"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:376
-#, c-format
-msgid "cannot write block %d of %u/%u blind: %m"
+#: storage/lmgr/spin.c:84
+msgid "spin.c does not support S_LOCK_FREE()"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:402
+#: storage/page/bufpage.c:92
 #, c-format
-msgid "cannot mark block %d of %s: %m"
+msgid ""
+"PageAddItem: corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:423
-#, c-format
-msgid "cannot mark block %d of %u/%u blind: %m"
+#: storage/page/bufpage.c:112
+msgid "PageAddItem: tried overwrite of used ItemId"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:450
-#, c-format
-msgid "cannot count blocks for %s: %m"
+#: storage/page/bufpage.c:139
+msgid "PageAddItem: specified offset after maxoff"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:482
+#: storage/page/bufpage.c:288
 #, c-format
-msgid "cannot truncate %s to %u blocks: %m"
+msgid ""
+"PageRepairFragmentation: corrupted page pointers: lower = %u, upper = %u, "
+"special = %u"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:524
+#: storage/page/bufpage.c:330
 #, c-format
-msgid "cannot unlink %u/%u: %m"
+msgid "PageRepairFragmentation: corrupted item pointer %u"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:547
+#: storage/page/bufpage.c:343
 #, c-format
-msgid "transaction commit failed on %s: %m"
+msgid "PageRepairFragmentation: corrupted item lengths, total %u, avail %u"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:566
+#: storage/page/bufpage.c:422
 #, c-format
-msgid "transaction abort failed on %s: %m"
+msgid ""
+"PageIndexTupleDelete: corrupted page pointers: lower = %u, upper = %u, "
+"special = %u"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:585
+#: storage/page/bufpage.c:427
 #, c-format
-msgid "storage sync failed on %s: %m"
+msgid "PageIndexTupleDelete: bad offnum %u"
 msgstr ""
 
-#: ../storage/smgr/smgr.c:599
+#: storage/page/bufpage.c:438
 #, c-format
-msgid "illegal storage manager number %d"
+msgid "PageIndexTupleDelete: corrupted item pointer: offset = %u size = %u"
 msgstr ""
 
-#: ../storage/smgr/md.c:252 ../storage/smgr/md.c:442 ../storage/smgr/md.c:485
-#: ../storage/smgr/md.c:519 ../storage/smgr/md.c:564
+#: storage/smgr/md.c:252 storage/smgr/md.c:424 storage/smgr/md.c:467
+#: storage/smgr/md.c:506
 msgid "seekpos too big!"
 msgstr ""
 
-#: ../storage/smgr/md.c:287
+#: storage/smgr/md.c:287
 msgid "segment too big!"
 msgstr ""
 
-#: ../storage/smgr/md.c:341
+#: storage/smgr/md.c:341
 msgid "segment too big on relopen!"
 msgstr ""
 
-#: ../storage/smgr/md.c:574
+#: storage/smgr/md.c:515
 #, c-format
 msgid "mdblindwrt: lseek(%ld) failed: %m"
 msgstr ""
 
-#: ../storage/smgr/md.c:588
+#: storage/smgr/md.c:529
 #, c-format
 msgid "mdblindwrt: write() failed: %m"
 msgstr ""
 
-#: ../storage/smgr/md.c:594
+#: storage/smgr/md.c:535
 #, c-format
 msgid "mdblindwrt: close() failed: %m"
 msgstr ""
 
-#: ../storage/smgr/md.c:679
+#: storage/smgr/md.c:572
 msgid "segment too big in mdnblocks!"
 msgstr ""
 
-#: ../storage/smgr/md.c:699
+#: storage/smgr/md.c:592
 #, c-format
 msgid "cannot count blocks for %s -- open failed: %m"
 msgstr ""
 
-#: ../storage/smgr/md.c:891
+#: storage/smgr/md.c:757
 msgid "_fdvec_alloc error"
 msgstr ""
 
-#: ../storage/smgr/md.c:973
+#: storage/smgr/md.c:839
 msgid "segment too big on openseg!"
 msgstr ""
 
-#: ../storage/smgr/md.c:992
+#: storage/smgr/md.c:858
 #, c-format
 msgid "_mdfd_getrelnfd: cannot open relation %s: %m"
 msgstr ""
 
-#: ../storage/smgr/md.c:1035
+#: storage/smgr/md.c:901
 #, c-format
 msgid "cannot open segment %u of relation %s (target block %u): %m"
 msgstr ""
 
-#: ../storage/smgr/md.c:1088
+#: storage/smgr/md.c:954
 #, c-format
 msgid "_mdfd_blind_getseg: couldn't open %s: %m"
 msgstr ""
 
-#: ../storage/smgr/mm.c:189
+#: storage/smgr/mm.c:189
 msgid "main memory storage mgr hash table out of memory"
 msgstr ""
 
-#: ../storage/smgr/mm.c:232
+#: storage/smgr/mm.c:232
 msgid "mmunlink: cache hash table corrupted"
 msgstr ""
 
-#: ../storage/smgr/mm.c:249
+#: storage/smgr/mm.c:249
 msgid "mmunlink: rel cache hash table corrupted"
 msgstr ""
 
-#: ../storage/smgr/mm.c:312
+#: storage/smgr/mm.c:312
 msgid "mmextend: rel cache hash table corrupt"
 msgstr ""
 
-#: ../storage/smgr/mm.c:323
+#: storage/smgr/mm.c:323
 msgid "mmextend: cache hash table corrupt"
 msgstr ""
 
-#: ../storage/smgr/mm.c:434
+#: storage/smgr/mm.c:434
 msgid "mmwrite: hash table missing requested page"
 msgstr ""
 
-#: ../storage/smgr/smgrtype.c:51
+#: storage/smgr/smgr.c:132
 #, c-format
-msgid "smgrin: unknown storage manager name '%s'"
+msgid "initialization failed on %s: %m"
 msgstr ""
 
-#: ../storage/smgr/smgrtype.c:62
+#: storage/smgr/smgr.c:154
 #, c-format
-msgid "Illegal storage manager id %d"
+msgid "shutdown failed on %s: %m"
 msgstr ""
 
-#: ../storage/freespace/freespace.c:178 ../storage/freespace/freespace.c:193
-#: ../storage/freespace/freespace.c:201
-msgid "Insufficient shared memory for free space map"
+#: storage/smgr/smgr.c:174
+#, c-format
+msgid "cannot create %s: %m"
 msgstr ""
 
-#: ../storage/freespace/freespace.c:530
-msgid "FreeSpaceMap hashtable out of memory"
+#: storage/smgr/smgr.c:246
+#, c-format
+msgid ""
+"cannot extend %s: %m.\n"
+"\tCheck free disk space."
 msgstr ""
 
-#: ../storage/freespace/freespace.c:599
-msgid "FreeSpaceMap hashtable corrupted"
+#: storage/smgr/smgr.c:270 utils/init/miscinit.c:1015
+#: utils/misc/database.c:149
+#, c-format
+msgid "cannot open %s: %m"
 msgstr ""
 
-#: ../storage/freespace/freespace.c:772
-msgid "fsm_record_free_space: unexpected match"
+#: storage/smgr/smgr.c:284
+#, c-format
+msgid "cannot close %s: %m"
 msgstr ""
 
-#: ../storage/freespace/freespace.c:891
-msgid "insert_fsm_page_entry: entry already exists!"
+#: storage/smgr/smgr.c:307
+#, c-format
+msgid "cannot read block %d of %s: %m"
+msgstr ""
+
+#: storage/smgr/smgr.c:331
+#, c-format
+msgid "cannot write block %d of %s: %m"
 msgstr ""
 
-#: ../storage/freespace/freespace.c:900
-msgid "insert_fsm_page_entry: failed to insert entry!"
+#: storage/smgr/smgr.c:360
+#, c-format
+msgid "cannot write block %d of %u/%u blind: %m"
 msgstr ""
 
-#: ../tcop/postgres.c:289
+#: storage/smgr/smgr.c:387
 #, c-format
-msgid "Socket command type %c unknown"
-msgstr "Socketkommandotyp %c unbekannt"
+msgid "cannot count blocks for %s: %m"
+msgstr ""
 
-#: ../tcop/postgres.c:372
+#: storage/smgr/smgr.c:417
 #, c-format
-msgid "query: %s"
-msgstr "Abfrage: %s"
+msgid "cannot truncate %s to %u blocks: %m"
+msgstr ""
+
+#: storage/smgr/smgr.c:459
+#, c-format
+msgid "cannot unlink %u/%u: %m"
+msgstr ""
 
-#: ../tcop/postgres.c:431
-msgid "parse tree:"
-msgstr "Parsebaum:"
+#: storage/smgr/smgr.c:484
+#, c-format
+msgid "transaction commit failed on %s: %m"
+msgstr ""
 
-#: ../tcop/postgres.c:435
+#: storage/smgr/smgr.c:506
 #, c-format
-msgid "parse tree: %s"
-msgstr "Parsebaum: %s"
+msgid "transaction abort failed on %s: %m"
+msgstr ""
 
-#: ../tcop/postgres.c:466
-msgid "pg_analyze_and_rewrite: copyObject failed on parse tree"
+#: storage/smgr/smgr.c:528
+#, c-format
+msgid "storage sync failed on %s: %m"
 msgstr ""
 
-#: ../tcop/postgres.c:475 ../tcop/postgres.c:485
-msgid "rewritten parse tree:"
-msgstr "umgeschriebener Parsebaum:"
+#: storage/smgr/smgr.c:542
+#, c-format
+msgid "illegal storage manager number %d"
+msgstr ""
 
-#: ../tcop/postgres.c:529
-msgid "pg_plan_query: copyObject failed on plan tree"
+#: storage/smgr/smgrtype.c:51
+#, c-format
+msgid "smgrin: unknown storage manager name '%s'"
+msgstr ""
+
+#: storage/smgr/smgrtype.c:62
+#, c-format
+msgid "Illegal storage manager id %d"
 msgstr ""
 
-#: ../tcop/postgres.c:543
-msgid "plan:"
-msgstr "Plan:"
+#: tcop/postgres.c:284
+#, c-format
+msgid "Socket command type %c unknown"
+msgstr "Socketkommandotyp %c unbekannt"
 
-#: ../tcop/postgres.c:547
+#: tcop/postgres.c:372
 #, c-format
-msgid "plan: %s"
-msgstr "Plan: %s"
+msgid "query: %s"
+msgstr "Abfrage: %s"
+
+#: tcop/postgres.c:459
+msgid "pg_analyze_and_rewrite: copyObject failed on parse tree"
+msgstr ""
+
+#: tcop/postgres.c:503
+msgid "pg_plan_query: copyObject failed on plan tree"
+msgstr ""
 
-#: ../tcop/fastpath.c:334 ../tcop/postgres.c:680
+#: tcop/fastpath.c:337 tcop/postgres.c:674
 msgid ""
 "current transaction is aborted, queries ignored until end of transaction "
 "block"
@@ -8609,28 +9881,28 @@ msgstr ""
 "aktuelle Transaktion wurde abgebrochen, Abfragen werden bis zum Ende der "
 "Transaktion ignoriert"
 
-#: ../tcop/postgres.c:746
-#, c-format
-msgid "ProcessUtility: %s"
-msgstr "ProcessUtility: %s"
-
-#: ../tcop/postgres.c:748
+#: tcop/postgres.c:751
 msgid "ProcessUtility"
 msgstr "ProcessUtility"
 
-#: ../tcop/postgres.c:781
+#: tcop/postgres.c:833
 msgid "ProcessQuery"
 msgstr "ProcessQuery"
 
-#: ../tcop/postgres.c:840
+#: tcop/postgres.c:944
+#, c-format
+msgid "duration: %ld.%06ld sec"
+msgstr ""
+
+#: tcop/postgres.c:958
 msgid "StartTransactionCommand"
 msgstr "StartTransactionCommand"
 
-#: ../tcop/postgres.c:852
+#: tcop/postgres.c:976
 msgid "CommitTransactionCommand"
 msgstr "CommitTransactionCommand"
 
-#: ../tcop/postgres.c:879
+#: tcop/postgres.c:1003
 msgid ""
 "Message from PostgreSQL backend:\n"
 "\tThe Postmaster has informed me that some other backend\n"
@@ -8640,39 +9912,39 @@ msgid ""
 "\tPlease reconnect to the database system and repeat your query."
 msgstr ""
 
-#: ../tcop/postgres.c:997
+#: tcop/postgres.c:1121
 msgid ""
 "floating point exception! The last floating point operation either exceeded "
 "legal ranges or was a divide by zero"
 msgstr ""
 
-#: ../tcop/postgres.c:1029
+#: tcop/postgres.c:1154
 msgid "This connection has been terminated by the administrator."
 msgstr "Diese Verbindung wurde vom Administrator abgebrochen."
 
-#: ../tcop/postgres.c:1035
-msgid "Query was canceled."
+#: tcop/postgres.c:1161
+msgid "Query was cancelled."
 msgstr "Abfrage wurde storniert."
 
-#: ../tcop/postgres.c:1176
+#: tcop/postgres.c:1308
 msgid "Assert checking is not compiled in"
 msgstr "Assert-Pr�fungen sind bei der �bersetzung nicht konfiguriert worden."
 
-#: ../tcop/postgres.c:1397
+#: tcop/postgres.c:1540
 msgid "only one -x flag is allowed"
 msgstr "Nur ein �-x�-Option ist erlaubt"
 
-#: ../tcop/postgres.c:1415
+#: tcop/postgres.c:1558
 msgid "use -x {off,nor,nopull,nopm,pullall,wait}"
 msgstr "Benutzen Sie -x {off,nor,nopull,nopm,pullall,wait}"
 
-#: ../tcop/postgres.c:1454
+#: tcop/postgres.c:1613
 msgid ""
 "Query statistics are disabled because parser, planner, or executor "
 "statistics are on."
 msgstr ""
 
-#: ../tcop/postgres.c:1534 ../tcop/postgres.c:1546
+#: tcop/postgres.c:1689 tcop/postgres.c:1701
 #, c-format
 msgid ""
 "%s: invalid command line arguments\n"
@@ -8681,24 +9953,24 @@ msgstr ""
 "%s: ung�ltige Kommandozeilenargumente\n"
 "Versuchen Sie �-?� f�r weitere Informationen."
 
-#: ../tcop/postgres.c:1554
+#: tcop/postgres.c:1709
 #, c-format
-msgid "%s: user name undefined and no database specified\n"
-msgstr "%s: kein Benutzername und kein Datenbankname angegeben\n"
+msgid "%s: user name undefined and no database specified"
+msgstr "%s: Benutzername undefiniert und kein Datenbankname angegeben"
 
-#: ../tcop/postgres.c:1606
+#: tcop/postgres.c:1760
 msgid "InitPostgres"
 msgstr "InitPostgres"
 
-#: ../tcop/postgres.c:1689
+#: tcop/postgres.c:1845
 msgid "AbortCurrentTransaction"
 msgstr "AbortCurrentTransaction"
 
-#: ../tcop/postgres.c:1878
+#: tcop/postgres.c:2050
 msgid "unknown frontend message was received"
 msgstr "unbekannte Nachricht vom Frontend erhalten"
 
-#: ../tcop/postgres.c:2010
+#: tcop/postgres.c:2179
 #, c-format
 msgid ""
 "%s\n"
@@ -8707,643 +9979,599 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: ../tcop/postgres.c:2032
+#: tcop/postgres.c:2541
 #, c-format
-msgid "Assert test successfull (val = %d)"
+msgid "CreateCommandTag: unknown parse node type %d"
 msgstr ""
 
-#: ../tcop/postgres.c:2035
+#: tcop/fastpath.c:172
 #, c-format
-msgid "Assert checking is disabled (val = %d)"
+msgid "fetch_fp_info: cache lookup for function %u failed"
 msgstr ""
 
-#: ../tcop/fastpath.c:172
-#, c-format
-msgid "fetch_fp_info: cache lookup for function %u failed"
+#: tcop/fastpath.c:183 tcop/fastpath.c:188
+msgid "CSTRING not supported in fastpath protocol"
 msgstr ""
 
-#: ../tcop/fastpath.c:272
+#: tcop/fastpath.c:275
 #, c-format
 msgid ""
 "HandleFunctionRequest: actual arguments (%d) != registered arguments (%d)"
 msgstr ""
 
-#: ../tcop/fastpath.c:291 ../tcop/fastpath.c:303
+#: tcop/fastpath.c:294 tcop/fastpath.c:306
 #, c-format
 msgid "HandleFunctionRequest: bogus argsize %d"
 msgstr ""
 
-#: ../tcop/fastpath.c:316
+#: tcop/fastpath.c:319
 #, c-format
 msgid "HandleFunctionRequest: bogus argsize %d, should be %d"
 msgstr ""
 
-#: ../tcop/pquery.c:119
-#, c-format
-msgid "CreateOperationTag: unknown operation type %d"
-msgstr ""
-
-#: ../tcop/pquery.c:147
+#: tcop/pquery.c:112
 #, c-format
 msgid "Closing pre-existing portal \"%s\""
 msgstr ""
 
-#: ../tcop/utility.c:89
+#: tcop/utility.c:95
 #, c-format
 msgid "\"%s\" is not %s %s. Use DROP %s to remove %s %s"
 msgstr ""
 
-#: ../tcop/utility.c:93
+#: tcop/utility.c:99
 #, c-format
 msgid "\"%s\" is not %s %s"
 msgstr ""
 
-#: ../tcop/utility.c:113
+#: tcop/utility.c:118 tcop/utility.c:123
 #, c-format
 msgid "%s \"%s\" does not exist"
 msgstr ""
 
-#: ../tcop/utility.c:121
-#, c-format
-msgid "you do not own %s \"%s\""
-msgstr ""
-
-#: ../tcop/utility.c:126
+#: tcop/utility.c:136
 #, c-format
 msgid "%s \"%s\" is a system %s"
 msgstr ""
 
-#: ../tcop/utility.c:303
+#: tcop/utility.c:162
 #, c-format
-msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
-msgstr ""
+msgid "relation \"%s\" is a system catalog"
+msgstr "Relation �%s� ist ein Systemkatalog"
 
-#: ../tcop/utility.c:309
+#: tcop/utility.c:445 tcop/utility.c:449
 #, c-format
-msgid "TRUNCATE cannot be used on sequences. '%s' is a sequence"
+msgid "ProcessUtility: Invalid target for RENAME: %d"
 msgstr ""
 
-#: ../tcop/utility.c:312
-#, c-format
-msgid "TRUNCATE cannot be used on views. '%s' is a view"
+#: tcop/utility.c:553
+msgid "ALTER TABLE: permission denied"
+msgstr "ALTER TABLE: keine Berechtigung"
+
+#: tcop/utility.c:559
+msgid "T_AlterTableStmt: unknown subtype"
 msgstr ""
 
-#: ../tcop/utility.c:317
+#: tcop/utility.c:876
 #, c-format
-msgid "you do not own class \"%s\""
+msgid "ProcessUtility: command #%d unsupported"
 msgstr ""
 
-#: ../tcop/utility.c:467
-msgid "T_AlterTableStmt: unknown subtype"
+#: utils/adt/pg_locale.c:160
+msgid "Invalid LC_COLLATE setting"
 msgstr ""
 
-#: ../tcop/utility.c:611
-msgid "CREATE VERSION is not currently implemented"
+#: utils/adt/acl.c:92
+#, c-format
+msgid "getid: identifier must be <%d characters"
 msgstr ""
 
-#: ../tcop/utility.c:689
+#: utils/adt/acl.c:130
 #, c-format
-msgid "CLUSTER: relation \"%s\" is a system catalog"
-msgstr ""
+msgid "aclparse: input = '%s'"
+msgstr "aclparse: input = '%s'"
+
+#: utils/adt/acl.c:142
+msgid "aclparse: bad keyword, must be [group|user]"
+msgstr "aclparse: ung�ltiges Schl�sselwort, mu� �group� oder �user� sein"
+
+#: utils/adt/acl.c:145
+msgid "aclparse: a name must follow the [group|user] keyword"
+msgstr "aclparse: auf Schl�sselwort �group� oder �user� mu� ein Name folgen"
 
-#: ../tcop/utility.c:869
+#: utils/adt/acl.c:162
 #, c-format
-msgid ""
-"\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
-"options"
+msgid "aclparse: mode change flag must use \"%c%c%c\""
 msgstr ""
 
-#: ../tcop/utility.c:872
+#: utils/adt/acl.c:208
 #, c-format
-msgid ""
-"\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
-"options"
+msgid "aclparse: mode flags must use \"%s\""
 msgstr ""
 
-#: ../tcop/utility.c:884
+#: utils/adt/acl.c:229
 #, c-format
-msgid ""
-"\"%s\" is a system table. call REINDEX under standalone postgres with -O -P "
-"options"
+msgid "aclparse: correctly read [%x %d %x], modechg=%x"
 msgstr ""
 
-#: ../tcop/utility.c:887
+#: utils/adt/acl.c:249
 #, c-format
-msgid ""
-"\"%s\" is a system table. call REINDEX under standalone postgres with -P -O "
-"options"
-msgstr ""
+msgid "makeacl: invalid size: %d"
+msgstr "makeacl: ung�ltige Gr��e: %d"
 
-#: ../tcop/utility.c:897
-msgid "must be called under standalone postgres with -O -P options"
-msgstr ""
+#: utils/adt/acl.c:280
+msgid "aclitemin: cannot accept anything but = ACLs"
+msgstr "aclitemin: kann nur �=�-ACLs akzeptieren"
 
-#: ../tcop/utility.c:899
-msgid "must be called under standalone postgres with -P -O options"
-msgstr ""
+#: utils/adt/acl.c:284
+msgid "aclitemin: extra garbage at end of specification"
+msgstr "aclitemin: �berfl�ssiger M�ll am Ende der Eingabe"
 
-#: ../tcop/utility.c:912
+#: utils/adt/acl.c:352
 #, c-format
-msgid "ProcessUtility: command #%d unsupported"
+msgid "aclitemout: bad idtype: %d"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:81
+#: utils/adt/acl.c:434
 #, c-format
-msgid ""
-"TextArray2ArrTgString: badly formed string, must have %c as first character\n"
+msgid "acldefault: bogus objtype %d"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:91
-msgid "TextArray2ArrTgString: text string ended prematurely\n"
+#: utils/adt/acl.c:507
+msgid "aclinsert3: insertion before world ACL??"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:97
-msgid "textArray2ArrTgString:  missing a begin quote\n"
+#: utils/adt/acl.c:618
+msgid "aclremove: removal of the world ACL??"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:102
-msgid "textArray2ArrTgString:  missing an end quote\n"
-msgstr ""
+#: utils/adt/acl.c:865
+#, c-format
+msgid "has_table_privilege: invalid privilege type %s"
+msgstr "has_table_privilege: ung�ltiger Privilegtyp %s"
 
-#: ../tioga/tgRecipe.c:138
+#: utils/adt/acl.c:1068
 #, c-format
-msgid "Element named %s not found in recipe named %s"
-msgstr ""
+msgid "has_database_privilege: invalid privilege type %s"
+msgstr "has_database_privilege: ung�ltiger Privilegtyp %s"
 
-#: ../tioga/tgRecipe.c:162
+#: utils/adt/acl.c:1244
 #, c-format
-msgid "Node named %s not found in recipe named %s"
-msgstr ""
+msgid "function \"%s\" does not exist"
+msgstr "Funktion �%s� existiert nicht"
 
-#: ../tioga/tgRecipe.c:248
+#: utils/adt/acl.c:1267
 #, c-format
-msgid "fillTgNode: unknown nodeType field value : %s\n"
-msgstr ""
+msgid "has_function_privilege: invalid privilege type %s"
+msgstr "has_function_privilege: ung�ltiger Privilegtyp %s"
 
-#: ../tioga/tgRecipe.c:326
+#: utils/adt/acl.c:1466
 #, c-format
-msgid "fillTgElement(): unknown srcLang field value : %s\n"
-msgstr ""
+msgid "has_language_privilege: invalid privilege type %s"
+msgstr "has_language_privilege: ung�ltiger Privilegtyp %s"
 
-#: ../tioga/tgRecipe.c:336
+#: utils/adt/acl.c:1642
 #, c-format
-msgid "fillTgElement(): unknown elemType field value : %s\n"
-msgstr ""
+msgid "schema \"%s\" does not exist"
+msgstr "Schema �%s� existiert nicht"
 
-#: ../tioga/tgRecipe.c:376
+#: utils/adt/acl.c:1668
 #, c-format
-msgid "lookupEdges(): Error while executing query : %s\n"
-msgstr ""
+msgid "has_schema_privilege: invalid privilege type %s"
+msgstr "has_schema_privilege: ung�ltiger Privilegtyp %s"
 
-#: ../tioga/tgRecipe.c:377 ../tioga/tgRecipe.c:540 ../tioga/tgRecipe.c:559
-#: ../tioga/tgRecipe.c:596 ../tioga/tgRecipe.c:707
+#: utils/adt/arrayfuncs.c:176
 #, c-format
-msgid "result = %s, error is %s\n"
-msgstr ""
+msgid "array_in: more than %d dimensions"
+msgstr "array_in: mehr als %d Dimensionen"
 
-#: ../tioga/tgRecipe.c:402
-msgid "lookupEdges():  SANITY CHECK failed.  Edge with invalid fromPort value!"
-msgstr ""
+#: utils/adt/arrayfuncs.c:179 utils/adt/arrayfuncs.c:188
+msgid "array_in: missing dimension value"
+msgstr "array_in: Dimensionswert fehlt"
+
+#: utils/adt/arrayfuncs.c:196
+msgid "array_in: missing ']' in array declaration"
+msgstr "array_in: �]� in Arraydeklaration fehlt"
 
-#: ../tioga/tgRecipe.c:407
-msgid "lookupEdges():  SANITY CHECK failed.  Edge with invalid toPort value!!"
+#: utils/adt/arrayfuncs.c:201
+msgid "array_in: upper_bound cannot be < lower_bound"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:416
-msgid "lookupEdges():  SANITY CHECK failed.  Edge with bad fromNode value!"
+#: utils/adt/arrayfuncs.c:210
+msgid "array_in: Need to specify dimension"
+msgstr "array_in: Dimension mu� angegeben werden"
+
+#: utils/adt/arrayfuncs.c:219
+msgid "array_in: missing assignment operator"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:422
-msgid "lookupEdges():  SANITY CHECK failed.  Edge with bad toNode value!"
+#: utils/adt/arrayfuncs.c:246
+msgid "array_in: missing left brace"
+msgstr "array_in: linke geschweifte Klammer fehlt"
+
+#: utils/adt/arrayfuncs.c:303 utils/adt/arrayfuncs.c:310
+#: utils/adt/arrayfuncs.c:423 utils/adt/arrayfuncs.c:433
+#, c-format
+msgid "malformed array constant: %s"
+msgstr "fehlerhafte Arraykonstante: %s"
+
+#: utils/adt/arrayfuncs.c:319 utils/adt/arrayfuncs.c:330
+#: utils/adt/arrayfuncs.c:452 utils/adt/arrayfuncs.c:465
+#: utils/adt/arrayfuncs.c:501
+msgid "array_in: illformed array constant"
+msgstr "array_in: fehlerhafte Arraykonstante"
+
+#: utils/adt/arrayfuncs.c:986
+msgid "Slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:469
-msgid "Internal Error: connectTee() called with a null origToNode"
+#: utils/adt/arrayfuncs.c:1122 utils/adt/arrayfuncs.c:1124
+#: utils/adt/arrayfuncs.c:1141 utils/adt/arrayfuncs.c:1161
+#: utils/adt/arrayfuncs.c:1171 utils/adt/arrayfuncs.c:1297
+#: utils/adt/arrayfuncs.c:1312 utils/adt/arrayfuncs.c:1321
+#: utils/adt/arrayfuncs.c:1328 utils/adt/arrayfuncs.c:1337
+msgid "Invalid array subscripts"
+msgstr "ung�ltige Arrayindizes"
+
+#: utils/adt/arrayfuncs.c:1286
+msgid "Updates on slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:539 ../tioga/tgRecipe.c:558
-#, c-format
-msgid "fillAllNodes(): Error while executing query : %s\n"
+#: utils/adt/arrayfuncs.c:1347
+msgid "Source array too small"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:595
+#: utils/adt/arrayfuncs.c:1478
 #, c-format
-msgid "fillAllElements(): Error while executing query : %s\n"
+msgid "array_map: invalid nargs: %d"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:706
-#, c-format
-msgid "retrieveRecipe: Error while executing query : %s\n"
+#: utils/adt/arrayfuncs.c:1480
+msgid "array_map: null input array"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:715
-#, c-format
-msgid "retrieveRecipe():  No recipe named %s exists\n"
+#: utils/adt/arrayfuncs.c:1524
+msgid "array_map: cannot handle NULL in array"
 msgstr ""
 
-#: ../tioga/tgRecipe.c:720
+#: utils/adt/arrayfuncs.c:1716 utils/cache/lsyscache.c:908
+#: utils/cache/lsyscache.c:931
 #, c-format
-msgid "retrieveRecipe():  Multiple (%d) recipes named %s exists\n"
+msgid "cache lookup failed for type %u"
 msgstr ""
 
-#: ../utils/adt/acl.c:89
+#: utils/adt/ascii.c:67
 #, c-format
-msgid "getid: identifier must be <%d characters"
+msgid "pg_to_ascii(): unsupported encoding from %s"
 msgstr ""
 
-#: ../utils/adt/acl.c:125
+#: utils/adt/bool.c:77
 #, c-format
-msgid "aclparse: input = '%s'"
-msgstr "aclparse: input = '%s'"
+msgid "Bad boolean external representation '%s'"
+msgstr "fehlerhafter �boolean�-Wert: %s"
 
-#: ../utils/adt/acl.c:137
-msgid "aclparse: bad keyword, must be [group|user]"
-msgstr "aclparse: ung�ltiges Schl�sselwort, mu� �group� oder �user� sein"
+#: utils/adt/cash.c:195
+#, c-format
+msgid "Bad money external representation %s"
+msgstr ""
 
-#: ../utils/adt/acl.c:140
-msgid "aclparse: a name must follow the [group|user] keyword"
-msgstr "aclparse: auf Schl�sselwort �group� oder �user� mu� ein Name folgen"
+#: utils/adt/cash.c:292 utils/adt/cash.c:305
+msgid "Memory allocation failed, can't output cash"
+msgstr ""
 
-#: ../utils/adt/acl.c:157
-#, c-format
-msgid "aclparse: mode change flag must use \"%s\""
+#: utils/adt/cash.c:445 utils/adt/cash.c:495
+msgid "cash_div:  divide by 0.0 error"
 msgstr ""
 
-#: ../utils/adt/acl.c:188
-#, c-format
-msgid "aclparse: mode flags must use \"%s\""
+#: utils/adt/cash.c:546
+msgid "cash_div_int4: divide by 0 error"
 msgstr ""
 
-#: ../utils/adt/acl.c:207
-#, c-format
-msgid "aclparse: correctly read [%x %d %x], modechg=%x"
+#: utils/adt/cash.c:596
+msgid "cash_div:  divide by 0 error"
 msgstr ""
 
-#: ../utils/adt/acl.c:227
+#: utils/adt/date.c:69
 #, c-format
-msgid "makeacl: invalid size: %d"
-msgstr "makeacl: ung�ltige Gr��e: %d"
+msgid "Bad date external representation (too long) '%s'"
+msgstr "fehlerhaftes Format f�r �date� (zu lang): %s"
 
-#: ../utils/adt/acl.c:257
-msgid "aclitemin: cannot accept anything but = ACLs"
-msgstr "aclitemin: kann nur �=�-ACLs akzeptieren"
+#: utils/adt/date.c:73
+#, c-format
+msgid "Bad date external representation '%s'"
+msgstr "fehlerhaftes Format f�r �date�: %s"
 
-#: ../utils/adt/acl.c:261
-msgid "aclitemin: extra garbage at end of specification"
-msgstr "aclitemin: �berfl�ssiger M�ll am Ende der Eingabe"
+#: utils/adt/date.c:81
+msgid ""
+"Date CURRENT no longer supported\n"
+"\tdate_in() internal coding error"
+msgstr ""
 
-#: ../utils/adt/acl.c:329
+#: utils/adt/date.c:91
 #, c-format
-msgid "aclitemout: bad ai_idtype: %d"
-msgstr ""
+msgid "Unrecognized date external representation '%s'"
+msgstr "fehlerhaftes Format f�r �date�: %s"
 
-#: ../utils/adt/acl.c:450
-msgid "aclinsert3: insertion before world ACL??"
-msgstr ""
+#: utils/adt/date.c:400
+msgid "Unable to convert timestamp to date"
+msgstr "kann �timestamp� nicht in �date� umwandeln"
 
-#: ../utils/adt/acl.c:559
-msgid "aclremove: removal of the world ACL??"
-msgstr ""
+#: utils/adt/date.c:425
+msgid "Unable to convert reserved abstime value to date"
+msgstr "kann reservierten �abstime�-Wert nicht in �date� umwandeln"
 
-#: ../utils/adt/acl.c:830 ../utils/adt/acl.c:901 ../utils/adt/acl.c:1026
-#, c-format
-msgid "has_table_privilege: invalid relation oid %u"
-msgstr "has_table_privilege: ung�ltige Relations-OID %u"
+#: utils/adt/date.c:484
+msgid "Bad date external representation (too long)"
+msgstr "fehlerhaftes Format f�r �date� (zu lang)"
 
-#: ../utils/adt/acl.c:962
+#: utils/adt/date.c:521
 #, c-format
-msgid "has_table_privilege: invalid privilege type %s"
-msgstr "has_table_privilege: ung�ltiger Privilegtyp %s"
+msgid "Bad time external representation (too long) '%s'"
+msgstr "fehlerhaftes Format f�r �time� (zu lang): %s"
 
-#: ../utils/adt/acl.c:1064
+#: utils/adt/date.c:525 utils/adt/date.c:1336
 #, c-format
-msgid "has_table_privilege: relation \"%s\" does not exist"
-msgstr "has_table_privilege: Relation �%s� existiert nicht"
+msgid "Bad time external representation '%s'"
+msgstr "fehlerhaftes Format f�r �time�: %s"
 
-#: ../utils/adt/arrayfuncs.c:157
-#, c-format
-msgid "array_in: more than %d dimensions"
-msgstr "array_in: mehr als %d Dimensionen"
+#: utils/adt/date.c:928
+msgid "Unable to convert timestamp to time"
+msgstr "kann �timestamp� nicht in �time� umwandeln"
 
-#: ../utils/adt/arrayfuncs.c:160 ../utils/adt/arrayfuncs.c:169
-msgid "array_in: missing dimension value"
-msgstr "array_in: Dimensionswert fehlt"
+#: utils/adt/date.c:963
+msgid "Unable to convert timestamptz to time"
+msgstr "kann �timestamptz� nicht in �time� umwandeln"
 
-#: ../utils/adt/arrayfuncs.c:177
-msgid "array_in: missing ']' in array declaration"
-msgstr "array_in: �]� in Arraydeklaration fehlt"
+#: utils/adt/date.c:1165
+msgid "Bad time external representation (too long)"
+msgstr "fehlerhaftes Format f�r �time� (zu lang)"
 
-#: ../utils/adt/arrayfuncs.c:182
-msgid "array_in: upper_bound cannot be < lower_bound"
-msgstr ""
+#: utils/adt/date.c:1196 utils/adt/date.c:1279
+#, c-format
+msgid "TIME units '%s' not recognized"
+msgstr "�time�-Einheiten �%s� nicht erkannt"
 
-#: ../utils/adt/arrayfuncs.c:191
-msgid "array_in: Need to specify dimension"
-msgstr "array_in: Dimension mu� angegeben werden"
+#: utils/adt/date.c:1263
+#, c-format
+msgid "TIME units '%s' not supported"
+msgstr "�time�-Einheiten �%s� nicht unterst�tzt"
 
-#: ../utils/adt/arrayfuncs.c:200
-msgid "array_in: missing assignment operator"
+#: utils/adt/date.c:1331
+#, c-format
+msgid "Bad time with time zone external representation (too long) '%s'"
 msgstr ""
 
-#: ../utils/adt/arrayfuncs.c:226
-msgid "array_in: missing left brace"
-msgstr "array_in: linke geschweifte Klammer fehlt"
+#: utils/adt/date.c:1795
+msgid "Unable to convert timestamptz to timetz"
+msgstr "kann �timestamp� nicht in �timetz� umwandeln"
+
+#: utils/adt/date.c:1871
+msgid "Bad timetz external representation (too long)"
+msgstr "fehlerhaftes Format f�r �timetz� (zu lang)"
 
-#: ../utils/adt/arrayfuncs.c:291
+#: utils/adt/date.c:1902 utils/adt/date.c:1998
 #, c-format
-msgid "malformed array constant: %s"
-msgstr "fehlerhafte Arraykonstante: %s"
+msgid "TIMETZ units '%s' not recognized"
+msgstr "�timetz�-Einheiten �%s� nicht erkannt"
 
-#: ../utils/adt/arrayfuncs.c:414 ../utils/adt/arrayfuncs.c:449
-msgid "array_in: illformed array constant"
-msgstr "array_in: fehlerhafte Arraykonstante"
+#: utils/adt/date.c:1982
+#, c-format
+msgid "TIMETZ units '%s' not supported"
+msgstr "�timetz�-Einheiten �%s� nicht unterst�tzt"
 
-#: ../utils/adt/arrayfuncs.c:849
-msgid "Slices of fixed-length arrays not implemented"
+#: utils/adt/date.c:2026 utils/adt/date.c:2058 utils/adt/timestamp.c:3282
+#: utils/adt/timestamp.c:3305 utils/adt/timestamp.c:3419
+#: utils/adt/timestamp.c:3441
+#, c-format
+msgid "Time zone '%s' not recognized"
+msgstr "Zeitzone %s nicht erkannt"
+
+#: utils/adt/date.c:2077 utils/adt/timestamp.c:3327 utils/adt/timestamp.c:3464
+#, c-format
+msgid "INTERVAL time zone '%s' not legal (month specified)"
 msgstr ""
 
-#: ../utils/adt/arrayfuncs.c:964 ../utils/adt/arrayfuncs.c:966
-#: ../utils/adt/arrayfuncs.c:983 ../utils/adt/arrayfuncs.c:1003
-#: ../utils/adt/arrayfuncs.c:1013 ../utils/adt/arrayfuncs.c:1137
-#: ../utils/adt/arrayfuncs.c:1152 ../utils/adt/arrayfuncs.c:1161
-#: ../utils/adt/arrayfuncs.c:1168
-msgid "Invalid array subscripts"
-msgstr "ung�ltige Arrayindizes"
+#: utils/adt/datetime.c:1239 utils/adt/datetime.c:1955
+msgid "'CURRENT' is no longer supported"
+msgstr "'CURRENT' wird nicht mehr unterst�tzt"
 
-#: ../utils/adt/arrayfuncs.c:1126
-msgid "Updates on slices of fixed-length arrays not implemented"
-msgstr ""
+#: utils/adt/datetime.c:1418 utils/adt/datetime.c:2227
+#: utils/adt/formatting.c:3036
+#, c-format
+msgid "Inconsistent use of year %04d and 'BC'"
+msgstr "Inkonsistente Verwendung von Jahr %04d und �BC�"
 
-#: ../utils/adt/arrayfuncs.c:1179
-msgid "Source array too small"
-msgstr ""
+#: utils/adt/datum.c:78 utils/adt/datum.c:87
+msgid "datumGetSize: Invalid Datum Pointer"
+msgstr "datumGetSize: ung�ltiger �Datum�-Zeiger"
 
-#: ../utils/adt/arrayfuncs.c:1307
+#: utils/adt/datum.c:92
 #, c-format
-msgid "array_map: invalid nargs: %d"
+msgid "datumGetSize: Invalid typLen %d"
 msgstr ""
 
-#: ../utils/adt/arrayfuncs.c:1309
-msgid "array_map: null input array"
+#: utils/adt/encode.c:53 utils/adt/encode.c:87
+#, c-format
+msgid "No such encoding as '%s'"
 msgstr ""
 
-#: ../utils/adt/arrayfuncs.c:1353
-msgid "array_map: cannot handle NULL in array"
+#: utils/adt/encode.c:62
+msgid "Overflow - encode estimate too small"
 msgstr ""
 
-#: ../utils/adt/arrayfuncs.c:1531
-#, c-format
-msgid "array_out: Cache lookup failed for type %u"
+#: utils/adt/encode.c:96
+msgid "Overflow - decode estimate too small"
 msgstr ""
 
-#: ../utils/adt/cash.c:209
+#: utils/adt/encode.c:144
 #, c-format
-msgid "Bad money external representation %s"
+msgid "Bad hex code: '%c'"
 msgstr ""
 
-#: ../utils/adt/cash.c:318 ../utils/adt/cash.c:331
-msgid "Memory allocation failed, can't output cash"
+#: utils/adt/encode.c:170
+msgid "hex_decode: invalid data"
 msgstr ""
 
-#: ../utils/adt/cash.c:471 ../utils/adt/cash.c:521
-msgid "cash_div:  divide by 0.0 error"
+#: utils/adt/encode.c:284
+msgid "base64: unexpected '='"
 msgstr ""
 
-#: ../utils/adt/cash.c:572
-msgid "cash_div_int4: divide by 0 error"
+#: utils/adt/encode.c:294
+msgid "base64: Invalid symbol"
 msgstr ""
 
-#: ../utils/adt/cash.c:622
-msgid "cash_div:  divide by 0 error"
+#: utils/adt/encode.c:312
+msgid "base64: invalid end sequence"
 msgstr ""
 
-#: ../utils/adt/bool.c:77
-#, c-format
-msgid "Bad boolean external representation '%s'"
-msgstr "fehlerhafter �boolean�-Wert: %s"
+#: utils/adt/encode.c:419 utils/adt/encode.c:482
+msgid "decode: Bad input string for type bytea"
+msgstr ""
 
-#: ../utils/adt/float.c:147
+#: utils/adt/float.c:148
 msgid "Bad float4 input format -- overflow"
 msgstr "fehlerhafter float4-Wert: �berlauf"
 
-#: ../utils/adt/float.c:149
+#: utils/adt/float.c:150
 msgid "Bad float4 input format -- underflow"
 msgstr "fehlerhafter float4-Wert: Unterlauf"
 
-#: ../utils/adt/float.c:171
+#: utils/adt/float.c:172
 msgid "Bad float8 input format -- overflow"
 msgstr "fehlerhafter float8-Wert: �berlauf"
 
-#: ../utils/adt/float.c:173
+#: utils/adt/float.c:174
 msgid "Bad float8 input format -- underflow"
 msgstr "fehlerhafter float8-Wert: Unterlauf"
 
-#: ../utils/adt/float.c:204
+#: utils/adt/float.c:204
 #, c-format
 msgid "Bad float4 input format '%s'"
 msgstr "fehlerhaftes float4-Eingabeformat: %s"
 
-#: ../utils/adt/float.c:209
+#: utils/adt/float.c:209
 #, c-format
 msgid "Input '%s' is out of range for float4"
 msgstr "Eingabe %s ist au�erhalb des g�ltigen Bereichs f�r float4"
 
-#: ../utils/adt/float.c:269 ../utils/adt/numeric.c:1685
+#: utils/adt/float.c:269 utils/adt/numeric.c:2836 utils/adt/numeric.c:2859
 #, c-format
 msgid "Bad float8 input format '%s'"
 msgstr "fehlerhaftes float8-Eingabeformat: %s"
 
-#: ../utils/adt/float.c:274
+#: utils/adt/float.c:274
 #, c-format
 msgid "Input '%s' is out of range for float8"
 msgstr "Eingabe %s ist au�erhalb des g�ltigen Bereichs f�r float8"
 
-#: ../utils/adt/float.c:493
+#: utils/adt/float.c:493
 msgid "float4div: divide by zero error"
 msgstr "float4div: Division durch Null"
 
-#: ../utils/adt/float.c:555
+#: utils/adt/float.c:555
 msgid "float8div: divide by zero error"
 msgstr "float8div: Division durch Null"
 
-#: ../utils/adt/float.c:805
+#: utils/adt/float.c:805
 msgid "dtoi4: integer out of range"
 msgstr ""
 
-#: ../utils/adt/float.c:822
+#: utils/adt/float.c:822
 msgid "dtoi2: integer out of range"
 msgstr ""
 
-#: ../utils/adt/float.c:867
+#: utils/adt/float.c:867
 msgid "ftoi4: integer out of range"
 msgstr ""
 
-#: ../utils/adt/float.c:884
+#: utils/adt/float.c:884
 msgid "ftoi2: integer out of range"
 msgstr ""
 
-#: ../utils/adt/float.c:1074
+#: utils/adt/float.c:1118
 msgid "can't take sqrt of a negative number"
 msgstr "Quadratwurzel von negativer Zahl kann nicht ermittelt werden"
 
-#: ../utils/adt/float.c:1118
+#: utils/adt/float.c:1162
 msgid "pow() result is out of range"
 msgstr "Ergebnis von pow() ist au�erhalb des g�ltigen Bereiches"
 
-#: ../utils/adt/float.c:1146
+#: utils/adt/float.c:1190
 msgid "exp() result is out of range"
 msgstr "Ergebnis von exp() ist au�erhalb des g�ltigen Bereiches"
 
-#: ../utils/adt/float.c:1164 ../utils/adt/float.c:1185
+#: utils/adt/float.c:1208 utils/adt/float.c:1229
 msgid "can't take log of zero"
 msgstr "Logarithmus von Null kann nicht ermittelt werden"
 
-#: ../utils/adt/float.c:1166 ../utils/adt/float.c:1187
+#: utils/adt/float.c:1210 utils/adt/float.c:1231
 msgid "can't take log of a negative number"
 msgstr "Logarithmus negativer Zahlen kann nicht ermittelt werden"
 
-#: ../utils/adt/float.c:1212
+#: utils/adt/float.c:1256
 #, c-format
 msgid "acos(%f) input is out of range"
 msgstr "%f ist au�erhalb des g�ltigen Bereiches f�r acos()"
 
-#: ../utils/adt/float.c:1235
+#: utils/adt/float.c:1279
 #, c-format
 msgid "asin(%f) input is out of range"
 msgstr "%f ist au�erhalb des g�ltigen Bereiches f�r asin()"
 
-#: ../utils/adt/float.c:1258
+#: utils/adt/float.c:1302
 #, c-format
 msgid "atan(%f) input is out of range"
 msgstr "%f ist au�erhalb des g�ltigen Bereiches f�r atan()"
 
-#: ../utils/adt/float.c:1282
+#: utils/adt/float.c:1326
 #, c-format
 msgid "atan2(%f,%f) input is out of range"
 msgstr "(%f,%f) ist au�erhalb des g�ltigen Bereiches f�r atan2()"
 
-#: ../utils/adt/float.c:1305
+#: utils/adt/float.c:1349
 #, c-format
 msgid "cos(%f) input is out of range"
 msgstr "%f ist au�erhalb des g�ltigen Bereiches f�r cos()"
 
-#: ../utils/adt/float.c:1328
+#: utils/adt/float.c:1372
 #, c-format
 msgid "cot(%f) input is out of range"
 msgstr "%f ist au�erhalb des g�ltigen Bereiches f�r sin()"
 
-#: ../utils/adt/float.c:1352
+#: utils/adt/float.c:1396
 #, c-format
 msgid "sin(%f) input is out of range"
 msgstr "%f ist au�erhalb des g�ltigen Bereiches f�r sin()"
 
-#: ../utils/adt/float.c:1375
+#: utils/adt/float.c:1419
 #, c-format
 msgid "tan(%f) input is out of range"
 msgstr "%f ist au�erhalb des g�ltigen Bereiches f�r tan()"
 
-#: ../utils/adt/float.c:1486
+#: utils/adt/float.c:1530
 #, c-format
 msgid "%s: expected 3-element float8 array"
 msgstr "%s: erwartete float8-Array mit 3 Elementen"
 
-#: ../utils/adt/float.c:1681
+#: utils/adt/float.c:1741
 msgid "float48div: divide by zero"
 msgstr "float48div: Division durch Null"
 
-#: ../utils/adt/float.c:1741
+#: utils/adt/float.c:1801
 msgid "float84div: divide by zero"
 msgstr "float48div: Division durch Null"
 
-#: ../utils/adt/ascii.c:107
-#, c-format
-msgid "pg_to_ascii(): unsupported encoding from %s"
-msgstr ""
-
-#: ../utils/adt/date.c:58
+#: utils/adt/format_type.c:136 utils/adt/format_type.c:162
 #, c-format
-msgid "Bad date external representation '%s'"
-msgstr "fehlerhaftes Format f�r �date�: %s"
-
-#: ../utils/adt/date.c:66
-msgid ""
-"Date CURRENT no longer supported\n"
-"\tdate_in() internal coding error"
+msgid "could not locate data type with oid %u in catalog"
 msgstr ""
 
-#: ../utils/adt/date.c:76
-#, c-format
-msgid "Unrecognized date external representation '%s'"
-msgstr "fehlerhaftes Format f�r �date�: %s"
-
-#: ../utils/adt/date.c:256 ../utils/adt/date.c:325 ../utils/adt/date.c:747
-#: ../utils/adt/date.c:1371
-msgid "Unable to convert timestamp to date"
-msgstr "kann �timestamp� nicht in �date� umwandeln"
-
-#: ../utils/adt/date.c:290
-msgid "Unable to convert date to tm"
-msgstr "kann �date� nicht in �tm� umwandeln"
-
-#: ../utils/adt/date.c:350
-msgid "Unable to convert reserved abstime value to date"
-msgstr "kann reservierten �abstime�-Wert nicht in �date� umwandeln"
-
-#: ../utils/adt/date.c:409
-msgid "Bad date external representation (too long)"
-msgstr "fehlerhaftes Format f�r �date� (zu lang)"
-
-#: ../utils/adt/date.c:447 ../utils/adt/date.c:956
-#, c-format
-msgid "Bad time external representation '%s'"
-msgstr "fehlerhaftes Format f�r �time�: %s"
-
-#: ../utils/adt/date.c:915
-msgid "Bad time external representation (too long)"
-msgstr "fehlerhaftes Format f�r �time� (zu lang)"
-
-#: ../utils/adt/date.c:1443
-msgid "Bad timetz external representation (too long)"
-msgstr "fehlerhaftes Format f�r �timetz� (zu lang)"
-
-#: ../utils/adt/date.c:1474 ../utils/adt/date.c:1557
-#, c-format
-msgid "TIMETZ units '%s' not recognized"
-msgstr "�timetz�-Einheiten �%s� nicht erkannt"
-
-#: ../utils/adt/date.c:1547
-#, c-format
-msgid "TIMETZ units '%s' not supported"
-msgstr "�timetz�-Einheiten �%s� nicht unterst�tzt"
-
-#: ../utils/adt/date.c:1585 ../utils/adt/date.c:1609
-#: ../utils/adt/timestamp.c:2807 ../utils/adt/timestamp.c:2829
-#: ../utils/adt/timestamp.c:2945 ../utils/adt/timestamp.c:2988
-#, c-format
-msgid "Time zone '%s' not recognized"
-msgstr "Zeitzone %s nicht erkannt"
-
-#: ../utils/adt/date.c:1629 ../utils/adt/timestamp.c:2852
-#: ../utils/adt/timestamp.c:3018
+#: utils/adt/format_type.c:315
 #, c-format
-msgid "INTERVAL time zone '%s' not legal (month specified)"
+msgid "Invalid INTERVAL typmod 0x%x"
 msgstr ""
 
-#: ../utils/adt/datetime.c:1069 ../utils/adt/datetime.c:1450
-msgid "'CURRENT' is no longer supported"
-msgstr "'CURRENT' wird nicht mehr unterst�tzt"
-
-#: ../utils/adt/datetime.c:1228 ../utils/adt/datetime.c:1685
-#: ../utils/adt/formatting.c:3053
-#, c-format
-msgid "Inconsistent use of year %04d and 'BC'"
-msgstr "Inkonsistente Verwendung von Jahr %04d und �BC�"
-
-#: ../utils/adt/datum.c:71
-msgid "datumGetSize: Invalid Datum Pointer"
-msgstr "datumGetSize: ung�ltiger �Datum�-Zeiger"
-
-#: ../utils/adt/formatting.c:396
+#: utils/adt/formatting.c:391
 #, c-format
 msgid ""
 "TMFC:\n"
@@ -9358,7 +10586,7 @@ msgid ""
 "ddd %d\n"
 "mm %d\n"
 "ms: %d\n"
-"yyyy %d\n"
+"year %d\n"
 "bc %d\n"
 "iw %d\n"
 "ww %d\n"
@@ -9369,7 +10597,7 @@ msgid ""
 "us: %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:402
+#: utils/adt/formatting.c:397
 #, c-format
 msgid ""
 "TM:\n"
@@ -9384,98 +10612,98 @@ msgid ""
 "mon %d\n"
 msgstr ""
 
-#: ../utils/adt/formatting.c:981
+#: utils/adt/formatting.c:964
 msgid "to_char/to_number(): '9' must be ahead of 'PR'."
 msgstr ""
 
-#: ../utils/adt/formatting.c:998
+#: utils/adt/formatting.c:981
 msgid "to_char/to_number(): '0' must be ahead of 'PR'."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1025
+#: utils/adt/formatting.c:1008
 msgid "to_char/to_number(): not unique decimal point."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1030 ../utils/adt/formatting.c:1117
+#: utils/adt/formatting.c:1013 utils/adt/formatting.c:1100
 msgid "to_char/to_number(): can't use 'V' and decimal poin together."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1043
+#: utils/adt/formatting.c:1026
 msgid "to_char/to_number(): not unique 'S'."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1048
+#: utils/adt/formatting.c:1031
 msgid "to_char/to_number(): can't use 'S' and 'PL'/'MI'/'SG'/'PR' together."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1070
+#: utils/adt/formatting.c:1053
 msgid "to_char/to_number(): can't use 'S' and 'MI' together."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1079
+#: utils/adt/formatting.c:1062
 msgid "to_char/to_number(): can't use 'S' and 'PL' together."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1088
+#: utils/adt/formatting.c:1071
 msgid "to_char/to_number(): can't use 'S' and 'SG' together."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1098
+#: utils/adt/formatting.c:1081
 msgid "to_char/to_number(): can't use 'PR' and 'S'/'PL'/'MI'/'SG' together."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1124
+#: utils/adt/formatting.c:1107
 msgid "to_char/to_number(): 'E' is not supported."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1148
+#: utils/adt/formatting.c:1131
 msgid "to_char/number(): run parser."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1344
+#: utils/adt/formatting.c:1327
 msgid "to_from-char(): DUMP FORMAT"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1349
+#: utils/adt/formatting.c:1332
 #, c-format
 msgid "%d:\t NODE_TYPE_ACTION '%s'\t(%s,%s)"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1352
+#: utils/adt/formatting.c:1335
 #, c-format
 msgid "%d:\t NODE_TYPE_CHAR '%c'"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1355
+#: utils/adt/formatting.c:1338
 #, c-format
 msgid "%d:\t NODE_TYPE_END"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1359
+#: utils/adt/formatting.c:1342
 #, c-format
 msgid "%d:\t UnKnown NODE !!!"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1383
+#: utils/adt/formatting.c:1366
 #, c-format
 msgid "get_th: '%s' is not number."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1551
+#: utils/adt/formatting.c:1540
 msgid "TO-FROM_CHAR: Dump KeyWord Index:"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1557
+#: utils/adt/formatting.c:1546
 #, c-format
 msgid "\t%c: %s, "
 msgstr ""
 
-#: ../utils/adt/formatting.c:1563
+#: utils/adt/formatting.c:1552
 #, c-format
 msgid "\t(%d) %c %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1566
+#: utils/adt/formatting.c:1555
 #, c-format
 msgid ""
 "\n"
@@ -9483,133 +10711,133 @@ msgid ""
 "\t\tFree positions: %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:1638
+#: utils/adt/formatting.c:1627
 msgid "to_timestamp(): bad AM/PM string"
 msgstr "to_timestamp(): fehlerhafter Wert f�r AM/PM"
 
-#: ../utils/adt/formatting.c:1974
+#: utils/adt/formatting.c:1971
 msgid "to_timestamp(): TZ/tz not supported."
 msgstr ""
 
-#: ../utils/adt/formatting.c:1982
+#: utils/adt/formatting.c:1979
 #, c-format
 msgid "to_timestamp(): bad value for %s"
 msgstr "to_timestamp(): fehlerhafter Wert f�r %s"
 
-#: ../utils/adt/formatting.c:2590 ../utils/adt/formatting.c:3182
+#: utils/adt/formatting.c:2613 utils/adt/formatting.c:3172
 #, c-format
 msgid "Cache is full (%d)"
 msgstr ""
 
-#: ../utils/adt/formatting.c:2598 ../utils/adt/formatting.c:3199
+#: utils/adt/formatting.c:2621 utils/adt/formatting.c:3189
 #, c-format
 msgid "OLD: '%s' AGE: %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:2609 ../utils/adt/formatting.c:3211
+#: utils/adt/formatting.c:2632 utils/adt/formatting.c:3201
 #, c-format
 msgid "NEW (%d)"
 msgstr ""
 
-#: ../utils/adt/formatting.c:2774 ../utils/adt/formatting.c:2800
+#: utils/adt/formatting.c:2797 utils/adt/formatting.c:2823
 msgid "to_char(): Unable to convert timestamp to tm"
 msgstr ""
 
-#: ../utils/adt/formatting.c:2976
+#: utils/adt/formatting.c:2999
 msgid "to_timestamp(): AM/PM hour must be between 1 and 12"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3085
+#: utils/adt/formatting.c:3068
 msgid "to_timestamp() cat't convert yday without year information"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3113
+#: utils/adt/formatting.c:3103
 msgid "to_timestamp(): can't convert 'tm' to timestamp."
 msgstr ""
 
-#: ../utils/adt/formatting.c:3261
+#: utils/adt/formatting.c:3251
 #, c-format
 msgid "REMOVING ENTRY (%s)"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3493
+#: utils/adt/formatting.c:3476
 msgid "CALL: get_last_relevant_decnum()"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3518
+#: utils/adt/formatting.c:3501
 msgid " --- scan start --- "
 msgstr ""
 
-#: ../utils/adt/formatting.c:3539
+#: utils/adt/formatting.c:3522
 #, c-format
 msgid "Try read sign (%c)."
 msgstr ""
 
-#: ../utils/adt/formatting.c:3551
+#: utils/adt/formatting.c:3534
 #, c-format
 msgid "Try read locale sign (%c)."
 msgstr ""
 
-#: ../utils/adt/formatting.c:3570
+#: utils/adt/formatting.c:3553
 #, c-format
 msgid "Try read sipmle sign (%c)."
 msgstr ""
 
-#: ../utils/adt/formatting.c:3611
+#: utils/adt/formatting.c:3594
 #, c-format
 msgid "Read digit (%c)."
 msgstr ""
 
-#: ../utils/adt/formatting.c:3622
+#: utils/adt/formatting.c:3605
 #, c-format
 msgid "Try read decimal point (%c)."
 msgstr ""
 
-#: ../utils/adt/formatting.c:3637
+#: utils/adt/formatting.c:3620
 #, c-format
 msgid "Try read locale point (%c)."
 msgstr ""
 
-#: ../utils/adt/formatting.c:3670
+#: utils/adt/formatting.c:3653
 #, c-format
 msgid "SIGN_WROTE: %d, CURRENT: %d, NUMBER_P: '%s', INOUT: '%s'"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3685
+#: utils/adt/formatting.c:3668
 #, c-format
 msgid "Writing sign to position: %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3727
+#: utils/adt/formatting.c:3710
 #, c-format
 msgid "Writing bracket to position %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3749
+#: utils/adt/formatting.c:3732
 #, c-format
 msgid "Writing blank space to position %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3764
+#: utils/adt/formatting.c:3747
 #, c-format
 msgid "Writing zero to position %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3782
+#: utils/adt/formatting.c:3765
 #, c-format
 msgid "Writing decimal point to position %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3835
+#: utils/adt/formatting.c:3814
 #, c-format
 msgid "Writing digit '%c' to position %d"
 msgstr ""
 
-#: ../utils/adt/formatting.c:3878
+#: utils/adt/formatting.c:3858
 msgid "to_number(): RN is not supported"
 msgstr ""
 
-#: ../utils/adt/formatting.c:4000
+#: utils/adt/formatting.c:3980
 #, c-format
 msgid ""
 "\n"
@@ -9626,2659 +10854,2969 @@ msgid ""
 "\tLAST_RELEVANT: %s"
 msgstr ""
 
-#: ../utils/adt/formatting.c:4259
+#: utils/adt/formatting.c:4245
 #, c-format
 msgid "TO_NUMBER (number): '%s'"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:294
+#: utils/adt/geo_ops.c:279
+msgid "Too many points requested"
+msgstr ""
+
+#: utils/adt/geo_ops.c:300
 msgid "Unable to format path"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:366
+#: utils/adt/geo_ops.c:372
 #, c-format
 msgid "Bad box external representation '%s'"
 msgstr "fehlerhaftes �box�-Format: %s"
 
-#: ../utils/adt/geo_ops.c:824
+#: utils/adt/geo_ops.c:831
 #, c-format
 msgid "Bad line external representation '%s'"
 msgstr "fehlerhaftes �line�-Format: %s"
 
-#: ../utils/adt/geo_ops.c:829 ../utils/adt/geo_ops.c:892
+#: utils/adt/geo_ops.c:836 utils/adt/geo_ops.c:900
 msgid "line not yet implemented"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:1219 ../utils/adt/geo_ops.c:1240
+#: utils/adt/geo_ops.c:1226 utils/adt/geo_ops.c:1247
 #, c-format
 msgid "Bad path external representation '%s'"
 msgstr "fehlerhaftes �path�-Format: %s"
 
-#: ../utils/adt/geo_ops.c:1556
+#: utils/adt/geo_ops.c:1563
 #, c-format
 msgid "Bad point external representation '%s'"
 msgstr "fehlerhaftes �point�-Format: %s"
 
-#: ../utils/adt/geo_ops.c:1752
+#: utils/adt/geo_ops.c:1759
 #, c-format
 msgid "Bad lseg external representation '%s'"
 msgstr "fehlerhaftes �lseg�-Format: %s"
 
-#: ../utils/adt/geo_ops.c:2312
+#: utils/adt/geo_ops.c:2309
 msgid "dist_lb not implemented"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:2834
+#: utils/adt/geo_ops.c:2820
 msgid "close_lb not implemented"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:3111
+#: utils/adt/geo_ops.c:3097
 msgid "Unable to create bounding box for empty polygon"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:3133 ../utils/adt/geo_ops.c:3144
+#: utils/adt/geo_ops.c:3119 utils/adt/geo_ops.c:3130
 #, c-format
 msgid "Bad polygon external representation '%s'"
 msgstr "fehlerhaftes �polygon�-Format: %s"
 
-#: ../utils/adt/geo_ops.c:3432
+#: utils/adt/geo_ops.c:3418
 msgid "poly_distance not implemented"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:3511
+#: utils/adt/geo_ops.c:3497
 msgid "point_div:  divide by 0.0 error"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:3738
+#: utils/adt/geo_ops.c:3616
+msgid "too many points requested."
+msgstr ""
+
+#: utils/adt/geo_ops.c:3724
 msgid "path_center not implemented"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:3753
+#: utils/adt/geo_ops.c:3739
 msgid "Open path cannot be converted to polygon"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:3919 ../utils/adt/geo_ops.c:3927
-#: ../utils/adt/geo_ops.c:3940 ../utils/adt/geo_ops.c:3944
+#: utils/adt/geo_ops.c:3904 utils/adt/geo_ops.c:3912 utils/adt/geo_ops.c:3925
+#: utils/adt/geo_ops.c:3929
 #, c-format
 msgid "Bad circle external representation '%s'"
 msgstr "fehlerhaftes �circle�-Format: %s"
 
-#: ../utils/adt/geo_ops.c:3964 ../utils/adt/geo_ops.c:3970
+#: utils/adt/geo_ops.c:3949 utils/adt/geo_ops.c:3955
 msgid "Unable to format circle"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:4450
+#: utils/adt/geo_ops.c:4434
 msgid "Unable to convert circle to polygon"
 msgstr ""
 
-#: ../utils/adt/geo_ops.c:4484 ../utils/adt/geo_ops.c:4505
+#: utils/adt/geo_ops.c:4441
+msgid "too many points requested"
+msgstr ""
+
+#: utils/adt/geo_ops.c:4474 utils/adt/geo_ops.c:4495
 msgid "Unable to convert polygon to circle"
 msgstr ""
 
-#: ../utils/adt/int.c:96
+#: utils/adt/int.c:96
 msgid "int2vector value has too many values"
 msgstr "int2vector-Wert hat zu viele Werte"
 
-#: ../utils/adt/int.c:250
+#: utils/adt/int.c:197
 #, c-format
 msgid "i4toi2: '%d' causes int2 underflow"
 msgstr "i4toi2: %d verursacht Unterlauf in int2"
 
-#: ../utils/adt/int.c:252
+#: utils/adt/int.c:199
 #, c-format
 msgid "i4toi2: '%d' causes int2 overflow"
 msgstr "i4toi2: %d verursacht �berlauf in int2"
 
-#: ../utils/adt/int8.c:98 ../utils/adt/int8.c:108
+#: utils/adt/int8.c:101 utils/adt/int8.c:125
 #, c-format
 msgid "Bad int8 external representation \"%s\""
 msgstr "fehlerhaftes Format f�r int8: %s"
 
-#: ../utils/adt/int8.c:104
+#: utils/adt/int8.c:114
 #, c-format
 msgid "int8 value out of range: \"%s\""
 msgstr "int8-Wert %s ist au�erhalb des g�ltigen Bereiches"
 
-#: ../utils/adt/int8.c:127
+#: utils/adt/int8.c:157
 msgid "Unable to format int8"
 msgstr "kann int8 nicht formatieren"
 
-#: ../utils/adt/int8.c:716
+#: utils/adt/int8.c:748
 msgid "int8 conversion to int4 is out of range"
 msgstr "Umwandlung von int8 in int4 ist au�erhalb des g�ltigen Bereiches"
 
-#: ../utils/adt/int8.c:739
+#: utils/adt/int8.c:771
 msgid "int8 conversion to int2 is out of range"
 msgstr "Umwandlung von int8 in int2 ist au�erhalb des g�ltigen Bereiches"
 
-#: ../utils/adt/int8.c:775
+#: utils/adt/int8.c:807 utils/adt/int8.c:844
 msgid "Floating point conversion to int8 is out of range"
 msgstr ""
 "Umwandlung von Flie�kommawert in int8 ist au�erhalb des g�ltigen Bereiches"
 
-#: ../utils/adt/oid.c:46
-#, c-format
-msgid "%s: error reading \"%s\": %m"
-msgstr "%s: kann �%s� nicht lesen: %m"
-
-#: ../utils/adt/oid.c:49 ../utils/adt/oid.c:63
-#, c-format
-msgid "%s: error in \"%s\": can't parse \"%s\""
-msgstr "%s: Fehler in �%s�: kann �%s� nicht parsen"
-
-#: ../utils/adt/oid.c:84
-#, c-format
-msgid "%s: error reading \"%s\": %s"
-msgstr "%s: kann �%s� nicht lesen: %s"
-
-#: ../utils/adt/oid.c:138
-msgid "oidvector value has too many values"
-msgstr "oidvector-Wert hat zu viele Werte"
+#: utils/adt/int8.c:859
+msgid "int8 conversion to OID is out of range"
+msgstr "Umwandlung von int8 in OID ist au�erhalb des g�ltigen Bereiches"
 
-#: ../utils/adt/like.c:493 ../utils/adt/like_match.c:288
+#: utils/adt/like.c:451 utils/adt/like_match.c:289 utils/adt/regexp.c:400
 msgid "ESCAPE string must be empty or one character"
 msgstr "ESCAPE-Zeichenkette mu� null oder ein Zeichen lang sein"
 
-#: ../utils/adt/mac.c:51
+#: utils/adt/mac.c:61
 #, c-format
 msgid "macaddr_in: error in parsing \"%s\""
 msgstr "macaddr_in: kann �%s� nicht lesen"
 
-#: ../utils/adt/mac.c:56
+#: utils/adt/mac.c:66
 #, c-format
 msgid "macaddr_in: illegal address \"%s\""
 msgstr "macaddr_in: ung�ltige Adresse: %s"
 
-#: ../utils/adt/mac.c:129
+#: utils/adt/mac.c:139
 msgid "Text is too long to convert to MAC address"
 msgstr "Text ist zu lang um ihn in eine MAC-Adresse umzuwandeln"
 
-#: ../utils/adt/nabstime.c:370 ../utils/adt/nabstime.c:403
+#: utils/adt/nabstime.c:352 utils/adt/nabstime.c:385
 #, c-format
 msgid "Invalid timezone '%s'"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:507
+#: utils/adt/nabstime.c:489
 #, c-format
-msgid "Bad (length) abstime external representation '%s'"
-msgstr ""
+msgid "Bad abstime external representation (too long) '%s'"
+msgstr "fehlerhaftes Format f�r �abstime� (zu lang): %s"
 
-#: ../utils/adt/nabstime.c:511
+#: utils/adt/nabstime.c:493
 #, c-format
 msgid "Bad abstime external representation '%s'"
 msgstr "Fehlerhaftes �abstime�-Format: %s"
 
-#: ../utils/adt/nabstime.c:541
+#: utils/adt/nabstime.c:523
 #, c-format
 msgid "Bad abstime (internal coding error) '%s'"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:732 ../utils/adt/nabstime.c:798
+#: utils/adt/nabstime.c:714 utils/adt/nabstime.c:782
 msgid "Unable to convert timestamp to abstime"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:756
+#: utils/adt/nabstime.c:738
 msgid "Unable to convert abstime 'invalid' to timestamp"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:817
+#: utils/adt/nabstime.c:753
+msgid ""
+"Unable to convert ABSTIME to TIMESTAMP\n"
+"\tabstime_timestamp() internal error"
+msgstr ""
+
+#: utils/adt/nabstime.c:806
 msgid "Unable to convert abstime 'invalid' to timestamptz"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:860
-#, c-format
-msgid "Bad (length) reltime external representation '%s'"
+#: utils/adt/nabstime.c:821
+msgid ""
+"Unable to convert ABSTIME to TIMESTAMP WITH TIME ZONE\n"
+"\tabstime_timestamptz() internal error"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:864
+#: utils/adt/nabstime.c:852
+#, c-format
+msgid "Bad reltime external representation (too long) '%s'"
+msgstr "fehlerhaftes Format f�r �reltime� (zu lang): %s"
+
+#: utils/adt/nabstime.c:856
 #, c-format
 msgid "Bad reltime external representation '%s'"
 msgstr "fehlerhaftes Format f�r �reltime�: %s"
 
-#: ../utils/adt/nabstime.c:874
+#: utils/adt/nabstime.c:866
 #, c-format
 msgid "Bad reltime (internal coding error) '%s'"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:932
+#: utils/adt/nabstime.c:924
 #, c-format
 msgid "Unable to decode tinterval '%s'"
 msgstr ""
 
-#: ../utils/adt/nabstime.c:1033
+#: utils/adt/nabstime.c:1037
 msgid "Unable to convert reltime 'invalid' to interval"
 msgstr ""
 
-#: ../utils/adt/network.c:66
+#: utils/adt/network.c:65
 #, c-format
 msgid "invalid %s value '%s'"
 msgstr "ung�ltiger %s-Wert: %s"
 
-#: ../utils/adt/network.c:77
+#: utils/adt/network.c:76
 #, c-format
 msgid "invalid CIDR value '%s': has bits set to right of mask"
 msgstr "ung�ltiger CIDR-Wert %s hat Bits rechts von der Maske"
 
-#: ../utils/adt/network.c:129 ../utils/adt/network.c:470
+#: utils/adt/network.c:128 utils/adt/network.c:469
 #, c-format
 msgid "unable to print address (%s)"
 msgstr "kann Adresse nicht ausgeben (%s)"
 
-#: ../utils/adt/network.c:139 ../utils/adt/network.c:403
-#: ../utils/adt/network.c:440 ../utils/adt/network.c:474
-#: ../utils/adt/network.c:520 ../utils/adt/network.c:560
-#: ../utils/adt/network.c:602 ../utils/adt/network.c:638
+#: utils/adt/network.c:138 utils/adt/network.c:402 utils/adt/network.c:439
+#: utils/adt/network.c:473 utils/adt/network.c:519 utils/adt/network.c:559
+#: utils/adt/network.c:601 utils/adt/network.c:637
 #, c-format
 msgid "unknown address family (%d)"
 msgstr "unbekannte Adressfamilie (%d)"
 
-#: ../utils/adt/network.c:186
+#: utils/adt/network.c:185
 #, c-format
 msgid "set_masklen - invalid value '%d'"
 msgstr "set_masklen: ung�ltiger Wert %d"
 
-#: ../utils/adt/network.c:227 ../utils/adt/network.c:316
-#: ../utils/adt/network.c:336 ../utils/adt/network.c:356
-#: ../utils/adt/network.c:376
+#: utils/adt/network.c:226 utils/adt/network.c:315 utils/adt/network.c:335
+#: utils/adt/network.c:355 utils/adt/network.c:375
 #, c-format
 msgid "cannot compare address families %d and %d"
 msgstr "Adressfamilien %d und %d k�nnen nicht verglichen werden"
 
-#: ../utils/adt/network.c:399 ../utils/adt/network.c:430
+#: utils/adt/network.c:398 utils/adt/network.c:429
 #, c-format
 msgid "unable to print host (%s)"
 msgstr "kann Host nicht ausgeben (%s)"
 
-#: ../utils/adt/network.c:657
+#: utils/adt/network.c:656
 #, c-format
 msgid "convert_network_to_scalar: unsupported type %u"
 msgstr "convert_network_to_scalar: Typ %u nicht unterst�tzt"
 
-#: ../utils/adt/not_in.c:65
+#: utils/adt/not_in.c:62
 msgid "int4notin: must provide relationname.attributename"
 msgstr ""
 
-#: ../utils/adt/not_in.c:76
-#, c-format
-msgid "int4notin: unknown attribute %s for relation %s"
-msgstr ""
-
-#: ../utils/adt/numeric.c:1500
+#: utils/adt/numeric.c:1512
 msgid "Cannot convert NaN to int4"
 msgstr "kann NaN nicht in int4 umwandeln"
 
-#: ../utils/adt/numeric.c:1550
+#: utils/adt/numeric.c:1562
 msgid "Cannot convert NaN to int8"
 msgstr "kann NaN nicht in int8 umwandeln"
 
-#: ../utils/adt/numeric.c:1601
+#: utils/adt/numeric.c:1613
 msgid "Cannot convert NaN to int2"
 msgstr "kann NaN nicht in int2 umwandeln"
 
-#: ../utils/adt/numeric.c:1767
+#: utils/adt/numeric.c:1809
 msgid "do_numeric_accum: expected 3-element numeric array"
 msgstr ""
 
-#: ../utils/adt/numeric.c:1858
+#: utils/adt/numeric.c:1900
 msgid "numeric_avg: expected 3-element numeric array"
 msgstr ""
 
-#: ../utils/adt/numeric.c:1893
+#: utils/adt/numeric.c:1936
 msgid "numeric_variance: expected 3-element numeric array"
 msgstr ""
 
-#: ../utils/adt/numeric.c:1960
+#: utils/adt/numeric.c:2018
 msgid "numeric_stddev: expected 3-element numeric array"
 msgstr ""
 
-#: ../utils/adt/numeric.c:2142
+#: utils/adt/numeric.c:2214
 msgid "int2_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: ../utils/adt/numeric.c:2162
+#: utils/adt/numeric.c:2234
 msgid "int4_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: ../utils/adt/numeric.c:2180
+#: utils/adt/numeric.c:2252
 msgid "int8_avg: expected 2-element int8 array"
 msgstr ""
 
-#: ../utils/adt/numeric.c:2371 ../utils/adt/numeric.c:2386
-#: ../utils/adt/numeric.c:2404 ../utils/adt/numeric.c:2408
-#: ../utils/adt/numeric.c:2419
+#: utils/adt/numeric.c:2443 utils/adt/numeric.c:2458 utils/adt/numeric.c:2476
+#: utils/adt/numeric.c:2480 utils/adt/numeric.c:2491
 #, c-format
 msgid "Bad numeric input format '%s'"
 msgstr "fehlerhaftes Format f�r �numeric�: %s"
 
-#: ../utils/adt/numeric.c:2738
+#: utils/adt/numeric.c:2810
 #, c-format
 msgid ""
 "overflow on numeric ABS(value) >= 10^%d for field with precision %d scale %d"
 msgstr ""
 
-#: ../utils/adt/numeric.c:3148
+#: utils/adt/numeric.c:3269
 msgid "division by zero on numeric"
 msgstr "Division durch Null"
 
-#: ../utils/adt/numeric.c:3453
+#: utils/adt/numeric.c:3650
 msgid "math error on numeric - cannot compute SQRT of negative value"
 msgstr ""
 
-#: ../utils/adt/numeric.c:3539
+#: utils/adt/numeric.c:3739
 msgid "argument for EXP() too big"
 msgstr ""
 
-#: ../utils/adt/numeric.c:3606
+#: utils/adt/numeric.c:3818
 msgid "math error on numeric - cannot compute LN of value <= zero"
 msgstr ""
 
-#: ../utils/adt/numutils.c:61
-msgid "pg_atoi: NULL pointer!"
+#: utils/adt/numutils.c:71
+msgid "pg_atoi: NULL pointer"
+msgstr ""
+
+#: utils/adt/numutils.c:73
+msgid "pg_atoi: zero-length string"
 msgstr ""
 
-#: ../utils/adt/numutils.c:73 ../utils/adt/numutils.c:85
-#: ../utils/adt/numutils.c:90 ../utils/adt/numutils.c:98
-#: ../utils/adt/numutils.c:103 ../utils/adt/numutils.c:110
-#: ../utils/adt/numutils.c:115
+#: utils/adt/numutils.c:83 utils/adt/numutils.c:95 utils/adt/numutils.c:100
+#: utils/adt/numutils.c:108 utils/adt/numutils.c:113 utils/adt/numutils.c:120
+#: utils/adt/numutils.c:125
 #, c-format
 msgid "pg_atoi: error reading \"%s\": %m"
 msgstr "pg_atoi: Fehler beim Lesen von �%s�: %m"
 
-#: ../utils/adt/numutils.c:75
+#: utils/adt/numutils.c:85
 #, c-format
 msgid "pg_atoi: error in \"%s\": can't parse \"%s\""
 msgstr "pg_atoi: Fehler in �%s�: kann �%s� nicht parsen"
 
-#: ../utils/adt/numutils.c:119
+#: utils/adt/numutils.c:129
 #, c-format
 msgid "pg_atoi: invalid result size: %d"
 msgstr "pg_atoi: ung�ltige Ergebnisgr��e: %d"
 
-#: ../utils/adt/varbit.c:101 ../utils/adt/varbit.c:217
+#: utils/adt/oid.c:46
+#, c-format
+msgid "%s: error reading \"%s\": %m"
+msgstr "%s: kann �%s� nicht lesen: %m"
+
+#: utils/adt/oid.c:49 utils/adt/oid.c:63
+#, c-format
+msgid "%s: error in \"%s\": can't parse \"%s\""
+msgstr "%s: Fehler in �%s�: kann �%s� nicht parsen"
+
+#: utils/adt/oid.c:84
 #, c-format
-msgid "bit string length does not match type bit(%d)"
-msgstr "L�nge der Bitkette stimmt nicht mit Typ bit(%d) �berein"
+msgid "%s: error reading \"%s\": %s"
+msgstr "%s: kann �%s� nicht lesen: %s"
+
+#: utils/adt/oid.c:138
+msgid "oidvector value has too many values"
+msgstr "oidvector-Wert hat zu viele Werte"
+
+#: utils/adt/oracle_compat.c:199 utils/adt/oracle_compat.c:294
+msgid "Requested length too large"
+msgstr ""
+
+#: utils/adt/oracle_compat.c:857
+msgid "Requested buffer is too large."
+msgstr ""
+
+#: utils/adt/pgstatfuncs.c:188
+msgid ""
+"pg_stat_get_backend_idset: called in context that does not accept a set "
+"result"
+msgstr ""
+
+#: utils/adt/pgstatfuncs.c:193
+msgid "No function memory context in set-function"
+msgstr ""
 
-#: ../utils/adt/varbit.c:122 ../utils/adt/varbit.c:329
+#: utils/adt/regexp.c:166
 #, c-format
-msgid "cannot parse %c as a binary digit"
-msgstr "%c ist keine Bin�rziffer"
+msgid "Invalid regular expression: %s"
+msgstr "ung�ltiger regul�rer Ausdruck: %s"
 
-#: ../utils/adt/varbit.c:143 ../utils/adt/varbit.c:350
+#: utils/adt/regproc.c:115 utils/adt/regproc.c:130 utils/adt/regproc.c:258
 #, c-format
-msgid "cannot parse %c as a hex digit"
-msgstr "%c ist keine Hexadezimalziffer"
+msgid "No procedure with name %s"
+msgstr "keine Prozedur mit Namen %s"
 
-#: ../utils/adt/varbit.c:308 ../utils/adt/varbit.c:423
+#: utils/adt/regproc.c:117 utils/adt/regproc.c:132
 #, c-format
-msgid "bit string too long for type bit varying(%d)"
-msgstr "Bitkette ist zu lang f�r Typ bit varying(%d)"
+msgid "There is more than one procedure named %s"
+msgstr ""
 
-#: ../utils/adt/varbit.c:815
-msgid "cannot AND bit strings of different sizes"
-msgstr "bin�res �Und� nicht mit Bitketten unterschiedlicher L�nge m�glich"
+#: utils/adt/regproc.c:413 utils/adt/regproc.c:428 utils/adt/regproc.c:576
+#, c-format
+msgid "No operator with name %s"
+msgstr "kein Operator mit Namen %s"
 
-#: ../utils/adt/varbit.c:853
-msgid "cannot OR bit strings of different sizes"
-msgstr "bin�res �Oder� nicht mit Bitketten unterschiedlicher L�nge m�glich"
+#: utils/adt/regproc.c:415 utils/adt/regproc.c:430
+#, c-format
+msgid "There is more than one operator named %s"
+msgstr ""
 
-#: ../utils/adt/varbit.c:897
-msgid "cannot XOR bit strings of different sizes"
+#: utils/adt/regproc.c:556
+msgid ""
+"regoperatorin: use NONE to denote the missing argument of a unary operator"
 msgstr ""
-"bin�res �Exklusiv-Oder� nicht mit Bitketten unterschiedlicher L�nge m�glich"
 
-#: ../utils/adt/varbit.c:1112
-msgid "bit string is too large to fit in type integer"
-msgstr "Bitkette ist zu lang f�r Typ integer"
+#: utils/adt/regproc.c:558
+msgid "regoperatorin: provide two argument types for operator"
+msgstr ""
 
-#: ../utils/adt/varbit.c:1200
+#: utils/adt/regproc.c:726
 #, c-format
-msgid "S. %d %d em=%2x sm=%2x r=%d"
+msgid "No class with name %s"
+msgstr ""
+
+#: utils/adt/regproc.c:870
+#, c-format
+msgid "No type with name %s"
+msgstr "kein Typ mit Namen %s"
+
+#: utils/adt/regproc.c:955 utils/adt/regproc.c:958 utils/adt/varlena.c:1355
+#: utils/adt/varlena.c:1358
+#, c-format
+msgid "%s: invalid name syntax"
+msgstr ""
+
+#: utils/adt/regproc.c:1015
+#, c-format
+msgid "%s: expected a left parenthesis"
+msgstr ""
+
+#: utils/adt/regproc.c:1029
+#, c-format
+msgid "%s: expected a right parenthesis"
+msgstr ""
+
+#: utils/adt/regproc.c:1045
+#, c-format
+msgid "%s: expected a type name"
+msgstr ""
+
+#: utils/adt/regproc.c:1075
+#, c-format
+msgid "%s: improper type name"
+msgstr ""
+
+#: utils/adt/regproc.c:1107
+#, c-format
+msgid "%s: too many argument datatypes"
+msgstr ""
+
+#: utils/adt/ri_triggers.c:185
+msgid "RI_FKey_check() not fired by trigger manager"
+msgstr ""
+
+#: utils/adt/ri_triggers.c:188
+msgid "RI_FKey_check() must be fired AFTER ROW"
+msgstr ""
+
+#: utils/adt/ri_triggers.c:191
+msgid "RI_FKey_check() must be fired for INSERT or UPDATE"
+msgstr ""
+
+#: utils/adt/ri_triggers.c:199
+msgid "wrong # of arguments in call to RI_FKey_check()"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:89
+#: utils/adt/ri_triggers.c:201
 #, c-format
-msgid ""
-"CURRENT LOCALE ENVIRONMENT:\n"
-"\n"
-"LANG:   \t%s\n"
-"LC_CTYPE:\t%s\n"
-"LC_NUMERIC:\t%s\n"
-"LC_TIME:\t%s\n"
-"LC_COLLATE:\t%s\n"
-"LC_MONETARY:\t%s\n"
-"LC_MESSAGES:\t%s\n"
+msgid "too many keys (%d max) in call to RI_FKey_check()"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:98
+#: utils/adt/ri_triggers.c:215 utils/adt/ri_triggers.c:758
+#: utils/adt/ri_triggers.c:988 utils/adt/ri_triggers.c:1224
+#: utils/adt/ri_triggers.c:1432 utils/adt/ri_triggers.c:1676
+#: utils/adt/ri_triggers.c:1899 utils/adt/ri_triggers.c:2127
+#: utils/adt/ri_triggers.c:2346 utils/adt/ri_triggers.c:2611
+#: utils/adt/ri_triggers.c:2873 utils/adt/ri_triggers.c:3143
 #, c-format
 msgid ""
-"CURRENT LOCALE ENVIRONMENT:\n"
-"\n"
-"LANG:   \t%s\n"
-"LC_CTYPE:\t%s\n"
-"LC_NUMERIC:\t%s\n"
-"LC_TIME:\t%s\n"
-"LC_COLLATE:\t%s\n"
-"LC_MONETARY:\t%s\n"
+"No target table given for trigger \"%s\" on \"%s\"\n"
+"\tRemove these RI triggers and do ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:122
-#, c-format
-msgid "pg_setlocale(): 'LC_COLLATE=%s' cannot be honored."
+#: utils/adt/ri_triggers.c:291 utils/adt/ri_triggers.c:402
+#: utils/adt/ri_triggers.c:607
+msgid "SPI_connect() failed in RI_FKey_check()"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:126
-#, c-format
-msgid "pg_setlocale(): 'LC_CTYPE=%s' cannot be honored."
+#: utils/adt/ri_triggers.c:296 utils/adt/ri_triggers.c:480
+msgid "SPI_execp() failed in RI_FKey_check()"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:130
+#: utils/adt/ri_triggers.c:301
 #, c-format
-msgid "pg_setlocale(): 'LC_NUMERIC=%s' cannot be honored."
+msgid "%s referential integrity violation - no rows found in %s"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:134
-#, c-format
-msgid "pg_setlocale(): 'LC_TIME=%s' cannot be honored."
+#: utils/adt/ri_triggers.c:307 utils/adt/ri_triggers.c:492
+msgid "SPI_finish() failed in RI_FKey_check()"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:138
-#, c-format
-msgid "pg_setlocale(): 'LC_MONETARY=%s' cannot be honored."
+#: utils/adt/ri_triggers.c:319 utils/adt/ri_triggers.c:908
+#: utils/adt/ri_triggers.c:1149 utils/adt/ri_triggers.c:1355
+#: utils/adt/ri_triggers.c:1594 utils/adt/ri_triggers.c:1816
+#: utils/adt/ri_triggers.c:2052 utils/adt/ri_triggers.c:2268
+#: utils/adt/ri_triggers.c:2536 utils/adt/ri_triggers.c:2796
+#: utils/adt/ri_triggers.c:3087 utils/adt/ri_triggers.c:3177
+msgid "MATCH PARTIAL not yet supported"
 msgstr ""
 
-#: ../utils/adt/pg_locale.c:143
+#: utils/adt/ri_triggers.c:355
 #, c-format
-msgid "pg_setlocale(): 'LC_MESSAGES=%s' cannot be honored."
+msgid ""
+"%s referential integrity violation - MATCH FULL doesn't allow mixing of NULL "
+"and NON-NULL key values"
 msgstr ""
 
-#: ../utils/adt/regexp.c:143
-#, c-format
-msgid "Invalid regular expression: %s"
-msgstr "ung�ltiger regul�rer Ausdruck: %s"
-
-#: ../utils/adt/regproc.c:61
-#, c-format
-msgid "No procedure with oid %s"
-msgstr "keine Prozedur mit Oid %s"
+#: utils/adt/ri_triggers.c:379 utils/adt/ri_triggers.c:593
+msgid "MATCH PARTIAL not yet implemented"
+msgstr ""
 
-#: ../utils/adt/regproc.c:128
+#: utils/adt/ri_triggers.c:485
 #, c-format
 msgid ""
-"There is more than one procedure named %s.\n"
-"\tSupply the pg_proc oid inside single quotes."
+"%s referential integrity violation - key referenced from %s not found in %s"
 msgstr ""
 
-#: ../utils/adt/regproc.c:130
-#, c-format
-msgid "No procedure with name %s"
-msgstr "keine Prozedur mit Namen %s"
-
-#: ../utils/adt/ruleutils.c:178
-msgid "get_ruledef: cannot connect to SPI manager"
-msgstr "get_ruledef: kann nicht mit SPI-Manager verbinden"
-
-#: ../utils/adt/ruleutils.c:193 ../utils/adt/ruleutils.c:286
-#, c-format
-msgid "SPI_prepare() failed for \"%s\""
-msgstr "SPI_prepare() f�r �%s� fehlgeschlagen"
+#: utils/adt/ri_triggers.c:501
+msgid "internal error #1 in ri_triggers.c"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:205
-#, c-format
-msgid "failed to get pg_rewrite tuple for %s"
+#: utils/adt/ri_triggers.c:678
+msgid "SPI_execp() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:209 ../utils/adt/ruleutils.c:234
-msgid "get_ruledef: SPI_finish() failed"
-msgstr "get_ruledef: SPI_finish() fehlgeschlagen"
+#: utils/adt/ri_triggers.c:685
+msgid "SPI_finish() failed in ri_Check_Pk_Match()"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:271
-msgid "get_viewdef: cannot connect to SPI manager"
-msgstr "get_viewdef: kann nicht mit SPI-Manager verbinden"
+#: utils/adt/ri_triggers.c:726
+msgid "RI_FKey_noaction_del() not fired by trigger manager"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:299
-#, c-format
-msgid "failed to get pg_rewrite tuple for view %s"
+#: utils/adt/ri_triggers.c:729
+msgid "RI_FKey_noaction_del() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:323
-msgid "get_viewdef: SPI_finish() failed"
-msgstr "get_viewdef: SPI_finish() fehlgeschlagen"
+#: utils/adt/ri_triggers.c:731
+msgid "RI_FKey_noaction_del() must be fired for DELETE"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:361
-#, c-format
-msgid "syscache lookup for index %u failed"
-msgstr "Syscache-Suche nach Index %u fehlgeschlagen"
+#: utils/adt/ri_triggers.c:739
+msgid "wrong # of arguments in call to RI_FKey_noaction_del()"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:371 ../utils/adt/ruleutils.c:381
+#: utils/adt/ri_triggers.c:741
 #, c-format
-msgid "syscache lookup for relid %u failed"
-msgstr "Syscache-Suche nach Relid %u fehlgeschlagen"
+msgid "too many keys (%d max) in call to RI_FKey_noaction_del()"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:392
-#, c-format
-msgid "lookup for AM %u failed"
-msgstr "Suche nach AM %u fehlgeschlagen"
+#: utils/adt/ri_triggers.c:816
+msgid "SPI_connect() failed in RI_FKey_noaction_del()"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:746
-#, c-format
-msgid "get_ruledef: rule %s has unsupported event type %d"
-msgstr "get_ruledef: Rule %s hat nicht unterst�tzten Ereignistyp %d"
+#: utils/adt/ri_triggers.c:886
+msgid "SPI_execp() failed in RI_FKey_noaction_del()"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:943
+#: utils/adt/ri_triggers.c:891 utils/adt/ri_triggers.c:1132
+#: utils/adt/ri_triggers.c:1799 utils/adt/ri_triggers.c:2035
 #, c-format
-msgid "get_ruledef of %s: query command type %d not implemented yet"
+msgid "%s referential integrity violation - key in %s still referenced from %s"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1163
-#, c-format
-msgid "get_setop_query: unexpected set op %d"
+#: utils/adt/ri_triggers.c:898
+msgid "SPI_finish() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1174
-#, c-format
-msgid "get_setop_query: unexpected node %d"
+#: utils/adt/ri_triggers.c:915
+msgid "internal error #2 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1230
-msgid "get_insert_query_def: too many RTEs in INSERT!"
+#: utils/adt/ri_triggers.c:956
+msgid "RI_FKey_noaction_upd() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1377
-msgid "get_utility_query_def: unexpected statement type"
+#: utils/adt/ri_triggers.c:959
+msgid "RI_FKey_noaction_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1404
-#, c-format
-msgid "get_names_for_var: bogus varlevelsup %d"
+#: utils/adt/ri_triggers.c:961
+msgid "RI_FKey_noaction_upd() must be fired for UPDATE"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1549
-#, c-format
-msgid "find_alias_in_namespace: unexpected node type %d"
+#: utils/adt/ri_triggers.c:969
+msgid "wrong # of arguments in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1660
+#: utils/adt/ri_triggers.c:971
 #, c-format
-msgid "phony_equal: unexpected node type %d"
+msgid "too many keys (%d max) in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1745
-#, c-format
-msgid "cache lookup for operator %u failed"
-msgstr "Cachesuche nach Operator %u fehlgeschlagen"
+#: utils/adt/ri_triggers.c:1057
+msgid "SPI_connect() failed in RI_FKey_noaction_upd()"
+msgstr ""
 
-#: ../utils/adt/ruleutils.c:1762
-msgid "get_rule_expr: bogus oprkind"
+#: utils/adt/ri_triggers.c:1127
+msgid "SPI_execp() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1802
-#, c-format
-msgid "get_rule_expr: expr opType %d not supported"
+#: utils/adt/ri_triggers.c:1139
+msgid "SPI_finish() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1885
-#, c-format
-msgid "Argument type %s of FieldSelect is not a tuple type"
+#: utils/adt/ri_triggers.c:1156
+msgid "internal error #3 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:1974
-#, c-format
-msgid "get_rule_expr: unexpected nulltesttype %d"
+#: utils/adt/ri_triggers.c:1192
+msgid "RI_FKey_cascade_del() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:2007
-#, c-format
-msgid "get_rule_expr: unexpected booltesttype %d"
+#: utils/adt/ri_triggers.c:1195
+msgid "RI_FKey_cascade_del() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:2019
-#, c-format
-msgid "get_ruledef of %s: unknown node type %d in get_rule_expr()"
+#: utils/adt/ri_triggers.c:1197
+msgid "RI_FKey_cascade_del() must be fired for DELETE"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:2380
-#, c-format
-msgid "get_sublink_expr: unsupported sublink type %d"
+#: utils/adt/ri_triggers.c:1205
+msgid "wrong # of arguments in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:2524
+#: utils/adt/ri_triggers.c:1207
 #, c-format
-msgid "get_from_clause_item: unknown join type %d"
+msgid "too many keys (%d max) in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:2575
-#, c-format
-msgid "get_from_clause_item: unexpected node type %d"
+#: utils/adt/ri_triggers.c:1271
+msgid "SPI_connect() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:2602 ../utils/cache/lsyscache.c:275
-#, c-format
-msgid "cache lookup failed for opclass %u"
+#: utils/adt/ri_triggers.c:1340
+msgid "SPI_execp() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: ../utils/adt/ruleutils.c:2632
-msgid "tleIsArrayAssign: I'm confused ..."
+#: utils/adt/ri_triggers.c:1345
+msgid "SPI_finish() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:842
-#, c-format
-msgid "patternsel: no = operator for type %u"
+#: utils/adt/ri_triggers.c:1362
+msgid "internal error #4 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:1026 ../utils/adt/selfuncs.c:1103
-#: ../utils/adt/selfuncs.c:1144 ../utils/adt/selfuncs.c:1174
-#, c-format
-msgid "booltestsel: unexpected booltesttype %d"
+#: utils/adt/ri_triggers.c:1400
+msgid "RI_FKey_cascade_upd() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:1215 ../utils/adt/selfuncs.c:1272
-#, c-format
-msgid "nulltestsel: unexpected nulltesttype %d"
+#: utils/adt/ri_triggers.c:1403
+msgid "RI_FKey_cascade_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:1844
-#, c-format
-msgid "convert_numeric_to_scalar: unsupported type %u"
+#: utils/adt/ri_triggers.c:1405
+msgid "RI_FKey_cascade_upd() must be fired for UPDATE"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:2034
-#, c-format
-msgid "convert_string_datum: unsupported type %u"
+#: utils/adt/ri_triggers.c:1413
+msgid "wrong # of arguments in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:2205
+#: utils/adt/ri_triggers.c:1415
 #, c-format
-msgid "convert_timevalue_to_scalar: unsupported type %u"
+msgid "too many keys (%d max) in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:2598
-msgid "pattern_fixed_prefix: bogus ptype"
+#: utils/adt/ri_triggers.c:1490
+msgid "SPI_connect() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:2627
-#, c-format
-msgid "prefix_selectivity: no >= operator for type %u"
+#: utils/adt/ri_triggers.c:1579
+msgid "SPI_execp() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:2650
-#, c-format
-msgid "prefix_selectivity: no < operator for type %u"
+#: utils/adt/ri_triggers.c:1584
+msgid "SPI_finish() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:2885
-msgid "pattern_selectivity: bogus ptype"
+#: utils/adt/ri_triggers.c:1601
+msgid "internal error #5 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:2914
-msgid "Invalid LC_COLLATE setting"
+#: utils/adt/ri_triggers.c:1644
+msgid "RI_FKey_restrict_del() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/selfuncs.c:3037
-#, c-format
-msgid "string_lessthan: unexpected datatype %u"
+#: utils/adt/ri_triggers.c:1647
+msgid "RI_FKey_restrict_del() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/sets.c:84
-#, c-format
-msgid "SetDefine: unable to define set %s"
+#: utils/adt/ri_triggers.c:1649
+msgid "RI_FKey_restrict_del() must be fired for DELETE"
 msgstr ""
 
-#: ../utils/adt/tid.c:54
-#, c-format
-msgid "invalid tid format: '%s'"
+#: utils/adt/ri_triggers.c:1657
+msgid "wrong # of arguments in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: ../utils/adt/tid.c:181
+#: utils/adt/ri_triggers.c:1659
 #, c-format
-msgid "Relation %s not found"
+msgid "too many keys (%d max) in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:68 ../utils/adt/timestamp.c:192
-#, c-format
-msgid "Bad timestamp external representation '%s'"
-msgstr "fehlerhaftes Format f�r �timestamp�: %s"
-
-#: ../utils/adt/timestamp.c:74
-#, c-format
-msgid "TIMESTAMP out of range '%s'"
-msgstr "TIMESTAMP au�erhalb des g�ltigen Bereichs: %s"
+#: utils/adt/ri_triggers.c:1723
+msgid "SPI_connect() failed in RI_FKey_restrict_del()"
+msgstr ""
 
-#: ../utils/adt/timestamp.c:90
-#, c-format
-msgid "TIMESTAMP '%s' no longer supported"
-msgstr "TIMESTAMP '%s' wird nicht mehr unterst�tzt"
+#: utils/adt/ri_triggers.c:1794
+msgid "SPI_execp() failed in RI_FKey_restrict_del()"
+msgstr ""
 
-#: ../utils/adt/timestamp.c:95
-#, c-format
-msgid "TIMESTAMP '%s' not parsed; internal coding error"
+#: utils/adt/ri_triggers.c:1806
+msgid "SPI_finish() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:123
-msgid "Unable to format timestamp; internal coding error"
+#: utils/adt/ri_triggers.c:1823
+msgid "internal error #6 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:198
-#, c-format
-msgid "TIMESTAMP WITH TIME ZONE out of range '%s'"
-msgstr "TIMESTAMP WITH TIME ZONE au�erhalb des g�ltigen Bereichs: %s"
+#: utils/adt/ri_triggers.c:1867
+msgid "RI_FKey_restrict_upd() not fired by trigger manager"
+msgstr ""
 
-#: ../utils/adt/timestamp.c:214
-#, c-format
-msgid "TIMESTAMP WITH TIME ZONE '%s' no longer supported"
-msgstr "TIMESTAMP WITH TIME ZONE '%s' wird nicht mehr unterst�tzt"
+#: utils/adt/ri_triggers.c:1870
+msgid "RI_FKey_restrict_upd() must be fired AFTER ROW"
+msgstr ""
 
-#: ../utils/adt/timestamp.c:219
-#, c-format
-msgid "TIMESTAMP WITH TIME ZONE '%s' not parsed; internal coding error"
+#: utils/adt/ri_triggers.c:1872
+msgid "RI_FKey_restrict_upd() must be fired for UPDATE"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:248
-msgid "Unable to format timestamp with time zone; internal coding error"
+#: utils/adt/ri_triggers.c:1880
+msgid "wrong # of arguments in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:308 ../utils/adt/timestamp.c:316
+#: utils/adt/ri_triggers.c:1882
 #, c-format
-msgid "Bad interval external representation '%s'"
-msgstr "fehlerhaftes Format f�r �interval�: %s"
+msgid "too many keys (%d max) in call to RI_FKey_restrict_upd()"
+msgstr ""
 
-#: ../utils/adt/timestamp.c:321
-#, c-format
-msgid "Interval '%s' no longer supported"
+#: utils/adt/ri_triggers.c:1957
+msgid "SPI_connect() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:325
-#, c-format
-msgid "Interval '%s' not parsed; internal coding error"
+#: utils/adt/ri_triggers.c:2030
+msgid "SPI_execp() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:345
-msgid "Unable to encode interval; internal coding error"
+#: utils/adt/ri_triggers.c:2042
+msgid "SPI_finish() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:348
-msgid "Unable to format interval; internal coding error"
+#: utils/adt/ri_triggers.c:2059
+msgid "internal error #7 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:470
-msgid "AdjustIntervalForTypmod(): internal coding error"
+#: utils/adt/ri_triggers.c:2095
+msgid "RI_FKey_setnull_del() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1194
-msgid "Unable to subtract non-finite timestamps"
+#: utils/adt/ri_triggers.c:2098
+msgid "RI_FKey_setnull_del() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1252
-msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamp_pl_span() internal error encoding timestamp"
+#: utils/adt/ri_triggers.c:2100
+msgid "RI_FKey_setnull_del() must be fired for DELETE"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1259
-msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamp_pl_span() internal error decoding timestamp"
+#: utils/adt/ri_triggers.c:2108
+msgid "wrong # of arguments in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1342
-msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamptz_pl_span() internal error encoding timestamp"
+#: utils/adt/ri_triggers.c:2110
+#, c-format
+msgid "too many keys (%d max) in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1347
-msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamptz_pl_span() internal error decoding timestamp"
+#: utils/adt/ri_triggers.c:2174
+msgid "SPI_connect() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1529
-msgid "interval_div: divide by 0.0 error"
+#: utils/adt/ri_triggers.c:2253
+msgid "SPI_execp() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1566
-msgid "interval_accum: expected 2-element interval array"
+#: utils/adt/ri_triggers.c:2258
+msgid "SPI_finish() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1608
-msgid "interval_avg: expected 2-element interval array"
+#: utils/adt/ri_triggers.c:2275
+msgid "internal error #8 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1730
-msgid ""
-"Unable to encode INTERVAL\n"
-"\ttimestamp_age() internal coding error"
+#: utils/adt/ri_triggers.c:2314
+msgid "RI_FKey_setnull_upd() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1734
-msgid ""
-"Unable to decode TIMESTAMP\n"
-"\ttimestamp_age() internal coding error"
+#: utils/adt/ri_triggers.c:2317
+msgid "RI_FKey_setnull_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1839 ../utils/adt/timestamp.c:1842
-msgid "Unable to decode TIMESTAMP"
+#: utils/adt/ri_triggers.c:2319
+msgid "RI_FKey_setnull_upd() must be fired for UPDATE"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1895
-msgid "TIMESTAMP bad external representation (too long)"
+#: utils/adt/ri_triggers.c:2327
+msgid "wrong # of arguments in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:1951
-msgid "TIMESTAMP WITH TIME ZONE bad external representation (too long)"
+#: utils/adt/ri_triggers.c:2329
+#, c-format
+msgid "too many keys (%d max) in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2008
-msgid "INTERVAL bad external representation (too long)"
+#: utils/adt/ri_triggers.c:2405
+msgid "SPI_connect() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2041 ../utils/adt/timestamp.c:2099
-#: ../utils/adt/timestamp.c:2388 ../utils/adt/timestamp.c:2503
-#, c-format
-msgid "TIMESTAMP units '%s' not recognized"
+#: utils/adt/ri_triggers.c:2521
+msgid "SPI_execp() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2090 ../utils/adt/timestamp.c:2468
-#: ../utils/adt/timestamp.c:2496
-#, c-format
-msgid "TIMESTAMP units '%s' not supported"
+#: utils/adt/ri_triggers.c:2526
+msgid "SPI_finish() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2095
-#, c-format
-msgid "Unable to truncate TIMESTAMP to '%s'"
+#: utils/adt/ri_triggers.c:2543
+msgid "internal error #9 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2128 ../utils/adt/timestamp.c:2187
-#: ../utils/adt/timestamp.c:2533 ../utils/adt/timestamp.c:2658
-#, c-format
-msgid "TIMESTAMP WITH TIME ZONE units '%s' not recognized"
+#: utils/adt/ri_triggers.c:2579
+msgid "RI_FKey_setdefault_del() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2176 ../utils/adt/timestamp.c:2623
-#: ../utils/adt/timestamp.c:2652
-#, c-format
-msgid "TIMESTAMP WITH TIME ZONE units '%s' not supported"
+#: utils/adt/ri_triggers.c:2582
+msgid "RI_FKey_setdefault_del() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2183
-#, c-format
-msgid "Unable to truncate TIMESTAMP WITH TIME ZONE to '%s'"
+#: utils/adt/ri_triggers.c:2584
+msgid "RI_FKey_setdefault_del() must be fired for DELETE"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2216 ../utils/adt/timestamp.c:2279
-#: ../utils/adt/timestamp.c:2686 ../utils/adt/timestamp.c:2779
-#, c-format
-msgid "INTERVAL units '%s' not recognized"
+#: utils/adt/ri_triggers.c:2592
+msgid "wrong # of arguments in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2264 ../utils/adt/timestamp.c:2754
+#: utils/adt/ri_triggers.c:2594
 #, c-format
-msgid "INTERVAL units '%s' not supported"
+msgid "too many keys (%d max) in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2268
-#, c-format
-msgid "Unable to truncate INTERVAL to '%s'"
+#: utils/adt/ri_triggers.c:2658
+msgid "SPI_connect() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2273
-msgid "Unable to decode INTERVAL; internal coding error"
+#: utils/adt/ri_triggers.c:2781
+msgid "SPI_execp() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2301
-msgid "isoweek2date(): can't convert without year information"
+#: utils/adt/ri_triggers.c:2786
+msgid "SPI_finish() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2482 ../utils/adt/timestamp.c:2489
-msgid "Unable to encode TIMESTAMP"
+#: utils/adt/ri_triggers.c:2803
+msgid "internal error #10 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2638 ../utils/adt/timestamp.c:2645
-msgid "Unable to encode TIMESTAMP WITH TIME ZONE"
+#: utils/adt/ri_triggers.c:2841
+msgid "RI_FKey_setdefault_upd() not fired by trigger manager"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2763
-msgid ""
-"Unable to decode INTERVAL\n"
-"\tinterval_part() internal coding error"
+#: utils/adt/ri_triggers.c:2844
+msgid "RI_FKey_setdefault_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2880
-msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
+#: utils/adt/ri_triggers.c:2846
+msgid "RI_FKey_setdefault_upd() must be fired for UPDATE"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2885
-msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
+#: utils/adt/ri_triggers.c:2854
+msgid "wrong # of arguments in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2910
-msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP (tm)"
+#: utils/adt/ri_triggers.c:2856
+#, c-format
+msgid "too many keys (%d max) in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2913
-msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP"
+#: utils/adt/ri_triggers.c:2933
+msgid "SPI_connect() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:2967
-msgid ""
-"Unable to decode TIMESTAMP WITH TIME ZONE\n"
-"\ttimestamptz_zone() internal coding error"
+#: utils/adt/ri_triggers.c:3072
+msgid "SPI_execp() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: ../utils/adt/timestamp.c:3028
-msgid ""
-"Unable to decode TIMESTAMP WITH TIME ZONE\n"
-"\ttimestamptz_izone() internal coding error"
+#: utils/adt/ri_triggers.c:3077
+msgid "SPI_finish() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:175
-msgid "RI_FKey_check() not fired by trigger manager"
+#: utils/adt/ri_triggers.c:3094
+msgid "internal error #11 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:178
-msgid "RI_FKey_check() must be fired AFTER ROW"
+#: utils/adt/ri_triggers.c:3125
+msgid "wrong # of arguments in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:181
-msgid "RI_FKey_check() must be fired for INSERT or UPDATE"
+#: utils/adt/ri_triggers.c:3127
+#, c-format
+msgid "too many keys (%d max) in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:189
-msgid "wrong # of arguments in call to RI_FKey_check()"
+#: utils/adt/ri_triggers.c:3184
+msgid "internal error #12 in ri_triggers.c"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:191
+#: utils/adt/ri_triggers.c:3249
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_check()"
+msgid "unrecognized referential integrity MATCH type '%s'"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:254 ../utils/adt/ri_triggers.c:365
-msgid "SPI_connect() failed in RI_FKey_check()"
+#: utils/adt/ri_triggers.c:3299 utils/adt/ri_triggers.c:3307
+#: utils/adt/ri_triggers.c:3359
+#, c-format
+msgid "constraint %s: table %s does not have an attribute %s"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:261 ../utils/adt/ri_triggers.c:443
-msgid "SPI_execp() failed in RI_FKey_check()"
+#: utils/adt/ri_triggers.c:3487
+msgid "out of memory for RI plan cache"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:266
+#: utils/adt/ri_triggers.c:3676
 #, c-format
-msgid "%s referential integrity violation - no rows found in %s"
+msgid "ri_AttributesEqual(): cannot find '=' operator for type %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:272 ../utils/adt/ri_triggers.c:455
-msgid "SPI_finish() failed in RI_FKey_check()"
+#: utils/adt/ri_triggers.c:3692
+msgid "out of memory for RI operator cache"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:282 ../utils/adt/ri_triggers.c:686
-#: ../utils/adt/ri_triggers.c:900 ../utils/adt/ri_triggers.c:1093
-#: ../utils/adt/ri_triggers.c:1317 ../utils/adt/ri_triggers.c:1528
-#: ../utils/adt/ri_triggers.c:1750 ../utils/adt/ri_triggers.c:1954
-#: ../utils/adt/ri_triggers.c:2207 ../utils/adt/ri_triggers.c:2456
-#: ../utils/adt/ri_triggers.c:2732 ../utils/adt/ri_triggers.c:2813
-msgid "MATCH PARTIAL not yet supported"
-msgstr ""
+#: utils/adt/ruleutils.c:198
+msgid "get_ruledef: cannot connect to SPI manager"
+msgstr "get_ruledef: kann nicht mit SPI-Manager verbinden"
 
-#: ../utils/adt/ri_triggers.c:318
+#: utils/adt/ruleutils.c:213 utils/adt/ruleutils.c:330
 #, c-format
-msgid ""
-"%s referential integrity violation - MATCH FULL doesn't allow mixing of NULL "
-"and NON-NULL key values"
-msgstr ""
+msgid "SPI_prepare() failed for \"%s\""
+msgstr "SPI_prepare() f�r �%s� fehlgeschlagen"
 
-#: ../utils/adt/ri_triggers.c:342
-msgid "MATCH PARTIAL not yet implemented"
+#: utils/adt/ruleutils.c:224
+#, c-format
+msgid "failed to get pg_rewrite tuple for %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:448
+#: utils/adt/ruleutils.c:228 utils/adt/ruleutils.c:253
+msgid "get_ruledef: SPI_finish() failed"
+msgstr "get_ruledef: SPI_finish() fehlgeschlagen"
+
+#: utils/adt/ruleutils.c:314
+msgid "get_viewdef: cannot connect to SPI manager"
+msgstr "get_viewdef: kann nicht mit SPI-Manager verbinden"
+
+#: utils/adt/ruleutils.c:343
 #, c-format
-msgid ""
-"%s referential integrity violation - key referenced from %s not found in %s"
+msgid "failed to get pg_rewrite tuple for view %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:462
-msgid "internal error #1 in ri_triggers.c"
-msgstr ""
+#: utils/adt/ruleutils.c:366
+msgid "get_viewdef: SPI_finish() failed"
+msgstr "get_viewdef: SPI_finish() fehlgeschlagen"
 
-#: ../utils/adt/ri_triggers.c:527
-msgid "RI_FKey_noaction_del() not fired by trigger manager"
-msgstr ""
+#: utils/adt/ruleutils.c:402
+#, c-format
+msgid "syscache lookup for index %u failed"
+msgstr "Syscache-Suche nach Index %u fehlgeschlagen"
 
-#: ../utils/adt/ri_triggers.c:530
-msgid "RI_FKey_noaction_del() must be fired AFTER ROW"
-msgstr ""
+#: utils/adt/ruleutils.c:415
+#, c-format
+msgid "syscache lookup for relid %u failed"
+msgstr "Syscache-Suche nach Relid %u fehlgeschlagen"
 
-#: ../utils/adt/ri_triggers.c:532
-msgid "RI_FKey_noaction_del() must be fired for DELETE"
+#: utils/adt/ruleutils.c:580
+#, c-format
+msgid "Failed to find constraint with OID %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:540
-msgid "wrong # of arguments in call to RI_FKey_noaction_del()"
+#: utils/adt/ruleutils.c:600
+#, c-format
+msgid "pg_get_constraintdef: Null conkey for constraint %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:542
+#: utils/adt/ruleutils.c:613
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_noaction_del()"
+msgid "pg_get_constraintdef: Null confkey for constraint %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:597
-msgid "SPI_connect() failed in RI_FKey_noaction_del()"
+#: utils/adt/ruleutils.c:633
+#, c-format
+msgid "pg_get_constraintdef: Unknown confmatchtype '%c' for constraint %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:666
-msgid "SPI_execp() failed in RI_FKey_noaction_del()"
+#: utils/adt/ruleutils.c:659
+#, c-format
+msgid "pg_get_constraintdef: Unknown confupdtype '%c' for constraint %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:671 ../utils/adt/ri_triggers.c:885
-#: ../utils/adt/ri_triggers.c:1513 ../utils/adt/ri_triggers.c:1735
+#: utils/adt/ruleutils.c:684
 #, c-format
-msgid "%s referential integrity violation - key in %s still referenced from %s"
+msgid "pg_get_constraintdef: Unknown confdeltype '%c' for constraint %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:678
-msgid "SPI_finish() failed in RI_FKey_noaction_del()"
+#: utils/adt/ruleutils.c:698
+#, c-format
+msgid "pg_get_constraintdef: unsupported constraint type '%c'"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:693
-msgid "internal error #2 in ri_triggers.c"
+#: utils/adt/ruleutils.c:1100
+#, c-format
+msgid "get_ruledef: rule %s has unsupported event type %d"
+msgstr "get_ruledef: Rule %s hat nicht unterst�tzten Ereignistyp %d"
+
+#: utils/adt/ruleutils.c:1302
+#, c-format
+msgid "get_query_def: unknown query command type %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:733
-msgid "RI_FKey_noaction_upd() not fired by trigger manager"
+#: utils/adt/ruleutils.c:1537
+#, c-format
+msgid "get_setop_query: unexpected set op %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:736
-msgid "RI_FKey_noaction_upd() must be fired AFTER ROW"
+#: utils/adt/ruleutils.c:1549
+#, c-format
+msgid "get_setop_query: unexpected node %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:738
-msgid "RI_FKey_noaction_upd() must be fired for UPDATE"
+#: utils/adt/ruleutils.c:1609
+msgid "get_insert_query_def: too many RTEs in INSERT!"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:746
-msgid "wrong # of arguments in call to RI_FKey_noaction_upd()"
+#: utils/adt/ruleutils.c:1761
+msgid "get_utility_query_def: unexpected statement type"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:748
+#: utils/adt/ruleutils.c:1792
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_noaction_upd()"
+msgid "get_names_for_var: bogus varlevelsup %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:811
-msgid "SPI_connect() failed in RI_FKey_noaction_upd()"
+#: utils/adt/ruleutils.c:1806
+#, c-format
+msgid "get_names_for_var: bogus varno %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:880
-msgid "SPI_execp() failed in RI_FKey_noaction_upd()"
+#: utils/adt/ruleutils.c:2036
+#, c-format
+msgid "get_rule_expr: expr opType %d not supported"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:892
-msgid "SPI_finish() failed in RI_FKey_noaction_upd()"
+#: utils/adt/ruleutils.c:2096
+#, c-format
+msgid "Argument type %s of FieldSelect is not a tuple type"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:907
-msgid "internal error #3 in ri_triggers.c"
+#: utils/adt/ruleutils.c:2178
+#, c-format
+msgid "get_rule_expr: unexpected nulltesttype %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:943
-msgid "RI_FKey_cascade_del() not fired by trigger manager"
+#: utils/adt/ruleutils.c:2211
+#, c-format
+msgid "get_rule_expr: unexpected booltesttype %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:946
-msgid "RI_FKey_cascade_del() must be fired AFTER ROW"
+#: utils/adt/ruleutils.c:2256
+#, c-format
+msgid "get_rule_expr: unknown node type %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:948
-msgid "RI_FKey_cascade_del() must be fired for DELETE"
+#: utils/adt/ruleutils.c:2297
+#, c-format
+msgid "cache lookup for operator %u failed"
+msgstr "Cachesuche nach Operator %u fehlgeschlagen"
+
+#: utils/adt/ruleutils.c:2316
+msgid "get_rule_expr: bogus oprkind"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:956
-msgid "wrong # of arguments in call to RI_FKey_cascade_del()"
+#: utils/adt/ruleutils.c:2676
+#, c-format
+msgid "get_sublink_expr: unsupported sublink type %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:958
+#: utils/adt/ruleutils.c:2769
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_cascade_del()"
+msgid "unexpected rte kind %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1014
-msgid "SPI_connect() failed in RI_FKey_cascade_del()"
+#: utils/adt/ruleutils.c:2841
+#, c-format
+msgid "get_from_clause_item: unknown join type %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1080
-msgid "SPI_execp() failed in RI_FKey_cascade_del()"
+#: utils/adt/ruleutils.c:2891
+#, c-format
+msgid "get_from_clause_item: unexpected node type %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1085
-msgid "SPI_finish() failed in RI_FKey_cascade_del()"
+#: utils/adt/ruleutils.c:2958 utils/cache/lsyscache.c:250
+#, c-format
+msgid "cache lookup failed for opclass %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1100
-msgid "internal error #4 in ri_triggers.c"
+#: utils/adt/ruleutils.c:2998
+msgid "tleIsArrayAssign: I'm confused ..."
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1138
-msgid "RI_FKey_cascade_upd() not fired by trigger manager"
+#: utils/adt/ruleutils.c:3215
+#, c-format
+msgid "cache lookup of operator %u failed"
+msgstr "Cachesuche nach Operator %u fehlgeschlagen"
+
+#: utils/adt/ruleutils.c:3236
+#, c-format
+msgid "unexpected oprkind %c for operator %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1141
-msgid "RI_FKey_cascade_upd() must be fired AFTER ROW"
+#: utils/adt/selfuncs.c:878
+#, c-format
+msgid "patternsel: no = operator for type %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1143
-msgid "RI_FKey_cascade_upd() must be fired for UPDATE"
+#: utils/adt/selfuncs.c:1055 utils/adt/selfuncs.c:1132
+#: utils/adt/selfuncs.c:1173 utils/adt/selfuncs.c:1203
+#, c-format
+msgid "booltestsel: unexpected booltesttype %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1151
-msgid "wrong # of arguments in call to RI_FKey_cascade_upd()"
+#: utils/adt/selfuncs.c:1238 utils/adt/selfuncs.c:1292
+#, c-format
+msgid "nulltestsel: unexpected nulltesttype %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1153
+#: utils/adt/selfuncs.c:2105
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_cascade_upd()"
+msgid "convert_numeric_to_scalar: unsupported type %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1217
-msgid "SPI_connect() failed in RI_FKey_cascade_upd()"
+#: utils/adt/selfuncs.c:2292
+#, c-format
+msgid "convert_string_datum: unsupported type %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1304
-msgid "SPI_execp() failed in RI_FKey_cascade_upd()"
+#: utils/adt/selfuncs.c:2481
+#, c-format
+msgid "convert_timevalue_to_scalar: unsupported type %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1309
-msgid "SPI_finish() failed in RI_FKey_cascade_upd()"
+#: utils/adt/selfuncs.c:2708 utils/adt/selfuncs.c:3076
+msgid "Cannot perform case insensitive matching on type BYTEA"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1324
-msgid "internal error #5 in ri_triggers.c"
+#: utils/adt/selfuncs.c:2793 utils/adt/selfuncs.c:3222
+msgid "Regex matching not supported on type BYTEA"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1367
-msgid "RI_FKey_restrict_del() not fired by trigger manager"
+#: utils/adt/selfuncs.c:2934
+msgid "pattern_fixed_prefix: bogus ptype"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1370
-msgid "RI_FKey_restrict_del() must be fired AFTER ROW"
+#: utils/adt/selfuncs.c:2963
+#, c-format
+msgid "prefix_selectivity: no >= operator for type %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1372
-msgid "RI_FKey_restrict_del() must be fired for DELETE"
+#: utils/adt/selfuncs.c:2994
+#, c-format
+msgid "prefix_selectivity: no < operator for type %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1380
-msgid "wrong # of arguments in call to RI_FKey_restrict_del()"
+#: utils/adt/selfuncs.c:3266
+msgid "pattern_selectivity: bogus ptype"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1382
+#: utils/adt/selfuncs.c:3432
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_restrict_del()"
+msgid "string_lessthan: unexpected datatype %u"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1438
-msgid "SPI_connect() failed in RI_FKey_restrict_del()"
+#: utils/adt/sets.c:87
+#, c-format
+msgid "SetDefine: unable to define set %s"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1508
-msgid "SPI_execp() failed in RI_FKey_restrict_del()"
+#: utils/adt/tid.c:62
+#, c-format
+msgid "invalid tid format: '%s'"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1520
-msgid "SPI_finish() failed in RI_FKey_restrict_del()"
-msgstr ""
+#: utils/adt/tid.c:67 utils/adt/tid.c:72
+msgid "tidin: invalid value."
+msgstr "tidin: ung�ltiger Wert"
 
-#: ../utils/adt/ri_triggers.c:1535
-msgid "internal error #6 in ri_triggers.c"
+#: utils/adt/tid.c:171
+msgid "ctid isn't of type TID"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1579
-msgid "RI_FKey_restrict_upd() not fired by trigger manager"
+#: utils/adt/tid.c:176
+msgid "currtid can't handle views with no CTID"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1582
-msgid "RI_FKey_restrict_upd() must be fired AFTER ROW"
+#: utils/adt/tid.c:178
+msgid "the view has no rules"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1584
-msgid "RI_FKey_restrict_upd() must be fired for UPDATE"
+#: utils/adt/tid.c:188
+msgid "only one select rule is allowed in views"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1592
-msgid "wrong # of arguments in call to RI_FKey_restrict_upd()"
+#: utils/adt/tid.c:209
+msgid "currtid can't handle this view"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1594
+#: utils/adt/timestamp.c:80
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_restrict_upd()"
+msgid "Bad timestamp external representation (too long) '%s'"
+msgstr "fehlerhaftes Format f�r �timestamp� (zu lang): %s"
+
+#: utils/adt/timestamp.c:84 utils/adt/timestamp.c:278
+#, c-format
+msgid "Bad timestamp external representation '%s'"
+msgstr "fehlerhaftes Format f�r �timestamp�: %s"
+
+#: utils/adt/timestamp.c:90
+#, c-format
+msgid "TIMESTAMP out of range '%s'"
+msgstr "TIMESTAMP au�erhalb des g�ltigen Bereichs: %s"
+
+#: utils/adt/timestamp.c:106
+#, c-format
+msgid "TIMESTAMP '%s' no longer supported"
+msgstr "TIMESTAMP '%s' wird nicht mehr unterst�tzt"
+
+#: utils/adt/timestamp.c:111
+#, c-format
+msgid "TIMESTAMP '%s' not parsed; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1658
-msgid "SPI_connect() failed in RI_FKey_restrict_upd()"
+#: utils/adt/timestamp.c:139
+msgid "Unable to format timestamp; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1730
-msgid "SPI_execp() failed in RI_FKey_restrict_upd()"
+#: utils/adt/timestamp.c:213
+#, c-format
+msgid "TIMESTAMP(%d) precision must be between %d and %d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1742
-msgid "SPI_finish() failed in RI_FKey_restrict_upd()"
+#: utils/adt/timestamp.c:273
+#, c-format
+msgid "Bad timestamp with time zone external representation (too long) '%s'"
+msgstr "fehlerhaftes Format f�r �timestamp with timezone� (zu lang): %s"
+
+#: utils/adt/timestamp.c:284
+#, c-format
+msgid "TIMESTAMP WITH TIME ZONE out of range '%s'"
+msgstr "TIMESTAMP WITH TIME ZONE au�erhalb des g�ltigen Bereichs: %s"
+
+#: utils/adt/timestamp.c:300
+#, c-format
+msgid "TIMESTAMP WITH TIME ZONE '%s' no longer supported"
+msgstr "TIMESTAMP WITH TIME ZONE '%s' wird nicht mehr unterst�tzt"
+
+#: utils/adt/timestamp.c:305
+#, c-format
+msgid "TIMESTAMP WITH TIME ZONE '%s' not parsed; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1757
-msgid "internal error #7 in ri_triggers.c"
+#: utils/adt/timestamp.c:334
+msgid "Unable to format timestamp with time zone; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1793
-msgid "RI_FKey_setnull_del() not fired by trigger manager"
+#: utils/adt/timestamp.c:393
+#, c-format
+msgid "Bad interval external representation (too long) '%s'"
+msgstr "fehlerhaftes Format f�r �interval� (zu lang): %s"
+
+#: utils/adt/timestamp.c:397 utils/adt/timestamp.c:405
+#, c-format
+msgid "Bad interval external representation '%s'"
+msgstr "fehlerhaftes Format f�r �interval�: %s"
+
+#: utils/adt/timestamp.c:410
+#, c-format
+msgid "Interval '%s' no longer supported"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1796
-msgid "RI_FKey_setnull_del() must be fired AFTER ROW"
+#: utils/adt/timestamp.c:414
+#, c-format
+msgid "Interval '%s' not parsed; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1798
-msgid "RI_FKey_setnull_del() must be fired for DELETE"
+#: utils/adt/timestamp.c:434
+msgid "Unable to encode interval; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1806
-msgid "wrong # of arguments in call to RI_FKey_setnull_del()"
+#: utils/adt/timestamp.c:437
+msgid "Unable to format interval; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1808
-#, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setnull_del()"
+#: utils/adt/timestamp.c:695
+msgid "AdjustIntervalForTypmod(): internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1864
-msgid "SPI_connect() failed in RI_FKey_setnull_del()"
+#: utils/adt/timestamp.c:1525
+msgid "Unable to subtract non-finite timestamps"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1941
-msgid "SPI_execp() failed in RI_FKey_setnull_del()"
+#: utils/adt/timestamp.c:1587
+msgid ""
+"Unable to add TIMESTAMP and INTERVAL\n"
+"\ttimestamp_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1946
-msgid "SPI_finish() failed in RI_FKey_setnull_del()"
+#: utils/adt/timestamp.c:1594
+msgid ""
+"Unable to add TIMESTAMP and INTERVAL\n"
+"\ttimestamp_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:1961
-msgid "internal error #8 in ri_triggers.c"
+#: utils/adt/timestamp.c:1672
+msgid ""
+"Unable to add TIMESTAMP and INTERVAL\n"
+"\ttimestamptz_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2000
-msgid "RI_FKey_setnull_upd() not fired by trigger manager"
+#: utils/adt/timestamp.c:1677
+msgid ""
+"Unable to add TIMESTAMP and INTERVAL\n"
+"\ttimestamptz_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2003
-msgid "RI_FKey_setnull_upd() must be fired AFTER ROW"
+#: utils/adt/timestamp.c:1906
+msgid "interval_div: divide by 0.0 error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2005
-msgid "RI_FKey_setnull_upd() must be fired for UPDATE"
+#: utils/adt/timestamp.c:1951
+msgid "interval_accum: expected 2-element interval array"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2013
-msgid "wrong # of arguments in call to RI_FKey_setnull_upd()"
+#: utils/adt/timestamp.c:1993
+msgid "interval_avg: expected 2-element interval array"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2015
-#, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setnull_upd()"
+#: utils/adt/timestamp.c:2115
+msgid ""
+"Unable to encode INTERVAL\n"
+"\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2081
-msgid "SPI_connect() failed in RI_FKey_setnull_upd()"
+#: utils/adt/timestamp.c:2119
+msgid ""
+"Unable to decode TIMESTAMP\n"
+"\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2194
-msgid "SPI_execp() failed in RI_FKey_setnull_upd()"
+#: utils/adt/timestamp.c:2224 utils/adt/timestamp.c:2227
+msgid "Unable to decode TIMESTAMP"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2199
-msgid "SPI_finish() failed in RI_FKey_setnull_upd()"
+#: utils/adt/timestamp.c:2280
+msgid "TIMESTAMP bad external representation (too long)"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2214
-msgid "internal error #9 in ri_triggers.c"
+#: utils/adt/timestamp.c:2336
+msgid "TIMESTAMP WITH TIME ZONE bad external representation (too long)"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2250
-msgid "RI_FKey_setdefault_del() not fired by trigger manager"
+#: utils/adt/timestamp.c:2393
+msgid "INTERVAL bad external representation (too long)"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2253
-msgid "RI_FKey_setdefault_del() must be fired AFTER ROW"
+#: utils/adt/timestamp.c:2426 utils/adt/timestamp.c:2490
+#: utils/adt/timestamp.c:2790 utils/adt/timestamp.c:2932
+#, c-format
+msgid "TIMESTAMP units '%s' not recognized"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2255
-msgid "RI_FKey_setdefault_del() must be fired for DELETE"
+#: utils/adt/timestamp.c:2481 utils/adt/timestamp.c:2893
+#: utils/adt/timestamp.c:2925
+#, c-format
+msgid "TIMESTAMP units '%s' not supported"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2263
-msgid "wrong # of arguments in call to RI_FKey_setdefault_del()"
+#: utils/adt/timestamp.c:2486
+#, c-format
+msgid "Unable to truncate TIMESTAMP to '%s'"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2265
+#: utils/adt/timestamp.c:2519 utils/adt/timestamp.c:2584
+#: utils/adt/timestamp.c:2962 utils/adt/timestamp.c:3115
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setdefault_del()"
+msgid "TIMESTAMP WITH TIME ZONE units '%s' not recognized"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2320
-msgid "SPI_connect() failed in RI_FKey_setdefault_del()"
+#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:3076
+#: utils/adt/timestamp.c:3109
+#, c-format
+msgid "TIMESTAMP WITH TIME ZONE units '%s' not supported"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2443
-msgid "SPI_execp() failed in RI_FKey_setdefault_del()"
+#: utils/adt/timestamp.c:2580
+#, c-format
+msgid "Unable to truncate TIMESTAMP WITH TIME ZONE to '%s'"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2448
-msgid "SPI_finish() failed in RI_FKey_setdefault_del()"
+#: utils/adt/timestamp.c:2613 utils/adt/timestamp.c:2681
+#: utils/adt/timestamp.c:3143 utils/adt/timestamp.c:3252
+#, c-format
+msgid "INTERVAL units '%s' not recognized"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2463
-msgid "internal error #10 in ri_triggers.c"
+#: utils/adt/timestamp.c:2666 utils/adt/timestamp.c:3223
+#, c-format
+msgid "INTERVAL units '%s' not supported"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2501
-msgid "RI_FKey_setdefault_upd() not fired by trigger manager"
+#: utils/adt/timestamp.c:2670
+#, c-format
+msgid "Unable to truncate INTERVAL to '%s'"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2504
-msgid "RI_FKey_setdefault_upd() must be fired AFTER ROW"
+#: utils/adt/timestamp.c:2675
+msgid "Unable to decode INTERVAL; internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2506
-msgid "RI_FKey_setdefault_upd() must be fired for UPDATE"
+#: utils/adt/timestamp.c:2703
+msgid "isoweek2date(): can't convert without year information"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2514
-msgid "wrong # of arguments in call to RI_FKey_setdefault_upd()"
+#: utils/adt/timestamp.c:2911 utils/adt/timestamp.c:2918
+msgid "Unable to encode TIMESTAMP"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2516
-#, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setdefault_upd()"
+#: utils/adt/timestamp.c:3095 utils/adt/timestamp.c:3102
+msgid "Unable to encode TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2581
-msgid "SPI_connect() failed in RI_FKey_setdefault_upd()"
+#: utils/adt/timestamp.c:3232
+msgid ""
+"Unable to decode INTERVAL\n"
+"\tinterval_part() internal coding error"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2719
-msgid "SPI_execp() failed in RI_FKey_setdefault_upd()"
+#: utils/adt/timestamp.c:3360
+msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2724
-msgid "SPI_finish() failed in RI_FKey_setdefault_upd()"
+#: utils/adt/timestamp.c:3365
+msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2739
-msgid "internal error #11 in ri_triggers.c"
+#: utils/adt/timestamp.c:3390
+msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP (tm)"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2770
-msgid "wrong # of arguments in call to RI_FKey_keyequal_upd()"
+#: utils/adt/timestamp.c:3393
+msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:2772
+#: utils/adt/varbit.c:106 utils/adt/varbit.c:231
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_keyequal_upd()"
-msgstr ""
+msgid "Bit string length %d does not match type BIT(%d)"
+msgstr "L�nge der Bitkette %d stimmt nicht mit Typ BIT(%d) �berein"
 
-#: ../utils/adt/ri_triggers.c:2820
-msgid "internal error #12 in ri_triggers.c"
-msgstr ""
+#: utils/adt/varbit.c:127 utils/adt/varbit.c:336
+#, c-format
+msgid "Cannot parse '%c' as a binary digit"
+msgstr "Kann %c nicht als Bin�rziffer lesen"
 
-#: ../utils/adt/ri_triggers.c:2853
+#: utils/adt/varbit.c:148 utils/adt/varbit.c:357
 #, c-format
-msgid "unrecognized referential integrity MATCH type '%s'"
-msgstr ""
+msgid "Cannot parse '%c' as a hex digit"
+msgstr "kann %c nicht als Hexadezimalziffer lesen"
 
-#: ../utils/adt/ri_triggers.c:2903 ../utils/adt/ri_triggers.c:2911
+#: utils/adt/varbit.c:315 utils/adt/varbit.c:436
 #, c-format
-msgid "constraint %s: table %s does not have an attribute %s"
+msgid "Bit string too long for type BIT VARYING(%d)"
+msgstr "Bitkette ist zu lang f�r Typ BIT VARYING(%d)"
+
+#: utils/adt/varbit.c:806
+msgid "Cannot AND bit strings of different sizes"
+msgstr "bin�res �Und� nicht mit Bitketten unterschiedlicher L�nge m�glich"
+
+#: utils/adt/varbit.c:844
+msgid "Cannot OR bit strings of different sizes"
+msgstr "bin�res �Oder� nicht mit Bitketten unterschiedlicher L�nge m�glich"
+
+#: utils/adt/varbit.c:888
+msgid "Cannot XOR bit strings of different sizes"
 msgstr ""
+"bin�res �Exklusiv-Oder� nicht mit Bitketten unterschiedlicher L�nge m�glich"
 
-#: ../utils/adt/ri_triggers.c:3040
-msgid "out of memory for RI plan cache"
+#: utils/adt/varbit.c:1103
+msgid "Bit string is too large to fit in type integer"
+msgstr "Bitkette ist zu lang f�r Typ integer"
+
+#: utils/adt/varbit.c:1147 utils/adt/varbit.c:1174
+msgid "INT64 is not supported on this platform"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:3234
+#: utils/adt/varbit.c:1162
+msgid "Bit string is too large to fit in type int64"
+msgstr "Bitkette ist zu lang f�r Typ int64"
+
+#: utils/adt/varbit.c:1254
 #, c-format
-msgid "ri_AttributesEqual(): cannot find '=' operator for type %u"
+msgid "S. %d %d em=%2x sm=%2x r=%d"
 msgstr ""
 
-#: ../utils/adt/ri_triggers.c:3252
-msgid "out of memory for RI operator cache"
-msgstr ""
+#: utils/adt/varchar.c:107 utils/adt/varchar.c:213
+#, c-format
+msgid "value too long for type character(%d)"
+msgstr "Wert zu lang f�r Typ character(%d)"
 
-#: ../utils/adt/encode.c:53 ../utils/adt/encode.c:87
+#: utils/adt/varchar.c:369 utils/adt/varchar.c:447
 #, c-format
-msgid "No such encoding as '%s'"
+msgid "value too long for type character varying(%d)"
+msgstr "Wert zu lang f�r Typ character varying(%d)"
+
+#: utils/adt/varlena.c:107 utils/adt/varlena.c:145
+msgid "Bad input string for type bytea"
 msgstr ""
 
-#: ../utils/adt/encode.c:62
-msgid "Overflow - encode estimate too small"
+#: utils/adt/varlena.c:337 utils/adt/varlena.c:620 utils/adt/varlena.c:723
+msgid "Invalid backend encoding; encoding max length is less than one."
 msgstr ""
 
-#: ../utils/adt/encode.c:96
-msgid "Overflow - decode estimate too small"
+#: utils/adt/varlena.c:484 utils/adt/varlena.c:546 utils/adt/varlena.c:1043
+msgid "negative substring length not allowed"
 msgstr ""
 
-#: ../utils/adt/encode.c:144
+#: utils/adt/varlena.c:1136
 #, c-format
-msgid "Bad hex code: '%c'"
+msgid "byteaGetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: ../utils/adt/encode.c:170
-msgid "hex_decode: invalid data"
+#: utils/adt/varlena.c:1165
+#, c-format
+msgid "byteaGetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: ../utils/adt/encode.c:284
-msgid "base64: unexpected '='"
+#: utils/adt/varlena.c:1199
+#, c-format
+msgid "byteaSetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: ../utils/adt/encode.c:294
-msgid "base64: Invalid symbol"
+#: utils/adt/varlena.c:1240
+#, c-format
+msgid "byteaSetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: ../utils/adt/encode.c:312
-msgid "base64: invalid end sequence"
+#: utils/adt/varlena.c:1250
+msgid "byteaSetBit: new bit must be 0 or 1"
 msgstr ""
 
-#: ../utils/adt/encode.c:419 ../utils/adt/encode.c:482
-msgid "decode: Bad input string for type bytea"
+#: utils/adt/varlena.c:1741
+msgid "field position must be > 0"
 msgstr ""
 
-#: ../utils/adt/varchar.c:120 ../utils/adt/varchar.c:132
-#: ../utils/adt/varchar.c:232 ../utils/adt/varchar.c:245
-#, c-format
-msgid "value too long for type character(%d)"
-msgstr "Wert zu lang f�r Typ character(%d)"
-
-#: ../utils/adt/varchar.c:448 ../utils/adt/varchar.c:519
-#: ../utils/adt/varchar.c:527
+#: utils/adt/pseudotypes.c:35 utils/adt/pseudotypes.c:86
+#: utils/adt/pseudotypes.c:109 utils/adt/pseudotypes.c:157
+#: utils/adt/pseudotypes.c:180 utils/adt/pseudotypes.c:203
+#: utils/adt/pseudotypes.c:226
 #, c-format
-msgid "value too long for type character varying(%d)"
-msgstr "Wert zu lang f�r Typ character varying(%d)"
-
-#: ../utils/adt/pgstatfuncs.c:186
-msgid ""
-"pg_stat_get_backend_idset: called in context that does not accept a set "
-"result"
+msgid "Cannot accept a constant of type %s"
 msgstr ""
 
-#: ../utils/adt/pgstatfuncs.c:191
-msgid "No function memory context in set-function"
+#: utils/adt/pseudotypes.c:46 utils/adt/pseudotypes.c:97
+#: utils/adt/pseudotypes.c:168 utils/adt/pseudotypes.c:191
+#: utils/adt/pseudotypes.c:214 utils/adt/pseudotypes.c:237
+#, c-format
+msgid "Cannot display a value of type %s"
 msgstr ""
 
-#: ../utils/adt/format_type.c:141 ../utils/adt/format_type.c:159
+#: utils/fmgr/fmgr.c:187
 #, c-format
-msgid "could not locate data type with oid %u in catalog"
+msgid "fmgr_info: function %u: cache lookup failed"
 msgstr ""
 
-#: ../utils/adt/format_type.c:297
+#: utils/fmgr/fmgr.c:220
 #, c-format
-msgid "Invalid INTERVAL typmod 0x%x"
+msgid "fmgr_info: function %s not in internal table"
 msgstr ""
 
-#: ../utils/adt/varlena.c:71 ../utils/adt/varlena.c:109
-msgid "Bad input string for type bytea"
+#: utils/fmgr/fmgr.c:267
+#, c-format
+msgid "fmgr: Could not extract prosrc for %u from pg_proc"
 msgstr ""
 
-#: ../utils/adt/varlena.c:842
+#: utils/fmgr/fmgr.c:274
 #, c-format
-msgid "byteaGetByte: index %d out of range [0..%d]"
+msgid "fmgr: Could not extract probin for %u from pg_proc"
 msgstr ""
 
-#: ../utils/adt/varlena.c:871
+#: utils/fmgr/fmgr.c:307
 #, c-format
-msgid "byteaGetBit: index %d out of range [0..%d]"
+msgid "Unknown function API version %d"
 msgstr ""
 
-#: ../utils/adt/varlena.c:905
+#: utils/fmgr/fmgr.c:333
 #, c-format
-msgid "byteaSetByte: index %d out of range [0..%d]"
+msgid "fmgr_info: cache lookup for language %u failed"
 msgstr ""
 
-#: ../utils/adt/varlena.c:946
+#: utils/fmgr/fmgr.c:346
 #, c-format
-msgid "byteaSetBit: index %d out of range [0..%d]"
+msgid "fmgr_info: language %u has old-style handler"
 msgstr ""
 
-#: ../utils/adt/varlena.c:956
-msgid "byteaSetBit: new bit must be 0 or 1"
+#: utils/fmgr/fmgr.c:394
+#, c-format
+msgid "Null result from %s"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:98
+#: utils/fmgr/fmgr.c:402
 #, c-format
-msgid "stat failed on file '%s': %m"
+msgid "Unknown version %d reported by %s"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:115
-msgid "Out of memory in load_external_function"
+#: utils/fmgr/fmgr.c:470
+msgid "Internal error: fmgr_oldstyle received NULL pointer"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:128
+#: utils/fmgr/fmgr.c:619
 #, c-format
-msgid "Load of file %s failed: %s"
+msgid "fmgr_oldstyle: function %u: too many arguments (%d > %d)"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:155
+#: utils/fmgr/fmgr.c:666
 #, c-format
-msgid "Can't find function %s in file %s"
+msgid "fmgr_security_definer: function %u: cache lookup failed"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:185
+#: utils/fmgr/fmgr.c:728
 #, c-format
-msgid "LOAD: could not open file '%s': %m"
+msgid "DirectFunctionCall1: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:240
+#: utils/fmgr/fmgr.c:756
 #, c-format
-msgid "stat failed on %s: %s"
+msgid "DirectFunctionCall2: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:335
-msgid "invalid macro name in dynamic library path"
+#: utils/fmgr/fmgr.c:779
+#, c-format
+msgid "DirectFunctionCall3: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:385
-msgid "zero length dynamic_library_path component"
+#: utils/fmgr/fmgr.c:803
+#, c-format
+msgid "DirectFunctionCall4: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:396
-msgid "dynamic_library_path component is not absolute"
+#: utils/fmgr/fmgr.c:828
+#, c-format
+msgid "DirectFunctionCall5: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/dfmgr.c:403
+#: utils/fmgr/fmgr.c:855
 #, c-format
-msgid "find_in_dynamic_libpath: trying %s"
+msgid "DirectFunctionCall6: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:172
+#: utils/fmgr/fmgr.c:883
 #, c-format
-msgid "fmgr_info: function %u: cache lookup failed"
+msgid "DirectFunctionCall7: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:206
+#: utils/fmgr/fmgr.c:912
 #, c-format
-msgid "fmgr_info: function %s not in internal table"
+msgid "DirectFunctionCall8: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:253
+#: utils/fmgr/fmgr.c:943
 #, c-format
-msgid "fmgr: Could not extract prosrc for %u from pg_proc"
+msgid "DirectFunctionCall9: function %p returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:260
+#: utils/fmgr/fmgr.c:974
 #, c-format
-msgid "fmgr: Could not extract probin for %u from pg_proc"
+msgid "FunctionCall1: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:293
+#: utils/fmgr/fmgr.c:1002 utils/sort/tuplesort.c:1827
 #, c-format
-msgid "Unknown function API version %d"
+msgid "FunctionCall2: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:318
+#: utils/fmgr/fmgr.c:1026
 #, c-format
-msgid "fmgr_info: cache lookup for language %u failed"
+msgid "FunctionCall3: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:334
+#: utils/fmgr/fmgr.c:1051
 #, c-format
-msgid "fmgr_info: language %u has old-style handler"
+msgid "FunctionCall4: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:339
+#: utils/fmgr/fmgr.c:1077
 #, c-format
-msgid "fmgr_info: function %u: unsupported language %u"
+msgid "FunctionCall5: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:387
+#: utils/fmgr/fmgr.c:1105
 #, c-format
-msgid "Null result from %s"
+msgid "FunctionCall6: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:395
+#: utils/fmgr/fmgr.c:1134
 #, c-format
-msgid "Unknown version %d reported by %s"
+msgid "FunctionCall7: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:463
-msgid "Internal error: fmgr_oldstyle received NULL pointer"
+#: utils/fmgr/fmgr.c:1164
+#, c-format
+msgid "FunctionCall8: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:612
+#: utils/fmgr/fmgr.c:1196
 #, c-format
-msgid "fmgr_oldstyle: function %u: too many arguments (%d > %d)"
+msgid "FunctionCall9: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:632
-msgid "Untrusted functions not supported"
+#: utils/fmgr/fmgr.c:1227
+#, c-format
+msgid "OidFunctionCall1: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:661
+#: utils/fmgr/fmgr.c:1252
 #, c-format
-msgid "DirectFunctionCall1: function %p returned NULL"
+msgid "OidFunctionCall2: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:682
+#: utils/fmgr/fmgr.c:1279
 #, c-format
-msgid "DirectFunctionCall2: function %p returned NULL"
+msgid "OidFunctionCall3: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:705
+#: utils/fmgr/fmgr.c:1307
 #, c-format
-msgid "DirectFunctionCall3: function %p returned NULL"
+msgid "OidFunctionCall4: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:729
+#: utils/fmgr/fmgr.c:1336
 #, c-format
-msgid "DirectFunctionCall4: function %p returned NULL"
+msgid "OidFunctionCall5: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:754
+#: utils/fmgr/fmgr.c:1367
 #, c-format
-msgid "DirectFunctionCall5: function %p returned NULL"
+msgid "OidFunctionCall6: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:781
+#: utils/fmgr/fmgr.c:1399
 #, c-format
-msgid "DirectFunctionCall6: function %p returned NULL"
+msgid "OidFunctionCall7: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:809
+#: utils/fmgr/fmgr.c:1432
 #, c-format
-msgid "DirectFunctionCall7: function %p returned NULL"
+msgid "OidFunctionCall8: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:838
+#: utils/fmgr/fmgr.c:1467
 #, c-format
-msgid "DirectFunctionCall8: function %p returned NULL"
+msgid "OidFunctionCall9: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:869
+#: utils/fmgr/fmgr.c:1506
 #, c-format
-msgid "DirectFunctionCall9: function %p returned NULL"
+msgid "fmgr: function %u: too many arguments (%d > %d)"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:895
+#: utils/fmgr/fmgr.c:1518
 #, c-format
-msgid "FunctionCall1: function %u returned NULL"
+msgid "fmgr: function %u returned NULL"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:917
+#: utils/fmgr/dfmgr.c:97
 #, c-format
-msgid "FunctionCall2: function %u returned NULL"
+msgid "stat failed on file '%s': %m"
+msgstr ""
+
+#: utils/fmgr/dfmgr.c:114
+msgid "Out of memory in load_external_function"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:941
+#: utils/fmgr/dfmgr.c:127
 #, c-format
-msgid "FunctionCall3: function %u returned NULL"
+msgid "Load of file %s failed: %s"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:966
+#: utils/fmgr/dfmgr.c:154
 #, c-format
-msgid "FunctionCall4: function %u returned NULL"
+msgid "Can't find function %s in file %s"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:992
+#: utils/fmgr/dfmgr.c:184
 #, c-format
-msgid "FunctionCall5: function %u returned NULL"
+msgid "LOAD: could not open file '%s': %m"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1020
+#: utils/fmgr/dfmgr.c:239
 #, c-format
-msgid "FunctionCall6: function %u returned NULL"
+msgid "stat failed on %s: %s"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1049
-#, c-format
-msgid "FunctionCall7: function %u returned NULL"
+#: utils/fmgr/dfmgr.c:334
+msgid "invalid macro name in dynamic library path"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1079
-#, c-format
-msgid "FunctionCall8: function %u returned NULL"
+#: utils/fmgr/dfmgr.c:384
+msgid "zero length dynamic_library_path component"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1111
-#, c-format
-msgid "FunctionCall9: function %u returned NULL"
+#: utils/fmgr/dfmgr.c:395
+msgid "dynamic_library_path component is not absolute"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1142
+#: utils/fmgr/dfmgr.c:401
 #, c-format
-msgid "OidFunctionCall1: function %u returned NULL"
+msgid "find_in_dynamic_libpath: trying %s"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1167
-#, c-format
-msgid "OidFunctionCall2: function %u returned NULL"
+#: utils/fmgr/funcapi.c:36
+msgid "function called in context that does not accept a set result"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1194
-#, c-format
-msgid "OidFunctionCall3: function %u returned NULL"
+#: utils/fmgr/funcapi.c:68
+msgid "init_MultiFuncCall may not be called more than once"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1222
+#: utils/cache/catcache.c:151
 #, c-format
-msgid "OidFunctionCall4: function %u returned NULL"
+msgid "GetCCHashFunc: type %u unsupported as catcache key"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1251
+#: utils/cache/catcache.c:195
 #, c-format
-msgid "OidFunctionCall5: function %u returned NULL"
+msgid "CCComputeHashValue: %d nkeys"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1282
+#: utils/cache/catcache.c:260
 #, c-format
-msgid "OidFunctionCall6: function %u returned NULL"
+msgid "CCComputeTupleHashValue: %d cc_nkeys"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1314
+#: utils/cache/catcache.c:284
 #, c-format
-msgid "OidFunctionCall7: function %u returned NULL"
+msgid "Catcache stats dump: %d/%d tuples in catcaches"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1347
+#: utils/cache/catcache.c:291
 #, c-format
-msgid "OidFunctionCall8: function %u returned NULL"
+msgid ""
+"Catcache %s/%s: %d tup, %ld srch, %ld+%ld=%ld hits, %ld+%ld=%ld loads, %ld "
+"invals, %ld discards, %ld lsrch, %ld lhits"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1382
+#: utils/cache/catcache.c:315
 #, c-format
-msgid "OidFunctionCall9: function %u returned NULL"
+msgid ""
+"Catcache totals: %d tup, %ld srch, %ld+%ld=%ld hits, %ld+%ld=%ld loads, %ld "
+"invals, %ld discards, %ld lsrch, %ld lhits"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1421
+#: utils/cache/catcache.c:550
 #, c-format
-msgid "fmgr: function %u: too many arguments (%d > %d)"
+msgid "Cache reference leak: cache %s (%d), list %p has count %d"
 msgstr ""
 
-#: ../utils/fmgr/fmgr.c:1433
+#: utils/cache/catcache.c:573
 #, c-format
-msgid "fmgr: function %u returned NULL"
+msgid "Cache reference leak: cache %s (%d), tuple %u has count %d"
 msgstr ""
 
-#: ../utils/cache/catcache.c:127
+#: utils/cache/catcache.c:761
 #, c-format
-msgid "GetCCHashFunc: type %u unsupported as catcache key"
+msgid "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n"
 msgstr ""
 
-#: ../utils/cache/catcache.c:182
+#: utils/cache/catcache.c:861
 #, c-format
 msgid "CatalogCacheInitializeCache: cache @%p %s"
 msgstr ""
 
-#: ../utils/cache/catcache.c:188
+#: utils/cache/catcache.c:867
 #, c-format
 msgid "CatalogCacheInitializeCache: load %d/%d w/%d, %u"
 msgstr ""
 
-#: ../utils/cache/catcache.c:192
+#: utils/cache/catcache.c:871
 #, c-format
 msgid "CatalogCacheInitializeCache: load %d/%d w/%d"
 msgstr ""
 
-#: ../utils/cache/catcache.c:261
+#: utils/cache/catcache.c:941
 msgid "CatalogCacheInit: only sys attr supported is OID"
 msgstr ""
 
-#: ../utils/cache/catcache.c:328
-#, c-format
-msgid "CCComputeHashIndex: %d cc_nkeys"
+#: utils/cache/fcache.c:39
+msgid "init_fcache: too many arguments"
 msgstr ""
 
-#: ../utils/cache/catcache.c:392
+#: utils/cache/inval.c:453
 #, c-format
-msgid "CCComputeTupleHashIndex: %d cc_nkeys"
+msgid "ExecuteInvalidationMessage: bogus message id %d"
 msgstr ""
 
-#: ../utils/cache/catcache.c:517
-#, c-format
-msgid "Cache reference leak: cache %s (%d), tuple %u has count %d"
+#: utils/cache/inval.c:708 utils/cache/inval.c:731
+msgid "Out of cache_callback_list slots"
 msgstr ""
 
-#: ../utils/cache/catcache.c:680
+#: utils/cache/lsyscache.c:72
 #, c-format
-msgid "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n"
+msgid "op_requires_recheck: op %u is not a member of opclass %u"
 msgstr ""
 
-#: ../utils/cache/catcache.c:803
+#: utils/cache/lsyscache.c:217
 #, c-format
-msgid "IndexScanOK: %s not found in %s"
-msgstr ""
-
-#: ../utils/cache/fcache.c:30
-msgid "init_fcache: too many arguments"
+msgid "cache lookup failed for relation %u attribute %d"
 msgstr ""
 
-#: ../utils/cache/inval.c:396
+#: utils/cache/lsyscache.c:369
 #, c-format
-msgid "ExecuteInvalidationMessage: bogus message id %d"
-msgstr ""
+msgid "op_mergejoin_crossops: operator %u not found"
+msgstr "op_mergejoin_crossops: Operator %u nicht gefunden"
 
-#: ../utils/cache/lsyscache.c:70
+#: utils/cache/lsyscache.c:377
 #, c-format
-msgid "op_requires_recheck: op %u is not a member of opclass %u"
+msgid "op_mergejoin_crossops: mergejoin operator %u has no matching < operator"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:242
+#: utils/cache/lsyscache.c:384
 #, c-format
-msgid "cache lookup failed for relation %u attribute %d"
+msgid "op_mergejoin_crossops: mergejoin operator %u has no matching > operator"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:411
+#: utils/cache/lsyscache.c:429
 #, c-format
 msgid "Operator OID %u does not exist"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:697
+#: utils/cache/lsyscache.c:661
 #, c-format
-msgid "cache lookup failed for type %u"
+msgid "get_system_catalog_relid: cannot find %s"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:771
+#: utils/cache/lsyscache.c:1006
 #, c-format
 msgid "get_typdefault: failed to lookup type %u"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:978
+#: utils/cache/lsyscache.c:1087
+#, c-format
+msgid "getBaseType: failed to lookup type %u"
+msgstr ""
+
+#: utils/cache/lsyscache.c:1225
+#, c-format
+msgid "getTypeInputInfo: Cache lookup of type %u failed"
+msgstr "getTypeInputInfo: Cachesuche nach Typ %u fehlgeschlagen"
+
+#: utils/cache/lsyscache.c:1255
+#, c-format
+msgid "getTypeOutputInfo: Cache lookup of type %u failed"
+msgstr "getTypeOutputInfo: Cachesuche nach Typ %u fehlgeschlagen"
+
+#: utils/cache/lsyscache.c:1351
 msgid "get_attstatsslot: stavalues is null"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:998
+#: utils/cache/lsyscache.c:1373
 #, c-format
 msgid "get_attstatsslot: Cache lookup failed for type %u"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:1034
+#: utils/cache/lsyscache.c:1409
 msgid "get_attstatsslot: stanumbers is null"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:1045
-msgid "get_attstatsslot: stanumbers is bogus"
+#: utils/cache/lsyscache.c:1420
+msgid "get_attstatsslot: stanumbers is not a 1-D float4 array"
 msgstr ""
 
-#: ../utils/cache/lsyscache.c:1103 ../utils/init/miscinit.c:461
-#, c-format
-msgid "user \"%s\" does not exist"
+#: utils/cache/relcache.c:168 utils/cache/relcache.c:176
+#: utils/cache/relcache.c:188
+msgid "out of memory for relation descriptor cache"
 msgstr ""
 
-#: ../utils/cache/relcache.c:147 ../utils/cache/relcache.c:155
-#: ../utils/cache/relcache.c:163
-msgid "out of memory for relation descriptor cache"
+#: utils/cache/relcache.c:234
+msgid "trying to delete a rd_id reldesc that does not exist."
+msgstr ""
+
+#: utils/cache/relcache.c:239
+msgid "trying to delete a rd_node reldesc that does not exist."
 msgstr ""
 
-#: ../utils/cache/relcache.c:210 ../utils/cache/relcache.c:215
-#: ../utils/cache/relcache.c:220
-msgid "trying to delete a reldesc that does not exist."
+#: utils/cache/relcache.c:248
+msgid "trying to delete a relname reldesc that does not exist."
 msgstr ""
 
-#: ../utils/cache/relcache.c:316 ../utils/cache/relcache.c:381
+#: utils/cache/relcache.c:354
 msgid "ScanPgRelation: bad buildinfo"
 msgstr ""
 
-#: ../utils/cache/relcache.c:592
+#: utils/cache/relcache.c:508
 #, c-format
-msgid "catalog is missing %d attribute%s for relid %u"
+msgid "Bogus attribute number %d for %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:662
+#: utils/cache/relcache.c:550
 #, c-format
-msgid "cannot find attribute %d of relation %s"
+msgid "catalog is missing %d attribute(s) for relid %u"
 msgstr ""
 
-#: ../utils/cache/relcache.c:1067
+#: utils/cache/relcache.c:961
+#, c-format
+msgid "RelationInitIndexAccessInfo: no pg_index entry for index %u"
+msgstr "RelationInitIndexAccessInfo: kein pg_index-Eintrag f�r Index %u"
+
+#: utils/cache/relcache.c:976
 #, c-format
-msgid "RelationBuildDesc: can't open %s: %m"
+msgid "RelationInitIndexAccessInfo: cache lookup failed for AM %u"
+msgstr "RelationInitIndexAccessInfo: Cachesuche nach AM %u fehlgeschlagen"
+
+#: utils/cache/relcache.c:1091
+msgid "IndexSupportInitialize: bogus pg_index tuple"
+msgstr ""
+
+#: utils/cache/relcache.c:1198
+msgid "out of memory for operator class cache"
 msgstr ""
 
-#: ../utils/cache/relcache.c:1306
+#: utils/cache/relcache.c:1272
 #, c-format
-msgid "fixrdesc: no pg_class entry for %s"
+msgid "Bogus amopstrategy number %d for opclass %u"
 msgstr ""
 
-#: ../utils/cache/relcache.c:1315
+#: utils/cache/relcache.c:1307
 #, c-format
-msgid "fixrdesc: no existing relcache entry for %s"
+msgid "Bogus amproc number %d for opclass %u"
 msgstr ""
 
-#: ../utils/cache/relcache.c:1547
+#: utils/cache/relcache.c:1645
 #, c-format
 msgid "RelationReloadClassinfo system relation id=%d doesn't exist"
 msgstr ""
 
-#: ../utils/cache/relcache.c:1674
+#: utils/cache/relcache.c:1772
 #, c-format
 msgid "RelationClearRelation: relation %u deleted while still in use"
 msgstr ""
 
-#: ../utils/cache/relcache.c:1775
+#: utils/cache/relcache.c:1855
 #, c-format
-msgid "Local relation %s not found in list"
+msgid "RelationForgetRelation: relation %u is still open"
 msgstr ""
 
-#: ../utils/cache/relcache.c:1823
-msgid "inval call to RFI"
+#: utils/cache/relcache.c:2012
+#, c-format
+msgid "Relcache reference leak: relation \"%s\" has refcnt %d instead of %d"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2298
+#: utils/cache/relcache.c:2298
 #, c-format
-msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
+msgid "RelationCacheInitializePhase2: no pg_class entry for %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2306
+#: utils/cache/relcache.c:2446
 #, c-format
-msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
+msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2319
+#: utils/cache/relcache.c:2454
 #, c-format
-msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
+msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2325
+#: utils/cache/relcache.c:2465
 #, c-format
-msgid "AttrDefaultFetch: %d record not found for rel %s"
+msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2399
+#: utils/cache/relcache.c:2474
 #, c-format
-msgid "RelCheckFetch: unexpected record found for rel %s"
+msgid "AttrDefaultFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2406
+#: utils/cache/relcache.c:2508
 #, c-format
-msgid "RelCheckFetch: rcname IS NULL for rel %s"
+msgid "CheckConstraintFetch: unexpected record found for rel %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2414
+#: utils/cache/relcache.c:2519
 #, c-format
-msgid "RelCheckFetch: rcbin IS NULL for rel %s"
+msgid "CheckConstraintFetch: conbin IS NULL for rel %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2425
+#: utils/cache/relcache.c:2532
 #, c-format
-msgid "RelCheckFetch: %d record not found for rel %s"
+msgid "CheckConstraintFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2845
+#: utils/cache/relcache.c:2995
 #, c-format
 msgid ""
 "Cannot create init file %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: ../utils/cache/relcache.c:2914
+#: utils/cache/relcache.c:3019
 msgid "cannot write init file -- descriptor length"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2918
+#: utils/cache/relcache.c:3023
 msgid "cannot write init file -- reldesc"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2924
-msgid "cannot write init file -- am tuple form length"
-msgstr ""
-
-#: ../utils/cache/relcache.c:2927
-msgid "cannot write init file -- am tuple form"
-msgstr ""
-
-#: ../utils/cache/relcache.c:2933
+#: utils/cache/relcache.c:3028
 msgid "cannot write init file -- relation tuple form length"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2936
+#: utils/cache/relcache.c:3031
 msgid "cannot write init file -- relation tuple form"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2944
+#: utils/cache/relcache.c:3038
 #, c-format
 msgid "cannot write init file -- length of attdesc %d"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2947
+#: utils/cache/relcache.c:3040
 #, c-format
 msgid "cannot write init file -- attdesc %d"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2955
+#: utils/cache/relcache.c:3059
+#, c-format
+msgid "write_relcache_init_file: no pg_index entry for index %u"
+msgstr "write_relcache_init_file: kein pg_index-Eintrag f�r Index %u"
+
+#: utils/cache/relcache.c:3063
+msgid "cannot write init file -- index tuple form length"
+msgstr ""
+
+#: utils/cache/relcache.c:3065
+msgid "cannot write init file -- index tuple form"
+msgstr ""
+
+#: utils/cache/relcache.c:3071
+msgid "cannot write init file -- am tuple form length"
+msgstr ""
+
+#: utils/cache/relcache.c:3074
+msgid "cannot write init file -- am tuple form"
+msgstr ""
+
+#: utils/cache/relcache.c:3080
 msgid "cannot write init file -- strategy map length"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2958
+#: utils/cache/relcache.c:3083
 msgid "cannot write init file -- strategy map"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2964
+#: utils/cache/relcache.c:3088
+msgid "cannot write init file -- operator vector length"
+msgstr ""
+
+#: utils/cache/relcache.c:3091
+msgid "cannot write init file -- operator vector"
+msgstr ""
+
+#: utils/cache/relcache.c:3096
 msgid "cannot write init file -- support vector length"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2967
+#: utils/cache/relcache.c:3099
 msgid "cannot write init file -- support vector"
 msgstr ""
 
-#: ../utils/cache/relcache.c:2981
+#: utils/cache/relcache.c:3143
 #, c-format
 msgid ""
 "Cannot rename init file %s to %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: ../utils/cache/syscache.c:407
+#: utils/cache/syscache.c:478
 #, c-format
 msgid "InitCatalogCache: Can't init cache %s (%d)"
 msgstr ""
 
-#: ../utils/cache/syscache.c:439
+#: utils/cache/syscache.c:534
 #, c-format
 msgid "SearchSysCache: Bad cache id %d"
 msgstr ""
 
-#: ../utils/cache/syscache.c:575
+#: utils/cache/syscache.c:715
 #, c-format
 msgid "SysCacheGetAttr: Bad cache id %d"
 msgstr ""
 
-#: ../utils/cache/syscache.c:578
+#: utils/cache/syscache.c:718
 #, c-format
 msgid "SysCacheGetAttr: missing cache data for id %d"
 msgstr ""
 
-#: ../utils/cache/temprel.c:161
+#: utils/cache/syscache.c:734
 #, c-format
-msgid "Cannot rename temp table \"%s\": temp table \"%s\" already exists"
+msgid "SearchSysCacheList: Bad cache id %d"
 msgstr ""
 
-#: ../utils/cache/temprel.c:193
-#, c-format
-msgid ""
-"Cannot rename \"%s\" to \"%s\": a temp table by that name already exists"
+#: utils/error/elog.c:128
+msgid "Pre-7.3 object file made an elog() call.  Recompile."
 msgstr ""
 
-#. translator: This string will be truncated at 31 characters.
-#: ../utils/error/elog.c:176
+#: utils/error/elog.c:218
 #, c-format
 msgid "copy: line %d, "
 msgstr ""
 
 #. translator: This must fit in fmt_fixedbuf.
-#: ../utils/error/elog.c:199 ../utils/error/elog.c:295
+#: utils/error/elog.c:241 utils/error/elog.c:337
 msgid "elog: out of memory"
 msgstr ""
 
-#: ../utils/error/elog.c:417
+#: utils/error/elog.c:438
+#, c-format
+msgid "statement: %s"
+msgstr ""
+
+#: utils/error/elog.c:488
 msgid "elog: error during error recovery, giving up!"
 msgstr ""
 
-#: ../utils/error/elog.c:462
+#: utils/error/elog.c:533
 #, c-format
 msgid "DebugFileOpen: open of %s: %m"
 msgstr ""
 
-#: ../utils/error/elog.c:471
+#: utils/error/elog.c:542
 #, c-format
 msgid "DebugFileOpen: %s reopen as stderr: %m"
 msgstr ""
 
-#: ../utils/error/elog.c:483
+#: utils/error/elog.c:554
 #, c-format
 msgid "DebugFileOpen: %s reopen as stdout: %m"
 msgstr ""
 
-#: ../utils/error/elog.c:500
+#: utils/error/elog.c:571
 msgid "DebugFileOpen: could not open debugging file"
 msgstr ""
 
-#: ../utils/error/elog.c:704
+#: utils/error/elog.c:776
 msgid "Numerical result out of range"
 msgstr ""
 
-#: ../utils/error/elog.c:718
+#: utils/error/elog.c:790
 #, c-format
 msgid "operating system error %d"
 msgstr ""
 
-#: ../utils/error/elog.c:735
+#: utils/error/elog.c:812
 msgid "DEBUG:  "
 msgstr ""
 
-#: ../utils/error/elog.c:738
+#: utils/error/elog.c:816
+msgid "LOG:  "
+msgstr ""
+
+#: utils/error/elog.c:819
+msgid "INFO:  "
+msgstr ""
+
+#: utils/error/elog.c:822
 msgid "NOTICE:  "
 msgstr ""
 
-#: ../utils/error/elog.c:741
+#: utils/error/elog.c:825
+msgid "WARNING:  "
+msgstr ""
+
+#: utils/error/elog.c:828
 msgid "ERROR:  "
 msgstr ""
 
-#: ../utils/error/elog.c:744
-msgid "FATAL 1:  "
+#: utils/error/elog.c:831
+msgid "FATAL:  "
 msgstr ""
 
-#: ../utils/error/elog.c:747
-msgid "FATAL 2:  "
+#: utils/error/elog.c:834
+msgid "PANIC:  "
 msgstr ""
 
-#: ../utils/hash/dynahash.c:663
+#: utils/hash/dynahash.c:662
 #, c-format
 msgid "hash_search: bogus action %d"
 msgstr ""
 
-#: ../utils/hash/dynahash.c:936 ../utils/hash/dynahash.c:938
+#: utils/hash/dynahash.c:935 utils/hash/dynahash.c:937
 #, c-format
 msgid "Hash table '%s' corrupted"
 msgstr ""
 
-#: ../utils/init/miscinit.c:136 ../utils/init/miscinit.c:155
-#: ../utils/init/miscinit.c:163 ../utils/init/miscinit.c:321
-#: ../utils/misc/guc.c:719 ../utils/misc/guc.c:726 ../utils/misc/guc.c:1082
-#: ../utils/misc/guc.c:1095 ../utils/misc/guc.c:1113 ../utils/misc/guc.c:1121
-#: ../utils/misc/guc.c:1276 ../utils/misc/guc.c:1282 ../utils/misc/guc.c:1289
-#: guc-file.l:148 guc-file.l:267 guc-file.l:308
-msgid "out of memory"
+#: utils/init/postinit.c:114
+#, c-format
+msgid "Database \"%s\", OID %u, has disappeared from pg_database"
 msgstr ""
 
-#: ../utils/init/miscinit.c:149
+#: utils/init/postinit.c:123
 #, c-format
-msgid "cannot get current working directory: %m"
+msgid "Database \"%s\" is not currently accepting connections"
 msgstr ""
 
-#: ../utils/init/miscinit.c:209 ../utils/init/miscinit.c:216
+#: utils/init/postinit.c:259
+#, c-format
+msgid "Database \"%s\" does not exist in the system catalog."
+msgstr ""
+
+#: utils/init/postinit.c:267
+#, c-format
 msgid ""
-"convert is not supported. To use convert, you need to enable multibyte "
-"capability"
+"Database \"%s\" does not exist.\n"
+"\tThe database subdirectory '%s' is missing."
 msgstr ""
 
-#: ../utils/init/miscinit.c:516
+#: utils/init/postinit.c:274
 #, c-format
-msgid "invalid user id %u"
+msgid "Unable to change directory to '%s': %m"
 msgstr ""
 
-#: ../utils/init/miscinit.c:598
+#: utils/init/postinit.c:303
 #, c-format
-msgid "Can't create lock file %s: %m"
+msgid "InitPostgres: bad backend id %d"
+msgstr ""
+
+#: utils/init/postinit.c:354
+msgid "There are currently no users defined in this database system."
 msgstr ""
 
-#: ../utils/init/miscinit.c:609 ../utils/init/miscinit.c:612
+#: utils/init/postinit.c:355
 #, c-format
-msgid "Can't read lock file %s: %m"
+msgid ""
+"You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
+msgstr ""
+
+#: utils/init/postinit.c:410
+msgid "Non-superuser connection limit exceeded"
 msgstr ""
 
-#: ../utils/init/miscinit.c:622
+#: utils/init/findbe.c:63
 #, c-format
-msgid "Bogus data in lock file %s"
+msgid "ValidateBinary: can't stat \"%s\""
 msgstr ""
 
-#: ../utils/init/miscinit.c:697
+#: utils/init/findbe.c:69
 #, c-format
-msgid ""
-"Can't remove old lock file %s: %m\n"
-"\tThe file seems accidentally left, but I couldn't remove it.\n"
-"\tPlease remove the file by hand and try again."
+msgid "ValidateBinary: \"%s\" is not a regular file"
 msgstr ""
 
-#: ../utils/init/miscinit.c:718
+#: utils/init/findbe.c:91
 #, c-format
-msgid "Can't write lock file %s: %m"
+msgid "ValidateBinary: \"%s\" is not user read/execute"
 msgstr ""
 
-#: ../utils/init/miscinit.c:809
+#: utils/init/findbe.c:117
 #, c-format
-msgid "Failed to rewrite %s: %m"
+msgid "ValidateBinary: \"%s\" is not group read/execute"
 msgstr ""
 
-#: ../utils/init/miscinit.c:815
+#: utils/init/findbe.c:125
 #, c-format
-msgid "Failed to read %s: %m"
+msgid "ValidateBinary: \"%s\" is not other read/execute"
 msgstr ""
 
-#: ../utils/init/miscinit.c:828
+#: utils/init/findbe.c:174
 #, c-format
-msgid "Bogus data in %s"
+msgid "FindExec: found \"%s\" using argv[0]"
 msgstr ""
 
-#: ../utils/init/miscinit.c:853
+#: utils/init/findbe.c:177
 #, c-format
-msgid "Failed to write %s: %m"
+msgid "FindExec: invalid binary \"%s\""
+msgstr ""
+
+#: utils/init/findbe.c:187
+msgid "FindExec: searching PATH ..."
 msgstr ""
 
-#: ../utils/init/miscinit.c:895
+#: utils/init/findbe.c:208
 #, c-format
-msgid "File %s is missing. This is not a valid data directory."
+msgid "FindExec: found \"%s\" using PATH"
 msgstr ""
 
-#: ../utils/init/miscinit.c:902
+#: utils/init/findbe.c:215
 #, c-format
-msgid "File %s does not contain valid data. You need to initdb."
+msgid "FindExec: could not read binary \"%s\""
 msgstr ""
 
-#: ../utils/init/miscinit.c:907
+#: utils/init/findbe.c:225
 #, c-format
-msgid ""
-"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
-"not compatible with this version %s."
+msgid "FindExec: could not find a %s to execute"
 msgstr ""
 
-#: ../utils/init/postinit.c:110
+#: guc-file.l:149 guc-file.l:269 guc-file.l:304 utils/init/miscinit.c:144
+#: utils/init/miscinit.c:163 utils/init/miscinit.c:171 utils/misc/guc.c:926
+#: utils/misc/guc.c:1109 utils/misc/guc.c:1903 utils/misc/guc.c:1917
+#: utils/misc/guc.c:2672 utils/misc/guc.c:2678 utils/misc/guc.c:2685
+msgid "out of memory"
+msgstr ""
+
+#: utils/init/miscinit.c:157
 #, c-format
-msgid "Database \"%s\", OID %u, has disappeared from pg_database"
+msgid "cannot get current working directory: %m"
 msgstr ""
 
-#: ../utils/init/postinit.c:119
+#: utils/init/miscinit.c:247
 #, c-format
-msgid "Database \"%s\" is not currently accepting connections"
+msgid "SetCharSet: unknown tag %s in file %s"
 msgstr ""
 
-#: ../utils/init/postinit.c:131
+#: utils/init/miscinit.c:402 utils/init/miscinit.c:458
 #, c-format
-msgid ""
-"database was initialized with MULTIBYTE encoding %d,\n"
-"\tbut the backend was compiled without multibyte support.\n"
-"\tlooks like you need to initdb or recompile."
+msgid "GetCharSetByHost: unknown tag %s in file %s"
 msgstr ""
 
-#: ../utils/init/postinit.c:238
+#: utils/init/miscinit.c:636
 #, c-format
-msgid "Database \"%s\" does not exist in the system catalog."
+msgid "invalid user id %u"
+msgstr ""
+
+#: utils/init/miscinit.c:718
+#, c-format
+msgid "Can't create lock file %s: %m"
+msgstr ""
+
+#: utils/init/miscinit.c:729 utils/init/miscinit.c:732
+#, c-format
+msgid "Can't read lock file %s: %m"
+msgstr ""
+
+#: utils/init/miscinit.c:742
+#, c-format
+msgid "Bogus data in lock file %s"
 msgstr ""
 
-#: ../utils/init/postinit.c:246
+#: utils/init/miscinit.c:816
 #, c-format
 msgid ""
-"Database \"%s\" does not exist.\n"
-"\tThe database subdirectory '%s' is missing."
+"Can't remove old lock file %s: %m\n"
+"\tThe file seems accidentally left, but I couldn't remove it.\n"
+"\tPlease remove the file by hand and try again."
 msgstr ""
 
-#: ../utils/init/postinit.c:253
+#: utils/init/miscinit.c:837
 #, c-format
-msgid "Unable to change directory to '%s': %m"
+msgid "Can't write lock file %s: %m"
 msgstr ""
 
-#: ../utils/init/postinit.c:282
+#: utils/init/miscinit.c:928
 #, c-format
-msgid "InitPostgres: bad backend id %d"
+msgid "Failed to rewrite %s: %m"
 msgstr ""
 
-#: ../utils/init/postinit.c:330
-msgid "There are currently no users defined in this database system."
+#: utils/init/miscinit.c:934
+#, c-format
+msgid "Failed to read %s: %m"
 msgstr ""
 
-#: ../utils/init/postinit.c:331
+#: utils/init/miscinit.c:947
 #, c-format
-msgid ""
-"You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
+msgid "Bogus data in %s"
 msgstr ""
 
-#: ../utils/mb/conv.c:1220
-msgid "Could not convert UTF-8 to ISO8859-1"
+#: utils/init/miscinit.c:971
+#, c-format
+msgid "Failed to write %s: %m"
+msgstr ""
+
+#: utils/init/miscinit.c:1013
+#, c-format
+msgid "File %s is missing. This is not a valid data directory."
+msgstr ""
+
+#: utils/init/miscinit.c:1020
+#, c-format
+msgid "File %s does not contain valid data. You need to initdb."
+msgstr ""
+
+#: utils/init/miscinit.c:1025
+#, c-format
+msgid ""
+"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
+"not compatible with this version %s."
 msgstr ""
 
-#: ../utils/mb/conv.c:1300
+#: utils/mb/conv.c:374
 #, c-format
-msgid "utf_to_local: could not convert UTF-8 (0x%04x). Ignored"
+msgid "UtfToLocal: could not convert UTF-8 (0x%04x). Ignored"
 msgstr ""
 
-#: ../utils/mb/conv.c:1399
+#: utils/mb/conv.c:401
 #, c-format
 msgid "Invalid encoding number %d"
 msgstr ""
 
-#: ../utils/mb/conv.c:1436
+#: utils/mb/conv.c:438
 #, c-format
-msgid "local_to_utf: could not convert (0x%04x) %s to UTF-8. Ignored"
+msgid "LocalToUtf: could not convert (0x%04x) %s to UTF-8. Ignored"
+msgstr ""
+
+#: utils/mb/encnames.c:440
+msgid "pg_char_to_encname_struct(): encoding name too long"
 msgstr ""
 
-#: ../utils/mb/mbutils.c:251
+#: utils/mb/mbutils.c:171
 #, c-format
-msgid "Invalid source encoding name %s"
+msgid "default conversion proc for %s to %s not found"
 msgstr ""
 
-#: ../utils/mb/mbutils.c:253
+#: utils/mb/mbutils.c:185
 #, c-format
-msgid "Invalid destination encoding name %s"
+msgid "default conversion proc %u for %s to %s not found in pg_proc"
+msgstr ""
+
+#: utils/mb/mbutils.c:244
+#, c-format
+msgid "Invalid source encoding name %s"
 msgstr ""
 
-#: ../utils/mb/mbutils.c:257
+#: utils/mb/mbutils.c:246
 #, c-format
-msgid "Conversion from %s to %s is not possible"
+msgid "Invalid destination encoding name %s"
 msgstr ""
 
-#: ../utils/mb/mbutils.c:269
+#: utils/mb/mbutils.c:256
 msgid "Encoding conversion failed"
 msgstr ""
 
-#: ../utils/mb/mbutils.c:445
+#: utils/mb/mbutils.c:474
 msgid "SetDatabaseEncoding(): invalid database encoding"
 msgstr ""
 
-#: ../utils/mb/encnames.c:350
-msgid "pg_char_to_encname_struct(): encoding name too long"
+#: utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c:87
+msgid "Could not convert UTF-8 to ISO8859-1"
+msgstr ""
+
+#: utils/misc/guc.c:1205 utils/misc/guc.c:1220 utils/misc/guc.c:1235
+#: utils/misc/guc.c:1264
+#, c-format
+msgid "Failed to reset %s"
 msgstr ""
 
-#: ../utils/misc/guc.c:884
+#: utils/misc/guc.c:1332 utils/misc/guc.c:1354 utils/misc/guc.c:1376
+#: utils/misc/guc.c:1406
+#, c-format
+msgid "Failed to commit %s"
+msgstr ""
+
+#: utils/misc/guc.c:1585 utils/misc/guc.c:2135
 #, c-format
 msgid "'%s' is not a valid option name"
 msgstr ""
 
-#: ../utils/misc/guc.c:899
+#: utils/misc/guc.c:1602
 #, c-format
 msgid "'%s' cannot be changed after server start"
 msgstr ""
 
-#: ../utils/misc/guc.c:903
+#: utils/misc/guc.c:1610
 #, c-format
 msgid "'%s' cannot be changed now"
 msgstr ""
 
-#: ../utils/misc/guc.c:927
+#: utils/misc/guc.c:1637
 #, c-format
 msgid "'%s' cannot be set after connection start"
 msgstr ""
 
-#: ../utils/misc/guc.c:953
+#: utils/misc/guc.c:1645
+#, c-format
+msgid "'%s': permission denied"
+msgstr "%s: keine Berechtigung"
+
+#: utils/misc/guc.c:1675
+#, c-format
+msgid "%s: setting ignored because previous source is higher priority"
+msgstr ""
+
+#: utils/misc/guc.c:1696
 #, c-format
 msgid "option '%s' requires a boolean value"
 msgstr ""
 
-#: ../utils/misc/guc.c:985
+#: utils/misc/guc.c:1710 utils/misc/guc.c:1781
 #, c-format
-msgid "option '%s' expects an integer value"
+msgid "invalid value for option '%s': %d"
 msgstr ""
 
-#: ../utils/misc/guc.c:990
+#: utils/misc/guc.c:1760
 #, c-format
-msgid "option '%s' value %d is outside of permissible range [%d .. %d]"
+msgid "option '%s' expects an integer value"
 msgstr ""
 
-#: ../utils/misc/guc.c:997
+#: utils/misc/guc.c:1766
 #, c-format
-msgid "invalid value for option '%s': %d"
+msgid "option '%s' value %d is outside of permissible range [%d .. %d]"
 msgstr ""
 
-#: ../utils/misc/guc.c:1029
+#: utils/misc/guc.c:1831
 #, c-format
 msgid "option '%s' expects a real number"
 msgstr ""
 
-#: ../utils/misc/guc.c:1034
+#: utils/misc/guc.c:1837
 #, c-format
 msgid "option '%s' value %g is outside of permissible range [%g .. %g]"
 msgstr ""
 
-#: ../utils/misc/guc.c:1041
+#: utils/misc/guc.c:1852
 #, c-format
 msgid "invalid value for option '%s': %g"
 msgstr ""
 
-#: ../utils/misc/guc.c:1071
+#: utils/misc/guc.c:1946
 #, c-format
 msgid "invalid value for option '%s': '%s'"
 msgstr ""
 
-#: ../utils/misc/guc.c:1170
+#: utils/misc/guc.c:2047 utils/misc/guc.c:2081 utils/misc/guc.c:2395
 #, c-format
 msgid "Option '%s' is not recognized"
 msgstr ""
 
-#: ../utils/misc/guc.c:1344
-msgid "bogus transaction isolation level"
+#: utils/misc/guc.c:2142
+#, c-format
+msgid "SET %s takes only one argument"
+msgstr "SET %s darf nur ein Argument haben"
+
+#: utils/misc/guc.c:2155 utils/misc/guc.c:2204
+msgid "flatten_set_variable_args: unexpected input"
+msgstr ""
+
+#: utils/misc/guc.c:2243
+msgid "SET variable name is required"
+msgstr ""
+
+#: utils/misc/guc.c:2779
+#, c-format
+msgid "cannot parse setting \"%s\""
 msgstr ""
 
-#: guc-file.l:159
+#: guc-file.l:160
 msgid "could not read configuration file `"
 msgstr ""
 
-#: guc-file.l:159
+#: guc-file.l:160
 #, c-format
 msgid "': %s"
 msgstr ""
 
-#: guc-file.l:259
+#: guc-file.l:261
 #, c-format
 msgid ":%u: syntax error, token=\"%s\""
 msgstr ""
 
-#: ../utils/mmgr/aset.c:331
+#: utils/mmgr/aset.c:333
 #, c-format
 msgid "Memory exhausted in AllocSetContextCreate(%lu)"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:493 ../utils/mmgr/aset.c:690
+#: utils/mmgr/aset.c:495 utils/mmgr/aset.c:692
 #, c-format
 msgid "Memory exhausted in AllocSetAlloc(%lu)"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:739
+#: utils/mmgr/aset.c:741
 #, c-format
 msgid "AllocSetFree: detected write past chunk end in %s %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:760
+#: utils/mmgr/aset.c:762
 #, c-format
 msgid "AllocSetFree: cannot find block containing chunk %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:814
+#: utils/mmgr/aset.c:816
 #, c-format
 msgid "AllocSetRealloc: detected write past chunk end in %s %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:854
+#: utils/mmgr/aset.c:856
 #, c-format
 msgid "AllocSetRealloc: cannot find block containing chunk %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:867
+#: utils/mmgr/aset.c:869
 #, c-format
 msgid "Memory exhausted in AllocSetReAlloc(%lu)"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:1024
+#: utils/mmgr/aset.c:1039
 #, c-format
 msgid "AllocSetCheck: %s: empty block %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:1046
+#: utils/mmgr/aset.c:1061
 #, c-format
 msgid "AllocSetCheck: %s: req size > alloc size for chunk %p in block %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:1049
+#: utils/mmgr/aset.c:1064
 #, c-format
 msgid "AllocSetCheck: %s: bad size %lu for chunk %p in block %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:1055
+#: utils/mmgr/aset.c:1070
 #, c-format
 msgid "AllocSetCheck: %s: bad single-chunk %p in block %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:1064
+#: utils/mmgr/aset.c:1079
 #, c-format
 msgid "AllocSetCheck: %s: bogus aset link in block %p, chunk %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:1071
+#: utils/mmgr/aset.c:1086
 #, c-format
 msgid "AllocSetCheck: %s: detected write past chunk end in block %p, chunk %p"
 msgstr ""
 
-#: ../utils/mmgr/aset.c:1081
+#: utils/mmgr/aset.c:1096
 #, c-format
 msgid "AllocSetCheck: %s: found inconsistent memory block %p"
 msgstr ""
 
-#: ../utils/mmgr/mcxt.c:417
+#: utils/mmgr/mcxt.c:449
 #, c-format
 msgid "MemoryContextAlloc: invalid request size %lu"
 msgstr ""
 
-#: ../utils/mmgr/mcxt.c:477
+#: utils/mmgr/mcxt.c:509
 #, c-format
 msgid "repalloc: invalid request size %lu"
 msgstr ""
 
-#: ../utils/mmgr/portalmem.c:78
+#: utils/mmgr/portalmem.c:78
 msgid "out of memory in PortalHashTable"
 msgstr ""
 
-#: ../utils/mmgr/portalmem.c:80
+#: utils/mmgr/portalmem.c:80
 msgid "trying to insert a portal name that exists."
 msgstr ""
 
-#: ../utils/mmgr/portalmem.c:93
+#: utils/mmgr/portalmem.c:93
 msgid "trying to delete portal name that does not exist."
 msgstr ""
 
-#: ../utils/mmgr/portalmem.c:196
+#: utils/mmgr/portalmem.c:196
 #, c-format
 msgid "CreatePortal: portal \"%s\" already exists"
 msgstr ""
 
-#: ../utils/sort/logtape.c:199
+#: utils/sort/logtape.c:199
 #, c-format
 msgid ""
 "ltsWriteBlock: failed to write block %ld of temporary file\n"
 "\t\tPerhaps out of disk space?"
 msgstr ""
 
-#: ../utils/sort/logtape.c:214
+#: utils/sort/logtape.c:214
 #, c-format
 msgid "ltsReadBlock: failed to read block %ld of temporary file"
 msgstr ""
 
-#: ../utils/sort/logtape.c:569
+#: utils/sort/logtape.c:569
 msgid "LogicalTapeWrite: impossible state"
 msgstr ""
 
-#: ../utils/sort/logtape.c:831
+#: utils/sort/logtape.c:831
 msgid "LogicalTapeBackspace: unexpected end of tape"
 msgstr ""
 
-#: ../utils/sort/logtape.c:888 ../utils/sort/logtape.c:898
+#: utils/sort/logtape.c:888 utils/sort/logtape.c:898
 msgid "LogicalTapeSeek: unexpected end of tape"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:723
+#: utils/sort/tuplesort.c:698
 msgid "tuplesort_puttuple: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:770
+#: utils/sort/tuplesort.c:745
 msgid "tuplesort_performsort: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:888 ../utils/sort/tuplesort.c:903
+#: utils/sort/tuplesort.c:863 utils/sort/tuplesort.c:878
 msgid "tuplesort_gettuple: bogus tuple len in backward scan"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:955
+#: utils/sort/tuplesort.c:930
 msgid "tuplesort_gettuple: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:1515
+#: utils/sort/tuplesort.c:1490
 msgid "tuplesort_rescan: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:1542
+#: utils/sort/tuplesort.c:1517
 msgid "tuplesort_markpos: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:1567
+#: utils/sort/tuplesort.c:1542
 msgid "tuplesort_restorepos failed"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:1571
+#: utils/sort/tuplesort.c:1546
 msgid "tuplesort_restorepos: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:1690
+#: utils/sort/tuplesort.c:1669
 msgid "tuplesort: unexpected end of tape"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:1692 ../utils/sort/tuplesort.c:1805
-#: ../utils/sort/tuplesort.c:1809 ../utils/sort/tuplesort.c:1938
-#: ../utils/sort/tuplesort.c:1942 ../utils/sort/tuplesort.c:2007
-#: ../utils/sort/tuplesort.c:2011
+#: utils/sort/tuplesort.c:1671 utils/sort/tuplesort.c:2010
+#: utils/sort/tuplesort.c:2014 utils/sort/tuplesort.c:2137
+#: utils/sort/tuplesort.c:2141 utils/sort/tuplesort.c:2209
+#: utils/sort/tuplesort.c:2213
 msgid "tuplesort: unexpected end of data"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:1891
-msgid "Cannot create unique index. Table contains non-unique values"
-msgstr ""
-"Kann �Unique�-Index nicht erstellen, da die Tabelle duplizierte Werte "
-"enth�lt."
-
-#: ../utils/sort/tuplesort.c:1975
-msgid "copytup_datum() should not be called"
-msgstr ""
-
-#: ../utils/sort/tuplesort.c:2131
+#: utils/sort/tuplesort.c:1789
 #, c-format
 msgid "SelectSortFunction: cache lookup failed for operator %u"
 msgstr ""
 
-#: ../utils/sort/tuplesort.c:2212
+#: utils/sort/tuplesort.c:1901
 #, c-format
 msgid "Invalid SortFunctionKind %d"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:313
+#: utils/sort/tuplesort.c:2089
+msgid "Cannot create unique index. Table contains non-unique values"
+msgstr ""
+"Kann �Unique�-Index nicht erstellen, da die Tabelle duplizierte Werte "
+"enth�lt."
+
+#: utils/sort/tuplesort.c:2165
+msgid "copytup_datum() should not be called"
+msgstr ""
+
+#: utils/sort/tuplestore.c:302
 msgid "tuplestore_puttuple: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:349
+#: utils/sort/tuplestore.c:338
 msgid "tuplestore_donestoring: seek(0) failed"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:357
+#: utils/sort/tuplestore.c:346
 msgid "tuplestore_donestoring: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:475 ../utils/sort/tuplestore.c:490
+#: utils/sort/tuplestore.c:464 utils/sort/tuplestore.c:479
 msgid "tuplestore_gettuple: bogus tuple len in backward scan"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:495
+#: utils/sort/tuplestore.c:484
 msgid "tuplestore_gettuple: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:531
+#: utils/sort/tuplestore.c:520
 msgid "tuplestore_rescan: seek(0) failed"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:538
+#: utils/sort/tuplestore.c:527
 msgid "tuplestore_rescan: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:564
+#: utils/sort/tuplestore.c:553
 msgid "tuplestore_markpos: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:589
+#: utils/sort/tuplestore.c:578
 msgid "tuplestore_restorepos failed"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:593
+#: utils/sort/tuplestore.c:582
 msgid "tuplestore_restorepos: invalid state"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:609
+#: utils/sort/tuplestore.c:598
 msgid "tuplestore: unexpected end of tape"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:611 ../utils/sort/tuplestore.c:679
-#: ../utils/sort/tuplestore.c:683
+#: utils/sort/tuplestore.c:600 utils/sort/tuplestore.c:669
+#: utils/sort/tuplestore.c:673
 msgid "tuplestore: unexpected end of data"
 msgstr ""
 
-#: ../utils/sort/tuplestore.c:621 ../utils/sort/tuplestore.c:651
-#: ../utils/sort/tuplestore.c:654 ../utils/sort/tuplestore.c:658
+#: utils/sort/tuplestore.c:610 utils/sort/tuplestore.c:641
+#: utils/sort/tuplestore.c:644 utils/sort/tuplestore.c:648
 msgid "tuplestore: write failed"
 msgstr ""
+
+#: utils/time/tqual.c:981
+msgid "CopyQuerySnapshot: no snapshot has been set"
+msgstr ""
diff --git a/src/backend/po/ru.po b/src/backend/po/ru.po
index d47e618e3b5118ce122c6595bdc51309bdc038d1..f9fca185eab13953d417c1a314ea294eca0617b1 100644
--- a/src/backend/po/ru.po
+++ b/src/backend/po/ru.po
@@ -1,9 +1,10 @@
 # ru.po
 # POSTGRES Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.10 2002/11/19 17:21:39 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.11 2003/06/28 22:31:00 petere Exp $
 #
 # Changelog:
+#   - January 2, 2003: Fuzzy Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Post-7.3 beta 2, Fuzzy Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 14, 2002: Post-7.3 beta 1, Take II, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Post-7.3 beta 1 updates messages, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -12,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-10-12 13:32-0400\n"
-"PO-Revision-Date: 2002-09-14 11:18-0500\n"
+"POT-Creation-Date: 2003-01-02 13:00-0500\n"
+"PO-Revision-Date: 2003-01-02 13:33-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -49,39 +50,39 @@ msgstr "heap_modifytuple: 
 msgid "index_formtuple: numberOfAttributes %d > %d"
 msgstr "index_formtuple: numberOfAttributes (����� ���������) ��� %d > %d"
 
-#: access/common/indextuple.c:162
+#: access/common/indextuple.c:161
 #, c-format
 msgid "index_formtuple: data takes %lu bytes, max is %d"
 msgstr "index_formtuple: ������ �������� %lu ����(��), ��� ���������: %d"
 
-#: access/common/tupdesc.c:421
+#: access/common/tupdesc.c:420
 #, c-format
 msgid "Unable to look up type id %u"
 msgstr "��� � ID %u �� ������"
 
-#: access/common/tupdesc.c:647 executor/nodeFunctionscan.c:200
+#: access/common/tupdesc.c:646 executor/nodeFunctionscan.c:204
 #: parser/parse_relation.c:931 parser/parse_relation.c:1286
 #: parser/parse_relation.c:1596
 #, c-format
 msgid "Invalid typrelid for complex type %u"
 msgstr "�������� typrelid ��� �������� ���� %u"
 
-#: access/common/tupdesc.c:661 access/common/tupdesc.c:684
+#: access/common/tupdesc.c:660 access/common/tupdesc.c:683
 msgid "TypeGetTupleDesc: number of aliases does not match number of attributes"
 msgstr "TypeGetTupleDesc: ����� ������� �� ��������� � ������ ���������"
 
-#: access/common/tupdesc.c:680
+#: access/common/tupdesc.c:679
 msgid "TypeGetTupleDesc: no column alias was provided"
 msgstr "TypeGetTupleDesc: ������ ������� �� �������"
 
-#: access/common/tupdesc.c:699
+#: access/common/tupdesc.c:698
 msgid "Unable to determine tuple description for function returning \"record\""
 msgstr ""
 "�� � ��������� ���������� �������� ������ ��� ������� ������������ ��� "
 "\"record\""
 
-#: access/common/tupdesc.c:701 catalog/pg_proc.c:463
-#: executor/nodeFunctionscan.c:230 parser/parse_relation.c:1383
+#: access/common/tupdesc.c:700 catalog/pg_proc.c:463
+#: executor/nodeFunctionscan.c:234 parser/parse_relation.c:1383
 #: parser/parse_relation.c:1637
 msgid "Unknown kind of return type specified for function"
 msgstr "������ ����������� ��� ������������� �������� ��� ������"
@@ -97,26 +98,26 @@ msgstr "%s 
 msgid "gist: failed to add index item to %s"
 msgstr "gist: �� ���������� �������� ������� ������� � %s"
 
-#: access/gist/gist.c:1668
+#: access/gist/gist.c:1666
 #, c-format
 msgid "initGISTstate: numberOfAttributes %d > %d"
 msgstr "initGISTstate: numberOfAttributes ��� %d > %d"
 
-#: access/gist/gist.c:1930
+#: access/gist/gist.c:1928
 #, c-format
 msgid "%sPage: %d %s blk: %d maxoff: %d free: %d"
 msgstr "%s���.: %d %s ���: %d ���� ���: %d ��������: %d"
 
-#: access/gist/gist.c:1940
+#: access/gist/gist.c:1938
 #, c-format
 msgid "%s  Tuple. blk: %d size: %d"
 msgstr "%s  ������. ���: %d ������: %d"
 
-#: access/gist/gist.c:1955
+#: access/gist/gist.c:1953
 msgid "gist_redo: unimplemented"
 msgstr "gist_redo: �� ��������������"
 
-#: access/gist/gist.c:1961
+#: access/gist/gist.c:1959
 msgid "gist_undo: unimplemented"
 msgstr "gist_undo: �� ��������������"
 
@@ -285,7 +286,7 @@ msgstr "heapgettup: ReadBuffer 
 msgid "Relation %u does not exist"
 msgstr ""
 
-#: access/heap/heapam.c:553 catalog/namespace.c:189 tcop/utility.c:153
+#: access/heap/heapam.c:553 catalog/namespace.c:189 tcop/utility.c:154
 #, c-format
 msgid "Relation \"%s\" does not exist"
 msgstr ""
@@ -352,7 +353,7 @@ msgstr ""
 msgid "simple_heap_delete: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1448 executor/execMain.c:1333
+#: access/heap/heapam.c:1448 executor/execMain.c:1324
 #, c-format
 msgid "Unknown status %u from heap_delete"
 msgstr ""
@@ -373,7 +374,7 @@ msgstr ""
 msgid "simple_heap_update: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1782 executor/execMain.c:1472
+#: access/heap/heapam.c:1782 executor/execMain.c:1462
 #, c-format
 msgid "Unknown status %u from heap_update"
 msgstr ""
@@ -739,99 +740,99 @@ msgstr ""
 msgid "bt_getroot[%s]: fixing root page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:787
+#: access/nbtree/nbtree.c:806
 #, c-format
 msgid ""
 "_bt_restscan: my bits moved right off the end of the world!\n"
 "\tRecreate index %s."
 msgstr ""
 
-#: access/nbtree/nbtree.c:817
+#: access/nbtree/nbtree.c:836
 msgid "_bt_restore_page: can't add item to page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:840
+#: access/nbtree/nbtree.c:859
 msgid "btree_delete_redo: block unfound"
 msgstr ""
 
-#: access/nbtree/nbtree.c:843
+#: access/nbtree/nbtree.c:862
 msgid "btree_delete_redo: uninitialized page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:879
+#: access/nbtree/nbtree.c:898
 #, c-format
 msgid "btree_insert_%sdo: block unfound"
 msgstr ""
 
-#: access/nbtree/nbtree.c:882
+#: access/nbtree/nbtree.c:901
 #, c-format
 msgid "btree_insert_%sdo: uninitialized page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:896
+#: access/nbtree/nbtree.c:915
 msgid "btree_insert_redo: failed to add item"
 msgstr ""
 
-#: access/nbtree/nbtree.c:905
+#: access/nbtree/nbtree.c:924
 msgid "btree_insert_undo: bad page LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:913
+#: access/nbtree/nbtree.c:932
 msgid "btree_insert_undo: unimplemented"
 msgstr ""
 
-#: access/nbtree/nbtree.c:940
+#: access/nbtree/nbtree.c:959
 #, c-format
 msgid "btree_split_%s: lost left sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:946
+#: access/nbtree/nbtree.c:965
 msgid "btree_split_undo: uninitialized left sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:969
+#: access/nbtree/nbtree.c:988
 msgid "btree_split_undo: bad left sibling LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:970 access/nbtree/nbtree.c:1009
+#: access/nbtree/nbtree.c:989 access/nbtree/nbtree.c:1028
 msgid "btree_split_undo: unimplemented"
 msgstr ""
 
-#: access/nbtree/nbtree.c:978
+#: access/nbtree/nbtree.c:997
 #, c-format
 msgid "btree_split_%s: lost right sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:984
+#: access/nbtree/nbtree.c:1003
 msgid "btree_split_undo: uninitialized right sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1008
+#: access/nbtree/nbtree.c:1027
 msgid "btree_split_undo: bad right sibling LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1022
+#: access/nbtree/nbtree.c:1041
 msgid "btree_split_redo: lost next right page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1026
+#: access/nbtree/nbtree.c:1045
 msgid "btree_split_redo: uninitialized next right page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1063
+#: access/nbtree/nbtree.c:1082
 msgid "btree_newroot_redo: no root page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1066
+#: access/nbtree/nbtree.c:1085
 msgid "btree_newroot_redo: no metapage"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1120
+#: access/nbtree/nbtree.c:1139
 #, c-format
 msgid "btree_redo: unknown op code %u"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1140
+#: access/nbtree/nbtree.c:1159
 #, c-format
 msgid "btree_undo: unknown op code %u"
 msgstr ""
@@ -849,11 +850,11 @@ msgstr ""
 msgid "Illegal scan direction %d"
 msgstr ""
 
-#: access/nbtree/nbtsort.c:292
+#: access/nbtree/nbtsort.c:288
 msgid "btree: failed to add item to the page in _bt_sort"
 msgstr ""
 
-#: access/nbtree/nbtsort.c:357
+#: access/nbtree/nbtsort.c:353
 #, c-format
 msgid "btree: index item size %lu exceeds maximum %ld"
 msgstr ""
@@ -943,7 +944,7 @@ msgstr ""
 msgid "read of clog file %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/clog.c:602 access/transam/xlog.c:1380
+#: access/transam/clog.c:602 access/transam/xlog.c:1378
 #, c-format
 msgid "creation of file %s failed: %m"
 msgstr ""
@@ -972,20 +973,20 @@ msgstr "
 msgid "could not read transaction-commit log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xact.c:424
+#: access/transam/xact.c:412
 msgid "You may only have 2^32-1 commands per transaction"
 msgstr "�� ������ ����� �� 2^32-1 ������ � ����� ����������"
 
-#: access/transam/xact.c:714
+#: access/transam/xact.c:702
 #, c-format
 msgid "RecordTransactionAbort: xact %u already committed"
 msgstr ""
 
-#: access/transam/xact.c:943
+#: access/transam/xact.c:917
 msgid "CommitTransaction and not in in-progress state"
 msgstr ""
 
-#: access/transam/xact.c:1066
+#: access/transam/xact.c:1058
 msgid "AbortTransaction and not in in-progress state"
 msgstr ""
 
@@ -1009,266 +1010,295 @@ msgstr "StartTransactionCommand: 
 msgid "StartTransactionCommand: unexpected TBLOCK_ENDABORT"
 msgstr "StartTransactionCommand: ����������� TBLOCK_ENDABORT"
 
-#: access/transam/xact.c:1440
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1454
+#, c-format
+msgid "%s cannot run inside a transaction block"
+msgstr "%s �� ����� ����������� ������ ��������������� �����"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1464
+#, c-format
+msgid "%s cannot be executed from a function"
+msgstr "%s �� ����� ����������� ������ �������"
+
+#: access/transam/xact.c:1468
+msgid "PreventTransactionChain: can't prevent chain"
+msgstr "PreventTransactionChain: �� � ��������� ������������� �������"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1475
+#, c-format
+msgid "%s will be committed automatically"
+msgstr ""
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1519
+#, c-format
+msgid "%s may only be used in begin/end transaction blocks"
+msgstr ""
+
+#: access/transam/xact.c:1541
 msgid "BEGIN: already a transaction in progress"
 msgstr "BEGIN: ���������� ��� � �������� ����������"
 
-#: access/transam/xact.c:1504
+#: access/transam/xact.c:1605
 msgid "COMMIT: no transaction in progress"
 msgstr "COMMIT: ��� ���������� � �������� ����������"
 
-#: access/transam/xact.c:1541 access/transam/xact.c:1588
+#: access/transam/xact.c:1642 access/transam/xact.c:1689
 msgid "ROLLBACK: no transaction in progress"
 msgstr "ROLLBACK: ��� ���������� � �������� ����������"
 
-#: access/transam/xact.c:1662 access/transam/xact.c:1673
+#: access/transam/xact.c:1768 access/transam/xact.c:1779
 #, c-format
 msgid "xact_redo: unknown op code %u"
 msgstr "xact_redo: ����������� ��� ��������: %u"
 
-#: access/transam/xact.c:1671
+#: access/transam/xact.c:1777
 msgid "xact_undo: can't undo committed xaction"
 msgstr ""
 
-#: access/transam/xact.c:1708
+#: access/transam/xact.c:1814
 msgid "XactPushRollback: already installed"
 msgstr ""
 
-#: access/transam/xlog.c:506
+#: access/transam/xlog.c:505
 #, c-format
 msgid "XLogInsert: invalid info mask %02X"
 msgstr ""
 
-#: access/transam/xlog.c:611
+#: access/transam/xlog.c:610
 #, c-format
 msgid "XLogInsert: can backup %d blocks at most"
 msgstr ""
 
-#: access/transam/xlog.c:629
+#: access/transam/xlog.c:628
 #, c-format
 msgid "XLogInsert: invalid record length %u"
 msgstr ""
 
-#: access/transam/xlog.c:786 access/transam/xlog.c:2627 utils/adt/name.c:52
-#: utils/adt/varchar.c:83 utils/adt/varchar.c:357 utils/adt/varlena.c:225
+#: access/transam/xlog.c:785 access/transam/xlog.c:2625 scan.l:36
+#: utils/adt/name.c:52 utils/adt/varchar.c:83 utils/adt/varchar.c:357
+#: utils/adt/varlena.c:226
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:1030
+#: access/transam/xlog.c:1029
 #, c-format
 msgid "XLogWrite: write request %X/%X is past end of log %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1047 access/transam/xlog.c:1157
-#: access/transam/xlog.c:3331
+#: access/transam/xlog.c:1046 access/transam/xlog.c:1156
+#: access/transam/xlog.c:3329
 #, c-format
 msgid "close of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1082
+#: access/transam/xlog.c:1081
 msgid "XLogWrite: time for a checkpoint, signaling postmaster"
 msgstr ""
 
-#: access/transam/xlog.c:1101
+#: access/transam/xlog.c:1100
 #, c-format
 msgid "lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1113
+#: access/transam/xlog.c:1112
 #, c-format
 msgid "write of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1209
+#: access/transam/xlog.c:1208
 #, c-format
-msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X\n"
+msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1315
+#: access/transam/xlog.c:1313
 #, c-format
 msgid "XLogFlush: request %X/%X is not satisfied --- flushed only to %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1358 access/transam/xlog.c:1439
-#: access/transam/xlog.c:1549 access/transam/xlog.c:1553
+#: access/transam/xlog.c:1356 access/transam/xlog.c:1437
+#: access/transam/xlog.c:1547 access/transam/xlog.c:1551
 #, c-format
 msgid "open of %s (log file %u, segment %u) failed: %m"
 msgstr "�� ������� ������� %s (���-����: %u, �������: %u): %m"
 
-#: access/transam/xlog.c:1407
+#: access/transam/xlog.c:1405
 #, c-format
 msgid "ZeroFill failed to write %s: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1412
+#: access/transam/xlog.c:1410
 #, c-format
 msgid "fsync of file %s failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1517
+#: access/transam/xlog.c:1515
 #, c-format
 msgid ""
 "link from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1522
+#: access/transam/xlog.c:1520
 #, c-format
 msgid ""
 "rename from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1603
+#: access/transam/xlog.c:1601
 #, c-format
 msgid "could not open transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1618
+#: access/transam/xlog.c:1616
 #, c-format
 msgid "archiving transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1620
+#: access/transam/xlog.c:1618
 msgid "archiving log files is not implemented!"
 msgstr "��������� ����� �� ��������������!"
 
-#: access/transam/xlog.c:1634
+#: access/transam/xlog.c:1632
 #, c-format
 msgid "recycled transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1640
+#: access/transam/xlog.c:1638
 #, c-format
 msgid "removing transaction log file %s"
 msgstr "�������� ���-����� ����������: %s"
 
-#: access/transam/xlog.c:1649
+#: access/transam/xlog.c:1647
 #, c-format
 msgid "could not read transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1722
+#: access/transam/xlog.c:1720
 #, c-format
 msgid "ReadRecord: bad resource manager data checksum in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1744
+#: access/transam/xlog.c:1742
 #, c-format
 msgid "ReadRecord: bad checksum of backup block %d in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1813
+#: access/transam/xlog.c:1811
 #, c-format
 msgid "ReadRecord: invalid record offset at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1836
+#: access/transam/xlog.c:1834
 #, c-format
 msgid "ReadRecord: lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1842 access/transam/xlog.c:1926
+#: access/transam/xlog.c:1840 access/transam/xlog.c:1924
 #, c-format
 msgid "ReadRecord: read of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1852
+#: access/transam/xlog.c:1850
 #, c-format
 msgid "ReadRecord: contrecord is requested by %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1866
+#: access/transam/xlog.c:1864
 #, c-format
 msgid "ReadRecord: record with zero length at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1890
+#: access/transam/xlog.c:1888
 #, c-format
 msgid "ReadRecord: record length %u at %X/%X too long"
 msgstr ""
 
-#: access/transam/xlog.c:1896
+#: access/transam/xlog.c:1894
 #, c-format
 msgid "ReadRecord: invalid resource manager id %u at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1934
+#: access/transam/xlog.c:1932
 #, c-format
 msgid ""
 "ReadRecord: there is no ContRecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:1942
+#: access/transam/xlog.c:1940
 #, c-format
 msgid ""
 "ReadRecord: invalid ContRecord length %u in log file %u, segment %u, offset %"
 "u"
 msgstr ""
 
-#: access/transam/xlog.c:2006
+#: access/transam/xlog.c:2004
 #, c-format
 msgid ""
 "ReadRecord: invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2012
+#: access/transam/xlog.c:2010
 #, c-format
 msgid ""
 "ReadRecord: invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2020
+#: access/transam/xlog.c:2018
 #, c-format
 msgid ""
 "ReadRecord: unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
 
 #. translator: SUI = startup id
-#: access/transam/xlog.c:2042
+#: access/transam/xlog.c:2040
 #, c-format
 msgid ""
 "ReadRecord: out-of-sequence SUI %u (after %u) in log file %u, segment %u, "
 "offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2101
+#: access/transam/xlog.c:2099
 msgid "invalid LC_COLLATE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2105
+#: access/transam/xlog.c:2103
 msgid "invalid LC_CTYPE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2123
+#: access/transam/xlog.c:2121
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr ""
 
-#: access/transam/xlog.c:2131
+#: access/transam/xlog.c:2129
 #, c-format
 msgid "WriteControlFile: could not create control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2140
+#: access/transam/xlog.c:2138
 #, c-format
 msgid "WriteControlFile: write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2144
+#: access/transam/xlog.c:2142
 #, c-format
 msgid "WriteControlFile: fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2160 access/transam/xlog.c:2283
+#: access/transam/xlog.c:2158 access/transam/xlog.c:2281
 #, c-format
 msgid "could not open control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2163
+#: access/transam/xlog.c:2161
 #, c-format
 msgid "read from control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2175
+#: access/transam/xlog.c:2173
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d,\n"
@@ -1276,11 +1306,11 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2188
+#: access/transam/xlog.c:2186
 msgid "invalid checksum in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2204
+#: access/transam/xlog.c:2202
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d,\n"
@@ -1288,7 +1318,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2210
+#: access/transam/xlog.c:2208
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d,\n"
@@ -1296,7 +1326,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2216
+#: access/transam/xlog.c:2214
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d,\n"
@@ -1304,7 +1334,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2223
+#: access/transam/xlog.c:2221
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d,\n"
@@ -1312,7 +1342,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2230
+#: access/transam/xlog.c:2228
 #, c-format
 msgid ""
 "The database cluster was initialized with FUNC_MAX_ARGS %d,\n"
@@ -1320,21 +1350,21 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2238
+#: access/transam/xlog.c:2236
 msgid ""
 "The database cluster was initialized without HAVE_INT64_TIMESTAMP\n"
 "\tbut the backend was compiled with HAVE_INT64_TIMESTAMP.\n"
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2244
+#: access/transam/xlog.c:2242
 msgid ""
 "The database cluster was initialized with HAVE_INT64_TIMESTAMP\n"
 "\tbut the backend was compiled without HAVE_INT64_TIMESTAMP.\n"
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2251
+#: access/transam/xlog.c:2249
 #, c-format
 msgid ""
 "The database cluster was initialized with LOCALE_NAME_BUFLEN %d,\n"
@@ -1342,7 +1372,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2258
+#: access/transam/xlog.c:2256
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_COLLATE '%s',\n"
@@ -1350,7 +1380,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2264
+#: access/transam/xlog.c:2262
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_CTYPE '%s',\n"
@@ -1358,41 +1388,41 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2291
+#: access/transam/xlog.c:2289
 #, c-format
 msgid "write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2295
+#: access/transam/xlog.c:2293
 #, c-format
 msgid "fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2435
+#: access/transam/xlog.c:2433
 #, c-format
 msgid "BootStrapXLOG failed to write log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2439
+#: access/transam/xlog.c:2437
 #, c-format
 msgid "BootStrapXLOG failed to fsync log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2505
+#: access/transam/xlog.c:2503
 msgid "control file context is broken"
 msgstr ""
 
-#: access/transam/xlog.c:2508
+#: access/transam/xlog.c:2506
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "������� ���� ���������: %s"
 
-#: access/transam/xlog.c:2511
+#: access/transam/xlog.c:2509
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr "���������� ������� ���� ��������: %s"
 
-#: access/transam/xlog.c:2514
+#: access/transam/xlog.c:2512
 #, c-format
 msgid ""
 "database system was interrupted being in recovery at %s\n"
@@ -1400,116 +1430,116 @@ msgid ""
 "\tand you will have to use the last backup for recovery."
 msgstr ""
 
-#: access/transam/xlog.c:2519
+#: access/transam/xlog.c:2517
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr "������� ���� ��������: %s"
 
-#: access/transam/xlog.c:2530
+#: access/transam/xlog.c:2528
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "����������� �����: %X/%X"
 
-#: access/transam/xlog.c:2539
+#: access/transam/xlog.c:2537
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "������������ ���������� ����������� �����: %X/%X"
 
-#: access/transam/xlog.c:2544
+#: access/transam/xlog.c:2542
 msgid "unable to locate a valid checkpoint record"
 msgstr "�� � ��������� ����� ���������� ����������� �����"
 
-#: access/transam/xlog.c:2550
+#: access/transam/xlog.c:2548
 #, c-format
 msgid "redo record is at %X/%X; undo record is at %X/%X; shutdown %s"
 msgstr "redo-������: %X/%X; undo-������: %X/%X; ����������: %s"
 
-#: access/transam/xlog.c:2554
+#: access/transam/xlog.c:2552
 #, c-format
 msgid "next transaction id: %u; next oid: %u"
 msgstr "id ��������� ����������: %u; ��������� OID: %u"
 
-#: access/transam/xlog.c:2557
+#: access/transam/xlog.c:2555
 msgid "invalid next transaction id"
 msgstr ""
 
-#: access/transam/xlog.c:2568
+#: access/transam/xlog.c:2566
 msgid "invalid redo in checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2576
+#: access/transam/xlog.c:2574
 msgid "invalid redo/undo record in shutdown checkpoint"
 msgstr ""
 
-#: access/transam/xlog.c:2585
+#: access/transam/xlog.c:2583
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 
-#: access/transam/xlog.c:2605
+#: access/transam/xlog.c:2603
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2636
+#: access/transam/xlog.c:2634
 #, c-format
 msgid "redo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2642
+#: access/transam/xlog.c:2640
 msgid "redo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2724
+#: access/transam/xlog.c:2722
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2734
+#: access/transam/xlog.c:2732
 #, c-format
 msgid "undo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2738
+#: access/transam/xlog.c:2736
 msgid "undo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2772
+#: access/transam/xlog.c:2770
 msgid "database system is ready"
 msgstr "������� ������ � �������������"
 
-#: access/transam/xlog.c:2900
+#: access/transam/xlog.c:2898
 msgid "shutting down"
 msgstr "���������� � ��������"
 
-#: access/transam/xlog.c:2913
+#: access/transam/xlog.c:2911
 msgid "database system is shut down"
 msgstr "������� ���������"
 
-#: access/transam/xlog.c:2934
+#: access/transam/xlog.c:2932
 msgid "CreateCheckPoint: cannot be called inside transaction block"
 msgstr ""
 
-#: access/transam/xlog.c:3049
+#: access/transam/xlog.c:3047
 msgid "active transaction while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3095
+#: access/transam/xlog.c:3093
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3326 access/transam/xlog.c:3354
+#: access/transam/xlog.c:3324 access/transam/xlog.c:3352
 #, c-format
 msgid "fsync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3360
+#: access/transam/xlog.c:3358
 #, c-format
 msgid "fdatasync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3368
+#: access/transam/xlog.c:3366
 #, c-format
 msgid "bogus wal_sync_method %d"
 msgstr ""
@@ -1526,7 +1556,7 @@ msgstr ""
 msgid "XLogOpenRelation: file found on insert into cache"
 msgstr ""
 
-#: bootstrap/bootstrap.c:193
+#: bootstrap/bootstrap.c:194
 msgid ""
 "Usage:\n"
 "  postgres -boot [-d level] [-D datadir] [-F] [-o file] [-x num] dbname\n"
@@ -1545,7 +1575,7 @@ msgstr ""
 "  -o ����          ��������� debug-����� � ����\n"
 "  -x �����         ��� ����������� �������������\n"
 
-#: bootstrap/bootstrap.c:307 postmaster/postmaster.c:308
+#: bootstrap/bootstrap.c:308 postmaster/postmaster.c:309
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -1560,120 +1590,178 @@ msgstr ""
 "��������� PGDATA.\n"
 "\n"
 
-#: bootstrap/bootstrap.c:407
+#: bootstrap/bootstrap.c:408
 #, c-format
 msgid "Unsupported XLOG op %d"
 msgstr ""
 
-#: bootstrap/bootstrap.c:510
+#: bootstrap/bootstrap.c:511
 #, c-format
 msgid "open relation %s, attrsize %d"
 msgstr ""
 
-#: bootstrap/bootstrap.c:526
+#: bootstrap/bootstrap.c:527
 #, c-format
 msgid "create attribute %d name %s len %d num %d type %u"
 msgstr ""
 
-#: bootstrap/bootstrap.c:545
+#: bootstrap/bootstrap.c:546
 #, c-format
 msgid "closerel: close of '%s' when '%s' was expected"
 msgstr ""
 
-#: bootstrap/bootstrap.c:549
+#: bootstrap/bootstrap.c:550
 #, c-format
 msgid "closerel: close of '%s' before any relation was opened"
 msgstr ""
 
-#: bootstrap/bootstrap.c:554
+#: bootstrap/bootstrap.c:555
 msgid "no open relation to close"
 msgstr ""
 
-#: bootstrap/bootstrap.c:557
+#: bootstrap/bootstrap.c:558
 #, c-format
 msgid "close relation %s"
 msgstr ""
 
-#: bootstrap/bootstrap.c:581
+#: bootstrap/bootstrap.c:582
 msgid "warning: no open relations allowed with 'create' command"
 msgstr ""
 
-#: bootstrap/bootstrap.c:590
+#: bootstrap/bootstrap.c:591
 #, c-format
 msgid "column %s %s"
 msgstr "������� %s %s"
 
-#: bootstrap/bootstrap.c:680
+#: bootstrap/bootstrap.c:681
 #, c-format
 msgid "inserting row oid %u, %d columns"
 msgstr ""
 
-#: bootstrap/bootstrap.c:692
+#: bootstrap/bootstrap.c:693
 msgid "row inserted"
 msgstr "������ ���������"
 
-#: bootstrap/bootstrap.c:714
+#: bootstrap/bootstrap.c:715
 #, c-format
 msgid "inserting column %d value '%s'"
 msgstr ""
 
-#: bootstrap/bootstrap.c:720
+#: bootstrap/bootstrap.c:721
 msgid "Typ != NULL"
 msgstr "Typ != NULL"
 
-#: bootstrap/bootstrap.c:727
+#: bootstrap/bootstrap.c:728
 #, c-format
 msgid "unable to find atttypid %u in Typ list"
 msgstr ""
 
-#: bootstrap/bootstrap.c:738 bootstrap/bootstrap.c:759
+#: bootstrap/bootstrap.c:739 bootstrap/bootstrap.c:760
 #, c-format
 msgid " -> %s"
 msgstr " -> %s"
 
-#: bootstrap/bootstrap.c:749
+#: bootstrap/bootstrap.c:750
 #, c-format
 msgid "type oid %u not found"
 msgstr ""
 
-#: bootstrap/bootstrap.c:750
+#: bootstrap/bootstrap.c:751
 #, c-format
 msgid "Typ == NULL, typeindex = %u"
 msgstr "Typ == NULL, typeindex = %u"
 
-#: bootstrap/bootstrap.c:762
+#: bootstrap/bootstrap.c:763
 msgid "inserted"
 msgstr "���������"
 
-#: bootstrap/bootstrap.c:772
+#: bootstrap/bootstrap.c:773
 #, c-format
 msgid "inserting column %d NULL"
 msgstr ""
 
-#: bootstrap/bootstrap.c:819
+#: bootstrap/bootstrap.c:820
 msgid "Memory manager fault: cleanup called twice.\n"
 msgstr ""
 
-#: bootstrap/bootstrap.c:866
+#: bootstrap/bootstrap.c:867
 #, c-format
 msgid "external type: %s"
 msgstr "������� ���: %s"
 
-#: bootstrap/bootstrap.c:890
+#: bootstrap/bootstrap.c:891
 #, c-format
 msgid "Error: unknown type '%s'.\n"
 msgstr "������: ����������� ��� '%s'.\n"
 
-#: bootstrap/bootstrap.c:906
+#: bootstrap/bootstrap.c:907
 msgid "AllocateAttribute: malloc failed"
 msgstr "AllocateAttribute: malloc �� ������"
 
-#: bootstrap/bootstrap.c:1057
+#: bootstrap/bootstrap.c:1058
 msgid ""
 "There are too many string constants and identifiers for the compiler to "
 "handle."
 msgstr ""
 
+#: bootscanner.l:128
+#, c-format
+msgid "syntax error at line %d: unexpected character %s"
+msgstr "������ ���������� � ������ %d: ����������� ������ %s"
+
+#: bootscanner.l:138
+#, c-format
+msgid "syntax error at line %d: unexpected token %s"
+msgstr "������ ���������� � ������ %d: ����������� ����� %s"
+
+#: bootparse.y:59
+msgid "start transaction"
+msgstr "������ ����������"
+
+#: bootparse.y:67
+msgid "commit transaction"
+msgstr "������������� ����������"
+
+#: bootparse.y:158
+#, c-format
+msgid "creating%s%s relation %s..."
+msgstr ""
+
+#: bootparse.y:179
+msgid "create bootstrap: warning, open relation exists, closing first"
+msgstr ""
+
+#: bootparse.y:189
+msgid "bootstrap relation created"
+msgstr ""
+
+#: bootparse.y:202
+#, c-format
+msgid "relation created with oid %u"
+msgstr "������ ������ � OID %u"
+
+#: bootparse.y:213
+#, c-format
+msgid "inserting row with oid %u..."
+msgstr "����������� ������ � OID %u..."
+
+#: bootparse.y:215
+msgid "inserting row..."
+msgstr "����������� ������..."
+
+#: bootparse.y:221
+#, c-format
+msgid "incorrect number of columns in row (expected %d, got %d)"
+msgstr "������� ����� ������� � ������ (��������� %d, �������� %d)"
+
+#: bootparse.y:225
+msgid "relation not open"
+msgstr "������ �� ������"
+
+#: bootparse.y:306
+msgid "too many columns"
+msgstr "������� ����� �������"
+
 #: catalog/aclchk.c:60
 #, c-format
 msgid "acl size = %d, # acls = %d"
@@ -1714,9 +1802,9 @@ msgstr ""
 msgid "database \"%s\" not found"
 msgstr "���� \"%s\" �� �������"
 
-#: catalog/aclchk.c:302 catalog/aclchk.c:474 catalog/pg_conversion.c:180
-#: commands/dbcommands.c:517 commands/user.c:851 tcop/utility.c:828
-#: utils/init/miscinit.c:616
+#: catalog/aclchk.c:302 catalog/aclchk.c:474 catalog/pg_conversion.c:146
+#: commands/dbcommands.c:535 commands/user.c:911 tcop/utility.c:861
+#: utils/init/miscinit.c:615
 msgid "permission denied"
 msgstr "������ �����ݣ�"
 
@@ -1725,7 +1813,7 @@ msgstr "
 msgid "invalid privilege type %s for function object"
 msgstr ""
 
-#: catalog/aclchk.c:389 parser/parse_func.c:867 parser/parse_func.c:1315
+#: catalog/aclchk.c:389 parser/parse_func.c:885 parser/parse_func.c:1332
 #, c-format
 msgid "function %u not found"
 msgstr "������� %u �� �������"
@@ -1803,7 +1891,7 @@ msgstr ""
 msgid "aclcheck: bogus ACL id type: %d"
 msgstr ""
 
-#: catalog/aclchk.c:879 commands/user.c:1232
+#: catalog/aclchk.c:879 commands/user.c:1304
 #, c-format
 msgid "%s: permission denied"
 msgstr "%s: ��� �������"
@@ -1887,391 +1975,383 @@ msgstr ""
 msgid "pg_opclass_ownercheck: operator class %u not found"
 msgstr ""
 
-#: catalog/dependency.c:162
+#: catalog/dependency.c:163
 #, c-format
 msgid ""
 "Cannot drop %s because other objects depend on it\n"
 "\tUse DROP ... CASCADE to drop the dependent objects too"
 msgstr ""
 
-#: catalog/dependency.c:252 catalog/dependency.c:571
+#: catalog/dependency.c:253 catalog/dependency.c:572
 #, c-format
 msgid "Cannot drop %s because it is required by the database system"
 msgstr ""
 
-#: catalog/dependency.c:256
+#: catalog/dependency.c:257
 #, c-format
 msgid "findAutoDeletableObjects: unknown dependency type '%c' for %s"
 msgstr ""
 
-#: catalog/dependency.c:385
+#: catalog/dependency.c:386
 #, c-format
 msgid ""
 "Cannot drop %s because %s requires it\n"
 "\tYou may drop %s instead"
 msgstr ""
 
-#: catalog/dependency.c:411
+#: catalog/dependency.c:412
 #, c-format
 msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
 msgstr ""
 
-#: catalog/dependency.c:423
+#: catalog/dependency.c:424
 #, c-format
 msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
 msgstr ""
 
-#: catalog/dependency.c:427 catalog/dependency.c:575
+#: catalog/dependency.c:428 catalog/dependency.c:576
 #, c-format
 msgid "recursiveDeletion: unknown dependency type '%c' for %s"
 msgstr ""
 
-#: catalog/dependency.c:453 catalog/dependency.c:531 catalog/dependency.c:557
+#: catalog/dependency.c:454 catalog/dependency.c:532 catalog/dependency.c:558
 #, c-format
 msgid "Drop auto-cascades to %s"
 msgstr ""
 
-#: catalog/dependency.c:457 catalog/dependency.c:535
+#: catalog/dependency.c:458 catalog/dependency.c:536
 #, c-format
 msgid "%s depends on %s"
 msgstr ""
 
-#: catalog/dependency.c:463 catalog/dependency.c:541
+#: catalog/dependency.c:464 catalog/dependency.c:542
 #, c-format
 msgid "Drop cascades to %s"
 msgstr ""
 
-#: catalog/dependency.c:692
+#: catalog/dependency.c:693
 #, c-format
 msgid "doDeletion: Unsupported object class %u"
 msgstr ""
 
-#: catalog/dependency.c:775
+#: catalog/dependency.c:776
 #, c-format
 msgid "find_expr_references_walker: bogus varlevelsup %d"
 msgstr ""
 
-#: catalog/dependency.c:779
+#: catalog/dependency.c:780
 #, c-format
 msgid "find_expr_references_walker: bogus varno %d"
 msgstr ""
 
-#: catalog/dependency.c:794
+#: catalog/dependency.c:800
 #, c-format
 msgid "find_expr_references_walker: bogus varattno %d"
 msgstr ""
 
-#: catalog/dependency.c:833
+#: catalog/dependency.c:844
 msgid "find_expr_references_walker: already-planned subqueries not supported"
 msgstr ""
 
-#: catalog/dependency.c:1169
+#: catalog/dependency.c:1180
 #, c-format
 msgid "getObjectClass: Unknown object class %u"
 msgstr ""
 
-#: catalog/dependency.c:1226
+#: catalog/dependency.c:1237
 #, c-format
 msgid "getObjectDescription: Cast %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1260
+#: catalog/dependency.c:1271
 #, c-format
 msgid "getObjectDescription: Constraint %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1290
+#: catalog/dependency.c:1301
 #, c-format
 msgid "getObjectDescription: Conversion %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1319
+#: catalog/dependency.c:1330
 #, c-format
 msgid "getObjectDescription: Default %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1344
+#: catalog/dependency.c:1355
 #, c-format
 msgid "getObjectDescription: Language %u does not exist"
 msgstr "getObjectDescription: ���� %u �� ����������"
 
-#: catalog/dependency.c:1369
+#: catalog/dependency.c:1380
 #, c-format
 msgid "cache lookup of opclass %u failed"
 msgstr "����� � ���� �������� %u �� ������"
 
-#: catalog/dependency.c:1387 utils/adt/ruleutils.c:425
+#: catalog/dependency.c:1398 utils/adt/ruleutils.c:425
 #, c-format
 msgid "syscache lookup for AM %u failed"
 msgstr "����� � ��������� ���� AM %u �� ������"
 
-#: catalog/dependency.c:1419
+#: catalog/dependency.c:1430
 #, c-format
 msgid "getObjectDescription: Rule %u does not exist"
 msgstr "getObjectDescription: ������ %u �� ����������"
 
-#: catalog/dependency.c:1453
+#: catalog/dependency.c:1464
 #, c-format
 msgid "getObjectDescription: Trigger %u does not exist"
 msgstr "getObjectDescription: ������� %u �� ����������"
 
-#: catalog/dependency.c:1473
+#: catalog/dependency.c:1484
 #, c-format
 msgid "getObjectDescription: Schema %u does not exist"
 msgstr "getObjectDescription: ����� %u �� ����������"
 
-#: catalog/dependency.c:1505 catalog/heap.c:1635 catalog/pg_constraint.c:445
-#: utils/adt/ruleutils.c:3120
+#: catalog/dependency.c:1516 catalog/heap.c:1660 catalog/pg_constraint.c:470
+#: utils/adt/ruleutils.c:3121
 #, c-format
 msgid "cache lookup of relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:155 catalog/heap.c:158
+#: catalog/heap.c:156 catalog/heap.c:159
 #, c-format
 msgid "SystemAttributeDefinition: invalid attribute number %d"
 msgstr "SystemAttributeDefinition: �������� ����� ��������: %d"
 
-#: catalog/heap.c:225
+#: catalog/heap.c:226
 #, c-format
 msgid ""
 "cannot create %s.%s: system catalog modifications are currently disallowed"
 msgstr ""
 
-#: catalog/heap.c:362
+#: catalog/heap.c:353
+#, c-format
+msgid "Number of columns is out of range (0 to %d)"
+msgstr "����� ������� ��� ��������� (�� 0 �� %d)"
+
+#: catalog/heap.c:368
 #, c-format
 msgid "name of column \"%s\" conflicts with an existing system column"
 msgstr "��� ������� \"%s\" ����������� � ������������ ��������� ��������"
 
-#: catalog/heap.c:376
+#: catalog/heap.c:382
 #, c-format
 msgid "column name \"%s\" is duplicated"
 msgstr "��������� ��� �������: \"%s\""
 
-#: catalog/heap.c:398
+#: catalog/heap.c:420
 #, c-format
 msgid ""
 "Attribute \"%s\" has an unknown type\n"
 "\tProceeding with relation creation anyway"
 msgstr ""
 
-#: catalog/heap.c:402
+#: catalog/heap.c:424
 #, c-format
 msgid "Attribute \"%s\" has pseudo-type %s"
 msgstr "������� \"%s\" ����� ������-��� %s"
 
-#: catalog/heap.c:410
+#: catalog/heap.c:431
 #, c-format
 msgid "Attribute \"%s\" has composite type %s"
 msgstr "������� \"%s\" ����� ������� ��� %s"
 
-#: catalog/heap.c:691
-#, c-format
-msgid "Number of columns is out of range (1 to %d)"
-msgstr "����� ������� ��� ��������� (�� 1 �� %d)"
-
-#: catalog/heap.c:697
+#: catalog/heap.c:714
 #, c-format
 msgid "Relation '%s' already exists"
 msgstr "������ '%s' ��� ����������"
 
-#: catalog/heap.c:848
+#: catalog/heap.c:871
 #, c-format
 msgid "DeleteRelationTuple: cache lookup failed for relation %u"
 msgstr "DeleteRelationTuple: ����� � ���� ����� %u �� ������"
 
-#: catalog/heap.c:927
+#: catalog/heap.c:950
 #, c-format
 msgid "RemoveAttributeById: Failed to find attribute %d in relation %u"
 msgstr ""
 
-#: catalog/heap.c:1006
+#: catalog/heap.c:1029
 #, c-format
 msgid "RemoveAttrDefault: no default found for rel %u attnum %d"
 msgstr ""
 
-#: catalog/heap.c:1042
+#: catalog/heap.c:1065
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for attrdef %u"
 msgstr "RemoveAttrDefaultById: ����� � ���� attrdef %u �� ������"
 
-#: catalog/heap.c:1065
+#: catalog/heap.c:1088
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for rel %u attr %d"
 msgstr "RemoveAttrDefaultById: ����� � ���� ��� ����� %u � attr %d �� ������"
 
-#: catalog/heap.c:1120
+#: catalog/heap.c:1143
 #, c-format
 msgid "heap_drop_with_catalog: FlushRelationBuffers returned %d"
 msgstr "heap_drop_with_catalog: FlushRelationBuffers ���������� %d"
 
-#: catalog/heap.c:1236 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3277
+#: catalog/heap.c:1264 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3278
 #, c-format
 msgid "cache lookup of attribute %d in relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:1493 commands/tablecmds.c:2567 commands/tablecmds.c:2603
+#: catalog/heap.c:1522 commands/tablecmds.c:2634 commands/tablecmds.c:2672
 #, c-format
 msgid "constraint \"%s\" already exists for relation \"%s\""
 msgstr ""
 
-#: catalog/heap.c:1507 commands/tablecmds.c:184
+#: catalog/heap.c:1536 commands/tablecmds.c:206
 #, c-format
 msgid "Duplicate CHECK constraint name: '%s'"
 msgstr ""
 
-#: catalog/heap.c:1566
+#: catalog/heap.c:1596
 #, c-format
 msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1573 commands/tablecmds.c:2684
+#: catalog/heap.c:1603 commands/tablecmds.c:2754 commands/typecmds.c:1588
 msgid "cannot use subselect in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1575 commands/tablecmds.c:2686
+#: catalog/heap.c:1605 commands/tablecmds.c:2756 commands/typecmds.c:1590
 msgid "cannot use aggregate function in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1690
+#: catalog/heap.c:1715
 msgid "cannot use column references in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1696
+#: catalog/heap.c:1721
 msgid "DEFAULT clause must not return a set"
 msgstr ""
 
-#: catalog/heap.c:1702
+#: catalog/heap.c:1727
 msgid "cannot use subselects in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1704
+#: catalog/heap.c:1729
 msgid "cannot use aggregate functions in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1725 rewrite/rewriteHandler.c:485
+#: catalog/heap.c:1750 rewrite/rewriteHandler.c:487
 #, c-format
 msgid ""
 "Column \"%s\" is of type %s but default expression is of type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: catalog/heap.c:1931
-msgid "TRUNCATE TABLE cannot run inside a transaction block"
-msgstr "������ ��������� TRUNCATE TABLE ������ ��������������� �����"
-
-#: catalog/index.c:125
+#: catalog/index.c:124
 #, c-format
 msgid "Function %u does not exist"
 msgstr "������� %u �� ����������"
 
-#: catalog/index.c:144 catalog/index.c:281
+#: catalog/index.c:143 catalog/index.c:280
 #, c-format
 msgid "Opclass %u does not exist"
 msgstr "Opclass %u �� ����������"
 
-#: catalog/index.c:158 catalog/index.c:294
+#: catalog/index.c:157 catalog/index.c:293
 #, c-format
 msgid "Type %u does not exist"
 msgstr "��� %u �� ����������"
 
-#: catalog/index.c:239
+#: catalog/index.c:238
 #, c-format
 msgid "cannot create index: column %d does not exist"
 msgstr "������ ������� ������: ������� %d �� ����������"
 
-#: catalog/index.c:544
+#: catalog/index.c:543
 msgid "must index at least one column"
 msgstr "��������� ���� ���� ������� ������ ���� �������������"
 
-#: catalog/index.c:549
+#: catalog/index.c:548
 msgid "User-defined indexes on system catalogs are not supported"
 msgstr "���������������� ������� �� ��������� �������� �� ��������������"
 
-#: catalog/index.c:559
+#: catalog/index.c:558
 msgid "Shared indexes cannot be created after initdb"
 msgstr ""
 
-#: catalog/index.c:562
+#: catalog/index.c:561
 #, c-format
 msgid "relation named \"%s\" already exists"
 msgstr "������ � ������ \"%s\" ��� ����������"
 
-#: catalog/index.c:675
+#: catalog/index.c:674
 msgid "index_create: constraint must be PRIMARY or UNIQUE"
 msgstr ""
 
-#: catalog/index.c:825
+#: catalog/index.c:824
 #, c-format
 msgid "index_drop: cache lookup failed for index %u"
 msgstr "index_drop: ����� � ���� ������� %u �� ������"
 
-#: catalog/index.c:838
+#: catalog/index.c:837
 #, c-format
 msgid "index_drop: FlushRelationBuffers returned %d"
 msgstr "index_drop: FlushRelationBuffers ���������� %d"
 
-#: catalog/index.c:1036
+#: catalog/index.c:1039
 #, c-format
 msgid "relation %s isn't an indexable relation"
 msgstr "������ %s �� �������� �������������"
 
-#: catalog/index.c:1107
+#: catalog/index.c:1110
 #, c-format
 msgid "setRelhasindex: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1223
+#: catalog/index.c:1226
 #, c-format
 msgid "setNewRelfilenode: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1335
+#: catalog/index.c:1338
 #, c-format
 msgid "UpdateStats: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1599
+#: catalog/index.c:1617
 msgid "IndexBuildHeapScan: concurrent insert in progress"
 msgstr ""
 
-#: catalog/index.c:1614
+#: catalog/index.c:1632
 msgid "IndexBuildHeapScan: concurrent delete in progress"
 msgstr ""
 
-#: catalog/index.c:1619 commands/vacuum.c:1207 commands/vacuumlazy.c:360
-#: commands/vacuumlazy.c:847
+#: catalog/index.c:1637 commands/vacuum.c:1207 commands/vacuumlazy.c:359
+#: commands/vacuumlazy.c:846
 msgid "Unexpected HeapTupleSatisfiesVacuum result"
 msgstr ""
 
-#: catalog/index.c:1706
+#: catalog/index.c:1725
 #, c-format
 msgid "IndexGetRelation: can't find index id %u"
 msgstr "IndexGetRelation: �� ���������� ����� ������ � id %u"
 
-#: catalog/index.c:1751
-msgid "REINDEX cannot run inside a transaction block"
-msgstr "������ �������� REINDEX ������ ����� ����������"
-
-#: catalog/index.c:1765
+#: catalog/index.c:1774
 msgid "reindex_index: can't open index relation"
 msgstr ""
 
-#: catalog/index.c:1776
+#: catalog/index.c:1785
 msgid "reindex_index: can't open heap relation"
 msgstr ""
 
-#: catalog/index.c:1790 catalog/index.c:1913
+#: catalog/index.c:1799 catalog/index.c:1922
 #, c-format
 msgid "the target relation %u is shared"
 msgstr ""
 
-#: catalog/index.c:1796
+#: catalog/index.c:1805
 #, c-format
 msgid "the target relation %u is nailed"
 msgstr ""
 
-#: catalog/namespace.c:168 catalog/namespace.c:215 catalog/namespace.c:1072
-#: parser/parse_expr.c:826 parser/parse_target.c:147
+#: catalog/namespace.c:168 catalog/namespace.c:215 catalog/namespace.c:1153
+#: parser/parse_expr.c:845 parser/parse_target.c:147
 msgid "Cross-database references are not implemented"
 msgstr ""
 
@@ -2284,13 +2364,13 @@ msgstr "
 msgid "TEMP tables may not specify a namespace"
 msgstr ""
 
-#: catalog/namespace.c:236 catalog/namespace.c:1101 catalog/namespace.c:1136
-#: catalog/namespace.c:1693
+#: catalog/namespace.c:236 catalog/namespace.c:1182 catalog/namespace.c:1217
+#: catalog/namespace.c:1802
 #, c-format
 msgid "Namespace \"%s\" does not exist"
 msgstr ""
 
-#: catalog/namespace.c:246 catalog/namespace.c:1146
+#: catalog/namespace.c:246 catalog/namespace.c:1227
 msgid "No namespace has been selected to create in"
 msgstr ""
 
@@ -2319,20 +2399,25 @@ msgstr "
 msgid "Cache lookup failed for opclass %u"
 msgstr "����� � ���� �������� %u �� ������"
 
-#: catalog/namespace.c:1075
+#: catalog/namespace.c:1087
+#, c-format
+msgid "Cache lookup failed for converions %u"
+msgstr "����� � ���� ��������� %u �� ������"
+
+#: catalog/namespace.c:1156 gram.y:2291 gram.y:6839
 #, c-format
 msgid "Improper qualified name (too many dotted names): %s"
 msgstr ""
 
-#: catalog/namespace.c:1179
+#: catalog/namespace.c:1260
 msgid "Improper relation name (too many dotted names)"
 msgstr ""
 
-#: catalog/namespace.c:1363
+#: catalog/namespace.c:1472
 msgid "recomputeNamespacePath: invalid list syntax"
 msgstr ""
 
-#: catalog/namespace.c:1492
+#: catalog/namespace.c:1601
 #, c-format
 msgid "%s: not authorized to create temp tables"
 msgstr ""
@@ -2356,47 +2441,48 @@ msgid ""
 "with input type"
 msgstr ""
 
-#: catalog/pg_constraint.c:413
+#: catalog/pg_constraint.c:437
 #, c-format
 msgid "RemoveConstraintById: constraint %u not found"
 msgstr ""
 
-#: catalog/pg_constraint.c:450
+#: catalog/pg_constraint.c:475
 #, c-format
 msgid "RemoveConstraintById: relation %s has relchecks = 0"
 msgstr ""
 
-#: catalog/pg_conversion.c:58 catalog/pg_conversion.c:150
+#: catalog/pg_constraint.c:502
+#, c-format
+msgid "RemoveConstraintById: Constraint %u is not a known type"
+msgstr ""
+
+#: catalog/pg_conversion.c:57
 msgid "no conversion name supplied"
 msgstr ""
 
-#: catalog/pg_conversion.c:65
+#: catalog/pg_conversion.c:64
 #, c-format
 msgid "conversion name \"%s\" already exists"
 msgstr "��������� � ������ \"%s\" ��� ����������"
 
-#: catalog/pg_conversion.c:76
+#: catalog/pg_conversion.c:75
 #, c-format
 msgid "default conversion for %s to %s already exists"
 msgstr ""
 
-#: catalog/pg_conversion.c:175
+#: catalog/pg_conversion.c:141 catalog/pg_conversion.c:308
 #, c-format
-msgid "conversion %s not found"
+msgid "Conversion %u search from syscache failed"
 msgstr ""
 
-#: catalog/pg_conversion.c:228
+#: catalog/pg_conversion.c:192
 #, c-format
 msgid "conversion %u does not exist"
 msgstr "��������� %u �� ����������"
 
-#: catalog/pg_conversion.c:330
-msgid "Conversion does not exist"
-msgstr "��������� �� ����������"
-
-#: catalog/pg_conversion.c:342
+#: catalog/pg_conversion.c:302 commands/conversioncmds.c:97
 #, c-format
-msgid "Conversion %u search from syscache failed"
+msgid "conversion %s not found"
 msgstr ""
 
 #: catalog/pg_largeobject.c:108
@@ -2457,7 +2543,7 @@ msgstr ""
 msgid "OperatorDef: can't create operator shell \"%s\""
 msgstr ""
 
-#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1376
+#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1393
 #, c-format
 msgid "functions cannot have more than %d arguments"
 msgstr "������� �� ����� ����� ����� ���������� ����� %d"
@@ -2534,7 +2620,7 @@ msgid "function declared to return %s returns %s instead of %s at column %d"
 msgstr ""
 
 #: catalog/pg_proc.c:486 catalog/pg_proc.c:525 catalog/pg_proc.c:568
-#: commands/functioncmds.c:739 utils/adt/ruleutils.c:3162
+#: commands/functioncmds.c:739 utils/adt/ruleutils.c:3163
 #, c-format
 msgid "cache lookup of function %u failed"
 msgstr "����� � ���� ������� %u �� ������"
@@ -2576,12 +2662,12 @@ msgstr ""
 msgid "type %s already exists"
 msgstr "��� %s ��� ����������"
 
-#: catalog/pg_type.c:399
+#: catalog/pg_type.c:437
 #, c-format
 msgid "type %s does not exist"
 msgstr "��� %s �� ����������"
 
-#: catalog/pg_type.c:405
+#: catalog/pg_type.c:443
 #, c-format
 msgid "type named %s already exists"
 msgstr "��� %s ��� ����������"
@@ -2604,12 +2690,12 @@ msgstr ""
 msgid "Analyzing %s.%s"
 msgstr "������������� %s.%s"
 
-#: commands/analyze.c:435 utils/adt/ruleutils.c:2496
+#: commands/analyze.c:431 utils/adt/ruleutils.c:2498
 #, c-format
 msgid "cache lookup of type %u failed"
 msgstr ""
 
-#: commands/analyze.c:645
+#: commands/analyze.c:638
 #, c-format
 msgid "acquire_sample_rows: ReadBuffer(%s,%u) failed"
 msgstr "acquire_sample_rows: ReadBuffer(%s,%u) �� ������"
@@ -2716,46 +2802,60 @@ msgstr "ProcessIncomingNotify: 
 msgid "NOTIFY for %s"
 msgstr "NOTIFY ��� %s"
 
-#: commands/cluster.c:99
+#: commands/cluster.c:119
+#, c-format
+msgid "CLUSTER: You do not own relation %s"
+msgstr ""
+
+#: commands/cluster.c:137 commands/cluster.c:541 commands/cluster.c:560
+#, c-format
+msgid "Cache lookup failed for index %u"
+msgstr "����� � ���� ������� %u �� ������"
+
+#: commands/cluster.c:150
+#, c-format
+msgid "CLUSTER: No previously clustered index found on table \"%s\""
+msgstr ""
+
+#: commands/cluster.c:159
 #, c-format
 msgid "CLUSTER: cannot find index \"%s\" for table \"%s\""
 msgstr ""
 
-#: commands/cluster.c:109
+#: commands/cluster.c:312
 #, c-format
 msgid "CLUSTER: \"%s\" is not an index for table \"%s\""
 msgstr ""
 
-#: commands/cluster.c:121
+#: commands/cluster.c:324
 #, c-format
 msgid "CLUSTER: cannot cluster system relation \"%s\""
 msgstr ""
 
-#: commands/cluster.c:300 commands/cluster.c:318
-#, c-format
-msgid "Cache lookup failed for index %u"
-msgstr "����� � ���� ������� %u �� ������"
+#: commands/cluster.c:332
+msgid "CLUSTER cannot be used on temp tables of other processes"
+msgstr ""
 
-#: commands/cluster.c:385
+#: commands/cluster.c:627
 #, c-format
 msgid "cache lookup failed for index %u"
 msgstr "����� � ���� ������� %u �� ������"
 
-#: commands/cluster.c:437 commands/cluster.c:444
+#: commands/cluster.c:679 commands/cluster.c:686
 #, c-format
 msgid "CLUSTER: Cannot find tuple for relation %u"
 msgstr ""
 
-#: commands/cluster.c:456 commands/cluster.c:462
+#: commands/cluster.c:698 commands/cluster.c:704
 #, c-format
 msgid "CLUSTER: FlushRelationBuffers returned %d"
 msgstr "CLUSTER: FlushRelationBuffers ���������� %d"
 
-#: commands/cluster.c:510
+#: commands/cluster.c:766
 msgid "CLUSTER: expected both swapped tables to have TOAST tables"
 msgstr ""
 
-#: commands/cluster.c:516 commands/cluster.c:521
+#: commands/cluster.c:772 commands/cluster.c:777
 #, c-format
 msgid "CLUSTER: expected one dependency record for TOAST table, found %ld"
 msgstr ""
@@ -2789,9 +2889,9 @@ msgstr "
 msgid "CommentAttribute: must specify relation.attribute"
 msgstr ""
 
-#: commands/comment.c:374 commands/tablecmds.c:1887 commands/tablecmds.c:2021
-#: commands/tablecmds.c:2139 commands/tablecmds.c:2356
-#: optimizer/prep/prepunion.c:804 parser/parse_func.c:1159
+#: commands/comment.c:374 commands/tablecmds.c:1953 commands/tablecmds.c:2087
+#: commands/tablecmds.c:2205 commands/tablecmds.c:2422
+#: optimizer/prep/prepunion.c:802 parser/parse_func.c:1176
 #: parser/parse_relation.c:1551 parser/parse_relation.c:1614
 #: parser/parse_relation.c:1770 parser/parse_type.c:88
 #, c-format
@@ -2802,7 +2902,7 @@ msgstr "
 msgid "CommentDatabase: database name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:409 commands/dbcommands.c:513 utils/adt/acl.c:1039
+#: commands/comment.c:409 commands/dbcommands.c:531 utils/adt/acl.c:1038
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "���� ������ \"%s\" �� ����������"
@@ -2860,91 +2960,86 @@ msgstr ""
 msgid "constraint \"%s\" for relation \"%s\" does not exist"
 msgstr ""
 
-#: commands/conversioncmds.c:61
+#: commands/conversioncmds.c:58
 #, c-format
 msgid "Invalid for encoding name: %s"
 msgstr "��������� ��� �������� ��������� (for): %s"
 
-#: commands/conversioncmds.c:65
+#: commands/conversioncmds.c:62
 #, c-format
 msgid "Invalid to encoding name: %s"
 msgstr "�������� ��� ��������� ���������� (to): %s"
 
-#: commands/conversioncmds.c:73
-#, c-format
-msgid "Function %s does not exist"
-msgstr "������� %s �� ����������"
-
-#: commands/copy.c:125
+#: commands/copy.c:128
 #, c-format
 msgid "CopySendData: %m"
 msgstr "CopySendData: %m"
 
-#: commands/copy.c:300
+#: commands/copy.c:303
 msgid "COPY: BINARY option appears more than once"
 msgstr ""
 
-#: commands/copy.c:307
+#: commands/copy.c:310
 msgid "COPY: OIDS option appears more than once"
 msgstr ""
 
-#: commands/copy.c:314
+#: commands/copy.c:317
 msgid "COPY: DELIMITER string may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:321
+#: commands/copy.c:324
 msgid "COPY: NULL representation may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:326
+#: commands/copy.c:329
 #, c-format
 msgid "COPY: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/copy.c:331
+#: commands/copy.c:334
 msgid "You can not specify the DELIMITER in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:334
+#: commands/copy.c:337
 msgid "You can not specify NULL in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:354
+#: commands/copy.c:357
 msgid ""
 "You must have Postgres superuser privilege to do a COPY directly to or from "
 "a file.  Anyone can COPY to stdout or from stdin.  Psql's \\copy command "
 "also works for anyone."
 msgstr ""
 
-#: commands/copy.c:363
+#: commands/copy.c:366
 msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr ""
 
-#: commands/copy.c:369
+#: commands/copy.c:372
 msgid "COPY delimiter must be a single character"
 msgstr ""
 
-#: commands/copy.c:375
+#: commands/copy.c:378
 #, c-format
 msgid "COPY: table \"%s\" does not have OIDs"
 msgstr "COPY: ������� \"%s\" �� �������� OIDs"
 
-#: commands/copy.c:396 commands/copy.c:441
+#: commands/copy.c:399 commands/copy.c:444
 #, c-format
 msgid "You cannot copy view %s"
 msgstr "�� �� ������ ���������� ��� %s"
 
-#: commands/copy.c:399
+#: commands/copy.c:402
 #, c-format
 msgid "You cannot change sequence relation %s"
 msgstr ""
 
-#: commands/copy.c:402 commands/copy.c:447
+#: commands/copy.c:405 commands/copy.c:450
 #, c-format
 msgid "You cannot copy object %s"
 msgstr "�� �� ������ ���������� ������ %s"
 
-#: commands/copy.c:422
+#: commands/copy.c:425
 #, c-format
 msgid ""
 "COPY command, running in backend with effective uid %d, could not open file "
@@ -2953,21 +3048,21 @@ msgstr ""
 "������� COPY, ������������� � backend� � ����������� UID %d, �� ������ "
 "������� ���� '%s' ��� ������.  Errno = %s (%d)."
 
-#: commands/copy.c:431 commands/copy.c:487
+#: commands/copy.c:434 commands/copy.c:490
 #, c-format
 msgid "COPY: %s is a directory"
 msgstr "COPY: %s �������� �����������"
 
-#: commands/copy.c:444
+#: commands/copy.c:447
 #, c-format
 msgid "You cannot copy sequence %s"
 msgstr ""
 
-#: commands/copy.c:471
+#: commands/copy.c:474
 msgid "Relative path not allowed for server side COPY command"
 msgstr ""
 
-#: commands/copy.c:479
+#: commands/copy.c:482
 #, c-format
 msgid ""
 "COPY command, running in backend with effective uid %d, could not open file "
@@ -2976,100 +3071,100 @@ msgstr ""
 "������� COPY, ������������� � backend� � ����������� UID %d, �� ������ "
 "������� ���� '%s' ��� ������.  Errno = %s (%d)."
 
-#: commands/copy.c:556
+#: commands/copy.c:561
 #, c-format
 msgid "COPY: couldn't lookup info for type %u"
 msgstr ""
 
-#: commands/copy.c:560 commands/copy.c:826
+#: commands/copy.c:565 commands/copy.c:835
 msgid "COPY BINARY: cstring not supported"
 msgstr ""
 
-#: commands/copy.c:893
+#: commands/copy.c:906
 msgid "COPY BINARY: file signature not recognized"
 msgstr ""
 
-#: commands/copy.c:897
+#: commands/copy.c:910
 msgid "COPY BINARY: incompatible integer layout"
 msgstr ""
 
-#: commands/copy.c:901
+#: commands/copy.c:914
 msgid "COPY BINARY: bogus file header (missing flags)"
 msgstr ""
 
-#: commands/copy.c:905
+#: commands/copy.c:918
 msgid "COPY BINARY: unrecognized critical flags in header"
 msgstr ""
 
-#: commands/copy.c:909
+#: commands/copy.c:922
 msgid "COPY BINARY: bogus file header (missing length)"
 msgstr ""
 
-#: commands/copy.c:915
+#: commands/copy.c:928
 msgid "COPY BINARY: bogus file header (wrong length)"
 msgstr ""
 
-#: commands/copy.c:964
+#: commands/copy.c:979
 msgid "NULL Oid"
 msgstr "NULL Oid"
 
-#: commands/copy.c:970
+#: commands/copy.c:985
 msgid "Invalid Oid"
 msgstr "�������� Oid"
 
-#: commands/copy.c:987
+#: commands/copy.c:1002
 #, c-format
 msgid "Missing data for column \"%s\""
 msgstr "����������� ������ ��� ������� \"%s\""
 
-#: commands/copy.c:1019
+#: commands/copy.c:1034
 msgid "Extra data after last expected column"
 msgstr ""
 
-#: commands/copy.c:1043
+#: commands/copy.c:1058
 #, c-format
 msgid "COPY BINARY: tuple field count is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1050 commands/copy.c:1056 commands/copy.c:1071
-#: commands/copy.c:1085 commands/copy.c:1094 commands/copy.c:1106
-#: commands/copy.c:1121
+#: commands/copy.c:1065 commands/copy.c:1071 commands/copy.c:1086
+#: commands/copy.c:1100 commands/copy.c:1109 commands/copy.c:1121
+#: commands/copy.c:1136
 msgid "COPY BINARY: unexpected EOF"
 msgstr ""
 
-#: commands/copy.c:1052
+#: commands/copy.c:1067
 #, c-format
 msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1058
+#: commands/copy.c:1073
 msgid "COPY BINARY: Invalid Oid"
 msgstr ""
 
-#: commands/copy.c:1075
+#: commands/copy.c:1090
 #, c-format
 msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1087
+#: commands/copy.c:1102
 msgid "COPY BINARY: bogus varlena length"
 msgstr ""
 
-#: commands/copy.c:1263
+#: commands/copy.c:1284
 #, c-format
 msgid "GetInputFunction: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1279
+#: commands/copy.c:1300
 #, c-format
 msgid "GetTypeElement: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1421
+#: commands/copy.c:1442
 msgid "CopyReadAttribute: end of record marker corrupted"
 msgstr ""
 
-#: commands/copy.c:1581
+#: commands/copy.c:1594
 #, c-format
 msgid "Attribute \"%s\" specified more than once"
 msgstr "������� \"%s\" ������ ����� ������ ����"
@@ -3084,135 +3179,141 @@ msgstr ""
 msgid "CREATE DATABASE: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/dbcommands.c:144 commands/dbcommands.c:151
-msgid "CREATE DATABASE: permission denied"
+#: commands/dbcommands.c:141
+#, c-format
+msgid "%d is not a valid encoding code"
+msgstr "%d �� �������� ������ ����� ���������"
+
+#: commands/dbcommands.c:147
+#, c-format
+msgid "%s is not a valid encoding name"
+msgstr "%s �� �������� ������ ������ ���������"
+
+#: commands/dbcommands.c:151
+msgid "CREATE DATABASE: bogus encoding parameter"
 msgstr ""
 
-#: commands/dbcommands.c:156
-msgid "CREATE DATABASE: may not be called in a transaction block"
+#: commands/dbcommands.c:164 commands/dbcommands.c:171
+msgid "CREATE DATABASE: permission denied"
 msgstr ""
 
-#: commands/dbcommands.c:167 commands/dbcommands.c:307
+#: commands/dbcommands.c:186 commands/dbcommands.c:326
 #, c-format
 msgid "CREATE DATABASE: database \"%s\" already exists"
 msgstr ""
 
-#: commands/dbcommands.c:179
+#: commands/dbcommands.c:198
 #, c-format
 msgid "CREATE DATABASE: template \"%s\" does not exist"
 msgstr ""
 
-#: commands/dbcommands.c:189
+#: commands/dbcommands.c:208
 #, c-format
 msgid "CREATE DATABASE: permission to copy \"%s\" denied"
 msgstr ""
 
-#: commands/dbcommands.c:208
+#: commands/dbcommands.c:227
 #, c-format
 msgid ""
 "CREATE DATABASE: source database \"%s\" is being accessed by other users"
 msgstr ""
 
-#: commands/dbcommands.c:216
+#: commands/dbcommands.c:235
 msgid "CREATE DATABASE: invalid backend encoding"
 msgstr ""
 
-#: commands/dbcommands.c:244 commands/dbcommands.c:246
-#: commands/dbcommands.c:248
+#: commands/dbcommands.c:263 commands/dbcommands.c:265
+#: commands/dbcommands.c:267
 msgid "database path may not contain single quotes"
 msgstr ""
 
-#: commands/dbcommands.c:271
+#: commands/dbcommands.c:290
 #, c-format
 msgid "CREATE DATABASE: unable to create database directory '%s': %m"
 msgstr ""
 
-#: commands/dbcommands.c:274
+#: commands/dbcommands.c:293
 #, c-format
 msgid "CREATE DATABASE: unable to remove temp directory '%s': %m"
 msgstr ""
 
-#: commands/dbcommands.c:281
+#: commands/dbcommands.c:300
 #, c-format
 msgid "CREATE DATABASE: could not link '%s' to '%s': %m"
 msgstr ""
 
-#: commands/dbcommands.c:291
+#: commands/dbcommands.c:310
 msgid "CREATE DATABASE: could not initialize database directory"
 msgstr ""
 
-#: commands/dbcommands.c:293
+#: commands/dbcommands.c:312
 msgid ""
 "CREATE DATABASE: could not initialize database directory; delete failed as "
 "well"
 msgstr ""
 
-#: commands/dbcommands.c:383
+#: commands/dbcommands.c:402
 msgid "DROP DATABASE: cannot be executed on the currently open database"
 msgstr ""
 
-#: commands/dbcommands.c:386
-msgid "DROP DATABASE: may not be called in a transaction block"
-msgstr ""
-
-#: commands/dbcommands.c:401
+#: commands/dbcommands.c:419
 #, c-format
 msgid "DROP DATABASE: database \"%s\" does not exist"
 msgstr ""
 
-#: commands/dbcommands.c:404
+#: commands/dbcommands.c:422
 msgid "DROP DATABASE: permission denied"
 msgstr ""
 
-#: commands/dbcommands.c:412
+#: commands/dbcommands.c:430
 msgid "DROP DATABASE: database is marked as a template"
 msgstr ""
 
-#: commands/dbcommands.c:421
+#: commands/dbcommands.c:439
 #, c-format
 msgid "DROP DATABASE: database \"%s\" is being accessed by other users"
 msgstr ""
 
-#: commands/dbcommands.c:438
+#: commands/dbcommands.c:456
 #, c-format
 msgid ""
 "DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the "
 "contrary"
 msgstr ""
 
-#: commands/dbcommands.c:679
+#: commands/dbcommands.c:700
 msgid "Relative paths are not allowed as database locations"
 msgstr ""
 
-#: commands/dbcommands.c:681
+#: commands/dbcommands.c:702
 msgid "Absolute paths are not allowed as database locations"
 msgstr ""
 
-#: commands/dbcommands.c:691
+#: commands/dbcommands.c:712
 #, c-format
 msgid "Postmaster environment variable '%s' not set"
 msgstr ""
 
-#: commands/dbcommands.c:693
+#: commands/dbcommands.c:714
 #, c-format
 msgid "Postmaster environment variable '%s' must be absolute path"
 msgstr ""
 
-#: commands/dbcommands.c:699
+#: commands/dbcommands.c:720
 msgid "Alternate path is too long"
 msgstr ""
 
-#: commands/dbcommands.c:728
+#: commands/dbcommands.c:749
 #, c-format
 msgid "could not remove '%s': %m"
 msgstr ""
 
-#: commands/dbcommands.c:737
+#: commands/dbcommands.c:758
 #, c-format
 msgid "database directory '%s' could not be removed"
 msgstr ""
 
-#: commands/dbcommands.c:809 commands/vacuum.c:582
+#: commands/dbcommands.c:830 commands/vacuum.c:581
 #, c-format
 msgid "database %u does not exist"
 msgstr ""
@@ -3254,7 +3355,7 @@ msgstr ""
 msgid "Define: invalid argument for \"%s\": \"%s\""
 msgstr "Define: �������� �������� ��� \"%s\": \"%s\""
 
-#: commands/explain.c:809
+#: commands/explain.c:890
 #, c-format
 msgid "show_sort_keys: no tlist entry for key %d"
 msgstr ""
@@ -3270,9 +3371,11 @@ msgid "Return type \"%s\" is only a shell"
 msgstr ""
 
 #: commands/functioncmds.c:103 commands/functioncmds.c:159
-#: commands/typecmds.c:322 commands/typecmds.c:329 commands/typecmds.c:647
-#: parser/parse_func.c:1386 parser/parse_oper.c:98 parser/parse_oper.c:107
-#: parser/parse_type.c:191 parser/parse_type.c:213 parser/parse_type.c:219
+#: commands/typecmds.c:345 commands/typecmds.c:352 commands/typecmds.c:689
+#: commands/typecmds.c:933 commands/typecmds.c:1052 commands/typecmds.c:1177
+#: commands/typecmds.c:1264 parser/parse_func.c:1403 parser/parse_oper.c:98
+#: parser/parse_oper.c:107 parser/parse_type.c:191 parser/parse_type.c:213
+#: parser/parse_type.c:219
 #, c-format
 msgid "Type \"%s\" does not exist"
 msgstr "��� \"%s\" �� ����������"
@@ -3333,7 +3436,7 @@ msgstr ""
 msgid "CREATE FUNCTION: only one AS item needed for %s language"
 msgstr ""
 
-#: commands/functioncmds.c:399 utils/adt/acl.c:1443
+#: commands/functioncmds.c:399 utils/adt/acl.c:1442
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "���� \"%s\" �� ����������"
@@ -3585,65 +3688,57 @@ msgstr ""
 msgid "pg_opclass contains multiple default opclasses for data type %s"
 msgstr ""
 
-#: commands/indexcmds.c:544 commands/indexcmds.c:581 commands/indexcmds.c:626
+#: commands/indexcmds.c:544 commands/indexcmds.c:576 commands/indexcmds.c:619
 #, c-format
 msgid "relation \"%s\" is of type \"%c\""
 msgstr ""
 
-#: commands/indexcmds.c:571 commands/indexcmds.c:620
-msgid "REINDEX cannot run inside a BEGIN/END block"
-msgstr ""
-
-#: commands/indexcmds.c:578
+#: commands/indexcmds.c:573
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr ""
 
-#: commands/indexcmds.c:589
+#: commands/indexcmds.c:584
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:592
+#: commands/indexcmds.c:587
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:601
+#: commands/indexcmds.c:602
 #, c-format
 msgid "index \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:630
+#: commands/indexcmds.c:634
 #, c-format
 msgid "table \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:654
+#: commands/indexcmds.c:658
 msgid "REINDEX DATABASE: Can be executed only on the currently open database."
 msgstr ""
 
-#: commands/indexcmds.c:657
+#: commands/indexcmds.c:661
 msgid "REINDEX DATABASE: Permission denied."
 msgstr ""
 
-#: commands/indexcmds.c:660
+#: commands/indexcmds.c:664
 msgid "must be called under standalone postgres with -O -P options"
 msgstr ""
 
-#: commands/indexcmds.c:662
+#: commands/indexcmds.c:666
 msgid "must be called under standalone postgres with -P -O options"
 msgstr ""
 
-#: commands/indexcmds.c:670
-msgid "REINDEX DATABASE cannot run inside a BEGIN/END block"
-msgstr ""
-
-#: commands/indexcmds.c:728
+#: commands/indexcmds.c:732
 #, c-format
 msgid "relation %u was reindexed"
 msgstr ""
@@ -3662,69 +3757,69 @@ msgstr ""
 msgid "Must be superuser to create an operator class"
 msgstr ""
 
-#: commands/opclasscmds.c:149
+#: commands/opclasscmds.c:146
 #, c-format
 msgid "DefineOpClass: invalid operator number %d, must be between 1 and %d"
 msgstr ""
 
-#: commands/opclasscmds.c:153
+#: commands/opclasscmds.c:150
 #, c-format
 msgid "DefineOpClass: operator number %d appears more than once"
 msgstr ""
 
-#: commands/opclasscmds.c:170
+#: commands/opclasscmds.c:167
 #, c-format
 msgid "DefineOpClass: Operator '%s' for types '%s' and '%s' does not exist"
 msgstr ""
 
-#: commands/opclasscmds.c:186
+#: commands/opclasscmds.c:183
 #, c-format
 msgid "DefineOpClass: invalid procedure number %d, must be between 1 and %d"
 msgstr ""
 
-#: commands/opclasscmds.c:190
+#: commands/opclasscmds.c:187
 #, c-format
 msgid "DefineOpClass: procedure number %d appears more than once"
 msgstr ""
 
-#: commands/opclasscmds.c:203
+#: commands/opclasscmds.c:200
 msgid "DefineOpClass: storage type specified more than once"
 msgstr ""
 
-#: commands/opclasscmds.c:207
+#: commands/opclasscmds.c:204
 #, c-format
 msgid "DefineOpClass: bogus item type %d"
 msgstr ""
 
-#: commands/opclasscmds.c:229
+#: commands/opclasscmds.c:226
 #, c-format
 msgid "Storage type may not be different from datatype for access method %s"
 msgstr ""
 
-#: commands/opclasscmds.c:245
+#: commands/opclasscmds.c:242
 #, c-format
 msgid "Operator class \"%s\" already exists for access method \"%s\""
 msgstr ""
 
-#: commands/opclasscmds.c:269
+#: commands/opclasscmds.c:266
 #, c-format
 msgid ""
 "Can't add class \"%s\" as default for type %s\n"
 "\tclass \"%s\" already is the default"
 msgstr ""
 
-#: commands/opclasscmds.c:477
+#: commands/opclasscmds.c:474
 #, c-format
 msgid "RemoveOpClass: access method \"%s\" not found"
 msgstr ""
 
-#: commands/opclasscmds.c:504 commands/opclasscmds.c:512
+#: commands/opclasscmds.c:501 commands/opclasscmds.c:509
 #, c-format
 msgid ""
 "RemoveOpClass: operator class \"%s\" not supported by access method \"%s\""
 msgstr ""
 
-#: commands/opclasscmds.c:556
+#: commands/opclasscmds.c:553
 #, c-format
 msgid "RemoveOpClassById: couldn't find pg_class entry %u"
 msgstr ""
@@ -3765,49 +3860,49 @@ msgstr "PerformPortalFetch: 
 msgid "PerformPortalFetch: portal \"%s\" not found"
 msgstr ""
 
-#: commands/portalcmds.c:201
+#: commands/portalcmds.c:243
 msgid "PerformPortalClose: missing portal name"
 msgstr "PerformPortalClose: ����������� ��� �������"
 
-#: commands/portalcmds.c:211
+#: commands/portalcmds.c:253
 #, c-format
 msgid "PerformPortalClose: portal \"%s\" not found"
 msgstr ""
 
-#: commands/prepare.c:66
+#: commands/prepare.c:65
 msgid "No statement name given"
 msgstr "�� ������� ��� �������"
 
-#: commands/prepare.c:69
+#: commands/prepare.c:68
 msgid "Utility statements cannot be prepared"
 msgstr ""
 
-#: commands/prepare.c:117
+#: commands/prepare.c:122
 msgid "ExecuteQuery: wrong number of arguments"
 msgstr "ExecuteQuery: �������� ����� ����������"
 
-#: commands/prepare.c:168
+#: commands/prepare.c:172
 msgid "INTO clause specified for non-SELECT query"
 msgstr ""
 
-#: commands/prepare.c:211
+#: commands/prepare.c:223
 msgid "InitQueryHashTable: unable to create hash table"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:241
+#: commands/prepare.c:253
 #, c-format
 msgid "Prepared statement with name \"%s\" already exists"
 msgstr "������������� ������� � ������ \"%s\" ��� ����������"
 
-#: commands/prepare.c:271
+#: commands/prepare.c:283
 #, c-format
 msgid "Unable to store prepared statement \"%s\"!"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:297 commands/prepare.c:314 commands/prepare.c:367
-#: commands/prepare.c:391
+#: commands/prepare.c:309 commands/prepare.c:326 commands/prepare.c:364
+#: commands/prepare.c:388
 #, c-format
 msgid "Prepared statement with name \"%s\" does not exist"
 msgstr "������������� ������� � ������ \"%s\" �� ����������"
@@ -3889,506 +3984,512 @@ msgstr "
 msgid "RemoveSchemaById: schema %u not found"
 msgstr ""
 
-#: commands/sequence.c:207
+#: commands/sequence.c:208
 msgid "DefineSequence: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:334
+#: commands/sequence.c:335
 #, c-format
 msgid "%s.nextval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:409
+#: commands/sequence.c:410
 #, c-format
 msgid "%s.nextval: reached MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:430
+#: commands/sequence.c:431
 #, c-format
 msgid "%s.nextval: reached MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:520
+#: commands/sequence.c:521
 #, c-format
 msgid "%s.currval: you don't have permissions to read sequence %s"
 msgstr ""
 
-#: commands/sequence.c:524
+#: commands/sequence.c:525
 #, c-format
 msgid "%s.currval is not yet defined in this session"
 msgstr ""
 
-#: commands/sequence.c:559
+#: commands/sequence.c:560
 #, c-format
 msgid "%s.setval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:574
+#: commands/sequence.c:575
 #, c-format
 msgid "%s.setval: value %s is out of bounds (%s,%s)"
 msgstr ""
 
-#: commands/sequence.c:700
+#: commands/sequence.c:701
 #, c-format
 msgid "%s.%s: %s is not a sequence"
 msgstr ""
 
-#: commands/sequence.c:718
+#: commands/sequence.c:719
 msgid "Memory exhausted in init_sequence"
 msgstr ""
 
-#: commands/sequence.c:746
+#: commands/sequence.c:747
 #, c-format
 msgid "%s.%s: invalid number of blocks in sequence"
 msgstr ""
 
-#: commands/sequence.c:751
+#: commands/sequence.c:752
 #, c-format
 msgid "%s.%s: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:760
+#: commands/sequence.c:761
 #, c-format
 msgid "%s.%s: bad magic (%08X)"
 msgstr ""
 
-#: commands/sequence.c:803
-msgid "DefineSequence: CYCLE ??"
-msgstr ""
-
-#: commands/sequence.c:807
+#: commands/sequence.c:804
 #, c-format
 msgid "DefineSequence: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/sequence.c:814
+#: commands/sequence.c:811
 msgid "DefineSequence: can't INCREMENT by 0"
 msgstr ""
 
-#: commands/sequence.c:843
+#: commands/sequence.c:840
 #, c-format
 msgid "DefineSequence: MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:864
+#: commands/sequence.c:861
 #, c-format
 msgid "DefineSequence: START value (%s) can't be less than MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:874
+#: commands/sequence.c:871
 #, c-format
 msgid "DefineSequence: START value (%s) can't be greater than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:885
+#: commands/sequence.c:882
 #, c-format
 msgid "DefineSequence: CACHE (%s) can't be <= 0"
 msgstr ""
 
-#: commands/sequence.c:905
+#: commands/sequence.c:902
 #, c-format
 msgid "seq_redo: unknown op code %u"
 msgstr ""
 
-#: commands/sequence.c:913
+#: commands/sequence.c:910
 #, c-format
 msgid "seq_redo: can't read block of %u/%u"
 msgstr ""
 
-#: commands/sequence.c:929
+#: commands/sequence.c:926
 msgid "seq_redo: failed to add item to page"
 msgstr ""
 
-#: commands/tablecmds.c:152
-msgid "DefineRelation: please inherit from a relation or define an attribute"
+#: commands/tablecmds.c:149
+msgid "ON COMMIT can only be used on TEMP tables"
 msgstr ""
 
-#: commands/tablecmds.c:360
+#: commands/tablecmds.c:379
 #, c-format
 msgid "TRUNCATE cannot be used on sequences. '%s' is a sequence"
 msgstr ""
 
-#: commands/tablecmds.c:363
+#: commands/tablecmds.c:382
 #, c-format
 msgid "TRUNCATE cannot be used on views. '%s' is a view"
 msgstr ""
 
-#: commands/tablecmds.c:366
+#: commands/tablecmds.c:385
 #, c-format
 msgid "TRUNCATE can only be used on tables. '%s' is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:372
+#: commands/tablecmds.c:391
 #, c-format
 msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
 msgstr ""
 
-#: commands/tablecmds.c:383
+#: commands/tablecmds.c:402
 msgid "TRUNCATE cannot be used on temp tables of other processes"
 msgstr ""
 
-#: commands/tablecmds.c:407
+#: commands/tablecmds.c:426
 #, c-format
 msgid ""
 "TRUNCATE cannot be used as table %s references this one via foreign key "
 "constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:517
+#: commands/tablecmds.c:537
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:540
+#: commands/tablecmds.c:560
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:544
+#: commands/tablecmds.c:564
 #, c-format
 msgid "CREATE TABLE: cannot inherit from temp relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:559
+#: commands/tablecmds.c:579
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:611
+#: commands/tablecmds.c:631
 #, c-format
 msgid ""
 "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:616
+#: commands/tablecmds.c:636
 #, c-format
 msgid "CREATE TABLE: inherited attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:762
+#: commands/tablecmds.c:782
 #, c-format
 msgid "CREATE TABLE: merging attribute \"%s\" with inherited definition"
 msgstr ""
 
-#: commands/tablecmds.c:767
+#: commands/tablecmds.c:787
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:805
+#: commands/tablecmds.c:825
 #, c-format
 msgid ""
 "CREATE TABLE: attribute \"%s\" inherits conflicting default values\n"
 "\tTo resolve the conflict, specify a default explicitly"
 msgstr ""
 
-#: commands/tablecmds.c:1049
+#: commands/tablecmds.c:1069
 #, c-format
 msgid "setRelhassubclassInRelation: cache lookup failed for relation %u"
 msgstr ""
 
-#: commands/tablecmds.c:1104
+#: commands/tablecmds.c:1124
 #, c-format
 msgid "renameatt: class \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1150
+#: commands/tablecmds.c:1170
 #, c-format
 msgid "Inherited attribute \"%s\" must be renamed in child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1158
+#: commands/tablecmds.c:1178
 #, c-format
 msgid "renameatt: attribute \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1163
+#: commands/tablecmds.c:1183
 #, c-format
 msgid "renameatt: system attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1171
+#: commands/tablecmds.c:1191
 #, c-format
 msgid "renameatt: inherited attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1180
+#: commands/tablecmds.c:1200
 #, c-format
 msgid "renameatt: attribute \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1210
+#: commands/tablecmds.c:1230
 #, c-format
 msgid "renameatt: can't find index id %u"
 msgstr ""
 
-#: commands/tablecmds.c:1295
+#: commands/tablecmds.c:1315
 #, c-format
 msgid "renamerel: system relation \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1311
+#: commands/tablecmds.c:1331
 #, c-format
 msgid "renamerel: relation \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1315
+#: commands/tablecmds.c:1335
 #, c-format
 msgid "renamerel: relation \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1614 commands/tablecmds.c:1842
-#: commands/tablecmds.c:1976 commands/tablecmds.c:2191
-#: commands/tablecmds.c:2340 commands/tablecmds.c:2510
-#: commands/tablecmds.c:3472 commands/tablecmds.c:3647
+#: commands/tablecmds.c:1633 commands/tablecmds.c:1908
+#: commands/tablecmds.c:2042 commands/tablecmds.c:2257
+#: commands/tablecmds.c:2406 commands/tablecmds.c:2576
+#: commands/tablecmds.c:3535 commands/tablecmds.c:3710
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:1625 commands/tablecmds.c:1847
-#: commands/tablecmds.c:1981 commands/tablecmds.c:2099
-#: commands/tablecmds.c:2198 commands/tablecmds.c:2345
-#: commands/tablecmds.c:2515 commands/tablecmds.c:3477
+#: commands/tablecmds.c:1644 commands/tablecmds.c:1913
+#: commands/tablecmds.c:2047 commands/tablecmds.c:2165
+#: commands/tablecmds.c:2264 commands/tablecmds.c:2411
+#: commands/tablecmds.c:2581 commands/tablecmds.c:3540
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1672
+#: commands/tablecmds.c:1697
+#, c-format
+msgid "ALTER TABLE: child table \"%s\" has different type for column \"%s\""
+msgstr ""
+
+#: commands/tablecmds.c:1705
+#, c-format
+msgid "ALTER TABLE: merging definition of column \"%s\" for child %s"
+msgstr ""
+
+#: commands/tablecmds.c:1735
 msgid "Attribute must be added to child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1689
+#: commands/tablecmds.c:1752
 msgid ""
 "Adding columns with defaults is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE SET DEFAULT."
 msgstr ""
 
-#: commands/tablecmds.c:1693
+#: commands/tablecmds.c:1756
 msgid ""
 "Adding NOT NULL columns is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE ... SET NOT NULL."
 msgstr ""
 
-#: commands/tablecmds.c:1702 commands/tablecmds.c:3787
+#: commands/tablecmds.c:1765 commands/tablecmds.c:3852
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:1714
+#: commands/tablecmds.c:1777
 #, c-format
 msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1720
+#: commands/tablecmds.c:1783
 #, c-format
 msgid "ALTER TABLE: relations limited to %d columns"
 msgstr ""
 
-#: commands/tablecmds.c:1892 commands/tablecmds.c:2026
-#: commands/tablecmds.c:2144
+#: commands/tablecmds.c:1958 commands/tablecmds.c:2092
+#: commands/tablecmds.c:2210
 #, c-format
 msgid "ALTER TABLE: Cannot alter system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1913
+#: commands/tablecmds.c:1979
 #, c-format
 msgid "ALTER TABLE: Index %u not found"
 msgstr "ALTER TABLE: ������ %u �� ������"
 
-#: commands/tablecmds.c:1928
+#: commands/tablecmds.c:1994
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" is in a primary key"
 msgstr ""
 
-#: commands/tablecmds.c:1944 commands/tablecmds.c:2058
-#: commands/tablecmds.c:2286
+#: commands/tablecmds.c:2010 commands/tablecmds.c:2124
+#: commands/tablecmds.c:2352
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2045
+#: commands/tablecmds.c:2111
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" contains NULL values"
 msgstr ""
 
-#: commands/tablecmds.c:2094
+#: commands/tablecmds.c:2160
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table or view"
 msgstr ""
 
-#: commands/tablecmds.c:2218
+#: commands/tablecmds.c:2284
 #, c-format
 msgid "ALTER TABLE: statistics target %d is too low"
 msgstr ""
 
-#: commands/tablecmds.c:2223
+#: commands/tablecmds.c:2289
 msgid "ALTER TABLE: lowering statistics target to 1000"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/tablecmds.c:2244
+#: commands/tablecmds.c:2310
 #, c-format
 msgid "ALTER TABLE: \"%s\" storage not recognized"
 msgstr "ALTER TABLE: \"%s\" ����� �� ����������"
 
-#: commands/tablecmds.c:2249
+#: commands/tablecmds.c:2315
 #, c-format
 msgid "ALTER TABLE: Invalid column flag: %c"
 msgstr ""
 
-#: commands/tablecmds.c:2291
+#: commands/tablecmds.c:2357
 #, c-format
 msgid "ALTER TABLE: cannot change system attribute \"%s\""
 msgstr "ALTER TABLE: ������ �������� ��������� ������� \"%s\""
 
-#: commands/tablecmds.c:2308
+#: commands/tablecmds.c:2374
 #, c-format
 msgid "ALTER TABLE: Column datatype %s can only have storage \"plain\""
 msgstr ""
 
-#: commands/tablecmds.c:2362
+#: commands/tablecmds.c:2428
 #, c-format
 msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2368
+#: commands/tablecmds.c:2434
 #, c-format
 msgid "ALTER TABLE: Cannot drop inherited column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2397 commands/tablecmds.c:2448
+#: commands/tablecmds.c:2463 commands/tablecmds.c:2514
 #, c-format
 msgid "ALTER TABLE: relation %u has no column \"%s\""
 msgstr "ALTER TABLE: � ����� %u ��� ������� \"%s\""
 
-#: commands/tablecmds.c:2402 commands/tablecmds.c:2453
+#: commands/tablecmds.c:2468 commands/tablecmds.c:2519
 #, c-format
 msgid "ALTER TABLE: relation %u has non-inherited column \"%s\""
 msgstr "ALTER TABLE: � ����� %u ��� ��������������� ������� \"%s\""
 
-#: commands/tablecmds.c:2587
+#: commands/tablecmds.c:2655
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
 msgstr ""
 
-#: commands/tablecmds.c:2617
+#: commands/tablecmds.c:2687
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
 msgstr ""
 
-#: commands/tablecmds.c:2677
+#: commands/tablecmds.c:2747
 #, c-format
 msgid "Only relation '%s' can be referenced in CHECK"
 msgstr ""
 
-#: commands/tablecmds.c:2726
+#: commands/tablecmds.c:2802
 #, c-format
 msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:2782
+#: commands/tablecmds.c:2858
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:2787
+#: commands/tablecmds.c:2863
 #, c-format
 msgid "%s: relation \"%s\" is a system catalog"
 msgstr "%s: ������ \"%s\" �������� ��������� ���������"
 
-#: commands/tablecmds.c:2802
+#: commands/tablecmds.c:2878
 #, c-format
 msgid "%s: Unable to reference temporary table from permanent table constraint"
 msgstr ""
 
-#: commands/tablecmds.c:2844
+#: commands/tablecmds.c:2920
 #, c-format
 msgid ""
 "%s: number of referencing and referenced attributes for foreign key disagree"
 msgstr ""
 
-#: commands/tablecmds.c:2925
+#: commands/tablecmds.c:3001
 #, c-format
 msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:2928
+#: commands/tablecmds.c:3004
 #, c-format
 msgid "Can only have %d keys in a foreign key"
 msgstr ""
 
-#: commands/tablecmds.c:2972
+#: commands/tablecmds.c:3048
 #, c-format
 msgid "transformFkeyGetPrimaryKey: index %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:2990
+#: commands/tablecmds.c:3066
 #, c-format
 msgid "PRIMARY KEY for referenced table \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:3046
+#: commands/tablecmds.c:3122
 #, c-format
 msgid "transformFkeyCheckAttrs: index %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:3104
+#: commands/tablecmds.c:3180
 #, c-format
 msgid ""
 "UNIQUE constraint matching given keys for referenced table \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:3271
+#: commands/tablecmds.c:3343
 #, c-format
 msgid ""
 "number of key attributes in referenced table must be equal to foreign key\n"
 "\tIllegal FOREIGN KEY definition references \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:3331
+#: commands/tablecmds.c:3399
 msgid "Unrecognized ON DELETE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3402
+#: commands/tablecmds.c:3465
 msgid "Unrecognized ON UPDATE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3447
+#: commands/tablecmds.c:3510
 #, c-format
 msgid "fkMatchTypeToString: Unknown MATCH TYPE '%c'"
 msgstr ""
 
-#: commands/tablecmds.c:3523
+#: commands/tablecmds.c:3586
 #, c-format
 msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:3527
+#: commands/tablecmds.c:3590
 msgid "Multiple constraints dropped"
 msgstr ""
 
-#: commands/tablecmds.c:3552
+#: commands/tablecmds.c:3615
 #, c-format
 msgid "ALTER TABLE: relation %u not found"
 msgstr "ALTER TABLE: ����� %u �� �������"
 
-#: commands/tablecmds.c:3614
+#: commands/tablecmds.c:3677
 #, c-format
 msgid ""
 "ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or "
 "sequence"
 msgstr ""
 
-#: commands/tablecmds.c:3664
+#: commands/tablecmds.c:3727
 msgid "Shared relations cannot be toasted after initdb"
 msgstr ""
 
-#: commands/tablecmds.c:3677
+#: commands/tablecmds.c:3740
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" already has a toast table"
 msgstr ""
 
-#: commands/tablecmds.c:3692
+#: commands/tablecmds.c:3755
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
 msgstr ""
@@ -4408,424 +4509,493 @@ msgstr ""
 msgid "CreateTrigger: can't create trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:199
-msgid "CreateTrigger: STATEMENT triggers are unimplemented, yet"
-msgstr ""
-
-#: commands/trigger.c:207
+#: commands/trigger.c:208
 msgid "CreateTrigger: double INSERT event specified"
 msgstr ""
 
-#: commands/trigger.c:212
+#: commands/trigger.c:213
 msgid "CreateTrigger: double DELETE event specified"
 msgstr ""
 
-#: commands/trigger.c:217
+#: commands/trigger.c:218
 msgid "CreateTrigger: double UPDATE event specified"
 msgstr ""
 
-#: commands/trigger.c:221
+#: commands/trigger.c:222
 msgid "CreateTrigger: unknown event specified"
 msgstr ""
 
-#: commands/trigger.c:247
+#: commands/trigger.c:248
 #, c-format
 msgid "CreateTrigger: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:259
+#: commands/trigger.c:260
 #, c-format
 msgid "CreateTrigger: function %s() does not exist"
 msgstr ""
 
-#: commands/trigger.c:270
+#: commands/trigger.c:271
 #, c-format
 msgid ""
 "CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:275
+#: commands/trigger.c:276
 #, c-format
 msgid "CreateTrigger: function %s() must return TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:375
+#: commands/trigger.c:376
 #, c-format
 msgid "CreateTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:460
+#: commands/trigger.c:461
 #, c-format
 msgid "DropTrigger: there is no trigger %s on relation %s"
 msgstr ""
 
-#: commands/trigger.c:509
+#: commands/trigger.c:510
 #, c-format
 msgid "RemoveTriggerById: Trigger %u does not exist"
 msgstr "RemoveTriggerById: ������� %u �� ����������"
 
-#: commands/trigger.c:520
+#: commands/trigger.c:521
 #, c-format
 msgid "DropTrigger: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/trigger.c:524
+#: commands/trigger.c:525
 #, c-format
 msgid "DropTrigger: can't drop trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:549
+#: commands/trigger.c:550
 #, c-format
 msgid "DropTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:554
+#: commands/trigger.c:555
 #, c-format
 msgid "DropTrigger: relation %s has reltriggers = 0"
 msgstr ""
 
-#: commands/trigger.c:625
+#: commands/trigger.c:626
 #, c-format
 msgid "renametrig: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:666
+#: commands/trigger.c:667
 #, c-format
 msgid "renametrig: trigger %s not defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:724
+#: commands/trigger.c:730
 #, c-format
 msgid "RelationBuildTriggers: unexpected record found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:753
+#: commands/trigger.c:758
 #, c-format
 msgid "RelationBuildTriggers: tgargs IS NULL for rel %s"
 msgstr ""
 
-#: commands/trigger.c:776
+#: commands/trigger.c:778
 #, c-format
 msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:1022
+#: commands/trigger.c:1129
 #, c-format
 msgid "ExecCallTriggerFunc: function %u returned NULL"
 msgstr ""
 
-#: commands/trigger.c:1261 executor/execMain.c:1043 executor/execMain.c:1317
-#: executor/execMain.c:1452
+#: commands/trigger.c:1179 commands/trigger.c:1290 commands/trigger.c:1414
+msgid "BEFORE STATEMENT trigger cannot return a value."
+msgstr ""
+
+#: commands/trigger.c:1534 executor/execMain.c:1015 executor/execMain.c:1308
+#: executor/execMain.c:1442
 msgid "Can't serialize access due to concurrent update"
 msgstr ""
 
-#: commands/trigger.c:1284 executor/execMain.c:1064
+#: commands/trigger.c:1557 executor/execMain.c:1036
 #, c-format
 msgid "Unknown status %u from heap_mark4update"
 msgstr ""
 
-#: commands/trigger.c:1296
+#: commands/trigger.c:1569
 msgid "GetTupleForTrigger: failed ReadBuffer"
 msgstr ""
 
-#: commands/trigger.c:1484
+#: commands/trigger.c:1757
 msgid "DeferredTriggerExecute: failed to fetch old tuple"
 msgstr ""
 
-#: commands/trigger.c:1491
+#: commands/trigger.c:1764
 msgid "DeferredTriggerExecute: failed to fetch new tuple"
 msgstr ""
 
-#: commands/trigger.c:1512
+#: commands/trigger.c:1785
 #, c-format
 msgid "DeferredTriggerExecute: can't find trigger %u"
 msgstr ""
 
-#: commands/trigger.c:1757
+#: commands/trigger.c:1931
+#, c-format
+msgid "deferredTriggerInvokeEvents: relation %u has no triggers"
+msgstr ""
+
+#: commands/trigger.c:2036
 msgid "DeferredTriggerBeginXact() called while inside transaction"
 msgstr ""
 
-#: commands/trigger.c:1935
+#: commands/trigger.c:2211
 msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: commands/trigger.c:1966
+#: commands/trigger.c:2242
 #, c-format
 msgid "Constraint '%s' is not deferrable"
 msgstr ""
 
-#: commands/trigger.c:1980
+#: commands/trigger.c:2256
 #, c-format
 msgid "Constraint '%s' does not exist"
 msgstr ""
 
-#: commands/trigger.c:2057
+#: commands/trigger.c:2332
 msgid "DeferredTriggerSaveEvent() called outside of transaction"
 msgstr ""
 
-#: commands/typecmds.c:94
+#: commands/typecmds.c:117
 #, c-format
 msgid "DefineType: type names must be %d characters or less"
 msgstr ""
 
-#: commands/typecmds.c:124
+#: commands/typecmds.c:147
 #, c-format
 msgid "Array element type cannot be %s"
 msgstr ""
 
-#: commands/typecmds.c:155
+#: commands/typecmds.c:178
 #, c-format
 msgid "DefineType: \"%s\" alignment not recognized"
 msgstr ""
 
-#: commands/typecmds.c:171
+#: commands/typecmds.c:194
 #, c-format
 msgid "DefineType: \"%s\" storage not recognized"
 msgstr ""
 
-#: commands/typecmds.c:176
+#: commands/typecmds.c:199
 #, c-format
 msgid "DefineType: attribute \"%s\" not recognized"
 msgstr ""
 
-#: commands/typecmds.c:185
+#: commands/typecmds.c:208
 msgid "Define: \"input\" unspecified"
 msgstr ""
 
-#: commands/typecmds.c:187
+#: commands/typecmds.c:210
 msgid "Define: \"output\" unspecified"
 msgstr ""
 
-#: commands/typecmds.c:220
+#: commands/typecmds.c:243
 #, c-format
 msgid "TypeCreate: changing return type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/typecmds.c:225
+#: commands/typecmds.c:248
 #, c-format
 msgid "Type input function %s must return %s"
 msgstr ""
 
-#: commands/typecmds.c:233
+#: commands/typecmds.c:256
 #, c-format
 msgid "TypeCreate: changing return type of function %s from OPAQUE to CSTRING"
 msgstr ""
 
-#: commands/typecmds.c:238
+#: commands/typecmds.c:261
 #, c-format
 msgid "Type output function %s must return cstring"
 msgstr ""
 
-#: commands/typecmds.c:366
+#: commands/typecmds.c:389
 #, c-format
 msgid "RemoveTypeById: type %u not found"
 msgstr "RemoveTypeById: ��� %u �� ������"
 
-#: commands/typecmds.c:426
+#: commands/typecmds.c:450
 #, c-format
 msgid "CREATE DOMAIN: domain names must be %d characters or less"
 msgstr ""
 
-#: commands/typecmds.c:445
+#: commands/typecmds.c:469
 #, c-format
 msgid "DefineDomain: %s is not a basetype"
 msgstr ""
 
-#: commands/typecmds.c:509
+#: commands/typecmds.c:522
+msgid "CREATE DOMAIN / FOREIGN KEY constraints not supported"
+msgstr "CREATE DOMAIN / FOREIGN KEY: ���������� �� ��������������"
+
+#: commands/typecmds.c:526
+msgid "DefineDomain: unexpected constraint node type"
+msgstr ""
+
+#: commands/typecmds.c:538
 msgid "CREATE DOMAIN has multiple DEFAULT expressions"
 msgstr ""
 
-#: commands/typecmds.c:539 commands/typecmds.c:546
+#: commands/typecmds.c:565 commands/typecmds.c:572
 msgid "CREATE DOMAIN has conflicting NULL / NOT NULL constraint"
 msgstr ""
 
-#: commands/typecmds.c:552
-msgid "CREATE DOMAIN / UNIQUE indexes not supported"
-msgstr "CREATE DOMAIN / UNIQUE: ������� �� ��������������"
+#: commands/typecmds.c:588
+msgid "CREATE DOMAIN / UNIQUE not supported"
+msgstr "CREATE DOMAIN / UNIQUE �� ��������������"
 
-#: commands/typecmds.c:556
-msgid "CREATE DOMAIN / PRIMARY KEY indexes not supported"
-msgstr "CREATE DOMAIN / PRIMARY KEY: ������� �� ��������������"
-
-#: commands/typecmds.c:560
-msgid "DefineDomain: CHECK Constraints not supported"
-msgstr ""
+#: commands/typecmds.c:592
+msgid "CREATE DOMAIN / PRIMARY KEY not supported"
+msgstr "CREATE DOMAIN / PRIMARY KEY �� ��������������"
 
-#: commands/typecmds.c:567
+#: commands/typecmds.c:599
 msgid ""
-"DefineDomain: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
+"CREATE DOMAIN: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
 "supported"
 msgstr ""
 
-#: commands/typecmds.c:571
-msgid "DefineDomain: unrecognized constraint node type"
+#: commands/typecmds.c:604
+msgid "DefineDomain: unrecognized constraint subtype"
 msgstr ""
 
-#: commands/typecmds.c:654
+#: commands/typecmds.c:696
 #, c-format
 msgid "RemoveDomain: type \"%s\" does not exist"
 msgstr "RemoveDomain: ��� \"%s\" �� ����������"
 
-#: commands/typecmds.c:667
+#: commands/typecmds.c:709 commands/typecmds.c:1507
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s �� �������� �������"
 
-#: commands/typecmds.c:736
+#: commands/typecmds.c:778
 #, c-format
 msgid "TypeCreate: changing argument type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/typecmds.c:795
+#: commands/typecmds.c:837
 #, c-format
 msgid ""
 "TypeCreate: changing argument type of function %s from OPAQUE to CSTRING"
 msgstr ""
 
-#: commands/typecmds.c:837
+#: commands/typecmds.c:880
 msgid "attempted to define composite type relation with no attrs"
 msgstr ""
 
-#: commands/user.c:141
+#: commands/typecmds.c:941 commands/typecmds.c:1060 commands/typecmds.c:1185
+#: commands/typecmds.c:1272
+#, c-format
+msgid "AlterDomain: type \"%s\" does not exist"
+msgstr "AlterDomain: ��� \"%s\" �� ����������"
+
+#: commands/typecmds.c:1070
+#, c-format
+msgid "AlterDomain: %s is already set to %s"
+msgstr ""
+
+#: commands/typecmds.c:1111
+#, c-format
+msgid "ALTER DOMAIN: Relation \"%s\" Attribute \"%s\" contains NULL values"
+msgstr ""
+
+#: commands/typecmds.c:1282
+msgid "ALTER DOMAIN / FOREIGN KEY constraints not supported"
+msgstr "ALTER DOMAIN / FOREIGN KEY: ����������� �� ��������������"
+
+#: commands/typecmds.c:1286
+msgid "AlterDomainAddConstraint: unexpected constraint node type"
+msgstr ""
+
+#: commands/typecmds.c:1293
+msgid "Use ALTER DOMAIN .. SET DEFAULT instead"
+msgstr ""
+
+#: commands/typecmds.c:1298
+msgid "Use ALTER DOMAIN .. [ SET | DROP ] NOT NULL instead"
+msgstr ""
+
+#: commands/typecmds.c:1306
+msgid "ALTER DOMAIN / UNIQUE indexes not supported"
+msgstr "ALTER DOMAIN / UNIQUE: ������� �� ��������������"
+
+#: commands/typecmds.c:1310
+msgid "ALTER DOMAIN / PRIMARY KEY indexes not supported"
+msgstr "ALTER DOMAIN / PRIMARY KEY: ������� �� ��������������"
+
+#: commands/typecmds.c:1317
+msgid ""
+"ALTER DOMAIN: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
+"supported"
+msgstr ""
+
+#: commands/typecmds.c:1322
+msgid "AlterDomainAddConstraint: unrecognized constraint node type"
+msgstr ""
+
+#: commands/typecmds.c:1387
+#, c-format
+msgid "AlterDomainAddConstraint: Domain %s constraint %s failed"
+msgstr ""
+
+#: commands/typecmds.c:1535
+#, c-format
+msgid "constraint \"%s\" already exists for domain \"%s\""
+msgstr "��������� \"%s\" ��� ���������� ��� ������ \"%s\""
+
+#: commands/typecmds.c:1575
+msgid "Relations cannot be referenced in domain CHECK constraint"
+msgstr ""
+
+#: commands/typecmds.c:1582
+msgid "cannot use column references in domain CHECK clause"
+msgstr ""
+
+#: commands/user.c:147
 #, c-format
 msgid "write_group_file: unable to write %s: %m"
 msgstr ""
 
-#: commands/user.c:171
+#: commands/user.c:181
 #, c-format
 msgid "Invalid group name '%s'"
 msgstr "�������� ��� ������ '%s'"
 
-#: commands/user.c:201 commands/user.c:331
+#: commands/user.c:211 commands/user.c:335
 #, c-format
 msgid "Invalid user name '%s'"
 msgstr "�������� ��� ������������ '%s'"
 
-#: commands/user.c:232 commands/user.c:355
+#: commands/user.c:242 commands/user.c:364
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: commands/user.c:240 commands/user.c:363
+#: commands/user.c:250 commands/user.c:372
 #, c-format
 msgid "rename %s to %s: %m"
 msgstr "RENAME %s TO %s: %m"
 
-#: commands/user.c:287
+#: commands/user.c:286
 #, c-format
-msgid "write_password_file: unable to write %s: %m"
-msgstr ""
+msgid "write_user_file: unable to write %s: %m"
+msgstr "write_user_file: �� ������� �������� %s: %m"
 
-#: commands/user.c:334
+#: commands/user.c:341
 #, c-format
 msgid "Invalid user password '%s'"
 msgstr "�������� ������ '%s'"
 
-#: commands/user.c:443 commands/user.c:453 commands/user.c:459
-#: commands/user.c:465 commands/user.c:471 commands/user.c:477
+#: commands/user.c:505 commands/user.c:515 commands/user.c:521
+#: commands/user.c:527 commands/user.c:533 commands/user.c:539
 msgid "CREATE USER: conflicting options"
 msgstr ""
 
-#: commands/user.c:481
+#: commands/user.c:543
 #, c-format
 msgid "CREATE USER: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:493
+#: commands/user.c:555
 msgid "user id must be positive"
 msgstr ""
 
-#: commands/user.c:508
+#: commands/user.c:570
 msgid "CREATE USER: permission denied"
 msgstr ""
 
-#: commands/user.c:511
+#: commands/user.c:573
 #, c-format
 msgid "CREATE USER: user name \"%s\" is reserved"
 msgstr ""
 
-#: commands/user.c:546
+#: commands/user.c:608
 #, c-format
 msgid "CREATE USER: user name \"%s\" already exists"
 msgstr ""
 
-#: commands/user.c:549
+#: commands/user.c:611
 #, c-format
 msgid "CREATE USER: sysid %d is already assigned"
 msgstr ""
 
-#: commands/user.c:580 commands/user.c:784
+#: commands/user.c:642 commands/user.c:843
 msgid "CREATE USER: password encryption failed"
 msgstr ""
 
-#: commands/user.c:670 commands/user.c:680 commands/user.c:686
-#: commands/user.c:692
+#: commands/user.c:733 commands/user.c:743 commands/user.c:749
+#: commands/user.c:755
 msgid "ALTER USER: conflicting options"
 msgstr ""
 
-#: commands/user.c:696
+#: commands/user.c:759
 #, c-format
 msgid "ALTER USER: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:719
+#: commands/user.c:782
 msgid "ALTER USER: permission denied"
 msgstr "ALTER USER: ��� �������"
 
-#: commands/user.c:723
-msgid "ALTER USER: password changes cannot be rolled back"
-msgstr ""
-
-#: commands/user.c:737
+#: commands/user.c:796
 #, c-format
 msgid "ALTER USER: user \"%s\" does not exist"
 msgstr "ALTER USER: ������������ \"%s\" �� ����������"
 
-#: commands/user.c:847 commands/variable.c:549 utils/cache/lsyscache.c:1507
-#: utils/init/miscinit.c:556
+#: commands/user.c:907 commands/variable.c:549 utils/cache/lsyscache.c:1543
+#: utils/init/miscinit.c:555
 #, c-format
 msgid "user \"%s\" does not exist"
 msgstr "������������ \"%s\" �� ����������"
 
-#: commands/user.c:903
+#: commands/user.c:968
 msgid "DROP USER: permission denied"
 msgstr "DROP USER: ��� �������"
 
-#: commands/user.c:906
-msgid "DROP USER cannot be rolled back completely"
-msgstr ""
-
-#: commands/user.c:933
+#: commands/user.c:995
 #, c-format
 msgid "DROP USER: user \"%s\" does not exist (no users removed)"
 msgstr ""
 "DROP USER: ������������ \"%s\" �� ���������� (����� �� �������������� �� "
 "���̣�)"
 
-#: commands/user.c:935
+#: commands/user.c:997
 #, c-format
 msgid "DROP USER: user \"%s\" does not exist"
 msgstr "DROP USER: ������������ \"%s\" �� ����������"
 
-#: commands/user.c:941
+#: commands/user.c:1003
 msgid "current user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:943
+#: commands/user.c:1005
 msgid "session user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:967
+#: commands/user.c:1029
 #, c-format
 msgid "DROP USER: user \"%s\" owns database \"%s\", cannot be removed%s"
 msgstr ""
 
-#: commands/user.c:1046
+#: commands/user.c:1109
 #, c-format
 msgid "CheckPgUserAclNotNull: \"%s\" not found"
 msgstr ""
 
-#: commands/user.c:1051
+#: commands/user.c:1114
 #, c-format
 msgid ""
 "To use passwords, you have to revoke permissions on %s so normal users "
@@ -4835,106 +5005,96 @@ msgstr ""
 "������������ �� ������ �� ������. ���������� 'REVOKE ALL ON \"%s\" FROM "
 "PUBLIC'."
 
-#: commands/user.c:1093 commands/user.c:1099
+#: commands/user.c:1156 commands/user.c:1162
 msgid "CREATE GROUP: conflicting options"
 msgstr "CREATE GROUP: �������� �����"
 
-#: commands/user.c:1103
+#: commands/user.c:1166
 #, c-format
 msgid "CREATE GROUP: option \"%s\" not recognized"
 msgstr "CREATE GROUP: ����� \"%s\" �� ����������"
 
-#: commands/user.c:1111
+#: commands/user.c:1174
 msgid "group id must be positive"
 msgstr ""
 
-#: commands/user.c:1122
+#: commands/user.c:1185
 msgid "CREATE GROUP: permission denied"
 msgstr "CREATE GROUP: ��� �������"
 
-#: commands/user.c:1125
+#: commands/user.c:1188
 #, c-format
 msgid "CREATE GROUP: group name \"%s\" is reserved"
 msgstr ""
 
-#: commands/user.c:1154
+#: commands/user.c:1223
 #, c-format
 msgid "CREATE GROUP: group name \"%s\" already exists"
 msgstr ""
 
-#: commands/user.c:1157
+#: commands/user.c:1226
 #, c-format
 msgid "CREATE GROUP: group sysid %d is already assigned"
 msgstr ""
 
-#: commands/user.c:1244
+#: commands/user.c:1319
 #, c-format
 msgid "%s: group \"%s\" does not exist"
 msgstr ""
 
-#: commands/user.c:1285
+#: commands/user.c:1360
 #, c-format
 msgid "AlterGroup: unknown tag %s"
 msgstr ""
 
-#: commands/user.c:1297
+#: commands/user.c:1372
 #, c-format
 msgid "%s: user \"%s\" is already in group \"%s\""
 msgstr ""
 
-#: commands/user.c:1312
+#: commands/user.c:1387
 #, c-format
 msgid "ALTER GROUP: group \"%s\" does not have any members"
 msgstr ""
 
-#: commands/user.c:1337
+#: commands/user.c:1412
 #, c-format
 msgid "ALTER GROUP: user \"%s\" is not in group \"%s\""
 msgstr ""
 
-#: commands/user.c:1465
+#: commands/user.c:1541
 msgid "DROP GROUP: permission denied"
 msgstr ""
 
-#: commands/user.c:1476
+#: commands/user.c:1554
 #, c-format
 msgid "DROP GROUP: group \"%s\" does not exist"
 msgstr ""
 
-#: commands/vacuum.c:181
-#, c-format
-msgid "%s cannot run inside a BEGIN/END block"
-msgstr ""
-
-#: commands/vacuum.c:185
-#, c-format
-msgid "%s cannot be executed from a function"
-msgstr ""
-
-#: commands/vacuum.c:460
+#: commands/vacuum.c:459
 msgid ""
 "oldest Xmin is far in the past --- close open transactions soon to avoid "
 "wraparound problems"
 msgstr ""
 
-#: commands/vacuum.c:506 commands/vacuum.c:513
+#: commands/vacuum.c:505 commands/vacuum.c:512
 #, c-format
 msgid "pg_class entry for relid %u vanished during vacuuming"
 msgstr ""
 
-#: commands/vacuum.c:666
+#: commands/vacuum.c:665
 msgid ""
 "Some databases have not been vacuumed in over 2 billion transactions.\n"
 "\tYou may have already suffered transaction-wraparound data loss."
 msgstr ""
 
-#: commands/vacuum.c:677
+#: commands/vacuum.c:676
 msgid ""
 "Some databases have not been vacuumed in over 1 billion transactions.\n"
 "\tBetter vacuum them soon, or you may have a wraparound failure."
 msgstr ""
 
-#: commands/vacuum.c:684
+#: commands/vacuum.c:683
 #, c-format
 msgid ""
 "Some databases have not been vacuumed in %d transactions.\n"
@@ -4952,12 +5112,12 @@ msgstr ""
 msgid "VACUUM (full_vacuum_rel): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:1044 commands/vacuumlazy.c:211
+#: commands/vacuum.c:1044 commands/vacuumlazy.c:210
 #, c-format
 msgid "--Relation %s.%s--"
 msgstr ""
 
-#: commands/vacuum.c:1078 commands/vacuumlazy.c:269
+#: commands/vacuum.c:1078 commands/vacuumlazy.c:268
 #, c-format
 msgid "Rel %s: Uninitialized page %u - fixing"
 msgstr ""
@@ -4974,7 +5134,7 @@ msgid ""
 "Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
-#: commands/vacuum.c:1220 commands/vacuumlazy.c:373
+#: commands/vacuum.c:1220 commands/vacuumlazy.c:372
 #, c-format
 msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
 msgstr ""
@@ -4988,138 +5148,138 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:1581
+#: commands/vacuum.c:1582
 msgid "HEAP_MOVED_IN was not expected"
 msgstr ""
 
-#: commands/vacuum.c:1591
+#: commands/vacuum.c:1592
 msgid "Invalid XVAC in tuple header"
 msgstr ""
 
-#: commands/vacuum.c:1616
+#: commands/vacuum.c:1617
 msgid "HEAP_MOVED_OFF was expected"
 msgstr ""
 
-#: commands/vacuum.c:1670 commands/vacuum.c:1792
+#: commands/vacuum.c:1671 commands/vacuum.c:1793
 msgid "Parent item in update-chain not found - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1707
+#: commands/vacuum.c:1708
 msgid ""
 "Child itemid in update-chain marked as unused - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1804
+#: commands/vacuum.c:1805
 msgid "Parent itemid marked as unused"
 msgstr ""
 
-#: commands/vacuum.c:1828
+#: commands/vacuum.c:1829
 msgid "Too old parent tuple found - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1957
+#: commands/vacuum.c:1958
 #, c-format
 msgid "moving chain: failed to add item with len = %lu to page %u"
 msgstr ""
 
-#: commands/vacuum.c:2101
+#: commands/vacuum.c:2102
 #, c-format
 msgid ""
 "failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %"
 "u)"
 msgstr ""
 
-#: commands/vacuum.c:2190
+#: commands/vacuum.c:2191
 msgid "HEAP_MOVED_IN was not expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2194
+#: commands/vacuum.c:2195
 msgid "Invalid XVAC in tuple header (4)"
 msgstr ""
 
-#: commands/vacuum.c:2219
+#: commands/vacuum.c:2220
 msgid "HEAP_MOVED_OFF was expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2330
+#: commands/vacuum.c:2331
 msgid "HEAP_MOVED_OFF/HEAP_MOVED_IN was expected"
 msgstr ""
 
-#: commands/vacuum.c:2332
+#: commands/vacuum.c:2333
 msgid "Invalid XVAC in tuple header (2)"
 msgstr ""
 
-#: commands/vacuum.c:2350
+#: commands/vacuum.c:2351
 #, c-format
 msgid ""
 "Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:2412
+#: commands/vacuum.c:2413
 msgid "Invalid XVAC in tuple header (3)"
 msgstr ""
 
-#: commands/vacuum.c:2417
+#: commands/vacuum.c:2418
 msgid "HEAP_MOVED_OFF was expected (3)"
 msgstr ""
 
-#: commands/vacuum.c:2467
+#: commands/vacuum.c:2468
 #, c-format
 msgid "VACUUM (repair_frag): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2531
+#: commands/vacuum.c:2534
 #, c-format
 msgid "VACUUM (vacuum_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2537
+#: commands/vacuum.c:2540
 #, c-format
 msgid "Rel %s: Pages: %u --> %u."
 msgstr ""
 
-#: commands/vacuum.c:2622 commands/vacuumlazy.c:600
+#: commands/vacuum.c:2625 commands/vacuumlazy.c:599
 #, c-format
 msgid ""
 "Index %s: Pages %u; Tuples %.0f.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:2635 commands/vacuum.c:2689
+#: commands/vacuum.c:2638 commands/vacuum.c:2692
 #, c-format
 msgid ""
 "Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\n"
 "\tRecreate the index."
 msgstr ""
 
-#: commands/vacuum.c:2676 commands/vacuumlazy.c:647
+#: commands/vacuum.c:2679 commands/vacuumlazy.c:646
 #, c-format
 msgid ""
 "Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuumlazy.c:435
+#: commands/vacuumlazy.c:434
 #, c-format
 msgid ""
 "Pages %u: Changed %u, Empty %u; Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n"
 "\tTotal %s"
 msgstr ""
 
-#: commands/vacuumlazy.c:485
+#: commands/vacuumlazy.c:484
 #, c-format
 msgid ""
 "Removed %d tuples in %d pages.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuumlazy.c:721
+#: commands/vacuumlazy.c:720
 #, c-format
 msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuumlazy.c:756
+#: commands/vacuumlazy.c:755
 #, c-format
 msgid ""
 "Truncated %u --> %u pages.\n"
@@ -5173,235 +5333,259 @@ msgstr ""
 msgid "%s is not a view"
 msgstr "%s �� �������� �����"
 
-#: commands/view.c:161 commands/view.c:171
+#: commands/view.c:162 commands/view.c:172
 msgid "Cannot change number of columns in view"
 msgstr ""
 
-#: commands/view.c:174
+#: commands/view.c:175
 #, c-format
 msgid "Cannot change name of view column \"%s\""
 msgstr ""
 
-#: commands/view.c:179
+#: commands/view.c:180
 #, c-format
 msgid "Cannot change datatype of view column \"%s\""
 msgstr ""
 
-#: executor/execAmi.c:161
+#: executor/execAmi.c:163
 #, c-format
 msgid "ExecReScan: node type %d not supported"
 msgstr ""
 
-#: executor/execAmi.c:213
+#: executor/execAmi.c:211
 #, c-format
 msgid "ExecMarkPos: node type %d not supported"
 msgstr ""
 
-#: executor/execAmi.c:254
+#: executor/execAmi.c:252
 #, c-format
 msgid "ExecRestrPos: node type %d not supported"
 msgstr ""
 
-#: executor/execMain.c:408
+#: executor/execMain.c:369
 #, c-format
 msgid "ExecCheckRTEPerms: bogus operation %d"
 msgstr ""
 
-#: executor/execMain.c:782
+#: executor/execMain.c:741
 #, c-format
 msgid "You can't change sequence relation %s"
 msgstr ""
 
-#: executor/execMain.c:786
+#: executor/execMain.c:745
 #, c-format
 msgid "You can't change toast relation %s"
 msgstr ""
 
-#: executor/execMain.c:790
+#: executor/execMain.c:749
 #, c-format
 msgid "You can't change view relation %s"
 msgstr ""
 
-#: executor/execMain.c:991
+#: executor/execMain.c:963
 msgid "ExecutePlan: NO (junk) `ctid' was found!"
 msgstr ""
 
-#: executor/execMain.c:995
+#: executor/execMain.c:967
 msgid "ExecutePlan: (junk) `ctid' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1020
+#: executor/execMain.c:992
 #, c-format
 msgid "ExecutePlan: NO (junk) `%s' was found!"
 msgstr ""
 
-#: executor/execMain.c:1025
+#: executor/execMain.c:997
 #, c-format
 msgid "ExecutePlan: (junk) `%s' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1114
+#: executor/execMain.c:1086
 msgid "ExecutePlan: unknown operation in queryDesc"
 msgstr ""
 
-#: executor/execMain.c:1382
+#: executor/execMain.c:1372
 msgid "ExecUpdate: UPDATE can't run without transactions"
 msgstr ""
 
-#: executor/execMain.c:1582
+#: executor/execMain.c:1572
 #, c-format
 msgid "%s: Fail to add null value in not null attribute %s"
 msgstr ""
 
-#: executor/execMain.c:1592
+#: executor/execMain.c:1582
 #, c-format
 msgid "%s: rejected due to CHECK constraint \"%s\" on \"%s\""
 msgstr ""
 
-#: executor/execMain.c:1636
+#: executor/execMain.c:1625
 #, c-format
 msgid "EvalPlanQual: can't find RTE %d"
 msgstr ""
 
-#: executor/execMain.c:1654
+#: executor/execMain.c:1643
 msgid "EvalPlanQual: t_xmin is uncommitted ?!"
 msgstr ""
 
-#: executor/execProcnode.c:228
+#: executor/execProcnode.c:218
 #, c-format
 msgid "ExecInitNode: node type %d unsupported"
 msgstr ""
 
-#: executor/execProcnode.c:361
+#: executor/execProcnode.c:378
 #, c-format
 msgid "ExecProcNode: node type %d unsupported"
 msgstr ""
 
-#: executor/execProcnode.c:448
+#: executor/execProcnode.c:471
 #, c-format
 msgid "ExecCountSlotsNode: node type %d unsupported"
 msgstr ""
 
-#: executor/execProcnode.c:574
+#: executor/execProcnode.c:600
 #, c-format
 msgid "ExecEndNode: node type %d unsupported"
 msgstr ""
 
-#: executor/execProcnode.c:753
+#: executor/execProcnode.c:776
 #, c-format
 msgid "ExecGetTupType: node type %d unsupported"
 msgstr ""
 
-#: executor/execQual.c:150 executor/execQual.c:172
+#: executor/execQual.c:167 executor/execQual.c:189
 #, c-format
 msgid "ExecEvalArrayRef: can only handle %d dimensions"
 msgstr ""
 
-#: executor/execQual.c:194
+#: executor/execQual.c:211
 msgid "ExecEvalArrayRef: upper and lower indices mismatch"
 msgstr ""
 
-#: executor/execQual.c:275
+#: executor/execQual.c:292
 msgid "ExecEvalAggref: no aggregates in this expression context"
 msgstr ""
 
-#: executor/execQual.c:477
-msgid "ExecEvalParam: new/old params with same id & diff names"
-msgstr ""
-
-#: executor/execQual.c:486
+#: executor/execQual.c:470
 #, c-format
 msgid "ExecEvalParam: invalid paramkind %d"
 msgstr ""
 
-#: executor/execQual.c:500
+#: executor/execQual.c:482
 #, c-format
 msgid "ExecEvalParam: Unknown value for parameter %s"
 msgstr ""
 
-#: executor/execQual.c:534
+#: executor/execQual.c:485
+#, c-format
+msgid "ExecEvalParam: Unknown value for parameter %d"
+msgstr ""
+
+#: executor/execQual.c:517
 msgid "GetAttributeByNum: Invalid attribute number"
 msgstr ""
 
-#: executor/execQual.c:537
+#: executor/execQual.c:520
 msgid "GetAttributeByNum: cannot access system attributes here"
 msgstr ""
 
-#: executor/execQual.c:540
+#: executor/execQual.c:523
 msgid "GetAttributeByNum: a NULL isNull flag was passed"
 msgstr ""
 
-#: executor/execQual.c:568
+#: executor/execQual.c:551
 msgid "GetAttributeByName: Invalid attribute name"
 msgstr ""
 
-#: executor/execQual.c:571
+#: executor/execQual.c:554
 msgid "GetAttributeByName: a NULL isNull flag was passed"
 msgstr ""
 
-#: executor/execQual.c:593
+#: executor/execQual.c:576
 #, c-format
 msgid "GetAttributeByName: attribute %s not found"
 msgstr ""
 
-#: executor/execQual.c:638
-msgid "Functions and operators can take only one set argument"
+#: executor/execQual.c:603
+msgid "init_fcache: too many arguments"
 msgstr ""
 
-#: executor/execQual.c:688 executor/execQual.c:730 executor/execQual.c:904
-#: executor/execQual.c:2068 executor/functions.c:531 executor/functions.c:566
-#: utils/adt/sets.c:200
-msgid "Set-valued function called in context that cannot accept a set"
+#: executor/execQual.c:645
+msgid "Functions and operators can take only one set argument"
 msgstr ""
 
-#: executor/execQual.c:875
-msgid "ExecMakeTableFunctionResult: expression is not a function call"
+#: executor/execQual.c:695 executor/execQual.c:737 executor/execQual.c:922
+#: executor/execQual.c:2427 executor/functions.c:524 executor/functions.c:559
+#: utils/adt/sets.c:204
+msgid "Set-valued function called in context that cannot accept a set"
 msgstr ""
 
-#: executor/execQual.c:996 executor/execQual.c:1029
+#: executor/execQual.c:1033 executor/execQual.c:1068
 msgid ""
 "ExecMakeTableFunctionResult: Invalid result from function returning tuple"
 msgstr ""
 
-#: executor/execQual.c:1054
+#: executor/execQual.c:1093
 msgid "ExecMakeTableFunctionResult: Materialize-mode protocol not followed"
 msgstr ""
 
-#: executor/execQual.c:1059
+#: executor/execQual.c:1098
 #, c-format
 msgid "ExecMakeTableFunctionResult: unknown returnMode %d"
 msgstr ""
 
-#: executor/execQual.c:1468
+#: executor/execQual.c:1218
+msgid "IS DISTINCT FROM does not support set arguments"
+msgstr ""
+
+#: executor/execQual.c:1470
 #, c-format
 msgid "ExecEvalNullTest: unexpected nulltesttype %d"
 msgstr ""
 
-#: executor/execQual.c:1548
+#: executor/execQual.c:1555
 #, c-format
 msgid "ExecEvalBooleanTest: unexpected booltesttype %d"
 msgstr ""
 
-#: executor/execQual.c:1573
+#: executor/execQual.c:1584
 #, c-format
 msgid "Domain %s does not allow NULL values"
 msgstr ""
 
-#: executor/execQual.c:1578
-msgid "Domain CHECK Constraints not yet implemented"
+#: executor/execQual.c:1611
+#, c-format
+msgid "ExecEvalConstraintTest: Domain %s constraint %s failed"
 msgstr ""
 
-#: executor/execQual.c:1581
+#: executor/execQual.c:1619
 msgid "ExecEvalConstraintTest: Constraint type unknown"
 msgstr ""
 
-#: executor/execQual.c:1737 executor/execQual.c:1782
+#: executor/execQual.c:1791
+#, c-format
+msgid "ExecEvalExpr: unknown boolop %d"
+msgstr ""
+
+#: executor/execQual.c:1845
 #, c-format
 msgid "ExecEvalExpr: unknown expression type %d"
 msgstr ""
 
-#: executor/execQual.c:2128
-msgid "ExecTargetList: fjoin nodes not currently supported"
+#: executor/execQual.c:1944 optimizer/util/clauses.c:422
+msgid "Aggregate function calls may not be nested"
+msgstr ""
+
+#: executor/execQual.c:1947
+msgid "ExecInitExpr: Aggref not expected here"
+msgstr ""
+
+#: executor/execQual.c:2016 executor/execQual.c:2153
+msgid "ExecInitExpr: SubPlan not expected here"
+msgstr ""
+
+#: executor/execQual.c:2129
+#, c-format
+msgid "ExecInitExpr: unknown expression type %d"
 msgstr ""
 
 #: executor/execTuples.c:259
@@ -5410,17 +5594,17 @@ msgid ""
 "\tsend mail to your local executor guru to fix this"
 msgstr ""
 
-#: executor/functions.c:171
+#: executor/functions.c:154
 #, c-format
 msgid "init_sql_fcache: Cache lookup failed for procedure %u"
 msgstr ""
 
-#: executor/functions.c:183
+#: executor/functions.c:166
 #, c-format
 msgid "init_sql_fcache: Cache lookup failed for type %u"
 msgstr ""
 
-#: executor/functions.c:242
+#: executor/functions.c:228
 #, c-format
 msgid "init_sql_fcache: null prosrc for procedure %u"
 msgstr ""
@@ -5433,123 +5617,111 @@ msgstr ""
 msgid "InstrStopNode without start"
 msgstr ""
 
-#: executor/nodeAgg.c:774
-msgid "ExecInitAgg: could not find any aggregate functions"
-msgstr ""
-
-#: executor/nodeAgg.c:872
+#: executor/nodeAgg.c:1253
 #, c-format
 msgid "ExecAgg: cache lookup failed for aggregate %u"
 msgstr "ExecAgg: ����� � ���� �������� %u �� ������"
 
-#: executor/nodeAgg.c:927
+#: executor/nodeAgg.c:1308
 #, c-format
 msgid "Aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 
-#: executor/nodeAgg.c:950 executor/nodeGroup.c:496
-#, c-format
-msgid "Unable to identify an equality operator for type %s"
-msgstr ""
-
-#: executor/nodeAgg.c:978
+#: executor/nodeAgg.c:1357
 #, c-format
 msgid ""
 "GetAggInitVal: cache lookup failed on aggregate transition function return "
 "type %u"
 msgstr ""
 
-#: executor/nodeAgg.c:1060
+#: executor/nodeAgg.c:1465
 #, c-format
 msgid "Aggregate function %u called as normal function"
 msgstr ""
 
-#: executor/nodeAppend.c:295
-msgid "ExecProcAppend: subnode is NULL"
-msgstr ""
-
-#: executor/nodeFunctionscan.c:93
+#: executor/nodeFunctionscan.c:91
 msgid ""
 "Query-specified return tuple and actual function return tuple do not match"
 msgstr ""
 
-#: executor/nodeHash.c:66
-msgid "ExecHash: hash table is NULL."
-msgstr ""
-
-#: executor/nodeHash.c:311 executor/nodeHash.c:490 executor/nodeHash.c:732
-msgid "Insufficient memory for hash table."
-msgstr ""
-
-#: executor/nodeHash.c:684
+#: executor/nodeHash.c:705
 #, c-format
-msgid "hashFunc: Invalid typLen %d"
-msgstr ""
+msgid "ComputeHashFunc: Invalid typLen %d"
+msgstr "ComputeHashFunc: �� ������ typLen %d"
 
-#: executor/nodeHashjoin.c:357
+#: executor/nodeHashjoin.c:363
 #, c-format
 msgid "ExecInitHashJoin: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeHashjoin.c:529 executor/nodeHashjoin.c:537
+#: executor/nodeHashjoin.c:541 executor/nodeHashjoin.c:549
 msgid "Read from hashjoin temp file failed"
 msgstr ""
 
-#: executor/nodeHashjoin.c:593 executor/nodeHashjoin.c:598
+#: executor/nodeHashjoin.c:605 executor/nodeHashjoin.c:610
 msgid "Failed to rewind hash temp file"
 msgstr ""
 
-#: executor/nodeHashjoin.c:669 executor/nodeHashjoin.c:672
+#: executor/nodeHashjoin.c:659 executor/nodeHashjoin.c:662
 msgid "Write to hashjoin temp file failed"
 msgstr ""
 
-#: executor/nodeIndexscan.c:747
+#: executor/nodeIndexscan.c:675
 msgid "ExecInitIndexScan: indxqual not an opclause!"
 msgstr ""
 
-#: executor/nodeIndexscan.c:873 executor/nodeIndexscan.c:936
+#: executor/nodeIndexscan.c:777 executor/nodeIndexscan.c:814
 #, c-format
 msgid "ExecInitIndexScan: %s"
 msgstr "ExecInitIndexScan: %s"
 
-#: executor/nodeIndexscan.c:1009
+#: executor/nodeIndexscan.c:887
 #, c-format
 msgid "indexes of the relation %u was inactivated"
 msgstr ""
 
-#: executor/nodeMergejoin.c:131
-msgid "MJFormSkipQuals: op not an Oper!"
+#: executor/nodeLimit.c:152 executor/nodeLimit.c:167
+msgid "ExecLimit: subplan failed to run backwards"
+msgstr ""
+
+#: executor/nodeLimit.c:198
+#, c-format
+msgid "ExecLimit: impossible state %d"
+msgstr ""
+
+#: executor/nodeMergejoin.c:132
+msgid "MJFormSkipQuals: op not an OpExpr!"
 msgstr ""
 
-#: executor/nodeMergejoin.c:395
+#: executor/nodeMergejoin.c:400
 #, c-format
 msgid "ExecMergeJoin: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1379
+#: executor/nodeMergejoin.c:1384
 #, c-format
 msgid "ExecMergeJoin: invalid join state %d, aborting"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1458
+#: executor/nodeMergejoin.c:1471
 msgid "RIGHT JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1473 optimizer/path/joinpath.c:935
+#: executor/nodeMergejoin.c:1486 optimizer/path/joinpath.c:904
 msgid "FULL JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1476
+#: executor/nodeMergejoin.c:1489
 #, c-format
 msgid "ExecInitMergeJoin: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeNestloop.c:318
+#: executor/nodeNestloop.c:322
 #, c-format
 msgid "ExecInitNestLoop: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeSetOp.c:174
+#: executor/nodeSetOp.c:173
 #, c-format
 msgid "ExecSetOp: bogus command code %d"
 msgstr ""
@@ -5558,32 +5730,32 @@ msgstr ""
 msgid "ExtractSortKeys: keycount <= 0"
 msgstr ""
 
-#: executor/nodeSubplan.c:53
+#: executor/nodeSubplan.c:56
 msgid "ExecSubPlan: can't set parent params from subquery"
 msgstr ""
 
-#: executor/nodeSubplan.c:120 executor/nodeSubplan.c:142
-#: executor/nodeSubplan.c:385
+#: executor/nodeSubplan.c:125 executor/nodeSubplan.c:150
+#: executor/nodeSubplan.c:427
 msgid "More than one tuple returned by a subselect used as an expression."
 msgstr ""
 
-#: executor/nodeSubplan.c:180
+#: executor/nodeSubplan.c:193
 msgid "ExecSubPlan: failed to find placeholder for subplan result"
 msgstr ""
 
-#: executor/nodeSubplan.c:358
+#: executor/nodeSubplan.c:400
 msgid "ExecSetParamPlan: ANY/ALL subselect unsupported"
 msgstr ""
 
-#: executor/nodeSubplan.c:468
+#: executor/nodeSubplan.c:516
 msgid "ExecReScanSetParamPlan: direct correlated subquery unsupported, yet"
 msgstr ""
 
-#: executor/nodeSubplan.c:470
+#: executor/nodeSubplan.c:518
 msgid "ExecReScanSetParamPlan: setParam list is NULL"
 msgstr ""
 
-#: executor/nodeSubplan.c:472
+#: executor/nodeSubplan.c:520
 msgid "ExecReScanSetParamPlan: extParam list of plan is NULL"
 msgstr ""
 
@@ -5599,62 +5771,62 @@ msgstr ""
 msgid "Memory exhausted in SPI_connect"
 msgstr ""
 
-#: executor/spi.c:149
+#: executor/spi.c:148
 msgid "Memory exhausted in SPI_finish"
 msgstr ""
 
-#: executor/spi.c:315 executor/spi.c:342 executor/spi.c:371 executor/spi.c:409
-#: executor/spi.c:653 executor/spi.c:1331
+#: executor/spi.c:310 executor/spi.c:337 executor/spi.c:366 executor/spi.c:404
+#: executor/spi.c:648 executor/spi.c:1418
 msgid "SPI: stack corrupted"
 msgstr ""
 
-#: executor/spi.c:720
+#: executor/spi.c:714
 msgid "cannot open multi-query plan as cursor"
 msgstr ""
 
-#: executor/spi.c:725
+#: executor/spi.c:719
 msgid "plan in SPI_cursor_open() is not a SELECT"
 msgstr ""
 
-#: executor/spi.c:727
+#: executor/spi.c:721
 msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
 msgstr ""
 
-#: executor/spi.c:729
+#: executor/spi.c:723
 msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
 msgstr ""
 
-#: executor/spi.c:760
+#: executor/spi.c:754
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr ""
 
-#: executor/spi.c:766
+#: executor/spi.c:760
 #, c-format
 msgid "failed to create portal \"%s\""
 msgstr ""
 
-#: executor/spi.c:879 executor/spi.c:1237
+#: executor/spi.c:869 executor/spi.c:1324
 msgid "invalid portal in SPI cursor operation"
 msgstr ""
 
-#: executor/spi.c:904
+#: executor/spi.c:894
 msgid "SPI: improper call to spi_printtup"
 msgstr ""
 
-#: executor/spi.c:906
+#: executor/spi.c:896
 msgid "SPI: stack corrupted in spi_printtup"
 msgstr ""
 
-#: executor/spi.c:1188
+#: executor/spi.c:1275
 msgid "SPI_select: retrieve into portal not implemented"
 msgstr ""
 
-#: executor/spi.c:1198
+#: executor/spi.c:1285
 msgid "SPI_select: # of processed tuples check failed"
 msgstr ""
 
-#: executor/spi.c:1297
+#: executor/spi.c:1384
 msgid "SPI_fetch: # of processed tuples check failed"
 msgstr ""
 
@@ -5666,419 +5838,410 @@ msgstr ""
 msgid "Memory exhausted in DLNewElem"
 msgstr ""
 
-#: libpq/be-fsstubs.c:84
+#: libpq/auth.c:106
 #, c-format
-msgid "lo_open(%u,%d)"
+msgid "pg_krb4_recvauth: kerberos error: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:102
+#: libpq/auth.c:112
 #, c-format
-msgid "cannot open large object %u"
+msgid "pg_krb4_recvauth: protocol version \"%s\" != \"%s\""
 msgstr ""
 
-#: libpq/be-fsstubs.c:122
+#: libpq/auth.c:118
 #, c-format
-msgid "lo_close: invalid large obj descriptor (%d)"
+msgid "pg_krb4_recvauth: name \"%s\" != \"%s\""
 msgstr ""
 
-#: libpq/be-fsstubs.c:126
-#, c-format
-msgid "lo_close(%d)"
+#: libpq/auth.c:130
+msgid "pg_krb4_recvauth: Kerberos not implemented on this server"
 msgstr ""
 
-#: libpq/be-fsstubs.c:158
+#: libpq/auth.c:190
 #, c-format
-msgid "lo_read: invalid large obj descriptor (%d)"
+msgid "pg_krb5_init: krb5_init_context returned Kerberos error %d"
 msgstr ""
 
-#: libpq/be-fsstubs.c:180
+#: libpq/auth.c:199
 #, c-format
-msgid "lo_write: invalid large obj descriptor (%d)"
+msgid "pg_krb5_init: krb5_kt_resolve returned Kerberos error %d"
 msgstr ""
 
-#: libpq/be-fsstubs.c:206
+#: libpq/auth.c:211
 #, c-format
-msgid "lo_lseek: invalid large obj descriptor (%d)"
+msgid "pg_krb5_init: krb5_sname_to_principal returned Kerberos error %d"
 msgstr ""
 
-#: libpq/be-fsstubs.c:261
+#: libpq/auth.c:255
 #, c-format
-msgid "lo_tell: invalid large object descriptor (%d)"
+msgid "pg_krb5_recvauth: krb5_recvauth returned Kerberos error %d"
 msgstr ""
 
-#: libpq/be-fsstubs.c:363
-msgid ""
-"You must have Postgres superuser privilege to use server-side lo_import().\n"
-"\tAnyone can use the client-side lo_import() provided by libpq."
+#: libpq/auth.c:279
+#, c-format
+msgid "pg_krb5_recvauth: krb5_unparse_name returned Kerberos error %d"
 msgstr ""
 
-#: libpq/be-fsstubs.c:378
+#: libpq/auth.c:290
 #, c-format
-msgid "lo_import: can't open unix file \"%s\": %m"
+msgid "pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\""
 msgstr ""
 
-#: libpq/be-fsstubs.c:386
-#, c-format
-msgid "lo_import: can't create inv object for \"%s\""
+#: libpq/auth.c:309
+msgid "pg_krb5_recvauth: Kerberos not implemented on this server"
 msgstr ""
 
-#: libpq/be-fsstubs.c:397
+#: libpq/auth.c:374
 #, c-format
-msgid "lo_import: error while reading \"%s\""
+msgid "%s authentication failed for user \"%s\""
 msgstr ""
 
-#: libpq/be-fsstubs.c:426
-msgid ""
-"You must have Postgres superuser privilege to use server-side lo_export().\n"
-"\tAnyone can use the client-side lo_export() provided by libpq."
+#: libpq/auth.c:396
+msgid "Missing or erroneous pg_hba.conf file, see postmaster log for details"
 msgstr ""
 
-#: libpq/be-fsstubs.c:436
+#: libpq/auth.c:417
 #, c-format
-msgid "lo_export: can't open inv object %u"
+msgid "No pg_hba.conf entry for host %s, user %s, database %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:454
+#: libpq/auth.c:452
 #, c-format
-msgid "lo_export: can't open unix file \"%s\": %m"
+msgid "pg_local_sendauth: can't do setsockopt: %m"
 msgstr ""
 
-#: libpq/be-fsstubs.c:464
+#: libpq/auth.c:541
 #, c-format
-msgid "lo_export: error while writing \"%s\""
+msgid "pam_passwd_conv_proc: Error from underlying PAM layer: '%s'"
 msgstr ""
 
-#: libpq/pqformat.c:159
+#: libpq/auth.c:545
 #, c-format
-msgid "pq_sendint: unsupported size %d"
+msgid "pam_passwd_conv_proc: Unexpected PAM conversation %d/'%s'"
 msgstr ""
 
-#: libpq/pqformat.c:241
-#, c-format
-msgid "pq_getint: unsupported size %d"
+#: libpq/auth.c:575
+msgid "received PAM packet"
 msgstr ""
 
-#: libpq/auth.c:106
-#, c-format
-msgid "pg_krb4_recvauth: kerberos error: %s"
+#: libpq/auth.c:579
+msgid "pam_passwd_conv_proc: no password"
 msgstr ""
 
-#: libpq/auth.c:112
-#, c-format
-msgid "pg_krb4_recvauth: protocol version \"%s\" != \"%s\""
+#: libpq/auth.c:592
+msgid "pam_passwd_conv_proc: Out of memory!"
 msgstr ""
 
-#: libpq/auth.c:118
+#: libpq/auth.c:636
 #, c-format
-msgid "pg_krb4_recvauth: name \"%s\" != \"%s\""
-msgstr ""
-
-#: libpq/auth.c:130
-msgid "pg_krb4_recvauth: Kerberos not implemented on this server"
+msgid "CheckPAMAuth: Failed to create PAM authenticator: '%s'"
 msgstr ""
 
-#: libpq/auth.c:190
+#: libpq/auth.c:646
 #, c-format
-msgid "pg_krb5_init: krb5_init_context returned Kerberos error %d"
+msgid "CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:199
+#: libpq/auth.c:656
 #, c-format
-msgid "pg_krb5_init: krb5_kt_resolve returned Kerberos error %d"
+msgid "CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:211
+#: libpq/auth.c:666
 #, c-format
-msgid "pg_krb5_init: krb5_sname_to_principal returned Kerberos error %d"
+msgid "CheckPAMAuth: pam_authenticate failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:255
+#: libpq/auth.c:676
 #, c-format
-msgid "pg_krb5_recvauth: krb5_recvauth returned Kerberos error %d"
+msgid "CheckPAMAuth: pam_acct_mgmt failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:279
+#: libpq/auth.c:686
 #, c-format
-msgid "pg_krb5_recvauth: krb5_unparse_name returned Kerberos error %d"
+msgid "CheckPAMAuth: Failed to release PAM authenticator: '%s'"
 msgstr ""
 
-#: libpq/auth.c:290
+#: libpq/auth.c:726
 #, c-format
-msgid "pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\""
+msgid "unexpected password packet size: read %d, expected %d"
 msgstr ""
 
-#: libpq/auth.c:309
-msgid "pg_krb5_recvauth: Kerberos not implemented on this server"
+#: libpq/auth.c:730
+msgid "received password packet"
 msgstr ""
 
-#: libpq/auth.c:374
+#: libpq/be-fsstubs.c:84
 #, c-format
-msgid "%s authentication failed for user \"%s\""
+msgid "lo_open(%u,%d)"
 msgstr ""
 
-#: libpq/auth.c:396
-msgid "Missing or erroneous pg_hba.conf file, see postmaster log for details"
+#: libpq/be-fsstubs.c:102
+#, c-format
+msgid "cannot open large object %u"
 msgstr ""
 
-#: libpq/auth.c:417
+#: libpq/be-fsstubs.c:122
 #, c-format
-msgid "No pg_hba.conf entry for host %s, user %s, database %s"
+msgid "lo_close: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/auth.c:450
+#: libpq/be-fsstubs.c:126
 #, c-format
-msgid "pg_local_sendauth: can't do setsockopt: %m"
+msgid "lo_close(%d)"
 msgstr ""
 
-#: libpq/auth.c:539
+#: libpq/be-fsstubs.c:158
 #, c-format
-msgid "pam_passwd_conv_proc: Error from underlying PAM layer: '%s'"
+msgid "lo_read: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/auth.c:543
+#: libpq/be-fsstubs.c:180
 #, c-format
-msgid "pam_passwd_conv_proc: Unexpected PAM conversation %d/'%s'"
+msgid "lo_write: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/auth.c:573
-msgid "received PAM packet"
+#: libpq/be-fsstubs.c:206
+#, c-format
+msgid "lo_lseek: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/auth.c:577
-msgid "pam_passwd_conv_proc: no password"
+#: libpq/be-fsstubs.c:261
+#, c-format
+msgid "lo_tell: invalid large object descriptor (%d)"
 msgstr ""
 
-#: libpq/auth.c:590
-msgid "pam_passwd_conv_proc: Out of memory!"
+#: libpq/be-fsstubs.c:363
+msgid ""
+"You must have Postgres superuser privilege to use server-side lo_import().\n"
+"\tAnyone can use the client-side lo_import() provided by libpq."
 msgstr ""
 
-#: libpq/auth.c:634
+#: libpq/be-fsstubs.c:378
 #, c-format
-msgid "CheckPAMAuth: Failed to create PAM authenticator: '%s'"
+msgid "lo_import: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: libpq/auth.c:644
+#: libpq/be-fsstubs.c:386
 #, c-format
-msgid "CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'"
+msgid "lo_import: can't create inv object for \"%s\""
 msgstr ""
 
-#: libpq/auth.c:654
+#: libpq/be-fsstubs.c:397
 #, c-format
-msgid "CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'"
+msgid "lo_import: error while reading \"%s\""
 msgstr ""
 
-#: libpq/auth.c:664
-#, c-format
-msgid "CheckPAMAuth: pam_authenticate failed: '%s'"
+#: libpq/be-fsstubs.c:426
+msgid ""
+"You must have Postgres superuser privilege to use server-side lo_export().\n"
+"\tAnyone can use the client-side lo_export() provided by libpq."
 msgstr ""
 
-#: libpq/auth.c:674
+#: libpq/be-fsstubs.c:436
 #, c-format
-msgid "CheckPAMAuth: pam_acct_mgmt failed: '%s'"
+msgid "lo_export: can't open inv object %u"
 msgstr ""
 
-#: libpq/auth.c:684
+#: libpq/be-fsstubs.c:454
 #, c-format
-msgid "CheckPAMAuth: Failed to release PAM authenticator: '%s'"
+msgid "lo_export: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: libpq/auth.c:724
+#: libpq/be-fsstubs.c:464
 #, c-format
-msgid "unexpected password packet size: read %d, expected %d"
-msgstr ""
-
-#: libpq/auth.c:728
-msgid "received password packet"
+msgid "lo_export: error while writing \"%s\""
 msgstr ""
 
-#: libpq/be-secure.c:293 libpq/be-secure.c:343
+#: libpq/be-secure.c:292 libpq/be-secure.c:342
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr ""
 
-#: libpq/be-secure.c:296 libpq/be-secure.c:346
+#: libpq/be-secure.c:295 libpq/be-secure.c:345
 #, c-format
 msgid "SSL error: %s"
 msgstr ""
 
-#: libpq/be-secure.c:398
+#: libpq/be-secure.c:397
 #, c-format
 msgid "DH errors (%s): %d bits expected, %d bits found"
 msgstr ""
 
-#: libpq/be-secure.c:408
+#: libpq/be-secure.c:407
 #, c-format
 msgid "DH_check error (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:413
+#: libpq/be-secure.c:412
 #, c-format
 msgid "DH error (%s): p is not prime"
 msgstr ""
 
-#: libpq/be-secure.c:420
+#: libpq/be-secure.c:419
 #, c-format
 msgid "DH error (%s): neither suitable generator or safe prime"
 msgstr ""
 
-#: libpq/be-secure.c:446
+#: libpq/be-secure.c:445
 #, c-format
 msgid "DH load buffer: %s"
 msgstr ""
 
-#: libpq/be-secure.c:518
+#: libpq/be-secure.c:517
 #, c-format
 msgid "DH: generating parameters (%d bits)...."
 msgstr ""
 
-#: libpq/be-secure.c:552
+#: libpq/be-secure.c:551
 msgid "SSL: handshake start"
 msgstr ""
 
-#: libpq/be-secure.c:555
+#: libpq/be-secure.c:554
 msgid "SSL: handshake done"
 msgstr ""
 
-#: libpq/be-secure.c:558
+#: libpq/be-secure.c:557
 msgid "SSL: accept loop"
 msgstr ""
 
-#: libpq/be-secure.c:561
+#: libpq/be-secure.c:560
 #, c-format
 msgid "SSL: accept exit (%d)"
 msgstr ""
 
-#: libpq/be-secure.c:564
+#: libpq/be-secure.c:563
 msgid "SSL: connect loop"
 msgstr ""
 
-#: libpq/be-secure.c:567
+#: libpq/be-secure.c:566
 #, c-format
 msgid "SSL: connect exit (%d)"
 msgstr ""
 
-#: libpq/be-secure.c:570
+#: libpq/be-secure.c:569
 #, c-format
 msgid "SSL: read alert (0x%04x)"
 msgstr ""
 
-#: libpq/be-secure.c:573
+#: libpq/be-secure.c:572
 #, c-format
 msgid "SSL: write alert (0x%04x)"
 msgstr ""
 
-#: libpq/be-secure.c:594
+#: libpq/be-secure.c:593
 #, c-format
 msgid "failed to create SSL context: %s"
 msgstr "�� ������� ������� �������� SSL: %s"
 
-#: libpq/be-secure.c:605
+#: libpq/be-secure.c:604
 #, c-format
 msgid "failed to load server certificate (%s): %s"
 msgstr "�� ������� ��������� ���������� ������� (%s): %s"
 
-#: libpq/be-secure.c:613
+#: libpq/be-secure.c:612
 #, c-format
 msgid "failed to stat private key file (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:620
+#: libpq/be-secure.c:619
 #, c-format
-msgid "bad permissions on private key file (%s)"
+msgid ""
+"bad permissions on private key file (%s)\n"
+"File must be owned by the proper user and must have no permissions for\n"
+"\"group\" or \"other\"."
 msgstr ""
 
-#: libpq/be-secure.c:625
+#: libpq/be-secure.c:626
 #, c-format
 msgid "failed to load private key file (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:631
+#: libpq/be-secure.c:632
 #, c-format
 msgid "check of private key failed: %s"
 msgstr ""
 
-#: libpq/be-secure.c:648
+#: libpq/be-secure.c:649
 #, c-format
 msgid "could not read root cert file (%s): %s"
 msgstr "�� ���������� ���� ��������� ����������� (%s): %s"
 
-#: libpq/be-secure.c:682
+#: libpq/be-secure.c:683
 #, c-format
 msgid "failed to initialize SSL connection: %s"
 msgstr "�� ������� ���������������� SSL-�������������: %s"
 
-#: libpq/be-secure.c:704
+#: libpq/be-secure.c:705
 #, c-format
 msgid "secure connection from '%s'"
 msgstr ""
 
-#: libpq/crypt.c:60
-msgid ""
-"Password is stored MD5 encrypted.  'password' and 'crypt' auth methods "
-"cannot be used."
+#: libpq/crypt.c:61
+msgid "Password is stored MD5 encrypted.  'crypt' auth method cannot be used."
 msgstr ""
-"������ ���������� � ������ ��� MD5. ������ �������������� 'password' � "
-"'crypt' �� ����� ��������������."
+"������ ���������� � ������ ��� MD5. ������ �������������� "
+"'crypt' �� ����� ��������������."
 
-#: libpq/hba.c:123
+#: libpq/hba.c:127
 #, c-format
 msgid "Token too long in authentication file, skipping, %s"
 msgstr ""
 
-#: libpq/hba.c:256
+#: libpq/hba.c:260
 #, c-format
 msgid ""
 "tokenize_inc_file: Unable to open secondary authentication file \"@%s\" as "
 "\"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:659
+#: libpq/hba.c:663
 #, c-format
 msgid "parse_hba: invalid syntax in pg_hba.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: libpq/hba.c:712 libpq/hba.c:734
+#: libpq/hba.c:716 libpq/hba.c:738
 #, c-format
 msgid "could not open %s: %m"
-msgstr ""
+msgstr "�� ���������� �������� %s: %m"
 
-#: libpq/hba.c:845
+#: libpq/hba.c:849
 #, c-format
 msgid "load_hba: Unable to open authentication config file \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:908
+#: libpq/hba.c:909
 #, c-format
 msgid ""
 "parse_ident_usermap: invalid syntax in pg_ident.conf file at line %d, token "
 "\"%s\""
 msgstr ""
 
-#: libpq/hba.c:940
+#: libpq/hba.c:941
 msgid ""
 "check_ident_usermap: hba configuration file does not have the usermap field "
 "filled in in the entry that pertains to this connection.  That field is "
 "essential for Ident-based authentication."
 msgstr ""
 
-#: libpq/hba.c:990
+#: libpq/hba.c:991
 #, c-format
 msgid "load_ident: Unable to open usermap file \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:1112
+#: libpq/hba.c:1113
 #, c-format
 msgid "Failed to create socket on which to talk to Ident server: %m"
 msgstr ""
 
-#: libpq/hba.c:1148
+#: libpq/hba.c:1149
 #, c-format
 msgid ""
 "Unable to connect to Ident server on the host which is trying to connect to "
 "Postgres (IP address %s, Port %d): %s"
 msgstr ""
 
-#: libpq/hba.c:1171
+#: libpq/hba.c:1172
 #, c-format
 msgid ""
 "Unable to send query to Ident server on the host which is trying to connect "
@@ -6086,7 +6249,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: libpq/hba.c:1188
+#: libpq/hba.c:1189
 #, c-format
 msgid ""
 "Unable to receive response from Ident server on the host which is trying to "
@@ -6094,17 +6257,17 @@ msgid ""
 "query to it: %s"
 msgstr ""
 
-#: libpq/hba.c:1230 libpq/hba.c:1295
+#: libpq/hba.c:1230 libpq/hba.c:1258 libpq/hba.c:1323
 #, c-format
 msgid "ident_unix: error receiving credentials: %m"
 msgstr ""
 
-#: libpq/hba.c:1238 libpq/hba.c:1304
+#: libpq/hba.c:1238 libpq/hba.c:1266 libpq/hba.c:1332
 #, c-format
 msgid "ident_unix: unknown local user with uid %d"
 msgstr ""
 
-#: libpq/hba.c:1314
+#: libpq/hba.c:1342
 msgid "'ident' auth is not supported on local connections on this platform"
 msgstr ""
 
@@ -6198,6 +6361,16 @@ msgstr ""
 msgid "pq_eof: recv() failed: %m"
 msgstr ""
 
+#: libpq/pqformat.c:159
+#, c-format
+msgid "pq_sendint: unsupported size %d"
+msgstr ""
+
+#: libpq/pqformat.c:241
+#, c-format
+msgid "pq_getint: unsupported size %d"
+msgstr ""
+
 #: main/main.c:83
 #, c-format
 msgid "%s: setsysinfo failed: %s\n"
@@ -6223,32 +6396,32 @@ msgstr ""
 msgid "%s: invalid current euid %d\n"
 msgstr ""
 
-#: nodes/copyfuncs.c:1564
+#: nodes/copyfuncs.c:1218
 #, c-format
 msgid "_copyAConst: unknown node type %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:2720
+#: nodes/copyfuncs.c:2304
 #, c-format
 msgid "_copyValue: unknown node type %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:3232
+#: nodes/copyfuncs.c:2796
 #, c-format
 msgid "copyObject: don't know how to copy node type %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:204
+#: nodes/equalfuncs.c:178
 #, c-format
 msgid "_equalParam: Invalid paramkind value: %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:1986
+#: nodes/equalfuncs.c:1490
 #, c-format
 msgid "_equalValue: unknown node type %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:2437
+#: nodes/equalfuncs.c:1931
 #, c-format
 msgid "equal: don't know whether nodes of type %d are equal"
 msgstr ""
@@ -6265,20 +6438,20 @@ msgstr "llast: 
 msgid "llasti: empty list"
 msgstr "llasti: ������ ������"
 
-#: nodes/outfuncs.c:1023 nodes/readfuncs.c:1691
+#: nodes/outfuncs.c:1191 nodes/readfuncs.c:821
 #, c-format
 msgid "bogus rte kind %d"
 msgstr ""
 
-#: nodes/outfuncs.c:1321
+#: nodes/outfuncs.c:1257
 #, c-format
-msgid "_outValue: don't know how to print type %d "
-msgstr ""
+msgid "_outValue: don't know how to print type %d"
+msgstr "_outValue: �� �������� ��� �������� ��� %d"
 
-#: nodes/outfuncs.c:1779
+#: nodes/outfuncs.c:1644
 #, c-format
-msgid "_outNode: don't know how to print type %d "
-msgstr "_outNode: �� �������� ��� �������� ��� %d "
+msgid "_outNode: don't know how to print type %d"
+msgstr "_outNode: �� �������� ��� �������� ��� %d"
 
 #: nodes/print.c:85
 #, c-format
@@ -6295,38 +6468,38 @@ msgid "Cache lookup for type %u failed"
 msgstr "����� � ���� ���� %u �� ������"
 
 #: nodes/read.c:296
-msgid "nodeRead: did not find '}' at end of plan node"
-msgstr "nodeRead: ������ '}' �� ���� ���������� � ����� ���� �����"
+msgid "nodeRead: did not find '}' at end of node"
+msgstr "nodeRead: ������ '}' �� ���� ���������� � ����� ����"
 
 #: nodes/read.c:376
 #, c-format
 msgid "nodeRead: Bad type %d"
 msgstr ""
 
-#: nodes/readfuncs.c:70
+#: nodes/readfuncs.c:149
 msgid "toIntList: unexpected datatype"
 msgstr ""
 
-#: nodes/readfuncs.c:104
+#: nodes/readfuncs.c:183
 msgid "toOidList: unexpected datatype"
 msgstr ""
 
-#: nodes/readfuncs.c:820
+#: nodes/readfuncs.c:518
 #, c-format
-msgid "_readExpr: unknown opType \"%.*s\""
+msgid "_readBoolExpr: unknown boolop \"%.*s\""
 msgstr ""
 
-#: nodes/readfuncs.c:2273
+#: nodes/readfuncs.c:926
 #, c-format
-msgid "badly formatted planstring \"%.10s\"..."
+msgid "badly formatted node string \"%.32s\"..."
 msgstr ""
 
-#: nodes/readfuncs.c:2306 nodes/readfuncs.c:2338
+#: nodes/readfuncs.c:959 nodes/readfuncs.c:991
 #, c-format
 msgid "readDatum: expected '%s', got '%s'; length = %lu"
 msgstr ""
 
-#: nodes/readfuncs.c:2313
+#: nodes/readfuncs.c:966
 #, c-format
 msgid "readDatum: byval & length = %lu"
 msgstr ""
@@ -6355,10 +6528,6 @@ msgstr ""
 msgid "edge_failure: no edge detected"
 msgstr ""
 
-#: optimizer/geqo/geqo_eval.c:139
-msgid "gimme_tree: failed to construct join rel"
-msgstr ""
-
 #: optimizer/geqo/geqo_main.c:123
 msgid "geqo_main: using edge recombination crossover [ERX]"
 msgstr ""
@@ -6401,7 +6570,7 @@ msgstr ""
 msgid "[GEQO] No mutations processed."
 msgstr ""
 
-#: optimizer/geqo/geqo_misc.c:43
+#: optimizer/geqo/geqo_misc.c:41
 msgid "avg_pool: pool_size of zero"
 msgstr ""
 
@@ -6409,74 +6578,74 @@ msgstr ""
 msgid "SELECT FOR UPDATE is not supported for inherit queries"
 msgstr ""
 
-#: optimizer/path/allpaths.c:617
+#: optimizer/path/allpaths.c:616
 #, c-format
 msgid "recurse_pushdown_safe: unexpected node %d"
 msgstr "recurse_pushdown_safe: ����������� ���� %d"
 
-#: optimizer/path/allpaths.c:685
+#: optimizer/path/allpaths.c:684
 #, c-format
 msgid "recurse_push_qual: unexpected node %d"
 msgstr "recurse_push_qual: ����������� ���� %d"
 
-#: optimizer/path/clausesel.c:522
+#: optimizer/path/clausesel.c:533
 #, c-format
 msgid "clause_selectivity: s1 %f"
 msgstr "clause_selectivity: s1 %f"
 
-#: optimizer/path/costsize.c:1312
+#: optimizer/path/costsize.c:1461
 #, c-format
 msgid "set_joinrel_size_estimates: unsupported join type %d"
 msgstr ""
 
-#: optimizer/path/indxpath.c:509
+#: optimizer/path/indxpath.c:495
 msgid "extract_or_indexqual_conditions: no matching clause"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1229
+#: optimizer/path/indxpath.c:1260
 msgid "pred_test_simple_clause: unknown test_op"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1258
+#: optimizer/path/indxpath.c:1301
 msgid "pred_test_simple_clause: null test result"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1903
+#: optimizer/path/indxpath.c:2084
 #, c-format
 msgid "prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1919
+#: optimizer/path/indxpath.c:2100
 #, c-format
 msgid "prefix_quals: no = operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1934
+#: optimizer/path/indxpath.c:2115
 #, c-format
 msgid "prefix_quals: no >= operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1950
+#: optimizer/path/indxpath.c:2131
 #, c-format
 msgid "prefix_quals: no < operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1997
+#: optimizer/path/indxpath.c:2177
 #, c-format
 msgid "network_prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2010
+#: optimizer/path/indxpath.c:2190
 #, c-format
 msgid "network_prefix_quals: no %s operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2025
+#: optimizer/path/indxpath.c:2205
 #, c-format
 msgid "network_prefix_quals: no <= operator for type %u"
 msgstr ""
 
-#: optimizer/path/joinpath.c:172
+#: optimizer/path/joinpath.c:170
 #, c-format
 msgid "sort_inner_and_outer: unexpected join type %d"
 msgstr ""
@@ -6486,56 +6655,56 @@ msgstr ""
 msgid "match_unsorted_outer: unexpected join type %d"
 msgstr ""
 
-#: optimizer/path/joinpath.c:602
+#: optimizer/path/joinpath.c:626
 #, c-format
 msgid "match_unsorted_inner: unexpected join type %d"
 msgstr ""
 
-#: optimizer/path/joinrels.c:226
+#: optimizer/path/joinrels.c:230
 #, c-format
 msgid "make_rels_by_joins: failed to build any %d-way joins"
 msgstr ""
 
-#: optimizer/path/joinrels.c:381
+#: optimizer/path/joinrels.c:385
 #, c-format
 msgid "make_jointree_rel: unexpected node type %d"
 msgstr ""
 
-#: optimizer/path/joinrels.c:438
+#: optimizer/path/joinrels.c:442
 #, c-format
 msgid "make_join_rel: unsupported join type %d"
 msgstr ""
 
-#: optimizer/path/pathkeys.c:876
+#: optimizer/path/pathkeys.c:878
 msgid ""
 "make_pathkeys_for_mergeclauses: can't identify which side of mergeclause to "
 "use"
 msgstr ""
 
-#: optimizer/plan/createplan.c:139
+#: optimizer/plan/createplan.c:150
 #, c-format
 msgid "create_plan: unknown pathtype %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:214
+#: optimizer/plan/createplan.c:228
 #, c-format
 msgid "create_scan_plan: unknown node type: %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:296
+#: optimizer/plan/createplan.c:310
 #, c-format
 msgid "create_join_plan: unknown node type: %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1033
+#: optimizer/plan/createplan.c:1050
 msgid "fix_indxqual_sublist: indexqual clause is not binary opclause"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1122
+#: optimizer/plan/createplan.c:1139
 msgid "fix_indxqual_operand: var is not index attribute"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1560
+#: optimizer/plan/createplan.c:1601
 msgid "make_sort_from_pathkeys: cannot find tlist item to sort"
 msgstr ""
 
@@ -6548,7 +6717,7 @@ msgstr ""
 msgid "add_base_rels_to_query: unexpected node type %d"
 msgstr "add_base_rels_to_query: ����������� ��� ���� %d"
 
-#: optimizer/plan/initsplan.c:307 optimizer/plan/planner.c:457
+#: optimizer/plan/initsplan.c:307 optimizer/plan/planner.c:501
 msgid "UNION JOIN is not implemented yet"
 msgstr ""
 
@@ -6571,100 +6740,91 @@ msgstr ""
 msgid "JOIN qualification may not refer to other relations"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:611
+#: optimizer/plan/initsplan.c:608
 msgid "distribute_qual_to_rels: can't cope with variable-free clause"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:753
+#: optimizer/plan/initsplan.c:750
 #, c-format
 msgid "Unable to identify an equality operator for types '%s' and '%s'"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:764
+#: optimizer/plan/initsplan.c:761
 #, c-format
 msgid ""
 "Equality operator for types '%s' and '%s' should be mergejoinable, but isn't"
 msgstr ""
 
-#: optimizer/plan/planmain.c:224
-msgid "subplanner: failed to construct a relation"
+#: optimizer/plan/planmain.c:158
+msgid "query_planner: failed to construct a relation"
 msgstr ""
 
-#: optimizer/plan/planner.c:460
+#: optimizer/plan/planner.c:504
 #, c-format
 msgid "pull_up_subqueries: unexpected join type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:466
+#: optimizer/plan/planner.c:510
 #, c-format
 msgid "pull_up_subqueries: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:487
+#: optimizer/plan/planner.c:531
 msgid "is_simple_subquery: subquery is bogus"
 msgstr ""
 
-#: optimizer/plan/planner.c:602
+#: optimizer/plan/planner.c:660
 #, c-format
 msgid "resolvenew_in_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:681
+#: optimizer/plan/planner.c:739
 #, c-format
 msgid "preprocess_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:793
+#: optimizer/plan/planner.c:832
 #, c-format
 msgid "preprocess_qual_conditions: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:908 parser/analyze.c:1780 parser/analyze.c:1963
-#: parser/analyze.c:2460
+#: optimizer/plan/planner.c:945 parser/analyze.c:1780 parser/analyze.c:1953
+#: parser/analyze.c:2448
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: optimizer/plan/planner.c:961
+#: optimizer/plan/planner.c:1007
 msgid "SELECT FOR UPDATE is not allowed in subselects"
 msgstr ""
 
-#: optimizer/plan/planner.c:1563 optimizer/plan/planner.c:1569
+#: optimizer/plan/planner.c:1849 optimizer/plan/planner.c:1855
 msgid "postprocess_setop_tlist: resjunk output columns not implemented"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:215
+#: optimizer/plan/setrefs.c:210
 #, c-format
 msgid "set_plan_references: unknown plan type %d"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:458
+#: optimizer/plan/setrefs.c:472
 msgid "join_references: variable not in subplan target lists"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:519
+#: optimizer/plan/setrefs.c:532
 msgid "replace_vars_with_subplan_refs: variable not in subplan target list"
 msgstr ""
 
-#: optimizer/plan/subselect.c:141
-msgid "make_subplan: invalid expression structure (SubLink already processed?)"
-msgstr ""
-
-#: optimizer/plan/subselect.c:143
-msgid ""
-"make_subplan: invalid expression structure (subquery already processed?)"
-msgstr ""
-
-#: optimizer/plan/subselect.c:281 optimizer/plan/subselect.c:430
+#: optimizer/plan/subselect.c:445
 #, c-format
 msgid "cache lookup failed for operator %u"
 msgstr ""
 
-#: optimizer/plan/subselect.c:705
+#: optimizer/plan/subselect.c:660
 #, c-format
 msgid "SS_finalize_plan: node %d unsupported"
 msgstr ""
 
-#: optimizer/plan/subselect.c:728
+#: optimizer/plan/subselect.c:683
 msgid "SS_finalize_plan: plan shouldn't reference subplan's variable"
 msgstr ""
 
@@ -6672,11 +6832,11 @@ msgstr ""
 msgid "preprocess_targetlist: subquery cannot be result relation"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:212
+#: optimizer/prep/preptlist.c:208
 msgid "expand_targetlist: unexpected command_type"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:242
+#: optimizer/prep/preptlist.c:238
 msgid "expand_targetlist: targetlist is not sorted correctly"
 msgstr ""
 
@@ -6689,51 +6849,56 @@ msgstr ""
 msgid "generate_nonunion_plan: bogus operation code"
 msgstr ""
 
-#: optimizer/util/clauses.c:81
-#, c-format
-msgid "make_clause: unsupported type %d"
-msgstr ""
-
-#: optimizer/util/clauses.c:445
-msgid "Aggregate function calls may not be nested"
-msgstr ""
-
-#: optimizer/util/clauses.c:718
+#: optimizer/util/clauses.c:700
 #, c-format
 msgid "Sub-SELECT uses un-GROUPed attribute %s.%s from outer query"
 msgstr ""
 
-#: optimizer/util/clauses.c:1062
+#: optimizer/util/clauses.c:1123
 msgid "CommuteClause: applied to non-binary-operator clause"
 msgstr ""
 
-#: optimizer/util/clauses.c:1070
+#: optimizer/util/clauses.c:1128
 #, c-format
 msgid "CommuteClause: no commutator for operator %u"
 msgstr ""
 
-#: optimizer/util/clauses.c:1395
+#: optimizer/util/clauses.c:1481
 #, c-format
-msgid "eval_const_expressions: unexpected opType %d"
+msgid "eval_const_expressions: unexpected boolop %d"
 msgstr ""
 
-#: optimizer/util/clauses.c:1631 utils/cache/lsyscache.c:581
-#: utils/cache/lsyscache.c:602 utils/cache/lsyscache.c:623
+#: optimizer/util/clauses.c:1654 utils/cache/lsyscache.c:598
+#: utils/cache/lsyscache.c:619 utils/cache/lsyscache.c:640
+#: utils/cache/lsyscache.c:661
 #, c-format
 msgid "Function OID %u does not exist"
 msgstr ""
 
-#: optimizer/util/clauses.c:1981
+#: optimizer/util/clauses.c:1871
+#, c-format
+msgid "inline_function: null prosrc for procedure %u"
+msgstr ""
+
+#: optimizer/util/clauses.c:2031
+msgid "substitute_actual_parameters_mutator: unexpected paramkind"
+msgstr ""
+
+#: optimizer/util/clauses.c:2033
+msgid "substitute_actual_parameters_mutator: unexpected paramid"
+msgstr ""
+
+#: optimizer/util/clauses.c:2339
 #, c-format
 msgid "expression_tree_walker: Unexpected node type %d"
 msgstr ""
 
-#: optimizer/util/clauses.c:2371
+#: optimizer/util/clauses.c:2740
 #, c-format
 msgid "expression_tree_mutator: Unexpected node type %d"
 msgstr ""
 
-#: optimizer/util/pathnode.c:125
+#: optimizer/util/pathnode.c:126
 msgid "Unable to devise a query plan for the given query"
 msgstr ""
 
@@ -6742,39 +6907,39 @@ msgstr ""
 msgid "get_relation_info: Relation %u not found"
 msgstr ""
 
-#: optimizer/util/plancat.c:221
+#: optimizer/util/plancat.c:225
 #, c-format
 msgid "restriction_selectivity: bad value %f"
 msgstr ""
 
-#: optimizer/util/plancat.c:254
+#: optimizer/util/plancat.c:258
 #, c-format
 msgid "join_selectivity: bad value %f"
 msgstr ""
 
-#: optimizer/util/plancat.c:326
+#: optimizer/util/plancat.c:330
 #, c-format
 msgid "has_subclass: Relation %u not found"
 msgstr ""
 
-#: optimizer/util/relnode.c:59
+#: optimizer/util/relnode.c:60
 msgid "build_base_rel: rel already exists"
 msgstr "build_base_rel: rel ��� ����������"
 
-#: optimizer/util/relnode.c:68
+#: optimizer/util/relnode.c:69
 msgid "build_base_rel: rel already exists as 'other' rel"
 msgstr ""
 
-#: optimizer/util/relnode.c:106
+#: optimizer/util/relnode.c:107
 msgid "build_other_rel: rel already exists as base rel"
 msgstr ""
 
-#: optimizer/util/relnode.c:179
+#: optimizer/util/relnode.c:181
 #, c-format
 msgid "make_base_rel: unsupported RTE kind %d"
 msgstr ""
 
-#: optimizer/util/relnode.c:215
+#: optimizer/util/relnode.c:217
 #, c-format
 msgid "find_base_rel: no relation entry for relid %d"
 msgstr ""
@@ -6784,349 +6949,269 @@ msgid ""
 "get_sortgroupclause_tle: ORDER/GROUP BY expression not found in targetlist"
 msgstr ""
 
-#: parser/analyze.c:257
+#: parser/analyze.c:256
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW ��������� ������ �ͣ� ������� ��� �������"
 
-#: parser/analyze.c:448
+#: parser/analyze.c:447
 msgid "INSERT ... SELECT may not specify INTO"
 msgstr "INSERT ... SELECT �� ����� ��������� INTO"
 
-#: parser/analyze.c:531
+#: parser/analyze.c:535
 msgid "INSERT has more expressions than target columns"
 msgstr ""
 
-#: parser/analyze.c:563
+#: parser/analyze.c:569
 msgid "INSERT has more target columns than expressions"
 msgstr ""
 
-#: parser/analyze.c:759
+#: parser/analyze.c:765
 msgid "parser: unrecognized node (internal error)"
 msgstr ""
 
-#: parser/analyze.c:841
+#: parser/analyze.c:847
 #, c-format
 msgid "%s will create implicit sequence '%s' for SERIAL column '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:922 parser/analyze.c:930
+#: parser/analyze.c:928 parser/analyze.c:936
 #, c-format
 msgid "%s/(NOT) NULL conflicting declaration for '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:938
+#: parser/analyze.c:944
 #, c-format
 msgid "%s/DEFAULT multiple values specified for '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:980 parser/analyze.c:1019
+#: parser/analyze.c:986 parser/analyze.c:1025
 msgid "parser: unrecognized constraint (internal error)"
 msgstr ""
 
-#: parser/analyze.c:1015
+#: parser/analyze.c:1021
 msgid "parser: illegal context for constraint (internal error)"
 msgstr ""
 
-#: parser/analyze.c:1059
+#: parser/analyze.c:1065
 #, c-format
 msgid "%s / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
 msgstr ""
 
-#: parser/analyze.c:1127
+#: parser/analyze.c:1133
 #, c-format
 msgid "inherited table \"%s\" is not a relation"
 msgstr ""
 
-#: parser/analyze.c:1156
+#: parser/analyze.c:1162
 #, c-format
 msgid ""
 "inherited attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
 "NOT NULL"
 msgstr ""
 
-#: parser/analyze.c:1182
+#: parser/analyze.c:1188
 #, c-format
 msgid ""
 "Existing attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
 "NOT NULL"
 msgstr ""
 
-#: parser/analyze.c:1189
+#: parser/analyze.c:1195
 #, c-format
 msgid "%s: column \"%s\" named in key does not exist"
 msgstr ""
 
-#: parser/analyze.c:1197
+#: parser/analyze.c:1203
 #, c-format
 msgid "%s: column \"%s\" appears twice in %s constraint"
 msgstr ""
 
-#: parser/analyze.c:1287
+#: parser/analyze.c:1293
 #, c-format
 msgid "%s: failed to make implicit index name"
 msgstr "%s: �� ������� ������� ��� ��� �������� �������"
 
-#: parser/analyze.c:1290
+#: parser/analyze.c:1296
 #, c-format
 msgid "%s / %s%s will create implicit index '%s' for table '%s'"
 msgstr "%s / %s%s ������� ������� ������ '%s' ��� ������� '%s'"
 
-#: parser/analyze.c:1304
+#: parser/analyze.c:1310
 #, c-format
 msgid "%s will create implicit trigger(s) for FOREIGN KEY check(s)"
 msgstr "%s ������� �������(�) �������(�) ��� �������� �� FOREIGN KEY"
 
-#: parser/analyze.c:1446 parser/analyze.c:1564
+#: parser/analyze.c:1452 parser/analyze.c:1574
 #, c-format
 msgid "transformRuleStmt: unexpected event type %d"
 msgstr ""
 
-#: parser/analyze.c:1455
+#: parser/analyze.c:1461
 msgid "Rule WHERE condition may not contain references to other relations"
 msgstr ""
 
-#: parser/analyze.c:1524
+#: parser/analyze.c:1465
+msgid "Rule WHERE condition may not contain aggregate functions"
+msgstr ""
+
+#: parser/analyze.c:1534
 msgid ""
 "Rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE "
 "actions"
 msgstr ""
 
-#: parser/analyze.c:1548
+#: parser/analyze.c:1558
 msgid "ON SELECT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1550
+#: parser/analyze.c:1560
 msgid "ON SELECT rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1557
+#: parser/analyze.c:1567
 msgid "ON INSERT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1561
+#: parser/analyze.c:1571
 msgid "ON DELETE rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1626 parser/analyze.c:1844
+#: parser/analyze.c:1636 parser/analyze.c:1844
 msgid "DECLARE CURSOR must not specify INTO"
 msgstr ""
 
-#: parser/analyze.c:1628 parser/analyze.c:1846
+#: parser/analyze.c:1638 parser/analyze.c:1846
 msgid ""
 "DECLARE/UPDATE is not supported\n"
 "\tCursors must be READ ONLY"
 msgstr ""
 
-#: parser/analyze.c:1638 parser/analyze.c:1856
-msgid "DECLARE CURSOR may only be used in begin/end transaction blocks"
-msgstr ""
-
-#: parser/analyze.c:1924
+#: parser/analyze.c:1914
 msgid ""
 "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result "
 "columns"
 msgstr ""
 
-#: parser/analyze.c:1958
+#: parser/analyze.c:1948
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:1960
+#: parser/analyze.c:1950
 msgid "Portal may not appear in UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2054
+#: parser/analyze.c:2044
 #, c-format
 msgid "Each %s query must have the same number of columns"
 msgstr ""
 
-#: parser/analyze.c:2112
+#: parser/analyze.c:2102
 #, c-format
 msgid "getSetColTypes: unexpected node %d"
 msgstr "getSetColTypes: �� ��������� ���� %d"
 
-#: parser/analyze.c:2123
+#: parser/analyze.c:2113
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr "CREATE TABLE AS ��������� ������� ����� �ͣ� ��� �������"
 
-#: parser/analyze.c:2206 parser/analyze.c:2215
+#: parser/analyze.c:2196 parser/analyze.c:2205
 msgid "UPDATE target count mismatch --- internal error"
 msgstr "UPDATE target: �� ���������� �ޣ���� --- ���������� ������"
 
-#: parser/analyze.c:2301
+#: parser/analyze.c:2291
 msgid "Unexpected node type in ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: parser/analyze.c:2384
+#: parser/analyze.c:2374
 msgid "transformPrepareStmt: internal error"
 msgstr ""
 
-#: parser/analyze.c:2411
+#: parser/analyze.c:2401
 #, c-format
 msgid "Wrong number of parameters, expected %d but got %d"
 msgstr ""
 
-#: parser/analyze.c:2424
+#: parser/analyze.c:2414
 msgid "Cannot use subselects in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2426
+#: parser/analyze.c:2416
 msgid "Cannot use aggregates in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2437
+#: parser/analyze.c:2427
 #, c-format
 msgid ""
 "Parameter $%d of type %s cannot be coerced into the expected type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: parser/analyze.c:2462
+#: parser/analyze.c:2450
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr ""
 
-#: parser/analyze.c:2464
+#: parser/analyze.c:2452
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr ""
 
-#: parser/analyze.c:2466
+#: parser/analyze.c:2454
 msgid "SELECT FOR UPDATE is not allowed with AGGREGATE"
 msgstr ""
 
-#: parser/analyze.c:2531
+#: parser/analyze.c:2519
 #, c-format
 msgid "FOR UPDATE: relation \"%s\" not found in FROM clause"
 msgstr ""
 
-#: parser/analyze.c:2571
+#: parser/analyze.c:2559
 #, c-format
 msgid "relationHasPrimaryKey: index %u not found"
 msgstr ""
 
-#: parser/analyze.c:2622
+#: parser/analyze.c:2610
 msgid "Misplaced DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2624 parser/analyze.c:2633
+#: parser/analyze.c:2612 parser/analyze.c:2621
 msgid "Multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:2631
+#: parser/analyze.c:2619
 msgid "Misplaced NOT DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2638 parser/analyze.c:2656
+#: parser/analyze.c:2626 parser/analyze.c:2644 gram.y:2150 gram.y:2164
 msgid "INITIALLY DEFERRED constraint must be DEFERRABLE"
 msgstr ""
 
-#: parser/analyze.c:2643
+#: parser/analyze.c:2631
 msgid "Misplaced INITIALLY DEFERRED clause"
 msgstr ""
 
-#: parser/analyze.c:2645 parser/analyze.c:2663
+#: parser/analyze.c:2633 parser/analyze.c:2651
 msgid "Multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:2661
+#: parser/analyze.c:2649
 msgid "Misplaced INITIALLY IMMEDIATE clause"
 msgstr ""
 
-#: parser/analyze.c:2770
+#: parser/analyze.c:2758
 #, c-format
 msgid ""
 "New table specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:2789
+#: parser/analyze.c:2777
 #, c-format
 msgid ""
 "New view specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:2806
+#: parser/analyze.c:2794
 msgid "parser: unsupported schema node (internal error)"
 msgstr ""
 
-#: parser/parse_expr.c:101
-#, c-format
-msgid "Expression too complex: nesting depth exceeds max_expr_depth = %d"
-msgstr ""
-
-#: parser/parse_expr.c:120
-#, c-format
-msgid "Parameter '$%d' is out of range"
-msgstr ""
-
-#: parser/parse_expr.c:358 parser/parse_expr.c:362
-msgid "Bad query in subselect"
-msgstr ""
-
-#: parser/parse_expr.c:384
-msgid "Subselect must have a field"
-msgstr ""
-
-#: parser/parse_expr.c:388
-msgid "Subselect must have only one field"
-msgstr ""
-
-#: parser/parse_expr.c:418
-#, c-format
-msgid "Row comparison cannot use operator %s"
-msgstr ""
-
-#: parser/parse_expr.c:441
-msgid "Subselect has too many fields"
-msgstr ""
-
-#: parser/parse_expr.c:457
-#, c-format
-msgid ""
-"%s has result type of %s, but must return %s to be used with quantified "
-"predicate subquery"
-msgstr ""
-
-#: parser/parse_expr.c:463
-#, c-format
-msgid "%s must not return a set to be used with quantified predicate subquery"
-msgstr ""
-
-#: parser/parse_expr.c:475
-msgid "Subselect has too few fields"
-msgstr ""
-
-#: parser/parse_expr.c:615
-#, c-format
-msgid "transformExpr: unexpected booltesttype %d"
-msgstr ""
-
-#: parser/parse_expr.c:652
-#, c-format
-msgid "transformExpr: does not know how to transform node %d (internal error)"
-msgstr ""
-
-#: parser/parse_expr.c:744
-#, c-format
-msgid "Attribute \"%s\" not found"
-msgstr "������� \"%s\" �� ������"
-
-#: parser/parse_expr.c:856 parser/parse_target.c:153
-msgid "Invalid qualified name syntax (too many names)"
-msgstr ""
-
-#: parser/parse_expr.c:913
-msgid "exprType: Cannot get type for untransformed sublink"
-msgstr ""
-
-#: parser/parse_expr.c:940
-#, c-format
-msgid "exprType: Do not know how to get type for %d node"
-msgstr "exprType: �� �������� ��� ������� ��� ��� ���� %d"
-
-#: parser/parse_expr.c:1110
-#, c-format
-msgid "Cannot cast type %s to %s"
-msgstr "������ �������������� ��� %s � %s"
-
 #: parser/parse_agg.c:112
 #, c-format
 msgid "Attribute %s.%s must be GROUPed or used in an aggregate function"
@@ -7144,117 +7229,113 @@ msgstr ""
 msgid "Aggregates not allowed in GROUP BY clause"
 msgstr ""
 
-#: parser/parse_clause.c:194
+#: parser/parse_clause.c:195
 msgid "Bogus InhOption value"
 msgstr ""
 
-#: parser/parse_clause.c:341
+#: parser/parse_clause.c:342
 #, c-format
 msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
 msgstr ""
 
-#: parser/parse_clause.c:400
+#: parser/parse_clause.c:401
 msgid "sub-select in FROM must have an alias"
 msgstr ""
 
-#: parser/parse_clause.c:424 parser/parse_clause.c:427
+#: parser/parse_clause.c:425 parser/parse_clause.c:428
 msgid "Unexpected parse analysis result for subselect in FROM"
 msgstr ""
 
-#: parser/parse_clause.c:430
+#: parser/parse_clause.c:431
 msgid "Expected SELECT query from subselect in FROM"
 msgstr ""
 
-#: parser/parse_clause.c:432
+#: parser/parse_clause.c:433
 msgid "Subselect in FROM may not have SELECT INTO"
 msgstr ""
 
-#: parser/parse_clause.c:493
+#: parser/parse_clause.c:494
 msgid ""
 "FROM function expression may not refer to other relations of same query level"
 msgstr ""
 
-#: parser/parse_clause.c:502
+#: parser/parse_clause.c:503
 msgid "cannot use aggregate function in FROM function expression"
 msgstr ""
 
-#: parser/parse_clause.c:514
-msgid "Coercion function not allowed in FROM clause"
-msgstr ""
-
-#: parser/parse_clause.c:624 parser/parse_clause.c:636
+#: parser/parse_clause.c:626 parser/parse_clause.c:638
 msgid "transformFromClauseItem: unexpected subtree type"
 msgstr ""
 
-#: parser/parse_clause.c:719
+#: parser/parse_clause.c:721
 #, c-format
 msgid "USING column name \"%s\" appears more than once"
 msgstr ""
 
-#: parser/parse_clause.c:731
+#: parser/parse_clause.c:733
 #, c-format
 msgid "Common column name \"%s\" appears more than once in left table"
 msgstr ""
 
-#: parser/parse_clause.c:737
+#: parser/parse_clause.c:739
 #, c-format
 msgid "JOIN/USING column \"%s\" not found in left table"
 msgstr ""
 
-#: parser/parse_clause.c:749
+#: parser/parse_clause.c:751
 #, c-format
 msgid "Common column name \"%s\" appears more than once in right table"
 msgstr ""
 
-#: parser/parse_clause.c:755
+#: parser/parse_clause.c:757
 #, c-format
 msgid "JOIN/USING column \"%s\" not found in right table"
 msgstr ""
 
-#: parser/parse_clause.c:804
+#: parser/parse_clause.c:806
 #, c-format
 msgid "Column alias list for \"%s\" has too many entries"
 msgstr ""
 
-#: parser/parse_clause.c:831
+#: parser/parse_clause.c:833
 #, c-format
 msgid ""
 "transformFromClauseItem: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: parser/parse_clause.c:942
+#: parser/parse_clause.c:944
 #, c-format
 msgid "buildMergedJoinVar: unexpected jointype %d"
 msgstr ""
 
-#: parser/parse_clause.c:1063
+#: parser/parse_clause.c:1065
 #, c-format
 msgid "%s '%s' is ambiguous"
 msgstr ""
 
-#: parser/parse_clause.c:1082
+#: parser/parse_clause.c:1084
 #, c-format
 msgid "Non-integer constant in %s"
 msgstr ""
 
-#: parser/parse_clause.c:1095
+#: parser/parse_clause.c:1097
 #, c-format
 msgid "%s position %d is not in target list"
 msgstr ""
 
-#: parser/parse_clause.c:1237
+#: parser/parse_clause.c:1238
 msgid "For SELECT DISTINCT, ORDER BY expressions must appear in target list"
 msgstr ""
 "��� SELECT DISTINCT, ��������� ORDER BY ������� ���� � ������ �����������"
 
-#: parser/parse_clause.c:1275
+#: parser/parse_clause.c:1276
 msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
 msgstr ""
 "��������� SELECT DISTINCT ON ������ ��������� � ������������ ������������ "
 "ORDER BY"
 
-#: parser/parse_clause.c:1299
+#: parser/parse_clause.c:1300
 msgid ""
 "transformDistinctClause: failed to add DISTINCT ON clause to target list"
 msgstr ""
@@ -7264,37 +7345,131 @@ msgstr ""
 msgid "coerce_type: no conversion function from %s to %s"
 msgstr "coerce_type: ������ ��������� �� %s � %s �� ����������"
 
-#: parser/parse_coerce.c:417
+#: parser/parse_coerce.c:423
 #, c-format
 msgid "coerce_type_constraints: failed to lookup type %u"
 msgstr "coerce_type_constraints: ��� %u �� ������"
 
+#: parser/parse_coerce.c:454
+#, c-format
+msgid "coerce_type_constraints: domain %s constraint %s has NULL conbin"
+msgstr ""
+
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:568
+#: parser/parse_coerce.c:607
 #, c-format
 msgid "Argument of %s must be type boolean, not type %s"
 msgstr "��� ��������� ����������� %s ������ ���� boolean, � �� %s"
 
 #. translator: %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:576
+#: parser/parse_coerce.c:615
+#, c-format
+msgid "Argument of %s must not be a set function"
+msgstr ""
+
+#: parser/parse_coerce.c:662
+#, c-format
+msgid "%s types '%s' and '%s' not matched"
+msgstr "%s ���� '%s' � '%s' �� ���������"
+
+#: parser/parse_coerce.c:714
+#, c-format
+msgid "%s unable to convert to type %s"
+msgstr "%s �� � ��������� ��������������� � ��� %s"
+
+#: parser/parse_coerce.c:996
+#, c-format
+msgid "find_coercion_pathway: bogus castcontext %c"
+msgstr ""
+
+#: parser/parse_expr.c:101
+#, c-format
+msgid "Expression too complex: nesting depth exceeds max_expr_depth = %d"
+msgstr ""
+
+#: parser/parse_expr.c:120
+#, c-format
+msgid "Parameter '$%d' is out of range"
+msgstr ""
+
+#: parser/parse_expr.c:273
+msgid "IS DISTINCT FROM requires = operator to yield boolean"
+msgstr ""
+
+#: parser/parse_expr.c:355 parser/parse_expr.c:359
+msgid "Bad query in subselect"
+msgstr ""
+
+#: parser/parse_expr.c:381
+msgid "Subselect must have a field"
+msgstr ""
+
+#: parser/parse_expr.c:385
+msgid "Subselect must have only one field"
+msgstr ""
+
+#: parser/parse_expr.c:415
+#, c-format
+msgid "Row comparison cannot use operator %s"
+msgstr ""
+
+#: parser/parse_expr.c:438
+msgid "Subselect has too many fields"
+msgstr ""
+
+#: parser/parse_expr.c:454
+#, c-format
+msgid ""
+"%s has result type of %s, but must return %s to be used with quantified "
+"predicate subquery"
+msgstr ""
+
+#: parser/parse_expr.c:460
+#, c-format
+msgid "%s must not return a set to be used with quantified predicate subquery"
+msgstr ""
+
+#: parser/parse_expr.c:476
+msgid "Subselect has too few fields"
+msgstr ""
+
+#: parser/parse_expr.c:620
+#, c-format
+msgid "transformExpr: unexpected booltesttype %d"
+msgstr ""
+
+#: parser/parse_expr.c:658
+#, c-format
+msgid "transformExpr: does not know how to transform node %d (internal error)"
+msgstr ""
+
+#: parser/parse_expr.c:763
 #, c-format
-msgid "Argument of %s must not be a set function"
+msgid "Attribute \"%s\" not found"
+msgstr "������� \"%s\" �� ������"
+
+#: parser/parse_expr.c:875 parser/parse_target.c:153
+msgid "Invalid qualified name syntax (too many names)"
+msgstr ""
+
+#: parser/parse_expr.c:935
+msgid "exprType: Cannot get type for untransformed sublink"
 msgstr ""
 
-#: parser/parse_coerce.c:623
+#: parser/parse_expr.c:977
 #, c-format
-msgid "%s types '%s' and '%s' not matched"
-msgstr "%s ���� '%s' � '%s' �� ���������"
+msgid "Relation reference \"%s\" cannot be used in an expression"
+msgstr ""
 
-#: parser/parse_coerce.c:675
+#: parser/parse_expr.c:982
 #, c-format
-msgid "%s unable to convert to type %s"
-msgstr "%s �� � ��������� ��������������� � ��� %s"
+msgid "exprType: Do not know how to get type for %d node"
+msgstr "exprType: �� �������� ��� ������� ��� ��� ���� %d"
 
-#: parser/parse_coerce.c:957
+#: parser/parse_expr.c:1151
 #, c-format
-msgid "find_coercion_pathway: bogus castcontext %c"
-msgstr ""
+msgid "Cannot cast type %s to %s"
+msgstr "������ �������������� ��� %s � %s"
 
 #: parser/parse_func.c:97
 #, c-format
@@ -7311,102 +7486,102 @@ msgstr ""
 msgid "Cannot find type OID for relation %u"
 msgstr ""
 
-#: parser/parse_func.c:208
+#: parser/parse_func.c:232
 #, c-format
 msgid "Cannot pass result of sub-select or join %s to a function"
 msgstr ""
 
-#: parser/parse_func.c:253
+#: parser/parse_func.c:270
 #, c-format
 msgid "%s(*) specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:256
+#: parser/parse_func.c:273
 #, c-format
 msgid "DISTINCT specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:279
+#: parser/parse_func.c:296
 #, c-format
 msgid "Attribute notation .%s applied to type %s, which is not a complex type"
 msgstr ""
 
-#: parser/parse_func.c:282
+#: parser/parse_func.c:299
 #, c-format
 msgid "Attribute \"%s\" not found in datatype %s"
 msgstr ""
 
-#: parser/parse_func.c:331
+#: parser/parse_func.c:342
 msgid "Aggregates may not return sets"
 msgstr ""
 
-#: parser/parse_func.c:1240
+#: parser/parse_func.c:1257
 #, c-format
 msgid "No such attribute %s.%s.%s"
 msgstr "%s.%s.%s: ��� ������ ��������"
 
-#: parser/parse_func.c:1243
+#: parser/parse_func.c:1260
 #, c-format
 msgid "No such attribute %s.%s"
 msgstr "%s.%s: ��� ������ ��������"
 
-#: parser/parse_func.c:1270
+#: parser/parse_func.c:1287
 #, c-format
 msgid "Function %s(%s) does not exist%s%s"
 msgstr "������� %s(%s) �� ���������� %s%s"
 
-#: parser/parse_func.c:1276
+#: parser/parse_func.c:1293
 #, c-format
 msgid "%s: function %s(%s) does not exist%s%s"
 msgstr "%s: ������� %s(%s) �� ���������� %s%s"
 
-#: parser/parse_func.c:1302
+#: parser/parse_func.c:1319
 #, c-format
 msgid "%s: aggregate %s(*) does not exist"
 msgstr "%s: ������� %s(*) �� ����������"
 
-#: parser/parse_func.c:1305
+#: parser/parse_func.c:1322
 #, c-format
 msgid "%s: aggregate %s(%s) does not exist"
 msgstr "%s: ������� %s(%s) �� ����������"
 
-#: parser/parse_func.c:1321
+#: parser/parse_func.c:1338
 #, c-format
 msgid "%s: function %s(*) is not an aggregate"
 msgstr ""
 
-#: parser/parse_func.c:1324
+#: parser/parse_func.c:1341
 #, c-format
 msgid "%s: function %s(%s) is not an aggregate"
 msgstr ""
 
-#: parser/parse_node.c:217
+#: parser/parse_node.c:211
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array type %u"
 msgstr ""
 
-#: parser/parse_node.c:223
+#: parser/parse_node.c:217
 #, c-format
 msgid "transformArraySubscripts: type %s is not an array"
 msgstr ""
 
-#: parser/parse_node.c:231
+#: parser/parse_node.c:225
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array element type %u"
 msgstr ""
 
-#: parser/parse_node.c:288 parser/parse_node.c:310
+#: parser/parse_node.c:282 parser/parse_node.c:302
 msgid "array index expressions must be integers"
 msgstr ""
 
-#: parser/parse_node.c:329
+#: parser/parse_node.c:321
 #, c-format
 msgid ""
 "Array assignment requires type %s but expression is of type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: parser/parse_node.c:439
+#: parser/parse_node.c:431
 #, c-format
 msgid "make_const: unknown type %d"
 msgstr ""
@@ -7426,56 +7601,61 @@ msgstr "%s: Postfix-
 msgid "%s: Operator '%s' for types '%s' and '%s' does not exist"
 msgstr "%s: �������� '%s' ��� ����� '%s' � '%s' �� ����������"
 
-#: parser/parse_oper.c:143
+#: parser/parse_oper.c:166
+#, c-format
+msgid "Unable to identify an equality operator for type %s"
+msgstr ""
+
+#: parser/parse_oper.c:204
 #, c-format
 msgid ""
-"Unable to identify an ordering operator '%s' for type '%s'\n"
+"Unable to identify an ordering operator for type %s\n"
 "\tUse an explicit ordering operator or modify the query"
 msgstr ""
 
-#: parser/parse_oper.c:894
+#: parser/parse_oper.c:966
 #, c-format
 msgid ""
 "Left hand side of operator '%s' has an unknown type\n"
 "\tProbably a bad attribute name"
 msgstr ""
 
-#: parser/parse_oper.c:899
+#: parser/parse_oper.c:971
 #, c-format
 msgid ""
 "Right hand side of operator %s has an unknown type\n"
 "\tProbably a bad attribute name"
 msgstr ""
 
-#: parser/parse_oper.c:903
+#: parser/parse_oper.c:975
 #, c-format
 msgid ""
 "Unable to identify an operator '%s' for types '%s' and '%s'\n"
 "\tYou will have to retype this query using an explicit cast"
 msgstr ""
 
-#: parser/parse_oper.c:919
+#: parser/parse_oper.c:991
 #, c-format
 msgid ""
 "operand of prefix operator '%s' has an unknown type\n"
 "\t(probably an invalid column reference)"
 msgstr ""
 
-#: parser/parse_oper.c:923
+#: parser/parse_oper.c:995
 #, c-format
 msgid ""
 "operand of postfix operator '%s' has an unknown type\n"
 "\t(probably an invalid column reference)"
 msgstr ""
 
-#: parser/parse_oper.c:930
+#: parser/parse_oper.c:1002
 #, c-format
 msgid ""
 "Unable to identify a prefix operator '%s' for type '%s'\n"
 "\tYou may need to add parentheses or an explicit cast"
 msgstr ""
 
-#: parser/parse_oper.c:934
+#: parser/parse_oper.c:1006
 #, c-format
 msgid ""
 "Unable to identify a postfix operator '%s' for type '%s'\n"
@@ -7615,26 +7795,26 @@ msgstr ""
 msgid "Cannot assign to system attribute '%s'"
 msgstr ""
 
-#: parser/parse_target.c:297
+#: parser/parse_target.c:298
 #, c-format
 msgid ""
 "column \"%s\" is of type %s but expression is of type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: parser/parse_target.c:370
+#: parser/parse_target.c:371
 #, c-format
 msgid "Attribute '%s' specified more than once"
 msgstr ""
 
-#: parser/parse_target.c:405
+#: parser/parse_target.c:406
 #, c-format
 msgid ""
 "ExpandAllTables: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: parser/parse_target.c:423
+#: parser/parse_target.c:424
 msgid "Wildcard with no tables specified not allowed"
 msgstr ""
 
@@ -7654,7 +7834,7 @@ msgid "%s converted to %s"
 msgstr ""
 
 #: parser/parse_type.c:194 parser/parse_type.c:222
-#: utils/cache/lsyscache.c:1229
+#: utils/cache/lsyscache.c:1265
 #, c-format
 msgid "Type \"%s\" is only a shell"
 msgstr ""
@@ -7684,6 +7864,263 @@ msgstr "typeidTypeRelid: 
 msgid "Invalid type name '%s'"
 msgstr "�������� ��� ���� '%s'"
 
+#: y.tab.c:8678
+msgid "syntax error: cannot back up"
+msgstr ""
+
+#: gram.y:929
+msgid "SET TRANSACTION/READ ONLY not yet supported"
+msgstr "SET TRANSACTION/READ ONLY ���� �� ��������������"
+
+#: gram.y:966 gram.y:983
+msgid "Time zone interval must be HOUR or HOUR TO MINUTE"
+msgstr ""
+
+#: gram.y:977 gram.y:4960 gram.y:6945 utils/adt/timestamp.c:701
+#, c-format
+msgid "INTERVAL(%d) precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:1421 gram.y:1427 gram.y:4368 gram.y:4375
+msgid "GLOBAL TEMPORARY TABLE is not currently supported"
+msgstr "GLOBAL TEMPORARY TABLE ���� �� ��������������"
+
+#: gram.y:1465
+#, c-format
+msgid "CREATE TABLE / COLLATE %s not yet implemented; clause ignored"
+msgstr ""
+
+#: gram.y:1649
+msgid "LIKE in table definitions not yet supported"
+msgstr ""
+
+#: gram.y:1753
+msgid "FOREIGN KEY/MATCH PARTIAL not yet implemented"
+msgstr ""
+
+#: gram.y:1833
+msgid "CREATE TABLE AS may not specify INTO"
+msgstr "CREATE TABLE AS �� ����� ��������� INTO"
+
+#: gram.y:2214
+msgid "CREATE ASSERTION is not yet supported"
+msgstr "CREATE ASSERTION ���� �� ��������������"
+
+#: gram.y:2228
+msgid "DROP ASSERTION is not yet supported"
+msgstr "DROP ASSERTION ���� �� ��������������"
+
+#: gram.y:2715
+msgid "FETCH / ABSOLUTE not supported, using RELATIVE"
+msgstr ""
+
+#: gram.y:2877 gram.y:2885
+msgid "grant options are not implemented"
+msgstr "grant-����� �� ��������������"
+
+#: gram.y:3061
+msgid "CREATE FUNCTION / OUT parameters are not supported"
+msgstr "CREATE FUNCTION / OUT ��������� �� ��������������"
+
+#: gram.y:3067
+msgid "CREATE FUNCTION / INOUT parameters are not supported"
+msgstr "CREATE FUNCTION / INOUT ��������� �� ��������������"
+
+#: gram.y:3219
+msgid "parser: argument type missing (use NONE for unary operators)"
+msgstr ""
+
+#: gram.y:3716
+#, c-format
+msgid "CREATE DOMAIN / COLLATE %s not yet implemented; clause ignored"
+msgstr ""
+
+#: gram.y:4454
+msgid ""
+"LIMIT #,# syntax not supported.\n"
+"\tUse separate LIMIT and OFFSET clauses."
+msgstr ""
+"��������� LIMIT #,# ������ �� ��������������.\n"
+"\t����������� LIMIT � OFFSET ��� ���� �����."
+
+#: gram.y:4470
+msgid "LIMIT must not be negative"
+msgstr "LIMIT �� ������ ���� �������������"
+
+#: gram.y:4508
+msgid "OFFSET must not be negative"
+msgstr "OFFSET �� ������ ���� �������������"
+
+#: gram.y:4650
+msgid ""
+"sub-SELECT in FROM must have an alias\n"
+"\tFor example, FROM (SELECT ...) [AS] foo"
+msgstr ""
+
+#: gram.y:5054
+msgid "precision for FLOAT must be at least 1"
+msgstr ""
+
+#: gram.y:5061
+msgid "precision for FLOAT must be less than 16"
+msgstr ""
+
+#: gram.y:5074 gram.y:5087
+#, c-format
+msgid "NUMERIC precision %d must be between 1 and %d"
+msgstr ""
+
+#: gram.y:5078
+#, c-format
+msgid "NUMERIC scale %d must be between 0 and precision %d"
+msgstr ""
+
+#: gram.y:5104 gram.y:5117
+#, c-format
+msgid "DECIMAL precision %d must be between 1 and %d"
+msgstr ""
+
+#: gram.y:5108
+#, c-format
+msgid "DECIMAL scale %d must be between 0 and precision %d"
+msgstr ""
+
+#: gram.y:5163 gram.y:5237
+#, c-format
+msgid "length for type '%s' must be at least 1"
+msgstr ""
+
+#: gram.y:5166 gram.y:5240
+#, c-format
+msgid "length for type '%s' cannot exceed %d"
+msgstr ""
+
+#: gram.y:5317
+#, c-format
+msgid "TIMESTAMP(%d)%s precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:5349
+#, c-format
+msgid "TIME(%d)%s precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:5499 gram.y:7503 gram.y:7555
+msgid "Unequal number of entries in row expression"
+msgstr ""
+
+#: gram.y:5913
+msgid "UNIQUE predicate is not yet implemented"
+msgstr ""
+
+#: gram.y:6142
+#, c-format
+msgid "CURRENT_TIME(%d) precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:6187
+#, c-format
+msgid "CURRENT_TIMESTAMP(%d) precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:6232
+#, c-format
+msgid "LOCALTIME(%d) precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:6277
+#, c-format
+msgid "LOCALTIMESTAMP(%d) precision must be between %d and %d"
+msgstr ""
+
+#: gram.y:7376
+msgid "OLD used in non-rule query"
+msgstr ""
+
+#: gram.y:7383
+msgid "NEW used in non-rule query"
+msgstr ""
+
+#: y.tab.c:17467
+msgid "parse error; also virtual memory exhausted"
+msgstr ""
+
+#: y.tab.c:17471
+msgid "parse error"
+msgstr ""
+
+#: y.tab.c:17586
+msgid "parser stack overflow"
+msgstr ""
+
+#: gram.y:7537
+#, c-format
+msgid "Operator '%s' not implemented for row expressions"
+msgstr ""
+
+#: gram.y:7610
+msgid "Wrong number of parameters on left side of OVERLAPS expression"
+msgstr ""
+
+#: gram.y:7615
+msgid "Wrong number of parameters on right side of OVERLAPS expression"
+msgstr ""
+
+#: gram.y:7652
+msgid "Multiple ORDER BY clauses not allowed"
+msgstr ""
+
+#: gram.y:7658
+msgid "Multiple FOR UPDATE clauses not allowed"
+msgstr ""
+
+#: gram.y:7664
+msgid "Multiple OFFSET clauses not allowed"
+msgstr ""
+
+#: gram.y:7670
+msgid "Multiple LIMIT clauses not allowed"
+msgstr ""
+
+#: scan.l:295
+msgid "unterminated /* comment"
+msgstr ""
+
+#: scan.l:323
+msgid "unterminated bit string literal"
+msgstr ""
+
+#: scan.l:342
+msgid "unterminated hexadecimal string literal"
+msgstr ""
+
+#: scan.l:388
+msgid "unterminated quoted string"
+msgstr ""
+
+#: scan.l:399
+msgid "zero-length delimited identifier"
+msgstr ""
+
+#: scan.l:406 scan.l:562
+#, c-format
+msgid "identifier \"%s\" will be truncated to \"%.*s\""
+msgstr ""
+
+#: scan.l:420
+msgid "unterminated quoted identifier"
+msgstr ""
+
+#: scan.l:580
+#, c-format
+msgid "parser: %s at end of input"
+msgstr ""
+
+#: scan.l:582
+#, c-format
+msgid "parser: %s at or near \"%s\" at character %d"
+msgstr ""
+
 #: port/ipc_test.c:93 storage/ipc/ipc.c:171
 msgid "Out of on_shmem_exit slots"
 msgstr ""
@@ -7717,11 +8154,11 @@ msgstr ""
 msgid "loading symbol '%s' failed "
 msgstr ""
 
-#: port/beos/sem.c:159
+#: port/beos/sem.c:158
 msgid "beos : semctl error : GETNCNT not implemented"
 msgstr ""
 
-#: port/beos/sem.c:174
+#: port/beos/sem.c:173
 msgid "beos : semctl error : unknown flag"
 msgstr ""
 
@@ -7733,25 +8170,25 @@ msgstr ""
 msgid "error while unloading add-on"
 msgstr ""
 
-#: port/dynloader/bsdi.c:59 port/dynloader/linux.c:67
+#: port/dynloader/bsdi.c:59 port/dynloader/linux.c:71
 msgid "dld: Cannot link C library!"
 msgstr ""
 
-#: port/dynloader/bsdi.c:66 port/dynloader/linux.c:74
+#: port/dynloader/bsdi.c:66 port/dynloader/linux.c:78
 msgid "dld: Cannot link math library!"
 msgstr ""
 
-#: port/dynloader/bsdi.c:75 port/dynloader/linux.c:83
+#: port/dynloader/bsdi.c:75 port/dynloader/linux.c:87
 msgid "dld: Undefined:"
 msgstr ""
 
-#: port/dynloader/bsdi.c:78 port/dynloader/linux.c:86
+#: port/dynloader/bsdi.c:78 port/dynloader/linux.c:90
 #: port/dynloader/ultrix4.c:61
 #, c-format
 msgid "  %s"
 msgstr "  %s"
 
-#: port/dynloader/linux.c:31
+#: port/dynloader/linux.c:35
 msgid "dynamic load not supported"
 msgstr ""
 
@@ -7759,24 +8196,24 @@ msgstr ""
 msgid "dl: Undefined:"
 msgstr ""
 
-#: postmaster/postmaster.c:328
+#: postmaster/postmaster.c:329
 #, c-format
 msgid "data directory %s was not found"
 msgstr ""
 
-#: postmaster/postmaster.c:330
+#: postmaster/postmaster.c:331
 #, c-format
 msgid "could not read permissions of directory %s: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:335
+#: postmaster/postmaster.c:336
 #, c-format
 msgid ""
 "data directory %s has group or world access; permissions should be u=rwx "
 "(0700)"
 msgstr ""
 
-#: postmaster/postmaster.c:348
+#: postmaster/postmaster.c:349
 #, c-format
 msgid ""
 "%s does not find the database system.\n"
@@ -7789,83 +8226,83 @@ msgstr ""
 "�� �� ���������� ������� ���� \"%s\": %s\n"
 "\n"
 
-#: postmaster/postmaster.c:433
+#: postmaster/postmaster.c:434
 msgid "Assert checking is not compiled in."
 msgstr ""
 
-#: postmaster/postmaster.c:539 tcop/postgres.c:1525
+#: postmaster/postmaster.c:540 tcop/postgres.c:1574
 #, c-format
 msgid "--%s requires argument"
 msgstr "--%s ������� ��������"
 
-#: postmaster/postmaster.c:541 tcop/postgres.c:1527
+#: postmaster/postmaster.c:542 tcop/postgres.c:1576
 #, c-format
 msgid "-c %s requires argument"
 msgstr "-c %s ������� ��������"
 
-#: postmaster/postmaster.c:552 postmaster/postmaster.c:563
-#: postmaster/postmaster.c:628
+#: postmaster/postmaster.c:553 postmaster/postmaster.c:564
+#: postmaster/postmaster.c:632
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "�������� '%s --help' ��� ����� ��������� ����������.\n"
 
-#: postmaster/postmaster.c:562
+#: postmaster/postmaster.c:563
 #, c-format
 msgid "invalid argument -- %s"
 msgstr "�������� �������� -- %s"
 
-#: postmaster/postmaster.c:578
+#: postmaster/postmaster.c:587
 msgid ""
 "The number of buffers (-B) must be at least twice the number of allowed "
 "connections (-N) and at least 16."
 msgstr ""
 
-#: postmaster/postmaster.c:591
+#: postmaster/postmaster.c:593
 msgid "superuser_reserved_connections must be less than max_connections."
 msgstr ""
 
-#: postmaster/postmaster.c:607
+#: postmaster/postmaster.c:611
 #, c-format
 msgid "%s: PostmasterMain: initial environ dump:"
 msgstr ""
 
-#: postmaster/postmaster.c:608 postmaster/postmaster.c:611
+#: postmaster/postmaster.c:612 postmaster/postmaster.c:615
 msgid "-----------------------------------------"
 msgstr ""
 
-#: postmaster/postmaster.c:610 postmaster/postmaster.c:2283
+#: postmaster/postmaster.c:614 postmaster/postmaster.c:2287
 #, c-format
 msgid "\t%s"
 msgstr "\t%s"
 
-#: postmaster/postmaster.c:618 tcop/postgres.c:1671
+#: postmaster/postmaster.c:622 tcop/postgres.c:1719
 #, c-format
 msgid "%s: could not locate executable, bailing out..."
 msgstr ""
 
-#: postmaster/postmaster.c:627
+#: postmaster/postmaster.c:631
 msgid "For SSL, TCP/IP connections must be enabled."
 msgstr ""
 
-#: postmaster/postmaster.c:674
+#: postmaster/postmaster.c:678
 msgid "cannot create INET stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:686
+#: postmaster/postmaster.c:690
 msgid "cannot create UNIX stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:806
+#: postmaster/postmaster.c:810
 #, c-format
 msgid "fork failed: %s"
 msgstr "fork �� ������: %s"
 
-#: postmaster/postmaster.c:828
+#: postmaster/postmaster.c:832
 #, c-format
 msgid "cannot disassociate from controlling TTY: %s"
 msgstr ""
 
-#: postmaster/postmaster.c:848
+#: postmaster/postmaster.c:852
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -7874,87 +8311,95 @@ msgstr ""
 "%s �������� PostgreSQL ��������.\n"
 "\n"
 
-#: postmaster/postmaster.c:849
+#: postmaster/postmaster.c:853
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [options...]\n"
+"  %s [OPTION]...\n"
 "\n"
 msgstr ""
 "�������������:\n"
-"  %s [�����...]\n"
+"  %s [�����]...\n"
 "\n"
 
-#: postmaster/postmaster.c:850
+#: postmaster/postmaster.c:854
 msgid "Options:\n"
 msgstr "�����:\n"
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:856
 msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr ""
 "  -A 1|0          ��������/��������� �������� �������������� ��������\n"
 
-#: postmaster/postmaster.c:854
+#: postmaster/postmaster.c:858
 #, c-format
 msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
 msgstr "  -B ��������     ����� ����� ������� (�� ���������: %d)\n"
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:859
 msgid "  -c NAME=VALUE   set run-time parameter\n"
 msgstr "  -c ���=����.   ���������� �������� ���������� (run-time)\n"
 
-#: postmaster/postmaster.c:856
+#: postmaster/postmaster.c:860
 msgid "  -d 1-5          debugging level\n"
 msgstr "  -d 1-5          ������� �������\n"
 
-#: postmaster/postmaster.c:857
+#: postmaster/postmaster.c:861
 msgid "  -D DATADIR      database directory\n"
 msgstr "  -D ���������    ���������� � �������\n"
 
-#: postmaster/postmaster.c:858
+#: postmaster/postmaster.c:862
 msgid "  -F              turn fsync off\n"
 msgstr "  -F              ���������� fsync\n"
 
-#: postmaster/postmaster.c:859
+#: postmaster/postmaster.c:863
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
 msgstr "  -h ����         ��� ����� ��� IP-����� ��� �������������\n"
 
-#: postmaster/postmaster.c:860
+#: postmaster/postmaster.c:864
 msgid "  -i              enable TCP/IP connections\n"
 msgstr "  -i              ���������� TCP/IP ����������\n"
 
-#: postmaster/postmaster.c:861
+#: postmaster/postmaster.c:865
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
 msgstr "  -k ����������   �������������� unix-domain �������\n"
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:867
 msgid "  -l              enable SSL connections\n"
 msgstr "  -l              �������� SSL-�������������\n"
 
-#: postmaster/postmaster.c:865
+#: postmaster/postmaster.c:869
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
 msgstr ""
 "  -N MAX-CONNECT  ����������� ��������� ����� ������������� (�� ���������: %"
 "d)\n"
 
-#: postmaster/postmaster.c:867
+#: postmaster/postmaster.c:871
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
 msgstr "  -o �����        �������� '�����' ������� ���-���� (�������)\n"
 
-#: postmaster/postmaster.c:868
+#: postmaster/postmaster.c:872
 #, c-format
 msgid "  -p PORT         port number to listen on (default %d)\n"
 msgstr "  -p ����         ����� ����� ��� ������������� (�� ���������: %d)\n"
 
-#: postmaster/postmaster.c:869
+#: postmaster/postmaster.c:873
 msgid ""
 "  -S              silent mode (start in background without logging output)\n"
 msgstr ""
 "  -S              ����� ����� (��������� �� ������ ����� ��� ����� "
 "�����������)\n"
 
-#: postmaster/postmaster.c:871
+#: postmaster/postmaster.c:874
+msgid "  --help          show this help, then exit\n"
+msgstr ""
+
+#: postmaster/postmaster.c:875
+msgid "  --version       output version information, then exit\n"
+msgstr ""
+
+#: postmaster/postmaster.c:877
 msgid ""
 "\n"
 "Developer options:\n"
@@ -7962,20 +8407,20 @@ msgstr ""
 "\n"
 "����� ������������:\n"
 
-#: postmaster/postmaster.c:872
+#: postmaster/postmaster.c:878
 msgid ""
 "  -n              do not reinitialize shared memory after abnormal exit\n"
 msgstr ""
 "  -n              �� �������������������� ����� ������ ����� ������������� "
 "����������\n"
 
-#: postmaster/postmaster.c:873
+#: postmaster/postmaster.c:879
 msgid "  -s              send SIGSTOP to all backend servers if one dies\n"
 msgstr ""
 "  -s              ������� ������ SIGSTOP ���� ���-����� (��������) ���� ���� "
 "�� ��� ������\n"
 
-#: postmaster/postmaster.c:875
+#: postmaster/postmaster.c:881
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -7985,249 +8430,256 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 
-#: postmaster/postmaster.c:957
+#: postmaster/postmaster.c:963
 #, c-format
 msgid "ServerLoop: select failed: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1083 postmaster/postmaster.c:1100
+#: postmaster/postmaster.c:1089 postmaster/postmaster.c:1104
 msgid "incomplete startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1091
+#: postmaster/postmaster.c:1097
 msgid "invalid length of startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1133
+#: postmaster/postmaster.c:1137
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1155
+#: postmaster/postmaster.c:1159
 msgid "unsupported frontend protocol"
 msgstr ""
 
-#: postmaster/postmaster.c:1182
+#: postmaster/postmaster.c:1186
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1215
+#: postmaster/postmaster.c:1219
 msgid "The database system is starting up"
 msgstr ""
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1222
 msgid "The database system is shutting down"
 msgstr ""
 
-#: postmaster/postmaster.c:1221
+#: postmaster/postmaster.c:1225
 msgid "The database system is in recovery mode"
 msgstr ""
 
-#: postmaster/postmaster.c:1224 storage/ipc/sinval.c:52
-#: storage/lmgr/proc.c:211
+#: postmaster/postmaster.c:1228 storage/ipc/sinval.c:52
+#: storage/lmgr/proc.c:219
 msgid "Sorry, too many clients already"
 msgstr ""
 
-#: postmaster/postmaster.c:1254
+#: postmaster/postmaster.c:1258
 #, c-format
 msgid "processCancelRequest: CheckPointPID in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1268
+#: postmaster/postmaster.c:1272
 #, c-format
 msgid "processing cancel request: sending SIGINT to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1274
+#: postmaster/postmaster.c:1278
 #, c-format
 msgid "bad key in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1281
+#: postmaster/postmaster.c:1285
 #, c-format
 msgid "bad pid in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1324
+#: postmaster/postmaster.c:1328
 msgid "ConnCreate: malloc failed"
 msgstr "ConnCreate: malloc �� ������"
 
-#: postmaster/postmaster.c:1419
+#: postmaster/postmaster.c:1423
 msgid "Received SIGHUP, reloading configuration files"
 msgstr ""
 
-#: postmaster/postmaster.c:1443
+#: postmaster/postmaster.c:1447
 #, c-format
 msgid "pmdie %d"
 msgstr "pmdie %d"
 
-#: postmaster/postmaster.c:1457
+#: postmaster/postmaster.c:1461
 msgid "smart shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1469 postmaster/postmaster.c:1513
+#: postmaster/postmaster.c:1473 postmaster/postmaster.c:1517
 #, c-format
 msgid "shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1487
+#: postmaster/postmaster.c:1491
 msgid "fast shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1493
+#: postmaster/postmaster.c:1497
 msgid "aborting any active transactions"
 msgstr ""
 
-#: postmaster/postmaster.c:1529
+#: postmaster/postmaster.c:1533
 msgid "immediate shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1564
+#: postmaster/postmaster.c:1568
 msgid "reaping dead processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1581
+#: postmaster/postmaster.c:1585
 msgid "statistics collector process"
 msgstr ""
 
-#: postmaster/postmaster.c:1594
+#: postmaster/postmaster.c:1598
 msgid "shutdown process"
 msgstr ""
 
-#: postmaster/postmaster.c:1605
+#: postmaster/postmaster.c:1609
 msgid "startup process"
 msgstr ""
 
-#: postmaster/postmaster.c:1607
+#: postmaster/postmaster.c:1611
 msgid "aborting startup due to startup process failure"
 msgstr ""
 
-#: postmaster/postmaster.c:1616
+#: postmaster/postmaster.c:1620
 #, c-format
 msgid "startup process %d died while shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1648
+#: postmaster/postmaster.c:1652
 msgid ""
 "all server processes terminated; reinitializing shared memory and semaphores"
 msgstr ""
 
-#: postmaster/postmaster.c:1686
+#: postmaster/postmaster.c:1690
 msgid "child process"
 msgstr ""
 
-#: postmaster/postmaster.c:1731
+#: postmaster/postmaster.c:1735
 msgid "server process"
 msgstr ""
 
-#: postmaster/postmaster.c:1732
+#: postmaster/postmaster.c:1736
 msgid "terminating any other active server processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1753
+#: postmaster/postmaster.c:1757
 #, c-format
 msgid "CleanupProc: sending %s to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1797
+#: postmaster/postmaster.c:1801
 #, c-format
 msgid "%s (pid %d) exited with exit code %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1800
+#: postmaster/postmaster.c:1804
 #, c-format
 msgid "%s (pid %d) was terminated by signal %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1803
+#: postmaster/postmaster.c:1807
 #, c-format
 msgid "%s (pid %d) exited with unexpected status %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1825
+#: postmaster/postmaster.c:1829
 #, c-format
 msgid "SignalChildren: sending signal %d to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1863
+#: postmaster/postmaster.c:1867
 msgid "out of memory; connection startup aborted"
 msgstr ""
 
-#: postmaster/postmaster.c:1914
+#: postmaster/postmaster.c:1918
 msgid "connection startup failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1931
+#: postmaster/postmaster.c:1935
 #, c-format
 msgid "connection startup failed (fork failure): %s"
 msgstr ""
 
-#: postmaster/postmaster.c:1938
+#: postmaster/postmaster.c:1942
 #, c-format
 msgid "BackendStartup: forked pid=%d socket=%d"
 msgstr ""
 
-#: postmaster/postmaster.c:1972
+#: postmaster/postmaster.c:1976
 msgid "Server process fork() failed: "
 msgstr ""
 
-#: postmaster/postmaster.c:2119
+#: postmaster/postmaster.c:2123
 #, c-format
 msgid "connection received: host=%s port=%hu"
 msgstr ""
 
-#: postmaster/postmaster.c:2139
+#: postmaster/postmaster.c:2143
 #, c-format
 msgid "connection received: host=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2159
+#: postmaster/postmaster.c:2163
 msgid "DoBackend: Unable to set timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2188
+#: postmaster/postmaster.c:2192
 msgid "DoBackend: Unable to disable timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2192
+#: postmaster/postmaster.c:2196
 #, c-format
 msgid "connection authorized: user=%s database=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2281
+#: postmaster/postmaster.c:2285
 #, c-format
 msgid "%s child[%d]: starting with ("
 msgstr ""
 
-#: postmaster/postmaster.c:2284
+#: postmaster/postmaster.c:2288
 msgid ")"
 msgstr ")"
 
-#: postmaster/postmaster.c:2583
+#: postmaster/postmaster.c:2350
+#, c-format
+msgid ""
+"Checkpoint segments are being created too frequently (%d secs)\n"
+"\tConsider increasing CHECKPOINT_SEGMENTS"
+msgstr ""
+
+#: postmaster/postmaster.c:2608
 #, c-format
 msgid "could not launch startup process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2586
+#: postmaster/postmaster.c:2611
 #, c-format
 msgid "could not launch checkpoint process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2589
+#: postmaster/postmaster.c:2614
 #, c-format
 msgid "could not launch shutdown process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2638
 msgid "CheckPointDataBase: malloc failed"
 msgstr "CheckPointDataBase: malloc �� ������"
 
-#: postmaster/postmaster.c:2652
+#: postmaster/postmaster.c:2677
 #, c-format
 msgid "cannot create file %s: %s"
 msgstr "�� ���������� ������� ���� %s: %s"
 
-#: postmaster/postmaster.c:2664
+#: postmaster/postmaster.c:2689
 #, c-format
 msgid "writing file %s failed"
 msgstr "������ ���� %s �� �������"
@@ -8257,7 +8709,7 @@ msgstr "PGSTAT: connect() 
 msgid "PGSTAT: fcntl() failed: %m"
 msgstr "PGSTAT: fcntl() �� ������: %m"
 
-#: postmaster/pgstat.c:230 postmaster/pgstat.c:1166
+#: postmaster/pgstat.c:230 postmaster/pgstat.c:1158
 #, c-format
 msgid "PGSTAT: pipe() failed: %m"
 msgstr "PGSTAT: pipe() �� ������: %m"
@@ -8266,25 +8718,25 @@ msgstr "PGSTAT: pipe() 
 msgid "PGSTAT: statistics collector startup skipped"
 msgstr ""
 
-#: postmaster/pgstat.c:296 postmaster/pgstat.c:1173
+#: postmaster/pgstat.c:296 postmaster/pgstat.c:1165
 #, c-format
 msgid "PGSTAT: fork() failed: %m"
 msgstr "PGSTAT: fork() �� ������: %m"
 
-#: postmaster/pgstat.c:705
+#: postmaster/pgstat.c:697
 msgid "Only database superusers can reset statistic counters"
 msgstr ""
 
-#: postmaster/pgstat.c:772 postmaster/pgstat.c:781 postmaster/pgstat.c:828
-#: postmaster/pgstat.c:838
+#: postmaster/pgstat.c:764 postmaster/pgstat.c:773 postmaster/pgstat.c:820
+#: postmaster/pgstat.c:830
 msgid "PGSTATBE: malloc() failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1227
+#: postmaster/pgstat.c:1219
 msgid "PGSTAT: Creation of dead backend hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1238
+#: postmaster/pgstat.c:1230
 msgid "PGSTAT: Allocation of backend table failed"
 msgstr ""
 
@@ -8405,7 +8857,7 @@ msgstr ""
 msgid "PGSTAT: failed to reinitialize hash table for database entry"
 msgstr ""
 
-#: regex/regcomp.c:1758 regex/regcomp.c:1773
+#: regex/regcomp.c:1757 regex/regcomp.c:1772
 msgid "cclass_init: out of memory"
 msgstr "cclass_init: �� ���������� ������"
 
@@ -8496,56 +8948,56 @@ msgstr ""
 msgid "Attempt to rename rule \"%s\" failed: \"%s\" already exists"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:343
+#: rewrite/rewriteHandler.c:345
 #, c-format
 msgid "rewriteTargetList: bogus resno %d in targetlist"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:385 rewrite/rewriteHandler.c:397
+#: rewrite/rewriteHandler.c:387 rewrite/rewriteHandler.c:399
 #, c-format
 msgid "Multiple assignments to same attribute \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:553
+#: rewrite/rewriteHandler.c:555
 msgid "ApplyRetrieveRule: expected just one rule action"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:555
+#: rewrite/rewriteHandler.c:557
 msgid "ApplyRetrieveRule: can't handle qualified ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:557
+#: rewrite/rewriteHandler.c:559
 msgid "ApplyRetrieveRule: can't handle per-attribute ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:835
+#: rewrite/rewriteHandler.c:837
 msgid "fireRIRrules: failed to remove aggs from qual"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1106
+#: rewrite/rewriteHandler.c:1098
 #, c-format
 msgid "query rewritten %d times, may contain cycles"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1230
+#: rewrite/rewriteHandler.c:1210
 msgid ""
 "Cannot insert into a view\n"
 "\tYou need an unconditional ON INSERT DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1234
+#: rewrite/rewriteHandler.c:1214
 msgid ""
 "Cannot update a view\n"
 "\tYou need an unconditional ON UPDATE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1238
+#: rewrite/rewriteHandler.c:1218
 msgid ""
 "Cannot delete from a view\n"
 "\tYou need an unconditional ON DELETE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1242
+#: rewrite/rewriteHandler.c:1222
 #, c-format
 msgid "QueryRewrite: unexpected commandType %d"
 msgstr ""
@@ -8562,7 +9014,7 @@ msgstr ""
 msgid "Conditional utility statements are not implemented"
 msgstr ""
 
-#: rewrite/rewriteManip.c:798
+#: rewrite/rewriteManip.c:790
 msgid "ResolveNew: can't handle whole-tuple reference"
 msgstr ""
 
@@ -8705,11 +9157,11 @@ msgstr ""
 msgid "no empty local buffer."
 msgstr ""
 
-#: storage/buffer/localbuf.c:120
+#: storage/buffer/localbuf.c:125
 msgid "Out of memory in LocalBufferAlloc"
 msgstr ""
 
-#: storage/buffer/localbuf.c:227
+#: storage/buffer/localbuf.c:232
 #, c-format
 msgid ""
 "Local Buffer Leak: [%03d] (rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %"
@@ -9000,12 +9452,12 @@ msgstr ""
 msgid "Memory exhausted in GetSnapshotData"
 msgstr ""
 
-#: storage/ipc/sinvaladt.c:122
+#: storage/ipc/sinvaladt.c:124
 #, c-format
 msgid "SIBackendInit: backend id %d"
 msgstr ""
 
-#: storage/ipc/sinvaladt.c:227
+#: storage/ipc/sinvaladt.c:229
 #, c-format
 msgid "SIInsertDataEntry: table is 70%% full, signaling postmaster"
 msgstr ""
@@ -9050,7 +9502,7 @@ msgstr ""
 msgid "inv_seek: invalid whence: %d"
 msgstr ""
 
-#: storage/lmgr/deadlock.c:271
+#: storage/lmgr/deadlock.c:275
 msgid "DeadLockCheckRecurse: inconsistent results"
 msgstr ""
 
@@ -9225,36 +9677,36 @@ msgstr ""
 msgid "LWLockRelease: lock %d is not held"
 msgstr ""
 
-#: storage/lmgr/proc.c:143 storage/lmgr/proc.c:157
+#: storage/lmgr/proc.c:151 storage/lmgr/proc.c:165
 msgid "cannot create new proc: out of memory"
 msgstr ""
 
-#: storage/lmgr/proc.c:184
+#: storage/lmgr/proc.c:192
 msgid "InitProcess: Proc Header uninitialized"
 msgstr ""
 
-#: storage/lmgr/proc.c:187
+#: storage/lmgr/proc.c:195
 msgid "InitProcess: you already exist"
 msgstr ""
 
-#: storage/lmgr/proc.c:265
+#: storage/lmgr/proc.c:273
 msgid "InitDummyProcess: Proc Header uninitialized"
 msgstr ""
 
-#: storage/lmgr/proc.c:268
+#: storage/lmgr/proc.c:276
 msgid "InitDummyProcess: you already exist"
 msgstr ""
 
-#: storage/lmgr/proc.c:274
+#: storage/lmgr/proc.c:282
 #, c-format
 msgid "InitDummyProcess: DummyProc is in use by PID %d"
 msgstr ""
 
-#: storage/lmgr/proc.c:649
+#: storage/lmgr/proc.c:657
 msgid "ProcSleep: Unable to set timer for process wakeup"
 msgstr ""
 
-#: storage/lmgr/proc.c:671
+#: storage/lmgr/proc.c:679
 msgid "ProcSleep: Unable to disable timer for process wakeup"
 msgstr ""
 
@@ -9320,8 +9772,8 @@ msgstr ""
 msgid "Illegal storage manager id %d"
 msgstr ""
 
-#: storage/smgr/md.c:252 storage/smgr/md.c:424 storage/smgr/md.c:467
-#: storage/smgr/md.c:506
+#: storage/smgr/md.c:252 storage/smgr/md.c:424 storage/smgr/md.c:471
+#: storage/smgr/md.c:510
 msgid "seekpos too big!"
 msgstr ""
 
@@ -9333,49 +9785,49 @@ msgstr ""
 msgid "segment too big on relopen!"
 msgstr ""
 
-#: storage/smgr/md.c:515
+#: storage/smgr/md.c:519
 #, c-format
 msgid "mdblindwrt: lseek(%ld) failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:529
+#: storage/smgr/md.c:533
 #, c-format
 msgid "mdblindwrt: write() failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:535
+#: storage/smgr/md.c:539
 #, c-format
 msgid "mdblindwrt: close() failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:572
+#: storage/smgr/md.c:576
 msgid "segment too big in mdnblocks!"
 msgstr ""
 
-#: storage/smgr/md.c:592
+#: storage/smgr/md.c:596
 #, c-format
 msgid "cannot count blocks for %s -- open failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:757
+#: storage/smgr/md.c:761
 msgid "_fdvec_alloc error"
 msgstr ""
 
-#: storage/smgr/md.c:839
+#: storage/smgr/md.c:843
 msgid "segment too big on openseg!"
 msgstr ""
 
-#: storage/smgr/md.c:858
+#: storage/smgr/md.c:862
 #, c-format
 msgid "_mdfd_getrelnfd: cannot open relation %s: %m"
 msgstr ""
 
-#: storage/smgr/md.c:901
+#: storage/smgr/md.c:905
 #, c-format
 msgid "cannot open segment %u of relation %s (target block %u): %m"
 msgstr ""
 
-#: storage/smgr/md.c:954
+#: storage/smgr/md.c:958
 #, c-format
 msgid "_mdfd_blind_getseg: couldn't open %s: %m"
 msgstr ""
@@ -9426,8 +9878,8 @@ msgid ""
 "\tCheck free disk space."
 msgstr ""
 
-#: storage/smgr/smgr.c:270 utils/init/miscinit.c:1015
-#: utils/misc/database.c:149
+#: storage/smgr/smgr.c:270 utils/init/miscinit.c:1014
+#: utils/misc/database.c:147
 #, c-format
 msgid "cannot open %s: %m"
 msgstr ""
@@ -9487,77 +9939,77 @@ msgstr ""
 msgid "illegal storage manager number %d"
 msgstr ""
 
-#: tcop/fastpath.c:172
+#: tcop/fastpath.c:174
 #, c-format
 msgid "fetch_fp_info: cache lookup for function %u failed"
 msgstr ""
 
-#: tcop/fastpath.c:183 tcop/fastpath.c:188
+#: tcop/fastpath.c:185 tcop/fastpath.c:190
 msgid "CSTRING not supported in fastpath protocol"
 msgstr ""
 
-#: tcop/fastpath.c:275
+#: tcop/fastpath.c:278
 #, c-format
 msgid ""
 "HandleFunctionRequest: actual arguments (%d) != registered arguments (%d)"
 msgstr ""
 
-#: tcop/fastpath.c:294 tcop/fastpath.c:306
+#: tcop/fastpath.c:297 tcop/fastpath.c:309
 #, c-format
 msgid "HandleFunctionRequest: bogus argsize %d"
 msgstr ""
 
-#: tcop/fastpath.c:319
+#: tcop/fastpath.c:322
 #, c-format
 msgid "HandleFunctionRequest: bogus argsize %d, should be %d"
 msgstr ""
 
-#: tcop/fastpath.c:337 tcop/postgres.c:665
+#: tcop/fastpath.c:340 tcop/postgres.c:674
 msgid ""
 "current transaction is aborted, queries ignored until end of transaction "
 "block"
 msgstr ""
 
-#: tcop/postgres.c:289
+#: tcop/postgres.c:284
 #, c-format
 msgid "Socket command type %c unknown"
 msgstr ""
 
-#: tcop/postgres.c:377
+#: tcop/postgres.c:372
 #, c-format
 msgid "query: %s"
 msgstr "������: %s"
 
-#: tcop/postgres.c:464
+#: tcop/postgres.c:459
 msgid "pg_analyze_and_rewrite: copyObject failed on parse tree"
 msgstr ""
 
-#: tcop/postgres.c:508
+#: tcop/postgres.c:503
 msgid "pg_plan_query: copyObject failed on plan tree"
 msgstr ""
 
-#: tcop/postgres.c:722
+#: tcop/postgres.c:751
 msgid "ProcessUtility"
 msgstr "ProcessUtility"
 
-#: tcop/postgres.c:783
+#: tcop/postgres.c:833
 msgid "ProcessQuery"
 msgstr "ProcessQuery"
 
-#: tcop/postgres.c:904
+#: tcop/postgres.c:944
 #, c-format
 msgid "duration: %ld.%06ld sec"
 msgstr ""
 
-#: tcop/postgres.c:918
+#: tcop/postgres.c:958
 msgid "StartTransactionCommand"
 msgstr "StartTransactionCommand"
 
-#: tcop/postgres.c:929
+#: tcop/postgres.c:976
 msgid "CommitTransactionCommand"
 msgstr "CommitTransactionCommand"
 
-#: tcop/postgres.c:956
+#: tcop/postgres.c:1003
 msgid ""
 "Message from PostgreSQL backend:\n"
 "\tThe Postmaster has informed me that some other backend\n"
@@ -9567,63 +10019,63 @@ msgid ""
 "\tPlease reconnect to the database system and repeat your query."
 msgstr ""
 
-#: tcop/postgres.c:1074
+#: tcop/postgres.c:1121
 msgid ""
 "floating point exception! The last floating point operation either exceeded "
 "legal ranges or was a divide by zero"
 msgstr ""
 
-#: tcop/postgres.c:1107
+#: tcop/postgres.c:1154
 msgid "This connection has been terminated by the administrator."
 msgstr ""
 
-#: tcop/postgres.c:1114
+#: tcop/postgres.c:1161
 msgid "Query was canceled."
 msgstr ""
 
-#: tcop/postgres.c:1259
+#: tcop/postgres.c:1308
 msgid "Assert checking is not compiled in"
 msgstr ""
 
-#: tcop/postgres.c:1491
+#: tcop/postgres.c:1540
 msgid "only one -x flag is allowed"
 msgstr ""
 
-#: tcop/postgres.c:1509
+#: tcop/postgres.c:1558
 msgid "use -x {off,nor,nopull,nopm,pullall,wait}"
 msgstr ""
 
-#: tcop/postgres.c:1564
+#: tcop/postgres.c:1613
 msgid ""
 "Query statistics are disabled because parser, planner, or executor "
 "statistics are on."
 msgstr ""
 
-#: tcop/postgres.c:1641 tcop/postgres.c:1653
+#: tcop/postgres.c:1689 tcop/postgres.c:1701
 #, c-format
 msgid ""
 "%s: invalid command line arguments\n"
 "Try -? for help."
 msgstr ""
 
-#: tcop/postgres.c:1661
+#: tcop/postgres.c:1709
 #, c-format
 msgid "%s: user name undefined and no database specified"
 msgstr ""
 
-#: tcop/postgres.c:1712
+#: tcop/postgres.c:1760
 msgid "InitPostgres"
 msgstr "InitPostgres"
 
-#: tcop/postgres.c:1795
+#: tcop/postgres.c:1845
 msgid "AbortCurrentTransaction"
 msgstr "AbortCurrentTransaction"
 
-#: tcop/postgres.c:2003
+#: tcop/postgres.c:2047
 msgid "unknown frontend message was received"
 msgstr ""
 
-#: tcop/postgres.c:2135
+#: tcop/postgres.c:2176
 #, c-format
 msgid ""
 "%s\n"
@@ -9632,55 +10084,59 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: tcop/postgres.c:2497
+#: tcop/postgres.c:2542
 #, c-format
 msgid "CreateCommandTag: unknown parse node type %d"
 msgstr ""
 
-#: tcop/pquery.c:112
+#: tcop/pquery.c:86
 #, c-format
 msgid "Closing pre-existing portal \"%s\""
 msgstr ""
 
-#: tcop/utility.c:95
+#: tcop/utility.c:96
 #, c-format
 msgid "\"%s\" is not %s %s. Use DROP %s to remove %s %s"
 msgstr ""
 
-#: tcop/utility.c:99
+#: tcop/utility.c:100
 #, c-format
 msgid "\"%s\" is not %s %s"
 msgstr ""
 
-#: tcop/utility.c:118 tcop/utility.c:123
+#: tcop/utility.c:119 tcop/utility.c:124
 #, c-format
 msgid "%s \"%s\" does not exist"
 msgstr ""
 
-#: tcop/utility.c:136
+#: tcop/utility.c:137
 #, c-format
 msgid "%s \"%s\" is a system %s"
 msgstr ""
 
-#: tcop/utility.c:162
+#: tcop/utility.c:163
 #, c-format
 msgid "relation \"%s\" is a system catalog"
 msgstr ""
 
-#: tcop/utility.c:445 tcop/utility.c:449
+#: tcop/utility.c:442 tcop/utility.c:446
 #, c-format
 msgid "ProcessUtility: Invalid target for RENAME: %d"
 msgstr ""
 
-#: tcop/utility.c:554
+#: tcop/utility.c:550
 msgid "ALTER TABLE: permission denied"
 msgstr "ALTER TABLE: ��� �������"
 
-#: tcop/utility.c:560
+#: tcop/utility.c:556
 msgid "T_AlterTableStmt: unknown subtype"
 msgstr ""
 
-#: tcop/utility.c:877
+#: tcop/utility.c:599
+msgid "T_AlterDomainStmt: unknown subtype"
+msgstr ""
+
+#: tcop/utility.c:908
 #, c-format
 msgid "ProcessUtility: command #%d unsupported"
 msgstr ""
@@ -9710,57 +10166,57 @@ msgstr ""
 msgid "array_in: missing assignment operator"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:246
+#: utils/adt/arrayfuncs.c:245
 msgid "array_in: missing left brace"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:303 utils/adt/arrayfuncs.c:310
-#: utils/adt/arrayfuncs.c:423 utils/adt/arrayfuncs.c:433
+#: utils/adt/arrayfuncs.c:301 utils/adt/arrayfuncs.c:308
+#: utils/adt/arrayfuncs.c:420 utils/adt/arrayfuncs.c:430
 #, c-format
 msgid "malformed array constant: %s"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:319 utils/adt/arrayfuncs.c:330
-#: utils/adt/arrayfuncs.c:452 utils/adt/arrayfuncs.c:465
-#: utils/adt/arrayfuncs.c:501
+#: utils/adt/arrayfuncs.c:317 utils/adt/arrayfuncs.c:328
+#: utils/adt/arrayfuncs.c:449 utils/adt/arrayfuncs.c:462
+#: utils/adt/arrayfuncs.c:498
 msgid "array_in: illformed array constant"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:986
+#: utils/adt/arrayfuncs.c:1039
 msgid "Slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1122 utils/adt/arrayfuncs.c:1124
-#: utils/adt/arrayfuncs.c:1141 utils/adt/arrayfuncs.c:1161
-#: utils/adt/arrayfuncs.c:1171 utils/adt/arrayfuncs.c:1297
-#: utils/adt/arrayfuncs.c:1312 utils/adt/arrayfuncs.c:1321
-#: utils/adt/arrayfuncs.c:1328 utils/adt/arrayfuncs.c:1337
+#: utils/adt/arrayfuncs.c:1175 utils/adt/arrayfuncs.c:1177
+#: utils/adt/arrayfuncs.c:1194 utils/adt/arrayfuncs.c:1214
+#: utils/adt/arrayfuncs.c:1224 utils/adt/arrayfuncs.c:1350
+#: utils/adt/arrayfuncs.c:1365 utils/adt/arrayfuncs.c:1374
+#: utils/adt/arrayfuncs.c:1381 utils/adt/arrayfuncs.c:1390
 msgid "Invalid array subscripts"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1286
+#: utils/adt/arrayfuncs.c:1339
 msgid "Updates on slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1347
+#: utils/adt/arrayfuncs.c:1400
 msgid "Source array too small"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1478
+#: utils/adt/arrayfuncs.c:1531
 #, c-format
 msgid "array_map: invalid nargs: %d"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1480
+#: utils/adt/arrayfuncs.c:1533
 msgid "array_map: null input array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1524
+#: utils/adt/arrayfuncs.c:1577
 msgid "array_map: cannot handle NULL in array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1716 utils/cache/lsyscache.c:908
-#: utils/cache/lsyscache.c:931
+#: utils/adt/arrayfuncs.c:1768 utils/cache/lsyscache.c:946
+#: utils/cache/lsyscache.c:969
 #, c-format
 msgid "cache lookup failed for type %u"
 msgstr ""
@@ -9803,63 +10259,63 @@ msgstr ""
 msgid "makeacl: invalid size: %d"
 msgstr ""
 
-#: utils/adt/acl.c:280
+#: utils/adt/acl.c:279
 msgid "aclitemin: cannot accept anything but = ACLs"
 msgstr ""
 
-#: utils/adt/acl.c:284
+#: utils/adt/acl.c:283
 msgid "aclitemin: extra garbage at end of specification"
 msgstr ""
 
-#: utils/adt/acl.c:352
+#: utils/adt/acl.c:351
 #, c-format
 msgid "aclitemout: bad idtype: %d"
 msgstr ""
 
-#: utils/adt/acl.c:434
+#: utils/adt/acl.c:433
 #, c-format
 msgid "acldefault: bogus objtype %d"
 msgstr ""
 
-#: utils/adt/acl.c:507
+#: utils/adt/acl.c:506
 msgid "aclinsert3: insertion before world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:618
+#: utils/adt/acl.c:617
 msgid "aclremove: removal of the world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:865
+#: utils/adt/acl.c:864
 #, c-format
 msgid "has_table_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1068
+#: utils/adt/acl.c:1067
 #, c-format
 msgid "has_database_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1244
+#: utils/adt/acl.c:1243
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "������� \"%s\" �� ����������"
 
-#: utils/adt/acl.c:1267
+#: utils/adt/acl.c:1266
 #, c-format
 msgid "has_function_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1466
+#: utils/adt/acl.c:1465
 #, c-format
 msgid "has_language_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1642
+#: utils/adt/acl.c:1641
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "����� \"%s\" �� ����������"
 
-#: utils/adt/acl.c:1668
+#: utils/adt/acl.c:1667
 #, c-format
 msgid "has_schema_privilege: invalid privilege type %s"
 msgstr ""
@@ -9983,14 +10439,14 @@ msgstr ""
 msgid "TIMETZ units '%s' not supported"
 msgstr ""
 
-#: utils/adt/date.c:2026 utils/adt/date.c:2058 utils/adt/timestamp.c:3282
-#: utils/adt/timestamp.c:3305 utils/adt/timestamp.c:3419
-#: utils/adt/timestamp.c:3441
+#: utils/adt/date.c:2025 utils/adt/date.c:2059 utils/adt/timestamp.c:3274
+#: utils/adt/timestamp.c:3297 utils/adt/timestamp.c:3411
+#: utils/adt/timestamp.c:3433
 #, c-format
 msgid "Time zone '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:2077 utils/adt/timestamp.c:3327 utils/adt/timestamp.c:3464
+#: utils/adt/date.c:2078 utils/adt/timestamp.c:3319 utils/adt/timestamp.c:3456
 #, c-format
 msgid "INTERVAL time zone '%s' not legal (month specified)"
 msgstr ""
@@ -10000,7 +10456,7 @@ msgid "'CURRENT' is no longer supported"
 msgstr ""
 
 #: utils/adt/datetime.c:1418 utils/adt/datetime.c:2227
-#: utils/adt/formatting.c:3036
+#: utils/adt/formatting.c:3035
 #, c-format
 msgid "Inconsistent use of year %04d and 'BC'"
 msgstr ""
@@ -10052,136 +10508,136 @@ msgstr ""
 msgid "decode: Bad input string for type bytea"
 msgstr ""
 
-#: utils/adt/float.c:148
+#: utils/adt/float.c:151
 msgid "Bad float4 input format -- overflow"
 msgstr ""
 
-#: utils/adt/float.c:150
+#: utils/adt/float.c:153
 msgid "Bad float4 input format -- underflow"
 msgstr ""
 
-#: utils/adt/float.c:172
+#: utils/adt/float.c:175
 msgid "Bad float8 input format -- overflow"
 msgstr ""
 
-#: utils/adt/float.c:174
+#: utils/adt/float.c:177
 msgid "Bad float8 input format -- underflow"
 msgstr ""
 
-#: utils/adt/float.c:205
+#: utils/adt/float.c:207
 #, c-format
 msgid "Bad float4 input format '%s'"
 msgstr ""
 
-#: utils/adt/float.c:210
+#: utils/adt/float.c:212
 #, c-format
 msgid "Input '%s' is out of range for float4"
 msgstr ""
 
-#: utils/adt/float.c:270 utils/adt/numeric.c:2830 utils/adt/numeric.c:2853
+#: utils/adt/float.c:278 utils/adt/numeric.c:2836 utils/adt/numeric.c:2859
 #, c-format
 msgid "Bad float8 input format '%s'"
 msgstr ""
 
-#: utils/adt/float.c:275
+#: utils/adt/float.c:283
 #, c-format
 msgid "Input '%s' is out of range for float8"
 msgstr ""
 
-#: utils/adt/float.c:494
+#: utils/adt/float.c:508
 msgid "float4div: divide by zero error"
 msgstr ""
 
-#: utils/adt/float.c:556
+#: utils/adt/float.c:570
 msgid "float8div: divide by zero error"
 msgstr ""
 
-#: utils/adt/float.c:806
+#: utils/adt/float.c:820
 msgid "dtoi4: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:823
+#: utils/adt/float.c:837
 msgid "dtoi2: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:868
+#: utils/adt/float.c:882
 msgid "ftoi4: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:885
+#: utils/adt/float.c:899
 msgid "ftoi2: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:1075
+#: utils/adt/float.c:1133
 msgid "can't take sqrt of a negative number"
 msgstr ""
 
-#: utils/adt/float.c:1119
+#: utils/adt/float.c:1177
 msgid "pow() result is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1147
+#: utils/adt/float.c:1205
 msgid "exp() result is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1165 utils/adt/float.c:1186
+#: utils/adt/float.c:1223 utils/adt/float.c:1244
 msgid "can't take log of zero"
 msgstr ""
 
-#: utils/adt/float.c:1167 utils/adt/float.c:1188
+#: utils/adt/float.c:1225 utils/adt/float.c:1246
 msgid "can't take log of a negative number"
 msgstr ""
 
-#: utils/adt/float.c:1213
+#: utils/adt/float.c:1271
 #, c-format
 msgid "acos(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1236
+#: utils/adt/float.c:1294
 #, c-format
 msgid "asin(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1259
+#: utils/adt/float.c:1317
 #, c-format
 msgid "atan(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1283
+#: utils/adt/float.c:1341
 #, c-format
 msgid "atan2(%f,%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1306
+#: utils/adt/float.c:1364
 #, c-format
 msgid "cos(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1329
+#: utils/adt/float.c:1387
 #, c-format
 msgid "cot(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1353
+#: utils/adt/float.c:1411
 #, c-format
 msgid "sin(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1376
+#: utils/adt/float.c:1434
 #, c-format
 msgid "tan(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1487
+#: utils/adt/float.c:1545
 #, c-format
 msgid "%s: expected 3-element float8 array"
 msgstr ""
 
-#: utils/adt/float.c:1698
+#: utils/adt/float.c:1756
 msgid "float48div: divide by zero"
 msgstr ""
 
-#: utils/adt/float.c:1758
+#: utils/adt/float.c:1816
 msgid "float84div: divide by zero"
 msgstr ""
 
@@ -10195,7 +10651,7 @@ msgstr ""
 msgid "Invalid INTERVAL typmod 0x%x"
 msgstr ""
 
-#: utils/adt/formatting.c:391
+#: utils/adt/formatting.c:390
 #, c-format
 msgid ""
 "TMFC:\n"
@@ -10221,7 +10677,7 @@ msgid ""
 "us: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:397
+#: utils/adt/formatting.c:396
 #, c-format
 msgid ""
 "TM:\n"
@@ -10236,98 +10692,98 @@ msgid ""
 "mon %d\n"
 msgstr ""
 
-#: utils/adt/formatting.c:964
+#: utils/adt/formatting.c:963
 msgid "to_char/to_number(): '9' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:981
+#: utils/adt/formatting.c:980
 msgid "to_char/to_number(): '0' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:1008
+#: utils/adt/formatting.c:1007
 msgid "to_char/to_number(): not unique decimal point."
 msgstr ""
 
-#: utils/adt/formatting.c:1013 utils/adt/formatting.c:1100
+#: utils/adt/formatting.c:1012 utils/adt/formatting.c:1099
 msgid "to_char/to_number(): can't use 'V' and decimal poin together."
 msgstr ""
 
-#: utils/adt/formatting.c:1026
+#: utils/adt/formatting.c:1025
 msgid "to_char/to_number(): not unique 'S'."
 msgstr ""
 
-#: utils/adt/formatting.c:1031
+#: utils/adt/formatting.c:1030
 msgid "to_char/to_number(): can't use 'S' and 'PL'/'MI'/'SG'/'PR' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1053
+#: utils/adt/formatting.c:1052
 msgid "to_char/to_number(): can't use 'S' and 'MI' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1062
+#: utils/adt/formatting.c:1061
 msgid "to_char/to_number(): can't use 'S' and 'PL' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1071
+#: utils/adt/formatting.c:1070
 msgid "to_char/to_number(): can't use 'S' and 'SG' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1081
+#: utils/adt/formatting.c:1080
 msgid "to_char/to_number(): can't use 'PR' and 'S'/'PL'/'MI'/'SG' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1107
+#: utils/adt/formatting.c:1106
 msgid "to_char/to_number(): 'E' is not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1131
+#: utils/adt/formatting.c:1130
 msgid "to_char/number(): run parser."
 msgstr ""
 
-#: utils/adt/formatting.c:1327
+#: utils/adt/formatting.c:1326
 msgid "to_from-char(): DUMP FORMAT"
 msgstr ""
 
-#: utils/adt/formatting.c:1332
+#: utils/adt/formatting.c:1331
 #, c-format
 msgid "%d:\t NODE_TYPE_ACTION '%s'\t(%s,%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:1335
+#: utils/adt/formatting.c:1334
 #, c-format
 msgid "%d:\t NODE_TYPE_CHAR '%c'"
 msgstr ""
 
-#: utils/adt/formatting.c:1338
+#: utils/adt/formatting.c:1337
 #, c-format
 msgid "%d:\t NODE_TYPE_END"
 msgstr ""
 
-#: utils/adt/formatting.c:1342
+#: utils/adt/formatting.c:1341
 #, c-format
 msgid "%d:\t UnKnown NODE !!!"
 msgstr ""
 
-#: utils/adt/formatting.c:1366
+#: utils/adt/formatting.c:1365
 #, c-format
 msgid "get_th: '%s' is not number."
 msgstr ""
 
-#: utils/adt/formatting.c:1540
+#: utils/adt/formatting.c:1539
 msgid "TO-FROM_CHAR: Dump KeyWord Index:"
 msgstr ""
 
-#: utils/adt/formatting.c:1546
+#: utils/adt/formatting.c:1545
 #, c-format
 msgid "\t%c: %s, "
 msgstr "\t%c: %s, "
 
-#: utils/adt/formatting.c:1552
+#: utils/adt/formatting.c:1551
 #, c-format
 msgid "\t(%d) %c %d"
 msgstr "\t(%d) %c %d"
 
-#: utils/adt/formatting.c:1555
+#: utils/adt/formatting.c:1554
 #, c-format
 msgid ""
 "\n"
@@ -10335,133 +10791,133 @@ msgid ""
 "\t\tFree positions: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:1627
+#: utils/adt/formatting.c:1626
 msgid "to_timestamp(): bad AM/PM string"
 msgstr ""
 
-#: utils/adt/formatting.c:1971
+#: utils/adt/formatting.c:1970
 msgid "to_timestamp(): TZ/tz not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1979
+#: utils/adt/formatting.c:1978
 #, c-format
 msgid "to_timestamp(): bad value for %s"
 msgstr ""
 
-#: utils/adt/formatting.c:2613 utils/adt/formatting.c:3172
+#: utils/adt/formatting.c:2612 utils/adt/formatting.c:3171
 #, c-format
 msgid "Cache is full (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2621 utils/adt/formatting.c:3189
+#: utils/adt/formatting.c:2620 utils/adt/formatting.c:3188
 #, c-format
 msgid "OLD: '%s' AGE: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:2632 utils/adt/formatting.c:3201
+#: utils/adt/formatting.c:2631 utils/adt/formatting.c:3200
 #, c-format
 msgid "NEW (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2797 utils/adt/formatting.c:2823
+#: utils/adt/formatting.c:2796 utils/adt/formatting.c:2822
 msgid "to_char(): Unable to convert timestamp to tm"
 msgstr ""
 
-#: utils/adt/formatting.c:2999
+#: utils/adt/formatting.c:2998
 msgid "to_timestamp(): AM/PM hour must be between 1 and 12"
 msgstr ""
 
-#: utils/adt/formatting.c:3068
+#: utils/adt/formatting.c:3067
 msgid "to_timestamp() cat't convert yday without year information"
 msgstr ""
 
-#: utils/adt/formatting.c:3103
+#: utils/adt/formatting.c:3102
 msgid "to_timestamp(): can't convert 'tm' to timestamp."
 msgstr ""
 
-#: utils/adt/formatting.c:3251
+#: utils/adt/formatting.c:3250
 #, c-format
 msgid "REMOVING ENTRY (%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:3476
+#: utils/adt/formatting.c:3475
 msgid "CALL: get_last_relevant_decnum()"
 msgstr ""
 
-#: utils/adt/formatting.c:3501
+#: utils/adt/formatting.c:3500
 msgid " --- scan start --- "
 msgstr ""
 
-#: utils/adt/formatting.c:3522
+#: utils/adt/formatting.c:3521
 #, c-format
 msgid "Try read sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3534
+#: utils/adt/formatting.c:3533
 #, c-format
 msgid "Try read locale sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3553
+#: utils/adt/formatting.c:3552
 #, c-format
 msgid "Try read sipmle sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3594
+#: utils/adt/formatting.c:3593
 #, c-format
 msgid "Read digit (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3605
+#: utils/adt/formatting.c:3604
 #, c-format
 msgid "Try read decimal point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3620
+#: utils/adt/formatting.c:3619
 #, c-format
 msgid "Try read locale point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3653
+#: utils/adt/formatting.c:3652
 #, c-format
 msgid "SIGN_WROTE: %d, CURRENT: %d, NUMBER_P: '%s', INOUT: '%s'"
 msgstr "SIGN_WROTE: %d, CURRENT: %d, NUMBER_P: '%s', INOUT: '%s'"
 
-#: utils/adt/formatting.c:3668
+#: utils/adt/formatting.c:3667
 #, c-format
 msgid "Writing sign to position: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3710
+#: utils/adt/formatting.c:3709
 #, c-format
 msgid "Writing bracket to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3732
+#: utils/adt/formatting.c:3731
 #, c-format
 msgid "Writing blank space to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3747
+#: utils/adt/formatting.c:3746
 #, c-format
 msgid "Writing zero to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3765
+#: utils/adt/formatting.c:3764
 #, c-format
 msgid "Writing decimal point to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3814
+#: utils/adt/formatting.c:3813
 #, c-format
 msgid "Writing digit '%c' to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3858
+#: utils/adt/formatting.c:3857
 msgid "to_number(): RN is not supported"
 msgstr ""
 
-#: utils/adt/formatting.c:3980
+#: utils/adt/formatting.c:3979
 #, c-format
 msgid ""
 "\n"
@@ -10490,104 +10946,104 @@ msgstr ""
 "\tZERO_END: %d\n"
 "\tLAST_RELEVANT: %s"
 
-#: utils/adt/formatting.c:4245
+#: utils/adt/formatting.c:4244
 #, c-format
 msgid "TO_NUMBER (number): '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:279
+#: utils/adt/geo_ops.c:290
 msgid "Too many points requested"
 msgstr ""
 
-#: utils/adt/geo_ops.c:300
+#: utils/adt/geo_ops.c:311
 msgid "Unable to format path"
 msgstr ""
 
-#: utils/adt/geo_ops.c:372
+#: utils/adt/geo_ops.c:383
 #, c-format
 msgid "Bad box external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:831
+#: utils/adt/geo_ops.c:842
 #, c-format
 msgid "Bad line external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:836 utils/adt/geo_ops.c:900
+#: utils/adt/geo_ops.c:847 utils/adt/geo_ops.c:911
 msgid "line not yet implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1226 utils/adt/geo_ops.c:1247
+#: utils/adt/geo_ops.c:1237 utils/adt/geo_ops.c:1258
 #, c-format
 msgid "Bad path external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1563
+#: utils/adt/geo_ops.c:1574
 #, c-format
 msgid "Bad point external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1759
+#: utils/adt/geo_ops.c:1770
 #, c-format
 msgid "Bad lseg external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:2309
+#: utils/adt/geo_ops.c:2320
 msgid "dist_lb not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:2820
+#: utils/adt/geo_ops.c:2831
 msgid "close_lb not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3097
+#: utils/adt/geo_ops.c:3108
 msgid "Unable to create bounding box for empty polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3119 utils/adt/geo_ops.c:3130
+#: utils/adt/geo_ops.c:3130 utils/adt/geo_ops.c:3140
 #, c-format
 msgid "Bad polygon external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3418
+#: utils/adt/geo_ops.c:3428
 msgid "poly_distance not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3497
+#: utils/adt/geo_ops.c:3507
 msgid "point_div:  divide by 0.0 error"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3616
+#: utils/adt/geo_ops.c:3626
 msgid "too many points requested."
 msgstr ""
 
-#: utils/adt/geo_ops.c:3724
+#: utils/adt/geo_ops.c:3734
 msgid "path_center not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3739
+#: utils/adt/geo_ops.c:3749
 msgid "Open path cannot be converted to polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3904 utils/adt/geo_ops.c:3912 utils/adt/geo_ops.c:3925
-#: utils/adt/geo_ops.c:3929
+#: utils/adt/geo_ops.c:3914 utils/adt/geo_ops.c:3922 utils/adt/geo_ops.c:3935
+#: utils/adt/geo_ops.c:3939
 #, c-format
 msgid "Bad circle external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3949 utils/adt/geo_ops.c:3955
+#: utils/adt/geo_ops.c:3959 utils/adt/geo_ops.c:3965
 msgid "Unable to format circle"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4434
+#: utils/adt/geo_ops.c:4445
 msgid "Unable to convert circle to polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4441
+#: utils/adt/geo_ops.c:4452
 msgid "too many points requested"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4474 utils/adt/geo_ops.c:4495
+#: utils/adt/geo_ops.c:4485 utils/adt/geo_ops.c:4506
 msgid "Unable to convert polygon to circle"
 msgstr ""
 
@@ -10639,127 +11095,127 @@ msgstr ""
 msgid "ESCAPE string must be empty or one character"
 msgstr ""
 
-#: utils/adt/mac.c:52
+#: utils/adt/mac.c:61
 #, c-format
 msgid "macaddr_in: error in parsing \"%s\""
 msgstr ""
 
-#: utils/adt/mac.c:57
+#: utils/adt/mac.c:66
 #, c-format
 msgid "macaddr_in: illegal address \"%s\""
 msgstr ""
 
-#: utils/adt/mac.c:130
+#: utils/adt/mac.c:139
 msgid "Text is too long to convert to MAC address"
 msgstr ""
 
-#: utils/adt/nabstime.c:352 utils/adt/nabstime.c:385
+#: utils/adt/nabstime.c:340 utils/adt/nabstime.c:373
 #, c-format
 msgid "Invalid timezone '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:489
+#: utils/adt/nabstime.c:477
 #, c-format
 msgid "Bad abstime external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:493
+#: utils/adt/nabstime.c:481
 #, c-format
 msgid "Bad abstime external representation '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:523
+#: utils/adt/nabstime.c:511
 #, c-format
 msgid "Bad abstime (internal coding error) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:714 utils/adt/nabstime.c:782
+#: utils/adt/nabstime.c:702 utils/adt/nabstime.c:770
 msgid "Unable to convert timestamp to abstime"
 msgstr ""
 
-#: utils/adt/nabstime.c:738
+#: utils/adt/nabstime.c:726
 msgid "Unable to convert abstime 'invalid' to timestamp"
 msgstr ""
 
-#: utils/adt/nabstime.c:753
+#: utils/adt/nabstime.c:741
 msgid ""
 "Unable to convert ABSTIME to TIMESTAMP\n"
 "\tabstime_timestamp() internal error"
 msgstr ""
 
-#: utils/adt/nabstime.c:806
+#: utils/adt/nabstime.c:794
 msgid "Unable to convert abstime 'invalid' to timestamptz"
 msgstr ""
 
-#: utils/adt/nabstime.c:821
+#: utils/adt/nabstime.c:809
 msgid ""
 "Unable to convert ABSTIME to TIMESTAMP WITH TIME ZONE\n"
 "\tabstime_timestamptz() internal error"
 msgstr ""
 
-#: utils/adt/nabstime.c:852
+#: utils/adt/nabstime.c:840
 #, c-format
 msgid "Bad reltime external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:856
+#: utils/adt/nabstime.c:844
 #, c-format
 msgid "Bad reltime external representation '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:866
+#: utils/adt/nabstime.c:854
 #, c-format
 msgid "Bad reltime (internal coding error) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:924
+#: utils/adt/nabstime.c:912
 #, c-format
 msgid "Unable to decode tinterval '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:1037
+#: utils/adt/nabstime.c:1025
 msgid "Unable to convert reltime 'invalid' to interval"
 msgstr ""
 
-#: utils/adt/network.c:65
+#: utils/adt/network.c:64
 #, c-format
 msgid "invalid %s value '%s'"
 msgstr ""
 
-#: utils/adt/network.c:76
+#: utils/adt/network.c:75
 #, c-format
 msgid "invalid CIDR value '%s': has bits set to right of mask"
 msgstr ""
 
-#: utils/adt/network.c:128 utils/adt/network.c:469
+#: utils/adt/network.c:127 utils/adt/network.c:468
 #, c-format
 msgid "unable to print address (%s)"
 msgstr ""
 
-#: utils/adt/network.c:138 utils/adt/network.c:402 utils/adt/network.c:439
-#: utils/adt/network.c:473 utils/adt/network.c:519 utils/adt/network.c:559
-#: utils/adt/network.c:601 utils/adt/network.c:637
+#: utils/adt/network.c:137 utils/adt/network.c:401 utils/adt/network.c:438
+#: utils/adt/network.c:472 utils/adt/network.c:517 utils/adt/network.c:556
+#: utils/adt/network.c:597 utils/adt/network.c:633
 #, c-format
 msgid "unknown address family (%d)"
 msgstr ""
 
-#: utils/adt/network.c:185
+#: utils/adt/network.c:184
 #, c-format
 msgid "set_masklen - invalid value '%d'"
 msgstr ""
 
-#: utils/adt/network.c:226 utils/adt/network.c:315 utils/adt/network.c:335
-#: utils/adt/network.c:355 utils/adt/network.c:375
+#: utils/adt/network.c:225 utils/adt/network.c:314 utils/adt/network.c:334
+#: utils/adt/network.c:354 utils/adt/network.c:374
 #, c-format
 msgid "cannot compare address families %d and %d"
 msgstr ""
 
-#: utils/adt/network.c:398 utils/adt/network.c:429
+#: utils/adt/network.c:397 utils/adt/network.c:428
 #, c-format
 msgid "unable to print host (%s)"
 msgstr ""
 
-#: utils/adt/network.c:656
+#: utils/adt/network.c:652
 #, c-format
 msgid "convert_network_to_scalar: unsupported type %u"
 msgstr ""
@@ -10768,71 +11224,71 @@ msgstr ""
 msgid "int4notin: must provide relationname.attributename"
 msgstr ""
 
-#: utils/adt/numeric.c:1506
+#: utils/adt/numeric.c:1512
 msgid "Cannot convert NaN to int4"
 msgstr ""
 
-#: utils/adt/numeric.c:1556
+#: utils/adt/numeric.c:1562
 msgid "Cannot convert NaN to int8"
 msgstr ""
 
-#: utils/adt/numeric.c:1607
+#: utils/adt/numeric.c:1613
 msgid "Cannot convert NaN to int2"
 msgstr ""
 
-#: utils/adt/numeric.c:1803
+#: utils/adt/numeric.c:1809
 msgid "do_numeric_accum: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1894
+#: utils/adt/numeric.c:1900
 msgid "numeric_avg: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1930
+#: utils/adt/numeric.c:1936
 msgid "numeric_variance: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:2012
+#: utils/adt/numeric.c:2018
 msgid "numeric_stddev: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:2208
+#: utils/adt/numeric.c:2214
 msgid "int2_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2228
+#: utils/adt/numeric.c:2234
 msgid "int4_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2246
+#: utils/adt/numeric.c:2252
 msgid "int8_avg: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2437 utils/adt/numeric.c:2452 utils/adt/numeric.c:2470
-#: utils/adt/numeric.c:2474 utils/adt/numeric.c:2485
+#: utils/adt/numeric.c:2443 utils/adt/numeric.c:2458 utils/adt/numeric.c:2476
+#: utils/adt/numeric.c:2480 utils/adt/numeric.c:2491
 #, c-format
 msgid "Bad numeric input format '%s'"
 msgstr ""
 
-#: utils/adt/numeric.c:2804
+#: utils/adt/numeric.c:2810
 #, c-format
 msgid ""
 "overflow on numeric ABS(value) >= 10^%d for field with precision %d scale %d"
 msgstr ""
 
-#: utils/adt/numeric.c:3263
+#: utils/adt/numeric.c:3269
 msgid "division by zero on numeric"
 msgstr ""
 
-#: utils/adt/numeric.c:3644
+#: utils/adt/numeric.c:3650
 msgid "math error on numeric - cannot compute SQRT of negative value"
 msgstr ""
 
-#: utils/adt/numeric.c:3733
+#: utils/adt/numeric.c:3739
 msgid "argument for EXP() too big"
 msgstr ""
 
-#: utils/adt/numeric.c:3812
+#: utils/adt/numeric.c:3818
 msgid "math error on numeric - cannot compute LN of value <= zero"
 msgstr ""
 
@@ -10888,7 +11344,7 @@ msgstr ""
 msgid "Requested buffer is too large."
 msgstr ""
 
-#: utils/adt/pg_locale.c:150
+#: utils/adt/pg_locale.c:160
 msgid "Invalid LC_COLLATE setting"
 msgstr ""
 
@@ -10961,8 +11417,8 @@ msgstr ""
 msgid "No type with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:955 utils/adt/regproc.c:958 utils/adt/varlena.c:1355
-#: utils/adt/varlena.c:1358
+#: utils/adt/regproc.c:955 utils/adt/regproc.c:958 utils/adt/varlena.c:1367
+#: utils/adt/varlena.c:1370
 #, c-format
 msgid "%s: invalid name syntax"
 msgstr ""
@@ -10992,505 +11448,500 @@ msgstr ""
 msgid "%s: too many argument datatypes"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:185
+#: utils/adt/ri_triggers.c:186
 msgid "RI_FKey_check() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:188
+#: utils/adt/ri_triggers.c:189
 msgid "RI_FKey_check() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:191
+#: utils/adt/ri_triggers.c:192
 msgid "RI_FKey_check() must be fired for INSERT or UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:199
+#: utils/adt/ri_triggers.c:200
 msgid "wrong # of arguments in call to RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:201
+#: utils/adt/ri_triggers.c:202
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:215 utils/adt/ri_triggers.c:758
-#: utils/adt/ri_triggers.c:988 utils/adt/ri_triggers.c:1224
-#: utils/adt/ri_triggers.c:1432 utils/adt/ri_triggers.c:1676
-#: utils/adt/ri_triggers.c:1899 utils/adt/ri_triggers.c:2127
-#: utils/adt/ri_triggers.c:2346 utils/adt/ri_triggers.c:2611
-#: utils/adt/ri_triggers.c:2873 utils/adt/ri_triggers.c:3143
+#: utils/adt/ri_triggers.c:216 utils/adt/ri_triggers.c:759
+#: utils/adt/ri_triggers.c:989 utils/adt/ri_triggers.c:1225
+#: utils/adt/ri_triggers.c:1433 utils/adt/ri_triggers.c:1677
+#: utils/adt/ri_triggers.c:1900 utils/adt/ri_triggers.c:2128
+#: utils/adt/ri_triggers.c:2347 utils/adt/ri_triggers.c:2612
+#: utils/adt/ri_triggers.c:2875 utils/adt/ri_triggers.c:3146
 #, c-format
 msgid ""
 "No target table given for trigger \"%s\" on \"%s\"\n"
 "\tRemove these RI triggers and do ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:291 utils/adt/ri_triggers.c:402
-#: utils/adt/ri_triggers.c:607
+#: utils/adt/ri_triggers.c:292 utils/adt/ri_triggers.c:403
+#: utils/adt/ri_triggers.c:608
 msgid "SPI_connect() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:296 utils/adt/ri_triggers.c:480
+#: utils/adt/ri_triggers.c:297 utils/adt/ri_triggers.c:481
 msgid "SPI_execp() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:301
+#: utils/adt/ri_triggers.c:302
 #, c-format
 msgid "%s referential integrity violation - no rows found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:307 utils/adt/ri_triggers.c:492
+#: utils/adt/ri_triggers.c:308 utils/adt/ri_triggers.c:493
 msgid "SPI_finish() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:319 utils/adt/ri_triggers.c:908
-#: utils/adt/ri_triggers.c:1149 utils/adt/ri_triggers.c:1355
-#: utils/adt/ri_triggers.c:1594 utils/adt/ri_triggers.c:1816
-#: utils/adt/ri_triggers.c:2052 utils/adt/ri_triggers.c:2268
-#: utils/adt/ri_triggers.c:2536 utils/adt/ri_triggers.c:2796
-#: utils/adt/ri_triggers.c:3087 utils/adt/ri_triggers.c:3177
+#: utils/adt/ri_triggers.c:320 utils/adt/ri_triggers.c:909
+#: utils/adt/ri_triggers.c:1150 utils/adt/ri_triggers.c:1356
+#: utils/adt/ri_triggers.c:1595 utils/adt/ri_triggers.c:1817
+#: utils/adt/ri_triggers.c:2053 utils/adt/ri_triggers.c:2269
+#: utils/adt/ri_triggers.c:2537 utils/adt/ri_triggers.c:2798
+#: utils/adt/ri_triggers.c:3090 utils/adt/ri_triggers.c:3180
 msgid "MATCH PARTIAL not yet supported"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:355
+#: utils/adt/ri_triggers.c:356
 #, c-format
 msgid ""
 "%s referential integrity violation - MATCH FULL doesn't allow mixing of NULL "
 "and NON-NULL key values"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:379 utils/adt/ri_triggers.c:593
+#: utils/adt/ri_triggers.c:380 utils/adt/ri_triggers.c:594
 msgid "MATCH PARTIAL not yet implemented"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:485
+#: utils/adt/ri_triggers.c:486
 #, c-format
 msgid ""
 "%s referential integrity violation - key referenced from %s not found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:501
+#: utils/adt/ri_triggers.c:502
 msgid "internal error #1 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:678
+#: utils/adt/ri_triggers.c:679
 msgid "SPI_execp() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:685
+#: utils/adt/ri_triggers.c:686
 msgid "SPI_finish() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:726
+#: utils/adt/ri_triggers.c:727
 msgid "RI_FKey_noaction_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:729
+#: utils/adt/ri_triggers.c:730
 msgid "RI_FKey_noaction_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:731
+#: utils/adt/ri_triggers.c:732
 msgid "RI_FKey_noaction_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:739
+#: utils/adt/ri_triggers.c:740
 msgid "wrong # of arguments in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:741
+#: utils/adt/ri_triggers.c:742
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:816
+#: utils/adt/ri_triggers.c:817
 msgid "SPI_connect() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:886
+#: utils/adt/ri_triggers.c:887
 msgid "SPI_execp() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:891 utils/adt/ri_triggers.c:1132
-#: utils/adt/ri_triggers.c:1799 utils/adt/ri_triggers.c:2035
+#: utils/adt/ri_triggers.c:892 utils/adt/ri_triggers.c:1133
+#: utils/adt/ri_triggers.c:1800 utils/adt/ri_triggers.c:2036
 #, c-format
 msgid "%s referential integrity violation - key in %s still referenced from %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:898
+#: utils/adt/ri_triggers.c:899
 msgid "SPI_finish() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:915
+#: utils/adt/ri_triggers.c:916
 msgid "internal error #2 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:956
+#: utils/adt/ri_triggers.c:957
 msgid "RI_FKey_noaction_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:959
+#: utils/adt/ri_triggers.c:960
 msgid "RI_FKey_noaction_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:961
+#: utils/adt/ri_triggers.c:962
 msgid "RI_FKey_noaction_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:969
+#: utils/adt/ri_triggers.c:970
 msgid "wrong # of arguments in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:971
+#: utils/adt/ri_triggers.c:972
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1057
+#: utils/adt/ri_triggers.c:1058
 msgid "SPI_connect() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1127
+#: utils/adt/ri_triggers.c:1128
 msgid "SPI_execp() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1139
+#: utils/adt/ri_triggers.c:1140
 msgid "SPI_finish() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1156
+#: utils/adt/ri_triggers.c:1157
 msgid "internal error #3 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1192
+#: utils/adt/ri_triggers.c:1193
 msgid "RI_FKey_cascade_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1195
+#: utils/adt/ri_triggers.c:1196
 msgid "RI_FKey_cascade_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1197
+#: utils/adt/ri_triggers.c:1198
 msgid "RI_FKey_cascade_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1205
+#: utils/adt/ri_triggers.c:1206
 msgid "wrong # of arguments in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1207
+#: utils/adt/ri_triggers.c:1208
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1271
+#: utils/adt/ri_triggers.c:1272
 msgid "SPI_connect() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1340
+#: utils/adt/ri_triggers.c:1341
 msgid "SPI_execp() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1345
+#: utils/adt/ri_triggers.c:1346
 msgid "SPI_finish() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1362
+#: utils/adt/ri_triggers.c:1363
 msgid "internal error #4 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1400
+#: utils/adt/ri_triggers.c:1401
 msgid "RI_FKey_cascade_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1403
+#: utils/adt/ri_triggers.c:1404
 msgid "RI_FKey_cascade_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1405
+#: utils/adt/ri_triggers.c:1406
 msgid "RI_FKey_cascade_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1413
+#: utils/adt/ri_triggers.c:1414
 msgid "wrong # of arguments in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1415
+#: utils/adt/ri_triggers.c:1416
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1490
+#: utils/adt/ri_triggers.c:1491
 msgid "SPI_connect() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1579
+#: utils/adt/ri_triggers.c:1580
 msgid "SPI_execp() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1584
+#: utils/adt/ri_triggers.c:1585
 msgid "SPI_finish() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1601
+#: utils/adt/ri_triggers.c:1602
 msgid "internal error #5 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1644
+#: utils/adt/ri_triggers.c:1645
 msgid "RI_FKey_restrict_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1647
+#: utils/adt/ri_triggers.c:1648
 msgid "RI_FKey_restrict_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1649
+#: utils/adt/ri_triggers.c:1650
 msgid "RI_FKey_restrict_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1657
+#: utils/adt/ri_triggers.c:1658
 msgid "wrong # of arguments in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1659
+#: utils/adt/ri_triggers.c:1660
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1723
+#: utils/adt/ri_triggers.c:1724
 msgid "SPI_connect() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1794
+#: utils/adt/ri_triggers.c:1795
 msgid "SPI_execp() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1806
+#: utils/adt/ri_triggers.c:1807
 msgid "SPI_finish() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1823
+#: utils/adt/ri_triggers.c:1824
 msgid "internal error #6 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1867
+#: utils/adt/ri_triggers.c:1868
 msgid "RI_FKey_restrict_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1870
+#: utils/adt/ri_triggers.c:1871
 msgid "RI_FKey_restrict_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1872
+#: utils/adt/ri_triggers.c:1873
 msgid "RI_FKey_restrict_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1880
+#: utils/adt/ri_triggers.c:1881
 msgid "wrong # of arguments in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1882
+#: utils/adt/ri_triggers.c:1883
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1957
+#: utils/adt/ri_triggers.c:1958
 msgid "SPI_connect() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2030
+#: utils/adt/ri_triggers.c:2031
 msgid "SPI_execp() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2042
+#: utils/adt/ri_triggers.c:2043
 msgid "SPI_finish() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2059
+#: utils/adt/ri_triggers.c:2060
 msgid "internal error #7 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2095
+#: utils/adt/ri_triggers.c:2096
 msgid "RI_FKey_setnull_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2098
+#: utils/adt/ri_triggers.c:2099
 msgid "RI_FKey_setnull_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2100
+#: utils/adt/ri_triggers.c:2101
 msgid "RI_FKey_setnull_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2108
+#: utils/adt/ri_triggers.c:2109
 msgid "wrong # of arguments in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2110
+#: utils/adt/ri_triggers.c:2111
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2174
+#: utils/adt/ri_triggers.c:2175
 msgid "SPI_connect() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2253
+#: utils/adt/ri_triggers.c:2254
 msgid "SPI_execp() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2258
+#: utils/adt/ri_triggers.c:2259
 msgid "SPI_finish() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2275
+#: utils/adt/ri_triggers.c:2276
 msgid "internal error #8 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2314
+#: utils/adt/ri_triggers.c:2315
 msgid "RI_FKey_setnull_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2317
+#: utils/adt/ri_triggers.c:2318
 msgid "RI_FKey_setnull_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2319
+#: utils/adt/ri_triggers.c:2320
 msgid "RI_FKey_setnull_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2327
+#: utils/adt/ri_triggers.c:2328
 msgid "wrong # of arguments in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2329
+#: utils/adt/ri_triggers.c:2330
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2405
+#: utils/adt/ri_triggers.c:2406
 msgid "SPI_connect() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2521
+#: utils/adt/ri_triggers.c:2522
 msgid "SPI_execp() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2526
+#: utils/adt/ri_triggers.c:2527
 msgid "SPI_finish() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2543
+#: utils/adt/ri_triggers.c:2544
 msgid "internal error #9 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2579
+#: utils/adt/ri_triggers.c:2580
 msgid "RI_FKey_setdefault_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2582
+#: utils/adt/ri_triggers.c:2583
 msgid "RI_FKey_setdefault_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2584
+#: utils/adt/ri_triggers.c:2585
 msgid "RI_FKey_setdefault_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2592
+#: utils/adt/ri_triggers.c:2593
 msgid "wrong # of arguments in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2594
+#: utils/adt/ri_triggers.c:2595
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2658
+#: utils/adt/ri_triggers.c:2659
 msgid "SPI_connect() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2781
+#: utils/adt/ri_triggers.c:2783
 msgid "SPI_execp() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2786
+#: utils/adt/ri_triggers.c:2788
 msgid "SPI_finish() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2803
+#: utils/adt/ri_triggers.c:2805
 msgid "internal error #10 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2841
+#: utils/adt/ri_triggers.c:2843
 msgid "RI_FKey_setdefault_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2844
+#: utils/adt/ri_triggers.c:2846
 msgid "RI_FKey_setdefault_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2846
+#: utils/adt/ri_triggers.c:2848
 msgid "RI_FKey_setdefault_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2854
+#: utils/adt/ri_triggers.c:2856
 msgid "wrong # of arguments in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2856
+#: utils/adt/ri_triggers.c:2858
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2933
+#: utils/adt/ri_triggers.c:2935
 msgid "SPI_connect() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3072
+#: utils/adt/ri_triggers.c:3075
 msgid "SPI_execp() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3077
+#: utils/adt/ri_triggers.c:3080
 msgid "SPI_finish() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3094
+#: utils/adt/ri_triggers.c:3097
 msgid "internal error #11 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3125
+#: utils/adt/ri_triggers.c:3128
 msgid "wrong # of arguments in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3127
+#: utils/adt/ri_triggers.c:3130
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3184
+#: utils/adt/ri_triggers.c:3187
 msgid "internal error #12 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3249
+#: utils/adt/ri_triggers.c:3252
 #, c-format
 msgid "unrecognized referential integrity MATCH type '%s'"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3299 utils/adt/ri_triggers.c:3307
-#: utils/adt/ri_triggers.c:3359
+#: utils/adt/ri_triggers.c:3302 utils/adt/ri_triggers.c:3310
+#: utils/adt/ri_triggers.c:3362
 #, c-format
 msgid "constraint %s: table %s does not have an attribute %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3487
+#: utils/adt/ri_triggers.c:3490
 msgid "out of memory for RI plan cache"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3676
-#, c-format
-msgid "ri_AttributesEqual(): cannot find '=' operator for type %u"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:3692
+#: utils/adt/ri_triggers.c:3690
 msgid "out of memory for RI operator cache"
 msgstr ""
 
@@ -11608,142 +12059,142 @@ msgstr ""
 msgid "get_names_for_var: bogus varno %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2036
+#: utils/adt/ruleutils.c:2092
 #, c-format
-msgid "get_rule_expr: expr opType %d not supported"
+msgid "get_rule_expr: unknown boolop %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2096
+#: utils/adt/ruleutils.c:2123
 #, c-format
 msgid "Argument type %s of FieldSelect is not a tuple type"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2178
+#: utils/adt/ruleutils.c:2205
 #, c-format
 msgid "get_rule_expr: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2211
+#: utils/adt/ruleutils.c:2238
 #, c-format
 msgid "get_rule_expr: unexpected booltesttype %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2256
+#: utils/adt/ruleutils.c:2261
 #, c-format
 msgid "get_rule_expr: unknown node type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2297
+#: utils/adt/ruleutils.c:2302
 #, c-format
 msgid "cache lookup for operator %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2316
+#: utils/adt/ruleutils.c:2321
 msgid "get_rule_expr: bogus oprkind"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2676
+#: utils/adt/ruleutils.c:2677
 #, c-format
 msgid "get_sublink_expr: unsupported sublink type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2769
+#: utils/adt/ruleutils.c:2770
 #, c-format
 msgid "unexpected rte kind %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2841
+#: utils/adt/ruleutils.c:2842
 #, c-format
 msgid "get_from_clause_item: unknown join type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2891
+#: utils/adt/ruleutils.c:2892
 #, c-format
 msgid "get_from_clause_item: unexpected node type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2958 utils/cache/lsyscache.c:250
+#: utils/adt/ruleutils.c:2959 utils/cache/lsyscache.c:251
 #, c-format
 msgid "cache lookup failed for opclass %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2998
+#: utils/adt/ruleutils.c:2999
 msgid "tleIsArrayAssign: I'm confused ..."
 msgstr ""
 
-#: utils/adt/ruleutils.c:3215
+#: utils/adt/ruleutils.c:3216
 #, c-format
 msgid "cache lookup of operator %u failed"
 msgstr "����� � ���� ��������� %u �� ������"
 
-#: utils/adt/ruleutils.c:3236
+#: utils/adt/ruleutils.c:3237
 #, c-format
 msgid "unexpected oprkind %c for operator %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:878
+#: utils/adt/selfuncs.c:880
 #, c-format
 msgid "patternsel: no = operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1060 utils/adt/selfuncs.c:1137
-#: utils/adt/selfuncs.c:1178 utils/adt/selfuncs.c:1208
+#: utils/adt/selfuncs.c:1057 utils/adt/selfuncs.c:1134
+#: utils/adt/selfuncs.c:1175 utils/adt/selfuncs.c:1205
 #, c-format
 msgid "booltestsel: unexpected booltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1246 utils/adt/selfuncs.c:1303
+#: utils/adt/selfuncs.c:1240 utils/adt/selfuncs.c:1294
 #, c-format
 msgid "nulltestsel: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2116
+#: utils/adt/selfuncs.c:2355
 #, c-format
 msgid "convert_numeric_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2303
+#: utils/adt/selfuncs.c:2542
 #, c-format
 msgid "convert_string_datum: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2492
+#: utils/adt/selfuncs.c:2731
 #, c-format
 msgid "convert_timevalue_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2719 utils/adt/selfuncs.c:3080
+#: utils/adt/selfuncs.c:2958 utils/adt/selfuncs.c:3326
 msgid "Cannot perform case insensitive matching on type BYTEA"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2804 utils/adt/selfuncs.c:3226
+#: utils/adt/selfuncs.c:3043 utils/adt/selfuncs.c:3472
 msgid "Regex matching not supported on type BYTEA"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2945
+#: utils/adt/selfuncs.c:3184
 msgid "pattern_fixed_prefix: bogus ptype"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2974
+#: utils/adt/selfuncs.c:3213
 #, c-format
 msgid "prefix_selectivity: no >= operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3001
+#: utils/adt/selfuncs.c:3244
 #, c-format
 msgid "prefix_selectivity: no < operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3270
+#: utils/adt/selfuncs.c:3516
 msgid "pattern_selectivity: bogus ptype"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3432
+#: utils/adt/selfuncs.c:3682
 #, c-format
 msgid "string_lessthan: unexpected datatype %u"
 msgstr ""
 
-#: utils/adt/sets.c:87
+#: utils/adt/sets.c:86
 #, c-format
 msgid "SetDefine: unable to define set %s"
 msgstr ""
@@ -11867,212 +12318,207 @@ msgstr ""
 msgid "AdjustIntervalForTypmod(): internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:701
-#, c-format
-msgid "INTERVAL(%d) precision must be between %d and %d"
-msgstr ""
-
-#: utils/adt/timestamp.c:1525
+#: utils/adt/timestamp.c:1517
 msgid "Unable to subtract non-finite timestamps"
 msgstr ""
 
-#: utils/adt/timestamp.c:1587
+#: utils/adt/timestamp.c:1579
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamp_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1594
+#: utils/adt/timestamp.c:1586
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamp_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1672
+#: utils/adt/timestamp.c:1664
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamptz_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1677
+#: utils/adt/timestamp.c:1669
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamptz_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1906
+#: utils/adt/timestamp.c:1898
 msgid "interval_div: divide by 0.0 error"
 msgstr ""
 
-#: utils/adt/timestamp.c:1951
+#: utils/adt/timestamp.c:1943
 msgid "interval_accum: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:1993
+#: utils/adt/timestamp.c:1985
 msgid "interval_avg: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:2115
+#: utils/adt/timestamp.c:2107
 msgid ""
 "Unable to encode INTERVAL\n"
 "\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2119
+#: utils/adt/timestamp.c:2111
 msgid ""
 "Unable to decode TIMESTAMP\n"
 "\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2224 utils/adt/timestamp.c:2227
+#: utils/adt/timestamp.c:2216 utils/adt/timestamp.c:2219
 msgid "Unable to decode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:2280
+#: utils/adt/timestamp.c:2272
 msgid "TIMESTAMP bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2336
+#: utils/adt/timestamp.c:2328
 msgid "TIMESTAMP WITH TIME ZONE bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2393
+#: utils/adt/timestamp.c:2385
 msgid "INTERVAL bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2426 utils/adt/timestamp.c:2490
-#: utils/adt/timestamp.c:2790 utils/adt/timestamp.c:2932
+#: utils/adt/timestamp.c:2418 utils/adt/timestamp.c:2482
+#: utils/adt/timestamp.c:2782 utils/adt/timestamp.c:2924
 #, c-format
 msgid "TIMESTAMP units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/timestamp.c:2481 utils/adt/timestamp.c:2893
-#: utils/adt/timestamp.c:2925
+#: utils/adt/timestamp.c:2473 utils/adt/timestamp.c:2885
+#: utils/adt/timestamp.c:2917
 #, c-format
 msgid "TIMESTAMP units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2486
+#: utils/adt/timestamp.c:2478
 #, c-format
 msgid "Unable to truncate TIMESTAMP to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2519 utils/adt/timestamp.c:2584
-#: utils/adt/timestamp.c:2962 utils/adt/timestamp.c:3115
+#: utils/adt/timestamp.c:2511 utils/adt/timestamp.c:2576
+#: utils/adt/timestamp.c:2954 utils/adt/timestamp.c:3107
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/timestamp.c:2573 utils/adt/timestamp.c:3076
-#: utils/adt/timestamp.c:3109
+#: utils/adt/timestamp.c:2565 utils/adt/timestamp.c:3068
+#: utils/adt/timestamp.c:3101
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2580
+#: utils/adt/timestamp.c:2572
 #, c-format
 msgid "Unable to truncate TIMESTAMP WITH TIME ZONE to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2613 utils/adt/timestamp.c:2681
-#: utils/adt/timestamp.c:3143 utils/adt/timestamp.c:3252
+#: utils/adt/timestamp.c:2605 utils/adt/timestamp.c:2673
+#: utils/adt/timestamp.c:3135 utils/adt/timestamp.c:3244
 #, c-format
 msgid "INTERVAL units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/timestamp.c:2666 utils/adt/timestamp.c:3223
+#: utils/adt/timestamp.c:2658 utils/adt/timestamp.c:3215
 #, c-format
 msgid "INTERVAL units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2670
+#: utils/adt/timestamp.c:2662
 #, c-format
 msgid "Unable to truncate INTERVAL to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2675
+#: utils/adt/timestamp.c:2667
 msgid "Unable to decode INTERVAL; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2703
+#: utils/adt/timestamp.c:2695
 msgid "isoweek2date(): can't convert without year information"
 msgstr ""
 
-#: utils/adt/timestamp.c:2911 utils/adt/timestamp.c:2918
+#: utils/adt/timestamp.c:2903 utils/adt/timestamp.c:2910
 msgid "Unable to encode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:3095 utils/adt/timestamp.c:3102
+#: utils/adt/timestamp.c:3087 utils/adt/timestamp.c:3094
 msgid "Unable to encode TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: utils/adt/timestamp.c:3232
+#: utils/adt/timestamp.c:3224
 msgid ""
 "Unable to decode INTERVAL\n"
 "\tinterval_part() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:3360
+#: utils/adt/timestamp.c:3352
 msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
 msgstr ""
 
-#: utils/adt/timestamp.c:3365
+#: utils/adt/timestamp.c:3357
 msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: utils/adt/timestamp.c:3390
+#: utils/adt/timestamp.c:3382
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP (tm)"
 msgstr ""
 
-#: utils/adt/timestamp.c:3393
+#: utils/adt/timestamp.c:3385
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP"
 msgstr ""
 
-#: utils/adt/varbit.c:106 utils/adt/varbit.c:231
+#: utils/adt/varbit.c:106 utils/adt/varbit.c:230
 #, c-format
 msgid "Bit string length %d does not match type BIT(%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:127 utils/adt/varbit.c:336
+#: utils/adt/varbit.c:126 utils/adt/varbit.c:333
 #, c-format
 msgid "Cannot parse '%c' as a binary digit"
 msgstr ""
 
-#: utils/adt/varbit.c:148 utils/adt/varbit.c:357
+#: utils/adt/varbit.c:147 utils/adt/varbit.c:354
 #, c-format
 msgid "Cannot parse '%c' as a hex digit"
 msgstr ""
 
-#: utils/adt/varbit.c:315 utils/adt/varbit.c:436
+#: utils/adt/varbit.c:313 utils/adt/varbit.c:433
 #, c-format
 msgid "Bit string too long for type BIT VARYING(%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:806
+#: utils/adt/varbit.c:803
 msgid "Cannot AND bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:844
+#: utils/adt/varbit.c:841
 msgid "Cannot OR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:888
+#: utils/adt/varbit.c:885
 msgid "Cannot XOR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:1103
+#: utils/adt/varbit.c:1100
 msgid "Bit string is too large to fit in type integer"
 msgstr ""
 
-#: utils/adt/varbit.c:1147 utils/adt/varbit.c:1174
+#: utils/adt/varbit.c:1144 utils/adt/varbit.c:1171
 msgid "INT64 is not supported on this platform"
 msgstr ""
 
-#: utils/adt/varbit.c:1162
+#: utils/adt/varbit.c:1159
 msgid "Bit string is too large to fit in type int64"
 msgstr ""
 
-#: utils/adt/varbit.c:1254
+#: utils/adt/varbit.c:1251
 #, c-format
 msgid "S. %d %d em=%2x sm=%2x r=%d"
 msgstr "S. %d %d em=%2x sm=%2x r=%d"
@@ -12087,43 +12533,43 @@ msgstr ""
 msgid "value too long for type character varying(%d)"
 msgstr ""
 
-#: utils/adt/varlena.c:107 utils/adt/varlena.c:145
+#: utils/adt/varlena.c:108 utils/adt/varlena.c:146
 msgid "Bad input string for type bytea"
 msgstr ""
 
-#: utils/adt/varlena.c:337 utils/adt/varlena.c:620 utils/adt/varlena.c:723
+#: utils/adt/varlena.c:338 utils/adt/varlena.c:621 utils/adt/varlena.c:724
 msgid "Invalid backend encoding; encoding max length is less than one."
 msgstr ""
 
-#: utils/adt/varlena.c:484 utils/adt/varlena.c:546 utils/adt/varlena.c:1043
+#: utils/adt/varlena.c:485 utils/adt/varlena.c:547 utils/adt/varlena.c:1055
 msgid "negative substring length not allowed"
 msgstr ""
 
-#: utils/adt/varlena.c:1136
+#: utils/adt/varlena.c:1148
 #, c-format
 msgid "byteaGetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1165
+#: utils/adt/varlena.c:1177
 #, c-format
 msgid "byteaGetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1199
+#: utils/adt/varlena.c:1211
 #, c-format
 msgid "byteaSetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1240
+#: utils/adt/varlena.c:1252
 #, c-format
 msgid "byteaSetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1250
+#: utils/adt/varlena.c:1262
 msgid "byteaSetBit: new bit must be 0 or 1"
 msgstr ""
 
-#: utils/adt/varlena.c:1741
+#: utils/adt/varlena.c:1753
 msgid "field position must be > 0"
 msgstr ""
 
@@ -12176,29 +12622,25 @@ msgstr ""
 msgid "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n"
 msgstr ""
 
-#: utils/cache/catcache.c:861
+#: utils/cache/catcache.c:860
 #, c-format
 msgid "CatalogCacheInitializeCache: cache @%p %s"
 msgstr ""
 
-#: utils/cache/catcache.c:867
+#: utils/cache/catcache.c:866
 #, c-format
 msgid "CatalogCacheInitializeCache: load %d/%d w/%d, %u"
 msgstr ""
 
-#: utils/cache/catcache.c:871
+#: utils/cache/catcache.c:870
 #, c-format
 msgid "CatalogCacheInitializeCache: load %d/%d w/%d"
 msgstr ""
 
-#: utils/cache/catcache.c:941
+#: utils/cache/catcache.c:940
 msgid "CatalogCacheInit: only sys attr supported is OID"
 msgstr ""
 
-#: utils/cache/fcache.c:39
-msgid "init_fcache: too many arguments"
-msgstr ""
-
 #: utils/cache/inval.c:453
 #, c-format
 msgid "ExecuteInvalidationMessage: bogus message id %d"
@@ -12208,75 +12650,75 @@ msgstr ""
 msgid "Out of cache_callback_list slots"
 msgstr ""
 
-#: utils/cache/lsyscache.c:72
+#: utils/cache/lsyscache.c:73
 #, c-format
 msgid "op_requires_recheck: op %u is not a member of opclass %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:217
+#: utils/cache/lsyscache.c:218
 #, c-format
 msgid "cache lookup failed for relation %u attribute %d"
 msgstr ""
 
-#: utils/cache/lsyscache.c:369
+#: utils/cache/lsyscache.c:370
 #, c-format
 msgid "op_mergejoin_crossops: operator %u not found"
 msgstr "op_mergejoin_crossops: �������� %u �� ������"
 
-#: utils/cache/lsyscache.c:377
+#: utils/cache/lsyscache.c:378
 #, c-format
 msgid "op_mergejoin_crossops: mergejoin operator %u has no matching < operator"
 msgstr ""
 
-#: utils/cache/lsyscache.c:384
+#: utils/cache/lsyscache.c:385
 #, c-format
 msgid "op_mergejoin_crossops: mergejoin operator %u has no matching > operator"
 msgstr ""
 
-#: utils/cache/lsyscache.c:429
+#: utils/cache/lsyscache.c:430 utils/cache/lsyscache.c:446
 #, c-format
 msgid "Operator OID %u does not exist"
 msgstr ""
 
-#: utils/cache/lsyscache.c:661
+#: utils/cache/lsyscache.c:699
 #, c-format
 msgid "get_system_catalog_relid: cannot find %s"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1006
+#: utils/cache/lsyscache.c:1044
 #, c-format
 msgid "get_typdefault: failed to lookup type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1087
+#: utils/cache/lsyscache.c:1123
 #, c-format
 msgid "getBaseType: failed to lookup type %u"
 msgstr "getBaseType: ��� %u �� ������"
 
-#: utils/cache/lsyscache.c:1225
+#: utils/cache/lsyscache.c:1261
 #, c-format
 msgid "getTypeInputInfo: Cache lookup of type %u failed"
 msgstr "getTypeInputInfo: ����� � ���� ���� %u �� ������"
 
-#: utils/cache/lsyscache.c:1255
+#: utils/cache/lsyscache.c:1291
 #, c-format
 msgid "getTypeOutputInfo: Cache lookup of type %u failed"
 msgstr "getTypeOutputInfo: ����� � ���� ���� %u �� ������"
 
-#: utils/cache/lsyscache.c:1351
+#: utils/cache/lsyscache.c:1387
 msgid "get_attstatsslot: stavalues is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1373
+#: utils/cache/lsyscache.c:1409
 #, c-format
 msgid "get_attstatsslot: Cache lookup failed for type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1409
+#: utils/cache/lsyscache.c:1445
 msgid "get_attstatsslot: stanumbers is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1420
+#: utils/cache/lsyscache.c:1456
 msgid "get_attstatsslot: stanumbers is not a 1-D float4 array"
 msgstr ""
 
@@ -12311,173 +12753,173 @@ msgstr ""
 msgid "catalog is missing %d attribute(s) for relid %u"
 msgstr ""
 
-#: utils/cache/relcache.c:961
+#: utils/cache/relcache.c:962
 #, c-format
 msgid "RelationInitIndexAccessInfo: no pg_index entry for index %u"
 msgstr ""
 
-#: utils/cache/relcache.c:976
+#: utils/cache/relcache.c:977
 #, c-format
 msgid "RelationInitIndexAccessInfo: cache lookup failed for AM %u"
 msgstr "RelationInitIndexAccessInfo: ����� � ���� AM %u �� ������"
 
-#: utils/cache/relcache.c:1091
+#: utils/cache/relcache.c:1092
 msgid "IndexSupportInitialize: bogus pg_index tuple"
 msgstr ""
 
-#: utils/cache/relcache.c:1198
+#: utils/cache/relcache.c:1199
 msgid "out of memory for operator class cache"
 msgstr ""
 
-#: utils/cache/relcache.c:1272
+#: utils/cache/relcache.c:1273
 #, c-format
 msgid "Bogus amopstrategy number %d for opclass %u"
 msgstr ""
 
-#: utils/cache/relcache.c:1307
+#: utils/cache/relcache.c:1308
 #, c-format
 msgid "Bogus amproc number %d for opclass %u"
 msgstr ""
 
-#: utils/cache/relcache.c:1645
+#: utils/cache/relcache.c:1653
 #, c-format
 msgid "RelationReloadClassinfo system relation id=%d doesn't exist"
 msgstr ""
 
-#: utils/cache/relcache.c:1775
+#: utils/cache/relcache.c:1780
 #, c-format
 msgid "RelationClearRelation: relation %u deleted while still in use"
 msgstr ""
 
-#: utils/cache/relcache.c:1865
+#: utils/cache/relcache.c:1863
 #, c-format
 msgid "RelationForgetRelation: relation %u is still open"
 msgstr ""
 
-#: utils/cache/relcache.c:2022
+#: utils/cache/relcache.c:2020
 #, c-format
 msgid "Relcache reference leak: relation \"%s\" has refcnt %d instead of %d"
 msgstr ""
 
-#: utils/cache/relcache.c:2308
+#: utils/cache/relcache.c:2317
 #, c-format
 msgid "RelationCacheInitializePhase2: no pg_class entry for %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2456
+#: utils/cache/relcache.c:2465
 #, c-format
 msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2464
+#: utils/cache/relcache.c:2473
 #, c-format
 msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2475
+#: utils/cache/relcache.c:2484
 #, c-format
 msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2484
+#: utils/cache/relcache.c:2493
 #, c-format
 msgid "AttrDefaultFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2518
+#: utils/cache/relcache.c:2527
 #, c-format
 msgid "CheckConstraintFetch: unexpected record found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2529
+#: utils/cache/relcache.c:2538
 #, c-format
 msgid "CheckConstraintFetch: conbin IS NULL for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2542
+#: utils/cache/relcache.c:2551
 #, c-format
 msgid "CheckConstraintFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:3005
+#: utils/cache/relcache.c:3027
 #, c-format
 msgid ""
 "Cannot create init file %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: utils/cache/relcache.c:3029
+#: utils/cache/relcache.c:3051
 msgid "cannot write init file -- descriptor length"
 msgstr ""
 
-#: utils/cache/relcache.c:3033
+#: utils/cache/relcache.c:3055
 msgid "cannot write init file -- reldesc"
 msgstr ""
 
-#: utils/cache/relcache.c:3038
+#: utils/cache/relcache.c:3060
 msgid "cannot write init file -- relation tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3041
+#: utils/cache/relcache.c:3063
 msgid "cannot write init file -- relation tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3048
+#: utils/cache/relcache.c:3070
 #, c-format
 msgid "cannot write init file -- length of attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3050
+#: utils/cache/relcache.c:3072
 #, c-format
 msgid "cannot write init file -- attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3069
+#: utils/cache/relcache.c:3091
 #, c-format
 msgid "write_relcache_init_file: no pg_index entry for index %u"
 msgstr ""
 
-#: utils/cache/relcache.c:3073
+#: utils/cache/relcache.c:3095
 msgid "cannot write init file -- index tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3075
+#: utils/cache/relcache.c:3097
 msgid "cannot write init file -- index tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3081
+#: utils/cache/relcache.c:3103
 msgid "cannot write init file -- am tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3084
+#: utils/cache/relcache.c:3106
 msgid "cannot write init file -- am tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3090
+#: utils/cache/relcache.c:3112
 msgid "cannot write init file -- strategy map length"
 msgstr ""
 
-#: utils/cache/relcache.c:3093
+#: utils/cache/relcache.c:3115
 msgid "cannot write init file -- strategy map"
 msgstr ""
 
-#: utils/cache/relcache.c:3098
+#: utils/cache/relcache.c:3120
 msgid "cannot write init file -- operator vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3101
+#: utils/cache/relcache.c:3123
 msgid "cannot write init file -- operator vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3106
+#: utils/cache/relcache.c:3128
 msgid "cannot write init file -- support vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3109
+#: utils/cache/relcache.c:3131
 msgid "cannot write init file -- support vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3153
+#: utils/cache/relcache.c:3175
 #, c-format
 msgid ""
 "Cannot rename init file %s to %s: %m\n"
@@ -12755,7 +13197,7 @@ msgstr ""
 msgid "FunctionCall1: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1002 utils/sort/tuplesort.c:1827
+#: utils/fmgr/fmgr.c:1002 utils/sort/tuplesort.c:1823
 #, c-format
 msgid "FunctionCall2: function %u returned NULL"
 msgstr ""
@@ -12850,12 +13292,12 @@ msgstr ""
 msgid "fmgr: function %u returned NULL"
 msgstr ""
 
-#: utils/hash/dynahash.c:661
+#: utils/hash/dynahash.c:662
 #, c-format
 msgid "hash_search: bogus action %d"
 msgstr ""
 
-#: utils/hash/dynahash.c:934 utils/hash/dynahash.c:936
+#: utils/hash/dynahash.c:935 utils/hash/dynahash.c:937
 #, c-format
 msgid "Hash table '%s' corrupted"
 msgstr ""
@@ -12890,58 +13332,74 @@ msgstr ""
 msgid "FindExec: found \"%s\" using argv[0]"
 msgstr ""
 
-#: utils/init/findbe.c:188
+#: utils/init/findbe.c:177
+#, c-format
+msgid "FindExec: invalid binary \"%s\""
+msgstr ""
+
+#: utils/init/findbe.c:187
 msgid "FindExec: searching PATH ..."
 msgstr ""
 
-#: utils/init/findbe.c:209
+#: utils/init/findbe.c:208
 #, c-format
 msgid "FindExec: found \"%s\" using PATH"
 msgstr ""
 
-#: utils/init/miscinit.c:144 utils/init/miscinit.c:163
-#: utils/init/miscinit.c:171 utils/misc/guc.c:927 utils/misc/guc.c:1110
-#: utils/misc/guc.c:1904 utils/misc/guc.c:1918 utils/misc/guc.c:2673
-#: utils/misc/guc.c:2679 utils/misc/guc.c:2686
+#: utils/init/findbe.c:215
+#, c-format
+msgid "FindExec: could not read binary \"%s\""
+msgstr ""
+
+#: utils/init/findbe.c:225
+#, c-format
+msgid "FindExec: could not find a %s to execute"
+msgstr ""
+
+#: utils/init/miscinit.c:143 utils/init/miscinit.c:162
+#: utils/init/miscinit.c:170 utils/misc/guc.c:940 utils/misc/guc.c:1123
+#: utils/misc/guc.c:1917 utils/misc/guc.c:1931 utils/misc/guc.c:2686
+#: utils/misc/guc.c:2692 utils/misc/guc.c:2699 guc-file.l:147 guc-file.l:267
+#: guc-file.l:302
 msgid "out of memory"
 msgstr "�� ������� ������"
 
-#: utils/init/miscinit.c:157
+#: utils/init/miscinit.c:156
 #, c-format
 msgid "cannot get current working directory: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:247
+#: utils/init/miscinit.c:246
 #, c-format
 msgid "SetCharSet: unknown tag %s in file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:402 utils/init/miscinit.c:458
+#: utils/init/miscinit.c:401 utils/init/miscinit.c:457
 #, c-format
 msgid "GetCharSetByHost: unknown tag %s in file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:636
+#: utils/init/miscinit.c:635
 #, c-format
-msgid "invalid user id %u"
-msgstr ""
+msgid "invalid user id %d"
+msgstr "�������� ID ������������: %d"
 
-#: utils/init/miscinit.c:718
+#: utils/init/miscinit.c:717
 #, c-format
 msgid "Can't create lock file %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:729 utils/init/miscinit.c:732
+#: utils/init/miscinit.c:728 utils/init/miscinit.c:731
 #, c-format
 msgid "Can't read lock file %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:742
+#: utils/init/miscinit.c:741
 #, c-format
 msgid "Bogus data in lock file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:816
+#: utils/init/miscinit.c:815
 #, c-format
 msgid ""
 "Can't remove old lock file %s: %m\n"
@@ -12949,42 +13407,42 @@ msgid ""
 "\tPlease remove the file by hand and try again."
 msgstr ""
 
-#: utils/init/miscinit.c:837
+#: utils/init/miscinit.c:836
 #, c-format
 msgid "Can't write lock file %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:928
+#: utils/init/miscinit.c:927
 #, c-format
 msgid "Failed to rewrite %s: %m"
 msgstr "�� ������� ������������ %s: %m"
 
-#: utils/init/miscinit.c:934
+#: utils/init/miscinit.c:933
 #, c-format
 msgid "Failed to read %s: %m"
 msgstr "�� ������� ��������� %s: %m"
 
-#: utils/init/miscinit.c:947
+#: utils/init/miscinit.c:946
 #, c-format
 msgid "Bogus data in %s"
 msgstr "\"�����\" ������ � %s"
 
-#: utils/init/miscinit.c:971
+#: utils/init/miscinit.c:970
 #, c-format
 msgid "Failed to write %s: %m"
 msgstr "�� ������� �������� %s: %m"
 
-#: utils/init/miscinit.c:1013
+#: utils/init/miscinit.c:1012
 #, c-format
 msgid "File %s is missing. This is not a valid data directory."
 msgstr "���� %s �����������. ��� �������� ���������� ������."
 
-#: utils/init/miscinit.c:1020
+#: utils/init/miscinit.c:1019
 #, c-format
 msgid "File %s does not contain valid data. You need to initdb."
 msgstr "���� %s �� �������� ������ ������. ��� ���� ��������� initdb."
 
-#: utils/init/miscinit.c:1025
+#: utils/init/miscinit.c:1024
 #, c-format
 msgid ""
 "The data directory was initialized by PostgreSQL version %ld.%ld, which is "
@@ -13037,11 +13495,11 @@ msgid ""
 "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
 msgstr ""
 
-#: utils/init/postinit.c:410
+#: utils/init/postinit.c:390
 msgid "Non-superuser connection limit exceeded"
 msgstr ""
 
-#: utils/mb/encnames.c:440
+#: utils/mb/encnames.c:445
 msgid "pg_char_to_encname_struct(): encoding name too long"
 msgstr ""
 
@@ -13060,31 +13518,31 @@ msgstr "
 msgid "LocalToUtf: could not convert (0x%04x) %s to UTF-8. Ignored"
 msgstr ""
 
-#: utils/mb/mbutils.c:170
+#: utils/mb/mbutils.c:174
 #, c-format
 msgid "default conversion proc for %s to %s not found"
 msgstr ""
 
-#: utils/mb/mbutils.c:184
+#: utils/mb/mbutils.c:188
 #, c-format
 msgid "default conversion proc %u for %s to %s not found in pg_proc"
 msgstr ""
 
-#: utils/mb/mbutils.c:243
+#: utils/mb/mbutils.c:247
 #, c-format
 msgid "Invalid source encoding name %s"
 msgstr "�������� ��� �������� ���������: %s"
 
-#: utils/mb/mbutils.c:245
+#: utils/mb/mbutils.c:249
 #, c-format
 msgid "Invalid destination encoding name %s"
 msgstr "�������� ��� ��������� ����������: %s"
 
-#: utils/mb/mbutils.c:255
+#: utils/mb/mbutils.c:259
 msgid "Encoding conversion failed"
 msgstr ""
 
-#: utils/mb/mbutils.c:473
+#: utils/mb/mbutils.c:480
 msgid "SetDatabaseEncoding(): invalid database encoding"
 msgstr ""
 
@@ -13092,111 +13550,125 @@ msgstr ""
 msgid "Could not convert UTF-8 to ISO8859-1"
 msgstr "�� ���������� ��������������� �� UTF-8 � ISO8859-1"
 
-#: utils/misc/guc.c:1206 utils/misc/guc.c:1221 utils/misc/guc.c:1236
-#: utils/misc/guc.c:1265
+#: utils/misc/guc.c:1219 utils/misc/guc.c:1234 utils/misc/guc.c:1249
+#: utils/misc/guc.c:1278
 #, c-format
 msgid "Failed to reset %s"
 msgstr ""
 
-#: utils/misc/guc.c:1333 utils/misc/guc.c:1355 utils/misc/guc.c:1377
-#: utils/misc/guc.c:1407
+#: utils/misc/guc.c:1346 utils/misc/guc.c:1368 utils/misc/guc.c:1390
+#: utils/misc/guc.c:1420
 #, c-format
 msgid "Failed to commit %s"
 msgstr ""
 
-#: utils/misc/guc.c:1586 utils/misc/guc.c:2136
+#: utils/misc/guc.c:1599 utils/misc/guc.c:2149
 #, c-format
 msgid "'%s' is not a valid option name"
 msgstr ""
 
-#: utils/misc/guc.c:1603
+#: utils/misc/guc.c:1616
 #, c-format
 msgid "'%s' cannot be changed after server start"
 msgstr ""
 
-#: utils/misc/guc.c:1611
+#: utils/misc/guc.c:1624
 #, c-format
 msgid "'%s' cannot be changed now"
 msgstr ""
 
-#: utils/misc/guc.c:1638
+#: utils/misc/guc.c:1651
 #, c-format
 msgid "'%s' cannot be set after connection start"
 msgstr ""
 
-#: utils/misc/guc.c:1646
+#: utils/misc/guc.c:1659
 #, c-format
 msgid "'%s': permission denied"
 msgstr "'%s': ��� �������"
 
-#: utils/misc/guc.c:1676
+#: utils/misc/guc.c:1689
 #, c-format
 msgid "%s: setting ignored because previous source is higher priority"
 msgstr ""
 
-#: utils/misc/guc.c:1697
+#: utils/misc/guc.c:1710
 #, c-format
 msgid "option '%s' requires a boolean value"
 msgstr "����� '%s' ������� ��������� ��������"
 
-#: utils/misc/guc.c:1711 utils/misc/guc.c:1782
+#: utils/misc/guc.c:1724 utils/misc/guc.c:1795
 #, c-format
 msgid "invalid value for option '%s': %d"
 msgstr "�� ������ �������� ��� ����� '%s': %d"
 
-#: utils/misc/guc.c:1761
+#: utils/misc/guc.c:1774
 #, c-format
 msgid "option '%s' expects an integer value"
 msgstr "����� '%s' ������� ����� ��������"
 
-#: utils/misc/guc.c:1767
+#: utils/misc/guc.c:1780
 #, c-format
 msgid "option '%s' value %d is outside of permissible range [%d .. %d]"
 msgstr ""
 
-#: utils/misc/guc.c:1832
+#: utils/misc/guc.c:1845
 #, c-format
 msgid "option '%s' expects a real number"
 msgstr "����� '%s' ������� �������� �����"
 
-#: utils/misc/guc.c:1838
+#: utils/misc/guc.c:1851
 #, c-format
 msgid "option '%s' value %g is outside of permissible range [%g .. %g]"
 msgstr ""
 
-#: utils/misc/guc.c:1853
+#: utils/misc/guc.c:1866
 #, c-format
 msgid "invalid value for option '%s': %g"
 msgstr "�� ������ �������� ��� ����� '%s': %g"
 
-#: utils/misc/guc.c:1947
+#: utils/misc/guc.c:1960
 #, c-format
 msgid "invalid value for option '%s': '%s'"
 msgstr "�� ������ �������� ��� ����� '%s': '%s'"
 
-#: utils/misc/guc.c:2048 utils/misc/guc.c:2082 utils/misc/guc.c:2396
+#: utils/misc/guc.c:2061 utils/misc/guc.c:2095 utils/misc/guc.c:2409
 #, c-format
 msgid "Option '%s' is not recognized"
 msgstr "����� '%s' �� ����������"
 
-#: utils/misc/guc.c:2143
+#: utils/misc/guc.c:2156
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s ��������� ������ ���� ��������"
 
-#: utils/misc/guc.c:2156 utils/misc/guc.c:2205
+#: utils/misc/guc.c:2169 utils/misc/guc.c:2218
 msgid "flatten_set_variable_args: unexpected input"
 msgstr ""
 
-#: utils/misc/guc.c:2244
+#: utils/misc/guc.c:2257
 msgid "SET variable name is required"
 msgstr "SET ��������� ��� ����������"
 
-#: utils/misc/guc.c:2780
+#: utils/misc/guc.c:2793
 #, c-format
 msgid "cannot parse setting \"%s\""
 msgstr "�� ���������� ���������������� ����� \"%s\""
 
+#: guc-file.l:158
+msgid "could not read configuration file `"
+msgstr "�� ���������� ������� ���� ������������ `"
+
+#: guc-file.l:158
+#, c-format
+msgid "': %s"
+msgstr "': %s"
+
+#: guc-file.l:259
+#, c-format
+msgid ":%u: syntax error, token=\"%s\""
+msgstr ":%u: ������ ����������, �����=\"%s\""
+
 #: utils/mmgr/portalmem.c:78
 msgid "out of memory in PortalHashTable"
 msgstr "�� ������� ������ � PortalHashTable"
@@ -13209,7 +13681,7 @@ msgstr ""
 msgid "trying to delete portal name that does not exist."
 msgstr ""
 
-#: utils/mmgr/portalmem.c:196
+#: utils/mmgr/portalmem.c:185
 #, c-format
 msgid "CreatePortal: portal \"%s\" already exists"
 msgstr "CreatePortal: ������ \"%s\" ��� ����������"
@@ -13219,77 +13691,77 @@ msgstr "CreatePortal: 
 msgid "Memory exhausted in AllocSetContextCreate(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:495 utils/mmgr/aset.c:692
+#: utils/mmgr/aset.c:496 utils/mmgr/aset.c:693
 #, c-format
 msgid "Memory exhausted in AllocSetAlloc(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:741
+#: utils/mmgr/aset.c:757
 #, c-format
 msgid "AllocSetFree: detected write past chunk end in %s %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:762
+#: utils/mmgr/aset.c:778
 #, c-format
 msgid "AllocSetFree: cannot find block containing chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:816
+#: utils/mmgr/aset.c:832
 #, c-format
 msgid "AllocSetRealloc: detected write past chunk end in %s %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:856
+#: utils/mmgr/aset.c:872
 #, c-format
 msgid "AllocSetRealloc: cannot find block containing chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:869
+#: utils/mmgr/aset.c:885
 #, c-format
 msgid "Memory exhausted in AllocSetReAlloc(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:1039
+#: utils/mmgr/aset.c:1055
 #, c-format
 msgid "AllocSetCheck: %s: empty block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1061
+#: utils/mmgr/aset.c:1077
 #, c-format
 msgid "AllocSetCheck: %s: req size > alloc size for chunk %p in block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1064
+#: utils/mmgr/aset.c:1080
 #, c-format
 msgid "AllocSetCheck: %s: bad size %lu for chunk %p in block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1070
+#: utils/mmgr/aset.c:1086
 #, c-format
 msgid "AllocSetCheck: %s: bad single-chunk %p in block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1079
+#: utils/mmgr/aset.c:1095
 #, c-format
 msgid "AllocSetCheck: %s: bogus aset link in block %p, chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1086
+#: utils/mmgr/aset.c:1102
 #, c-format
 msgid "AllocSetCheck: %s: detected write past chunk end in block %p, chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1096
+#: utils/mmgr/aset.c:1112
 #, c-format
 msgid "AllocSetCheck: %s: found inconsistent memory block %p"
 msgstr ""
 
-#: utils/mmgr/mcxt.c:449
+#: utils/mmgr/mcxt.c:478 utils/mmgr/mcxt.c:499 utils/mmgr/mcxt.c:524
 #, c-format
 msgid "MemoryContextAlloc: invalid request size %lu"
 msgstr ""
 
-#: utils/mmgr/mcxt.c:509
+#: utils/mmgr/mcxt.c:588
 #, c-format
 msgid "repalloc: invalid request size %lu"
 msgstr ""
@@ -13318,118 +13790,118 @@ msgstr ""
 msgid "LogicalTapeSeek: unexpected end of tape"
 msgstr ""
 
-#: utils/sort/tuplesort.c:698
+#: utils/sort/tuplesort.c:694
 msgid "tuplesort_puttuple: invalid state"
 msgstr "tuplesort_puttuple: �������� ���������"
 
-#: utils/sort/tuplesort.c:745
+#: utils/sort/tuplesort.c:741
 msgid "tuplesort_performsort: invalid state"
 msgstr "tuplesort_performsort: �������� ���������"
 
-#: utils/sort/tuplesort.c:863 utils/sort/tuplesort.c:878
+#: utils/sort/tuplesort.c:859 utils/sort/tuplesort.c:874
 msgid "tuplesort_gettuple: bogus tuple len in backward scan"
 msgstr ""
 
-#: utils/sort/tuplesort.c:930
+#: utils/sort/tuplesort.c:926
 msgid "tuplesort_gettuple: invalid state"
 msgstr "tuplesort_gettuple: �������� ���������"
 
-#: utils/sort/tuplesort.c:1490
+#: utils/sort/tuplesort.c:1486
 msgid "tuplesort_rescan: invalid state"
 msgstr "tuplesort_rescan: �������� ���������"
 
-#: utils/sort/tuplesort.c:1517
+#: utils/sort/tuplesort.c:1513
 msgid "tuplesort_markpos: invalid state"
 msgstr "tuplesort_markpos: �������� ���������"
 
-#: utils/sort/tuplesort.c:1542
+#: utils/sort/tuplesort.c:1538
 msgid "tuplesort_restorepos failed"
 msgstr "tuplesort_restorepos �� ������"
 
-#: utils/sort/tuplesort.c:1546
+#: utils/sort/tuplesort.c:1542
 msgid "tuplesort_restorepos: invalid state"
 msgstr "tuplesort_restorepos: �������� ���������"
 
-#: utils/sort/tuplesort.c:1669
+#: utils/sort/tuplesort.c:1665
 msgid "tuplesort: unexpected end of tape"
 msgstr ""
 
-#: utils/sort/tuplesort.c:1671 utils/sort/tuplesort.c:1995
-#: utils/sort/tuplesort.c:1999 utils/sort/tuplesort.c:2121
-#: utils/sort/tuplesort.c:2125 utils/sort/tuplesort.c:2193
-#: utils/sort/tuplesort.c:2197
+#: utils/sort/tuplesort.c:1667 utils/sort/tuplesort.c:2006
+#: utils/sort/tuplesort.c:2010 utils/sort/tuplesort.c:2133
+#: utils/sort/tuplesort.c:2137 utils/sort/tuplesort.c:2205
+#: utils/sort/tuplesort.c:2209
 msgid "tuplesort: unexpected end of data"
 msgstr "tuplesort: ����������� ����� ������"
 
-#: utils/sort/tuplesort.c:1789
+#: utils/sort/tuplesort.c:1785
 #, c-format
 msgid "SelectSortFunction: cache lookup failed for operator %u"
 msgstr ""
 
-#: utils/sort/tuplesort.c:1901
+#: utils/sort/tuplesort.c:1897
 #, c-format
 msgid "Invalid SortFunctionKind %d"
 msgstr "�� ������ SortFunctionKind %d"
 
-#: utils/sort/tuplesort.c:2073
+#: utils/sort/tuplesort.c:2085
 msgid "Cannot create unique index. Table contains non-unique values"
 msgstr ""
 
-#: utils/sort/tuplesort.c:2149
+#: utils/sort/tuplesort.c:2161
 msgid "copytup_datum() should not be called"
 msgstr ""
 
-#: utils/sort/tuplestore.c:302
+#: utils/sort/tuplestore.c:300
 msgid "tuplestore_puttuple: invalid state"
 msgstr "tuplestore_puttuple: �������� ���������"
 
-#: utils/sort/tuplestore.c:338
+#: utils/sort/tuplestore.c:336
 msgid "tuplestore_donestoring: seek(0) failed"
 msgstr "tuplestore_donestoring: seek(0) �� ������"
 
-#: utils/sort/tuplestore.c:346
+#: utils/sort/tuplestore.c:344
 msgid "tuplestore_donestoring: invalid state"
 msgstr "tuplestore_donestoring: �������� ���������"
 
-#: utils/sort/tuplestore.c:464 utils/sort/tuplestore.c:479
+#: utils/sort/tuplestore.c:462 utils/sort/tuplestore.c:477
 msgid "tuplestore_gettuple: bogus tuple len in backward scan"
 msgstr ""
 
-#: utils/sort/tuplestore.c:484
+#: utils/sort/tuplestore.c:482
 msgid "tuplestore_gettuple: invalid state"
 msgstr "tuplestore_gettuple: �������� ���������"
 
-#: utils/sort/tuplestore.c:520
+#: utils/sort/tuplestore.c:518
 msgid "tuplestore_rescan: seek(0) failed"
 msgstr "tuplestore_rescan: seek(0) �� ������"
 
-#: utils/sort/tuplestore.c:527
+#: utils/sort/tuplestore.c:525
 msgid "tuplestore_rescan: invalid state"
 msgstr "tuplestore_rescan: �������� ���������"
 
-#: utils/sort/tuplestore.c:553
+#: utils/sort/tuplestore.c:551
 msgid "tuplestore_markpos: invalid state"
 msgstr "tuplestore_markpos: �������� ���������"
 
-#: utils/sort/tuplestore.c:578
+#: utils/sort/tuplestore.c:576
 msgid "tuplestore_restorepos failed"
 msgstr "tuplestore_restorepos �� ������"
 
-#: utils/sort/tuplestore.c:582
+#: utils/sort/tuplestore.c:580
 msgid "tuplestore_restorepos: invalid state"
 msgstr "tuplestore_restorepos: �������� ���������"
 
-#: utils/sort/tuplestore.c:598
+#: utils/sort/tuplestore.c:596
 msgid "tuplestore: unexpected end of tape"
 msgstr "tuplestore: ����������� ����� �����"
 
-#: utils/sort/tuplestore.c:600 utils/sort/tuplestore.c:669
-#: utils/sort/tuplestore.c:673
+#: utils/sort/tuplestore.c:598 utils/sort/tuplestore.c:667
+#: utils/sort/tuplestore.c:671
 msgid "tuplestore: unexpected end of data"
 msgstr "tuplestore: ����������� ����� ������"
 
-#: utils/sort/tuplestore.c:610 utils/sort/tuplestore.c:641
-#: utils/sort/tuplestore.c:644 utils/sort/tuplestore.c:648
+#: utils/sort/tuplestore.c:608 utils/sort/tuplestore.c:639
+#: utils/sort/tuplestore.c:642 utils/sort/tuplestore.c:646
 msgid "tuplestore: write failed"
 msgstr "tuplestore: ������ �� �������"
 
@@ -13437,32 +13909,14 @@ msgstr "tuplestore: 
 msgid "CopyQuerySnapshot: no snapshot has been set"
 msgstr ""
 
-#~ msgid "start transaction"
-#~ msgstr "������ ����������"
-
-#~ msgid "commit transaction"
-#~ msgstr "������������� ����������"
+#~ msgid "TRUNCATE TABLE cannot run inside a transaction block"
+#~ msgstr "������ ��������� TRUNCATE TABLE ������ ��������������� �����"
 
-#~ msgid "inserting row with oid %u..."
-#~ msgstr "����������� ������ � OID %u..."
+#~ msgid "Conversion does not exist"
+#~ msgstr "��������� �� ����������"
 
-#~ msgid "inserting row..."
-#~ msgstr "����������� ������..."
-
-#~ msgid "incorrect number of columns in row (expected %d, got %d)"
-#~ msgstr "������� ����� ������� � ������ (��������� %d, �������� %d)"
-
-#~ msgid "relation not open"
-#~ msgstr "������ �� ������"
-
-#~ msgid "too many columns"
-#~ msgstr "������� ����� �������"
-
-#~ msgid "syntax error at line %d: unexpected character %s"
-#~ msgstr "������ ���������� � ������ %d: ����������� ������ %s"
-
-#~ msgid "syntax error at line %d: unexpected token %s"
-#~ msgstr "������ ���������� � ������ %d: ����������� ����� %s"
+#~ msgid "Function %s does not exist"
+#~ msgstr "������� %s �� ����������"
 
 #~ msgid "doDeletion: Relation %u does not exist"
 #~ msgstr "doDeletion: ����� %u �� ����������"
@@ -13470,43 +13924,6 @@ msgstr ""
 #~ msgid "function %s() does not return type %s"
 #~ msgstr "������� %s() �� ���������� ��� %s"
 
-#~ msgid "SET TRANSACTION/READ ONLY not yet supported"
-#~ msgstr "SET TRANSACTION/READ ONLY ���� �� ��������������"
-
-#~ msgid "CREATE TABLE AS may not specify INTO"
-#~ msgstr "CREATE TABLE AS �� ����� ��������� INTO"
-
-#~ msgid "CREATE ASSERTION is not yet supported"
-#~ msgstr "CREATE ASSERTION ���� �� ��������������"
-
-#~ msgid "DROP ASSERTION is not yet supported"
-#~ msgstr "DROP ASSERTION ���� �� ��������������"
-
-#~ msgid "CREATE FUNCTION / OUT parameters are not supported"
-#~ msgstr "CREATE FUNCTION / OUT ��������� �� ��������������"
-
-#~ msgid "CREATE FUNCTION / INOUT parameters are not supported"
-#~ msgstr "CREATE FUNCTION / INOUT ��������� �� ��������������"
-
-#~ msgid "%s is not a valid encoding name"
-#~ msgstr "%s �� �������� ������ ������ ���������"
-
-#~ msgid "%d is not a valid encoding code"
-#~ msgstr "%d �� �������� ������ ����� ���������"
-
-#~ msgid ""
-#~ "LIMIT #,# syntax not supported.\n"
-#~ "\tUse separate LIMIT and OFFSET clauses."
-#~ msgstr ""
-#~ "��������� LIMIT #,# ������ �� ��������������.\n"
-#~ "\t����������� LIMIT � OFFSET ��� ���� �����."
-
-#~ msgid "LIMIT must not be negative"
-#~ msgstr "LIMIT �� ������ ���� �������������"
-
-#~ msgid "OFFSET must not be negative"
-#~ msgstr "OFFSET �� ������ ���� �������������"
-
 #~ msgid "Conversion \"%s\" does not exist"
 #~ msgstr "��������� \"%s\" �� ����������"
 
diff --git a/src/backend/po/sv.po b/src/backend/po/sv.po
index dbc712defae0a78076dda6e2f3c1c14badc90c55..4be46d6e0f7a1b51afcb3a8cd1f181898b69fb56 100644
--- a/src/backend/po/sv.po
+++ b/src/backend/po/sv.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-10-03 04:18-0400\n"
-"PO-Revision-Date: 2002-10-04 08:23+0200\n"
+"POT-Creation-Date: 2002-10-25 04:16-0400\n"
+"PO-Revision-Date: 2002-10-26 07:22+0200\n"
 "Last-Translator: Dennis Bj�rklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -312,7 +312,7 @@ msgstr ""
 msgid "simple_heap_delete: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1448 executor/execMain.c:1333
+#: access/heap/heapam.c:1448 executor/execMain.c:1334
 #, c-format
 msgid "Unknown status %u from heap_delete"
 msgstr ""
@@ -333,7 +333,7 @@ msgstr ""
 msgid "simple_heap_update: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1782 executor/execMain.c:1472
+#: access/heap/heapam.c:1782 executor/execMain.c:1473
 #, c-format
 msgid "Unknown status %u from heap_update"
 msgstr ""
@@ -726,99 +726,99 @@ msgstr ""
 msgid "bt_getroot[%s]: fixing root page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:787
+#: access/nbtree/nbtree.c:806
 #, c-format
 msgid ""
 "_bt_restscan: my bits moved right off the end of the world!\n"
 "\tRecreate index %s."
 msgstr ""
 
-#: access/nbtree/nbtree.c:817
+#: access/nbtree/nbtree.c:836
 msgid "_bt_restore_page: can't add item to page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:840
+#: access/nbtree/nbtree.c:859
 msgid "btree_delete_redo: block unfound"
 msgstr ""
 
-#: access/nbtree/nbtree.c:843
+#: access/nbtree/nbtree.c:862
 msgid "btree_delete_redo: uninitialized page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:879
+#: access/nbtree/nbtree.c:898
 #, c-format
 msgid "btree_insert_%sdo: block unfound"
 msgstr ""
 
-#: access/nbtree/nbtree.c:882
+#: access/nbtree/nbtree.c:901
 #, c-format
 msgid "btree_insert_%sdo: uninitialized page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:896
+#: access/nbtree/nbtree.c:915
 msgid "btree_insert_redo: failed to add item"
 msgstr ""
 
-#: access/nbtree/nbtree.c:905
+#: access/nbtree/nbtree.c:924
 msgid "btree_insert_undo: bad page LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:913
+#: access/nbtree/nbtree.c:932
 msgid "btree_insert_undo: unimplemented"
 msgstr ""
 
-#: access/nbtree/nbtree.c:940
+#: access/nbtree/nbtree.c:959
 #, c-format
 msgid "btree_split_%s: lost left sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:946
+#: access/nbtree/nbtree.c:965
 msgid "btree_split_undo: uninitialized left sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:969
+#: access/nbtree/nbtree.c:988
 msgid "btree_split_undo: bad left sibling LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:970 access/nbtree/nbtree.c:1009
+#: access/nbtree/nbtree.c:989 access/nbtree/nbtree.c:1028
 msgid "btree_split_undo: unimplemented"
 msgstr ""
 
-#: access/nbtree/nbtree.c:978
+#: access/nbtree/nbtree.c:997
 #, c-format
 msgid "btree_split_%s: lost right sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:984
+#: access/nbtree/nbtree.c:1003
 msgid "btree_split_undo: uninitialized right sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1008
+#: access/nbtree/nbtree.c:1027
 msgid "btree_split_undo: bad right sibling LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1022
+#: access/nbtree/nbtree.c:1041
 msgid "btree_split_redo: lost next right page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1026
+#: access/nbtree/nbtree.c:1045
 msgid "btree_split_redo: uninitialized next right page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1063
+#: access/nbtree/nbtree.c:1082
 msgid "btree_newroot_redo: no root page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1066
+#: access/nbtree/nbtree.c:1085
 msgid "btree_newroot_redo: no metapage"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1120
+#: access/nbtree/nbtree.c:1139
 #, c-format
 msgid "btree_redo: unknown op code %u"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1140
+#: access/nbtree/nbtree.c:1159
 #, c-format
 msgid "btree_undo: unknown op code %u"
 msgstr ""
@@ -930,7 +930,7 @@ msgstr ""
 msgid "read of clog file %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/clog.c:602 access/transam/xlog.c:1375
+#: access/transam/clog.c:602 access/transam/xlog.c:1380
 #, c-format
 msgid "creation of file %s failed: %m"
 msgstr ""
@@ -959,65 +959,87 @@ msgstr ""
 msgid "could not read transaction-commit log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xact.c:424
+#: access/transam/xact.c:425
 msgid "You may only have 2^32-1 commands per transaction"
 msgstr ""
 
-#: access/transam/xact.c:714
+#: access/transam/xact.c:715
 #, c-format
 msgid "RecordTransactionAbort: xact %u already committed"
 msgstr ""
 
-#: access/transam/xact.c:943
+#: access/transam/xact.c:944
 msgid "CommitTransaction and not in in-progress state"
 msgstr ""
 
-#: access/transam/xact.c:1066
+#: access/transam/xact.c:1079
 msgid "AbortTransaction and not in in-progress state"
 msgstr ""
 
-#: access/transam/xact.c:1143
+#: access/transam/xact.c:1164
 msgid "CleanupTransaction and not in abort state"
 msgstr ""
 
-#: access/transam/xact.c:1175
+#: access/transam/xact.c:1196
 msgid "StartTransactionCommand: can't prevent chain"
 msgstr ""
 
-#: access/transam/xact.c:1194
+#: access/transam/xact.c:1215
 msgid "StartTransactionCommand: unexpected TBLOCK_BEGIN"
 msgstr ""
 
-#: access/transam/xact.c:1215
+#: access/transam/xact.c:1236
 msgid "StartTransactionCommand: unexpected TBLOCK_END"
 msgstr ""
 
-#: access/transam/xact.c:1238
+#: access/transam/xact.c:1259
 msgid "StartTransactionCommand: unexpected TBLOCK_ENDABORT"
 msgstr ""
 
-#: access/transam/xact.c:1440
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1475
+#, c-format
+msgid "%s cannot run inside a transaction block"
+msgstr ""
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1485
+#, c-format
+msgid "%s cannot be executed from a function"
+msgstr ""
+
+#: access/transam/xact.c:1489
+msgid "PreventTransactionChain: can't prevent chain"
+msgstr ""
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1496
+#, c-format
+msgid "%s will be committed automatically"
+msgstr ""
+
+#: access/transam/xact.c:1518
 msgid "BEGIN: already a transaction in progress"
 msgstr ""
 
-#: access/transam/xact.c:1504
+#: access/transam/xact.c:1582
 msgid "COMMIT: no transaction in progress"
 msgstr "COMMIT: ingen transaktion p�g�r"
 
-#: access/transam/xact.c:1541 access/transam/xact.c:1588
+#: access/transam/xact.c:1619 access/transam/xact.c:1666
 msgid "ROLLBACK: no transaction in progress"
 msgstr "ROLLBACK: ingen transaktion p�g�r"
 
-#: access/transam/xact.c:1662 access/transam/xact.c:1673
+#: access/transam/xact.c:1740 access/transam/xact.c:1751
 #, c-format
 msgid "xact_redo: unknown op code %u"
 msgstr ""
 
-#: access/transam/xact.c:1671
+#: access/transam/xact.c:1749
 msgid "xact_undo: can't undo committed xaction"
 msgstr ""
 
-#: access/transam/xact.c:1708
+#: access/transam/xact.c:1786
 msgid "XactPushRollback: already installed"
 msgstr ""
 
@@ -1036,7 +1058,7 @@ msgstr ""
 msgid "XLogInsert: invalid record length %u"
 msgstr ""
 
-#: access/transam/xlog.c:786 access/transam/xlog.c:2622 utils/adt/name.c:52
+#: access/transam/xlog.c:786 access/transam/xlog.c:2627 utils/adt/name.c:52
 #: utils/adt/varchar.c:83 utils/adt/varchar.c:357 utils/adt/varlena.c:225
 #, c-format
 msgid "%s"
@@ -1048,7 +1070,7 @@ msgid "XLogWrite: write request %X/%X is past end of log %X/%X"
 msgstr ""
 
 #: access/transam/xlog.c:1047 access/transam/xlog.c:1157
-#: access/transam/xlog.c:3326
+#: access/transam/xlog.c:3331
 #, c-format
 msgid "close of log file %u, segment %u failed: %m"
 msgstr ""
@@ -1072,190 +1094,190 @@ msgstr ""
 msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X\n"
 msgstr ""
 
-#: access/transam/xlog.c:1310
+#: access/transam/xlog.c:1315
 #, c-format
 msgid "XLogFlush: request %X/%X is not satisfied --- flushed only to %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1353 access/transam/xlog.c:1434
-#: access/transam/xlog.c:1544 access/transam/xlog.c:1548
+#: access/transam/xlog.c:1358 access/transam/xlog.c:1439
+#: access/transam/xlog.c:1549 access/transam/xlog.c:1553
 #, c-format
 msgid "open of %s (log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1402
+#: access/transam/xlog.c:1407
 #, c-format
 msgid "ZeroFill failed to write %s: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1407
+#: access/transam/xlog.c:1412
 #, c-format
 msgid "fsync of file %s failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1512
+#: access/transam/xlog.c:1517
 #, c-format
 msgid ""
 "link from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1517
+#: access/transam/xlog.c:1522
 #, c-format
 msgid ""
 "rename from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1598
+#: access/transam/xlog.c:1603
 #, c-format
 msgid "could not open transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1613
+#: access/transam/xlog.c:1618
 #, c-format
 msgid "archiving transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1615
+#: access/transam/xlog.c:1620
 msgid "archiving log files is not implemented!"
 msgstr ""
 
-#: access/transam/xlog.c:1629
+#: access/transam/xlog.c:1634
 #, c-format
 msgid "recycled transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1635
+#: access/transam/xlog.c:1640
 #, c-format
 msgid "removing transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1644
+#: access/transam/xlog.c:1649
 #, c-format
 msgid "could not read transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1717
+#: access/transam/xlog.c:1722
 #, c-format
 msgid "ReadRecord: bad resource manager data checksum in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1739
+#: access/transam/xlog.c:1744
 #, c-format
 msgid "ReadRecord: bad checksum of backup block %d in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1808
+#: access/transam/xlog.c:1813
 #, c-format
 msgid "ReadRecord: invalid record offset at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1831
+#: access/transam/xlog.c:1836
 #, c-format
 msgid "ReadRecord: lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1837 access/transam/xlog.c:1921
+#: access/transam/xlog.c:1842 access/transam/xlog.c:1926
 #, c-format
 msgid "ReadRecord: read of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1847
+#: access/transam/xlog.c:1852
 #, c-format
 msgid "ReadRecord: contrecord is requested by %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1861
+#: access/transam/xlog.c:1866
 #, c-format
 msgid "ReadRecord: record with zero length at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1885
+#: access/transam/xlog.c:1890
 #, c-format
 msgid "ReadRecord: record length %u at %X/%X too long"
 msgstr ""
 
-#: access/transam/xlog.c:1891
+#: access/transam/xlog.c:1896
 #, c-format
 msgid "ReadRecord: invalid resource manager id %u at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1929
+#: access/transam/xlog.c:1934
 #, c-format
 msgid ""
 "ReadRecord: there is no ContRecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:1937
+#: access/transam/xlog.c:1942
 #, c-format
 msgid ""
 "ReadRecord: invalid ContRecord length %u in log file %u, segment %u, offset %"
 "u"
 msgstr ""
 
-#: access/transam/xlog.c:2001
+#: access/transam/xlog.c:2006
 #, c-format
 msgid ""
 "ReadRecord: invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2007
+#: access/transam/xlog.c:2012
 #, c-format
 msgid ""
 "ReadRecord: invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2015
+#: access/transam/xlog.c:2020
 #, c-format
 msgid ""
 "ReadRecord: unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
 
 #. translator: SUI = startup id
-#: access/transam/xlog.c:2037
+#: access/transam/xlog.c:2042
 #, c-format
 msgid ""
 "ReadRecord: out-of-sequence SUI %u (after %u) in log file %u, segment %u, "
 "offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2096
+#: access/transam/xlog.c:2101
 msgid "invalid LC_COLLATE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2100
+#: access/transam/xlog.c:2105
 msgid "invalid LC_CTYPE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2118
+#: access/transam/xlog.c:2123
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr ""
 
-#: access/transam/xlog.c:2126
+#: access/transam/xlog.c:2131
 #, c-format
 msgid "WriteControlFile: could not create control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2135
+#: access/transam/xlog.c:2140
 #, c-format
 msgid "WriteControlFile: write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2139
+#: access/transam/xlog.c:2144
 #, c-format
 msgid "WriteControlFile: fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2155 access/transam/xlog.c:2278
+#: access/transam/xlog.c:2160 access/transam/xlog.c:2283
 #, c-format
 msgid "could not open control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2158
+#: access/transam/xlog.c:2163
 #, c-format
 msgid "read from control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2170
+#: access/transam/xlog.c:2175
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d,\n"
@@ -1263,11 +1285,11 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2183
+#: access/transam/xlog.c:2188
 msgid "invalid checksum in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2199
+#: access/transam/xlog.c:2204
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d,\n"
@@ -1275,7 +1297,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2205
+#: access/transam/xlog.c:2210
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d,\n"
@@ -1283,7 +1305,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2211
+#: access/transam/xlog.c:2216
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d,\n"
@@ -1291,7 +1313,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2218
+#: access/transam/xlog.c:2223
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d,\n"
@@ -1299,7 +1321,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2225
+#: access/transam/xlog.c:2230
 #, c-format
 msgid ""
 "The database cluster was initialized with FUNC_MAX_ARGS %d,\n"
@@ -1307,21 +1329,21 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2233
+#: access/transam/xlog.c:2238
 msgid ""
 "The database cluster was initialized without HAVE_INT64_TIMESTAMP\n"
 "\tbut the backend was compiled with HAVE_INT64_TIMESTAMP.\n"
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2239
+#: access/transam/xlog.c:2244
 msgid ""
 "The database cluster was initialized with HAVE_INT64_TIMESTAMP\n"
 "\tbut the backend was compiled without HAVE_INT64_TIMESTAMP.\n"
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2246
+#: access/transam/xlog.c:2251
 #, c-format
 msgid ""
 "The database cluster was initialized with LOCALE_NAME_BUFLEN %d,\n"
@@ -1329,7 +1351,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2253
+#: access/transam/xlog.c:2258
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_COLLATE '%s',\n"
@@ -1337,7 +1359,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2259
+#: access/transam/xlog.c:2264
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_CTYPE '%s',\n"
@@ -1345,41 +1367,41 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2286
+#: access/transam/xlog.c:2291
 #, c-format
 msgid "write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2290
+#: access/transam/xlog.c:2295
 #, c-format
 msgid "fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2430
+#: access/transam/xlog.c:2435
 #, c-format
 msgid "BootStrapXLOG failed to write log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2434
+#: access/transam/xlog.c:2439
 #, c-format
 msgid "BootStrapXLOG failed to fsync log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2500
+#: access/transam/xlog.c:2505
 msgid "control file context is broken"
 msgstr ""
 
-#: access/transam/xlog.c:2503
+#: access/transam/xlog.c:2508
 #, c-format
 msgid "database system was shut down at %s"
 msgstr ""
 
-#: access/transam/xlog.c:2506
+#: access/transam/xlog.c:2511
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr ""
 
-#: access/transam/xlog.c:2509
+#: access/transam/xlog.c:2514
 #, c-format
 msgid ""
 "database system was interrupted being in recovery at %s\n"
@@ -1387,156 +1409,156 @@ msgid ""
 "\tand you will have to use the last backup for recovery."
 msgstr ""
 
-#: access/transam/xlog.c:2514
+#: access/transam/xlog.c:2519
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr ""
 
-#: access/transam/xlog.c:2525
+#: access/transam/xlog.c:2530
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2534
+#: access/transam/xlog.c:2539
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2539
+#: access/transam/xlog.c:2544
 msgid "unable to locate a valid checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2545
+#: access/transam/xlog.c:2550
 #, c-format
 msgid "redo record is at %X/%X; undo record is at %X/%X; shutdown %s"
 msgstr ""
 
-#: access/transam/xlog.c:2549
+#: access/transam/xlog.c:2554
 #, c-format
 msgid "next transaction id: %u; next oid: %u"
 msgstr "n�sta transaktions-id: %u; n�sta oid: %u"
 
-#: access/transam/xlog.c:2552
+#: access/transam/xlog.c:2557
 msgid "invalid next transaction id"
 msgstr "n�sta transaktions-id ogiltig"
 
-#: access/transam/xlog.c:2563
+#: access/transam/xlog.c:2568
 msgid "invalid redo in checkpoint record"
 msgstr "ogiltig redo i checkpoint-post"
 
-#: access/transam/xlog.c:2571
+#: access/transam/xlog.c:2576
 msgid "invalid redo/undo record in shutdown checkpoint"
 msgstr ""
 
-#: access/transam/xlog.c:2580
+#: access/transam/xlog.c:2585
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 
-#: access/transam/xlog.c:2600
+#: access/transam/xlog.c:2605
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2631
+#: access/transam/xlog.c:2636
 #, c-format
 msgid "redo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2637
+#: access/transam/xlog.c:2642
 msgid "redo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2719
+#: access/transam/xlog.c:2724
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2729
+#: access/transam/xlog.c:2734
 #, c-format
 msgid "undo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2733
+#: access/transam/xlog.c:2738
 msgid "undo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2767
+#: access/transam/xlog.c:2772
 msgid "database system is ready"
 msgstr "databassystemet �r redo"
 
-#: access/transam/xlog.c:2799
+#: access/transam/xlog.c:2804
 msgid "invalid primary checkpoint link in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2800
+#: access/transam/xlog.c:2805
 msgid "invalid secondary checkpoint link in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2809
+#: access/transam/xlog.c:2814
 msgid "invalid primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2810
+#: access/transam/xlog.c:2815
 msgid "invalid secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2816
+#: access/transam/xlog.c:2821
 msgid "invalid resource manager id in primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2817
+#: access/transam/xlog.c:2822
 msgid "invalid resource manager id in secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2824
+#: access/transam/xlog.c:2829
 msgid "invalid xl_info in primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2825
+#: access/transam/xlog.c:2830
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2831
+#: access/transam/xlog.c:2836
 msgid "invalid length of primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2832
+#: access/transam/xlog.c:2837
 msgid "invalid length of secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2895
+#: access/transam/xlog.c:2900
 msgid "shutting down"
 msgstr "st�nger ner"
 
-#: access/transam/xlog.c:2908
+#: access/transam/xlog.c:2913
 msgid "database system is shut down"
 msgstr "databassystemet �r nedst�ngt"
 
-#: access/transam/xlog.c:2929
+#: access/transam/xlog.c:2934
 msgid "CreateCheckPoint: cannot be called inside transaction block"
 msgstr ""
 
-#: access/transam/xlog.c:3044
+#: access/transam/xlog.c:3049
 msgid "active transaction while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3090
+#: access/transam/xlog.c:3095
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3321 access/transam/xlog.c:3349
+#: access/transam/xlog.c:3326 access/transam/xlog.c:3354
 #, c-format
 msgid "fsync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3355
+#: access/transam/xlog.c:3360
 #, c-format
 msgid "fdatasync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3363
+#: access/transam/xlog.c:3368
 #, c-format
 msgid "bogus wal_sync_method %d"
 msgstr ""
@@ -1729,7 +1751,7 @@ msgid "database \"%s\" not found"
 msgstr "hittar inte databasen \"%s\""
 
 #: catalog/aclchk.c:302 catalog/aclchk.c:474 catalog/pg_conversion.c:180
-#: commands/dbcommands.c:517 commands/user.c:851 tcop/utility.c:835
+#: commands/dbcommands.c:515 commands/user.c:911 tcop/utility.c:827
 #: utils/init/miscinit.c:616
 msgid "permission denied"
 msgstr "r�ttighet saknas"
@@ -1739,7 +1761,7 @@ msgstr "r
 msgid "invalid privilege type %s for function object"
 msgstr ""
 
-#: catalog/aclchk.c:389 parser/parse_func.c:867 parser/parse_func.c:1315
+#: catalog/aclchk.c:389 parser/parse_func.c:891 parser/parse_func.c:1339
 #, c-format
 msgid "function %u not found"
 msgstr ""
@@ -1816,7 +1838,7 @@ msgstr ""
 msgid "aclcheck: bogus ACL id type: %d"
 msgstr ""
 
-#: catalog/aclchk.c:879 commands/user.c:1232
+#: catalog/aclchk.c:879 commands/user.c:1299
 #, c-format
 msgid "%s: permission denied"
 msgstr "%s: r�ttighet saknas"
@@ -2122,7 +2144,7 @@ msgstr ""
 msgid "cache lookup of attribute %d in relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:1493 commands/tablecmds.c:2567 commands/tablecmds.c:2603
+#: catalog/heap.c:1493 commands/tablecmds.c:2603 commands/tablecmds.c:2639
 #, c-format
 msgid "constraint \"%s\" already exists for relation \"%s\""
 msgstr ""
@@ -2137,11 +2159,11 @@ msgstr ""
 msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1573 commands/tablecmds.c:2684
+#: catalog/heap.c:1573 commands/tablecmds.c:2720
 msgid "cannot use subselect in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1575 commands/tablecmds.c:2686
+#: catalog/heap.c:1575 commands/tablecmds.c:2722
 msgid "cannot use aggregate function in CHECK constraint expression"
 msgstr ""
 
@@ -2168,10 +2190,6 @@ msgid ""
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: catalog/heap.c:1931
-msgid "TRUNCATE TABLE cannot run inside a transaction block"
-msgstr ""
-
 #: catalog/index.c:125
 #, c-format
 msgid "Function %u does not exist"
@@ -2261,24 +2279,20 @@ msgstr ""
 msgid "IndexGetRelation: can't find index id %u"
 msgstr ""
 
-#: catalog/index.c:1751
-msgid "REINDEX cannot run inside a transaction block"
-msgstr ""
-
-#: catalog/index.c:1765
+#: catalog/index.c:1755
 msgid "reindex_index: can't open index relation"
 msgstr ""
 
-#: catalog/index.c:1776
+#: catalog/index.c:1766
 msgid "reindex_index: can't open heap relation"
 msgstr ""
 
-#: catalog/index.c:1790 catalog/index.c:1913
+#: catalog/index.c:1780 catalog/index.c:1903
 #, c-format
 msgid "the target relation %u is shared"
 msgstr ""
 
-#: catalog/index.c:1796
+#: catalog/index.c:1786
 #, c-format
 msgid "the target relation %u is nailed"
 msgstr ""
@@ -2470,7 +2484,7 @@ msgstr ""
 msgid "OperatorDef: can't create operator shell \"%s\""
 msgstr ""
 
-#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1376
+#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1400
 #, c-format
 msgid "functions cannot have more than %d arguments"
 msgstr ""
@@ -2800,9 +2814,9 @@ msgstr "relation \"%s\" 
 msgid "CommentAttribute: must specify relation.attribute"
 msgstr ""
 
-#: commands/comment.c:374 commands/tablecmds.c:1887 commands/tablecmds.c:2021
-#: commands/tablecmds.c:2139 commands/tablecmds.c:2356
-#: optimizer/prep/prepunion.c:804 parser/parse_func.c:1159
+#: commands/comment.c:374 commands/tablecmds.c:1923 commands/tablecmds.c:2057
+#: commands/tablecmds.c:2175 commands/tablecmds.c:2392
+#: optimizer/prep/prepunion.c:804 parser/parse_func.c:1183
 #: parser/parse_relation.c:1551 parser/parse_relation.c:1614
 #: parser/parse_relation.c:1770 parser/parse_type.c:88
 #, c-format
@@ -2813,7 +2827,7 @@ msgstr ""
 msgid "CommentDatabase: database name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:409 commands/dbcommands.c:513 utils/adt/acl.c:1039
+#: commands/comment.c:409 commands/dbcommands.c:511 utils/adt/acl.c:1039
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "databaseen \"%s\" existerar inte"
@@ -2886,197 +2900,197 @@ msgstr ""
 msgid "Function %s does not exist"
 msgstr "Funktion %s existerar inte"
 
-#: commands/copy.c:125
+#: commands/copy.c:126
 #, c-format
 msgid "CopySendData: %m"
 msgstr ""
 
-#: commands/copy.c:300
+#: commands/copy.c:301
 msgid "COPY: BINARY option appears more than once"
 msgstr ""
 
-#: commands/copy.c:307
+#: commands/copy.c:308
 msgid "COPY: OIDS option appears more than once"
 msgstr ""
 
-#: commands/copy.c:314
+#: commands/copy.c:315
 msgid "COPY: DELIMITER string may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:321
+#: commands/copy.c:322
 msgid "COPY: NULL representation may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:326
+#: commands/copy.c:327
 #, c-format
 msgid "COPY: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/copy.c:331
+#: commands/copy.c:332
 msgid "You can not specify the DELIMITER in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:334
+#: commands/copy.c:335
 msgid "You can not specify NULL in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:354
+#: commands/copy.c:355
 msgid ""
 "You must have Postgres superuser privilege to do a COPY directly to or from "
 "a file.  Anyone can COPY to stdout or from stdin.  Psql's \\copy command "
 "also works for anyone."
 msgstr ""
 
-#: commands/copy.c:363
+#: commands/copy.c:364
 msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr ""
 
-#: commands/copy.c:369
+#: commands/copy.c:370
 msgid "COPY delimiter must be a single character"
 msgstr ""
 
-#: commands/copy.c:375
+#: commands/copy.c:376
 #, c-format
 msgid "COPY: table \"%s\" does not have OIDs"
 msgstr ""
 
-#: commands/copy.c:396 commands/copy.c:441
+#: commands/copy.c:397 commands/copy.c:442
 #, c-format
 msgid "You cannot copy view %s"
 msgstr ""
 
-#: commands/copy.c:399
+#: commands/copy.c:400
 #, c-format
 msgid "You cannot change sequence relation %s"
 msgstr ""
 
-#: commands/copy.c:402 commands/copy.c:447
+#: commands/copy.c:403 commands/copy.c:448
 #, c-format
 msgid "You cannot copy object %s"
 msgstr ""
 
-#: commands/copy.c:422
+#: commands/copy.c:423
 #, c-format
 msgid ""
 "COPY command, running in backend with effective uid %d, could not open file "
 "'%s' for reading.  Errno = %s (%d)."
 msgstr ""
 
-#: commands/copy.c:431 commands/copy.c:487
+#: commands/copy.c:432 commands/copy.c:488
 #, c-format
 msgid "COPY: %s is a directory"
 msgstr ""
 
-#: commands/copy.c:444
+#: commands/copy.c:445
 #, c-format
 msgid "You cannot copy sequence %s"
 msgstr ""
 
-#: commands/copy.c:471
+#: commands/copy.c:472
 msgid "Relative path not allowed for server side COPY command"
 msgstr ""
 
-#: commands/copy.c:479
+#: commands/copy.c:480
 #, c-format
 msgid ""
 "COPY command, running in backend with effective uid %d, could not open file "
 "'%s' for writing.  Errno = %s (%d)."
 msgstr ""
 
-#: commands/copy.c:556
+#: commands/copy.c:557
 #, c-format
 msgid "COPY: couldn't lookup info for type %u"
 msgstr ""
 
-#: commands/copy.c:560 commands/copy.c:826
+#: commands/copy.c:561 commands/copy.c:827
 msgid "COPY BINARY: cstring not supported"
 msgstr ""
 
-#: commands/copy.c:893
+#: commands/copy.c:894
 msgid "COPY BINARY: file signature not recognized"
 msgstr ""
 
-#: commands/copy.c:897
+#: commands/copy.c:898
 msgid "COPY BINARY: incompatible integer layout"
 msgstr ""
 
-#: commands/copy.c:901
+#: commands/copy.c:902
 msgid "COPY BINARY: bogus file header (missing flags)"
 msgstr ""
 
-#: commands/copy.c:905
+#: commands/copy.c:906
 msgid "COPY BINARY: unrecognized critical flags in header"
 msgstr ""
 
-#: commands/copy.c:909
+#: commands/copy.c:910
 msgid "COPY BINARY: bogus file header (missing length)"
 msgstr ""
 
-#: commands/copy.c:915
+#: commands/copy.c:916
 msgid "COPY BINARY: bogus file header (wrong length)"
 msgstr ""
 
-#: commands/copy.c:964
+#: commands/copy.c:965
 msgid "NULL Oid"
 msgstr "NULL Oid"
 
-#: commands/copy.c:970
+#: commands/copy.c:971
 msgid "Invalid Oid"
 msgstr "Ogiltig Oid"
 
-#: commands/copy.c:987
+#: commands/copy.c:988
 #, c-format
 msgid "Missing data for column \"%s\""
 msgstr "Saknar data f�r kolumn \"%s\""
 
-#: commands/copy.c:1019
+#: commands/copy.c:1020
 msgid "Extra data after last expected column"
 msgstr ""
 
-#: commands/copy.c:1043
+#: commands/copy.c:1044
 #, c-format
 msgid "COPY BINARY: tuple field count is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1050 commands/copy.c:1056 commands/copy.c:1071
-#: commands/copy.c:1085 commands/copy.c:1094 commands/copy.c:1106
-#: commands/copy.c:1121
+#: commands/copy.c:1051 commands/copy.c:1057 commands/copy.c:1072
+#: commands/copy.c:1086 commands/copy.c:1095 commands/copy.c:1107
+#: commands/copy.c:1122
 msgid "COPY BINARY: unexpected EOF"
 msgstr "COPY BINARY: ov�ntad EOF"
 
-#: commands/copy.c:1052
+#: commands/copy.c:1053
 #, c-format
 msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1058
+#: commands/copy.c:1059
 msgid "COPY BINARY: Invalid Oid"
 msgstr ""
 
-#: commands/copy.c:1075
+#: commands/copy.c:1076
 #, c-format
 msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1087
+#: commands/copy.c:1088
 msgid "COPY BINARY: bogus varlena length"
 msgstr ""
 
-#: commands/copy.c:1263
+#: commands/copy.c:1264
 #, c-format
 msgid "GetInputFunction: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1279
+#: commands/copy.c:1280
 #, c-format
 msgid "GetTypeElement: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1421
+#: commands/copy.c:1422
 msgid "CopyReadAttribute: end of record marker corrupted"
 msgstr ""
 
-#: commands/copy.c:1581
+#: commands/copy.c:1582
 #, c-format
 msgid "Attribute \"%s\" specified more than once"
 msgstr "Attributet \"%s\" angivet mer �n en g�ng"
@@ -3095,131 +3109,125 @@ msgstr "CREATE DATABASE: flagga \"%s\" k
 msgid "CREATE DATABASE: permission denied"
 msgstr "CREATE DATABASE: r�ttighet saknas"
 
-#: commands/dbcommands.c:156
-msgid "CREATE DATABASE: may not be called in a transaction block"
-msgstr "CREATE DATABASE: kan inte anropas i ett transaktionsblock"
-
-#: commands/dbcommands.c:167 commands/dbcommands.c:307
+#: commands/dbcommands.c:166 commands/dbcommands.c:306
 #, c-format
 msgid "CREATE DATABASE: database \"%s\" already exists"
 msgstr "CREATE DATABASE: databasen \"%s\" existerar redan"
 
-#: commands/dbcommands.c:179
+#: commands/dbcommands.c:178
 #, c-format
 msgid "CREATE DATABASE: template \"%s\" does not exist"
 msgstr "CREATE DATABASE: mallen \"%s\" existerar inte"
 
-#: commands/dbcommands.c:189
+#: commands/dbcommands.c:188
 #, c-format
 msgid "CREATE DATABASE: permission to copy \"%s\" denied"
 msgstr "CREATE DATABASE: r�ttighet att kopiera \"%s\" saknas"
 
-#: commands/dbcommands.c:208
+#: commands/dbcommands.c:207
 #, c-format
 msgid ""
 "CREATE DATABASE: source database \"%s\" is being accessed by other users"
 msgstr "CREATE DATABASE: k�lldatabas \"%s\" anv�nds av andra anv�ndare"
 
-#: commands/dbcommands.c:216
+#: commands/dbcommands.c:215
 msgid "CREATE DATABASE: invalid backend encoding"
 msgstr ""
 
-#: commands/dbcommands.c:244 commands/dbcommands.c:246
-#: commands/dbcommands.c:248
+#: commands/dbcommands.c:243 commands/dbcommands.c:245
+#: commands/dbcommands.c:247
 msgid "database path may not contain single quotes"
 msgstr ""
 
-#: commands/dbcommands.c:271
+#: commands/dbcommands.c:270
 #, c-format
 msgid "CREATE DATABASE: unable to create database directory '%s': %m"
 msgstr ""
 
-#: commands/dbcommands.c:274
+#: commands/dbcommands.c:273
 #, c-format
 msgid "CREATE DATABASE: unable to remove temp directory '%s': %m"
 msgstr "CREATE DATABASE: kan inte ta bort tempor�r katalog \"%s\": %m"
 
-#: commands/dbcommands.c:281
+#: commands/dbcommands.c:280
 #, c-format
 msgid "CREATE DATABASE: could not link '%s' to '%s': %m"
 msgstr "CREATE DATABASE: kunde inte l�nka \"%s\" till \"%s\": %m"
 
-#: commands/dbcommands.c:291
+#: commands/dbcommands.c:290
 msgid "CREATE DATABASE: could not initialize database directory"
 msgstr "CREATE DATABASE: kunde inte initialisera databaskatalogen"
 
-#: commands/dbcommands.c:293
+#: commands/dbcommands.c:292
 msgid ""
 "CREATE DATABASE: could not initialize database directory; delete failed as "
 "well"
-msgstr "CREATE DATABASE: kunde inte initialisera databaskatalogen; borttagning misslyckades med"
-
-#: commands/dbcommands.c:383
-msgid "DROP DATABASE: cannot be executed on the currently open database"
 msgstr ""
+"CREATE DATABASE: kunde inte initialisera databaskatalogen; borttagning "
+"misslyckades med"
 
-#: commands/dbcommands.c:386
-msgid "DROP DATABASE: may not be called in a transaction block"
+#: commands/dbcommands.c:382
+msgid "DROP DATABASE: cannot be executed on the currently open database"
 msgstr ""
 
-#: commands/dbcommands.c:401
+#: commands/dbcommands.c:399
 #, c-format
 msgid "DROP DATABASE: database \"%s\" does not exist"
 msgstr "DROP DATABASE: databasen \"%s\" existerar inte"
 
-#: commands/dbcommands.c:404
+#: commands/dbcommands.c:402
 msgid "DROP DATABASE: permission denied"
 msgstr "DROP DATABASE: r�ttighet saknas"
 
-#: commands/dbcommands.c:412
+#: commands/dbcommands.c:410
 msgid "DROP DATABASE: database is marked as a template"
 msgstr "DROP DATABASE: databasen �r markerad som en mall"
 
-#: commands/dbcommands.c:421
+#: commands/dbcommands.c:419
 #, c-format
 msgid "DROP DATABASE: database \"%s\" is being accessed by other users"
 msgstr "DROP DATABASE: databasen \"%s\" anv�nds av andra anv�ndare"
 
-#: commands/dbcommands.c:438
+#: commands/dbcommands.c:436
 #, c-format
 msgid ""
 "DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the "
 "contrary"
 msgstr ""
 
-#: commands/dbcommands.c:679
+#: commands/dbcommands.c:677
 msgid "Relative paths are not allowed as database locations"
 msgstr ""
 
-#: commands/dbcommands.c:681
+#: commands/dbcommands.c:679
 msgid "Absolute paths are not allowed as database locations"
 msgstr ""
 
-#: commands/dbcommands.c:691
+#: commands/dbcommands.c:689
 #, c-format
 msgid "Postmaster environment variable '%s' not set"
 msgstr ""
 
-#: commands/dbcommands.c:693
+#: commands/dbcommands.c:691
 #, c-format
 msgid "Postmaster environment variable '%s' must be absolute path"
 msgstr ""
 
-#: commands/dbcommands.c:699
+#: commands/dbcommands.c:697
 msgid "Alternate path is too long"
 msgstr ""
 
-#: commands/dbcommands.c:728
+#: commands/dbcommands.c:726
 #, c-format
 msgid "could not remove '%s': %m"
 msgstr "kunde inte ta bort \"%s\": %m"
 
-#: commands/dbcommands.c:737
+#: commands/dbcommands.c:735
 #, c-format
 msgid "database directory '%s' could not be removed"
 msgstr "databaskatalogen \"%s\" kunde inte tas bort"
 
-#: commands/dbcommands.c:809 commands/vacuum.c:582
+#: commands/dbcommands.c:807 commands/vacuum.c:581
 #, c-format
 msgid "database %u does not exist"
 msgstr ""
@@ -3261,7 +3269,7 @@ msgstr ""
 msgid "Define: invalid argument for \"%s\": \"%s\""
 msgstr ""
 
-#: commands/explain.c:809
+#: commands/explain.c:815
 #, c-format
 msgid "show_sort_keys: no tlist entry for key %d"
 msgstr ""
@@ -3278,7 +3286,7 @@ msgstr ""
 
 #: commands/functioncmds.c:103 commands/functioncmds.c:159
 #: commands/typecmds.c:322 commands/typecmds.c:329 commands/typecmds.c:647
-#: parser/parse_func.c:1386 parser/parse_oper.c:98 parser/parse_oper.c:107
+#: parser/parse_func.c:1410 parser/parse_oper.c:98 parser/parse_oper.c:107
 #: parser/parse_type.c:191 parser/parse_type.c:213 parser/parse_type.c:219
 #, c-format
 msgid "Type \"%s\" does not exist"
@@ -3392,12 +3400,12 @@ msgstr ""
 msgid "SetFunctionArgType: function %u doesn't take OPAQUE"
 msgstr ""
 
-#: commands/functioncmds.c:693 commands/functioncmds.c:857
+#: commands/functioncmds.c:693 commands/functioncmds.c:884
 #, c-format
 msgid "source data type %s does not exist"
 msgstr ""
 
-#: commands/functioncmds.c:698 commands/functioncmds.c:862
+#: commands/functioncmds.c:698 commands/functioncmds.c:889
 #, c-format
 msgid "target data type %s does not exist"
 msgstr ""
@@ -3426,7 +3434,7 @@ msgstr ""
 msgid "target data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:723 commands/functioncmds.c:877
+#: commands/functioncmds.c:723 commands/functioncmds.c:904
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr ""
@@ -3455,22 +3463,30 @@ msgstr ""
 msgid "cast function must not return a set"
 msgstr ""
 
-#: commands/functioncmds.c:776
+#: commands/functioncmds.c:774
+msgid "Must be superuser to create a cast WITHOUT FUNCTION"
+msgstr ""
+
+#: commands/functioncmds.c:787
+msgid "source and target datatypes are not physically compatible"
+msgstr ""
+
+#: commands/functioncmds.c:803
 #, c-format
 msgid "CreateCast: bogus CoercionContext %c"
 msgstr ""
 
-#: commands/functioncmds.c:793
+#: commands/functioncmds.c:820
 #, c-format
 msgid "cast from data type %s to data type %s already exists"
 msgstr ""
 
-#: commands/functioncmds.c:870
+#: commands/functioncmds.c:897
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr ""
 
-#: commands/functioncmds.c:913
+#: commands/functioncmds.c:940
 #, c-format
 msgid "could not find tuple for cast %u"
 msgstr ""
@@ -3584,65 +3600,57 @@ msgstr ""
 msgid "pg_opclass contains multiple default opclasses for data type %s"
 msgstr ""
 
-#: commands/indexcmds.c:544 commands/indexcmds.c:581 commands/indexcmds.c:626
+#: commands/indexcmds.c:544 commands/indexcmds.c:576 commands/indexcmds.c:619
 #, c-format
 msgid "relation \"%s\" is of type \"%c\""
 msgstr ""
 
-#: commands/indexcmds.c:571 commands/indexcmds.c:620
-msgid "REINDEX cannot run inside a BEGIN/END block"
-msgstr ""
-
-#: commands/indexcmds.c:578
+#: commands/indexcmds.c:573
 #, c-format
 msgid "index \"%s\" does not exist"
 msgstr "index \"%s\" existerar inte"
 
-#: commands/indexcmds.c:589
+#: commands/indexcmds.c:584
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:592
+#: commands/indexcmds.c:587
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:601
+#: commands/indexcmds.c:602
 #, c-format
 msgid "index \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:630
+#: commands/indexcmds.c:634
 #, c-format
 msgid "table \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:654
+#: commands/indexcmds.c:658
 msgid "REINDEX DATABASE: Can be executed only on the currently open database."
 msgstr ""
 
-#: commands/indexcmds.c:657
+#: commands/indexcmds.c:661
 msgid "REINDEX DATABASE: Permission denied."
 msgstr "REINDEX DATABASE: r�ttighet saknas."
 
-#: commands/indexcmds.c:660
+#: commands/indexcmds.c:664
 msgid "must be called under standalone postgres with -O -P options"
 msgstr ""
 
-#: commands/indexcmds.c:662
+#: commands/indexcmds.c:666
 msgid "must be called under standalone postgres with -P -O options"
 msgstr ""
 
-#: commands/indexcmds.c:670
-msgid "REINDEX DATABASE cannot run inside a BEGIN/END block"
-msgstr ""
-
-#: commands/indexcmds.c:728
+#: commands/indexcmds.c:732
 #, c-format
 msgid "relation %u was reindexed"
 msgstr ""
@@ -3657,69 +3665,73 @@ msgstr ""
 msgid "DefineOpClass: access method \"%s\" not found"
 msgstr ""
 
-#: commands/opclasscmds.c:136
+#: commands/opclasscmds.c:107
+msgid "Must be superuser to create an operator class"
+msgstr ""
+
+#: commands/opclasscmds.c:149
 #, c-format
 msgid "DefineOpClass: invalid operator number %d, must be between 1 and %d"
 msgstr ""
 
-#: commands/opclasscmds.c:140
+#: commands/opclasscmds.c:153
 #, c-format
 msgid "DefineOpClass: operator number %d appears more than once"
 msgstr ""
 
-#: commands/opclasscmds.c:157
+#: commands/opclasscmds.c:170
 #, c-format
 msgid "DefineOpClass: Operator '%s' for types '%s' and '%s' does not exist"
 msgstr ""
 
-#: commands/opclasscmds.c:173
+#: commands/opclasscmds.c:186
 #, c-format
 msgid "DefineOpClass: invalid procedure number %d, must be between 1 and %d"
 msgstr ""
 
-#: commands/opclasscmds.c:177
+#: commands/opclasscmds.c:190
 #, c-format
 msgid "DefineOpClass: procedure number %d appears more than once"
 msgstr ""
 
-#: commands/opclasscmds.c:190
+#: commands/opclasscmds.c:203
 msgid "DefineOpClass: storage type specified more than once"
 msgstr ""
 
-#: commands/opclasscmds.c:194
+#: commands/opclasscmds.c:207
 #, c-format
 msgid "DefineOpClass: bogus item type %d"
 msgstr ""
 
-#: commands/opclasscmds.c:216
+#: commands/opclasscmds.c:229
 #, c-format
 msgid "Storage type may not be different from datatype for access method %s"
 msgstr ""
 
-#: commands/opclasscmds.c:232
+#: commands/opclasscmds.c:245
 #, c-format
 msgid "Operator class \"%s\" already exists for access method \"%s\""
 msgstr ""
 
-#: commands/opclasscmds.c:256
+#: commands/opclasscmds.c:269
 #, c-format
 msgid ""
 "Can't add class \"%s\" as default for type %s\n"
 "\tclass \"%s\" already is the default"
 msgstr ""
 
-#: commands/opclasscmds.c:464
+#: commands/opclasscmds.c:477
 #, c-format
 msgid "RemoveOpClass: access method \"%s\" not found"
 msgstr ""
 
-#: commands/opclasscmds.c:491 commands/opclasscmds.c:499
+#: commands/opclasscmds.c:504 commands/opclasscmds.c:512
 #, c-format
 msgid ""
 "RemoveOpClass: operator class \"%s\" not supported by access method \"%s\""
 msgstr ""
 
-#: commands/opclasscmds.c:543
+#: commands/opclasscmds.c:556
 #, c-format
 msgid "RemoveOpClassById: couldn't find pg_class entry %u"
 msgstr ""
@@ -3980,537 +3992,557 @@ msgstr ""
 msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
 msgstr ""
 
-#: commands/tablecmds.c:383
+#: commands/tablecmds.c:393
 msgid "TRUNCATE cannot be used on temp tables of other processes"
 msgstr ""
 
-#: commands/tablecmds.c:407
+#: commands/tablecmds.c:417
 #, c-format
 msgid ""
 "TRUNCATE cannot be used as table %s references this one via foreign key "
 "constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:517
+#: commands/tablecmds.c:527
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:540
+#: commands/tablecmds.c:550
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:544
+#: commands/tablecmds.c:554
 #, c-format
 msgid "CREATE TABLE: cannot inherit from temp relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:559
+#: commands/tablecmds.c:569
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:611
+#: commands/tablecmds.c:621
 #, c-format
 msgid ""
 "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:616
+#: commands/tablecmds.c:626
 #, c-format
 msgid "CREATE TABLE: inherited attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:762
+#: commands/tablecmds.c:772
 #, c-format
 msgid "CREATE TABLE: merging attribute \"%s\" with inherited definition"
 msgstr ""
 
-#: commands/tablecmds.c:767
+#: commands/tablecmds.c:777
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:805
+#: commands/tablecmds.c:815
 #, c-format
 msgid ""
 "CREATE TABLE: attribute \"%s\" inherits conflicting default values\n"
 "\tTo resolve the conflict, specify a default explicitly"
 msgstr ""
 
-#: commands/tablecmds.c:1049
+#: commands/tablecmds.c:1059
 #, c-format
 msgid "setRelhassubclassInRelation: cache lookup failed for relation %u"
 msgstr ""
 
-#: commands/tablecmds.c:1104
+#: commands/tablecmds.c:1114
 #, c-format
 msgid "renameatt: class \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1150
+#: commands/tablecmds.c:1160
 #, c-format
 msgid "Inherited attribute \"%s\" must be renamed in child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1158
+#: commands/tablecmds.c:1168
 #, c-format
 msgid "renameatt: attribute \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1163
+#: commands/tablecmds.c:1173
 #, c-format
 msgid "renameatt: system attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1171
+#: commands/tablecmds.c:1181
 #, c-format
 msgid "renameatt: inherited attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1180
+#: commands/tablecmds.c:1190
 #, c-format
 msgid "renameatt: attribute \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1210
+#: commands/tablecmds.c:1220
 #, c-format
 msgid "renameatt: can't find index id %u"
 msgstr ""
 
-#: commands/tablecmds.c:1295
+#: commands/tablecmds.c:1305
 #, c-format
 msgid "renamerel: system relation \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1311
+#: commands/tablecmds.c:1321
 #, c-format
 msgid "renamerel: relation \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1315
+#: commands/tablecmds.c:1325
 #, c-format
 msgid "renamerel: relation \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1614 commands/tablecmds.c:1842
-#: commands/tablecmds.c:1976 commands/tablecmds.c:2191
-#: commands/tablecmds.c:2340 commands/tablecmds.c:2510
-#: commands/tablecmds.c:3472 commands/tablecmds.c:3647
+#: commands/tablecmds.c:1623 commands/tablecmds.c:1878
+#: commands/tablecmds.c:2012 commands/tablecmds.c:2227
+#: commands/tablecmds.c:2376 commands/tablecmds.c:2546
+#: commands/tablecmds.c:3508 commands/tablecmds.c:3683
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:1625 commands/tablecmds.c:1847
-#: commands/tablecmds.c:1981 commands/tablecmds.c:2099
-#: commands/tablecmds.c:2198 commands/tablecmds.c:2345
-#: commands/tablecmds.c:2515 commands/tablecmds.c:3477
+#: commands/tablecmds.c:1634 commands/tablecmds.c:1883
+#: commands/tablecmds.c:2017 commands/tablecmds.c:2135
+#: commands/tablecmds.c:2234 commands/tablecmds.c:2381
+#: commands/tablecmds.c:2551 commands/tablecmds.c:3513
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1672
+#: commands/tablecmds.c:1682
+#, c-format
+msgid "ALTER TABLE: child table %u has different type for column \"%s\""
+msgstr "ALTER TABLE: barntabell %u har en annan typ p� kolumn \"%s\""
+
+#: commands/tablecmds.c:1691
+#, c-format
+msgid "ALTER TABLE: merging definition of column \"%s\" for child %s"
+msgstr "ALTER TABLE: sl�r samman definition av kolumn \"%s\" f�r barn %s"
+
+#: commands/tablecmds.c:1708
 msgid "Attribute must be added to child tables too"
-msgstr ""
+msgstr "Attributet m�ste l�ggas till barntabellerna ocks�"
 
-#: commands/tablecmds.c:1689
+#: commands/tablecmds.c:1725
 msgid ""
 "Adding columns with defaults is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE SET DEFAULT."
 msgstr ""
 
-#: commands/tablecmds.c:1693
+#: commands/tablecmds.c:1729
 msgid ""
 "Adding NOT NULL columns is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE ... SET NOT NULL."
 msgstr ""
 
-#: commands/tablecmds.c:1702 commands/tablecmds.c:3787
+#: commands/tablecmds.c:1738 commands/tablecmds.c:3823
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" not found"
-msgstr ""
+msgstr "ALTER TABLE: relation \"%s\" hittades inte"
 
-#: commands/tablecmds.c:1714
+#: commands/tablecmds.c:1750
 #, c-format
 msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
-msgstr ""
+msgstr "ALTER TABLE: kolumnnamn \"%s\" finns redan i tabell \"%s\""
 
-#: commands/tablecmds.c:1720
+#: commands/tablecmds.c:1756
 #, c-format
 msgid "ALTER TABLE: relations limited to %d columns"
-msgstr ""
+msgstr "ALTER TABLE: relationer �r begr�nsade till %d kolumner"
 
-#: commands/tablecmds.c:1892 commands/tablecmds.c:2026
-#: commands/tablecmds.c:2144
+#: commands/tablecmds.c:1928 commands/tablecmds.c:2062
+#: commands/tablecmds.c:2180
 #, c-format
 msgid "ALTER TABLE: Cannot alter system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1913
+#: commands/tablecmds.c:1949
 #, c-format
 msgid "ALTER TABLE: Index %u not found"
-msgstr ""
+msgstr "ALTER TABLE: Index %u hittades inte"
 
-#: commands/tablecmds.c:1928
+#: commands/tablecmds.c:1964
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" is in a primary key"
 msgstr "ALTER TABLE: Attributet \"%s\" �r del av prim�rnyckel"
 
-#: commands/tablecmds.c:1944 commands/tablecmds.c:2058
-#: commands/tablecmds.c:2286
+#: commands/tablecmds.c:1980 commands/tablecmds.c:2094
+#: commands/tablecmds.c:2322
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
 msgstr "ALTER TABLE: relationen \"%s\" har ingen kolumn \"%s\""
 
-#: commands/tablecmds.c:2045
+#: commands/tablecmds.c:2081
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" contains NULL values"
-msgstr ""
+msgstr "ALTER TABLE: Attributet \"%s\" inneh�ller NULL-v�rden"
 
-#: commands/tablecmds.c:2094
+#: commands/tablecmds.c:2130
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table or view"
 msgstr ""
 
-#: commands/tablecmds.c:2218
+#: commands/tablecmds.c:2254
 #, c-format
 msgid "ALTER TABLE: statistics target %d is too low"
 msgstr ""
 
-#: commands/tablecmds.c:2223
+#: commands/tablecmds.c:2259
 msgid "ALTER TABLE: lowering statistics target to 1000"
 msgstr ""
 
-#: commands/tablecmds.c:2244
+#: commands/tablecmds.c:2280
 #, c-format
 msgid "ALTER TABLE: \"%s\" storage not recognized"
 msgstr ""
 
-#: commands/tablecmds.c:2249
+#: commands/tablecmds.c:2285
 #, c-format
 msgid "ALTER TABLE: Invalid column flag: %c"
-msgstr ""
+msgstr "ALTER TABLE: Ogiltig kolumnflagga: %c"
 
-#: commands/tablecmds.c:2291
+#: commands/tablecmds.c:2327
 #, c-format
 msgid "ALTER TABLE: cannot change system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2308
+#: commands/tablecmds.c:2344
 #, c-format
 msgid "ALTER TABLE: Column datatype %s can only have storage \"plain\""
 msgstr ""
 
-#: commands/tablecmds.c:2362
+#: commands/tablecmds.c:2398
 #, c-format
 msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2368
+#: commands/tablecmds.c:2404
 #, c-format
 msgid "ALTER TABLE: Cannot drop inherited column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2397 commands/tablecmds.c:2448
+#: commands/tablecmds.c:2433 commands/tablecmds.c:2484
 #, c-format
 msgid "ALTER TABLE: relation %u has no column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2402 commands/tablecmds.c:2453
+#: commands/tablecmds.c:2438 commands/tablecmds.c:2489
 #, c-format
 msgid "ALTER TABLE: relation %u has non-inherited column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2587
+#: commands/tablecmds.c:2623
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
 msgstr ""
 
-#: commands/tablecmds.c:2617
+#: commands/tablecmds.c:2653
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
 msgstr ""
 
-#: commands/tablecmds.c:2677
+#: commands/tablecmds.c:2713
 #, c-format
 msgid "Only relation '%s' can be referenced in CHECK"
 msgstr ""
 
-#: commands/tablecmds.c:2726
+#: commands/tablecmds.c:2762
 #, c-format
 msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:2782
+#: commands/tablecmds.c:2818
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr "refererad relation \"%s\" �r inte en tabell"
 
-#: commands/tablecmds.c:2787
+#: commands/tablecmds.c:2823
 #, c-format
 msgid "%s: relation \"%s\" is a system catalog"
 msgstr "%s: relation \"%s\" �r en systemkatalog"
 
-#: commands/tablecmds.c:2802
+#: commands/tablecmds.c:2838
 #, c-format
 msgid "%s: Unable to reference temporary table from permanent table constraint"
 msgstr ""
 
-#: commands/tablecmds.c:2844
+#: commands/tablecmds.c:2880
 #, c-format
 msgid ""
 "%s: number of referencing and referenced attributes for foreign key disagree"
 msgstr ""
 
-#: commands/tablecmds.c:2925
+#: commands/tablecmds.c:2961
 #, c-format
 msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
-msgstr ""
+msgstr "%s: kolumn \"%s\" som refereras till i fr�mmande nyckel existerar inte"
 
-#: commands/tablecmds.c:2928
+#: commands/tablecmds.c:2964
 #, c-format
 msgid "Can only have %d keys in a foreign key"
 msgstr "Kan bara ha %d nycklar i en fr�mmande nyckel"
 
-#: commands/tablecmds.c:2972
+#: commands/tablecmds.c:3008
 #, c-format
 msgid "transformFkeyGetPrimaryKey: index %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:2990
+#: commands/tablecmds.c:3026
 #, c-format
 msgid "PRIMARY KEY for referenced table \"%s\" not found"
-msgstr ""
+msgstr "hittar inte PRIM�RNYCKELN f�r refererad tabell \"%s\""
 
-#: commands/tablecmds.c:3046
+#: commands/tablecmds.c:3082
 #, c-format
 msgid "transformFkeyCheckAttrs: index %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:3104
+#: commands/tablecmds.c:3140
 #, c-format
 msgid ""
 "UNIQUE constraint matching given keys for referenced table \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:3271
+#: commands/tablecmds.c:3307
 #, c-format
 msgid ""
 "number of key attributes in referenced table must be equal to foreign key\n"
 "\tIllegal FOREIGN KEY definition references \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:3331
+#: commands/tablecmds.c:3367
 msgid "Unrecognized ON DELETE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3402
+#: commands/tablecmds.c:3438
 msgid "Unrecognized ON UPDATE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3447
+#: commands/tablecmds.c:3483
 #, c-format
 msgid "fkMatchTypeToString: Unknown MATCH TYPE '%c'"
 msgstr ""
 
-#: commands/tablecmds.c:3523
+#: commands/tablecmds.c:3559
 #, c-format
 msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
 msgstr "ALTER TABLE / DROP CONSTRAINT: %s existerar inte"
 
-#: commands/tablecmds.c:3527
+#: commands/tablecmds.c:3563
 msgid "Multiple constraints dropped"
 msgstr ""
 
-#: commands/tablecmds.c:3552
+#: commands/tablecmds.c:3588
 #, c-format
 msgid "ALTER TABLE: relation %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:3614
+#: commands/tablecmds.c:3650
 #, c-format
 msgid ""
 "ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or "
 "sequence"
-msgstr ""
+msgstr "ALTER TABLE: relationen \"%s\" �r inte en tabell, TOAST-tabell, index, vy eller sekvens"
 
-#: commands/tablecmds.c:3664
+#: commands/tablecmds.c:3700
 msgid "Shared relations cannot be toasted after initdb"
 msgstr ""
 
-#: commands/tablecmds.c:3677
+#: commands/tablecmds.c:3713
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" already has a toast table"
 msgstr ""
 
-#: commands/tablecmds.c:3692
+#: commands/tablecmds.c:3728
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
 msgstr ""
 
-#: commands/trigger.c:98
+#: commands/trigger.c:132
+#, c-format
+msgid "Unable to find table for constraint \"%s\""
+msgstr ""
+
+#: commands/trigger.c:137
 #, c-format
 msgid "CreateTrigger: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/trigger.c:102
+#: commands/trigger.c:141
 #, c-format
 msgid "CreateTrigger: can't create trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:160
+#: commands/trigger.c:199
 msgid "CreateTrigger: STATEMENT triggers are unimplemented, yet"
 msgstr ""
 
-#: commands/trigger.c:168
+#: commands/trigger.c:207
 msgid "CreateTrigger: double INSERT event specified"
 msgstr ""
 
-#: commands/trigger.c:173
+#: commands/trigger.c:212
 msgid "CreateTrigger: double DELETE event specified"
 msgstr ""
 
-#: commands/trigger.c:178
+#: commands/trigger.c:217
 msgid "CreateTrigger: double UPDATE event specified"
 msgstr ""
 
-#: commands/trigger.c:182
+#: commands/trigger.c:221
 msgid "CreateTrigger: unknown event specified"
 msgstr ""
 
-#: commands/trigger.c:208
+#: commands/trigger.c:247
 #, c-format
 msgid "CreateTrigger: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:220
+#: commands/trigger.c:259
 #, c-format
 msgid "CreateTrigger: function %s() does not exist"
 msgstr "CreateTrigger: funktion %s() existerar inte"
 
-#: commands/trigger.c:231
+#: commands/trigger.c:270
 #, c-format
 msgid ""
 "CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:236
+#: commands/trigger.c:275
 #, c-format
 msgid "CreateTrigger: function %s() must return TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:336
+#: commands/trigger.c:375
 #, c-format
 msgid "CreateTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:421
+#: commands/trigger.c:460
 #, c-format
 msgid "DropTrigger: there is no trigger %s on relation %s"
 msgstr ""
 
-#: commands/trigger.c:470
+#: commands/trigger.c:509
 #, c-format
 msgid "RemoveTriggerById: Trigger %u does not exist"
 msgstr ""
 
-#: commands/trigger.c:481
+#: commands/trigger.c:520
 #, c-format
 msgid "DropTrigger: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/trigger.c:485
+#: commands/trigger.c:524
 #, c-format
 msgid "DropTrigger: can't drop trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:510
+#: commands/trigger.c:549
 #, c-format
 msgid "DropTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:515
+#: commands/trigger.c:554
 #, c-format
 msgid "DropTrigger: relation %s has reltriggers = 0"
 msgstr ""
 
-#: commands/trigger.c:586
+#: commands/trigger.c:625
 #, c-format
 msgid "renametrig: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:627
+#: commands/trigger.c:666
 #, c-format
 msgid "renametrig: trigger %s not defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:685
+#: commands/trigger.c:729
 #, c-format
 msgid "RelationBuildTriggers: unexpected record found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:714
+#: commands/trigger.c:757
 #, c-format
 msgid "RelationBuildTriggers: tgargs IS NULL for rel %s"
 msgstr ""
 
-#: commands/trigger.c:737
+#: commands/trigger.c:777
 #, c-format
 msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:983
+#: commands/trigger.c:1129
 #, c-format
 msgid "ExecCallTriggerFunc: function %u returned NULL"
 msgstr ""
 
-#: commands/trigger.c:1222 executor/execMain.c:1043 executor/execMain.c:1317
-#: executor/execMain.c:1452
+#: commands/trigger.c:1368 executor/execMain.c:1044 executor/execMain.c:1318
+#: executor/execMain.c:1453
 msgid "Can't serialize access due to concurrent update"
 msgstr ""
 
-#: commands/trigger.c:1245 executor/execMain.c:1064
+#: commands/trigger.c:1391 executor/execMain.c:1065
 #, c-format
 msgid "Unknown status %u from heap_mark4update"
 msgstr ""
 
-#: commands/trigger.c:1257
+#: commands/trigger.c:1403
 msgid "GetTupleForTrigger: failed ReadBuffer"
 msgstr ""
 
-#: commands/trigger.c:1445
+#: commands/trigger.c:1591
 msgid "DeferredTriggerExecute: failed to fetch old tuple"
 msgstr ""
 
-#: commands/trigger.c:1452
+#: commands/trigger.c:1598
 msgid "DeferredTriggerExecute: failed to fetch new tuple"
 msgstr ""
 
-#: commands/trigger.c:1473
+#: commands/trigger.c:1619
 #, c-format
 msgid "DeferredTriggerExecute: can't find trigger %u"
 msgstr ""
 
-#: commands/trigger.c:1718
+#: commands/trigger.c:1765
+#, c-format
+msgid "deferredTriggerInvokeEvents: relation %u has no triggers"
+msgstr ""
+
+#: commands/trigger.c:1876
 msgid "DeferredTriggerBeginXact() called while inside transaction"
 msgstr ""
 
-#: commands/trigger.c:1896
+#: commands/trigger.c:2052
 msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: commands/trigger.c:1927
+#: commands/trigger.c:2083
 #, c-format
 msgid "Constraint '%s' is not deferrable"
 msgstr ""
 
-#: commands/trigger.c:1941
+#: commands/trigger.c:2097
 #, c-format
 msgid "Constraint '%s' does not exist"
 msgstr "Integritetsvillkor '%s' existerar inte"
 
-#: commands/trigger.c:2018
+#: commands/trigger.c:2174
 msgid "DeferredTriggerSaveEvent() called outside of transaction"
 msgstr ""
 
@@ -4620,7 +4652,7 @@ msgstr ""
 #: commands/typecmds.c:667
 #, c-format
 msgid "%s is not a domain"
-msgstr ""
+msgstr "%s �r inte en dom�n"
 
 #: commands/typecmds.c:736
 #, c-format
@@ -4637,250 +4669,232 @@ msgstr ""
 msgid "attempted to define composite type relation with no attrs"
 msgstr ""
 
-#: commands/user.c:141
+#: commands/user.c:147
 #, c-format
 msgid "write_group_file: unable to write %s: %m"
 msgstr ""
 
-#: commands/user.c:171
+#: commands/user.c:181
 #, c-format
 msgid "Invalid group name '%s'"
 msgstr "Ogiltigt gruppnamn \"%s\""
 
-#: commands/user.c:201 commands/user.c:331
+#: commands/user.c:211 commands/user.c:335
 #, c-format
 msgid "Invalid user name '%s'"
 msgstr "Ogiltigt anv�ndarnamn \"%s\""
 
-#: commands/user.c:232 commands/user.c:355
+#: commands/user.c:242 commands/user.c:364
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: commands/user.c:240 commands/user.c:363
+#: commands/user.c:250 commands/user.c:372
 #, c-format
 msgid "rename %s to %s: %m"
 msgstr "d�p om %s till %s: %m"
 
-#: commands/user.c:287
+#: commands/user.c:286
 #, c-format
-msgid "write_password_file: unable to write %s: %m"
+msgid "write_user_file: unable to write %s: %m"
 msgstr ""
 
-#: commands/user.c:334
+#: commands/user.c:341
 #, c-format
 msgid "Invalid user password '%s'"
 msgstr "Ogiltigt anv�ndarl�senord \"%s\""
 
-#: commands/user.c:443 commands/user.c:453 commands/user.c:459
-#: commands/user.c:465 commands/user.c:471 commands/user.c:477
+#: commands/user.c:505 commands/user.c:515 commands/user.c:521
+#: commands/user.c:527 commands/user.c:533 commands/user.c:539
 msgid "CREATE USER: conflicting options"
 msgstr ""
 
-#: commands/user.c:481
+#: commands/user.c:543
 #, c-format
 msgid "CREATE USER: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:493
+#: commands/user.c:555
 msgid "user id must be positive"
 msgstr "anv�ndar-id m�ste vara positivt"
 
-#: commands/user.c:508
+#: commands/user.c:570
 msgid "CREATE USER: permission denied"
 msgstr "CREATE USER: r�ttighet saknas"
 
-#: commands/user.c:511
+#: commands/user.c:573
 #, c-format
 msgid "CREATE USER: user name \"%s\" is reserved"
 msgstr "CREATE USER: anv�ndarnamn \"%s\" �r reserverat"
 
-#: commands/user.c:546
+#: commands/user.c:608
 #, c-format
 msgid "CREATE USER: user name \"%s\" already exists"
 msgstr "CREATE USER: anv�ndarnamn \"%s\" finns redan"
 
-#: commands/user.c:549
+#: commands/user.c:611
 #, c-format
 msgid "CREATE USER: sysid %d is already assigned"
 msgstr "CREATE USER: anv�ndarid %d �r redan anv�nd"
 
-#: commands/user.c:580 commands/user.c:784
+#: commands/user.c:642 commands/user.c:843
 msgid "CREATE USER: password encryption failed"
 msgstr ""
 
-#: commands/user.c:670 commands/user.c:680 commands/user.c:686
-#: commands/user.c:692
+#: commands/user.c:733 commands/user.c:743 commands/user.c:749
+#: commands/user.c:755
 msgid "ALTER USER: conflicting options"
 msgstr ""
 
-#: commands/user.c:696
+#: commands/user.c:759
 #, c-format
 msgid "ALTER USER: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:719
+#: commands/user.c:782
 msgid "ALTER USER: permission denied"
 msgstr "ALTER USER: r�ttighet saknas"
 
-#: commands/user.c:723
-msgid "ALTER USER: password changes cannot be rolled back"
-msgstr ""
-
-#: commands/user.c:737
+#: commands/user.c:796
 #, c-format
 msgid "ALTER USER: user \"%s\" does not exist"
 msgstr "ALTER USER: anv�ndare \"%s\" existerar inte"
 
-#: commands/user.c:847 commands/variable.c:549 utils/cache/lsyscache.c:1507
+#: commands/user.c:907 commands/variable.c:549 utils/cache/lsyscache.c:1507
 #: utils/init/miscinit.c:556
 #, c-format
 msgid "user \"%s\" does not exist"
 msgstr "anv�ndare \"%s\" existerar inte"
 
-#: commands/user.c:903
+#: commands/user.c:963
 msgid "DROP USER: permission denied"
 msgstr "DROP USER: r�ttighet saknas"
 
-#: commands/user.c:906
-msgid "DROP USER cannot be rolled back completely"
-msgstr ""
-
-#: commands/user.c:933
+#: commands/user.c:990
 #, c-format
 msgid "DROP USER: user \"%s\" does not exist (no users removed)"
 msgstr "DROP USER: anv�ndare \"%s\" existerar inte (inga anv�ndare borttagna)"
 
-#: commands/user.c:935
+#: commands/user.c:992
 #, c-format
 msgid "DROP USER: user \"%s\" does not exist"
 msgstr "DROP USER: anv�ndare \"%s\" existerar inte"
 
-#: commands/user.c:941
+#: commands/user.c:998
 msgid "current user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:943
+#: commands/user.c:1000
 msgid "session user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:967
+#: commands/user.c:1024
 #, c-format
 msgid "DROP USER: user \"%s\" owns database \"%s\", cannot be removed%s"
 msgstr "DROP USER: anv�ndare \"%s\" �ger databas \"%s\", kan inte tas bort%s"
 
-#: commands/user.c:1046
+#: commands/user.c:1104
 #, c-format
 msgid "CheckPgUserAclNotNull: \"%s\" not found"
 msgstr ""
 
-#: commands/user.c:1051
+#: commands/user.c:1109
 #, c-format
 msgid ""
 "To use passwords, you have to revoke permissions on %s so normal users "
 "cannot read the passwords. Try 'REVOKE ALL ON \"%s\" FROM PUBLIC'."
 msgstr ""
 
-#: commands/user.c:1093 commands/user.c:1099
+#: commands/user.c:1151 commands/user.c:1157
 msgid "CREATE GROUP: conflicting options"
 msgstr ""
 
-#: commands/user.c:1103
+#: commands/user.c:1161
 #, c-format
 msgid "CREATE GROUP: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:1111
+#: commands/user.c:1169
 msgid "group id must be positive"
 msgstr ""
 
-#: commands/user.c:1122
+#: commands/user.c:1180
 msgid "CREATE GROUP: permission denied"
 msgstr "CREATE GROUP: r�ttighet saknas"
 
-#: commands/user.c:1125
+#: commands/user.c:1183
 #, c-format
 msgid "CREATE GROUP: group name \"%s\" is reserved"
 msgstr ""
 
-#: commands/user.c:1154
+#: commands/user.c:1218
 #, c-format
 msgid "CREATE GROUP: group name \"%s\" already exists"
 msgstr ""
 
-#: commands/user.c:1157
+#: commands/user.c:1221
 #, c-format
 msgid "CREATE GROUP: group sysid %d is already assigned"
 msgstr ""
 
-#: commands/user.c:1244
+#: commands/user.c:1314
 #, c-format
 msgid "%s: group \"%s\" does not exist"
 msgstr "%s: gruppen \"%s\" existerar inte"
 
-#: commands/user.c:1285
+#: commands/user.c:1355
 #, c-format
 msgid "AlterGroup: unknown tag %s"
 msgstr ""
 
-#: commands/user.c:1297
+#: commands/user.c:1367
 #, c-format
 msgid "%s: user \"%s\" is already in group \"%s\""
 msgstr ""
 
-#: commands/user.c:1312
+#: commands/user.c:1382
 #, c-format
 msgid "ALTER GROUP: group \"%s\" does not have any members"
 msgstr ""
 
-#: commands/user.c:1337
+#: commands/user.c:1407
 #, c-format
 msgid "ALTER GROUP: user \"%s\" is not in group \"%s\""
 msgstr ""
 
-#: commands/user.c:1465
+#: commands/user.c:1536
 msgid "DROP GROUP: permission denied"
 msgstr "DROP GROUP: r�ttighet saknas"
 
-#: commands/user.c:1476
+#: commands/user.c:1549
 #, c-format
 msgid "DROP GROUP: group \"%s\" does not exist"
 msgstr "DROP GROUP: gruppen \"%s\" existerar inte"
 
-#: commands/vacuum.c:181
-#, c-format
-msgid "%s cannot run inside a BEGIN/END block"
-msgstr ""
-
-#: commands/vacuum.c:185
-#, c-format
-msgid "%s cannot be executed from a function"
-msgstr ""
-
-#: commands/vacuum.c:460
+#: commands/vacuum.c:459
 msgid ""
 "oldest Xmin is far in the past --- close open transactions soon to avoid "
 "wraparound problems"
 msgstr ""
 
-#: commands/vacuum.c:506 commands/vacuum.c:513
+#: commands/vacuum.c:505 commands/vacuum.c:512
 #, c-format
 msgid "pg_class entry for relid %u vanished during vacuuming"
 msgstr ""
 
-#: commands/vacuum.c:666
+#: commands/vacuum.c:665
 msgid ""
 "Some databases have not been vacuumed in over 2 billion transactions.\n"
 "\tYou may have already suffered transaction-wraparound data loss."
 msgstr ""
 
-#: commands/vacuum.c:677
+#: commands/vacuum.c:676
 msgid ""
 "Some databases have not been vacuumed in over 1 billion transactions.\n"
 "\tBetter vacuum them soon, or you may have a wraparound failure."
 msgstr ""
 
-#: commands/vacuum.c:684
+#: commands/vacuum.c:683
 #, c-format
 msgid ""
 "Some databases have not been vacuumed in %d transactions.\n"
@@ -5204,48 +5218,48 @@ msgstr ""
 msgid "You can't change view relation %s"
 msgstr ""
 
-#: executor/execMain.c:991
+#: executor/execMain.c:992
 msgid "ExecutePlan: NO (junk) `ctid' was found!"
 msgstr ""
 
-#: executor/execMain.c:995
+#: executor/execMain.c:996
 msgid "ExecutePlan: (junk) `ctid' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1020
+#: executor/execMain.c:1021
 #, c-format
 msgid "ExecutePlan: NO (junk) `%s' was found!"
 msgstr ""
 
-#: executor/execMain.c:1025
+#: executor/execMain.c:1026
 #, c-format
 msgid "ExecutePlan: (junk) `%s' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1114
+#: executor/execMain.c:1115
 msgid "ExecutePlan: unknown operation in queryDesc"
 msgstr ""
 
-#: executor/execMain.c:1382
+#: executor/execMain.c:1383
 msgid "ExecUpdate: UPDATE can't run without transactions"
 msgstr ""
 
-#: executor/execMain.c:1582
+#: executor/execMain.c:1583
 #, c-format
 msgid "%s: Fail to add null value in not null attribute %s"
 msgstr ""
 
-#: executor/execMain.c:1592
+#: executor/execMain.c:1593
 #, c-format
 msgid "%s: rejected due to CHECK constraint \"%s\" on \"%s\""
 msgstr ""
 
-#: executor/execMain.c:1636
+#: executor/execMain.c:1637
 #, c-format
 msgid "EvalPlanQual: can't find RTE %d"
 msgstr ""
 
-#: executor/execMain.c:1654
+#: executor/execMain.c:1655
 msgid "EvalPlanQual: t_xmin is uncommitted ?!"
 msgstr ""
 
@@ -5415,33 +5429,33 @@ msgstr ""
 msgid "InstrStopNode without start"
 msgstr ""
 
-#: executor/nodeAgg.c:764
+#: executor/nodeAgg.c:774
 msgid "ExecInitAgg: could not find any aggregate functions"
 msgstr ""
 
-#: executor/nodeAgg.c:862
+#: executor/nodeAgg.c:872
 #, c-format
 msgid "ExecAgg: cache lookup failed for aggregate %u"
 msgstr ""
 
-#: executor/nodeAgg.c:917
+#: executor/nodeAgg.c:927
 #, c-format
 msgid "Aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 
-#: executor/nodeAgg.c:940 executor/nodeGroup.c:496
+#: executor/nodeAgg.c:950 executor/nodeGroup.c:496
 #, c-format
 msgid "Unable to identify an equality operator for type %s"
 msgstr ""
 
-#: executor/nodeAgg.c:968
+#: executor/nodeAgg.c:978
 #, c-format
 msgid ""
 "GetAggInitVal: cache lookup failed on aggregate transition function return "
 "type %u"
 msgstr ""
 
-#: executor/nodeAgg.c:1050
+#: executor/nodeAgg.c:1060
 #, c-format
 msgid "Aggregate function %u called as normal function"
 msgstr ""
@@ -5581,62 +5595,62 @@ msgstr ""
 msgid "Memory exhausted in SPI_connect"
 msgstr ""
 
-#: executor/spi.c:149
+#: executor/spi.c:148
 msgid "Memory exhausted in SPI_finish"
 msgstr ""
 
-#: executor/spi.c:315 executor/spi.c:342 executor/spi.c:371 executor/spi.c:409
-#: executor/spi.c:653 executor/spi.c:1331
+#: executor/spi.c:313 executor/spi.c:340 executor/spi.c:369 executor/spi.c:407
+#: executor/spi.c:651 executor/spi.c:1427
 msgid "SPI: stack corrupted"
 msgstr ""
 
-#: executor/spi.c:720
+#: executor/spi.c:718
 msgid "cannot open multi-query plan as cursor"
 msgstr ""
 
-#: executor/spi.c:725
+#: executor/spi.c:723
 msgid "plan in SPI_cursor_open() is not a SELECT"
 msgstr ""
 
-#: executor/spi.c:727
+#: executor/spi.c:725
 msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
 msgstr ""
 
-#: executor/spi.c:729
+#: executor/spi.c:727
 msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
 msgstr ""
 
-#: executor/spi.c:760
+#: executor/spi.c:758
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr ""
 
-#: executor/spi.c:766
+#: executor/spi.c:764
 #, c-format
 msgid "failed to create portal \"%s\""
 msgstr ""
 
-#: executor/spi.c:879 executor/spi.c:1237
+#: executor/spi.c:877 executor/spi.c:1333
 msgid "invalid portal in SPI cursor operation"
 msgstr ""
 
-#: executor/spi.c:904
+#: executor/spi.c:902
 msgid "SPI: improper call to spi_printtup"
 msgstr ""
 
-#: executor/spi.c:906
+#: executor/spi.c:904
 msgid "SPI: stack corrupted in spi_printtup"
 msgstr ""
 
-#: executor/spi.c:1188
+#: executor/spi.c:1284
 msgid "SPI_select: retrieve into portal not implemented"
 msgstr ""
 
-#: executor/spi.c:1198
+#: executor/spi.c:1294
 msgid "SPI_select: # of processed tuples check failed"
 msgstr ""
 
-#: executor/spi.c:1297
+#: executor/spi.c:1393
 msgid "SPI_fetch: # of processed tuples check failed"
 msgstr ""
 
@@ -6223,12 +6237,12 @@ msgstr ""
 msgid "_equalParam: Invalid paramkind value: %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:1986
+#: nodes/equalfuncs.c:1987
 #, c-format
 msgid "_equalValue: unknown node type %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:2437
+#: nodes/equalfuncs.c:2438
 #, c-format
 msgid "equal: don't know whether nodes of type %d are equal"
 msgstr ""
@@ -6245,17 +6259,17 @@ msgstr ""
 msgid "llasti: empty list"
 msgstr ""
 
-#: nodes/outfuncs.c:1023 nodes/readfuncs.c:1691
+#: nodes/outfuncs.c:1026 nodes/readfuncs.c:1694
 #, c-format
 msgid "bogus rte kind %d"
 msgstr ""
 
-#: nodes/outfuncs.c:1321
+#: nodes/outfuncs.c:1324
 #, c-format
 msgid "_outValue: don't know how to print type %d "
 msgstr ""
 
-#: nodes/outfuncs.c:1779
+#: nodes/outfuncs.c:1782
 #, c-format
 msgid "_outNode: don't know how to print type %d "
 msgstr ""
@@ -6291,22 +6305,22 @@ msgstr ""
 msgid "toOidList: unexpected datatype"
 msgstr ""
 
-#: nodes/readfuncs.c:820
+#: nodes/readfuncs.c:823
 #, c-format
 msgid "_readExpr: unknown opType \"%.*s\""
 msgstr ""
 
-#: nodes/readfuncs.c:2273
+#: nodes/readfuncs.c:2276
 #, c-format
 msgid "badly formatted planstring \"%.10s\"..."
 msgstr ""
 
-#: nodes/readfuncs.c:2306 nodes/readfuncs.c:2338
+#: nodes/readfuncs.c:2309 nodes/readfuncs.c:2341
 #, c-format
 msgid "readDatum: expected '%s', got '%s'; length = %lu"
 msgstr ""
 
-#: nodes/readfuncs.c:2313
+#: nodes/readfuncs.c:2316
 #, c-format
 msgid "readDatum: byval & length = %lu"
 msgstr ""
@@ -6399,7 +6413,7 @@ msgstr ""
 msgid "recurse_push_qual: unexpected node %d"
 msgstr ""
 
-#: optimizer/path/clausesel.c:522
+#: optimizer/path/clausesel.c:533
 #, c-format
 msgid "clause_selectivity: s1 %f"
 msgstr ""
@@ -6599,8 +6613,8 @@ msgstr ""
 msgid "preprocess_qual_conditions: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:908 parser/analyze.c:1780 parser/analyze.c:1963
-#: parser/analyze.c:2460
+#: optimizer/plan/planner.c:908 parser/analyze.c:1774 parser/analyze.c:1947
+#: parser/analyze.c:2444
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr ""
 
@@ -6737,24 +6751,24 @@ msgstr ""
 msgid "has_subclass: Relation %u not found"
 msgstr ""
 
-#: optimizer/util/relnode.c:59
+#: optimizer/util/relnode.c:60
 msgid "build_base_rel: rel already exists"
 msgstr ""
 
-#: optimizer/util/relnode.c:68
+#: optimizer/util/relnode.c:69
 msgid "build_base_rel: rel already exists as 'other' rel"
 msgstr ""
 
-#: optimizer/util/relnode.c:106
+#: optimizer/util/relnode.c:107
 msgid "build_other_rel: rel already exists as base rel"
 msgstr ""
 
-#: optimizer/util/relnode.c:179
+#: optimizer/util/relnode.c:180
 #, c-format
 msgid "make_base_rel: unsupported RTE kind %d"
 msgstr ""
 
-#: optimizer/util/relnode.c:215
+#: optimizer/util/relnode.c:216
 #, c-format
 msgid "find_base_rel: no relation entry for relid %d"
 msgstr ""
@@ -6856,7 +6870,7 @@ msgstr ""
 msgid "%s will create implicit trigger(s) for FOREIGN KEY check(s)"
 msgstr ""
 
-#: parser/analyze.c:1446 parser/analyze.c:1564
+#: parser/analyze.c:1446 parser/analyze.c:1568
 #, c-format
 msgid "transformRuleStmt: unexpected event type %d"
 msgstr ""
@@ -6865,165 +6879,165 @@ msgstr ""
 msgid "Rule WHERE condition may not contain references to other relations"
 msgstr ""
 
-#: parser/analyze.c:1524
+#: parser/analyze.c:1459
+msgid "Rule WHERE condition may not contain aggregate functions"
+msgstr ""
+
+#: parser/analyze.c:1528
 msgid ""
 "Rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE "
 "actions"
 msgstr ""
 
-#: parser/analyze.c:1548
+#: parser/analyze.c:1552
 msgid "ON SELECT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1550
+#: parser/analyze.c:1554
 msgid "ON SELECT rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1557
+#: parser/analyze.c:1561
 msgid "ON INSERT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1561
+#: parser/analyze.c:1565
 msgid "ON DELETE rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1626 parser/analyze.c:1844
+#: parser/analyze.c:1630 parser/analyze.c:1838
 msgid "DECLARE CURSOR must not specify INTO"
 msgstr ""
 
-#: parser/analyze.c:1628 parser/analyze.c:1846
+#: parser/analyze.c:1632 parser/analyze.c:1840
 msgid ""
 "DECLARE/UPDATE is not supported\n"
 "\tCursors must be READ ONLY"
 msgstr ""
 
-#: parser/analyze.c:1638 parser/analyze.c:1856
-msgid "DECLARE CURSOR may only be used in begin/end transaction blocks"
-msgstr ""
-
-#: parser/analyze.c:1924
+#: parser/analyze.c:1908
 msgid ""
 "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result "
 "columns"
 msgstr ""
 
-#: parser/analyze.c:1958
+#: parser/analyze.c:1942
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:1960
+#: parser/analyze.c:1944
 msgid "Portal may not appear in UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2054
+#: parser/analyze.c:2038
 #, c-format
 msgid "Each %s query must have the same number of columns"
 msgstr ""
 
-#: parser/analyze.c:2112
+#: parser/analyze.c:2096
 #, c-format
 msgid "getSetColTypes: unexpected node %d"
 msgstr ""
 
-#: parser/analyze.c:2123
+#: parser/analyze.c:2107
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr ""
 
-#: parser/analyze.c:2206 parser/analyze.c:2215
+#: parser/analyze.c:2190 parser/analyze.c:2199
 msgid "UPDATE target count mismatch --- internal error"
 msgstr ""
 
-#: parser/analyze.c:2301
+#: parser/analyze.c:2285
 msgid "Unexpected node type in ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: parser/analyze.c:2384
+#: parser/analyze.c:2368
 msgid "transformPrepareStmt: internal error"
 msgstr ""
 
-#: parser/analyze.c:2411
+#: parser/analyze.c:2395
 #, c-format
 msgid "Wrong number of parameters, expected %d but got %d"
 msgstr ""
 
-#: parser/analyze.c:2424
+#: parser/analyze.c:2408
 msgid "Cannot use subselects in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2426
+#: parser/analyze.c:2410
 msgid "Cannot use aggregates in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2437
+#: parser/analyze.c:2421
 #, c-format
 msgid ""
 "Parameter $%d of type %s cannot be coerced into the expected type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: parser/analyze.c:2462
+#: parser/analyze.c:2446
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr ""
 
-#: parser/analyze.c:2464
+#: parser/analyze.c:2448
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr ""
 
-#: parser/analyze.c:2466
+#: parser/analyze.c:2450
 msgid "SELECT FOR UPDATE is not allowed with AGGREGATE"
 msgstr ""
 
-#: parser/analyze.c:2531
+#: parser/analyze.c:2515
 #, c-format
 msgid "FOR UPDATE: relation \"%s\" not found in FROM clause"
 msgstr ""
 
-#: parser/analyze.c:2571
+#: parser/analyze.c:2555
 #, c-format
 msgid "relationHasPrimaryKey: index %u not found"
 msgstr ""
 
-#: parser/analyze.c:2622
+#: parser/analyze.c:2606
 msgid "Misplaced DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2624 parser/analyze.c:2633
+#: parser/analyze.c:2608 parser/analyze.c:2617
 msgid "Multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:2631
+#: parser/analyze.c:2615
 msgid "Misplaced NOT DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2638 parser/analyze.c:2656
+#: parser/analyze.c:2622 parser/analyze.c:2640
 msgid "INITIALLY DEFERRED constraint must be DEFERRABLE"
 msgstr ""
 
-#: parser/analyze.c:2643
+#: parser/analyze.c:2627
 msgid "Misplaced INITIALLY DEFERRED clause"
 msgstr ""
 
-#: parser/analyze.c:2645 parser/analyze.c:2663
+#: parser/analyze.c:2629 parser/analyze.c:2647
 msgid "Multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:2661
+#: parser/analyze.c:2645
 msgid "Misplaced INITIALLY IMMEDIATE clause"
 msgstr ""
 
-#: parser/analyze.c:2770
+#: parser/analyze.c:2754
 #, c-format
 msgid ""
 "New table specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:2789
+#: parser/analyze.c:2773
 #, c-format
 msgid ""
 "New view specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:2806
+#: parser/analyze.c:2790
 msgid "parser: unsupported schema node (internal error)"
 msgstr ""
 
@@ -7156,39 +7170,39 @@ msgid ""
 "transformDistinctClause: failed to add DISTINCT ON clause to target list"
 msgstr ""
 
-#: parser/parse_coerce.c:291
+#: parser/parse_coerce.c:288
 #, c-format
 msgid "coerce_type: no conversion function from %s to %s"
 msgstr ""
 
-#: parser/parse_coerce.c:417
+#: parser/parse_coerce.c:414
 #, c-format
 msgid "coerce_type_constraints: failed to lookup type %u"
 msgstr ""
 
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:568
+#: parser/parse_coerce.c:565
 #, c-format
 msgid "Argument of %s must be type boolean, not type %s"
 msgstr ""
 
 #. translator: %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:576
+#: parser/parse_coerce.c:573
 #, c-format
 msgid "Argument of %s must not be a set function"
 msgstr ""
 
-#: parser/parse_coerce.c:623
+#: parser/parse_coerce.c:620
 #, c-format
 msgid "%s types '%s' and '%s' not matched"
 msgstr ""
 
-#: parser/parse_coerce.c:675
+#: parser/parse_coerce.c:672
 #, c-format
 msgid "%s unable to convert to type %s"
 msgstr "%s kan inte konvertera till typ %s"
 
-#: parser/parse_coerce.c:957
+#: parser/parse_coerce.c:954
 #, c-format
 msgid "find_coercion_pathway: bogus castcontext %c"
 msgstr ""
@@ -7288,71 +7302,71 @@ msgstr ""
 msgid "Cannot find type OID for relation %u"
 msgstr ""
 
-#: parser/parse_func.c:208
+#: parser/parse_func.c:232
 #, c-format
 msgid "Cannot pass result of sub-select or join %s to a function"
 msgstr ""
 
-#: parser/parse_func.c:253
+#: parser/parse_func.c:270
 #, c-format
 msgid "%s(*) specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:256
+#: parser/parse_func.c:273
 #, c-format
 msgid "DISTINCT specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:279
+#: parser/parse_func.c:296
 #, c-format
 msgid "Attribute notation .%s applied to type %s, which is not a complex type"
 msgstr ""
 
-#: parser/parse_func.c:282
+#: parser/parse_func.c:299
 #, c-format
 msgid "Attribute \"%s\" not found in datatype %s"
 msgstr ""
 
-#: parser/parse_func.c:331
+#: parser/parse_func.c:348
 msgid "Aggregates may not return sets"
 msgstr ""
 
-#: parser/parse_func.c:1240
+#: parser/parse_func.c:1264
 #, c-format
 msgid "No such attribute %s.%s.%s"
 msgstr ""
 
-#: parser/parse_func.c:1243
+#: parser/parse_func.c:1267
 #, c-format
 msgid "No such attribute %s.%s"
 msgstr ""
 
-#: parser/parse_func.c:1270
+#: parser/parse_func.c:1294
 #, c-format
 msgid "Function %s(%s) does not exist%s%s"
 msgstr ""
 
-#: parser/parse_func.c:1276
+#: parser/parse_func.c:1300
 #, c-format
 msgid "%s: function %s(%s) does not exist%s%s"
 msgstr ""
 
-#: parser/parse_func.c:1302
+#: parser/parse_func.c:1326
 #, c-format
 msgid "%s: aggregate %s(*) does not exist"
 msgstr ""
 
-#: parser/parse_func.c:1305
+#: parser/parse_func.c:1329
 #, c-format
 msgid "%s: aggregate %s(%s) does not exist"
 msgstr ""
 
-#: parser/parse_func.c:1321
+#: parser/parse_func.c:1345
 #, c-format
 msgid "%s: function %s(*) is not an aggregate"
 msgstr ""
 
-#: parser/parse_func.c:1324
+#: parser/parse_func.c:1348
 #, c-format
 msgid "%s: function %s(%s) is not an aggregate"
 msgstr ""
@@ -7710,25 +7724,25 @@ msgstr ""
 msgid "error while unloading add-on"
 msgstr ""
 
-#: port/dynloader/bsdi.c:59 port/dynloader/linux.c:67
+#: port/dynloader/bsdi.c:59 port/dynloader/linux.c:71
 msgid "dld: Cannot link C library!"
 msgstr ""
 
-#: port/dynloader/bsdi.c:66 port/dynloader/linux.c:74
+#: port/dynloader/bsdi.c:66 port/dynloader/linux.c:78
 msgid "dld: Cannot link math library!"
 msgstr ""
 
-#: port/dynloader/bsdi.c:75 port/dynloader/linux.c:83
+#: port/dynloader/bsdi.c:75 port/dynloader/linux.c:87
 msgid "dld: Undefined:"
 msgstr ""
 
-#: port/dynloader/bsdi.c:78 port/dynloader/linux.c:86
+#: port/dynloader/bsdi.c:78 port/dynloader/linux.c:90
 #: port/dynloader/ultrix4.c:61
 #, c-format
 msgid "  %s"
 msgstr ""
 
-#: port/dynloader/linux.c:31
+#: port/dynloader/linux.c:35
 msgid "dynamic load not supported"
 msgstr ""
 
@@ -7761,7 +7775,7 @@ msgstr ""
 msgid "PGSTAT: fcntl() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:230 postmaster/pgstat.c:1166
+#: postmaster/pgstat.c:230 postmaster/pgstat.c:1158
 #, c-format
 msgid "PGSTAT: pipe() failed: %m"
 msgstr ""
@@ -7770,25 +7784,25 @@ msgstr ""
 msgid "PGSTAT: statistics collector startup skipped"
 msgstr ""
 
-#: postmaster/pgstat.c:296 postmaster/pgstat.c:1173
+#: postmaster/pgstat.c:296 postmaster/pgstat.c:1165
 #, c-format
 msgid "PGSTAT: fork() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:705
+#: postmaster/pgstat.c:697
 msgid "Only database superusers can reset statistic counters"
 msgstr ""
 
-#: postmaster/pgstat.c:772 postmaster/pgstat.c:781 postmaster/pgstat.c:828
-#: postmaster/pgstat.c:838
+#: postmaster/pgstat.c:764 postmaster/pgstat.c:773 postmaster/pgstat.c:820
+#: postmaster/pgstat.c:830
 msgid "PGSTATBE: malloc() failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1227
+#: postmaster/pgstat.c:1219
 msgid "PGSTAT: Creation of dead backend hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1238
+#: postmaster/pgstat.c:1230
 msgid "PGSTAT: Allocation of backend table failed"
 msgstr ""
 
@@ -7939,12 +7953,12 @@ msgstr ""
 msgid "Assert checking is not compiled in."
 msgstr ""
 
-#: postmaster/postmaster.c:539 tcop/postgres.c:1493
+#: postmaster/postmaster.c:539 tcop/postgres.c:1574
 #, c-format
 msgid "--%s requires argument"
 msgstr ""
 
-#: postmaster/postmaster.c:541 tcop/postgres.c:1495
+#: postmaster/postmaster.c:541 tcop/postgres.c:1576
 #, c-format
 msgid "-c %s requires argument"
 msgstr ""
@@ -7979,12 +7993,12 @@ msgstr ""
 msgid "-----------------------------------------"
 msgstr ""
 
-#: postmaster/postmaster.c:610 postmaster/postmaster.c:2283
+#: postmaster/postmaster.c:610 postmaster/postmaster.c:2285
 #, c-format
 msgid "\t%s"
 msgstr ""
 
-#: postmaster/postmaster.c:618 tcop/postgres.c:1639
+#: postmaster/postmaster.c:618 tcop/postgres.c:1720
 #, c-format
 msgid "%s: could not locate executable, bailing out..."
 msgstr ""
@@ -8022,11 +8036,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [options...]\n"
+"  %s [OPTION]...\n"
 "\n"
 msgstr ""
 "Anv�ndning:\n"
-"  %s [flaggor...]\n"
+"  %s [FLAGGA]...\n"
 "\n"
 
 #: postmaster/postmaster.c:850
@@ -8035,24 +8049,24 @@ msgstr "Flaggor:\n"
 
 #: postmaster/postmaster.c:852
 msgid "  -A 1|0          enable/disable run-time assert checking\n"
-msgstr ""
+msgstr "  -A 1|0          sl� p�/av k�rningskontroller (assert)\n"
 
 #: postmaster/postmaster.c:854
 #, c-format
 msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
-msgstr ""
+msgstr "  -B ANBUFFER     antal delade buffertar (standard %d)\n"
 
 #: postmaster/postmaster.c:855
 msgid "  -c NAME=VALUE   set run-time parameter\n"
-msgstr ""
+msgstr "  -c NAMN=V�RDE   s�tt k�rningsparameter\n"
 
 #: postmaster/postmaster.c:856
 msgid "  -d 1-5          debugging level\n"
-msgstr ""
+msgstr "  -d 1-5          debug-niv�\n"
 
 #: postmaster/postmaster.c:857
 msgid "  -D DATADIR      database directory\n"
-msgstr ""
+msgstr "  -D DATAKAT      databaskatalog\n"
 
 #: postmaster/postmaster.c:858
 msgid "  -F              turn fsync off\n"
@@ -8060,11 +8074,11 @@ msgstr "  -F              sl
 
 #: postmaster/postmaster.c:859
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
-msgstr ""
+msgstr "  -h V�RDNAMN     v�rdnamn eller IP-adress att lyssna p�\n"
 
 #: postmaster/postmaster.c:860
 msgid "  -i              enable TCP/IP connections\n"
-msgstr ""
+msgstr "  -i              sl� p� TCP/IP-uppkopplingar\n"
 
 #: postmaster/postmaster.c:861
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
@@ -8077,38 +8091,48 @@ msgstr "  -l              sl
 #: postmaster/postmaster.c:865
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
-msgstr ""
+msgstr "  -N MAX-CONNECT  maximalt antal till�tna uppkopplingar (standard %d)\n"
 
 #: postmaster/postmaster.c:867
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
-msgstr ""
+msgstr "  -o FLAGGOR      skicka \"FLAGGOR\" till varje backend-server\n"
 
 #: postmaster/postmaster.c:868
 #, c-format
 msgid "  -p PORT         port number to listen on (default %d)\n"
-msgstr ""
+msgstr "  -p PORT         portnummer att lyssna p� (standard %d)\n"
 
 #: postmaster/postmaster.c:869
 msgid ""
 "  -S              silent mode (start in background without logging output)\n"
-msgstr ""
+msgstr "  -S              tyst l�ge (starta i bakgrunden och logga inte utdata)\n"
+
+#: postmaster/postmaster.c:870
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          visa den h�r hj�lpen, avsluta sedan\n"
 
 #: postmaster/postmaster.c:871
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       visa versionsinformation, avsluta sedan\n"
+
+#: postmaster/postmaster.c:873
 msgid ""
 "\n"
 "Developer options:\n"
-msgstr "\nUtvecklarflaggor:\n"
+msgstr ""
+"\n"
+"Utvecklarflaggor:\n"
 
-#: postmaster/postmaster.c:872
+#: postmaster/postmaster.c:874
 msgid ""
 "  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr ""
+msgstr "  -n              �terinitiera inte delat minne efter onormalt avslutande\n"
 
-#: postmaster/postmaster.c:873
+#: postmaster/postmaster.c:875
 msgid "  -s              send SIGSTOP to all backend servers if one dies\n"
-msgstr ""
+msgstr "  -s              skicka SIGSTOP till alla backend-servrar om en d�r\n"
 
-#: postmaster/postmaster.c:875
+#: postmaster/postmaster.c:877
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -8123,256 +8147,256 @@ msgstr ""
 "\n"
 "Rapportera buggar till <pgsql-bugs@postgresql.org>.\n"
 
-#: postmaster/postmaster.c:957
+#: postmaster/postmaster.c:959
 #, c-format
 msgid "ServerLoop: select failed: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1083 postmaster/postmaster.c:1100
+#: postmaster/postmaster.c:1085 postmaster/postmaster.c:1102
 msgid "incomplete startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1091
+#: postmaster/postmaster.c:1093
 msgid "invalid length of startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1133
+#: postmaster/postmaster.c:1135
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1155
+#: postmaster/postmaster.c:1157
 msgid "unsupported frontend protocol"
 msgstr ""
 
-#: postmaster/postmaster.c:1182
+#: postmaster/postmaster.c:1184
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1215
+#: postmaster/postmaster.c:1217
 msgid "The database system is starting up"
 msgstr ""
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1220
 msgid "The database system is shutting down"
 msgstr ""
 
-#: postmaster/postmaster.c:1221
+#: postmaster/postmaster.c:1223
 msgid "The database system is in recovery mode"
 msgstr ""
 
-#: postmaster/postmaster.c:1224 storage/ipc/sinval.c:52
+#: postmaster/postmaster.c:1226 storage/ipc/sinval.c:52
 #: storage/lmgr/proc.c:211
 msgid "Sorry, too many clients already"
 msgstr "Ledsen, f�r m�nga klienter"
 
-#: postmaster/postmaster.c:1254
+#: postmaster/postmaster.c:1256
 #, c-format
 msgid "processCancelRequest: CheckPointPID in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1268
+#: postmaster/postmaster.c:1270
 #, c-format
 msgid "processing cancel request: sending SIGINT to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1274
+#: postmaster/postmaster.c:1276
 #, c-format
 msgid "bad key in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1281
+#: postmaster/postmaster.c:1283
 #, c-format
 msgid "bad pid in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1324
+#: postmaster/postmaster.c:1326
 msgid "ConnCreate: malloc failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1419
+#: postmaster/postmaster.c:1421
 msgid "Received SIGHUP, reloading configuration files"
 msgstr ""
 
-#: postmaster/postmaster.c:1443
+#: postmaster/postmaster.c:1445
 #, c-format
 msgid "pmdie %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1457
+#: postmaster/postmaster.c:1459
 msgid "smart shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1469 postmaster/postmaster.c:1513
+#: postmaster/postmaster.c:1471 postmaster/postmaster.c:1515
 #, c-format
 msgid "shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1487
+#: postmaster/postmaster.c:1489
 msgid "fast shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1493
+#: postmaster/postmaster.c:1495
 msgid "aborting any active transactions"
 msgstr ""
 
-#: postmaster/postmaster.c:1529
+#: postmaster/postmaster.c:1531
 msgid "immediate shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1564
+#: postmaster/postmaster.c:1566
 msgid "reaping dead processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1581
+#: postmaster/postmaster.c:1583
 msgid "statistics collector process"
 msgstr ""
 
-#: postmaster/postmaster.c:1594
+#: postmaster/postmaster.c:1596
 msgid "shutdown process"
 msgstr "st�ng ner process"
 
-#: postmaster/postmaster.c:1605
+#: postmaster/postmaster.c:1607
 msgid "startup process"
 msgstr "starta process"
 
-#: postmaster/postmaster.c:1607
+#: postmaster/postmaster.c:1609
 msgid "aborting startup due to startup process failure"
 msgstr ""
 
-#: postmaster/postmaster.c:1616
+#: postmaster/postmaster.c:1618
 #, c-format
 msgid "startup process %d died while shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1648
+#: postmaster/postmaster.c:1650
 msgid ""
 "all server processes terminated; reinitializing shared memory and semaphores"
 msgstr ""
 
-#: postmaster/postmaster.c:1686
+#: postmaster/postmaster.c:1688
 msgid "child process"
 msgstr ""
 
-#: postmaster/postmaster.c:1731
+#: postmaster/postmaster.c:1733
 msgid "server process"
 msgstr ""
 
-#: postmaster/postmaster.c:1732
+#: postmaster/postmaster.c:1734
 msgid "terminating any other active server processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1753
+#: postmaster/postmaster.c:1755
 #, c-format
 msgid "CleanupProc: sending %s to process %d"
-msgstr ""
+msgstr "CleanupProc: skickar %s till process %d"
 
-#: postmaster/postmaster.c:1797
+#: postmaster/postmaster.c:1799
 #, c-format
 msgid "%s (pid %d) exited with exit code %d"
-msgstr ""
+msgstr "%s (pid %d) avslutade med avslutningskod %d"
 
-#: postmaster/postmaster.c:1800
+#: postmaster/postmaster.c:1802
 #, c-format
 msgid "%s (pid %d) was terminated by signal %d"
-msgstr ""
+msgstr "%s (pid %d) terminerades av signal %d"
 
-#: postmaster/postmaster.c:1803
+#: postmaster/postmaster.c:1805
 #, c-format
 msgid "%s (pid %d) exited with unexpected status %d"
-msgstr ""
+msgstr "%s (pid %d) avslutad med ov�ntad status %d"
 
-#: postmaster/postmaster.c:1825
+#: postmaster/postmaster.c:1827
 #, c-format
 msgid "SignalChildren: sending signal %d to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1863
+#: postmaster/postmaster.c:1865
 msgid "out of memory; connection startup aborted"
-msgstr ""
+msgstr "slut p� minnet; uppkoppling avbruten"
 
-#: postmaster/postmaster.c:1914
+#: postmaster/postmaster.c:1916
 msgid "connection startup failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1931
+#: postmaster/postmaster.c:1933
 #, c-format
 msgid "connection startup failed (fork failure): %s"
 msgstr ""
 
-#: postmaster/postmaster.c:1938
+#: postmaster/postmaster.c:1940
 #, c-format
 msgid "BackendStartup: forked pid=%d socket=%d"
 msgstr ""
 
-#: postmaster/postmaster.c:1972
+#: postmaster/postmaster.c:1974
 msgid "Server process fork() failed: "
 msgstr ""
 
-#: postmaster/postmaster.c:2119
+#: postmaster/postmaster.c:2121
 #, c-format
 msgid "connection received: host=%s port=%hu"
 msgstr ""
 
-#: postmaster/postmaster.c:2139
+#: postmaster/postmaster.c:2141
 #, c-format
 msgid "connection received: host=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2159
+#: postmaster/postmaster.c:2161
 msgid "DoBackend: Unable to set timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2188
+#: postmaster/postmaster.c:2190
 msgid "DoBackend: Unable to disable timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2192
+#: postmaster/postmaster.c:2194
 #, c-format
 msgid "connection authorized: user=%s database=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2281
+#: postmaster/postmaster.c:2283
 #, c-format
 msgid "%s child[%d]: starting with ("
 msgstr ""
 
-#: postmaster/postmaster.c:2284
+#: postmaster/postmaster.c:2286
 msgid ")"
 msgstr ""
 
-#: postmaster/postmaster.c:2583
+#: postmaster/postmaster.c:2585
 #, c-format
 msgid "could not launch startup process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2586
+#: postmaster/postmaster.c:2588
 #, c-format
 msgid "could not launch checkpoint process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2589
+#: postmaster/postmaster.c:2591
 #, c-format
 msgid "could not launch shutdown process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2613
+#: postmaster/postmaster.c:2615
 msgid "CheckPointDataBase: malloc failed"
 msgstr ""
 
-#: postmaster/postmaster.c:2652
+#: postmaster/postmaster.c:2654
 #, c-format
 msgid "cannot create file %s: %s"
-msgstr ""
+msgstr "kan inte skapa fil %s: %s"
 
-#: postmaster/postmaster.c:2664
+#: postmaster/postmaster.c:2666
 #, c-format
 msgid "writing file %s failed"
-msgstr ""
+msgstr "kan inte skriva fil %s"
 
 #: regex/regcomp.c:1758 regex/regcomp.c:1773
 msgid "cclass_init: out of memory"
-msgstr ""
+msgstr "cclass_init: slut p� minnet"
 
 #: rewrite/rewriteDefine.c:100
 #, c-format
@@ -8459,7 +8483,7 @@ msgstr ""
 #: rewrite/rewriteDefine.c:516
 #, c-format
 msgid "Attempt to rename rule \"%s\" failed: \"%s\" already exists"
-msgstr ""
+msgstr "F�rs�k att d�pa om regel \"%s\" misslyckades: \"%s\" finns redan"
 
 #: rewrite/rewriteHandler.c:343
 #, c-format
@@ -8487,30 +8511,30 @@ msgstr ""
 msgid "fireRIRrules: failed to remove aggs from qual"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1106
+#: rewrite/rewriteHandler.c:1096
 #, c-format
 msgid "query rewritten %d times, may contain cycles"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1230
+#: rewrite/rewriteHandler.c:1208
 msgid ""
 "Cannot insert into a view\n"
 "\tYou need an unconditional ON INSERT DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1234
+#: rewrite/rewriteHandler.c:1212
 msgid ""
 "Cannot update a view\n"
 "\tYou need an unconditional ON UPDATE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1238
+#: rewrite/rewriteHandler.c:1216
 msgid ""
 "Cannot delete from a view\n"
 "\tYou need an unconditional ON DELETE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1242
+#: rewrite/rewriteHandler.c:1220
 #, c-format
 msgid "QueryRewrite: unexpected commandType %d"
 msgstr ""
@@ -8527,7 +8551,7 @@ msgstr ""
 msgid "Conditional utility statements are not implemented"
 msgstr ""
 
-#: rewrite/rewriteManip.c:798
+#: rewrite/rewriteManip.c:790
 msgid "ResolveNew: can't handle whole-tuple reference"
 msgstr ""
 
@@ -8664,15 +8688,15 @@ msgstr ""
 
 #: storage/buffer/freelist.c:201
 msgid "out of free buffers: time to abort!"
-msgstr ""
+msgstr "slut p� tomma buffertar: dags att avbryta!"
 
 #: storage/buffer/localbuf.c:83
 msgid "no empty local buffer."
-msgstr ""
+msgstr "ingen tom lokal buffert."
 
 #: storage/buffer/localbuf.c:120
 msgid "Out of memory in LocalBufferAlloc"
-msgstr ""
+msgstr "Slut p� minne i LocalBufferAlloc"
 
 #: storage/buffer/localbuf.c:227
 #, c-format
@@ -9015,7 +9039,7 @@ msgstr ""
 msgid "inv_seek: invalid whence: %d"
 msgstr ""
 
-#: storage/lmgr/deadlock.c:269
+#: storage/lmgr/deadlock.c:271
 msgid "DeadLockCheckRecurse: inconsistent results"
 msgstr ""
 
@@ -9473,52 +9497,52 @@ msgstr ""
 msgid "HandleFunctionRequest: bogus argsize %d, should be %d"
 msgstr ""
 
-#: tcop/fastpath.c:337 tcop/postgres.c:664
+#: tcop/fastpath.c:337 tcop/postgres.c:679
 msgid ""
 "current transaction is aborted, queries ignored until end of transaction "
 "block"
 msgstr ""
 
-#: tcop/postgres.c:288
+#: tcop/postgres.c:286
 #, c-format
 msgid "Socket command type %c unknown"
 msgstr ""
 
-#: tcop/postgres.c:376
+#: tcop/postgres.c:374
 #, c-format
 msgid "query: %s"
 msgstr ""
 
-#: tcop/postgres.c:463
+#: tcop/postgres.c:461
 msgid "pg_analyze_and_rewrite: copyObject failed on parse tree"
 msgstr ""
 
-#: tcop/postgres.c:507
+#: tcop/postgres.c:505
 msgid "pg_plan_query: copyObject failed on plan tree"
 msgstr ""
 
-#: tcop/postgres.c:719
+#: tcop/postgres.c:756
 msgid "ProcessUtility"
 msgstr ""
 
-#: tcop/postgres.c:763
+#: tcop/postgres.c:838
 msgid "ProcessQuery"
 msgstr ""
 
-#: tcop/postgres.c:872
+#: tcop/postgres.c:951
 #, c-format
 msgid "duration: %ld.%06ld sec"
 msgstr ""
 
-#: tcop/postgres.c:886
+#: tcop/postgres.c:965
 msgid "StartTransactionCommand"
 msgstr ""
 
-#: tcop/postgres.c:897
+#: tcop/postgres.c:976
 msgid "CommitTransactionCommand"
 msgstr ""
 
-#: tcop/postgres.c:924
+#: tcop/postgres.c:1003
 msgid ""
 "Message from PostgreSQL backend:\n"
 "\tThe Postmaster has informed me that some other backend\n"
@@ -9528,63 +9552,63 @@ msgid ""
 "\tPlease reconnect to the database system and repeat your query."
 msgstr ""
 
-#: tcop/postgres.c:1042
+#: tcop/postgres.c:1121
 msgid ""
 "floating point exception! The last floating point operation either exceeded "
 "legal ranges or was a divide by zero"
 msgstr ""
 
-#: tcop/postgres.c:1075
+#: tcop/postgres.c:1154
 msgid "This connection has been terminated by the administrator."
 msgstr ""
 
-#: tcop/postgres.c:1082
-msgid "Query was canceled."
+#: tcop/postgres.c:1161
+msgid "Query was cancelled."
 msgstr "Fr�gan avbr�ts."
 
-#: tcop/postgres.c:1227
+#: tcop/postgres.c:1308
 msgid "Assert checking is not compiled in"
 msgstr ""
 
-#: tcop/postgres.c:1459
+#: tcop/postgres.c:1540
 msgid "only one -x flag is allowed"
 msgstr ""
 
-#: tcop/postgres.c:1477
+#: tcop/postgres.c:1558
 msgid "use -x {off,nor,nopull,nopm,pullall,wait}"
 msgstr ""
 
-#: tcop/postgres.c:1532
+#: tcop/postgres.c:1613
 msgid ""
 "Query statistics are disabled because parser, planner, or executor "
 "statistics are on."
 msgstr ""
 
-#: tcop/postgres.c:1609 tcop/postgres.c:1621
+#: tcop/postgres.c:1690 tcop/postgres.c:1702
 #, c-format
 msgid ""
 "%s: invalid command line arguments\n"
 "Try -? for help."
 msgstr ""
 
-#: tcop/postgres.c:1629
+#: tcop/postgres.c:1710
 #, c-format
 msgid "%s: user name undefined and no database specified"
 msgstr ""
 
-#: tcop/postgres.c:1680
+#: tcop/postgres.c:1761
 msgid "InitPostgres"
 msgstr ""
 
-#: tcop/postgres.c:1763
+#: tcop/postgres.c:1844
 msgid "AbortCurrentTransaction"
 msgstr ""
 
-#: tcop/postgres.c:1968
+#: tcop/postgres.c:2052
 msgid "unknown frontend message was received"
 msgstr ""
 
-#: tcop/postgres.c:2100
+#: tcop/postgres.c:2181
 #, c-format
 msgid ""
 "%s\n"
@@ -9593,7 +9617,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: tcop/postgres.c:2462
+#: tcop/postgres.c:2543
 #, c-format
 msgid "CreateCommandTag: unknown parse node type %d"
 msgstr ""
@@ -9628,20 +9652,20 @@ msgstr ""
 msgid "relation \"%s\" is a system catalog"
 msgstr ""
 
-#: tcop/utility.c:452 tcop/utility.c:456
+#: tcop/utility.c:445 tcop/utility.c:449
 #, c-format
 msgid "ProcessUtility: Invalid target for RENAME: %d"
 msgstr ""
 
-#: tcop/utility.c:561
+#: tcop/utility.c:553
 msgid "ALTER TABLE: permission denied"
 msgstr "ALTER TABLE: r�ttighet saknas"
 
-#: tcop/utility.c:567
+#: tcop/utility.c:559
 msgid "T_AlterTableStmt: unknown subtype"
 msgstr ""
 
-#: tcop/utility.c:884
+#: tcop/utility.c:876
 #, c-format
 msgid "ProcessUtility: command #%d unsupported"
 msgstr ""
@@ -10029,120 +10053,120 @@ msgstr ""
 msgid "Bad float8 input format -- underflow"
 msgstr ""
 
-#: utils/adt/float.c:205
+#: utils/adt/float.c:204
 #, c-format
 msgid "Bad float4 input format '%s'"
 msgstr ""
 
-#: utils/adt/float.c:210
+#: utils/adt/float.c:209
 #, c-format
 msgid "Input '%s' is out of range for float4"
 msgstr ""
 
-#: utils/adt/float.c:270 utils/adt/numeric.c:2830 utils/adt/numeric.c:2853
+#: utils/adt/float.c:269 utils/adt/numeric.c:2836 utils/adt/numeric.c:2859
 #, c-format
 msgid "Bad float8 input format '%s'"
 msgstr ""
 
-#: utils/adt/float.c:275
+#: utils/adt/float.c:274
 #, c-format
 msgid "Input '%s' is out of range for float8"
 msgstr ""
 
-#: utils/adt/float.c:494
+#: utils/adt/float.c:493
 msgid "float4div: divide by zero error"
 msgstr ""
 
-#: utils/adt/float.c:556
+#: utils/adt/float.c:555
 msgid "float8div: divide by zero error"
 msgstr ""
 
-#: utils/adt/float.c:806
+#: utils/adt/float.c:805
 msgid "dtoi4: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:823
+#: utils/adt/float.c:822
 msgid "dtoi2: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:868
+#: utils/adt/float.c:867
 msgid "ftoi4: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:885
+#: utils/adt/float.c:884
 msgid "ftoi2: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:1075
+#: utils/adt/float.c:1118
 msgid "can't take sqrt of a negative number"
 msgstr ""
 
-#: utils/adt/float.c:1119
+#: utils/adt/float.c:1162
 msgid "pow() result is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1147
+#: utils/adt/float.c:1190
 msgid "exp() result is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1165 utils/adt/float.c:1186
+#: utils/adt/float.c:1208 utils/adt/float.c:1229
 msgid "can't take log of zero"
 msgstr ""
 
-#: utils/adt/float.c:1167 utils/adt/float.c:1188
+#: utils/adt/float.c:1210 utils/adt/float.c:1231
 msgid "can't take log of a negative number"
 msgstr ""
 
-#: utils/adt/float.c:1213
+#: utils/adt/float.c:1256
 #, c-format
 msgid "acos(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1236
+#: utils/adt/float.c:1279
 #, c-format
 msgid "asin(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1259
+#: utils/adt/float.c:1302
 #, c-format
 msgid "atan(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1283
+#: utils/adt/float.c:1326
 #, c-format
 msgid "atan2(%f,%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1306
+#: utils/adt/float.c:1349
 #, c-format
 msgid "cos(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1329
+#: utils/adt/float.c:1372
 #, c-format
 msgid "cot(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1353
+#: utils/adt/float.c:1396
 #, c-format
 msgid "sin(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1376
+#: utils/adt/float.c:1419
 #, c-format
 msgid "tan(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1487
+#: utils/adt/float.c:1530
 #, c-format
 msgid "%s: expected 3-element float8 array"
 msgstr ""
 
-#: utils/adt/float.c:1698
+#: utils/adt/float.c:1741
 msgid "float48div: divide by zero"
 msgstr ""
 
-#: utils/adt/float.c:1758
+#: utils/adt/float.c:1801
 msgid "float84div: divide by zero"
 msgstr ""
 
@@ -10588,17 +10612,17 @@ msgstr ""
 msgid "ESCAPE string must be empty or one character"
 msgstr ""
 
-#: utils/adt/mac.c:52
+#: utils/adt/mac.c:61
 #, c-format
 msgid "macaddr_in: error in parsing \"%s\""
 msgstr ""
 
-#: utils/adt/mac.c:57
+#: utils/adt/mac.c:66
 #, c-format
 msgid "macaddr_in: illegal address \"%s\""
 msgstr ""
 
-#: utils/adt/mac.c:130
+#: utils/adt/mac.c:139
 msgid "Text is too long to convert to MAC address"
 msgstr ""
 
@@ -10632,7 +10656,7 @@ msgstr ""
 
 #: utils/adt/nabstime.c:753
 msgid ""
-"Unable convert ABSTIME to TIMESTAMP\n"
+"Unable to convert ABSTIME to TIMESTAMP\n"
 "\tabstime_timestamp() internal error"
 msgstr ""
 
@@ -10642,8 +10666,8 @@ msgstr ""
 
 #: utils/adt/nabstime.c:821
 msgid ""
-"Unable convert ABSTIME to TIMESTAMP WITH TIME ZONE\n"
-"\tabstime_timestamp() internal error"
+"Unable to convert ABSTIME to TIMESTAMP WITH TIME ZONE\n"
+"\tabstime_timestamptz() internal error"
 msgstr ""
 
 #: utils/adt/nabstime.c:852
@@ -10717,71 +10741,71 @@ msgstr ""
 msgid "int4notin: must provide relationname.attributename"
 msgstr ""
 
-#: utils/adt/numeric.c:1506
+#: utils/adt/numeric.c:1512
 msgid "Cannot convert NaN to int4"
 msgstr ""
 
-#: utils/adt/numeric.c:1556
+#: utils/adt/numeric.c:1562
 msgid "Cannot convert NaN to int8"
 msgstr ""
 
-#: utils/adt/numeric.c:1607
+#: utils/adt/numeric.c:1613
 msgid "Cannot convert NaN to int2"
 msgstr ""
 
-#: utils/adt/numeric.c:1803
+#: utils/adt/numeric.c:1809
 msgid "do_numeric_accum: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1894
+#: utils/adt/numeric.c:1900
 msgid "numeric_avg: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1930
+#: utils/adt/numeric.c:1936
 msgid "numeric_variance: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:2012
+#: utils/adt/numeric.c:2018
 msgid "numeric_stddev: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:2208
+#: utils/adt/numeric.c:2214
 msgid "int2_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2228
+#: utils/adt/numeric.c:2234
 msgid "int4_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2246
+#: utils/adt/numeric.c:2252
 msgid "int8_avg: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2437 utils/adt/numeric.c:2452 utils/adt/numeric.c:2470
-#: utils/adt/numeric.c:2474 utils/adt/numeric.c:2485
+#: utils/adt/numeric.c:2443 utils/adt/numeric.c:2458 utils/adt/numeric.c:2476
+#: utils/adt/numeric.c:2480 utils/adt/numeric.c:2491
 #, c-format
 msgid "Bad numeric input format '%s'"
 msgstr ""
 
-#: utils/adt/numeric.c:2804
+#: utils/adt/numeric.c:2810
 #, c-format
 msgid ""
 "overflow on numeric ABS(value) >= 10^%d for field with precision %d scale %d"
 msgstr ""
 
-#: utils/adt/numeric.c:3263
+#: utils/adt/numeric.c:3269
 msgid "division by zero on numeric"
 msgstr ""
 
-#: utils/adt/numeric.c:3644
+#: utils/adt/numeric.c:3650
 msgid "math error on numeric - cannot compute SQRT of negative value"
 msgstr ""
 
-#: utils/adt/numeric.c:3733
+#: utils/adt/numeric.c:3739
 msgid "argument for EXP() too big"
 msgstr ""
 
-#: utils/adt/numeric.c:3812
+#: utils/adt/numeric.c:3818
 msgid "math error on numeric - cannot compute LN of value <= zero"
 msgstr ""
 
@@ -10837,7 +10861,7 @@ msgstr ""
 msgid "Requested buffer is too large."
 msgstr ""
 
-#: utils/adt/pg_locale.c:150
+#: utils/adt/pg_locale.c:160
 msgid "Invalid LC_COLLATE setting"
 msgstr ""
 
@@ -10947,472 +10971,484 @@ msgstr ""
 msgid "too many keys (%d max) in call to RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:282 utils/adt/ri_triggers.c:393
-#: utils/adt/ri_triggers.c:598
+#: utils/adt/ri_triggers.c:215 utils/adt/ri_triggers.c:758
+#: utils/adt/ri_triggers.c:988 utils/adt/ri_triggers.c:1224
+#: utils/adt/ri_triggers.c:1432 utils/adt/ri_triggers.c:1676
+#: utils/adt/ri_triggers.c:1899 utils/adt/ri_triggers.c:2127
+#: utils/adt/ri_triggers.c:2346 utils/adt/ri_triggers.c:2611
+#: utils/adt/ri_triggers.c:2873 utils/adt/ri_triggers.c:3143
+#, c-format
+msgid ""
+"No target table given for trigger \"%s\" on \"%s\"\n"
+"\tRemove these RI triggers and do ALTER TABLE ADD CONSTRAINT"
+msgstr ""
+
+#: utils/adt/ri_triggers.c:291 utils/adt/ri_triggers.c:402
+#: utils/adt/ri_triggers.c:607
 msgid "SPI_connect() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:287 utils/adt/ri_triggers.c:471
+#: utils/adt/ri_triggers.c:296 utils/adt/ri_triggers.c:480
 msgid "SPI_execp() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:292
+#: utils/adt/ri_triggers.c:301
 #, c-format
 msgid "%s referential integrity violation - no rows found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:298 utils/adt/ri_triggers.c:483
+#: utils/adt/ri_triggers.c:307 utils/adt/ri_triggers.c:492
 msgid "SPI_finish() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:310 utils/adt/ri_triggers.c:893
-#: utils/adt/ri_triggers.c:1128 utils/adt/ri_triggers.c:1328
-#: utils/adt/ri_triggers.c:1561 utils/adt/ri_triggers.c:1777
-#: utils/adt/ri_triggers.c:2007 utils/adt/ri_triggers.c:2217
-#: utils/adt/ri_triggers.c:2479 utils/adt/ri_triggers.c:2733
-#: utils/adt/ri_triggers.c:3018 utils/adt/ri_triggers.c:3102
+#: utils/adt/ri_triggers.c:319 utils/adt/ri_triggers.c:908
+#: utils/adt/ri_triggers.c:1149 utils/adt/ri_triggers.c:1355
+#: utils/adt/ri_triggers.c:1594 utils/adt/ri_triggers.c:1816
+#: utils/adt/ri_triggers.c:2052 utils/adt/ri_triggers.c:2268
+#: utils/adt/ri_triggers.c:2536 utils/adt/ri_triggers.c:2796
+#: utils/adt/ri_triggers.c:3087 utils/adt/ri_triggers.c:3177
 msgid "MATCH PARTIAL not yet supported"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:346
+#: utils/adt/ri_triggers.c:355
 #, c-format
 msgid ""
 "%s referential integrity violation - MATCH FULL doesn't allow mixing of NULL "
 "and NON-NULL key values"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:370 utils/adt/ri_triggers.c:584
+#: utils/adt/ri_triggers.c:379 utils/adt/ri_triggers.c:593
 msgid "MATCH PARTIAL not yet implemented"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:476
+#: utils/adt/ri_triggers.c:485
 #, c-format
 msgid ""
 "%s referential integrity violation - key referenced from %s not found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:492
+#: utils/adt/ri_triggers.c:501
 msgid "internal error #1 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:669
+#: utils/adt/ri_triggers.c:678
 msgid "SPI_execp() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:676
+#: utils/adt/ri_triggers.c:685
 msgid "SPI_finish() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:717
+#: utils/adt/ri_triggers.c:726
 msgid "RI_FKey_noaction_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:720
+#: utils/adt/ri_triggers.c:729
 msgid "RI_FKey_noaction_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:722
+#: utils/adt/ri_triggers.c:731
 msgid "RI_FKey_noaction_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:730
+#: utils/adt/ri_triggers.c:739
 msgid "wrong # of arguments in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:732
+#: utils/adt/ri_triggers.c:741
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:801
+#: utils/adt/ri_triggers.c:816
 msgid "SPI_connect() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:871
+#: utils/adt/ri_triggers.c:886
 msgid "SPI_execp() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:876 utils/adt/ri_triggers.c:1111
-#: utils/adt/ri_triggers.c:1760 utils/adt/ri_triggers.c:1990
+#: utils/adt/ri_triggers.c:891 utils/adt/ri_triggers.c:1132
+#: utils/adt/ri_triggers.c:1799 utils/adt/ri_triggers.c:2035
 #, c-format
 msgid "%s referential integrity violation - key in %s still referenced from %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:883
+#: utils/adt/ri_triggers.c:898
 msgid "SPI_finish() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:900
+#: utils/adt/ri_triggers.c:915
 msgid "internal error #2 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:941
+#: utils/adt/ri_triggers.c:956
 msgid "RI_FKey_noaction_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:944
+#: utils/adt/ri_triggers.c:959
 msgid "RI_FKey_noaction_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:946
+#: utils/adt/ri_triggers.c:961
 msgid "RI_FKey_noaction_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:954
+#: utils/adt/ri_triggers.c:969
 msgid "wrong # of arguments in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:956
+#: utils/adt/ri_triggers.c:971
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1036
+#: utils/adt/ri_triggers.c:1057
 msgid "SPI_connect() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1106
+#: utils/adt/ri_triggers.c:1127
 msgid "SPI_execp() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1118
+#: utils/adt/ri_triggers.c:1139
 msgid "SPI_finish() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1135
+#: utils/adt/ri_triggers.c:1156
 msgid "internal error #3 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1171
+#: utils/adt/ri_triggers.c:1192
 msgid "RI_FKey_cascade_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1174
+#: utils/adt/ri_triggers.c:1195
 msgid "RI_FKey_cascade_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1176
+#: utils/adt/ri_triggers.c:1197
 msgid "RI_FKey_cascade_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1184
+#: utils/adt/ri_triggers.c:1205
 msgid "wrong # of arguments in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1186
+#: utils/adt/ri_triggers.c:1207
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1244
+#: utils/adt/ri_triggers.c:1271
 msgid "SPI_connect() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1313
+#: utils/adt/ri_triggers.c:1340
 msgid "SPI_execp() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1318
+#: utils/adt/ri_triggers.c:1345
 msgid "SPI_finish() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1335
+#: utils/adt/ri_triggers.c:1362
 msgid "internal error #4 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1373
+#: utils/adt/ri_triggers.c:1400
 msgid "RI_FKey_cascade_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1376
+#: utils/adt/ri_triggers.c:1403
 msgid "RI_FKey_cascade_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1378
+#: utils/adt/ri_triggers.c:1405
 msgid "RI_FKey_cascade_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1386
+#: utils/adt/ri_triggers.c:1413
 msgid "wrong # of arguments in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1388
+#: utils/adt/ri_triggers.c:1415
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1457
+#: utils/adt/ri_triggers.c:1490
 msgid "SPI_connect() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1546
+#: utils/adt/ri_triggers.c:1579
 msgid "SPI_execp() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1551
+#: utils/adt/ri_triggers.c:1584
 msgid "SPI_finish() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1568
+#: utils/adt/ri_triggers.c:1601
 msgid "internal error #5 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1611
+#: utils/adt/ri_triggers.c:1644
 msgid "RI_FKey_restrict_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1614
+#: utils/adt/ri_triggers.c:1647
 msgid "RI_FKey_restrict_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1616
+#: utils/adt/ri_triggers.c:1649
 msgid "RI_FKey_restrict_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1624
+#: utils/adt/ri_triggers.c:1657
 msgid "wrong # of arguments in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1626
+#: utils/adt/ri_triggers.c:1659
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1684
+#: utils/adt/ri_triggers.c:1723
 msgid "SPI_connect() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1755
+#: utils/adt/ri_triggers.c:1794
 msgid "SPI_execp() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1767
+#: utils/adt/ri_triggers.c:1806
 msgid "SPI_finish() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1784
+#: utils/adt/ri_triggers.c:1823
 msgid "internal error #6 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1828
+#: utils/adt/ri_triggers.c:1867
 msgid "RI_FKey_restrict_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1831
+#: utils/adt/ri_triggers.c:1870
 msgid "RI_FKey_restrict_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1833
+#: utils/adt/ri_triggers.c:1872
 msgid "RI_FKey_restrict_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1841
+#: utils/adt/ri_triggers.c:1880
 msgid "wrong # of arguments in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1843
+#: utils/adt/ri_triggers.c:1882
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1912
+#: utils/adt/ri_triggers.c:1957
 msgid "SPI_connect() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1985
+#: utils/adt/ri_triggers.c:2030
 msgid "SPI_execp() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1997
+#: utils/adt/ri_triggers.c:2042
 msgid "SPI_finish() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2014
+#: utils/adt/ri_triggers.c:2059
 msgid "internal error #7 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2050
+#: utils/adt/ri_triggers.c:2095
 msgid "RI_FKey_setnull_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2053
+#: utils/adt/ri_triggers.c:2098
 msgid "RI_FKey_setnull_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2055
+#: utils/adt/ri_triggers.c:2100
 msgid "RI_FKey_setnull_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2063
+#: utils/adt/ri_triggers.c:2108
 msgid "wrong # of arguments in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2065
+#: utils/adt/ri_triggers.c:2110
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2123
+#: utils/adt/ri_triggers.c:2174
 msgid "SPI_connect() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2202
+#: utils/adt/ri_triggers.c:2253
 msgid "SPI_execp() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2207
+#: utils/adt/ri_triggers.c:2258
 msgid "SPI_finish() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2224
+#: utils/adt/ri_triggers.c:2275
 msgid "internal error #8 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2263
+#: utils/adt/ri_triggers.c:2314
 msgid "RI_FKey_setnull_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2266
+#: utils/adt/ri_triggers.c:2317
 msgid "RI_FKey_setnull_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2268
+#: utils/adt/ri_triggers.c:2319
 msgid "RI_FKey_setnull_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2276
+#: utils/adt/ri_triggers.c:2327
 msgid "wrong # of arguments in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2278
+#: utils/adt/ri_triggers.c:2329
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2348
+#: utils/adt/ri_triggers.c:2405
 msgid "SPI_connect() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2464
+#: utils/adt/ri_triggers.c:2521
 msgid "SPI_execp() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2469
+#: utils/adt/ri_triggers.c:2526
 msgid "SPI_finish() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2486
+#: utils/adt/ri_triggers.c:2543
 msgid "internal error #9 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2522
+#: utils/adt/ri_triggers.c:2579
 msgid "RI_FKey_setdefault_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2525
+#: utils/adt/ri_triggers.c:2582
 msgid "RI_FKey_setdefault_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2527
+#: utils/adt/ri_triggers.c:2584
 msgid "RI_FKey_setdefault_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2535
+#: utils/adt/ri_triggers.c:2592
 msgid "wrong # of arguments in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2537
+#: utils/adt/ri_triggers.c:2594
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2595
+#: utils/adt/ri_triggers.c:2658
 msgid "SPI_connect() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2718
+#: utils/adt/ri_triggers.c:2781
 msgid "SPI_execp() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2723
+#: utils/adt/ri_triggers.c:2786
 msgid "SPI_finish() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2740
+#: utils/adt/ri_triggers.c:2803
 msgid "internal error #10 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2778
+#: utils/adt/ri_triggers.c:2841
 msgid "RI_FKey_setdefault_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2781
+#: utils/adt/ri_triggers.c:2844
 msgid "RI_FKey_setdefault_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2783
+#: utils/adt/ri_triggers.c:2846
 msgid "RI_FKey_setdefault_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2791
+#: utils/adt/ri_triggers.c:2854
 msgid "wrong # of arguments in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2793
+#: utils/adt/ri_triggers.c:2856
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2864
+#: utils/adt/ri_triggers.c:2933
 msgid "SPI_connect() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3003
+#: utils/adt/ri_triggers.c:3072
 msgid "SPI_execp() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3008
+#: utils/adt/ri_triggers.c:3077
 msgid "SPI_finish() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3025
+#: utils/adt/ri_triggers.c:3094
 msgid "internal error #11 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3056
+#: utils/adt/ri_triggers.c:3125
 msgid "wrong # of arguments in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3058
+#: utils/adt/ri_triggers.c:3127
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3109
+#: utils/adt/ri_triggers.c:3184
 msgid "internal error #12 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3174
+#: utils/adt/ri_triggers.c:3249
 #, c-format
 msgid "unrecognized referential integrity MATCH type '%s'"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3224 utils/adt/ri_triggers.c:3232
-#: utils/adt/ri_triggers.c:3284
+#: utils/adt/ri_triggers.c:3299 utils/adt/ri_triggers.c:3307
+#: utils/adt/ri_triggers.c:3359
 #, c-format
 msgid "constraint %s: table %s does not have an attribute %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3412
+#: utils/adt/ri_triggers.c:3487
 msgid "out of memory for RI plan cache"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3601
+#: utils/adt/ri_triggers.c:3676
 #, c-format
 msgid "ri_AttributesEqual(): cannot find '=' operator for type %u"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3617
+#: utils/adt/ri_triggers.c:3692
 msgid "out of memory for RI operator cache"
 msgstr ""
 
@@ -11608,55 +11644,55 @@ msgstr ""
 msgid "patternsel: no = operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1060 utils/adt/selfuncs.c:1137
-#: utils/adt/selfuncs.c:1178 utils/adt/selfuncs.c:1208
+#: utils/adt/selfuncs.c:1055 utils/adt/selfuncs.c:1132
+#: utils/adt/selfuncs.c:1173 utils/adt/selfuncs.c:1203
 #, c-format
 msgid "booltestsel: unexpected booltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1246 utils/adt/selfuncs.c:1303
+#: utils/adt/selfuncs.c:1238 utils/adt/selfuncs.c:1292
 #, c-format
 msgid "nulltestsel: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2116
+#: utils/adt/selfuncs.c:2105
 #, c-format
 msgid "convert_numeric_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2303
+#: utils/adt/selfuncs.c:2292
 #, c-format
 msgid "convert_string_datum: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2492
+#: utils/adt/selfuncs.c:2481
 #, c-format
 msgid "convert_timevalue_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2719 utils/adt/selfuncs.c:3080
+#: utils/adt/selfuncs.c:2708 utils/adt/selfuncs.c:3076
 msgid "Cannot perform case insensitive matching on type BYTEA"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2804 utils/adt/selfuncs.c:3226
+#: utils/adt/selfuncs.c:2793 utils/adt/selfuncs.c:3222
 msgid "Regex matching not supported on type BYTEA"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2945
+#: utils/adt/selfuncs.c:2934
 msgid "pattern_fixed_prefix: bogus ptype"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2974
+#: utils/adt/selfuncs.c:2963
 #, c-format
 msgid "prefix_selectivity: no >= operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3001
+#: utils/adt/selfuncs.c:2994
 #, c-format
 msgid "prefix_selectivity: no < operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3270
+#: utils/adt/selfuncs.c:3266
 msgid "pattern_selectivity: bogus ptype"
 msgstr ""
 
@@ -12281,140 +12317,140 @@ msgstr ""
 msgid "RelationReloadClassinfo system relation id=%d doesn't exist"
 msgstr ""
 
-#: utils/cache/relcache.c:1775
+#: utils/cache/relcache.c:1772
 #, c-format
 msgid "RelationClearRelation: relation %u deleted while still in use"
 msgstr ""
 
-#: utils/cache/relcache.c:1865
+#: utils/cache/relcache.c:1855
 #, c-format
 msgid "RelationForgetRelation: relation %u is still open"
 msgstr ""
 
-#: utils/cache/relcache.c:2022
+#: utils/cache/relcache.c:2012
 #, c-format
 msgid "Relcache reference leak: relation \"%s\" has refcnt %d instead of %d"
 msgstr ""
 
-#: utils/cache/relcache.c:2308
+#: utils/cache/relcache.c:2298
 #, c-format
 msgid "RelationCacheInitializePhase2: no pg_class entry for %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2456
+#: utils/cache/relcache.c:2446
 #, c-format
 msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2464
+#: utils/cache/relcache.c:2454
 #, c-format
 msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2475
+#: utils/cache/relcache.c:2465
 #, c-format
 msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2484
+#: utils/cache/relcache.c:2474
 #, c-format
 msgid "AttrDefaultFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2518
+#: utils/cache/relcache.c:2508
 #, c-format
 msgid "CheckConstraintFetch: unexpected record found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2529
+#: utils/cache/relcache.c:2519
 #, c-format
 msgid "CheckConstraintFetch: conbin IS NULL for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2542
+#: utils/cache/relcache.c:2532
 #, c-format
 msgid "CheckConstraintFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:3005
+#: utils/cache/relcache.c:2995
 #, c-format
 msgid ""
 "Cannot create init file %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: utils/cache/relcache.c:3029
+#: utils/cache/relcache.c:3019
 msgid "cannot write init file -- descriptor length"
 msgstr ""
 
-#: utils/cache/relcache.c:3033
+#: utils/cache/relcache.c:3023
 msgid "cannot write init file -- reldesc"
 msgstr ""
 
-#: utils/cache/relcache.c:3038
+#: utils/cache/relcache.c:3028
 msgid "cannot write init file -- relation tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3041
+#: utils/cache/relcache.c:3031
 msgid "cannot write init file -- relation tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3048
+#: utils/cache/relcache.c:3038
 #, c-format
 msgid "cannot write init file -- length of attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3050
+#: utils/cache/relcache.c:3040
 #, c-format
 msgid "cannot write init file -- attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3069
+#: utils/cache/relcache.c:3059
 #, c-format
 msgid "write_relcache_init_file: no pg_index entry for index %u"
 msgstr ""
 
-#: utils/cache/relcache.c:3073
+#: utils/cache/relcache.c:3063
 msgid "cannot write init file -- index tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3075
+#: utils/cache/relcache.c:3065
 msgid "cannot write init file -- index tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3081
+#: utils/cache/relcache.c:3071
 msgid "cannot write init file -- am tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3084
+#: utils/cache/relcache.c:3074
 msgid "cannot write init file -- am tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3090
+#: utils/cache/relcache.c:3080
 msgid "cannot write init file -- strategy map length"
 msgstr ""
 
-#: utils/cache/relcache.c:3093
+#: utils/cache/relcache.c:3083
 msgid "cannot write init file -- strategy map"
 msgstr ""
 
-#: utils/cache/relcache.c:3098
+#: utils/cache/relcache.c:3088
 msgid "cannot write init file -- operator vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3101
+#: utils/cache/relcache.c:3091
 msgid "cannot write init file -- operator vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3106
+#: utils/cache/relcache.c:3096
 msgid "cannot write init file -- support vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3109
+#: utils/cache/relcache.c:3099
 msgid "cannot write init file -- support vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3153
+#: utils/cache/relcache.c:3143
 #, c-format
 msgid ""
 "Cannot rename init file %s to %s: %m\n"
@@ -12634,147 +12670,147 @@ msgstr ""
 msgid "fmgr_security_definer: function %u: cache lookup failed"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:714
+#: utils/fmgr/fmgr.c:728
 #, c-format
 msgid "DirectFunctionCall1: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:735
+#: utils/fmgr/fmgr.c:756
 #, c-format
 msgid "DirectFunctionCall2: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:758
+#: utils/fmgr/fmgr.c:779
 #, c-format
 msgid "DirectFunctionCall3: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:782
+#: utils/fmgr/fmgr.c:803
 #, c-format
 msgid "DirectFunctionCall4: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:807
+#: utils/fmgr/fmgr.c:828
 #, c-format
 msgid "DirectFunctionCall5: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:834
+#: utils/fmgr/fmgr.c:855
 #, c-format
 msgid "DirectFunctionCall6: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:862
+#: utils/fmgr/fmgr.c:883
 #, c-format
 msgid "DirectFunctionCall7: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:891
+#: utils/fmgr/fmgr.c:912
 #, c-format
 msgid "DirectFunctionCall8: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:922
+#: utils/fmgr/fmgr.c:943
 #, c-format
 msgid "DirectFunctionCall9: function %p returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:948
+#: utils/fmgr/fmgr.c:974
 #, c-format
 msgid "FunctionCall1: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:970
+#: utils/fmgr/fmgr.c:1002 utils/sort/tuplesort.c:1827
 #, c-format
 msgid "FunctionCall2: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:994
+#: utils/fmgr/fmgr.c:1026
 #, c-format
 msgid "FunctionCall3: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1019
+#: utils/fmgr/fmgr.c:1051
 #, c-format
 msgid "FunctionCall4: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1045
+#: utils/fmgr/fmgr.c:1077
 #, c-format
 msgid "FunctionCall5: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1073
+#: utils/fmgr/fmgr.c:1105
 #, c-format
 msgid "FunctionCall6: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1102
+#: utils/fmgr/fmgr.c:1134
 #, c-format
 msgid "FunctionCall7: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1132
+#: utils/fmgr/fmgr.c:1164
 #, c-format
 msgid "FunctionCall8: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1164
+#: utils/fmgr/fmgr.c:1196
 #, c-format
 msgid "FunctionCall9: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1195
+#: utils/fmgr/fmgr.c:1227
 #, c-format
 msgid "OidFunctionCall1: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1220
+#: utils/fmgr/fmgr.c:1252
 #, c-format
 msgid "OidFunctionCall2: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1247
+#: utils/fmgr/fmgr.c:1279
 #, c-format
 msgid "OidFunctionCall3: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1275
+#: utils/fmgr/fmgr.c:1307
 #, c-format
 msgid "OidFunctionCall4: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1304
+#: utils/fmgr/fmgr.c:1336
 #, c-format
 msgid "OidFunctionCall5: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1335
+#: utils/fmgr/fmgr.c:1367
 #, c-format
 msgid "OidFunctionCall6: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1367
+#: utils/fmgr/fmgr.c:1399
 #, c-format
 msgid "OidFunctionCall7: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1400
+#: utils/fmgr/fmgr.c:1432
 #, c-format
 msgid "OidFunctionCall8: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1435
+#: utils/fmgr/fmgr.c:1467
 #, c-format
 msgid "OidFunctionCall9: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1474
+#: utils/fmgr/fmgr.c:1506
 #, c-format
 msgid "fmgr: function %u: too many arguments (%d > %d)"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1486
+#: utils/fmgr/fmgr.c:1518
 #, c-format
 msgid "fmgr: function %u returned NULL"
 msgstr ""
@@ -12931,46 +12967,46 @@ msgstr ""
 #: utils/init/postinit.c:114
 #, c-format
 msgid "Database \"%s\", OID %u, has disappeared from pg_database"
-msgstr ""
+msgstr "Database \"%s\", OID %u, har f�rsvunnit fr�n pg_database"
 
 #: utils/init/postinit.c:123
 #, c-format
 msgid "Database \"%s\" is not currently accepting connections"
 msgstr ""
 
-#: utils/init/postinit.c:256
+#: utils/init/postinit.c:259
 #, c-format
 msgid "Database \"%s\" does not exist in the system catalog."
 msgstr ""
 
-#: utils/init/postinit.c:264
+#: utils/init/postinit.c:267
 #, c-format
 msgid ""
 "Database \"%s\" does not exist.\n"
 "\tThe database subdirectory '%s' is missing."
 msgstr ""
 
-#: utils/init/postinit.c:271
+#: utils/init/postinit.c:274
 #, c-format
 msgid "Unable to change directory to '%s': %m"
-msgstr ""
+msgstr "Kan inte byta katalog till \"%s\": %m"
 
-#: utils/init/postinit.c:300
+#: utils/init/postinit.c:303
 #, c-format
 msgid "InitPostgres: bad backend id %d"
 msgstr ""
 
-#: utils/init/postinit.c:351
+#: utils/init/postinit.c:354
 msgid "There are currently no users defined in this database system."
 msgstr ""
 
-#: utils/init/postinit.c:352
+#: utils/init/postinit.c:355
 #, c-format
 msgid ""
 "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
 msgstr ""
 
-#: utils/init/postinit.c:407
+#: utils/init/postinit.c:410
 msgid "Non-superuser connection limit exceeded"
 msgstr ""
 
@@ -13070,12 +13106,12 @@ msgstr ""
 #: utils/misc/guc.c:1697
 #, c-format
 msgid "option '%s' requires a boolean value"
-msgstr ""
+msgstr "flagga '%s' kr�ver ett boolskt v�rde"
 
 #: utils/misc/guc.c:1711 utils/misc/guc.c:1782
 #, c-format
 msgid "invalid value for option '%s': %d"
-msgstr ""
+msgstr "ogiltigt v�rde f�r flagga \"%s\": %d"
 
 #: utils/misc/guc.c:1761
 #, c-format
@@ -13287,31 +13323,31 @@ msgstr ""
 msgid "tuplesort: unexpected end of tape"
 msgstr ""
 
-#: utils/sort/tuplesort.c:1671 utils/sort/tuplesort.c:1785
-#: utils/sort/tuplesort.c:1789 utils/sort/tuplesort.c:1911
-#: utils/sort/tuplesort.c:1915 utils/sort/tuplesort.c:1983
-#: utils/sort/tuplesort.c:1987
+#: utils/sort/tuplesort.c:1671 utils/sort/tuplesort.c:1995
+#: utils/sort/tuplesort.c:1999 utils/sort/tuplesort.c:2121
+#: utils/sort/tuplesort.c:2125 utils/sort/tuplesort.c:2193
+#: utils/sort/tuplesort.c:2197
 msgid "tuplesort: unexpected end of data"
 msgstr ""
 
-#: utils/sort/tuplesort.c:1863
-msgid "Cannot create unique index. Table contains non-unique values"
-msgstr ""
-
-#: utils/sort/tuplesort.c:1939
-msgid "copytup_datum() should not be called"
-msgstr ""
-
-#: utils/sort/tuplesort.c:2088
+#: utils/sort/tuplesort.c:1789
 #, c-format
 msgid "SelectSortFunction: cache lookup failed for operator %u"
 msgstr ""
 
-#: utils/sort/tuplesort.c:2169
+#: utils/sort/tuplesort.c:1901
 #, c-format
 msgid "Invalid SortFunctionKind %d"
 msgstr ""
 
+#: utils/sort/tuplesort.c:2073
+msgid "Cannot create unique index. Table contains non-unique values"
+msgstr ""
+
+#: utils/sort/tuplesort.c:2149
+msgid "copytup_datum() should not be called"
+msgstr ""
+
 #: utils/sort/tuplestore.c:302
 msgid "tuplestore_puttuple: invalid state"
 msgstr ""
@@ -13366,6 +13402,13 @@ msgstr ""
 msgid "tuplestore: write failed"
 msgstr ""
 
+#: utils/time/tqual.c:981
+msgid "CopyQuerySnapshot: no snapshot has been set"
+msgstr ""
+
+#~ msgid "CREATE DATABASE: may not be called in a transaction block"
+#~ msgstr "CREATE DATABASE: kan inte anropas i ett transaktionsblock"
+
 #~ msgid "table \"%s\" does not exist"
 #~ msgstr "tabell \"%s\" existerar inte"
 
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index cbdfc93f68adda09611081c6905fef172e4211ba..df047ef5161415b0d05431e0a59c91a84c001606 100644
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -1,5 +1,5 @@
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/nls.mk,v 1.3 2002/10/14 19:04:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/nls.mk,v 1.4 2003/06/28 22:31:00 petere Exp $
 CATALOG_NAME	:= pg_controldata
-AVAIL_LANGUAGES	:= de es pt_BR ru sv zh_CN
+AVAIL_LANGUAGES	:= de es fr hu pt_BR ru sv zh_CN
 GETTEXT_FILES	:= pg_controldata.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_controldata/po/de.po b/src/bin/pg_controldata/po/de.po
index 48fca61b4f765028d5e93278f647581363566f4f..678ec360a59e5d9e009ce454b5901faeb58e1b6b 100644
--- a/src/bin/pg_controldata/po/de.po
+++ b/src/bin/pg_controldata/po/de.po
@@ -1,15 +1,15 @@
 # German message translation file for pg_controldata
 # Peter Eisentraut <peter_e@gmx.net>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/de.po,v 1.2 2002/09/22 20:57:20 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/de.po,v 1.3 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: �%s�
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-09-22 13:15+0200\n"
-"PO-Revision-Date: 2002-09-22 13:16+0200\n"
+"POT-Creation-Date: 2002-11-13 20:28+0100\n"
+"PO-Revision-Date: 2002-11-13 20:28+0100\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,10 @@ msgstr ""
 
 #: pg_controldata.c:28
 #, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
-msgstr "%s zeigt Kontrollinformationen �ber PostgreSQL-Datenbankcluster an.\n"
+msgid ""
+"%s displays PostgreSQL database cluster control information.\n"
+"\n"
+msgstr "%s zeigt Kontrollinformationen �ber PostgreSQL-Datenbankcluster an.\n\n"
 
 #: pg_controldata.c:29
 #, c-format
diff --git a/src/bin/pg_controldata/po/pt_BR.po b/src/bin/pg_controldata/po/pt_BR.po
index ce18becef7ac70349a7a9b462a2d9b57a3dac2d2..f0d7b52b47d6251b26af984de4418a68754e3029 100644
--- a/src/bin/pg_controldata/po/pt_BR.po
+++ b/src/bin/pg_controldata/po/pt_BR.po
@@ -1,22 +1,24 @@
 # Translation to Portuguese (Brazilian) language
-# Cesar Suga <sartre@linuxbr.com>, 2002.
-# Fair & Simple Networks Ltda.
+# Cesar Suga <sartre@linuxbr.com>, 2002. - Fair & Simple Networks Ltda.
+# Roberto Mello <rmello@fslc.usu.edu>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-09-29 04:16-0400\n"
-"PO-Revision-Date: 2002-07-20 17:25-0300\n"
-"Last-Translator: Cesar Suga <sartre@linuxbr.com>\n"
-"Language-Team: Cesar Suga <sartre@linuxbr.com>\n"
+"POT-Creation-Date: 2002-12-05 04:20-0500\n"
+"PO-Revision-Date: 2002-12-05 12:59-0700\n"
+"Last-Translator: Roberto Mello <rmello@fslc.usu.edu>\n"
+"Language-Team: Roberto Mello <rmello@fslc.usu.edu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: pg_controldata.c:28
 #, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
-msgstr "%s mostra informa��es de controle de cluster de banco de dados de PostgreSQL.\n"
+msgid ""
+"%s displays PostgreSQL database cluster control information.\n"
+"\n"
+msgstr "%s mostra informa��es de controle de agrupamento (cluster) de banco de dados PostgreSQL.\n"
 
 #: pg_controldata.c:29
 #, c-format
@@ -41,7 +43,7 @@ msgstr ""
 
 #: pg_controldata.c:31
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Reporte bugs a <pgsql-bugs@postgresql.org>.\n"
+msgstr "Reporte problemas a <pgsql-bugs@postgresql.org>.\n"
 
 #: pg_controldata.c:41
 msgid "starting up"
@@ -57,7 +59,7 @@ msgstr "desligando"
 
 #: pg_controldata.c:47
 msgid "in recovery"
-msgstr "em recovery"
+msgstr "em recupera��o"
 
 #: pg_controldata.c:49
 msgid "in production"
@@ -90,7 +92,7 @@ msgid ""
 "\n"
 msgstr ""
 "AVISO: A soma calculada de CRC n�o � a mesma do valor armazenado no arquivo.\n"
-"Ou o arquivo est� corrompido ou tem um layout diferente do que este programa\n"
+"Ou o arquivo est� corrompido ou tem um formato diferente do que este programa\n"
 "est� esperando.  Os resultados abaixo n�o s�o confi�veis.\n"
 
 #: pg_controldata.c:141
@@ -101,12 +103,12 @@ msgstr "vers
 #: pg_controldata.c:142
 #, c-format
 msgid "Catalog version number:               %u\n"
-msgstr "N�mero de vers�o de cat�logo:         %u\n"
+msgstr "N�mero de vers�o do cat�logo:         %u\n"
 
 #: pg_controldata.c:143
 #, c-format
 msgid "Database cluster state:               %s\n"
-msgstr "Estado do cluster de banco:           %s\n"
+msgstr "Estado do agrupamento (cluster) do banco de dados:           %s\n"
 
 #: pg_controldata.c:144
 #, c-format
@@ -126,42 +128,42 @@ msgstr "Pr
 #: pg_controldata.c:147
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
-msgstr "�ltimo lugar de checkpoint:           %X/%X\n"
+msgstr "�ltimo local do ponto de checagem (checkpoint):           %X/%X\n"
 
 #: pg_controldata.c:149
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
-msgstr "Lugar de checkpoint anterior:         %X/%X\n"
+msgstr "Lugar do ponto de checagem (checkpoint) anterior:         %X/%X\n"
 
 #: pg_controldata.c:151
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "�ltimo lugar de REDO no checkpoint:   %X/%X\n"
+msgstr "�ltimo lugar de REDO do ponto de checagem (checkpoint):   %X/%X\n"
 
 #: pg_controldata.c:153
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
-msgstr "�ltimo lugar de UNDO no checkpoint:   %X/%X\n"
+msgstr "�ltimo lugar de UNDO do ponto de checagem (checkpoint):   %X/%X\n"
 
 #: pg_controldata.c:155
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "�ltimo StartUpID no checkpoint:       %u\n"
+msgstr "�ltimo StartUpID do ponto de checagem (checkpoint):       %u\n"
 
 #: pg_controldata.c:156
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "�ltimo NextXID do checkpoint:         %u\n"
+msgstr "�ltimo NextXID do ponto de checagem (checkpoint):         %u\n"
 
 #: pg_controldata.c:157
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "�ltimo NextOID do checkpoint:         %u\n"
+msgstr "�ltimo NextOID do ponto de checagem (checkpoint):         %u\n"
 
 #: pg_controldata.c:158
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
-msgstr "Hora do �ltimo checkpoint:            %s\n"
+msgstr "Hora do �ltimo ponto de checagem (checkpoint):            %s\n"
 
 #: pg_controldata.c:159
 #, c-format
@@ -171,7 +173,7 @@ msgstr "Tamanho de bloco do banco de dados:   %u\n"
 #: pg_controldata.c:160
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
-msgstr "Blocos/segmento de rela��o grande:   %u\n"
+msgstr "Blocos por segmento de rela��o grande:   %u\n"
 
 #: pg_controldata.c:161
 #, c-format
@@ -181,16 +183,16 @@ msgstr "Tamanho m
 #: pg_controldata.c:162
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
-msgstr "Nro. m�ximo de argumentos de fun��o:  %u\n"
+msgstr "N�mero m�ximo de argumentos de fun��o:  %u\n"
 
 #: pg_controldata.c:163
 #, c-format
 msgid "Date/time type storage:               %s\n"
-msgstr "Uso em disco do tipo date/time:       %s\n"
+msgstr "Uso de disco dos tipos date/time:       %s\n"
 
 #: pg_controldata.c:164
 msgid "64-bit integers"
-msgstr "N�meros de 64 bits"
+msgstr "Inteiros de 64 bits"
 
 #: pg_controldata.c:164
 msgid "Floating point"
diff --git a/src/bin/pg_controldata/po/sv.po b/src/bin/pg_controldata/po/sv.po
index aa54714b6f1387cf505931dc21757dce3d0acead..59cae298182fd01698028f247cbbb6e4fa212ac1 100644
--- a/src/bin/pg_controldata/po/sv.po
+++ b/src/bin/pg_controldata/po/sv.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-09-03 04:16-0400\n"
-"PO-Revision-Date: 2002-09-04 07:55+0200\n"
+"POT-Creation-Date: 2002-10-25 04:17-0400\n"
+"PO-Revision-Date: 2002-10-26 06:23+0200\n"
 "Last-Translator: Dennis Bj�rklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,8 +15,10 @@ msgstr ""
 
 #: pg_controldata.c:28
 #, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
-msgstr "%s visar PostgreSQL-databas klusterkontrollinformation.\n"
+msgid ""
+"%s displays PostgreSQL database cluster control information.\n"
+"\n"
+msgstr "%s visar PostgreSQL-databas klusterkontrollinformation.\n\n"
 
 #: pg_controldata.c:29
 #, c-format
diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index ca39896dfcd4036643876a7942f212c9e3a74b5b..63fb2becc088660c6a4f5d35317082301b5561b9 100644
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -1,6 +1,6 @@
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/nls.mk,v 1.7 2002/08/27 18:57:26 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/nls.mk,v 1.8 2003/06/28 22:31:01 petere Exp $
 CATALOG_NAME	:= pg_dump
-AVAIL_LANGUAGES	:= cs de ru sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de pt_BR ru sv zh_CN zh_TW
 GETTEXT_FILES	:= pg_dump.c common.c pg_backup_archiver.c pg_backup_custom.c \
                    pg_backup_db.c pg_backup_files.c pg_backup_null.c \
                    pg_backup_tar.c pg_restore.c pg_dumpall.c
diff --git a/src/bin/pg_dump/po/de.po b/src/bin/pg_dump/po/de.po
index 851d7ffb3236c06dfbba99696fad46d7fe95dd78..18c071a85f1edb93c60a9cfaf19524d107f0fab3 100644
--- a/src/bin/pg_dump/po/de.po
+++ b/src/bin/pg_dump/po/de.po
@@ -1,37 +1,37 @@
 # German message translation file for pg_dump and friends
 # Peter Eisentraut <peter_e@gmx.net>, 2001, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/de.po,v 1.2 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/de.po,v 1.3 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: �%s�
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_dump (PostgreSQL) 7.3\n"
-"POT-Creation-Date: 2002-09-22 16:37+0200\n"
-"PO-Revision-Date: 2002-09-22 16:40+0200\n"
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2003-05-19 01:39+0200\n"
+"PO-Revision-Date: 2003-05-19 01:40+0200\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_dump.c:389 pg_restore.c:254
+#: pg_dump.c:387 pg_restore.c:254
 msgid "User name: "
 msgstr "Benutzername: "
 
-#: pg_dump.c:423 pg_restore.c:281
+#: pg_dump.c:421 pg_restore.c:281
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: ung�ltige �-X�-Option -- %s\n"
 
-#: pg_dump.c:425 pg_dump.c:447 pg_dumpall.c:173 pg_restore.c:283
+#: pg_dump.c:423 pg_dump.c:445 pg_dumpall.c:174 pg_restore.c:283
 #: pg_restore.c:295
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Versuchen Sie �%s --help� f�r weitere Informationen.\n"
 
-#: pg_dump.c:436
+#: pg_dump.c:434
 #, c-format
 msgid ""
 "%s was compiled without support for long options.\n"
@@ -40,7 +40,7 @@ msgstr ""
 "%s wurde ohne Unterst�tzung f�r lange Optionen kompiliert.\n"
 "Verwenden Sie --help f�r Hilfe.\n"
 
-#: pg_dump.c:455 pg_dumpall.c:181
+#: pg_dump.c:453 pg_dumpall.c:182
 #, c-format
 msgid ""
 "%s: too many command line options (first is '%s')\n"
@@ -49,7 +49,7 @@ msgstr ""
 "%s: zu Viele Kommandozeilenoptionen (die Erste ist �%s�)\n"
 "Versuchen Sie �%s --help� f�r weitere Informationen.\n"
 
-#: pg_dump.c:467
+#: pg_dump.c:465
 msgid ""
 "The options \"schema only\" (-s) and \"data only\" (-a) cannot be used "
 "together.\n"
@@ -57,72 +57,77 @@ msgstr ""
 "Die Optionen �nur Schema� (-s) und �nur Daten� (-a) k�nnen nicht zusammen "
 "verwendet werden.\n"
 
-#: pg_dump.c:473
+#: pg_dump.c:471
 msgid ""
 "The options \"clean\" (-c) and \"data only\" (-a) cannot be used together.\n"
 msgstr ""
 "Die Optionen �L�schen� (-c) und �nur Daten� (-a) k�nnen nicht zusammen "
 "verwendet werden.\n"
 
-#: pg_dump.c:479
+#: pg_dump.c:477
 msgid "Large object output is not supported for a single table.\n"
 msgstr ""
 "Large-Object-Unterst�tzung kann nicht mit einer einzigen Tabelle verwendet "
 "werden.\n"
 
-#: pg_dump.c:480
+#: pg_dump.c:478
 msgid "Use all tables or a full dump instead.\n"
 msgstr "Sie m�ssen alle Tabellen oder die komplette Datenbank ausgeben.\n"
 
-#: pg_dump.c:486
+#: pg_dump.c:484
 msgid "INSERT (-d, -D) and OID (-o) options cannot be used together.\n"
 msgstr ""
 "Die Optionen INSERT (-d, -D) und OID (-o) k�nnen nicht zusammen verwendet "
 "werden.\n"
 
-#: pg_dump.c:487
+#: pg_dump.c:485
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Die INSERT-Anweisung kann OIDs nicht setzen.)\n"
 
-#: pg_dump.c:493
+#: pg_dump.c:491
 msgid "large object output is not supported for plain text dump files.\n"
 msgstr "Large-Object-Ausgabe wird im �plain text�-Format nicht unterst�tzt.\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:492
 msgid "(Use a different output format.)\n"
 msgstr "(Verwenden Sie ein anderes Format.)\n"
 
-#: pg_dump.c:524
+#: pg_dump.c:522
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "ung�ltiges Ausgabeformat �%s� angegeben\n"
 
-#: pg_dump.c:530
+#: pg_dump.c:528
 #, c-format
 msgid "could not open output file %s for writing\n"
 msgstr "konnte Ausgabedatei %s nicht zum Schreiben �ffnen\n"
 
-#: pg_backup_db.c:48 pg_dump.c:541
+#: pg_backup_db.c:48 pg_dump.c:539
 #, c-format
 msgid "unable to parse version string \"%s\"\n"
 msgstr "kann Versionszeichenkette �%s� nicht entzifferen\n"
 
-#: pg_dump.c:559
+#: pg_dump.c:557
 #, c-format
 msgid "BEGIN command failed: %s"
 msgstr "BEGIN-Anweisung schlug fehl: %s"
 
-#: pg_dump.c:565
+#: pg_dump.c:563
 #, c-format
 msgid "could not set transaction isolation level to serializable: %s"
 msgstr "konnte Transaktionsisolation nicht auf serialisierbar setzen: %s"
 
-#: pg_dump.c:578
+#: pg_dump.c:570
+#, c-format
+msgid "could not set datestyle to ISO: %s"
+msgstr "konnte Datumsstil nicht auf ISO setzen: %s"
+
+#: pg_dump.c:582
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "letzte eingebaute OID ist %u\n"
 
-#: pg_dump.c:658
+#: pg_dump.c:662
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -131,36 +136,103 @@ msgstr ""
 "%s gibt eine Datenbank als Textdatei oder in anderen Formaten aus.\n"
 "\n"
 
-#: pg_dump.c:659 pg_dumpall.c:215 pg_restore.c:377
+#: pg_dump.c:663 pg_dumpall.c:216 pg_restore.c:377
 msgid "Usage:\n"
 msgstr "Benutzung:\n"
 
-#: pg_dump.c:660
+#: pg_dump.c:664
 #, c-format
+msgid "  %s [OPTION]... [DBNAME]\n"
+msgstr "  %s [OPTION]... [DBNAME]\n"
+
+#: pg_dump.c:666 pg_restore.c:380
 msgid ""
-"  %s [OPTIONS] DBNAME\n"
 "\n"
+"General options:\n"
 msgstr ""
-"  %s [OPTIONEN] DBNAME\n"
 "\n"
+"Allgemeine Optionen:\n"
 
-#: pg_dump.c:661 pg_dumpall.c:218 pg_restore.c:379
-msgid "Options:\n"
-msgstr "Optionen:\n"
+#: pg_dump.c:668 pg_restore.c:383
+msgid "  -f, --file=FILENAME      output file name\n"
+msgstr "  -f, --file=DATEINAME     Name der Ausgabedatei\n"
 
-#: pg_dump.c:664
+#: pg_dump.c:669
+msgid ""
+"  -F, --format=c|t|p       output file format (custom, tar, plain text)\n"
+msgstr "  -F, --format=c|t|p       Ausgabeformat (custom, tar, plain text)\n"
+
+#: pg_dump.c:670
+msgid ""
+"  -i, --ignore-version     proceed even when server version mismatches\n"
+"                           pg_dump version\n"
+msgstr ""
+"  -i, --ignore-version     trotz unpassender Serverversion fortsetzen\n"
+
+#: pg_dump.c:672 pg_dumpall.c:228 pg_restore.c:387
+msgid "  -v, --verbose            verbose mode\n"
+msgstr "  -v, --verbose            �Verbose�-Modus\n"
+
+#: pg_dump.c:673
+msgid "  -Z, --compress=0-9       compression level for compressed formats\n"
+msgstr ""
+"  -Z, --compress=0-9       Komprimierungsniveau f�r komprimierte Formate\n"
+
+#: pg_dump.c:675 pg_restore.c:390
+msgid "  -f FILENAME              output file name\n"
+msgstr "  -f DATEINAME             Name der Ausgabedatei\n"
+
+#: pg_dump.c:676
+msgid ""
+"  -F c|t|p                 output file format (custom, tar, plain text)\n"
+msgstr "  -F c|t|p                 Ausgabeformat (custom, tar, plain text)\n"
+
+#: pg_dump.c:677
+msgid ""
+"  -i                       proceed even when server version mismatches\n"
+"                           pg_dump version\n"
+msgstr ""
+"  -i                       trotz unpassender Serverversion fortsetzen\n"
+
+#: pg_dump.c:679 pg_dumpall.c:237 pg_restore.c:394
+msgid "  -v                       verbose mode\n"
+msgstr "  -v                       �Verbose�-Modus\n"
+
+#: pg_dump.c:680
+msgid "  -Z 0-9                   compression level for compressed formats\n"
+msgstr ""
+"  -Z 0-9                   Komprimierungsniveau f�r komprimierte Formate\n"
+
+#: pg_dump.c:682 pg_dumpall.c:239 pg_restore.c:396
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   diese Hilfe anzeigen, dann beenden\n"
+
+#: pg_dump.c:683 pg_dumpall.c:240 pg_restore.c:397
+msgid "  --version                output version information, then exit\n"
+msgstr ""
+"  --version                Versionsinformationen anzeigen, dann beenden\n"
+
+#: pg_dump.c:685 pg_restore.c:399
+msgid ""
+"\n"
+"Options controlling the output content:\n"
+msgstr ""
+"\n"
+"Optionen die den Inhalt der Ausgabe kontrollieren:\n"
+
+#: pg_dump.c:687
 msgid "  -a, --data-only          dump only the data, not the schema\n"
 msgstr "  -a, --data-only          nur Daten, nicht das Schema, ausgeben\n"
 
-#: pg_dump.c:665
+#: pg_dump.c:688
 msgid "  -b, --blobs              include large objects in dump\n"
 msgstr "  -b, --blobs              Large Objects mit ausgeben\n"
 
-#: pg_dump.c:666 pg_restore.c:383
+#: pg_dump.c:689 pg_restore.c:402
 msgid "  -c, --clean              clean (drop) schema prior to create\n"
 msgstr "  -c, --clean              Schema vor der Erstellung l�schen\n"
 
-#: pg_dump.c:667
+#: pg_dump.c:690
 msgid ""
 "  -C, --create             include commands to create database in dump\n"
 msgstr ""
@@ -168,45 +240,25 @@ msgstr ""
 "Ausgabe\n"
 "                           einf�gen\n"
 
-#: pg_dump.c:668 pg_dumpall.c:221
+#: pg_dump.c:691 pg_dumpall.c:222
 msgid ""
 "  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"
 msgstr ""
 "  -d, --inserts            Daten als INSERT-Anweisungen, statt COPY, "
 "ausgeben\n"
 
-#: pg_dump.c:669 pg_dumpall.c:222
+#: pg_dump.c:692 pg_dumpall.c:223
 msgid ""
 "  -D, --column-inserts     dump data as INSERT commands with column names\n"
 msgstr ""
 "  -D, --column-inserts     Daten als INSERT-Anweisungen mit Spaltennamen\n"
 "                           ausgeben\n"
 
-#: pg_dump.c:670 pg_restore.c:386
-msgid "  -f, --file=FILENAME      output file name\n"
-msgstr "  -f, --file=DATEINAME     Name der Ausgabedatei\n"
-
-#: pg_dump.c:671
-msgid ""
-"  -F, --format {c|t|p}     output file format (custom, tar, plain text)\n"
-msgstr "  -F, --format {c|t|p}     Ausgabeformat (custom, tar, plain text)\n"
-
-#: pg_dump.c:672 pg_dumpall.c:224 pg_restore.c:388
-msgid "  -h, --host=HOSTNAME      database server host name\n"
-msgstr "  -h, --host=HOSTNAME      Hostname des Datenbankservers\n"
-
-#: pg_dump.c:673
-msgid ""
-"  -i, --ignore-version     proceed even when server version mismatches\n"
-"                           pg_dump version\n"
-msgstr ""
-"  -i, --ignore-version     trotz unpassender Serverversion fortsetzen\n"
-
-#: pg_dump.c:675 pg_dumpall.c:227
+#: pg_dump.c:693 pg_dumpall.c:227
 msgid "  -o, --oids               include OIDs in dump\n"
 msgstr "  -o, --oids               OIDs mit ausgeben\n"
 
-#: pg_dump.c:676
+#: pg_dump.c:694
 msgid ""
 "  -O, --no-owner           do not output \\connect commands in plain\n"
 "                           text format\n"
@@ -215,11 +267,7 @@ msgstr ""
 "Format\n"
 "                           ausgeben\n"
 
-#: pg_dump.c:678 pg_dumpall.c:228 pg_restore.c:398
-msgid "  -p, --port=PORT          database server port number\n"
-msgstr "  -p, --port=PORT          Portnummer des Datenbankservers\n"
-
-#: pg_dump.c:679
+#: pg_dump.c:696
 msgid ""
 "  -R, --no-reconnect       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
@@ -227,42 +275,26 @@ msgstr ""
 "  -R, --no-reconnect       keine Wiederverbindungen mit der Datenbank im\n"
 "                           �plain text�-Format erm�glichen\n"
 
-#: pg_dump.c:681
+#: pg_dump.c:698
 msgid "  -s, --schema-only        dump only the schema, no data\n"
 msgstr "  -s, --schema-only        nur das Schema, nicht die Daten, ausgeben\n"
 
-#: pg_dump.c:682
+#: pg_dump.c:699
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
 "                           plain text format\n"
 msgstr "  -S, --superuser=NAME     Superusername f�r das �plain text�-Format\n"
 
-#: pg_dump.c:684
+#: pg_dump.c:701
 msgid "  -t, --table=TABLE        dump this table only (* for all)\n"
 msgstr "  -t, --table=TABELLE      nur diese Tabelle ausgeben (* f�r alle)\n"
 
-#: pg_dump.c:685 pg_dumpall.c:229 pg_restore.c:408
-msgid "  -U, --username=NAME      connect as specified database user\n"
-msgstr "  -U, --username=NAME      Datenbankbenutzername\n"
-
-#: pg_dump.c:686 pg_dumpall.c:230 pg_restore.c:409
-msgid "  -v, --verbose            verbose mode\n"
-msgstr "  -v, --verbose            �Verbose�-Modus\n"
-
-#: pg_dump.c:687 pg_dumpall.c:231 pg_restore.c:410
-msgid ""
-"  -W, --password           force password prompt (should happen "
-"automatically)\n"
-msgstr ""
-"  -W, --password           nach Passwort fragen (sollte automatisch "
-"geschehen)\n"
-
-#: pg_dump.c:688
+#: pg_dump.c:702
 msgid "  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
 msgstr ""
 "  -x, --no-privileges      Zugriffsrechte (grant/revoke) nicht ausgeben\n"
 
-#: pg_dump.c:689
+#: pg_dump.c:703
 msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
@@ -273,7 +305,7 @@ msgstr ""
 "von\n"
 "                           �\\connect� ausgeben\n"
 
-#: pg_dump.c:692 pg_restore.c:415
+#: pg_dump.c:706 pg_restore.c:424
 msgid ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           disable triggers during data-only restore\n"
@@ -282,24 +314,19 @@ msgstr ""
 "                           Trigger abschalten w�hrend der Datenwieder-\n"
 "                           herstellung\n"
 
-#: pg_dump.c:694
-msgid "  -Z, --compress {0-9}     compression level for compressed formats\n"
-msgstr ""
-"  -Z, --compress {0-9}     Komprimierungsniveau f�r komprimierte Formate\n"
-
-#: pg_dump.c:697
+#: pg_dump.c:709
 msgid "  -a                       dump only the data, not the schema\n"
 msgstr "  -a                       nur Daten, nicht das Schema, ausgeben\n"
 
-#: pg_dump.c:698
+#: pg_dump.c:710
 msgid "  -b                       include large objects in dump\n"
 msgstr "  -b                       Large Objects mit ausgeben\n"
 
-#: pg_dump.c:699 pg_restore.c:420
+#: pg_dump.c:711 pg_restore.c:428
 msgid "  -c                       clean (drop) schema prior to create\n"
 msgstr "  -c                       Schema vor der Erstellung l�schen\n"
 
-#: pg_dump.c:700
+#: pg_dump.c:712
 msgid ""
 "  -C                       include commands to create database in dump\n"
 msgstr ""
@@ -307,45 +334,25 @@ msgstr ""
 "Ausgabe\n"
 "                           einf�gen\n"
 
-#: pg_dump.c:701 pg_dumpall.c:234
+#: pg_dump.c:713 pg_dumpall.c:231
 msgid ""
 "  -d                       dump data as INSERT, rather than COPY, commands\n"
 msgstr ""
 "  -d                       Daten als INSERT-Anweisungen, statt COPY, "
 "ausgeben\n"
 
-#: pg_dump.c:702 pg_dumpall.c:235
+#: pg_dump.c:714 pg_dumpall.c:232
 msgid ""
 "  -D                       dump data as INSERT commands with column names\n"
 msgstr ""
 "  -D                       Daten als INSERT-Anweisungen mit Spaltennamen\n"
 "                           ausgeben\n"
 
-#: pg_dump.c:703 pg_restore.c:423
-msgid "  -f FILENAME              output file name\n"
-msgstr "  -f DATEINAME             Name der Ausgabedatei\n"
-
-#: pg_dump.c:704
-msgid ""
-"  -F {c|t|p}               output file format (custom, tar, plain text)\n"
-msgstr "  -F {c|t|p}               Ausgabeformat (custom, tar, plain text)\n"
-
-#: pg_dump.c:705 pg_dumpall.c:237 pg_restore.c:425
-msgid "  -h HOSTNAME              database server host name\n"
-msgstr "  -h HOSTNAME              Hostname des Datenbankservers\n"
-
-#: pg_dump.c:706
-msgid ""
-"  -i                       proceed even when server version mismatches\n"
-"                           pg_dump version\n"
-msgstr ""
-"  -i                       trotz unpassender Serverversion fortsetzen\n"
-
-#: pg_dump.c:708 pg_dumpall.c:240
+#: pg_dump.c:715 pg_dumpall.c:236
 msgid "  -o                       include OIDs in dump\n"
 msgstr "  -o                       OIDs mit ausgeben\n"
 
-#: pg_dump.c:709
+#: pg_dump.c:716
 msgid ""
 "  -O                       do not output \\connect commands in plain\n"
 "                           text format\n"
@@ -354,11 +361,7 @@ msgstr ""
 "Format\n"
 "                           ausgeben\n"
 
-#: pg_dump.c:711 pg_dumpall.c:241 pg_restore.c:435
-msgid "  -p PORT                  database server port number\n"
-msgstr "  -p PORT                  Portnummer des Datenbankservers\n"
-
-#: pg_dump.c:712
+#: pg_dump.c:718
 msgid ""
 "  -R                       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
@@ -366,42 +369,26 @@ msgstr ""
 "  -R                       keine Wiederverbindungen mit der Datenbank im\n"
 "                           �plain text�-Format erm�glichen\n"
 
-#: pg_dump.c:714
+#: pg_dump.c:720
 msgid "  -s                       dump only the schema, no data\n"
 msgstr "  -s                       nur das Schema, nicht die Daten, ausgeben\n"
 
-#: pg_dump.c:715
+#: pg_dump.c:721
 msgid ""
 "  -S NAME                  specify the superuser user name to use in\n"
 "                           plain text format\n"
 msgstr "  -S NAME                  Superusername f�r das �plain text�-Format\n"
 
-#: pg_dump.c:717
+#: pg_dump.c:723
 msgid "  -t TABLE                 dump this table only (* for all)\n"
 msgstr "  -t TABELLE               nur diese Tabelle ausgeben (* f�r alle)\n"
 
-#: pg_dump.c:718 pg_dumpall.c:242 pg_restore.c:444
-msgid "  -U NAME                  connect as specified database user\n"
-msgstr "  -U NAME                  Datenbankbenutzername\n"
-
-#: pg_dump.c:719 pg_dumpall.c:243 pg_restore.c:445
-msgid "  -v                       verbose mode\n"
-msgstr "  -v                       �Verbose�-Modus\n"
-
-#: pg_dump.c:720 pg_dumpall.c:244 pg_restore.c:446
-msgid ""
-"  -W                       force password prompt (should happen "
-"automatically)\n"
-msgstr ""
-"  -W                       nach Passwort fragen (sollte automatisch "
-"geschehen)\n"
-
-#: pg_dump.c:721
+#: pg_dump.c:724
 msgid "  -x                       do not dump privileges (grant/revoke)\n"
 msgstr ""
 "  -x                       Zugriffsrechte (grant/revoke) nicht ausgeben\n"
 
-#: pg_dump.c:722
+#: pg_dump.c:725
 msgid ""
 "  -X use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
@@ -412,18 +399,61 @@ msgstr ""
 "von\n"
 "                           �\\connect� ausgeben\n"
 
-#: pg_dump.c:725 pg_restore.c:451
+#: pg_dump.c:728 pg_restore.c:449
 msgid "  -X disable-triggers      disable triggers during data-only restore\n"
 msgstr ""
 "  -X disable-triggers      Trigger abschalten w�hrend der Datenwieder-\n"
 "                           herstellung\n"
 
-#: pg_dump.c:726
-msgid "  -Z {0-9}                 compression level for compressed formats\n"
+#: pg_dump.c:731 pg_dumpall.c:242 pg_restore.c:452
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Verbindungsoptionen:\n"
+
+#: pg_dump.c:733 pg_dumpall.c:244 pg_restore.c:454
+msgid "  -h, --host=HOSTNAME      database server host name\n"
+msgstr "  -h, --host=HOSTNAME      Hostname des Datenbankservers\n"
+
+#: pg_dump.c:734 pg_dumpall.c:245 pg_restore.c:455
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr "  -p, --port=PORT          Portnummer des Datenbankservers\n"
+
+#: pg_dump.c:735 pg_dumpall.c:246 pg_restore.c:456
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr "  -U, --username=NAME      Datenbankbenutzername\n"
+
+#: pg_dump.c:736 pg_dumpall.c:247 pg_restore.c:457
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr ""
+"  -W, --password           nach Passwort fragen (sollte automatisch "
+"geschehen)\n"
+
+#: pg_dump.c:738 pg_dumpall.c:249 pg_restore.c:459
+msgid "  -h HOSTNAME              database server host name\n"
+msgstr "  -h HOSTNAME              Hostname des Datenbankservers\n"
+
+#: pg_dump.c:739 pg_dumpall.c:250 pg_restore.c:460
+msgid "  -p PORT                  database server port number\n"
+msgstr "  -p PORT                  Portnummer des Datenbankservers\n"
+
+#: pg_dump.c:740 pg_dumpall.c:251 pg_restore.c:461
+msgid "  -U NAME                  connect as specified database user\n"
+msgstr "  -U NAME                  Datenbankbenutzername\n"
+
+#: pg_dump.c:741 pg_dumpall.c:252 pg_restore.c:462
+msgid ""
+"  -W                       force password prompt (should happen "
+"automatically)\n"
 msgstr ""
-"  -Z {0-9}                 Komprimierungsniveau f�r komprimierte Formate\n"
+"  -W                       nach Passwort fragen (sollte automatisch "
+"geschehen)\n"
 
-#: pg_dump.c:729
+#: pg_dump.c:744
 msgid ""
 "\n"
 "If no database name is not supplied, then the PGDATABASE environment\n"
@@ -435,47 +465,47 @@ msgstr ""
 "PGDATABASE verwendet.\n"
 "\n"
 
-#: pg_dump.c:731 pg_dumpall.c:248 pg_restore.c:455
+#: pg_dump.c:746 pg_dumpall.c:256 pg_restore.c:466
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_backup_archiver.c:1288 pg_dump.c:739
+#: pg_backup_archiver.c:1297 pg_dump.c:754
 msgid "*** aborted because of error\n"
 msgstr "*** abgebrochen wegen Fehler\n"
 
-#: pg_dump.c:806
+#: pg_dump.c:821
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "gebe Inhalt der Tabelle %s aus\n"
 
-#: pg_dump.c:845
+#: pg_dump.c:860
 #, c-format
 msgid "SQL command to dump the contents of table \"%s\" failed\n"
 msgstr "SQL-Anweisung um Inhalt der Tabelle �%s� auszugeben schlug fehl\n"
 
-#: pg_dump.c:847 pg_dump.c:936 pg_dump.c:985 pg_dump.c:999 pg_dump.c:1097
-#: pg_dump.c:1215
+#: pg_dump.c:862 pg_dump.c:951 pg_dump.c:1001 pg_dump.c:1015 pg_dump.c:1119
+#: pg_dump.c:1237
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Fehlermeldung vom Server: %s"
 
-#: pg_dump.c:848 pg_dump.c:857 pg_dump.c:937 pg_dump.c:986 pg_dump.c:1216
+#: pg_dump.c:863 pg_dump.c:872 pg_dump.c:952 pg_dump.c:1002 pg_dump.c:1238
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Die Anweisung war: %s\n"
 
-#: pg_dump.c:853
+#: pg_dump.c:868
 #, c-format
 msgid "SQL command to dump the contents of table \"%s\" executed abnormally.\n"
 msgstr ""
 "SQL-Anweisung um Inhalt der Tabelle �%s� auszugeben lief nicht korrekt ab.\n"
 
-#: pg_dump.c:855
+#: pg_dump.c:870
 #, c-format
 msgid "The server returned status %d when %d was expected.\n"
 msgstr "Der Server gab Status %d zur�ck, aber %d wurde erwartet.\n"
 
-#: pg_dump.c:935
+#: pg_dump.c:950
 #, c-format
 msgid ""
 "SQL command to dump the contents of table \"%s\" failed: PQendcopy() "
@@ -484,273 +514,273 @@ msgstr ""
 "SQL-Anweisung um Inhalt der Tabelle �%s� auszugeben fehlgeschlagen: PQendcopy"
 "() nicht erfolgreich.\n"
 
-#: pg_dump.c:984 pg_dump.c:998 pg_dump.c:1096
+#: pg_dump.c:1000 pg_dump.c:1014 pg_dump.c:1118
 msgid "dumpClasses(): SQL command failed\n"
 msgstr "dumpClasses(): SQL-Anweisung schlug fehl\n"
 
-#: pg_dump.c:1000
+#: pg_dump.c:1016
 msgid "The command was: FETCH 100 FROM _pg_dump_cursor\n"
 msgstr "Die Anweisung war: FETCH 100 FROM _pg_dump_cursor\n"
 
-#: pg_dump.c:1098
+#: pg_dump.c:1120
 msgid "The command was: CLOSE _pg_dump_cursor\n"
 msgstr "Die Anweisung war: CLOSE _pg_dump_cursor\n"
 
-#: pg_dump.c:1136
+#: pg_dump.c:1158
 #, c-format
 msgid "preparing to dump the contents of table %s\n"
 msgstr "Vorbereitung um Inhalt der Tabelle %s auszugeben\n"
 
-#: pg_dump.c:1199
+#: pg_dump.c:1221
 msgid "saving database definition\n"
 msgstr "sichere Datenbankdefinition\n"
 
-#: pg_dump.c:1214
+#: pg_dump.c:1236
 msgid "SQL command failed\n"
 msgstr "SQL-Anweisung schlug fehl\n"
 
-#: pg_dump.c:1224
+#: pg_dump.c:1246
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "fehlender pg_database-Eintrag f�r Datenbank �%s�\n"
 
-#: pg_dump.c:1231
+#: pg_dump.c:1253
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr ""
 "Abfrage ergab mehr als einen (%d) pg_database-Eintrag f�r Datenbank �%s�\n"
 
-#: pg_dump.c:1298
+#: pg_dump.c:1320
 msgid "saving large objects\n"
 msgstr "sichere Large Objects\n"
 
-#: pg_dump.c:1312
+#: pg_dump.c:1334
 #, c-format
 msgid "dumpBlobs(): cursor declaration failed: %s"
 msgstr "dumpBlobs(): Cursordeklaration fehlgeschlagen: %s"
 
-#: pg_dump.c:1327
+#: pg_dump.c:1349
 #, c-format
 msgid "dumpBlobs(): fetch from cursor failed: %s"
 msgstr "dumpBlobs(): Fetch vom Cursor fehlgeschlagen: %s"
 
-#: pg_dump.c:1340
+#: pg_dump.c:1362
 #, c-format
 msgid "dumpBlobs(): could not open large object: %s"
 msgstr "dumpBlobs(): konnte Large Object nicht �ffnen: %s"
 
-#: pg_dump.c:1353
+#: pg_dump.c:1375
 #, c-format
 msgid "dumpBlobs(): error reading large object: %s"
 msgstr "dumpBlobs(): Fehler beim Lesen von Large Object: %s"
 
-#: pg_dump.c:1441
+#: pg_dump.c:1463
 #, c-format
 msgid "query to obtain list of namespaces failed: %s"
 msgstr "Abfrage um Liste der Namespaces zu ermitteln fehlgeschlagen: %s"
 
-#: pg_dump.c:1465
+#: pg_dump.c:1487
 #, c-format
 msgid "WARNING: owner of namespace %s appears to be invalid\n"
 msgstr "WARNUNG: Eigent�mer des Namespace %s scheint ung�ltig zu sein\n"
 
-#: pg_dump.c:1500
+#: pg_dump.c:1522
 #, c-format
 msgid "could not find namespace with OID %s\n"
 msgstr "konnte Namespace mit OID %s nicht finden\n"
 
-#: pg_dump.c:1580
+#: pg_dump.c:1602
 #, c-format
 msgid "query to obtain list of data types failed: %s"
 msgstr "Abfrage um Liste der Datentypen zu erhalten schlug fehl: %s"
 
-#: pg_dump.c:1625
+#: pg_dump.c:1647
 #, c-format
 msgid "WARNING: owner of data type %s appears to be invalid\n"
 msgstr "WARNUNG: Eigent�mer des Datentypen %s scheint ung�ltig zu sein\n"
 
-#: pg_dump.c:1688 pg_dump.c:4010
+#: pg_dump.c:1710 pg_dump.c:4036
 #, c-format
 msgid "query to obtain list of operators failed: %s"
 msgstr "Abfrage um Liste der Operatoren zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:1713
+#: pg_dump.c:1735
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigent�mer des Operatoren �%s� scheint ung�ltig zu sein\n"
 
-#: pg_dump.c:1771
+#: pg_dump.c:1793
 #, c-format
 msgid "query to obtain list of operator classes failed: %s"
 msgstr "Abfrage um Liste der Operatorklassen zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:1796
+#: pg_dump.c:1818
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigent�mer der Operatorklasse �%s� scheint ung�ltig zu sein\n"
 
-#: pg_dump.c:1864 pg_dump.c:4630
+#: pg_dump.c:1886 pg_dump.c:4656
 #, c-format
 msgid "query to obtain list of aggregate functions failed: %s"
 msgstr "Abfrage um Liste der Aggregatfunktionen zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:1890
+#: pg_dump.c:1912
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr ""
 "WARNUNG: Eigent�mer der Aggregatfunktion �%s� scheint ung�ltig zu sein\n"
 
-#: pg_dump.c:1964
+#: pg_dump.c:1986
 #, c-format
 msgid "query to obtain list of functions failed: %s"
 msgstr "Abfrage um Liste der Funktionen zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:2011
+#: pg_dump.c:2033
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigent�mer der Funktion �%s� scheint ung�ltig zu sein\n"
 
-#: pg_dump.c:2161
+#: pg_dump.c:2183
 #, c-format
 msgid "query to obtain list of tables failed: %s"
 msgstr "Abfrage um Liste der Tabellen zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:2257
+#: pg_dump.c:2279
 #, c-format
 msgid "Attempt to lock table \"%s\" failed.  %s"
 msgstr "Versuch die Tabelle �%s� zu sperren ist fehlgeschlagen.  %s"
 
-#: pg_dump.c:2266
+#: pg_dump.c:2288
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "WARNUNG: Eigent�mer der Tabelle �%s� scheint ung�ltig zu sein\n"
 
-#: pg_dump.c:2308
+#: pg_dump.c:2330
 #, c-format
 msgid "query to obtain inheritance relationships failed: %s"
 msgstr "Abfrage um die Ableitungsbeziehungen zu ermitteln fehlgeschlagen: %s"
 
-#: pg_dump.c:2392
+#: pg_dump.c:2415
 #, c-format
 msgid "finding the columns and types of table %s\n"
 msgstr "finde Spalten und Typen von Tabelle %s\n"
 
-#: pg_dump.c:2441
+#: pg_dump.c:2464
 #, c-format
 msgid "query to get table columns failed: %s"
 msgstr "Abfrage nach Tabellenspalten fehlgeschlagen: %s"
 
-#: pg_dump.c:2494
+#: pg_dump.c:2520
 #, c-format
 msgid "finding DEFAULT expressions of table %s\n"
 msgstr "finde DEFAULT-Ausdrucke von Tabelle %s\n"
 
-#: pg_dump.c:2525
+#: pg_dump.c:2551
 #, c-format
 msgid "query to get column default values failed: %s"
 msgstr "Abfrage nach DEFAULT-Ausdruck fehlgeschlagen: %s"
 
-#: pg_dump.c:2537
+#: pg_dump.c:2563
 #, c-format
 msgid "invalid adnum value %d for table %s\n"
 msgstr "ung�ltiger adnum-Wert %d f�r Tabelle %s\n"
 
-#: pg_dump.c:2654
+#: pg_dump.c:2680
 #, c-format
 msgid "query to get comment on oid %s failed: %s"
 msgstr "Abfrage nach Kommentar f�r Oid %s fehlgeschlagen: %s"
 
-#: pg_dump.c:2738
+#: pg_dump.c:2764
 #, c-format
 msgid "query to get comments on table %s failed: %s"
 msgstr "Abfrage nach Kommentaren f�r Tabelle %s fehlgeschlagen: %s"
 
-#: pg_dump.c:2821
+#: pg_dump.c:2847
 #, c-format
 msgid "query to get database oid failed: %s"
 msgstr "Abfrage nach Datenbank-Oid fehlgeschlagen: %s"
 
-#: pg_dump.c:2990
+#: pg_dump.c:3016
 #, c-format
 msgid "query to obtain information on type %s failed: %s"
 msgstr "Abfrage um Informationen �ber Typ %s zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:2999 pg_dump.c:3173 pg_dump.c:3675 pg_dump.c:4018 pg_dump.c:4331
-#: pg_dump.c:4639 pg_dump.c:6578
+#: pg_dump.c:3025 pg_dump.c:3199 pg_dump.c:3701 pg_dump.c:4044 pg_dump.c:4357
+#: pg_dump.c:4665 pg_dump.c:6611
 #, c-format
 msgid "Got %d rows instead of one from: %s"
 msgstr "Ergebnis waren %d Zeilen statt einer von: %s"
 
-#: pg_dump.c:3165
+#: pg_dump.c:3191
 #, c-format
 msgid "query to obtain domain information failed: %s"
 msgstr "Abfrage um Liste der Domains zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:3268
+#: pg_dump.c:3294
 #, c-format
 msgid "query to obtain type information failed: %s"
 msgstr "Abfrage um Typeninformationen zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:3276
+#: pg_dump.c:3302
 #, c-format
 msgid "Got no rows from: %s"
 msgstr "Ergebnis waren keine Zeilen von: %s"
 
-#: pg_dump.c:3407
+#: pg_dump.c:3433
 #, c-format
 msgid "query to obtain list of procedural languages failed: %s"
 msgstr "Abfrage um Liste der Prozedursprachen zu ermitteln fehlgeschlagen: %s"
 
-#: pg_dump.c:3442
+#: pg_dump.c:3468
 #, c-format
 msgid "handler procedure for procedural language %s not found\n"
 msgstr "Handlerfunktion f�r Prozedursprache %s nicht gefunden\n"
 
-#: pg_dump.c:3452
+#: pg_dump.c:3478
 #, c-format
 msgid "validator procedure for procedural language %s not found\n"
 msgstr "Validatorprozedur f�r Prozedursprache %s nicht gefunden\n"
 
-#: pg_dump.c:3666
+#: pg_dump.c:3692
 #, c-format
 msgid "query to obtain information on function %s failed: %s"
 msgstr "Abfrage um Informationen �ber Funktion %s zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:3741
+#: pg_dump.c:3767
 #, c-format
 msgid "Unexpected provolatile value for function %s\n"
 msgstr "Unerwarteter provolatile-Wert f�r Funktion %s\n"
 
-#: pg_dump.c:3807
+#: pg_dump.c:3833
 #, c-format
 msgid "query to obtain list of casts failed: %s"
 msgstr "Abfrage um Liste der Casts zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:4239
+#: pg_dump.c:4265
 #, c-format
 msgid "WARNING: cannot find operator with OID %s\n"
 msgstr "WARNUNG: kann Operator mit OID %s nicht finden\n"
 
-#: pg_dump.c:4323
+#: pg_dump.c:4349
 #, c-format
 msgid "query to obtain operator class details failed: %s"
 msgstr "Abfrage um Operatorklassendetails zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:4393
+#: pg_dump.c:4419
 #, c-format
 msgid "query to obtain operator class operators failed: %s"
 msgstr ""
 "Abfrage um Liste der Operatoren der Operatorklasse zu ermitteln schlug fehl: "
 "%s"
 
-#: pg_dump.c:4438
+#: pg_dump.c:4464
 #, c-format
 msgid "query to obtain operator class functions failed: %s"
 msgstr ""
 "Abfrage um Liste der Operatorklassenfunktionen zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:4667
+#: pg_dump.c:4693
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
@@ -759,23 +789,23 @@ msgstr ""
 "WARNUNG: Aggregatfunktion %s konnte f�r diese Datenbankversion nicht korrekt "
 "ausgegeben werden - ignoriert\n"
 
-#: pg_dump.c:4889
+#: pg_dump.c:4925
 #, c-format
 msgid "could not parse ACL list (%s) for object %s (%s)\n"
 msgstr "konnte ACL-Zeichenkette (%s) f�r Objekt %s (%s) nicht interpretieren\n"
 
-#: pg_dump.c:5123
+#: pg_dump.c:5161
 #, c-format
 msgid "query to obtain definition of view \"%s\" failed: %s"
 msgstr "Abfrage um die Definition der Sicht �%s� zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:5131
+#: pg_dump.c:5169
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr ""
 "Abfrage um die Definition der Sicht �%s� zu ermitteln lieferte keine Daten\n"
 
-#: pg_dump.c:5134
+#: pg_dump.c:5172
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
@@ -783,142 +813,142 @@ msgstr ""
 "Abfrage um die Definition der Sicht �%s� zu ermitteln lieferte mehr als eine "
 "Definition\n"
 
-#: pg_dump.c:5141
+#: pg_dump.c:5179
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned NULL oid\n"
 msgstr ""
 "Abfrage um die Definition der Sicht �%s� zu ermitteln ergab eine NULL Oid\n"
 
-#: pg_dump.c:5150
+#: pg_dump.c:5188
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "Definition der Sicht �%s� scheint leer zu sein (L�nge null)\n"
 
-#: pg_dump.c:5288
+#: pg_dump.c:5326
 #, c-format
 msgid "finding CHECK constraints for table %s\n"
 msgstr "finde Check-Constraints f�r Tabelle %s\n"
 
-#: pg_dump.c:5330
+#: pg_dump.c:5368
 #, c-format
 msgid "query to obtain check constraints failed: %s"
 msgstr "Abfrage nach Check-Constraints fehlgeschlagen: %s"
 
-#: pg_dump.c:5336
+#: pg_dump.c:5374
 #, c-format
 msgid "expected %d check constraints on table \"%s\" but found %d\n"
 msgstr "%d Check-Constraints f�r Tabelle %s erwartet, aber %d gefunden\n"
 
-#: pg_dump.c:5338
+#: pg_dump.c:5376
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(Die Systemkataloge sind wahrscheinlich verf�lscht.)\n"
 
-#: pg_dump.c:5465
+#: pg_dump.c:5498
 #, c-format
 msgid "getAttrName(): invalid column number %d for table %s\n"
 msgstr "getAttrName(): ung�ltige Spaltennummer %d in Tabelle %s\n"
 
-#: pg_dump.c:5553
+#: pg_dump.c:5586
 #, c-format
 msgid "query to obtain list of indexes failed: %s"
 msgstr "Abfrage um Liste der Indizies zu ermitteln fehlgeschlagen: %s"
 
-#: pg_dump.c:5694
+#: pg_dump.c:5727
 #, c-format
 msgid "could not create pgdump_oid table: %s"
 msgstr "konnte Tabelle pgdump_oid nicht erstellen: %s"
 
-#: pg_dump.c:5702
+#: pg_dump.c:5735
 #, c-format
 msgid "could not insert into pgdump_oid table: %s"
 msgstr "konnte nicht in Tabelle pgdump_oid einf�gen: %s"
 
-#: pg_dump.c:5708
+#: pg_dump.c:5741
 msgid "inserted invalid oid\n"
 msgstr "ung�ltige Oid eingef�gt\n"
 
-#: pg_dump.c:5716
+#: pg_dump.c:5749
 #, c-format
 msgid "could not drop pgdump_oid table: %s"
 msgstr "konnte Tabelle pgdump_oid nicht entfernen: %s"
 
-#: pg_dump.c:5721
+#: pg_dump.c:5754
 #, c-format
 msgid "maximum system oid is %u\n"
 msgstr "h�chste System-Oid ist %u\n"
 
-#: pg_dump.c:5758
+#: pg_dump.c:5791
 #, c-format
 msgid "error in finding the last system oid: %s"
 msgstr "Fehler beim Finden der letzten System-Oid: %s"
 
-#: pg_dump.c:5764
+#: pg_dump.c:5797
 msgid "missing pg_database entry for this database\n"
 msgstr "fehlender pg_database-Eintrag f�r diese Datenbank\n"
 
-#: pg_dump.c:5769
+#: pg_dump.c:5802
 msgid "found more than one pg_database entry for this database\n"
 msgstr "mehr als einen pg_database-Eintrag f�r diese Datenbank gefunden\n"
 
-#: pg_dump.c:5797
+#: pg_dump.c:5830
 #, c-format
 msgid "error in finding the template1 database: %s"
 msgstr "Fehler beim Finden der Datenbank template1: %s"
 
-#: pg_dump.c:5803
+#: pg_dump.c:5836
 msgid "could not find template1 database entry in the pg_database table\n"
 msgstr ""
 "konnte Eintrag f�r Datenbank template1 nicht in der Tabelle pg_database "
 "finden\n"
 
-#: pg_dump.c:5808
+#: pg_dump.c:5841
 msgid "found more than one template1 database entry in the pg_database table\n"
 msgstr ""
 "mehr als ein Eintrag f�r Datenbank template1 in der Tabelle pg_database "
 "gefunden\n"
 
-#: pg_dump.c:5842
+#: pg_dump.c:5875
 #, c-format
 msgid "query to get data of sequence \"%s\" failed: %s"
 msgstr "Abfrage nach Daten der Sequenz %s fehlgeschlagen: %s"
 
-#: pg_dump.c:5848
+#: pg_dump.c:5881
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
 msgstr "Abfrage nach Daten der Sequenz %s ergab %d Zeilen (erwartete 1)\n"
 
-#: pg_dump.c:5857
+#: pg_dump.c:5890
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "Abfrage nach Daten der Sequenz %s ergab Name �%s�\n"
 
-#: pg_dump.c:5980
+#: pg_dump.c:6013
 #, c-format
 msgid "dumping foreign key constraints for table %s\n"
 msgstr "gebe Fremdschl�ssel-Constraints f�r Tabelle %s aus\n"
 
-#: pg_dump.c:6001
+#: pg_dump.c:6034
 #, c-format
 msgid "query to obtain list of foreign key definitions failed: %s"
 msgstr ""
 "Abfrage um Liste der Fremdschl�sseldefinitionen zu ermitteln schlug fehl: %s"
 
-#: pg_dump.c:6091
+#: pg_dump.c:6124
 #, c-format
 msgid "dumping triggers for table %s\n"
 msgstr "dumpe Trigger von Tabelle %s\n"
 
-#: pg_dump.c:6140
+#: pg_dump.c:6173
 #, c-format
 msgid "query to obtain list of triggers failed: %s"
 msgstr "Abfrage um Liste der Trigger zu ermitteln fehlgeschlagen: %s"
 
-#: pg_dump.c:6151
+#: pg_dump.c:6184
 #, c-format
 msgid "expected %d triggers on table \"%s\" but found %d\n"
 msgstr "%d Trigger f�r Tabelle %s erwartet, aber %d gefunden\n"
 
-#: pg_dump.c:6261
+#: pg_dump.c:6294
 #, c-format
 msgid ""
 "query produced NULL referenced table name for foreign key trigger \"%s\" on "
@@ -927,27 +957,27 @@ msgstr ""
 "Abfrage ergab NULL als Name der Tabelle auf die sich Fremdschl�ssel-Trigger "
 "�%s� von Tabelle �%s� bezieht (Oid der Tabelle: %s)\n"
 
-#: pg_dump.c:6301
+#: pg_dump.c:6334
 #, c-format
 msgid "bad argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr ""
 "fehlerhafte Argumentzeichenkette (%s) f�r Trigger �%s� von Tabelle �%s�\n"
 
-#: pg_dump.c:6371
+#: pg_dump.c:6404
 msgid "dumping out rules\n"
 msgstr "Ausgabe der Rules\n"
 
-#: pg_dump.c:6424
+#: pg_dump.c:6457
 #, c-format
 msgid "query to get rules associated with table \"%s\" failed: %s"
 msgstr "Abfrage nach Rules der Tabelle %s fehlgeschlagen: %s"
 
-#: pg_dump.c:6507
+#: pg_dump.c:6540
 #, c-format
 msgid "query to set search_path failed: %s"
 msgstr "Abfrage um search_path zu setzen fehlgeschlagen: %s"
 
-#: pg_dump.c:6569
+#: pg_dump.c:6602
 #, c-format
 msgid "query to obtain name of type %s failed: %s"
 msgstr "Abfrage nach Namen von Typ %s fehlgeschlagen: %s"
@@ -1040,30 +1070,30 @@ msgstr "Ausgabe der benutzerdefinierten Operatorklassen\n"
 msgid "dumping out user-defined casts\n"
 msgstr "Ausgabe der benutzerdefinierten Casts\n"
 
-#: common.c:444
+#: common.c:452
 #, c-format
 msgid "failed sanity check, operator with oid %s not found\n"
 msgstr "Sanity-Check fehlgeschlagen, Operator mit Oid %s nicht gefunden\n"
 
-#: common.c:494
+#: common.c:502
 #, c-format
 msgid "failed sanity check, parent oid %s of table %s (oid %s) not found\n"
 msgstr ""
 "Sanity-Check fehlgeschlagen, Basistabelle mit Oid %s von Tabelle %s (Oid %s) "
 "nicht gefunden\n"
 
-#: common.c:499
+#: common.c:507
 #, c-format
 msgid "failed sanity check, parent oid %s of table (oid %s) not found\n"
 msgstr ""
 "Sanity-Check fehlgeschlagen, Basistabelle mit Oid %s von Tabelle mit Oid %s "
 "nicht gefunden\n"
 
-#: common.c:537
+#: common.c:545
 msgid "parseNumericArray: too many numbers\n"
 msgstr "parseNumericArray: zu viele Zahlen\n"
 
-#: common.c:552
+#: common.c:560
 msgid "parseNumericArray: bogus number\n"
 msgstr "parseNumericArray: ung�ltige Zahl\n"
 
@@ -1125,229 +1155,239 @@ msgstr ""
 "kann komprimiertes Archiv nicht wiederherstellen (Unterst�tzung nicht "
 "konfiguriert)\n"
 
-#: pg_backup_archiver.c:306
+#: pg_backup_archiver.c:307
 msgid "WARNING: skipping large object restoration\n"
 msgstr "WARNUNG: Large-Object-Wiederherstellung �bersprungen\n"
 
-#: pg_backup_archiver.c:321
+#: pg_backup_archiver.c:320
 #, c-format
 msgid "restoring data for table %s\n"
 msgstr "Wiederherstellung der Daten von Tabelle %s\n"
 
-#: pg_backup_archiver.c:346
+#: pg_backup_archiver.c:345
 #, c-format
 msgid "executing %s %s\n"
 msgstr "f�hre %s %s aus\n"
 
-#: pg_backup_archiver.c:370
+#: pg_backup_archiver.c:367
 #, c-format
 msgid "checking whether we loaded %s\n"
 msgstr "pr�fe ob %s geladen wurde\n"
 
-#: pg_backup_archiver.c:376
+#: pg_backup_archiver.c:373
 #, c-format
 msgid "fixing up large object cross-reference for %s\n"
 msgstr "stelle Large-Object-Querverweise f�r %s ein\n"
 
-#: pg_backup_archiver.c:381
+#: pg_backup_archiver.c:378
 #, c-format
 msgid "ignoring large object cross-references for %s %s\n"
 msgstr "ignoriere Large-Object-Querverweis von %s %s\n"
 
-#: pg_backup_archiver.c:470
+#: pg_backup_archiver.c:471
 msgid "disabling triggers\n"
 msgstr "schalte Trigger aus\n"
 
-#: pg_backup_archiver.c:533
+#: pg_backup_archiver.c:538
 msgid "enabling triggers\n"
 msgstr "schalte Trigger ein\n"
 
-#: pg_backup_archiver.c:582
+#: pg_backup_archiver.c:587
 msgid ""
 "WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr ""
 "WriteData kann nicht au�erhalb des Kontexts einer DataDumper-Routine "
 "aufgerufen werden\n"
 
-#: pg_backup_archiver.c:609 pg_backup_archiver.c:1037
-#: pg_backup_archiver.c:1156 pg_backup_archiver.c:1462
-#: pg_backup_archiver.c:1604 pg_backup_archiver.c:1634 pg_backup_custom.c:141
+#: pg_backup_archiver.c:614 pg_backup_archiver.c:1044
+#: pg_backup_archiver.c:1163 pg_backup_archiver.c:1551
+#: pg_backup_archiver.c:1701 pg_backup_archiver.c:1734 pg_backup_custom.c:141
 #: pg_backup_custom.c:146 pg_backup_custom.c:152 pg_backup_custom.c:167
-#: pg_backup_custom.c:561 pg_backup_db.c:164 pg_backup_db.c:238
-#: pg_backup_files.c:112 pg_backup_tar.c:168 pg_backup_tar.c:968
+#: pg_backup_custom.c:545 pg_backup_db.c:174 pg_backup_db.c:247
+#: pg_backup_files.c:112 pg_backup_tar.c:169 pg_backup_tar.c:961
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: pg_backup_archiver.c:704
+#: pg_backup_archiver.c:711
 msgid "large object output not supported in chosen format\n"
 msgstr "Large-Object-Ausgabe im gew�hlten Format nicht unterst�tzt\n"
 
-#: pg_backup_archiver.c:744 pg_backup_archiver.c:829
+#: pg_backup_archiver.c:751 pg_backup_archiver.c:836
 msgid "committing large object transactions\n"
 msgstr "schlie�e Large-Object-Transaktionen ab\n"
 
-#: pg_backup_archiver.c:751
+#: pg_backup_archiver.c:758
 #, c-format
 msgid "restored %d large objects\n"
 msgstr "%d Large Objects wiederhergestellt\n"
 
-#: pg_backup_archiver.c:768
+#: pg_backup_archiver.c:775
 msgid "cannot restore large objects without a database connection\n"
 msgstr "kann Large Objects ohne Datenbankverbindung nicht wiederherstellen\n"
 
-#: pg_backup_archiver.c:782
+#: pg_backup_archiver.c:789
 msgid "starting large object transactions\n"
 msgstr "starte Transaktion f�r Large Objects\n"
 
-#: pg_backup_archiver.c:790
+#: pg_backup_archiver.c:797
 msgid "could not create large object\n"
 msgstr "konnte Large Object nicht erstellen\n"
 
-#: pg_backup_archiver.c:792
+#: pg_backup_archiver.c:799
 #, c-format
 msgid "restoring large object with oid %u as %u\n"
 msgstr "Wiederherstellung von Large Object Oid %u als %u\n"
 
-#: pg_backup_archiver.c:798
+#: pg_backup_archiver.c:805
 msgid "could not open large object\n"
 msgstr "konnte Large Object nicht �ffnen: %s\n"
 
-#: pg_backup_archiver.c:813
+#: pg_backup_archiver.c:820
 #, c-format
 msgid "wrote remaining %lu bytes of large object data (result = %lu)\n"
 msgstr "%lu Bytes Large-Object-Daten geschrieben (Ergebnis = %lu)\n"
 
-#: pg_backup_archiver.c:816 pg_backup_archiver.c:1213
+#: pg_backup_archiver.c:823 pg_backup_archiver.c:1220
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "konnte Large Object nicht schreiben (Ergebis: %lu, erwartet: %lu)\n"
 
-#: pg_backup_archiver.c:953
+#: pg_backup_archiver.c:960
 msgid "could not open TOC file\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht �ffnen\n"
 
-#: pg_backup_archiver.c:974
+#: pg_backup_archiver.c:981
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "WARNUNG: Zeile ignoriert: %s\n"
 
-#: pg_backup_archiver.c:981
+#: pg_backup_archiver.c:988
 #, c-format
 msgid "could not find entry for id %d\n"
 msgstr "konnte Eintrag f�r ID %d nicht finden\n"
 
-#: pg_backup_archiver.c:990 pg_backup_files.c:156 pg_backup_files.c:441
+#: pg_backup_archiver.c:997 pg_backup_files.c:156 pg_backup_files.c:438
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht finden: %s\n"
 
-#: pg_backup_archiver.c:1105 pg_backup_files.c:130
+#: pg_backup_archiver.c:1112 pg_backup_files.c:130
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "konnte Ausgabedatei nicht �ffnen: %s\n"
 
-#: pg_backup_archiver.c:1121
+#: pg_backup_archiver.c:1128
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "konnte Ausgabedatei nicht schlie�en: %s\n"
 
-#: pg_backup_archiver.c:1209
+#: pg_backup_archiver.c:1216
 #, c-format
 msgid "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr "%lu Bytes Large-Object-Daten geschrieben (Ergebnis = %lu)\n"
 
-#: pg_backup_archiver.c:1231
+#: pg_backup_archiver.c:1238
 msgid "could not write to compressed archive\n"
 msgstr "konnte nicht in komprimiertes Archiv schreiben\n"
 
-#: pg_backup_archiver.c:1239
+#: pg_backup_archiver.c:1246
 msgid "could not write to custom output routine\n"
 msgstr "konnte nicht zur Custom-Ausgaberoutine schreiben\n"
 
-#: pg_backup_archiver.c:1254
+#: pg_backup_archiver.c:1261
 #, c-format
 msgid "could not write to output file (%lu != %lu)\n"
 msgstr "konnte nicht in Ausgabedatei schreiben (%lu != %lu)\n"
 
-#: pg_backup_archiver.c:1480
+#: pg_backup_archiver.c:1444
+#, c-format
+msgid "Unexpected data offset flag %d\n"
+msgstr "Unerwartete Datenoffsetmarkierung %d\n"
+
+#: pg_backup_archiver.c:1457
+msgid "file offset in dump file is too large\n"
+msgstr "Dateioffset in Dumpdatei ist zu gro�\n"
+
+#: pg_backup_archiver.c:1569
 msgid "attempting to ascertain archive format\n"
 msgstr "versuche Archivformat zu ermitteln\n"
 
-#: pg_backup_archiver.c:1500 pg_backup_files.c:148
+#: pg_backup_archiver.c:1589 pg_backup_files.c:148
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "konnte Eingabedatei nicht �ffnen: %s\n"
 
-#: pg_backup_archiver.c:1507
+#: pg_backup_archiver.c:1596
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "konnte nicht aus Eingabedatei lesen: %s\n"
 
-#: pg_backup_archiver.c:1509
+#: pg_backup_archiver.c:1598
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "Eingabedatei ist zu kurz (gelesen: %lu, erwartet: 5)\n"
 
-#: pg_backup_archiver.c:1554
+#: pg_backup_archiver.c:1651
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "Eingabedatei scheint kein g�ltiges Archiv zu sein (zu kurz?)\n"
 
-#: pg_backup_archiver.c:1557
+#: pg_backup_archiver.c:1654
 msgid "input file does not appear to be a valid archive\n"
 msgstr "Eingabedatei scheint kein g�ltiges Archiv zu sein\n"
 
-#: pg_backup_archiver.c:1575
+#: pg_backup_archiver.c:1672
 #, c-format
 msgid "read %lu bytes into lookahead buffer\n"
 msgstr "%lu Bytes in Puffer gelesen\n"
 
-#: pg_backup_archiver.c:1582
+#: pg_backup_archiver.c:1679
 #, c-format
 msgid "could not close the input file after reading header: %s\n"
 msgstr "konnte Ausgabedatei nach dem Lesen des Kopfes nicht schlie�en: %s\n"
 
-#: pg_backup_archiver.c:1599
+#: pg_backup_archiver.c:1696
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "erstelle AH f�r %s, Format %d\n"
 
-#: pg_backup_archiver.c:1650
+#: pg_backup_archiver.c:1750
 #, c-format
 msgid "archive format is %d\n"
 msgstr "Archivformat ist %d\n"
 
-#: pg_backup_archiver.c:1678
+#: pg_backup_archiver.c:1778
 #, c-format
 msgid "unrecognized file format '%d'\n"
 msgstr "unerkanntes Dateiformat �%d�\n"
 
-#: pg_backup_archiver.c:1791
-msgid "entry id out of range - perhaps a corrupt TOC\n"
+#: pg_backup_archiver.c:1891
+#, c-format
+msgid "entry id %d out of range - perhaps a corrupt TOC\n"
 msgstr ""
-"ID des Eintrags au�erhalb des g�ltigen Bereichs - vielleicht ein "
+"ID %d des Eintrags au�erhalb des g�ltigen Bereichs - vielleicht ein "
 "verf�lschtes Inhaltsverzeichnis\n"
 
-#: pg_backup_archiver.c:1826
+#: pg_backup_archiver.c:1926
 #, c-format
 msgid "read dependency for %s -> %s\n"
 msgstr "Abh�ngigkeit %s -> %s gelesen\n"
 
-#: pg_backup_archiver.c:1845
+#: pg_backup_archiver.c:1948
 #, c-format
 msgid "read TOC entry %d (id %d) for %s %s\n"
 msgstr "Inhaltsverzeichniseintrag %d (Id %d) von %s %s gelesen\n"
 
-#: pg_backup_archiver.c:1971
+#: pg_backup_archiver.c:2074
 #, c-format
 msgid "could not set session user to %s: %s"
 msgstr "konnte Session-Benutzer nicht auf %s setzen: %s"
 
-#: pg_backup_archiver.c:2085
+#: pg_backup_archiver.c:2188
 #, c-format
 msgid "could not set search_path to %s: %s"
 msgstr "konnte search_path nicht auf %s setzen: %s"
 
-#: pg_backup_archiver.c:2144
+#: pg_backup_archiver.c:2248
 msgid ""
 "WARNING: requested compression not available in this installation - archive "
 "will be uncompressed\n"
@@ -1355,21 +1395,21 @@ msgstr ""
 "WARNUNG: Komprimierung ist in dieser Installation nicht verf�gbar; Archiv "
 "wird nicht komprimiert\n"
 
-#: pg_backup_archiver.c:2177
+#: pg_backup_archiver.c:2281
 msgid "did not find magic string in file header\n"
 msgstr "magische Zeichenkette im Dateikopf nicht gefunden\n"
 
-#: pg_backup_archiver.c:2191
+#: pg_backup_archiver.c:2295
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "nicht unterst�tzte Version (%d.%d) im Dateikopf\n"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2300
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "Pr�fung der Integer-Gr��e (%lu) fehlgeschlagen\n"
 
-#: pg_backup_archiver.c:2200
+#: pg_backup_archiver.c:2304
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "may fail\n"
@@ -1377,14 +1417,14 @@ msgstr ""
 "WARNUNG: Archiv wurde auf einer Maschine mit gr��eren Integers erstellt; "
 "einige Operationen k�nnten fehlschlagen\n"
 
-#: pg_backup_archiver.c:2205
+#: pg_backup_archiver.c:2314
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr ""
 "erwartetes Format (%d) ist nicht das gleiche wie das in der Datei gefundene "
 "(%d)\n"
 
-#: pg_backup_archiver.c:2221
+#: pg_backup_archiver.c:2330
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression - no data will be available\n"
@@ -1392,7 +1432,7 @@ msgstr ""
 "WARNUNG: Archiv ist komprimiert, aber diese Installation unterst�tzt keine "
 "Komprimierung - keine Daten verf�gbar\n"
 
-#: pg_backup_archiver.c:2239
+#: pg_backup_archiver.c:2348
 msgid "WARNING: invalid creation date in header\n"
 msgstr "WARNUNG: ung�ltiges Erstellungsdatum im Kopf\n"
 
@@ -1400,7 +1440,7 @@ msgstr "WARNUNG: ung
 msgid "custom archiver"
 msgstr "Custom-Archivierer"
 
-#: pg_backup_custom.c:181 pg_backup_custom.c:194
+#: pg_backup_custom.c:180 pg_backup_custom.c:191
 #, c-format
 msgid "could not open archive file %s: %s\n"
 msgstr "konnte Archivdatei %s nicht �ffnen: %s\n"
@@ -1409,7 +1449,7 @@ msgstr "konnte Archivdatei %s nicht 
 msgid "invalid OID for large object\n"
 msgstr "ung�ltige Oid f�r Large Object\n"
 
-#: pg_backup_custom.c:448
+#: pg_backup_custom.c:446
 msgid ""
 "Dumping a specific TOC data block out of order is not supported without id "
 "on this input stream (fseek required)\n"
@@ -1417,87 +1457,87 @@ msgstr ""
 "Ausgabe eines bestimmten Inhaltsverzeichnisblockes au�er der Reihe wird ohne "
 "Id in diesem Eingabestrom nicht unterst�tzt (fseek ben�tigt)\n"
 
-#: pg_backup_custom.c:467
+#: pg_backup_custom.c:461
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr "unerkannter Datenblocktyp (%d) beim Suchen im Archiv gefunden\n"
 
-#: pg_backup_custom.c:483
+#: pg_backup_custom.c:472
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "Fehler beim Suchen in Datei: %s\n"
 
-#: pg_backup_custom.c:491
+#: pg_backup_custom.c:479
 #, c-format
 msgid "found unexpected block ID (%d) when reading data - expected %d\n"
 msgstr ""
 "unerwartete Block-Id (%d) beim Lesen der Daten gefunden - erwartet wurde %d\n"
 
-#: pg_backup_custom.c:505
+#: pg_backup_custom.c:490
 msgid "large objects cannot be loaded without a database connection\n"
 msgstr "Large Objects k�nnen nicht ohne Datenbankverbindung geladen werden\n"
 
-#: pg_backup_custom.c:512
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr ""
 "unerkannter Datenblocktyp %d beim Wiederherstellen des Archivs gefunden\n"
 
-#: pg_backup_custom.c:548 pg_backup_custom.c:912
+#: pg_backup_custom.c:532 pg_backup_custom.c:894
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren: %s\n"
 
-#: pg_backup_custom.c:570 pg_backup_custom.c:698
+#: pg_backup_custom.c:554 pg_backup_custom.c:677
 #, c-format
 msgid "could not read data block - expected %lu, got %lu\n"
 msgstr "konnte Datenblock nicht lesen - %lu Bytes erwartet, %lu erhalten\n"
 
-#: pg_backup_custom.c:589 pg_backup_custom.c:621
+#: pg_backup_custom.c:572 pg_backup_custom.c:602
 #, c-format
 msgid "unable to uncompress data: %s\n"
 msgstr "konnte Daten nicht komprimieren: %s\n"
 
-#: pg_backup_custom.c:627
+#: pg_backup_custom.c:608
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "konnte Komprimierungsbibliothek nicht schlie�en: %s\n"
 
-#: pg_backup_custom.c:727
+#: pg_backup_custom.c:705
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "konnte Byte nicht schreiben: %s\n"
 
-#: pg_backup_custom.c:771 pg_backup_files.c:416
+#: pg_backup_custom.c:749 pg_backup_files.c:413
 #, c-format
 msgid "write error in _WriteBuf (%lu != %lu)\n"
 msgstr "Schreibfehler in _WriteBuf (%lu != %lu)\n"
 
-#: pg_backup_custom.c:842
+#: pg_backup_custom.c:820
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "konnte Archivdatei nicht schlie�en: %s\n"
 
-#: pg_backup_custom.c:865
-msgid "WARNING: ftell mismatch with expected position -- ftell ignored\n"
+#: pg_backup_custom.c:843
+msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr ""
-"WARNUNG: erwartete Dateiposition stimmt nicht mit ftell �berein -- ftell "
-"ignoriert\n"
+"WARNUNG: erwartete Dateiposition stimmt nicht mit ftell �berein -- benutze "
+"ftell\n"
 
-#: pg_backup_custom.c:944
+#: pg_backup_custom.c:926
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "konnte Daten nicht komprimieren: %s\n"
 
-#: pg_backup_custom.c:964
+#: pg_backup_custom.c:946
 msgid "could not write compressed chunk\n"
 msgstr "konnte komprimiertes St�ck nicht schreiben\n"
 
-#: pg_backup_custom.c:978
+#: pg_backup_custom.c:960
 msgid "could not write uncompressed chunk\n"
 msgstr "konnte unkomprimiertes St�ck nicht schreiben\n"
 
-#: pg_backup_custom.c:1027
+#: pg_backup_custom.c:1006
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "konnte Komprimierungsstrom nicht schlie�en: %s\n"
@@ -1506,22 +1546,22 @@ msgstr "konnte Komprimierungsstrom nicht schlie
 msgid "archiver (db)"
 msgstr "Archivierer (DB)"
 
-#: pg_backup_db.c:69
+#: pg_backup_db.c:73 pg_backup_db.c:83
 #, c-format
 msgid "could not get version from server: %s"
 msgstr "konnte Version des Servers nicht ermitteln: %s"
 
-#: pg_backup_db.c:81
+#: pg_backup_db.c:91
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "Version des Servers: %s; Version von %s: %s\n"
 
 # XXX  bessere �bersetzung von mismatch?
-#: pg_backup_db.c:84
+#: pg_backup_db.c:94
 msgid "proceeding despite version mismatch\n"
 msgstr "Fortsetzung trotz unterschiedlicher Versionen\n"
 
-#: pg_backup_db.c:86
+#: pg_backup_db.c:96
 msgid ""
 "aborting because of version mismatch  (Use the -i option to proceed "
 "anyway.)\n"
@@ -1529,129 +1569,134 @@ msgstr ""
 "Abbruch wegen unterschiedlicher Versionen  (Verwenden Sie die Option -i um "
 "trotzdem fortzusetzen.)\n"
 
-#: pg_backup_db.c:158
+#: pg_backup_db.c:168
 #, c-format
 msgid "connecting to database %s as user %s\n"
 msgstr "verbinde mit Datenbank %s als Benutzer %s\n"
 
-#: pg_backup_db.c:162 pg_backup_db.c:195 pg_backup_db.c:236 pg_backup_db.c:265
-#: pg_dumpall.c:617 pg_dumpall.c:643
+#: pg_backup_db.c:172 pg_backup_db.c:205 pg_backup_db.c:245 pg_backup_db.c:274
+#: pg_dumpall.c:639 pg_dumpall.c:665
 msgid "Password: "
 msgstr "Pa�wort: "
 
-#: pg_backup_db.c:174
+#: pg_backup_db.c:184
 msgid "failed to reconnect to database\n"
 msgstr "konnte nicht wieder zur Datenbank verbinden\n"
 
-#: pg_backup_db.c:198
+#: pg_backup_db.c:208
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "konnte nicht wieder zur Datenbank verbinden: %s"
 
-#: pg_backup_db.c:232
+#: pg_backup_db.c:241
 msgid "already connected to a database\n"
 msgstr "bereits mit einer Datenbank verbunden\n"
 
-#: pg_backup_db.c:255
+#: pg_backup_db.c:264
 msgid "failed to connect to database\n"
 msgstr "Verbinden zur Datenbank schlug fehl\n"
 
-#: pg_backup_db.c:274
+#: pg_backup_db.c:283
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "Verbindung zur Datenbank �%s� fehlgeschlagen: %s"
 
-#: pg_backup_db.c:289
+#: pg_backup_db.c:296
+#, c-format
+msgid "SET autocommit TO 'on' failed: %s"
+msgstr "SET autocommit TO 'on' schlug fehl: %s"
+
+#: pg_backup_db.c:310
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:317
+#: pg_backup_db.c:338
 #, c-format
 msgid "%s: no result from server\n"
 msgstr "%s: kein Ergebnis vom Server\n"
 
 # XXX  Was ist eine prim�re Verbindung?
-#: pg_backup_db.c:324
+#: pg_backup_db.c:345
 msgid "COPY command executed in non-primary connection\n"
 msgstr "COPY-Anweisung nicht auf prim�rer Verbindung ausgef�hrt\n"
 
-#: pg_backup_db.c:329
+#: pg_backup_db.c:350
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: pg_backup_db.c:403
+#: pg_backup_db.c:424
 msgid "error returned by PQputline\n"
 msgstr "Fehler in PQputline\n"
 
-#: pg_backup_db.c:414
+#: pg_backup_db.c:435
 msgid "error returned by PQendcopy\n"
 msgstr "Fehler in PQendcopy\n"
 
-#: pg_backup_db.c:459
+#: pg_backup_db.c:479
 msgid "could not execute query"
 msgstr "konnte Abfrage nicht ausf�hren"
 
-#: pg_backup_db.c:600
+#: pg_backup_db.c:614
 #, c-format
 msgid "could not find oid columns of table \"%s\": %s"
 msgstr "konnte die OID-Spalten der Tabelle �%s� nicht finden: %s"
 
-#: pg_backup_db.c:606
+#: pg_backup_db.c:620
 #, c-format
 msgid "no OID type columns in table %s\n"
 msgstr "keine Spalten vom Typ OID in Tabelle %s\n"
 
-#: pg_backup_db.c:613
+#: pg_backup_db.c:634
 #, c-format
 msgid "fixing large object cross-references for %s.%s\n"
 msgstr "stelle Large-Object-Querverweise f�r %s.%s ein\n"
 
-#: pg_backup_db.c:629
+#: pg_backup_db.c:673
 #, c-format
 msgid "SQL: %s\n"
 msgstr "SQL: %s\n"
 
-#: pg_backup_db.c:634
+#: pg_backup_db.c:678
 #, c-format
 msgid "could not update column \"%s\" of table \"%s\": %s"
 msgstr "konnte Spalte %s von Tabelle %s nicht �ndern: %s"
 
-#: pg_backup_db.c:639
+#: pg_backup_db.c:683
 #, c-format
 msgid "error while updating column \"%s\" of table \"%s\": %s"
 msgstr "Fehler beim �ndern der Spalte %s von Tabelle %s: %s"
 
-#: pg_backup_db.c:662
+#: pg_backup_db.c:706
 msgid "creating table for large object cross-references\n"
 msgstr "erstelle Tabelle f�r Large-Object-Querverweise\n"
 
-#: pg_backup_db.c:666
+#: pg_backup_db.c:710
 msgid "could not create large object cross-reference table"
 msgstr "konnte Tabelle f�r Large-Object-Querverweise nicht erstellen"
 
-#: pg_backup_db.c:671
+#: pg_backup_db.c:715
 msgid "could not create index on large object cross-reference table"
 msgstr "konnte Index f�r Large-Object-Querverweistabelle nicht erstellen"
 
-#: pg_backup_db.c:685
+#: pg_backup_db.c:729
 msgid "could not create large object cross-reference entry"
 msgstr "konnte Large-Object-Querverweis nicht erstellen"
 
-#: pg_backup_db.c:697
+#: pg_backup_db.c:741
 msgid "could not start database transaction"
 msgstr "konnte Datenbanktransaktion nicht starten"
 
-#: pg_backup_db.c:711
+#: pg_backup_db.c:755
 msgid "could not start transaction for large object cross-references"
 msgstr "konnte keine Transaktion f�r Large-Object-Querverweise starten"
 
-#: pg_backup_db.c:724
+#: pg_backup_db.c:768
 msgid "could not commit database transaction"
 msgstr "konnte Datenbanktransaktion nicht beenden"
 
-#: pg_backup_db.c:737
+#: pg_backup_db.c:781
 msgid "could not commit transaction for large object cross-references"
 msgstr "konnte Transaktion f�r Large-Object-Querverweise nicht abschlie�en"
 
@@ -1670,51 +1715,51 @@ msgstr ""
 "  normalen Gebrauch.  Dateien werden in das aktuelle Verzeichnis\n"
 "  geschrieben.\n"
 
-#: pg_backup_files.c:246
+#: pg_backup_files.c:245
 msgid "could not open data file for output\n"
 msgstr "konnte Datendatei nicht zur Ausgabe �ffnen\n"
 
-#: pg_backup_files.c:267
+#: pg_backup_files.c:265
 msgid "could not close data file\n"
 msgstr "konnte Datendatei nicht schlie�en\n"
 
-#: pg_backup_files.c:291
+#: pg_backup_files.c:289
 msgid "could not open data file for input\n"
 msgstr "konnte Dateindatei nicht zur Eingabe �ffnen\n"
 
-#: pg_backup_files.c:300
+#: pg_backup_files.c:298
 msgid "could not close data file after reading\n"
 msgstr "konnte Datendatei nach dem Lesen nicht schlie�en\n"
 
-#: pg_backup_files.c:364
+#: pg_backup_files.c:361
 #, c-format
 msgid "could not open large object TOC for input: %s\n"
 msgstr "konnte Large-Object-Inhaltsverzeichnis nicht zur Eingabe �ffnen: %s\n"
 
-#: pg_backup_files.c:377 pg_backup_files.c:548
+#: pg_backup_files.c:374 pg_backup_files.c:544
 #, c-format
 msgid "could not close large object TOC file: %s\n"
 msgstr "konnte Large-Object-Inhaltsverzeichnisdatei nicht schlie�en: %s\n"
 
-#: pg_backup_files.c:389
+#: pg_backup_files.c:386
 msgid "could not write byte\n"
 msgstr "konnte Byte nicht schreiben\n"
 
-#: pg_backup_files.c:475
+#: pg_backup_files.c:472
 #, c-format
 msgid "could not open large object TOC for output: %s\n"
 msgstr "konnte Large-Object-Inhaltsverzeichnis nicht zur Ausgabe �ffnen: %s\n"
 
-#: pg_backup_files.c:496 pg_backup_tar.c:890
+#: pg_backup_files.c:492 pg_backup_tar.c:885
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "Large Object hat ung�ltige Oid (%u)\n"
 
-#: pg_backup_files.c:515
+#: pg_backup_files.c:511
 msgid "could not open large object file\n"
 msgstr "konnte Large-Object-Datei nicht �ffnen\n"
 
-#: pg_backup_files.c:530
+#: pg_backup_files.c:526
 msgid "could not close large object file\n"
 msgstr "konnte Large-Object-Datei nicht schlie�en\n"
 
@@ -1722,20 +1767,20 @@ msgstr "konnte Large-Object-Datei nicht schlie
 msgid "this format cannot be read\n"
 msgstr "dieses Format kann nicht gelesen werden\n"
 
-#: pg_backup_tar.c:106
+#: pg_backup_tar.c:107
 msgid "tar archiver"
 msgstr "Tar-Archivierer"
 
-#: pg_backup_tar.c:183
+#: pg_backup_tar.c:184
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht zur Ausgabe �ffnen: %s\n"
 
-#: pg_backup_tar.c:208
+#: pg_backup_tar.c:209
 msgid "compression not supported by tar output format\n"
 msgstr "Komprimierung ist im Tar-Format nicht unterst�tzt\n"
 
-#: pg_backup_tar.c:220
+#: pg_backup_tar.c:221
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht zur Eingabe �ffnen: %s\n"
@@ -1749,40 +1794,40 @@ msgstr "konnte Datei %s nicht im Archiv finden\n"
 msgid "compression support is disabled in this format\n"
 msgstr "Komprimierung ist in diesem Format nicht unterst�tzt\n"
 
-#: pg_backup_tar.c:369
+#: pg_backup_tar.c:368
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "konnte keine tempor�ren Dateinamen erzeugen: %s\n"
 
-#: pg_backup_tar.c:378
+#: pg_backup_tar.c:377
 msgid "could not gzdopen temporary file\n"
 msgstr "konnte komprimierte tempor�re Datei nicht �ffnen (gzopen)\n"
 
-#: pg_backup_tar.c:408
+#: pg_backup_tar.c:407
 msgid "could not close tar member\n"
 msgstr "konnte Tar-Mitglied nicht schlie�en\n"
 
-#: pg_backup_tar.c:508
+#: pg_backup_tar.c:507
 msgid "neither th nor fh specified in tarReadRaw() (internal error)\n"
 msgstr "weder th noch fh in tarReadRaw() angegeben (interner Fehler)\n"
 
-#: pg_backup_tar.c:512
+#: pg_backup_tar.c:511
 #, c-format
 msgid "requested %d bytes, got %d from lookahead and %d from file\n"
 msgstr "%d Bytes verlangs, %d Bytes vom Puffer und %d aus der Datei gelesen\n"
 
-#: pg_backup_tar.c:551
+#: pg_backup_tar.c:550
 #, c-format
 msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
 msgstr "konnte Tar-Mitglied nicht schreiben (%lu geschrieben, %lu versucht)\n"
 
-#: pg_backup_tar.c:640
+#: pg_backup_tar.c:639
 #, c-format
 msgid "bad COPY statement - could not find \"copy\" in string \"%s\"\n"
 msgstr ""
 "fehlerhafte COPY-Anweisung: Zeichenkette �copy� in �%s� nicht gefunden\n"
 
-#: pg_backup_tar.c:658
+#: pg_backup_tar.c:657
 #, c-format
 msgid ""
 "bad COPY statement - could not find \"from stdin\" in string \"%s\" starting "
@@ -1791,61 +1836,61 @@ msgstr ""
 "fehlerhafte COPY-Anweisung: Zeichenkette �from stdin� in �%s� ab Position %"
 "lu nicht gefunden\n"
 
-#: pg_backup_tar.c:694
+#: pg_backup_tar.c:693
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "Wiederherstellung von Large Object OID %u\n"
 
-#: pg_backup_tar.c:833
+#: pg_backup_tar.c:830
 msgid "could not write null block at end of tar archive\n"
 msgstr "konnte Nullblock am Ende des Tar-Archivs nicht schreiben\n"
 
-#: pg_backup_tar.c:1021
+#: pg_backup_tar.c:1024
 msgid "archive member too large for tar format\n"
 msgstr "Archivmitglied zu gro� f�r Tar-Format\n"
 
-#: pg_backup_tar.c:1031
+#: pg_backup_tar.c:1034
 #, c-format
 msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
 msgstr ""
 "Schreibfehler beim Anh�ngen an Tar-Archiv (%lu geschrieben, %lu versucht)\n"
 
-#: pg_backup_tar.c:1037
+#: pg_backup_tar.c:1040
 #, c-format
 msgid "could not close tar member: %s\n"
 msgstr "konnte Tar-Mitglied nicht schlie�en: %s\n"
 
-#: pg_backup_tar.c:1046
+#: pg_backup_tar.c:1049
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr ""
 "tats�chliche Dateil�nge (%s) stimmt nicht mit erwarteter L�nge (%s) �berein\n"
 
-#: pg_backup_tar.c:1054
+#: pg_backup_tar.c:1057
 msgid "could not output padding at end of tar member\n"
 msgstr "konnte Tar-Mitglied am Ende nicht auff�llen\n"
 
-#: pg_backup_tar.c:1083
+#: pg_backup_tar.c:1086
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "bewege Position von %s auf n�chstes Mitglied bei Position %s\n"
 
-#: pg_backup_tar.c:1094
+#: pg_backup_tar.c:1097
 #, c-format
 msgid "now at file position %s\n"
 msgstr "jetzt bei Dateiposition %s\n"
 
-#: pg_backup_tar.c:1103 pg_backup_tar.c:1130
+#: pg_backup_tar.c:1106 pg_backup_tar.c:1133
 #, c-format
 msgid "could not find header for file %s in tar archive\n"
 msgstr "konnte Kopf f�r Datei %s im Tar-Archiv nicht finden\n"
 
-#: pg_backup_tar.c:1114
+#: pg_backup_tar.c:1117
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "Tar-Mitglied %s �bersprungen\n"
 
-#: pg_backup_tar.c:1118
+#: pg_backup_tar.c:1121
 #, c-format
 msgid ""
 "dumping data out of order is not supported in this archive format: %s is "
@@ -1854,23 +1899,23 @@ msgstr ""
 "Ausgabe der Daten in anderer Reihenfolge wird in diesem Archivformat nicht "
 "unterst�tzt: %s wird ben�tigt, aber es kommt vor %s in der Archivdatei.\n"
 
-#: pg_backup_tar.c:1166
+#: pg_backup_tar.c:1169
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr ""
 "tats�chliche Dateiposition stimmt nicht mit erwarteter �berein (%s und %s)\n"
 
-#: pg_backup_tar.c:1181
+#: pg_backup_tar.c:1184
 #, c-format
 msgid "incomplete tar header found (%lu bytes)\n"
 msgstr "unvollst�ndiger Tar-Dateikopf gefunden (%lu Bytes)\n"
 
-#: pg_backup_tar.c:1216
+#: pg_backup_tar.c:1219
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "Inhaltsverzeichniseintrag %s bei %s (L�nge %lu, Pr�fsumme %d)\n"
 
-#: pg_backup_tar.c:1226
+#: pg_backup_tar.c:1229
 #, c-format
 msgid ""
 "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
@@ -1878,7 +1923,7 @@ msgstr ""
 "besch�digter Tar-Kopf in %s gefunden (%d erwartet, %d berechnet), "
 "Dateiposition %s\n"
 
-#: pg_backup_tar.c:1316
+#: pg_backup_tar.c:1319
 msgid "unable to write tar header\n"
 msgstr "kann Tar-Kopf nicht schreiben\n"
 
@@ -1894,64 +1939,79 @@ msgstr ""
 
 #: pg_restore.c:378
 #, c-format
-msgid ""
-"  %s [OPTIONS] [FILE]\n"
-"\n"
-msgstr ""
-"  %s [OPTIONEN] [DATEI]\n"
-"\n"
+msgid "  %s [OPTION]... [FILE]\n"
+msgstr "  %s [OPTION]... [DATEI]\n"
 
 #: pg_restore.c:382
-msgid "  -a, --data-only          restore only the data, no schema\n"
-msgstr ""
-"  -a, --data-only          nur Daten, nicht das Schema, wiederherstellen\n"
-
-#: pg_restore.c:384
-msgid "  -C, --create             issue commands to create the database\n"
-msgstr ""
-"  -C, --create             Anweisungen zum Erstellen der Datenbank ausgeben\n"
-
-#: pg_restore.c:385
 msgid "  -d, --dbname=NAME        output database name\n"
 msgstr "  -d, --dbname=NAME        Name der Datenbank zur Wiederherstellung\n"
 
-#: pg_restore.c:387
-msgid "  -F, --format={c|t}       specify backup file format\n"
-msgstr "  -F, --format={c|f}       Format der Backup-Datei\n"
+#: pg_restore.c:384
+msgid "  -F, --format=c|t         specify backup file format\n"
+msgstr "  -F, --format=c|f         Format der Backup-Datei\n"
 
-#: pg_restore.c:389
+#: pg_restore.c:385
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 msgstr ""
 "  -i, --ignore-version     trotz unpassender Serverversion fortsetzen\n"
 
-#: pg_restore.c:390
-msgid "  -I, --index=NAME         restore named index\n"
-msgstr "  -I, --index=NAME         benannten Index wiederherstellen\n"
-
-#: pg_restore.c:391
+#: pg_restore.c:386
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr ""
 "  -l, --list               Inhaltsverzeichnis f�r dieses Archiv anzeigen\n"
 
+#: pg_restore.c:389
+msgid "  -d NAME                  output database name\n"
+msgstr "  -d NAME                  Name der Datenbank zur Wiederherstellung\n"
+
+#: pg_restore.c:391
+msgid "  -F c|t                   specify backup file format\n"
+msgstr "  -F c|f                   Format der Backup-Datei\n"
+
 #: pg_restore.c:392
 msgid ""
+"  -i                       proceed even when server version mismatches\n"
+msgstr ""
+"  -i                       trotz unpassender Serverversion fortsetzen\n"
+
+#: pg_restore.c:393
+msgid "  -l                       print summarized TOC of the archive\n"
+msgstr ""
+"  -l                       Inhaltsverzeichnis f�r dieses Archiv anzeigen\n"
+
+#: pg_restore.c:401
+msgid "  -a, --data-only          restore only the data, no schema\n"
+msgstr ""
+"  -a, --data-only          nur Daten, nicht das Schema, wiederherstellen\n"
+
+#: pg_restore.c:403
+msgid "  -C, --create             issue commands to create the database\n"
+msgstr ""
+"  -C, --create             Anweisungen zum Erstellen der Datenbank ausgeben\n"
+
+#: pg_restore.c:404
+msgid "  -I, --index=NAME         restore named index\n"
+msgstr "  -I, --index=NAME         benannten Index wiederherstellen\n"
+
+#: pg_restore.c:405
+msgid ""
 "  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
 "                           output from this file\n"
 msgstr ""
 "  -L, --use-list=DATEINAME benanntes Inhaltsverzeichnis zur Ordnung der "
 "Ausgabe\n"
 
-#: pg_restore.c:394
+#: pg_restore.c:407
 msgid "  -N, --orig-order         restore in original dump order\n"
 msgstr ""
 "  -N, --orig-order         in der Originalreihenfolge wiederherstellen\n"
 
-#: pg_restore.c:395
+#: pg_restore.c:408
 msgid "  -o, --oid-order          restore in OID order\n"
 msgstr "  -o, --oid-order          in OID-Reihenfolge wiederherstellen\n"
 
-#: pg_restore.c:396
+#: pg_restore.c:409
 msgid ""
 "  -O, --no-owner           do not reconnect to database to match\n"
 "                           object owner\n"
@@ -1959,7 +2019,7 @@ msgstr ""
 "  -O, --no-owner           keine Wiederverbindungen mit der Datenbank\n"
 "                           erm�glichen, um Eigent�mer einzustellen\n"
 
-#: pg_restore.c:399
+#: pg_restore.c:411
 msgid ""
 "  -P, --function=NAME(args)\n"
 "                           restore named function\n"
@@ -1967,47 +2027,47 @@ msgstr ""
 "  -P, --function=NAME(args)\n"
 "                           benannte Funktion wiederherstellen\n"
 
-#: pg_restore.c:401
+#: pg_restore.c:413
 msgid ""
 "  -r, --rearrange          rearrange output to put indexes etc. at end\n"
 msgstr ""
 "  -r, --rearrange          umsortieren um Indizies usw. ans Ende zu stellen\n"
 
-#: pg_restore.c:402
+#: pg_restore.c:414
 msgid "  -R, --no-reconnect       disallow ALL reconnections to the database\n"
 msgstr ""
 "  -R, --no-reconnect       keine Wiederverbindungen mit der Datenbank\n"
 "                           erm�glichen\n"
 
-#: pg_restore.c:403
+#: pg_restore.c:415
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr ""
 "  -s, --schema-only        nur das Schema, nicht die Daten, "
 "wiederherstellen\n"
 
-#: pg_restore.c:404
+#: pg_restore.c:416
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use for\n"
 "                           disabling triggers\n"
 msgstr ""
 "  -S, --superuser=NAME     Name des Superusers, um Trigger auszuschalten\n"
 
-#: pg_restore.c:406
+#: pg_restore.c:418
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NAME         benannte Tabelle wiederherstellen\n"
 
-#: pg_restore.c:407
+#: pg_restore.c:419
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NAME       benannten Trigger wiederherstellen\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:420
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr ""
 "  -x, --no-privileges      Wiederherstellung der Zugriffsrechte auslassen\n"
 
-#: pg_restore.c:412
+#: pg_restore.c:421
 msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
@@ -2018,40 +2078,21 @@ msgstr ""
 "Anweisung\n"
 "                           verwenden anstelle neu zu verbinden\n"
 
-#: pg_restore.c:419
+#: pg_restore.c:427
 msgid "  -a                       restore only the data, no schema\n"
 msgstr ""
 "  -a                       nur Daten, nicht das Schema, wiederherstellen\n"
 
-#: pg_restore.c:421
+#: pg_restore.c:429
 msgid "  -C                       issue commands to create the database\n"
 msgstr ""
 "  -C                       Anweisungen zum Erstellen der Datenbank ausgeben\n"
 
-#: pg_restore.c:422
-msgid "  -d NAME                  output database name\n"
-msgstr "  -d NAME                  Name der Datenbank zur Wiederherstellung\n"
-
-#: pg_restore.c:424
-msgid "  -F {c|t}                 specify backup file format\n"
-msgstr "  -F {c|f}                 Format der Backup-Datei\n"
-
-#: pg_restore.c:426
-msgid ""
-"  -i                       proceed even when server version mismatches\n"
-msgstr ""
-"  -i                       trotz unpassender Serverversion fortsetzen\n"
-
-#: pg_restore.c:427
+#: pg_restore.c:430
 msgid "  -I NAME                  restore named index\n"
 msgstr "  -I NAME                  benannten Index wiederherstellen\n"
 
-#: pg_restore.c:428
-msgid "  -l                       print summarized TOC of the archive\n"
-msgstr ""
-"  -l                       Inhaltsverzeichnis f�r dieses Archiv anzeigen\n"
-
-#: pg_restore.c:429
+#: pg_restore.c:431
 msgid ""
 "  -L FILENAME              use specified table of contents for ordering\n"
 "                           output from this file\n"
@@ -2060,16 +2101,16 @@ msgstr ""
 "Ausgabe\n"
 "                           aus dem Archiv verwenden\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:433
 msgid "  -N                       restore in original dump order\n"
 msgstr ""
 "  -N                       in der Originalreihenfolge wiederherstellen\n"
 
-#: pg_restore.c:432
+#: pg_restore.c:434
 msgid "  -o                       restore in OID order\n"
 msgstr "  -o                       in OID-Reihenfolge wiederherstellen\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:435
 msgid ""
 "  -O                       do not reconnect to database to match\n"
 "                           object owner\n"
@@ -2077,51 +2118,51 @@ msgstr ""
 "  -O                       keine Wiederverbindungen mit der Datenbank\n"
 "                           erm�glichen, um Eigent�mer einzustellen\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:437
 msgid "  -P NAME(args)            restore named function\n"
 msgstr "  -P NAME(args)            benannte Funktion wiederherstellen\n"
 
-#: pg_restore.c:437
+#: pg_restore.c:438
 msgid ""
 "  -r                       rearrange output to put indexes etc. at end\n"
 msgstr ""
 "  -r                       umsortieren um Indizies usw. ans Ende zu stellen\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:439
 msgid "  -R                       disallow ALL reconnections to the database\n"
 msgstr ""
 "  -R                       keine Wiederverbindungen mit der Datenbank\n"
 "                           erm�glichen\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:440
 msgid "  -s                       restore only the schema, no data\n"
 msgstr ""
 "  -s                       nur das Schema, nicht die Daten, "
 "wiederherstellen\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:441
 msgid ""
 "  -S NAME                  specify the superuser user name to use for\n"
 "                           disabling triggers\n"
 msgstr ""
 "  -S NAME                  Name des Superusers, um Trigger auszuschalten\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:443
 msgid "  -t NAME                  restore named table\n"
 msgstr "  -t NAME                  benannte Tabelle wiederherstellen\n"
 
-#: pg_restore.c:443
+#: pg_restore.c:444
 msgid "  -T NAME                  restore named trigger\n"
 msgstr "  -T NAME                  benannten Trigger wiederherstellen\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:445
 msgid ""
 "  -x                       skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr ""
 "  -x                       Wiederherstellung der Zugriffsrechte auslassen\n"
 
-#: pg_restore.c:448
+#: pg_restore.c:446
 msgid ""
 "  -X use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
@@ -2132,7 +2173,7 @@ msgstr ""
 "Anweisung\n"
 "                           verwenden anstelle neu zu verbinden\n"
 
-#: pg_restore.c:454
+#: pg_restore.c:465
 msgid ""
 "\n"
 "If no input file name is supplied, then standard input is used.\n"
@@ -2142,7 +2183,7 @@ msgstr ""
 "Wenn keine Eingabedatei angegeben ist, wird die Standardeingabe verwendet.\n"
 "\n"
 
-#: pg_dumpall.c:214
+#: pg_dumpall.c:215
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2150,20 +2191,24 @@ msgid ""
 msgstr ""
 "%s gibt eines PostgreSQL-Datenbankcluster in eine SQL-Skriptdatei aus.\n"
 
-#: pg_dumpall.c:216
+#: pg_dumpall.c:217
 #, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [OPTION]...\n"
+
+#: pg_dumpall.c:219
 msgid ""
-"  %s [OPTIONS]\n"
 "\n"
+"Options:\n"
 msgstr ""
-"  %s [OPTIONEN]\n"
 "\n"
+"Optionen:\n"
 
-#: pg_dumpall.c:220
+#: pg_dumpall.c:221
 msgid "  -c, --clean              clean (drop) databases prior to create\n"
 msgstr "  -c, --clean              Datenbanken vor der Erstellung l�schen\n"
 
-#: pg_dumpall.c:223
+#: pg_dumpall.c:224
 msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr ""
 "  -g, --globals-only       nur globale Objekte, keine Datenbanken, ausgeben\n"
@@ -2175,23 +2220,23 @@ msgid ""
 msgstr ""
 "  -i, --ignore-version     trotz unpassender Serverversion fortsetzen\n"
 
-#: pg_dumpall.c:233
+#: pg_dumpall.c:230
 msgid "  -c                       clean (drop) databases prior to create\n"
 msgstr "  -c                       Datenbanken vor der Erstellung l�schen\n"
 
-#: pg_dumpall.c:236
+#: pg_dumpall.c:233
 msgid "  -g                       dump only global objects, no databases\n"
 msgstr ""
 "  -g                       nur globale Objekte, keine Datenbanken, ausgeben\n"
 
-#: pg_dumpall.c:238
+#: pg_dumpall.c:234
 msgid ""
 "  -i                       proceed even when server version mismatches\n"
 "                           pg_dumpall version\n"
 msgstr ""
 "  -i                       trotz unpassender Serverversion fortsetzen\n"
 
-#: pg_dumpall.c:247
+#: pg_dumpall.c:255
 msgid ""
 "\n"
 "The SQL script will be written to the standard output.\n"
@@ -2201,52 +2246,52 @@ msgstr ""
 "Das SQL-Skript wird auf die Standardausgabe geschrieben.\n"
 "\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:570
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: Ausgabe der Datenbank �%s�...\n"
 
-#: pg_dumpall.c:568
+#: pg_dumpall.c:576
 #, c-format
 msgid "%s: pg_dump failed on %s, exiting\n"
 msgstr "%s: pg_dump bei %s fehlgeschlagen; beende\n"
 
-#: pg_dumpall.c:590
+#: pg_dumpall.c:611
 #, c-format
 msgid "%s: running %s\n"
 msgstr "%s: f�hre %s aus\n"
 
-#: pg_dumpall.c:630
+#: pg_dumpall.c:652
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: konnte nicht mit der Datenbank verbinden: %s\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:675
 #, c-format
 msgid "%s: could not connect to database %s: %s\n"
 msgstr "%s: konnte nicht mit der Datenbank %s verbinden: %s\n"
 
-#: pg_dumpall.c:661
+#: pg_dumpall.c:683
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: konnte Version des Servers nicht ermitteln\n"
 
-#: pg_dumpall.c:670
+#: pg_dumpall.c:692
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: konnte Versionszeichenkette �%s� nicht entzifferen\n"
 
-#: pg_dumpall.c:692
+#: pg_dumpall.c:714
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: Abfrage schlug fehl: %s"
 
-#: pg_dumpall.c:693
+#: pg_dumpall.c:715
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: Abfrage war: %s\n"
 
-#: pg_dumpall.c:739
+#: pg_dumpall.c:761
 #, c-format
 msgid ""
 "%s: could not find pg_dump\n"
diff --git a/src/bin/pg_dump/po/sv.po b/src/bin/pg_dump/po/sv.po
index 25917f38c205c4f288d2756a04e8f4465f603b91..5b19f02f256e0cd0913be7eb36e9ddb0b72cd4ce 100644
--- a/src/bin/pg_dump/po/sv.po
+++ b/src/bin/pg_dump/po/sv.po
@@ -2,37 +2,37 @@
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
 # Dennis Bj�rklund <db@zigo.dhs.org>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/sv.po,v 1.5 2002/10/21 18:51:03 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/sv.po,v 1.6 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: "%s"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-10-16 04:16-0400\n"
-"PO-Revision-Date: 2002-10-17 09:47+0200\n"
+"POT-Creation-Date: 2003-05-19 01:39+0200\n"
+"PO-Revision-Date: 2003-05-19 01:42+0200\n"
 "Last-Translator: Dennis Bj�rklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_dump.c:389 pg_restore.c:254
+#: pg_dump.c:387 pg_restore.c:254
 msgid "User name: "
 msgstr "Anv�ndarnamn: "
 
-#: pg_dump.c:423 pg_restore.c:281
+#: pg_dump.c:421 pg_restore.c:281
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: ogiltig \"-X\"-flagga -- %s\n"
 
-#: pg_dump.c:425 pg_dump.c:447 pg_dumpall.c:173 pg_restore.c:283
+#: pg_dump.c:423 pg_dump.c:445 pg_dumpall.c:174 pg_restore.c:283
 #: pg_restore.c:295
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "F�rs�k med \"%s --help\" f�r mer information.\n"
 
-#: pg_dump.c:436
+#: pg_dump.c:434
 #, c-format
 msgid ""
 "%s was compiled without support for long options.\n"
@@ -41,7 +41,7 @@ msgstr ""
 "%s har inte kompilerats med st�d f�r l�nga flaggor.\n"
 "Anv�nd --help f�r hj�lp om flaggor.\n"
 
-#: pg_dump.c:455 pg_dumpall.c:181
+#: pg_dump.c:453 pg_dumpall.c:182
 #, c-format
 msgid ""
 "%s: too many command line options (first is '%s')\n"
@@ -50,72 +50,82 @@ msgstr ""
 "%s: f�r m�nga flaggor (f�rsta �r \"%s\")\n"
 "F�rs�k med \"%s --help\" f�r mer information.\n"
 
-#: pg_dump.c:467
+#: pg_dump.c:465
 msgid ""
 "The options \"schema only\" (-s) and \"data only\" (-a) cannot be used "
 "together.\n"
-msgstr "Flaggorna \"bara schema\" (-s) och \"bara data\" (-a) kan inte anv�ndas tillsammans.\n"
+msgstr ""
+"Flaggorna \"bara schema\" (-s) och \"bara data\" (-a) kan inte anv�ndas "
+"tillsammans.\n"
 
-#: pg_dump.c:473
+#: pg_dump.c:471
 msgid ""
 "The options \"clean\" (-c) and \"data only\" (-a) cannot be used together.\n"
-msgstr "Flaggorna \"nollst�lla\" (-c) och \"bara data\" (-a) kan inte anv�ndas tillsammans.\n"
+msgstr ""
+"Flaggorna \"nollst�lla\" (-c) och \"bara data\" (-a) kan inte anv�ndas "
+"tillsammans.\n"
 
-#: pg_dump.c:479
+#: pg_dump.c:477
 msgid "Large object output is not supported for a single table.\n"
 msgstr "Utmatning av stora objekt st�ds inte f�r en ensam tabell.\n"
 
-#: pg_dump.c:480
+#: pg_dump.c:478
 msgid "Use all tables or a full dump instead.\n"
 msgstr "Anv�nd alla tabeller eller en full dumpning ist�llet.\n"
 
-#: pg_dump.c:486
+#: pg_dump.c:484
 msgid "INSERT (-d, -D) and OID (-o) options cannot be used together.\n"
-msgstr "Flaggorna INSERT (-d, -D) och OID (-o) kan inte anv�ndas tillsammans.\n"
+msgstr ""
+"Flaggorna INSERT (-d, -D) och OID (-o) kan inte anv�ndas tillsammans.\n"
 
-#: pg_dump.c:487
+#: pg_dump.c:485
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Kommandot INSERT kan inte s�tta OID:s.)\n"
 
-#: pg_dump.c:493
+#: pg_dump.c:491
 msgid "large object output is not supported for plain text dump files.\n"
 msgstr "utmatning av stora objekt st�ds inte f�r dumpfiler i textformat.\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:492
 msgid "(Use a different output format.)\n"
 msgstr "(Anv�nd ett annat utdataformat.)\n"
 
-#: pg_dump.c:524
+#: pg_dump.c:522
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "ogiltigt utdataformat \"%s\" angivet\n"
 
-#: pg_dump.c:530
+#: pg_dump.c:528
 #, c-format
 msgid "could not open output file %s for writing\n"
 msgstr "kunde inte �ppna utfil %s f�r skrivning\n"
 
-#: pg_backup_db.c:48 pg_dump.c:541
+#: pg_backup_db.c:48 pg_dump.c:539
 #, c-format
 msgid "unable to parse version string \"%s\"\n"
 msgstr "kunde inte tolka versionstr�ngen \"%s\"\n"
 
-#: pg_dump.c:559
+#: pg_dump.c:557
 #, c-format
 msgid "BEGIN command failed: %s"
 msgstr "BEGIN-kommandot misslyckades: %s"
 
-#: pg_dump.c:565
+#: pg_dump.c:563
 #, c-format
 msgid "could not set transaction isolation level to serializable: %s"
 msgstr "kunde inte s�tta transaktionsisolering till serialiserbar: %s"
 
-#: pg_dump.c:577
+#: pg_dump.c:570
+#, c-format
+msgid "could not set datestyle to ISO: %s"
+msgstr "kunde inte s�tta datostil till ISO: %s"
+
+#: pg_dump.c:582
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "sista inbyggda OID �r %u\n"
 
-#: pg_dump.c:657
+#: pg_dump.c:662
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -124,88 +134,132 @@ msgstr ""
 "%s dumpar en databas som en textfil eller i andra format.\n"
 "\n"
 
-#: pg_dump.c:658 pg_dumpall.c:215 pg_restore.c:377
+#: pg_dump.c:663 pg_dumpall.c:216 pg_restore.c:377
 msgid "Usage:\n"
 msgstr "Anv�ndning:\n"
 
-#: pg_dump.c:659
+#: pg_dump.c:664
 #, c-format
+msgid "  %s [OPTION]... [DBNAME]\n"
+msgstr "  %s [FLAGGOR] DBNAMN\n"
+
+#: pg_dump.c:666 pg_restore.c:380
 msgid ""
-"  %s [OPTIONS] DBNAME\n"
 "\n"
+"General options:\n"
 msgstr ""
-"  %s [FLAGGOR] DBNAMN\n"
 "\n"
+"Allm�nna flaggor:\n"
+
+#: pg_dump.c:668 pg_restore.c:383
+msgid "  -f, --file=FILENAME      output file name\n"
+msgstr "  -f, --file=FILNAMN       utdatafilnamn\n"
+
+#: pg_dump.c:669
+msgid ""
+"  -F, --format=c|t|p       output file format (custom, tar, plain text)\n"
+msgstr ""
+"  -F, --format=c|t|p       utdataformat (c:eget, t:tar, p:vanlig text)\n"
+
+#: pg_dump.c:670
+msgid ""
+"  -i, --ignore-version     proceed even when server version mismatches\n"
+"                           pg_dump version\n"
+msgstr ""
+"  -i, --ignore-version     forts�tt �ven n�r serverns version inte �r\n"
+"                           samma som pg_dump-versionen\n"
+
+#: pg_dump.c:672 pg_dumpall.c:228 pg_restore.c:387
+msgid "  -v, --verbose            verbose mode\n"
+msgstr "  -v, --verbose            visa mer information\n"
+
+#: pg_dump.c:673
+msgid "  -Z, --compress=0-9       compression level for compressed formats\n"
+msgstr "  -Z, --compress=0-9       komprimeringsniv� f�r komprimerade format\n"
+
+#: pg_dump.c:675 pg_restore.c:390
+msgid "  -f FILENAME              output file name\n"
+msgstr "  -f FILNAMN               utdatafilnamn\n"
+
+#: pg_dump.c:676
+msgid ""
+"  -F c|t|p                 output file format (custom, tar, plain text)\n"
+msgstr ""
+"  -F c|t|p                 utdataformat (c:eget, t:tar, p:vanlig text)\n"
+
+#: pg_dump.c:677
+msgid ""
+"  -i                       proceed even when server version mismatches\n"
+"                           pg_dump version\n"
+msgstr ""
+"  -i                       forts�tt �ven n�r serverns version inte �r\n"
+"                           samma som pg_dump-versionen\n"
+
+#: pg_dump.c:679 pg_dumpall.c:237 pg_restore.c:394
+msgid "  -v                       verbose mode\n"
+msgstr "  -v                       visa mer information\n"
+
+#: pg_dump.c:680
+msgid "  -Z 0-9                   compression level for compressed formats\n"
+msgstr "  -Z 0-9                   komprimeringsniv� f�r komprimerade format\n"
+
+#: pg_dump.c:682 pg_dumpall.c:239 pg_restore.c:396
+msgid "  --help                   show this help, then exit\n"
+msgstr "  --help                   visa den h�r hj�lpen, avsluta sedan\n"
+
+#: pg_dump.c:683 pg_dumpall.c:240 pg_restore.c:397
+msgid "  --version                output version information, then exit\n"
+msgstr "  --version                visa versionsinformation, avsluta sedan\n"
 
-#: pg_dump.c:660 pg_dumpall.c:218 pg_restore.c:379
-msgid "Options:\n"
-msgstr "Flaggor:\n"
+#: pg_dump.c:685 pg_restore.c:399
+msgid ""
+"\n"
+"Options controlling the output content:\n"
+msgstr ""
+"\n"
+"Flaggor som p�verkar utdata:\n"
 
-#: pg_dump.c:663
+#: pg_dump.c:687
 msgid "  -a, --data-only          dump only the data, not the schema\n"
 msgstr "  -a, --data-only          dumpa bara data, inte schema\n"
 
-#: pg_dump.c:664
+#: pg_dump.c:688
 msgid "  -b, --blobs              include large objects in dump\n"
 msgstr "  -b, --blobs              ta med stora objekt i dumpen\n"
 
-#: pg_dump.c:665 pg_restore.c:383
+#: pg_dump.c:689 pg_restore.c:402
 msgid "  -c, --clean              clean (drop) schema prior to create\n"
 msgstr "  -c, --clean              nollst�ll (drop) schema innan skapande\n"
 
-#: pg_dump.c:666
+#: pg_dump.c:690
 msgid ""
 "  -C, --create             include commands to create database in dump\n"
-msgstr "  -C, --create             inkludera kommandon f�r att skapa databasen i dumpen\n"
+msgstr ""
+"  -C, --create             inkludera kommandon f�r att skapa databasen i "
+"dumpen\n"
 
-#: pg_dump.c:667 pg_dumpall.c:221
+#: pg_dump.c:691 pg_dumpall.c:222
 msgid ""
 "  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"
 msgstr "  -d, --inserts            dumpa data som INSERT, ist�llet f�r COPY\n"
 
-#: pg_dump.c:668 pg_dumpall.c:222
+#: pg_dump.c:692 pg_dumpall.c:223
 msgid ""
 "  -D, --column-inserts     dump data as INSERT commands with column names\n"
 msgstr "  -D, --column-inserts     dumpa data som INSERT med kolumnnamn\n"
 
-#: pg_dump.c:669 pg_restore.c:386
-msgid "  -f, --file=FILENAME      output file name\n"
-msgstr "  -f, --file=FILNAMN       utdatafilnamn\n"
-
-#: pg_dump.c:670
-msgid ""
-"  -F, --format {c|t|p}     output file format (custom, tar, plain text)\n"
-msgstr ""
-"  -F, --format {c|t|p}     utdataformat (c:eget, t:tar, p:vanlig text)\n"
-
-#: pg_dump.c:671 pg_dumpall.c:224 pg_restore.c:388
-msgid "  -h, --host=HOSTNAME      database server host name\n"
-msgstr "  -h, --host=V�RDNAMN      databasens v�rdnamn\n"
-
-#: pg_dump.c:672
-msgid ""
-"  -i, --ignore-version     proceed even when server version mismatches\n"
-"                           pg_dump version\n"
-msgstr ""
-"  -i, --ignore-version     forts�tt �ven n�r serverns version inte �r\n"
-"                           samma som pg_dump-versionen\n"
-
-#: pg_dump.c:674 pg_dumpall.c:227
+#: pg_dump.c:693 pg_dumpall.c:227
 msgid "  -o, --oids               include OIDs in dump\n"
 msgstr "  -o, --oids               inkludera OID:er i dumpning\n"
 
-#: pg_dump.c:675
+#: pg_dump.c:694
 msgid ""
 "  -O, --no-owner           do not output \\connect commands in plain\n"
 "                           text format\n"
 msgstr ""
 "  -O, --no-owner           skriv inte \\connect-kommandon i textformat\n"
 
-#: pg_dump.c:677 pg_dumpall.c:228 pg_restore.c:398
-msgid "  -p, --port=PORT          database server port number\n"
-msgstr "  -p, --port=PORT          databasens v�rdport\n"
-
-#: pg_dump.c:678
+#: pg_dump.c:696
 msgid ""
 "  -R, --no-reconnect       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
@@ -213,11 +267,11 @@ msgstr ""
 "  -R, --no-reconnect       sl� av ALLA �teruppkopplingar mot databasen\n"
 "                           i textformat\n"
 
-#: pg_dump.c:680
+#: pg_dump.c:698
 msgid "  -s, --schema-only        dump only the schema, no data\n"
 msgstr "  -s, --schema-only        dumpa bara scheman, inte data\n"
 
-#: pg_dump.c:681
+#: pg_dump.c:699
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
 "                           plain text format\n"
@@ -225,29 +279,15 @@ msgstr ""
 "  -S, --superuser=NAMN     ange superanv�ndarens anv�ndarnamn f�r\n"
 "                           anv�ndning i textformat\n"
 
-#: pg_dump.c:683
+#: pg_dump.c:701
 msgid "  -t, --table=TABLE        dump this table only (* for all)\n"
 msgstr "  -t, --table=TABELL       dumpa bara denna tabell (* f�r alla)\n"
 
-#: pg_dump.c:684 pg_dumpall.c:229 pg_restore.c:408
-msgid "  -U, --username=NAME      connect as specified database user\n"
-msgstr "  -U, --username=NAMN      anslut med datta anv�ndarnamn mot databasen\n"
-
-#: pg_dump.c:685 pg_dumpall.c:230 pg_restore.c:409
-msgid "  -v, --verbose            verbose mode\n"
-msgstr "  -v, --verbose            visa mer information\n"
-
-#: pg_dump.c:686 pg_dumpall.c:231 pg_restore.c:410
-msgid ""
-"  -W, --password           force password prompt (should happen "
-"automatically)\n"
-msgstr "  -W, --password           fr�ga om l�senord (borde ske automatiskt)\n"
-
-#: pg_dump.c:687
+#: pg_dump.c:702
 msgid "  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      dumpa inte r�ttigheter (grant/revoke)\n"
 
-#: pg_dump.c:688
+#: pg_dump.c:703
 msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
@@ -257,7 +297,7 @@ msgstr ""
 "                           skriv kommando SET SESSION AUTHORIZATION\n"
 "                           ist�llet f�r \\connect-kommando\n"
 
-#: pg_dump.c:691 pg_restore.c:415
+#: pg_dump.c:706 pg_restore.c:424
 msgid ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           disable triggers during data-only restore\n"
@@ -265,75 +305,47 @@ msgstr ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           sl� av utl�sare vid �terst�llning av enbart data\n"
 
-#: pg_dump.c:693
-msgid "  -Z, --compress {0-9}     compression level for compressed formats\n"
-msgstr "  -Z, --compress {0-9}     komprimeringsniv� f�r komprimerade format\n"
-
-#: pg_dump.c:696
+#: pg_dump.c:709
 msgid "  -a                       dump only the data, not the schema\n"
 msgstr "  -a                       dumpa bara data, inte schema\n"
 
-#: pg_dump.c:697
+#: pg_dump.c:710
 msgid "  -b                       include large objects in dump\n"
 msgstr "  -b                       ta med stora objekt i dumpen\n"
 
-#: pg_dump.c:698 pg_restore.c:420
+#: pg_dump.c:711 pg_restore.c:428
 msgid "  -c                       clean (drop) schema prior to create\n"
 msgstr "  -c                       nollst�ll (drop) schema innan skapande\n"
 
-#: pg_dump.c:699
+#: pg_dump.c:712
 msgid ""
 "  -C                       include commands to create database in dump\n"
-msgstr "  -C                       inkludera kommandon f�r att skapa databasen i dumpen\n"
+msgstr ""
+"  -C                       inkludera kommandon f�r att skapa databasen i "
+"dumpen\n"
 
-#: pg_dump.c:700 pg_dumpall.c:234
+#: pg_dump.c:713 pg_dumpall.c:231
 msgid ""
 "  -d                       dump data as INSERT, rather than COPY, commands\n"
 msgstr "  -d                       dumpa data som INSERT, ist�llet f�r COPY\n"
 
-#: pg_dump.c:701 pg_dumpall.c:235
+#: pg_dump.c:714 pg_dumpall.c:232
 msgid ""
 "  -D                       dump data as INSERT commands with column names\n"
 msgstr "  -D                       dumpa data som INSERT med kolumnnamn\n"
 
-#: pg_dump.c:702 pg_restore.c:423
-msgid "  -f FILENAME              output file name\n"
-msgstr "  -f FILNAMN               utdatafilnamn\n"
-
-#: pg_dump.c:703
-msgid ""
-"  -F {c|t|p}               output file format (custom, tar, plain text)\n"
-msgstr ""
-"  -F {c|t|p}               utdataformat (c:eget, t:tar, p:vanlig text)\n"
-
-#: pg_dump.c:704 pg_dumpall.c:237 pg_restore.c:425
-msgid "  -h HOSTNAME              database server host name\n"
-msgstr "  -h V�RDNAMN              databasens v�rdnamn\n"
-
-#: pg_dump.c:705
-msgid ""
-"  -i                       proceed even when server version mismatches\n"
-"                           pg_dump version\n"
-msgstr ""
-"  -i                       forts�tt �ven n�r serverns version inte �r\n"
-"                           samma som pg_dump-versionen\n"
-
-#: pg_dump.c:707 pg_dumpall.c:240
+#: pg_dump.c:715 pg_dumpall.c:236
 msgid "  -o                       include OIDs in dump\n"
 msgstr "  -o                       inkludera OID:er i dumpning\n"
 
-#: pg_dump.c:708
+#: pg_dump.c:716
 msgid ""
 "  -O                       do not output \\connect commands in plain\n"
 "                           text format\n"
 msgstr ""
 "  -O                       skriv inte \\connect-kommandon i textformat\n"
 
-#: pg_dump.c:710 pg_dumpall.c:241 pg_restore.c:435
-msgid "  -p PORT                  database server port number\n"
-msgstr "  -p PORT                  databasens v�rdport\n"
-
-#: pg_dump.c:711
+#: pg_dump.c:718
 msgid ""
 "  -R                       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
@@ -341,11 +353,11 @@ msgstr ""
 "  -R                       sl� av ALLA �teruppkoppling mot databasen\n"
 "                           i textformat\n"
 
-#: pg_dump.c:713
+#: pg_dump.c:720
 msgid "  -s                       dump only the schema, no data\n"
 msgstr "  -s                       dumpa bara scheman, inte data\n"
 
-#: pg_dump.c:714
+#: pg_dump.c:721
 msgid ""
 "  -S NAME                  specify the superuser user name to use in\n"
 "                           plain text format\n"
@@ -353,29 +365,15 @@ msgstr ""
 "  -S NAMN                  ange superanv�ndarens anv�ndarnamn f�r\n"
 "                           anv�ndning i textformat\n"
 
-#: pg_dump.c:716
+#: pg_dump.c:723
 msgid "  -t TABLE                 dump this table only (* for all)\n"
 msgstr "  -t TABELL                dumpa bara denna tabell (* f�r alla)\n"
 
-#: pg_dump.c:717 pg_dumpall.c:242 pg_restore.c:444
-msgid "  -U NAME                  connect as specified database user\n"
-msgstr "  -U NAMN                  anslut med datta anv�ndarnamn mot databasen\n"
-
-#: pg_dump.c:718 pg_dumpall.c:243 pg_restore.c:445
-msgid "  -v                       verbose mode\n"
-msgstr "  -v                       visa mer information\n"
-
-#: pg_dump.c:719 pg_dumpall.c:244 pg_restore.c:446
-msgid ""
-"  -W                       force password prompt (should happen "
-"automatically)\n"
-msgstr "  -W                       fr�ga om l�senord (borde ske automatiskt)\n"
-
-#: pg_dump.c:720
+#: pg_dump.c:724
 msgid "  -x                       do not dump privileges (grant/revoke)\n"
 msgstr "  -x                       dumpa inte r�ttigheter (grant/revoke)\n"
 
-#: pg_dump.c:721
+#: pg_dump.c:725
 msgid ""
 "  -X use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
@@ -385,15 +383,58 @@ msgstr ""
 "                           skriv kommando SET SESSION AUTHORIZATION\n"
 "                           ist�llet f�r \\connect-kommando\n"
 
-#: pg_dump.c:724 pg_restore.c:451
+#: pg_dump.c:728 pg_restore.c:449
 msgid "  -X disable-triggers      disable triggers during data-only restore\n"
-msgstr "  -X disable-triggers      sl� av utl�sare vid �terst�llning av enbart data\n"
+msgstr ""
+"  -X disable-triggers      sl� av utl�sare vid �terst�llning av enbart data\n"
 
-#: pg_dump.c:725
-msgid "  -Z {0-9}                 compression level for compressed formats\n"
-msgstr "  -Z {0-9}                 komprimeringsniv� f�r komprimerade format\n"
+#: pg_dump.c:731 pg_dumpall.c:242 pg_restore.c:452
+msgid ""
+"\n"
+"Connection options:\n"
+msgstr ""
+"\n"
+"Uppkopplingsflaggor:\n"
+
+#: pg_dump.c:733 pg_dumpall.c:244 pg_restore.c:454
+msgid "  -h, --host=HOSTNAME      database server host name\n"
+msgstr "  -h, --host=V�RDNAMN      databasens v�rdnamn\n"
+
+#: pg_dump.c:734 pg_dumpall.c:245 pg_restore.c:455
+msgid "  -p, --port=PORT          database server port number\n"
+msgstr "  -p, --port=PORT          databasens v�rdport\n"
+
+#: pg_dump.c:735 pg_dumpall.c:246 pg_restore.c:456
+msgid "  -U, --username=NAME      connect as specified database user\n"
+msgstr ""
+"  -U, --username=NAMN      anslut med datta anv�ndarnamn mot databasen\n"
+
+#: pg_dump.c:736 pg_dumpall.c:247 pg_restore.c:457
+msgid ""
+"  -W, --password           force password prompt (should happen "
+"automatically)\n"
+msgstr "  -W, --password           fr�ga om l�senord (borde ske automatiskt)\n"
+
+#: pg_dump.c:738 pg_dumpall.c:249 pg_restore.c:459
+msgid "  -h HOSTNAME              database server host name\n"
+msgstr "  -h V�RDNAMN              databasens v�rdnamn\n"
+
+#: pg_dump.c:739 pg_dumpall.c:250 pg_restore.c:460
+msgid "  -p PORT                  database server port number\n"
+msgstr "  -p PORT                  databasens v�rdport\n"
+
+#: pg_dump.c:740 pg_dumpall.c:251 pg_restore.c:461
+msgid "  -U NAME                  connect as specified database user\n"
+msgstr ""
+"  -U NAMN                  anslut med datta anv�ndarnamn mot databasen\n"
+
+#: pg_dump.c:741 pg_dumpall.c:252 pg_restore.c:462
+msgid ""
+"  -W                       force password prompt (should happen "
+"automatically)\n"
+msgstr "  -W                       fr�ga om l�senord (borde ske automatiskt)\n"
 
-#: pg_dump.c:728
+#: pg_dump.c:744
 msgid ""
 "\n"
 "If no database name is not supplied, then the PGDATABASE environment\n"
@@ -405,497 +446,513 @@ msgstr ""
 "PGDATABASE att anv�ndas.\n"
 "\n"
 
-#: pg_dump.c:730 pg_dumpall.c:248 pg_restore.c:455
+#: pg_dump.c:746 pg_dumpall.c:256 pg_restore.c:466
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Rapportera buggar till <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_backup_archiver.c:1284 pg_dump.c:738
+#: pg_backup_archiver.c:1297 pg_dump.c:754
 msgid "*** aborted because of error\n"
 msgstr "*** avbruten p� grund av fel\n"
 
-#: pg_dump.c:805
+#: pg_dump.c:821
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "dumpar inneh�llet i tabellen %s\n"
 
-#: pg_dump.c:844
+#: pg_dump.c:860
 #, c-format
 msgid "SQL command to dump the contents of table \"%s\" failed\n"
-msgstr "SQL-kommando f�r att skriva ut inneh�llet av tabellen \"%s\" misslyckades\n"
+msgstr ""
+"SQL-kommando f�r att skriva ut inneh�llet av tabellen \"%s\" misslyckades\n"
 
-#: pg_dump.c:846 pg_dump.c:935 pg_dump.c:984 pg_dump.c:998 pg_dump.c:1096
-#: pg_dump.c:1214
+#: pg_dump.c:862 pg_dump.c:951 pg_dump.c:1001 pg_dump.c:1015 pg_dump.c:1119
+#: pg_dump.c:1237
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Felmeddelandet fr�n servern: %s"
 
-#: pg_dump.c:847 pg_dump.c:856 pg_dump.c:936 pg_dump.c:985 pg_dump.c:1215
+#: pg_dump.c:863 pg_dump.c:872 pg_dump.c:952 pg_dump.c:1002 pg_dump.c:1238
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Kommandot var: %s\n"
 
-#: pg_dump.c:852
+#: pg_dump.c:868
 #, c-format
 msgid "SQL command to dump the contents of table \"%s\" executed abnormally.\n"
-msgstr "SQL-kommand f�r att dumpa inneh�ll av tabell \"%s\" utf�rdes inte korrekt.\n"
+msgstr ""
+"SQL-kommand f�r att dumpa inneh�ll av tabell \"%s\" utf�rdes inte korrekt.\n"
 
-#: pg_dump.c:854
+#: pg_dump.c:870
 #, c-format
 msgid "The server returned status %d when %d was expected.\n"
 msgstr "Servern returnerade status %d n�r %d f�rv�ntades.\n"
 
-#: pg_dump.c:934
+#: pg_dump.c:950
 #, c-format
 msgid ""
 "SQL command to dump the contents of table \"%s\" failed: PQendcopy() "
 "failed.\n"
-msgstr "SQL-kommandot f�r att dumpa inneh�llet i tabellen \"%s\" misslyckades: PQendcopy() misslyckades.\n"
+msgstr ""
+"SQL-kommandot f�r att dumpa inneh�llet i tabellen \"%s\" misslyckades: "
+"PQendcopy() misslyckades.\n"
 
-#: pg_dump.c:983 pg_dump.c:997 pg_dump.c:1095
+#: pg_dump.c:1000 pg_dump.c:1014 pg_dump.c:1118
 msgid "dumpClasses(): SQL command failed\n"
 msgstr "dumpClasses(): SQL-kommando misslyckades\n"
 
-#: pg_dump.c:999
+#: pg_dump.c:1016
 msgid "The command was: FETCH 100 FROM _pg_dump_cursor\n"
 msgstr "Kommandot var: FETCH 100 FROM _pg_dump_cursor\n"
 
-#: pg_dump.c:1097
+#: pg_dump.c:1120
 msgid "The command was: CLOSE _pg_dump_cursor\n"
 msgstr "Kommandot var: CLOSE _pg_dump_cursor\n"
 
-#: pg_dump.c:1135
+#: pg_dump.c:1158
 #, c-format
 msgid "preparing to dump the contents of table %s\n"
 msgstr "f�rbereder f�r att dumpa inneh�llet i tabell %s\n"
 
-#: pg_dump.c:1198
+#: pg_dump.c:1221
 msgid "saving database definition\n"
 msgstr "sparar databasdefinition\n"
 
-#: pg_dump.c:1213
+#: pg_dump.c:1236
 msgid "SQL command failed\n"
 msgstr "SQL-kommando misslyckades\n"
 
-#: pg_dump.c:1223
+#: pg_dump.c:1246
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "pg_database-post f�r databas \"%s\" saknas\n"
 
-#: pg_dump.c:1230
+#: pg_dump.c:1253
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
-msgstr "fr�ga har givit mer �n en (%d) pg_database-post som resultat f�r databas \"%s\"\n"
+msgstr ""
+"fr�ga har givit mer �n en (%d) pg_database-post som resultat f�r databas \"%s"
+"\"\n"
 
-#: pg_dump.c:1297
+#: pg_dump.c:1320
 msgid "saving large objects\n"
 msgstr "sparar stora objekt\n"
 
-#: pg_dump.c:1311
+#: pg_dump.c:1334
 #, c-format
 msgid "dumpBlobs(): cursor declaration failed: %s"
 msgstr "dumpBlobs(): mark�rdeklaration misslyckades: %s"
 
-#: pg_dump.c:1326
+#: pg_dump.c:1349
 #, c-format
 msgid "dumpBlobs(): fetch from cursor failed: %s"
 msgstr "dumpBlobs(): h�mta fr�n mark�r misslyckades: %s"
 
-#: pg_dump.c:1339
+#: pg_dump.c:1362
 #, c-format
 msgid "dumpBlobs(): could not open large object: %s"
 msgstr "dumpBlobs(): kunde inte �ppna det stora objektet: %s"
 
-#: pg_dump.c:1352
+#: pg_dump.c:1375
 #, c-format
 msgid "dumpBlobs(): error reading large object: %s"
 msgstr "dumpBlobs(): fel vid l�sning av stort objekt: %s"
 
-#: pg_dump.c:1440
+#: pg_dump.c:1463
 #, c-format
 msgid "query to obtain list of namespaces failed: %s"
 msgstr "fr�ga f�r att h�mta listan av namnutrymmen misslyckades: %s"
 
-#: pg_dump.c:1464
+#: pg_dump.c:1487
 #, c-format
 msgid "WARNING: owner of namespace %s appears to be invalid\n"
 msgstr "VARNING: �garen av namnutrymmet %s verkar vara ogiltig\n"
 
-#: pg_dump.c:1499
+#: pg_dump.c:1522
 #, c-format
 msgid "could not find namespace with OID %s\n"
 msgstr "kunde inte hitta namnutrymme med OID %s\n"
 
-#: pg_dump.c:1579
+#: pg_dump.c:1602
 #, c-format
 msgid "query to obtain list of data types failed: %s"
 msgstr "fr�ga f�r att h�mta lista med datatyper misslyckades: %s"
 
-#: pg_dump.c:1624
+#: pg_dump.c:1647
 #, c-format
 msgid "WARNING: owner of data type %s appears to be invalid\n"
 msgstr "VARNING: �gare av datatyp %s verkar vara ogiltig\n"
 
-#: pg_dump.c:1687 pg_dump.c:4013
+#: pg_dump.c:1710 pg_dump.c:4036
 #, c-format
 msgid "query to obtain list of operators failed: %s"
 msgstr "fr�ga f�r att h�mta lista med operatorer misslyckades: %s"
 
-#: pg_dump.c:1712
+#: pg_dump.c:1735
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "VARNING: �gare av operator \"%s\" verkar vara ogiltig\n"
 
-#: pg_dump.c:1770
+#: pg_dump.c:1793
 #, c-format
 msgid "query to obtain list of operator classes failed: %s"
 msgstr "fr�ga f�r att h�mta lista med operatorklasser misslyckades: %s"
 
-#: pg_dump.c:1795
+#: pg_dump.c:1818
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "VARNING: �gare av operatorklass \"%s\" verkar vara ogiltig\n"
 
-#: pg_dump.c:1863 pg_dump.c:4633
+#: pg_dump.c:1886 pg_dump.c:4656
 #, c-format
 msgid "query to obtain list of aggregate functions failed: %s"
 msgstr "fr�ga f�r att h�mta lista med aggregatfunktioner misslyckades: %s"
 
-#: pg_dump.c:1889
+#: pg_dump.c:1912
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "VARNING: �gare av aggregatfunktion \"%s\" verkar vara ogiltig\n"
 
-#: pg_dump.c:1963
+#: pg_dump.c:1986
 #, c-format
 msgid "query to obtain list of functions failed: %s"
 msgstr "fr�ga f�r att h�mta lista med funktioner misslyckades: %s"
 
-#: pg_dump.c:2010
+#: pg_dump.c:2033
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "VARNING: �gare av funktion \"%s\" verkar vara ogiltig\n"
 
-#: pg_dump.c:2160
+#: pg_dump.c:2183
 #, c-format
 msgid "query to obtain list of tables failed: %s"
 msgstr "fr�ga f�r att h�mta lista med tabeller misslyckades: %s"
 
-#: pg_dump.c:2256
+#: pg_dump.c:2279
 #, c-format
 msgid "Attempt to lock table \"%s\" failed.  %s"
 msgstr "F�rs�k att l�sa tabell \"%s\" misslyckades.  %s"
 
-#: pg_dump.c:2265
+#: pg_dump.c:2288
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "VARNING: �gare av tabell \"%s\" verkar vara ogiltig\n"
 
-#: pg_dump.c:2307
+#: pg_dump.c:2330
 #, c-format
 msgid "query to obtain inheritance relationships failed: %s"
 msgstr "F�rs�k att h�mta arvsrelationer misslyckades. %s"
 
-#: pg_dump.c:2392
+#: pg_dump.c:2415
 #, c-format
 msgid "finding the columns and types of table %s\n"
 msgstr "hittar kolumner och typer f�r tabell %s\n"
 
-#: pg_dump.c:2441
+#: pg_dump.c:2464
 #, c-format
 msgid "query to get table columns failed: %s"
 msgstr "fr�ga f�r att h�mta tabellkolumner misslyckades: %s"
 
-#: pg_dump.c:2497
+#: pg_dump.c:2520
 #, c-format
 msgid "finding DEFAULT expressions of table %s\n"
 msgstr "hittar DEFAULT-uttrycken f�r tabell %s\n"
 
-#: pg_dump.c:2528
+#: pg_dump.c:2551
 #, c-format
 msgid "query to get column default values failed: %s"
 msgstr "fr�ga f�r att h�mta kolumnens standardv�rde misslyckades: %s"
 
-#: pg_dump.c:2540
+#: pg_dump.c:2563
 #, c-format
 msgid "invalid adnum value %d for table %s\n"
 msgstr "felaktigt adnum-v�rde %d f�r tabell %s\n"
 
-#: pg_dump.c:2657
+#: pg_dump.c:2680
 #, c-format
 msgid "query to get comment on oid %s failed: %s"
 msgstr "fr�ga f�r att h�mta kommentaren till OID %s misslyckades: %s"
 
-#: pg_dump.c:2741
+#: pg_dump.c:2764
 #, c-format
 msgid "query to get comments on table %s failed: %s"
 msgstr "fr�ga f�r att h�mta kommentaren till tabell %s misslyckades: %s"
 
-#: pg_dump.c:2824
+#: pg_dump.c:2847
 #, c-format
 msgid "query to get database oid failed: %s"
 msgstr "fr�ga f�r att h�mta databasens OID misslyckades: %s"
 
-#: pg_dump.c:2993
+#: pg_dump.c:3016
 #, c-format
 msgid "query to obtain information on type %s failed: %s"
 msgstr "fr�ga f�r att h�mta information om typ %s misslyckades: %s"
 
-#: pg_dump.c:3002 pg_dump.c:3176 pg_dump.c:3678 pg_dump.c:4021 pg_dump.c:4334
-#: pg_dump.c:4642 pg_dump.c:6593
+#: pg_dump.c:3025 pg_dump.c:3199 pg_dump.c:3701 pg_dump.c:4044 pg_dump.c:4357
+#: pg_dump.c:4665 pg_dump.c:6611
 #, c-format
 msgid "Got %d rows instead of one from: %s"
 msgstr "Fick %d rader ist�llet f�r en fr�n: %s"
 
-#: pg_dump.c:3168
+#: pg_dump.c:3191
 #, c-format
 msgid "query to obtain domain information failed: %s"
 msgstr "fr�ga f�r att h�mta dom�ninformation misslyckades: %s"
 
-#: pg_dump.c:3271
+#: pg_dump.c:3294
 #, c-format
 msgid "query to obtain type information failed: %s"
 msgstr "fr�ga f�r att h�mta typinformation misslyckades: %s"
 
-#: pg_dump.c:3279
+#: pg_dump.c:3302
 #, c-format
 msgid "Got no rows from: %s"
 msgstr "Fick inga rader fr�n: %s"
 
-#: pg_dump.c:3410
+#: pg_dump.c:3433
 #, c-format
 msgid "query to obtain list of procedural languages failed: %s"
 msgstr "fr�ga f�r att h�mta lista med procedurspr�k misslyckades: %s"
 
-#: pg_dump.c:3445
+#: pg_dump.c:3468
 #, c-format
 msgid "handler procedure for procedural language %s not found\n"
 msgstr "procedurhanterare f�r procedurspr�k %s hittades inte\n"
 
-#: pg_dump.c:3455
+#: pg_dump.c:3478
 #, c-format
 msgid "validator procedure for procedural language %s not found\n"
 msgstr "valideringsprocedur f�r procedurspr�k %s hittades inte\n"
 
-#: pg_dump.c:3669
+#: pg_dump.c:3692
 #, c-format
 msgid "query to obtain information on function %s failed: %s"
 msgstr "fr�ga f�r att h�mta information om funktion %s misslyckades: %s"
 
-#: pg_dump.c:3744
+#: pg_dump.c:3767
 #, c-format
 msgid "Unexpected provolatile value for function %s\n"
 msgstr "Ov�ntat provolatile-v�rde f�r funktion %s\n"
 
-#: pg_dump.c:3810
+#: pg_dump.c:3833
 #, c-format
 msgid "query to obtain list of casts failed: %s"
 msgstr "fr�ga f�r att h�mta listan av typomvandlingar misslyckades: %s"
 
-#: pg_dump.c:4242
+#: pg_dump.c:4265
 #, c-format
 msgid "WARNING: cannot find operator with OID %s\n"
 msgstr "VARNING: kan inte hitta operator med OID %s\n"
 
-#: pg_dump.c:4326
+#: pg_dump.c:4349
 #, c-format
 msgid "query to obtain operator class details failed: %s"
 msgstr "fr�ga f�r att h�mta detaljer om operatorklass misslyckades: %s"
 
-#: pg_dump.c:4396
+#: pg_dump.c:4419
 #, c-format
 msgid "query to obtain operator class operators failed: %s"
 msgstr "fr�ga f�r att h�mta operatorer f�r operatorklass misslyckades: %s"
 
-#: pg_dump.c:4441
+#: pg_dump.c:4464
 #, c-format
 msgid "query to obtain operator class functions failed: %s"
 msgstr "fr�ga f�r att h�mta funktioner f�r operatorklass misslyckades: %s"
 
-#: pg_dump.c:4670
+#: pg_dump.c:4693
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
 "database version; ignored\n"
-msgstr "VARNING: aggregatfunktion %s kunde inte dumpas korrekt f�r denna databasversion; ignorerad\n"
+msgstr ""
+"VARNING: aggregatfunktion %s kunde inte dumpas korrekt f�r denna "
+"databasversion; ignorerad\n"
 
-#: pg_dump.c:4902
+#: pg_dump.c:4925
 #, c-format
 msgid "could not parse ACL list (%s) for object %s (%s)\n"
 msgstr "kunde inte tolka ACL-listan (%s) f�r objekt %s (%s)\n"
 
-#: pg_dump.c:5138
+#: pg_dump.c:5161
 #, c-format
 msgid "query to obtain definition of view \"%s\" failed: %s"
 msgstr "fr�ga f�r att h�mta definition av vy \"%s\" misslyckades: %s"
 
-#: pg_dump.c:5146
+#: pg_dump.c:5169
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "fr�ga f�r att h�mta definition av vy \"%s\" returnerade ingen data\n"
 
-#: pg_dump.c:5149
+#: pg_dump.c:5172
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
-msgstr "fr�ga f�r att h�mta definition av vy \"%s\" returnerade mer �n en definiton\n"
+msgstr ""
+"fr�ga f�r att h�mta definition av vy \"%s\" returnerade mer �n en definiton\n"
 
-#: pg_dump.c:5156
+#: pg_dump.c:5179
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned NULL oid\n"
 msgstr "fr�ga f�r att h�mta definition av vy \"%s\" returnerade NULL oid\n"
 
-#: pg_dump.c:5165
+#: pg_dump.c:5188
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "definition av vy \\\"%s\\\" verkar vara tom (l�ngd noll)\n"
 
-#: pg_dump.c:5303
+#: pg_dump.c:5326
 #, c-format
 msgid "finding CHECK constraints for table %s\n"
 msgstr "hittar CHECK-villkor f�r tabell %s\n"
 
-#: pg_dump.c:5345
+#: pg_dump.c:5368
 #, c-format
 msgid "query to obtain check constraints failed: %s"
 msgstr "fr�ga f�r att h�mta check-villkor misslyckades: %s"
 
-#: pg_dump.c:5351
+#: pg_dump.c:5374
 #, c-format
 msgid "expected %d check constraints on table \"%s\" but found %d\n"
 msgstr "f�rv�ntade %d check-villkor f�r tabell \"%s\" men hittade %d\n"
 
-#: pg_dump.c:5353
+#: pg_dump.c:5376
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(systemkatalogerna kan vara trasiga.)\n"
 
-#: pg_dump.c:5480
+#: pg_dump.c:5498
 #, c-format
 msgid "getAttrName(): invalid column number %d for table %s\n"
 msgstr "getAttrName(): ogiltigt kolumnnummer %d f�r tabell %s\n"
 
-#: pg_dump.c:5568
+#: pg_dump.c:5586
 #, c-format
 msgid "query to obtain list of indexes failed: %s"
 msgstr "fr�ga f�r att h�mta lista av index misslyckades: %s"
 
-#: pg_dump.c:5709
+#: pg_dump.c:5727
 #, c-format
 msgid "could not create pgdump_oid table: %s"
 msgstr "kan inte skapa tabellen pgdump_oid: %s"
 
-#: pg_dump.c:5717
+#: pg_dump.c:5735
 #, c-format
 msgid "could not insert into pgdump_oid table: %s"
 msgstr "kunde inte s�tta in i tabell pgdump_oid: %s"
 
-#: pg_dump.c:5723
+#: pg_dump.c:5741
 msgid "inserted invalid oid\n"
 msgstr "satte in ogiltig oid\n"
 
-#: pg_dump.c:5731
+#: pg_dump.c:5749
 #, c-format
 msgid "could not drop pgdump_oid table: %s"
 msgstr "kan inte ta bort tabellen pgdump_oid: %s"
 
-#: pg_dump.c:5736
+#: pg_dump.c:5754
 #, c-format
 msgid "maximum system oid is %u\n"
 msgstr "st�rsta system-oid �r %u\n"
 
-#: pg_dump.c:5773
+#: pg_dump.c:5791
 #, c-format
 msgid "error in finding the last system oid: %s"
 msgstr "fel vid h�mtning av sista system-oid: %s"
 
-#: pg_dump.c:5779
+#: pg_dump.c:5797
 msgid "missing pg_database entry for this database\n"
 msgstr "pg_database-posten f�r denna databas saknas\n"
 
-#: pg_dump.c:5784
+#: pg_dump.c:5802
 msgid "found more than one pg_database entry for this database\n"
 msgstr "det finns mer �n en pg_database-post f�r denna databas\n"
 
-#: pg_dump.c:5812
+#: pg_dump.c:5830
 #, c-format
 msgid "error in finding the template1 database: %s"
 msgstr "fel vid h�mtning av databasen template1: %s"
 
-#: pg_dump.c:5818
+#: pg_dump.c:5836
 msgid "could not find template1 database entry in the pg_database table\n"
 msgstr "kan inte hitta pg_database-posten f�r databas template1\n"
 
-#: pg_dump.c:5823
+#: pg_dump.c:5841
 msgid "found more than one template1 database entry in the pg_database table\n"
 msgstr "det finns mer �n en pg_database-post f�r databas template1\n"
 
-#: pg_dump.c:5857
+#: pg_dump.c:5875
 #, c-format
 msgid "query to get data of sequence \"%s\" failed: %s"
 msgstr "fr�ga f�r att h�mta data f�r sekvens \"%s\" misslyckades: %s"
 
-#: pg_dump.c:5863
+#: pg_dump.c:5881
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
-msgstr "fr�ga f�r att h�mta data f�r sekvens \"%s\" returnerade %d rader (f�rv�ntade 1)\n"
+msgstr ""
+"fr�ga f�r att h�mta data f�r sekvens \"%s\" returnerade %d rader (f�rv�ntade "
+"1)\n"
 
-#: pg_dump.c:5872
+#: pg_dump.c:5890
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "fr�ga f�r att h�mta data f�r sekvens \"%s\" returnerade namn \"%s\"\n"
 
-#: pg_dump.c:5995
+#: pg_dump.c:6013
 #, c-format
 msgid "dumping foreign key constraints for table %s\n"
 msgstr "dumpar fr�mmande nyckel-villkor f�r tabell %s\n"
 
-#: pg_dump.c:6016
+#: pg_dump.c:6034
 #, c-format
 msgid "query to obtain list of foreign key definitions failed: %s"
-msgstr "fr�ga f�r att h�mta lista med definitioner av fr�mmande nycklar misslyckades: %s"
+msgstr ""
+"fr�ga f�r att h�mta lista med definitioner av fr�mmande nycklar "
+"misslyckades: %s"
 
-#: pg_dump.c:6106
+#: pg_dump.c:6124
 #, c-format
 msgid "dumping triggers for table %s\n"
 msgstr "dumpar utl�sare f�r tabell %s\n"
 
-#: pg_dump.c:6155
+#: pg_dump.c:6173
 #, c-format
 msgid "query to obtain list of triggers failed: %s"
 msgstr "fr�ga f�r att h�mta listan med utl�sare misslyckades: %s"
 
-#: pg_dump.c:6166
+#: pg_dump.c:6184
 #, c-format
 msgid "expected %d triggers on table \"%s\" but found %d\n"
 msgstr "f�rv�ntade %d utl�sare p� tabell \"%s\" men hittade %d\n"
 
-#: pg_dump.c:6276
+#: pg_dump.c:6294
 #, c-format
 msgid ""
 "query produced NULL referenced table name for foreign key trigger \"%s\" on "
 "table \"%s\" (oid of table: %s)\n"
-msgstr "fr�ga producerade NULL som refererad tabell f�r fr�mmande nyckel-utl�sare \"%s\" i tabell \"%s\" (oid f�r tabell : %s)\n"
+msgstr ""
+"fr�ga producerade NULL som refererad tabell f�r fr�mmande nyckel-utl�sare \"%"
+"s\" i tabell \"%s\" (oid f�r tabell : %s)\n"
 
-#: pg_dump.c:6316
+#: pg_dump.c:6334
 #, c-format
 msgid "bad argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "felaktig argumentstr�ng (%sa) f�r utl�sare \"%s\" i tabell \"%s\"\n"
 
-#: pg_dump.c:6386
+#: pg_dump.c:6404
 msgid "dumping out rules\n"
 msgstr "dumpar regler\n"
 
-#: pg_dump.c:6439
+#: pg_dump.c:6457
 #, c-format
 msgid "query to get rules associated with table \"%s\" failed: %s"
-msgstr "fr�ga f�r att h�mta regler associerade med tabell \"%s\" misslyckades: %s"
+msgstr ""
+"fr�ga f�r att h�mta regler associerade med tabell \"%s\" misslyckades: %s"
 
-#: pg_dump.c:6522
+#: pg_dump.c:6540
 #, c-format
 msgid "query to set search_path failed: %s"
 msgstr "fr�ga f�r att s�tta search_path misslyckades: %s"
 
-#: pg_dump.c:6584
+#: pg_dump.c:6602
 #, c-format
 msgid "query to obtain name of type %s failed: %s"
 msgstr "fr�ga f�r att h�mta namn p� typ %s misslyckades: %s"
@@ -997,12 +1054,16 @@ msgstr ""
 #: common.c:502
 #, c-format
 msgid "failed sanity check, parent oid %s of table %s (oid %s) not found\n"
-msgstr "misslyckades med riktighetskontroll, hittade inte f�r�lder-oid %s f�r tabell %s (oid %s)\n"
+msgstr ""
+"misslyckades med riktighetskontroll, hittade inte f�r�lder-oid %s f�r tabell "
+"%s (oid %s)\n"
 
 #: common.c:507
 #, c-format
 msgid "failed sanity check, parent oid %s of table (oid %s) not found\n"
-msgstr "misslyckades med riktighetskontroll, hittade inte f�r�lder-oid %s f�r tabell (oid %s)\n"
+msgstr ""
+"misslyckades med riktighetskontroll, hittade inte f�r�lder-oid %s f�r tabell "
+"(oid %s)\n"
 
 #: common.c:545
 msgid "parseNumericArray: too many numbers\n"
@@ -1034,7 +1095,8 @@ msgstr "kopplar upp mot databas f
 
 #: pg_backup_archiver.c:161
 msgid "direct database connections are not supported in pre-1.3 archives\n"
-msgstr "direkta databasuppkopplingar st�ds inte i arkiv fr�n f�re version 1.3\n"
+msgstr ""
+"direkta databasuppkopplingar st�ds inte i arkiv fr�n f�re version 1.3\n"
 
 #: pg_backup_archiver.c:198
 msgid "implied data-only restore\n"
@@ -1064,264 +1126,284 @@ msgstr "kopplar upp mot ny databas %s som anv
 msgid ""
 "unable to restore from compressed archive (not configured for compression "
 "support)\n"
-msgstr "kunde inte �terst�lla fr�n komprimerat arkiv (inte konfigurerad med st�d f�r komprimering)\n"
+msgstr ""
+"kunde inte �terst�lla fr�n komprimerat arkiv (inte konfigurerad med st�d f�r "
+"komprimering)\n"
 
-#: pg_backup_archiver.c:306
+#: pg_backup_archiver.c:307
 msgid "WARNING: skipping large object restoration\n"
 msgstr "VARNING: hoppar �ver �terst�llning av stora objekt\n"
 
-#: pg_backup_archiver.c:319
+#: pg_backup_archiver.c:320
 #, c-format
 msgid "restoring data for table %s\n"
 msgstr "�terst�ller data f�r tabell %s\n"
 
-#: pg_backup_archiver.c:344
+#: pg_backup_archiver.c:345
 #, c-format
 msgid "executing %s %s\n"
 msgstr "k�r %s %s\n"
 
-#: pg_backup_archiver.c:366
+#: pg_backup_archiver.c:367
 #, c-format
 msgid "checking whether we loaded %s\n"
 msgstr "kollar ifall vi laddat %s\n"
 
-#: pg_backup_archiver.c:372
+#: pg_backup_archiver.c:373
 #, c-format
 msgid "fixing up large object cross-reference for %s\n"
 msgstr "fixar till korsreferens f�r stort objekt %s\n"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:378
 #, c-format
 msgid "ignoring large object cross-references for %s %s\n"
 msgstr "ignorerar korsreferens f�r stort objekt %s %s\n"
 
-#: pg_backup_archiver.c:466
+#: pg_backup_archiver.c:471
 msgid "disabling triggers\n"
 msgstr "sl�r av utl�sare\n"
 
-#: pg_backup_archiver.c:529
+#: pg_backup_archiver.c:538
 msgid "enabling triggers\n"
 msgstr "sl�r p� utl�sare\n"
 
-#: pg_backup_archiver.c:578
+#: pg_backup_archiver.c:587
 msgid ""
 "WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr "WriteData kan inte anropas utanf�r kontexten av en DataDumper-rutin\n"
 
-#: pg_backup_archiver.c:605 pg_backup_archiver.c:1033
-#: pg_backup_archiver.c:1152 pg_backup_archiver.c:1458
-#: pg_backup_archiver.c:1600 pg_backup_archiver.c:1630 pg_backup_custom.c:141
+#: pg_backup_archiver.c:614 pg_backup_archiver.c:1044
+#: pg_backup_archiver.c:1163 pg_backup_archiver.c:1551
+#: pg_backup_archiver.c:1701 pg_backup_archiver.c:1734 pg_backup_custom.c:141
 #: pg_backup_custom.c:146 pg_backup_custom.c:152 pg_backup_custom.c:167
-#: pg_backup_custom.c:561 pg_backup_db.c:174 pg_backup_db.c:248
-#: pg_backup_files.c:112 pg_backup_tar.c:168 pg_backup_tar.c:968
+#: pg_backup_custom.c:545 pg_backup_db.c:174 pg_backup_db.c:247
+#: pg_backup_files.c:112 pg_backup_tar.c:169 pg_backup_tar.c:961
 msgid "out of memory\n"
 msgstr "minnet slut\n"
 
-#: pg_backup_archiver.c:700
+#: pg_backup_archiver.c:711
 msgid "large object output not supported in chosen format\n"
 msgstr "utmatning av stora objekt st�ds inte i det valda formatet\n"
 
-#: pg_backup_archiver.c:740 pg_backup_archiver.c:825
+#: pg_backup_archiver.c:751 pg_backup_archiver.c:836
 msgid "committing large object transactions\n"
 msgstr "commitar transaktioner f�r stora objekt\n"
 
-#: pg_backup_archiver.c:747
+#: pg_backup_archiver.c:758
 #, c-format
 msgid "restored %d large objects\n"
 msgstr "�terst�llde %d stora objekt\n"
 
-#: pg_backup_archiver.c:764
+#: pg_backup_archiver.c:775
 msgid "cannot restore large objects without a database connection\n"
 msgstr "kan inte �terst�lla stora objekt utan en databasuppkoppling\n"
 
-#: pg_backup_archiver.c:778
+#: pg_backup_archiver.c:789
 msgid "starting large object transactions\n"
 msgstr "startar transaktioner f�r stora objekt\n"
 
-#: pg_backup_archiver.c:786
+#: pg_backup_archiver.c:797
 msgid "could not create large object\n"
 msgstr "kunde inte skapa stort objekt\n"
 
-#: pg_backup_archiver.c:788
+#: pg_backup_archiver.c:799
 #, c-format
 msgid "restoring large object with oid %u as %u\n"
 msgstr "�terst�ller stort objekt med oid %u som %u\n"
 
-#: pg_backup_archiver.c:794
+#: pg_backup_archiver.c:805
 msgid "could not open large object\n"
 msgstr "kunde inte �ppna stort objekt\n"
 
-#: pg_backup_archiver.c:809
+#: pg_backup_archiver.c:820
 #, c-format
 msgid "wrote remaining %lu bytes of large object data (result = %lu)\n"
-msgstr "skrev �terst�ende %lu bytes av data till stort objeckt (resultat = %lu)\n"
+msgstr ""
+"skrev �terst�ende %lu bytes av data till stort objeckt (resultat = %lu)\n"
 
-#: pg_backup_archiver.c:812 pg_backup_archiver.c:1209
+#: pg_backup_archiver.c:823 pg_backup_archiver.c:1220
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "kunde inte skriva till stort objekt (resultat: %lu, f�rv�ntat: %lu)\n"
 
-#: pg_backup_archiver.c:949
+#: pg_backup_archiver.c:960
 msgid "could not open TOC file\n"
 msgstr "kunde inte �ppna TOC-filen\n"
 
-#: pg_backup_archiver.c:970
+#: pg_backup_archiver.c:981
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "VARNING: rad ignorerad: %s\n"
 
-#: pg_backup_archiver.c:977
+#: pg_backup_archiver.c:988
 #, c-format
 msgid "could not find entry for id %d\n"
 msgstr "kunde inte hitta en post f�r id %d\n"
 
-#: pg_backup_archiver.c:986 pg_backup_files.c:156 pg_backup_files.c:441
+#: pg_backup_archiver.c:997 pg_backup_files.c:156 pg_backup_files.c:438
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "kunde inte st�nga TOC-filen: %s\n"
 
-#: pg_backup_archiver.c:1101 pg_backup_files.c:130
+#: pg_backup_archiver.c:1112 pg_backup_files.c:130
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "kunde inte �ppna utdatafilen: %s\n"
 
-#: pg_backup_archiver.c:1117
+#: pg_backup_archiver.c:1128
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "kunde inte st�nga utdatafilen: %s\n"
 
-#: pg_backup_archiver.c:1205
+#: pg_backup_archiver.c:1216
 #, c-format
 msgid "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr "skrev %lu bytes av stort objekt-data (resultat = %lu)\n"
 
-#: pg_backup_archiver.c:1227
+#: pg_backup_archiver.c:1238
 msgid "could not write to compressed archive\n"
 msgstr "kunde inte skriva till komprimerat arkiv\n"
 
-#: pg_backup_archiver.c:1235
+#: pg_backup_archiver.c:1246
 msgid "could not write to custom output routine\n"
 msgstr "kunde inte skriva till egen utdatarutin\n"
 
-#: pg_backup_archiver.c:1250
+#: pg_backup_archiver.c:1261
 #, c-format
 msgid "could not write to output file (%lu != %lu)\n"
 msgstr "kan inte skriva till utfilen: (%lu != %lu)\n"
 
-#: pg_backup_archiver.c:1476
+#: pg_backup_archiver.c:1444
+#, c-format
+msgid "Unexpected data offset flag %d\n"
+msgstr "Ov�ntad dataoffsetflagga %d\n"
+
+#: pg_backup_archiver.c:1457
+msgid "file offset in dump file is too large\n"
+msgstr "fil-offset i dumpfil �r f�r stor\n"
+
+#: pg_backup_archiver.c:1569
 msgid "attempting to ascertain archive format\n"
 msgstr "f�rs�ker lista ut arkivformat\n"
 
-#: pg_backup_archiver.c:1496 pg_backup_files.c:148
+#: pg_backup_archiver.c:1589 pg_backup_files.c:148
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "kan inte �ppna infil: %s\n"
 
-#: pg_backup_archiver.c:1503
+#: pg_backup_archiver.c:1596
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "kan inte l�sa infilen: %s\n"
 
-#: pg_backup_archiver.c:1505
+#: pg_backup_archiver.c:1598
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "indatafilen �r f�r kort (l�ste %lu, f�rv�ntade 5)\n"
 
-#: pg_backup_archiver.c:1550
+#: pg_backup_archiver.c:1651
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "indatafilen verkar inte vara ett korrekt arkiv (f�r kort?)\n"
 
-#: pg_backup_archiver.c:1553
+#: pg_backup_archiver.c:1654
 msgid "input file does not appear to be a valid archive\n"
 msgstr "indatafilen verkar inte vara ett korrekt arkiv\n"
 
-#: pg_backup_archiver.c:1571
+#: pg_backup_archiver.c:1672
 #, c-format
 msgid "read %lu bytes into lookahead buffer\n"
 msgstr "l�ste %lu tecken in i lookahead-bufferten\n"
 
-#: pg_backup_archiver.c:1578
+#: pg_backup_archiver.c:1679
 #, c-format
 msgid "could not close the input file after reading header: %s\n"
 msgstr "kunde inte st�nga indatafilen efter att ha l�st huvudet: %s\n"
 
-#: pg_backup_archiver.c:1595
+#: pg_backup_archiver.c:1696
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "allokerar AH f�r %s, format %d\n"
 
-#: pg_backup_archiver.c:1646
+#: pg_backup_archiver.c:1750
 #, c-format
 msgid "archive format is %d\n"
 msgstr "arkivformat �r %d\n"
 
-#: pg_backup_archiver.c:1674
+#: pg_backup_archiver.c:1778
 #, c-format
 msgid "unrecognized file format '%d'\n"
 msgstr "k�nner inte igen filformatet '%d'\n"
 
-#: pg_backup_archiver.c:1787
-msgid "entry id out of range - perhaps a corrupt TOC\n"
-msgstr "post-id utanf�r sitt intervall - kanske en trasig TOC\n"
+#: pg_backup_archiver.c:1891
+#, c-format
+msgid "entry id %d out of range - perhaps a corrupt TOC\n"
+msgstr "post-id %d utanf�r sitt intervall - kanske en trasig TOC\n"
 
-#: pg_backup_archiver.c:1822
+#: pg_backup_archiver.c:1926
 #, c-format
 msgid "read dependency for %s -> %s\n"
 msgstr "l�sberoende f�r %s -> %s\n"
 
-#: pg_backup_archiver.c:1841
+#: pg_backup_archiver.c:1948
 #, c-format
 msgid "read TOC entry %d (id %d) for %s %s\n"
 msgstr "l�ste TOC-post %d (id %d) f�r %s %s\n"
 
-#: pg_backup_archiver.c:1967
+#: pg_backup_archiver.c:2074
 #, c-format
 msgid "could not set session user to %s: %s"
 msgstr "kunde inte s�tta sessionsanv�ndare till %s: %s"
 
-#: pg_backup_archiver.c:2081
+#: pg_backup_archiver.c:2188
 #, c-format
 msgid "could not set search_path to %s: %s"
 msgstr "kunde inte s�tta search_path till %s: %s"
 
-#: pg_backup_archiver.c:2140
+#: pg_backup_archiver.c:2248
 msgid ""
 "WARNING: requested compression not available in this installation - archive "
 "will be uncompressed\n"
-msgstr "VARNING: efterfr�gad komprimering finns inte i denna installation - arkivet kommer sparas okomprimerat\n"
+msgstr ""
+"VARNING: efterfr�gad komprimering finns inte i denna installation - arkivet "
+"kommer sparas okomprimerat\n"
 
-#: pg_backup_archiver.c:2173
+#: pg_backup_archiver.c:2281
 msgid "did not find magic string in file header\n"
 msgstr "kunde inte hitta den magiska str�ngen i filhuvudet\n"
 
-#: pg_backup_archiver.c:2187
+#: pg_backup_archiver.c:2295
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "ej supportad version (%d.%d) i filhuvudet\n"
 
-#: pg_backup_archiver.c:2192
+#: pg_backup_archiver.c:2300
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "riktighetskontroll p� heltalsstorlek (%lu) misslyckades\n"
 
-#: pg_backup_archiver.c:2196
+#: pg_backup_archiver.c:2304
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "may fail\n"
-msgstr "VARNING: arkivet skapades p� en maskin med st�rre heltal, en del operationer kan misslyckas\n"
+msgstr ""
+"VARNING: arkivet skapades p� en maskin med st�rre heltal, en del operationer "
+"kan misslyckas\n"
 
-#: pg_backup_archiver.c:2201
+#: pg_backup_archiver.c:2314
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
-msgstr "f�rv�ntat format (%d) skiljer sig fr�n formatet som fanns i filen (%d)\n"
+msgstr ""
+"f�rv�ntat format (%d) skiljer sig fr�n formatet som fanns i filen (%d)\n"
 
-#: pg_backup_archiver.c:2217
+#: pg_backup_archiver.c:2330
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression - no data will be available\n"
-msgstr "VARNING: arkivet �r komprimerat, men denna installation st�djer inte komprimering - ingen data kommer kunna l�sas\n"
+msgstr ""
+"VARNING: arkivet �r komprimerat, men denna installation st�djer inte "
+"komprimering - ingen data kommer kunna l�sas\n"
 
-#: pg_backup_archiver.c:2235
+#: pg_backup_archiver.c:2348
 msgid "WARNING: invalid creation date in header\n"
 msgstr "VARNING: ogiltig skapandedatum i huvud\n"
 
@@ -1329,7 +1411,7 @@ msgstr "VARNING: ogiltig skapandedatum i huvud\n"
 msgid "custom archiver"
 msgstr "egen arkiverare"
 
-#: pg_backup_custom.c:181 pg_backup_custom.c:194
+#: pg_backup_custom.c:180 pg_backup_custom.c:191
 #, c-format
 msgid "could not open archive file %s: %s\n"
 msgstr "kan inte �ppna arkivfilen %s: %s\n"
@@ -1338,7 +1420,7 @@ msgstr "kan inte 
 msgid "invalid OID for large object\n"
 msgstr "ogiltig OID f�r stort objekt\n"
 
-#: pg_backup_custom.c:448
+#: pg_backup_custom.c:446
 msgid ""
 "Dumping a specific TOC data block out of order is not supported without id "
 "on this input stream (fseek required)\n"
@@ -1346,83 +1428,83 @@ msgstr ""
 "Dumpning av ett specifikt TOC-datablock i utanf�r normal ordning st�ds inte\n"
 "utan ett id f�r denna indatastr�m (fseek kr�vs)\n"
 
-#: pg_backup_custom.c:467
+#: pg_backup_custom.c:461
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr "k�nner inte igen datablocktyp (%d) vid genoms�kning av arkiv\n"
 
-#: pg_backup_custom.c:483
+#: pg_backup_custom.c:472
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "fel vid s�kning: %s\n"
 
-#: pg_backup_custom.c:491
+#: pg_backup_custom.c:479
 #, c-format
 msgid "found unexpected block ID (%d) when reading data - expected %d\n"
 msgstr "hittade ov�ntat block-ID (%d) vid l�sning av data - f�rv�ntade %d\n"
 
-#: pg_backup_custom.c:505
+#: pg_backup_custom.c:490
 msgid "large objects cannot be loaded without a database connection\n"
 msgstr "stora objekt kan inte l�sas utan en databasuppkoppling\n"
 
-#: pg_backup_custom.c:512
+#: pg_backup_custom.c:496
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr "ej igenk�nd datablockstyp %d vid �terst�llande av arkiv\n"
 
-#: pg_backup_custom.c:548 pg_backup_custom.c:912
+#: pg_backup_custom.c:532 pg_backup_custom.c:894
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "kunde inte initiera komprimeringsbibliotek: %s\n"
 
-#: pg_backup_custom.c:570 pg_backup_custom.c:698
+#: pg_backup_custom.c:554 pg_backup_custom.c:677
 #, c-format
 msgid "could not read data block - expected %lu, got %lu\n"
 msgstr "kunde inte l�sa datablock - f�rv�ntade %lu, fick %lu\n"
 
-#: pg_backup_custom.c:589 pg_backup_custom.c:621
+#: pg_backup_custom.c:572 pg_backup_custom.c:602
 #, c-format
 msgid "unable to uncompress data: %s\n"
 msgstr "kan inte komprimera data: %s\n"
 
-#: pg_backup_custom.c:627
+#: pg_backup_custom.c:608
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "kunde inte st�nga komprimeringsbiblioteket: %s\n"
 
-#: pg_backup_custom.c:727
+#: pg_backup_custom.c:705
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "kunde inte skriva tecken: %s\n"
 
-#: pg_backup_custom.c:771 pg_backup_files.c:416
+#: pg_backup_custom.c:749 pg_backup_files.c:413
 #, c-format
 msgid "write error in _WriteBuf (%lu != %lu)\n"
 msgstr "fel vid skrivning i _WriteBuf (%lu != %lu)\n"
 
-#: pg_backup_custom.c:842
+#: pg_backup_custom.c:820
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "kan inte st�nga arkivfilen: %s\n"
 
-#: pg_backup_custom.c:865
-msgid "WARNING: ftell mismatch with expected position -- ftell ignored\n"
-msgstr "VARNING: ftell st�mmer inte med f�rv�ntad position -- ftell ignorerad\n"
+#: pg_backup_custom.c:843
+msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
+msgstr "VARNING: ftell st�mmer inte med f�rv�ntad position -- anv�nde ftell\n"
 
-#: pg_backup_custom.c:944
+#: pg_backup_custom.c:926
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "kunde inte komprimera data: %s\n"
 
-#: pg_backup_custom.c:964
+#: pg_backup_custom.c:946
 msgid "could not write compressed chunk\n"
 msgstr "kunde inte skriva komprimerat block\n"
 
-#: pg_backup_custom.c:978
+#: pg_backup_custom.c:960
 msgid "could not write uncompressed chunk\n"
 msgstr "kunde inte skriva okomprimerat block\n"
 
-#: pg_backup_custom.c:1027
+#: pg_backup_custom.c:1006
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "kunde inte st�nga komprimeringsstr�mmen: %s\n"
@@ -1449,15 +1531,17 @@ msgstr "forts
 msgid ""
 "aborting because of version mismatch  (Use the -i option to proceed "
 "anyway.)\n"
-msgstr "avbryter p� grund av att versionerna inte matchar (anv�nd flaggan -i f�r att forts�tta �nd�.)\n"
+msgstr ""
+"avbryter p� grund av att versionerna inte matchar (anv�nd flaggan -i f�r att "
+"forts�tta �nd�.)\n"
 
 #: pg_backup_db.c:168
 #, c-format
 msgid "connecting to database %s as user %s\n"
 msgstr "kopplar upp mot databas %s som anv�ndare %s\n"
 
-#: pg_backup_db.c:172 pg_backup_db.c:205 pg_backup_db.c:246 pg_backup_db.c:275
-#: pg_dumpall.c:617 pg_dumpall.c:643
+#: pg_backup_db.c:172 pg_backup_db.c:205 pg_backup_db.c:245 pg_backup_db.c:274
+#: pg_dumpall.c:639 pg_dumpall.c:665
 msgid "Password: "
 msgstr "L�senord: "
 
@@ -1470,114 +1554,115 @@ msgstr "misslyckades att 
 msgid "could not reconnect to database: %s"
 msgstr "kunde inte �teruppkoppla mot databasen: %s"
 
-#: pg_backup_db.c:242
+#: pg_backup_db.c:241
 msgid "already connected to a database\n"
 msgstr "�r redan uppkopplad mot en databas\n"
 
-#: pg_backup_db.c:265
+#: pg_backup_db.c:264
 msgid "failed to connect to database\n"
 msgstr "misslyckades med att koppla upp mot databas\n"
 
-#: pg_backup_db.c:284
+#: pg_backup_db.c:283
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "uppkoppling mot databas \"%s\" misslyckades: %s"
 
-#: pg_backup_db.c:297
+#: pg_backup_db.c:296
 #, c-format
 msgid "SET autocommit TO 'on' failed: %s"
 msgstr "SET autocommit TILL \"on\" misslyckades: %s"
 
-#: pg_backup_db.c:311
+#: pg_backup_db.c:310
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:339
+#: pg_backup_db.c:338
 #, c-format
 msgid "%s: no result from server\n"
 msgstr "%s: inget resultat fr�n servern\n"
 
-#: pg_backup_db.c:346
+#: pg_backup_db.c:345
 msgid "COPY command executed in non-primary connection\n"
 msgstr "COPY-kommandot utf�rt i en icke-prim�r uppkoppling\n"
 
-#: pg_backup_db.c:351
+#: pg_backup_db.c:350
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: pg_backup_db.c:425
+#: pg_backup_db.c:424
 msgid "error returned by PQputline\n"
 msgstr "fel returnerat av PQputline\n"
 
-#: pg_backup_db.c:436
+#: pg_backup_db.c:435
 msgid "error returned by PQendcopy\n"
 msgstr "fel returnerat av PQendcopy\n"
 
-#: pg_backup_db.c:481
+#: pg_backup_db.c:479
 msgid "could not execute query"
 msgstr "kunde inte utf�ra fr�ga"
 
-#: pg_backup_db.c:622
+#: pg_backup_db.c:614
 #, c-format
 msgid "could not find oid columns of table \"%s\": %s"
 msgstr "kunde inte hitta oid-kolumner f�r tabell \"%s\": %s"
 
-#: pg_backup_db.c:628
+#: pg_backup_db.c:620
 #, c-format
 msgid "no OID type columns in table %s\n"
 msgstr "ingga OID-typ-kolumner i tabell %s\n"
 
-#: pg_backup_db.c:635
+#: pg_backup_db.c:634
 #, c-format
 msgid "fixing large object cross-references for %s.%s\n"
 msgstr "fixar korsreferens till stort objekt f�r %s.%s\n"
 
-#: pg_backup_db.c:651
+#: pg_backup_db.c:673
 #, c-format
 msgid "SQL: %s\n"
 msgstr "SQL: %s\n"
 
-#: pg_backup_db.c:656
+#: pg_backup_db.c:678
 #, c-format
 msgid "could not update column \"%s\" of table \"%s\": %s"
 msgstr "kunde inte uppdatera kolumn \"%s\" i tabell \"%s\": %s"
 
-#: pg_backup_db.c:661
+#: pg_backup_db.c:683
 #, c-format
 msgid "error while updating column \"%s\" of table \"%s\": %s"
 msgstr "fel vid uppdatering av kolumn \"%s\" i tabell \"%s\": %s"
 
-#: pg_backup_db.c:684
+#: pg_backup_db.c:706
 msgid "creating table for large object cross-references\n"
 msgstr "skapar tabell f�r korsreferenser till stora objekt\n"
 
-#: pg_backup_db.c:688
+#: pg_backup_db.c:710
 msgid "could not create large object cross-reference table"
 msgstr "kunde inte skapa tabell f�r korsreferenser till stora objekt"
 
-#: pg_backup_db.c:693
+#: pg_backup_db.c:715
 msgid "could not create index on large object cross-reference table"
-msgstr "kunde inte skapa index f�r tabellen med korsreferenser till stora objekt"
+msgstr ""
+"kunde inte skapa index f�r tabellen med korsreferenser till stora objekt"
 
-#: pg_backup_db.c:707
+#: pg_backup_db.c:729
 msgid "could not create large object cross-reference entry"
 msgstr "kunde inte skapa post f�r korsreferens till stort objekt"
 
-#: pg_backup_db.c:719
+#: pg_backup_db.c:741
 msgid "could not start database transaction"
 msgstr "kunde inte starta databastransaktionen"
 
-#: pg_backup_db.c:733
+#: pg_backup_db.c:755
 msgid "could not start transaction for large object cross-references"
 msgstr "kunde inte starta transaktion f�r korsreferens till stort objekt"
 
-#: pg_backup_db.c:746
+#: pg_backup_db.c:768
 msgid "could not commit database transaction"
 msgstr "kunde inte genomf�ra databastransaktionen"
 
-#: pg_backup_db.c:759
+#: pg_backup_db.c:781
 msgid "could not commit transaction for large object cross-references"
 msgstr "kunde inte genomf�ra transaktion f�r korsreferens till stort objekt"
 
@@ -1595,51 +1680,51 @@ msgstr ""
 "  Detta format �r f�r demonstationsanv�ndning; det �r inte t�nkt\n"
 "  f�r normal anv�ndning. Filer skrivs i aktuella katalogen.\n"
 
-#: pg_backup_files.c:246
+#: pg_backup_files.c:245
 msgid "could not open data file for output\n"
 msgstr "kunde inte �ppna datafil f�r utmatning\n"
 
-#: pg_backup_files.c:267
+#: pg_backup_files.c:265
 msgid "could not close data file\n"
 msgstr "kan inte st�nga datafil\n"
 
-#: pg_backup_files.c:291
+#: pg_backup_files.c:289
 msgid "could not open data file for input\n"
 msgstr "kan inte �ppna datafil f�r l�sning\n"
 
-#: pg_backup_files.c:300
+#: pg_backup_files.c:298
 msgid "could not close data file after reading\n"
 msgstr "kan inte st�nga datafil efter l�sning\n"
 
-#: pg_backup_files.c:364
+#: pg_backup_files.c:361
 #, c-format
 msgid "could not open large object TOC for input: %s\n"
 msgstr "kunde inte �ppna TOC-filen f�r stora objekt: %s\n"
 
-#: pg_backup_files.c:377 pg_backup_files.c:548
+#: pg_backup_files.c:374 pg_backup_files.c:544
 #, c-format
 msgid "could not close large object TOC file: %s\n"
 msgstr "kunde inte st�nga TOC-filen f�r stora objekt: %s\n"
 
-#: pg_backup_files.c:389
+#: pg_backup_files.c:386
 msgid "could not write byte\n"
 msgstr "kunde inte skriva tecken\n"
 
-#: pg_backup_files.c:475
+#: pg_backup_files.c:472
 #, c-format
 msgid "could not open large object TOC for output: %s\n"
 msgstr "kunde inte �ppna TOC-filen f�r stora objekt f�r utmatning: %s\n"
 
-#: pg_backup_files.c:496 pg_backup_tar.c:890
+#: pg_backup_files.c:492 pg_backup_tar.c:885
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "ogiltig OID f�r stort objekt (%u)\n"
 
-#: pg_backup_files.c:515
+#: pg_backup_files.c:511
 msgid "could not open large object file\n"
 msgstr "kunde inte �ppna filen f�r stort objekt\n"
 
-#: pg_backup_files.c:530
+#: pg_backup_files.c:526
 msgid "could not close large object file\n"
 msgstr "kunde inte st�nga filen f�r stort objekt\n"
 
@@ -1647,20 +1732,20 @@ msgstr "kunde inte st
 msgid "this format cannot be read\n"
 msgstr "detta format kan inte l�sas\n"
 
-#: pg_backup_tar.c:106
+#: pg_backup_tar.c:107
 msgid "tar archiver"
 msgstr "tar-arkiverare"
 
-#: pg_backup_tar.c:183
+#: pg_backup_tar.c:184
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "kunde inte �ppna TOC-filen f�r utmatning: %s\n"
 
-#: pg_backup_tar.c:208
+#: pg_backup_tar.c:209
 msgid "compression not supported by tar output format\n"
 msgstr "komprimering �r st�djs inte av utdataformat f�r tar\n"
 
-#: pg_backup_tar.c:220
+#: pg_backup_tar.c:221
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "kunde inte �ppna TOC-fil f�r l�sning: %s\n"
@@ -1674,126 +1759,131 @@ msgstr "kunde inte hitta fil %s i arkiv\n"
 msgid "compression support is disabled in this format\n"
 msgstr "st�d f�r komprimering �r avst�ngt f�r detta format\n"
 
-#: pg_backup_tar.c:369
+#: pg_backup_tar.c:368
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "kunde inte generera tempor�rt filnamn: %s\n"
 
-#: pg_backup_tar.c:378
+#: pg_backup_tar.c:377
 msgid "could not gzdopen temporary file\n"
 msgstr "kunde inte gzdopen tempor�r fil\n"
 
-#: pg_backup_tar.c:408
+#: pg_backup_tar.c:407
 msgid "could not close tar member\n"
 msgstr "kunde inte st�nga tar-medlem\n"
 
-#: pg_backup_tar.c:508
+#: pg_backup_tar.c:507
 msgid "neither th nor fh specified in tarReadRaw() (internal error)\n"
 msgstr "varken th eller fh angiven i tarReadRaw() (internt fel)\n"
 
-#: pg_backup_tar.c:512
+#: pg_backup_tar.c:511
 #, c-format
 msgid "requested %d bytes, got %d from lookahead and %d from file\n"
 msgstr "efterfr�gade %d tecken, fick %d fr�n lookahead och %d fr�n filen\n"
 
-#: pg_backup_tar.c:551
+#: pg_backup_tar.c:550
 #, c-format
 msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
 msgstr "kunde inte skriva till tar-medlem (skrev %lu, f�rs�kte %lu)\n"
 
-#: pg_backup_tar.c:640
+#: pg_backup_tar.c:639
 #, c-format
 msgid "bad COPY statement - could not find \"copy\" in string \"%s\"\n"
 msgstr "felaktig COPY-sats - kunde inte hitta \"copy\" i str�ngen \"%s\"\n"
 
-#: pg_backup_tar.c:658
+#: pg_backup_tar.c:657
 #, c-format
 msgid ""
 "bad COPY statement - could not find \"from stdin\" in string \"%s\" starting "
 "at position %lu\n"
-msgstr "felaktig COPY-sats - kunde inte hitta \"from stdin\" i str�ngen \"%s\" med b�rjan i position %lu\n"
+msgstr ""
+"felaktig COPY-sats - kunde inte hitta \"from stdin\" i str�ngen \"%s\" med "
+"b�rjan i position %lu\n"
 
-#: pg_backup_tar.c:694
+#: pg_backup_tar.c:693
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "�terst�ller stort objekt OID %u\n"
 
-#: pg_backup_tar.c:833
+#: pg_backup_tar.c:830
 msgid "could not write null block at end of tar archive\n"
 msgstr "kunde inte skriva null-block i slutet p� tar-arkivet\n"
 
-#: pg_backup_tar.c:1021
+#: pg_backup_tar.c:1024
 msgid "archive member too large for tar format\n"
 msgstr "arkivdel f�r stor f�r formatet tar\n"
 
-#: pg_backup_tar.c:1031
+#: pg_backup_tar.c:1034
 #, c-format
 msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
 msgstr "skrivfel vid adderande till tar-arkiv (skrev %lu, f�rs�kte %lu)\n"
 
-#: pg_backup_tar.c:1037
+#: pg_backup_tar.c:1040
 #, c-format
 msgid "could not close tar member: %s\n"
 msgstr "kunde inte st�nka tar-medlem: %s\n"
 
-#: pg_backup_tar.c:1046
+#: pg_backup_tar.c:1049
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "verklig fill�ngd (%s) matchar inte det f�rv�ntade (%s)\n"
 
-#: pg_backup_tar.c:1054
+#: pg_backup_tar.c:1057
 msgid "could not output padding at end of tar member\n"
 msgstr "kunde inte skriva utfyllnad i slutet av tar-medlem\n"
 
-#: pg_backup_tar.c:1083
+#: pg_backup_tar.c:1086
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "flyttar fr�n position %s till n�sta del vid filposition %s\n"
 
-#: pg_backup_tar.c:1094
+#: pg_backup_tar.c:1097
 #, c-format
 msgid "now at file position %s\n"
 msgstr "nu p� filposition %s\n"
 
-#: pg_backup_tar.c:1103 pg_backup_tar.c:1130
+#: pg_backup_tar.c:1106 pg_backup_tar.c:1133
 #, c-format
 msgid "could not find header for file %s in tar archive\n"
 msgstr "kunde inte hitta filhuvud f�r fil %s i tar-arkiv\n"
 
-#: pg_backup_tar.c:1114
+#: pg_backup_tar.c:1117
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "hoppar �ver tar-medlem %s\n"
 
-#: pg_backup_tar.c:1118
+#: pg_backup_tar.c:1121
 #, c-format
 msgid ""
 "dumping data out of order is not supported in this archive format: %s is "
 "required, but comes before %s in the archive file.\n"
-msgstr "dumpa data i oordning st�ds inte av detta arkivformat: %s kr�vs, men kommer f�re %s i denna arkivfil.\n"
+msgstr ""
+"dumpa data i oordning st�ds inte av detta arkivformat: %s kr�vs, men kommer "
+"f�re %s i denna arkivfil.\n"
 
-#: pg_backup_tar.c:1166
+#: pg_backup_tar.c:1169
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr "verklig j�mf�rt med f�rv�ntad filposition matchar inte (%s mot %s)\n"
 
-#: pg_backup_tar.c:1181
+#: pg_backup_tar.c:1184
 #, c-format
 msgid "incomplete tar header found (%lu bytes)\n"
 msgstr "inkomplett tar-huvud hittat (%lu bytes)\n"
 
-#: pg_backup_tar.c:1216
+#: pg_backup_tar.c:1219
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "TOC-data %s vid %s (l�ngd %lu, kontrollsumma %d)\n"
 
-#: pg_backup_tar.c:1226
+#: pg_backup_tar.c:1229
 #, c-format
 msgid ""
 "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
-msgstr "trasigt tar-huvud hittat i %s (f�rv�ntade %d, ber�knad %d) filposition %s\n"
+msgstr ""
+"trasigt tar-huvud hittat i %s (f�rv�ntade %d, ber�knad %d) filposition %s\n"
 
-#: pg_backup_tar.c:1316
+#: pg_backup_tar.c:1319
 msgid "unable to write tar header\n"
 msgstr "kan inte skriva tar-huvud\n"
 
@@ -1808,43 +1898,58 @@ msgstr ""
 
 #: pg_restore.c:378
 #, c-format
-msgid ""
-"  %s [OPTIONS] [FILE]\n"
-"\n"
-msgstr ""
-"  %s [FLAGGOR] [FIL]\n"
-"\n"
+msgid "  %s [OPTION]... [FILE]\n"
+msgstr "  %s [FLAGGA]... [FIL]\n"
 
 #: pg_restore.c:382
-msgid "  -a, --data-only          restore only the data, no schema\n"
-msgstr "  -a, --data-only          �terst�ll bara data, inte schema\n"
+msgid "  -d, --dbname=NAME        output database name\n"
+msgstr "  -d, --dbname=NAMN        databasnamn f�r utmatning\n"
 
 #: pg_restore.c:384
-msgid "  -C, --create             issue commands to create the database\n"
-msgstr "  -C, --create             utf�r kommandon f�r att skapa databasen\n"
+msgid "  -F, --format=c|t         specify backup file format\n"
+msgstr "  -F, --format=c|t         backupformat (c:eget, t:tar)\n"
 
 #: pg_restore.c:385
-msgid "  -d, --dbname=NAME        output database name\n"
-msgstr "  -d, --dbname=NAMN        databasnamn f�r utmatning\n"
+msgid ""
+"  -i, --ignore-version     proceed even when server version mismatches\n"
+msgstr ""
+"  -i, --ignore-version     forts�tt �ven n�r versionerna inte st�mmer\n"
 
-#: pg_restore.c:387
-msgid "  -F, --format={c|t}       specify backup file format\n"
-msgstr "  -F, --format={c|t}       backupformat (c:eget, t:tar)\n"
+#: pg_restore.c:386
+msgid "  -l, --list               print summarized TOC of the archive\n"
+msgstr "  -l, --list               skriv ut summerad TOC f�r arkivet\n"
 
 #: pg_restore.c:389
+msgid "  -d NAME                  output database name\n"
+msgstr "  -d NAMN                  databasnamn f�r utmatning\n"
+
+#: pg_restore.c:391
+msgid "  -F c|t                   specify backup file format\n"
+msgstr "  -F c|t                   backupformat (c:eget, t:tar)\n"
+
+#: pg_restore.c:392
 msgid ""
-"  -i, --ignore-version     proceed even when server version mismatches\n"
-msgstr "  -i, --ignore-version     forts�tt �ven n�r versionerna inte st�mmer\n"
+"  -i                       proceed even when server version mismatches\n"
+msgstr ""
+"  -i                       forts�tt �ven n�r versionerna inte st�mmer\n"
+
+#: pg_restore.c:393
+msgid "  -l                       print summarized TOC of the archive\n"
+msgstr "  -l                       skriv ut summerad TOC f�r arkivet\n"
+
+#: pg_restore.c:401
+msgid "  -a, --data-only          restore only the data, no schema\n"
+msgstr "  -a, --data-only          �terst�ll bara data, inte schema\n"
 
-#: pg_restore.c:390
+#: pg_restore.c:403
+msgid "  -C, --create             issue commands to create the database\n"
+msgstr "  -C, --create             utf�r kommandon f�r att skapa databasen\n"
+
+#: pg_restore.c:404
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=NAMN         �terst�ll namngivet index\n"
 
-#: pg_restore.c:391
-msgid "  -l, --list               print summarized TOC of the archive\n"
-msgstr "  -l, --list               skriv ut summerad TOC f�r arkivet\n"
-
-#: pg_restore.c:392
+#: pg_restore.c:405
 msgid ""
 "  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
 "                           output from this file\n"
@@ -1852,15 +1957,16 @@ msgstr ""
 "  -L, --use-list=FILNAMN   anv�nd angiven TOC f�r att f� utdata-ordning\n"
 "                           fr�n denna fil\n"
 
-#: pg_restore.c:394
+#: pg_restore.c:407
 msgid "  -N, --orig-order         restore in original dump order\n"
-msgstr "  -N, --orig-order         �terst�ll i originalordning fr�n dumpningen\n"
+msgstr ""
+"  -N, --orig-order         �terst�ll i originalordning fr�n dumpningen\n"
 
-#: pg_restore.c:395
+#: pg_restore.c:408
 msgid "  -o, --oid-order          restore in OID order\n"
 msgstr "  -o, --oid-order          �terst�ll i OID-ordning\n"
 
-#: pg_restore.c:396
+#: pg_restore.c:409
 msgid ""
 "  -O, --no-owner           do not reconnect to database to match\n"
 "                           object owner\n"
@@ -1868,7 +1974,7 @@ msgstr ""
 "  -O, --no-owner           �teruppkoppla inte mot databas f�r att match\n"
 "                           objekt�garen\n"
 
-#: pg_restore.c:399
+#: pg_restore.c:411
 msgid ""
 "  -P, --function=NAME(args)\n"
 "                           restore named function\n"
@@ -1876,40 +1982,44 @@ msgstr ""
 "  -P, --function=NAMN(argument)\n"
 "                           �terst�ll namngiven funktion\n"
 
-#: pg_restore.c:401
+#: pg_restore.c:413
 msgid ""
 "  -r, --rearrange          rearrange output to put indexes etc. at end\n"
-msgstr "  -r, --rearrange          kasta om utdata s� att index osv. kommer sist\n"
+msgstr ""
+"  -r, --rearrange          kasta om utdata s� att index osv. kommer sist\n"
 
-#: pg_restore.c:402
+#: pg_restore.c:414
 msgid "  -R, --no-reconnect       disallow ALL reconnections to the database\n"
 msgstr "  -R, --no-reconnect       till�t inte �teruppkoppling mot databasen\n"
 
-#: pg_restore.c:403
+#: pg_restore.c:415
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr "  -s, --schema-only        �terst�ll bara scheman, inte data\n"
 
-#: pg_restore.c:404
+#: pg_restore.c:416
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use for\n"
 "                           disabling triggers\n"
-msgstr "  -S, --superuser=NAMN     ange superanv�ndarens namn f�r att sl� av utl�sare\n"
+msgstr ""
+"  -S, --superuser=NAMN     ange superanv�ndarens namn f�r att sl� av "
+"utl�sare\n"
 
-#: pg_restore.c:406
+#: pg_restore.c:418
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NAMN         �terst�ll namngiven tabell\n"
 
-#: pg_restore.c:407
+#: pg_restore.c:419
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NAMN       �terst�ll namngiven utl�sare\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:420
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
 "revoke)\n"
-msgstr "  -x, --no-privileges      �terst�ll inte �tkomstr�ttigheter (grant/revoke)\n"
+msgstr ""
+"  -x, --no-privileges      �terst�ll inte �tkomstr�ttigheter (grant/revoke)\n"
 
-#: pg_restore.c:412
+#: pg_restore.c:421
 msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
@@ -1919,36 +2029,19 @@ msgstr ""
 "                           anv�nd kommandot SET SESSION AUTHORIZATION\n"
 "                           om m�jligt ist�llet f�r att �teruppkoppla\n"
 
-#: pg_restore.c:419
+#: pg_restore.c:427
 msgid "  -a                       restore only the data, no schema\n"
 msgstr "  -a                       �terst�ll bara data, inte schema\n"
 
-#: pg_restore.c:421
+#: pg_restore.c:429
 msgid "  -C                       issue commands to create the database\n"
 msgstr "  -C                       utf�r kommandon f�r att skapa databasen\n"
 
-#: pg_restore.c:422
-msgid "  -d NAME                  output database name\n"
-msgstr "  -d NAMN                  databasnamn f�r utmatning\n"
-
-#: pg_restore.c:424
-msgid "  -F {c|t}                 specify backup file format\n"
-msgstr "  -F {c|t}                 backupformat (c:eget, t:tar)\n"
-
-#: pg_restore.c:426
-msgid ""
-"  -i                       proceed even when server version mismatches\n"
-msgstr "  -i                       forts�tt �ven n�r versionerna inte st�mmer\n"
-
-#: pg_restore.c:427
+#: pg_restore.c:430
 msgid "  -I NAME                  restore named index\n"
 msgstr "  -I NAMN                  �terst�ll namngivet index\n"
 
-#: pg_restore.c:428
-msgid "  -l                       print summarized TOC of the archive\n"
-msgstr "  -l                       skriv ut summerad TOC f�r arkivet\n"
-
-#: pg_restore.c:429
+#: pg_restore.c:431
 msgid ""
 "  -L FILENAME              use specified table of contents for ordering\n"
 "                           output from this file\n"
@@ -1956,15 +2049,16 @@ msgstr ""
 "  -L FILNAMN               anv�nd angiven TOC f�r att f� utdata-ordning\n"
 "                           fr�n denna fil\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:433
 msgid "  -N                       restore in original dump order\n"
-msgstr "  -N                       �terst�ll i originalordning fr�n dumpningen\n"
+msgstr ""
+"  -N                       �terst�ll i originalordning fr�n dumpningen\n"
 
-#: pg_restore.c:432
+#: pg_restore.c:434
 msgid "  -o                       restore in OID order\n"
 msgstr "  -o                       �terst�ll i OID-ordning\n"
 
-#: pg_restore.c:433
+#: pg_restore.c:435
 msgid ""
 "  -O                       do not reconnect to database to match\n"
 "                           object owner\n"
@@ -1972,44 +2066,49 @@ msgstr ""
 "  -O                       �teruppkoppla inte mot databas f�r att match\n"
 "                           objekt�garen\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:437
 msgid "  -P NAME(args)            restore named function\n"
 msgstr "  -P NAMN(arg)             �terst�ll namngiven funktion\n"
 
-#: pg_restore.c:437
+#: pg_restore.c:438
 msgid ""
 "  -r                       rearrange output to put indexes etc. at end\n"
-msgstr "  -r                       kasta om utdata s� att index osv. kommer sist\n"
+msgstr ""
+"  -r                       kasta om utdata s� att index osv. kommer sist\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:439
 msgid "  -R                       disallow ALL reconnections to the database\n"
-msgstr "  -R                       till�t inte n�gon �teruppkoppling mot databasen\n"
+msgstr ""
+"  -R                       till�t inte n�gon �teruppkoppling mot databasen\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:440
 msgid "  -s                       restore only the schema, no data\n"
 msgstr "  -s                       �terst�ll bara scheman, inte data\n"
 
-#: pg_restore.c:440
+#: pg_restore.c:441
 msgid ""
 "  -S NAME                  specify the superuser user name to use for\n"
 "                           disabling triggers\n"
-msgstr "  -S NAMN                  ange superanv�ndarens namn f�r att sl� av utl�sare\n"
+msgstr ""
+"  -S NAMN                  ange superanv�ndarens namn f�r att sl� av "
+"utl�sare\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:443
 msgid "  -t NAME                  restore named table\n"
 msgstr "  -t NAMN                  �terst�ll namngiven tabell\n"
 
-#: pg_restore.c:443
+#: pg_restore.c:444
 msgid "  -T NAME                  restore named trigger\n"
 msgstr "  -T NAMN                  �terst�ll namngiven utl�sare\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:445
 msgid ""
 "  -x                       skip restoration of access privileges (grant/"
 "revoke)\n"
-msgstr "  -x                       �terst�ll inte �tkomstr�ttigheter (grant/revoke)\n"
+msgstr ""
+"  -x                       �terst�ll inte �tkomstr�ttigheter (grant/revoke)\n"
 
-#: pg_restore.c:448
+#: pg_restore.c:446
 msgid ""
 "  -X use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
@@ -2019,7 +2118,7 @@ msgstr ""
 "                           anv�nd kommandot SET SESSION AUTHORIZATION\n"
 "                           om m�jligt ist�llet f�r att �teruppkoppla\n"
 
-#: pg_restore.c:454
+#: pg_restore.c:465
 msgid ""
 "\n"
 "If no input file name is supplied, then standard input is used.\n"
@@ -2029,7 +2128,7 @@ msgstr ""
 "Om inget indatafilnamn �r angivet, s� kommer standard in att anv�ndas.\n"
 "\n"
 
-#: pg_dumpall.c:214
+#: pg_dumpall.c:215
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -2038,20 +2137,24 @@ msgstr ""
 "%s extraherar ett PostgreSQL databaskluster till en SQL-scriptfil.\n"
 "\n"
 
-#: pg_dumpall.c:216
+#: pg_dumpall.c:217
 #, c-format
+msgid "  %s [OPTION]...\n"
+msgstr "  %s [FLAGGA]...\n"
+
+#: pg_dumpall.c:219
 msgid ""
-"  %s [OPTIONS]\n"
 "\n"
+"Options:\n"
 msgstr ""
-"  %s [FLAGGOR]\n"
 "\n"
+"Flaggor:\n"
 
-#: pg_dumpall.c:220
+#: pg_dumpall.c:221
 msgid "  -c, --clean              clean (drop) databases prior to create\n"
 msgstr "  -c, --clean              nollst�ll (drop) databaser innan skapande\n"
 
-#: pg_dumpall.c:223
+#: pg_dumpall.c:224
 msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr "  -g, --globals-only       dumpa bara globala objekt, inte databaser\n"
 
@@ -2063,15 +2166,15 @@ msgstr ""
 "  -i, --ignore-version     forts�tt �ven n�r serverns version inte �r\n"
 "                           samma som pg_dumpall-versionen\n"
 
-#: pg_dumpall.c:233
+#: pg_dumpall.c:230
 msgid "  -c                       clean (drop) databases prior to create\n"
 msgstr "  -c                       nollst�ll (drop) databaser innan skapande\n"
 
-#: pg_dumpall.c:236
+#: pg_dumpall.c:233
 msgid "  -g                       dump only global objects, no databases\n"
 msgstr "  -g                       dumpa bara globala objekt, inte databaser\n"
 
-#: pg_dumpall.c:238
+#: pg_dumpall.c:234
 msgid ""
 "  -i                       proceed even when server version mismatches\n"
 "                           pg_dumpall version\n"
@@ -2079,7 +2182,7 @@ msgstr ""
 "  -i                       forts�tt �ven n�r serverns version inte �r\n"
 "                           samma som pg_dumpall-versionen\n"
 
-#: pg_dumpall.c:247
+#: pg_dumpall.c:255
 msgid ""
 "\n"
 "The SQL script will be written to the standard output.\n"
@@ -2089,52 +2192,52 @@ msgstr ""
 "SQL-scriptet kommer att skrivas till standard ut.\n"
 "\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:570
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: dumpar databas \"%s\"...\n"
 
-#: pg_dumpall.c:568
+#: pg_dumpall.c:576
 #, c-format
 msgid "%s: pg_dump failed on %s, exiting\n"
 msgstr "%s: pg_dump misslyckades med %s, avslutar\n"
 
-#: pg_dumpall.c:590
+#: pg_dumpall.c:611
 #, c-format
 msgid "%s: running %s\n"
 msgstr "%s: k�r %s\n"
 
-#: pg_dumpall.c:630
+#: pg_dumpall.c:652
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: kunde inte ansluta till databasen %s\n"
 
-#: pg_dumpall.c:653
+#: pg_dumpall.c:675
 #, c-format
 msgid "%s: could not connect to database %s: %s\n"
 msgstr "%s: kunde inte ansluta till databasen %s: %s\n"
 
-#: pg_dumpall.c:661
+#: pg_dumpall.c:683
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: kunde inte h�mta serverversionen\n"
 
-#: pg_dumpall.c:670
+#: pg_dumpall.c:692
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: kunde inte tolka versionstr�ngen \"%s\"\n"
 
-#: pg_dumpall.c:692
+#: pg_dumpall.c:714
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: fr�ga misslyckades: %s"
 
-#: pg_dumpall.c:693
+#: pg_dumpall.c:715
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: fr�gan var: %s\n"
 
-#: pg_dumpall.c:739
+#: pg_dumpall.c:761
 #, c-format
 msgid ""
 "%s: could not find pg_dump\n"
diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index 88062cf9f9e9236f67a740d91851a70ff5a20da5..e38eaf95b88db6daff27ea73654f1114c51f2ac9 100644
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
@@ -1,5 +1,5 @@
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.4 2002/10/14 19:04:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.5 2003/06/28 22:31:01 petere Exp $
 CATALOG_NAME	:= pg_resetxlog
-AVAIL_LANGUAGES	:= de pt_BR ru sv zh_CN
+AVAIL_LANGUAGES	:= de hu pt_BR ru sv zh_CN
 GETTEXT_FILES	:= pg_resetxlog.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_resetxlog/po/de.po b/src/bin/pg_resetxlog/po/de.po
index 8048e0e4875f19f107a08a511318b48d8895a265..10bd70165edb6634febbd543074a88e0531f90f6 100644
--- a/src/bin/pg_resetxlog/po/de.po
+++ b/src/bin/pg_resetxlog/po/de.po
@@ -1,56 +1,73 @@
 # German message translation file for pg_resetxlog
 # Peter Eisentraut <peter_e@gmx.net>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/de.po,v 1.1 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/de.po,v 1.2 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: �%s�
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-09-22 17:17+0200\n"
-"PO-Revision-Date: 2002-09-22 22:38+0200\n"
+"POT-Creation-Date: 2002-11-13 20:39+0100\n"
+"PO-Revision-Date: 2002-11-13 20:45+0100\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:144
+#, c-format
+msgid "%s: invalid argument for -x option\n"
+msgstr "%s: ung�ltiges Argument f�r Option -x\n"
+
+#: pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175 pg_resetxlog.c:182
+#: pg_resetxlog.c:188 pg_resetxlog.c:196
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Versuchen sie �%s --help� f�r weitere Informationen.\n"
+
+#: pg_resetxlog.c:150
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: Transaktions-ID (-x) darf nicht 0 sein\n"
 
-#: pg_resetxlog.c:149
+#: pg_resetxlog.c:159
 #, c-format
-msgid "%s: invalid argument for -l option\n"
-msgstr "%s: ung�ltiges Argument f�r Option -l\n"
+msgid "%s: invalid argument for -o option\n"
+msgstr "%s: ung�ltiges Argument f�r Option -o\n"
 
-#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#: pg_resetxlog.c:165
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Versuchen sie �%s --help� f�r weitere Informationen.\n"
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) darf nicht 0 sein\n"
 
-#: pg_resetxlog.c:163
+#: pg_resetxlog.c:174 pg_resetxlog.c:181
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: ung�ltiges Argument f�r Option -l\n"
+
+#: pg_resetxlog.c:195
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: kein Datenverzeichnis angegeben\n"
 
-#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#: pg_resetxlog.c:215 pg_resetxlog.c:311
 #, c-format
 msgid "%s: could not open %s for reading: %s\n"
 msgstr "%s: konnte %s nicht zum Lesen �ffnen: %s\n"
 
-#: pg_resetxlog.c:189
+#: pg_resetxlog.c:221
 #, c-format
 msgid ""
 "%s: lock file %s exists\n"
 "Is a server running? If not, delete the lock file and try again.\n"
 msgstr ""
 "%s: Sperrdatei %s besteht\n"
-"L�uft der Server? Wenn nicht, dann Sperrdatei l�schen und nochmal versuchen.\n"
+"L�uft der Server? Wenn nicht, dann Sperrdatei l�schen und nochmal "
+"versuchen.\n"
 
-#: pg_resetxlog.c:210
+#: pg_resetxlog.c:260
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -59,7 +76,7 @@ msgstr ""
 "Wenn diese Werte akzeptabel scheinen, dann benutzen Sie -f um das\n"
 "Zur�cksetzen zu erzwingen.\n"
 
-#: pg_resetxlog.c:222
+#: pg_resetxlog.c:272
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -70,11 +87,11 @@ msgstr ""
 "Wenn Sie trotzdem weiter machen wollen, benutzen Sie -f um das\n"
 "Zur�cksetzen zu erzwingen.\n"
 
-#: pg_resetxlog.c:247
+#: pg_resetxlog.c:285
 msgid "Transaction log reset\n"
 msgstr "Transaktionslog wurde zur�ck gesetzt\n"
 
-#: pg_resetxlog.c:276
+#: pg_resetxlog.c:314
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, do\n"
@@ -85,188 +102,240 @@ msgstr ""
 "  touch %s\n"
 "und versuchen Sie es erneut.\n"
 
-#: pg_resetxlog.c:289
+#: pg_resetxlog.c:327
 #, c-format
 msgid "%s: could not read %s: %s\n"
 msgstr "%s: konnte %s nicht lesen: %s\n"
 
-#: pg_resetxlog.c:312
+#: pg_resetxlog.c:350
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
-msgstr "%s: pg_control existiert aber mit ung�ltiger CRC; mit Vorsicht fortfahren\n"
+msgstr ""
+"%s: pg_control existiert aber mit ung�ltiger CRC; mit Vorsicht fortfahren\n"
 
-#: pg_resetxlog.c:321
+#: pg_resetxlog.c:359
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control ist kaputt oder hat unbekannte Version; wird ignoriert\n"
+msgstr ""
+"%s: pg_control ist kaputt oder hat unbekannte Version; wird ignoriert\n"
 
-#: pg_resetxlog.c:363
+#: pg_resetxlog.c:410
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s: ung�ltige LC_COLLATE-Einstellung\n"
 
-#: pg_resetxlog.c:370
+#: pg_resetxlog.c:417
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s: ung�ltige LC_CTYPE-Einstellung\n"
 
-#: pg_resetxlog.c:392
+#: pg_resetxlog.c:439
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
-msgstr "Gesch�tzte pg_control-Werte:\n\n"
+msgstr ""
+"Gesch�tzte pg_control-Werte:\n"
+"\n"
 
-#: pg_resetxlog.c:394
+#: pg_resetxlog.c:441
 msgid ""
 "pg_control values:\n"
 "\n"
-msgstr "pg_control-Werte:\n\n"
+msgstr ""
+"pg_control-Werte:\n"
+"\n"
 
-#: pg_resetxlog.c:396
+#: pg_resetxlog.c:443
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control-Versionsnummer:            %u\n"
 
-#: pg_resetxlog.c:397
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Katalog-Versionsnummer:               %u\n"
 
-#: pg_resetxlog.c:398
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "Aktuelle Logdatei-ID:                 %u\n"
 
-#: pg_resetxlog.c:399
+#: pg_resetxlog.c:446
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "N�chstes Logdatei-Segment:            %u\n"
 
-#: pg_resetxlog.c:400
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
 msgstr "StartUpID vom letzten Checkpoint:     %u\n"
 
-#: pg_resetxlog.c:401
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "NextXID vom letzten Checkpoint:       %u\n"
 
-#: pg_resetxlog.c:402
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID vom letzten Checkpoint:       %u\n"
 
-#: pg_resetxlog.c:403
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Datenbank-Blockgr��e:                 %u\n"
 
-#: pg_resetxlog.c:404
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Bl�cke pro Segment:                   %u\n"
 
-#: pg_resetxlog.c:405
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maximale Namensl�nge:                 %u\n"
+
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "Maximale Funktionsargumente:          %u\n"
+
+#: pg_resetxlog.c:454
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Datum/Zeit-Speicherung:               %s\n"
+
+#: pg_resetxlog.c:455
+msgid "64-bit integers"
+msgstr "64-Bit-Integers"
+
+#: pg_resetxlog.c:455
+msgid "Floating point"
+msgstr "Flie�komma"
+
+#: pg_resetxlog.c:456
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "Maximall�nge eines Locale-Namen:      %u\n"
+
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_resetxlog.c:406
+#: pg_resetxlog.c:458
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:459
+#: pg_resetxlog.c:511
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
-msgstr "%s: interner Fehler -- sizeof(ControlFileData) is zu gro� ... xlog.c reparieren\n"
+msgstr ""
+"%s: interner Fehler -- sizeof(ControlFileData) is zu gro� ... xlog.c "
+"reparieren\n"
 
-#: pg_resetxlog.c:472
+#: pg_resetxlog.c:524
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: konnte pg_control Datei nicht erstellen: %s\n"
 
-#: pg_resetxlog.c:483
+#: pg_resetxlog.c:535
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%sL konnte pg_control Datei nicht schreiben: %s\n"
 
-#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#: pg_resetxlog.c:542 pg_resetxlog.c:683
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync-Fehler: %s\n"
 
-#: pg_resetxlog.c:511
+#: pg_resetxlog.c:563
 #, c-format
 msgid "%s: could not open directory %s: %s\n"
 msgstr "%s: konnte Verzeichnis %s nicht �ffnen: %s\n"
 
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:577
 #, c-format
 msgid "%s: could not delete file %s: %s\n"
 msgstr "%s: konnte Datei %s nicht l�schen: %s\n"
 
-#: pg_resetxlog.c:535
+#: pg_resetxlog.c:587
 #, c-format
 msgid "%s: could not read from directory %s: %s\n"
 msgstr "%s: konnte aus dem Verzeichnis %s nicht lesen: %s\n"
 
-#: pg_resetxlog.c:598
+#: pg_resetxlog.c:650
 #, c-format
 msgid "%s: could not open %s: %s\n"
 msgstr "%s: konnte %s nicht �ffnen: %s\n"
 
-#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#: pg_resetxlog.c:661 pg_resetxlog.c:675
 #, c-format
 msgid "%s: could not write %s: %s\n"
 msgstr "%s: konnte nicht nach %s schreiben: %s\n"
 
-#: pg_resetxlog.c:642
+#: pg_resetxlog.c:694
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
 "\n"
-msgstr "%s setzt den PostgreSQL-Transaktionslog zur�ck.\n\n"
+msgstr ""
+"%s setzt den PostgreSQL-Transaktionslog zur�ck.\n"
+"\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:695
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTIONS] DATADIR\n"
+"  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
 "Benutzung:\n"
-"  %s [OPTIONEN] DATENVERZEICHNIS\n"
+"  %s [OPTION]... DATENVERZEICHNIS\n"
 "\n"
 
-#: pg_resetxlog.c:644
+#: pg_resetxlog.c:696
 msgid "Options:\n"
 msgstr "Optionen:\n"
 
-#: pg_resetxlog.c:645
-msgid "  -f                force update to be done\n"
-msgstr "  -f                �nderung erzwingen\n"
+#: pg_resetxlog.c:697
+msgid "  -f              force update to be done\n"
+msgstr "  -f              �nderung erzwingen\n"
 
-#: pg_resetxlog.c:646
+#: pg_resetxlog.c:698
 msgid ""
-"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
-msgstr "  -l DATEIID,SEG    minimale WAL-Startposition f�r neuen Log erzwingen\n"
+msgstr "  -l DATEIID,SEG  minimale WAL-Startposition f�r neuen Log erzwingen\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:699
 msgid ""
-"  -n                no update, just show extracted control values (for "
+"  -n              no update, just show extracted control values (for "
 "testing)\n"
-msgstr "  -n                keine �nderung, nur Kontrolldaten anzeigen (zum Testen)\n"
+msgstr "  -n              keine �nderung, nur Kontrolldaten anzeigen (zum Testen)\n"
 
-#: pg_resetxlog.c:648
-msgid "  -x XID            set next transaction ID\n"
-msgstr "  -x XID            n�chste Transaktions-ID setzen\n"
+#: pg_resetxlog.c:700
+msgid "  -o OID          set next OID\n"
+msgstr "  -o OID          n�chste OID setzen\n"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:701
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID          n�chste Transaktions-ID setzen\n"
+
+#: pg_resetxlog.c:702
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          diese Hilfe anzeigen, dann beenden\n"
+
+#: pg_resetxlog.c:703
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       Versionsinformationen anzeigen, dann beenden\n"
+
+#: pg_resetxlog.c:704
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "\nBerichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Berichten Sie Fehler an <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/pg_resetxlog/po/pt_BR.po b/src/bin/pg_resetxlog/po/pt_BR.po
index 742139fd0fe6b4252cab2bd4327904582fc5838a..2f585152f983eb0b652bdb697874a5a8d4d4e272 100644
--- a/src/bin/pg_resetxlog/po/pt_BR.po
+++ b/src/bin/pg_resetxlog/po/pt_BR.po
@@ -1,75 +1,92 @@
 # Translation to Portuguese (Brazilian) language
-# Cesar Suga <sartre@linuxbr.com>, 2002.
-# Fair & Simple Networks Ltda.
+# Cesar Suga <sartre@linuxbr.com>, 2002. - Fair & Simple Networks Ltda.
+# Roberto Mello <rmello@fslc.usu.edu>
 #
+
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-09-29 06:35-0300\n"
-"PO-Revision-Date: 2002-09-29 06:45-0300\n"
-"Last-Translator: Cesar Suga <sartre@linuxbr.com>\n"
-"Language-Team: Cesar Suga <sartre@linuxbr.com>\n"
+"POT-Creation-Date: 2002-12-05 04:20-0500\n"
+"PO-Revision-Date: 2002-12-05 13:01-0700\n"
+"Last-Translator: Roberto Mello <rmello@fslc.usu.edu>\n"
+"Language-Team: Roberto Mello <rmello@fslc.usu.edu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:144
+#, fuzzy, c-format
+msgid "%s: invalid argument for -x option\n"
+msgstr "%s: argumento inv�lido para a op��o -x\n"
+
+#: pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175 pg_resetxlog.c:182
+#: pg_resetxlog.c:188 pg_resetxlog.c:196
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Tente '%s --help' para mais informa��o.\n"
+
+#: pg_resetxlog.c:150
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: ID de transa��o (-x) n�o pode ser 0\n"
 
-#: pg_resetxlog.c:149
-#, c-format
-msgid "%s: invalid argument for -l option\n"
+#: pg_resetxlog.c:159
+#, fuzzy, c-format
+msgid "%s: invalid argument for -o option\n"
 msgstr "%s: argumento inv�lido para a op��o -l\n"
 
-#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#: pg_resetxlog.c:165
+#, fuzzy, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: ID de transa��o (-x) n�o pode ser 0\n"
+
+#: pg_resetxlog.c:174 pg_resetxlog.c:181
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Tente '%s --help' para mais informa��o.\n"
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: argumento inv�lido para a op��o -l\n"
 
-#: pg_resetxlog.c:163
+#: pg_resetxlog.c:195
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: nenhum diret�rio de dados especificado\n"
 
-#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#: pg_resetxlog.c:215 pg_resetxlog.c:311
 #, c-format
 msgid "%s: could not open %s for reading: %s\n"
 msgstr "%s: n�o pude abrir %s para leitura: %s\n"
 
-#: pg_resetxlog.c:189
+#: pg_resetxlog.c:221
 #, c-format
 msgid ""
 "%s: lock file %s exists\n"
 "Is a server running? If not, delete the lock file and try again.\n"
 msgstr ""
 "%s: arquivo de lock %s existe\n"
-"H� algum servidor rodando? Se n�o, delete o arquivo de lock e tente novamente.\n"
+"H� algum servidor rodando? Se n�o, apague o arquivo de trava e tente novamente.\n"
 
-#: pg_resetxlog.c:210
+#: pg_resetxlog.c:260
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
 msgstr ""
 "\n"
-"Se estes valores parecem aceit�veis, use -f para for�ar o reset.\n"
+"Se estes valores lhe parecem aceit�veis, use -f para for�ar o rein�cio (reset).\n"
 
-#: pg_resetxlog.c:222
+#: pg_resetxlog.c:272
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
 "If you want to proceed anyway, use -f to force reset.\n"
 msgstr ""
-"O servidor de banco de dados n�o foi desativado corretamente.\n"
-"Resetar o log de transa��o pode causar perdas de dados.\n"
+"O servidor de banco de dados n�o foi desligado corretamente.\n"
+"Reiniciar o log de transa��o pode causar perdas de dados.\n"
 "Se voc� quer continuar de qualquer forma, use -f para for�ar o reset.\n"
 
-#: pg_resetxlog.c:247
+#: pg_resetxlog.c:285
 msgid "Transaction log reset\n"
 msgstr "Reset do log de transa��o\n"
 
-#: pg_resetxlog.c:276
+#: pg_resetxlog.c:314
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, do\n"
@@ -78,34 +95,34 @@ msgid ""
 msgstr ""
 "Se voc� tem certeza de que o diret�rio de dados est� correto, fa�a\n"
 "  touch %s\n"
-"e tente noavmente.\n"
+"e tente novamente.\n"
 
-#: pg_resetxlog.c:289
+#: pg_resetxlog.c:327
 #, c-format
 msgid "%s: could not read %s: %s\n"
 msgstr "%s: n�o pude ler %s: %s\n"
 
-#: pg_resetxlog.c:312
+#: pg_resetxlog.c:350
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control existe mas tem CRC inv�lido: prossiga com cuidado\n"
 
-#: pg_resetxlog.c:321
+#: pg_resetxlog.c:359
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control existe mas � de vers�o desconhecida ou n�o funciona; ignorando\n"
+msgstr "%s: pg_control existe mas � de vers�o desconhecida ou n�o funciona; ignorando-o\n"
 
-#: pg_resetxlog.c:363
+#: pg_resetxlog.c:410
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
-msgstr "%s: setagem de LC_COLLATE inv�lida\n"
+msgstr "%s: valor de LC_COLLATE inv�lido\n"
 
-#: pg_resetxlog.c:370
+#: pg_resetxlog.c:417
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
-msgstr "%s: setagem LC_CTYPE inv�lida\n"
+msgstr "%s: valor LC_CTYPE inv�lido\n"
 
-#: pg_resetxlog.c:392
+#: pg_resetxlog.c:439
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -113,7 +130,7 @@ msgstr ""
 "Valores de pg_control supostos:\n"
 "\n"
 
-#: pg_resetxlog.c:394
+#: pg_resetxlog.c:441
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -121,158 +138,202 @@ msgstr ""
 "Valores de pg_control:\n"
 "\n"
 
-#: pg_resetxlog.c:396
+#: pg_resetxlog.c:443
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "N�mero de vers�o do pg_control:       %u\n"
 
-#: pg_resetxlog.c:397
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Catalog version number:               %u\n"
-msgstr "N�mero de vers�o de cat�logo:         %u\n"
+msgstr "N�mero de vers�o do cat�logo:         %u\n"
 
-#: pg_resetxlog.c:398
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "ID de arquivo de log atual:           %u\n"
 
-#: pg_resetxlog.c:399
+#: pg_resetxlog.c:446
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Pr�ximo segmento de arquivo de log:   %u\n"
 
-#: pg_resetxlog.c:400
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "�ltimo StartUpID do checkpoint:       %u\n"
+msgstr "�ltimo StartUpID do ponto de checagem (checkpoint):       %u\n"
 
-#: pg_resetxlog.c:401
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "�ltimo NextXID do checkpoint:         %u\n"
+msgstr "�ltimo NextXID do ponto de checagem (checkpoint):         %u\n"
 
-#: pg_resetxlog.c:402
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "�ltimo NextOID do checkpoint:         %u\n"
+msgstr "�ltimo NextOID do ponto de checagem (checkpoint):         %u\n"
 
-#: pg_resetxlog.c:403
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Tamanho de bloco do banco de dados:   %u\n"
 
-#: pg_resetxlog.c:404
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
-msgstr "Blocos/segmento de rela��o grande:   %u\n"
+msgstr "Blocos por segmento de rela��o grande:   %u\n"
+
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Tamanho maximo de identificadores:        %u\n"
 
-#: pg_resetxlog.c:405
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "N�mero maximo de argumentos de fun��o: %u\n"
+
+#: pg_resetxlog.c:454
+#, fuzzy, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Armazenamento de tipos Date/time:               %s\n"
+
+#: pg_resetxlog.c:455
+msgid "64-bit integers"
+msgstr "Inteiros de 64 bits"
+
+#: pg_resetxlog.c:455
+msgid "Floating point"
+msgstr "Ponto flutuante"
+
+#: pg_resetxlog.c:456
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "Tamanho maximo de nome de localidade:        %u\n"
+
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_resetxlog.c:406
+#: pg_resetxlog.c:458
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:459
+#: pg_resetxlog.c:511
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr ""
-"%s: erro interno -- sizeof(ControlFileData) muito grande ... consertar xlog.c\n"
+"%s: erro interno -- sizeof(ControlFileData) � muito grande ... conserte o xlog."
+"c\n"
 
-#: pg_resetxlog.c:472
+#: pg_resetxlog.c:524
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: n�o pude criar arquivo de pg_control: %s\n"
 
-#: pg_resetxlog.c:483
+#: pg_resetxlog.c:535
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
-msgstr "%s: n�o pude escerver arquivo de pg_control: %s\n"
+msgstr "%s: n�o pude escrever arquivo de pg_control: %s\n"
 
-#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#: pg_resetxlog.c:542 pg_resetxlog.c:683
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: erro de fsync: %s\n"
 
-#: pg_resetxlog.c:511
+#: pg_resetxlog.c:563
 #, c-format
 msgid "%s: could not open directory %s: %s\n"
 msgstr "%s: n�o pude abrir diret�rio %s: %s\n"
 
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:577
 #, c-format
 msgid "%s: could not delete file %s: %s\n"
-msgstr "%s: n�o pude deletar arquivo %s: %s\n"
+msgstr "%s: n�o pude apagar arquivo %s: %s\n"
 
-#: pg_resetxlog.c:535
+#: pg_resetxlog.c:587
 #, c-format
 msgid "%s: could not read from directory %s: %s\n"
 msgstr "%s: n�o pude ler do diret�rio %s: %s\n"
 
-#: pg_resetxlog.c:598
+#: pg_resetxlog.c:650
 #, c-format
 msgid "%s: could not open %s: %s\n"
 msgstr "%s: n�o pude ler %s: %s\n"
 
-#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#: pg_resetxlog.c:661 pg_resetxlog.c:675
 #, c-format
 msgid "%s: could not write %s: %s\n"
 msgstr "%s: n�o pude escrever %s: %s\n"
 
-#: pg_resetxlog.c:642
+#: pg_resetxlog.c:694
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
 "\n"
 msgstr ""
-"%s reseta o log de transa��o PostgreSQL.\n"
+"%s reinicia o log de transa��o do PostgreSQL.\n"
 "\n"
 
-#: pg_resetxlog.c:643
-#, c-format
+#: pg_resetxlog.c:695
+#, fuzzy, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTIONS] DATADIR\n"
+"  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
 "Uso:\n"
 "  %s [OP��ES] DATADIR\n"
 "\n"
 
-#: pg_resetxlog.c:644
+#: pg_resetxlog.c:696
 msgid "Options:\n"
 msgstr "Op��es:\n"
 
-#: pg_resetxlog.c:645
-msgid "  -f                force update to be done\n"
-msgstr "  -f                for�a o update a ser feito\n"
+#: pg_resetxlog.c:697
+#, fuzzy
+msgid "  -f              force update to be done\n"
+msgstr "  -f                for�a a atualiza��o a ser feita\n"
 
-#: pg_resetxlog.c:646
+#: pg_resetxlog.c:698
+#, fuzzy
 msgid ""
-"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
-msgstr ""
-"  -l FILEID,SEG     for�a localiza��o m�nima de WAL para novos logs de transa��o\n"
+msgstr "  -l FILEID,SEG     for�a localiza��o m�nima de WAL para novos logs de transa��o\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:699
+#, fuzzy
 msgid ""
-"  -n                no update, just show extracted control values (for "
+"  -n              no update, just show extracted control values (for "
 "testing)\n"
-msgstr ""
-"  -n                sem update, s� mostra valores de controle extra�dos (para teste)\n"
+msgstr "  -n                sem atualiza��o, s� mostra valores de controle extra�dos (para teste)\n"
+
+#: pg_resetxlog.c:700
+#, fuzzy
+msgid "  -o OID          set next OID\n"
+msgstr "  -x XID            acerta pr�ximo ID de transa��o\n"
+
+#: pg_resetxlog.c:701
+#, fuzzy
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID            acerta pr�ximo ID de transa��o\n"
+
+#: pg_resetxlog.c:702
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          mostra essa ajuda e termina\n"
 
-#: pg_resetxlog.c:648
-msgid "  -x XID            set next transaction ID\n"
-msgstr "  -x XID            seta pr�ximo ID de transa��o\n"
+#: pg_resetxlog.c:703
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       mostra informas de vers�o e termina\n"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:704
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Reportar bugs a <pgsql-bugs@postgresql.org>.\n"
+"Relatar problemas para <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/pg_resetxlog/po/sv.po b/src/bin/pg_resetxlog/po/sv.po
index 4fac3f3b7a542550785386dd555d1a7fb8a03bac..61666a86abf039daa35ea8e22a97347822b5c190 100644
--- a/src/bin/pg_resetxlog/po/sv.po
+++ b/src/bin/pg_resetxlog/po/sv.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-10-04 04:17-0400\n"
-"PO-Revision-Date: 2002-10-04 18:28+0200\n"
+"POT-Creation-Date: 2002-10-25 04:17-0400\n"
+"PO-Revision-Date: 2002-10-26 06:51+0200\n"
 "Last-Translator: Dennis Bj�rklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -126,13 +126,17 @@ msgstr "%s: ogiltig inst
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
-msgstr "Gissade pg_control-v�rden:\n\n"
+msgstr ""
+"Gissade pg_control-v�rden:\n"
+"\n"
 
 #: pg_resetxlog.c:441
 msgid ""
 "pg_control values:\n"
 "\n"
-msgstr "pg_control-v�rden:\n\n"
+msgstr ""
+"pg_control-v�rden:\n"
+"\n"
 
 #: pg_resetxlog.c:443
 #, c-format
@@ -268,17 +272,19 @@ msgstr "%s: kunde inte skriva %s: %s\n"
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
 "\n"
-msgstr "%s �terst�ller PostgreSQL transaktionslogg.\n\n"
+msgstr ""
+"%s �terst�ller PostgreSQL transaktionslogg.\n"
+"\n"
 
 #: pg_resetxlog.c:695
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTIONS] DATADIR\n"
+"  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
 "Anv�ndning:\n"
-"  %s [FLAGGOR] DATAKATALOG\n"
+"  %s [FLAGGA]... DATAKATALOG\n"
 "\n"
 
 #: pg_resetxlog.c:696
@@ -286,31 +292,41 @@ msgid "Options:\n"
 msgstr "Flaggor:\n"
 
 #: pg_resetxlog.c:697
-msgid "  -f                force update to be done\n"
-msgstr "  -f                forcera �terst�llande\n"
+msgid "  -f              force update to be done\n"
+msgstr "  -f              forcera �terst�llande\n"
 
 #: pg_resetxlog.c:698
 msgid ""
-"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
-msgstr "  -l FILID,SEG      ange minsta WAL-startposition f�r ny transaktionslogg\n"
+msgstr "  -l FILID,SEG    ange minsta WAL-startposition f�r ny transaktionslogg\n"
 
 #: pg_resetxlog.c:699
 msgid ""
-"  -n                no update, just show extracted control values (for "
+"  -n              no update, just show extracted control values (for "
 "testing)\n"
-msgstr "  -n                ingen updatering, visa bara kontrollv�rden (f�r testning)\n"
+msgstr "  -n              ingen updatering, visa bara kontrollv�rden (f�r testning)\n"
 
 #: pg_resetxlog.c:700
-msgid "  -o OID            set next OID\n"
-msgstr "  -o OID            s�tt n�sta OID\n"
+msgid "  -o OID          set next OID\n"
+msgstr "  -o OID          s�tt n�sta OID\n"
 
 #: pg_resetxlog.c:701
-msgid "  -x XID            set next transaction ID\n"
-msgstr "  -x XID            s�tt n�sta transaktions-ID\n"
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID          s�tt n�sta transaktions-ID\n"
 
 #: pg_resetxlog.c:702
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          visa den h�r hj�lpen, avsluta sedan\n"
+
+#: pg_resetxlog.c:703
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       visa versionsinformation, avsluta sedan\n"
+
+#: pg_resetxlog.c:704
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "\nReportera buggar till <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Reportera buggar till <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index fe7b95d781d26eceb2f93e7c49e907b15a40ee6e..2b4f6f7463d53a50e9bb61096ed0e28f60e378c4 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -1,6 +1,6 @@
-# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.7 2001/11/29 18:59:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.8 2003/06/28 22:31:01 petere Exp $
 CATALOG_NAME	:= psql
-AVAIL_LANGUAGES	:= cs de fr ru sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de fr hu ru sv zh_CN zh_TW
 GETTEXT_FILES	:= command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c startup.c describe.c
 GETTEXT_TRIGGERS:= _ psql_error simple_prompt
diff --git a/src/bin/psql/po/de.po b/src/bin/psql/po/de.po
index f81942fcb7f7b8d38309d99c9b205c3e41a926ce..91856f92dd647c1c7244737dae1803706c386916 100644
--- a/src/bin/psql/po/de.po
+++ b/src/bin/psql/po/de.po
@@ -1,273 +1,273 @@
 # German message translation file for psql
 # Peter Eisentraut <peter_e@gmx.net>, 2001, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/po/de.po,v 1.2 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/de.po,v 1.3 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: �%s�
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-09-22 17:30+0200\n"
-"PO-Revision-Date: 2002-09-22 17:33+0200\n"
+"POT-Creation-Date: 2002-11-13 20:29+0100\n"
+"PO-Revision-Date: 2002-11-13 20:37+0100\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: command.c:155
+#: command.c:156
 msgid "Warning: This syntax is deprecated.\n"
 msgstr "Warnung: Dieser Syntax is veraltet.\n"
 
-#: command.c:162
+#: command.c:163
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Ung�ltige Anweisung \\%s.  Versuchen Sie \\? f�r Hilfe.\n"
 
-#: command.c:164
+#: command.c:165
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "ung�ltige Anweisung \\%s\n"
 
-#: command.c:291
+#: command.c:292
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "konnte Home-Verzeichnis nicht ermitteln: %s\n"
 
-#: command.c:307
+#: command.c:308
 #, c-format
 msgid "\\%s: could not change directory to '%s': %s\n"
 msgstr "\\%s: konnte nicht in das Verzeichnis �%s� wechseln: %s\n"
 
-#: command.c:403 command.c:762
+#: command.c:404 command.c:764
 msgid "no query buffer\n"
 msgstr "kein Abfragepuffer\n"
 
-#: command.c:458
+#: command.c:459
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: ung�ltiger Kodierungsname oder Umwandlungsprozedur nicht gefunden\n"
 
-#: command.c:518 command.c:549 command.c:560 command.c:574 command.c:616
-#: command.c:742 command.c:771
+#: command.c:520 command.c:551 command.c:562 command.c:576 command.c:618
+#: command.c:744 command.c:773
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: notwendiges Argument fehlt\n"
 
-#: command.c:604
+#: command.c:606
 msgid "Query buffer is empty."
 msgstr "Abfragepuffer ist leer."
 
-#: command.c:637
+#: command.c:639
 msgid "Query buffer reset (cleared)."
 msgstr "Abfragepuffer wurde gel�scht."
 
-#: command.c:648
+#: command.c:650
 #, c-format
 msgid "Wrote history to %s.\n"
 msgstr "History nach %s geschrieben.\n"
 
-#: command.c:688 command.c:1142 command.c:1239 command.c:1923 common.c:56
-#: copy.c:92 describe.c:41 mainloop.c:80 mainloop.c:386
+#: command.c:690 command.c:1144 command.c:1241 command.c:1929 common.c:64
+#: copy.c:90 copy.c:118 describe.c:41 mainloop.c:80 mainloop.c:388
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: command.c:697 command.c:747
+#: command.c:699 command.c:749
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: Fehler\n"
 
-#: command.c:726
+#: command.c:728
 msgid "Timing is on."
 msgstr "Zeitmessung ist an."
 
-#: command.c:729
+#: command.c:731
 msgid "Timing is off."
 msgstr "Zeitmessung ist aus."
 
-#: command.c:786 command.c:806 command.c:1002 command.c:1015 command.c:1026
-#: command.c:1580 command.c:1593 command.c:1605 command.c:1618 command.c:1632
-#: command.c:1646 command.c:1676 common.c:105 copy.c:308
+#: command.c:788 command.c:808 command.c:1004 command.c:1017 command.c:1028
+#: command.c:1586 command.c:1599 command.c:1611 command.c:1624 command.c:1638
+#: command.c:1652 command.c:1682 common.c:113 copy.c:381
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:872
+#: command.c:874
 #, c-format
 msgid "\\%s: extra argument '%s' ignored\n"
 msgstr "\\%s: �berfl�ssiges Argument �%s� ignoriert\n"
 
-#: command.c:963 command.c:991 command.c:1115
+#: command.c:965 command.c:993 command.c:1117
 msgid "parse error at the end of line\n"
 msgstr "Parse-Fehler am Zeilenende\n"
 
-#: command.c:1354 command.c:1378 startup.c:175 startup.c:193
+#: command.c:1356 command.c:1380 startup.c:175 startup.c:193
 msgid "Password: "
 msgstr "Passwort: "
 
-#: command.c:1392 common.c:154 common.c:247 common.c:419
+#: command.c:1394 common.c:162 common.c:282 common.c:468
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1396
+#: command.c:1398
 msgid "Previous connection kept\n"
 msgstr "Vorherige Verbindung wurde behalten\n"
 
-#: command.c:1408
+#: command.c:1410
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1420
+#: command.c:1422
 #, c-format
 msgid "You are now connected to database %s.\n"
 msgstr "Sie sind jetzt mit der Datenbank %s verbunden.\n"
 
-#: command.c:1422
+#: command.c:1424
 #, c-format
 msgid "You are now connected as new user %s.\n"
 msgstr "Sie sind jetzt als neuer Benutzer %s verbunden.\n"
 
-#: command.c:1425
+#: command.c:1427
 #, c-format
 msgid "You are now connected to database %s as user %s.\n"
 msgstr "Sie sind jetzt mit der Datenbank %s als Benutzer %s verbunden.\n"
 
-#: command.c:1518
+#: command.c:1524
 #, c-format
 msgid "could not start editor %s\n"
 msgstr "konnte Editor %s nicht starten\n"
 
-#: command.c:1520
+#: command.c:1526
 msgid "could not start /bin/sh\n"
 msgstr "konnte /bin/sh nicht starten\n"
 
-#: command.c:1565
+#: command.c:1571
 #, c-format
 msgid "could not open temporary file %s: %s\n"
 msgstr "konnte tempor�re Datei %s nicht �ffnen: %s\n"
 
-#: command.c:1749
+#: command.c:1755
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset: zul�ssige Formate sind unaligned, aligned, html, latex\n"
 
-#: command.c:1754
+#: command.c:1760
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Ausgabeformat ist �%s�.\n"
 
-#: command.c:1764
+#: command.c:1770
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Rahmenstil ist %d.\n"
 
-#: command.c:1773
+#: command.c:1779
 msgid "Expanded display is on.\n"
 msgstr "Erweiterte Anzeige ist an.\n"
 
-#: command.c:1774
+#: command.c:1780
 msgid "Expanded display is off.\n"
 msgstr "Erweiterte Anzeige ist aus.\n"
 
-#: command.c:1786
+#: command.c:1792
 #, c-format
 msgid "Null display is '%s'.\n"
 msgstr "Null-Anzeige ist �%s�.\n"
 
-#: command.c:1798
+#: command.c:1804
 #, c-format
 msgid "Field separator is '%s'.\n"
 msgstr "Feldtrennzeichen ist �%s�.\n"
 
-#: command.c:1812
+#: command.c:1818
 msgid "Record separator is <newline>."
 msgstr "Satztrennzeichen ist <newline>."
 
-#: command.c:1814
+#: command.c:1820
 #, c-format
 msgid "Record separator is '%s'.\n"
 msgstr "Satztrennzeichen ist �%s�.\n"
 
-#: command.c:1825
+#: command.c:1831
 msgid "Showing only tuples."
 msgstr "Zeige nur Datenzeilen."
 
-#: command.c:1827
+#: command.c:1833
 msgid "Tuples only is off."
 msgstr "Nur Datenzeilen ist aus."
 
-#: command.c:1843
+#: command.c:1849
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Titel ist �%s�.\n"
 
-#: command.c:1845
+#: command.c:1851
 msgid "Title is unset.\n"
 msgstr "Titel ist nicht gesetzt.\n"
 
-#: command.c:1861
+#: command.c:1867
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Tabellenattribut ist �%s�.\n"
 
-#: command.c:1863
+#: command.c:1869
 msgid "Table attributes unset.\n"
 msgstr "Tabellenattribute sind nicht gesetzt.\n"
 
-#: command.c:1874
+#: command.c:1880
 msgid "Using pager is on."
 msgstr "Pager-Verwendung ist an."
 
-#: command.c:1876
+#: command.c:1882
 msgid "Using pager is off."
 msgstr "Pager-Verwendung ist aus."
 
-#: command.c:1887
+#: command.c:1893
 msgid "Default footer is on."
 msgstr "Standardfu�zeile ist an."
 
-#: command.c:1889
+#: command.c:1895
 msgid "Default footer is off."
 msgstr "Standardfu�zeile ist aus."
 
-#: command.c:1895
+#: command.c:1901
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: unbekannte Option: %s\n"
 
-#: command.c:1938
+#: command.c:1944
 msgid "\\!: failed\n"
 msgstr "\\!: fehlgeschlagen\n"
 
-#: common.c:49
+#: common.c:57
 #, c-format
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: xstrdup: Versuch NULL-Zeiger zu kopieren (interner Fehler)\n"
 
-#: common.c:215 common.c:304
+#: common.c:230 common.c:343
 msgid "You are currently not connected to a database.\n"
 msgstr "Sie sind gegenw�rtig nicht mit einer Datenbank verbunden.\n"
 
-#: common.c:254 common.c:429
+#: common.c:289 common.c:478
 msgid "connection to server was lost\n"
 msgstr "Verbindung zum Server wurde verloren\n"
 
-#: common.c:257 common.c:432
+#: common.c:292 common.c:481
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Die Verbindung zum Server wurde verloren.  Versuche Reset: "
 
-#: common.c:261 common.c:436
+#: common.c:296 common.c:485
 msgid "Failed.\n"
 msgstr "Fehlgeschlagen.\n"
 
-#: common.c:271 common.c:448
+#: common.c:306 common.c:497
 msgid "Succeeded.\n"
 msgstr "Erfolgreich.\n"
 
-#: common.c:312
+#: common.c:351
 #, c-format
 msgid ""
 "***(Single step mode: Verify query)"
@@ -282,7 +282,7 @@ msgstr ""
 "***(Dr�cken Sie die Eingabetaste um fortzufahren oder �x� um abzubrechen)"
 "*******\n"
 
-#: common.c:408
+#: common.c:457
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -290,40 +290,40 @@ msgstr ""
 "Geben Sie die zu kopierenden Daten ein, gefolgt von einem Zeilenende.\n"
 "Beenden Sie mit einem Backslash und einem Punkt alleine auf einer Zeile."
 
-#: common.c:454
+#: common.c:503
 #, c-format
 msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
 msgstr "Aynchrones NOTIFY �%s� von Backend mit PID %d empfangen.\n"
 
-#: common.c:466
+#: common.c:516 common.c:519
 #, c-format
 msgid "Time: %.2f ms\n"
 msgstr "Zeit: %.2f ms\n"
 
-#: copy.c:86
+#: copy.c:112
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: ben�tigt Argumente\n"
 
-#: copy.c:234
+#: copy.c:292
 #, c-format
 msgid "\\copy: parse error at '%s'\n"
 msgstr "\\copy: Parse-Fehler bei �%s�\n"
 
-#: copy.c:236
+#: copy.c:294
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: Parse-Fehler am Zeilenende\n"
 
-#: copy.c:319
+#: copy.c:392
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: ein Verzeichnis kann nicht kopiert werden\n"
 
-#: copy.c:340
+#: copy.c:413
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:344
+#: copy.c:417
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: unerwartete Antwort (%d)\n"
@@ -346,153 +346,166 @@ msgstr "konnte aktuellen Benutzernamen nicht ermitteln: %s\n"
 msgid ""
 "This is psql %s, the PostgreSQL interactive terminal.\n"
 "\n"
-msgstr "Dies ist psql %s, das interaktive PostgreSQL-Terminal.\n\n"
+msgstr ""
+"Dies ist psql %s, das interaktive PostgreSQL-Terminal.\n"
+"\n"
 
 #: help.c:85
 msgid "Usage:"
 msgstr "Benutzung:"
 
 #: help.c:86
-msgid "  psql [OPTIONS] [DBNAME [USERNAME]]\n"
-msgstr "  psql [OPTIONEN] [DBNAME [BENUTZERNAME]]\n"
-
-#: help.c:87
-msgid "Options:"
-msgstr "Optionen:"
+msgid "  psql [OPTIONS]... [DBNAME [USERNAME]]\n"
+msgstr "  psql [OPTION]... [DBNAME [BENUTZERNAME]]\n"
 
 #: help.c:88
-msgid "  -a              Echo all input from script"
-msgstr "  -a              Gib Skript-Inhalt wieder"
+msgid "General options:"
+msgstr "Allgemeine Optionen:"
 
-#: help.c:89
-msgid "  -A              Unaligned table output mode (-P format=unaligned)"
+#: help.c:93
+#, c-format
+msgid "  -d DBNAME       specify database name to connect to (default: %s)\n"
 msgstr ""
-"  -A              Unausgerichteter Tabellenausgabemodus (-P format=unaligned)"
+"  -d DBNAME       Datenbank, zu der verbunden werden soll (Standard: %s)\n"
+
+#: help.c:94
+msgid "  -c COMMAND      run only single command (SQL or internal) and exit"
+msgstr "  -c ANWEISUNG    f�hre einzelne Anweisung aus und beende"
 
-#: help.c:90
-msgid "  -c COMMAND      Run only single command (SQL or internal) and exit"
-msgstr "  -c ANWEISUNG    F�hre einzelne Anweisung aus und beende"
+#: help.c:95
+msgid "  -f FILENAME     execute commands from file, then exit"
+msgstr "  -f DATEINAME    f�hre Anweisungen aus Datei aus und beende danach"
 
 #: help.c:96
-#, c-format
-msgid "  -d DBNAME       Specify database name to connect to (default: %s)\n"
-msgstr ""
-"  -d DBNAME       Datenbank, zu der verbunden werden soll (Standard: %s)\n"
+msgid "  -l              list available databases, then exit"
+msgstr "  -l              zeige verf�gbare Datenbanken und beende"
+
+#: help.c:97
+msgid "  -v NAME=VALUE   set psql variable 'NAME' to 'VALUE'"
+msgstr "  -v NAME=WERT    setze psql-Variable �NAME� auf �WERT�"
 
 #: help.c:98
-msgid "  -e              Echo commands sent to server"
-msgstr ""
-"  -e              Zeige Anweisungen, die an den Server geschickt werden"
+msgid "  -X              do not read startup file (~/.psqlrc)"
+msgstr "  -X              lese die Startdatei nicht (~/.psqlrc)"
 
 #: help.c:99
-msgid "  -E              Display queries that internal commands generate"
-msgstr ""
-"  -E              Zeige Abfragen, die von internen Anweisungen erzeugt werden"
+msgid "  --help          show this help, then exit"
+msgstr "  -l              zeige verf�gbare Datenbanken und beende"
 
 #: help.c:100
-msgid "  -f FILENAME     Execute commands from file, then exit"
-msgstr "  -f DATEINAME    F�hre Anweisungen aus Datei aus und beende danach"
+msgid "  --version       output version information, then exit"
+msgstr "  -V              zeige Versionsinformationen und beende"
 
-#: help.c:101
-#, c-format
+#: help.c:102
 msgid ""
-"  -F STRING       Set field separator (default: \"%s\") (-P fieldsep=)\n"
-msgstr ""
-"  -F ZEICHEN      Setze Feldtrennzeichen (Standard: �%s�) (-P fieldsep=)\n"
+"\n"
+"Input and output options:"
+msgstr "\nEingabe- und Ausgabeoptionen:"
+
+#: help.c:103
+msgid "  -a              echo all input from script"
+msgstr "  -a              gib Skript-Inhalt wieder"
+
+#: help.c:104
+msgid "  -e              echo commands sent to server"
+msgstr "  -e              zeige Anweisungen, die an den Server geschickt werden"
+
+#: help.c:105
+msgid "  -E              display queries that internal commands generate"
+msgstr "  -E              zeige Abfragen, die von internen Anweisungen erzeugt werden"
 
 #: help.c:106
-#, c-format
-msgid "  -h HOSTNAME     Specify database server host (default: %s)\n"
-msgstr "  -h HOSTNAME     Hostname des Datenbankservers (Standard: %s)\n"
+msgid "  -q              run quietly (no messages, only query output)"
+msgstr "  -q              stille Ausf�hrung (keine Mitteilungen, nur Abfrageergebnisse)"
 
 #: help.c:107
-msgid "local socket"
-msgstr "lokales Socket"
+msgid "  -o FILENAME     send query results to file (or |pipe)"
+msgstr "  -o DATEINAME    sende Abfrageergebnisse in Datei (oder |Pipe)"
+
+#: help.c:108
+msgid "  -n              disable enhanced command line editing (readline)"
+msgstr "  -n              schalte erweiterte Zeilenbearbeitung (Readline) aus"
 
 #: help.c:109
-msgid "  -H              HTML table output mode (-P format=html)"
-msgstr "  -H              HTML-Tabellenausgabemodus (-P format=html)"
+msgid "  -s              single step mode (confirm each query)"
+msgstr "  -s              Einzelschrittmodus (best�tige jede Abfrage)"
 
 #: help.c:110
-msgid "  -l              List available databases, then exit"
-msgstr "  -l              Zeige verf�gbare Datenbanken und beende"
-
-#: help.c:111
-msgid "  -n              Disable enhanced command line editing (readline)"
-msgstr "  -n              Schalte erweiterte Zeilenbearbeitung (Readline) aus"
+msgid "  -S              single line mode (end of line terminates SQL command)"
+msgstr "  -S              Einzelzeilenmodus (Zeilenende beendet SQL-Anweisung)"
 
 #: help.c:112
-msgid "  -o FILENAME     Send query results to file (or |pipe)"
-msgstr "  -o DATEINAME    Sende Abfrageergebnisse in Datei (oder |Pipe)"
+msgid ""
+"\n"
+"Output format options:"
+msgstr "\nAusgabeformatoptionen:"
+
+#: help.c:113
+msgid "  -A              unaligned table output mode (-P format=unaligned)"
+msgstr "  -A              unausgerichteter Tabellenausgabemodus (-P format=unaligned)"
+
+#: help.c:114
+msgid "  -H              HTML table output mode (-P format=html)"
+msgstr "  -H              HTML-Tabellenausgabemodus (-P format=html)"
+
+#: help.c:115
+msgid "  -t              print rows only (-P tuples_only)"
+msgstr "  -t              gebe nur Datenzeilen aus (-P tuples_only)"
 
 #: help.c:116
-#, c-format
-msgid "  -p PORT         Specify database server port (default: %s)\n"
-msgstr "  -p PORT         Port des Datenbankservers (Standard: %s)\n"
+msgid ""
+"  -T TEXT         set HTML table tag attributes (width, border) (-P "
+"tableattr=)"
+msgstr "  -T TEXT         setze HTML �table�-Tag-Attribute (z.B. width) (-P tableattr=)"
 
-#: help.c:119
+#: help.c:117
+msgid "  -x              turn on expanded table output (-P expanded)"
+msgstr "  -x              schalte erweiterte Tabellenausgabe ein (-P expanded)"
+
+#: help.c:118
 msgid ""
-"  -P VAR[=ARG]    Set printing option 'VAR' to 'ARG' (see \\pset command)"
-msgstr ""
-"  -P VAR[=ARG]    Setze Ausgabeoption �VAR� auf �ARG� (siehe \\pset-"
-"Anweisung)"
+"  -P VAR[=ARG]    set printing option 'VAR' to 'ARG' (see \\pset command)"
+msgstr "  -P VAR[=ARG]    setze Ausgabeoption �VAR� auf �ARG� (siehe \\pset-Anweisung)"
 
-#: help.c:120
-msgid "  -q              Run quietly (no messages, only query output)"
-msgstr ""
-"  -q              Stille Ausf�hrung (keine Mitteilungen, nur "
-"Abfrageergebnisse)"
+#: help.c:119
+#, c-format
+msgid ""
+"  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"
+msgstr "  -F ZEICHEN      setze Feldtrennzeichen (Standard: �%s�) (-P fieldsep=)\n"
 
 #: help.c:121
 msgid ""
-"  -R STRING       Set record separator (default: newline) (-P recordsep=)"
-msgstr ""
-"  -R ZEICHEN      Setze Satztrennzeichen (Standard: newline) (-P recordsep=)"
-
-#: help.c:122
-msgid "  -s              Single step mode (confirm each query)"
-msgstr "  -s              Einzelschrittmodus (best�tige jede Abfrage)"
+"  -R STRING       set record separator (default: newline) (-P recordsep=)"
+msgstr "  -R ZEICHEN      setze Satztrennzeichen (Standard: newline) (-P recordsep=)"
 
 #: help.c:123
-msgid "  -S              Single line mode (end of line terminates SQL command)"
-msgstr "  -S              Einzelzeilenmodus (Zeilenende beendet SQL-Anweisung)"
-
-#: help.c:124
-msgid "  -t              Print rows only (-P tuples_only)"
-msgstr "  -t              Gebe nur Datenzeilen aus (-P tuples_only)"
-
-#: help.c:125
 msgid ""
-"  -T TEXT         Set HTML table tag attributes (width, border) (-P "
-"tableattr=)"
-msgstr ""
-"  -T TEXT         Setze HTML �table�-Tag-Attribute (z.B. width) (-P "
-"tableattr=)"
+"\n"
+"Connection options:"
+msgstr "\nVerbindungsoptionen:"
 
-#: help.c:131
+#: help.c:126
 #, c-format
-msgid "  -U NAME         Specify database user name (default: %s)\n"
-msgstr "  -U NAME         Datenbank-Benutzername (Standard: %s)\n"
-
-#: help.c:133
-msgid "  -v NAME=VALUE   Set psql variable 'NAME' to 'VALUE'"
-msgstr "  -v NAME=WERT    Setze psql-Variable �NAME� auf �WERT�"
+msgid "  -h HOSTNAME     specify database server host (default: %s)\n"
+msgstr "  -h HOSTNAME     Hostname des Datenbankservers (Standard: %s)\n"
 
-#: help.c:134
-msgid "  -V              Show version information and exit"
-msgstr "  -V              Zeige Versionsinformationen und beende"
+#: help.c:127
+msgid "local socket"
+msgstr "lokales Socket"
 
-#: help.c:135
-msgid "  -W              Prompt for password (should happen automatically)"
-msgstr "  -W              Frage nach Passwort (sollte automatisch passieren)"
+#: help.c:130
+#, c-format
+msgid "  -p PORT         specify database server port (default: %s)\n"
+msgstr "  -p PORT         Port des Datenbankservers (Standard: %s)\n"
 
 #: help.c:136
-msgid "  -x              Turn on expanded table output (-P expanded)"
-msgstr "  -x              Schalte erweiterte Tabellenausgabe ein (-P expanded)"
+#, c-format
+msgid "  -U NAME         specify database user name (default: %s)\n"
+msgstr "  -U NAME         Datenbank-Benutzername (Standard: %s)\n"
 
 #: help.c:137
-msgid "  -X              Do not read startup file (~/.psqlrc)"
-msgstr "  -X              Lese die Startdatei nicht (~/.psqlrc)"
+msgid "  -W              prompt for password (should happen automatically)"
+msgstr "  -W              frage nach Passwort (sollte automatisch passieren)"
 
 #: help.c:140
 msgid ""
@@ -510,13 +523,13 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>."
 
-#: help.c:211
+#: help.c:174
 msgid " \\a             toggle between unaligned and aligned output mode\n"
 msgstr ""
 " \\a             schalte zwischen unausgerichtetem und ausgerichtetem\n"
 "                Ausgabemodus um\n"
 
-#: help.c:212
+#: help.c:175
 #, c-format
 msgid ""
 " \\c[onnect] [DBNAME|- [USER]]\n"
@@ -525,27 +538,27 @@ msgstr ""
 " \\c[onnect] [DBNAME|- [BENUTZER]]\n"
 "                Verbinde mit neuer Datenbank (aktuell �%s�)\n"
 
-#: help.c:215
+#: help.c:178
 msgid " \\C [STRING]    set table title, or unset if none\n"
 msgstr " \\C [TITEL]     Tabellentitel setzen und l�schen\n"
 
-#: help.c:216
+#: help.c:179
 msgid " \\cd [DIR]      change the current working directory\n"
 msgstr " \\cd [VERZ]     wechsle Arbeitsverzeichnis\n"
 
-#: help.c:217
+#: help.c:180
 msgid " \\copy ...      perform SQL COPY with data stream to the client host\n"
 msgstr " \\copy ...      f�hre SQL COPY mit Datenstrom auf Clienthost aus\n"
 
-#: help.c:218
+#: help.c:181
 msgid " \\copyright     show PostgreSQL usage and distribution terms\n"
 msgstr " \\copyright     zeige PostgreSQL-Urheberrechtsinformationen\n"
 
-#: help.c:219
+#: help.c:182
 msgid " \\d [NAME]      describe table, index, sequence, or view\n"
 msgstr " \\d [NAME]      beschreibe Tabelle, Index, Sequenz oder Sicht\n"
 
-#: help.c:220
+#: help.c:183
 msgid ""
 " \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
 "                list tables/indexes/sequences/views/system tables\n"
@@ -553,88 +566,89 @@ msgstr ""
 " \\d{t|i|s|v|S} [MUSTER] (�+� f�r mehr Detail hinzuf�gen)\n"
 "                liste Tabellen/Indizes/Sequenzen/Sichten auf\n"
 
-#: help.c:222
+#: help.c:185
 msgid " \\da [PATTERN]  list aggregate functions\n"
 msgstr " \\da [MUSTER]   liste Aggregatfunktionen auf\n"
 
-#: help.c:223
+#: help.c:186
 msgid " \\dd [PATTERN]  show comment for object\n"
 msgstr " \\dd [MUSTER]   Kommentar f�r Objekt anzeigen\n"
 
-#: help.c:224
+#: help.c:187
 msgid " \\dD [PATTERN]  list domains\n"
 msgstr " \\dD [MUSTER]   liste Dom�nen auf\n"
 
-#: help.c:225
+#: help.c:188
 msgid " \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
 msgstr ""
 " \\df [MUSTER]   liste Funktionen auf (�+� hinzuf�gen f�r mehr Detail)\n"
 
-#: help.c:226
+#: help.c:189
 msgid " \\do [NAME]     list operators\n"
 msgstr " \\do [NAME]     liste Operatoren auf\n"
 
-#: help.c:227
+#: help.c:190
 msgid " \\dl            list large objects, same as \\lo_list\n"
 msgstr " \\dl            liste Large Objects auf, wie \\lo_list\n"
 
-#: help.c:228
+#: help.c:191
 msgid " \\dp [PATTERN]  list table access privileges\n"
 msgstr " \\dp [MUSTER]   zeige Tabellenzugriffsrechte\n"
 
-#: help.c:229
+#: help.c:192
 msgid " \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
-msgstr " \\dT [MUSTER]   liste Datentypen auf (�+� f�r mehr Detail hinzuf�gen)\n"
+msgstr ""
+" \\dT [MUSTER]   liste Datentypen auf (�+� f�r mehr Detail hinzuf�gen)\n"
 
-#: help.c:230
+#: help.c:193
 msgid " \\du [PATTERN]  list users\n"
 msgstr " \\du [MUSTER]   liste Benutzer auf\n"
 
-#: help.c:231
+#: help.c:194
 msgid " \\e [FILE]      edit the query buffer (or file) with external editor\n"
 msgstr ""
 " \\e [DATEI]     bearbeite Abfragepuffer (oder Datei) mit externem Editor\n"
 
-#: help.c:232
+#: help.c:195
 msgid " \\echo [STRING] write string to standard output\n"
 msgstr " \\echo [TEXT]   schreibe Text auf Standardausgabe\n"
 
-#: help.c:233
+#: help.c:196
 msgid " \\encoding [ENCODING]  show or set client encoding\n"
 msgstr " \\encoding [KODIERUNG]  setze Client-Kodierung\n"
 
-#: help.c:234
+#: help.c:197
 msgid ""
 " \\f [STRING]    show or set field separator for unaligned query output\n"
 msgstr " \\f [ZEICHEN]   setze Feldtrennzeichen\n"
 
-#: help.c:235
+#: help.c:198
 msgid ""
 " \\g [FILE]      send query buffer to server (and results to file or |pipe)\n"
 msgstr ""
 " \\g [DATEI]     f�hre SQL-Anweisung aus (und schreibe Ergebnis in Datei\n"
 "                oder |Pipe)\n"
 
-#: help.c:236
+#: help.c:199
 msgid " \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
 msgstr ""
 " \\h [NAME]      Syntaxhilfe �ber SQL-Anweisung, oder * f�r alle "
 "Anweisungen\n"
 
-#: help.c:237
+#: help.c:200
 #, c-format
 msgid " \\H             toggle HTML output mode (currently %s)\n"
 msgstr " \\H             schalte HTML-Ausgabemodus um (gegenw�rtig %s)\n"
 
-#: help.c:239
+#: help.c:202
 msgid " \\i FILE        execute commands from file\n"
 msgstr " \\i DATEI       f�hre Anweisungen aus Datei aus\n"
 
-#: help.c:240
+#: help.c:203
 msgid " \\l             list all databases\n"
 msgstr " \\l             liste alle Datenbanken auf\n"
 
-#: help.c:241
+#: help.c:204
 msgid ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                large object operations\n"
@@ -642,15 +656,15 @@ msgstr ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                Large-Object-Operationen\n"
 
-#: help.c:243
+#: help.c:206
 msgid " \\o FILE        send all query results to file or |pipe\n"
 msgstr " \\o DATEI       schreibe alle Abfrageergebnisse in Datei oder |Pipe\n"
 
-#: help.c:244
+#: help.c:207
 msgid " \\p             show the contents of the query buffer\n"
 msgstr " \\p             zeige aktuellen Inhalt der Abfragepuffers\n"
 
-#: help.c:245
+#: help.c:208
 msgid ""
 " \\pset NAME [VALUE]  set table output option\n"
 "                (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
@@ -660,71 +674,71 @@ msgstr ""
 "                (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
 "                tuples_only|title|tableattr|pager})\n"
 
-#: help.c:248
+#: help.c:211
 msgid " \\q             quit psql\n"
 msgstr " \\q             beende psql\n"
 
-#: help.c:249
+#: help.c:212
 msgid " \\qecho [STRING]  write string to query output stream (see \\o)\n"
 msgstr ""
 " \\qecho [TEXT]  schreibe Text auf Ausgabestrom f�r Abfrageergebnisse (siehe "
 "\\o)\n"
 
-#: help.c:250
+#: help.c:213
 msgid " \\r             reset (clear) the query buffer\n"
 msgstr " \\r             l�sche Abfragepuffer\n"
 
-#: help.c:251
+#: help.c:214
 msgid " \\s [FILE]      display history or save it to file\n"
 msgstr ""
 " \\s [DATEI]     gib Kommandogeschichte aus oder schreibe sie in Datei\n"
 
-#: help.c:252
+#: help.c:215
 msgid ""
 " \\set [NAME [VALUE]]  set internal variable, or list all if no parameters\n"
 msgstr " \\set [NAME [WERT]]  setze interne Variable\n"
 
-#: help.c:253
+#: help.c:216
 #, c-format
 msgid " \\t             show only rows (currently %s)\n"
 msgstr " \\t             zeige nur Datenzeilen (gegenw�rtig %s)\n"
 
-#: help.c:255
+#: help.c:218
 msgid " \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
 msgstr " \\T [TEXT]      setze oder l�sche HTML <table>-Tag Attribute\n"
 
-#: help.c:256
+#: help.c:219
 #, c-format
 msgid " \\timing        toggle timing of commands (currently %s)\n"
 msgstr " \\timing        schalte Zeitmessung um (gegenw�rtig %s)\n"
 
-#: help.c:258
+#: help.c:221
 msgid " \\unset NAME    unset (delete) internal variable\n"
 msgstr " \\unset NAME    l�sche interne Variable\n"
 
-#: help.c:259
+#: help.c:222
 msgid " \\w [FILE]      write query buffer to file\n"
 msgstr " \\w [DATEI]     schreibe aktuellen Abfragepuffer in eine Datei\n"
 
-#: help.c:260
+#: help.c:223
 #, c-format
 msgid " \\x             toggle expanded output (currently %s)\n"
 msgstr " \\x             schalte erweiterte Ausgabe um (gegenw�rtig %s)\n"
 
-#: help.c:262
+#: help.c:225
 msgid " \\z [PATTERN]   list table access privileges (same as \\dp)\n"
 msgstr " \\z [MUSTER]    zeige Tabellenzugriffsrechte (wie \\dp)\n"
 
-#: help.c:263
+#: help.c:226
 msgid " \\! [COMMAND]   execute command in shell or start interactive shell\n"
 msgstr ""
 " \\! [KOMMANDO]  f�hre Kommando in Shell aus oder starte interaktive Shell\n"
 
-#: help.c:290
-msgid "Available help:"
-msgstr "Verf�gbare Hilfe:"
+#: help.c:256
+msgid "Available help:\n"
+msgstr "Verf�gbare Hilfe:\n"
 
-#: help.c:321
+#: help.c:294
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -739,7 +753,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:332
+#: help.c:305
 #, c-format
 msgid ""
 "No help available for '%-.*s'.\n"
@@ -773,8 +787,8 @@ msgstr "\\lo_import: nicht mit einer Datenbank verbunden\n"
 msgid "\\lo_unlink: not connected to a database\n"
 msgstr "\\lo_unlink: nicht mit einer Datenbank verbunden\n"
 
-#: describe.c:86 describe.c:136 describe.c:209 describe.c:271 describe.c:318
-#: describe.c:417 describe.c:692 describe.c:1267 large_obj.c:363
+#: describe.c:86 describe.c:137 describe.c:210 describe.c:272 describe.c:319
+#: describe.c:418 describe.c:693 describe.c:1268 large_obj.c:363
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -787,15 +801,15 @@ msgstr "Large Objects"
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "Verwenden Sie �\\q�, um %s zu verlassen.\n"
 
-#: print.c:412
+#: print.c:413
 msgid "(No rows)\n"
 msgstr "(Keine Zeilen)\n"
 
-#: print.c:1147
+#: print.c:1114
 msgid "(1 row)"
 msgstr "(1 Zeile)"
 
-#: print.c:1149
+#: print.c:1116
 #, c-format
 msgid "(%d rows)"
 msgstr "(%d Zeilen)"
@@ -873,19 +887,7 @@ msgstr "%s: Warnung: The Option -u is veraltet. Verwenden Sie -U.\n"
 msgid "contains support for command-line editing"
 msgstr "enth�lt Unterst�tzung f�r Kommandozeilenbearbeitung"
 
-#: startup.c:644
-msgid ""
-"Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"
-"Portions Copyright (c) 1996, Regents of the University of California\n"
-"Read the file COPYRIGHT or use the command \\copyright to see the\n"
-"usage and distribution terms."
-msgstr ""
-"Teile Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"
-"Teile Copyright (c) 1996, Regents of the University of California\n"
-"Lesen Sie die Datei COPYRIGHT oder verwenden Sie das Anweisung \\copyright\n"
-"um Urheberrechtsinformationen zu sehen."
-
-#: startup.c:669
+#: startup.c:664
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -894,13 +896,13 @@ msgstr ""
 "SSL-Verbindung (Verschl�sslungsmethode: %s, Bits: %i)\n"
 "\n"
 
-#: describe.c:85 describe.c:126 describe.c:196 describe.c:269 describe.c:363
-#: describe.c:417 describe.c:1260 describe.c:1365
+#: describe.c:85 describe.c:127 describe.c:197 describe.c:270 describe.c:364
+#: describe.c:418 describe.c:1261 describe.c:1367
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:85 describe.c:126 describe.c:196 describe.c:269 describe.c:311
-#: describe.c:417 describe.c:1260 describe.c:1366
+#: describe.c:85 describe.c:127 describe.c:197 describe.c:270 describe.c:312
+#: describe.c:418 describe.c:1261 describe.c:1368
 msgid "Name"
 msgstr "Name"
 
@@ -916,303 +918,303 @@ msgstr "Datentyp"
 msgid "List of aggregate functions"
 msgstr "Liste der Aggregatfunktionen"
 
-#: describe.c:126
+#: describe.c:127
 msgid "Result data type"
 msgstr "Ergebnisdatentyp"
 
-#: describe.c:127
+#: describe.c:128
 msgid "Argument data types"
 msgstr "Argumentdatentypen"
 
-#: describe.c:135 describe.c:311 describe.c:1262
+#: describe.c:136 describe.c:312 describe.c:1263
 msgid "Owner"
 msgstr "Eigent�mer"
 
-#: describe.c:135
+#: describe.c:136
 msgid "Language"
 msgstr "Sprache"
 
-#: describe.c:136
+#: describe.c:137
 msgid "Source code"
 msgstr "Quelltext"
 
-#: describe.c:170
+#: describe.c:171
 msgid "List of functions"
 msgstr "Liste der Funktionen"
 
-#: describe.c:206
+#: describe.c:207
 msgid "Internal name"
 msgstr "Interner Name"
 
-#: describe.c:206
+#: describe.c:207
 msgid "Size"
 msgstr "Gr��e"
 
-#: describe.c:238
+#: describe.c:239
 msgid "List of data types"
 msgstr "Liste der Datentypen"
 
-#: describe.c:270
+#: describe.c:271
 msgid "Left arg type"
 msgstr "Linker Typ"
 
-#: describe.c:270
+#: describe.c:271
 msgid "Right arg type"
 msgstr "Rechter Typ"
 
-#: describe.c:271
+#: describe.c:272
 msgid "Result type"
 msgstr "Ergebnistyp"
 
-#: describe.c:285
+#: describe.c:286
 msgid "List of operators"
 msgstr "Liste der Operatoren"
 
-#: describe.c:314
+#: describe.c:315
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: describe.c:330
+#: describe.c:331
 msgid "List of databases"
 msgstr "Liste der Datenbanken"
 
-#: describe.c:363 describe.c:1277
+#: describe.c:364 describe.c:1278
 msgid "Table"
 msgstr "Tabelle"
 
-#: describe.c:363
+#: describe.c:364
 msgid "Access privileges"
 msgstr "Zugangsrechte"
 
-#: describe.c:385
+#: describe.c:386
 #, c-format
 msgid "Access privileges for database \"%s\""
 msgstr "Zugriffsrechte f�r Datenbank �%s�"
 
-#: describe.c:417
+#: describe.c:418
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:428
+#: describe.c:429
 msgid "aggregate"
 msgstr "Aggregat"
 
-#: describe.c:446
+#: describe.c:447
 msgid "function"
 msgstr "Funktion"
 
-#: describe.c:460
+#: describe.c:461
 msgid "operator"
 msgstr "Operator"
 
-#: describe.c:474
+#: describe.c:475
 msgid "data type"
 msgstr "Datentyp"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "table"
 msgstr "Tabelle"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "view"
 msgstr "Sicht"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "index"
 msgstr "Index"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "sequence"
 msgstr "Sequenz"
 
-#: describe.c:507
+#: describe.c:508
 msgid "rule"
 msgstr "Rule"
 
-#: describe.c:523
+#: describe.c:524
 msgid "trigger"
 msgstr "Trigger"
 
-#: describe.c:541
+#: describe.c:542
 msgid "Object descriptions"
 msgstr "Objektbeschreibungen"
 
-#: describe.c:587
+#: describe.c:588
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Keine Relationen namens �%s� gefunden\n"
 
-#: describe.c:666
+#: describe.c:667
 #, c-format
 msgid "Did not find any relation with oid %s.\n"
 msgstr "Keine Relation mit OID %s gefunden\n"
 
-#: describe.c:679
+#: describe.c:680
 msgid "Column"
 msgstr "Spalte"
 
-#: describe.c:680 describe.c:1262 describe.c:1367
+#: describe.c:681 describe.c:1263 describe.c:1369
 msgid "Type"
 msgstr "Typ"
 
-#: describe.c:686
+#: describe.c:687
 msgid "Modifiers"
 msgstr "Attribute"
 
-#: describe.c:786
+#: describe.c:787
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabelle �%s.%s�"
 
-#: describe.c:790
+#: describe.c:791
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Sicht �%s.%s�"
 
-#: describe.c:794
+#: describe.c:795
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sequenz �%s.%s�"
 
-#: describe.c:798
+#: describe.c:799
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index �%s.%s�"
 
-#: describe.c:802
+#: describe.c:803
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "Spezielle Relation �%s.%s�"
 
-#: describe.c:806
+#: describe.c:807
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-Tabelle �%s.%s�"
 
-#: describe.c:810
+#: describe.c:811
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Zusammengesetzter Typ �%s.%s�"
 
-#: describe.c:814
+#: describe.c:815
 #, c-format
 msgid "?%c? \"%s.%s\""
 msgstr "?%c? �%s.%s�"
 
-#: describe.c:853
+#: describe.c:854
 msgid "primary key, "
 msgstr "Prim�rschl�ssel, "
 
-#: describe.c:855
+#: describe.c:856
 msgid "unique, "
 msgstr "eindeutig, "
 
-#: describe.c:861
+#: describe.c:862
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "f�r Tabelle �%s.%s�"
 
-#: describe.c:900
+#: describe.c:901
 #, c-format
 msgid "View definition: %s"
 msgstr "Sichtdefinition: %s"
 
-#: describe.c:906 describe.c:1102
+#: describe.c:907 describe.c:1103
 msgid "Rules"
 msgstr "Rules"
 
-#: describe.c:1026
+#: describe.c:1027
 msgid "Indexes"
 msgstr "Indizies"
 
-#: describe.c:1040
+#: describe.c:1041
 msgid " primary key"
 msgstr " Prim�rschl�ssel"
 
-#: describe.c:1042
+#: describe.c:1043
 msgid " unique"
 msgstr " eindeutig"
 
-#: describe.c:1063
+#: describe.c:1064
 msgid "Check constraints"
 msgstr "Check-Constraints"
 
-#: describe.c:1066
+#: describe.c:1067
 #, c-format
 msgid "%s: \"%s\" %s"
 msgstr "%s: �%s� %s"
 
-#: describe.c:1071
+#: describe.c:1072
 #, c-format
 msgid "%*s  \"%s\" %s"
 msgstr "%*s  �%s� %s"
 
-#: describe.c:1081
+#: describe.c:1082
 msgid "Foreign Key constraints"
 msgstr "Foreign-Key-Constraints"
 
-#: describe.c:1084
+#: describe.c:1085
 #, c-format
 msgid "%s: %s %s"
 msgstr "%s: %s %s"
 
-#: describe.c:1089
+#: describe.c:1090
 #, c-format
 msgid "%*s  %s %s"
 msgstr "%*s  %s %s"
 
-#: describe.c:1117
+#: describe.c:1118
 msgid "Triggers"
 msgstr "Triggers"
 
-#: describe.c:1199
+#: describe.c:1200
 msgid "User name"
 msgstr "Benutzername"
 
-#: describe.c:1199
+#: describe.c:1200
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: describe.c:1200
+#: describe.c:1201
 msgid "superuser, create database"
 msgstr "Superuser, Datenbanken erstellen"
 
-#: describe.c:1201
+#: describe.c:1202
 msgid "superuser"
 msgstr "Superuser"
 
-#: describe.c:1201
+#: describe.c:1202
 msgid "create database"
 msgstr "Datenbanken erstellen"
 
-#: describe.c:1202
+#: describe.c:1203
 msgid "Attributes"
 msgstr "Attribute"
 
-#: describe.c:1215
+#: describe.c:1216
 msgid "List of database users"
 msgstr "Liste der Datenbankbenutzer"
 
-#: describe.c:1262
+#: describe.c:1263
 msgid "special"
 msgstr "spezial"
 
-#: describe.c:1322
+#: describe.c:1324
 msgid "No matching relations found.\n"
 msgstr "Keine passenden Relationen gefunden\n"
 
-#: describe.c:1324
+#: describe.c:1326
 msgid "No relations found.\n"
 msgstr "Keine Relationen gefunden\n"
 
-#: describe.c:1329
+#: describe.c:1331
 msgid "List of relations"
 msgstr "Liste der Relationen"
 
-#: describe.c:1368
+#: describe.c:1370
 msgid "Modifier"
 msgstr "Attribute"
 
-#: describe.c:1382
+#: describe.c:1384
 msgid "List of domains"
 msgstr "Liste der Dom�nen"
diff --git a/src/bin/psql/po/sv.po b/src/bin/psql/po/sv.po
index d3ef902f7dc6adf7b229a91118a2a66598a41ebd..b562ccc4a5e88620af7daa7e904474e9d8d45fab 100644
--- a/src/bin/psql/po/sv.po
+++ b/src/bin/psql/po/sv.po
@@ -2,272 +2,272 @@
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
 # Dennis Bj�rklund <db@zigo.dhs.org>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/po/sv.po,v 1.4 2002/10/14 19:04:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/sv.po,v 1.5 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: "%s"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-10-03 04:19-0400\n"
-"PO-Revision-Date: 2002-10-04 08:04+0200\n"
+"POT-Creation-Date: 2002-10-25 04:17-0400\n"
+"PO-Revision-Date: 2002-10-26 07:01+0200\n"
 "Last-Translator: Dennis Bj�rklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: command.c:155
+#: command.c:156
 msgid "Warning: This syntax is deprecated.\n"
 msgstr "Varning: Denna syntax �r f�rlegad.\n"
 
-#: command.c:162
+#: command.c:163
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "Ogiltigt kommando \\%s. F�rs�k med \\? f�r hj�lp.\n"
 
-#: command.c:164
+#: command.c:165
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "ogiltigt kommando \\%s\n"
 
-#: command.c:291
+#: command.c:292
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "kunde inte h�mta hemkatalogen: %s\n"
 
-#: command.c:307
+#: command.c:308
 #, c-format
 msgid "\\%s: could not change directory to '%s': %s\n"
 msgstr "\\%s: kunde inte byta katalog till \"%s\": %s\n"
 
-#: command.c:403 command.c:762
+#: command.c:404 command.c:764
 msgid "no query buffer\n"
 msgstr "ingen fr�gebuffert\n"
 
-#: command.c:458
+#: command.c:459
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr "%s: ogiltigt kodningsnamn eller konverteringsprocedur hittades inte\n"
 
-#: command.c:518 command.c:549 command.c:560 command.c:574 command.c:616
-#: command.c:742 command.c:771
+#: command.c:520 command.c:551 command.c:562 command.c:576 command.c:618
+#: command.c:744 command.c:773
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: obligatoriskt argument saknas\n"
 
-#: command.c:604
+#: command.c:606
 msgid "Query buffer is empty."
 msgstr "Fr�gebufferten �r tom."
 
-#: command.c:637
+#: command.c:639
 msgid "Query buffer reset (cleared)."
 msgstr "Fr�gebufferten har blivit borttagen."
 
-#: command.c:648
+#: command.c:650
 #, c-format
 msgid "Wrote history to %s.\n"
 msgstr "Kommandohistorien har skrivits till %s.\n"
 
-#: command.c:688 command.c:1142 command.c:1239 command.c:1923 common.c:56
-#: copy.c:92 describe.c:41 mainloop.c:80 mainloop.c:386
+#: command.c:690 command.c:1144 command.c:1241 command.c:1929 common.c:68
+#: copy.c:90 copy.c:118 describe.c:41 mainloop.c:80 mainloop.c:388
 msgid "out of memory\n"
 msgstr "minnet slut\n"
 
-#: command.c:697 command.c:747
+#: command.c:699 command.c:749
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: fel\n"
 
-#: command.c:726
+#: command.c:728
 msgid "Timing is on."
 msgstr "Tidstagning �r p�."
 
-#: command.c:729
+#: command.c:731
 msgid "Timing is off."
 msgstr "Tidstagning �r av."
 
-#: command.c:786 command.c:806 command.c:1002 command.c:1015 command.c:1026
-#: command.c:1580 command.c:1593 command.c:1605 command.c:1618 command.c:1632
-#: command.c:1646 command.c:1676 common.c:105 copy.c:308
+#: command.c:788 command.c:808 command.c:1004 command.c:1017 command.c:1028
+#: command.c:1586 command.c:1599 command.c:1611 command.c:1624 command.c:1638
+#: command.c:1652 command.c:1682 common.c:117 copy.c:381
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:872
+#: command.c:874
 #, c-format
 msgid "\\%s: extra argument '%s' ignored\n"
 msgstr "\\%s: �verfl�digt argument \"%s\" ignorerat\n"
 
-#: command.c:963 command.c:991 command.c:1115
+#: command.c:965 command.c:993 command.c:1117
 msgid "parse error at the end of line\n"
 msgstr "parsfel vid radslutet\n"
 
-#: command.c:1354 command.c:1378 startup.c:175 startup.c:193
+#: command.c:1356 command.c:1380 startup.c:175 startup.c:193
 msgid "Password: "
 msgstr "L�senord: "
 
-#: command.c:1392 common.c:154 common.c:247 common.c:419
+#: command.c:1394 common.c:166 common.c:286 common.c:472
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1396
+#: command.c:1398
 msgid "Previous connection kept\n"
 msgstr "F�reg�ende f�rbindelse bevarad\n"
 
-#: command.c:1408
+#: command.c:1410
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1420
+#: command.c:1422
 #, c-format
 msgid "You are now connected to database %s.\n"
 msgstr "Du �r nu uppkopplad mot databasen %s.\n"
 
-#: command.c:1422
+#: command.c:1424
 #, c-format
 msgid "You are now connected as new user %s.\n"
 msgstr "Du �r nu uppkopplad som ny anv�ndare %s.\n"
 
-#: command.c:1425
+#: command.c:1427
 #, c-format
 msgid "You are now connected to database %s as user %s.\n"
 msgstr "Du �r nu uppkopplad mot databasen %s som anv�ndare %s.\n"
 
-#: command.c:1518
+#: command.c:1524
 #, c-format
 msgid "could not start editor %s\n"
 msgstr "kunde inte starta editorn %s\n"
 
-#: command.c:1520
+#: command.c:1526
 msgid "could not start /bin/sh\n"
 msgstr "kunde inte starta /bin/sh\n"
 
-#: command.c:1565
+#: command.c:1571
 #, c-format
 msgid "could not open temporary file %s: %s\n"
 msgstr "kunde inte �ppna tempor�r fil %s: %s\n"
 
-#: command.c:1749
+#: command.c:1755
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset: till�tna formaten �r unaligned, aligned, html, latex\n"
 
-#: command.c:1754
+#: command.c:1760
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Utdataformatet �r \"%s\".\n"
 
-#: command.c:1764
+#: command.c:1770
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Ramstil �r %d.\n"
 
-#: command.c:1773
+#: command.c:1779
 msgid "Expanded display is on.\n"
 msgstr "Ut�kad visning �r p�.\n"
 
-#: command.c:1774
+#: command.c:1780
 msgid "Expanded display is off.\n"
 msgstr "Ut�kad visning �r av.\n"
 
-#: command.c:1786
+#: command.c:1792
 #, c-format
 msgid "Null display is '%s'.\n"
 msgstr "Null-visare �r '%s'.\n"
 
-#: command.c:1798
+#: command.c:1804
 #, c-format
 msgid "Field separator is '%s'.\n"
 msgstr "F�ltseparatorn �r \"%s\".\n"
 
-#: command.c:1812
+#: command.c:1818
 msgid "Record separator is <newline>."
 msgstr "Postseparatorn �r <nyrad>."
 
-#: command.c:1814
+#: command.c:1820
 #, c-format
 msgid "Record separator is '%s'.\n"
 msgstr "Postseparatorn �r \"%s\".\n"
 
-#: command.c:1825
+#: command.c:1831
 msgid "Showing only tuples."
 msgstr "Visar bara tupler."
 
-#: command.c:1827
+#: command.c:1833
 msgid "Tuples only is off."
 msgstr "Visa bara tupler �r av."
 
-#: command.c:1843
+#: command.c:1849
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Titeln �r \"%s\".\n"
 
-#: command.c:1845
+#: command.c:1851
 msgid "Title is unset.\n"
 msgstr "Titeln �r inte satt.\n"
 
-#: command.c:1861
+#: command.c:1867
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Tabellattribut �r \"%s\".\n"
 
-#: command.c:1863
+#: command.c:1869
 msgid "Table attributes unset.\n"
 msgstr "Tabellattribut �r ej satt.\n"
 
-#: command.c:1874
+#: command.c:1880
 msgid "Using pager is on."
 msgstr "Siduppdelare �r p�."
 
-#: command.c:1876
+#: command.c:1882
 msgid "Using pager is off."
 msgstr "Siduppdelare �r av."
 
-#: command.c:1887
+#: command.c:1893
 msgid "Default footer is on."
 msgstr "Standard sidfot �r p�."
 
-#: command.c:1889
+#: command.c:1895
 msgid "Default footer is off."
 msgstr "Standard sidfot �r av."
 
-#: command.c:1895
+#: command.c:1901
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: ok�nd parameter: %s\n"
 
-#: command.c:1938
+#: command.c:1944
 msgid "\\!: failed\n"
 msgstr "\\!: misslyckades\n"
 
-#: common.c:49
+#: common.c:61
 #, c-format
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: xstrdup: kan inte kopiera null-pekare (internt fel)\n"
 
-#: common.c:215 common.c:304
+#: common.c:234 common.c:347
 msgid "You are currently not connected to a database.\n"
 msgstr "Du �r f�r n�rvarande inte uppkopplad mot en databas.\n"
 
-#: common.c:254 common.c:429
+#: common.c:293 common.c:482
 msgid "connection to server was lost\n"
 msgstr "f�rbindelsen till servern har brutits\n"
 
-#: common.c:257 common.c:432
+#: common.c:296 common.c:485
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "F�rbindelsen till servern har brutits. F�rs�ker starta om: "
 
-#: common.c:261 common.c:436
+#: common.c:300 common.c:489
 msgid "Failed.\n"
 msgstr "Misslyckades.\n"
 
-#: common.c:271 common.c:448
+#: common.c:310 common.c:501
 msgid "Succeeded.\n"
 msgstr "Lyckades.\n"
 
-#: common.c:312
+#: common.c:355
 #, c-format
 msgid ""
 "***(Single step mode: Verify query)"
@@ -280,7 +280,7 @@ msgstr ""
 "%s\n"
 "***(tryck return f�r att forts�tta eller skriv x och return f�r att avbryta)****\n"
 
-#: common.c:408
+#: common.c:461
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -288,40 +288,40 @@ msgstr ""
 "Mata in data som skall kopieras f�ljt av en nyrad.\n"
 "Avsluta med bakstreck och en punkt ensamma p� en rad."
 
-#: common.c:454
+#: common.c:507
 #, c-format
 msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
 msgstr "Asynkront NOTIFY \"%s\" mottaget fr�n backenden med pid %d.\n"
 
-#: common.c:466
+#: common.c:520 common.c:523
 #, c-format
 msgid "Time: %.2f ms\n"
 msgstr "Tid: %.2f ms\n"
 
-#: copy.c:86
+#: copy.c:112
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: argument kr�vs\n"
 
-#: copy.c:234
+#: copy.c:292
 #, c-format
 msgid "\\copy: parse error at '%s'\n"
 msgstr "\\copy: parsfel vid \"%s\"\n"
 
-#: copy.c:236
+#: copy.c:294
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: parsfel vid radslutet\n"
 
-#: copy.c:319
+#: copy.c:392
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: kan inte kopiera fr�n/till en katalog\n"
 
-#: copy.c:340
+#: copy.c:413
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:344
+#: copy.c:417
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: ov�ntat svar (%d)\n"
@@ -344,143 +344,166 @@ msgstr "kunde inte h
 msgid ""
 "This is psql %s, the PostgreSQL interactive terminal.\n"
 "\n"
-msgstr "Detta �r psql %s, den interaktiva PostgreSQL-terminalen.\n\n"
+msgstr ""
+"Detta �r psql %s, den interaktiva PostgreSQL-terminalen.\n"
+"\n"
 
 #: help.c:85
 msgid "Usage:"
 msgstr "Anv�ndning:"
 
 #: help.c:86
-msgid "  psql [OPTIONS] [DBNAME [USERNAME]]\n"
-msgstr "  psql [FLAGGOR] [DBNAMN [ANV�NDARNAMN]]\n"
-
-#: help.c:87
-msgid "Options:"
-msgstr "Flaggor:"
+msgid "  psql [OPTIONS]... [DBNAME [USERNAME]]\n"
+msgstr "  psql [FLAGGA]... [DBNAMN [ANV�NDARNAMN]]\n"
 
 #: help.c:88
-msgid "  -a              Echo all input from script"
-msgstr "  -a              Visa all indata fr�n skriptet"
+msgid "General options:"
+msgstr "Allm�nna flaggor:"
 
-#: help.c:89
-msgid "  -A              Unaligned table output mode (-P format=unaligned)"
-msgstr ""
-"  -A              Ojusterad utskrift av tabeller (-P format=unaligned)\""
+#: help.c:93
+#, c-format
+msgid "  -d DBNAME       specify database name to connect to (default: %s)\n"
+msgstr "  -d DBNAMN       ange databasen att koppla upp mot (standard: %s)\n"
 
-#: help.c:90
-msgid "  -c COMMAND      Run only single command (SQL or internal) and exit"
-msgstr "  -c KOMMANDO     K�r ett kommando (SQL eller internt) och avsluta sedan"
+#: help.c:94
+msgid "  -c COMMAND      run only single command (SQL or internal) and exit"
+msgstr "  -c KOMMANDO     k�r ett kommando (SQL eller internt) och avsluta sedan"
+
+#: help.c:95
+msgid "  -f FILENAME     execute commands from file, then exit"
+msgstr "  -f FILNAMN      k�r kommandona fr�n fil och avsluta sedan"
 
 #: help.c:96
-#, c-format
-msgid "  -d DBNAME       Specify database name to connect to (default: %s)\n"
-msgstr "  -d DBNAMN       Ange databasen att koppla upp mot (standard: %s)\n"
+msgid "  -l              list available databases, then exit"
+msgstr "  -l              lista befintliga databaser och avsluta sedan"
+
+#: help.c:97
+msgid "  -v NAME=VALUE   set psql variable 'NAME' to 'VALUE'"
+msgstr "  -v NAMN=V�RDE   s�tt psql-variabel \"NAMN\" till \"V�RDE\""
 
 #: help.c:98
-msgid "  -e              Echo commands sent to server"
-msgstr "  -e              Visa kommandon som skickas till servern"
+msgid "  -X              do not read startup file (~/.psqlrc)"
+msgstr "  -X              l�s inte startfilen (~/.psqlrc)"
 
 #: help.c:99
-msgid "  -E              Display queries that internal commands generate"
-msgstr "  -E              Visa fr�gor som interna kommandon skapar"
+msgid "  --help          show this help, then exit"
+msgstr "  --help          visa den h�r hj�lpen, avsluta sedan"
 
 #: help.c:100
-msgid "  -f FILENAME     Execute commands from file, then exit"
-msgstr "  -f FILNAMN      K�r kommandona fr�n fil och avsluta sedan"
+msgid "  --version       output version information, then exit"
+msgstr "  --version       visa versionsinformation, avsluta sedan"
 
-#: help.c:101
-#, c-format
+#: help.c:102
 msgid ""
-"  -F STRING       Set field separator (default: \"%s\") (-P fieldsep=)\n"
-msgstr "  -F STR�NG       S�tt f�ltseparatorn (standard: \"%s\") (-P fieldsep=)\n"
+"\n"
+"Input and output options:"
+msgstr "\nFlaggor f�r in- och utmatning:"
+
+#: help.c:103
+msgid "  -a              echo all input from script"
+msgstr "  -a              visa all indata fr�n skriptet"
 
+#: help.c:104
+msgid "  -e              echo commands sent to server"
+msgstr "  -e              visa kommandon som skickas till servern"
+
+#: help.c:105
+msgid "  -E              display queries that internal commands generate"
+msgstr "  -E              visa fr�gor som interna kommandon skapar"
+
+# XXX
 #: help.c:106
-#, c-format
-msgid "  -h HOSTNAME     Specify database server host (default: %s)\n"
-msgstr "  -h V�RDNAMN     Ange databasens v�rdnamn (standard: %s)\n"
+msgid "  -q              run quietly (no messages, only query output)"
+msgstr "  -q              k�r tyst (inga meddelanden, endast fr�geutdata)"
 
 #: help.c:107
-msgid "local socket"
-msgstr "lokalt uttag (socket)"
+msgid "  -o FILENAME     send query results to file (or |pipe)"
+msgstr "  -o FILNAMN      skriv fr�geresultat till fil (eller |r�r)"
+
+#: help.c:108
+msgid "  -n              disable enhanced command line editing (readline)"
+msgstr "  -n              sl� av f�rb�ttrad kommandoradsredigering (readline)"
 
 #: help.c:109
-msgid "  -H              HTML table output mode (-P format=html)"
-msgstr "  -H              HTML-utskrift av tabeller (-P format=html)"
+msgid "  -s              single step mode (confirm each query)"
+msgstr "  -s              stegningsl�ge (konfirmera varje fr�ga)"
 
 #: help.c:110
-msgid "  -l              List available databases, then exit"
-msgstr "  -l              Lista befintliga databaser och avsluta sedan"
-
-#: help.c:111
-msgid "  -n              Disable enhanced command line editing (readline)"
-msgstr "  -n              Sl� av f�rb�ttrad kommandoradsredigering (readline)"
+msgid "  -S              single line mode (end of line terminates SQL command)"
+msgstr "  -S              enradsl�ge (slutet p� raden avslutar SQL-kommando"
 
 #: help.c:112
-msgid "  -o FILENAME     Send query results to file (or |pipe)"
-msgstr "  -o FILNAMN      Skriv fr�geresultat till fil (eller |r�r)"
+msgid ""
+"\n"
+"Output format options:"
+msgstr "\nFlaggor f�r utmatningsformat:"
+
+#: help.c:113
+msgid "  -A              unaligned table output mode (-P format=unaligned)"
+msgstr "  -A              ojusterad utskrift av tabeller (-P format=unaligned)\""
+
+#: help.c:114
+msgid "  -H              HTML table output mode (-P format=html)"
+msgstr "  -H              HTML-utskrift av tabeller (-P format=html)"
+
+#: help.c:115
+msgid "  -t              print rows only (-P tuples_only)"
+msgstr "  -t              visa endast rader (-P tuples_only)"
 
 #: help.c:116
-#, c-format
-msgid "  -p PORT         Specify database server port (default: %s)\n"
-msgstr "  -p PORT         Ange databasens serverport (standard: %s)\n"
+msgid ""
+"  -T TEXT         set HTML table tag attributes (width, border) (-P "
+"tableattr=)"
+msgstr "  -T TEXT         s�tt HTML-tabellers flaggor (width, border) (-P tableattr=)"
 
-#: help.c:119
+#: help.c:117
+msgid "  -x              turn on expanded table output (-P expanded)"
+msgstr "  -x              sl� p� ut�kad utsrift av tabeller (-P expanded)"
+
+#: help.c:118
 msgid ""
-"  -P VAR[=ARG]    Set printing option 'VAR' to 'ARG' (see \\pset command)"
-msgstr "  -P VAR[=ARG]    S�tt utskriftsvariabel 'VAR' till 'ARG' (se kommando \\pset)"
+"  -P VAR[=ARG]    set printing option 'VAR' to 'ARG' (see \\pset command)"
+msgstr "  -P VAR[=ARG]    s�tt utskriftsvariabel 'VAR' till 'ARG' (se kommando \\pset)"
 
-# XXX
-#: help.c:120
-msgid "  -q              Run quietly (no messages, only query output)"
-msgstr "  -q              K�r tyst (inga meddelanden, endast fr�geutdata)"
+#: help.c:119
+#, c-format
+msgid ""
+"  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"
+msgstr "  -F STR�NG       s�tt f�ltseparator (standard: \"%s\") (-P fieldsep=)\n"
 
 #: help.c:121
 msgid ""
-"  -R STRING       Set record separator (default: newline) (-P recordsep=)"
-msgstr "  -R STR�NG       S�tt postseparatorn (standard: newline) (-P recordsep=)"
-
-#: help.c:122
-msgid "  -s              Single step mode (confirm each query)"
-msgstr "  -s              Stegningsl�ge (konfirmera varje fr�ga)"
+"  -R STRING       set record separator (default: newline) (-P recordsep=)"
+msgstr "  -R STR�NG       s�tt postseparatorn (standard: newline) (-P recordsep=)"
 
 #: help.c:123
-msgid "  -S              Single line mode (end of line terminates SQL command)"
-msgstr "  -S              Enradsl�ge (slutet p� raden avslutar SQL-kommando"
-
-#: help.c:124
-msgid "  -t              Print rows only (-P tuples_only)"
-msgstr "  -t              Visa endast rader (-P tuples_only)"
-
-#: help.c:125
 msgid ""
-"  -T TEXT         Set HTML table tag attributes (width, border) (-P "
-"tableattr=)"
-msgstr "  -T TEXT         S�tt HTML-tabellers flaggor (width, border) (-P tableattr=)"
+"\n"
+"Connection options:"
+msgstr "\nUppkopplingsflaggor:"
 
-#: help.c:131
+#: help.c:126
 #, c-format
-msgid "  -U NAME         Specify database user name (default: %s)\n"
-msgstr "  -U NAMN         Ange databasanv�ndarnamnet (standard: %s)\n"
-
-#: help.c:133
-msgid "  -v NAME=VALUE   Set psql variable 'NAME' to 'VALUE'"
-msgstr "  -v NAMN=V�RDE   S�tt psql-variabel \"NAMN\" till \"V�RDE\""
+msgid "  -h HOSTNAME     specify database server host (default: %s)\n"
+msgstr "  -h V�RDNAMN     ange databasens v�rdnamn (standard: %s)\n"
 
-#: help.c:134
-msgid "  -V              Show version information and exit"
-msgstr "  -V              Visa versionsinformation och avsluta"
+#: help.c:127
+msgid "local socket"
+msgstr "lokalt uttag (socket)"
 
-#: help.c:135
-msgid "  -W              Prompt for password (should happen automatically)"
-msgstr "  -W              Fr�ga om l�senord (b�r ske automatiskt)"
+#: help.c:130
+#, c-format
+msgid "  -p PORT         specify database server port (default: %s)\n"
+msgstr "  -p PORT         ange databasens serverport (standard: %s)\n"
 
 #: help.c:136
-msgid "  -x              Turn on expanded table output (-P expanded)"
-msgstr "  -x              Sl� p� ut�kad utsrift av tabeller (-P expanded)"
+#, c-format
+msgid "  -U NAME         specify database user name (default: %s)\n"
+msgstr "  -U NAMN         ange databasanv�ndarnamnet (standard: %s)\n"
 
 #: help.c:137
-msgid "  -X              Do not read startup file (~/.psqlrc)"
-msgstr "  -X              L�s inte startfilen (~/.psqlrc)"
+msgid "  -W              prompt for password (should happen automatically)"
+msgstr "  -W              fr�ga om l�senord (b�r ske automatiskt)"
 
 #: help.c:140
 msgid ""
@@ -498,11 +521,11 @@ msgstr ""
 "\n"
 "Rapportera fel till <pgsql-bugs@postgresql.org>."
 
-#: help.c:211
+#: help.c:174
 msgid " \\a             toggle between unaligned and aligned output mode\n"
 msgstr " \\a             byt mellan ojusterat och justerat utdataformat\n"
 
-#: help.c:212
+#: help.c:175
 #, c-format
 msgid ""
 " \\c[onnect] [DBNAME|- [USER]]\n"
@@ -511,28 +534,28 @@ msgstr ""
 " \\c[onnect] [DBNAMN|- [ANV�NDAR]]\n"
 "                koppla upp mot ny databas (f�r n�rvarande \"%s\")\n"
 
-#: help.c:215
+#: help.c:178
 msgid " \\C [STRING]    set table title, or unset if none\n"
 msgstr " \\C [TEXT]      s�tt tabelltitel, eller nollst�ll\n"
 
-#: help.c:216
+#: help.c:179
 msgid " \\cd [DIR]      change the current working directory\n"
 msgstr " \\cd [KATALOG]  byt den aktuella katalogen\n"
 
-#: help.c:217
+#: help.c:180
 msgid " \\copy ...      perform SQL COPY with data stream to the client host\n"
 msgstr " \\\\copy ...      utf�r SQL COPY med datastr�m till klientv�rden\n"
 
-#: help.c:218
+#: help.c:181
 msgid " \\copyright     show PostgreSQL usage and distribution terms\n"
 msgstr " \\copyright     visa PostgreSQL-upphovsr�ttsinformation\n"
 
-#: help.c:219
+#: help.c:182
 msgid " \\d [NAME]      describe table, index, sequence, or view\n"
 msgstr " \\d [NAMN]      beskriv tabell, index, sekvens eller vy\n"
 
 # XXX
-#: help.c:220
+#: help.c:183
 msgid ""
 " \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
 "                list tables/indexes/sequences/views/system tables\n"
@@ -540,82 +563,82 @@ msgstr ""
 " \\d{t|i|s|v|S} [MALL] (l�gg till '+' f�r mer detaljer)\n"
 "                lista tabeller/index/sekvenser/vyer/system tabeller\n"
 
-#: help.c:222
+#: help.c:185
 msgid " \\da [PATTERN]  list aggregate functions\n"
 msgstr " \\da [MALL]     lista aggregatfunktioner\n"
 
-#: help.c:223
+#: help.c:186
 msgid " \\dd [PATTERN]  show comment for object\n"
 msgstr " \\dd [MALL]     visa kommentar f�r objekt\n"
 
-#: help.c:224
+#: help.c:187
 msgid " \\dD [PATTERN]  list domains\n"
 msgstr " \\dD [MALL]     lista dom�ner\n"
 
-#: help.c:225
+#: help.c:188
 msgid " \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
 msgstr " \\df [MALL]     lista funktioner (l�gg till '+' f�r mer detaljer)\n"
 
-#: help.c:226
+#: help.c:189
 msgid " \\do [NAME]     list operators\n"
 msgstr " \\do [NAMN]     lista operat�rer\n"
 
-#: help.c:227
+#: help.c:190
 msgid " \\dl            list large objects, same as \\lo_list\n"
 msgstr " \\dl            lista stora objekt, samma som \\lo_list\n"
 
-#: help.c:228
+#: help.c:191
 msgid " \\dp [PATTERN]  list table access privileges\n"
 msgstr " \\dp [MALL]     lista tabell�tkomstr�ttigheter\n"
 
-#: help.c:229
+#: help.c:192
 msgid " \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
 msgstr " \\dT [MALL]     lista datatyper (l�gg till '+' f�r mer detaljer)\n"
 
-#: help.c:230
+#: help.c:193
 msgid " \\du [PATTERN]  list users\n"
 msgstr " \\du [MALL]     lista anv�ndare\n"
 
-#: help.c:231
+#: help.c:194
 msgid " \\e [FILE]      edit the query buffer (or file) with external editor\n"
 msgstr " \\e [FILNAMN]  redigera fr�gebufferten (eller filen) med extern redigerare\n"
 
-#: help.c:232
+#: help.c:195
 msgid " \\echo [STRING] write string to standard output\n"
 msgstr " \\echo [TEXT]   skriv text till standard ut\n"
 
-#: help.c:233
+#: help.c:196
 msgid " \\encoding [ENCODING]  show or set client encoding\n"
 msgstr " \\encoding [KODNING]   visa eller s�tt klientens teckenkodning\n"
 
-#: help.c:234
+#: help.c:197
 msgid ""
 " \\f [STRING]    show or set field separator for unaligned query output\n"
 msgstr " \\f [TEXT]      visa eller s�tt f�ltseparatorn f�r ojusterad utmatning\n"
 
-#: help.c:235
+#: help.c:198
 msgid ""
 " \\g [FILE]      send query buffer to server (and results to file or |pipe)\n"
 msgstr " \\g [FILNAMN]   skicka SQL-kommando till servern (och skriv resultatet till fil eller |r�r)\n"
 
-#: help.c:236
+#: help.c:199
 msgid " \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
 msgstr " \\h NAMN        hj�lp med syntaxen f�r SQL-kommandon, * f�r alla kommanon\n"
 
-#: help.c:237
+#: help.c:200
 #, c-format
 msgid " \\H             toggle HTML output mode (currently %s)\n"
 msgstr " \\H             sl� om HTML-utskriftsl�ge (f�r n�rvarande: %s)\n"
 
-#: help.c:239
+#: help.c:202
 msgid " \\i FILE        execute commands from file\n"
 msgstr " \\i FILNAMN     k�r kommandon fr�n fil\n"
 
-#: help.c:240
+#: help.c:203
 msgid " \\l             list all databases\n"
 msgstr " \\l             lista alla databaser\n"
 
-#: help.c:241
+#: help.c:204
 msgid ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                large object operations\n"
@@ -623,15 +646,15 @@ msgstr ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                operationer p� stora objekt\n"
 
-#: help.c:243
+#: help.c:206
 msgid " \\o FILE        send all query results to file or |pipe\n"
 msgstr "  -o FILNAMN      skicka fr�geresultat till fil (eller |r�r)\n"
 
-#: help.c:244
+#: help.c:207
 msgid " \\p             show the contents of the query buffer\n"
 msgstr " \\p             visa inneh�llet i fr�gebufferten\n"
 
-#: help.c:245
+#: help.c:208
 msgid ""
 " \\pset NAME [VALUE]  set table output option\n"
 "                (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
@@ -641,68 +664,68 @@ msgstr ""
 "                (NAMN := {format|border|expanded|fieldsep|null|recordsep|\n"
 "                tuples_only|title|tableattr|pager})\n"
 
-#: help.c:248
+#: help.c:211
 msgid " \\q             quit psql\n"
 msgstr " \\q             avsluta psql\n"
 
-#: help.c:249
+#: help.c:212
 msgid " \\qecho [STRING]  write string to query output stream (see \\o)\n"
 msgstr " \\qecho TEXT    skriv text till fr�geutdatastr�mmen (se \\\\o)\n"
 
-#: help.c:250
+#: help.c:213
 msgid " \\r             reset (clear) the query buffer\n"
 msgstr " \\r             nollst�ll (radera) fr�gebufferten\n"
 
-#: help.c:251
+#: help.c:214
 msgid " \\s [FILE]      display history or save it to file\n"
 msgstr " \\s [FILNAMN]   visa kommandohistorien eller spara den i fil\n"
 
-#: help.c:252
+#: help.c:215
 msgid ""
 " \\set [NAME [VALUE]]  set internal variable, or list all if no parameters\n"
 msgstr " \\set [NAMN [V�RDE]]  s�tt intern variabel, eller lista alla om ingen param\n"
 
-#: help.c:253
+#: help.c:216
 #, c-format
 msgid " \\t             show only rows (currently %s)\n"
 msgstr " \\t             visa endast rader (f�r n�rvarande: %s)\n"
 
-#: help.c:255
+#: help.c:218
 msgid " \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
 msgstr " \\T [TEXT]      s�tt HTML-tabellens <table>-attribut, eller nollst�ll\n"
 
-#: help.c:256
+#: help.c:219
 #, c-format
 msgid " \\timing        toggle timing of commands (currently %s)\n"
 msgstr " \\timing        sl� om tidstagning av kommandon (f�r n�rvarande: %s)\n"
 
-#: help.c:258
+#: help.c:221
 msgid " \\unset NAME    unset (delete) internal variable\n"
 msgstr " \\unset NAME    ta bort intern variabel\n"
 
-#: help.c:259
+#: help.c:222
 msgid " \\w [FILE]      write query buffer to file\n"
 msgstr " \\w [FILNAMN]   skriv fr�gebuffert till fil\n"
 
-#: help.c:260
+#: help.c:223
 #, c-format
 msgid " \\x             toggle expanded output (currently %s)\n"
 msgstr " \\x             sl� om ut�kad utskrift (f�r n�rvarande: %s)\n"
 
-#: help.c:262
+#: help.c:225
 msgid " \\z [PATTERN]   list table access privileges (same as \\dp)\n"
 msgstr " \\z [MALL]      lista tabell�tkomstr�ttigheter (samma som \\dp)\n"
 
 # XXX
-#: help.c:263
+#: help.c:226
 msgid " \\! [COMMAND]   execute command in shell or start interactive shell\n"
 msgstr " \\! [KOMMANDO]  k�r kommando i skal eller starta interaktivt skal\n"
 
-#: help.c:290
-msgid "Available help:"
-msgstr "Tillg�nglig hj�lp:"
+#: help.c:256
+msgid "Available help:\n"
+msgstr "Tillg�nglig hj�lp:\n"
 
-#: help.c:321
+#: help.c:294
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -717,7 +740,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:332
+#: help.c:305
 #, c-format
 msgid ""
 "No help available for '%-.*s'.\n"
@@ -751,8 +774,8 @@ msgstr "\\lo_import: ej uppkopplad mot en databas\n"
 msgid "\\lo_unlink: not connected to a database\n"
 msgstr "\\lo_unlink: ej uppkopplad mot en databas\n"
 
-#: describe.c:86 describe.c:136 describe.c:209 describe.c:271 describe.c:318
-#: describe.c:417 describe.c:692 describe.c:1267 large_obj.c:363
+#: describe.c:86 describe.c:137 describe.c:210 describe.c:272 describe.c:319
+#: describe.c:418 describe.c:693 describe.c:1268 large_obj.c:363
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -765,15 +788,15 @@ msgstr "Stora objekt"
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "Anv�nd \"\\q\" f�r att l�mna %s.\n"
 
-#: print.c:412
+#: print.c:402
 msgid "(No rows)\n"
 msgstr "(Inga rader)\n"
 
-#: print.c:1147
+#: print.c:1103
 msgid "(1 row)"
 msgstr "(1 rad)"
 
-#: print.c:1149
+#: print.c:1105
 #, c-format
 msgid "(%d rows)"
 msgstr "(%d rader)"
@@ -851,19 +874,7 @@ msgstr "%s: Varning: Flaggan -u 
 msgid "contains support for command-line editing"
 msgstr "inneh�ller st�d f�r kommandoradsredigering"
 
-#: startup.c:644
-msgid ""
-"Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"
-"Portions Copyright (c) 1996, Regents of the University of California\n"
-"Read the file COPYRIGHT or use the command \\copyright to see the\n"
-"usage and distribution terms."
-msgstr ""
-"Delar Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"
-"Delar Copyright (c) 1996, Regents of the University of California\n"
-"L�s filen COPYRIGHT eller anv�nd kommandot \\copyright f�r att l�sa\n"
-"anv�ndnings- och kopieringsvillkor."
-
-#: startup.c:669
+#: startup.c:664
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -872,13 +883,13 @@ msgstr ""
 "SSL-f�rbindelse (krypto: %s, bitar: %i)\n"
 "\n"
 
-#: describe.c:85 describe.c:126 describe.c:196 describe.c:269 describe.c:363
-#: describe.c:417 describe.c:1260 describe.c:1366
+#: describe.c:85 describe.c:127 describe.c:197 describe.c:270 describe.c:364
+#: describe.c:418 describe.c:1261 describe.c:1367
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:85 describe.c:126 describe.c:196 describe.c:269 describe.c:311
-#: describe.c:417 describe.c:1260 describe.c:1367
+#: describe.c:85 describe.c:127 describe.c:197 describe.c:270 describe.c:312
+#: describe.c:418 describe.c:1261 describe.c:1368
 msgid "Name"
 msgstr "Namn"
 
@@ -894,307 +905,321 @@ msgstr "Datatyp"
 msgid "List of aggregate functions"
 msgstr "Lista med aggregatfunktioner"
 
-#: describe.c:126
+#: describe.c:127
 msgid "Result data type"
 msgstr "Resultatdatatyp"
 
-#: describe.c:127
+#: describe.c:128
 msgid "Argument data types"
 msgstr "Argumentdatatyp"
 
-#: describe.c:135 describe.c:311 describe.c:1262
+#: describe.c:136 describe.c:312 describe.c:1263
 msgid "Owner"
 msgstr "�gare"
 
-#: describe.c:135
+#: describe.c:136
 msgid "Language"
 msgstr "Spr�k"
 
-#: describe.c:136
+#: describe.c:137
 msgid "Source code"
 msgstr "K�llkod"
 
-#: describe.c:170
+#: describe.c:171
 msgid "List of functions"
 msgstr "Lista med funktioner"
 
-#: describe.c:206
+#: describe.c:207
 msgid "Internal name"
 msgstr "Internt namn"
 
-#: describe.c:206
+#: describe.c:207
 msgid "Size"
 msgstr "Storlek"
 
-#: describe.c:238
+#: describe.c:239
 msgid "List of data types"
 msgstr "Lista med datatyper"
 
-#: describe.c:270
+#: describe.c:271
 msgid "Left arg type"
 msgstr "V�nster argumenttyp"
 
-#: describe.c:270
+#: describe.c:271
 msgid "Right arg type"
 msgstr "H�ger argumenttyp"
 
-#: describe.c:271
+#: describe.c:272
 msgid "Result type"
 msgstr "Resultattyp"
 
-#: describe.c:285
+#: describe.c:286
 msgid "List of operators"
 msgstr "Lista med operatorer"
 
-#: describe.c:314
+#: describe.c:315
 msgid "Encoding"
 msgstr "Kodning"
 
-#: describe.c:330
+#: describe.c:331
 msgid "List of databases"
 msgstr "Lista med databaser"
 
-#: describe.c:363 describe.c:1277
+#: describe.c:364 describe.c:1278
 msgid "Table"
 msgstr "Tabell"
 
-#: describe.c:363
+#: describe.c:364
 msgid "Access privileges"
 msgstr "�tkomstr�ttigheter"
 
-#: describe.c:385
+#: describe.c:386
 #, c-format
 msgid "Access privileges for database \"%s\""
 msgstr "�tkomstr�ttigheter f�r databasen \"%s\""
 
-#: describe.c:417
+#: describe.c:418
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:428
+#: describe.c:429
 msgid "aggregate"
 msgstr "aggregat"
 
-#: describe.c:446
+#: describe.c:447
 msgid "function"
 msgstr "funktion"
 
-#: describe.c:460
+#: describe.c:461
 msgid "operator"
 msgstr "operat�r"
 
-#: describe.c:474
+#: describe.c:475
 msgid "data type"
 msgstr "datatyp"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "table"
 msgstr "tabell"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "view"
 msgstr "vy"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "index"
 msgstr "index"
 
-#: describe.c:491 describe.c:1261
+#: describe.c:492 describe.c:1262
 msgid "sequence"
 msgstr "sekvens"
 
-#: describe.c:507
+#: describe.c:508
 msgid "rule"
 msgstr "rule"
 
-#: describe.c:523
+#: describe.c:524
 msgid "trigger"
 msgstr "trigger"
 
-#: describe.c:541
+#: describe.c:542
 msgid "Object descriptions"
 msgstr "Objektbeskrivningar"
 
-#: describe.c:587
+#: describe.c:588
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Kunde inte hitta en relation med namn \"%s\".\n"
 
-#: describe.c:666
+#: describe.c:667
 #, c-format
 msgid "Did not find any relation with oid %s.\n"
 msgstr "Kunde inte hitta en relation med oid %s.\n"
 
-#: describe.c:679
+#: describe.c:680
 msgid "Column"
 msgstr "Kolumn"
 
-#: describe.c:680 describe.c:1262 describe.c:1368
+#: describe.c:681 describe.c:1263 describe.c:1369
 msgid "Type"
 msgstr "Typ"
 
-#: describe.c:686
+#: describe.c:687
 msgid "Modifiers"
 msgstr "Modifierare"
 
-#: describe.c:786
+#: describe.c:787
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabell \"%s.%s\""
 
-#: describe.c:790
+#: describe.c:791
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vy \"%s.%s\""
 
-#: describe.c:794
+#: describe.c:795
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sekvens \"%s.%s\""
 
-#: describe.c:798
+#: describe.c:799
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index \"%s.%s\""
 
-#: describe.c:802
+#: describe.c:803
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "S�rskild relation \"%s.%s\""
 
-#: describe.c:806
+#: describe.c:807
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-tabell \"%s.%s\""
 
-#: describe.c:810
+#: describe.c:811
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Sammansatt typ \"%s.%s\""
 
-#: describe.c:814
+#: describe.c:815
 #, c-format
 msgid "?%c? \"%s.%s\""
 msgstr "?%c? \"%s.%s\""
 
-#: describe.c:853
+#: describe.c:854
 msgid "primary key, "
 msgstr "prim�rnyckel, "
 
-#: describe.c:855
+#: describe.c:856
 msgid "unique, "
 msgstr "unik, "
 
-#: describe.c:861
+#: describe.c:862
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "f�r tabell \"%s.%s\""
 
-#: describe.c:900
+#: describe.c:901
 #, c-format
 msgid "View definition: %s"
 msgstr "Vydefinition: %s"
 
-#: describe.c:906 describe.c:1102
+#: describe.c:907 describe.c:1103
 msgid "Rules"
 msgstr "Regler"
 
-#: describe.c:1026
+#: describe.c:1027
 msgid "Indexes"
 msgstr "Index"
 
-#: describe.c:1040
+#: describe.c:1041
 msgid " primary key"
 msgstr " prim�rnyckel"
 
-#: describe.c:1042
+#: describe.c:1043
 msgid " unique"
 msgstr " unik"
 
-#: describe.c:1063
+#: describe.c:1064
 msgid "Check constraints"
 msgstr "Kontrollera integritetsvillkor"
 
-#: describe.c:1066
+#: describe.c:1067
 #, c-format
 msgid "%s: \"%s\" %s"
 msgstr "%s: \"%s\" %s"
 
-#: describe.c:1071
+#: describe.c:1072
 #, c-format
 msgid "%*s  \"%s\" %s"
 msgstr "%*s  \"%s\" %s"
 
-#: describe.c:1081
+#: describe.c:1082
 msgid "Foreign Key constraints"
 msgstr "Fr�mmande nyckel-villkor"
 
-#: describe.c:1084
+#: describe.c:1085
 #, c-format
 msgid "%s: %s %s"
 msgstr "%s: %s %s"
 
-#: describe.c:1089
+#: describe.c:1090
 #, c-format
 msgid "%*s  %s %s"
 msgstr "%*s  %s %s"
 
-#: describe.c:1117
+#: describe.c:1118
 msgid "Triggers"
 msgstr "Utl�sare"
 
-#: describe.c:1199
+#: describe.c:1200
 msgid "User name"
 msgstr "Anv�ndarnamn"
 
-#: describe.c:1199
+#: describe.c:1200
 msgid "User ID"
 msgstr "Anv�ndar-ID"
 
-#: describe.c:1200
+#: describe.c:1201
 msgid "superuser, create database"
 msgstr "superanv�ndare, skapa databas"
 
-#: describe.c:1201
+#: describe.c:1202
 msgid "superuser"
 msgstr "superanv�ndare"
 
-#: describe.c:1201
+#: describe.c:1202
 msgid "create database"
 msgstr "skapa databas"
 
-#: describe.c:1202
+#: describe.c:1203
 msgid "Attributes"
 msgstr "Attribut"
 
-#: describe.c:1215
+#: describe.c:1216
 msgid "List of database users"
 msgstr "Lista med databasanv�ndare"
 
-#: describe.c:1262
+#: describe.c:1263
 msgid "special"
 msgstr "s�rskild"
 
-#: describe.c:1323
+#: describe.c:1324
 msgid "No matching relations found.\n"
 msgstr "Inga matchande relationer funna.\n"
 
-#: describe.c:1325
+#: describe.c:1326
 msgid "No relations found.\n"
 msgstr "Inga relationer funna.\n"
 
-#: describe.c:1330
+#: describe.c:1331
 msgid "List of relations"
 msgstr "Lista med relationer"
 
-#: describe.c:1369
+#: describe.c:1370
 msgid "Modifier"
 msgstr "Modifierare"
 
-#: describe.c:1383
+#: describe.c:1384
 msgid "List of domains"
 msgstr "Lista av dom�ner"
 
+#~ msgid "Options:"
+#~ msgstr "Flaggor:"
+
+#~ msgid ""
+#~ "Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"
+#~ "Portions Copyright (c) 1996, Regents of the University of California\n"
+#~ "Read the file COPYRIGHT or use the command \\copyright to see the\n"
+#~ "usage and distribution terms."
+#~ msgstr ""
+#~ "Delar Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"
+#~ "Delar Copyright (c) 1996, Regents of the University of California\n"
+#~ "L�s filen COPYRIGHT eller anv�nd kommandot \\copyright f�r att l�sa\n"
+#~ "anv�ndnings- och kopieringsvillkor."
+
 #~ msgid "  psql [options] [dbname [username]]\n"
 #~ msgstr "  psql [flaggor] [dbnamn [anv�ndarnamn]]\n"
 
diff --git a/src/interfaces/libpq/po/de.po b/src/interfaces/libpq/po/de.po
index b42cbd69ca3c9f0144fc603149d104ceb930ac55..b9037fcee154b2d9c9bcd28f399b78722b668f03 100644
--- a/src/interfaces/libpq/po/de.po
+++ b/src/interfaces/libpq/po/de.po
@@ -1,15 +1,15 @@
 # German message translation file for libpq
 # Peter Eisentraut <peter_e@gmx.net>, 2001, 2002.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/de.po,v 1.2 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/de.po,v 1.3 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: �%s�
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-09-22 13:13+0200\n"
-"PO-Revision-Date: 2002-09-22 13:13+0200\n"
+"POT-Creation-Date: 2003-05-19 01:22+0200\n"
+"PO-Revision-Date: 2003-05-19 01:24+0200\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
@@ -73,21 +73,21 @@ msgstr "ung
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ung�ltiges Authentifizierungssystem: %d\n"
 
-#: fe-connect.c:484
+#: fe-connect.c:492
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr "konnte den zu verwendenden PostgreSQL-Benutzernamen nicht bestimmen\n"
 
-#: fe-connect.c:708
+#: fe-connect.c:715
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "konnte Socket nicht auf nicht-blockierenden Modus umstellen: %s\n"
 
-#: fe-connect.c:732
+#: fe-connect.c:739
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "konnte Socket nicht auf TCP �No Delay�-Modus umstellen: %s\n"
 
-#: fe-connect.c:752
+#: fe-connect.c:759
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -98,7 +98,7 @@ msgstr ""
 "\tL�uft der Server lokal und akzeptiert er Verbindungen\n"
 "\tauf dem Unix-Domain-Socket �%s�?\n"
 
-#: fe-connect.c:761
+#: fe-connect.c:768
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -109,116 +109,116 @@ msgstr ""
 "\tL�uft der Server auf dem Host %s und akzeptiert er\n"
 "\tTCP/IP-Verbindungen auf Port %s?\n"
 
-#: fe-connect.c:825
+#: fe-connect.c:832
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "ung�ltige Hostadresse: %s\n"
 
-#: fe-connect.c:844
+#: fe-connect.c:851
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "unbekannter Hostname: %s\n"
 
-#: fe-connect.c:891
+#: fe-connect.c:898
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "konnte Socket nicht erzeugen: %s\n"
 
-#: fe-connect.c:959
+#: fe-connect.c:966
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "konnte Paket zur SSL-Verhandlung nicht senden: %s\n"
 
-#: fe-connect.c:972
+#: fe-connect.c:979
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "konnte Serverantwort auf SSL-Verhandlungspaket nicht empfangen: %s\n"
 
-#: fe-connect.c:1001
+#: fe-connect.c:1008
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ung�ltige Antwort auf SSL-Verhandlungspaket empfangen: %c\n"
 
-#: fe-connect.c:1010
+#: fe-connect.c:1017
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "Server unterst�tzt kein SSL, aber SSL wurde verlangt\n"
 
-#: fe-connect.c:1232
+#: fe-connect.c:1203
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ung�ltiger Verbindungszustand, m�glicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1263
+#: fe-connect.c:1234
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "konnte Socket-Fehlerstatus nicht ermitteln: %s\n"
 
-#: fe-connect.c:1283
+#: fe-connect.c:1254
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "konnte Client-Adresse vom Socket nicht ermitteln: %s\n"
 
-#: fe-connect.c:1322
+#: fe-connect.c:1293
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "konnte Startpaket nicht senden: %s\n"
 
-#: fe-connect.c:1378
+#: fe-connect.c:1349
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr ""
 "Authentifizierungsanfrage wurde vom Server erwartet, aber %c wurde "
 "empfangen\n"
 
-#: fe-connect.c:1490
+#: fe-connect.c:1461
 msgid "unexpected message from server during startup\n"
 msgstr "unerwartete Nachricht vom Server beim Start\n"
 
-#: fe-connect.c:1549
+#: fe-connect.c:1520
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ung�ltiger Verbindungszustand %c, m�glicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1637
+#: fe-connect.c:1606
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "ung�ltiger �setenv�-Zustand %c, m�glicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1676
+#: fe-connect.c:1643
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "ung�ltiger Kodierungsname in PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1800
+#: fe-connect.c:1762
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "ung�ltiger Zustand %c, m�glicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+#: fe-connect.c:2390 fe-connect.c:2399 fe-connect.c:2897 fe-exec.c:1284
 #: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: fe-connect.c:2475
+#: fe-connect.c:2438
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "fehlendes �=� nach �%s� in der Zeichenkette der Verbindungsdaten\n"
 
-#: fe-connect.c:2524
+#: fe-connect.c:2487
 msgid "unterminated quoted string in connection info string\n"
 msgstr ""
 "fehlendes schlie�endes Anf�hrungszeichen (\") in der Zeichenkette der "
 "Verbindugsdaten\n"
 
-#: fe-connect.c:2558
+#: fe-connect.c:2521
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "ung�ltige Verbindungsoption �%s�\n"
 
-#: fe-connect.c:2744
+#: fe-connect.c:2707
 msgid "connection pointer is NULL\n"
 msgstr "Verbindung ist ein NULL-Zeiger\n"
 
-#: fe-connect.c:2953
+#: fe-connect.c:2915
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -394,12 +394,12 @@ msgstr "Integer der Gr
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "Integer der Gr��e %lu wird nicht von pqPutInt unterst�tzt\n"
 
-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:856
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() fehlgeschlagen: %s\n"
 
-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:807
 msgid "connection not open\n"
 msgstr "Verbindung nicht offen\n"
 
@@ -423,105 +423,117 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "konnte keine Daten an den Server senden: %s\n"
 
-#: fe-secure.c:273 fe-secure.c:319
+#: fe-misc.c:863
+msgid "timeout expired\n"
+msgstr "Timeout abgelaufen\n"
+
+#: fe-secure.c:278 fe-secure.c:334
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL-SYSCALL-Fehler: %s\n"
 
-#: fe-secure.c:278 fe-secure.c:324
+#: fe-secure.c:282 fe-secure.c:338
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "SSL-SYSCALL-Fehler: Dateiende entdeckt\n"
+
+#: fe-secure.c:286 fe-secure.c:342
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL-Fehler: %s\n"
 
-#: fe-secure.c:384
+#: fe-secure.c:295 fe-secure.c:351
+msgid "Unknown SSL error code\n"
+msgstr "Unbekannter SSL-Fehlercode\n"
+
+#: fe-secure.c:407
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "Fehler beim Auslesen der Socket: %s\n"
 
-#: fe-secure.c:397
+#: fe-secure.c:420
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "konnte Host-Informationen (%s) nicht ermitteln: %s\n"
 
-#: fe-secure.c:416
+#: fe-secure.c:439
 msgid "unsupported protocol\n"
 msgstr "nicht unterst�tztes Protokoll\n"
 
-#: fe-secure.c:438
+#: fe-secure.c:461
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "Servlet Common-Name �%s� entspricht nicht %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:445
+#: fe-secure.c:468
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "Server Common-Name �%s� entspricht nicht der Peer-Adresse\n"
 
-#: fe-secure.c:613
+#: fe-secure.c:637
 msgid "could not get user information\n"
 msgstr "konnte Benutzerinformationen nicht ermitteln\n"
 
-#: fe-secure.c:625
+#: fe-secure.c:649
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "konnte Zertifikat (%s) nicht �ffnen: %s\n"
 
-#: fe-secure.c:632
+#: fe-secure.c:656
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "konnte Zertifikat (%s) nicht lesen: %s\n"
 
-#: fe-secure.c:645
+#: fe-secure.c:669
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "Zertifikat vorhanden, aber kein privater Schl�ssel (%s)\n"
 
-#: fe-secure.c:654
+#: fe-secure.c:678
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "privater Schl�ssel (%s) hat falsche Zugriffsrechte\n"
 
-#: fe-secure.c:661
+#: fe-secure.c:685
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "konnte private Schl�sseldatei (%s) nicht �ffnen: %s\n"
 
-#: fe-secure.c:670
+#: fe-secure.c:694
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "privater Schl�ssel (%s) w�hrend der Ausf�hrung ge�ndert\n"
 
-#: fe-secure.c:677
+#: fe-secure.c:701
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "konnte privaten Schl�ssel (%s) nicht lesen: %s\n"
 
-#: fe-secure.c:689
+#: fe-secure.c:713
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "Zertifikat/privater Schl�ssel stimmen nicht �berein (%s): %s\n"
 
-#: fe-secure.c:717
+#: fe-secure.c:741
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s\n"
 
-#: fe-secure.c:730 fe-secure.c:737
+#: fe-secure.c:757 fe-secure.c:765
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "konnte Root-Zertifikat-Liste (%s) nicht lesen: %s\n"
 
-#: fe-secure.c:784
+#: fe-secure.c:814
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "konnte SSL-Verbindung nicht aufbauen: %s\n"
 
-#: fe-secure.c:800
+#: fe-secure.c:832
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "Zertifikat konnte nicht validiert werden: %s\n"
 
-#: fe-secure.c:811
+#: fe-secure.c:844
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "Zertifikat konnte nicht ermittelt werden: %s\n"
diff --git a/src/interfaces/libpq/po/fr.po b/src/interfaces/libpq/po/fr.po
index 88070e31b6a1f0b1262243283c217f650a969ad3..8fa58418f971d59bed1a102265f9e97635a8525a 100644
--- a/src/interfaces/libpq/po/fr.po
+++ b/src/interfaces/libpq/po/fr.po
@@ -1,91 +1,92 @@
 # French message translation file for libpq
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
+# Lo�c Hennequin <loic.hennequin@wanadoo.fr>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.1 2002/08/21 20:42:27 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/fr.po,v 1.2 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: �%s�
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-12-05 20:41+0100\n"
-"PO-Revision-Date: 2001-12-11 00:02+0100\n"
-"Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
-"Language-Team: French <peter_e@gmx.net>\n"
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2003-05-19 01:22+0200\n"
+"PO-Revision-Date: 2003-05-19 01:32+0200\n"
+"Last-Translator: Lo�c HENNEQUIN <loic.hennequin@wanadoo.fr>\n"
+"Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fe-auth.c:228
+#: fe-auth.c:232
 #, c-format
 msgid "Kerberos 4 error: %s\n"
 msgstr "erreur de Kerberos 4: %s\n"
 
-#: fe-auth.c:391
+#: fe-auth.c:395
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "n'a pas pu activer le mode bloquant pour le socket: %s\n"
 
-#: fe-auth.c:407
+#: fe-auth.c:412 fe-auth.c:416
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "authentification Kerberos 5 rejet�e: %*s\n"
 
-#: fe-auth.c:427
+#: fe-auth.c:440
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "n'a pas pu r�tablir le mode non-bloquant pour le socket: %s\n"
 
-#: fe-auth.c:490
+#: fe-auth.c:503
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "m�thode d'authentification SCM_CRED non support�e\n"
 
-#: fe-auth.c:576
+#: fe-auth.c:589
 msgid "Kerberos 4 authentication failed\n"
 msgstr "�chec d'authentification Kerberos 4\n"
 
-#: fe-auth.c:582
+#: fe-auth.c:595
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "authentification Kerberos 4 non support�e\n"
 
-#: fe-auth.c:593
+#: fe-auth.c:606
 msgid "Kerberos 5 authentication failed\n"
 msgstr "�chec d'authentification Kerberos 5\n"
 
-#: fe-auth.c:599
+#: fe-auth.c:612
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "authentification Kerberos 5 non support�e\n"
 
-#: fe-auth.c:627
+#: fe-auth.c:640
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "m�thode d'authentification %u non support�e\n"
 
-#: fe-auth.c:664
+#: fe-auth.c:677
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "nom invalide de service d'authentification �%s�, ignor�\n"
 
-#: fe-auth.c:721
+#: fe-auth.c:734
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: syst�me invalide d'authentification: %d\n"
 
-#: fe-connect.c:483
+#: fe-connect.c:492
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr "n'a pas pu d�terminer le nom d'utilisateur � utiliser\n"
 
-#: fe-connect.c:703
+#: fe-connect.c:715
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "n'a pas pu activer le mode non-bloquant pour le socket: %s\n"
 
-#: fe-connect.c:727
+#: fe-connect.c:739
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "n'a pas pu activer le mode non-bloquant de TCP pour le socket: %s\n"
 
-#: fe-connect.c:747
+#: fe-connect.c:759
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -94,9 +95,9 @@ msgid ""
 msgstr ""
 "n'a pas pu connecter au serveur: %s\n"
 "\tEst-ce que le serveur est en �xecution � l'h�te local\n"
-"\tet en acceptant des connexions au socket Unix �%s�?\n"
+"\tet accepte des connexions au socket Unix �%s�?\n"
 
-#: fe-connect.c:756
+#: fe-connect.c:768
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -107,208 +108,225 @@ msgstr ""
 "\tEst-ce que le serveur est en �xecution � l'h�te %s\n"
 "\tet en acceptant des connexions TCP/IP au port %s?\n"
 
-#: fe-connect.c:820
+#: fe-connect.c:832
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "adresse invalide de l'h�te: %s\n"
 
-#: fe-connect.c:839
+#: fe-connect.c:851
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "nom inconnu de l'h�te: %s\n"
 
-#: fe-connect.c:881
+#: fe-connect.c:898
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "n'a pas pu cr�er le socket: %s\n"
 
-#: fe-connect.c:944
+#: fe-connect.c:966
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "n'a pas pu transmettre le paquet de n�gociation SSL: %s\n"
 
-#: fe-connect.c:952
+#: fe-connect.c:979
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "n'a pas pu recevoir la r�ponse au paquet de n�gociation SSL: %s\n"
 
-#: fe-connect.c:966
-#, c-format
-msgid "could not create SSL context: %s\n"
-msgstr "n'a pas pu cr�er le contexte SSL: %s\n"
-
-#: fe-connect.c:976
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "n'a pas pu �tablir la connexion SSL: %s\n"
-
-#: fe-connect.c:999
+#: fe-connect.c:1008
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "r�ponse invalide au n�gociation SSL �tait re�ue: %c\n"
 
-#: fe-connect.c:1008
+#: fe-connect.c:1017
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "le serveur ne supporte pas SSL, mais SSL �tait exig�\n"
 
-#: fe-connect.c:1174
+#: fe-connect.c:1203
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "�tat invalide de connexion, probablement une indication de m�moire corrompue\n"
+msgstr ""
+"�tat invalide de connexion, probablement une indication de m�moire "
+"corrompue\n"
 
-#: fe-connect.c:1205
+#: fe-connect.c:1234
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "n'a pas pu d�terminer l'erreur du socket: %s\n"
 
-#: fe-connect.c:1225
+#: fe-connect.c:1254
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "n'a pas pu obtenir l'adresse du client du socket: %s\n"
 
-#: fe-connect.c:1264
+#: fe-connect.c:1293
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "n'a pas pu transmettre le paquet de d�marrage: %s\n"
 
-#: fe-connect.c:1320
+#: fe-connect.c:1349
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "requ�te d'authentification attendue, mais %c �tait re�u\n"
 
-#: fe-connect.c:1432
+#: fe-connect.c:1461
 msgid "unexpected message from server during startup\n"
 msgstr "message inattendu du serveur lors de d�marrage\n"
 
-#: fe-connect.c:1491
+#: fe-connect.c:1520
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "�tat invalide de connexion (%c), probablement une indication de m�moire corrompue\n"
+msgstr ""
+"�tat invalide de connexion (%c), probablement une indication de m�moire "
+"corrompue\n"
 
-#: fe-connect.c:1590
+#: fe-connect.c:1606
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "�tat invalide de setenv (%c), probablement une indication de m�moire corrompue\n"
+msgstr ""
+"�tat invalide de setenv (%c), probablement une indication de m�moire "
+"corrompue\n"
 
-#: fe-connect.c:1630
+#: fe-connect.c:1643
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "nom invalide d'encodage en PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1755
+#: fe-connect.c:1762
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "�tat invalide (%c), probablement une indication de m�moire corrompue\n"
 
-#: fe-connect.c:2374 fe-connect.c:2383 fe-exec.c:1184 fe-lobj.c:536
+#: fe-connect.c:2390 fe-connect.c:2399 fe-connect.c:2897 fe-exec.c:1284
+#: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "m�moire �puis�e\n"
 
-#: fe-connect.c:2422
+#: fe-connect.c:2438
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "�=� manquant apr�s �%s� dans la cha�ne de param�tres de connexion\n"
 
-#: fe-connect.c:2471
+#: fe-connect.c:2487
 msgid "unterminated quoted string in connection info string\n"
-msgstr "cha�ne incompl�te entre guillemets dans la cha�ne de param�tres de connexion\n"
+msgstr ""
+"cha�ne incompl�te entre guillemets dans la cha�ne de param�tres de "
+"connexion\n"
 
-#: fe-connect.c:2505
+#: fe-connect.c:2521
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "option invalide de connexion �%s�\n"
 
-#: fe-connect.c:2720
+#: fe-connect.c:2707
 msgid "connection pointer is NULL\n"
+msgstr "le pointeur de connexion vaut NULL\n"
+
+#: fe-connect.c:2915
+#, c-format
+msgid ""
+"WARNING: Password file %s has world or group read access; permission should "
+"be u=rw (0600)\n"
 msgstr ""
+"ATTENTION: Le fichier des mots de passe %s a des permission de groupe et "
+"pour tous en lecture; les permissions doivent �tre u=rw (0600)\n"
 
-#: fe-exec.c:633
+#: fe-exec.c:737
 msgid "command string is a null pointer\n"
-msgstr ""
+msgstr "la chaine de commande est un pointeur nul\n"
 
-#: fe-exec.c:641
+#: fe-exec.c:745
 msgid "no connection to the server\n"
 msgstr "aucune connexion au serveur\n"
 
-#: fe-exec.c:648
+#: fe-exec.c:752
 msgid "another command is already in progress\n"
 msgstr "une autre commande est d�j� en cours\n"
 
-#: fe-exec.c:846
+#: fe-exec.c:950
 #, c-format
 msgid "message type 0x%02x arrived from server while idle\n"
 msgstr ""
+"type de message 0x%02x est arriv� du serveur pendant qu'il �tait inactif\n"
 
-#: fe-exec.c:888
+#: fe-exec.c:992
 #, c-format
 msgid ""
 "unexpected character %c following empty query response (\"I\" message)\n"
 msgstr ""
+"caract�re %c inattendu suivant une r�ponse � une requ�te vide (message \"I"
+"\")\n"
 
-#: fe-exec.c:945
+#: fe-exec.c:1049
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)\n"
 msgstr ""
+"le serveur a envoy� des donn�es (message \"D\") sans description de ligne "
+"pr�alable (message \"T\")\n"
 
-#: fe-exec.c:962
+#: fe-exec.c:1066
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)\n"
 msgstr ""
+"le serveur a envoy� des donn�es binaires (message \"B\") sans description "
+"ant�rieure de la ligne (message \"T\" )\n"
 
-#: fe-exec.c:978
+#: fe-exec.c:1082
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "r�ponse inattendue du serveur; le premier caract�re re�u a �t� �%c�\n"
 
-#: fe-exec.c:1271
+#: fe-exec.c:1371
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "asyncStatus inattendu: %d\n"
 
-#: fe-exec.c:1321
+#: fe-exec.c:1421
 msgid "COPY state must be terminated first\n"
 msgstr "�tat COPY doit �tre termin� auparavant\n"
 
-#: fe-exec.c:1672
+#: fe-exec.c:1780
 msgid "no COPY in progress\n"
 msgstr "aucun COPY en cours\n"
 
-#: fe-exec.c:1711
+#: fe-exec.c:1819
 msgid "lost synchronization with server, resetting connection\n"
-msgstr "synchronisation avec le serveur �tait perdue, la connexion sera r�initialis�e\n"
+msgstr ""
+"synchronisation avec le serveur �tait perdue, la connexion sera "
+"r�initialis�e\n"
 
-#: fe-exec.c:1776
+#: fe-exec.c:1884
 msgid "connection in wrong state\n"
 msgstr "mauvais �tat de connexion\n"
 
-#: fe-exec.c:1878 fe-exec.c:1912
+#: fe-exec.c:1986 fe-exec.c:2020
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "erreur de protocole: id=0x%x\n"
 
-#: fe-exec.c:1947
+#: fe-exec.c:2055
 msgid "invalid ExecStatusType code"
 msgstr "code invalide ExecStatusType"
 
-#: fe-exec.c:2000 fe-exec.c:2033
+#: fe-exec.c:2108 fe-exec.c:2141
 #, c-format
 msgid "column number %d is out of range 0..%d\n"
 msgstr "nombre de colonne %d est en dehors des limites 0..%d\n"
 
-#: fe-exec.c:2022
+#: fe-exec.c:2130
 #, c-format
 msgid "row number %d is out of range 0..%d\n"
-msgstr ""
+msgstr "le num�ro de ligne %d est hors de l'�tendue 0..%d\n"
 
-#: fe-exec.c:2217
+#: fe-exec.c:2325
 #, c-format
 msgid "could not interpret result from server: %s\n"
 msgstr "n'a pas pu interpr�ter la r�ponse du serveur: %s\n"
 
-#: fe-exec.c:2233
+#: fe-exec.c:2341
 msgid "no row count available\n"
-msgstr ""
+msgstr "le nombre de lignes n'est pas disponible\n"
 
 #: fe-lobj.c:400 fe-lobj.c:483
 #, c-format
@@ -318,12 +336,12 @@ msgstr "n'a pas pu ouvrir 
 #: fe-lobj.c:412
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
-msgstr ""
+msgstr "ne peut pas cr�er l'objet large pour le fichier \"%s\"\n"
 
 #: fe-lobj.c:422 fe-lobj.c:472
 #, c-format
 msgid "could not open large object %u\n"
-msgstr ""
+msgstr "ne peut pas ouvrir l'objet large %u\n"
 
 #: fe-lobj.c:437
 #, c-format
@@ -338,6 +356,8 @@ msgstr "erreur d'
 #: fe-lobj.c:564
 msgid "query to initialize large object functions did not return data\n"
 msgstr ""
+"la requ�te d'initialisation des fonctions des objets larges ne retourne pas "
+"de donn�es\n"
 
 #: fe-lobj.c:602
 msgid "cannot determine OID of function lo_open\n"
@@ -371,36 +391,31 @@ msgstr "ne peut pas d
 msgid "cannot determine OID of function lowrite\n"
 msgstr "ne peut pas d�terminer l'OID de la fonction lowrite\n"
 
-#: fe-misc.c:132
-#, c-format
-msgid "could not flush enough data (space available: %d, space needed %d)\n"
-msgstr ""
-
-#: fe-misc.c:281
+#: fe-misc.c:303
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt\n"
 msgstr "entier de taille %lu non support� par pqGetInt\n"
 
-#: fe-misc.c:319
+#: fe-misc.c:341
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "entier de taille %lu non support� par pqPutInt\n"
 
-#: fe-misc.c:357 fe-misc.c:391 fe-misc.c:779
+#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:856
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "�chec de select(): %s\n"
 
-#: fe-misc.c:418 fe-misc.c:618 fe-misc.c:758
+#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:807
 msgid "connection not open\n"
 msgstr "connexion n'est pas active\n"
 
-#: fe-misc.c:489 fe-misc.c:575
+#: fe-misc.c:515 fe-misc.c:595
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "n'a pas pu recevoir des donn�es du serveur: %s\n"
 
-#: fe-misc.c:592 fe-misc.c:676
+#: fe-misc.c:612 fe-misc.c:686
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -410,7 +425,125 @@ msgstr ""
 "\tPeut-�tre c'est � dire que le serveur a termin� anormalement\n"
 "\tavant ou lors du traitement de la requ�te.\n"
 
-#: fe-misc.c:692
+#: fe-misc.c:702
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "n'a pas pu transmettre des donn�es au serveur: %s\n"
+
+#: fe-misc.c:863
+msgid "timeout expired\n"
+msgstr "le d�lai a expir�\n"
+
+#: fe-secure.c:278 fe-secure.c:334
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "erreur SYSCALL SSL: %s\n"
+
+#: fe-secure.c:282 fe-secure.c:338
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "erreur SYSCALL SSL: EOF a �t� trouv�\n"
+
+#: fe-secure.c:286 fe-secure.c:342
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "erreur de SSL: %s\n"
+
+#: fe-secure.c:295 fe-secure.c:351
+msgid "Unknown SSL error code\n"
+msgstr "code d'erreur SSL inconnue\n"
+
+#: fe-secure.c:407
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "erreur dans l'appel � la socket �%s�\n"
+
+#: fe-secure.c:420
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "n'a pas pu obtenir les information sur l'h�te (%s): %s\n"
+
+#: fe-secure.c:439
+msgid "unsupported protocol\n"
+msgstr "protocole non support�\n"
+
+#: fe-secure.c:461
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr ""
+"le nom courant du serveur \"%s\" n'a pas pu �tre r�solu en %ld.%ld.%ld.%ld\n"
+
+#: fe-secure.c:468
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr ""
+"le nom courant du serveur \"%s\" n'a pas pu �tre r�solu en une adresse d'un "
+"pair\n"
+
+#: fe-secure.c:637
+msgid "could not get user information\n"
+msgstr "n'a pas pu obtenir les informations utilisateur\n"
+
+#: fe-secure.c:649
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "n'a pas pu ouvrir le certificat (%s): %s\n"
+
+#: fe-secure.c:656
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "n'a pas pu lire le certificat (%s): %s\n"
+
+#: fe-secure.c:669
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr "le certificat est pr�sent, mais pas la cl� priv�e (%s)\n"
+
+#: fe-secure.c:678
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr "la cl� priv�e (%s) n'a pas les bonnes permissions\n"
+
+#: fe-secure.c:685
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr "n'a pas pu ouvrir le fichier de cl� priv�e (%s): %s\n"
+
+#: fe-secure.c:694
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr "la cl� priv�e (%s) a chang� pendant l'ex�cution\n"
+
+#: fe-secure.c:701
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr "n'a pas pu lire la cl� priv�e (%s): %s\n"
+
+#: fe-secure.c:713
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr "le certificat et la cl� priv�e ne correspondent pas (%s): %s\n"
+
+#: fe-secure.c:741
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "n'a pas pu cr�er le contexte SSL: %s\n"
+
+#: fe-secure.c:757 fe-secure.c:765
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "n'a pas pu lire la liste de certificat racine (%s): %s\n"
+
+#: fe-secure.c:814
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "n'a pas pu �tablir la connexion SSL: %s\n"
+
+#: fe-secure.c:832
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "le certificat n'a pas pu �tre valid�: %s\n"
+
+#: fe-secure.c:844
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "le certificat n'a pas pu �tre obtenu: %s\n"
diff --git a/src/interfaces/libpq/po/pt_BR.po b/src/interfaces/libpq/po/pt_BR.po
index bae052c9ad11d6a633faa2e6848f32c081d0b4db..4bcaa2303a3ce1bb5d2cef37eb17bbe28befd3f2 100644
--- a/src/interfaces/libpq/po/pt_BR.po
+++ b/src/interfaces/libpq/po/pt_BR.po
@@ -1,37 +1,38 @@
 # Translation to Portuguese (Brazilian) language
-# Cesar Suga <sartre@linuxbr.com>, 2002.
-# Fair & Simple Networks Ltda.
+# Cesar Suga <sartre@linuxbr.com>, 2002.-  Fair & Simple Networks Ltda.
+# Roberto Mello <rmello@fslc.usu.edu>, 2002.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2002-09-29 04:16-0400\n"
-"PO-Revision-Date: 2002-07-20 17:25-0300\n"
-"Last-Translator: Cesar Suga <sartre@linuxbr.com>\n"
-"Language-Team: Cesar Suga <sartre@linuxbr.com>\n"
+"POT-Creation-Date: 2002-12-05 04:19-0500\n"
+"PO-Revision-Date: 2002-12-05 18:51GMT\n"
+"Last-Translator: Roberto Mello <rmello@fslc.usu.edu>\n"
+"Language-Team: Roberto Mello <rmello@fslc.usu.edu>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 0.9.5\n"
 
 #: fe-auth.c:232
 #, c-format
 msgid "Kerberos 4 error: %s\n"
-msgstr "Erro Kerberos 4: %s\n"
+msgstr "Erro do Kerberos 4: %s\n"
 
 #: fe-auth.c:395
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
-msgstr "n�o pude setar socket para modo blocking: %s\n"
+msgstr "n�o pude configurar o soquete para modo bloqueado: %s\n"
 
 #: fe-auth.c:412 fe-auth.c:416
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "Autentica��o Kerberos 5 rejeitavda: %*s\n"
+msgstr "Autentica��o Kerberos 5 rejeitada: %*s\n"
 
 #: fe-auth.c:440
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "n�o pude restaurar modo non-blocking no socket: %s\n"
+msgstr "n�o pude restaurar modo n�o-bloqueado no soquete: %s\n"
 
 #: fe-auth.c:503
 msgid "SCM_CRED authentication method not supported\n"
@@ -68,21 +69,21 @@ msgstr "nome de servi
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: sistema de autentica��o inv�lido: %d\n"
 
-#: fe-connect.c:484
+#: fe-connect.c:483
 msgid "could not determine the PostgreSQL user name to use\n"
-msgstr "n�o pude determinar o usu�rio PostgreSQL a usar\n"
+msgstr "n�o pude determinar o usu�rio PostgreSQL a ser usado\n"
 
-#: fe-connect.c:708
+#: fe-connect.c:710
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "n�o pude setar socket para modo non-blocking: %s\n"
+msgstr "n�o pude configurar o soquete para modo n�o-bloqueado: %s\n"
 
-#: fe-connect.c:732
+#: fe-connect.c:734
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "n�o pude setar socket para modo TCP sem delay: %s\n"
+msgstr "n�o pude configurar soquete para modo TCP sem atraso: %s\n"
 
-#: fe-connect.c:752
+#: fe-connect.c:754
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -91,9 +92,9 @@ msgid ""
 msgstr ""
 "n�o pude conectar ao servidor: %s\n"
 "\tO servidor est� rodando localmente e aceitando\n"
-"\tconex�es no Unix domain socket \"%s\"?\n"
+"\tconex�es no soquete de dom�nio Unix \"%s\"?\n"
 
-#: fe-connect.c:761
+#: fe-connect.c:763
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -104,127 +105,125 @@ msgstr ""
 "\tO servidor est� rodando na m�quina %s e aceitando\n"
 "\tconex�es TCP/IP na porta %s?\n"
 
-#: fe-connect.c:825
+#: fe-connect.c:827
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "nome inv�lido de m�quina: %s\n"
 
-#: fe-connect.c:844
+#: fe-connect.c:846
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "m�quina desconhecida: %s\n"
 
-#: fe-connect.c:891
+#: fe-connect.c:893
 #, c-format
 msgid "could not create socket: %s\n"
-msgstr "n�o pude criar socket: %s\n"
+msgstr "n�o pude criar soquete: %s\n"
 
-#: fe-connect.c:959
+#: fe-connect.c:961
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "n�o pude mandar pacote de negocia��o SSL: %s\n"
 
-#: fe-connect.c:972
+#: fe-connect.c:974
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "n�o pude receber resposta do servidor para pacote de negocia��o SSL: %s\n"
 
-#: fe-connect.c:1001
+#: fe-connect.c:1003
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "recebida resposta inv�lida a negocia��o SSL: %c\n"
 
-#: fe-connect.c:1010
+#: fe-connect.c:1012
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "servidor nao suporta SSL, mas SSL foi requerido\n"
 
-#: fe-connect.c:1232
+#: fe-connect.c:1198
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "estado de conex�o inv�lido, prov�vel indicativo de corrup��o de mem�ria\n"
+msgstr "estado de conex�o inv�lido, provavelmente indicativo de corrup��o de mem�ria\n"
 
-#: fe-connect.c:1263
+#: fe-connect.c:1229
 #, c-format
 msgid "could not get socket error status: %s\n"
-msgstr "n�o pude obter status de erro de socket: %s\n"
+msgstr "n�o pude obter estado do erro de soquete: %s\n"
 
-#: fe-connect.c:1283
+#: fe-connect.c:1249
 #, c-format
 msgid "could not get client address from socket: %s\n"
-msgstr "n�o pude pegar endere�o de cliente do socket: %s\n"
+msgstr "n�o pude obter endere�o de cliente do soquete: %s\n"
 
-#: fe-connect.c:1322
+#: fe-connect.c:1288
 #, c-format
 msgid "could not send startup packet: %s\n"
-msgstr "n�o pude mandar pacote de inicia��o: %s\n"
+msgstr "n�o pude enviar pacote de inicializa��o: %s\n"
 
-#: fe-connect.c:1378
+#: fe-connect.c:1344
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "pedido de autentica��o esperado do servidor, mas recebido %c\n"
 
-#: fe-connect.c:1490
+#: fe-connect.c:1456
 msgid "unexpected message from server during startup\n"
-msgstr "mensagem n�o esperada do servidor durante startup\n"
+msgstr "mensagem n�o esperada do servidor durante inicializa��o\n"
 
-#: fe-connect.c:1549
+#: fe-connect.c:1515
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr ""
 "estado de conex�o %c inv�lido, provavelmente indicativo de corrup��o de\n"
 "mem�ria\n"
 
-#: fe-connect.c:1637
+#: fe-connect.c:1601
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr ""
 "estado de setenv %c inv�lido, provavelmente indicativo de corrup��o\n"
 "de mem�ria\n"
 
-#: fe-connect.c:1676
+#: fe-connect.c:1638
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
-msgstr "nome de encoding inv�lido em PGCLIENTENCODING: %s\n"
+msgstr "nome de codifica��o inv�lido em PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1800
+#: fe-connect.c:1757
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "estado %c inv�lido, provavelmente indicativo de corrup��o de mem�ria\n"
 
-#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+#: fe-connect.c:2385 fe-connect.c:2394 fe-connect.c:2891 fe-exec.c:1284
 #: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "sem mem�ria\n"
 
-#: fe-connect.c:2475
+#: fe-connect.c:2433
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr "faltando \"=\" depois de \"%s\" na string de informa��o de conex�o\n"
+msgstr "faltando \"=\" depois de \"%s\" na linha de informa��o de conex�o\n"
 
-#: fe-connect.c:2524
+#: fe-connect.c:2482
 msgid "unterminated quoted string in connection info string\n"
-msgstr "string em aspas n�o terminada na string de informa��o de conex�o\n"
+msgstr "frase em aspas n�o terminada na linha de informa��o da conex�o\n"
 
-#: fe-connect.c:2558
+#: fe-connect.c:2516
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "op��o de conex�o \"%s\" inv�lida\n"
 
-#: fe-connect.c:2744
+#: fe-connect.c:2702
 msgid "connection pointer is NULL\n"
 msgstr "ponteiro de conex�o � NULL\n"
 
-#: fe-connect.c:2953
+#: fe-connect.c:2912
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
 "be u=rw (0600)\n"
-msgstr ""
-"AVISO: Arquivo de senhas %s tem permiss�es de leitura de grupo ou globais; "
-"permiss�o deve ser u=rw (0600)\n"
+msgstr "AVISO: Arquivo de senhas %s tem permiss�es de leitura de grupo ou globais; permiss�o deve ser u=rw (0600)\n"
 
 #: fe-exec.c:737
 msgid "command string is a null pointer\n"
-msgstr "string de comando � um ponteiro nulo\n"
+msgstr "linha de comando � um ponteiro nulo\n"
 
 #: fe-exec.c:745
 msgid "no connection to the server\n"
@@ -241,28 +240,27 @@ msgstr "tipo de mensagem 0x%02x chegou do servidor enquanto inativo\n"
 
 #: fe-exec.c:992
 #, c-format
-msgid ""
-"unexpected character %c following empty query response (\"I\" message)\n"
-msgstr "caractere %c n�o esperado seguindo resposta de query vazia (mensagem \"I\")\n"
+msgid "unexpected character %c following empty query response (\"I\" message)\n"
+msgstr "caractere %c n�o esperado seguindo resposta de consulta vazia (mensagem \"I\")\n"
 
 #: fe-exec.c:1049
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)\n"
-msgstr "servidor mandou dados (mensagem \"D\") sem descri��o anterior de linha(mensagem \"T\")\n"
+msgstr "servidor enviou dados (mensagem \"D\") sem descri��o anterior de linha(mensagem \"T\")\n"
 
 #: fe-exec.c:1066
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)\n"
 msgstr ""
-"servidor mandou dados bin�rios (mensagem \"B\") sem descri��o de linha\n"
+"servidor enviou dados bin�rios (mensagem \"B\") sem descri��o de linha\n"
 "anterior (mensagem \"T\")\n"
 
 #: fe-exec.c:1082
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "resposta n�o esperada do servidor; primeiro caractere recebido foi \"%c\"\n"
+msgstr "resposta inesperada do servidor; primeiro caractere recebido foi \"%c\"\n"
 
 #: fe-exec.c:1371
 #, c-format
@@ -279,7 +277,7 @@ msgstr "Nenhum COPY em andamento\n"
 
 #: fe-exec.c:1819
 msgid "lost synchronization with server, resetting connection\n"
-msgstr "perdi sincroniza��o com o servidor, resetando a conex�o\n"
+msgstr "perdi sincroniza��o com o servidor, reiniciando a conex�o\n"
 
 #: fe-exec.c:1884
 msgid "connection in wrong state\n"
@@ -340,7 +338,7 @@ msgstr "erro enquanto escrevendo ao arquivo \"%s\"\n"
 
 #: fe-lobj.c:564
 msgid "query to initialize large object functions did not return data\n"
-msgstr "query para inicializar fun��es de objeto grande n�o retornou dados\n"
+msgstr "consulta para inicializar fun��es de objeto grande n�o retornou dados\n"
 
 #: fe-lobj.c:602
 msgid "cannot determine OID of function lo_open\n"
@@ -384,12 +382,12 @@ msgstr "inteiro de tamanho %lu n
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "inteiro de tamanho %lu n�o suportado por pqPutInt\n"
 
-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:856
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() falhou: %s\n"
 
-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:807
 msgid "connection not open\n"
 msgstr "conex�o n�o aberta\n"
 
@@ -413,105 +411,109 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "n�o pude mandar dados ao servidor: %s\n"
 
-#: fe-secure.c:275 fe-secure.c:321
+#: fe-misc.c:863
+msgid "timeout expired\n"
+msgstr "tempo de espera expirado\n"
+
+#: fe-secure.c:274 fe-secure.c:319
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "Erro de chamada de sistema (SYSCALL) SSL: %s\n"
 
-#: fe-secure.c:280 fe-secure.c:326
+#: fe-secure.c:279 fe-secure.c:324
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "Erro de SSL: %s\n"
 
-#: fe-secure.c:387
+#: fe-secure.c:385
 #, c-format
 msgid "error querying socket: %s\n"
-msgstr "erro ao checar socket: %s\n"
+msgstr "erro ao checar soquete: %s\n"
 
-#: fe-secure.c:400
+#: fe-secure.c:398
 #, c-format
 msgid "could not get information about host (%s): %s\n"
-msgstr "n�o pude obter informa��es sobre host (%s): %s\n"
+msgstr "n�o pude obter informa��es sobre m�quina (%s): %s\n"
 
-#: fe-secure.c:419
+#: fe-secure.c:417
 msgid "unsupported protocol\n"
 msgstr "protocolo n�o suportado\n"
 
-#: fe-secure.c:441
+#: fe-secure.c:439
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
-msgstr "nome do servidor \"%s\" n�o resolve a %ld.%ld.%ld.%ld\n"
+msgstr "nome do servidor \"%s\" n�o resolve para %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:448
+#: fe-secure.c:446
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "nome do servidor \"%s\" n�o resolve ao endere�o remoto\n"
 
-#: fe-secure.c:617
+#: fe-secure.c:615
 msgid "could not get user information\n"
 msgstr "n�o pude obter informa��o do usu�rio\n"
 
-#: fe-secure.c:629
+#: fe-secure.c:627
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "n�o pude abrir certificado (%s): %s\n"
 
-#: fe-secure.c:636
+#: fe-secure.c:634
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "n�o pude ler certificado (%s): %s\n"
 
-#: fe-secure.c:649
+#: fe-secure.c:647
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "certificado presente, mas n�o a chave privada (%s)\n"
 
-#: fe-secure.c:658
+#: fe-secure.c:656
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "chave privada (%s) tem permiss�es erradas\n"
 
-#: fe-secure.c:665
+#: fe-secure.c:663
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "n�o pude abrir arquivo de chave privada (%s): %s\n"
 
-#: fe-secure.c:674
+#: fe-secure.c:672
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "chave privada (%s) mudou durante a execu��o\n"
 
-#: fe-secure.c:681
+#: fe-secure.c:679
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "n�o pude ler chave privada (%s): %s\n"
 
-#: fe-secure.c:693
+#: fe-secure.c:691
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "certificado ou chave privada incorreto (%s): %s\n"
 
-#: fe-secure.c:721
+#: fe-secure.c:719
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "n�o pude criar contexto de SSL: %s\n"
 
-#: fe-secure.c:737 fe-secure.c:745
+#: fe-secure.c:735 fe-secure.c:743
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "n�o pude ler listagem de certificados-raiz (%s): %s\n"
 
-#: fe-secure.c:794
+#: fe-secure.c:792
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "n�o pude estabelecer conex�o SSL: %s\n"
 
-#: fe-secure.c:812
+#: fe-secure.c:810
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "certificado n�o p�de ser validado: %s\n"
 
-#: fe-secure.c:824
+#: fe-secure.c:822
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "certificado n�o p�de ser obtido: %s\n"
diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po
index b0d2d50784ae9b3457953be857aa00d1860bfb72..262bd0f4203dfa4073f80ad36c07c397cb553b5f 100644
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
@@ -1,18 +1,19 @@
 # ru.po
 # LIBPQ Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.3 2002/10/14 19:04:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.4 2003/06/28 22:31:01 petere Exp $
 #
 # Changelog:
-#   - October 12, 2002: Post-7.3beta2 fuzzy translation fizes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - Januray 2, 2002: Completed SSL transaltion, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Post-7.3beta2 fuzzy translation fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-10-12 12:42-0400\n"
-"PO-Revision-Date: 2002-10-12 12:45-0500\n"
+"POT-Creation-Date: 2003-01-02 05:05-0500\n"
+"PO-Revision-Date: 2003-01-02 12:56-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -39,37 +40,37 @@ msgstr "
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "�� ���������� ������������ �� ����������� ����� ��� ������: %s\n"
 
-#: fe-auth.c:503
+#: fe-auth.c:505
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "�������������� SCM_CRED �� ��������������\n"
 
-#: fe-auth.c:589
+#: fe-auth.c:591
 msgid "Kerberos 4 authentication failed\n"
 msgstr "�������������� Kerberos 4 �� �������\n"
 
-#: fe-auth.c:595
+#: fe-auth.c:597
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "�������������� Kerberos 4 �� ��������������\n"
 
-#: fe-auth.c:606
+#: fe-auth.c:608
 msgid "Kerberos 5 authentication failed\n"
 msgstr "�������������� Kerberos 5 �� �������\n"
 
-#: fe-auth.c:612
+#: fe-auth.c:614
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "�������������� Kerberos 5 �� ��������������\n"
 
-#: fe-auth.c:640
+#: fe-auth.c:642
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "����� �������������� %u �� ��������������\n"
 
-#: fe-auth.c:677
+#: fe-auth.c:679
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "������������ ��� ������� �������������� \"%s\", ������������\n"
 
-#: fe-auth.c:734
+#: fe-auth.c:736
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ������������ ������� ��������������: %d\n"
@@ -79,17 +80,17 @@ msgid "could not determine the PostgreSQL user name to use\n"
 msgstr ""
 "�� ���������� ���������� ����� ��� ������������ PostgreSQL ������������\n"
 
-#: fe-connect.c:707
+#: fe-connect.c:710
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "�� ���������� ���������� ����� � �� ����������� �����: %s\n"
 
-#: fe-connect.c:731
+#: fe-connect.c:734
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "�� ���������� ���������� ����� � ������������ TCP �����: %s\n"
 
-#: fe-connect.c:751
+#: fe-connect.c:754
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -100,7 +101,7 @@ msgstr ""
 "\t�������� �� ������ �������� � ���������\n"
 "\t������������� �� ������ Unix'������� ������ \"%s\"?\n"
 
-#: fe-connect.c:760
+#: fe-connect.c:763
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -111,120 +112,120 @@ msgstr ""
 "\t�������� �� ������ �� ����� %s � ���������\n"
 "\t������������� ����� TCP/IP �������� �� ���� %s?\n"
 
-#: fe-connect.c:824
+#: fe-connect.c:827
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "������������ ����� �����: %s\n"
 
-#: fe-connect.c:843
+#: fe-connect.c:846
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "����������� ��� �����: %s\n"
 
-#: fe-connect.c:890
+#: fe-connect.c:893
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "�� ���������� ������� �����: %s\n"
 
-#: fe-connect.c:958
+#: fe-connect.c:961
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "�� ���������� ��������� ����� ������������ SSL: %s\n"
 
-#: fe-connect.c:971
+#: fe-connect.c:974
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "�� ��� ������� ����� ������� �� ����� ������������ SSL: %s\n"
 
-#: fe-connect.c:1000
+#: fe-connect.c:1003
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "������� ������������ ����� �� ��������� ������������ �� SSL: %c\n"
 
-#: fe-connect.c:1009
+#: fe-connect.c:1012
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "������ �� ������������ SSL, �� ������� SSL ���� ����������\n"
 
-#: fe-connect.c:1218
+#: fe-connect.c:1201
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� �������������, ��������� ��������� �� ��������� "
 "����������� ������\n"
 
-#: fe-connect.c:1249
+#: fe-connect.c:1232
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "���������� ���� �������� ������ ������ ������: %s\n"
 
-#: fe-connect.c:1269
+#: fe-connect.c:1252
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "���������� ���� �������� ����� ������� �� ������: %s\n"
 
-#: fe-connect.c:1308
+#: fe-connect.c:1291
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "�� ���������� ��������� ��������� �����: %s\n"
 
-#: fe-connect.c:1364
+#: fe-connect.c:1347
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "�������� ������ �������������� �� �������, �� ���� ��������: %c\n"
 
-#: fe-connect.c:1476
+#: fe-connect.c:1459
 msgid "unexpected message from server during startup\n"
 msgstr "����������� ��������� �� ������� ��� �������\n"
 
-#: fe-connect.c:1535
+#: fe-connect.c:1518
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� ������������� %c, ��������� ��������� �� ��������� "
 "����������� ������\n"
 
-#: fe-connect.c:1623
+#: fe-connect.c:1604
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� setenv %c, ��������� ���������� ��������� ����������� "
 "������\n"
 
-#: fe-connect.c:1662
+#: fe-connect.c:1641
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "������������ ��� ��������� � PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1786
+#: fe-connect.c:1766
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� %c, ��������� ���������� ��������� ����������� "
 "������\n"
 
-#: fe-connect.c:2413 fe-connect.c:2422 fe-connect.c:2919 fe-exec.c:1284
+#: fe-connect.c:2394 fe-connect.c:2403 fe-connect.c:2900 fe-exec.c:1284
 #: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "������������ ������\n"
 
-#: fe-connect.c:2461
+#: fe-connect.c:2442
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "����������� \"=\" ����� \"%s\" � ������ �������������\n"
 
-#: fe-connect.c:2510
+#: fe-connect.c:2491
 msgid "unterminated quoted string in connection info string\n"
 msgstr "������������ ������ (�� ������� �������) � ������ �������������\n"
 
-#: fe-connect.c:2544
+#: fe-connect.c:2525
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "������������ ����� ������������� \"%s\"\n"
 
-#: fe-connect.c:2730
+#: fe-connect.c:2711
 msgid "connection pointer is NULL\n"
 msgstr "��������� ������������� �������� NULL'��\n"
 
-#: fe-connect.c:2940
+#: fe-connect.c:2921
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -401,12 +402,12 @@ msgstr "
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "��� integer �������� %lu ���� �� �������������� �������� pqPutInt\n"
 
-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:856
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() �� ������: %s\n"
 
-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:807
 msgid "connection not open\n"
 msgstr "���������� �� �������\n"
 
@@ -430,6 +431,10 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "�� ���������� ������� ������ �������: %s\n"
 
+#: fe-misc.c:863
+msgid "timeout expired\n"
+msgstr "������� �������� ��ԣ�\n"
+
 #: fe-secure.c:275 fe-secure.c:321
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
@@ -462,7 +467,7 @@ msgstr "
 #: fe-secure.c:448
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
-msgstr ""
+msgstr "������� ��� ������� \"%s\" �� ���������� � �����\n"
 
 #: fe-secure.c:617
 msgid "could not get user information\n"
@@ -481,32 +486,32 @@ msgstr "
 #: fe-secure.c:649
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
-msgstr ""
+msgstr "���������� �����������, �� ��� ������� ����� (%s)\n"
 
 #: fe-secure.c:658
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
-msgstr ""
+msgstr "�� ������ ����� ��� ������� ����� (%s)\n"
 
 #: fe-secure.c:665
 #, c-format
 msgid "could not open private key file (%s): %s\n"
-msgstr ""
+msgstr "�� ���������� ������� ���� ������� ����� (%s): %s\n"
 
 #: fe-secure.c:674
 #, c-format
 msgid "private key (%s) changed during execution\n"
-msgstr ""
+msgstr "������ ���� (%s) ��������� �� ����� ����������\n"
 
 #: fe-secure.c:681
 #, c-format
 msgid "could not read private key (%s): %s\n"
-msgstr ""
+msgstr "�� ���������� ��������� ������ ���� (%s): %s\n"
 
 #: fe-secure.c:693
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
-msgstr ""
+msgstr "����������/������ ���� �� ��������� (%s): %s\n"
 
 #: fe-secure.c:721
 #, c-format
diff --git a/src/interfaces/libpq/po/sv.po b/src/interfaces/libpq/po/sv.po
index ef03b7b7c9359486f530911ae9260149dcc7357f..79bc4b09e712305c5b8c7f572d3bc9742ab0519b 100644
--- a/src/interfaces/libpq/po/sv.po
+++ b/src/interfaces/libpq/po/sv.po
@@ -2,15 +2,15 @@
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
 # Dennis Bj�rklund <db@zigo.dhs.org>, 2002.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/sv.po,v 1.4 2002/10/14 19:04:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/sv.po,v 1.5 2003/06/28 22:31:01 petere Exp $
 #
 # Use these quotes: "%s"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3\n"
-"POT-Creation-Date: 2002-10-03 04:19-0400\n"
-"PO-Revision-Date: 2002-10-04 07:42+0200\n"
+"POT-Creation-Date: 2003-05-19 01:22+0200\n"
+"PO-Revision-Date: 2003-05-19 01:38+0200\n"
 "Last-Translator: Dennis Bj�rklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -72,21 +72,21 @@ msgstr "ogiltigt namn f
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ogiltigt autentiseringssystem: %d\n"
 
-#: fe-connect.c:484
+#: fe-connect.c:492
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr "kan inte ta reda p� anv�ndarnamnet att anv�nda f�r PostgreSQL\n"
 
-#: fe-connect.c:708
+#: fe-connect.c:715
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "kunde inte s�tta uttag (socket) till ickeblockerande: %s\n"
 
-#: fe-connect.c:732
+#: fe-connect.c:739
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "kunde inte s�tta uttag (socket) till l�get TCP-ingen-f�rdr�jning: %s\n"
 
-#: fe-connect.c:752
+#: fe-connect.c:759
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -97,7 +97,7 @@ msgstr ""
 "\tK�r servern p� lokala v�rden och accepterar den\n"
 "\tanslutningar p� Unix-uttaget \"%s\"?\n"
 
-#: fe-connect.c:761
+#: fe-connect.c:768
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -108,117 +108,119 @@ msgstr ""
 "\tK�r servern p� v�rden %s och accepterar\n"
 "\tden TCP/IP-uppkopplingar p� porten %s?\n"
 
-#: fe-connect.c:825
+#: fe-connect.c:832
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "ogiltig v�rdadress: %s\n"
 
-#: fe-connect.c:844
+#: fe-connect.c:851
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "ok�nt v�rdnamn: %s\n"
 
-#: fe-connect.c:891
+#: fe-connect.c:898
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: fe-connect.c:959
+#: fe-connect.c:966
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "kunde inte skicka SSL-paket f�r uppkopplingsf�rhandling: %s\n"
 
-#: fe-connect.c:972
+#: fe-connect.c:979
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "kunde inte ta emot serversvar f�r SSL-uppkopplingsf�rhandling: %s\n"
 
-#: fe-connect.c:1001
+#: fe-connect.c:1008
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "tog emot ogiltigt svar till SSL-uppkopplingsf�rhandling: %c\n"
 
-#: fe-connect.c:1010
+#: fe-connect.c:1017
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "SSL st�ds inte av servern, men SSL kr�vdes\n"
 
-#: fe-connect.c:1232
+#: fe-connect.c:1203
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ogiltigt f�rbindelsetillst�nd, antagligen korrupt minne\n"
 
-#: fe-connect.c:1263
+#: fe-connect.c:1234
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "kunde inte h�mta felstatus f�r uttag (socket): %s\n"
 
-#: fe-connect.c:1283
+#: fe-connect.c:1254
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "kunde inte f� tag p� klientadressen fr�n uttag (socket): %s\n"
 
-#: fe-connect.c:1322
+#: fe-connect.c:1293
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "kan inte skicka startpaketet: %s\n"
 
-#: fe-connect.c:1378
+#: fe-connect.c:1349
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "f�rv�ntade autentiseringsf�rfr�gan fr�n servern, men fick %c\n"
 
-#: fe-connect.c:1490
+#: fe-connect.c:1461
 msgid "unexpected message from server during startup\n"
 msgstr "ov�ntat meddelande fr�n servern under starten\n"
 
-#: fe-connect.c:1549
+#: fe-connect.c:1520
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ogiltigt f�rbindelsetillst�nd %c, antagligen korrupt minne\n"
 
-#: fe-connect.c:1637
+#: fe-connect.c:1606
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "ogiltigt setenv-tillst�nd %c, antagligen korrupt minne\n"
 
-#: fe-connect.c:1676
+#: fe-connect.c:1643
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "ogiltigt kodningnamn i PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1800
+#: fe-connect.c:1762
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "ogiltigt tillst�nd %c, antagligen korrupt minne\n"
 
-#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+#: fe-connect.c:2390 fe-connect.c:2399 fe-connect.c:2897 fe-exec.c:1284
 #: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "minnet slut\n"
 
-#: fe-connect.c:2475
+#: fe-connect.c:2438
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "\"=\" efter \"%s\" saknas i f�rbindelseinfostr�ng\n"
 
-#: fe-connect.c:2524
+#: fe-connect.c:2487
 msgid "unterminated quoted string in connection info string\n"
 msgstr "icke terminerad str�ng i uppkopplingsinformationen\n"
 
-#: fe-connect.c:2558
+#: fe-connect.c:2521
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "ogiltig f�rbindelseparameter \"%s\"\n"
 
-#: fe-connect.c:2744
+#: fe-connect.c:2707
 msgid "connection pointer is NULL\n"
 msgstr "anslutningspekare �r NULL\n"
 
-#: fe-connect.c:2953
+#: fe-connect.c:2915
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
 "be u=rw (0600)\n"
-msgstr "VARNING: L�senordsfilen %s har l�sr�ttigheter f�r v�rlden och gruppen; r�ttigheten skall vara u=rw (0600)\n"
+msgstr ""
+"VARNING: L�senordsfilen %s har l�sr�ttigheter f�r v�rlden och gruppen; "
+"r�ttigheten skall vara u=rw (0600)\n"
 
 #: fe-exec.c:737
 msgid "command string is a null pointer\n"
@@ -247,13 +249,17 @@ msgstr "ov
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)\n"
-msgstr "serven skickade data (\"D\"-meddelande) utan f�reg�ende radbeskrivning (\"T\"-meddelande)\n"
+msgstr ""
+"serven skickade data (\"D\"-meddelande) utan f�reg�ende radbeskrivning (\"T"
+"\"-meddelande)\n"
 
 #: fe-exec.c:1066
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)\n"
-msgstr "servern skickade bin�r data (\"B\"-meddelande) utan f�reg�ende radbeskrivning (\"T\"-meddelande)\n"
+msgstr ""
+"servern skickade bin�r data (\"B\"-meddelande) utan f�reg�ende "
+"radbeskrivning (\"T\"-meddelande)\n"
 
 #: fe-exec.c:1082
 #, c-format
@@ -380,12 +386,12 @@ msgstr "heltal med storlek %lu st
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "heltal med storlek %lu st�ds inte av pqPutInt\n"
 
-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:856
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() misslyckades: %s\n"
 
-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
+#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:807
 msgid "connection not open\n"
 msgstr "f�rbindelse inte �ppen\n"
 
@@ -409,105 +415,117 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "kan inte skicka data till servern: %s\n"
 
-#: fe-secure.c:275 fe-secure.c:321
+#: fe-misc.c:863
+msgid "timeout expired\n"
+msgstr "timeout utl�stes\n"
+
+#: fe-secure.c:278 fe-secure.c:334
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL fel: %s\n"
 
-#: fe-secure.c:280 fe-secure.c:326
+#: fe-secure.c:282 fe-secure.c:338
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "SSL SYSCALL fel: hittade EOF\n"
+
+#: fe-secure.c:286 fe-secure.c:342
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL-fel: %s\n"
 
-#: fe-secure.c:387
+#: fe-secure.c:295 fe-secure.c:351
+msgid "Unknown SSL error code\n"
+msgstr "Ok�nd SSL-felkod\n"
+
+#: fe-secure.c:407
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "fel vid f�rfr�gan till uttag (socket): %s\n"
 
-#: fe-secure.c:400
+#: fe-secure.c:420
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "kunde inte f� information om v�rd (%s): %s\n"
 
-#: fe-secure.c:419
+#: fe-secure.c:439
 msgid "unsupported protocol\n"
 msgstr "protokoll st�ds inte\n"
 
-#: fe-secure.c:441
+#: fe-secure.c:461
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "v�rdens namn \"%s\" �r inte %ld.%ld.%ld.%ld efter uppslagning\n"
 
-#: fe-secure.c:448
+#: fe-secure.c:468
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "v�rdens namn \"%s\" ger inte r�tt adress vid namnuppslagning\n"
 
-#: fe-secure.c:617
+#: fe-secure.c:637
 msgid "could not get user information\n"
 msgstr "kunde inte h�mta anv�ndarinformation\n"
 
-#: fe-secure.c:629
+#: fe-secure.c:649
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "kunde inte �ppna certifikat (%s): %s\n"
 
-#: fe-secure.c:636
+#: fe-secure.c:656
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "kunde inte l�sa certifikat (%s): %s\n"
 
-#: fe-secure.c:649
+#: fe-secure.c:669
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "certifikat tillg�ngligt, men inte den privata nyckeln (%s)\n"
 
-#: fe-secure.c:658
+#: fe-secure.c:678
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "privata nyckeln (%s) har fel r�ttigheter\n"
 
-#: fe-secure.c:665
+#: fe-secure.c:685
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "kan inte �ppna privat nyckelfil (%s): %s\n"
 
-#: fe-secure.c:674
+#: fe-secure.c:694
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "privata nyckeln (%s) har �ndrats under k�rning\n"
 
-#: fe-secure.c:681
+#: fe-secure.c:701
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "kunde inte l�sa privat nyckel (%s): %s\n"
 
-#: fe-secure.c:693
+#: fe-secure.c:713
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "certifikat/privat nyckel matchar inte (%s): %s\n"
 
-#: fe-secure.c:721
+#: fe-secure.c:741
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "kan inte skapa SSL-omgivning: %s\n"
 
-#: fe-secure.c:737 fe-secure.c:745
+#: fe-secure.c:757 fe-secure.c:765
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "kunde inte l�sa root-certifikatlistan (%s): %s\n"
 
-#: fe-secure.c:794
+#: fe-secure.c:814
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "kan inte skapa SSL-f�rbindelse: %s\n"
 
-#: fe-secure.c:812
+#: fe-secure.c:832
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "certifikatet kunde inte valideras: %s\n"
 
-#: fe-secure.c:824
+#: fe-secure.c:844
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "certifikatet kunde inte h�mtas: %s\n"