diff --git a/src/backend/po/ru.po b/src/backend/po/ru.po
index cc85fef0e58cf71e0ca2190a94781e5f3a1d0ec4..51500b4b08f43edc8914ad1c5dd913c78632a477 100644
--- a/src/backend/po/ru.po
+++ b/src/backend/po/ru.po
@@ -1,17 +1,18 @@
 # ru.po
 # POSTGRES Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.8 2002/09/22 20:57:20 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.9 2002/10/14 19:04:27 petere Exp $
 #
 # Changelog:
-#   - September 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - September 7, 2002: Post-7.3 beta 1 updates messages, 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>
+#   - September 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-09-14 10:48-0400\n"
+"POT-Creation-Date: 2002-10-12 13:32-0400\n"
 "PO-Revision-Date: 2002-09-14 11:18-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
@@ -38,7 +39,7 @@ msgid "heap_formtuple: numberOfAttributes %d exceeds limit %d"
 msgstr ""
 "heap_formtuple: numberOfAttributes (����� ���������) %d ��������� ����� %d"
 
-#: access/common/heaptuple.c:689
+#: access/common/heaptuple.c:687
 #, c-format
 msgid "heap_modifytuple: repl is \\%3d"
 msgstr "heap_modifytuple: �������� repl: \\%3d"
@@ -53,33 +54,33 @@ msgstr "index_formtuple: numberOfAttributes (
 msgid "index_formtuple: data takes %lu bytes, max is %d"
 msgstr "index_formtuple: ������ �������� %lu ����(��), ��� ���������: %d"
 
-#: access/common/tupdesc.c:405
+#: access/common/tupdesc.c:421
 #, c-format
 msgid "Unable to look up type id %u"
 msgstr "��� � ID %u �� ������"
 
-#: access/common/tupdesc.c:630 executor/nodeFunctionscan.c:200
+#: 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 "Invalid typrelid for complex type %u"
 msgstr "�������� typrelid ��� �������� ���� %u"
 
-#: access/common/tupdesc.c:644 access/common/tupdesc.c:667
+#: access/common/tupdesc.c:661 access/common/tupdesc.c:684
 msgid "TypeGetTupleDesc: number of aliases does not match number of attributes"
 msgstr "TypeGetTupleDesc: ����� ������� �� ��������� � ������ ���������"
 
-#: access/common/tupdesc.c:663
+#: access/common/tupdesc.c:680
 msgid "TypeGetTupleDesc: no column alias was provided"
 msgstr "TypeGetTupleDesc: ������ ������� �� �������"
 
-#: access/common/tupdesc.c:682
+#: access/common/tupdesc.c:699
 msgid "Unable to determine tuple description for function returning \"record\""
 msgstr ""
 "�� � ��������� ���������� �������� ������ ��� ������� ������������ ��� "
 "\"record\""
 
-#: access/common/tupdesc.c:684 catalog/pg_proc.c:463
+#: 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"
@@ -335,178 +336,178 @@ msgstr "heap_fetch: ReadBuffer(%s, %lu) 
 msgid "heap_get_latest_tid: %s relation: ReadBuffer(%lx) failed"
 msgstr ""
 
-#: access/heap/heapam.c:1276
+#: access/heap/heapam.c:1284
 msgid "heap_delete: failed ReadBuffer"
 msgstr "heap_delete: ReadBuffer �� ������"
 
-#: access/heap/heapam.c:1295
+#: access/heap/heapam.c:1303
 msgid "heap_delete: (am)invalid tid"
 msgstr ""
 
-#: access/heap/heapam.c:1428
+#: access/heap/heapam.c:1436
 msgid "simple_heap_delete: tuple already updated by self"
 msgstr ""
 
-#: access/heap/heapam.c:1436
+#: access/heap/heapam.c:1444
 msgid "simple_heap_delete: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1440 executor/execMain.c:1329
+#: access/heap/heapam.c:1448 executor/execMain.c:1333
 #, c-format
 msgid "Unknown status %u from heap_delete"
 msgstr ""
 
-#: access/heap/heapam.c:1474
+#: access/heap/heapam.c:1482
 msgid "heap_update: failed ReadBuffer"
 msgstr "heap_update: ReadBuffer �� ������"
 
-#: access/heap/heapam.c:1499
+#: access/heap/heapam.c:1507
 msgid "heap_update: (am)invalid tid"
 msgstr ""
 
-#: access/heap/heapam.c:1762
+#: access/heap/heapam.c:1770
 msgid "simple_heap_update: tuple already updated by self"
 msgstr ""
 
-#: access/heap/heapam.c:1770
+#: access/heap/heapam.c:1778
 msgid "simple_heap_update: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1774 executor/execMain.c:1467
+#: access/heap/heapam.c:1782 executor/execMain.c:1472
 #, c-format
 msgid "Unknown status %u from heap_update"
 msgstr ""
 
-#: access/heap/heapam.c:1798
+#: access/heap/heapam.c:1806
 msgid "heap_mark4update: failed ReadBuffer"
 msgstr "heap_mark4update: ReadBuffer �� ������"
 
-#: access/heap/heapam.c:1815
+#: access/heap/heapam.c:1823
 msgid "heap_mark4update: (am)invalid tid"
 msgstr ""
 
-#: access/heap/heapam.c:2112
+#: access/heap/heapam.c:2123
 msgid "heap_clean_redo: no block"
 msgstr ""
 
-#: access/heap/heapam.c:2116
+#: access/heap/heapam.c:2127
 msgid "heap_clean_redo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2174
+#: access/heap/heapam.c:2185
 #, c-format
 msgid "heap_delete_%sdo: no block"
 msgstr ""
 
-#: access/heap/heapam.c:2178
+#: access/heap/heapam.c:2189
 #, c-format
 msgid "heap_delete_%sdo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2190
+#: access/heap/heapam.c:2201
 msgid "heap_delete_undo: bad page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2197
+#: access/heap/heapam.c:2208
 #, c-format
 msgid "heap_delete_%sdo: invalid lp"
 msgstr "heap_delete_%sdo: �� ������ lp"
 
-#: access/heap/heapam.c:2217
+#: access/heap/heapam.c:2228
 msgid "heap_delete_undo: unimplemented"
 msgstr ""
 
-#: access/heap/heapam.c:2245
+#: access/heap/heapam.c:2256
 #, c-format
 msgid "heap_insert_%sdo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2269
+#: access/heap/heapam.c:2280
 msgid "heap_insert_redo: invalid max offset number"
 msgstr ""
 
-#: access/heap/heapam.c:2295
+#: access/heap/heapam.c:2304
 msgid "heap_insert_redo: failed to add tuple"
 msgstr ""
 
-#: access/heap/heapam.c:2305
+#: access/heap/heapam.c:2314
 msgid "heap_insert_undo: bad page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2307
+#: access/heap/heapam.c:2316
 msgid "heap_insert_undo: unimplemented"
 msgstr ""
 
-#: access/heap/heapam.c:2338
+#: access/heap/heapam.c:2347
 #, c-format
 msgid "heap_update_%sdo: no block"
 msgstr "heap_update_%sdo: ��� �����"
 
-#: access/heap/heapam.c:2342
+#: access/heap/heapam.c:2351
 #, c-format
 msgid "heap_update_%sdo: uninitialized old page"
 msgstr ""
 
-#: access/heap/heapam.c:2356
+#: access/heap/heapam.c:2365
 msgid "heap_update_undo: bad old tuple page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2363
+#: access/heap/heapam.c:2372
 #, c-format
 msgid "heap_update_%sdo: invalid lp"
 msgstr ""
 
-#: access/heap/heapam.c:2398 access/heap/heapam.c:2505
+#: access/heap/heapam.c:2407 access/heap/heapam.c:2507
 msgid "heap_update_undo: unimplemented"
 msgstr ""
 
-#: access/heap/heapam.c:2419
+#: access/heap/heapam.c:2428
 #, c-format
 msgid "heap_update_%sdo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2443
+#: access/heap/heapam.c:2452
 msgid "heap_update_redo: invalid max offset number"
 msgstr ""
 
-#: access/heap/heapam.c:2494
+#: access/heap/heapam.c:2496
 msgid "heap_update_redo: failed to add tuple"
 msgstr ""
 
-#: access/heap/heapam.c:2503
+#: access/heap/heapam.c:2505
 msgid "heap_update_undo: bad new tuple page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2521
+#: access/heap/heapam.c:2523
 msgid "_heap_unlock_tuple: can't open relation"
 msgstr ""
 
-#: access/heap/heapam.c:2526
+#: access/heap/heapam.c:2528
 msgid "_heap_unlock_tuple: can't read buffer"
 msgstr ""
 
-#: access/heap/heapam.c:2530
+#: access/heap/heapam.c:2532
 msgid "_heap_unlock_tuple: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2534
+#: access/heap/heapam.c:2536
 msgid "_heap_unlock_tuple: invalid itemid"
 msgstr ""
 
-#: access/heap/heapam.c:2538
+#: access/heap/heapam.c:2540
 msgid "_heap_unlock_tuple: unused/deleted tuple in rollback"
 msgstr ""
 
-#: access/heap/heapam.c:2543
+#: access/heap/heapam.c:2545
 msgid "_heap_unlock_tuple: invalid xmax in rollback"
 msgstr ""
 
-#: access/heap/heapam.c:2567
+#: access/heap/heapam.c:2569
 #, c-format
 msgid "heap_redo: unknown op code %u"
 msgstr ""
 
-#: access/heap/heapam.c:2587
+#: access/heap/heapam.c:2589
 #, c-format
 msgid "heap_undo: unknown op code %u"
 msgstr ""
@@ -942,7 +943,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 ""
@@ -1048,9 +1049,8 @@ msgstr ""
 msgid "XLogInsert: invalid record length %u"
 msgstr ""
 
-#: access/transam/xlog.c:786 access/transam/xlog.c:2622 scan.l:35
-#: utils/adt/name.c:52 utils/adt/varchar.c:83 utils/adt/varchar.c:378
-#: utils/adt/varlena.c:225
+#: 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"
 msgstr "%s"
@@ -1061,7 +1061,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:3323
+#: access/transam/xlog.c:3331
 #, c-format
 msgid "close of log file %u, segment %u failed: %m"
 msgstr ""
@@ -1085,190 +1085,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 "�� ������� ������� %s (���-����: %u, �������: %u): %m"
 
-#: 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 "�������� ���-����� ����������: %s"
 
-#: 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"
@@ -1276,11 +1276,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"
@@ -1288,7 +1288,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"
@@ -1296,7 +1296,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"
@@ -1304,7 +1304,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"
@@ -1312,7 +1312,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"
@@ -1320,21 +1320,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"
@@ -1342,7 +1342,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"
@@ -1350,7 +1350,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"
@@ -1358,41 +1358,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 "������� ���� ���������: %s"
 
-#: access/transam/xlog.c:2506
+#: access/transam/xlog.c:2511
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr "���������� ������� ���� ��������: %s"
 
-#: access/transam/xlog.c:2509
+#: access/transam/xlog.c:2514
 #, c-format
 msgid ""
 "database system was interrupted being in recovery at %s\n"
@@ -1400,116 +1400,116 @@ 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 "������� ���� ��������: %s"
 
-#: access/transam/xlog.c:2525
+#: access/transam/xlog.c:2530
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "����������� �����: %X/%X"
 
-#: access/transam/xlog.c:2534
+#: access/transam/xlog.c:2539
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "������������ ���������� ����������� �����: %X/%X"
 
-#: 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 "redo-������: %X/%X; undo-������: %X/%X; ����������: %s"
 
-#: access/transam/xlog.c:2549
+#: access/transam/xlog.c:2554
 #, c-format
 msgid "next transaction id: %u; next oid: %u"
 msgstr "id ��������� ����������: %u; ��������� OID: %u"
 
-#: access/transam/xlog.c:2552
+#: access/transam/xlog.c:2557
 msgid "invalid next transaction id"
 msgstr ""
 
-#: access/transam/xlog.c:2563
+#: access/transam/xlog.c:2568
 msgid "invalid redo in checkpoint record"
 msgstr ""
 
-#: 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 "������� ������ � �������������"
 
-#: access/transam/xlog.c:2895
+#: access/transam/xlog.c:2900
 msgid "shutting down"
 msgstr "���������� � ��������"
 
-#: access/transam/xlog.c:2908
+#: access/transam/xlog.c:2913
 msgid "database system is shut down"
 msgstr "������� ���������"
 
-#: access/transam/xlog.c:2926
+#: access/transam/xlog.c:2934
 msgid "CreateCheckPoint: cannot be called inside transaction block"
 msgstr ""
 
-#: access/transam/xlog.c:3041
+#: access/transam/xlog.c:3049
 msgid "active transaction while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3087
+#: access/transam/xlog.c:3095
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3318 access/transam/xlog.c:3346
+#: 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:3352
+#: access/transam/xlog.c:3360
 #, c-format
 msgid "fdatasync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3360
+#: access/transam/xlog.c:3368
 #, c-format
 msgid "bogus wal_sync_method %d"
 msgstr ""
@@ -1545,7 +1545,7 @@ msgstr ""
 "  -o ����          ��������� debug-����� � ����\n"
 "  -x �����         ��� ����������� �������������\n"
 
-#: bootstrap/bootstrap.c:307 postmaster/postmaster.c:306
+#: bootstrap/bootstrap.c:307 postmaster/postmaster.c:308
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -1560,178 +1560,120 @@ msgstr ""
 "��������� PGDATA.\n"
 "\n"
 
-#: bootstrap/bootstrap.c:406
+#: bootstrap/bootstrap.c:407
 #, c-format
 msgid "Unsupported XLOG op %d"
 msgstr ""
 
-#: bootstrap/bootstrap.c:509
+#: bootstrap/bootstrap.c:510
 #, c-format
 msgid "open relation %s, attrsize %d"
 msgstr ""
 
-#: bootstrap/bootstrap.c:525
+#: bootstrap/bootstrap.c:526
 #, c-format
 msgid "create attribute %d name %s len %d num %d type %u"
 msgstr ""
 
-#: bootstrap/bootstrap.c:544
+#: bootstrap/bootstrap.c:545
 #, c-format
 msgid "closerel: close of '%s' when '%s' was expected"
 msgstr ""
 
-#: bootstrap/bootstrap.c:548
+#: bootstrap/bootstrap.c:549
 #, c-format
 msgid "closerel: close of '%s' before any relation was opened"
 msgstr ""
 
-#: bootstrap/bootstrap.c:553
+#: bootstrap/bootstrap.c:554
 msgid "no open relation to close"
 msgstr ""
 
-#: bootstrap/bootstrap.c:556
+#: bootstrap/bootstrap.c:557
 #, c-format
 msgid "close relation %s"
 msgstr ""
 
-#: bootstrap/bootstrap.c:580
+#: bootstrap/bootstrap.c:581
 msgid "warning: no open relations allowed with 'create' command"
 msgstr ""
 
-#: bootstrap/bootstrap.c:589
+#: bootstrap/bootstrap.c:590
 #, c-format
 msgid "column %s %s"
 msgstr "������� %s %s"
 
-#: bootstrap/bootstrap.c:678
+#: bootstrap/bootstrap.c:680
 #, c-format
 msgid "inserting row oid %u, %d columns"
 msgstr ""
 
-#: bootstrap/bootstrap.c:690
+#: bootstrap/bootstrap.c:692
 msgid "row inserted"
 msgstr "������ ���������"
 
-#: bootstrap/bootstrap.c:712
+#: bootstrap/bootstrap.c:714
 #, c-format
 msgid "inserting column %d value '%s'"
 msgstr ""
 
-#: bootstrap/bootstrap.c:718
+#: bootstrap/bootstrap.c:720
 msgid "Typ != NULL"
 msgstr "Typ != NULL"
 
-#: bootstrap/bootstrap.c:725
+#: bootstrap/bootstrap.c:727
 #, c-format
 msgid "unable to find atttypid %u in Typ list"
 msgstr ""
 
-#: bootstrap/bootstrap.c:736 bootstrap/bootstrap.c:757
+#: bootstrap/bootstrap.c:738 bootstrap/bootstrap.c:759
 #, c-format
 msgid " -> %s"
 msgstr " -> %s"
 
-#: bootstrap/bootstrap.c:747
+#: bootstrap/bootstrap.c:749
 #, c-format
 msgid "type oid %u not found"
 msgstr ""
 
-#: bootstrap/bootstrap.c:748
+#: bootstrap/bootstrap.c:750
 #, c-format
 msgid "Typ == NULL, typeindex = %u"
 msgstr "Typ == NULL, typeindex = %u"
 
-#: bootstrap/bootstrap.c:760
+#: bootstrap/bootstrap.c:762
 msgid "inserted"
 msgstr "���������"
 
-#: bootstrap/bootstrap.c:770
+#: bootstrap/bootstrap.c:772
 #, c-format
 msgid "inserting column %d NULL"
 msgstr ""
 
-#: bootstrap/bootstrap.c:817
+#: bootstrap/bootstrap.c:819
 msgid "Memory manager fault: cleanup called twice.\n"
 msgstr ""
 
-#: bootstrap/bootstrap.c:864
+#: bootstrap/bootstrap.c:866
 #, c-format
 msgid "external type: %s"
 msgstr "������� ���: %s"
 
-#: bootstrap/bootstrap.c:888
+#: bootstrap/bootstrap.c:890
 #, c-format
 msgid "Error: unknown type '%s'.\n"
 msgstr "������: ����������� ��� '%s'.\n"
 
-#: bootstrap/bootstrap.c:904
+#: bootstrap/bootstrap.c:906
 msgid "AllocateAttribute: malloc failed"
 msgstr "AllocateAttribute: malloc �� ������"
 
-#: bootstrap/bootstrap.c:1055
+#: bootstrap/bootstrap.c:1057
 msgid ""
 "There are too many string constants and identifiers for the compiler to "
 "handle."
 msgstr ""
 
-#: 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:201
-#, c-format
-msgid "relation created with oid %u"
-msgstr ""
-
-#: bootparse.y:212
-#, c-format
-msgid "inserting row with oid %u..."
-msgstr "����������� ������ � OID %u..."
-
-#: bootparse.y:214
-msgid "inserting row..."
-msgstr "����������� ������..."
-
-#: bootparse.y:220
-#, c-format
-msgid "incorrect number of columns in row (expected %d, got %d)"
-msgstr "������� ����� ������� � ������ (��������� %d, �������� %d)"
-
-#: bootparse.y:224
-msgid "relation not open"
-msgstr "������ �� ������"
-
-#: bootparse.y:305
-msgid "too many columns"
-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"
-
 #: catalog/aclchk.c:60
 #, c-format
 msgid "acl size = %d, # acls = %d"
@@ -1773,7 +1715,7 @@ 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:836
+#: commands/dbcommands.c:517 commands/user.c:851 tcop/utility.c:828
 #: utils/init/miscinit.c:616
 msgid "permission denied"
 msgstr "������ �����ݣ�"
@@ -1783,7 +1725,7 @@ msgstr "
 msgid "invalid privilege type %s for function object"
 msgstr ""
 
-#: catalog/aclchk.c:389 parser/parse_func.c:869 parser/parse_func.c:1320
+#: catalog/aclchk.c:389 parser/parse_func.c:867 parser/parse_func.c:1315
 #, c-format
 msgid "function %u not found"
 msgstr "������� %u �� �������"
@@ -1945,270 +1887,275 @@ msgstr ""
 msgid "pg_opclass_ownercheck: operator class %u not found"
 msgstr ""
 
-#: catalog/dependency.c:150
+#: catalog/dependency.c:162
 #, 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:285
+#: catalog/dependency.c:252 catalog/dependency.c:571
 #, c-format
-msgid ""
-"Cannot drop %s because %s requires it\n"
-"\tYou may drop %s instead"
+msgid "Cannot drop %s because it is required by the database system"
 msgstr ""
 
-#: catalog/dependency.c:311
+#: catalog/dependency.c:256
 #, c-format
-msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
+msgid "findAutoDeletableObjects: unknown dependency type '%c' for %s"
 msgstr ""
 
-#: catalog/dependency.c:323
+#: catalog/dependency.c:385
 #, c-format
-msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
+msgid ""
+"Cannot drop %s because %s requires it\n"
+"\tYou may drop %s instead"
 msgstr ""
 
-#: catalog/dependency.c:327 catalog/dependency.c:468
+#: catalog/dependency.c:411
 #, c-format
-msgid "recursiveDeletion: unknown dependency type '%c' for %s"
+msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
 msgstr ""
 
-#: catalog/dependency.c:353 catalog/dependency.c:494
+#: catalog/dependency.c:423
 #, c-format
-msgid "%s depends on %s"
+msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
 msgstr ""
 
-#: catalog/dependency.c:359 catalog/dependency.c:433
+#: catalog/dependency.c:427 catalog/dependency.c:575
 #, c-format
-msgid "Drop cascades to %s"
+msgid "recursiveDeletion: unknown dependency type '%c' for %s"
 msgstr ""
 
-#: catalog/dependency.c:450
+#: catalog/dependency.c:453 catalog/dependency.c:531 catalog/dependency.c:557
 #, c-format
 msgid "Drop auto-cascades to %s"
 msgstr ""
 
-#: catalog/dependency.c:464
+#: catalog/dependency.c:457 catalog/dependency.c:535
 #, c-format
-msgid "Cannot drop %s because it is required by the database system"
+msgid "%s depends on %s"
 msgstr ""
 
-#: catalog/dependency.c:565
+#: catalog/dependency.c:463 catalog/dependency.c:541
 #, c-format
-msgid "doDeletion: Relation %u does not exist"
-msgstr "doDeletion: ����� %u �� ����������"
+msgid "Drop cascades to %s"
+msgstr ""
 
-#: catalog/dependency.c:635
+#: catalog/dependency.c:692
 #, c-format
 msgid "doDeletion: Unsupported object class %u"
 msgstr ""
 
-#: catalog/dependency.c:718
+#: catalog/dependency.c:775
 #, c-format
 msgid "find_expr_references_walker: bogus varlevelsup %d"
 msgstr ""
 
-#: catalog/dependency.c:722
+#: catalog/dependency.c:779
 #, c-format
 msgid "find_expr_references_walker: bogus varno %d"
 msgstr ""
 
-#: catalog/dependency.c:737
+#: catalog/dependency.c:794
 #, c-format
 msgid "find_expr_references_walker: bogus varattno %d"
 msgstr ""
 
-#: catalog/dependency.c:776
+#: catalog/dependency.c:833
 msgid "find_expr_references_walker: already-planned subqueries not supported"
 msgstr ""
 
-#: catalog/dependency.c:1130
+#: catalog/dependency.c:1169
 #, c-format
 msgid "getObjectClass: Unknown object class %u"
 msgstr ""
 
-#: catalog/dependency.c:1187
+#: catalog/dependency.c:1226
 #, c-format
 msgid "getObjectDescription: Cast %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1221
+#: catalog/dependency.c:1260
 #, c-format
 msgid "getObjectDescription: Constraint %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1251
+#: catalog/dependency.c:1290
 #, c-format
 msgid "getObjectDescription: Conversion %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1280
+#: catalog/dependency.c:1319
 #, c-format
 msgid "getObjectDescription: Default %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1305
+#: catalog/dependency.c:1344
 #, c-format
 msgid "getObjectDescription: Language %u does not exist"
 msgstr "getObjectDescription: ���� %u �� ����������"
 
-#: catalog/dependency.c:1330
+#: catalog/dependency.c:1369
 #, c-format
 msgid "cache lookup of opclass %u failed"
 msgstr "����� � ���� �������� %u �� ������"
 
-#: catalog/dependency.c:1348 utils/adt/ruleutils.c:424
+#: catalog/dependency.c:1387 utils/adt/ruleutils.c:425
 #, c-format
 msgid "syscache lookup for AM %u failed"
 msgstr "����� � ��������� ���� AM %u �� ������"
 
-#: catalog/dependency.c:1380
+#: catalog/dependency.c:1419
 #, c-format
 msgid "getObjectDescription: Rule %u does not exist"
 msgstr "getObjectDescription: ������ %u �� ����������"
 
-#: catalog/dependency.c:1414
+#: catalog/dependency.c:1453
 #, c-format
 msgid "getObjectDescription: Trigger %u does not exist"
 msgstr "getObjectDescription: ������� %u �� ����������"
 
-#: catalog/dependency.c:1434
+#: catalog/dependency.c:1473
 #, c-format
 msgid "getObjectDescription: Schema %u does not exist"
 msgstr "getObjectDescription: ����� %u �� ����������"
 
-#: catalog/dependency.c:1466 catalog/heap.c:1622 catalog/pg_constraint.c:429
-#: utils/adt/ruleutils.c:3147
+#: catalog/dependency.c:1505 catalog/heap.c:1635 catalog/pg_constraint.c:445
+#: utils/adt/ruleutils.c:3120
 #, c-format
 msgid "cache lookup of relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:156 catalog/heap.c:159
+#: catalog/heap.c:155 catalog/heap.c:158
 #, c-format
 msgid "SystemAttributeDefinition: invalid attribute number %d"
 msgstr "SystemAttributeDefinition: �������� ����� ��������: %d"
 
-#: catalog/heap.c:226
+#: catalog/heap.c:225
 #, c-format
 msgid ""
 "cannot create %s.%s: system catalog modifications are currently disallowed"
 msgstr ""
 
-#: catalog/heap.c:363
+#: catalog/heap.c:362
 #, c-format
 msgid "name of column \"%s\" conflicts with an existing system column"
 msgstr "��� ������� \"%s\" ����������� � ������������ ��������� ��������"
 
-#: catalog/heap.c:377
+#: catalog/heap.c:376
 #, c-format
 msgid "column name \"%s\" is duplicated"
 msgstr "��������� ��� �������: \"%s\""
 
-#: catalog/heap.c:395
+#: catalog/heap.c:398
 #, c-format
 msgid ""
 "Attribute \"%s\" has an unknown type\n"
 "\tProceeding with relation creation anyway"
 msgstr ""
 
-#: catalog/heap.c:399
+#: catalog/heap.c:402
 #, c-format
 msgid "Attribute \"%s\" has pseudo-type %s"
-msgstr ""
+msgstr "������� \"%s\" ����� ������-��� %s"
+
+#: catalog/heap.c:410
+#, c-format
+msgid "Attribute \"%s\" has composite type %s"
+msgstr "������� \"%s\" ����� ������� ��� %s"
 
-#: catalog/heap.c:679
+#: catalog/heap.c:691
 #, c-format
 msgid "Number of columns is out of range (1 to %d)"
-msgstr ""
+msgstr "����� ������� ��� ��������� (�� 1 �� %d)"
 
-#: catalog/heap.c:685
+#: catalog/heap.c:697
 #, c-format
 msgid "Relation '%s' already exists"
-msgstr ""
+msgstr "������ '%s' ��� ����������"
 
-#: catalog/heap.c:836
+#: catalog/heap.c:848
 #, c-format
 msgid "DeleteRelationTuple: cache lookup failed for relation %u"
 msgstr "DeleteRelationTuple: ����� � ���� ����� %u �� ������"
 
-#: catalog/heap.c:915
+#: catalog/heap.c:927
 #, c-format
 msgid "RemoveAttributeById: Failed to find attribute %d in relation %u"
 msgstr ""
 
-#: catalog/heap.c:994
+#: catalog/heap.c:1006
 #, c-format
 msgid "RemoveAttrDefault: no default found for rel %u attnum %d"
 msgstr ""
 
-#: catalog/heap.c:1030
+#: catalog/heap.c:1042
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for attrdef %u"
 msgstr "RemoveAttrDefaultById: ����� � ���� attrdef %u �� ������"
 
-#: catalog/heap.c:1053
+#: catalog/heap.c:1065
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for rel %u attr %d"
 msgstr "RemoveAttrDefaultById: ����� � ���� ��� ����� %u � attr %d �� ������"
 
-#: catalog/heap.c:1108
+#: catalog/heap.c:1120
 #, c-format
 msgid "heap_drop_with_catalog: FlushRelationBuffers returned %d"
 msgstr "heap_drop_with_catalog: FlushRelationBuffers ���������� %d"
 
-#: catalog/heap.c:1224 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3304
+#: catalog/heap.c:1236 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3277
 #, c-format
 msgid "cache lookup of attribute %d in relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:1480 commands/tablecmds.c:2543 commands/tablecmds.c:2667
+#: catalog/heap.c:1493 commands/tablecmds.c:2567 commands/tablecmds.c:2603
 #, c-format
 msgid "constraint \"%s\" already exists for relation \"%s\""
 msgstr ""
 
-#: catalog/heap.c:1494 commands/tablecmds.c:174
+#: catalog/heap.c:1507 commands/tablecmds.c:184
 #, c-format
 msgid "Duplicate CHECK constraint name: '%s'"
 msgstr ""
 
-#: catalog/heap.c:1553
+#: catalog/heap.c:1566
 #, c-format
 msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1560 commands/tablecmds.c:2589
+#: catalog/heap.c:1573 commands/tablecmds.c:2684
 msgid "cannot use subselect in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1562 commands/tablecmds.c:2591
+#: catalog/heap.c:1575 commands/tablecmds.c:2686
 msgid "cannot use aggregate function in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1677
+#: catalog/heap.c:1690
 msgid "cannot use column references in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1683
+#: catalog/heap.c:1696
 msgid "DEFAULT clause must not return a set"
 msgstr ""
 
-#: catalog/heap.c:1689
+#: catalog/heap.c:1702
 msgid "cannot use subselects in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1691
+#: catalog/heap.c:1704
 msgid "cannot use aggregate functions in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1712 rewrite/rewriteHandler.c:487
+#: 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 ""
 
-#: catalog/heap.c:1919
+#: catalog/heap.c:1931
 msgid "TRUNCATE TABLE cannot run inside a transaction block"
 msgstr "������ ��������� TRUNCATE TABLE ������ ��������������� �����"
 
@@ -2217,131 +2164,114 @@ msgstr "
 msgid "Function %u does not exist"
 msgstr "������� %u �� ����������"
 
-#: catalog/index.c:144 catalog/index.c:279
+#: catalog/index.c:144 catalog/index.c:281
 #, c-format
 msgid "Opclass %u does not exist"
 msgstr "Opclass %u �� ����������"
 
-#: catalog/index.c:158 catalog/index.c:292
+#: catalog/index.c:158 catalog/index.c:294
 #, c-format
 msgid "Type %u does not exist"
 msgstr "��� %u �� ����������"
 
-#: catalog/index.c:238
+#: catalog/index.c:239
 #, c-format
 msgid "cannot create index: column %d does not exist"
 msgstr "������ ������� ������: ������� %d �� ����������"
 
-#: catalog/index.c:546
+#: catalog/index.c:544
 msgid "must index at least one column"
 msgstr "��������� ���� ���� ������� ������ ���� �������������"
 
-#: catalog/index.c:551
+#: catalog/index.c:549
 msgid "User-defined indexes on system catalogs are not supported"
 msgstr "���������������� ������� �� ��������� �������� �� ��������������"
 
-#: catalog/index.c:561
+#: catalog/index.c:559
 msgid "Shared indexes cannot be created after initdb"
 msgstr ""
 
-#: catalog/index.c:564
+#: catalog/index.c:562
 #, c-format
 msgid "relation named \"%s\" already exists"
 msgstr "������ � ������ \"%s\" ��� ����������"
 
-#: catalog/index.c:677
+#: catalog/index.c:675
 msgid "index_create: constraint must be PRIMARY or UNIQUE"
 msgstr ""
 
-#: catalog/index.c:826
+#: catalog/index.c:825
 #, c-format
 msgid "index_drop: cache lookup failed for index %u"
 msgstr "index_drop: ����� � ���� ������� %u �� ������"
 
-#: catalog/index.c:839
+#: catalog/index.c:838
 #, c-format
 msgid "index_drop: FlushRelationBuffers returned %d"
 msgstr "index_drop: FlushRelationBuffers ���������� %d"
 
-#: catalog/index.c:1064
-#, c-format
-msgid "LockClassinfoForUpdate couldn't lock relid %u"
-msgstr ""
-
-#: catalog/index.c:1075
-msgid "The tuple isn't committed"
-msgstr ""
-
-#: catalog/index.c:1078
-msgid "The tuple is already deleted"
-msgstr ""
-
-#: catalog/index.c:1099
+#: catalog/index.c:1036
 #, c-format
-msgid "IndexesAreActive couldn't lock %u"
-msgstr ""
-
-#: catalog/index.c:1102
-#, c-format
-msgid "relation %u isn't an indexable relation"
-msgstr ""
+msgid "relation %s isn't an indexable relation"
+msgstr "������ %s �� �������� �������������"
 
-#: catalog/index.c:1172
+#: catalog/index.c:1107
 #, c-format
 msgid "setRelhasindex: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1257
-msgid "setNewRelfilenode impossible to lock class tuple"
+#: catalog/index.c:1223
+#, c-format
+msgid "setNewRelfilenode: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1379
+#: catalog/index.c:1335
 #, c-format
 msgid "UpdateStats: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1647
+#: catalog/index.c:1599
 msgid "IndexBuildHeapScan: concurrent insert in progress"
 msgstr ""
 
-#: catalog/index.c:1662
+#: catalog/index.c:1614
 msgid "IndexBuildHeapScan: concurrent delete in progress"
 msgstr ""
 
-#: catalog/index.c:1667 commands/vacuum.c:1173 commands/vacuumlazy.c:360
-#: commands/vacuumlazy.c:849
+#: catalog/index.c:1619 commands/vacuum.c:1207 commands/vacuumlazy.c:360
+#: commands/vacuumlazy.c:847
 msgid "Unexpected HeapTupleSatisfiesVacuum result"
 msgstr ""
 
-#: catalog/index.c:1754
+#: catalog/index.c:1706
 #, c-format
 msgid "IndexGetRelation: can't find index id %u"
 msgstr "IndexGetRelation: �� ���������� ����� ������ � id %u"
 
-#: catalog/index.c:1799
+#: catalog/index.c:1751
 msgid "REINDEX cannot run inside a transaction block"
 msgstr "������ �������� REINDEX ������ ����� ����������"
 
-#: catalog/index.c:1813
+#: catalog/index.c:1765
 msgid "reindex_index: can't open index relation"
 msgstr ""
 
-#: catalog/index.c:1826
+#: catalog/index.c:1776
 msgid "reindex_index: can't open heap relation"
 msgstr ""
 
-#: catalog/index.c:1951
+#: catalog/index.c:1790 catalog/index.c:1913
 #, c-format
-msgid "the target relation %u is nailed"
+msgid "the target relation %u is shared"
 msgstr ""
 
-#: catalog/index.c:1967
+#: catalog/index.c:1796
 #, c-format
-msgid "the target relation %u is shared"
+msgid "the target relation %u is nailed"
 msgstr ""
 
 #: catalog/namespace.c:168 catalog/namespace.c:215 catalog/namespace.c:1072
-#: parser/parse_expr.c:828 parser/parse_target.c:147
+#: parser/parse_expr.c:826 parser/parse_target.c:147
 msgid "Cross-database references are not implemented"
 msgstr ""
 
@@ -2355,7 +2285,7 @@ msgid "TEMP tables may not specify a namespace"
 msgstr ""
 
 #: catalog/namespace.c:236 catalog/namespace.c:1101 catalog/namespace.c:1136
-#: catalog/namespace.c:1671
+#: catalog/namespace.c:1693
 #, c-format
 msgid "Namespace \"%s\" does not exist"
 msgstr ""
@@ -2389,7 +2319,7 @@ msgstr "
 msgid "Cache lookup failed for opclass %u"
 msgstr "����� � ���� �������� %u �� ������"
 
-#: catalog/namespace.c:1075 gram.y:2269 gram.y:6806
+#: catalog/namespace.c:1075
 #, c-format
 msgid "Improper qualified name (too many dotted names): %s"
 msgstr ""
@@ -2398,11 +2328,11 @@ msgstr ""
 msgid "Improper relation name (too many dotted names)"
 msgstr ""
 
-#: catalog/namespace.c:1341
+#: catalog/namespace.c:1363
 msgid "recomputeNamespacePath: invalid list syntax"
 msgstr ""
 
-#: catalog/namespace.c:1470
+#: catalog/namespace.c:1492
 #, c-format
 msgid "%s: not authorized to create temp tables"
 msgstr ""
@@ -2426,12 +2356,12 @@ msgid ""
 "with input type"
 msgstr ""
 
-#: catalog/pg_constraint.c:397
+#: catalog/pg_constraint.c:413
 #, c-format
 msgid "RemoveConstraintById: constraint %u not found"
 msgstr ""
 
-#: catalog/pg_constraint.c:434
+#: catalog/pg_constraint.c:450
 #, c-format
 msgid "RemoveConstraintById: relation %s has relchecks = 0"
 msgstr ""
@@ -2527,7 +2457,7 @@ msgstr ""
 msgid "OperatorDef: can't create operator shell \"%s\""
 msgstr ""
 
-#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1381
+#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1376
 #, c-format
 msgid "functions cannot have more than %d arguments"
 msgstr "������� �� ����� ����� ����� ���������� ����� %d"
@@ -2604,7 +2534,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:670 utils/adt/ruleutils.c:3189
+#: commands/functioncmds.c:739 utils/adt/ruleutils.c:3162
 #, c-format
 msgid "cache lookup of function %u failed"
 msgstr "����� � ���� ������� %u �� ������"
@@ -2656,12 +2586,12 @@ msgstr "
 msgid "type named %s already exists"
 msgstr "��� %s ��� ����������"
 
-#: commands/analyze.c:198
+#: commands/analyze.c:199
 #, c-format
 msgid "Skipping \"%s\" --- only table or database owner can ANALYZE it"
 msgstr ""
 
-#: commands/analyze.c:212 commands/vacuum.c:771
+#: commands/analyze.c:213 commands/vacuum.c:784
 #, c-format
 msgid ""
 "Skipping \"%s\" --- can not process indexes, views or special system tables"
@@ -2669,18 +2599,17 @@ msgstr ""
 "������������ \"%s\" --- �������, ���� ��� ����������� ��������� ������� �� "
 "��������������"
 
-#: commands/analyze.c:228
+#: commands/analyze.c:242
 #, c-format
 msgid "Analyzing %s.%s"
 msgstr "������������� %s.%s"
 
-#: commands/analyze.c:421 utils/adt/ruleutils.c:2084
-#: utils/adt/ruleutils.c:2537
+#: commands/analyze.c:435 utils/adt/ruleutils.c:2496
 #, c-format
 msgid "cache lookup of type %u failed"
 msgstr ""
 
-#: commands/analyze.c:631
+#: commands/analyze.c:645
 #, c-format
 msgid "acquire_sample_rows: ReadBuffer(%s,%u) failed"
 msgstr "acquire_sample_rows: ReadBuffer(%s,%u) �� ������"
@@ -2753,36 +2682,36 @@ msgstr ""
 msgid "AtCommit_Notify: done"
 msgstr "AtCommit_Notify: ���������"
 
-#: commands/async.c:617
+#: commands/async.c:621
 msgid "Async_NotifyHandler: perform async notify"
 msgstr ""
 
-#: commands/async.c:622
+#: commands/async.c:626
 msgid "Async_NotifyHandler: done"
 msgstr "Async_NotifyHandler: ���������"
 
-#: commands/async.c:689
+#: commands/async.c:693
 msgid "EnableNotifyInterrupt: perform async notify"
 msgstr ""
 
-#: commands/async.c:694
+#: commands/async.c:698
 msgid "EnableNotifyInterrupt: done"
 msgstr "EnableNotifyInterrupt: ���������"
 
-#: commands/async.c:745
+#: commands/async.c:749
 msgid "ProcessIncomingNotify"
 msgstr "ProcessIncomingNotify"
 
-#: commands/async.c:781
+#: commands/async.c:785
 #, c-format
 msgid "ProcessIncomingNotify: received %s from %d"
 msgstr "ProcessIncomingNotify: �������� %s �� %d"
 
-#: commands/async.c:816
+#: commands/async.c:820
 msgid "ProcessIncomingNotify: done"
 msgstr "ProcessIncomingNotify: ���������"
 
-#: commands/async.c:843
+#: commands/async.c:847
 #, c-format
 msgid "NOTIFY for %s"
 msgstr "NOTIFY ��� %s"
@@ -2860,10 +2789,9 @@ msgstr "
 msgid "CommentAttribute: must specify relation.attribute"
 msgstr ""
 
-#: commands/comment.c:374 commands/tablecmds.c:1863 commands/tablecmds.c:1997
-#: commands/tablecmds.c:2115 commands/tablecmds.c:2334
-#: commands/tablecmds.c:2862 commands/tablecmds.c:2878
-#: optimizer/prep/prepunion.c:805 parser/parse_func.c:1162
+#: 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
 #: parser/parse_relation.c:1551 parser/parse_relation.c:1614
 #: parser/parse_relation.c:1770 parser/parse_type.c:88
 #, c-format
@@ -2874,7 +2802,7 @@ msgstr "
 msgid "CommentDatabase: database name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:409 commands/dbcommands.c:513 utils/adt/acl.c:1037
+#: commands/comment.c:409 commands/dbcommands.c:513 utils/adt/acl.c:1039
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "���� ������ \"%s\" �� ����������"
@@ -2947,76 +2875,76 @@ msgstr "
 msgid "Function %s does not exist"
 msgstr "������� %s �� ����������"
 
-#: commands/copy.c:122
+#: commands/copy.c:125
 #, c-format
 msgid "CopySendData: %m"
 msgstr "CopySendData: %m"
 
-#: commands/copy.c:297
+#: commands/copy.c:300
 msgid "COPY: BINARY option appears more than once"
 msgstr ""
 
-#: commands/copy.c:304
+#: commands/copy.c:307
 msgid "COPY: OIDS option appears more than once"
 msgstr ""
 
-#: commands/copy.c:311
+#: commands/copy.c:314
 msgid "COPY: DELIMITER string may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:318
+#: commands/copy.c:321
 msgid "COPY: NULL representation may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:323
+#: commands/copy.c:326
 #, c-format
 msgid "COPY: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/copy.c:328
+#: commands/copy.c:331
 msgid "You can not specify the DELIMITER in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:331
+#: commands/copy.c:334
 msgid "You can not specify NULL in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:351
+#: commands/copy.c:354
 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:360
+#: commands/copy.c:363
 msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr ""
 
-#: commands/copy.c:366
+#: commands/copy.c:369
 msgid "COPY delimiter must be a single character"
 msgstr ""
 
-#: commands/copy.c:372
+#: commands/copy.c:375
 #, c-format
 msgid "COPY: table \"%s\" does not have OIDs"
 msgstr "COPY: ������� \"%s\" �� �������� OIDs"
 
-#: commands/copy.c:393 commands/copy.c:438
+#: commands/copy.c:396 commands/copy.c:441
 #, c-format
 msgid "You cannot copy view %s"
 msgstr "�� �� ������ ���������� ��� %s"
 
-#: commands/copy.c:396
+#: commands/copy.c:399
 #, c-format
 msgid "You cannot change sequence relation %s"
 msgstr ""
 
-#: commands/copy.c:399 commands/copy.c:444
+#: commands/copy.c:402 commands/copy.c:447
 #, c-format
 msgid "You cannot copy object %s"
 msgstr "�� �� ������ ���������� ������ %s"
 
-#: commands/copy.c:419
+#: commands/copy.c:422
 #, c-format
 msgid ""
 "COPY command, running in backend with effective uid %d, could not open file "
@@ -3025,21 +2953,21 @@ msgstr ""
 "������� COPY, ������������� � backend� � ����������� UID %d, �� ������ "
 "������� ���� '%s' ��� ������.  Errno = %s (%d)."
 
-#: commands/copy.c:428 commands/copy.c:484
+#: commands/copy.c:431 commands/copy.c:487
 #, c-format
 msgid "COPY: %s is a directory"
 msgstr "COPY: %s �������� �����������"
 
-#: commands/copy.c:441
+#: commands/copy.c:444
 #, c-format
 msgid "You cannot copy sequence %s"
 msgstr ""
 
-#: commands/copy.c:468
+#: commands/copy.c:471
 msgid "Relative path not allowed for server side COPY command"
 msgstr ""
 
-#: commands/copy.c:476
+#: commands/copy.c:479
 #, c-format
 msgid ""
 "COPY command, running in backend with effective uid %d, could not open file "
@@ -3048,100 +2976,100 @@ msgstr ""
 "������� COPY, ������������� � backend� � ����������� UID %d, �� ������ "
 "������� ���� '%s' ��� ������.  Errno = %s (%d)."
 
-#: commands/copy.c:553
+#: commands/copy.c:556
 #, c-format
 msgid "COPY: couldn't lookup info for type %u"
 msgstr ""
 
-#: commands/copy.c:557 commands/copy.c:814
+#: commands/copy.c:560 commands/copy.c:826
 msgid "COPY BINARY: cstring not supported"
 msgstr ""
 
-#: commands/copy.c:842
+#: commands/copy.c:893
 msgid "COPY BINARY: file signature not recognized"
 msgstr ""
 
-#: commands/copy.c:846
+#: commands/copy.c:897
 msgid "COPY BINARY: incompatible integer layout"
 msgstr ""
 
-#: commands/copy.c:850
+#: commands/copy.c:901
 msgid "COPY BINARY: bogus file header (missing flags)"
 msgstr ""
 
-#: commands/copy.c:854
+#: commands/copy.c:905
 msgid "COPY BINARY: unrecognized critical flags in header"
 msgstr ""
 
-#: commands/copy.c:858
+#: commands/copy.c:909
 msgid "COPY BINARY: bogus file header (missing length)"
 msgstr ""
 
-#: commands/copy.c:864
+#: commands/copy.c:915
 msgid "COPY BINARY: bogus file header (wrong length)"
 msgstr ""
 
-#: commands/copy.c:913
+#: commands/copy.c:964
 msgid "NULL Oid"
 msgstr "NULL Oid"
 
-#: commands/copy.c:919
+#: commands/copy.c:970
 msgid "Invalid Oid"
 msgstr "�������� Oid"
 
-#: commands/copy.c:936
+#: commands/copy.c:987
 #, c-format
 msgid "Missing data for column \"%s\""
 msgstr "����������� ������ ��� ������� \"%s\""
 
-#: commands/copy.c:968
+#: commands/copy.c:1019
 msgid "Extra data after last expected column"
 msgstr ""
 
-#: commands/copy.c:992
+#: commands/copy.c:1043
 #, c-format
 msgid "COPY BINARY: tuple field count is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:999 commands/copy.c:1005 commands/copy.c:1019
-#: commands/copy.c:1033 commands/copy.c:1042 commands/copy.c:1054
-#: commands/copy.c:1069
+#: 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
 msgid "COPY BINARY: unexpected EOF"
 msgstr ""
 
-#: commands/copy.c:1001
+#: commands/copy.c:1052
 #, c-format
 msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1007
+#: commands/copy.c:1058
 msgid "COPY BINARY: Invalid Oid"
 msgstr ""
 
-#: commands/copy.c:1023
+#: commands/copy.c:1075
 #, c-format
 msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1035
+#: commands/copy.c:1087
 msgid "COPY BINARY: bogus varlena length"
 msgstr ""
 
-#: commands/copy.c:1181
+#: commands/copy.c:1263
 #, c-format
 msgid "GetInputFunction: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1197
+#: commands/copy.c:1279
 #, c-format
 msgid "GetTypeElement: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1339
+#: commands/copy.c:1421
 msgid "CopyReadAttribute: end of record marker corrupted"
 msgstr ""
 
-#: commands/copy.c:1499
+#: commands/copy.c:1581
 #, c-format
 msgid "Attribute \"%s\" specified more than once"
 msgstr "������� \"%s\" ������ ����� ������ ����"
@@ -3284,7 +3212,7 @@ msgstr ""
 msgid "database directory '%s' could not be removed"
 msgstr ""
 
-#: commands/dbcommands.c:809 commands/vacuum.c:575
+#: commands/dbcommands.c:809 commands/vacuum.c:582
 #, c-format
 msgid "database %u does not exist"
 msgstr ""
@@ -3326,7 +3254,7 @@ msgstr ""
 msgid "Define: invalid argument for \"%s\": \"%s\""
 msgstr "Define: �������� �������� ��� \"%s\": \"%s\""
 
-#: commands/explain.c:808
+#: commands/explain.c:809
 #, c-format
 msgid "show_sort_keys: no tlist entry for key %d"
 msgstr ""
@@ -3342,8 +3270,8 @@ msgid "Return type \"%s\" is only a shell"
 msgstr ""
 
 #: commands/functioncmds.c:103 commands/functioncmds.c:159
-#: commands/typecmds.c:309 commands/typecmds.c:316 commands/typecmds.c:634
-#: parser/parse_func.c:1391 parser/parse_oper.c:98 parser/parse_oper.c:107
+#: 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
 #, c-format
 msgid "Type \"%s\" does not exist"
@@ -3405,7 +3333,7 @@ msgstr ""
 msgid "CREATE FUNCTION: only one AS item needed for %s language"
 msgstr ""
 
-#: commands/functioncmds.c:399 utils/adt/acl.c:1441
+#: commands/functioncmds.c:399 utils/adt/acl.c:1443
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "���� \"%s\" �� ����������"
@@ -3437,80 +3365,113 @@ msgstr ""
 msgid "RemoveFunctionById: couldn't find pg_aggregate tuple for %u"
 msgstr ""
 
-#: commands/functioncmds.c:617 commands/functioncmds.c:753
+#: 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 "�������� ��� ������ %s �� ����������"
 
-#: commands/functioncmds.c:622 commands/functioncmds.c:758
+#: commands/functioncmds.c:698 commands/functioncmds.c:889
 #, c-format
 msgid "target data type %s does not exist"
 msgstr "��� ������ ���������� %s �� ����������"
 
-#: commands/functioncmds.c:626
+#: commands/functioncmds.c:702
 msgid "source data type and target data type are the same"
 msgstr ""
 
-#: commands/functioncmds.c:630
+#: commands/functioncmds.c:706
 #, c-format
 msgid "source data type %s is only a shell"
 msgstr ""
 
-#: commands/functioncmds.c:634
+#: commands/functioncmds.c:710
 #, c-format
 msgid "target data type %s is only a shell"
 msgstr ""
 
-#: commands/functioncmds.c:638
+#: commands/functioncmds.c:714
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:642
+#: commands/functioncmds.c:718
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:647 commands/functioncmds.c:773
+#: commands/functioncmds.c:723 commands/functioncmds.c:904
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr ""
 
-#: commands/functioncmds.c:658
-#, c-format
-msgid "cast from data type %s to data type %s already exists"
-msgstr ""
-
-#: commands/functioncmds.c:674
+#: commands/functioncmds.c:743
 msgid "cast function must take 1 argument"
 msgstr ""
 
-#: commands/functioncmds.c:676
+#: commands/functioncmds.c:745
 msgid "argument of cast function must match source data type"
 msgstr ""
 
-#: commands/functioncmds.c:678
+#: commands/functioncmds.c:747
 msgid "return data type of cast function must match target data type"
 msgstr ""
 
-#: commands/functioncmds.c:680
-msgid "cast function must be immutable"
+#: commands/functioncmds.c:749
+msgid "cast function must not be volatile"
 msgstr ""
 
-#: commands/functioncmds.c:682
+#: commands/functioncmds.c:751
 msgid "cast function must not be an aggregate function"
 msgstr ""
 
-#: commands/functioncmds.c:684
+#: commands/functioncmds.c:753
 msgid "cast function must not return a set"
 msgstr ""
 
-#: commands/functioncmds.c:766
+#: 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 "��������� ���� %s � ��� %s �� ����������"
 
-#: commands/functioncmds.c:809
+#: commands/functioncmds.c:940
 #, c-format
 msgid "could not find tuple for cast %u"
 msgstr ""
@@ -3624,70 +3585,65 @@ msgstr ""
 msgid "pg_opclass contains multiple default opclasses for data type %s"
 msgstr ""
 
-#: commands/indexcmds.c:546 commands/indexcmds.c:585
-#, c-format
-msgid "index \"%s\" does not exist"
-msgstr ""
-
-#: commands/indexcmds.c:549 commands/indexcmds.c:588 commands/indexcmds.c:639
+#: commands/indexcmds.c:544 commands/indexcmds.c:581 commands/indexcmds.c:626
 #, c-format
 msgid "relation \"%s\" is of type \"%c\""
 msgstr ""
 
-#: commands/indexcmds.c:578 commands/indexcmds.c:628
+#: commands/indexcmds.c:571 commands/indexcmds.c:620
 msgid "REINDEX cannot run inside a BEGIN/END block"
 msgstr ""
 
-#: commands/indexcmds.c:596
+#: commands/indexcmds.c:578
+#, c-format
+msgid "index \"%s\" does not exist"
+msgstr ""
+
+#: commands/indexcmds.c:589
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:599
+#: commands/indexcmds.c:592
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:608
+#: commands/indexcmds.c:601
 #, c-format
 msgid "index \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:635
-#, c-format
-msgid "table \"%s\" does not exist"
-msgstr ""
-
-#: commands/indexcmds.c:645
+#: commands/indexcmds.c:630
 #, c-format
 msgid "table \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:669
+#: commands/indexcmds.c:654
 msgid "REINDEX DATABASE: Can be executed only on the currently open database."
 msgstr ""
 
-#: commands/indexcmds.c:672
+#: commands/indexcmds.c:657
 msgid "REINDEX DATABASE: Permission denied."
 msgstr ""
 
-#: commands/indexcmds.c:675
+#: commands/indexcmds.c:660
 msgid "must be called under standalone postgres with -O -P options"
 msgstr ""
 
-#: commands/indexcmds.c:677
+#: commands/indexcmds.c:662
 msgid "must be called under standalone postgres with -P -O options"
 msgstr ""
 
-#: commands/indexcmds.c:685
+#: commands/indexcmds.c:670
 msgid "REINDEX DATABASE cannot run inside a BEGIN/END block"
 msgstr ""
 
-#: commands/indexcmds.c:743
+#: commands/indexcmds.c:728
 #, c-format
 msgid "relation %u was reindexed"
 msgstr ""
@@ -3702,69 +3658,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 ""
@@ -3822,74 +3782,81 @@ msgstr "
 msgid "Utility statements cannot be prepared"
 msgstr ""
 
-#: commands/prepare.c:124
+#: commands/prepare.c:117
 msgid "ExecuteQuery: wrong number of arguments"
 msgstr "ExecuteQuery: �������� ����� ����������"
 
-#: commands/prepare.c:175
+#: commands/prepare.c:168
 msgid "INTO clause specified for non-SELECT query"
 msgstr ""
 
-#: commands/prepare.c:218
+#: commands/prepare.c:211
 msgid "InitQueryHashTable: unable to create hash table"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:248
+#: commands/prepare.c:241
 #, c-format
 msgid "Prepared statement with name \"%s\" already exists"
 msgstr "������������� ������� � ������ \"%s\" ��� ����������"
 
-#: commands/prepare.c:278
+#: commands/prepare.c:271
 #, c-format
 msgid "Unable to store prepared statement \"%s\"!"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:304 commands/prepare.c:321 commands/prepare.c:374
-#: commands/prepare.c:398
+#: commands/prepare.c:297 commands/prepare.c:314 commands/prepare.c:367
+#: commands/prepare.c:391
 #, c-format
 msgid "Prepared statement with name \"%s\" does not exist"
 msgstr "������������� ������� � ������ \"%s\" �� ����������"
 
-#: commands/proclang.c:60
+#: commands/proclang.c:61
 msgid ""
 "Only users with superuser privilege are permitted to create procedural "
 "languages"
 msgstr ""
 
-#: commands/proclang.c:72
+#: commands/proclang.c:73
 #, c-format
 msgid "Language %s already exists"
 msgstr ""
 
-#: commands/proclang.c:81
+#: commands/proclang.c:82
 #, c-format
 msgid "function %s() doesn't exist"
 msgstr "������� %s() �� ����������"
 
-#: commands/proclang.c:84
+#: commands/proclang.c:94
+#, c-format
+msgid ""
+"CreateProceduralLanguage: changing return type of function %s() from OPAQUE "
+"to LANGUAGE_HANDLER"
+msgstr ""
+
+#: commands/proclang.c:99
 #, c-format
-msgid "function %s() does not return type %s"
-msgstr "������� %s() �� ���������� ��� %s"
+msgid "CreateProceduralLanguage: function %s() must return LANGUAGE_HANDLER"
+msgstr ""
 
-#: commands/proclang.c:94
+#: commands/proclang.c:109
 #, c-format
 msgid "function %s(oid) doesn't exist"
 msgstr "������� %s(oid) �� ����������"
 
-#: commands/proclang.c:168
+#: commands/proclang.c:183
 msgid ""
 "Only users with superuser privilege are permitted to drop procedural "
 "languages"
 msgstr ""
 
-#: commands/proclang.c:181
+#: commands/proclang.c:196
 #, c-format
 msgid "Language %s doesn't exist"
 msgstr "���� %s �� ����������"
 
-#: commands/proclang.c:210
+#: commands/proclang.c:225
 #, c-format
 msgid "DropProceduralLanguageById: language %u not found"
 msgstr ""
@@ -3922,628 +3889,677 @@ msgstr "
 msgid "RemoveSchemaById: schema %u not found"
 msgstr ""
 
-#: commands/sequence.c:206
+#: commands/sequence.c:207
 msgid "DefineSequence: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:333
+#: commands/sequence.c:334
 #, c-format
 msgid "%s.nextval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:408
+#: commands/sequence.c:409
 #, c-format
 msgid "%s.nextval: reached MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:429
+#: commands/sequence.c:430
 #, c-format
 msgid "%s.nextval: reached MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:519
+#: commands/sequence.c:520
 #, c-format
 msgid "%s.currval: you don't have permissions to read sequence %s"
 msgstr ""
 
-#: commands/sequence.c:523
+#: commands/sequence.c:524
 #, c-format
 msgid "%s.currval is not yet defined in this session"
 msgstr ""
 
-#: commands/sequence.c:558
+#: commands/sequence.c:559
 #, c-format
 msgid "%s.setval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:573
+#: commands/sequence.c:574
 #, c-format
 msgid "%s.setval: value %s is out of bounds (%s,%s)"
 msgstr ""
 
-#: commands/sequence.c:699
+#: commands/sequence.c:700
 #, c-format
 msgid "%s.%s: %s is not a sequence"
 msgstr ""
 
-#: commands/sequence.c:717
+#: commands/sequence.c:718
 msgid "Memory exhausted in init_sequence"
 msgstr ""
 
-#: commands/sequence.c:745
+#: commands/sequence.c:746
 #, c-format
 msgid "%s.%s: invalid number of blocks in sequence"
 msgstr ""
 
-#: commands/sequence.c:750
+#: commands/sequence.c:751
 #, c-format
 msgid "%s.%s: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:759
+#: commands/sequence.c:760
 #, c-format
 msgid "%s.%s: bad magic (%08X)"
 msgstr ""
 
-#: commands/sequence.c:802
+#: commands/sequence.c:803
 msgid "DefineSequence: CYCLE ??"
 msgstr ""
 
-#: commands/sequence.c:806
+#: commands/sequence.c:807
 #, c-format
 msgid "DefineSequence: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/sequence.c:813
+#: commands/sequence.c:814
 msgid "DefineSequence: can't INCREMENT by 0"
 msgstr ""
 
-#: commands/sequence.c:842
+#: commands/sequence.c:843
 #, c-format
 msgid "DefineSequence: MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:863
+#: commands/sequence.c:864
 #, c-format
 msgid "DefineSequence: START value (%s) can't be less than MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:873
+#: commands/sequence.c:874
 #, c-format
 msgid "DefineSequence: START value (%s) can't be greater than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:884
+#: commands/sequence.c:885
 #, c-format
 msgid "DefineSequence: CACHE (%s) can't be <= 0"
 msgstr ""
 
-#: commands/sequence.c:904
+#: commands/sequence.c:905
 #, c-format
 msgid "seq_redo: unknown op code %u"
 msgstr ""
 
-#: commands/sequence.c:912
+#: commands/sequence.c:913
 #, c-format
 msgid "seq_redo: can't read block of %u/%u"
 msgstr ""
 
-#: commands/sequence.c:928
+#: commands/sequence.c:929
 msgid "seq_redo: failed to add item to page"
 msgstr ""
 
-#: commands/tablecmds.c:142
+#: commands/tablecmds.c:152
 msgid "DefineRelation: please inherit from a relation or define an attribute"
 msgstr ""
 
-#: commands/tablecmds.c:350
+#: commands/tablecmds.c:360
 #, c-format
 msgid "TRUNCATE cannot be used on sequences. '%s' is a sequence"
 msgstr ""
 
-#: commands/tablecmds.c:353
+#: commands/tablecmds.c:363
 #, c-format
 msgid "TRUNCATE cannot be used on views. '%s' is a view"
 msgstr ""
 
-#: commands/tablecmds.c:356
+#: commands/tablecmds.c:366
 #, c-format
 msgid "TRUNCATE can only be used on tables. '%s' is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:361
+#: commands/tablecmds.c:372
 #, c-format
 msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
 msgstr ""
 
-#: commands/tablecmds.c:389
+#: commands/tablecmds.c:383
+msgid "TRUNCATE cannot be used on temp tables of other processes"
+msgstr ""
+
+#: commands/tablecmds.c:407
 #, c-format
 msgid ""
 "TRUNCATE cannot be used as table %s references this one via foreign key "
 "constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:499
+#: commands/tablecmds.c:517
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:522
+#: commands/tablecmds.c:540
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:526
+#: commands/tablecmds.c:544
 #, c-format
 msgid "CREATE TABLE: cannot inherit from temp relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:541
+#: commands/tablecmds.c:559
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:593
+#: commands/tablecmds.c:611
 #, c-format
 msgid ""
 "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:598
+#: commands/tablecmds.c:616
 #, c-format
 msgid "CREATE TABLE: inherited attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:742
+#: commands/tablecmds.c:762
 #, c-format
 msgid "CREATE TABLE: merging attribute \"%s\" with inherited definition"
 msgstr ""
 
-#: commands/tablecmds.c:747
+#: commands/tablecmds.c:767
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:783
+#: commands/tablecmds.c:805
 #, c-format
 msgid ""
 "CREATE TABLE: attribute \"%s\" inherits conflicting default values\n"
 "\tTo resolve the conflict, specify a default explicitly"
 msgstr ""
 
-#: commands/tablecmds.c:1027
+#: commands/tablecmds.c:1049
 #, c-format
 msgid "setRelhassubclassInRelation: cache lookup failed for relation %u"
 msgstr ""
 
-#: commands/tablecmds.c:1082
+#: commands/tablecmds.c:1104
 #, c-format
 msgid "renameatt: class \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1128
+#: commands/tablecmds.c:1150
 #, c-format
 msgid "Inherited attribute \"%s\" must be renamed in child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1136
+#: commands/tablecmds.c:1158
 #, c-format
 msgid "renameatt: attribute \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1141
+#: commands/tablecmds.c:1163
 #, c-format
 msgid "renameatt: system attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1149
+#: commands/tablecmds.c:1171
 #, c-format
 msgid "renameatt: inherited attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1158
+#: commands/tablecmds.c:1180
 #, c-format
 msgid "renameatt: attribute \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1188
+#: commands/tablecmds.c:1210
 #, c-format
 msgid "renameatt: can't find index id %u"
 msgstr ""
 
-#: commands/tablecmds.c:1273
+#: commands/tablecmds.c:1295
 #, c-format
 msgid "renamerel: system relation \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1289
+#: commands/tablecmds.c:1311
 #, c-format
 msgid "renamerel: relation \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1293
+#: commands/tablecmds.c:1315
 #, c-format
 msgid "renamerel: relation \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1592 commands/tablecmds.c:1818
-#: commands/tablecmds.c:1952 commands/tablecmds.c:2167
-#: commands/tablecmds.c:2318 commands/tablecmds.c:2466
-#: commands/tablecmds.c:3173 commands/tablecmds.c:3348
+#: 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
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:1603 commands/tablecmds.c:1823
-#: commands/tablecmds.c:1957 commands/tablecmds.c:2075
-#: commands/tablecmds.c:2174 commands/tablecmds.c:2323
-#: commands/tablecmds.c:2471 commands/tablecmds.c:2696
-#: commands/tablecmds.c:3178
+#: 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
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1649
+#: commands/tablecmds.c:1672
 msgid "Attribute must be added to child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1666
+#: commands/tablecmds.c:1689
 msgid ""
 "Adding columns with defaults is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE SET DEFAULT."
 msgstr ""
 
-#: commands/tablecmds.c:1670
+#: commands/tablecmds.c:1693
 msgid ""
 "Adding NOT NULL columns is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE ... SET NOT NULL."
 msgstr ""
 
-#: commands/tablecmds.c:1679 commands/tablecmds.c:3488
+#: commands/tablecmds.c:1702 commands/tablecmds.c:3787
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:1691
+#: commands/tablecmds.c:1714
 #, c-format
 msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1697
+#: commands/tablecmds.c:1720
 #, c-format
 msgid "ALTER TABLE: relations limited to %d columns"
 msgstr ""
 
-#: commands/tablecmds.c:1868 commands/tablecmds.c:2002
-#: commands/tablecmds.c:2120
+#: commands/tablecmds.c:1892 commands/tablecmds.c:2026
+#: commands/tablecmds.c:2144
 #, c-format
 msgid "ALTER TABLE: Cannot alter system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1889
+#: commands/tablecmds.c:1913
 #, c-format
 msgid "ALTER TABLE: Index %u not found"
 msgstr "ALTER TABLE: ������ %u �� ������"
 
-#: commands/tablecmds.c:1904
+#: commands/tablecmds.c:1928
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" is in a primary key"
 msgstr ""
 
-#: commands/tablecmds.c:1920 commands/tablecmds.c:2034
-#: commands/tablecmds.c:2262
+#: commands/tablecmds.c:1944 commands/tablecmds.c:2058
+#: commands/tablecmds.c:2286
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2021
+#: commands/tablecmds.c:2045
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" contains NULL values"
 msgstr ""
 
-#: commands/tablecmds.c:2070
+#: commands/tablecmds.c:2094
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table or view"
 msgstr ""
 
-#: commands/tablecmds.c:2194
+#: commands/tablecmds.c:2218
 #, c-format
 msgid "ALTER TABLE: statistics target %d is too low"
 msgstr ""
 
-#: commands/tablecmds.c:2199
+#: commands/tablecmds.c:2223
 msgid "ALTER TABLE: lowering statistics target to 1000"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/tablecmds.c:2220
+#: commands/tablecmds.c:2244
 #, c-format
 msgid "ALTER TABLE: \"%s\" storage not recognized"
 msgstr "ALTER TABLE: \"%s\" ����� �� ����������"
 
-#: commands/tablecmds.c:2225
+#: commands/tablecmds.c:2249
 #, c-format
 msgid "ALTER TABLE: Invalid column flag: %c"
 msgstr ""
 
-#: commands/tablecmds.c:2267
+#: commands/tablecmds.c:2291
 #, c-format
 msgid "ALTER TABLE: cannot change system attribute \"%s\""
 msgstr "ALTER TABLE: ������ �������� ��������� ������� \"%s\""
 
-#: commands/tablecmds.c:2284
+#: commands/tablecmds.c:2308
 #, c-format
 msgid "ALTER TABLE: Column datatype %s can only have storage \"plain\""
 msgstr ""
 
-#: commands/tablecmds.c:2339
-#, c-format
-msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
-msgstr ""
-
 #: commands/tablecmds.c:2362
 #, c-format
-msgid "ALTER TABLE: Cannot drop last column from table \"%s\""
+msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2367
+#: commands/tablecmds.c:2368
 #, c-format
 msgid "ALTER TABLE: Cannot drop inherited column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2394
+#: commands/tablecmds.c:2397 commands/tablecmds.c:2448
 #, c-format
 msgid "ALTER TABLE: relation %u has no column \"%s\""
 msgstr "ALTER TABLE: � ����� %u ��� ������� \"%s\""
 
-#: commands/tablecmds.c:2582
+#: commands/tablecmds.c:2402 commands/tablecmds.c:2453
+#, c-format
+msgid "ALTER TABLE: relation %u has non-inherited column \"%s\""
+msgstr "ALTER TABLE: � ����� %u ��� ��������������� ������� \"%s\""
+
+#: commands/tablecmds.c:2587
+msgid ""
+"ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
+msgstr ""
+
+#: commands/tablecmds.c:2617
+msgid ""
+"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
+msgstr ""
+
+#: commands/tablecmds.c:2677
 #, c-format
 msgid "Only relation '%s' can be referenced in CHECK"
 msgstr ""
 
-#: commands/tablecmds.c:2633
+#: commands/tablecmds.c:2726
 #, c-format
 msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:2649
-msgid ""
-"ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
+#: commands/tablecmds.c:2782
+#, c-format
+msgid "referenced relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:2691
+#: commands/tablecmds.c:2787
 #, c-format
-msgid "referenced relation \"%s\" is not a table"
+msgid "%s: relation \"%s\" is a system catalog"
+msgstr "%s: ������ \"%s\" �������� ��������� ���������"
+
+#: commands/tablecmds.c:2802
+#, c-format
+msgid "%s: Unable to reference temporary table from permanent table constraint"
 msgstr ""
 
-#: commands/tablecmds.c:2703
+#: commands/tablecmds.c:2844
+#, c-format
 msgid ""
-"ALTER TABLE / ADD CONSTRAINT: Unable to reference temporary table from "
-"permanent table constraint"
+"%s: number of referencing and referenced attributes for foreign key disagree"
 msgstr ""
 
-#: commands/tablecmds.c:2738
-msgid ""
-"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
+#: commands/tablecmds.c:2925
+#, c-format
+msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
+msgstr ""
+
+#: commands/tablecmds.c:2928
+#, c-format
+msgid "Can only have %d keys in a foreign key"
 msgstr ""
 
 #: commands/tablecmds.c:2972
 #, c-format
+msgid "transformFkeyGetPrimaryKey: index %u not found"
+msgstr ""
+
+#: commands/tablecmds.c:2990
+#, c-format
+msgid "PRIMARY KEY for referenced table \"%s\" not found"
+msgstr ""
+
+#: commands/tablecmds.c:3046
+#, c-format
+msgid "transformFkeyCheckAttrs: index %u not found"
+msgstr ""
+
+#: commands/tablecmds.c:3104
+#, c-format
+msgid ""
+"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
+msgstr ""
+
+#: commands/tablecmds.c:3271
+#, 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:3032
+#: commands/tablecmds.c:3331
 msgid "Unrecognized ON DELETE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3103
+#: commands/tablecmds.c:3402
 msgid "Unrecognized ON UPDATE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3148
+#: commands/tablecmds.c:3447
 #, c-format
 msgid "fkMatchTypeToString: Unknown MATCH TYPE '%c'"
 msgstr ""
 
-#: commands/tablecmds.c:3224
+#: commands/tablecmds.c:3523
 #, c-format
 msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:3228
+#: commands/tablecmds.c:3527
 msgid "Multiple constraints dropped"
 msgstr ""
 
-#: commands/tablecmds.c:3253
+#: commands/tablecmds.c:3552
 #, c-format
 msgid "ALTER TABLE: relation %u not found"
 msgstr "ALTER TABLE: ����� %u �� �������"
 
-#: commands/tablecmds.c:3315
+#: commands/tablecmds.c:3614
 #, c-format
 msgid ""
 "ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or "
 "sequence"
 msgstr ""
 
-#: commands/tablecmds.c:3365
+#: commands/tablecmds.c:3664
 msgid "Shared relations cannot be toasted after initdb"
 msgstr ""
 
-#: commands/tablecmds.c:3378
+#: commands/tablecmds.c:3677
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" already has a toast table"
 msgstr ""
 
-#: commands/tablecmds.c:3393
+#: commands/tablecmds.c:3692
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
 msgstr ""
 
-#: commands/trigger.c:96
+#: 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:100
+#: commands/trigger.c:141
 #, c-format
 msgid "CreateTrigger: can't create trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:158
+#: commands/trigger.c:199
 msgid "CreateTrigger: STATEMENT triggers are unimplemented, yet"
 msgstr ""
 
-#: commands/trigger.c:166
+#: commands/trigger.c:207
 msgid "CreateTrigger: double INSERT event specified"
 msgstr ""
 
-#: commands/trigger.c:171
+#: commands/trigger.c:212
 msgid "CreateTrigger: double DELETE event specified"
 msgstr ""
 
-#: commands/trigger.c:176
+#: commands/trigger.c:217
 msgid "CreateTrigger: double UPDATE event specified"
 msgstr ""
 
-#: commands/trigger.c:180
+#: commands/trigger.c:221
 msgid "CreateTrigger: unknown event specified"
 msgstr ""
 
-#: commands/trigger.c:206
+#: commands/trigger.c:247
 #, c-format
 msgid "CreateTrigger: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:218 commands/trigger.c:224
+#: commands/trigger.c:259
 #, c-format
 msgid "CreateTrigger: function %s() does not exist"
 msgstr ""
 
-#: commands/trigger.c:230
+#: commands/trigger.c:270
+#, c-format
 msgid ""
-"CreateTrigger: OPAQUE is deprecated, use type TRIGGER instead to define "
-"trigger functions"
+"CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:232
+#: commands/trigger.c:275
 #, c-format
 msgid "CreateTrigger: function %s() must return TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:333
+#: commands/trigger.c:375
 #, c-format
 msgid "CreateTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:418
+#: commands/trigger.c:460
 #, c-format
 msgid "DropTrigger: there is no trigger %s on relation %s"
 msgstr ""
 
-#: commands/trigger.c:467
+#: commands/trigger.c:509
 #, c-format
 msgid "RemoveTriggerById: Trigger %u does not exist"
 msgstr "RemoveTriggerById: ������� %u �� ����������"
 
-#: commands/trigger.c:478
+#: commands/trigger.c:520
 #, c-format
 msgid "DropTrigger: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/trigger.c:482
+#: commands/trigger.c:524
 #, c-format
 msgid "DropTrigger: can't drop trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:507
+#: commands/trigger.c:549
 #, c-format
 msgid "DropTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:512
+#: commands/trigger.c:554
 #, c-format
 msgid "DropTrigger: relation %s has reltriggers = 0"
 msgstr ""
 
-#: commands/trigger.c:583
+#: commands/trigger.c:625
 #, c-format
 msgid "renametrig: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:624
+#: commands/trigger.c:666
 #, c-format
 msgid "renametrig: trigger %s not defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:682
+#: commands/trigger.c:724
 #, c-format
 msgid "RelationBuildTriggers: unexpected record found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:711
+#: commands/trigger.c:753
 #, c-format
 msgid "RelationBuildTriggers: tgargs IS NULL for rel %s"
 msgstr ""
 
-#: commands/trigger.c:734
+#: commands/trigger.c:776
 #, c-format
 msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:980
+#: commands/trigger.c:1022
 #, c-format
 msgid "ExecCallTriggerFunc: function %u returned NULL"
 msgstr ""
 
-#: commands/trigger.c:1218 executor/execMain.c:1040 executor/execMain.c:1313
-#: executor/execMain.c:1447
+#: commands/trigger.c:1261 executor/execMain.c:1043 executor/execMain.c:1317
+#: executor/execMain.c:1452
 msgid "Can't serialize access due to concurrent update"
 msgstr ""
 
-#: commands/trigger.c:1241 executor/execMain.c:1061
+#: commands/trigger.c:1284 executor/execMain.c:1064
 #, c-format
 msgid "Unknown status %u from heap_mark4update"
 msgstr ""
 
-#: commands/trigger.c:1253
+#: commands/trigger.c:1296
 msgid "GetTupleForTrigger: failed ReadBuffer"
 msgstr ""
 
-#: commands/trigger.c:1441
+#: commands/trigger.c:1484
 msgid "DeferredTriggerExecute: failed to fetch old tuple"
 msgstr ""
 
-#: commands/trigger.c:1448
+#: commands/trigger.c:1491
 msgid "DeferredTriggerExecute: failed to fetch new tuple"
 msgstr ""
 
-#: commands/trigger.c:1469
+#: commands/trigger.c:1512
 #, c-format
 msgid "DeferredTriggerExecute: can't find trigger %u"
 msgstr ""
 
-#: commands/trigger.c:1714
+#: commands/trigger.c:1757
 msgid "DeferredTriggerBeginXact() called while inside transaction"
 msgstr ""
 
-#: commands/trigger.c:1892
+#: commands/trigger.c:1935
 msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: commands/trigger.c:1923
+#: commands/trigger.c:1966
 #, c-format
 msgid "Constraint '%s' is not deferrable"
 msgstr ""
 
-#: commands/trigger.c:1937
+#: commands/trigger.c:1980
 #, c-format
 msgid "Constraint '%s' does not exist"
 msgstr ""
 
-#: commands/trigger.c:2014
+#: commands/trigger.c:2057
 msgid "DeferredTriggerSaveEvent() called outside of transaction"
 msgstr ""
 
@@ -4580,78 +4596,93 @@ msgstr ""
 msgid "Define: \"output\" unspecified"
 msgstr ""
 
-#: commands/typecmds.c:214 commands/typecmds.c:223
-msgid ""
-"DefineType: OPAQUE is deprecated, instead declare I/O functions using their "
-"true datatypes"
+#: commands/typecmds.c:220
+#, c-format
+msgid "TypeCreate: changing return type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/typecmds.c:216
+#: commands/typecmds.c:225
 #, c-format
 msgid "Type input function %s must return %s"
 msgstr ""
 
-#: commands/typecmds.c:225
+#: commands/typecmds.c:233
+#, c-format
+msgid "TypeCreate: changing return type of function %s from OPAQUE to CSTRING"
+msgstr ""
+
+#: commands/typecmds.c:238
 #, c-format
 msgid "Type output function %s must return cstring"
 msgstr ""
 
-#: commands/typecmds.c:353
+#: commands/typecmds.c:366
 #, c-format
 msgid "RemoveTypeById: type %u not found"
 msgstr "RemoveTypeById: ��� %u �� ������"
 
-#: commands/typecmds.c:413
+#: commands/typecmds.c:426
 #, c-format
 msgid "CREATE DOMAIN: domain names must be %d characters or less"
 msgstr ""
 
-#: commands/typecmds.c:432
+#: commands/typecmds.c:445
 #, c-format
 msgid "DefineDomain: %s is not a basetype"
 msgstr ""
 
-#: commands/typecmds.c:496
+#: commands/typecmds.c:509
 msgid "CREATE DOMAIN has multiple DEFAULT expressions"
 msgstr ""
 
-#: commands/typecmds.c:526 commands/typecmds.c:533
+#: commands/typecmds.c:539 commands/typecmds.c:546
 msgid "CREATE DOMAIN has conflicting NULL / NOT NULL constraint"
 msgstr ""
 
-#: commands/typecmds.c:539
+#: commands/typecmds.c:552
 msgid "CREATE DOMAIN / UNIQUE indexes not supported"
 msgstr "CREATE DOMAIN / UNIQUE: ������� �� ��������������"
 
-#: commands/typecmds.c:543
+#: commands/typecmds.c:556
 msgid "CREATE DOMAIN / PRIMARY KEY indexes not supported"
 msgstr "CREATE DOMAIN / PRIMARY KEY: ������� �� ��������������"
 
-#: commands/typecmds.c:547
+#: commands/typecmds.c:560
 msgid "DefineDomain: CHECK Constraints not supported"
 msgstr ""
 
-#: commands/typecmds.c:554
+#: commands/typecmds.c:567
 msgid ""
 "DefineDomain: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
 "supported"
 msgstr ""
 
-#: commands/typecmds.c:558
+#: commands/typecmds.c:571
 msgid "DefineDomain: unrecognized constraint node type"
 msgstr ""
 
-#: commands/typecmds.c:641
+#: commands/typecmds.c:654
 #, c-format
 msgid "RemoveDomain: type \"%s\" does not exist"
 msgstr "RemoveDomain: ��� \"%s\" �� ����������"
 
-#: commands/typecmds.c:654
+#: commands/typecmds.c:667
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s �� �������� �������"
 
-#: commands/typecmds.c:799
+#: commands/typecmds.c:736
+#, c-format
+msgid "TypeCreate: changing argument type of function %s from OPAQUE to %s"
+msgstr ""
+
+#: commands/typecmds.c:795
+#, c-format
+msgid ""
+"TypeCreate: changing argument type of function %s from OPAQUE to CSTRING"
+msgstr ""
+
+#: commands/typecmds.c:837
 msgid "attempted to define composite type relation with no attrs"
 msgstr ""
 
@@ -4750,7 +4781,7 @@ msgstr ""
 msgid "ALTER USER: user \"%s\" does not exist"
 msgstr "ALTER USER: ������������ \"%s\" �� ����������"
 
-#: commands/user.c:847 commands/variable.c:549 utils/cache/lsyscache.c:1498
+#: commands/user.c:847 commands/variable.c:549 utils/cache/lsyscache.c:1507
 #: utils/init/miscinit.c:556
 #, c-format
 msgid "user \"%s\" does not exist"
@@ -4767,7 +4798,9 @@ msgstr ""
 #: commands/user.c:933
 #, c-format
 msgid "DROP USER: user \"%s\" does not exist (no users removed)"
-msgstr "DROP USER: ������������ \"%s\" �� ���������� (����� �� �������������� �� ���̣�)"
+msgstr ""
+"DROP USER: ������������ \"%s\" �� ���������� (����� �� �������������� �� "
+"���̣�)"
 
 #: commands/user.c:935
 #, c-format
@@ -4798,8 +4831,9 @@ 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 ""
-"��� ������������� ������� ��������� ������ ����� �� %s ��� ����� ������� ������������ "
-"�� ������ �� ������. ���������� 'REVOKE ALL ON \"%s\" FROM PUBLIC'."
+"��� ������������� ������� ��������� ������ ����� �� %s ��� ����� ������� "
+"������������ �� ������ �� ������. ���������� 'REVOKE ALL ON \"%s\" FROM "
+"PUBLIC'."
 
 #: commands/user.c:1093 commands/user.c:1099
 msgid "CREATE GROUP: conflicting options"
@@ -4877,30 +4911,30 @@ msgstr ""
 msgid "%s cannot be executed from a function"
 msgstr ""
 
-#: commands/vacuum.c:453
+#: commands/vacuum.c:460
 msgid ""
 "oldest Xmin is far in the past --- close open transactions soon to avoid "
 "wraparound problems"
 msgstr ""
 
-#: commands/vacuum.c:499 commands/vacuum.c:506
+#: commands/vacuum.c:506 commands/vacuum.c:513
 #, c-format
 msgid "pg_class entry for relid %u vanished during vacuuming"
 msgstr ""
 
-#: commands/vacuum.c:659
+#: commands/vacuum.c:666
 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:670
+#: commands/vacuum.c:677
 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:677
+#: commands/vacuum.c:684
 #, c-format
 msgid ""
 "Some databases have not been vacuumed in %d transactions.\n"
@@ -4908,44 +4942,44 @@ msgid ""
 "\tor you may have a wraparound failure."
 msgstr ""
 
-#: commands/vacuum.c:758
+#: commands/vacuum.c:771
 #, c-format
 msgid "Skipping \"%s\" --- only table or database owner can VACUUM it"
 msgstr ""
 
-#: commands/vacuum.c:943
+#: commands/vacuum.c:977
 #, c-format
 msgid "VACUUM (full_vacuum_rel): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:1010 commands/vacuumlazy.c:211
+#: commands/vacuum.c:1044 commands/vacuumlazy.c:211
 #, c-format
 msgid "--Relation %s.%s--"
 msgstr ""
 
-#: commands/vacuum.c:1044 commands/vacuumlazy.c:269
+#: commands/vacuum.c:1078 commands/vacuumlazy.c:269
 #, c-format
 msgid "Rel %s: Uninitialized page %u - fixing"
 msgstr ""
 
-#: commands/vacuum.c:1158
+#: commands/vacuum.c:1192
 #, c-format
 msgid ""
 "Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
-#: commands/vacuum.c:1168
+#: commands/vacuum.c:1202
 #, c-format
 msgid ""
 "Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
-#: commands/vacuum.c:1186 commands/vacuumlazy.c:373
+#: commands/vacuum.c:1220 commands/vacuumlazy.c:373
 #, c-format
 msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
 msgstr ""
 
-#: commands/vacuum.c:1324
+#: commands/vacuum.c:1358
 #, c-format
 msgid ""
 "Pages %u: Changed %u, reaped %u, Empty %u, New %u; Tup %.0f: Vac %.0f, Keep/"
@@ -4954,112 +4988,112 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:1546
+#: commands/vacuum.c:1581
 msgid "HEAP_MOVED_IN was not expected"
 msgstr ""
 
-#: commands/vacuum.c:1556
+#: commands/vacuum.c:1591
 msgid "Invalid XVAC in tuple header"
 msgstr ""
 
-#: commands/vacuum.c:1581
+#: commands/vacuum.c:1616
 msgid "HEAP_MOVED_OFF was expected"
 msgstr ""
 
-#: commands/vacuum.c:1635 commands/vacuum.c:1757
+#: 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:1672
+#: commands/vacuum.c:1707
 msgid ""
 "Child itemid in update-chain marked as unused - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1769
+#: commands/vacuum.c:1804
 msgid "Parent itemid marked as unused"
 msgstr ""
 
-#: commands/vacuum.c:1793
+#: commands/vacuum.c:1828
 msgid "Too old parent tuple found - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1922
+#: commands/vacuum.c:1957
 #, c-format
 msgid "moving chain: failed to add item with len = %lu to page %u"
 msgstr ""
 
-#: commands/vacuum.c:2066
+#: commands/vacuum.c:2101
 #, c-format
 msgid ""
 "failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %"
 "u)"
 msgstr ""
 
-#: commands/vacuum.c:2155
+#: commands/vacuum.c:2190
 msgid "HEAP_MOVED_IN was not expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2159
+#: commands/vacuum.c:2194
 msgid "Invalid XVAC in tuple header (4)"
 msgstr ""
 
-#: commands/vacuum.c:2184
+#: commands/vacuum.c:2219
 msgid "HEAP_MOVED_OFF was expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2295
+#: commands/vacuum.c:2330
 msgid "HEAP_MOVED_OFF/HEAP_MOVED_IN was expected"
 msgstr ""
 
-#: commands/vacuum.c:2297
+#: commands/vacuum.c:2332
 msgid "Invalid XVAC in tuple header (2)"
 msgstr ""
 
-#: commands/vacuum.c:2315
+#: commands/vacuum.c:2350
 #, c-format
 msgid ""
 "Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:2377
+#: commands/vacuum.c:2412
 msgid "Invalid XVAC in tuple header (3)"
 msgstr ""
 
-#: commands/vacuum.c:2382
+#: commands/vacuum.c:2417
 msgid "HEAP_MOVED_OFF was expected (3)"
 msgstr ""
 
-#: commands/vacuum.c:2432
+#: commands/vacuum.c:2467
 #, c-format
 msgid "VACUUM (repair_frag): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2496
+#: commands/vacuum.c:2531
 #, c-format
 msgid "VACUUM (vacuum_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2502
+#: commands/vacuum.c:2537
 #, c-format
 msgid "Rel %s: Pages: %u --> %u."
 msgstr ""
 
-#: commands/vacuum.c:2587 commands/vacuumlazy.c:601
+#: commands/vacuum.c:2622 commands/vacuumlazy.c:600
 #, c-format
 msgid ""
 "Index %s: Pages %u; Tuples %.0f.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:2600 commands/vacuum.c:2654
+#: commands/vacuum.c:2635 commands/vacuum.c:2689
 #, 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:2641 commands/vacuumlazy.c:648
+#: commands/vacuum.c:2676 commands/vacuumlazy.c:647
 #, c-format
 msgid ""
 "Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
@@ -5073,19 +5107,19 @@ msgid ""
 "\tTotal %s"
 msgstr ""
 
-#: commands/vacuumlazy.c:486
+#: commands/vacuumlazy.c:485
 #, c-format
 msgid ""
 "Removed %d tuples in %d pages.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuumlazy.c:723
+#: commands/vacuumlazy.c:721
 #, c-format
 msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuumlazy.c:758
+#: commands/vacuumlazy.c:756
 #, c-format
 msgid ""
 "Truncated %u --> %u pages.\n"
@@ -5130,25 +5164,25 @@ msgstr ""
 msgid "SET SERVER_ENCODING is not supported"
 msgstr "SET SERVER_ENCODING �� ��������������"
 
-#: commands/view.c:86
+#: commands/view.c:87
 msgid "attempted to define virtual relation with no attrs"
 msgstr ""
 
-#: commands/view.c:108
+#: commands/view.c:109
 #, c-format
 msgid "%s is not a view"
 msgstr "%s �� �������� �����"
 
-#: commands/view.c:160 commands/view.c:170
+#: commands/view.c:161 commands/view.c:171
 msgid "Cannot change number of columns in view"
 msgstr ""
 
-#: commands/view.c:173
+#: commands/view.c:174
 #, c-format
 msgid "Cannot change name of view column \"%s\""
 msgstr ""
 
-#: commands/view.c:178
+#: commands/view.c:179
 #, c-format
 msgid "Cannot change datatype of view column \"%s\""
 msgstr ""
@@ -5206,30 +5240,30 @@ msgstr ""
 msgid "ExecutePlan: (junk) `%s' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1111
+#: executor/execMain.c:1114
 msgid "ExecutePlan: unknown operation in queryDesc"
 msgstr ""
 
-#: executor/execMain.c:1378
+#: executor/execMain.c:1382
 msgid "ExecUpdate: UPDATE can't run without transactions"
 msgstr ""
 
-#: executor/execMain.c:1577
+#: executor/execMain.c:1582
 #, c-format
 msgid "%s: Fail to add null value in not null attribute %s"
 msgstr ""
 
-#: executor/execMain.c:1587
+#: executor/execMain.c:1592
 #, c-format
 msgid "%s: rejected due to CHECK constraint \"%s\" on \"%s\""
 msgstr ""
 
-#: executor/execMain.c:1631
+#: executor/execMain.c:1636
 #, c-format
 msgid "EvalPlanQual: can't find RTE %d"
 msgstr ""
 
-#: executor/execMain.c:1649
+#: executor/execMain.c:1654
 msgid "EvalPlanQual: t_xmin is uncommitted ?!"
 msgstr ""
 
@@ -5399,33 +5433,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 "ExecAgg: ����� � ���� �������� %u �� ������"
 
-#: 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 ""
@@ -5963,17 +5997,17 @@ msgstr ""
 msgid "check of private key failed: %s"
 msgstr ""
 
-#: libpq/be-secure.c:645
+#: libpq/be-secure.c:648
 #, c-format
 msgid "could not read root cert file (%s): %s"
 msgstr "�� ���������� ���� ��������� ����������� (%s): %s"
 
-#: libpq/be-secure.c:678
+#: libpq/be-secure.c:682
 #, c-format
 msgid "failed to initialize SSL connection: %s"
 msgstr "�� ������� ���������������� SSL-�������������: %s"
 
-#: libpq/be-secure.c:700
+#: libpq/be-secure.c:704
 #, c-format
 msgid "secure connection from '%s'"
 msgstr ""
@@ -6189,17 +6223,17 @@ msgstr ""
 msgid "%s: invalid current euid %d\n"
 msgstr ""
 
-#: nodes/copyfuncs.c:1562
+#: nodes/copyfuncs.c:1564
 #, c-format
 msgid "_copyAConst: unknown node type %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:2717
+#: nodes/copyfuncs.c:2720
 #, c-format
 msgid "_copyValue: unknown node type %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:3229
+#: nodes/copyfuncs.c:3232
 #, c-format
 msgid "copyObject: don't know how to copy node type %d"
 msgstr ""
@@ -6209,12 +6243,12 @@ msgstr ""
 msgid "_equalParam: Invalid paramkind value: %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:1967
+#: nodes/equalfuncs.c:1986
 #, c-format
 msgid "_equalValue: unknown node type %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:2418
+#: nodes/equalfuncs.c:2437
 #, c-format
 msgid "equal: don't know whether nodes of type %d are equal"
 msgstr ""
@@ -6231,17 +6265,17 @@ msgstr "llast: 
 msgid "llasti: empty list"
 msgstr "llasti: ������ ������"
 
-#: nodes/outfuncs.c:1019 nodes/readfuncs.c:1679
+#: nodes/outfuncs.c:1023 nodes/readfuncs.c:1691
 #, c-format
 msgid "bogus rte kind %d"
 msgstr ""
 
-#: nodes/outfuncs.c:1317
+#: nodes/outfuncs.c:1321
 #, c-format
 msgid "_outValue: don't know how to print type %d "
 msgstr ""
 
-#: nodes/outfuncs.c:1775
+#: nodes/outfuncs.c:1779
 #, c-format
 msgid "_outNode: don't know how to print type %d "
 msgstr "_outNode: �� �������� ��� �������� ��� %d "
@@ -6282,17 +6316,17 @@ msgstr ""
 msgid "_readExpr: unknown opType \"%.*s\""
 msgstr ""
 
-#: nodes/readfuncs.c:2261
+#: nodes/readfuncs.c:2273
 #, c-format
 msgid "badly formatted planstring \"%.10s\"..."
 msgstr ""
 
-#: nodes/readfuncs.c:2294 nodes/readfuncs.c:2326
+#: nodes/readfuncs.c:2306 nodes/readfuncs.c:2338
 #, c-format
 msgid "readDatum: expected '%s', got '%s'; length = %lu"
 msgstr ""
 
-#: nodes/readfuncs.c:2301
+#: nodes/readfuncs.c:2313
 #, c-format
 msgid "readDatum: byval & length = %lu"
 msgstr ""
@@ -6399,45 +6433,45 @@ msgstr ""
 msgid "extract_or_indexqual_conditions: no matching clause"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1319
+#: optimizer/path/indxpath.c:1229
 msgid "pred_test_simple_clause: unknown test_op"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1348
+#: optimizer/path/indxpath.c:1258
 msgid "pred_test_simple_clause: null test result"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1993
+#: optimizer/path/indxpath.c:1903
 #, c-format
 msgid "prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2009
+#: optimizer/path/indxpath.c:1919
 #, c-format
 msgid "prefix_quals: no = operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2024
+#: optimizer/path/indxpath.c:1934
 #, c-format
 msgid "prefix_quals: no >= operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2040
+#: optimizer/path/indxpath.c:1950
 #, c-format
 msgid "prefix_quals: no < operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2087
+#: optimizer/path/indxpath.c:1997
 #, c-format
 msgid "network_prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2100
+#: optimizer/path/indxpath.c:2010
 #, c-format
 msgid "network_prefix_quals: no %s operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2115
+#: optimizer/path/indxpath.c:2025
 #, c-format
 msgid "network_prefix_quals: no <= operator for type %u"
 msgstr ""
@@ -6472,7 +6506,7 @@ msgstr ""
 msgid "make_join_rel: unsupported join type %d"
 msgstr ""
 
-#: optimizer/path/pathkeys.c:875
+#: optimizer/path/pathkeys.c:876
 msgid ""
 "make_pathkeys_for_mergeclauses: can't identify which side of mergeclause to "
 "use"
@@ -6493,19 +6527,15 @@ msgstr ""
 msgid "create_join_plan: unknown node type: %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1034
+#: optimizer/plan/createplan.c:1033
 msgid "fix_indxqual_sublist: indexqual clause is not binary opclause"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1071
-msgid "fix_indxqual_sublist: failed to find substitute op"
-msgstr ""
-
-#: optimizer/plan/createplan.c:1133
+#: optimizer/plan/createplan.c:1122
 msgid "fix_indxqual_operand: var is not index attribute"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1571
+#: optimizer/plan/createplan.c:1560
 msgid "make_sort_from_pathkeys: cannot find tlist item to sort"
 msgstr ""
 
@@ -6518,7 +6548,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:451
+#: optimizer/plan/initsplan.c:307 optimizer/plan/planner.c:457
 msgid "UNION JOIN is not implemented yet"
 msgstr ""
 
@@ -6560,45 +6590,45 @@ msgstr ""
 msgid "subplanner: failed to construct a relation"
 msgstr ""
 
-#: optimizer/plan/planner.c:454
+#: optimizer/plan/planner.c:460
 #, c-format
 msgid "pull_up_subqueries: unexpected join type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:460
+#: optimizer/plan/planner.c:466
 #, c-format
 msgid "pull_up_subqueries: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:481
+#: optimizer/plan/planner.c:487
 msgid "is_simple_subquery: subquery is bogus"
 msgstr ""
 
-#: optimizer/plan/planner.c:596
+#: optimizer/plan/planner.c:602
 #, c-format
 msgid "resolvenew_in_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:675
+#: optimizer/plan/planner.c:681
 #, c-format
 msgid "preprocess_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:787
+#: optimizer/plan/planner.c:793
 #, c-format
 msgid "preprocess_qual_conditions: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:902 parser/analyze.c:1930 parser/analyze.c:2113
-#: parser/analyze.c:2601
+#: optimizer/plan/planner.c:908 parser/analyze.c:1780 parser/analyze.c:1963
+#: parser/analyze.c:2460
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: optimizer/plan/planner.c:955
+#: optimizer/plan/planner.c:961
 msgid "SELECT FOR UPDATE is not allowed in subselects"
 msgstr ""
 
-#: optimizer/plan/planner.c:1557 optimizer/plan/planner.c:1563
+#: optimizer/plan/planner.c:1563 optimizer/plan/planner.c:1569
 msgid "postprocess_setop_tlist: resjunk output columns not implemented"
 msgstr ""
 
@@ -6642,11 +6672,11 @@ msgstr ""
 msgid "preprocess_targetlist: subquery cannot be result relation"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:211
+#: optimizer/prep/preptlist.c:212
 msgid "expand_targetlist: unexpected command_type"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:241
+#: optimizer/prep/preptlist.c:242
 msgid "expand_targetlist: targetlist is not sorted correctly"
 msgstr ""
 
@@ -6754,411 +6784,360 @@ msgid ""
 "get_sortgroupclause_tle: ORDER/GROUP BY expression not found in targetlist"
 msgstr ""
 
-#: parser/analyze.c:260
+#: parser/analyze.c:257
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW ��������� ������ �ͣ� ������� ��� �������"
 
-#: parser/analyze.c:451
+#: parser/analyze.c:448
 msgid "INSERT ... SELECT may not specify INTO"
 msgstr "INSERT ... SELECT �� ����� ��������� INTO"
 
-#: parser/analyze.c:534
+#: parser/analyze.c:531
 msgid "INSERT has more expressions than target columns"
 msgstr ""
 
-#: parser/analyze.c:566
+#: parser/analyze.c:563
 msgid "INSERT has more target columns than expressions"
 msgstr ""
 
-#: parser/analyze.c:762
+#: parser/analyze.c:759
 msgid "parser: unrecognized node (internal error)"
 msgstr ""
 
-#: parser/analyze.c:844
+#: parser/analyze.c:841
 #, c-format
 msgid "%s will create implicit sequence '%s' for SERIAL column '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:925 parser/analyze.c:933
+#: parser/analyze.c:922 parser/analyze.c:930
 #, c-format
 msgid "%s/(NOT) NULL conflicting declaration for '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:941
+#: parser/analyze.c:938
 #, c-format
 msgid "%s/DEFAULT multiple values specified for '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:983 parser/analyze.c:1022
+#: parser/analyze.c:980 parser/analyze.c:1019
 msgid "parser: unrecognized constraint (internal error)"
 msgstr ""
 
-#: parser/analyze.c:1018
+#: parser/analyze.c:1015
 msgid "parser: illegal context for constraint (internal error)"
 msgstr ""
 
-#: parser/analyze.c:1062
+#: parser/analyze.c:1059
 #, c-format
 msgid "%s / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
 msgstr ""
 
-#: parser/analyze.c:1130 parser/analyze.c:2931
+#: parser/analyze.c:1127
 #, c-format
 msgid "inherited table \"%s\" is not a relation"
 msgstr ""
 
-#: parser/analyze.c:1159
+#: 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:1185
+#: 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:1192
+#: parser/analyze.c:1189
 #, c-format
 msgid "%s: column \"%s\" named in key does not exist"
 msgstr ""
 
-#: parser/analyze.c:1200
+#: parser/analyze.c:1197
 #, c-format
 msgid "%s: column \"%s\" appears twice in %s constraint"
 msgstr ""
 
-#: parser/analyze.c:1290
+#: parser/analyze.c:1287
 #, c-format
 msgid "%s: failed to make implicit index name"
 msgstr "%s: �� ������� ������� ��� ��� �������� �������"
 
-#: parser/analyze.c:1293
+#: parser/analyze.c:1290
 #, c-format
 msgid "%s / %s%s will create implicit index '%s' for table '%s'"
 msgstr "%s / %s%s ������� ������� ������ '%s' ��� ������� '%s'"
 
-#: parser/analyze.c:1310
+#: parser/analyze.c:1304
 #, c-format
 msgid "%s will create implicit trigger(s) for FOREIGN KEY check(s)"
 msgstr "%s ������� �������(�) �������(�) ��� �������� �� FOREIGN KEY"
 
-#: parser/analyze.c:1335 parser/analyze.c:1363 parser/analyze.c:1421
-#, c-format
-msgid "Can only have %d keys in a foreign key"
-msgstr ""
-
-#: parser/analyze.c:1375 parser/analyze.c:2828
-#, c-format
-msgid "PRIMARY KEY for referenced table \"%s\" not found"
-msgstr ""
-
-#: parser/analyze.c:1438 parser/analyze.c:2764
-#, c-format
-msgid ""
-"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
-msgstr ""
-
-#: parser/analyze.c:1596 parser/analyze.c:1714
+#: parser/analyze.c:1446 parser/analyze.c:1564
 #, c-format
 msgid "transformRuleStmt: unexpected event type %d"
 msgstr ""
 
-#: parser/analyze.c:1605
+#: parser/analyze.c:1455
 msgid "Rule WHERE condition may not contain references to other relations"
 msgstr ""
 
-#: parser/analyze.c:1674
+#: parser/analyze.c:1524
 msgid ""
 "Rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE "
 "actions"
 msgstr ""
 
-#: parser/analyze.c:1698
+#: parser/analyze.c:1548
 msgid "ON SELECT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1700
+#: parser/analyze.c:1550
 msgid "ON SELECT rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1707
+#: parser/analyze.c:1557
 msgid "ON INSERT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1711
+#: parser/analyze.c:1561
 msgid "ON DELETE rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1776 parser/analyze.c:1994
+#: parser/analyze.c:1626 parser/analyze.c:1844
 msgid "DECLARE CURSOR must not specify INTO"
 msgstr ""
 
-#: parser/analyze.c:1778 parser/analyze.c:1996
+#: parser/analyze.c:1628 parser/analyze.c:1846
 msgid ""
 "DECLARE/UPDATE is not supported\n"
 "\tCursors must be READ ONLY"
 msgstr ""
 
-#: parser/analyze.c:1788 parser/analyze.c:2006
+#: parser/analyze.c:1638 parser/analyze.c:1856
 msgid "DECLARE CURSOR may only be used in begin/end transaction blocks"
 msgstr ""
 
-#: parser/analyze.c:2074
+#: parser/analyze.c:1924
 msgid ""
 "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result "
 "columns"
 msgstr ""
 
-#: parser/analyze.c:2108
+#: parser/analyze.c:1958
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2110
+#: parser/analyze.c:1960
 msgid "Portal may not appear in UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2204
+#: parser/analyze.c:2054
 #, c-format
 msgid "Each %s query must have the same number of columns"
 msgstr ""
 
-#: parser/analyze.c:2262
+#: parser/analyze.c:2112
 #, c-format
 msgid "getSetColTypes: unexpected node %d"
 msgstr "getSetColTypes: �� ��������� ���� %d"
 
-#: parser/analyze.c:2273
+#: parser/analyze.c:2123
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr "CREATE TABLE AS ��������� ������� ����� �ͣ� ��� �������"
 
-#: parser/analyze.c:2356 parser/analyze.c:2365
+#: parser/analyze.c:2206 parser/analyze.c:2215
 msgid "UPDATE target count mismatch --- internal error"
 msgstr "UPDATE target: �� ���������� �ޣ���� --- ���������� ������"
 
-#: parser/analyze.c:2440
+#: parser/analyze.c:2301
 msgid "Unexpected node type in ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: parser/analyze.c:2521
+#: parser/analyze.c:2384
 msgid "transformPrepareStmt: internal error"
 msgstr ""
 
-#: parser/analyze.c:2548
+#: parser/analyze.c:2411
 #, c-format
 msgid "Wrong number of parameters, expected %d but got %d"
 msgstr ""
 
-#: parser/analyze.c:2561
+#: parser/analyze.c:2424
 msgid "Cannot use subselects in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2563
+#: parser/analyze.c:2426
 msgid "Cannot use aggregates in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2578
+#: parser/analyze.c:2437
 #, 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:2603
+#: parser/analyze.c:2462
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr ""
 
-#: parser/analyze.c:2605
+#: parser/analyze.c:2464
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr ""
 
-#: parser/analyze.c:2607
+#: parser/analyze.c:2466
 msgid "SELECT FOR UPDATE is not allowed with AGGREGATE"
 msgstr ""
 
-#: parser/analyze.c:2672
+#: parser/analyze.c:2531
 #, c-format
 msgid "FOR UPDATE: relation \"%s\" not found in FROM clause"
 msgstr ""
 
-#: parser/analyze.c:2702 parser/analyze.c:2795
-#, c-format
-msgid "Referenced relation \"%s\" is not a table"
-msgstr ""
-
-#: parser/analyze.c:2723
-#, c-format
-msgid "transformFkeyCheckAttrs: index %u not found"
-msgstr ""
-
-#: parser/analyze.c:2813
-#, c-format
-msgid "transformFkeyGetPrimaryKey: index %u not found"
-msgstr ""
-
-#: parser/analyze.c:2880
+#: parser/analyze.c:2571
 #, c-format
 msgid "relationHasPrimaryKey: index %u not found"
 msgstr ""
 
-#: parser/analyze.c:2963
-#, c-format
-msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
-msgstr ""
-
-#: parser/analyze.c:3004
+#: parser/analyze.c:2622
 msgid "Misplaced DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:3006 parser/analyze.c:3015
+#: parser/analyze.c:2624 parser/analyze.c:2633
 msgid "Multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:3013
+#: parser/analyze.c:2631
 msgid "Misplaced NOT DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:3020 parser/analyze.c:3038 gram.y:2128 gram.y:2142
+#: parser/analyze.c:2638 parser/analyze.c:2656
 msgid "INITIALLY DEFERRED constraint must be DEFERRABLE"
 msgstr ""
 
-#: parser/analyze.c:3025
+#: parser/analyze.c:2643
 msgid "Misplaced INITIALLY DEFERRED clause"
 msgstr ""
 
-#: parser/analyze.c:3027 parser/analyze.c:3045
+#: parser/analyze.c:2645 parser/analyze.c:2663
 msgid "Multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:3043
+#: parser/analyze.c:2661
 msgid "Misplaced INITIALLY IMMEDIATE clause"
 msgstr ""
 
-#: parser/analyze.c:3152
+#: parser/analyze.c:2770
 #, c-format
 msgid ""
 "New table specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:3171
+#: parser/analyze.c:2789
 #, c-format
 msgid ""
 "New view specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:3188
+#: parser/analyze.c:2806
 msgid "parser: unsupported schema node (internal error)"
 msgstr ""
 
-#: parser/parse_expr.c:104
+#: parser/parse_expr.c:101
 #, c-format
 msgid "Expression too complex: nesting depth exceeds max_expr_depth = %d"
 msgstr ""
 
-#: parser/parse_expr.c:123
+#: parser/parse_expr.c:120
 #, c-format
 msgid "Parameter '$%d' is out of range"
 msgstr ""
 
-#: parser/parse_expr.c:362 parser/parse_expr.c:366
+#: parser/parse_expr.c:358 parser/parse_expr.c:362
 msgid "Bad query in subselect"
 msgstr ""
 
-#: parser/parse_expr.c:388
+#: parser/parse_expr.c:384
 msgid "Subselect must have a field"
 msgstr ""
 
-#: parser/parse_expr.c:392
+#: parser/parse_expr.c:388
 msgid "Subselect must have only one field"
 msgstr ""
 
-#: parser/parse_expr.c:422
+#: parser/parse_expr.c:418
 #, c-format
 msgid "Row comparison cannot use operator %s"
 msgstr ""
 
-#: parser/parse_expr.c:445
+#: parser/parse_expr.c:441
 msgid "Subselect has too many fields"
 msgstr ""
 
-#: parser/parse_expr.c:461
+#: 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:467
+#: 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:479
+#: parser/parse_expr.c:475
 msgid "Subselect has too few fields"
 msgstr ""
 
-#: parser/parse_expr.c:621
+#: parser/parse_expr.c:615
 #, c-format
 msgid "transformExpr: unexpected booltesttype %d"
 msgstr ""
 
-#: parser/parse_expr.c:658
+#: parser/parse_expr.c:652
 #, c-format
 msgid "transformExpr: does not know how to transform node %d (internal error)"
 msgstr ""
 
-#: parser/parse_expr.c:746
+#: parser/parse_expr.c:744
 #, c-format
 msgid "Attribute \"%s\" not found"
 msgstr "������� \"%s\" �� ������"
 
-#: parser/parse_expr.c:858 parser/parse_target.c:153
+#: parser/parse_expr.c:856 parser/parse_target.c:153
 msgid "Invalid qualified name syntax (too many names)"
 msgstr ""
 
-#: parser/parse_expr.c:915
+#: parser/parse_expr.c:913
 msgid "exprType: Cannot get type for untransformed sublink"
 msgstr ""
 
-#: parser/parse_expr.c:942
+#: 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:1089 utils/adt/ruleutils.c:2433
+#: parser/parse_expr.c:1110
 #, c-format
-msgid "cache lookup for proc %u failed"
-msgstr ""
+msgid "Cannot cast type %s to %s"
+msgstr "������ �������������� ��� %s � %s"
 
-#: parser/parse_expr.c:1115
+#: parser/parse_agg.c:112
 #, c-format
-msgid "cache lookup for type %u failed"
+msgid "Attribute %s.%s must be GROUPed or used in an aggregate function"
 msgstr ""
 
-#: parser/parse_expr.c:1170
-#, c-format
-msgid "Cannot cast this expression to type '%s'"
+#: parser/parse_agg.c:150
+msgid "Aggregates not allowed in WHERE clause"
 msgstr ""
 
-#: parser/parse_expr.c:1221
-#, c-format
-msgid "Cannot cast type '%s' to '%s'"
-msgstr ""
-
-#: parser/parse_agg.c:112
-#, c-format
-msgid "Attribute %s.%s must be GROUPed or used in an aggregate function"
-msgstr ""
-
-#: parser/parse_agg.c:150
-msgid "Aggregates not allowed in WHERE clause"
-msgstr ""
-
-#: parser/parse_agg.c:152
-msgid "Aggregates not allowed in JOIN conditions"
+#: parser/parse_agg.c:152
+msgid "Aggregates not allowed in JOIN conditions"
 msgstr ""
 
 #: parser/parse_agg.c:168
@@ -7244,185 +7223,190 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: parser/parse_clause.c:938
+#: parser/parse_clause.c:942
 #, c-format
 msgid "buildMergedJoinVar: unexpected jointype %d"
 msgstr ""
 
-#: parser/parse_clause.c:1059
+#: parser/parse_clause.c:1063
 #, c-format
 msgid "%s '%s' is ambiguous"
 msgstr ""
 
-#: parser/parse_clause.c:1078
+#: parser/parse_clause.c:1082
 #, c-format
 msgid "Non-integer constant in %s"
 msgstr ""
 
-#: parser/parse_clause.c:1091
+#: parser/parse_clause.c:1095
 #, c-format
 msgid "%s position %d is not in target list"
 msgstr ""
 
-#: parser/parse_clause.c:1233
+#: parser/parse_clause.c:1237
 msgid "For SELECT DISTINCT, ORDER BY expressions must appear in target list"
 msgstr ""
 "��� SELECT DISTINCT, ��������� ORDER BY ������� ���� � ������ �����������"
 
-#: parser/parse_clause.c:1271
+#: parser/parse_clause.c:1275
 msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
 msgstr ""
 "��������� SELECT DISTINCT ON ������ ��������� � ������������ ������������ "
 "ORDER BY"
 
-#: parser/parse_clause.c:1295
+#: parser/parse_clause.c:1299
 msgid ""
 "transformDistinctClause: failed to add DISTINCT ON clause to target list"
 msgstr ""
 
-#: parser/parse_coerce.c:207
+#: parser/parse_coerce.c:291
 #, c-format
 msgid "coerce_type: no conversion function from %s to %s"
 msgstr "coerce_type: ������ ��������� �� %s � %s �� ����������"
 
-#: parser/parse_coerce.c:332
+#: parser/parse_coerce.c:417
 #, c-format
 msgid "coerce_type_constraints: failed to lookup type %u"
 msgstr "coerce_type_constraints: ��� %u �� ������"
 
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:448
+#: parser/parse_coerce.c:568
 #, 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:458
+#: parser/parse_coerce.c:576
 #, c-format
 msgid "Argument of %s must not be a set function"
 msgstr ""
 
-#: parser/parse_coerce.c:511
+#: parser/parse_coerce.c:623
 #, c-format
 msgid "%s types '%s' and '%s' not matched"
 msgstr "%s ���� '%s' � '%s' �� ���������"
 
-#: parser/parse_coerce.c:567
+#: parser/parse_coerce.c:675
 #, c-format
 msgid "%s unable to convert to type %s"
 msgstr "%s �� � ��������� ��������������� � ��� %s"
 
-#: parser/parse_func.c:100
+#: parser/parse_coerce.c:957
+#, c-format
+msgid "find_coercion_pathway: bogus castcontext %c"
+msgstr ""
+
+#: parser/parse_func.c:97
 #, c-format
 msgid "Cannot pass more than %d arguments to a function"
 msgstr ""
 
-#: parser/parse_func.c:107
+#: parser/parse_func.c:104
 #, c-format
 msgid "Function '%s' does not allow NULL input"
 msgstr ""
 
-#: parser/parse_func.c:195
+#: parser/parse_func.c:192
 #, c-format
 msgid "Cannot find type OID for relation %u"
 msgstr ""
 
-#: parser/parse_func.c:211
+#: parser/parse_func.c:208
 #, c-format
 msgid "Cannot pass result of sub-select or join %s to a function"
 msgstr ""
 
-#: parser/parse_func.c:256
+#: parser/parse_func.c:253
 #, c-format
 msgid "%s(*) specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:259
+#: parser/parse_func.c:256
 #, c-format
 msgid "DISTINCT specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:282
+#: parser/parse_func.c:279
 #, c-format
 msgid "Attribute notation .%s applied to type %s, which is not a complex type"
 msgstr ""
 
-#: parser/parse_func.c:285
+#: parser/parse_func.c:282
 #, c-format
 msgid "Attribute \"%s\" not found in datatype %s"
 msgstr ""
 
-#: parser/parse_func.c:333
+#: parser/parse_func.c:331
 msgid "Aggregates may not return sets"
 msgstr ""
 
-#: parser/parse_func.c:1245
+#: parser/parse_func.c:1240
 #, c-format
 msgid "No such attribute %s.%s.%s"
 msgstr "%s.%s.%s: ��� ������ ��������"
 
-#: parser/parse_func.c:1248
+#: parser/parse_func.c:1243
 #, c-format
 msgid "No such attribute %s.%s"
 msgstr "%s.%s: ��� ������ ��������"
 
-#: parser/parse_func.c:1275
+#: parser/parse_func.c:1270
 #, c-format
 msgid "Function %s(%s) does not exist%s%s"
 msgstr "������� %s(%s) �� ���������� %s%s"
 
-#: parser/parse_func.c:1281
+#: parser/parse_func.c:1276
 #, c-format
 msgid "%s: function %s(%s) does not exist%s%s"
 msgstr "%s: ������� %s(%s) �� ���������� %s%s"
 
-#: parser/parse_func.c:1307
+#: parser/parse_func.c:1302
 #, c-format
 msgid "%s: aggregate %s(*) does not exist"
 msgstr "%s: ������� %s(*) �� ����������"
 
-#: parser/parse_func.c:1310
+#: parser/parse_func.c:1305
 #, c-format
 msgid "%s: aggregate %s(%s) does not exist"
 msgstr "%s: ������� %s(%s) �� ����������"
 
-#: parser/parse_func.c:1326
+#: parser/parse_func.c:1321
 #, c-format
 msgid "%s: function %s(*) is not an aggregate"
 msgstr ""
 
-#: parser/parse_func.c:1329
+#: parser/parse_func.c:1324
 #, c-format
 msgid "%s: function %s(%s) is not an aggregate"
 msgstr ""
 
-#: parser/parse_node.c:223
+#: parser/parse_node.c:217
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array type %u"
 msgstr ""
 
-#: parser/parse_node.c:229
+#: parser/parse_node.c:223
 #, c-format
 msgid "transformArraySubscripts: type %s is not an array"
 msgstr ""
 
-#: parser/parse_node.c:237
+#: parser/parse_node.c:231
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array element type %u"
 msgstr ""
 
-#: parser/parse_node.c:292 parser/parse_node.c:312
+#: parser/parse_node.c:288 parser/parse_node.c:310
 msgid "array index expressions must be integers"
 msgstr ""
 
-#: parser/parse_node.c:333
+#: 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:448
+#: parser/parse_node.c:439
 #, c-format
 msgid "make_const: unknown type %d"
 msgstr ""
@@ -7634,23 +7618,23 @@ msgstr ""
 #: 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:418
+#: parser/parse_target.c:370
 #, c-format
 msgid "Attribute '%s' specified more than once"
 msgstr ""
 
-#: parser/parse_target.c:452
+#: parser/parse_target.c:405
 #, c-format
 msgid ""
 "ExpandAllTables: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: parser/parse_target.c:469
+#: parser/parse_target.c:423
 msgid "Wildcard with no tables specified not allowed"
 msgstr ""
 
@@ -7670,7 +7654,7 @@ msgid "%s converted to %s"
 msgstr ""
 
 #: parser/parse_type.c:194 parser/parse_type.c:222
-#: utils/cache/lsyscache.c:1220
+#: utils/cache/lsyscache.c:1229
 #, c-format
 msgid "Type \"%s\" is only a shell"
 msgstr ""
@@ -7700,281 +7684,6 @@ msgstr "typeidTypeRelid: 
 msgid "Invalid type name '%s'"
 msgstr "�������� ��� ���� '%s'"
 
-#: /usr/share/bison/bison.simple:179
-msgid "syntax error: cannot back up"
-msgstr ""
-
-#: gram.y:926
-msgid "SET TRANSACTION/READ ONLY not yet supported"
-msgstr "SET TRANSACTION/READ ONLY ���� �� ��������������"
-
-#: gram.y:963 gram.y:980
-msgid "Time zone interval must be HOUR or HOUR TO MINUTE"
-msgstr ""
-
-#: gram.y:974 gram.y:4906 gram.y:6912 utils/adt/timestamp.c:693
-#, c-format
-msgid "INTERVAL(%d) precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:1416 gram.y:1422 gram.y:4309 gram.y:4316
-msgid "GLOBAL TEMPORARY TABLE is not currently supported"
-msgstr ""
-
-#: gram.y:1459
-#, c-format
-msgid "CREATE TABLE / COLLATE %s not yet implemented; clause ignored"
-msgstr ""
-
-#: gram.y:1643
-msgid "LIKE in table definitions not yet supported"
-msgstr ""
-
-#: gram.y:1747
-msgid "FOREIGN KEY/MATCH PARTIAL not yet implemented"
-msgstr ""
-
-#: gram.y:1821
-msgid "CREATE TABLE AS may not specify INTO"
-msgstr "CREATE TABLE AS �� ����� ��������� INTO"
-
-#: gram.y:2192
-msgid "CREATE ASSERTION is not yet supported"
-msgstr "CREATE ASSERTION ���� �� ��������������"
-
-#: gram.y:2206
-msgid "DROP ASSERTION is not yet supported"
-msgstr "DROP ASSERTION ���� �� ��������������"
-
-#: gram.y:2576
-msgid "FETCH / RELATIVE at current position is not supported"
-msgstr ""
-
-#: gram.y:2704
-msgid "FETCH / ABSOLUTE not supported, using RELATIVE"
-msgstr ""
-
-#: gram.y:2866 gram.y:2874
-msgid "grant options are not implemented"
-msgstr ""
-
-#: gram.y:3050
-msgid "CREATE FUNCTION / OUT parameters are not supported"
-msgstr "CREATE FUNCTION / OUT ��������� �� ��������������"
-
-#: gram.y:3056
-msgid "CREATE FUNCTION / INOUT parameters are not supported"
-msgstr "CREATE FUNCTION / INOUT ��������� �� ��������������"
-
-#: gram.y:3208
-msgid "parser: argument type missing (use NONE for unary operators)"
-msgstr ""
-
-#: gram.y:3620
-msgid "%s is not a valid encoding name"
-msgstr "%s �� �������� ������ ������ ���������"
-
-#: gram.y:3632
-#, c-format
-msgid "%d is not a valid encoding code"
-msgstr "%d �� �������� ������ ����� ���������"
-
-#: gram.y:3716
-#, c-format
-msgid "CREATE DOMAIN / COLLATE %s not yet implemented; clause ignored"
-msgstr ""
-
-#: gram.y:4395
-msgid ""
-"LIMIT #,# syntax not supported.\n"
-"\tUse separate LIMIT and OFFSET clauses."
-msgstr ""
-"��������� LIMIT #,# ������ �� ��������������.\n"
-"\t����������� LIMIT � OFFSET ��� ���� �����."
-
-#: gram.y:4411
-msgid "LIMIT must not be negative"
-msgstr "LIMIT �� ������ ���� �������������"
-
-#: gram.y:4453
-msgid "OFFSET must not be negative"
-msgstr "OFFSET �� ������ ���� �������������"
-
-#: gram.y:4597
-msgid ""
-"sub-SELECT in FROM must have an alias\n"
-"\tFor example, FROM (SELECT ...) [AS] foo"
-msgstr ""
-
-#: gram.y:5000
-msgid "precision for FLOAT must be at least 1"
-msgstr ""
-
-#: gram.y:5007
-msgid "precision for FLOAT must be less than 16"
-msgstr ""
-
-#: gram.y:5020 gram.y:5033
-#, c-format
-msgid "NUMERIC precision %d must be between 1 and %d"
-msgstr ""
-
-#: gram.y:5024
-#, c-format
-msgid "NUMERIC scale %d must be between 0 and precision %d"
-msgstr ""
-
-#: gram.y:5050 gram.y:5063
-#, c-format
-msgid "DECIMAL precision %d must be between 1 and %d"
-msgstr ""
-
-#: gram.y:5054
-#, c-format
-msgid "DECIMAL scale %d must be between 0 and precision %d"
-msgstr ""
-
-#: gram.y:5109 gram.y:5183
-#, c-format
-msgid "length for type '%s' must be at least 1"
-msgstr ""
-
-#: gram.y:5112 gram.y:5186
-#, c-format
-msgid "length for type '%s' cannot exceed %d"
-msgstr ""
-
-#: gram.y:5263
-#, c-format
-msgid "TIMESTAMP(%d)%s precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:5295
-#, c-format
-msgid "TIME(%d)%s precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:5445 gram.y:7465 gram.y:7517
-msgid "Unequal number of entries in row expression"
-msgstr ""
-
-#: gram.y:5846
-msgid "UNIQUE predicate is not yet implemented"
-msgstr ""
-
-#: gram.y:6075
-#, c-format
-msgid "CURRENT_TIME(%d) precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:6120
-#, c-format
-msgid "CURRENT_TIMESTAMP(%d) precision must be between %d and %d"
-msgstr ""
-
-#: 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:6536
-#, c-format
-msgid "Conversion \"%s\" does not exist"
-msgstr "��������� \"%s\" �� ����������"
-
-#: gram.y:7338
-msgid "OLD used in non-rule query"
-msgstr ""
-
-#: gram.y:7345
-msgid "NEW used in non-rule query"
-msgstr ""
-
-#: /usr/share/bison/bison.simple:795
-msgid "parse error; also virtual memory exhausted"
-msgstr ""
-
-#: /usr/share/bison/bison.simple:799
-msgid "parse error"
-msgstr ""
-
-#: /usr/share/bison/bison.simple:924
-msgid "parser stack overflow"
-msgstr ""
-
-#: gram.y:7499
-#, c-format
-msgid "Operator '%s' not implemented for row expressions"
-msgstr ""
-
-#: gram.y:7575
-msgid "Wrong number of parameters on left side of OVERLAPS expression"
-msgstr ""
-
-#: gram.y:7580
-msgid "Wrong number of parameters on right side of OVERLAPS expression"
-msgstr ""
-
-#: gram.y:7617
-msgid "Multiple ORDER BY clauses not allowed"
-msgstr ""
-
-#: gram.y:7623
-msgid "Multiple FOR UPDATE clauses not allowed"
-msgstr ""
-
-#: gram.y:7629
-msgid "Multiple OFFSET clauses not allowed"
-msgstr ""
-
-#: gram.y:7635
-msgid "Multiple LIMIT clauses not allowed"
-msgstr ""
-
-#: scan.l:294
-msgid "unterminated /* comment"
-msgstr ""
-
-#: scan.l:322
-msgid "unterminated bit string literal"
-msgstr ""
-
-#: scan.l:341
-msgid "unterminated hexadecimal string literal"
-msgstr ""
-
-#: scan.l:387
-msgid "unterminated quoted string"
-msgstr ""
-
-#: scan.l:398
-msgid "zero-length delimited identifier"
-msgstr ""
-
-#: scan.l:405 scan.l:561
-#, c-format
-msgid "identifier \"%s\" will be truncated to \"%.*s\""
-msgstr ""
-
-#: scan.l:419
-msgid "unterminated quoted identifier"
-msgstr ""
-
-#: scan.l:579
-#, c-format
-msgid "parser: %s at end of input"
-msgstr ""
-
-#: scan.l:581
-#, 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 ""
@@ -8050,24 +7759,24 @@ msgstr ""
 msgid "dl: Undefined:"
 msgstr ""
 
-#: postmaster/postmaster.c:326
+#: postmaster/postmaster.c:328
 #, c-format
 msgid "data directory %s was not found"
 msgstr ""
 
-#: postmaster/postmaster.c:328
+#: postmaster/postmaster.c:330
 #, c-format
 msgid "could not read permissions of directory %s: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:333
+#: postmaster/postmaster.c:335
 #, c-format
 msgid ""
 "data directory %s has group or world access; permissions should be u=rwx "
 "(0700)"
 msgstr ""
 
-#: postmaster/postmaster.c:346
+#: postmaster/postmaster.c:348
 #, c-format
 msgid ""
 "%s does not find the database system.\n"
@@ -8080,83 +7789,83 @@ msgstr ""
 "�� �� ���������� ������� ���� \"%s\": %s\n"
 "\n"
 
-#: postmaster/postmaster.c:431
+#: postmaster/postmaster.c:433
 msgid "Assert checking is not compiled in."
 msgstr ""
 
-#: postmaster/postmaster.c:536 tcop/postgres.c:1497
+#: postmaster/postmaster.c:539 tcop/postgres.c:1525
 #, c-format
 msgid "--%s requires argument"
 msgstr "--%s ������� ��������"
 
-#: postmaster/postmaster.c:538 tcop/postgres.c:1499
+#: postmaster/postmaster.c:541 tcop/postgres.c:1527
 #, c-format
 msgid "-c %s requires argument"
 msgstr "-c %s ������� ��������"
 
-#: postmaster/postmaster.c:549 postmaster/postmaster.c:560
-#: postmaster/postmaster.c:625
+#: postmaster/postmaster.c:552 postmaster/postmaster.c:563
+#: postmaster/postmaster.c:628
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "�������� '%s --help' ��� ����� ��������� ����������.\n"
 
-#: postmaster/postmaster.c:559
+#: postmaster/postmaster.c:562
 #, c-format
 msgid "invalid argument -- %s"
 msgstr "�������� �������� -- %s"
 
-#: postmaster/postmaster.c:575
+#: 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."
 msgstr ""
 
-#: postmaster/postmaster.c:588
+#: postmaster/postmaster.c:591
 msgid "superuser_reserved_connections must be less than max_connections."
 msgstr ""
 
-#: postmaster/postmaster.c:604
+#: postmaster/postmaster.c:607
 #, c-format
 msgid "%s: PostmasterMain: initial environ dump:"
 msgstr ""
 
-#: postmaster/postmaster.c:605 postmaster/postmaster.c:608
+#: postmaster/postmaster.c:608 postmaster/postmaster.c:611
 msgid "-----------------------------------------"
 msgstr ""
 
-#: postmaster/postmaster.c:607 postmaster/postmaster.c:2270
+#: postmaster/postmaster.c:610 postmaster/postmaster.c:2283
 #, c-format
 msgid "\t%s"
 msgstr "\t%s"
 
-#: postmaster/postmaster.c:615 tcop/postgres.c:1627
+#: postmaster/postmaster.c:618 tcop/postgres.c:1671
 #, c-format
 msgid "%s: could not locate executable, bailing out..."
 msgstr ""
 
-#: postmaster/postmaster.c:624
+#: postmaster/postmaster.c:627
 msgid "For SSL, TCP/IP connections must be enabled."
 msgstr ""
 
-#: postmaster/postmaster.c:671
+#: postmaster/postmaster.c:674
 msgid "cannot create INET stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:683
+#: postmaster/postmaster.c:686
 msgid "cannot create UNIX stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:803
+#: postmaster/postmaster.c:806
 #, c-format
 msgid "fork failed: %s"
 msgstr "fork �� ������: %s"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:828
 #, c-format
 msgid "cannot disassociate from controlling TTY: %s"
 msgstr ""
 
-#: postmaster/postmaster.c:845
+#: postmaster/postmaster.c:848
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -8165,7 +7874,7 @@ msgstr ""
 "%s �������� PostgreSQL ��������.\n"
 "\n"
 
-#: postmaster/postmaster.c:846
+#: postmaster/postmaster.c:849
 #, c-format
 msgid ""
 "Usage:\n"
@@ -8176,76 +7885,76 @@ msgstr ""
 "  %s [�����...]\n"
 "\n"
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:850
 msgid "Options:\n"
 msgstr "�����:\n"
 
-#: postmaster/postmaster.c:849
+#: postmaster/postmaster.c:852
 msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr ""
 "  -A 1|0          ��������/��������� �������� �������������� ��������\n"
 
-#: postmaster/postmaster.c:851
+#: postmaster/postmaster.c:854
 #, c-format
 msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
 msgstr "  -B ��������     ����� ����� ������� (�� ���������: %d)\n"
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:855
 msgid "  -c NAME=VALUE   set run-time parameter\n"
 msgstr "  -c ���=����.   ���������� �������� ���������� (run-time)\n"
 
-#: postmaster/postmaster.c:853
+#: postmaster/postmaster.c:856
 msgid "  -d 1-5          debugging level\n"
 msgstr "  -d 1-5          ������� �������\n"
 
-#: postmaster/postmaster.c:854
+#: postmaster/postmaster.c:857
 msgid "  -D DATADIR      database directory\n"
 msgstr "  -D ���������    ���������� � �������\n"
 
-#: postmaster/postmaster.c:855
+#: postmaster/postmaster.c:858
 msgid "  -F              turn fsync off\n"
 msgstr "  -F              ���������� fsync\n"
 
-#: postmaster/postmaster.c:856
+#: postmaster/postmaster.c:859
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
 msgstr "  -h ����         ��� ����� ��� IP-����� ��� �������������\n"
 
-#: postmaster/postmaster.c:857
+#: postmaster/postmaster.c:860
 msgid "  -i              enable TCP/IP connections\n"
 msgstr "  -i              ���������� TCP/IP ����������\n"
 
-#: postmaster/postmaster.c:858
+#: postmaster/postmaster.c:861
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
 msgstr "  -k ����������   �������������� unix-domain �������\n"
 
-#: postmaster/postmaster.c:860
+#: postmaster/postmaster.c:863
 msgid "  -l              enable SSL connections\n"
 msgstr "  -l              �������� SSL-�������������\n"
 
-#: postmaster/postmaster.c:862
+#: postmaster/postmaster.c:865
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
 msgstr ""
 "  -N MAX-CONNECT  ����������� ��������� ����� ������������� (�� ���������: %"
 "d)\n"
 
-#: postmaster/postmaster.c:864
+#: postmaster/postmaster.c:867
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
 msgstr "  -o �����        �������� '�����' ������� ���-���� (�������)\n"
 
-#: postmaster/postmaster.c:865
+#: postmaster/postmaster.c:868
 #, c-format
 msgid "  -p PORT         port number to listen on (default %d)\n"
 msgstr "  -p ����         ����� ����� ��� ������������� (�� ���������: %d)\n"
 
-#: postmaster/postmaster.c:866
+#: postmaster/postmaster.c:869
 msgid ""
 "  -S              silent mode (start in background without logging output)\n"
 msgstr ""
 "  -S              ����� ����� (��������� �� ������ ����� ��� ����� "
 "�����������)\n"
 
-#: postmaster/postmaster.c:868
+#: postmaster/postmaster.c:871
 msgid ""
 "\n"
 "Developer options:\n"
@@ -8253,20 +7962,20 @@ msgstr ""
 "\n"
 "����� ������������:\n"
 
-#: postmaster/postmaster.c:869
+#: postmaster/postmaster.c:872
 msgid ""
 "  -n              do not reinitialize shared memory after abnormal exit\n"
 msgstr ""
 "  -n              �� �������������������� ����� ������ ����� ������������� "
 "����������\n"
 
-#: postmaster/postmaster.c:870
+#: postmaster/postmaster.c:873
 msgid "  -s              send SIGSTOP to all backend servers if one dies\n"
 msgstr ""
 "  -s              ������� ������ SIGSTOP ���� ���-����� (��������) ���� ���� "
 "�� ��� ������\n"
 
-#: postmaster/postmaster.c:872
+#: postmaster/postmaster.c:875
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -8276,249 +7985,249 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 
-#: postmaster/postmaster.c:954
+#: postmaster/postmaster.c:957
 #, c-format
 msgid "ServerLoop: select failed: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1080 postmaster/postmaster.c:1097
+#: postmaster/postmaster.c:1083 postmaster/postmaster.c:1100
 msgid "incomplete startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1088
+#: postmaster/postmaster.c:1091
 msgid "invalid length of startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1130
+#: postmaster/postmaster.c:1133
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1152
+#: postmaster/postmaster.c:1155
 msgid "unsupported frontend protocol"
 msgstr ""
 
-#: postmaster/postmaster.c:1179
+#: postmaster/postmaster.c:1182
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1212
+#: postmaster/postmaster.c:1215
 msgid "The database system is starting up"
 msgstr ""
 
-#: postmaster/postmaster.c:1215
+#: postmaster/postmaster.c:1218
 msgid "The database system is shutting down"
 msgstr ""
 
-#: postmaster/postmaster.c:1218
+#: postmaster/postmaster.c:1221
 msgid "The database system is in recovery mode"
 msgstr ""
 
-#: postmaster/postmaster.c:1221 storage/ipc/sinval.c:52
+#: postmaster/postmaster.c:1224 storage/ipc/sinval.c:52
 #: storage/lmgr/proc.c:211
 msgid "Sorry, too many clients already"
 msgstr ""
 
-#: postmaster/postmaster.c:1251
+#: postmaster/postmaster.c:1254
 #, c-format
 msgid "processCancelRequest: CheckPointPID in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1265
+#: postmaster/postmaster.c:1268
 #, c-format
 msgid "processing cancel request: sending SIGINT to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1271
+#: postmaster/postmaster.c:1274
 #, c-format
 msgid "bad key in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1278
+#: postmaster/postmaster.c:1281
 #, c-format
 msgid "bad pid in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1321
+#: postmaster/postmaster.c:1324
 msgid "ConnCreate: malloc failed"
 msgstr "ConnCreate: malloc �� ������"
 
-#: postmaster/postmaster.c:1416
+#: postmaster/postmaster.c:1419
 msgid "Received SIGHUP, reloading configuration files"
 msgstr ""
 
-#: postmaster/postmaster.c:1440
+#: postmaster/postmaster.c:1443
 #, c-format
 msgid "pmdie %d"
 msgstr "pmdie %d"
 
-#: postmaster/postmaster.c:1454
+#: postmaster/postmaster.c:1457
 msgid "smart shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1466 postmaster/postmaster.c:1510
+#: postmaster/postmaster.c:1469 postmaster/postmaster.c:1513
 #, c-format
 msgid "shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1484
+#: postmaster/postmaster.c:1487
 msgid "fast shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1490
+#: postmaster/postmaster.c:1493
 msgid "aborting any active transactions"
 msgstr ""
 
-#: postmaster/postmaster.c:1526
+#: postmaster/postmaster.c:1529
 msgid "immediate shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1561
+#: postmaster/postmaster.c:1564
 msgid "reaping dead processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1578
+#: postmaster/postmaster.c:1581
 msgid "statistics collector process"
 msgstr ""
 
-#: postmaster/postmaster.c:1591
+#: postmaster/postmaster.c:1594
 msgid "shutdown process"
 msgstr ""
 
-#: postmaster/postmaster.c:1602
+#: postmaster/postmaster.c:1605
 msgid "startup process"
 msgstr ""
 
-#: postmaster/postmaster.c:1604
+#: postmaster/postmaster.c:1607
 msgid "aborting startup due to startup process failure"
 msgstr ""
 
-#: postmaster/postmaster.c:1613
+#: postmaster/postmaster.c:1616
 #, c-format
 msgid "startup process %d died while shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1645
+#: postmaster/postmaster.c:1648
 msgid ""
 "all server processes terminated; reinitializing shared memory and semaphores"
 msgstr ""
 
-#: postmaster/postmaster.c:1683
+#: postmaster/postmaster.c:1686
 msgid "child process"
 msgstr ""
 
-#: postmaster/postmaster.c:1728
+#: postmaster/postmaster.c:1731
 msgid "server process"
 msgstr ""
 
-#: postmaster/postmaster.c:1729
+#: postmaster/postmaster.c:1732
 msgid "terminating any other active server processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1750
+#: postmaster/postmaster.c:1753
 #, c-format
 msgid "CleanupProc: sending %s to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1794
+#: postmaster/postmaster.c:1797
 #, c-format
 msgid "%s (pid %d) exited with exit code %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1797
+#: postmaster/postmaster.c:1800
 #, c-format
 msgid "%s (pid %d) was terminated by signal %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1800
+#: postmaster/postmaster.c:1803
 #, c-format
 msgid "%s (pid %d) exited with unexpected status %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1822
+#: postmaster/postmaster.c:1825
 #, c-format
 msgid "SignalChildren: sending signal %d to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1860
+#: postmaster/postmaster.c:1863
 msgid "out of memory; connection startup aborted"
 msgstr ""
 
-#: postmaster/postmaster.c:1911
+#: postmaster/postmaster.c:1914
 msgid "connection startup failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1928
+#: postmaster/postmaster.c:1931
 #, c-format
 msgid "connection startup failed (fork failure): %s"
 msgstr ""
 
-#: postmaster/postmaster.c:1935
+#: postmaster/postmaster.c:1938
 #, c-format
 msgid "BackendStartup: forked pid=%d socket=%d"
 msgstr ""
 
-#: postmaster/postmaster.c:1969
+#: postmaster/postmaster.c:1972
 msgid "Server process fork() failed: "
 msgstr ""
 
-#: postmaster/postmaster.c:2115
+#: postmaster/postmaster.c:2119
 #, c-format
 msgid "connection received: host=%s port=%hu"
 msgstr ""
 
-#: postmaster/postmaster.c:2135
+#: postmaster/postmaster.c:2139
 #, c-format
 msgid "connection received: host=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2155
+#: postmaster/postmaster.c:2159
 msgid "DoBackend: Unable to set timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2184
+#: postmaster/postmaster.c:2188
 msgid "DoBackend: Unable to disable timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2188
+#: postmaster/postmaster.c:2192
 #, c-format
 msgid "connection authorized: user=%s database=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2268
+#: postmaster/postmaster.c:2281
 #, c-format
 msgid "%s child[%d]: starting with ("
 msgstr ""
 
-#: postmaster/postmaster.c:2271
+#: postmaster/postmaster.c:2284
 msgid ")"
 msgstr ")"
 
-#: postmaster/postmaster.c:2570
+#: postmaster/postmaster.c:2583
 #, c-format
 msgid "could not launch startup process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2573
+#: postmaster/postmaster.c:2586
 #, c-format
 msgid "could not launch checkpoint process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2576
+#: postmaster/postmaster.c:2589
 #, c-format
 msgid "could not launch shutdown process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2600
+#: postmaster/postmaster.c:2613
 msgid "CheckPointDataBase: malloc failed"
 msgstr "CheckPointDataBase: malloc �� ������"
 
-#: postmaster/postmaster.c:2639
+#: postmaster/postmaster.c:2652
 #, c-format
 msgid "cannot create file %s: %s"
 msgstr "�� ���������� ������� ���� %s: %s"
 
-#: postmaster/postmaster.c:2651
+#: postmaster/postmaster.c:2664
 #, c-format
 msgid "writing file %s failed"
 msgstr "������ ���� %s �� �������"
@@ -8548,7 +8257,7 @@ msgstr "PGSTAT: connect() 
 msgid "PGSTAT: fcntl() failed: %m"
 msgstr "PGSTAT: fcntl() �� ������: %m"
 
-#: postmaster/pgstat.c:230 postmaster/pgstat.c:1164
+#: postmaster/pgstat.c:230 postmaster/pgstat.c:1166
 #, c-format
 msgid "PGSTAT: pipe() failed: %m"
 msgstr "PGSTAT: pipe() �� ������: %m"
@@ -8557,142 +8266,142 @@ msgstr "PGSTAT: pipe() 
 msgid "PGSTAT: statistics collector startup skipped"
 msgstr ""
 
-#: postmaster/pgstat.c:296 postmaster/pgstat.c:1171
+#: postmaster/pgstat.c:296 postmaster/pgstat.c:1173
 #, c-format
 msgid "PGSTAT: fork() failed: %m"
 msgstr "PGSTAT: fork() �� ������: %m"
 
-#: postmaster/pgstat.c:703
+#: postmaster/pgstat.c:705
 msgid "Only database superusers can reset statistic counters"
 msgstr ""
 
-#: postmaster/pgstat.c:770 postmaster/pgstat.c:779 postmaster/pgstat.c:826
-#: postmaster/pgstat.c:836
+#: postmaster/pgstat.c:772 postmaster/pgstat.c:781 postmaster/pgstat.c:828
+#: postmaster/pgstat.c:838
 msgid "PGSTATBE: malloc() failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1223
+#: postmaster/pgstat.c:1227
 msgid "PGSTAT: Creation of dead backend hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1234
+#: postmaster/pgstat.c:1238
 msgid "PGSTAT: Allocation of backend table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1290
+#: postmaster/pgstat.c:1294
 #, c-format
 msgid "PGSTAT: select() failed: %m"
 msgstr "PGSTAT: select() �� ������: %m"
 
-#: postmaster/pgstat.c:1330
+#: postmaster/pgstat.c:1334
 #, c-format
 msgid "PGSTAT: read() failed: %m"
 msgstr "PGSTAT: read() �� ������: %m"
 
-#: postmaster/pgstat.c:1348
+#: postmaster/pgstat.c:1352
 msgid "PGSTAT: bogus message length"
 msgstr ""
 
-#: postmaster/pgstat.c:1498
+#: postmaster/pgstat.c:1502
 #, c-format
 msgid "PGSTATBUFF: fcntl() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1508
+#: postmaster/pgstat.c:1512
 msgid "PGSTATBUFF: malloc() failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1535
+#: postmaster/pgstat.c:1539
 msgid "PGSTATBUFF: Warning - receive buffer full"
 msgstr ""
 
-#: postmaster/pgstat.c:1566
+#: postmaster/pgstat.c:1570
 #, c-format
 msgid "PGSTATBUFF: select() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1582
+#: postmaster/pgstat.c:1586
 #, c-format
 msgid "PGSTATBUFF: recvfrom() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1657
+#: postmaster/pgstat.c:1661
 #, c-format
 msgid "PGSTATBUFF: write() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1710
+#: postmaster/pgstat.c:1714
 #, c-format
 msgid "PGSTAT: Invalid backend ID %d"
 msgstr ""
 
-#: postmaster/pgstat.c:1766
+#: postmaster/pgstat.c:1770
 msgid "PGSTAT: DB hash table out of memory - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:1795 postmaster/pgstat.c:2210 postmaster/pgstat.c:2217
+#: postmaster/pgstat.c:1799 postmaster/pgstat.c:2214 postmaster/pgstat.c:2221
 msgid "PGSTAT: failed to initialize hash table for new database entry"
 msgstr ""
 
-#: postmaster/pgstat.c:1847
+#: postmaster/pgstat.c:1851
 msgid "PGSTAT: dead backend hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:1894
+#: postmaster/pgstat.c:1898
 #, c-format
 msgid "PGSTAT: cannot open temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1920
+#: postmaster/pgstat.c:1924
 msgid "PGSTAT: database hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:1956
+#: postmaster/pgstat.c:1960
 #, c-format
 msgid ""
 "PGSTAT: tables hash table for database %d corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2003
+#: postmaster/pgstat.c:2007
 #, c-format
 msgid "PGSTAT: Error closing temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2010
+#: postmaster/pgstat.c:2014
 #, c-format
 msgid "PGSTAT: Cannot rename temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2031
+#: postmaster/pgstat.c:2035
 msgid "PGSTAT: dead backend hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2096 postmaster/pgstat.c:2100
+#: postmaster/pgstat.c:2100 postmaster/pgstat.c:2104
 msgid "PGSTAT: Creation of DB hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:2138 postmaster/pgstat.c:2144 postmaster/pgstat.c:2173
-#: postmaster/pgstat.c:2179 postmaster/pgstat.c:2244 postmaster/pgstat.c:2250
-#: postmaster/pgstat.c:2283 postmaster/pgstat.c:2289 postmaster/pgstat.c:2312
-#: postmaster/pgstat.c:2318 postmaster/pgstat.c:2366 postmaster/pgstat.c:2372
-#: postmaster/pgstat.c:2407 postmaster/pgstat.c:2413
+#: 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:2160 postmaster/pgstat.c:2166
+#: postmaster/pgstat.c:2164 postmaster/pgstat.c:2170
 msgid "PGSTAT: DB hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:2269 postmaster/pgstat.c:2275
+#: postmaster/pgstat.c:2273 postmaster/pgstat.c:2279
 msgid "PGSTAT: Tab hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:2522
+#: postmaster/pgstat.c:2526
 #, c-format
 msgid "PGSTAT: tables hash table out of memory for database %d - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2702
+#: postmaster/pgstat.c:2706
 msgid "PGSTAT: failed to reinitialize hash table for database entry"
 msgstr ""
 
@@ -8787,56 +8496,56 @@ msgstr ""
 msgid "Attempt to rename rule \"%s\" failed: \"%s\" already exists"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:344
+#: rewrite/rewriteHandler.c:343
 #, c-format
 msgid "rewriteTargetList: bogus resno %d in targetlist"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:386 rewrite/rewriteHandler.c:398
+#: rewrite/rewriteHandler.c:385 rewrite/rewriteHandler.c:397
 #, c-format
 msgid "Multiple assignments to same attribute \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:562
+#: rewrite/rewriteHandler.c:553
 msgid "ApplyRetrieveRule: expected just one rule action"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:564
+#: rewrite/rewriteHandler.c:555
 msgid "ApplyRetrieveRule: can't handle qualified ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:566
+#: rewrite/rewriteHandler.c:557
 msgid "ApplyRetrieveRule: can't handle per-attribute ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:844
+#: rewrite/rewriteHandler.c:835
 msgid "fireRIRrules: failed to remove aggs from qual"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1115
+#: rewrite/rewriteHandler.c:1106
 #, c-format
 msgid "query rewritten %d times, may contain cycles"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1239
+#: rewrite/rewriteHandler.c:1230
 msgid ""
 "Cannot insert into a view\n"
 "\tYou need an unconditional ON INSERT DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1243
+#: rewrite/rewriteHandler.c:1234
 msgid ""
 "Cannot update a view\n"
 "\tYou need an unconditional ON UPDATE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1247
+#: rewrite/rewriteHandler.c:1238
 msgid ""
 "Cannot delete from a view\n"
 "\tYou need an unconditional ON DELETE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1251
+#: rewrite/rewriteHandler.c:1242
 #, c-format
 msgid "QueryRewrite: unexpected commandType %d"
 msgstr ""
@@ -9192,24 +8901,28 @@ msgstr ""
 msgid "FreeFile: file was not obtained from AllocateFile"
 msgstr ""
 
-#: storage/freespace/freespace.c:178 storage/freespace/freespace.c:193
-#: storage/freespace/freespace.c:201
+#: 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:530
+#: 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:599
+#: storage/freespace/freespace.c:606
 msgid "FreeSpaceMap hashtable corrupted"
 msgstr ""
 
-#: storage/freespace/freespace.c:772
+#: storage/freespace/freespace.c:779
 msgid "fsm_record_free_space: unexpected match"
 msgstr ""
 
-#: storage/freespace/freespace.c:899
+#: storage/freespace/freespace.c:889
 msgid "insert_fsm_page_entry: entry already exists!"
 msgstr ""
 
@@ -9337,7 +9050,7 @@ msgstr ""
 msgid "inv_seek: invalid whence: %d"
 msgstr ""
 
-#: storage/lmgr/deadlock.c:269
+#: storage/lmgr/deadlock.c:271
 msgid "DeadLockCheckRecurse: inconsistent results"
 msgstr ""
 
@@ -9392,100 +9105,100 @@ msgstr ""
 msgid "LockMethodTableInit: too many lock types %d greater than %d"
 msgstr ""
 
-#: storage/lmgr/lock.c:263 storage/lmgr/lock.c:309 storage/lmgr/lock.c:329
+#: 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:450
+#: storage/lmgr/lock.c:451
 #, c-format
 msgid "LockAcquire: user lock [%u] %s"
 msgstr ""
 
-#: storage/lmgr/lock.c:461
+#: storage/lmgr/lock.c:462
 #, c-format
 msgid "LockAcquire: bad lock table %d"
 msgstr ""
 
-#: storage/lmgr/lock.c:479
+#: storage/lmgr/lock.c:480
 #, c-format
 msgid "LockAcquire: lock table %d is out of memory"
 msgstr ""
 
-#: storage/lmgr/lock.c:526
+#: storage/lmgr/lock.c:527
 msgid "LockAcquire: holder table out of memory"
 msgstr ""
 
-#: storage/lmgr/lock.c:571
+#: 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:651
+#: storage/lmgr/lock.c:652
 msgid "LockAcquire: remove holder, table corrupted"
 msgstr ""
 
-#: storage/lmgr/lock.c:907
+#: storage/lmgr/lock.c:908
 msgid "deadlock detected"
 msgstr ""
 
-#: storage/lmgr/lock.c:988
+#: storage/lmgr/lock.c:989
 #, c-format
 msgid "LockRelease: user lock tag [%u] %d"
 msgstr ""
 
-#: storage/lmgr/lock.c:998
+#: storage/lmgr/lock.c:999
 msgid "lockMethodTable is null in LockRelease"
 msgstr ""
 
-#: storage/lmgr/lock.c:1020
+#: storage/lmgr/lock.c:1021
 msgid "LockRelease: no such lock"
 msgstr ""
 
-#: storage/lmgr/lock.c:1043
+#: storage/lmgr/lock.c:1044
 msgid "LockRelease: no lock with this tag"
 msgstr ""
 
-#: storage/lmgr/lock.c:1046
+#: storage/lmgr/lock.c:1047
 msgid "LockRelease: holder table corrupted"
 msgstr ""
 
-#: storage/lmgr/lock.c:1060
+#: storage/lmgr/lock.c:1061
 #, c-format
 msgid "LockRelease: you don't own a lock of type %s"
 msgstr ""
 
-#: storage/lmgr/lock.c:1114
+#: storage/lmgr/lock.c:1115
 msgid "LockRelease: remove lock, table corrupted"
 msgstr ""
 
-#: storage/lmgr/lock.c:1143
+#: storage/lmgr/lock.c:1144
 msgid "LockRelease: remove holder, table corrupted"
 msgstr ""
 
-#: storage/lmgr/lock.c:1184
+#: storage/lmgr/lock.c:1185
 #, c-format
 msgid "LockReleaseAll: lockmethod=%d, pid=%d"
 msgstr ""
 
-#: storage/lmgr/lock.c:1192
+#: storage/lmgr/lock.c:1193
 #, c-format
 msgid "LockReleaseAll: bad lockmethod %d"
 msgstr ""
 
-#: storage/lmgr/lock.c:1296
+#: storage/lmgr/lock.c:1297
 msgid "LockReleaseAll: holder table corrupted"
 msgstr ""
 
-#: storage/lmgr/lock.c:1314
+#: storage/lmgr/lock.c:1315
 msgid "LockReleaseAll: cannot remove lock from HTAB"
 msgstr ""
 
-#: storage/lmgr/lock.c:1329
+#: storage/lmgr/lock.c:1330
 msgid "LockReleaseAll: done"
 msgstr ""
 
-#: storage/lmgr/lock.c:1516
+#: storage/lmgr/lock.c:1517
 msgid "DumpAllLocks: holder->tag.lock = NULL"
 msgstr ""
 
@@ -9503,11 +9216,11 @@ msgstr "%s(%d): %s"
 msgid "No more LWLockIds available"
 msgstr ""
 
-#: storage/lmgr/lwlock.c:274
+#: storage/lmgr/lwlock.c:281
 msgid "LWLockAcquire: can't wait without a PGPROC structure"
 msgstr ""
 
-#: storage/lmgr/lwlock.c:420
+#: storage/lmgr/lwlock.c:427
 #, c-format
 msgid "LWLockRelease: lock %d is not held"
 msgstr ""
@@ -9537,11 +9250,11 @@ msgstr ""
 msgid "InitDummyProcess: DummyProc is in use by PID %d"
 msgstr ""
 
-#: storage/lmgr/proc.c:640
+#: storage/lmgr/proc.c:649
 msgid "ProcSleep: Unable to set timer for process wakeup"
 msgstr ""
 
-#: storage/lmgr/proc.c:662
+#: storage/lmgr/proc.c:671
 msgid "ProcSleep: Unable to disable timer for process wakeup"
 msgstr ""
 
@@ -9744,32 +9457,32 @@ msgstr ""
 msgid "cannot count blocks for %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:419
+#: storage/smgr/smgr.c:417
 #, c-format
 msgid "cannot truncate %s to %u blocks: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:461
+#: storage/smgr/smgr.c:459
 #, c-format
 msgid "cannot unlink %u/%u: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:486
+#: storage/smgr/smgr.c:484
 #, c-format
 msgid "transaction commit failed on %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:508
+#: storage/smgr/smgr.c:506
 #, c-format
 msgid "transaction abort failed on %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:530
+#: storage/smgr/smgr.c:528
 #, c-format
 msgid "storage sync failed on %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:544
+#: storage/smgr/smgr.c:542
 #, c-format
 msgid "illegal storage manager number %d"
 msgstr ""
@@ -9799,52 +9512,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:665
 msgid ""
 "current transaction is aborted, queries ignored until end of transaction "
 "block"
 msgstr ""
 
-#: tcop/postgres.c:288
+#: tcop/postgres.c:289
 #, c-format
 msgid "Socket command type %c unknown"
 msgstr ""
 
-#: tcop/postgres.c:376
+#: tcop/postgres.c:377
 #, c-format
 msgid "query: %s"
 msgstr "������: %s"
 
-#: tcop/postgres.c:463
+#: tcop/postgres.c:464
 msgid "pg_analyze_and_rewrite: copyObject failed on parse tree"
 msgstr ""
 
-#: tcop/postgres.c:507
+#: tcop/postgres.c:508
 msgid "pg_plan_query: copyObject failed on plan tree"
 msgstr ""
 
-#: tcop/postgres.c:719
+#: tcop/postgres.c:722
 msgid "ProcessUtility"
 msgstr "ProcessUtility"
 
-#: tcop/postgres.c:763
+#: tcop/postgres.c:783
 msgid "ProcessQuery"
 msgstr "ProcessQuery"
 
-#: tcop/postgres.c:872
+#: tcop/postgres.c:904
 #, c-format
 msgid "duration: %ld.%06ld sec"
 msgstr ""
 
-#: tcop/postgres.c:886
+#: tcop/postgres.c:918
 msgid "StartTransactionCommand"
 msgstr "StartTransactionCommand"
 
-#: tcop/postgres.c:897
+#: tcop/postgres.c:929
 msgid "CommitTransactionCommand"
 msgstr "CommitTransactionCommand"
 
-#: tcop/postgres.c:924
+#: tcop/postgres.c:956
 msgid ""
 "Message from PostgreSQL backend:\n"
 "\tThe Postmaster has informed me that some other backend\n"
@@ -9854,63 +9567,63 @@ msgid ""
 "\tPlease reconnect to the database system and repeat your query."
 msgstr ""
 
-#: tcop/postgres.c:1042
+#: tcop/postgres.c:1074
 msgid ""
 "floating point exception! The last floating point operation either exceeded "
 "legal ranges or was a divide by zero"
 msgstr ""
 
-#: tcop/postgres.c:1074
+#: tcop/postgres.c:1107
 msgid "This connection has been terminated by the administrator."
 msgstr ""
 
-#: tcop/postgres.c:1080
+#: tcop/postgres.c:1114
 msgid "Query was cancelled."
 msgstr ""
 
-#: tcop/postgres.c:1217
+#: tcop/postgres.c:1259
 msgid "Assert checking is not compiled in"
 msgstr ""
 
-#: tcop/postgres.c:1463
+#: tcop/postgres.c:1491
 msgid "only one -x flag is allowed"
 msgstr ""
 
-#: tcop/postgres.c:1481
+#: tcop/postgres.c:1509
 msgid "use -x {off,nor,nopull,nopm,pullall,wait}"
 msgstr ""
 
-#: tcop/postgres.c:1520
+#: tcop/postgres.c:1564
 msgid ""
 "Query statistics are disabled because parser, planner, or executor "
 "statistics are on."
 msgstr ""
 
-#: tcop/postgres.c:1597 tcop/postgres.c:1609
+#: tcop/postgres.c:1641 tcop/postgres.c:1653
 #, c-format
 msgid ""
 "%s: invalid command line arguments\n"
 "Try -? for help."
 msgstr ""
 
-#: tcop/postgres.c:1617
+#: tcop/postgres.c:1661
 #, c-format
 msgid "%s: user name undefined and no database specified"
 msgstr ""
 
-#: tcop/postgres.c:1668
+#: tcop/postgres.c:1712
 msgid "InitPostgres"
 msgstr "InitPostgres"
 
-#: tcop/postgres.c:1750
+#: tcop/postgres.c:1795
 msgid "AbortCurrentTransaction"
 msgstr "AbortCurrentTransaction"
 
-#: tcop/postgres.c:1955
+#: tcop/postgres.c:2003
 msgid "unknown frontend message was received"
 msgstr ""
 
-#: tcop/postgres.c:2087
+#: tcop/postgres.c:2135
 #, c-format
 msgid ""
 "%s\n"
@@ -9919,7 +9632,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: tcop/postgres.c:2449
+#: tcop/postgres.c:2497
 #, c-format
 msgid "CreateCommandTag: unknown parse node type %d"
 msgstr ""
@@ -9954,100 +9667,100 @@ 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:554
 msgid "ALTER TABLE: permission denied"
 msgstr "ALTER TABLE: ��� �������"
 
-#: tcop/utility.c:567
+#: tcop/utility.c:560
 msgid "T_AlterTableStmt: unknown subtype"
 msgstr ""
 
-#: tcop/utility.c:886
+#: tcop/utility.c:877
 #, c-format
 msgid "ProcessUtility: command #%d unsupported"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:175
+#: utils/adt/arrayfuncs.c:176
 #, c-format
 msgid "array_in: more than %d dimensions"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:178 utils/adt/arrayfuncs.c:187
+#: utils/adt/arrayfuncs.c:179 utils/adt/arrayfuncs.c:188
 msgid "array_in: missing dimension value"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:195
+#: utils/adt/arrayfuncs.c:196
 msgid "array_in: missing ']' in array declaration"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:200
+#: utils/adt/arrayfuncs.c:201
 msgid "array_in: upper_bound cannot be < lower_bound"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:209
+#: utils/adt/arrayfuncs.c:210
 msgid "array_in: Need to specify dimension"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:218
+#: utils/adt/arrayfuncs.c:219
 msgid "array_in: missing assignment operator"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:245
+#: utils/adt/arrayfuncs.c:246
 msgid "array_in: missing left brace"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:302 utils/adt/arrayfuncs.c:309
-#: utils/adt/arrayfuncs.c:422 utils/adt/arrayfuncs.c:432
+#: 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 ""
 
-#: utils/adt/arrayfuncs.c:318 utils/adt/arrayfuncs.c:329
-#: utils/adt/arrayfuncs.c:451 utils/adt/arrayfuncs.c:464
-#: utils/adt/arrayfuncs.c:500
+#: 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 ""
 
-#: utils/adt/arrayfuncs.c:919
+#: utils/adt/arrayfuncs.c:986
 msgid "Slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1055 utils/adt/arrayfuncs.c:1057
-#: utils/adt/arrayfuncs.c:1074 utils/adt/arrayfuncs.c:1094
-#: utils/adt/arrayfuncs.c:1104 utils/adt/arrayfuncs.c:1230
-#: utils/adt/arrayfuncs.c:1245 utils/adt/arrayfuncs.c:1254
-#: utils/adt/arrayfuncs.c:1261 utils/adt/arrayfuncs.c:1270
+#: 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 ""
 
-#: utils/adt/arrayfuncs.c:1219
+#: utils/adt/arrayfuncs.c:1286
 msgid "Updates on slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1280
+#: utils/adt/arrayfuncs.c:1347
 msgid "Source array too small"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1411
+#: utils/adt/arrayfuncs.c:1478
 #, c-format
 msgid "array_map: invalid nargs: %d"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1413
+#: utils/adt/arrayfuncs.c:1480
 msgid "array_map: null input array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1457
+#: utils/adt/arrayfuncs.c:1524
 msgid "array_map: cannot handle NULL in array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1649 utils/cache/lsyscache.c:881
-#: utils/cache/lsyscache.c:904
+#: utils/adt/arrayfuncs.c:1716 utils/cache/lsyscache.c:908
+#: utils/cache/lsyscache.c:931
 #, c-format
 msgid "cache lookup failed for type %u"
 msgstr ""
@@ -10103,50 +9816,50 @@ msgstr ""
 msgid "aclitemout: bad idtype: %d"
 msgstr ""
 
-#: utils/adt/acl.c:432
+#: utils/adt/acl.c:434
 #, c-format
 msgid "acldefault: bogus objtype %d"
 msgstr ""
 
-#: utils/adt/acl.c:505
+#: utils/adt/acl.c:507
 msgid "aclinsert3: insertion before world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:616
+#: utils/adt/acl.c:618
 msgid "aclremove: removal of the world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:863
+#: utils/adt/acl.c:865
 #, c-format
 msgid "has_table_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1066
+#: utils/adt/acl.c:1068
 #, c-format
 msgid "has_database_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1242
+#: utils/adt/acl.c:1244
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "������� \"%s\" �� ����������"
 
-#: utils/adt/acl.c:1265
+#: utils/adt/acl.c:1267
 #, c-format
 msgid "has_function_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1464
+#: utils/adt/acl.c:1466
 #, c-format
 msgid "has_language_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1640
+#: utils/adt/acl.c:1642
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "����� \"%s\" �� ����������"
 
-#: utils/adt/acl.c:1666
+#: utils/adt/acl.c:1668
 #, c-format
 msgid "has_schema_privilege: invalid privilege type %s"
 msgstr ""
@@ -10182,102 +9895,102 @@ msgstr ""
 msgid "cash_div:  divide by 0 error"
 msgstr ""
 
-#: utils/adt/date.c:61
+#: utils/adt/date.c:69
 #, c-format
 msgid "Bad date external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:65
+#: utils/adt/date.c:73
 #, c-format
 msgid "Bad date external representation '%s'"
 msgstr ""
 
-#: utils/adt/date.c:73
+#: utils/adt/date.c:81
 msgid ""
 "Date CURRENT no longer supported\n"
 "\tdate_in() internal coding error"
 msgstr ""
 
-#: utils/adt/date.c:83
+#: utils/adt/date.c:91
 #, c-format
 msgid "Unrecognized date external representation '%s'"
 msgstr ""
 
-#: utils/adt/date.c:392
+#: utils/adt/date.c:400
 msgid "Unable to convert timestamp to date"
 msgstr ""
 
-#: utils/adt/date.c:417
+#: utils/adt/date.c:425
 msgid "Unable to convert reserved abstime value to date"
 msgstr ""
 
-#: utils/adt/date.c:476
+#: utils/adt/date.c:484
 msgid "Bad date external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:513
+#: utils/adt/date.c:521
 #, c-format
 msgid "Bad time external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:517 utils/adt/date.c:1328
+#: utils/adt/date.c:525 utils/adt/date.c:1336
 #, c-format
 msgid "Bad time external representation '%s'"
 msgstr ""
 
-#: utils/adt/date.c:920
+#: utils/adt/date.c:928
 msgid "Unable to convert timestamp to time"
 msgstr ""
 
-#: utils/adt/date.c:955
+#: utils/adt/date.c:963
 msgid "Unable to convert timestamptz to time"
 msgstr ""
 
-#: utils/adt/date.c:1157
+#: utils/adt/date.c:1165
 msgid "Bad time external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:1188 utils/adt/date.c:1271
+#: utils/adt/date.c:1196 utils/adt/date.c:1279
 #, c-format
 msgid "TIME units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:1255
+#: utils/adt/date.c:1263
 #, c-format
 msgid "TIME units '%s' not supported"
 msgstr ""
 
-#: utils/adt/date.c:1323
+#: utils/adt/date.c:1331
 #, c-format
 msgid "Bad time with time zone external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:1787
+#: utils/adt/date.c:1795
 msgid "Unable to convert timestamptz to timetz"
 msgstr ""
 
-#: utils/adt/date.c:1863
+#: utils/adt/date.c:1871
 msgid "Bad timetz external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:1894 utils/adt/date.c:1990
+#: utils/adt/date.c:1902 utils/adt/date.c:1998
 #, c-format
 msgid "TIMETZ units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:1974
+#: utils/adt/date.c:1982
 #, c-format
 msgid "TIMETZ units '%s' not supported"
 msgstr ""
 
-#: utils/adt/date.c:2018 utils/adt/date.c:2050 utils/adt/timestamp.c:3274
-#: utils/adt/timestamp.c:3297 utils/adt/timestamp.c:3411
-#: utils/adt/timestamp.c:3433
+#: 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 ""
 
-#: utils/adt/date.c:2069 utils/adt/timestamp.c:3319 utils/adt/timestamp.c:3456
+#: 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 ""
@@ -10287,7 +10000,7 @@ msgid "'CURRENT' is no longer supported"
 msgstr ""
 
 #: utils/adt/datetime.c:1418 utils/adt/datetime.c:2227
-#: utils/adt/formatting.c:3031
+#: utils/adt/formatting.c:3036
 #, c-format
 msgid "Inconsistent use of year %04d and 'BC'"
 msgstr ""
@@ -10365,7 +10078,7 @@ msgstr ""
 msgid "Input '%s' is out of range for float4"
 msgstr ""
 
-#: utils/adt/float.c:270 utils/adt/numeric.c:1658
+#: utils/adt/float.c:270 utils/adt/numeric.c:2830 utils/adt/numeric.c:2853
 #, c-format
 msgid "Bad float8 input format '%s'"
 msgstr ""
@@ -10523,98 +10236,98 @@ msgid ""
 "mon %d\n"
 msgstr ""
 
-#: utils/adt/formatting.c:965
+#: utils/adt/formatting.c:964
 msgid "to_char/to_number(): '9' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:982
+#: utils/adt/formatting.c:981
 msgid "to_char/to_number(): '0' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:1009
+#: utils/adt/formatting.c:1008
 msgid "to_char/to_number(): not unique decimal point."
 msgstr ""
 
-#: utils/adt/formatting.c:1014 utils/adt/formatting.c:1101
+#: 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:1027
+#: utils/adt/formatting.c:1026
 msgid "to_char/to_number(): not unique 'S'."
 msgstr ""
 
-#: utils/adt/formatting.c:1032
+#: 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:1054
+#: utils/adt/formatting.c:1053
 msgid "to_char/to_number(): can't use 'S' and 'MI' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1063
+#: utils/adt/formatting.c:1062
 msgid "to_char/to_number(): can't use 'S' and 'PL' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1072
+#: utils/adt/formatting.c:1071
 msgid "to_char/to_number(): can't use 'S' and 'SG' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1082
+#: 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:1108
+#: utils/adt/formatting.c:1107
 msgid "to_char/to_number(): 'E' is not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1132
+#: utils/adt/formatting.c:1131
 msgid "to_char/number(): run parser."
 msgstr ""
 
-#: utils/adt/formatting.c:1328
+#: utils/adt/formatting.c:1327
 msgid "to_from-char(): DUMP FORMAT"
 msgstr ""
 
-#: utils/adt/formatting.c:1333
+#: utils/adt/formatting.c:1332
 #, c-format
 msgid "%d:\t NODE_TYPE_ACTION '%s'\t(%s,%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:1336
+#: utils/adt/formatting.c:1335
 #, c-format
 msgid "%d:\t NODE_TYPE_CHAR '%c'"
 msgstr ""
 
-#: utils/adt/formatting.c:1339
+#: utils/adt/formatting.c:1338
 #, c-format
 msgid "%d:\t NODE_TYPE_END"
 msgstr ""
 
-#: utils/adt/formatting.c:1343
+#: utils/adt/formatting.c:1342
 #, c-format
 msgid "%d:\t UnKnown NODE !!!"
 msgstr ""
 
-#: utils/adt/formatting.c:1367
+#: utils/adt/formatting.c:1366
 #, c-format
 msgid "get_th: '%s' is not number."
 msgstr ""
 
-#: utils/adt/formatting.c:1535
+#: utils/adt/formatting.c:1540
 msgid "TO-FROM_CHAR: Dump KeyWord Index:"
 msgstr ""
 
-#: utils/adt/formatting.c:1541
+#: utils/adt/formatting.c:1546
 #, c-format
 msgid "\t%c: %s, "
 msgstr "\t%c: %s, "
 
-#: utils/adt/formatting.c:1547
+#: utils/adt/formatting.c:1552
 #, c-format
 msgid "\t(%d) %c %d"
 msgstr "\t(%d) %c %d"
 
-#: utils/adt/formatting.c:1550
+#: utils/adt/formatting.c:1555
 #, c-format
 msgid ""
 "\n"
@@ -10622,133 +10335,133 @@ msgid ""
 "\t\tFree positions: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:1622
+#: utils/adt/formatting.c:1627
 msgid "to_timestamp(): bad AM/PM string"
 msgstr ""
 
-#: utils/adt/formatting.c:1966
+#: utils/adt/formatting.c:1971
 msgid "to_timestamp(): TZ/tz not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1974
+#: utils/adt/formatting.c:1979
 #, c-format
 msgid "to_timestamp(): bad value for %s"
 msgstr ""
 
-#: utils/adt/formatting.c:2608 utils/adt/formatting.c:3167
+#: utils/adt/formatting.c:2613 utils/adt/formatting.c:3172
 #, c-format
 msgid "Cache is full (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2616 utils/adt/formatting.c:3184
+#: utils/adt/formatting.c:2621 utils/adt/formatting.c:3189
 #, c-format
 msgid "OLD: '%s' AGE: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:2627 utils/adt/formatting.c:3196
+#: utils/adt/formatting.c:2632 utils/adt/formatting.c:3201
 #, c-format
 msgid "NEW (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2792 utils/adt/formatting.c:2818
+#: utils/adt/formatting.c:2797 utils/adt/formatting.c:2823
 msgid "to_char(): Unable to convert timestamp to tm"
 msgstr ""
 
-#: utils/adt/formatting.c:2994
+#: utils/adt/formatting.c:2999
 msgid "to_timestamp(): AM/PM hour must be between 1 and 12"
 msgstr ""
 
-#: utils/adt/formatting.c:3063
+#: utils/adt/formatting.c:3068
 msgid "to_timestamp() cat't convert yday without year information"
 msgstr ""
 
-#: utils/adt/formatting.c:3098
+#: utils/adt/formatting.c:3103
 msgid "to_timestamp(): can't convert 'tm' to timestamp."
 msgstr ""
 
-#: utils/adt/formatting.c:3246
+#: utils/adt/formatting.c:3251
 #, c-format
 msgid "REMOVING ENTRY (%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:3470
+#: utils/adt/formatting.c:3476
 msgid "CALL: get_last_relevant_decnum()"
 msgstr ""
 
-#: utils/adt/formatting.c:3495
+#: utils/adt/formatting.c:3501
 msgid " --- scan start --- "
 msgstr ""
 
-#: utils/adt/formatting.c:3516
+#: utils/adt/formatting.c:3522
 #, c-format
 msgid "Try read sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3528
+#: utils/adt/formatting.c:3534
 #, c-format
 msgid "Try read locale sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3547
+#: utils/adt/formatting.c:3553
 #, c-format
 msgid "Try read sipmle sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3588
+#: utils/adt/formatting.c:3594
 #, c-format
 msgid "Read digit (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3599
+#: utils/adt/formatting.c:3605
 #, c-format
 msgid "Try read decimal point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3614
+#: utils/adt/formatting.c:3620
 #, c-format
 msgid "Try read locale point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3647
+#: utils/adt/formatting.c:3653
 #, 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:3662
+#: utils/adt/formatting.c:3668
 #, c-format
 msgid "Writing sign to position: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3704
+#: utils/adt/formatting.c:3710
 #, c-format
 msgid "Writing bracket to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3726
+#: utils/adt/formatting.c:3732
 #, c-format
 msgid "Writing blank space to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3741
+#: utils/adt/formatting.c:3747
 #, c-format
 msgid "Writing zero to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3759
+#: utils/adt/formatting.c:3765
 #, c-format
 msgid "Writing decimal point to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3812
+#: utils/adt/formatting.c:3814
 #, c-format
 msgid "Writing digit '%c' to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3855
+#: utils/adt/formatting.c:3858
 msgid "to_number(): RN is not supported"
 msgstr ""
 
-#: utils/adt/formatting.c:3977
+#: utils/adt/formatting.c:3980
 #, c-format
 msgid ""
 "\n"
@@ -10777,7 +10490,7 @@ msgstr ""
 "\tZERO_END: %d\n"
 "\tLAST_RELEVANT: %s"
 
-#: utils/adt/formatting.c:4242
+#: utils/adt/formatting.c:4245
 #, c-format
 msgid "TO_NUMBER (number): '%s'"
 msgstr ""
@@ -10892,33 +10605,37 @@ msgstr ""
 msgid "i4toi2: '%d' causes int2 overflow"
 msgstr ""
 
-#: utils/adt/int8.c:90 utils/adt/int8.c:100
+#: utils/adt/int8.c:101 utils/adt/int8.c:125
 #, c-format
 msgid "Bad int8 external representation \"%s\""
 msgstr ""
 
-#: utils/adt/int8.c:96
+#: utils/adt/int8.c:114
 #, c-format
 msgid "int8 value out of range: \"%s\""
 msgstr ""
 
-#: utils/adt/int8.c:119
+#: utils/adt/int8.c:157
 msgid "Unable to format int8"
 msgstr ""
 
-#: utils/adt/int8.c:710
+#: utils/adt/int8.c:748
 msgid "int8 conversion to int4 is out of range"
 msgstr ""
 
-#: utils/adt/int8.c:733
+#: utils/adt/int8.c:771
 msgid "int8 conversion to int2 is out of range"
 msgstr ""
 
-#: utils/adt/int8.c:769
+#: utils/adt/int8.c:807 utils/adt/int8.c:844
 msgid "Floating point conversion to int8 is out of range"
 msgstr ""
 
-#: utils/adt/like.c:451 utils/adt/like_match.c:289
+#: utils/adt/int8.c:859
+msgid "int8 conversion to OID is out of range"
+msgstr ""
+
+#: 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 ""
 
@@ -10966,7 +10683,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 ""
 
@@ -10976,8 +10693,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
@@ -11051,71 +10768,71 @@ msgstr ""
 msgid "int4notin: must provide relationname.attributename"
 msgstr ""
 
-#: utils/adt/numeric.c:1473
+#: utils/adt/numeric.c:1506
 msgid "Cannot convert NaN to int4"
 msgstr ""
 
-#: utils/adt/numeric.c:1523
+#: utils/adt/numeric.c:1556
 msgid "Cannot convert NaN to int8"
 msgstr ""
 
-#: utils/adt/numeric.c:1574
+#: utils/adt/numeric.c:1607
 msgid "Cannot convert NaN to int2"
 msgstr ""
 
-#: utils/adt/numeric.c:1740
+#: utils/adt/numeric.c:1803
 msgid "do_numeric_accum: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1831
+#: utils/adt/numeric.c:1894
 msgid "numeric_avg: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1867
+#: utils/adt/numeric.c:1930
 msgid "numeric_variance: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1946
+#: utils/adt/numeric.c:2012
 msgid "numeric_stddev: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:2139
+#: utils/adt/numeric.c:2208
 msgid "int2_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2159
+#: utils/adt/numeric.c:2228
 msgid "int4_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2177
+#: utils/adt/numeric.c:2246
 msgid "int8_avg: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2368 utils/adt/numeric.c:2383 utils/adt/numeric.c:2401
-#: utils/adt/numeric.c:2405 utils/adt/numeric.c:2416
+#: 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
 #, c-format
 msgid "Bad numeric input format '%s'"
 msgstr ""
 
-#: utils/adt/numeric.c:2735
+#: utils/adt/numeric.c:2804
 #, c-format
 msgid ""
 "overflow on numeric ABS(value) >= 10^%d for field with precision %d scale %d"
 msgstr ""
 
-#: utils/adt/numeric.c:3145
+#: utils/adt/numeric.c:3263
 msgid "division by zero on numeric"
 msgstr ""
 
-#: utils/adt/numeric.c:3489
+#: utils/adt/numeric.c:3644
 msgid "math error on numeric - cannot compute SQRT of negative value"
 msgstr ""
 
-#: utils/adt/numeric.c:3575
+#: utils/adt/numeric.c:3733
 msgid "argument for EXP() too big"
 msgstr ""
 
-#: utils/adt/numeric.c:3642
+#: utils/adt/numeric.c:3812
 msgid "math error on numeric - cannot compute LN of value <= zero"
 msgstr ""
 
@@ -11205,92 +10922,72 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: utils/adt/regproc.c:82 utils/adt/regproc.c:246
-#, c-format
-msgid "No procedure with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:122 utils/adt/regproc.c:137 utils/adt/regproc.c:272
+#: utils/adt/regproc.c:115 utils/adt/regproc.c:130 utils/adt/regproc.c:258
 #, c-format
 msgid "No procedure with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:124 utils/adt/regproc.c:139
+#: utils/adt/regproc.c:117 utils/adt/regproc.c:132
 #, c-format
 msgid "There is more than one procedure named %s"
 msgstr ""
 
-#: utils/adt/regproc.c:394 utils/adt/regproc.c:567
-#, c-format
-msgid "No operator with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:434 utils/adt/regproc.c:449 utils/adt/regproc.c:604
+#: utils/adt/regproc.c:413 utils/adt/regproc.c:428 utils/adt/regproc.c:576
 #, c-format
 msgid "No operator with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:436 utils/adt/regproc.c:451
+#: utils/adt/regproc.c:415 utils/adt/regproc.c:430
 #, c-format
 msgid "There is more than one operator named %s"
 msgstr ""
 
-#: utils/adt/regproc.c:584
+#: utils/adt/regproc.c:556
 msgid ""
 "regoperatorin: use NONE to denote the missing argument of a unary operator"
 msgstr ""
 
-#: utils/adt/regproc.c:586
+#: utils/adt/regproc.c:558
 msgid "regoperatorin: provide two argument types for operator"
 msgstr ""
 
-#: utils/adt/regproc.c:730
-#, c-format
-msgid "No class with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:761
+#: utils/adt/regproc.c:726
 #, c-format
 msgid "No class with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:881
-#, c-format
-msgid "No type with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:912
+#: utils/adt/regproc.c:870
 #, c-format
 msgid "No type with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:997 utils/adt/regproc.c:1000 utils/adt/varlena.c:1355
+#: 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:1057
+#: utils/adt/regproc.c:1015
 #, c-format
 msgid "%s: expected a left parenthesis"
 msgstr ""
 
-#: utils/adt/regproc.c:1071
+#: utils/adt/regproc.c:1029
 #, c-format
 msgid "%s: expected a right parenthesis"
 msgstr ""
 
-#: utils/adt/regproc.c:1087
+#: utils/adt/regproc.c:1045
 #, c-format
 msgid "%s: expected a type name"
 msgstr ""
 
-#: utils/adt/regproc.c:1117
+#: utils/adt/regproc.c:1075
 #, c-format
 msgid "%s: improper type name"
 msgstr ""
 
-#: utils/adt/regproc.c:1149
+#: utils/adt/regproc.c:1107
 #, c-format
 msgid "%s: too many argument datatypes"
 msgstr ""
@@ -11316,658 +11013,670 @@ 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 ""
 
-#: utils/adt/ruleutils.c:197
+#: utils/adt/ruleutils.c:198
 msgid "get_ruledef: cannot connect to SPI manager"
 msgstr ""
 
-#: utils/adt/ruleutils.c:212 utils/adt/ruleutils.c:329
+#: utils/adt/ruleutils.c:213 utils/adt/ruleutils.c:330
 #, c-format
 msgid "SPI_prepare() failed for \"%s\""
 msgstr ""
 
-#: utils/adt/ruleutils.c:223
+#: utils/adt/ruleutils.c:224
 #, c-format
 msgid "failed to get pg_rewrite tuple for %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:227 utils/adt/ruleutils.c:252
+#: utils/adt/ruleutils.c:228 utils/adt/ruleutils.c:253
 msgid "get_ruledef: SPI_finish() failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:313
+#: utils/adt/ruleutils.c:314
 msgid "get_viewdef: cannot connect to SPI manager"
 msgstr ""
 
-#: utils/adt/ruleutils.c:342
+#: utils/adt/ruleutils.c:343
 #, c-format
 msgid "failed to get pg_rewrite tuple for view %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:365
+#: utils/adt/ruleutils.c:366
 msgid "get_viewdef: SPI_finish() failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:401
+#: utils/adt/ruleutils.c:402
 #, c-format
 msgid "syscache lookup for index %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:414
+#: utils/adt/ruleutils.c:415
 #, c-format
 msgid "syscache lookup for relid %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:579
+#: utils/adt/ruleutils.c:580
 #, c-format
 msgid "Failed to find constraint with OID %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:599
+#: utils/adt/ruleutils.c:600
 #, c-format
 msgid "pg_get_constraintdef: Null conkey for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:612
+#: utils/adt/ruleutils.c:613
 #, c-format
 msgid "pg_get_constraintdef: Null confkey for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:632
+#: utils/adt/ruleutils.c:633
 #, c-format
 msgid "pg_get_constraintdef: Unknown confmatchtype '%c' for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:658
+#: utils/adt/ruleutils.c:659
 #, c-format
 msgid "pg_get_constraintdef: Unknown confupdtype '%c' for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:683
+#: utils/adt/ruleutils.c:684
 #, c-format
 msgid "pg_get_constraintdef: Unknown confdeltype '%c' for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:697
+#: utils/adt/ruleutils.c:698
 #, c-format
 msgid "pg_get_constraintdef: unsupported constraint type '%c'"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1096
+#: utils/adt/ruleutils.c:1100
 #, c-format
 msgid "get_ruledef: rule %s has unsupported event type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1298
+#: utils/adt/ruleutils.c:1302
 #, c-format
 msgid "get_query_def: unknown query command type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1534
+#: utils/adt/ruleutils.c:1537
 #, c-format
 msgid "get_setop_query: unexpected set op %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1546
+#: utils/adt/ruleutils.c:1549
 #, c-format
 msgid "get_setop_query: unexpected node %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1606
+#: utils/adt/ruleutils.c:1609
 msgid "get_insert_query_def: too many RTEs in INSERT!"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1758
+#: utils/adt/ruleutils.c:1761
 msgid "get_utility_query_def: unexpected statement type"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1789
+#: utils/adt/ruleutils.c:1792
 #, c-format
 msgid "get_names_for_var: bogus varlevelsup %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1803
+#: utils/adt/ruleutils.c:1806
 #, c-format
 msgid "get_names_for_var: bogus varno %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2021
+#: utils/adt/ruleutils.c:2036
 #, c-format
 msgid "get_rule_expr: expr opType %d not supported"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2089
+#: utils/adt/ruleutils.c:2096
 #, c-format
 msgid "Argument type %s of FieldSelect is not a tuple type"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2154
+#: utils/adt/ruleutils.c:2178
 #, c-format
 msgid "get_rule_expr: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2187
+#: utils/adt/ruleutils.c:2211
 #, c-format
 msgid "get_rule_expr: unexpected booltesttype %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2232
+#: utils/adt/ruleutils.c:2256
 #, c-format
 msgid "get_rule_expr: unknown node type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2273
+#: utils/adt/ruleutils.c:2297
 #, c-format
 msgid "cache lookup for operator %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2292
+#: utils/adt/ruleutils.c:2316
 msgid "get_rule_expr: bogus oprkind"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2703
+#: utils/adt/ruleutils.c:2676
 #, c-format
 msgid "get_sublink_expr: unsupported sublink type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2796
+#: utils/adt/ruleutils.c:2769
 #, c-format
 msgid "unexpected rte kind %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2868
+#: utils/adt/ruleutils.c:2841
 #, c-format
 msgid "get_from_clause_item: unknown join type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2918
+#: utils/adt/ruleutils.c:2891
 #, c-format
 msgid "get_from_clause_item: unexpected node type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2985 utils/cache/lsyscache.c:250
+#: utils/adt/ruleutils.c:2958 utils/cache/lsyscache.c:250
 #, c-format
 msgid "cache lookup failed for opclass %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:3025
+#: utils/adt/ruleutils.c:2998
 msgid "tleIsArrayAssign: I'm confused ..."
 msgstr ""
 
-#: utils/adt/ruleutils.c:3242
+#: utils/adt/ruleutils.c:3215
 #, c-format
 msgid "cache lookup of operator %u failed"
 msgstr "����� � ���� ��������� %u �� ������"
 
-#: utils/adt/ruleutils.c:3263
+#: utils/adt/ruleutils.c:3236
 #, c-format
 msgid "unexpected oprkind %c for operator %u"
 msgstr ""
@@ -12068,307 +11777,312 @@ msgstr ""
 msgid "currtid can't handle this view"
 msgstr ""
 
-#: utils/adt/timestamp.c:72
+#: utils/adt/timestamp.c:80
 #, c-format
 msgid "Bad timestamp external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:76 utils/adt/timestamp.c:270
+#: utils/adt/timestamp.c:84 utils/adt/timestamp.c:278
 #, c-format
 msgid "Bad timestamp external representation '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:82
+#: utils/adt/timestamp.c:90
 #, c-format
 msgid "TIMESTAMP out of range '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:98
+#: utils/adt/timestamp.c:106
 #, c-format
 msgid "TIMESTAMP '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:103
+#: utils/adt/timestamp.c:111
 #, c-format
 msgid "TIMESTAMP '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:131
+#: utils/adt/timestamp.c:139
 msgid "Unable to format timestamp; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:205
+#: utils/adt/timestamp.c:213
 #, c-format
 msgid "TIMESTAMP(%d) precision must be between %d and %d"
 msgstr ""
 
-#: utils/adt/timestamp.c:265
+#: utils/adt/timestamp.c:273
 #, c-format
 msgid "Bad timestamp with time zone external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:276
+#: utils/adt/timestamp.c:284
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE out of range '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:292
+#: utils/adt/timestamp.c:300
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:297
+#: utils/adt/timestamp.c:305
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:326
+#: utils/adt/timestamp.c:334
 msgid "Unable to format timestamp with time zone; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:385
+#: utils/adt/timestamp.c:393
 #, c-format
 msgid "Bad interval external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:389 utils/adt/timestamp.c:397
+#: utils/adt/timestamp.c:397 utils/adt/timestamp.c:405
 #, c-format
 msgid "Bad interval external representation '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:402
+#: utils/adt/timestamp.c:410
 #, c-format
 msgid "Interval '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:406
+#: utils/adt/timestamp.c:414
 #, c-format
 msgid "Interval '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:426
+#: utils/adt/timestamp.c:434
 msgid "Unable to encode interval; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:429
+#: utils/adt/timestamp.c:437
 msgid "Unable to format interval; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:687
+#: utils/adt/timestamp.c:695
 msgid "AdjustIntervalForTypmod(): internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:1517
+#: utils/adt/timestamp.c:701
+#, c-format
+msgid "INTERVAL(%d) precision must be between %d and %d"
+msgstr ""
+
+#: utils/adt/timestamp.c:1525
 msgid "Unable to subtract non-finite timestamps"
 msgstr ""
 
-#: utils/adt/timestamp.c:1579
+#: utils/adt/timestamp.c:1587
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamp_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1586
+#: utils/adt/timestamp.c:1594
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamp_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1664
+#: utils/adt/timestamp.c:1672
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamptz_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1669
+#: utils/adt/timestamp.c:1677
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamptz_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1898
+#: utils/adt/timestamp.c:1906
 msgid "interval_div: divide by 0.0 error"
 msgstr ""
 
-#: utils/adt/timestamp.c:1943
+#: utils/adt/timestamp.c:1951
 msgid "interval_accum: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:1985
+#: utils/adt/timestamp.c:1993
 msgid "interval_avg: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:2107
+#: utils/adt/timestamp.c:2115
 msgid ""
 "Unable to encode INTERVAL\n"
 "\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2111
+#: utils/adt/timestamp.c:2119
 msgid ""
 "Unable to decode TIMESTAMP\n"
 "\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2216 utils/adt/timestamp.c:2219
+#: utils/adt/timestamp.c:2224 utils/adt/timestamp.c:2227
 msgid "Unable to decode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:2272
+#: utils/adt/timestamp.c:2280
 msgid "TIMESTAMP bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2328
+#: utils/adt/timestamp.c:2336
 msgid "TIMESTAMP WITH TIME ZONE bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2385
+#: utils/adt/timestamp.c:2393
 msgid "INTERVAL bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2418 utils/adt/timestamp.c:2482
-#: utils/adt/timestamp.c:2782 utils/adt/timestamp.c:2924
+#: 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/timestamp.c:2473 utils/adt/timestamp.c:2885
-#: utils/adt/timestamp.c:2917
+#: 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/timestamp.c:2478
+#: utils/adt/timestamp.c:2486
 #, c-format
 msgid "Unable to truncate TIMESTAMP to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2511 utils/adt/timestamp.c:2576
-#: utils/adt/timestamp.c:2954 utils/adt/timestamp.c:3107
+#: utils/adt/timestamp.c:2519 utils/adt/timestamp.c:2584
+#: utils/adt/timestamp.c:2962 utils/adt/timestamp.c:3115
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/timestamp.c:2565 utils/adt/timestamp.c:3068
-#: utils/adt/timestamp.c:3101
+#: 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/timestamp.c:2572
+#: utils/adt/timestamp.c:2580
 #, c-format
 msgid "Unable to truncate TIMESTAMP WITH TIME ZONE to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2605 utils/adt/timestamp.c:2673
-#: utils/adt/timestamp.c:3135 utils/adt/timestamp.c:3244
+#: 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/timestamp.c:2658 utils/adt/timestamp.c:3215
+#: utils/adt/timestamp.c:2666 utils/adt/timestamp.c:3223
 #, c-format
 msgid "INTERVAL units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2662
+#: utils/adt/timestamp.c:2670
 #, c-format
 msgid "Unable to truncate INTERVAL to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2675
 msgid "Unable to decode INTERVAL; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2695
+#: utils/adt/timestamp.c:2703
 msgid "isoweek2date(): can't convert without year information"
 msgstr ""
 
-#: utils/adt/timestamp.c:2903 utils/adt/timestamp.c:2910
+#: utils/adt/timestamp.c:2911 utils/adt/timestamp.c:2918
 msgid "Unable to encode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:3087 utils/adt/timestamp.c:3094
+#: utils/adt/timestamp.c:3095 utils/adt/timestamp.c:3102
 msgid "Unable to encode TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: utils/adt/timestamp.c:3224
+#: utils/adt/timestamp.c:3232
 msgid ""
 "Unable to decode INTERVAL\n"
 "\tinterval_part() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:3352
+#: utils/adt/timestamp.c:3360
 msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
 msgstr ""
 
-#: utils/adt/timestamp.c:3357
+#: utils/adt/timestamp.c:3365
 msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: utils/adt/timestamp.c:3382
+#: utils/adt/timestamp.c:3390
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP (tm)"
 msgstr ""
 
-#: utils/adt/timestamp.c:3385
+#: utils/adt/timestamp.c:3393
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP"
 msgstr ""
 
-#: utils/adt/varbit.c:101 utils/adt/varbit.c:217
+#: utils/adt/varbit.c:106 utils/adt/varbit.c:231
 #, c-format
 msgid "Bit string length %d does not match type BIT(%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:122 utils/adt/varbit.c:329
+#: utils/adt/varbit.c:127 utils/adt/varbit.c:336
 #, c-format
 msgid "Cannot parse '%c' as a binary digit"
 msgstr ""
 
-#: utils/adt/varbit.c:143 utils/adt/varbit.c:350
+#: utils/adt/varbit.c:148 utils/adt/varbit.c:357
 #, c-format
 msgid "Cannot parse '%c' as a hex digit"
 msgstr ""
 
-#: utils/adt/varbit.c:308 utils/adt/varbit.c:423
+#: utils/adt/varbit.c:315 utils/adt/varbit.c:436
 #, c-format
 msgid "Bit string too long for type BIT VARYING(%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:815
+#: utils/adt/varbit.c:806
 msgid "Cannot AND bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:853
+#: utils/adt/varbit.c:844
 msgid "Cannot OR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:897
+#: utils/adt/varbit.c:888
 msgid "Cannot XOR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:1112
+#: utils/adt/varbit.c:1103
 msgid "Bit string is too large to fit in type integer"
 msgstr ""
 
-#: utils/adt/varbit.c:1156 utils/adt/varbit.c:1183
+#: utils/adt/varbit.c:1147 utils/adt/varbit.c:1174
 msgid "INT64 is not supported on this platform"
 msgstr ""
 
-#: utils/adt/varbit.c:1171
+#: utils/adt/varbit.c:1162
 msgid "Bit string is too large to fit in type int64"
 msgstr ""
 
-#: utils/adt/varbit.c:1263
+#: utils/adt/varbit.c:1254
 #, c-format
 msgid "S. %d %d em=%2x sm=%2x r=%d"
 msgstr "S. %d %d em=%2x sm=%2x r=%d"
 
-#: utils/adt/varchar.c:107 utils/adt/varchar.c:204
+#: utils/adt/varchar.c:107 utils/adt/varchar.c:213
 #, c-format
 msgid "value too long for type character(%d)"
 msgstr ""
 
-#: utils/adt/varchar.c:390 utils/adt/varchar.c:460
+#: utils/adt/varchar.c:369 utils/adt/varchar.c:447
 #, c-format
 msgid "value too long for type character varying(%d)"
 msgstr ""
@@ -12529,45 +12243,40 @@ msgstr ""
 msgid "get_system_catalog_relid: cannot find %s"
 msgstr ""
 
-#: utils/cache/lsyscache.c:979
+#: utils/cache/lsyscache.c:1006
 #, c-format
 msgid "get_typdefault: failed to lookup type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1060
+#: utils/cache/lsyscache.c:1087
 #, c-format
 msgid "getBaseType: failed to lookup type %u"
 msgstr "getBaseType: ��� %u �� ������"
 
-#: utils/cache/lsyscache.c:1096
-#, c-format
-msgid "getBaseTypeMod: failed to lookup type %u"
-msgstr "getBaseTypeMod: ��� %u �� ������"
-
-#: utils/cache/lsyscache.c:1216
+#: utils/cache/lsyscache.c:1225
 #, c-format
 msgid "getTypeInputInfo: Cache lookup of type %u failed"
 msgstr "getTypeInputInfo: ����� � ���� ���� %u �� ������"
 
-#: utils/cache/lsyscache.c:1246
+#: utils/cache/lsyscache.c:1255
 #, c-format
 msgid "getTypeOutputInfo: Cache lookup of type %u failed"
 msgstr "getTypeOutputInfo: ����� � ���� ���� %u �� ������"
 
-#: utils/cache/lsyscache.c:1342
+#: utils/cache/lsyscache.c:1351
 msgid "get_attstatsslot: stavalues is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1364
+#: utils/cache/lsyscache.c:1373
 #, c-format
 msgid "get_attstatsslot: Cache lookup failed for type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1400
+#: utils/cache/lsyscache.c:1409
 msgid "get_attstatsslot: stanumbers is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1411
+#: utils/cache/lsyscache.c:1420
 msgid "get_attstatsslot: stanumbers is not a 1-D float4 array"
 msgstr ""
 
@@ -12635,140 +12344,140 @@ msgstr ""
 msgid "RelationReloadClassinfo system relation id=%d doesn't exist"
 msgstr ""
 
-#: utils/cache/relcache.c:1771
+#: utils/cache/relcache.c:1775
 #, c-format
 msgid "RelationClearRelation: relation %u deleted while still in use"
 msgstr ""
 
-#: utils/cache/relcache.c:1861
+#: utils/cache/relcache.c:1865
 #, c-format
 msgid "RelationForgetRelation: relation %u is still open"
 msgstr ""
 
-#: utils/cache/relcache.c:2018
+#: utils/cache/relcache.c:2022
 #, c-format
 msgid "Relcache reference leak: relation \"%s\" has refcnt %d instead of %d"
 msgstr ""
 
-#: utils/cache/relcache.c:2304
+#: utils/cache/relcache.c:2308
 #, c-format
 msgid "RelationCacheInitializePhase2: no pg_class entry for %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2452
+#: utils/cache/relcache.c:2456
 #, c-format
 msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2460
+#: utils/cache/relcache.c:2464
 #, c-format
 msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2471
+#: utils/cache/relcache.c:2475
 #, c-format
 msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2480
+#: utils/cache/relcache.c:2484
 #, c-format
 msgid "AttrDefaultFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2514
+#: utils/cache/relcache.c:2518
 #, c-format
 msgid "CheckConstraintFetch: unexpected record found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2525
+#: utils/cache/relcache.c:2529
 #, c-format
 msgid "CheckConstraintFetch: conbin IS NULL for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2538
+#: utils/cache/relcache.c:2542
 #, c-format
 msgid "CheckConstraintFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:3001
+#: utils/cache/relcache.c:3005
 #, c-format
 msgid ""
 "Cannot create init file %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: utils/cache/relcache.c:3025
+#: utils/cache/relcache.c:3029
 msgid "cannot write init file -- descriptor length"
 msgstr ""
 
-#: utils/cache/relcache.c:3029
+#: utils/cache/relcache.c:3033
 msgid "cannot write init file -- reldesc"
 msgstr ""
 
-#: utils/cache/relcache.c:3034
+#: utils/cache/relcache.c:3038
 msgid "cannot write init file -- relation tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3037
+#: utils/cache/relcache.c:3041
 msgid "cannot write init file -- relation tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3044
+#: utils/cache/relcache.c:3048
 #, c-format
 msgid "cannot write init file -- length of attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3046
+#: utils/cache/relcache.c:3050
 #, c-format
 msgid "cannot write init file -- attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3065
+#: utils/cache/relcache.c:3069
 #, c-format
 msgid "write_relcache_init_file: no pg_index entry for index %u"
 msgstr ""
 
-#: utils/cache/relcache.c:3069
+#: utils/cache/relcache.c:3073
 msgid "cannot write init file -- index tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3071
+#: utils/cache/relcache.c:3075
 msgid "cannot write init file -- index tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3077
+#: utils/cache/relcache.c:3081
 msgid "cannot write init file -- am tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3080
+#: utils/cache/relcache.c:3084
 msgid "cannot write init file -- am tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3086
+#: utils/cache/relcache.c:3090
 msgid "cannot write init file -- strategy map length"
 msgstr ""
 
-#: utils/cache/relcache.c:3089
+#: utils/cache/relcache.c:3093
 msgid "cannot write init file -- strategy map"
 msgstr ""
 
-#: utils/cache/relcache.c:3094
+#: utils/cache/relcache.c:3098
 msgid "cannot write init file -- operator vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3097
+#: utils/cache/relcache.c:3101
 msgid "cannot write init file -- operator vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3102
+#: utils/cache/relcache.c:3106
 msgid "cannot write init file -- support vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3105
+#: utils/cache/relcache.c:3109
 msgid "cannot write init file -- support vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3149
+#: utils/cache/relcache.c:3153
 #, c-format
 msgid ""
 "Cannot rename init file %s to %s: %m\n"
@@ -12996,147 +12705,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 ""
@@ -13294,12 +13003,12 @@ msgstr "
 msgid "Database \"%s\" is not currently accepting connections"
 msgstr "���� \"%s\" �� ��������� ������������� � ������ ������"
 
-#: utils/init/postinit.c:256
+#: utils/init/postinit.c:259
 #, c-format
 msgid "Database \"%s\" does not exist in the system catalog."
 msgstr "���� \"%s\" �� ���������� � ��������� ��������."
 
-#: utils/init/postinit.c:264
+#: utils/init/postinit.c:267
 #, c-format
 msgid ""
 "Database \"%s\" does not exist.\n"
@@ -13308,27 +13017,27 @@ msgstr ""
 "���� ������ \"%s\" �� ����������.\n"
 "\t������������� '%s' �� ������."
 
-#: utils/init/postinit.c:271
+#: utils/init/postinit.c:274
 #, c-format
 msgid "Unable to change directory to '%s': %m"
 msgstr "�� ���������� �������� ���������� �� '%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 ""
 
@@ -13645,31 +13354,31 @@ msgstr "tuplesort_restorepos: 
 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 "tuplesort: ����������� ����� ������"
 
-#: 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 "�� ������ SortFunctionKind %d"
 
+#: 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 "tuplestore_puttuple: �������� ���������"
@@ -13723,3 +13432,83 @@ msgstr "tuplestore: 
 #: utils/sort/tuplestore.c:644 utils/sort/tuplestore.c:648
 msgid "tuplestore: write failed"
 msgstr "tuplestore: ������ �� �������"
+
+#: utils/time/tqual.c:981
+msgid "CopyQuerySnapshot: no snapshot has been set"
+msgstr ""
+
+#~ msgid "start transaction"
+#~ msgstr "������ ����������"
+
+#~ msgid "commit transaction"
+#~ msgstr "������������� ����������"
+
+#~ msgid "inserting row with oid %u..."
+#~ msgstr "����������� ������ � OID %u..."
+
+#~ 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 "doDeletion: Relation %u does not exist"
+#~ msgstr "doDeletion: ����� %u �� ����������"
+
+#~ 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\" �� ����������"
+
+#~ msgid "getBaseTypeMod: failed to lookup type %u"
+#~ msgstr "getBaseTypeMod: ��� %u �� ������"
diff --git a/src/backend/po/sv.po b/src/backend/po/sv.po
index 11940096ccbd45bb8e4cd9ede0153f1e1c2ff1ad..487f86de0de6cff81e96b65095bc3826104836a3 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-08-29 04:20-0400\n"
-"PO-Revision-Date: 2002-09-04 09:47+0200\n"
+"POT-Creation-Date: 2002-10-03 04:18-0400\n"
+"PO-Revision-Date: 2002-10-04 08: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"
@@ -30,7 +30,7 @@ msgstr ""
 msgid "heap_formtuple: numberOfAttributes %d exceeds limit %d"
 msgstr ""
 
-#: access/common/heaptuple.c:689
+#: access/common/heaptuple.c:687
 #, c-format
 msgid "heap_modifytuple: repl is \\%3d"
 msgstr ""
@@ -45,32 +45,32 @@ msgstr ""
 msgid "index_formtuple: data takes %lu bytes, max is %d"
 msgstr ""
 
-#: access/common/tupdesc.c:397
+#: access/common/tupdesc.c:421
 #, c-format
 msgid "Unable to look up type id %u"
 msgstr ""
 
-#: access/common/tupdesc.c:618 executor/nodeFunctionscan.c:217
-#: parser/parse_relation.c:934 parser/parse_relation.c:1289
-#: parser/parse_relation.c:1597
+#: 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 "Invalid typrelid for complex type %u"
 msgstr ""
 
-#: access/common/tupdesc.c:632 access/common/tupdesc.c:655
+#: 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:651
+#: access/common/tupdesc.c:680
 msgid "TypeGetTupleDesc: no column alias was provided"
 msgstr ""
 
-#: access/common/tupdesc.c:670
+#: access/common/tupdesc.c:699
 msgid "Unable to determine tuple description for function returning \"record\""
 msgstr ""
 
-#: access/common/tupdesc.c:672 catalog/pg_proc.c:463
-#: executor/nodeFunctionscan.c:252 parser/parse_relation.c:1386
+#: 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 ""
@@ -81,31 +81,31 @@ msgstr ""
 msgid "%s already contains data"
 msgstr ""
 
-#: access/gist/gist.c:398 access/gist/gist.c:605
+#: 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:1667
+#: access/gist/gist.c:1668
 #, c-format
 msgid "initGISTstate: numberOfAttributes %d > %d"
 msgstr ""
 
-#: access/gist/gist.c:1929
+#: access/gist/gist.c:1930
 #, c-format
 msgid "%sPage: %d %s blk: %d maxoff: %d free: %d"
 msgstr ""
 
-#: access/gist/gist.c:1939
+#: access/gist/gist.c:1940
 #, c-format
 msgid "%s  Tuple. blk: %d size: %d"
 msgstr ""
 
-#: access/gist/gist.c:1954
+#: access/gist/gist.c:1955
 msgid "gist_redo: unimplemented"
 msgstr ""
 
-#: access/gist/gist.c:1960
+#: access/gist/gist.c:1961
 msgid "gist_undo: unimplemented"
 msgstr ""
 
@@ -119,11 +119,11 @@ msgstr ""
 msgid "Bad operation in GiST scan adjust: %d"
 msgstr ""
 
-#: access/hash/hash.c:500
+#: access/hash/hash.c:504
 msgid "hash_redo: unimplemented"
 msgstr ""
 
-#: access/hash/hash.c:506
+#: access/hash/hash.c:510
 msgid "hash_undo: unimplemented"
 msgstr ""
 
@@ -296,178 +296,178 @@ msgstr ""
 msgid "heap_get_latest_tid: %s relation: ReadBuffer(%lx) failed"
 msgstr ""
 
-#: access/heap/heapam.c:1282
+#: access/heap/heapam.c:1284
 msgid "heap_delete: failed ReadBuffer"
 msgstr ""
 
-#: access/heap/heapam.c:1301
+#: access/heap/heapam.c:1303
 msgid "heap_delete: (am)invalid tid"
 msgstr ""
 
-#: access/heap/heapam.c:1431
+#: access/heap/heapam.c:1436
 msgid "simple_heap_delete: tuple already updated by self"
 msgstr ""
 
-#: access/heap/heapam.c:1439
+#: access/heap/heapam.c:1444
 msgid "simple_heap_delete: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1443 executor/execMain.c:1323
+#: access/heap/heapam.c:1448 executor/execMain.c:1333
 #, c-format
 msgid "Unknown status %u from heap_delete"
 msgstr ""
 
-#: access/heap/heapam.c:1477
+#: access/heap/heapam.c:1482
 msgid "heap_update: failed ReadBuffer"
 msgstr ""
 
-#: access/heap/heapam.c:1502
+#: access/heap/heapam.c:1507
 msgid "heap_update: (am)invalid tid"
 msgstr ""
 
-#: access/heap/heapam.c:1755
+#: access/heap/heapam.c:1770
 msgid "simple_heap_update: tuple already updated by self"
 msgstr ""
 
-#: access/heap/heapam.c:1763
+#: access/heap/heapam.c:1778
 msgid "simple_heap_update: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1767 executor/execMain.c:1461
+#: access/heap/heapam.c:1782 executor/execMain.c:1472
 #, c-format
 msgid "Unknown status %u from heap_update"
 msgstr ""
 
-#: access/heap/heapam.c:1791
+#: access/heap/heapam.c:1806
 msgid "heap_mark4update: failed ReadBuffer"
 msgstr ""
 
-#: access/heap/heapam.c:1808
+#: access/heap/heapam.c:1823
 msgid "heap_mark4update: (am)invalid tid"
 msgstr ""
 
-#: access/heap/heapam.c:2109
+#: access/heap/heapam.c:2123
 msgid "heap_clean_redo: no block"
 msgstr ""
 
-#: access/heap/heapam.c:2113
+#: access/heap/heapam.c:2127
 msgid "heap_clean_redo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2171
+#: access/heap/heapam.c:2185
 #, c-format
 msgid "heap_delete_%sdo: no block"
 msgstr ""
 
-#: access/heap/heapam.c:2175
+#: access/heap/heapam.c:2189
 #, c-format
 msgid "heap_delete_%sdo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2187
+#: access/heap/heapam.c:2201
 msgid "heap_delete_undo: bad page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2194
+#: access/heap/heapam.c:2208
 #, c-format
 msgid "heap_delete_%sdo: invalid lp"
 msgstr ""
 
-#: access/heap/heapam.c:2216
+#: access/heap/heapam.c:2228
 msgid "heap_delete_undo: unimplemented"
 msgstr ""
 
-#: access/heap/heapam.c:2244
+#: access/heap/heapam.c:2256
 #, c-format
 msgid "heap_insert_%sdo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2268
+#: access/heap/heapam.c:2280
 msgid "heap_insert_redo: invalid max offset number"
 msgstr ""
 
-#: access/heap/heapam.c:2299
+#: access/heap/heapam.c:2304
 msgid "heap_insert_redo: failed to add tuple"
 msgstr ""
 
-#: access/heap/heapam.c:2309
+#: access/heap/heapam.c:2314
 msgid "heap_insert_undo: bad page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2311
+#: access/heap/heapam.c:2316
 msgid "heap_insert_undo: unimplemented"
 msgstr ""
 
-#: access/heap/heapam.c:2342
+#: access/heap/heapam.c:2347
 #, c-format
 msgid "heap_update_%sdo: no block"
 msgstr ""
 
-#: access/heap/heapam.c:2346
+#: access/heap/heapam.c:2351
 #, c-format
 msgid "heap_update_%sdo: uninitialized old page"
 msgstr ""
 
-#: access/heap/heapam.c:2360
+#: access/heap/heapam.c:2365
 msgid "heap_update_undo: bad old tuple page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2367
+#: access/heap/heapam.c:2372
 #, c-format
 msgid "heap_update_%sdo: invalid lp"
 msgstr ""
 
-#: access/heap/heapam.c:2403 access/heap/heapam.c:2513
+#: access/heap/heapam.c:2407 access/heap/heapam.c:2507
 msgid "heap_update_undo: unimplemented"
 msgstr ""
 
-#: access/heap/heapam.c:2424
+#: access/heap/heapam.c:2428
 #, c-format
 msgid "heap_update_%sdo: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2448
+#: access/heap/heapam.c:2452
 msgid "heap_update_redo: invalid max offset number"
 msgstr ""
 
-#: access/heap/heapam.c:2502
+#: access/heap/heapam.c:2496
 msgid "heap_update_redo: failed to add tuple"
 msgstr ""
 
-#: access/heap/heapam.c:2511
+#: access/heap/heapam.c:2505
 msgid "heap_update_undo: bad new tuple page LSN"
 msgstr ""
 
-#: access/heap/heapam.c:2529
+#: access/heap/heapam.c:2523
 msgid "_heap_unlock_tuple: can't open relation"
 msgstr ""
 
-#: access/heap/heapam.c:2534
+#: access/heap/heapam.c:2528
 msgid "_heap_unlock_tuple: can't read buffer"
 msgstr ""
 
-#: access/heap/heapam.c:2538
+#: access/heap/heapam.c:2532
 msgid "_heap_unlock_tuple: uninitialized page"
 msgstr ""
 
-#: access/heap/heapam.c:2542
+#: access/heap/heapam.c:2536
 msgid "_heap_unlock_tuple: invalid itemid"
 msgstr ""
 
-#: access/heap/heapam.c:2546
+#: access/heap/heapam.c:2540
 msgid "_heap_unlock_tuple: unused/deleted tuple in rollback"
 msgstr ""
 
-#: access/heap/heapam.c:2551
+#: access/heap/heapam.c:2545
 msgid "_heap_unlock_tuple: invalid xmax in rollback"
 msgstr ""
 
-#: access/heap/heapam.c:2575
+#: access/heap/heapam.c:2569
 #, c-format
 msgid "heap_redo: unknown op code %u"
 msgstr ""
 
-#: access/heap/heapam.c:2595
+#: access/heap/heapam.c:2589
 #, c-format
 msgid "heap_undo: unknown op code %u"
 msgstr ""
@@ -486,31 +486,31 @@ msgstr ""
 msgid "Tuple is too big: size %lu"
 msgstr ""
 
-#: access/heap/tuptoaster.c:904
+#: access/heap/tuptoaster.c:899
 msgid "Failed to build TOAST tuple"
 msgstr ""
 
-#: access/heap/tuptoaster.c:920
+#: access/heap/tuptoaster.c:915
 msgid "Failed to insert index entry for TOAST tuple"
 msgstr ""
 
-#: access/heap/tuptoaster.c:1079 access/heap/tuptoaster.c:1259
+#: access/heap/tuptoaster.c:1074 access/heap/tuptoaster.c:1254
 #, c-format
 msgid "unexpected chunk number %d (expected %d) for toast value %u"
 msgstr ""
 
-#: access/heap/tuptoaster.c:1085 access/heap/tuptoaster.c:1092
-#: access/heap/tuptoaster.c:1265 access/heap/tuptoaster.c:1272
+#: 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:1097
+#: access/heap/tuptoaster.c:1092
 #, c-format
 msgid "unexpected chunk number %d for toast value %u"
 msgstr ""
 
-#: access/heap/tuptoaster.c:1115 access/heap/tuptoaster.c:1297
+#: access/heap/tuptoaster.c:1110 access/heap/tuptoaster.c:1294
 #, c-format
 msgid "missing chunk number %d for toast value %u"
 msgstr ""
@@ -534,7 +534,7 @@ msgstr ""
 msgid "%s is not an index relation"
 msgstr "%s �r inte en indexrelation"
 
-#: access/index/indexam.c:651
+#: access/index/indexam.c:652
 #, c-format
 msgid "Missing support function %d for attribute %d of index %s"
 msgstr ""
@@ -558,150 +558,150 @@ msgstr ""
 msgid "RelationInvokeStrategy: cannot evaluate strategy %d"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:248
+#: access/nbtree/nbtinsert.c:250
 #, c-format
 msgid "Cannot insert a duplicate key into unique index %s"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:387
+#: access/nbtree/nbtinsert.c:389
 #, c-format
 msgid "btree: index item size %lu exceeds maximum %lu"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:523
+#: access/nbtree/nbtinsert.c:525
 msgid "btree: concurrent ROOT page split"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:533
+#: access/nbtree/nbtinsert.c:535
 #, c-format
 msgid "bt_insertonpg[%s]: no root page found"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:536
+#: access/nbtree/nbtinsert.c:538
 #, c-format
 msgid "bt_insertonpg[%s]: root page unfound - fixing upper levels"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:583
+#: 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:586
+#: access/nbtree/nbtinsert.c:588
 #, c-format
 msgid "bt_insertonpg[%s]: parent page unfound - fixing branch"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:754
+#: access/nbtree/nbtinsert.c:756
 msgid "btree: failed to add hikey to the right sibling"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:780
+#: access/nbtree/nbtinsert.c:782
 msgid "btree: failed to add hikey to the left sibling"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1110
+#: access/nbtree/nbtinsert.c:1112
 #, c-format
 msgid "_bt_findsplitloc: can't find a feasible split point for %s"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1337
+#: access/nbtree/nbtinsert.c:1339
 msgid "btree: failed to add leftkey to new root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1354
+#: access/nbtree/nbtinsert.c:1356
 msgid "btree: failed to add rightkey to new root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1440
+#: access/nbtree/nbtinsert.c:1442
 msgid "bt_fixroot: not valid old root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1571
+#: access/nbtree/nbtinsert.c:1573
 #, c-format
 msgid "bt_fixtree[%s]: invalid start page (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1597
+#: access/nbtree/nbtinsert.c:1599
 #, c-format
 msgid "bt_fixtree[%s]: fixing root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1645
+#: 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:1652
+#: 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:1655
+#: access/nbtree/nbtinsert.c:1657
 #, c-format
 msgid "bt_fixtlevel[%s]: invalid start child (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1681
+#: access/nbtree/nbtinsert.c:1683
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(1) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1713
+#: access/nbtree/nbtinsert.c:1715
 #, c-format
 msgid "bt_fixlevel[%s]: pointer disappeared (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1732
+#: access/nbtree/nbtinsert.c:1734
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(2) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1746
+#: access/nbtree/nbtinsert.c:1748
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(3) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1876
+#: access/nbtree/nbtinsert.c:1878
 #, c-format
 msgid "bt_fixbranch[%s]: left pointer unfound (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1883
+#: access/nbtree/nbtinsert.c:1885
 #, c-format
 msgid "bt_fixbranch[%s]: invalid item order (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1892
+#: access/nbtree/nbtinsert.c:1894
 #, c-format
 msgid "bt_fixbranch[%s]: right pointer unfound(1) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1900
+#: access/nbtree/nbtinsert.c:1902
 #, c-format
 msgid "bt_fixbranch[%s]: right pointer unfound(2) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1948
+#: access/nbtree/nbtinsert.c:1950
 #, c-format
 msgid "bt_fixbranch[%s]: fixing upper levels"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1979
+#: access/nbtree/nbtinsert.c:1981
 #, c-format
 msgid "bt_fixup[%s]: checking/fixing upper levels"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1994
+#: access/nbtree/nbtinsert.c:1996
 #, c-format
 msgid "bt_fixup[%s]: fixing root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:2057
+#: access/nbtree/nbtinsert.c:2059
 #, c-format
 msgid "btree: failed to add item to the %s for %s"
 msgstr ""
@@ -726,99 +726,99 @@ msgstr ""
 msgid "bt_getroot[%s]: fixing root page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:783
+#: access/nbtree/nbtree.c:787
 #, c-format
 msgid ""
 "_bt_restscan: my bits moved right off the end of the world!\n"
 "\tRecreate index %s."
 msgstr ""
 
-#: access/nbtree/nbtree.c:813
+#: access/nbtree/nbtree.c:817
 msgid "_bt_restore_page: can't add item to page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:836
+#: access/nbtree/nbtree.c:840
 msgid "btree_delete_redo: block unfound"
 msgstr ""
 
-#: access/nbtree/nbtree.c:839
+#: access/nbtree/nbtree.c:843
 msgid "btree_delete_redo: uninitialized page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:875
+#: access/nbtree/nbtree.c:879
 #, c-format
 msgid "btree_insert_%sdo: block unfound"
 msgstr ""
 
-#: access/nbtree/nbtree.c:878
+#: access/nbtree/nbtree.c:882
 #, c-format
 msgid "btree_insert_%sdo: uninitialized page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:892
+#: access/nbtree/nbtree.c:896
 msgid "btree_insert_redo: failed to add item"
 msgstr ""
 
-#: access/nbtree/nbtree.c:901
+#: access/nbtree/nbtree.c:905
 msgid "btree_insert_undo: bad page LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:909
+#: access/nbtree/nbtree.c:913
 msgid "btree_insert_undo: unimplemented"
 msgstr ""
 
-#: access/nbtree/nbtree.c:936
+#: access/nbtree/nbtree.c:940
 #, c-format
 msgid "btree_split_%s: lost left sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:942
+#: access/nbtree/nbtree.c:946
 msgid "btree_split_undo: uninitialized left sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:965
+#: access/nbtree/nbtree.c:969
 msgid "btree_split_undo: bad left sibling LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:966 access/nbtree/nbtree.c:1005
+#: access/nbtree/nbtree.c:970 access/nbtree/nbtree.c:1009
 msgid "btree_split_undo: unimplemented"
 msgstr ""
 
-#: access/nbtree/nbtree.c:974
+#: access/nbtree/nbtree.c:978
 #, c-format
 msgid "btree_split_%s: lost right sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:980
+#: access/nbtree/nbtree.c:984
 msgid "btree_split_undo: uninitialized right sibling"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1004
+#: access/nbtree/nbtree.c:1008
 msgid "btree_split_undo: bad right sibling LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1018
+#: access/nbtree/nbtree.c:1022
 msgid "btree_split_redo: lost next right page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1022
+#: access/nbtree/nbtree.c:1026
 msgid "btree_split_redo: uninitialized next right page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1059
+#: access/nbtree/nbtree.c:1063
 msgid "btree_newroot_redo: no root page"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1062
+#: access/nbtree/nbtree.c:1066
 msgid "btree_newroot_redo: no metapage"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1116
+#: access/nbtree/nbtree.c:1120
 #, c-format
 msgid "btree_redo: unknown op code %u"
 msgstr ""
 
-#: access/nbtree/nbtree.c:1136
+#: access/nbtree/nbtree.c:1140
 #, c-format
 msgid "btree_undo: unknown op code %u"
 msgstr ""
@@ -859,44 +859,44 @@ msgstr ""
 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:1067
+#: access/rtree/rtree.c:1068
 msgid "rtpicksplit: failed to find a workable page split"
 msgstr ""
 
-#: access/rtree/rtree.c:1346
+#: access/rtree/rtree.c:1347
 msgid "rtree_redo: unimplemented"
 msgstr ""
 
-#: access/rtree/rtree.c:1352
+#: access/rtree/rtree.c:1353
 msgid "rtree_undo: unimplemented"
 msgstr ""
 
@@ -910,354 +910,352 @@ msgstr ""
 msgid "Bad operation in rtree scan adjust: %d"
 msgstr ""
 
-#: access/transam/clog.c:547 access/transam/clog.c:599
+#: access/transam/clog.c:546 access/transam/clog.c:598
 #, c-format
 msgid "open of %s failed: %m"
 msgstr ""
 
-#: access/transam/clog.c:548
+#: access/transam/clog.c:547
 #, c-format
 msgid "clog file %s doesn't exist, reading as zeroes"
 msgstr ""
 
-#: access/transam/clog.c:554 access/transam/clog.c:607
+#: 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:559
+#: access/transam/clog.c:558
 #, c-format
 msgid "read of clog file %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/clog.c:603 access/transam/xlog.c:1380
+#: access/transam/clog.c:602 access/transam/xlog.c:1375
 #, c-format
 msgid "creation of file %s failed: %m"
 msgstr ""
 
-#: access/transam/clog.c:616
+#: access/transam/clog.c:615
 #, c-format
 msgid "write of clog file %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/clog.c:835
+#: access/transam/clog.c:834
 msgid "unable to truncate commit log: apparent wraparound"
 msgstr ""
 
-#: access/transam/clog.c:890
+#: access/transam/clog.c:889
 #, c-format
 msgid "could not open transaction-commit log directory (%s): %m"
 msgstr ""
 
-#: access/transam/clog.c:906
+#: access/transam/clog.c:905
 #, c-format
 msgid "removing commit log file %s"
 msgstr ""
 
-#: access/transam/clog.c:915
+#: access/transam/clog.c:914
 #, c-format
 msgid "could not read transaction-commit log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xact.c:420
+#: access/transam/xact.c:424
 msgid "You may only have 2^32-1 commands per transaction"
 msgstr ""
 
-#: access/transam/xact.c:708
+#: access/transam/xact.c:714
 #, c-format
 msgid "RecordTransactionAbort: xact %u already committed"
 msgstr ""
 
-#: access/transam/xact.c:936
+#: access/transam/xact.c:943
 msgid "CommitTransaction and not in in-progress state"
 msgstr ""
 
-#: access/transam/xact.c:1059
+#: access/transam/xact.c:1066
 msgid "AbortTransaction and not in in-progress state"
 msgstr ""
 
-#: access/transam/xact.c:1136
+#: access/transam/xact.c:1143
 msgid "CleanupTransaction and not in abort state"
 msgstr ""
 
-#: access/transam/xact.c:1176
+#: access/transam/xact.c:1175
+msgid "StartTransactionCommand: can't prevent chain"
+msgstr ""
+
+#: access/transam/xact.c:1194
 msgid "StartTransactionCommand: unexpected TBLOCK_BEGIN"
 msgstr ""
 
-#: access/transam/xact.c:1197
+#: access/transam/xact.c:1215
 msgid "StartTransactionCommand: unexpected TBLOCK_END"
 msgstr ""
 
-#: access/transam/xact.c:1220
+#: access/transam/xact.c:1238
 msgid "StartTransactionCommand: unexpected TBLOCK_ENDABORT"
 msgstr ""
 
-#: access/transam/xact.c:1400
+#: access/transam/xact.c:1440
 msgid "BEGIN: already a transaction in progress"
 msgstr ""
 
-#: access/transam/xact.c:1461
+#: access/transam/xact.c:1504
 msgid "COMMIT: no transaction in progress"
 msgstr "COMMIT: ingen transaktion p�g�r"
 
-#: access/transam/xact.c:1498 access/transam/xact.c:1545
+#: access/transam/xact.c:1541 access/transam/xact.c:1588
 msgid "ROLLBACK: no transaction in progress"
 msgstr "ROLLBACK: ingen transaktion p�g�r"
 
-#: access/transam/xact.c:1619 access/transam/xact.c:1630
+#: access/transam/xact.c:1662 access/transam/xact.c:1673
 #, c-format
 msgid "xact_redo: unknown op code %u"
 msgstr ""
 
-#: access/transam/xact.c:1628
+#: access/transam/xact.c:1671
 msgid "xact_undo: can't undo committed xaction"
 msgstr ""
 
-#: access/transam/xact.c:1665
+#: access/transam/xact.c:1708
 msgid "XactPushRollback: already installed"
 msgstr ""
 
-#: access/transam/xlog.c:508
+#: access/transam/xlog.c:506
 #, c-format
 msgid "XLogInsert: invalid info mask %02X"
 msgstr ""
 
-#: access/transam/xlog.c:613
+#: access/transam/xlog.c:611
 #, c-format
 msgid "XLogInsert: can backup %d blocks at most"
 msgstr ""
 
-#: access/transam/xlog.c:631
+#: access/transam/xlog.c:629
 #, c-format
 msgid "XLogInsert: invalid record length %u"
 msgstr ""
 
-#: access/transam/xlog.c:788 access/transam/xlog.c:2638 utils/adt/name.c:52
-#: utils/adt/varchar.c:83 utils/adt/varchar.c:377 utils/adt/varlena.c:225
+#: access/transam/xlog.c:786 access/transam/xlog.c:2622 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 ""
 
-#: access/transam/xlog.c:1032
+#: 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:1049 access/transam/xlog.c:1163
-#: access/transam/xlog.c:3341
+#: access/transam/xlog.c:1047 access/transam/xlog.c:1157
+#: access/transam/xlog.c:3326
 #, c-format
 msgid "close of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1062
-msgid ""
-"XLogWrite: new log file created - consider increasing 'wal_files' in "
-"postgresql.conf."
-msgstr ""
-
-#: access/transam/xlog.c:1088
+#: access/transam/xlog.c:1082
 msgid "XLogWrite: time for a checkpoint, signaling postmaster"
 msgstr ""
 
-#: access/transam/xlog.c:1107
+#: access/transam/xlog.c:1101
 #, c-format
 msgid "lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1119
+#: access/transam/xlog.c:1113
 #, c-format
 msgid "write of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1215
+#: access/transam/xlog.c:1209
 #, c-format
 msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X\n"
 msgstr ""
 
-#: access/transam/xlog.c:1315
+#: access/transam/xlog.c:1310
 #, 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:1353 access/transam/xlog.c:1434
+#: access/transam/xlog.c:1544 access/transam/xlog.c:1548
 #, c-format
 msgid "open of %s (log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1407
+#: access/transam/xlog.c:1402
 #, c-format
 msgid "ZeroFill failed to write %s: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1412
+#: access/transam/xlog.c:1407
 #, c-format
 msgid "fsync of file %s failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1517
+#: access/transam/xlog.c:1512
 #, 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:1517
 #, c-format
 msgid ""
 "rename from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1614
+#: access/transam/xlog.c:1598
 #, c-format
 msgid "could not open transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1629
+#: access/transam/xlog.c:1613
 #, c-format
 msgid "archiving transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1631
+#: access/transam/xlog.c:1615
 msgid "archiving log files is not implemented!"
 msgstr ""
 
-#: access/transam/xlog.c:1645
+#: access/transam/xlog.c:1629
 #, c-format
 msgid "recycled transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1651
+#: access/transam/xlog.c:1635
 #, c-format
 msgid "removing transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1660
+#: access/transam/xlog.c:1644
 #, c-format
 msgid "could not read transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1733
+#: access/transam/xlog.c:1717
 #, c-format
 msgid "ReadRecord: bad resource manager data checksum in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1755
+#: access/transam/xlog.c:1739
 #, c-format
 msgid "ReadRecord: bad checksum of backup block %d in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1824
+#: access/transam/xlog.c:1808
 #, c-format
 msgid "ReadRecord: invalid record offset at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1847
+#: access/transam/xlog.c:1831
 #, c-format
 msgid "ReadRecord: lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1853 access/transam/xlog.c:1937
+#: access/transam/xlog.c:1837 access/transam/xlog.c:1921
 #, c-format
 msgid "ReadRecord: read of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1863
+#: access/transam/xlog.c:1847
 #, c-format
 msgid "ReadRecord: contrecord is requested by %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1877
+#: access/transam/xlog.c:1861
 #, c-format
 msgid "ReadRecord: record with zero length at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1901
+#: access/transam/xlog.c:1885
 #, c-format
 msgid "ReadRecord: record length %u at %X/%X too long"
 msgstr ""
 
-#: access/transam/xlog.c:1907
+#: access/transam/xlog.c:1891
 #, c-format
 msgid "ReadRecord: invalid resource manager id %u at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1945
+#: access/transam/xlog.c:1929
 #, c-format
 msgid ""
 "ReadRecord: there is no ContRecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:1953
+#: access/transam/xlog.c:1937
 #, c-format
 msgid ""
 "ReadRecord: invalid ContRecord length %u in log file %u, segment %u, offset %"
 "u"
 msgstr ""
 
-#: access/transam/xlog.c:2017
+#: access/transam/xlog.c:2001
 #, c-format
 msgid ""
 "ReadRecord: invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2023
+#: access/transam/xlog.c:2007
 #, c-format
 msgid ""
 "ReadRecord: invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2031
+#: access/transam/xlog.c:2015
 #, 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:2053
+#: access/transam/xlog.c:2037
 #, c-format
 msgid ""
 "ReadRecord: out-of-sequence SUI %u (after %u) in log file %u, segment %u, "
 "offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2112
+#: access/transam/xlog.c:2096
 msgid "invalid LC_COLLATE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2116
+#: access/transam/xlog.c:2100
 msgid "invalid LC_CTYPE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2134
+#: access/transam/xlog.c:2118
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr ""
 
-#: access/transam/xlog.c:2142
+#: access/transam/xlog.c:2126
 #, c-format
 msgid "WriteControlFile: could not create control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2151
+#: access/transam/xlog.c:2135
 #, c-format
 msgid "WriteControlFile: write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2155
+#: access/transam/xlog.c:2139
 #, c-format
 msgid "WriteControlFile: fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2171 access/transam/xlog.c:2294
+#: access/transam/xlog.c:2155 access/transam/xlog.c:2278
 #, c-format
 msgid "could not open control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2174
+#: access/transam/xlog.c:2158
 #, c-format
 msgid "read from control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2186
+#: access/transam/xlog.c:2170
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d,\n"
@@ -1265,11 +1263,11 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2199
+#: access/transam/xlog.c:2183
 msgid "invalid checksum in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2215
+#: access/transam/xlog.c:2199
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d,\n"
@@ -1277,7 +1275,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2221
+#: access/transam/xlog.c:2205
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d,\n"
@@ -1285,7 +1283,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2227
+#: access/transam/xlog.c:2211
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d,\n"
@@ -1293,7 +1291,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2234
+#: access/transam/xlog.c:2218
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d,\n"
@@ -1301,7 +1299,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2241
+#: access/transam/xlog.c:2225
 #, c-format
 msgid ""
 "The database cluster was initialized with FUNC_MAX_ARGS %d,\n"
@@ -1309,21 +1307,21 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2249
+#: access/transam/xlog.c:2233
 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:2255
+#: access/transam/xlog.c:2239
 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:2262
+#: access/transam/xlog.c:2246
 #, c-format
 msgid ""
 "The database cluster was initialized with LOCALE_NAME_BUFLEN %d,\n"
@@ -1331,7 +1329,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2269
+#: access/transam/xlog.c:2253
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_COLLATE '%s',\n"
@@ -1339,7 +1337,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2275
+#: access/transam/xlog.c:2259
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_CTYPE '%s',\n"
@@ -1347,41 +1345,41 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2302
+#: access/transam/xlog.c:2286
 #, c-format
 msgid "write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2306
+#: access/transam/xlog.c:2290
 #, c-format
 msgid "fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2446
+#: access/transam/xlog.c:2430
 #, c-format
 msgid "BootStrapXLOG failed to write log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2450
+#: access/transam/xlog.c:2434
 #, c-format
 msgid "BootStrapXLOG failed to fsync log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2516
+#: access/transam/xlog.c:2500
 msgid "control file context is broken"
 msgstr ""
 
-#: access/transam/xlog.c:2519
+#: access/transam/xlog.c:2503
 #, c-format
 msgid "database system was shut down at %s"
 msgstr ""
 
-#: access/transam/xlog.c:2522
+#: access/transam/xlog.c:2506
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr ""
 
-#: access/transam/xlog.c:2525
+#: access/transam/xlog.c:2509
 #, c-format
 msgid ""
 "database system was interrupted being in recovery at %s\n"
@@ -1389,156 +1387,156 @@ msgid ""
 "\tand you will have to use the last backup for recovery."
 msgstr ""
 
-#: access/transam/xlog.c:2530
+#: access/transam/xlog.c:2514
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr ""
 
-#: access/transam/xlog.c:2541
+#: access/transam/xlog.c:2525
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2550
+#: access/transam/xlog.c:2534
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2555
+#: access/transam/xlog.c:2539
 msgid "unable to locate a valid checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2561
+#: access/transam/xlog.c:2545
 #, c-format
 msgid "redo record is at %X/%X; undo record is at %X/%X; shutdown %s"
 msgstr ""
 
-#: access/transam/xlog.c:2565
+#: access/transam/xlog.c:2549
 #, c-format
 msgid "next transaction id: %u; next oid: %u"
 msgstr "n�sta transaktions-id: %u; n�sta oid: %u"
 
-#: access/transam/xlog.c:2568
+#: access/transam/xlog.c:2552
 msgid "invalid next transaction id"
 msgstr "n�sta transaktions-id ogiltig"
 
-#: access/transam/xlog.c:2579
+#: access/transam/xlog.c:2563
 msgid "invalid redo in checkpoint record"
 msgstr "ogiltig redo i checkpoint-post"
 
-#: access/transam/xlog.c:2587
+#: access/transam/xlog.c:2571
 msgid "invalid redo/undo record in shutdown checkpoint"
 msgstr ""
 
-#: access/transam/xlog.c:2596
+#: access/transam/xlog.c:2580
 msgid ""
 "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 
-#: access/transam/xlog.c:2616
+#: access/transam/xlog.c:2600
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2647
+#: access/transam/xlog.c:2631
 #, c-format
 msgid "redo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2653
+#: access/transam/xlog.c:2637
 msgid "redo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2735
+#: access/transam/xlog.c:2719
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2745
+#: access/transam/xlog.c:2729
 #, c-format
 msgid "undo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2749
+#: access/transam/xlog.c:2733
 msgid "undo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2783
+#: access/transam/xlog.c:2767
 msgid "database system is ready"
 msgstr "databassystemet �r redo"
 
-#: access/transam/xlog.c:2815
+#: access/transam/xlog.c:2799
 msgid "invalid primary checkpoint link in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2816
+#: access/transam/xlog.c:2800
 msgid "invalid secondary checkpoint link in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2825
+#: access/transam/xlog.c:2809
 msgid "invalid primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2826
+#: access/transam/xlog.c:2810
 msgid "invalid secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2832
+#: access/transam/xlog.c:2816
 msgid "invalid resource manager id in primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2833
+#: access/transam/xlog.c:2817
 msgid "invalid resource manager id in secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2840
+#: access/transam/xlog.c:2824
 msgid "invalid xl_info in primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2841
+#: access/transam/xlog.c:2825
 msgid "invalid xl_info in secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2847
+#: access/transam/xlog.c:2831
 msgid "invalid length of primary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2848
+#: access/transam/xlog.c:2832
 msgid "invalid length of secondary checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2911
+#: access/transam/xlog.c:2895
 msgid "shutting down"
 msgstr "st�nger ner"
 
-#: access/transam/xlog.c:2924
+#: access/transam/xlog.c:2908
 msgid "database system is shut down"
 msgstr "databassystemet �r nedst�ngt"
 
-#: access/transam/xlog.c:2942
+#: access/transam/xlog.c:2929
 msgid "CreateCheckPoint: cannot be called inside transaction block"
 msgstr ""
 
-#: access/transam/xlog.c:3057
+#: access/transam/xlog.c:3044
 msgid "active transaction while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3103
+#: access/transam/xlog.c:3090
 msgid ""
 "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3336 access/transam/xlog.c:3364
+#: access/transam/xlog.c:3321 access/transam/xlog.c:3349
 #, c-format
 msgid "fsync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3370
+#: access/transam/xlog.c:3355
 #, c-format
 msgid "fdatasync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3378
+#: access/transam/xlog.c:3363
 #, c-format
 msgid "bogus wal_sync_method %d"
 msgstr ""
@@ -1566,7 +1564,7 @@ msgid ""
 "  -x num           internal use\n"
 msgstr ""
 
-#: bootstrap/bootstrap.c:308 postmaster/postmaster.c:292
+#: bootstrap/bootstrap.c:307 postmaster/postmaster.c:308
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -1576,7 +1574,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: bootstrap/bootstrap.c:406
+#: bootstrap/bootstrap.c:407
 #, c-format
 msgid "Unsupported XLOG op %d"
 msgstr ""
@@ -1619,7 +1617,7 @@ msgstr ""
 msgid "column %s %s"
 msgstr "kolumn %s %s"
 
-#: bootstrap/bootstrap.c:678
+#: bootstrap/bootstrap.c:680
 #, c-format
 msgid "inserting row oid %u, %d columns"
 msgstr "s�tter in rad oid %u, %d kolumner"
@@ -1675,16 +1673,16 @@ msgstr ""
 msgid "external type: %s"
 msgstr "extern typ: %s"
 
-#: bootstrap/bootstrap.c:891
+#: bootstrap/bootstrap.c:890
 #, c-format
 msgid "Error: unknown type '%s'.\n"
 msgstr ""
 
-#: bootstrap/bootstrap.c:907
+#: bootstrap/bootstrap.c:906
 msgid "AllocateAttribute: malloc failed"
 msgstr ""
 
-#: bootstrap/bootstrap.c:1058
+#: bootstrap/bootstrap.c:1057
 msgid ""
 "There are too many string constants and identifiers for the compiler to "
 "handle."
@@ -1700,381 +1698,391 @@ msgstr ""
 msgid "\tacl[%d]: %s"
 msgstr ""
 
-#: catalog/aclchk.c:150
+#: catalog/aclchk.c:153
 #, c-format
 msgid "bogus GrantStmt.objtype %d"
 msgstr ""
 
-#: catalog/aclchk.c:170
+#: catalog/aclchk.c:173
 #, c-format
 msgid "invalid privilege type %s for table object"
 msgstr ""
 
-#: catalog/aclchk.c:199
+#: catalog/aclchk.c:202
 #, c-format
 msgid "relation %u not found"
 msgstr "hittar inte relationen %u"
 
-#: catalog/aclchk.c:206
+#: catalog/aclchk.c:209
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\" �r ett index"
 
-#: catalog/aclchk.c:265
+#: catalog/aclchk.c:268
 #, c-format
 msgid "invalid privilege type %s for database object"
 msgstr ""
 
-#: catalog/aclchk.c:295
+#: catalog/aclchk.c:298
 #, c-format
 msgid "database \"%s\" not found"
 msgstr "hittar inte databasen \"%s\""
 
-#: catalog/aclchk.c:299 catalog/aclchk.c:471 catalog/pg_conversion.c:176
-#: commands/dbcommands.c:513 commands/user.c:848 tcop/utility.c:818
-#: utils/init/miscinit.c:618
+#: 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
+#: utils/init/miscinit.c:616
 msgid "permission denied"
 msgstr "r�ttighet saknas"
 
-#: catalog/aclchk.c:356
+#: catalog/aclchk.c:359
 #, c-format
 msgid "invalid privilege type %s for function object"
 msgstr ""
 
-#: catalog/aclchk.c:386 parser/parse_func.c:867 parser/parse_func.c:1317
+#: catalog/aclchk.c:389 parser/parse_func.c:867 parser/parse_func.c:1315
 #, c-format
 msgid "function %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:449
+#: catalog/aclchk.c:452
 #, c-format
 msgid "invalid privilege type %s for language object"
 msgstr ""
 
-#: catalog/aclchk.c:478
+#: catalog/aclchk.c:481
 #, c-format
 msgid "language \"%s\" not found"
 msgstr ""
 
-#: catalog/aclchk.c:482
+#: catalog/aclchk.c:485
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr ""
 
-#: catalog/aclchk.c:539
+#: catalog/aclchk.c:542
 #, c-format
 msgid "invalid privilege type %s for namespace object"
 msgstr ""
 
-#: catalog/aclchk.c:565
+#: catalog/aclchk.c:568
 #, c-format
 msgid "namespace \"%s\" not found"
 msgstr ""
 
-#: catalog/aclchk.c:642
+#: catalog/aclchk.c:644
 #, c-format
 msgid "privilege_to_string: unrecognized privilege %d"
 msgstr ""
 
-#: catalog/aclchk.c:664
+#: catalog/aclchk.c:666
 #, c-format
 msgid "non-existent group \"%s\""
 msgstr ""
 
-#: catalog/aclchk.c:734
+#: catalog/aclchk.c:736
 #, c-format
 msgid "in_group: group %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:762
+#: catalog/aclchk.c:764
 msgid "aclcheck: null ACL, returning OK"
 msgstr ""
 
-#: catalog/aclchk.c:777
+#: catalog/aclchk.c:779
 msgid "aclcheck: zero-length ACL, returning OK"
 msgstr ""
 
-#: catalog/aclchk.c:786
+#: catalog/aclchk.c:788
 msgid "aclcheck: first entry in ACL is not 'world' entry"
 msgstr ""
 
-#: catalog/aclchk.c:790
+#: catalog/aclchk.c:792
 #, c-format
 msgid "aclcheck: using world=%d"
 msgstr ""
 
-#: catalog/aclchk.c:806
+#: catalog/aclchk.c:808
 #, c-format
 msgid "aclcheck: found user %u/%d"
 msgstr ""
 
-#: catalog/aclchk.c:823 catalog/aclchk.c:844
+#: catalog/aclchk.c:825 catalog/aclchk.c:846
 #, c-format
 msgid "aclcheck: found group %u/%d"
 msgstr ""
 
-#: catalog/aclchk.c:856
+#: catalog/aclchk.c:858
 #, c-format
 msgid "aclcheck: bogus ACL id type: %d"
 msgstr ""
 
-#: catalog/aclchk.c:877 commands/user.c:1225
+#: catalog/aclchk.c:879 commands/user.c:1232
 #, c-format
 msgid "%s: permission denied"
 msgstr "%s: r�ttighet saknas"
 
-#: catalog/aclchk.c:880
+#: catalog/aclchk.c:882
 #, c-format
 msgid "%s: must be owner"
 msgstr "%s: m�ste vara �garen"
 
-#: catalog/aclchk.c:883
+#: catalog/aclchk.c:885
 #, c-format
 msgid "%s: unexpected AclResult %d"
 msgstr ""
 
-#: catalog/aclchk.c:911
+#: catalog/aclchk.c:913
 #, c-format
 msgid "pg_class_aclcheck: invalid user id %u"
 msgstr ""
 
-#: catalog/aclchk.c:926
+#: catalog/aclchk.c:928
 #, c-format
 msgid "pg_class_aclcheck: relation %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:939
+#: catalog/aclchk.c:941
 msgid "pg_class_aclcheck: catalog update: permission denied"
 msgstr ""
 
-#: catalog/aclchk.c:951
+#: catalog/aclchk.c:953
 #, c-format
 msgid "pg_class_aclcheck: %u is superuser"
 msgstr ""
 
-#: catalog/aclchk.c:1019
+#: catalog/aclchk.c:1021
 #, c-format
 msgid "pg_database_aclcheck: database %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1074
+#: catalog/aclchk.c:1076
 #, c-format
 msgid "pg_proc_aclcheck: function %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1127
+#: catalog/aclchk.c:1129
 #, c-format
 msgid "pg_language_aclcheck: language %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1184
+#: catalog/aclchk.c:1186
 #, c-format
 msgid "pg_namespace_aclcheck: namespace %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1232
+#: catalog/aclchk.c:1234
 #, c-format
 msgid "pg_class_ownercheck: relation %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1258
+#: catalog/aclchk.c:1260
 #, c-format
 msgid "pg_type_ownercheck: type %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1284
+#: catalog/aclchk.c:1286
 #, c-format
 msgid "pg_oper_ownercheck: operator %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1310
+#: catalog/aclchk.c:1312
 #, c-format
 msgid "pg_proc_ownercheck: function %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1336
+#: catalog/aclchk.c:1338
 #, c-format
 msgid "pg_namespace_ownercheck: namespace %u not found"
 msgstr ""
 
-#: catalog/aclchk.c:1363
+#: catalog/aclchk.c:1365
 #, c-format
 msgid "pg_opclass_ownercheck: operator class %u not found"
 msgstr ""
 
-#: catalog/dependency.c:150
+#: catalog/dependency.c:162
 #, 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:284
+#: catalog/dependency.c:252 catalog/dependency.c:571
+#, c-format
+msgid "Cannot drop %s because it is required by the database system"
+msgstr ""
+
+#: catalog/dependency.c:256
+#, c-format
+msgid "findAutoDeletableObjects: unknown dependency type '%c' for %s"
+msgstr ""
+
+#: catalog/dependency.c:385
 #, c-format
 msgid ""
 "Cannot drop %s because %s requires it\n"
 "\tYou may drop %s instead"
 msgstr ""
 
-#: catalog/dependency.c:308
+#: catalog/dependency.c:411
 #, c-format
 msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
 msgstr ""
 
-#: catalog/dependency.c:319
+#: catalog/dependency.c:423
 #, c-format
 msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
 msgstr ""
 
-#: catalog/dependency.c:323 catalog/dependency.c:462
+#: catalog/dependency.c:427 catalog/dependency.c:575
 #, c-format
 msgid "recursiveDeletion: unknown dependency type '%c' for %s"
 msgstr ""
 
-#: catalog/dependency.c:349 catalog/dependency.c:488
-#, c-format
-msgid "%s depends on %s"
-msgstr "%s beror p� %s"
-
-#: catalog/dependency.c:355 catalog/dependency.c:429
-#, c-format
-msgid "Drop cascades to %s"
-msgstr "Drop sv�mmar �ver (cascades) till %s"
-
-#: catalog/dependency.c:445
+#: catalog/dependency.c:453 catalog/dependency.c:531 catalog/dependency.c:557
 #, c-format
 msgid "Drop auto-cascades to %s"
 msgstr ""
 
-#: catalog/dependency.c:458
+#: catalog/dependency.c:457 catalog/dependency.c:535
 #, c-format
-msgid "Cannot drop %s because it is required by the database system"
-msgstr ""
+msgid "%s depends on %s"
+msgstr "%s beror p� %s"
 
-#: catalog/dependency.c:557
+#: catalog/dependency.c:463 catalog/dependency.c:541
 #, c-format
-msgid "doDeletion: Relation %u does not exist"
-msgstr ""
+msgid "Drop cascades to %s"
+msgstr "Drop sv�mmar �ver (cascades) till %s"
 
-#: catalog/dependency.c:627
+#: catalog/dependency.c:692
 #, c-format
 msgid "doDeletion: Unsupported object class %u"
 msgstr ""
 
-#: catalog/dependency.c:704
+#: catalog/dependency.c:775
 #, c-format
 msgid "find_expr_references_walker: bogus varlevelsup %d"
 msgstr ""
 
-#: catalog/dependency.c:708
+#: catalog/dependency.c:779
 #, c-format
 msgid "find_expr_references_walker: bogus varno %d"
 msgstr ""
 
-#: catalog/dependency.c:748
+#: catalog/dependency.c:794
+#, c-format
+msgid "find_expr_references_walker: bogus varattno %d"
+msgstr ""
+
+#: catalog/dependency.c:833
 msgid "find_expr_references_walker: already-planned subqueries not supported"
 msgstr ""
 
-#: catalog/dependency.c:1099
+#: catalog/dependency.c:1169
 #, c-format
 msgid "getObjectClass: Unknown object class %u"
 msgstr ""
 
-#: catalog/dependency.c:1156
+#: catalog/dependency.c:1226
 #, c-format
 msgid "getObjectDescription: Cast %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1190
+#: catalog/dependency.c:1260
 #, c-format
 msgid "getObjectDescription: Constraint %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1220
+#: catalog/dependency.c:1290
 #, c-format
 msgid "getObjectDescription: Conversion %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1249
+#: catalog/dependency.c:1319
 #, c-format
 msgid "getObjectDescription: Default %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1274
+#: catalog/dependency.c:1344
 #, c-format
 msgid "getObjectDescription: Language %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1299
+#: catalog/dependency.c:1369
 #, c-format
 msgid "cache lookup of opclass %u failed"
 msgstr ""
 
-#: catalog/dependency.c:1317 utils/adt/ruleutils.c:424
+#: catalog/dependency.c:1387 utils/adt/ruleutils.c:425
 #, c-format
 msgid "syscache lookup for AM %u failed"
 msgstr ""
 
-#: catalog/dependency.c:1349
+#: catalog/dependency.c:1419
 #, c-format
 msgid "getObjectDescription: Rule %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1383
+#: catalog/dependency.c:1453
 #, c-format
 msgid "getObjectDescription: Trigger %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1403
+#: catalog/dependency.c:1473
 #, c-format
 msgid "getObjectDescription: Schema %u does not exist"
 msgstr ""
 
-#: catalog/dependency.c:1435 catalog/heap.c:1635 catalog/pg_constraint.c:429
-#: utils/adt/ruleutils.c:3129
+#: catalog/dependency.c:1505 catalog/heap.c:1635 catalog/pg_constraint.c:445
+#: utils/adt/ruleutils.c:3120
 #, c-format
 msgid "cache lookup of relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:156 catalog/heap.c:159
+#: catalog/heap.c:155 catalog/heap.c:158
 #, c-format
 msgid "SystemAttributeDefinition: invalid attribute number %d"
 msgstr ""
 
-#: catalog/heap.c:226
+#: catalog/heap.c:225
 #, c-format
 msgid ""
 "cannot create %s.%s: system catalog modifications are currently disallowed"
 msgstr ""
 
-#: catalog/heap.c:370
+#: catalog/heap.c:362
 #, c-format
 msgid "name of column \"%s\" conflicts with an existing system column"
 msgstr ""
 
-#: catalog/heap.c:384
+#: catalog/heap.c:376
 #, c-format
 msgid "column name \"%s\" is duplicated"
 msgstr ""
 
-#: catalog/heap.c:402
+#: catalog/heap.c:398
 #, c-format
 msgid ""
 "Attribute \"%s\" has an unknown type\n"
 "\tProceeding with relation creation anyway"
 msgstr ""
 
-#: catalog/heap.c:406
+#: catalog/heap.c:402
 #, c-format
 msgid "Attribute \"%s\" has pseudo-type %s"
 msgstr ""
 
-#: catalog/heap.c:687
+#: catalog/heap.c:410
+#, c-format
+msgid "Attribute \"%s\" has composite type %s"
+msgstr "Attributet \"%s\" har sammanslagen typ %s"
+
+#: catalog/heap.c:691
 #, c-format
 msgid "Number of columns is out of range (1 to %d)"
 msgstr "Antalet kolumner �r felaktigt (skall vara i intervallet 1 till %d)"
 
-#: catalog/heap.c:693
+#: catalog/heap.c:697
 #, c-format
 msgid "Relation '%s' already exists"
 msgstr "Relationen \"%s\" finns redan"
@@ -2084,42 +2092,42 @@ msgstr "Relationen \"%s\" finns redan"
 msgid "DeleteRelationTuple: cache lookup failed for relation %u"
 msgstr ""
 
-#: catalog/heap.c:929
+#: catalog/heap.c:927
 #, c-format
 msgid "RemoveAttributeById: Failed to find attribute %d in relation %u"
 msgstr ""
 
-#: catalog/heap.c:1009
+#: catalog/heap.c:1006
 #, c-format
 msgid "RemoveAttrDefault: no default found for rel %u attnum %d"
 msgstr ""
 
-#: catalog/heap.c:1045
+#: catalog/heap.c:1042
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for attrdef %u"
 msgstr ""
 
-#: catalog/heap.c:1068
+#: catalog/heap.c:1065
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for rel %u attr %d"
 msgstr ""
 
-#: catalog/heap.c:1123
+#: catalog/heap.c:1120
 #, c-format
 msgid "heap_drop_with_catalog: FlushRelationBuffers returned %d"
 msgstr ""
 
-#: catalog/heap.c:1239 parser/parse_relation.c:1506 utils/adt/ruleutils.c:3286
+#: catalog/heap.c:1236 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3277
 #, c-format
 msgid "cache lookup of attribute %d in relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:1495 commands/tablecmds.c:2482 commands/tablecmds.c:2606
+#: catalog/heap.c:1493 commands/tablecmds.c:2567 commands/tablecmds.c:2603
 #, c-format
 msgid "constraint \"%s\" already exists for relation \"%s\""
 msgstr ""
 
-#: catalog/heap.c:1509 commands/tablecmds.c:173
+#: catalog/heap.c:1507 commands/tablecmds.c:184
 #, c-format
 msgid "Duplicate CHECK constraint name: '%s'"
 msgstr ""
@@ -2129,11 +2137,11 @@ msgstr ""
 msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1573 commands/tablecmds.c:2528
+#: catalog/heap.c:1573 commands/tablecmds.c:2684
 msgid "cannot use subselect in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1575 commands/tablecmds.c:2530
+#: catalog/heap.c:1575 commands/tablecmds.c:2686
 msgid "cannot use aggregate function in CHECK constraint expression"
 msgstr ""
 
@@ -2153,14 +2161,14 @@ msgstr ""
 msgid "cannot use aggregate functions in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1725 rewrite/rewriteHandler.c:489
+#: 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 ""
 
-#: catalog/heap.c:1935
+#: catalog/heap.c:1931
 msgid "TRUNCATE TABLE cannot run inside a transaction block"
 msgstr ""
 
@@ -2169,131 +2177,114 @@ msgstr ""
 msgid "Function %u does not exist"
 msgstr "Funktionen %u existerar inte"
 
-#: catalog/index.c:144 catalog/index.c:278
+#: catalog/index.c:144 catalog/index.c:281
 #, c-format
 msgid "Opclass %u does not exist"
 msgstr "Opklass %u existerar inte"
 
-#: catalog/index.c:158 catalog/index.c:291
+#: catalog/index.c:158 catalog/index.c:294
 #, c-format
 msgid "Type %u does not exist"
 msgstr "Typ %u existerar inte"
 
-#: catalog/index.c:238
+#: catalog/index.c:239
 #, c-format
 msgid "cannot create index: column %d does not exist"
 msgstr ""
 
-#: catalog/index.c:546
+#: catalog/index.c:544
 msgid "must index at least one column"
 msgstr ""
 
-#: catalog/index.c:551
+#: catalog/index.c:549
 msgid "User-defined indexes on system catalogs are not supported"
 msgstr ""
 
-#: catalog/index.c:561
+#: catalog/index.c:559
 msgid "Shared indexes cannot be created after initdb"
 msgstr ""
 
-#: catalog/index.c:564
+#: catalog/index.c:562
 #, c-format
 msgid "relation named \"%s\" already exists"
 msgstr "relation med namn \"%s\" finns redan"
 
-#: catalog/index.c:676
+#: catalog/index.c:675
 msgid "index_create: constraint must be PRIMARY or UNIQUE"
 msgstr ""
 
-#: catalog/index.c:824
+#: catalog/index.c:825
 #, c-format
 msgid "index_drop: cache lookup failed for index %u"
 msgstr ""
 
-#: catalog/index.c:837
+#: catalog/index.c:838
 #, c-format
 msgid "index_drop: FlushRelationBuffers returned %d"
 msgstr ""
 
-#: catalog/index.c:1061
-#, c-format
-msgid "LockClassinfoForUpdate couldn't lock relid %u"
-msgstr ""
-
-#: catalog/index.c:1072
-msgid "The tuple isn't committed"
-msgstr ""
-
-#: catalog/index.c:1075
-msgid "The tuple is already deleted"
-msgstr ""
-
-#: catalog/index.c:1096
-#, c-format
-msgid "IndexesAreActive couldn't lock %u"
-msgstr ""
-
-#: catalog/index.c:1099
+#: catalog/index.c:1036
 #, c-format
-msgid "relation %u isn't an indexable relation"
-msgstr ""
+msgid "relation %s isn't an indexable relation"
+msgstr "relationen %s �r inte en indexerbar relation"
 
-#: catalog/index.c:1169
+#: catalog/index.c:1107
 #, c-format
 msgid "setRelhasindex: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1253
-msgid "setNewRelfilenode impossible to lock class tuple"
+#: catalog/index.c:1223
+#, c-format
+msgid "setNewRelfilenode: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1375
+#: catalog/index.c:1335
 #, c-format
 msgid "UpdateStats: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1643
+#: catalog/index.c:1599
 msgid "IndexBuildHeapScan: concurrent insert in progress"
 msgstr ""
 
-#: catalog/index.c:1658
+#: catalog/index.c:1614
 msgid "IndexBuildHeapScan: concurrent delete in progress"
 msgstr ""
 
-#: catalog/index.c:1663 commands/vacuum.c:1165 commands/vacuumlazy.c:360
-#: commands/vacuumlazy.c:849
+#: catalog/index.c:1619 commands/vacuum.c:1207 commands/vacuumlazy.c:360
+#: commands/vacuumlazy.c:847
 msgid "Unexpected HeapTupleSatisfiesVacuum result"
 msgstr ""
 
-#: catalog/index.c:1750
+#: catalog/index.c:1706
 #, c-format
 msgid "IndexGetRelation: can't find index id %u"
 msgstr ""
 
-#: catalog/index.c:1795
+#: catalog/index.c:1751
 msgid "REINDEX cannot run inside a transaction block"
 msgstr ""
 
-#: catalog/index.c:1809
+#: catalog/index.c:1765
 msgid "reindex_index: can't open index relation"
 msgstr ""
 
-#: catalog/index.c:1822
+#: catalog/index.c:1776
 msgid "reindex_index: can't open heap relation"
 msgstr ""
 
-#: catalog/index.c:1946
+#: catalog/index.c:1790 catalog/index.c:1913
 #, c-format
-msgid "the target relation %u is nailed"
+msgid "the target relation %u is shared"
 msgstr ""
 
-#: catalog/index.c:1962
+#: catalog/index.c:1796
 #, c-format
-msgid "the target relation %u is shared"
+msgid "the target relation %u is nailed"
 msgstr ""
 
-#: catalog/namespace.c:168 catalog/namespace.c:215 catalog/namespace.c:1070
-#: parser/parse_expr.c:818 parser/parse_target.c:146
+#: 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 ""
 
@@ -2306,13 +2297,13 @@ msgstr "Relationen \"%s\".\"%s\" existerar inte"
 msgid "TEMP tables may not specify a namespace"
 msgstr ""
 
-#: catalog/namespace.c:236 catalog/namespace.c:1099 catalog/namespace.c:1134
-#: catalog/namespace.c:1666
+#: catalog/namespace.c:236 catalog/namespace.c:1101 catalog/namespace.c:1136
+#: catalog/namespace.c:1693
 #, c-format
 msgid "Namespace \"%s\" does not exist"
 msgstr "Nameutrymmet \"%s\" existerar inte"
 
-#: catalog/namespace.c:246 catalog/namespace.c:1144
+#: catalog/namespace.c:246 catalog/namespace.c:1146
 msgid "No namespace has been selected to create in"
 msgstr ""
 
@@ -2336,25 +2327,25 @@ msgstr ""
 msgid "Cache lookup failed for operator %u"
 msgstr ""
 
-#: catalog/namespace.c:1005
+#: catalog/namespace.c:1006
 #, c-format
 msgid "Cache lookup failed for opclass %u"
 msgstr ""
 
-#: catalog/namespace.c:1073
+#: catalog/namespace.c:1075
 #, c-format
 msgid "Improper qualified name (too many dotted names): %s"
 msgstr ""
 
-#: catalog/namespace.c:1177
+#: catalog/namespace.c:1179
 msgid "Improper relation name (too many dotted names)"
 msgstr ""
 
-#: catalog/namespace.c:1337
+#: catalog/namespace.c:1363
 msgid "recomputeNamespacePath: invalid list syntax"
 msgstr ""
 
-#: catalog/namespace.c:1466
+#: catalog/namespace.c:1492
 #, c-format
 msgid "%s: not authorized to create temp tables"
 msgstr ""
@@ -2378,45 +2369,45 @@ msgid ""
 "with input type"
 msgstr ""
 
-#: catalog/pg_constraint.c:397
+#: catalog/pg_constraint.c:413
 #, c-format
 msgid "RemoveConstraintById: constraint %u not found"
 msgstr ""
 
-#: catalog/pg_constraint.c:434
+#: catalog/pg_constraint.c:450
 #, c-format
 msgid "RemoveConstraintById: relation %s has relchecks = 0"
 msgstr ""
 
-#: catalog/pg_conversion.c:57 catalog/pg_conversion.c:146
+#: catalog/pg_conversion.c:58 catalog/pg_conversion.c:150
 msgid "no conversion name supplied"
 msgstr ""
 
-#: catalog/pg_conversion.c:64
+#: catalog/pg_conversion.c:65
 #, c-format
 msgid "conversion name \"%s\" already exists"
 msgstr ""
 
-#: catalog/pg_conversion.c:73
+#: catalog/pg_conversion.c:76
 #, c-format
 msgid "default conversion for %s to %s already exists"
 msgstr ""
 
-#: catalog/pg_conversion.c:171
+#: catalog/pg_conversion.c:175
 #, c-format
 msgid "conversion %s not found"
 msgstr "hittar inte konvertering %s"
 
-#: catalog/pg_conversion.c:224
+#: catalog/pg_conversion.c:228
 #, c-format
 msgid "conversion %u does not exist"
 msgstr "konvertering %u existerar inte"
 
-#: catalog/pg_conversion.c:324
+#: catalog/pg_conversion.c:330
 msgid "Conversion does not exist"
 msgstr "Konvertering existerar inte"
 
-#: catalog/pg_conversion.c:336
+#: catalog/pg_conversion.c:342
 #, c-format
 msgid "Conversion %u search from syscache failed"
 msgstr ""
@@ -2465,21 +2456,21 @@ msgstr ""
 msgid "OperatorDef: operator \"%s\" already defined"
 msgstr ""
 
-#: catalog/pg_operator.c:622
+#: catalog/pg_operator.c:623
 #, c-format
 msgid "OperatorDef: operator %u not found"
 msgstr ""
 
-#: catalog/pg_operator.c:710
+#: catalog/pg_operator.c:711
 msgid "operator cannot be its own negator or sort operator"
 msgstr ""
 
-#: catalog/pg_operator.c:727
+#: catalog/pg_operator.c:728
 #, c-format
 msgid "OperatorDef: can't create operator shell \"%s\""
 msgstr ""
 
-#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1378
+#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1376
 #, c-format
 msgid "functions cannot have more than %d arguments"
 msgstr ""
@@ -2519,26 +2510,26 @@ msgstr "funktionen %s 
 msgid "function %s is not an aggregate"
 msgstr "funktionen %s �r inte en aggregatfunktion"
 
-#: catalog/pg_proc.c:325
+#: catalog/pg_proc.c:323
 #, c-format
 msgid "function declared to return %s, but no SELECT provided"
 msgstr ""
 
-#: catalog/pg_proc.c:342
+#: catalog/pg_proc.c:341
 msgid "function declared to return void, but final statement is a SELECT"
 msgstr ""
 
-#: catalog/pg_proc.c:348
+#: catalog/pg_proc.c:347
 #, c-format
 msgid "function declared to return %s, but final statement is not a SELECT"
 msgstr ""
 
-#: catalog/pg_proc.c:369
+#: catalog/pg_proc.c:368
 #, c-format
 msgid "function declared to return %s returns multiple columns in final SELECT"
 msgstr ""
 
-#: catalog/pg_proc.c:374
+#: catalog/pg_proc.c:373
 #, c-format
 msgid "return type mismatch in function: declared to return %s, returns %s"
 msgstr ""
@@ -2556,7 +2547,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:671 utils/adt/ruleutils.c:3171
+#: commands/functioncmds.c:739 utils/adt/ruleutils.c:3162
 #, c-format
 msgid "cache lookup of function %u failed"
 msgstr ""
@@ -2598,12 +2589,12 @@ msgstr ""
 msgid "type %s already exists"
 msgstr "typen %s existerar redan"
 
-#: catalog/pg_type.c:401
+#: catalog/pg_type.c:399
 #, c-format
 msgid "type %s does not exist"
 msgstr "typen %s existerar inte"
 
-#: catalog/pg_type.c:407
+#: catalog/pg_type.c:405
 #, c-format
 msgid "type named %s already exists"
 msgstr ""
@@ -2635,104 +2626,103 @@ msgstr ""
 msgid "RemoveAggregate: couldn't find pg_proc tuple for %s"
 msgstr ""
 
-#: commands/analyze.c:198
+#: commands/analyze.c:199
 #, c-format
 msgid "Skipping \"%s\" --- only table or database owner can ANALYZE it"
 msgstr ""
 
-#: commands/analyze.c:212 commands/vacuum.c:763
+#: 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:228
+#: commands/analyze.c:242
 #, c-format
 msgid "Analyzing %s.%s"
 msgstr "Analyserar %s.%s"
 
-#: commands/analyze.c:421 utils/adt/ruleutils.c:2082
-#: utils/adt/ruleutils.c:2522
+#: commands/analyze.c:435 utils/adt/ruleutils.c:2496
 #, c-format
 msgid "cache lookup of type %u failed"
 msgstr ""
 
-#: commands/analyze.c:631
+#: commands/analyze.c:645
 #, c-format
 msgid "acquire_sample_rows: ReadBuffer(%s,%u) failed"
 msgstr ""
 
-#: commands/async.c:154
+#: commands/async.c:153
 #, c-format
 msgid "Async_Notify: %s"
 msgstr ""
 
-#: commands/async.c:202
+#: commands/async.c:201
 #, c-format
 msgid "Async_Listen: %s"
 msgstr ""
 
-#: commands/async.c:225
+#: commands/async.c:224
 #, c-format
 msgid "Async_Listen: We are already listening on %s"
 msgstr ""
 
-#: commands/async.c:297
+#: commands/async.c:296
 #, c-format
 msgid "Async_Unlisten %s"
 msgstr ""
 
-#: commands/async.c:355
+#: commands/async.c:354
 msgid "Async_UnlistenAll"
 msgstr ""
 
-#: commands/async.c:457
+#: commands/async.c:456
 msgid "AtCommit_Notify"
 msgstr ""
 
-#: commands/async.c:489
+#: commands/async.c:488
 msgid "AtCommit_Notify: notifying self"
 msgstr ""
 
-#: commands/async.c:496
+#: commands/async.c:495
 #, c-format
 msgid "AtCommit_Notify: notifying pid %d"
 msgstr ""
 
-#: commands/async.c:545
+#: commands/async.c:544
 msgid "AtCommit_Notify: done"
 msgstr ""
 
-#: commands/async.c:618
+#: commands/async.c:621
 msgid "Async_NotifyHandler: perform async notify"
 msgstr ""
 
-#: commands/async.c:623
+#: commands/async.c:626
 msgid "Async_NotifyHandler: done"
 msgstr ""
 
-#: commands/async.c:690
+#: commands/async.c:693
 msgid "EnableNotifyInterrupt: perform async notify"
 msgstr ""
 
-#: commands/async.c:695
+#: commands/async.c:698
 msgid "EnableNotifyInterrupt: done"
 msgstr ""
 
-#: commands/async.c:746
+#: commands/async.c:749
 msgid "ProcessIncomingNotify"
 msgstr ""
 
-#: commands/async.c:782
+#: commands/async.c:785
 #, c-format
 msgid "ProcessIncomingNotify: received %s from %d"
 msgstr ""
 
-#: commands/async.c:817
+#: commands/async.c:820
 msgid "ProcessIncomingNotify: done"
 msgstr ""
 
-#: commands/async.c:844
+#: commands/async.c:847
 #, c-format
 msgid "NOTIFY for %s"
 msgstr "NOTIFY f�r %s"
@@ -2752,26 +2742,31 @@ msgstr ""
 msgid "CLUSTER: cannot cluster system relation \"%s\""
 msgstr ""
 
-#: commands/cluster.c:297 commands/cluster.c:320
+#: commands/cluster.c:300 commands/cluster.c:318
 #, c-format
 msgid "Cache lookup failed for index %u"
 msgstr ""
 
-#: commands/cluster.c:432 commands/cluster.c:439
+#: commands/cluster.c:385
+#, c-format
+msgid "cache lookup failed for index %u"
+msgstr ""
+
+#: commands/cluster.c:437 commands/cluster.c:444
 #, c-format
 msgid "CLUSTER: Cannot find tuple for relation %u"
 msgstr ""
 
-#: commands/cluster.c:451 commands/cluster.c:457
+#: commands/cluster.c:456 commands/cluster.c:462
 #, c-format
 msgid "CLUSTER: FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/cluster.c:504
+#: commands/cluster.c:510
 msgid "CLUSTER: expected both swapped tables to have TOAST tables"
 msgstr ""
 
-#: commands/cluster.c:510 commands/cluster.c:515
+#: commands/cluster.c:516 commands/cluster.c:521
 #, c-format
 msgid "CLUSTER: expected one dependency record for TOAST table, found %ld"
 msgstr ""
@@ -2781,98 +2776,97 @@ msgstr ""
 msgid "An attempt was made to comment on a unknown type: %d"
 msgstr ""
 
-#: commands/comment.c:308
+#: commands/comment.c:306
 #, c-format
 msgid "relation \"%s\" is not an index"
 msgstr "relation \"%s\" �r inte ett index"
 
-#: commands/comment.c:313
+#: commands/comment.c:311
 #, c-format
 msgid "relation \"%s\" is not a sequence"
 msgstr "relation \"%s\" �r inte en sekvens"
 
-#: commands/comment.c:318
+#: commands/comment.c:316
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "relation \"%s\" �r inte en tabell"
 
-#: commands/comment.c:323
+#: commands/comment.c:321
 #, c-format
 msgid "relation \"%s\" is not a view"
 msgstr "relation \"%s\" �r inte en vy"
 
-#: commands/comment.c:359
+#: commands/comment.c:357
 msgid "CommentAttribute: must specify relation.attribute"
 msgstr ""
 
-#: commands/comment.c:376 commands/tablecmds.c:1847 commands/tablecmds.c:1981
-#: commands/tablecmds.c:2099 commands/tablecmds.c:2317
-#: commands/tablecmds.c:2800 commands/tablecmds.c:2816
-#: optimizer/prep/prepunion.c:806 parser/parse_func.c:1160
-#: parser/parse_relation.c:1552 parser/parse_relation.c:1614
-#: parser/parse_relation.c:1767 parser/parse_type.c:88
+#: 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
+#: 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 ""
 
-#: commands/comment.c:405
+#: commands/comment.c:403
 msgid "CommentDatabase: database name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:411 commands/dbcommands.c:509 utils/adt/acl.c:1037
+#: commands/comment.c:409 commands/dbcommands.c:513 utils/adt/acl.c:1039
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "databaseen \"%s\" existerar inte"
 
-#: commands/comment.c:416
+#: commands/comment.c:414
 #, c-format
 msgid "you are not permitted to comment on database \"%s\""
 msgstr ""
 
-#: commands/comment.c:421
+#: commands/comment.c:419
 msgid "Database comments may only be applied to the current database"
 msgstr ""
 
-#: commands/comment.c:444
+#: commands/comment.c:442
 msgid "CommentSchema: schema name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:451
+#: commands/comment.c:449
 #, c-format
 msgid "CommentSchema: Schema \"%s\" could not be found"
 msgstr ""
 
-#: commands/comment.c:524 commands/comment.c:558
+#: commands/comment.c:521 commands/comment.c:555
 #, c-format
 msgid "rule \"%s\" does not exist"
 msgstr "regel \"%s\" existerar inte"
 
-#: commands/comment.c:530
+#: 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:736
+#: commands/comment.c:732
 msgid "CommentTrigger: must specify relation and trigger"
 msgstr ""
 
-#: commands/comment.c:769
+#: commands/comment.c:765
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" does not exist"
 msgstr "utl�sare \"%s\" f�r relation \"%s\" existerar inte"
 
-#: commands/comment.c:812
+#: commands/comment.c:807
 msgid "CommentConstraint: must specify relation and constraint"
 msgstr ""
 
-#: commands/comment.c:846
+#: commands/comment.c:841
 #, c-format
 msgid "Relation \"%s\" has multiple constraints named \"%s\""
 msgstr "Relationen \"%s\" har flera integritetsvillkor med namn \"%s\""
 
-#: commands/comment.c:856
+#: commands/comment.c:851
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" does not exist"
 msgstr "integritetsvillkor \"%s\" f�r relation \"%s\" existerar inte"
@@ -2887,387 +2881,387 @@ msgstr ""
 msgid "Invalid to encoding name: %s"
 msgstr ""
 
-#: commands/conversioncmds.c:72
+#: commands/conversioncmds.c:73
 #, c-format
 msgid "Function %s does not exist"
 msgstr "Funktion %s existerar inte"
 
-#: commands/copy.c:122
+#: commands/copy.c:125
 #, c-format
 msgid "CopySendData: %m"
 msgstr ""
 
-#: commands/copy.c:297
+#: commands/copy.c:300
 msgid "COPY: BINARY option appears more than once"
 msgstr ""
 
-#: commands/copy.c:304
+#: commands/copy.c:307
 msgid "COPY: OIDS option appears more than once"
 msgstr ""
 
-#: commands/copy.c:311
+#: commands/copy.c:314
 msgid "COPY: DELIMITER string may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:318
+#: commands/copy.c:321
 msgid "COPY: NULL representation may only be defined once in query"
 msgstr ""
 
-#: commands/copy.c:323
+#: commands/copy.c:326
 #, c-format
 msgid "COPY: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/copy.c:328
+#: commands/copy.c:331
 msgid "You can not specify the DELIMITER in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:331
+#: commands/copy.c:334
 msgid "You can not specify NULL in BINARY mode."
 msgstr ""
 
-#: commands/copy.c:351
+#: commands/copy.c:354
 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:360
+#: commands/copy.c:363
 msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr ""
 
-#: commands/copy.c:366
+#: commands/copy.c:369
 msgid "COPY delimiter must be a single character"
 msgstr ""
 
-#: commands/copy.c:372
+#: commands/copy.c:375
 #, c-format
 msgid "COPY: table \"%s\" does not have OIDs"
 msgstr ""
 
-#: commands/copy.c:393 commands/copy.c:438
+#: commands/copy.c:396 commands/copy.c:441
 #, c-format
 msgid "You cannot copy view %s"
 msgstr ""
 
-#: commands/copy.c:396
+#: commands/copy.c:399
 #, c-format
 msgid "You cannot change sequence relation %s"
 msgstr ""
 
-#: commands/copy.c:399 commands/copy.c:444
+#: commands/copy.c:402 commands/copy.c:447
 #, c-format
 msgid "You cannot copy object %s"
 msgstr ""
 
-#: commands/copy.c:419
+#: commands/copy.c:422
 #, 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:428 commands/copy.c:484
+#: commands/copy.c:431 commands/copy.c:487
 #, c-format
 msgid "COPY: %s is a directory"
 msgstr ""
 
-#: commands/copy.c:441
+#: commands/copy.c:444
 #, c-format
 msgid "You cannot copy sequence %s"
 msgstr ""
 
-#: commands/copy.c:468
+#: commands/copy.c:471
 msgid "Relative path not allowed for server side COPY command"
 msgstr ""
 
-#: commands/copy.c:476
+#: commands/copy.c:479
 #, 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:554
+#: commands/copy.c:556
 #, c-format
 msgid "COPY: couldn't lookup info for type %u"
 msgstr ""
 
-#: commands/copy.c:558 commands/copy.c:816
+#: commands/copy.c:560 commands/copy.c:826
 msgid "COPY BINARY: cstring not supported"
 msgstr ""
 
-#: commands/copy.c:844
+#: commands/copy.c:893
 msgid "COPY BINARY: file signature not recognized"
 msgstr ""
 
-#: commands/copy.c:848
+#: commands/copy.c:897
 msgid "COPY BINARY: incompatible integer layout"
 msgstr ""
 
-#: commands/copy.c:852
+#: commands/copy.c:901
 msgid "COPY BINARY: bogus file header (missing flags)"
 msgstr ""
 
-#: commands/copy.c:856
+#: commands/copy.c:905
 msgid "COPY BINARY: unrecognized critical flags in header"
 msgstr ""
 
-#: commands/copy.c:860
+#: commands/copy.c:909
 msgid "COPY BINARY: bogus file header (missing length)"
 msgstr ""
 
-#: commands/copy.c:866
+#: commands/copy.c:915
 msgid "COPY BINARY: bogus file header (wrong length)"
 msgstr ""
 
-#: commands/copy.c:915
+#: commands/copy.c:964
 msgid "NULL Oid"
 msgstr "NULL Oid"
 
-#: commands/copy.c:921
+#: commands/copy.c:970
 msgid "Invalid Oid"
 msgstr "Ogiltig Oid"
 
-#: commands/copy.c:938
+#: commands/copy.c:987
 #, c-format
 msgid "Missing data for column \"%s\""
 msgstr "Saknar data f�r kolumn \"%s\""
 
-#: commands/copy.c:970
+#: commands/copy.c:1019
 msgid "Extra data after last expected column"
 msgstr ""
 
-#: commands/copy.c:994
+#: commands/copy.c:1043
 #, c-format
 msgid "COPY BINARY: tuple field count is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1001 commands/copy.c:1007 commands/copy.c:1021
-#: commands/copy.c:1035 commands/copy.c:1044 commands/copy.c:1056
-#: commands/copy.c:1072
+#: 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
 msgid "COPY BINARY: unexpected EOF"
 msgstr "COPY BINARY: ov�ntad EOF"
 
-#: commands/copy.c:1003
+#: commands/copy.c:1052
 #, c-format
 msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1009
+#: commands/copy.c:1058
 msgid "COPY BINARY: Invalid Oid"
 msgstr ""
 
-#: commands/copy.c:1025
+#: commands/copy.c:1075
 #, c-format
 msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
 msgstr ""
 
-#: commands/copy.c:1037
+#: commands/copy.c:1087
 msgid "COPY BINARY: bogus varlena length"
 msgstr ""
 
-#: commands/copy.c:1184
+#: commands/copy.c:1263
 #, c-format
 msgid "GetInputFunction: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1200
+#: commands/copy.c:1279
 #, c-format
 msgid "GetTypeElement: Cache lookup of type %u failed"
 msgstr ""
 
-#: commands/copy.c:1342
+#: commands/copy.c:1421
 msgid "CopyReadAttribute: end of record marker corrupted"
 msgstr ""
 
-#: commands/copy.c:1502
+#: commands/copy.c:1581
 #, c-format
 msgid "Attribute \"%s\" specified more than once"
 msgstr "Attributet \"%s\" angivet mer �n en g�ng"
 
-#: commands/dbcommands.c:100 commands/dbcommands.c:106
-#: commands/dbcommands.c:112 commands/dbcommands.c:118
+#: 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:122
+#: commands/dbcommands.c:121
 #, c-format
 msgid "CREATE DATABASE: option \"%s\" not recognized"
-msgstr ""
+msgstr "CREATE DATABASE: flagga \"%s\" k�nns inte igen"
 
-#: commands/dbcommands.c:145 commands/dbcommands.c:152
+#: commands/dbcommands.c:144 commands/dbcommands.c:151
 msgid "CREATE DATABASE: permission denied"
 msgstr "CREATE DATABASE: r�ttighet saknas"
 
-#: commands/dbcommands.c:157
+#: 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:168 commands/dbcommands.c:308
+#: commands/dbcommands.c:167 commands/dbcommands.c:307
 #, c-format
 msgid "CREATE DATABASE: database \"%s\" already exists"
 msgstr "CREATE DATABASE: databasen \"%s\" existerar redan"
 
-#: commands/dbcommands.c:180
+#: commands/dbcommands.c:179
 #, c-format
 msgid "CREATE DATABASE: template \"%s\" does not exist"
 msgstr "CREATE DATABASE: mallen \"%s\" existerar inte"
 
-#: commands/dbcommands.c:190
+#: commands/dbcommands.c:189
 #, c-format
 msgid "CREATE DATABASE: permission to copy \"%s\" denied"
 msgstr "CREATE DATABASE: r�ttighet att kopiera \"%s\" saknas"
 
-#: commands/dbcommands.c:209
+#: commands/dbcommands.c:208
 #, 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:217
+#: commands/dbcommands.c:216
 msgid "CREATE DATABASE: invalid backend encoding"
 msgstr ""
 
-#: commands/dbcommands.c:245 commands/dbcommands.c:247
-#: commands/dbcommands.c:249
+#: commands/dbcommands.c:244 commands/dbcommands.c:246
+#: commands/dbcommands.c:248
 msgid "database path may not contain single quotes"
 msgstr ""
 
-#: commands/dbcommands.c:272
+#: commands/dbcommands.c:271
 #, c-format
 msgid "CREATE DATABASE: unable to create database directory '%s': %m"
 msgstr ""
 
-#: commands/dbcommands.c:275
+#: commands/dbcommands.c:274
 #, c-format
 msgid "CREATE DATABASE: unable to remove temp directory '%s': %m"
-msgstr ""
+msgstr "CREATE DATABASE: kan inte ta bort tempor�r katalog \"%s\": %m"
 
-#: commands/dbcommands.c:282
+#: commands/dbcommands.c:281
 #, c-format
 msgid "CREATE DATABASE: could not link '%s' to '%s': %m"
-msgstr ""
+msgstr "CREATE DATABASE: kunde inte l�nka \"%s\" till \"%s\": %m"
 
-#: commands/dbcommands.c:292
+#: commands/dbcommands.c:291
 msgid "CREATE DATABASE: could not initialize database directory"
-msgstr ""
+msgstr "CREATE DATABASE: kunde inte initialisera databaskatalogen"
 
-#: commands/dbcommands.c:294
+#: commands/dbcommands.c:293
 msgid ""
 "CREATE DATABASE: could not initialize database directory; delete failed as "
 "well"
-msgstr ""
+msgstr "CREATE DATABASE: kunde inte initialisera databaskatalogen; borttagning misslyckades med"
 
-#: commands/dbcommands.c:379
+#: commands/dbcommands.c:383
 msgid "DROP DATABASE: cannot be executed on the currently open database"
 msgstr ""
 
-#: commands/dbcommands.c:382
+#: commands/dbcommands.c:386
 msgid "DROP DATABASE: may not be called in a transaction block"
 msgstr ""
 
-#: commands/dbcommands.c:397
+#: commands/dbcommands.c:401
 #, c-format
 msgid "DROP DATABASE: database \"%s\" does not exist"
-msgstr ""
+msgstr "DROP DATABASE: databasen \"%s\" existerar inte"
 
-#: commands/dbcommands.c:400
+#: commands/dbcommands.c:404
 msgid "DROP DATABASE: permission denied"
 msgstr "DROP DATABASE: r�ttighet saknas"
 
-#: commands/dbcommands.c:408
+#: commands/dbcommands.c:412
 msgid "DROP DATABASE: database is marked as a template"
-msgstr ""
+msgstr "DROP DATABASE: databasen �r markerad som en mall"
 
-#: commands/dbcommands.c:417
+#: commands/dbcommands.c:421
 #, c-format
 msgid "DROP DATABASE: database \"%s\" is being accessed by other users"
-msgstr ""
+msgstr "DROP DATABASE: databasen \"%s\" anv�nds av andra anv�ndare"
 
-#: commands/dbcommands.c:434
+#: commands/dbcommands.c:438
 #, c-format
 msgid ""
 "DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the "
 "contrary"
 msgstr ""
 
-#: commands/dbcommands.c:678
+#: commands/dbcommands.c:679
 msgid "Relative paths are not allowed as database locations"
 msgstr ""
 
-#: commands/dbcommands.c:680
+#: commands/dbcommands.c:681
 msgid "Absolute paths are not allowed as database locations"
 msgstr ""
 
-#: commands/dbcommands.c:690
+#: commands/dbcommands.c:691
 #, c-format
 msgid "Postmaster environment variable '%s' not set"
 msgstr ""
 
-#: commands/dbcommands.c:692
+#: commands/dbcommands.c:693
 #, c-format
 msgid "Postmaster environment variable '%s' must be absolute path"
 msgstr ""
 
-#: commands/dbcommands.c:698
+#: commands/dbcommands.c:699
 msgid "Alternate path is too long"
 msgstr ""
 
-#: commands/dbcommands.c:727
+#: commands/dbcommands.c:728
 #, c-format
 msgid "could not remove '%s': %m"
 msgstr "kunde inte ta bort \"%s\": %m"
 
-#: commands/dbcommands.c:736
+#: commands/dbcommands.c:737
 #, c-format
 msgid "database directory '%s' could not be removed"
 msgstr "databaskatalogen \"%s\" kunde inte tas bort"
 
-#: commands/dbcommands.c:808 commands/vacuum.c:568
+#: commands/dbcommands.c:809 commands/vacuum.c:582
 #, c-format
 msgid "database %u does not exist"
 msgstr ""
 
-#: commands/define.c:68 commands/define.c:156 commands/define.c:184
-#: commands/define.c:214
+#: commands/define.c:68 commands/define.c:157 commands/define.c:185
+#: commands/define.c:215
 #, c-format
 msgid "Define: \"%s\" requires a parameter"
 msgstr ""
 
-#: commands/define.c:93 commands/define.c:238
+#: commands/define.c:93 commands/define.c:239
 #, c-format
 msgid "Define: cannot interpret argument of \"%s\""
 msgstr ""
 
 #: commands/define.c:106 commands/define.c:115 commands/define.c:128
-#: commands/define.c:143
+#: commands/define.c:144
 #, c-format
 msgid "Define: \"%s\" requires a numeric value"
 msgstr ""
 
-#: commands/define.c:168
+#: commands/define.c:169
 #, c-format
 msgid "Define: argument of \"%s\" must be a name"
 msgstr ""
 
-#: commands/define.c:200
+#: commands/define.c:201
 #, c-format
 msgid "Define: argument of \"%s\" must be a type name"
 msgstr ""
 
-#: commands/define.c:221
+#: commands/define.c:222
 #, c-format
 msgid "Define: \"%s\" requires an integral value"
 msgstr ""
 
-#: commands/define.c:241
+#: commands/define.c:242
 #, c-format
 msgid "Define: invalid argument for \"%s\": \"%s\""
 msgstr ""
 
-#: commands/explain.c:807
+#: commands/explain.c:809
 #, c-format
 msgid "show_sort_keys: no tlist entry for key %d"
 msgstr ""
@@ -3283,12 +3277,12 @@ msgid "Return type \"%s\" is only a shell"
 msgstr ""
 
 #: commands/functioncmds.c:103 commands/functioncmds.c:159
-#: commands/typecmds.c:308 commands/typecmds.c:315 commands/typecmds.c:630
-#: parser/parse_func.c:1388 parser/parse_oper.c:98 parser/parse_oper.c:107
+#: 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
 #, c-format
 msgid "Type \"%s\" does not exist"
-msgstr ""
+msgstr "Typen \"%s\" existerar inte"
 
 #: commands/functioncmds.c:106
 #, c-format
@@ -3298,7 +3292,7 @@ msgstr ""
 #: commands/functioncmds.c:116
 #, c-format
 msgid "could not create type %s"
-msgstr ""
+msgstr "kan inte skapa typ %s"
 
 #: commands/functioncmds.c:150
 #, c-format
@@ -3346,112 +3340,137 @@ msgstr ""
 msgid "CREATE FUNCTION: only one AS item needed for %s language"
 msgstr ""
 
-#: commands/functioncmds.c:399 utils/adt/acl.c:1441
+#: commands/functioncmds.c:399 utils/adt/acl.c:1443
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "spr�k \"%s\" existerar inte"
 
-#: commands/functioncmds.c:506
+#: commands/functioncmds.c:505
 #, c-format
 msgid "RemoveFunction: couldn't find tuple for function %s"
 msgstr ""
 
-#: commands/functioncmds.c:516
+#: commands/functioncmds.c:515
 #, c-format
 msgid ""
 "RemoveFunction: function '%s' is an aggregate\n"
 "\tUse DROP AGGREGATE to remove it"
 msgstr ""
 
-#: commands/functioncmds.c:523
+#: commands/functioncmds.c:522
 #, c-format
 msgid "Removing built-in function \"%s\""
 msgstr ""
 
-#: commands/functioncmds.c:561
+#: commands/functioncmds.c:560
 #, c-format
 msgid "RemoveFunctionById: couldn't find tuple for function %u"
 msgstr ""
 
-#: commands/functioncmds.c:583
+#: commands/functioncmds.c:582
 #, c-format
 msgid "RemoveFunctionById: couldn't find pg_aggregate tuple for %u"
 msgstr ""
 
-#: commands/functioncmds.c:618 commands/functioncmds.c:754
+#: 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:857
 #, c-format
 msgid "source data type %s does not exist"
 msgstr ""
 
-#: commands/functioncmds.c:623 commands/functioncmds.c:759
+#: commands/functioncmds.c:698 commands/functioncmds.c:862
 #, c-format
 msgid "target data type %s does not exist"
 msgstr ""
 
-#: commands/functioncmds.c:627
+#: commands/functioncmds.c:702
 msgid "source data type and target data type are the same"
 msgstr ""
 
-#: commands/functioncmds.c:631
+#: commands/functioncmds.c:706
 #, c-format
 msgid "source data type %s is only a shell"
 msgstr ""
 
-#: commands/functioncmds.c:635
+#: commands/functioncmds.c:710
 #, c-format
 msgid "target data type %s is only a shell"
 msgstr ""
 
-#: commands/functioncmds.c:639
+#: commands/functioncmds.c:714
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:643
+#: commands/functioncmds.c:718
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:648 commands/functioncmds.c:774
+#: commands/functioncmds.c:723 commands/functioncmds.c:877
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr ""
 
-#: commands/functioncmds.c:659
-#, c-format
-msgid "cast from data type %s to data type %s already exists"
-msgstr ""
-
-#: commands/functioncmds.c:675
+#: commands/functioncmds.c:743
 msgid "cast function must take 1 argument"
 msgstr ""
 
-#: commands/functioncmds.c:677
+#: commands/functioncmds.c:745
 msgid "argument of cast function must match source data type"
 msgstr ""
 
-#: commands/functioncmds.c:679
+#: commands/functioncmds.c:747
 msgid "return data type of cast function must match target data type"
 msgstr ""
 
-#: commands/functioncmds.c:681
-msgid "cast function must be immutable"
+#: commands/functioncmds.c:749
+msgid "cast function must not be volatile"
 msgstr ""
 
-#: commands/functioncmds.c:683
+#: commands/functioncmds.c:751
 msgid "cast function must not be an aggregate function"
 msgstr ""
 
-#: commands/functioncmds.c:685
+#: commands/functioncmds.c:753
 msgid "cast function must not return a set"
 msgstr ""
 
-#: commands/functioncmds.c:767
+#: commands/functioncmds.c:776
+#, c-format
+msgid "CreateCast: bogus CoercionContext %c"
+msgstr ""
+
+#: commands/functioncmds.c:793
+#, c-format
+msgid "cast from data type %s to data type %s already exists"
+msgstr ""
+
+#: commands/functioncmds.c:870
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr ""
 
-#: commands/functioncmds.c:810
+#: commands/functioncmds.c:913
 #, c-format
 msgid "could not find tuple for cast %u"
 msgstr ""
@@ -3565,70 +3584,65 @@ msgstr ""
 msgid "pg_opclass contains multiple default opclasses for data type %s"
 msgstr ""
 
-#: commands/indexcmds.c:546 commands/indexcmds.c:589
-#, c-format
-msgid "index \"%s\" does not exist"
-msgstr "index \"%s\" existerar inte"
-
-#: commands/indexcmds.c:549 commands/indexcmds.c:592 commands/indexcmds.c:644
+#: commands/indexcmds.c:544 commands/indexcmds.c:581 commands/indexcmds.c:626
 #, c-format
 msgid "relation \"%s\" is of type \"%c\""
 msgstr ""
 
-#: commands/indexcmds.c:582 commands/indexcmds.c:634
+#: commands/indexcmds.c:571 commands/indexcmds.c:620
 msgid "REINDEX cannot run inside a BEGIN/END block"
 msgstr ""
 
-#: commands/indexcmds.c:599
+#: commands/indexcmds.c:578
+#, c-format
+msgid "index \"%s\" does not exist"
+msgstr "index \"%s\" existerar inte"
+
+#: commands/indexcmds.c:589
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:602
+#: commands/indexcmds.c:592
 #, c-format
 msgid ""
 "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
 "options"
 msgstr ""
 
-#: commands/indexcmds.c:611
+#: commands/indexcmds.c:601
 #, c-format
 msgid "index \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:641
-#, c-format
-msgid "table \"%s\" does not exist"
-msgstr "tabell \"%s\" existerar inte"
-
-#: commands/indexcmds.c:651
+#: commands/indexcmds.c:630
 #, c-format
 msgid "table \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/indexcmds.c:675
+#: commands/indexcmds.c:654
 msgid "REINDEX DATABASE: Can be executed only on the currently open database."
 msgstr ""
 
-#: commands/indexcmds.c:678
+#: commands/indexcmds.c:657
 msgid "REINDEX DATABASE: Permission denied."
 msgstr "REINDEX DATABASE: r�ttighet saknas."
 
-#: commands/indexcmds.c:681
+#: commands/indexcmds.c:660
 msgid "must be called under standalone postgres with -O -P options"
 msgstr ""
 
-#: commands/indexcmds.c:683
+#: commands/indexcmds.c:662
 msgid "must be called under standalone postgres with -P -O options"
 msgstr ""
 
-#: commands/indexcmds.c:691
+#: commands/indexcmds.c:670
 msgid "REINDEX DATABASE cannot run inside a BEGIN/END block"
 msgstr ""
 
-#: commands/indexcmds.c:745
+#: commands/indexcmds.c:728
 #, c-format
 msgid "relation %u was reindexed"
 msgstr ""
@@ -3694,18 +3708,18 @@ msgid ""
 "\tclass \"%s\" already is the default"
 msgstr ""
 
-#: commands/opclasscmds.c:461
+#: commands/opclasscmds.c:464
 #, c-format
 msgid "RemoveOpClass: access method \"%s\" not found"
 msgstr ""
 
-#: commands/opclasscmds.c:488 commands/opclasscmds.c:496
+#: commands/opclasscmds.c:491 commands/opclasscmds.c:499
 #, c-format
 msgid ""
 "RemoveOpClass: operator class \"%s\" not supported by access method \"%s\""
 msgstr ""
 
-#: commands/opclasscmds.c:540
+#: commands/opclasscmds.c:543
 #, c-format
 msgid "RemoveOpClassById: couldn't find pg_class entry %u"
 msgstr ""
@@ -3755,699 +3769,748 @@ msgstr ""
 msgid "PerformPortalClose: portal \"%s\" not found"
 msgstr ""
 
-#: commands/proclang.c:59
+#: commands/proclang.c:61
 msgid ""
 "Only users with superuser privilege are permitted to create procedural "
 "languages"
 msgstr ""
 
-#: commands/proclang.c:71
+#: commands/proclang.c:73
 #, c-format
 msgid "Language %s already exists"
 msgstr ""
 
-#: commands/proclang.c:80
+#: commands/proclang.c:82
 #, c-format
 msgid "function %s() doesn't exist"
 msgstr ""
 
-#: commands/proclang.c:83
+#: commands/proclang.c:94
 #, c-format
-msgid "function %s() does not return type %s"
-msgstr "funktionen %s() har inte returtyp %s"
+msgid ""
+"CreateProceduralLanguage: changing return type of function %s() from OPAQUE "
+"to LANGUAGE_HANDLER"
+msgstr ""
+
+#: commands/proclang.c:99
+#, c-format
+msgid "CreateProceduralLanguage: function %s() must return LANGUAGE_HANDLER"
+msgstr ""
 
-#: commands/proclang.c:93
+#: commands/proclang.c:109
 #, c-format
 msgid "function %s(oid) doesn't exist"
 msgstr ""
 
-#: commands/proclang.c:167
+#: commands/proclang.c:183
 msgid ""
 "Only users with superuser privilege are permitted to drop procedural "
 "languages"
 msgstr ""
 
-#: commands/proclang.c:180
+#: commands/proclang.c:196
 #, c-format
 msgid "Language %s doesn't exist"
 msgstr ""
 
-#: commands/proclang.c:209
+#: commands/proclang.c:225
 #, c-format
 msgid "DropProceduralLanguageById: language %u not found"
 msgstr ""
 
-#: commands/schemacmds.c:77
+#: commands/schemacmds.c:79
 #, c-format
 msgid ""
 "CREATE SCHEMA: permission denied\n"
 "\t\"%s\" is not a superuser, so cannot create a schema for \"%s\""
 msgstr ""
 
-#: commands/schemacmds.c:90
+#: commands/schemacmds.c:92
 #, c-format
 msgid ""
 "CREATE SCHEMA: Illegal schema name: \"%s\" -- pg_ is reserved for system "
 "schemas"
 msgstr ""
 
-#: commands/schemacmds.c:160
+#: commands/schemacmds.c:162
 msgid "Schema name may not be qualified"
 msgstr ""
 
-#: commands/schemacmds.c:167
+#: commands/schemacmds.c:169
 #, c-format
 msgid "Schema \"%s\" does not exist"
 msgstr "Schemat \"%s\" existerar inte"
 
-#: commands/schemacmds.c:204
+#: commands/schemacmds.c:206
 #, c-format
 msgid "RemoveSchemaById: schema %u not found"
 msgstr ""
 
-#: commands/sequence.c:205
+#: commands/sequence.c:207
 msgid "DefineSequence: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:331
+#: commands/sequence.c:334
 #, c-format
 msgid "%s.nextval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:402
+#: commands/sequence.c:409
 #, c-format
-msgid "%s.nextval: reached MAXVALUE ("
+msgid "%s.nextval: reached MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:402 commands/sequence.c:418 commands/sequence.c:553
-#: commands/sequence.c:815 commands/sequence.c:829 commands/sequence.c:832
-#: postmaster/postmaster.c:2244
-msgid ")"
-msgstr ""
-
-#: commands/sequence.c:418
+#: commands/sequence.c:430
 #, c-format
-msgid "%s.nextval: reached MINVALUE ("
+msgid "%s.nextval: reached MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:507
+#: commands/sequence.c:520
 #, c-format
 msgid "%s.currval: you don't have permissions to read sequence %s"
 msgstr ""
 
-#: commands/sequence.c:511
+#: commands/sequence.c:524
 #, c-format
 msgid "%s.currval is not yet defined in this session"
 msgstr ""
 
-#: commands/sequence.c:546
+#: commands/sequence.c:559
 #, c-format
 msgid "%s.setval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:553
+#: commands/sequence.c:574
 #, c-format
-msgid "%s.setval: value "
-msgstr ""
-
-#: commands/sequence.c:553
-msgid " is out of bounds ("
+msgid "%s.setval: value %s is out of bounds (%s,%s)"
 msgstr ""
 
-#: commands/sequence.c:553
-msgid ","
-msgstr ""
-
-#: commands/sequence.c:678
+#: commands/sequence.c:700
 #, c-format
 msgid "%s.%s: %s is not a sequence"
 msgstr ""
 
-#: commands/sequence.c:696
+#: commands/sequence.c:718
 msgid "Memory exhausted in init_sequence"
 msgstr ""
 
-#: commands/sequence.c:724
+#: commands/sequence.c:746
 #, c-format
 msgid "%s.%s: invalid number of blocks in sequence"
 msgstr ""
 
-#: commands/sequence.c:729
+#: commands/sequence.c:751
 #, c-format
 msgid "%s.%s: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:738
+#: commands/sequence.c:760
 #, c-format
 msgid "%s.%s: bad magic (%08X)"
 msgstr ""
 
-#: commands/sequence.c:781
+#: commands/sequence.c:803
 msgid "DefineSequence: CYCLE ??"
 msgstr ""
 
-#: commands/sequence.c:785
+#: commands/sequence.c:807
 #, c-format
 msgid "DefineSequence: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/sequence.c:792
+#: commands/sequence.c:814
 msgid "DefineSequence: can't INCREMENT by 0"
 msgstr ""
 
-#: commands/sequence.c:815
-msgid "DefineSequence: MINVALUE ("
-msgstr ""
-
-#: commands/sequence.c:815
-msgid ") can't be >= MAXVALUE ("
-msgstr ""
-
-#: commands/sequence.c:829 commands/sequence.c:832
-msgid "DefineSequence: START value ("
-msgstr ""
-
-#: commands/sequence.c:829
-msgid ") can't be < MINVALUE ("
+#: commands/sequence.c:843
+#, c-format
+msgid "DefineSequence: MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:832
-msgid ") can't be > MAXVALUE ("
+#: commands/sequence.c:864
+#, c-format
+msgid "DefineSequence: START value (%s) can't be less than MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:838
-msgid "DefineSequence: CACHE ("
+#: commands/sequence.c:874
+#, c-format
+msgid "DefineSequence: START value (%s) can't be greater than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:838
-msgid ") can't be <= 0"
+#: commands/sequence.c:885
+#, c-format
+msgid "DefineSequence: CACHE (%s) can't be <= 0"
 msgstr ""
 
-#: commands/sequence.c:857
+#: commands/sequence.c:905
 #, c-format
 msgid "seq_redo: unknown op code %u"
 msgstr ""
 
-#: commands/sequence.c:865
+#: commands/sequence.c:913
 #, c-format
 msgid "seq_redo: can't read block of %u/%u"
 msgstr ""
 
-#: commands/sequence.c:881
+#: commands/sequence.c:929
 msgid "seq_redo: failed to add item to page"
 msgstr ""
 
-#: commands/tablecmds.c:142
+#: commands/tablecmds.c:152
 msgid "DefineRelation: please inherit from a relation or define an attribute"
 msgstr ""
 
-#: commands/tablecmds.c:350
+#: commands/tablecmds.c:360
 #, c-format
 msgid "TRUNCATE cannot be used on sequences. '%s' is a sequence"
 msgstr ""
 
-#: commands/tablecmds.c:353
+#: commands/tablecmds.c:363
 #, c-format
 msgid "TRUNCATE cannot be used on views. '%s' is a view"
 msgstr ""
 
-#: commands/tablecmds.c:356
+#: commands/tablecmds.c:366
 #, c-format
 msgid "TRUNCATE can only be used on tables. '%s' is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:361
+#: commands/tablecmds.c:372
 #, c-format
 msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
 msgstr ""
 
-#: commands/tablecmds.c:390
+#: commands/tablecmds.c:383
+msgid "TRUNCATE cannot be used on temp tables of other processes"
+msgstr ""
+
+#: commands/tablecmds.c:407
 #, c-format
 msgid ""
 "TRUNCATE cannot be used as table %s references this one via foreign key "
 "constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:500
+#: commands/tablecmds.c:517
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:523
+#: commands/tablecmds.c:540
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:527
+#: commands/tablecmds.c:544
 #, c-format
 msgid "CREATE TABLE: cannot inherit from temp relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:542
+#: commands/tablecmds.c:559
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:592
+#: commands/tablecmds.c:611
 #, c-format
 msgid ""
 "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:597
+#: commands/tablecmds.c:616
 #, c-format
 msgid "CREATE TABLE: inherited attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:739
+#: commands/tablecmds.c:762
 #, c-format
 msgid "CREATE TABLE: merging attribute \"%s\" with inherited definition"
 msgstr ""
 
-#: commands/tablecmds.c:744
+#: commands/tablecmds.c:767
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:780
+#: commands/tablecmds.c:805
 #, c-format
 msgid ""
 "CREATE TABLE: attribute \"%s\" inherits conflicting default values\n"
 "\tTo resolve the conflict, specify a default explicitly"
 msgstr ""
 
-#: commands/tablecmds.c:1024
+#: commands/tablecmds.c:1049
 #, c-format
 msgid "setRelhassubclassInRelation: cache lookup failed for relation %u"
 msgstr ""
 
-#: commands/tablecmds.c:1077
+#: commands/tablecmds.c:1104
 #, c-format
 msgid "renameatt: class \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1120
+#: commands/tablecmds.c:1150
+#, c-format
+msgid "Inherited attribute \"%s\" must be renamed in child tables too"
+msgstr ""
+
+#: commands/tablecmds.c:1158
 #, c-format
 msgid "renameatt: attribute \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1124
+#: commands/tablecmds.c:1163
 #, c-format
 msgid "renameatt: system attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1133
+#: commands/tablecmds.c:1171
+#, c-format
+msgid "renameatt: inherited attribute \"%s\" may not be renamed"
+msgstr ""
+
+#: commands/tablecmds.c:1180
 #, c-format
 msgid "renameatt: attribute \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1164
+#: commands/tablecmds.c:1210
 #, c-format
 msgid "renameatt: can't find index id %u"
 msgstr ""
 
-#: commands/tablecmds.c:1248
+#: commands/tablecmds.c:1295
 #, c-format
 msgid "renamerel: system relation \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1264
+#: commands/tablecmds.c:1311
 #, c-format
 msgid "renamerel: relation \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1268
+#: commands/tablecmds.c:1315
 #, c-format
 msgid "renamerel: relation \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1590 commands/tablecmds.c:1802
-#: commands/tablecmds.c:1936 commands/tablecmds.c:2151
-#: commands/tablecmds.c:2301 commands/tablecmds.c:2405
-#: commands/tablecmds.c:3110 commands/tablecmds.c:3290
+#: 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
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:1601 commands/tablecmds.c:1807
-#: commands/tablecmds.c:1941 commands/tablecmds.c:2059
-#: commands/tablecmds.c:2158 commands/tablecmds.c:2306
-#: commands/tablecmds.c:2410 commands/tablecmds.c:2635
-#: commands/tablecmds.c:3115
+#: 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
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1651
+#: commands/tablecmds.c:1672
+msgid "Attribute must be added to child tables too"
+msgstr ""
+
+#: commands/tablecmds.c:1689
 msgid ""
 "Adding columns with defaults is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE SET DEFAULT."
 msgstr ""
 
-#: commands/tablecmds.c:1655
+#: commands/tablecmds.c:1693
 msgid ""
 "Adding NOT NULL columns is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE ... SET NOT NULL."
 msgstr ""
 
-#: commands/tablecmds.c:1664 commands/tablecmds.c:3318
+#: commands/tablecmds.c:1702 commands/tablecmds.c:3787
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:1675
+#: commands/tablecmds.c:1714
 #, c-format
 msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1681
+#: commands/tablecmds.c:1720
 #, c-format
 msgid "ALTER TABLE: relations limited to %d columns"
 msgstr ""
 
-#: commands/tablecmds.c:1852 commands/tablecmds.c:1986
-#: commands/tablecmds.c:2104
+#: commands/tablecmds.c:1892 commands/tablecmds.c:2026
+#: commands/tablecmds.c:2144
 #, c-format
 msgid "ALTER TABLE: Cannot alter system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1873
+#: commands/tablecmds.c:1913
 #, c-format
 msgid "ALTER TABLE: Index %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:1888
+#: commands/tablecmds.c:1928
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" is in a primary key"
-msgstr ""
+msgstr "ALTER TABLE: Attributet \"%s\" �r del av prim�rnyckel"
 
-#: commands/tablecmds.c:1904 commands/tablecmds.c:2018
-#: commands/tablecmds.c:2246
+#: commands/tablecmds.c:1944 commands/tablecmds.c:2058
+#: commands/tablecmds.c:2286
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
-msgstr ""
+msgstr "ALTER TABLE: relationen \"%s\" har ingen kolumn \"%s\""
 
-#: commands/tablecmds.c:2005
+#: commands/tablecmds.c:2045
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" contains NULL values"
 msgstr ""
 
-#: commands/tablecmds.c:2054
+#: commands/tablecmds.c:2094
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table or view"
 msgstr ""
 
-#: commands/tablecmds.c:2178
+#: commands/tablecmds.c:2218
 #, c-format
 msgid "ALTER TABLE: statistics target %d is too low"
 msgstr ""
 
-#: commands/tablecmds.c:2183
+#: commands/tablecmds.c:2223
 msgid "ALTER TABLE: lowering statistics target to 1000"
 msgstr ""
 
-#: commands/tablecmds.c:2204
+#: commands/tablecmds.c:2244
 #, c-format
 msgid "ALTER TABLE: \"%s\" storage not recognized"
 msgstr ""
 
-#: commands/tablecmds.c:2209
+#: commands/tablecmds.c:2249
 #, c-format
 msgid "ALTER TABLE: Invalid column flag: %c"
 msgstr ""
 
-#: commands/tablecmds.c:2251
+#: commands/tablecmds.c:2291
 #, c-format
 msgid "ALTER TABLE: cannot change system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2267
+#: commands/tablecmds.c:2308
 #, c-format
 msgid "ALTER TABLE: Column datatype %s can only have storage \"plain\""
 msgstr ""
 
-#: commands/tablecmds.c:2322
+#: commands/tablecmds.c:2362
 #, c-format
 msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2344
+#: commands/tablecmds.c:2368
 #, c-format
-msgid "ALTER TABLE: Cannot drop last column from table \"%s\""
+msgid "ALTER TABLE: Cannot drop inherited column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2521
+#: commands/tablecmds.c:2397 commands/tablecmds.c:2448
 #, c-format
-msgid "Only relation '%s' can be referenced in CHECK"
+msgid "ALTER TABLE: relation %u has no column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2572
+#: commands/tablecmds.c:2402 commands/tablecmds.c:2453
 #, c-format
-msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
+msgid "ALTER TABLE: relation %u has non-inherited column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2588
+#: commands/tablecmds.c:2587
 msgid ""
 "ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
 msgstr ""
 
-#: commands/tablecmds.c:2630
+#: commands/tablecmds.c:2617
+msgid ""
+"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
+msgstr ""
+
+#: commands/tablecmds.c:2677
+#, c-format
+msgid "Only relation '%s' can be referenced in CHECK"
+msgstr ""
+
+#: commands/tablecmds.c:2726
+#, c-format
+msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
+msgstr ""
+
+#: commands/tablecmds.c:2782
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
+msgstr "refererad relation \"%s\" �r inte en tabell"
+
+#: commands/tablecmds.c:2787
+#, c-format
+msgid "%s: relation \"%s\" is a system catalog"
+msgstr "%s: relation \"%s\" �r en systemkatalog"
+
+#: commands/tablecmds.c:2802
+#, c-format
+msgid "%s: Unable to reference temporary table from permanent table constraint"
 msgstr ""
 
-#: commands/tablecmds.c:2642
+#: commands/tablecmds.c:2844
+#, c-format
 msgid ""
-"ALTER TABLE / ADD CONSTRAINT: Unable to reference temporary table from "
-"permanent table constraint"
+"%s: number of referencing and referenced attributes for foreign key disagree"
+msgstr ""
+
+#: commands/tablecmds.c:2925
+#, c-format
+msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:2675
+#: commands/tablecmds.c:2928
+#, 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
+#, c-format
+msgid "transformFkeyGetPrimaryKey: index %u not found"
+msgstr ""
+
+#: commands/tablecmds.c:2990
+#, c-format
+msgid "PRIMARY KEY for referenced table \"%s\" not found"
+msgstr ""
+
+#: commands/tablecmds.c:3046
+#, c-format
+msgid "transformFkeyCheckAttrs: index %u not found"
+msgstr ""
+
+#: commands/tablecmds.c:3104
+#, c-format
 msgid ""
-"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
+"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:2909
+#: commands/tablecmds.c:3271
 #, 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:2969
+#: commands/tablecmds.c:3331
 msgid "Unrecognized ON DELETE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3040
+#: commands/tablecmds.c:3402
 msgid "Unrecognized ON UPDATE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3085
+#: commands/tablecmds.c:3447
 #, c-format
 msgid "fkMatchTypeToString: Unknown MATCH TYPE '%c'"
 msgstr ""
 
-#: commands/tablecmds.c:3161
+#: commands/tablecmds.c:3523
 #, c-format
 msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
 msgstr "ALTER TABLE / DROP CONSTRAINT: %s existerar inte"
 
-#: commands/tablecmds.c:3165
+#: commands/tablecmds.c:3527
 msgid "Multiple constraints dropped"
 msgstr ""
 
-#: commands/tablecmds.c:3190
+#: commands/tablecmds.c:3552
 #, c-format
 msgid "ALTER TABLE: relation %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:3255
+#: commands/tablecmds.c:3614
 #, c-format
 msgid ""
 "ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or "
 "sequence"
 msgstr ""
 
-#: commands/tablecmds.c:3307
+#: commands/tablecmds.c:3664
 msgid "Shared relations cannot be toasted after initdb"
 msgstr ""
 
-#: commands/tablecmds.c:3330
-msgid "couldn't lock pg_class tuple"
-msgstr ""
-
-#: commands/tablecmds.c:3348
+#: commands/tablecmds.c:3677
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" already has a toast table"
 msgstr ""
 
-#: commands/tablecmds.c:3365
+#: commands/tablecmds.c:3692
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
 msgstr ""
 
-#: commands/trigger.c:96
+#: commands/trigger.c:98
 #, c-format
 msgid "CreateTrigger: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/trigger.c:100
+#: commands/trigger.c:102
 #, c-format
 msgid "CreateTrigger: can't create trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:158
+#: commands/trigger.c:160
 msgid "CreateTrigger: STATEMENT triggers are unimplemented, yet"
 msgstr ""
 
-#: commands/trigger.c:166
+#: commands/trigger.c:168
 msgid "CreateTrigger: double INSERT event specified"
 msgstr ""
 
-#: commands/trigger.c:171
+#: commands/trigger.c:173
 msgid "CreateTrigger: double DELETE event specified"
 msgstr ""
 
-#: commands/trigger.c:176
+#: commands/trigger.c:178
 msgid "CreateTrigger: double UPDATE event specified"
 msgstr ""
 
-#: commands/trigger.c:180
+#: commands/trigger.c:182
 msgid "CreateTrigger: unknown event specified"
 msgstr ""
 
-#: commands/trigger.c:206
+#: commands/trigger.c:208
 #, c-format
 msgid "CreateTrigger: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:218 commands/trigger.c:224
+#: commands/trigger.c:220
 #, c-format
 msgid "CreateTrigger: function %s() does not exist"
 msgstr "CreateTrigger: funktion %s() existerar inte"
 
-#: commands/trigger.c:230
+#: commands/trigger.c:231
+#, c-format
 msgid ""
-"CreateTrigger: OPAQUE is deprecated, use type TRIGGER instead to define "
-"trigger functions"
+"CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:232
+#: commands/trigger.c:236
 #, c-format
 msgid "CreateTrigger: function %s() must return TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:334
+#: commands/trigger.c:336
 #, c-format
 msgid "CreateTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:418
+#: commands/trigger.c:421
 #, c-format
 msgid "DropTrigger: there is no trigger %s on relation %s"
 msgstr ""
 
-#: commands/trigger.c:468
+#: commands/trigger.c:470
 #, c-format
 msgid "RemoveTriggerById: Trigger %u does not exist"
 msgstr ""
 
-#: commands/trigger.c:479
+#: commands/trigger.c:481
 #, c-format
 msgid "DropTrigger: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/trigger.c:483
+#: commands/trigger.c:485
 #, c-format
 msgid "DropTrigger: can't drop trigger for system relation %s"
 msgstr ""
 
-#: commands/trigger.c:508
+#: commands/trigger.c:510
 #, c-format
 msgid "DropTrigger: relation %s not found in pg_class"
 msgstr ""
 
-#: commands/trigger.c:513
+#: commands/trigger.c:515
 #, c-format
 msgid "DropTrigger: relation %s has reltriggers = 0"
 msgstr ""
 
-#: commands/trigger.c:584
+#: commands/trigger.c:586
 #, c-format
 msgid "renametrig: trigger %s already defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:624
+#: commands/trigger.c:627
 #, c-format
 msgid "renametrig: trigger %s not defined on relation %s"
 msgstr ""
 
-#: commands/trigger.c:682
+#: commands/trigger.c:685
 #, c-format
 msgid "RelationBuildTriggers: unexpected record found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:712
+#: commands/trigger.c:714
 #, c-format
 msgid "RelationBuildTriggers: tgargs IS NULL for rel %s"
 msgstr ""
 
-#: commands/trigger.c:735
+#: commands/trigger.c:737
 #, c-format
 msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:981
+#: commands/trigger.c:983
 #, c-format
 msgid "ExecCallTriggerFunc: function %u returned NULL"
 msgstr ""
 
-#: commands/trigger.c:1219 executor/execMain.c:1036 executor/execMain.c:1307
-#: executor/execMain.c:1441
+#: commands/trigger.c:1222 executor/execMain.c:1043 executor/execMain.c:1317
+#: executor/execMain.c:1452
 msgid "Can't serialize access due to concurrent update"
 msgstr ""
 
-#: commands/trigger.c:1242 executor/execMain.c:1057
+#: commands/trigger.c:1245 executor/execMain.c:1064
 #, c-format
 msgid "Unknown status %u from heap_mark4update"
 msgstr ""
 
-#: commands/trigger.c:1254
+#: commands/trigger.c:1257
 msgid "GetTupleForTrigger: failed ReadBuffer"
 msgstr ""
 
-#: commands/trigger.c:1442
+#: commands/trigger.c:1445
 msgid "DeferredTriggerExecute: failed to fetch old tuple"
 msgstr ""
 
-#: commands/trigger.c:1449
+#: commands/trigger.c:1452
 msgid "DeferredTriggerExecute: failed to fetch new tuple"
 msgstr ""
 
-#: commands/trigger.c:1470
+#: commands/trigger.c:1473
 #, c-format
 msgid "DeferredTriggerExecute: can't find trigger %u"
 msgstr ""
 
-#: commands/trigger.c:1715
+#: commands/trigger.c:1718
 msgid "DeferredTriggerBeginXact() called while inside transaction"
 msgstr ""
 
-#: commands/trigger.c:1892
+#: commands/trigger.c:1896
 msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: commands/trigger.c:1923
+#: commands/trigger.c:1927
 #, c-format
 msgid "Constraint '%s' is not deferrable"
 msgstr ""
 
-#: commands/trigger.c:1938
+#: commands/trigger.c:1941
 #, c-format
 msgid "Constraint '%s' does not exist"
 msgstr "Integritetsvillkor '%s' existerar inte"
 
-#: commands/trigger.c:2015
+#: commands/trigger.c:2018
 msgid "DeferredTriggerSaveEvent() called outside of transaction"
 msgstr ""
 
@@ -4484,282 +4547,302 @@ msgstr ""
 msgid "Define: \"output\" unspecified"
 msgstr ""
 
-#: commands/typecmds.c:213 commands/typecmds.c:222
-msgid ""
-"DefineType: OPAQUE is deprecated, instead declare I/O functions using their "
-"true datatypes"
+#: commands/typecmds.c:220
+#, c-format
+msgid "TypeCreate: changing return type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/typecmds.c:215
+#: commands/typecmds.c:225
 #, c-format
 msgid "Type input function %s must return %s"
 msgstr ""
 
-#: commands/typecmds.c:224
+#: commands/typecmds.c:233
+#, c-format
+msgid "TypeCreate: changing return type of function %s from OPAQUE to CSTRING"
+msgstr ""
+
+#: commands/typecmds.c:238
 #, c-format
 msgid "Type output function %s must return cstring"
 msgstr ""
 
-#: commands/typecmds.c:352
+#: commands/typecmds.c:366
 #, c-format
 msgid "RemoveTypeById: type %u not found"
 msgstr ""
 
-#: commands/typecmds.c:412
+#: commands/typecmds.c:426
 #, c-format
 msgid "CREATE DOMAIN: domain names must be %d characters or less"
 msgstr ""
 
-#: commands/typecmds.c:430
+#: commands/typecmds.c:445
 #, c-format
 msgid "DefineDomain: %s is not a basetype"
 msgstr ""
 
-#: commands/typecmds.c:494
+#: commands/typecmds.c:509
 msgid "CREATE DOMAIN has multiple DEFAULT expressions"
 msgstr ""
 
-#: commands/typecmds.c:522 commands/typecmds.c:529
+#: commands/typecmds.c:539 commands/typecmds.c:546
 msgid "CREATE DOMAIN has conflicting NULL / NOT NULL constraint"
 msgstr ""
 
-#: commands/typecmds.c:535
+#: commands/typecmds.c:552
 msgid "CREATE DOMAIN / UNIQUE indexes not supported"
 msgstr ""
 
-#: commands/typecmds.c:539
+#: commands/typecmds.c:556
 msgid "CREATE DOMAIN / PRIMARY KEY indexes not supported"
 msgstr ""
 
-#: commands/typecmds.c:543
+#: commands/typecmds.c:560
 msgid "DefineDomain: CHECK Constraints not supported"
 msgstr ""
 
-#: commands/typecmds.c:550
+#: commands/typecmds.c:567
 msgid ""
 "DefineDomain: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
 "supported"
 msgstr ""
 
-#: commands/typecmds.c:554
+#: commands/typecmds.c:571
 msgid "DefineDomain: unrecognized constraint node type"
 msgstr ""
 
-#: commands/typecmds.c:637
+#: commands/typecmds.c:654
 #, c-format
 msgid "RemoveDomain: type \"%s\" does not exist"
 msgstr ""
 
-#: commands/typecmds.c:650
+#: commands/typecmds.c:667
 #, c-format
 msgid "%s is not a domain"
 msgstr ""
 
+#: commands/typecmds.c:736
+#, c-format
+msgid "TypeCreate: changing argument type of function %s from OPAQUE to %s"
+msgstr ""
+
 #: commands/typecmds.c:795
+#, c-format
+msgid ""
+"TypeCreate: changing argument type of function %s from OPAQUE to CSTRING"
+msgstr ""
+
+#: commands/typecmds.c:837
 msgid "attempted to define composite type relation with no attrs"
 msgstr ""
 
-#: commands/user.c:140
+#: commands/user.c:141
 #, c-format
 msgid "write_group_file: unable to write %s: %m"
 msgstr ""
 
-#: commands/user.c:168
+#: commands/user.c:171
 #, c-format
 msgid "Invalid group name '%s'"
-msgstr ""
+msgstr "Ogiltigt gruppnamn \"%s\""
 
-#: commands/user.c:198 commands/user.c:328
+#: commands/user.c:201 commands/user.c:331
 #, c-format
 msgid "Invalid user name '%s'"
-msgstr ""
+msgstr "Ogiltigt anv�ndarnamn \"%s\""
 
-#: commands/user.c:229 commands/user.c:352
+#: commands/user.c:232 commands/user.c:355
 #, c-format
 msgid "%s: %m"
-msgstr ""
+msgstr "%s: %m"
 
-#: commands/user.c:237 commands/user.c:360
+#: commands/user.c:240 commands/user.c:363
 #, c-format
 msgid "rename %s to %s: %m"
-msgstr ""
+msgstr "d�p om %s till %s: %m"
 
-#: commands/user.c:284
+#: commands/user.c:287
 #, c-format
 msgid "write_password_file: unable to write %s: %m"
 msgstr ""
 
-#: commands/user.c:331
+#: commands/user.c:334
 #, c-format
 msgid "Invalid user password '%s'"
-msgstr ""
+msgstr "Ogiltigt anv�ndarl�senord \"%s\""
 
-#: commands/user.c:440 commands/user.c:450 commands/user.c:456
-#: commands/user.c:462 commands/user.c:468 commands/user.c:474
+#: commands/user.c:443 commands/user.c:453 commands/user.c:459
+#: commands/user.c:465 commands/user.c:471 commands/user.c:477
 msgid "CREATE USER: conflicting options"
 msgstr ""
 
-#: commands/user.c:478
+#: commands/user.c:481
 #, c-format
 msgid "CREATE USER: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:490
+#: commands/user.c:493
 msgid "user id must be positive"
 msgstr "anv�ndar-id m�ste vara positivt"
 
-#: commands/user.c:505
+#: commands/user.c:508
 msgid "CREATE USER: permission denied"
 msgstr "CREATE USER: r�ttighet saknas"
 
-#: commands/user.c:508
+#: commands/user.c:511
 #, c-format
 msgid "CREATE USER: user name \"%s\" is reserved"
-msgstr ""
+msgstr "CREATE USER: anv�ndarnamn \"%s\" �r reserverat"
 
-#: commands/user.c:543
+#: commands/user.c:546
 #, c-format
 msgid "CREATE USER: user name \"%s\" already exists"
-msgstr ""
+msgstr "CREATE USER: anv�ndarnamn \"%s\" finns redan"
 
-#: commands/user.c:546
+#: commands/user.c:549
 #, c-format
 msgid "CREATE USER: sysid %d is already assigned"
-msgstr ""
+msgstr "CREATE USER: anv�ndarid %d �r redan anv�nd"
 
-#: commands/user.c:577 commands/user.c:781
+#: commands/user.c:580 commands/user.c:784
 msgid "CREATE USER: password encryption failed"
 msgstr ""
 
-#: commands/user.c:667 commands/user.c:677 commands/user.c:683
-#: commands/user.c:689
+#: commands/user.c:670 commands/user.c:680 commands/user.c:686
+#: commands/user.c:692
 msgid "ALTER USER: conflicting options"
 msgstr ""
 
-#: commands/user.c:693
+#: commands/user.c:696
 #, c-format
 msgid "ALTER USER: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:716
+#: commands/user.c:719
 msgid "ALTER USER: permission denied"
 msgstr "ALTER USER: r�ttighet saknas"
 
-#: commands/user.c:720
+#: commands/user.c:723
 msgid "ALTER USER: password changes cannot be rolled back"
 msgstr ""
 
-#: commands/user.c:734
+#: commands/user.c:737
 #, c-format
 msgid "ALTER USER: user \"%s\" does not exist"
 msgstr "ALTER USER: anv�ndare \"%s\" existerar inte"
 
-#: commands/user.c:844 commands/variable.c:541 utils/cache/lsyscache.c:1490
-#: utils/init/miscinit.c:558
+#: commands/user.c:847 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:900
+#: commands/user.c:903
 msgid "DROP USER: permission denied"
 msgstr "DROP USER: r�ttighet saknas"
 
-#: commands/user.c:903
+#: commands/user.c:906
 msgid "DROP USER cannot be rolled back completely"
 msgstr ""
 
-#: commands/user.c:928
+#: commands/user.c:933
+#, 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
 #, c-format
-msgid "DROP USER: user \"%s\" does not exist%s"
-msgstr "DROP USER: anv�ndare \"%s\" existerar inte%s"
+msgid "DROP USER: user \"%s\" does not exist"
+msgstr "DROP USER: anv�ndare \"%s\" existerar inte"
 
-#: commands/user.c:934
+#: commands/user.c:941
 msgid "current user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:936
+#: commands/user.c:943
 msgid "session user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:960
+#: commands/user.c:967
 #, c-format
 msgid "DROP USER: user \"%s\" owns database \"%s\", cannot be removed%s"
-msgstr ""
+msgstr "DROP USER: anv�ndare \"%s\" �ger databas \"%s\", kan inte tas bort%s"
 
-#: commands/user.c:1039
+#: commands/user.c:1046
 #, c-format
 msgid "CheckPgUserAclNotNull: \"%s\" not found"
 msgstr ""
 
-#: commands/user.c:1044
+#: commands/user.c:1051
 #, 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:1086 commands/user.c:1092
+#: commands/user.c:1093 commands/user.c:1099
 msgid "CREATE GROUP: conflicting options"
 msgstr ""
 
-#: commands/user.c:1096
+#: commands/user.c:1103
 #, c-format
 msgid "CREATE GROUP: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/user.c:1104
+#: commands/user.c:1111
 msgid "group id must be positive"
 msgstr ""
 
-#: commands/user.c:1115
+#: commands/user.c:1122
 msgid "CREATE GROUP: permission denied"
 msgstr "CREATE GROUP: r�ttighet saknas"
 
-#: commands/user.c:1118
+#: commands/user.c:1125
 #, c-format
 msgid "CREATE GROUP: group name \"%s\" is reserved"
 msgstr ""
 
-#: commands/user.c:1147
+#: commands/user.c:1154
 #, c-format
 msgid "CREATE GROUP: group name \"%s\" already exists"
 msgstr ""
 
-#: commands/user.c:1150
+#: commands/user.c:1157
 #, c-format
 msgid "CREATE GROUP: group sysid %d is already assigned"
 msgstr ""
 
-#: commands/user.c:1237
+#: commands/user.c:1244
 #, c-format
 msgid "%s: group \"%s\" does not exist"
 msgstr "%s: gruppen \"%s\" existerar inte"
 
-#: commands/user.c:1278
+#: commands/user.c:1285
 #, c-format
 msgid "AlterGroup: unknown tag %s"
 msgstr ""
 
-#: commands/user.c:1289
+#: commands/user.c:1297
 #, c-format
 msgid "%s: user \"%s\" is already in group \"%s\""
 msgstr ""
 
-#: commands/user.c:1304
+#: commands/user.c:1312
 #, c-format
 msgid "ALTER GROUP: group \"%s\" does not have any members"
 msgstr ""
 
-#: commands/user.c:1329
+#: commands/user.c:1337
 #, c-format
 msgid "ALTER GROUP: user \"%s\" is not in group \"%s\""
 msgstr ""
 
-#: commands/user.c:1457
+#: commands/user.c:1465
 msgid "DROP GROUP: permission denied"
 msgstr "DROP GROUP: r�ttighet saknas"
 
-#: commands/user.c:1468
+#: commands/user.c:1476
 #, c-format
 msgid "DROP GROUP: group \"%s\" does not exist"
 msgstr "DROP GROUP: gruppen \"%s\" existerar inte"
@@ -4774,30 +4857,30 @@ msgstr ""
 msgid "%s cannot be executed from a function"
 msgstr ""
 
-#: commands/vacuum.c:446
+#: commands/vacuum.c:460
 msgid ""
 "oldest Xmin is far in the past --- close open transactions soon to avoid "
 "wraparound problems"
 msgstr ""
 
-#: commands/vacuum.c:492 commands/vacuum.c:499
+#: commands/vacuum.c:506 commands/vacuum.c:513
 #, c-format
 msgid "pg_class entry for relid %u vanished during vacuuming"
 msgstr ""
 
-#: commands/vacuum.c:652
+#: commands/vacuum.c:666
 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:663
+#: commands/vacuum.c:677
 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:670
+#: commands/vacuum.c:684
 #, c-format
 msgid ""
 "Some databases have not been vacuumed in %d transactions.\n"
@@ -4805,44 +4888,44 @@ msgid ""
 "\tor you may have a wraparound failure."
 msgstr ""
 
-#: commands/vacuum.c:750
+#: commands/vacuum.c:771
 #, c-format
 msgid "Skipping \"%s\" --- only table or database owner can VACUUM it"
 msgstr ""
 
-#: commands/vacuum.c:935
+#: commands/vacuum.c:977
 #, c-format
 msgid "VACUUM (full_vacuum_rel): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:1002 commands/vacuumlazy.c:211
+#: commands/vacuum.c:1044 commands/vacuumlazy.c:211
 #, c-format
 msgid "--Relation %s.%s--"
 msgstr ""
 
-#: commands/vacuum.c:1036 commands/vacuumlazy.c:269
+#: commands/vacuum.c:1078 commands/vacuumlazy.c:269
 #, c-format
 msgid "Rel %s: Uninitialized page %u - fixing"
 msgstr ""
 
-#: commands/vacuum.c:1150
+#: commands/vacuum.c:1192
 #, c-format
 msgid ""
 "Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
-#: commands/vacuum.c:1160
+#: commands/vacuum.c:1202
 #, c-format
 msgid ""
 "Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
-#: commands/vacuum.c:1178 commands/vacuumlazy.c:373
+#: commands/vacuum.c:1220 commands/vacuumlazy.c:373
 #, c-format
 msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
 msgstr ""
 
-#: commands/vacuum.c:1316
+#: commands/vacuum.c:1358
 #, c-format
 msgid ""
 "Pages %u: Changed %u, reaped %u, Empty %u, New %u; Tup %.0f: Vac %.0f, Keep/"
@@ -4851,112 +4934,112 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:1538
+#: commands/vacuum.c:1581
 msgid "HEAP_MOVED_IN was not expected"
 msgstr ""
 
-#: commands/vacuum.c:1548
+#: commands/vacuum.c:1591
 msgid "Invalid XVAC in tuple header"
 msgstr ""
 
-#: commands/vacuum.c:1573
+#: commands/vacuum.c:1616
 msgid "HEAP_MOVED_OFF was expected"
 msgstr ""
 
-#: commands/vacuum.c:1625 commands/vacuum.c:1747
+#: 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:1662
+#: commands/vacuum.c:1707
 msgid ""
 "Child itemid in update-chain marked as unused - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1759
+#: commands/vacuum.c:1804
 msgid "Parent itemid marked as unused"
 msgstr ""
 
-#: commands/vacuum.c:1784
+#: commands/vacuum.c:1828
 msgid "Too old parent tuple found - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1908
+#: commands/vacuum.c:1957
 #, c-format
 msgid "moving chain: failed to add item with len = %lu to page %u"
 msgstr ""
 
-#: commands/vacuum.c:2050
+#: commands/vacuum.c:2101
 #, c-format
 msgid ""
 "failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %"
 "u)"
 msgstr ""
 
-#: commands/vacuum.c:2135
+#: commands/vacuum.c:2190
 msgid "HEAP_MOVED_IN was not expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2139
+#: commands/vacuum.c:2194
 msgid "Invalid XVAC in tuple header (4)"
 msgstr ""
 
-#: commands/vacuum.c:2164
+#: commands/vacuum.c:2219
 msgid "HEAP_MOVED_OFF was expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2275
+#: commands/vacuum.c:2330
 msgid "HEAP_MOVED_OFF/HEAP_MOVED_IN was expected"
 msgstr ""
 
-#: commands/vacuum.c:2277
+#: commands/vacuum.c:2332
 msgid "Invalid XVAC in tuple header (2)"
 msgstr ""
 
-#: commands/vacuum.c:2295
+#: commands/vacuum.c:2350
 #, c-format
 msgid ""
 "Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:2357
+#: commands/vacuum.c:2412
 msgid "Invalid XVAC in tuple header (3)"
 msgstr ""
 
-#: commands/vacuum.c:2362
+#: commands/vacuum.c:2417
 msgid "HEAP_MOVED_OFF was expected (3)"
 msgstr ""
 
-#: commands/vacuum.c:2409
+#: commands/vacuum.c:2467
 #, c-format
 msgid "VACUUM (repair_frag): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2473
+#: commands/vacuum.c:2531
 #, c-format
 msgid "VACUUM (vacuum_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2479
+#: commands/vacuum.c:2537
 #, c-format
 msgid "Rel %s: Pages: %u --> %u."
 msgstr ""
 
-#: commands/vacuum.c:2564 commands/vacuumlazy.c:601
+#: commands/vacuum.c:2622 commands/vacuumlazy.c:600
 #, c-format
 msgid ""
 "Index %s: Pages %u; Tuples %.0f.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:2577 commands/vacuum.c:2631
+#: commands/vacuum.c:2635 commands/vacuum.c:2689
 #, 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:2618 commands/vacuumlazy.c:648
+#: commands/vacuum.c:2676 commands/vacuumlazy.c:647
 #, c-format
 msgid ""
 "Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
@@ -4970,19 +5053,19 @@ msgid ""
 "\tTotal %s"
 msgstr ""
 
-#: commands/vacuumlazy.c:486
+#: commands/vacuumlazy.c:485
 #, c-format
 msgid ""
 "Removed %d tuples in %d pages.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuumlazy.c:723
+#: commands/vacuumlazy.c:721
 #, c-format
 msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuumlazy.c:758
+#: commands/vacuumlazy.c:756
 #, c-format
 msgid ""
 "Truncated %u --> %u pages.\n"
@@ -5002,35 +5085,54 @@ msgstr ""
 msgid "SET DATESTYLE: conflicting specifications"
 msgstr ""
 
-#: commands/variable.c:287
+#: commands/variable.c:288
 msgid "SET TIME ZONE: illegal INTERVAL; month not allowed"
 msgstr ""
 
-#: commands/variable.c:330
+#: commands/variable.c:331
 msgid "Unable to clear TZ environment variable"
 msgstr ""
 
-#: commands/variable.c:349
+#: commands/variable.c:351
 msgid "assign_timezone: putenv failed"
 msgstr ""
 
-#: commands/variable.c:422
+#: commands/variable.c:420
 msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr ""
 
-#: commands/variable.c:487
+#: commands/variable.c:495
 #, c-format
 msgid "Conversion between %s and %s is not supported"
 msgstr ""
 
-#: commands/variable.c:499
+#: commands/variable.c:507
 msgid "SET SERVER_ENCODING is not supported"
 msgstr ""
 
-#: commands/view.c:82
+#: commands/view.c:87
 msgid "attempted to define virtual relation with no attrs"
 msgstr ""
 
+#: commands/view.c:109
+#, c-format
+msgid "%s is not a view"
+msgstr "%s �r inte en vy"
+
+#: commands/view.c:161 commands/view.c:171
+msgid "Cannot change number of columns in view"
+msgstr ""
+
+#: commands/view.c:174
+#, c-format
+msgid "Cannot change name of view column \"%s\""
+msgstr ""
+
+#: commands/view.c:179
+#, c-format
+msgid "Cannot change datatype of view column \"%s\""
+msgstr ""
+
 #: commands/prepare.c:66
 msgid "No statement name given"
 msgstr ""
@@ -5039,30 +5141,30 @@ msgstr ""
 msgid "Utility statements cannot be prepared"
 msgstr ""
 
-#: commands/prepare.c:124
+#: commands/prepare.c:117
 msgid "ExecuteQuery: wrong number of arguments"
 msgstr ""
 
-#: commands/prepare.c:175
+#: commands/prepare.c:168
 msgid "INTO clause specified for non-SELECT query"
 msgstr ""
 
-#: commands/prepare.c:218
+#: commands/prepare.c:211
 msgid "InitQueryHashTable: unable to create hash table"
 msgstr ""
 
-#: commands/prepare.c:248
+#: commands/prepare.c:241
 #, c-format
 msgid "Prepared statement with name \"%s\" already exists"
 msgstr ""
 
-#: commands/prepare.c:278
+#: commands/prepare.c:271
 #, c-format
 msgid "Unable to store prepared statement \"%s\"!"
 msgstr ""
 
-#: commands/prepare.c:304 commands/prepare.c:321 commands/prepare.c:374
-#: commands/prepare.c:398
+#: commands/prepare.c:297 commands/prepare.c:314 commands/prepare.c:367
+#: commands/prepare.c:391
 #, c-format
 msgid "Prepared statement with name \"%s\" does not exist"
 msgstr ""
@@ -5082,68 +5184,68 @@ msgstr ""
 msgid "ExecRestrPos: node type %d not supported"
 msgstr ""
 
-#: executor/execMain.c:407
+#: executor/execMain.c:408
 #, c-format
 msgid "ExecCheckRTEPerms: bogus operation %d"
 msgstr ""
 
-#: executor/execMain.c:778
+#: executor/execMain.c:782
 #, c-format
 msgid "You can't change sequence relation %s"
 msgstr ""
 
-#: executor/execMain.c:782
+#: executor/execMain.c:786
 #, c-format
 msgid "You can't change toast relation %s"
 msgstr ""
 
-#: executor/execMain.c:786
+#: executor/execMain.c:790
 #, c-format
 msgid "You can't change view relation %s"
 msgstr ""
 
-#: executor/execMain.c:987
+#: executor/execMain.c:991
 msgid "ExecutePlan: NO (junk) `ctid' was found!"
 msgstr ""
 
-#: executor/execMain.c:991
+#: executor/execMain.c:995
 msgid "ExecutePlan: (junk) `ctid' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1016
+#: executor/execMain.c:1020
 #, c-format
 msgid "ExecutePlan: NO (junk) `%s' was found!"
 msgstr ""
 
-#: executor/execMain.c:1021
+#: executor/execMain.c:1025
 #, c-format
 msgid "ExecutePlan: (junk) `%s' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1105
+#: executor/execMain.c:1114
 msgid "ExecutePlan: unknown operation in queryDesc"
 msgstr ""
 
-#: executor/execMain.c:1372
+#: executor/execMain.c:1382
 msgid "ExecUpdate: UPDATE can't run without transactions"
 msgstr ""
 
-#: executor/execMain.c:1571
+#: executor/execMain.c:1582
 #, c-format
 msgid "%s: Fail to add null value in not null attribute %s"
 msgstr ""
 
-#: executor/execMain.c:1581
+#: executor/execMain.c:1592
 #, c-format
 msgid "%s: rejected due to CHECK constraint \"%s\" on \"%s\""
 msgstr ""
 
-#: executor/execMain.c:1625
+#: executor/execMain.c:1636
 #, c-format
 msgid "EvalPlanQual: can't find RTE %d"
 msgstr ""
 
-#: executor/execMain.c:1643
+#: executor/execMain.c:1654
 msgid "EvalPlanQual: t_xmin is uncommitted ?!"
 msgstr ""
 
@@ -5172,96 +5274,115 @@ msgstr ""
 msgid "ExecGetTupType: node type %d unsupported"
 msgstr ""
 
-#: executor/execQual.c:146 executor/execQual.c:168
+#: executor/execQual.c:150 executor/execQual.c:172
 #, c-format
 msgid "ExecEvalArrayRef: can only handle %d dimensions"
 msgstr ""
 
-#: executor/execQual.c:190
+#: executor/execQual.c:194
 msgid "ExecEvalArrayRef: upper and lower indices mismatch"
 msgstr ""
 
-#: executor/execQual.c:271
+#: executor/execQual.c:275
 msgid "ExecEvalAggref: no aggregates in this expression context"
 msgstr ""
 
-#: executor/execQual.c:473
+#: executor/execQual.c:477
 msgid "ExecEvalParam: new/old params with same id & diff names"
 msgstr ""
 
-#: executor/execQual.c:482
+#: executor/execQual.c:486
 #, c-format
 msgid "ExecEvalParam: invalid paramkind %d"
 msgstr ""
 
-#: executor/execQual.c:496
+#: executor/execQual.c:500
 #, c-format
 msgid "ExecEvalParam: Unknown value for parameter %s"
 msgstr ""
 
-#: executor/execQual.c:530
+#: executor/execQual.c:534
 msgid "GetAttributeByNum: Invalid attribute number"
 msgstr ""
 
-#: executor/execQual.c:533
+#: executor/execQual.c:537
 msgid "GetAttributeByNum: cannot access system attributes here"
 msgstr ""
 
-#: executor/execQual.c:536
+#: executor/execQual.c:540
 msgid "GetAttributeByNum: a NULL isNull flag was passed"
 msgstr ""
 
-#: executor/execQual.c:564
+#: executor/execQual.c:568
 msgid "GetAttributeByName: Invalid attribute name"
 msgstr ""
 
-#: executor/execQual.c:567
+#: executor/execQual.c:571
 msgid "GetAttributeByName: a NULL isNull flag was passed"
 msgstr ""
 
-#: executor/execQual.c:589
+#: executor/execQual.c:593
 #, c-format
 msgid "GetAttributeByName: attribute %s not found"
 msgstr ""
 
-#: executor/execQual.c:634
+#: executor/execQual.c:638
 msgid "Functions and operators can take only one set argument"
 msgstr ""
 
-#: executor/execQual.c:687 executor/execQual.c:723 executor/execQual.c:1833
-#: executor/functions.c:531 executor/functions.c:566 utils/adt/sets.c:201
+#: 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 ""
 
-#: executor/execQual.c:1228
+#: executor/execQual.c:875
+msgid "ExecMakeTableFunctionResult: expression is not a function call"
+msgstr ""
+
+#: executor/execQual.c:996 executor/execQual.c:1029
+msgid ""
+"ExecMakeTableFunctionResult: Invalid result from function returning tuple"
+msgstr ""
+
+#: executor/execQual.c:1054
+msgid "ExecMakeTableFunctionResult: Materialize-mode protocol not followed"
+msgstr ""
+
+#: executor/execQual.c:1059
+#, c-format
+msgid "ExecMakeTableFunctionResult: unknown returnMode %d"
+msgstr ""
+
+#: executor/execQual.c:1468
 #, c-format
 msgid "ExecEvalNullTest: unexpected nulltesttype %d"
 msgstr ""
 
-#: executor/execQual.c:1255
+#: executor/execQual.c:1548
 #, c-format
-msgid "Domain %s does not allow NULL values"
+msgid "ExecEvalBooleanTest: unexpected booltesttype %d"
 msgstr ""
 
-#: executor/execQual.c:1260
-msgid "ExecEvalConstraint: Domain CHECK Constraints not yet implemented"
+#: executor/execQual.c:1573
+#, c-format
+msgid "Domain %s does not allow NULL values"
 msgstr ""
 
-#: executor/execQual.c:1263
-msgid "ExecEvalConstraint: Constraint type unknown"
+#: executor/execQual.c:1578
+msgid "Domain CHECK Constraints not yet implemented"
 msgstr ""
 
-#: executor/execQual.c:1345
-#, c-format
-msgid "ExecEvalBooleanTest: unexpected booltesttype %d"
+#: executor/execQual.c:1581
+msgid "ExecEvalConstraintTest: Constraint type unknown"
 msgstr ""
 
-#: executor/execQual.c:1499 executor/execQual.c:1544
+#: executor/execQual.c:1737 executor/execQual.c:1782
 #, c-format
 msgid "ExecEvalExpr: unknown expression type %d"
 msgstr ""
 
-#: executor/execQual.c:1893
+#: executor/execQual.c:2128
 msgid "ExecTargetList: fjoin nodes not currently supported"
 msgstr ""
 
@@ -5325,42 +5446,42 @@ msgstr ""
 msgid "Aggregate function %u called as normal function"
 msgstr ""
 
-#: executor/nodeAppend.c:293
+#: executor/nodeAppend.c:295
 msgid "ExecProcAppend: subnode is NULL"
 msgstr ""
 
-#: executor/nodeFunctionscan.c:458
+#: executor/nodeFunctionscan.c:93
 msgid ""
 "Query-specified return tuple and actual function return tuple do not match"
 msgstr ""
 
-#: executor/nodeHash.c:67
+#: executor/nodeHash.c:66
 msgid "ExecHash: hash table is NULL."
 msgstr ""
 
-#: executor/nodeHash.c:312 executor/nodeHash.c:491 executor/nodeHash.c:733
+#: executor/nodeHash.c:311 executor/nodeHash.c:490 executor/nodeHash.c:732
 msgid "Insufficient memory for hash table."
 msgstr ""
 
-#: executor/nodeHash.c:685
+#: executor/nodeHash.c:684
 #, c-format
 msgid "hashFunc: Invalid typLen %d"
 msgstr ""
 
-#: executor/nodeHashjoin.c:358
+#: executor/nodeHashjoin.c:357
 #, c-format
 msgid "ExecInitHashJoin: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeHashjoin.c:530 executor/nodeHashjoin.c:538
+#: executor/nodeHashjoin.c:529 executor/nodeHashjoin.c:537
 msgid "Read from hashjoin temp file failed"
 msgstr ""
 
-#: executor/nodeHashjoin.c:594 executor/nodeHashjoin.c:599
+#: executor/nodeHashjoin.c:593 executor/nodeHashjoin.c:598
 msgid "Failed to rewind hash temp file"
 msgstr ""
 
-#: executor/nodeHashjoin.c:670 executor/nodeHashjoin.c:673
+#: executor/nodeHashjoin.c:669 executor/nodeHashjoin.c:672
 msgid "Write to hashjoin temp file failed"
 msgstr ""
 
@@ -5396,7 +5517,7 @@ msgstr ""
 msgid "RIGHT JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1473 optimizer/path/joinpath.c:936
+#: executor/nodeMergejoin.c:1473 optimizer/path/joinpath.c:935
 msgid "FULL JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
@@ -5464,58 +5585,58 @@ msgstr ""
 msgid "Memory exhausted in SPI_finish"
 msgstr ""
 
-#: executor/spi.c:315 executor/spi.c:342 executor/spi.c:371 executor/spi.c:410
-#: executor/spi.c:654 executor/spi.c:1332
+#: executor/spi.c:315 executor/spi.c:342 executor/spi.c:371 executor/spi.c:409
+#: executor/spi.c:653 executor/spi.c:1331
 msgid "SPI: stack corrupted"
 msgstr ""
 
-#: executor/spi.c:721
+#: executor/spi.c:720
 msgid "cannot open multi-query plan as cursor"
 msgstr ""
 
-#: executor/spi.c:726
+#: executor/spi.c:725
 msgid "plan in SPI_cursor_open() is not a SELECT"
 msgstr ""
 
-#: executor/spi.c:728
+#: executor/spi.c:727
 msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
 msgstr ""
 
-#: executor/spi.c:730
+#: executor/spi.c:729
 msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
 msgstr ""
 
-#: executor/spi.c:761
+#: executor/spi.c:760
 #, c-format
 msgid "cursor \"%s\" already in use"
 msgstr ""
 
-#: executor/spi.c:767
+#: executor/spi.c:766
 #, c-format
 msgid "failed to create portal \"%s\""
 msgstr ""
 
-#: executor/spi.c:880 executor/spi.c:1238
+#: executor/spi.c:879 executor/spi.c:1237
 msgid "invalid portal in SPI cursor operation"
 msgstr ""
 
-#: executor/spi.c:905
+#: executor/spi.c:904
 msgid "SPI: improper call to spi_printtup"
 msgstr ""
 
-#: executor/spi.c:907
+#: executor/spi.c:906
 msgid "SPI: stack corrupted in spi_printtup"
 msgstr ""
 
-#: executor/spi.c:1189
+#: executor/spi.c:1188
 msgid "SPI_select: retrieve into portal not implemented"
 msgstr ""
 
-#: executor/spi.c:1199
+#: executor/spi.c:1198
 msgid "SPI_select: # of processed tuples check failed"
 msgstr ""
 
-#: executor/spi.c:1298
+#: executor/spi.c:1297
 msgid "SPI_fetch: # of processed tuples check failed"
 msgstr ""
 
@@ -5527,338 +5648,338 @@ msgstr ""
 msgid "Memory exhausted in DLNewElem"
 msgstr ""
 
-#: libpq/auth.c:107
+#: libpq/auth.c:106
 #, c-format
 msgid "pg_krb4_recvauth: kerberos error: %s"
 msgstr ""
 
-#: libpq/auth.c:113
+#: libpq/auth.c:112
 #, c-format
 msgid "pg_krb4_recvauth: protocol version \"%s\" != \"%s\""
 msgstr ""
 
-#: libpq/auth.c:119
+#: libpq/auth.c:118
 #, c-format
 msgid "pg_krb4_recvauth: name \"%s\" != \"%s\""
 msgstr ""
 
-#: libpq/auth.c:131
+#: libpq/auth.c:130
 msgid "pg_krb4_recvauth: Kerberos not implemented on this server"
 msgstr ""
 
-#: libpq/auth.c:192
+#: libpq/auth.c:190
 #, c-format
 msgid "pg_krb5_init: krb5_init_context returned Kerberos error %d"
 msgstr ""
 
-#: libpq/auth.c:201
+#: libpq/auth.c:199
 #, c-format
 msgid "pg_krb5_init: krb5_kt_resolve returned Kerberos error %d"
 msgstr ""
 
-#: libpq/auth.c:213
+#: libpq/auth.c:211
 #, c-format
 msgid "pg_krb5_init: krb5_sname_to_principal returned Kerberos error %d"
 msgstr ""
 
-#: libpq/auth.c:257
+#: libpq/auth.c:255
 #, c-format
 msgid "pg_krb5_recvauth: krb5_recvauth returned Kerberos error %d"
 msgstr ""
 
-#: libpq/auth.c:281
+#: libpq/auth.c:279
 #, c-format
 msgid "pg_krb5_recvauth: krb5_unparse_name returned Kerberos error %d"
 msgstr ""
 
-#: libpq/auth.c:292
+#: libpq/auth.c:290
 #, c-format
 msgid "pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\""
 msgstr ""
 
-#: libpq/auth.c:311
+#: libpq/auth.c:309
 msgid "pg_krb5_recvauth: Kerberos not implemented on this server"
 msgstr ""
 
-#: libpq/auth.c:377
+#: libpq/auth.c:374
 #, c-format
 msgid "%s authentication failed for user \"%s\""
 msgstr ""
 
-#: libpq/auth.c:399
+#: libpq/auth.c:396
 msgid "Missing or erroneous pg_hba.conf file, see postmaster log for details"
 msgstr ""
 
-#: libpq/auth.c:420
+#: libpq/auth.c:417
 #, c-format
 msgid "No pg_hba.conf entry for host %s, user %s, database %s"
 msgstr ""
 
-#: libpq/auth.c:453
+#: libpq/auth.c:450
 #, c-format
 msgid "pg_local_sendauth: can't do setsockopt: %m"
 msgstr ""
 
-#: libpq/auth.c:542
+#: libpq/auth.c:539
 #, c-format
 msgid "pam_passwd_conv_proc: Error from underlying PAM layer: '%s'"
 msgstr ""
 
-#: libpq/auth.c:546
+#: libpq/auth.c:543
 #, c-format
 msgid "pam_passwd_conv_proc: Unexpected PAM conversation %d/'%s'"
 msgstr ""
 
-#: libpq/auth.c:577
+#: libpq/auth.c:573
 msgid "received PAM packet"
 msgstr ""
 
-#: libpq/auth.c:581
+#: libpq/auth.c:577
 msgid "pam_passwd_conv_proc: no password"
 msgstr ""
 
-#: libpq/auth.c:594
+#: libpq/auth.c:590
 msgid "pam_passwd_conv_proc: Out of memory!"
 msgstr ""
 
-#: libpq/auth.c:638
+#: libpq/auth.c:634
 #, c-format
 msgid "CheckPAMAuth: Failed to create PAM authenticator: '%s'"
 msgstr ""
 
-#: libpq/auth.c:648
+#: libpq/auth.c:644
 #, c-format
 msgid "CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:658
+#: libpq/auth.c:654
 #, c-format
 msgid "CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:668
+#: libpq/auth.c:664
 #, c-format
 msgid "CheckPAMAuth: pam_authenticate failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:678
+#: libpq/auth.c:674
 #, c-format
 msgid "CheckPAMAuth: pam_acct_mgmt failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:688
+#: libpq/auth.c:684
 #, c-format
 msgid "CheckPAMAuth: Failed to release PAM authenticator: '%s'"
 msgstr ""
 
-#: libpq/auth.c:727
+#: libpq/auth.c:724
 #, c-format
 msgid "unexpected password packet size: read %d, expected %d"
 msgstr ""
 
-#: libpq/auth.c:731
+#: libpq/auth.c:728
 msgid "received password packet"
 msgstr ""
 
-#: libpq/be-fsstubs.c:85
+#: libpq/be-fsstubs.c:84
 #, c-format
 msgid "lo_open(%u,%d)"
 msgstr ""
 
-#: libpq/be-fsstubs.c:103
+#: libpq/be-fsstubs.c:102
 #, c-format
 msgid "cannot open large object %u"
 msgstr ""
 
-#: libpq/be-fsstubs.c:123
+#: libpq/be-fsstubs.c:122
 #, c-format
 msgid "lo_close: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/be-fsstubs.c:127
+#: libpq/be-fsstubs.c:126
 #, c-format
 msgid "lo_close(%d)"
 msgstr ""
 
-#: libpq/be-fsstubs.c:159
+#: libpq/be-fsstubs.c:158
 #, c-format
 msgid "lo_read: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/be-fsstubs.c:181
+#: libpq/be-fsstubs.c:180
 #, c-format
 msgid "lo_write: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/be-fsstubs.c:207
+#: libpq/be-fsstubs.c:206
 #, c-format
 msgid "lo_lseek: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: libpq/be-fsstubs.c:262
+#: libpq/be-fsstubs.c:261
 #, c-format
 msgid "lo_tell: invalid large object descriptor (%d)"
 msgstr ""
 
-#: libpq/be-fsstubs.c:364
+#: 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/be-fsstubs.c:379
+#: libpq/be-fsstubs.c:378
 #, c-format
 msgid "lo_import: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: libpq/be-fsstubs.c:387
+#: libpq/be-fsstubs.c:386
 #, c-format
 msgid "lo_import: can't create inv object for \"%s\""
 msgstr ""
 
-#: libpq/be-fsstubs.c:398
+#: libpq/be-fsstubs.c:397
 #, c-format
 msgid "lo_import: error while reading \"%s\""
 msgstr ""
 
-#: libpq/be-fsstubs.c:427
+#: 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/be-fsstubs.c:437
+#: libpq/be-fsstubs.c:436
 #, c-format
 msgid "lo_export: can't open inv object %u"
 msgstr ""
 
-#: libpq/be-fsstubs.c:455
+#: libpq/be-fsstubs.c:454
 #, c-format
 msgid "lo_export: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: libpq/be-fsstubs.c:465
+#: libpq/be-fsstubs.c:464
 #, c-format
 msgid "lo_export: error while writing \"%s\""
 msgstr ""
 
-#: libpq/be-secure.c:294 libpq/be-secure.c:344
+#: libpq/be-secure.c:293 libpq/be-secure.c:343
 #, c-format
 msgid "SSL SYSCALL error: %s"
 msgstr "SSL SYSCALL-fel: %s"
 
-#: libpq/be-secure.c:297 libpq/be-secure.c:347
+#: libpq/be-secure.c:296 libpq/be-secure.c:346
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL-fel: %s"
 
-#: libpq/be-secure.c:399
+#: libpq/be-secure.c:398
 #, c-format
 msgid "DH errors (%s): %d bits expected, %d bits found"
 msgstr ""
 
-#: libpq/be-secure.c:409
+#: libpq/be-secure.c:408
 #, c-format
 msgid "DH_check error (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:414
+#: libpq/be-secure.c:413
 #, c-format
 msgid "DH error (%s): p is not prime"
 msgstr ""
 
-#: libpq/be-secure.c:421
+#: libpq/be-secure.c:420
 #, c-format
 msgid "DH error (%s): neither suitable generator or safe prime"
 msgstr ""
 
-#: libpq/be-secure.c:447
+#: libpq/be-secure.c:446
 #, c-format
 msgid "DH load buffer: %s"
 msgstr ""
 
-#: libpq/be-secure.c:519
+#: libpq/be-secure.c:518
 #, c-format
 msgid "DH: generating parameters (%d bits)...."
 msgstr ""
 
-#: libpq/be-secure.c:553
+#: libpq/be-secure.c:552
 msgid "SSL: handshake start"
 msgstr ""
 
-#: libpq/be-secure.c:556
+#: libpq/be-secure.c:555
 msgid "SSL: handshake done"
 msgstr ""
 
-#: libpq/be-secure.c:559
+#: libpq/be-secure.c:558
 msgid "SSL: accept loop"
 msgstr ""
 
-#: libpq/be-secure.c:562
+#: libpq/be-secure.c:561
 #, c-format
 msgid "SSL: accept exit (%d)"
 msgstr ""
 
-#: libpq/be-secure.c:565
+#: libpq/be-secure.c:564
 msgid "SSL: connect loop"
 msgstr ""
 
-#: libpq/be-secure.c:568
+#: libpq/be-secure.c:567
 #, c-format
 msgid "SSL: connect exit (%d)"
 msgstr ""
 
-#: libpq/be-secure.c:571
+#: libpq/be-secure.c:570
 #, c-format
 msgid "SSL: read alert (0x%04x)"
 msgstr ""
 
-#: libpq/be-secure.c:574
+#: libpq/be-secure.c:573
 #, c-format
 msgid "SSL: write alert (0x%04x)"
 msgstr ""
 
-#: libpq/be-secure.c:595
+#: libpq/be-secure.c:594
 #, c-format
 msgid "failed to create SSL context: %s"
 msgstr ""
 
-#: libpq/be-secure.c:606
+#: libpq/be-secure.c:605
 #, c-format
 msgid "failed to load server certificate (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:614
+#: libpq/be-secure.c:613
 #, c-format
 msgid "failed to stat private key file (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:621
+#: libpq/be-secure.c:620
 #, c-format
 msgid "bad permissions on private key file (%s)"
 msgstr ""
 
-#: libpq/be-secure.c:626
+#: libpq/be-secure.c:625
 #, c-format
 msgid "failed to load private key file (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:632
+#: libpq/be-secure.c:631
 #, c-format
 msgid "check of private key failed: %s"
 msgstr ""
 
-#: libpq/be-secure.c:646
+#: libpq/be-secure.c:648
 #, c-format
 msgid "could not read root cert file (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:679
+#: libpq/be-secure.c:682
 #, c-format
 msgid "failed to initialize SSL connection: %s"
 msgstr ""
 
-#: libpq/be-secure.c:701
+#: libpq/be-secure.c:704
 #, c-format
 msgid "secure connection from '%s'"
 msgstr ""
@@ -5869,65 +5990,65 @@ msgid ""
 "cannot be used."
 msgstr ""
 
-#: libpq/hba.c:122
+#: libpq/hba.c:123
 #, c-format
 msgid "Token too long in authentication file, skipping, %s"
 msgstr ""
 
-#: libpq/hba.c:255
+#: libpq/hba.c:256
 #, c-format
 msgid ""
 "tokenize_inc_file: Unable to open secondary authentication file \"@%s\" as "
 "\"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:657
+#: libpq/hba.c:659
 #, c-format
 msgid "parse_hba: invalid syntax in pg_hba.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: libpq/hba.c:710 libpq/hba.c:732
+#: libpq/hba.c:712 libpq/hba.c:734
 #, c-format
 msgid "could not open %s: %m"
 msgstr ""
 
-#: libpq/hba.c:843
+#: libpq/hba.c:845
 #, c-format
 msgid "load_hba: Unable to open authentication config file \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:906
+#: libpq/hba.c:908
 #, c-format
 msgid ""
 "parse_ident_usermap: invalid syntax in pg_ident.conf file at line %d, token "
 "\"%s\""
 msgstr ""
 
-#: libpq/hba.c:938
+#: libpq/hba.c:940
 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:988
+#: libpq/hba.c:990
 #, c-format
 msgid "load_ident: Unable to open usermap file \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:1110
+#: libpq/hba.c:1112
 #, c-format
 msgid "Failed to create socket on which to talk to Ident server: %m"
 msgstr ""
 
-#: libpq/hba.c:1146
+#: libpq/hba.c:1148
 #, 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:1168
+#: libpq/hba.c:1171
 #, c-format
 msgid ""
 "Unable to send query to Ident server on the host which is trying to connect "
@@ -5935,7 +6056,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: libpq/hba.c:1185
+#: libpq/hba.c:1188
 #, c-format
 msgid ""
 "Unable to receive response from Ident server on the host which is trying to "
@@ -5943,36 +6064,36 @@ msgid ""
 "query to it: %s"
 msgstr ""
 
-#: libpq/hba.c:1227 libpq/hba.c:1292
+#: libpq/hba.c:1230 libpq/hba.c:1295
 #, c-format
 msgid "ident_unix: error receiving credentials: %m"
 msgstr ""
 
-#: libpq/hba.c:1235 libpq/hba.c:1301
+#: libpq/hba.c:1238 libpq/hba.c:1304
 #, c-format
 msgid "ident_unix: unknown local user with uid %d"
 msgstr ""
 
-#: libpq/hba.c:1311
+#: libpq/hba.c:1314
 msgid "'ident' auth is not supported on local connections on this platform"
 msgstr ""
 
-#: libpq/pqcomm.c:197
+#: libpq/pqcomm.c:196
 #, c-format
 msgid "StreamServerPort: socket() failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:206
+#: libpq/pqcomm.c:205
 #, c-format
 msgid "StreamServerPort: setsockopt(SO_REUSEADDR) failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:247
+#: libpq/pqcomm.c:246
 #, c-format
 msgid "StreamServerPort: gethostbyname(%s) failed"
 msgstr ""
 
-#: libpq/pqcomm.c:263
+#: libpq/pqcomm.c:262
 #, c-format
 msgid ""
 "StreamServerPort: bind() failed: %m\n"
@@ -5980,7 +6101,7 @@ msgid ""
 "\tIf not, remove socket node (%s) and retry."
 msgstr ""
 
-#: libpq/pqcomm.c:268
+#: libpq/pqcomm.c:267
 #, c-format
 msgid ""
 "StreamServerPort: bind() failed: %m\n"
@@ -5988,61 +6109,61 @@ msgid ""
 "\tIf not, wait a few seconds and retry."
 msgstr ""
 
-#: libpq/pqcomm.c:307
+#: libpq/pqcomm.c:306
 #, c-format
 msgid "No such group as '%s'"
 msgstr ""
 
-#: libpq/pqcomm.c:315
+#: libpq/pqcomm.c:314
 #, c-format
 msgid "Could not set group of %s: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:323
+#: libpq/pqcomm.c:322
 #, c-format
 msgid "Could not set permissions on %s: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:342
+#: libpq/pqcomm.c:341
 #, c-format
 msgid "StreamServerPort: listen() failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:372
+#: libpq/pqcomm.c:371
 #, c-format
 msgid "StreamConnection: accept() failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:391
+#: libpq/pqcomm.c:390
 #, c-format
 msgid "StreamConnection: getsockname() failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:403
+#: libpq/pqcomm.c:402
 #, c-format
 msgid "StreamConnection: setsockopt(TCP_NODELAY) failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:409
+#: libpq/pqcomm.c:408
 #, c-format
 msgid "StreamConnection: setsockopt(SO_KEEPALIVE) failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:478
+#: libpq/pqcomm.c:476
 #, c-format
 msgid "pq_recvbuf: recv() failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:484
+#: libpq/pqcomm.c:482
 msgid "pq_recvbuf: unexpected EOF on client connection"
 msgstr ""
 
-#: libpq/pqcomm.c:672
+#: libpq/pqcomm.c:680
 #, c-format
 msgid "pq_flush: send() failed: %m"
 msgstr ""
 
-#: libpq/pqcomm.c:706
+#: libpq/pqcomm.c:714
 #, c-format
 msgid "pq_eof: recv() failed: %m"
 msgstr ""
@@ -6062,7 +6183,7 @@ msgstr ""
 msgid "%s: setsysinfo failed: %s\n"
 msgstr ""
 
-#: main/main.c:169
+#: main/main.c:172
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
 "\n"
@@ -6072,27 +6193,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main/main.c:189
+#: main/main.c:192
 #, c-format
 msgid "%s: real and effective user ids must match\n"
 msgstr ""
 
-#: main/main.c:224
+#: main/main.c:227
 #, c-format
 msgid "%s: invalid current euid %d\n"
 msgstr ""
 
-#: nodes/copyfuncs.c:1561
+#: nodes/copyfuncs.c:1564
 #, c-format
 msgid "_copyAConst: unknown node type %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:2713
+#: nodes/copyfuncs.c:2720
 #, c-format
 msgid "_copyValue: unknown node type %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:3222
+#: nodes/copyfuncs.c:3232
 #, c-format
 msgid "copyObject: don't know how to copy node type %d"
 msgstr ""
@@ -6102,12 +6223,12 @@ msgstr ""
 msgid "_equalParam: Invalid paramkind value: %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:1947
+#: nodes/equalfuncs.c:1986
 #, c-format
 msgid "_equalValue: unknown node type %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:2395
+#: nodes/equalfuncs.c:2437
 #, c-format
 msgid "equal: don't know whether nodes of type %d are equal"
 msgstr ""
@@ -6124,17 +6245,17 @@ msgstr ""
 msgid "llasti: empty list"
 msgstr ""
 
-#: nodes/outfuncs.c:1018 nodes/readfuncs.c:1642
+#: nodes/outfuncs.c:1023 nodes/readfuncs.c:1691
 #, c-format
 msgid "bogus rte kind %d"
 msgstr ""
 
-#: nodes/outfuncs.c:1316
+#: nodes/outfuncs.c:1321
 #, c-format
 msgid "_outValue: don't know how to print type %d "
 msgstr ""
 
-#: nodes/outfuncs.c:1757
+#: nodes/outfuncs.c:1779
 #, c-format
 msgid "_outNode: don't know how to print type %d "
 msgstr ""
@@ -6175,17 +6296,17 @@ msgstr ""
 msgid "_readExpr: unknown opType \"%.*s\""
 msgstr ""
 
-#: nodes/readfuncs.c:2222
+#: nodes/readfuncs.c:2273
 #, c-format
 msgid "badly formatted planstring \"%.10s\"..."
 msgstr ""
 
-#: nodes/readfuncs.c:2255 nodes/readfuncs.c:2287
+#: nodes/readfuncs.c:2306 nodes/readfuncs.c:2338
 #, c-format
 msgid "readDatum: expected '%s', got '%s'; length = %lu"
 msgstr ""
 
-#: nodes/readfuncs.c:2262
+#: nodes/readfuncs.c:2313
 #, c-format
 msgid "readDatum: byval & length = %lu"
 msgstr ""
@@ -6264,10 +6385,20 @@ msgstr ""
 msgid "avg_pool: pool_size of zero"
 msgstr ""
 
-#: optimizer/path/allpaths.c:199
+#: optimizer/path/allpaths.c:204
 msgid "SELECT FOR UPDATE is not supported for inherit queries"
 msgstr ""
 
+#: optimizer/path/allpaths.c:617
+#, c-format
+msgid "recurse_pushdown_safe: unexpected node %d"
+msgstr ""
+
+#: optimizer/path/allpaths.c:685
+#, c-format
+msgid "recurse_push_qual: unexpected node %d"
+msgstr ""
+
 #: optimizer/path/clausesel.c:522
 #, c-format
 msgid "clause_selectivity: s1 %f"
@@ -6282,60 +6413,60 @@ msgstr ""
 msgid "extract_or_indexqual_conditions: no matching clause"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1319
+#: optimizer/path/indxpath.c:1229
 msgid "pred_test_simple_clause: unknown test_op"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1348
+#: optimizer/path/indxpath.c:1258
 msgid "pred_test_simple_clause: null test result"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2026
+#: optimizer/path/indxpath.c:1903
 #, c-format
 msgid "prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2037
+#: optimizer/path/indxpath.c:1919
 #, c-format
 msgid "prefix_quals: no = operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2052
+#: optimizer/path/indxpath.c:1934
 #, c-format
 msgid "prefix_quals: no >= operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2068
+#: optimizer/path/indxpath.c:1950
 #, c-format
 msgid "prefix_quals: no < operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2117
+#: optimizer/path/indxpath.c:1997
 #, c-format
 msgid "network_prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2130
+#: optimizer/path/indxpath.c:2010
 #, c-format
 msgid "network_prefix_quals: no %s operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2145
+#: optimizer/path/indxpath.c:2025
 #, c-format
 msgid "network_prefix_quals: no <= operator for type %u"
 msgstr ""
 
-#: optimizer/path/joinpath.c:173
+#: optimizer/path/joinpath.c:172
 #, c-format
 msgid "sort_inner_and_outer: unexpected join type %d"
 msgstr ""
 
-#: optimizer/path/joinpath.c:344
+#: optimizer/path/joinpath.c:343
 #, c-format
 msgid "match_unsorted_outer: unexpected join type %d"
 msgstr ""
 
-#: optimizer/path/joinpath.c:603
+#: optimizer/path/joinpath.c:602
 #, c-format
 msgid "match_unsorted_inner: unexpected join type %d"
 msgstr ""
@@ -6355,146 +6486,142 @@ msgstr ""
 msgid "make_join_rel: unsupported join type %d"
 msgstr ""
 
-#: optimizer/path/pathkeys.c:875
+#: optimizer/path/pathkeys.c:876
 msgid ""
 "make_pathkeys_for_mergeclauses: can't identify which side of mergeclause to "
 "use"
 msgstr ""
 
-#: optimizer/plan/createplan.c:140
+#: optimizer/plan/createplan.c:139
 #, c-format
 msgid "create_plan: unknown pathtype %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:215
+#: optimizer/plan/createplan.c:214
 #, c-format
 msgid "create_scan_plan: unknown node type: %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:297
+#: optimizer/plan/createplan.c:296
 #, c-format
 msgid "create_join_plan: unknown node type: %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1035
+#: optimizer/plan/createplan.c:1033
 msgid "fix_indxqual_sublist: indexqual clause is not binary opclause"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1072
-msgid "fix_indxqual_sublist: failed to find substitute op"
-msgstr ""
-
-#: optimizer/plan/createplan.c:1134
+#: optimizer/plan/createplan.c:1122
 msgid "fix_indxqual_operand: var is not index attribute"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1572
+#: optimizer/plan/createplan.c:1560
 msgid "make_sort_from_pathkeys: cannot find tlist item to sort"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:122
+#: optimizer/plan/initsplan.c:124
 msgid "SELECT FOR UPDATE cannot be applied to a join"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:125
+#: optimizer/plan/initsplan.c:127
 #, c-format
 msgid "add_base_rels_to_query: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:305 optimizer/plan/planner.c:449
+#: optimizer/plan/initsplan.c:307 optimizer/plan/planner.c:457
 msgid "UNION JOIN is not implemented yet"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:309
+#: optimizer/plan/initsplan.c:311
 #, c-format
 msgid "distribute_quals_to_rels: unsupported join type %d"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:319
+#: optimizer/plan/initsplan.c:321
 #, c-format
 msgid "distribute_quals_to_rels: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:356
+#: 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:449
+#: optimizer/plan/initsplan.c:452
 msgid "JOIN qualification may not refer to other relations"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:608
+#: optimizer/plan/initsplan.c:611
 msgid "distribute_qual_to_rels: can't cope with variable-free clause"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:750
+#: optimizer/plan/initsplan.c:753
 #, c-format
 msgid "Unable to identify an equality operator for types '%s' and '%s'"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:761
+#: 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:225
+#: optimizer/plan/planmain.c:224
 msgid "subplanner: failed to construct a relation"
 msgstr ""
 
-#: optimizer/plan/planner.c:452
+#: optimizer/plan/planner.c:460
 #, c-format
 msgid "pull_up_subqueries: unexpected join type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:458
+#: optimizer/plan/planner.c:466
 #, c-format
 msgid "pull_up_subqueries: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:479
+#: optimizer/plan/planner.c:487
 msgid "is_simple_subquery: subquery is bogus"
 msgstr ""
 
-#: optimizer/plan/planner.c:594
+#: optimizer/plan/planner.c:602
 #, c-format
 msgid "resolvenew_in_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:673
+#: optimizer/plan/planner.c:681
 #, c-format
 msgid "preprocess_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:785
+#: optimizer/plan/planner.c:793
 #, c-format
 msgid "preprocess_qual_conditions: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:900 parser/analyze.c:1926 parser/analyze.c:2109
-#: parser/analyze.c:2596
+#: optimizer/plan/planner.c:908 parser/analyze.c:1780 parser/analyze.c:1963
+#: parser/analyze.c:2460
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: optimizer/plan/planner.c:953
+#: optimizer/plan/planner.c:961
 msgid "SELECT FOR UPDATE is not allowed in subselects"
 msgstr ""
 
-#: optimizer/plan/planner.c:1555 optimizer/plan/planner.c:1561
+#: optimizer/plan/planner.c:1563 optimizer/plan/planner.c:1569
 msgid "postprocess_setop_tlist: resjunk output columns not implemented"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:216
+#: optimizer/plan/setrefs.c:215
 #, c-format
 msgid "set_plan_references: unknown plan type %d"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:459
+#: optimizer/plan/setrefs.c:458
 msgid "join_references: variable not in subplan target lists"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:520
+#: optimizer/plan/setrefs.c:519
 msgid "replace_vars_with_subplan_refs: variable not in subplan target list"
 msgstr ""
 
@@ -6521,24 +6648,24 @@ msgstr ""
 msgid "SS_finalize_plan: plan shouldn't reference subplan's variable"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:57
+#: optimizer/prep/preptlist.c:58
 msgid "preprocess_targetlist: subquery cannot be result relation"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:204
+#: optimizer/prep/preptlist.c:212
 msgid "expand_targetlist: unexpected command_type"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:234
+#: 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:310
+#: optimizer/prep/prepunion.c:309
 msgid "generate_nonunion_plan: bogus operation code"
 msgstr ""
 
@@ -6565,23 +6692,23 @@ msgstr ""
 msgid "CommuteClause: no commutator for operator %u"
 msgstr ""
 
-#: optimizer/util/clauses.c:1386
+#: optimizer/util/clauses.c:1395
 #, c-format
 msgid "eval_const_expressions: unexpected opType %d"
 msgstr ""
 
-#: optimizer/util/clauses.c:1622 utils/cache/lsyscache.c:581
+#: 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 "Funktionen OID %u existerar inte"
 
-#: optimizer/util/clauses.c:1969
+#: optimizer/util/clauses.c:1981
 #, c-format
 msgid "expression_tree_walker: Unexpected node type %d"
 msgstr ""
 
-#: optimizer/util/clauses.c:2360
+#: optimizer/util/clauses.c:2371
 #, c-format
 msgid "expression_tree_mutator: Unexpected node type %d"
 msgstr ""
@@ -6637,7 +6764,7 @@ msgid ""
 "get_sortgroupclause_tle: ORDER/GROUP BY expression not found in targetlist"
 msgstr ""
 
-#: parser/analyze.c:258
+#: parser/analyze.c:257
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr ""
 
@@ -6685,7 +6812,7 @@ msgstr ""
 msgid "%s / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
 msgstr ""
 
-#: parser/analyze.c:1127 parser/analyze.c:2926
+#: parser/analyze.c:1127
 #, c-format
 msgid "inherited table \"%s\" is not a relation"
 msgstr ""
@@ -6714,225 +6841,189 @@ msgstr ""
 msgid "%s: column \"%s\" appears twice in %s constraint"
 msgstr ""
 
-#: parser/analyze.c:1286
+#: parser/analyze.c:1287
 #, c-format
 msgid "%s: failed to make implicit index name"
 msgstr ""
 
-#: parser/analyze.c:1289
+#: parser/analyze.c:1290
 #, c-format
 msgid "%s / %s%s will create implicit index '%s' for table '%s'"
 msgstr ""
 
-#: parser/analyze.c:1306
+#: parser/analyze.c:1304
 #, c-format
 msgid "%s will create implicit trigger(s) for FOREIGN KEY check(s)"
 msgstr ""
 
-#: parser/analyze.c:1331 parser/analyze.c:1359 parser/analyze.c:1417
-#, c-format
-msgid "Can only have %d keys in a foreign key"
-msgstr ""
-
-#: parser/analyze.c:1371 parser/analyze.c:2823
-#, c-format
-msgid "PRIMARY KEY for referenced table \"%s\" not found"
-msgstr ""
-
-#: parser/analyze.c:1434 parser/analyze.c:2759
-#, c-format
-msgid ""
-"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
-msgstr ""
-
-#: parser/analyze.c:1592 parser/analyze.c:1710
+#: parser/analyze.c:1446 parser/analyze.c:1564
 #, c-format
 msgid "transformRuleStmt: unexpected event type %d"
 msgstr ""
 
-#: parser/analyze.c:1601
+#: parser/analyze.c:1455
 msgid "Rule WHERE condition may not contain references to other relations"
 msgstr ""
 
-#: parser/analyze.c:1670
+#: parser/analyze.c:1524
 msgid ""
 "Rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE "
 "actions"
 msgstr ""
 
-#: parser/analyze.c:1694
+#: parser/analyze.c:1548
 msgid "ON SELECT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1696
+#: parser/analyze.c:1550
 msgid "ON SELECT rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1703
+#: parser/analyze.c:1557
 msgid "ON INSERT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1707
+#: parser/analyze.c:1561
 msgid "ON DELETE rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1772 parser/analyze.c:1990
+#: parser/analyze.c:1626 parser/analyze.c:1844
 msgid "DECLARE CURSOR must not specify INTO"
 msgstr ""
 
-#: parser/analyze.c:1774 parser/analyze.c:1992
+#: parser/analyze.c:1628 parser/analyze.c:1846
 msgid ""
 "DECLARE/UPDATE is not supported\n"
 "\tCursors must be READ ONLY"
 msgstr ""
 
-#: parser/analyze.c:1784 parser/analyze.c:2002
+#: parser/analyze.c:1638 parser/analyze.c:1856
 msgid "DECLARE CURSOR may only be used in begin/end transaction blocks"
 msgstr ""
 
-#: parser/analyze.c:2070
+#: parser/analyze.c:1924
 msgid ""
 "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result "
 "columns"
 msgstr ""
 
-#: parser/analyze.c:2104
+#: parser/analyze.c:1958
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2106
+#: parser/analyze.c:1960
 msgid "Portal may not appear in UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2200
+#: parser/analyze.c:2054
 #, c-format
 msgid "Each %s query must have the same number of columns"
 msgstr ""
 
-#: parser/analyze.c:2258
+#: parser/analyze.c:2112
 #, c-format
 msgid "getSetColTypes: unexpected node %d"
 msgstr ""
 
-#: parser/analyze.c:2269
+#: parser/analyze.c:2123
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr ""
 
-#: parser/analyze.c:2352 parser/analyze.c:2361
+#: parser/analyze.c:2206 parser/analyze.c:2215
 msgid "UPDATE target count mismatch --- internal error"
 msgstr ""
 
-#: parser/analyze.c:2436
+#: parser/analyze.c:2301
 msgid "Unexpected node type in ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: parser/analyze.c:2516
+#: parser/analyze.c:2384
 msgid "transformPrepareStmt: internal error"
 msgstr ""
 
-#: parser/analyze.c:2543
+#: parser/analyze.c:2411
 #, c-format
 msgid "Wrong number of parameters, expected %d but got %d"
 msgstr ""
 
-#: parser/analyze.c:2556
+#: parser/analyze.c:2424
 msgid "Cannot use subselects in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2558
+#: parser/analyze.c:2426
 msgid "Cannot use aggregates in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2573
+#: parser/analyze.c:2437
 #, 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:2598
+#: parser/analyze.c:2462
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr ""
 
-#: parser/analyze.c:2600
+#: parser/analyze.c:2464
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr ""
 
-#: parser/analyze.c:2602
+#: parser/analyze.c:2466
 msgid "SELECT FOR UPDATE is not allowed with AGGREGATE"
 msgstr ""
 
-#: parser/analyze.c:2667
+#: parser/analyze.c:2531
 #, c-format
 msgid "FOR UPDATE: relation \"%s\" not found in FROM clause"
 msgstr ""
 
-#: parser/analyze.c:2697 parser/analyze.c:2790
-#, c-format
-msgid "Referenced relation \"%s\" is not a table"
-msgstr ""
-
-#: parser/analyze.c:2718
-#, c-format
-msgid "transformFkeyCheckAttrs: index %u not found"
-msgstr ""
-
-#: parser/analyze.c:2808
-#, c-format
-msgid "transformFkeyGetPrimaryKey: index %u not found"
-msgstr ""
-
-#: parser/analyze.c:2875
+#: parser/analyze.c:2571
 #, c-format
 msgid "relationHasPrimaryKey: index %u not found"
 msgstr ""
 
-#: parser/analyze.c:2958
-#, c-format
-msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
-msgstr ""
-
-#: parser/analyze.c:2999
+#: parser/analyze.c:2622
 msgid "Misplaced DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:3001 parser/analyze.c:3010
+#: parser/analyze.c:2624 parser/analyze.c:2633
 msgid "Multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:3008
+#: parser/analyze.c:2631
 msgid "Misplaced NOT DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:3015 parser/analyze.c:3033
+#: parser/analyze.c:2638 parser/analyze.c:2656
 msgid "INITIALLY DEFERRED constraint must be DEFERRABLE"
 msgstr ""
 
-#: parser/analyze.c:3020
+#: parser/analyze.c:2643
 msgid "Misplaced INITIALLY DEFERRED clause"
 msgstr ""
 
-#: parser/analyze.c:3022 parser/analyze.c:3040
+#: parser/analyze.c:2645 parser/analyze.c:2663
 msgid "Multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:3038
+#: parser/analyze.c:2661
 msgid "Misplaced INITIALLY IMMEDIATE clause"
 msgstr ""
 
-#: parser/analyze.c:3147
+#: parser/analyze.c:2770
 #, c-format
 msgid ""
 "New table specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:3166
+#: parser/analyze.c:2789
 #, c-format
 msgid ""
 "New view specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:3183
+#: parser/analyze.c:2806
 msgid "parser: unsupported schema node (internal error)"
 msgstr ""
 
@@ -6978,256 +7069,246 @@ msgstr ""
 msgid "Subselect in FROM may not have SELECT INTO"
 msgstr ""
 
-#: parser/parse_clause.c:492
+#: parser/parse_clause.c:493
 msgid ""
 "FROM function expression may not refer to other relations of same query level"
 msgstr ""
 
-#: parser/parse_clause.c:501
+#: parser/parse_clause.c:502
 msgid "cannot use aggregate function in FROM function expression"
 msgstr ""
 
-#: parser/parse_clause.c:512
+#: parser/parse_clause.c:514
 msgid "Coercion function not allowed in FROM clause"
 msgstr ""
 
-#: parser/parse_clause.c:622 parser/parse_clause.c:634
+#: parser/parse_clause.c:624 parser/parse_clause.c:636
 msgid "transformFromClauseItem: unexpected subtree type"
 msgstr ""
 
-#: parser/parse_clause.c:717
+#: parser/parse_clause.c:719
 #, c-format
 msgid "USING column name \"%s\" appears more than once"
 msgstr ""
 
-#: parser/parse_clause.c:729
+#: parser/parse_clause.c:731
 #, c-format
 msgid "Common column name \"%s\" appears more than once in left table"
 msgstr ""
 
-#: parser/parse_clause.c:735
+#: parser/parse_clause.c:737
 #, c-format
 msgid "JOIN/USING column \"%s\" not found in left table"
 msgstr "JOIN/USING-kolumn \"%s\" finns inte i v�nstra tabellen"
 
-#: parser/parse_clause.c:747
+#: parser/parse_clause.c:749
 #, c-format
 msgid "Common column name \"%s\" appears more than once in right table"
 msgstr ""
 
-#: parser/parse_clause.c:753
+#: parser/parse_clause.c:755
 #, c-format
 msgid "JOIN/USING column \"%s\" not found in right table"
 msgstr "JOIN/USING-kolumn \"%s\" finns inte i h�gra tabellen"
 
-#: parser/parse_clause.c:802
+#: parser/parse_clause.c:804
 #, c-format
 msgid "Column alias list for \"%s\" has too many entries"
 msgstr ""
 
-#: parser/parse_clause.c:829
+#: parser/parse_clause.c:831
 #, c-format
 msgid ""
 "transformFromClauseItem: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: parser/parse_clause.c:935
+#: parser/parse_clause.c:942
 #, c-format
 msgid "buildMergedJoinVar: unexpected jointype %d"
 msgstr ""
 
-#: parser/parse_clause.c:1056
+#: parser/parse_clause.c:1063
 #, c-format
 msgid "%s '%s' is ambiguous"
 msgstr "%s \"%s\" �r tvetydig"
 
-#: parser/parse_clause.c:1075
+#: parser/parse_clause.c:1082
 #, c-format
 msgid "Non-integer constant in %s"
 msgstr ""
 
-#: parser/parse_clause.c:1088
+#: parser/parse_clause.c:1095
 #, c-format
 msgid "%s position %d is not in target list"
 msgstr ""
 
-#: parser/parse_clause.c:1230
+#: parser/parse_clause.c:1237
 msgid "For SELECT DISTINCT, ORDER BY expressions must appear in target list"
 msgstr ""
 
-#: parser/parse_clause.c:1268
+#: parser/parse_clause.c:1275
 msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
 msgstr ""
 
-#: parser/parse_clause.c:1292
+#: parser/parse_clause.c:1299
 msgid ""
 "transformDistinctClause: failed to add DISTINCT ON clause to target list"
 msgstr ""
 
-#: parser/parse_coerce.c:154
+#: parser/parse_coerce.c:291
+#, c-format
+msgid "coerce_type: no conversion function from %s to %s"
+msgstr ""
+
+#: parser/parse_coerce.c:417
 #, c-format
-msgid "coerce_type: no conversion function from '%s' to '%s'"
+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:376
+#: parser/parse_coerce.c:568
 #, 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:386
+#: parser/parse_coerce.c:576
 #, c-format
 msgid "Argument of %s must not be a set function"
 msgstr ""
 
-#: parser/parse_coerce.c:439
+#: parser/parse_coerce.c:623
 #, c-format
 msgid "%s types '%s' and '%s' not matched"
 msgstr ""
 
-#: parser/parse_coerce.c:495
+#: parser/parse_coerce.c:675
 #, c-format
 msgid "%s unable to convert to type %s"
 msgstr "%s kan inte konvertera till typ %s"
 
-#: parser/parse_coerce.c:888 utils/cache/lsyscache.c:1060
+#: parser/parse_coerce.c:957
 #, c-format
-msgid "getBaseType: failed to lookup type %u"
+msgid "find_coercion_pathway: bogus castcontext %c"
 msgstr ""
 
-#: parser/parse_expr.c:104
+#: parser/parse_expr.c:101
 #, c-format
 msgid "Expression too complex: nesting depth exceeds max_expr_depth = %d"
 msgstr ""
 
-#: parser/parse_expr.c:123
+#: parser/parse_expr.c:120
 #, c-format
 msgid "Parameter '$%d' is out of range"
 msgstr ""
 
-#: parser/parse_expr.c:355 parser/parse_expr.c:359
+#: parser/parse_expr.c:358 parser/parse_expr.c:362
 msgid "Bad query in subselect"
 msgstr "Felaktig fr�ga i subselect"
 
-#: parser/parse_expr.c:381
+#: parser/parse_expr.c:384
 msgid "Subselect must have a field"
 msgstr ""
 
-#: parser/parse_expr.c:385
+#: parser/parse_expr.c:388
 msgid "Subselect must have only one field"
 msgstr ""
 
-#: parser/parse_expr.c:415
+#: parser/parse_expr.c:418
 #, c-format
 msgid "Row comparison cannot use operator %s"
 msgstr "Radj�mf�relse kan inte anv�nda operator %s"
 
-#: parser/parse_expr.c:438
+#: parser/parse_expr.c:441
 msgid "Subselect has too many fields"
 msgstr ""
 
-#: parser/parse_expr.c:454
+#: 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:460
+#: 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:472
+#: parser/parse_expr.c:475
 msgid "Subselect has too few fields"
 msgstr ""
 
-#: parser/parse_expr.c:614
+#: parser/parse_expr.c:615
 #, c-format
 msgid "transformExpr: unexpected booltesttype %d"
 msgstr ""
 
-#: parser/parse_expr.c:650
+#: parser/parse_expr.c:652
 #, c-format
 msgid "transformExpr: does not know how to transform node %d (internal error)"
 msgstr ""
 
-#: parser/parse_expr.c:736
+#: parser/parse_expr.c:744
 #, c-format
 msgid "Attribute \"%s\" not found"
 msgstr ""
 
-#: parser/parse_expr.c:848 parser/parse_target.c:152
+#: parser/parse_expr.c:856 parser/parse_target.c:153
 msgid "Invalid qualified name syntax (too many names)"
 msgstr ""
 
-#: parser/parse_expr.c:905
+#: parser/parse_expr.c:913
 msgid "exprType: Cannot get type for untransformed sublink"
 msgstr ""
 
-#: parser/parse_expr.c:932
+#: parser/parse_expr.c:940
 #, c-format
 msgid "exprType: Do not know how to get type for %d node"
 msgstr ""
 
-#: parser/parse_expr.c:1078 utils/adt/ruleutils.c:2418
-#, c-format
-msgid "cache lookup for proc %u failed"
-msgstr ""
-
-#: parser/parse_expr.c:1103
+#: parser/parse_expr.c:1110
 #, c-format
-msgid "cache lookup for type %u failed"
+msgid "Cannot cast type %s to %s"
 msgstr ""
 
-#: parser/parse_expr.c:1158
-#, c-format
-msgid "Cannot cast this expression to type '%s'"
-msgstr ""
-
-#: parser/parse_expr.c:1209
-#, c-format
-msgid "Cannot cast type '%s' to '%s'"
-msgstr ""
-
-#: parser/parse_func.c:100
+#: parser/parse_func.c:97
 #, c-format
 msgid "Cannot pass more than %d arguments to a function"
 msgstr ""
 
-#: parser/parse_func.c:107
+#: parser/parse_func.c:104
 #, c-format
 msgid "Function '%s' does not allow NULL input"
 msgstr ""
 
-#: parser/parse_func.c:195
+#: parser/parse_func.c:192
 #, c-format
 msgid "Cannot find type OID for relation %u"
 msgstr ""
 
-#: parser/parse_func.c:210
+#: parser/parse_func.c:208
 #, c-format
 msgid "Cannot pass result of sub-select or join %s to a function"
 msgstr ""
 
-#: parser/parse_func.c:255
+#: parser/parse_func.c:253
 #, c-format
 msgid "%s(*) specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:258
+#: parser/parse_func.c:256
 #, c-format
 msgid "DISTINCT specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_func.c:281
+#: parser/parse_func.c:279
 #, c-format
 msgid "Attribute notation .%s applied to type %s, which is not a complex type"
 msgstr ""
 
-#: parser/parse_func.c:284
+#: parser/parse_func.c:282
 #, c-format
 msgid "Attribute \"%s\" not found in datatype %s"
 msgstr ""
@@ -7236,73 +7317,73 @@ msgstr ""
 msgid "Aggregates may not return sets"
 msgstr ""
 
-#: parser/parse_func.c:1242
+#: parser/parse_func.c:1240
 #, c-format
 msgid "No such attribute %s.%s.%s"
 msgstr ""
 
-#: parser/parse_func.c:1245
+#: parser/parse_func.c:1243
 #, c-format
 msgid "No such attribute %s.%s"
 msgstr ""
 
-#: parser/parse_func.c:1272
+#: parser/parse_func.c:1270
 #, c-format
 msgid "Function %s(%s) does not exist%s%s"
 msgstr ""
 
-#: parser/parse_func.c:1278
+#: parser/parse_func.c:1276
 #, c-format
 msgid "%s: function %s(%s) does not exist%s%s"
 msgstr ""
 
-#: parser/parse_func.c:1304
+#: parser/parse_func.c:1302
 #, c-format
 msgid "%s: aggregate %s(*) does not exist"
 msgstr ""
 
-#: parser/parse_func.c:1307
+#: parser/parse_func.c:1305
 #, c-format
 msgid "%s: aggregate %s(%s) does not exist"
 msgstr ""
 
-#: parser/parse_func.c:1323
+#: parser/parse_func.c:1321
 #, c-format
 msgid "%s: function %s(*) is not an aggregate"
 msgstr ""
 
-#: parser/parse_func.c:1326
+#: parser/parse_func.c:1324
 #, c-format
 msgid "%s: function %s(%s) is not an aggregate"
 msgstr ""
 
-#: parser/parse_node.c:223
+#: parser/parse_node.c:217
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array type %u"
 msgstr ""
 
-#: parser/parse_node.c:229
+#: parser/parse_node.c:223
 #, c-format
 msgid "transformArraySubscripts: type %s is not an array"
 msgstr ""
 
-#: parser/parse_node.c:237
+#: parser/parse_node.c:231
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array element type %u"
 msgstr ""
 
-#: parser/parse_node.c:292 parser/parse_node.c:312
+#: parser/parse_node.c:288 parser/parse_node.c:310
 msgid "array index expressions must be integers"
 msgstr ""
 
-#: parser/parse_node.c:333
+#: 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:448
+#: parser/parse_node.c:439
 #, c-format
 msgid "make_const: unknown type %d"
 msgstr ""
@@ -7329,49 +7410,49 @@ msgid ""
 "\tUse an explicit ordering operator or modify the query"
 msgstr ""
 
-#: parser/parse_oper.c:891
+#: 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:896
+#: 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:900
+#: parser/parse_oper.c:903
 #, 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:916
+#: 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:920
+#: 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:927
+#: 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:931
+#: parser/parse_oper.c:934
 #, c-format
 msgid ""
 "Unable to identify a postfix operator '%s' for type '%s'\n"
@@ -7398,106 +7479,106 @@ msgstr ""
 msgid "scanNameSpaceForRelid: unexpected node type %d"
 msgstr ""
 
-#: parser/parse_relation.c:321
+#: parser/parse_relation.c:319
 #, c-format
 msgid "checkNameSpaceConflicts: unexpected node type %d"
 msgstr ""
 
-#: parser/parse_relation.c:344 parser/parse_relation.c:354
+#: 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:376
+#: parser/parse_relation.c:373
 #, c-format
 msgid "scanNameSpaceForConflict: unexpected node type %d"
 msgstr ""
 
-#: parser/parse_relation.c:411
+#: parser/parse_relation.c:408
 msgid "RTERangeTablePosn: RTE not found (internal error)"
 msgstr ""
 
-#: parser/parse_relation.c:463 parser/parse_relation.c:556
+#: parser/parse_relation.c:460 parser/parse_relation.c:553
 #, c-format
 msgid "Column reference \"%s\" is ambiguous"
 msgstr ""
 
-#: parser/parse_relation.c:550
+#: parser/parse_relation.c:547
 #, c-format
 msgid "colnameToVar: unexpected node type %d"
 msgstr ""
 
-#: parser/parse_relation.c:649 parser/parse_relation.c:742
-#: parser/parse_relation.c:835 parser/parse_relation.c:949
+#: 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:910
+#: parser/parse_relation.c:907
 msgid "A column definition list is only allowed for functions returning RECORD"
 msgstr ""
 
-#: parser/parse_relation.c:919
+#: parser/parse_relation.c:916
 msgid "A column definition list is required for functions returning RECORD"
 msgstr ""
 
-#: parser/parse_relation.c:975
+#: parser/parse_relation.c:972
 #, c-format
 msgid "Too many column aliases specified for function %s"
 msgstr ""
 
-#: parser/parse_relation.c:996
+#: parser/parse_relation.c:993
 #, c-format
 msgid "Unknown kind of return type specified for function %s"
 msgstr ""
 
-#: parser/parse_relation.c:1428
+#: parser/parse_relation.c:1425
 #, c-format
 msgid "expandRTE: unsupported RTE kind %d"
 msgstr ""
 
-#: parser/parse_relation.c:1517
+#: parser/parse_relation.c:1515
 #, c-format
 msgid "Invalid attnum %d for rangetable entry %s"
 msgstr ""
 
-#: parser/parse_relation.c:1544 parser/parse_relation.c:1606
-#: parser/parse_relation.c:1680
+#: 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 ""
 
-#: parser/parse_relation.c:1575
+#: parser/parse_relation.c:1574
 #, c-format
 msgid "Subquery %s does not have attribute %d"
 msgstr ""
 
-#: parser/parse_relation.c:1652
+#: parser/parse_relation.c:1655
 #, c-format
 msgid "get_rte_attribute_type: unsupported RTE kind %d"
 msgstr ""
 
-#: parser/parse_relation.c:1713
+#: parser/parse_relation.c:1716
 #, c-format
 msgid "Relation %s does not have attribute %d"
 msgstr ""
 
-#: parser/parse_relation.c:1729
+#: parser/parse_relation.c:1732
 #, c-format
 msgid "get_rte_attribute_is_dropped: unsupported RTE kind %d"
 msgstr ""
 
-#: parser/parse_relation.c:1812
+#: parser/parse_relation.c:1815
 #, c-format
 msgid "attnumAttName: invalid attribute number %d"
 msgstr ""
 
-#: parser/parse_relation.c:1834
+#: parser/parse_relation.c:1837
 #, c-format
 msgid "attnumTypeId: invalid attribute number %d"
 msgstr ""
 
-#: parser/parse_relation.c:1861
+#: parser/parse_relation.c:1864
 #, c-format
 msgid "Adding missing FROM-clause entry%s for table \"%s\""
 msgstr ""
@@ -7506,31 +7587,31 @@ msgstr ""
 msgid "You can't use relation names alone in the target list, try relation.*."
 msgstr ""
 
-#: parser/parse_target.c:235
+#: parser/parse_target.c:236
 #, c-format
 msgid "Cannot assign to system attribute '%s'"
 msgstr ""
 
-#: parser/parse_target.c:296
+#: 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:417
+#: parser/parse_target.c:370
 #, c-format
 msgid "Attribute '%s' specified more than once"
 msgstr ""
 
-#: parser/parse_target.c:451
+#: parser/parse_target.c:405
 #, c-format
 msgid ""
 "ExpandAllTables: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: parser/parse_target.c:468
+#: parser/parse_target.c:423
 msgid "Wildcard with no tables specified not allowed"
 msgstr ""
 
@@ -7550,7 +7631,7 @@ msgid "%s converted to %s"
 msgstr ""
 
 #: parser/parse_type.c:194 parser/parse_type.c:222
-#: utils/cache/lsyscache.c:1212
+#: utils/cache/lsyscache.c:1229
 #, c-format
 msgid "Type \"%s\" is only a shell"
 msgstr ""
@@ -7564,31 +7645,31 @@ msgstr ""
 msgid "typeTypeId() called with NULL type struct"
 msgstr ""
 
-#: parser/parse_type.c:379
+#: parser/parse_type.c:389
 #, c-format
 msgid "typeidOutfunc: Invalid type - oid = %u"
 msgstr ""
 
-#: parser/parse_type.c:400
+#: parser/parse_type.c:410
 #, c-format
 msgid "typeidTypeRelid: Invalid type - oid = %u"
 msgstr ""
 
-#: parser/parse_type.c:437 parser/parse_type.c:453 parser/parse_type.c:455
-#: parser/parse_type.c:461 parser/parse_type.c:467 parser/parse_type.c:471
+#: 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 "parseTypeString: Invalid type name '%s'"
+msgid "Invalid type name '%s'"
 msgstr ""
 
 #: 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:169 port/sysv_sema.c:319
+#: 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:357 port/posix_sema.c:206 port/sysv_sema.c:357
+#: port/pg_sema.c:358 port/posix_sema.c:205 port/sysv_sema.c:358
 msgid "PGSemaphoreCreate: too many semaphores created"
 msgstr ""
 
@@ -7655,41 +7736,41 @@ msgstr ""
 msgid "dl: Undefined:"
 msgstr ""
 
-#: postmaster/pgstat.c:179
+#: postmaster/pgstat.c:178
 #, c-format
 msgid "PGSTAT: socket() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:193
+#: postmaster/pgstat.c:192
 #, c-format
 msgid "PGSTAT: bind(127.0.0.1) failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:198
+#: postmaster/pgstat.c:197
 #, c-format
 msgid "PGSTAT: getsockname() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:210
+#: postmaster/pgstat.c:209
 #, c-format
 msgid "PGSTAT: connect() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:222
+#: postmaster/pgstat.c:221
 #, c-format
 msgid "PGSTAT: fcntl() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:231 postmaster/pgstat.c:1166
+#: postmaster/pgstat.c:230 postmaster/pgstat.c:1166
 #, c-format
 msgid "PGSTAT: pipe() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:274
+#: postmaster/pgstat.c:273
 msgid "PGSTAT: statistics collector startup skipped"
 msgstr ""
 
-#: postmaster/pgstat.c:297 postmaster/pgstat.c:1173
+#: postmaster/pgstat.c:296 postmaster/pgstat.c:1173
 #, c-format
 msgid "PGSTAT: fork() failed: %m"
 msgstr ""
@@ -7703,149 +7784,149 @@ msgstr ""
 msgid "PGSTATBE: malloc() failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1225
+#: postmaster/pgstat.c:1227
 msgid "PGSTAT: Creation of dead backend hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1236
+#: postmaster/pgstat.c:1238
 msgid "PGSTAT: Allocation of backend table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1292
+#: postmaster/pgstat.c:1294
 #, c-format
 msgid "PGSTAT: select() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1332
+#: postmaster/pgstat.c:1334
 #, c-format
 msgid "PGSTAT: read() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1350
+#: postmaster/pgstat.c:1352
 msgid "PGSTAT: bogus message length"
 msgstr ""
 
-#: postmaster/pgstat.c:1500
+#: postmaster/pgstat.c:1502
 #, c-format
 msgid "PGSTATBUFF: fcntl() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1510
+#: postmaster/pgstat.c:1512
 msgid "PGSTATBUFF: malloc() failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1537
+#: postmaster/pgstat.c:1539
 msgid "PGSTATBUFF: Warning - receive buffer full"
 msgstr ""
 
-#: postmaster/pgstat.c:1568
+#: postmaster/pgstat.c:1570
 #, c-format
 msgid "PGSTATBUFF: select() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1584
+#: postmaster/pgstat.c:1586
 #, c-format
 msgid "PGSTATBUFF: recvfrom() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1659
+#: postmaster/pgstat.c:1661
 #, c-format
 msgid "PGSTATBUFF: write() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1712
+#: postmaster/pgstat.c:1714
 #, c-format
 msgid "PGSTAT: Invalid backend ID %d"
 msgstr ""
 
-#: postmaster/pgstat.c:1768
+#: postmaster/pgstat.c:1770
 msgid "PGSTAT: DB hash table out of memory - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:1797 postmaster/pgstat.c:2212 postmaster/pgstat.c:2219
+#: postmaster/pgstat.c:1799 postmaster/pgstat.c:2214 postmaster/pgstat.c:2221
 msgid "PGSTAT: failed to initialize hash table for new database entry"
 msgstr ""
 
-#: postmaster/pgstat.c:1849
+#: postmaster/pgstat.c:1851
 msgid "PGSTAT: dead backend hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:1896
+#: postmaster/pgstat.c:1898
 #, c-format
 msgid "PGSTAT: cannot open temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1922
+#: postmaster/pgstat.c:1924
 msgid "PGSTAT: database hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:1958
+#: postmaster/pgstat.c:1960
 #, c-format
 msgid ""
 "PGSTAT: tables hash table for database %d corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2005
+#: postmaster/pgstat.c:2007
 #, c-format
 msgid "PGSTAT: Error closing temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2012
+#: postmaster/pgstat.c:2014
 #, c-format
 msgid "PGSTAT: Cannot rename temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2033
+#: postmaster/pgstat.c:2035
 msgid "PGSTAT: dead backend hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2098 postmaster/pgstat.c:2102
+#: postmaster/pgstat.c:2100 postmaster/pgstat.c:2104
 msgid "PGSTAT: Creation of DB hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:2140 postmaster/pgstat.c:2146 postmaster/pgstat.c:2175
-#: postmaster/pgstat.c:2181 postmaster/pgstat.c:2246 postmaster/pgstat.c:2252
-#: postmaster/pgstat.c:2285 postmaster/pgstat.c:2291 postmaster/pgstat.c:2314
-#: postmaster/pgstat.c:2320 postmaster/pgstat.c:2368 postmaster/pgstat.c:2374
-#: postmaster/pgstat.c:2409 postmaster/pgstat.c:2415
+#: 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:2162 postmaster/pgstat.c:2168
+#: postmaster/pgstat.c:2164 postmaster/pgstat.c:2170
 msgid "PGSTAT: DB hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:2271 postmaster/pgstat.c:2277
+#: postmaster/pgstat.c:2273 postmaster/pgstat.c:2279
 msgid "PGSTAT: Tab hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:2524
+#: postmaster/pgstat.c:2526
 #, c-format
 msgid "PGSTAT: tables hash table out of memory for database %d - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2704
+#: postmaster/pgstat.c:2706
 msgid "PGSTAT: failed to reinitialize hash table for database entry"
 msgstr ""
 
-#: postmaster/postmaster.c:312
+#: postmaster/postmaster.c:328
 #, c-format
 msgid "data directory %s was not found"
 msgstr ""
 
-#: postmaster/postmaster.c:314
+#: postmaster/postmaster.c:330
 #, c-format
 msgid "could not read permissions of directory %s: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:319
+#: postmaster/postmaster.c:335
 #, c-format
 msgid ""
 "data directory %s has group or world access; permissions should be u=rwx "
 "(0700)"
 msgstr ""
 
-#: postmaster/postmaster.c:333
+#: postmaster/postmaster.c:348
 #, c-format
 msgid ""
 "%s does not find the database system.\n"
@@ -7854,173 +7935,180 @@ msgid ""
 "\n"
 msgstr ""
 
-#: postmaster/postmaster.c:418
+#: postmaster/postmaster.c:433
 msgid "Assert checking is not compiled in."
 msgstr ""
 
-#: postmaster/postmaster.c:522 tcop/postgres.c:1472
+#: postmaster/postmaster.c:539 tcop/postgres.c:1493
 #, c-format
 msgid "--%s requires argument"
 msgstr ""
 
-#: postmaster/postmaster.c:524 tcop/postgres.c:1474
+#: postmaster/postmaster.c:541 tcop/postgres.c:1495
 #, c-format
 msgid "-c %s requires argument"
 msgstr ""
 
-#: postmaster/postmaster.c:535 postmaster/postmaster.c:546
-#: postmaster/postmaster.c:605
+#: postmaster/postmaster.c:552 postmaster/postmaster.c:563
+#: postmaster/postmaster.c:628
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: postmaster/postmaster.c:545
+#: postmaster/postmaster.c:562
 #, c-format
 msgid "invalid argument -- %s"
 msgstr ""
 
-#: postmaster/postmaster.c:561
+#: 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."
 msgstr ""
 
-#: postmaster/postmaster.c:584
+#: 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:585 postmaster/postmaster.c:588
+#: postmaster/postmaster.c:608 postmaster/postmaster.c:611
 msgid "-----------------------------------------"
 msgstr ""
 
-#: postmaster/postmaster.c:587 postmaster/postmaster.c:2243
+#: postmaster/postmaster.c:610 postmaster/postmaster.c:2283
 #, c-format
 msgid "\t%s"
 msgstr ""
 
-#: postmaster/postmaster.c:595 tcop/postgres.c:1602
+#: postmaster/postmaster.c:618 tcop/postgres.c:1639
 #, c-format
 msgid "%s: could not locate executable, bailing out..."
 msgstr ""
 
-#: postmaster/postmaster.c:604
+#: postmaster/postmaster.c:627
 msgid "For SSL, TCP/IP connections must be enabled."
 msgstr ""
 
-#: postmaster/postmaster.c:651
+#: postmaster/postmaster.c:674
 msgid "cannot create INET stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:663
+#: postmaster/postmaster.c:686
 msgid "cannot create UNIX stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:781
+#: postmaster/postmaster.c:806
 #, c-format
 msgid "fork failed: %s"
 msgstr ""
 
-#: postmaster/postmaster.c:803
+#: postmaster/postmaster.c:828
 #, c-format
 msgid "cannot disassociate from controlling TTY: %s"
 msgstr ""
 
-#: postmaster/postmaster.c:823
+#: postmaster/postmaster.c:848
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
 "\n"
 msgstr ""
 
-#: postmaster/postmaster.c:824
+#: postmaster/postmaster.c:849
 #, c-format
 msgid ""
 "Usage:\n"
 "  %s [options...]\n"
 "\n"
 msgstr ""
+"Anv�ndning:\n"
+"  %s [flaggor...]\n"
+"\n"
 
-#: postmaster/postmaster.c:825
+#: postmaster/postmaster.c:850
 msgid "Options:\n"
-msgstr ""
+msgstr "Flaggor:\n"
 
-#: postmaster/postmaster.c:827
+#: postmaster/postmaster.c:852
 msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr ""
 
-#: postmaster/postmaster.c:829
+#: postmaster/postmaster.c:854
 #, c-format
 msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
 msgstr ""
 
-#: postmaster/postmaster.c:830
+#: postmaster/postmaster.c:855
 msgid "  -c NAME=VALUE   set run-time parameter\n"
 msgstr ""
 
-#: postmaster/postmaster.c:831
+#: postmaster/postmaster.c:856
 msgid "  -d 1-5          debugging level\n"
 msgstr ""
 
-#: postmaster/postmaster.c:832
+#: postmaster/postmaster.c:857
 msgid "  -D DATADIR      database directory\n"
 msgstr ""
 
-#: postmaster/postmaster.c:833
+#: postmaster/postmaster.c:858
 msgid "  -F              turn fsync off\n"
-msgstr ""
+msgstr "  -F              sl� av fsync\n"
 
-#: postmaster/postmaster.c:834
+#: postmaster/postmaster.c:859
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
 msgstr ""
 
-#: postmaster/postmaster.c:835
+#: postmaster/postmaster.c:860
 msgid "  -i              enable TCP/IP connections\n"
 msgstr ""
 
-#: postmaster/postmaster.c:836
+#: postmaster/postmaster.c:861
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
 msgstr ""
 
-#: postmaster/postmaster.c:838
+#: postmaster/postmaster.c:863
 msgid "  -l              enable SSL connections\n"
-msgstr ""
+msgstr "  -l              sl� p� SSL-anslutningar\n"
 
-#: postmaster/postmaster.c:840
+#: postmaster/postmaster.c:865
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
 msgstr ""
 
-#: postmaster/postmaster.c:842
+#: postmaster/postmaster.c:867
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
 msgstr ""
 
-#: postmaster/postmaster.c:843
+#: postmaster/postmaster.c:868
 #, c-format
 msgid "  -p PORT         port number to listen on (default %d)\n"
 msgstr ""
 
-#: postmaster/postmaster.c:844
+#: postmaster/postmaster.c:869
 msgid ""
 "  -S              silent mode (start in background without logging output)\n"
 msgstr ""
 
-#: postmaster/postmaster.c:846
+#: postmaster/postmaster.c:871
 msgid ""
 "\n"
 "Developer options:\n"
-msgstr ""
+msgstr "\nUtvecklarflaggor:\n"
 
-#: postmaster/postmaster.c:847
+#: postmaster/postmaster.c:872
 msgid ""
 "  -n              do not reinitialize shared memory after abnormal exit\n"
 msgstr ""
 
-#: postmaster/postmaster.c:848
+#: postmaster/postmaster.c:873
 msgid "  -s              send SIGSTOP to all backend servers if one dies\n"
 msgstr ""
 
-#: postmaster/postmaster.c:850
+#: postmaster/postmaster.c:875
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -8029,391 +8117,400 @@ msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
+"\n"
+"V�nligen l�s dokumentationen f�r en komplett lista av k�rningsinst�llningar\n"
+"och hur man anger dem p� kommandoraden eller i konfigurationsfilen.\n"
+"\n"
+"Rapportera buggar till <pgsql-bugs@postgresql.org>.\n"
 
-#: postmaster/postmaster.c:932
+#: postmaster/postmaster.c:957
 #, c-format
 msgid "ServerLoop: select failed: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1058 postmaster/postmaster.c:1075
+#: postmaster/postmaster.c:1083 postmaster/postmaster.c:1100
 msgid "incomplete startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1066
+#: postmaster/postmaster.c:1091
 msgid "invalid length of startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1108
+#: postmaster/postmaster.c:1133
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1130
+#: postmaster/postmaster.c:1155
 msgid "unsupported frontend protocol"
 msgstr ""
 
-#: postmaster/postmaster.c:1157
+#: postmaster/postmaster.c:1182
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1189
+#: postmaster/postmaster.c:1215
 msgid "The database system is starting up"
 msgstr ""
 
-#: postmaster/postmaster.c:1192
+#: postmaster/postmaster.c:1218
 msgid "The database system is shutting down"
 msgstr ""
 
-#: postmaster/postmaster.c:1195
+#: postmaster/postmaster.c:1221
 msgid "The database system is in recovery mode"
 msgstr ""
 
-#: postmaster/postmaster.c:1198 storage/ipc/sinval.c:53
-#: storage/lmgr/proc.c:208
+#: postmaster/postmaster.c:1224 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:1228
+#: postmaster/postmaster.c:1254
 #, c-format
 msgid "processCancelRequest: CheckPointPID in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1242
+#: postmaster/postmaster.c:1268
 #, c-format
 msgid "processing cancel request: sending SIGINT to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1248
+#: postmaster/postmaster.c:1274
 #, c-format
 msgid "bad key in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1255
+#: postmaster/postmaster.c:1281
 #, c-format
 msgid "bad pid in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1298
+#: postmaster/postmaster.c:1324
 msgid "ConnCreate: malloc failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1393
+#: postmaster/postmaster.c:1419
 msgid "Received SIGHUP, reloading configuration files"
 msgstr ""
 
-#: postmaster/postmaster.c:1417
+#: postmaster/postmaster.c:1443
 #, c-format
 msgid "pmdie %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1431
+#: postmaster/postmaster.c:1457
 msgid "smart shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1443 postmaster/postmaster.c:1487
+#: postmaster/postmaster.c:1469 postmaster/postmaster.c:1513
 #, c-format
 msgid "shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1461
+#: postmaster/postmaster.c:1487
 msgid "fast shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1467
+#: postmaster/postmaster.c:1493
 msgid "aborting any active transactions"
 msgstr ""
 
-#: postmaster/postmaster.c:1503
+#: postmaster/postmaster.c:1529
 msgid "immediate shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1538
+#: postmaster/postmaster.c:1564
 msgid "reaping dead processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1555
+#: postmaster/postmaster.c:1581
 msgid "statistics collector process"
 msgstr ""
 
-#: postmaster/postmaster.c:1568
+#: postmaster/postmaster.c:1594
 msgid "shutdown process"
-msgstr ""
+msgstr "st�ng ner process"
 
-#: postmaster/postmaster.c:1579
+#: postmaster/postmaster.c:1605
 msgid "startup process"
-msgstr ""
+msgstr "starta process"
 
-#: postmaster/postmaster.c:1581
+#: postmaster/postmaster.c:1607
 msgid "aborting startup due to startup process failure"
 msgstr ""
 
-#: postmaster/postmaster.c:1590
+#: postmaster/postmaster.c:1616
 #, c-format
 msgid "startup process %d died while shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1622
+#: postmaster/postmaster.c:1648
 msgid ""
 "all server processes terminated; reinitializing shared memory and semaphores"
 msgstr ""
 
-#: postmaster/postmaster.c:1660
+#: postmaster/postmaster.c:1686
 msgid "child process"
 msgstr ""
 
-#: postmaster/postmaster.c:1705
+#: postmaster/postmaster.c:1731
 msgid "server process"
 msgstr ""
 
-#: postmaster/postmaster.c:1706
+#: postmaster/postmaster.c:1732
 msgid "terminating any other active server processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1727
+#: postmaster/postmaster.c:1753
 #, c-format
 msgid "CleanupProc: sending %s to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1771
+#: postmaster/postmaster.c:1797
 #, c-format
 msgid "%s (pid %d) exited with exit code %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1774
+#: postmaster/postmaster.c:1800
 #, c-format
 msgid "%s (pid %d) was terminated by signal %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1777
+#: postmaster/postmaster.c:1803
 #, c-format
 msgid "%s (pid %d) exited with unexpected status %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1799
+#: postmaster/postmaster.c:1825
 #, c-format
 msgid "SignalChildren: sending signal %d to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1836
+#: postmaster/postmaster.c:1863
 msgid "out of memory; connection startup aborted"
 msgstr ""
 
-#: postmaster/postmaster.c:1885
+#: postmaster/postmaster.c:1914
 msgid "connection startup failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1902
+#: postmaster/postmaster.c:1931
 #, c-format
 msgid "connection startup failed (fork failure): %s"
 msgstr ""
 
-#: postmaster/postmaster.c:1909
+#: postmaster/postmaster.c:1938
 #, c-format
 msgid "BackendStartup: forked pid=%d socket=%d"
 msgstr ""
 
-#: postmaster/postmaster.c:1942
+#: postmaster/postmaster.c:1972
 msgid "Server process fork() failed: "
 msgstr ""
 
-#: postmaster/postmaster.c:2088
+#: postmaster/postmaster.c:2119
 #, c-format
 msgid "connection received: host=%s port=%hu"
 msgstr ""
 
-#: postmaster/postmaster.c:2108
+#: postmaster/postmaster.c:2139
 #, c-format
 msgid "connection received: host=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2128
+#: postmaster/postmaster.c:2159
 msgid "DoBackend: Unable to set timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2157
+#: postmaster/postmaster.c:2188
 msgid "DoBackend: Unable to disable timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2161
+#: postmaster/postmaster.c:2192
 #, c-format
 msgid "connection authorized: user=%s database=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2241
+#: postmaster/postmaster.c:2281
 #, c-format
 msgid "%s child[%d]: starting with ("
 msgstr ""
 
-#: postmaster/postmaster.c:2541
+#: postmaster/postmaster.c:2284
+msgid ")"
+msgstr ""
+
+#: postmaster/postmaster.c:2583
 #, c-format
 msgid "could not launch startup process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2544
+#: postmaster/postmaster.c:2586
 #, c-format
 msgid "could not launch checkpoint process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2547
+#: postmaster/postmaster.c:2589
 #, c-format
 msgid "could not launch shutdown process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2571
+#: postmaster/postmaster.c:2613
 msgid "CheckPointDataBase: malloc failed"
 msgstr ""
 
-#: postmaster/postmaster.c:2610
+#: postmaster/postmaster.c:2652
 #, c-format
 msgid "cannot create file %s: %s"
 msgstr ""
 
-#: postmaster/postmaster.c:2622
+#: postmaster/postmaster.c:2664
 #, c-format
 msgid "writing file %s failed"
 msgstr ""
 
-#: regex/regcomp.c:1733 regex/regcomp.c:1746
+#: regex/regcomp.c:1758 regex/regcomp.c:1773
 msgid "cclass_init: out of memory"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:67
+#: rewrite/rewriteDefine.c:100
 #, c-format
 msgid "Attempt to insert rule \"%s\" failed: already exists"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:187
+#: rewrite/rewriteDefine.c:227
 msgid ""
 "rule actions on OLD currently not supported\n"
 "\tuse views or triggers instead"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:190
+#: rewrite/rewriteDefine.c:230
 msgid ""
 "rule actions on NEW currently not supported\n"
 "\tuse triggers instead"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:207
+#: rewrite/rewriteDefine.c:247
 msgid ""
 "instead nothing rules on select currently not supported\n"
 "\tuse views instead"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:215
+#: rewrite/rewriteDefine.c:255
 msgid "multiple action rules on select currently not supported"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:222
+#: rewrite/rewriteDefine.c:262
 msgid "only instead-select rules currently supported on select"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:228
+#: rewrite/rewriteDefine.c:268
 msgid "event qualifications not supported for rules on select"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:246
+#: rewrite/rewriteDefine.c:286
 msgid "select rule's target list has too many entries"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:259
+#: rewrite/rewriteDefine.c:300
 msgid "cannot convert relation containing dropped columns to view"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:262
+#: rewrite/rewriteDefine.c:303
 #, c-format
 msgid "select rule's target entry %d has different column name from %s"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:265
+#: rewrite/rewriteDefine.c:306
 #, c-format
 msgid "select rule's target entry %d has different type from attribute %s"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:276
+#: rewrite/rewriteDefine.c:317
 #, c-format
 msgid "select rule's target entry %d has different size from attribute %s"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:280
+#: rewrite/rewriteDefine.c:321
 msgid "select rule's target list has too few entries"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:293
+#: rewrite/rewriteDefine.c:334
 #, c-format
 msgid "\"%s\" is already a view"
 msgstr "\"%s\" �r redan en vy"
 
-#: rewrite/rewriteDefine.c:315
+#: rewrite/rewriteDefine.c:356
 #, c-format
 msgid "view rule for \"%s\" must be named \"%s\""
 msgstr ""
 
-#: rewrite/rewriteDefine.c:332
+#: rewrite/rewriteDefine.c:373
 #, c-format
 msgid "Relation \"%s\" is not empty. Cannot convert it to view"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:469
+#: rewrite/rewriteDefine.c:512
 #, c-format
 msgid "RenameRewriteRule: rule \"%s\" does not exist"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:473
+#: rewrite/rewriteDefine.c:516
 #, c-format
 msgid "Attempt to rename rule \"%s\" failed: \"%s\" already exists"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:344
+#: rewrite/rewriteHandler.c:343
 #, c-format
 msgid "rewriteTargetList: bogus resno %d in targetlist"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:386 rewrite/rewriteHandler.c:398
+#: rewrite/rewriteHandler.c:385 rewrite/rewriteHandler.c:397
 #, c-format
 msgid "Multiple assignments to same attribute \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:564
+#: rewrite/rewriteHandler.c:553
 msgid "ApplyRetrieveRule: expected just one rule action"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:566
+#: rewrite/rewriteHandler.c:555
 msgid "ApplyRetrieveRule: can't handle qualified ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:568
+#: rewrite/rewriteHandler.c:557
 msgid "ApplyRetrieveRule: can't handle per-attribute ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:845
+#: rewrite/rewriteHandler.c:835
 msgid "fireRIRrules: failed to remove aggs from qual"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1116
+#: rewrite/rewriteHandler.c:1106
 #, c-format
 msgid "query rewritten %d times, may contain cycles"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1240
+#: rewrite/rewriteHandler.c:1230
 msgid ""
 "Cannot insert into a view\n"
 "\tYou need an unconditional ON INSERT DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1244
+#: rewrite/rewriteHandler.c:1234
 msgid ""
 "Cannot update a view\n"
 "\tYou need an unconditional ON UPDATE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1248
+#: rewrite/rewriteHandler.c:1238
 msgid ""
 "Cannot delete from a view\n"
 "\tYou need an unconditional ON DELETE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1252
+#: rewrite/rewriteHandler.c:1242
 #, c-format
 msgid "QueryRewrite: unexpected commandType %d"
 msgstr ""
@@ -8589,204 +8686,208 @@ msgstr ""
 msgid "BufFileSeek: invalid whence: %d"
 msgstr ""
 
-#: storage/file/fd.c:273
+#: 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:386
+#: storage/file/fd.c:385
 #, c-format
 msgid "LruDelete %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:400
+#: storage/file/fd.c:399
 #, c-format
 msgid "LruDelete: failed to close %s: %m"
 msgstr ""
 
-#: storage/file/fd.c:414
+#: storage/file/fd.c:413
 #, c-format
 msgid "Insert %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:435
+#: storage/file/fd.c:434
 #, c-format
 msgid "LruInsert %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:457
+#: storage/file/fd.c:456
 #, c-format
 msgid "RE_OPEN FAILED: %d"
 msgstr ""
 
-#: storage/file/fd.c:462
+#: storage/file/fd.c:461
 msgid "RE_OPEN SUCCESS"
 msgstr ""
 
-#: storage/file/fd.c:488
+#: storage/file/fd.c:487
 #, c-format
 msgid "ReleaseLruFile. Opened %d"
 msgstr ""
 
-#: storage/file/fd.c:509
+#: storage/file/fd.c:508
 #, c-format
 msgid "AllocateVfd. Size %d"
 msgstr ""
 
-#: storage/file/fd.c:516
+#: storage/file/fd.c:515
 msgid "AllocateVfd: no room for VFD array"
 msgstr ""
 
-#: storage/file/fd.c:548
+#: storage/file/fd.c:547
 msgid "AllocateVfd: no room to enlarge VFD array"
 msgstr ""
 
-#: storage/file/fd.c:581
+#: storage/file/fd.c:580
 #, c-format
 msgid "FreeVfd: %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:631
+#: storage/file/fd.c:630
 #, c-format
 msgid "FileAccess %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:683
+#: storage/file/fd.c:682
 msgid "fileNameOpenFile: NULL fname"
 msgstr ""
 
-#: storage/file/fd.c:685
+#: storage/file/fd.c:684
 #, c-format
 msgid "fileNameOpenFile: %s %x %o"
 msgstr ""
 
-#: storage/file/fd.c:705
+#: storage/file/fd.c:704
 #, c-format
 msgid "fileNameOpenFile: success %d"
 msgstr ""
 
-#: storage/file/fd.c:712
+#: storage/file/fd.c:711
 msgid "fileNameOpenFile: no room to save VFD filename"
 msgstr ""
 
-#: storage/file/fd.c:796
+#: storage/file/fd.c:795
 #, c-format
 msgid "Failed to create temporary file %s"
 msgstr ""
 
-#: storage/file/fd.c:815
+#: storage/file/fd.c:814
 #, c-format
 msgid "FileClose: %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:827
+#: storage/file/fd.c:826
 #, c-format
 msgid "FileClose: failed to close %s: %m"
 msgstr ""
 
-#: storage/file/fd.c:842
+#: storage/file/fd.c:841
 #, c-format
 msgid "FileClose: failed to unlink %s: %m"
 msgstr ""
 
-#: storage/file/fd.c:860
+#: storage/file/fd.c:859
 #, c-format
 msgid "FileUnlink: %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:876
+#: storage/file/fd.c:875
 #, c-format
 msgid "FileRead: %d (%s) %ld %d %p"
 msgstr ""
 
-#: storage/file/fd.c:897
+#: storage/file/fd.c:896
 #, c-format
 msgid "FileWrite: %d (%s) %ld %d %p"
 msgstr ""
 
-#: storage/file/fd.c:923
+#: storage/file/fd.c:922
 #, c-format
 msgid "FileSeek: %d (%s) %ld %ld %d"
 msgstr ""
 
-#: storage/file/fd.c:933 storage/file/fd.c:954
+#: storage/file/fd.c:932 storage/file/fd.c:953
 #, c-format
 msgid "FileSeek: invalid offset: %ld"
 msgstr ""
 
-#: storage/file/fd.c:944 storage/file/fd.c:966
+#: storage/file/fd.c:943 storage/file/fd.c:965
 #, c-format
 msgid "FileSeek: invalid whence: %d"
 msgstr ""
 
-#: storage/file/fd.c:981
+#: storage/file/fd.c:980
 #, c-format
 msgid "FileTell %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:994
+#: storage/file/fd.c:993
 #, c-format
 msgid "FileTruncate %d (%s)"
 msgstr ""
 
-#: storage/file/fd.c:1025
+#: storage/file/fd.c:1024
 #, c-format
 msgid "AllocateFile: Allocated %d"
 msgstr ""
 
-#: storage/file/fd.c:1028
+#: storage/file/fd.c:1027
 msgid "AllocateFile: too many private FDs demanded"
 msgstr ""
 
-#: storage/file/fd.c:1042
+#: storage/file/fd.c:1041
 #, c-format
 msgid "AllocateFile: not enough descs, retry, er= %d"
 msgstr ""
 
-#: storage/file/fd.c:1058
+#: storage/file/fd.c:1057
 #, c-format
 msgid "FreeFile: Allocated %d"
 msgstr ""
 
-#: storage/file/fd.c:1071
+#: storage/file/fd.c:1070
 msgid "FreeFile: file was not obtained from AllocateFile"
 msgstr ""
 
-#: storage/freespace/freespace.c:178 storage/freespace/freespace.c:193
-#: storage/freespace/freespace.c:201
+#: 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:530
+#: 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:599
+#: storage/freespace/freespace.c:606
 msgid "FreeSpaceMap hashtable corrupted"
 msgstr ""
 
-#: storage/freespace/freespace.c:772
+#: storage/freespace/freespace.c:779
 msgid "fsm_record_free_space: unexpected match"
 msgstr ""
 
-#: storage/freespace/freespace.c:895
+#: storage/freespace/freespace.c:889
 msgid "insert_fsm_page_entry: entry already exists!"
 msgstr ""
 
@@ -8809,36 +8910,36 @@ msgstr ""
 msgid "Out of on_proc_exit slots"
 msgstr ""
 
-#: storage/ipc/ipci.c:74
+#: storage/ipc/ipci.c:73
 #, c-format
 msgid "invoking IpcMemoryCreate(size=%d)"
 msgstr ""
 
-#: storage/ipc/ipci.c:116
+#: storage/ipc/ipci.c:115
 msgid "Couldn't create the lock table"
 msgstr ""
 
-#: storage/ipc/shmem.c:160
+#: storage/ipc/shmem.c:161
 msgid "ShmemAlloc: out of memory"
 msgstr ""
 
-#: storage/ipc/shmem.c:206
+#: storage/ipc/shmem.c:207
 msgid "InitShmemIndex: couldn't initialize Shmem Index"
 msgstr ""
 
-#: storage/ipc/shmem.c:217
+#: storage/ipc/shmem.c:218
 msgid "InitShmemIndex: Shmem Index out of memory"
 msgstr ""
 
-#: storage/ipc/shmem.c:335
+#: storage/ipc/shmem.c:336
 msgid "ShmemInitStruct: Shmem Index out of memory"
 msgstr ""
 
-#: storage/ipc/shmem.c:350
+#: storage/ipc/shmem.c:351
 msgid "ShmemInitStruct: ShmemIndex entry size is wrong"
 msgstr ""
 
-#: storage/ipc/shmem.c:367
+#: storage/ipc/shmem.c:368
 #, c-format
 msgid "ShmemInitStruct: cannot allocate '%s'"
 msgstr ""
@@ -8848,11 +8949,11 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: storage/ipc/sinval.c:51
+#: 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 ""
 
@@ -8864,52 +8965,52 @@ msgstr ""
 msgid "Memory exhausted in GetSnapshotData"
 msgstr ""
 
-#: storage/ipc/sinvaladt.c:123
+#: storage/ipc/sinvaladt.c:122
 #, c-format
 msgid "SIBackendInit: backend id %d"
 msgstr ""
 
-#: storage/ipc/sinvaladt.c:222
+#: storage/ipc/sinvaladt.c:227
 #, c-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:245
+#: storage/large_object/inv_api.c:244
 #, c-format
 msgid "inv_getsize: large object %u not found"
 msgstr ""
 
-#: storage/large_object/inv_api.c:258 storage/large_object/inv_api.c:263
-#: storage/large_object/inv_api.c:271
+#: 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:276
+#: storage/large_object/inv_api.c:275
 #, c-format
 msgid "inv_seek: invalid whence: %d"
 msgstr ""
@@ -8946,21 +9047,21 @@ msgstr ""
 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:246
+#: storage/lmgr/lock.c:245
 #, c-format
 msgid "LockMethodTableInit: too many lock types %d greater than %d"
 msgstr ""
@@ -9058,7 +9159,7 @@ msgstr ""
 msgid "LockReleaseAll: done"
 msgstr ""
 
-#: storage/lmgr/lock.c:1509
+#: storage/lmgr/lock.c:1517
 msgid "DumpAllLocks: holder->tag.lock = NULL"
 msgstr ""
 
@@ -9076,45 +9177,45 @@ msgstr ""
 msgid "No more LWLockIds available"
 msgstr ""
 
-#: storage/lmgr/lwlock.c:274
+#: storage/lmgr/lwlock.c:281
 msgid "LWLockAcquire: can't wait without a PGPROC structure"
 msgstr ""
 
-#: storage/lmgr/lwlock.c:420
+#: storage/lmgr/lwlock.c:427
 #, c-format
 msgid "LWLockRelease: lock %d is not held"
 msgstr ""
 
-#: storage/lmgr/proc.c:142 storage/lmgr/proc.c:155
+#: storage/lmgr/proc.c:143 storage/lmgr/proc.c:157
 msgid "cannot create new proc: out of memory"
 msgstr ""
 
-#: storage/lmgr/proc.c:181
+#: storage/lmgr/proc.c:184
 msgid "InitProcess: Proc Header uninitialized"
 msgstr ""
 
-#: storage/lmgr/proc.c:184
+#: storage/lmgr/proc.c:187
 msgid "InitProcess: you already exist"
 msgstr ""
 
-#: storage/lmgr/proc.c:262
+#: storage/lmgr/proc.c:265
 msgid "InitDummyProcess: Proc Header uninitialized"
 msgstr ""
 
-#: storage/lmgr/proc.c:265
+#: storage/lmgr/proc.c:268
 msgid "InitDummyProcess: you already exist"
 msgstr ""
 
-#: storage/lmgr/proc.c:271
+#: storage/lmgr/proc.c:274
 #, c-format
 msgid "InitDummyProcess: DummyProc is in use by PID %d"
 msgstr ""
 
-#: storage/lmgr/proc.c:637
+#: storage/lmgr/proc.c:649
 msgid "ProcSleep: Unable to set timer for process wakeup"
 msgstr ""
 
-#: storage/lmgr/proc.c:659
+#: storage/lmgr/proc.c:671
 msgid "ProcSleep: Unable to disable timer for process wakeup"
 msgstr ""
 
@@ -9122,50 +9223,50 @@ msgstr ""
 msgid "spin.c does not support S_LOCK_FREE()"
 msgstr ""
 
-#: storage/page/bufpage.c:93
+#: storage/page/bufpage.c:92
 #, c-format
 msgid ""
 "PageAddItem: corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 
-#: storage/page/bufpage.c:113
+#: storage/page/bufpage.c:112
 msgid "PageAddItem: tried overwrite of used ItemId"
 msgstr ""
 
-#: storage/page/bufpage.c:140
+#: storage/page/bufpage.c:139
 msgid "PageAddItem: specified offset after maxoff"
 msgstr ""
 
-#: storage/page/bufpage.c:289
+#: storage/page/bufpage.c:288
 #, c-format
 msgid ""
 "PageRepairFragmentation: corrupted page pointers: lower = %u, upper = %u, "
 "special = %u"
 msgstr ""
 
-#: storage/page/bufpage.c:331
+#: storage/page/bufpage.c:330
 #, c-format
 msgid "PageRepairFragmentation: corrupted item pointer %u"
 msgstr ""
 
-#: storage/page/bufpage.c:344
+#: storage/page/bufpage.c:343
 #, c-format
 msgid "PageRepairFragmentation: corrupted item lengths, total %u, avail %u"
 msgstr ""
 
-#: storage/page/bufpage.c:423
+#: storage/page/bufpage.c:422
 #, c-format
 msgid ""
 "PageIndexTupleDelete: corrupted page pointers: lower = %u, upper = %u, "
 "special = %u"
 msgstr ""
 
-#: storage/page/bufpage.c:428
+#: storage/page/bufpage.c:427
 #, c-format
 msgid "PageIndexTupleDelete: bad offnum %u"
 msgstr ""
 
-#: storage/page/bufpage.c:439
+#: storage/page/bufpage.c:438
 #, c-format
 msgid "PageIndexTupleDelete: corrupted item pointer: offset = %u size = %u"
 msgstr ""
@@ -9276,7 +9377,7 @@ msgid ""
 "\tCheck free disk space."
 msgstr ""
 
-#: storage/smgr/smgr.c:270 utils/init/miscinit.c:1017
+#: storage/smgr/smgr.c:270 utils/init/miscinit.c:1015
 #: utils/misc/database.c:149
 #, c-format
 msgid "cannot open %s: %m"
@@ -9307,32 +9408,32 @@ msgstr ""
 msgid "cannot count blocks for %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:419
+#: storage/smgr/smgr.c:417
 #, c-format
 msgid "cannot truncate %s to %u blocks: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:461
+#: storage/smgr/smgr.c:459
 #, c-format
 msgid "cannot unlink %u/%u: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:486
+#: storage/smgr/smgr.c:484
 #, c-format
 msgid "transaction commit failed on %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:508
+#: storage/smgr/smgr.c:506
 #, c-format
 msgid "transaction abort failed on %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:530
+#: storage/smgr/smgr.c:528
 #, c-format
 msgid "storage sync failed on %s: %m"
 msgstr ""
 
-#: storage/smgr/smgr.c:544
+#: storage/smgr/smgr.c:542
 #, c-format
 msgid "illegal storage manager number %d"
 msgstr ""
@@ -9372,7 +9473,7 @@ msgstr ""
 msgid "HandleFunctionRequest: bogus argsize %d, should be %d"
 msgstr ""
 
-#: tcop/fastpath.c:337 tcop/postgres.c:653
+#: tcop/fastpath.c:337 tcop/postgres.c:664
 msgid ""
 "current transaction is aborted, queries ignored until end of transaction "
 "block"
@@ -9396,23 +9497,28 @@ msgstr ""
 msgid "pg_plan_query: copyObject failed on plan tree"
 msgstr ""
 
-#: tcop/postgres.c:708
+#: tcop/postgres.c:719
 msgid "ProcessUtility"
 msgstr ""
 
-#: tcop/postgres.c:752
+#: tcop/postgres.c:763
 msgid "ProcessQuery"
 msgstr ""
 
-#: tcop/postgres.c:862
+#: tcop/postgres.c:872
+#, c-format
+msgid "duration: %ld.%06ld sec"
+msgstr ""
+
+#: tcop/postgres.c:886
 msgid "StartTransactionCommand"
 msgstr ""
 
-#: tcop/postgres.c:873
+#: tcop/postgres.c:897
 msgid "CommitTransactionCommand"
 msgstr ""
 
-#: tcop/postgres.c:900
+#: tcop/postgres.c:924
 msgid ""
 "Message from PostgreSQL backend:\n"
 "\tThe Postmaster has informed me that some other backend\n"
@@ -9422,63 +9528,63 @@ msgid ""
 "\tPlease reconnect to the database system and repeat your query."
 msgstr ""
 
-#: tcop/postgres.c:1018
+#: tcop/postgres.c:1042
 msgid ""
 "floating point exception! The last floating point operation either exceeded "
 "legal ranges or was a divide by zero"
 msgstr ""
 
-#: tcop/postgres.c:1050
+#: tcop/postgres.c:1075
 msgid "This connection has been terminated by the administrator."
 msgstr ""
 
-#: tcop/postgres.c:1056
+#: tcop/postgres.c:1082
 msgid "Query was cancelled."
 msgstr "Fr�gan avbr�ts."
 
-#: tcop/postgres.c:1195
+#: tcop/postgres.c:1227
 msgid "Assert checking is not compiled in"
 msgstr ""
 
-#: tcop/postgres.c:1438
+#: tcop/postgres.c:1459
 msgid "only one -x flag is allowed"
 msgstr ""
 
-#: tcop/postgres.c:1456
+#: tcop/postgres.c:1477
 msgid "use -x {off,nor,nopull,nopm,pullall,wait}"
 msgstr ""
 
-#: tcop/postgres.c:1495
+#: tcop/postgres.c:1532
 msgid ""
 "Query statistics are disabled because parser, planner, or executor "
 "statistics are on."
 msgstr ""
 
-#: tcop/postgres.c:1572 tcop/postgres.c:1584
+#: tcop/postgres.c:1609 tcop/postgres.c:1621
 #, c-format
 msgid ""
 "%s: invalid command line arguments\n"
 "Try -? for help."
 msgstr ""
 
-#: tcop/postgres.c:1592
+#: tcop/postgres.c:1629
 #, c-format
 msgid "%s: user name undefined and no database specified"
 msgstr ""
 
-#: tcop/postgres.c:1643
+#: tcop/postgres.c:1680
 msgid "InitPostgres"
 msgstr ""
 
-#: tcop/postgres.c:1725
+#: tcop/postgres.c:1763
 msgid "AbortCurrentTransaction"
 msgstr ""
 
-#: tcop/postgres.c:1928
+#: tcop/postgres.c:1968
 msgid "unknown frontend message was received"
 msgstr ""
 
-#: tcop/postgres.c:2060
+#: tcop/postgres.c:2100
 #, c-format
 msgid ""
 "%s\n"
@@ -9487,7 +9593,7 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: tcop/postgres.c:2420
+#: tcop/postgres.c:2462
 #, c-format
 msgid "CreateCommandTag: unknown parse node type %d"
 msgstr ""
@@ -9522,20 +9628,20 @@ msgstr ""
 msgid "relation \"%s\" is a system catalog"
 msgstr ""
 
-#: tcop/utility.c:441 tcop/utility.c:445
+#: tcop/utility.c:452 tcop/utility.c:456
 #, c-format
 msgid "ProcessUtility: Invalid target for RENAME: %d"
 msgstr ""
 
-#: tcop/utility.c:543
+#: tcop/utility.c:561
 msgid "ALTER TABLE: permission denied"
 msgstr "ALTER TABLE: r�ttighet saknas"
 
-#: tcop/utility.c:549
+#: tcop/utility.c:567
 msgid "T_AlterTableStmt: unknown subtype"
 msgstr ""
 
-#: tcop/utility.c:868
+#: tcop/utility.c:884
 #, c-format
 msgid "ProcessUtility: command #%d unsupported"
 msgstr ""
@@ -9591,130 +9697,130 @@ msgstr ""
 msgid "aclitemout: bad idtype: %d"
 msgstr ""
 
-#: utils/adt/acl.c:432
+#: utils/adt/acl.c:434
 #, c-format
 msgid "acldefault: bogus objtype %d"
 msgstr ""
 
-#: utils/adt/acl.c:505
+#: utils/adt/acl.c:507
 msgid "aclinsert3: insertion before world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:616
+#: utils/adt/acl.c:618
 msgid "aclremove: removal of the world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:863
+#: utils/adt/acl.c:865
 #, c-format
 msgid "has_table_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1066
+#: utils/adt/acl.c:1068
 #, c-format
 msgid "has_database_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1242
+#: utils/adt/acl.c:1244
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr ""
 
-#: utils/adt/acl.c:1265
+#: utils/adt/acl.c:1267
 #, c-format
 msgid "has_function_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1464
+#: utils/adt/acl.c:1466
 #, c-format
 msgid "has_language_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1640
+#: utils/adt/acl.c:1642
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr ""
 
-#: utils/adt/acl.c:1666
+#: utils/adt/acl.c:1668
 #, c-format
 msgid "has_schema_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:175
+#: utils/adt/arrayfuncs.c:176
 #, c-format
 msgid "array_in: more than %d dimensions"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:178 utils/adt/arrayfuncs.c:187
+#: utils/adt/arrayfuncs.c:179 utils/adt/arrayfuncs.c:188
 msgid "array_in: missing dimension value"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:195
+#: utils/adt/arrayfuncs.c:196
 msgid "array_in: missing ']' in array declaration"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:200
+#: utils/adt/arrayfuncs.c:201
 msgid "array_in: upper_bound cannot be < lower_bound"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:209
+#: utils/adt/arrayfuncs.c:210
 msgid "array_in: Need to specify dimension"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:218
+#: utils/adt/arrayfuncs.c:219
 msgid "array_in: missing assignment operator"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:245
+#: utils/adt/arrayfuncs.c:246
 msgid "array_in: missing left brace"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:302 utils/adt/arrayfuncs.c:309
-#: utils/adt/arrayfuncs.c:422 utils/adt/arrayfuncs.c:432
+#: 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 ""
 
-#: utils/adt/arrayfuncs.c:318 utils/adt/arrayfuncs.c:329
-#: utils/adt/arrayfuncs.c:451 utils/adt/arrayfuncs.c:464
-#: utils/adt/arrayfuncs.c:500
+#: 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 ""
 
-#: utils/adt/arrayfuncs.c:919
+#: utils/adt/arrayfuncs.c:986
 msgid "Slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1054 utils/adt/arrayfuncs.c:1056
-#: utils/adt/arrayfuncs.c:1073 utils/adt/arrayfuncs.c:1093
-#: utils/adt/arrayfuncs.c:1103 utils/adt/arrayfuncs.c:1229
-#: utils/adt/arrayfuncs.c:1244 utils/adt/arrayfuncs.c:1253
-#: utils/adt/arrayfuncs.c:1260 utils/adt/arrayfuncs.c:1269
+#: 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 ""
 
-#: utils/adt/arrayfuncs.c:1218
+#: utils/adt/arrayfuncs.c:1286
 msgid "Updates on slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1279
+#: utils/adt/arrayfuncs.c:1347
 msgid "Source array too small"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1410
+#: utils/adt/arrayfuncs.c:1478
 #, c-format
 msgid "array_map: invalid nargs: %d"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1412
+#: utils/adt/arrayfuncs.c:1480
 msgid "array_map: null input array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1456
+#: utils/adt/arrayfuncs.c:1524
 msgid "array_map: cannot handle NULL in array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1650 utils/cache/lsyscache.c:881
-#: utils/cache/lsyscache.c:904
+#: utils/adt/arrayfuncs.c:1716 utils/cache/lsyscache.c:908
+#: utils/cache/lsyscache.c:931
 #, c-format
 msgid "cache lookup failed for type %u"
 msgstr ""
@@ -9750,49 +9856,45 @@ msgstr ""
 msgid "cash_div:  divide by 0 error"
 msgstr ""
 
-#: utils/adt/date.c:61
+#: utils/adt/date.c:69
 #, c-format
 msgid "Bad date external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:65
+#: utils/adt/date.c:73
 #, c-format
 msgid "Bad date external representation '%s'"
 msgstr ""
 
-#: utils/adt/date.c:73
+#: utils/adt/date.c:81
 msgid ""
 "Date CURRENT no longer supported\n"
 "\tdate_in() internal coding error"
 msgstr ""
 
-#: utils/adt/date.c:83
+#: utils/adt/date.c:91
 #, c-format
 msgid "Unrecognized date external representation '%s'"
 msgstr ""
 
-#: utils/adt/date.c:356
-msgid "Unable to convert date to tm"
-msgstr ""
-
-#: utils/adt/date.c:405
+#: utils/adt/date.c:400
 msgid "Unable to convert timestamp to date"
 msgstr ""
 
-#: utils/adt/date.c:430
+#: utils/adt/date.c:425
 msgid "Unable to convert reserved abstime value to date"
 msgstr ""
 
-#: utils/adt/date.c:489
+#: utils/adt/date.c:484
 msgid "Bad date external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:525
+#: utils/adt/date.c:521
 #, c-format
 msgid "Bad time external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:529 utils/adt/date.c:1332
+#: utils/adt/date.c:525 utils/adt/date.c:1336
 #, c-format
 msgid "Bad time external representation '%s'"
 msgstr ""
@@ -9801,65 +9903,65 @@ msgstr ""
 msgid "Unable to convert timestamp to time"
 msgstr ""
 
-#: utils/adt/date.c:961
+#: utils/adt/date.c:963
 msgid "Unable to convert timestamptz to time"
 msgstr ""
 
-#: utils/adt/date.c:1161
+#: utils/adt/date.c:1165
 msgid "Bad time external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:1192 utils/adt/date.c:1275
+#: utils/adt/date.c:1196 utils/adt/date.c:1279
 #, c-format
 msgid "TIME units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:1259
+#: utils/adt/date.c:1263
 #, c-format
 msgid "TIME units '%s' not supported"
 msgstr ""
 
-#: utils/adt/date.c:1327
+#: utils/adt/date.c:1331
 #, c-format
 msgid "Bad time with time zone external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:1789
+#: utils/adt/date.c:1795
 msgid "Unable to convert timestamptz to timetz"
 msgstr ""
 
-#: utils/adt/date.c:1865
+#: utils/adt/date.c:1871
 msgid "Bad timetz external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:1896 utils/adt/date.c:1992
+#: utils/adt/date.c:1902 utils/adt/date.c:1998
 #, c-format
 msgid "TIMETZ units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:1976
+#: utils/adt/date.c:1982
 #, c-format
 msgid "TIMETZ units '%s' not supported"
 msgstr ""
 
-#: utils/adt/date.c:2020 utils/adt/date.c:2052 utils/adt/timestamp.c:3251
-#: utils/adt/timestamp.c:3274 utils/adt/timestamp.c:3388
-#: utils/adt/timestamp.c:3410
+#: 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 ""
 
-#: utils/adt/date.c:2071 utils/adt/timestamp.c:3296 utils/adt/timestamp.c:3433
+#: 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/datetime.c:1222 utils/adt/datetime.c:1839
+#: utils/adt/datetime.c:1239 utils/adt/datetime.c:1955
 msgid "'CURRENT' is no longer supported"
 msgstr ""
 
-#: utils/adt/datetime.c:1399 utils/adt/datetime.c:2113
-#: utils/adt/formatting.c:3033
+#: 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 ""
@@ -9937,7 +10039,7 @@ msgstr ""
 msgid "Input '%s' is out of range for float4"
 msgstr ""
 
-#: utils/adt/float.c:270 utils/adt/numeric.c:1659
+#: utils/adt/float.c:270 utils/adt/numeric.c:2830 utils/adt/numeric.c:2853
 #, c-format
 msgid "Bad float8 input format '%s'"
 msgstr ""
@@ -10044,12 +10146,12 @@ msgstr ""
 msgid "float84div: divide by zero"
 msgstr ""
 
-#: utils/adt/format_type.c:137 utils/adt/format_type.c:163
+#: utils/adt/format_type.c:136 utils/adt/format_type.c:162
 #, c-format
 msgid "could not locate data type with oid %u in catalog"
 msgstr ""
 
-#: utils/adt/format_type.c:316
+#: utils/adt/format_type.c:315
 #, c-format
 msgid "Invalid INTERVAL typmod 0x%x"
 msgstr ""
@@ -10095,98 +10197,98 @@ msgid ""
 "mon %d\n"
 msgstr ""
 
-#: utils/adt/formatting.c:965
+#: utils/adt/formatting.c:964
 msgid "to_char/to_number(): '9' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:982
+#: utils/adt/formatting.c:981
 msgid "to_char/to_number(): '0' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:1009
+#: utils/adt/formatting.c:1008
 msgid "to_char/to_number(): not unique decimal point."
 msgstr ""
 
-#: utils/adt/formatting.c:1014 utils/adt/formatting.c:1101
+#: 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:1027
+#: utils/adt/formatting.c:1026
 msgid "to_char/to_number(): not unique 'S'."
 msgstr ""
 
-#: utils/adt/formatting.c:1032
+#: 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:1054
+#: utils/adt/formatting.c:1053
 msgid "to_char/to_number(): can't use 'S' and 'MI' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1063
+#: utils/adt/formatting.c:1062
 msgid "to_char/to_number(): can't use 'S' and 'PL' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1072
+#: utils/adt/formatting.c:1071
 msgid "to_char/to_number(): can't use 'S' and 'SG' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1082
+#: 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:1108
+#: utils/adt/formatting.c:1107
 msgid "to_char/to_number(): 'E' is not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1132
+#: utils/adt/formatting.c:1131
 msgid "to_char/number(): run parser."
 msgstr ""
 
-#: utils/adt/formatting.c:1328
+#: utils/adt/formatting.c:1327
 msgid "to_from-char(): DUMP FORMAT"
 msgstr ""
 
-#: utils/adt/formatting.c:1333
+#: utils/adt/formatting.c:1332
 #, c-format
 msgid "%d:\t NODE_TYPE_ACTION '%s'\t(%s,%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:1336
+#: utils/adt/formatting.c:1335
 #, c-format
 msgid "%d:\t NODE_TYPE_CHAR '%c'"
 msgstr ""
 
-#: utils/adt/formatting.c:1339
+#: utils/adt/formatting.c:1338
 #, c-format
 msgid "%d:\t NODE_TYPE_END"
 msgstr ""
 
-#: utils/adt/formatting.c:1343
+#: utils/adt/formatting.c:1342
 #, c-format
 msgid "%d:\t UnKnown NODE !!!"
 msgstr ""
 
-#: utils/adt/formatting.c:1367
+#: utils/adt/formatting.c:1366
 #, c-format
 msgid "get_th: '%s' is not number."
 msgstr ""
 
-#: utils/adt/formatting.c:1535
+#: utils/adt/formatting.c:1540
 msgid "TO-FROM_CHAR: Dump KeyWord Index:"
 msgstr ""
 
-#: utils/adt/formatting.c:1541
+#: utils/adt/formatting.c:1546
 #, c-format
 msgid "\t%c: %s, "
 msgstr ""
 
-#: utils/adt/formatting.c:1547
+#: utils/adt/formatting.c:1552
 #, c-format
 msgid "\t(%d) %c %d"
 msgstr ""
 
-#: utils/adt/formatting.c:1550
+#: utils/adt/formatting.c:1555
 #, c-format
 msgid ""
 "\n"
@@ -10194,119 +10296,119 @@ msgid ""
 "\t\tFree positions: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:1622
+#: utils/adt/formatting.c:1627
 msgid "to_timestamp(): bad AM/PM string"
 msgstr ""
 
-#: utils/adt/formatting.c:1966
+#: utils/adt/formatting.c:1971
 msgid "to_timestamp(): TZ/tz not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1974
+#: utils/adt/formatting.c:1979
 #, c-format
 msgid "to_timestamp(): bad value for %s"
 msgstr ""
 
-#: utils/adt/formatting.c:2610 utils/adt/formatting.c:3169
+#: utils/adt/formatting.c:2613 utils/adt/formatting.c:3172
 #, c-format
 msgid "Cache is full (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2618 utils/adt/formatting.c:3186
+#: utils/adt/formatting.c:2621 utils/adt/formatting.c:3189
 #, c-format
 msgid "OLD: '%s' AGE: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:2629 utils/adt/formatting.c:3198
+#: utils/adt/formatting.c:2632 utils/adt/formatting.c:3201
 #, c-format
 msgid "NEW (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2794 utils/adt/formatting.c:2820
+#: utils/adt/formatting.c:2797 utils/adt/formatting.c:2823
 msgid "to_char(): Unable to convert timestamp to tm"
 msgstr ""
 
-#: utils/adt/formatting.c:2996
+#: utils/adt/formatting.c:2999
 msgid "to_timestamp(): AM/PM hour must be between 1 and 12"
 msgstr ""
 
-#: utils/adt/formatting.c:3065
+#: utils/adt/formatting.c:3068
 msgid "to_timestamp() cat't convert yday without year information"
 msgstr ""
 
-#: utils/adt/formatting.c:3100
+#: utils/adt/formatting.c:3103
 msgid "to_timestamp(): can't convert 'tm' to timestamp."
 msgstr ""
 
-#: utils/adt/formatting.c:3248
+#: utils/adt/formatting.c:3251
 #, c-format
 msgid "REMOVING ENTRY (%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:3472
+#: utils/adt/formatting.c:3476
 msgid "CALL: get_last_relevant_decnum()"
 msgstr ""
 
-#: utils/adt/formatting.c:3497
+#: utils/adt/formatting.c:3501
 msgid " --- scan start --- "
 msgstr ""
 
-#: utils/adt/formatting.c:3518
+#: utils/adt/formatting.c:3522
 #, c-format
 msgid "Try read sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3530
+#: utils/adt/formatting.c:3534
 #, c-format
 msgid "Try read locale sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3549
+#: utils/adt/formatting.c:3553
 #, c-format
 msgid "Try read sipmle sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3590
+#: utils/adt/formatting.c:3594
 #, c-format
 msgid "Read digit (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3601
+#: utils/adt/formatting.c:3605
 #, c-format
 msgid "Try read decimal point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3616
+#: utils/adt/formatting.c:3620
 #, c-format
 msgid "Try read locale point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3649
+#: utils/adt/formatting.c:3653
 #, c-format
 msgid "SIGN_WROTE: %d, CURRENT: %d, NUMBER_P: '%s', INOUT: '%s'"
 msgstr ""
 
-#: utils/adt/formatting.c:3664
+#: utils/adt/formatting.c:3668
 #, c-format
 msgid "Writing sign to position: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3706
+#: utils/adt/formatting.c:3710
 #, c-format
 msgid "Writing bracket to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3728
+#: utils/adt/formatting.c:3732
 #, c-format
 msgid "Writing blank space to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3743
+#: utils/adt/formatting.c:3747
 #, c-format
 msgid "Writing zero to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3761
+#: utils/adt/formatting.c:3765
 #, c-format
 msgid "Writing decimal point to position %d"
 msgstr ""
@@ -10316,11 +10418,11 @@ msgstr ""
 msgid "Writing digit '%c' to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3857
+#: utils/adt/formatting.c:3858
 msgid "to_number(): RN is not supported"
 msgstr ""
 
-#: utils/adt/formatting.c:3979
+#: utils/adt/formatting.c:3980
 #, c-format
 msgid ""
 "\n"
@@ -10337,92 +10439,104 @@ msgid ""
 "\tLAST_RELEVANT: %s"
 msgstr ""
 
-#: utils/adt/formatting.c:4244
+#: 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 ""
 
-#: utils/adt/geo_ops.c:825
+#: utils/adt/geo_ops.c:831
 #, c-format
 msgid "Bad line external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:830 utils/adt/geo_ops.c:894
+#: utils/adt/geo_ops.c:836 utils/adt/geo_ops.c:900
 msgid "line not yet implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1220 utils/adt/geo_ops.c:1241
+#: utils/adt/geo_ops.c:1226 utils/adt/geo_ops.c:1247
 #, c-format
 msgid "Bad path external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1557
+#: utils/adt/geo_ops.c:1563
 #, c-format
 msgid "Bad point external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1753
+#: utils/adt/geo_ops.c:1759
 #, c-format
 msgid "Bad lseg external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:2303
+#: utils/adt/geo_ops.c:2309
 msgid "dist_lb not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:2816
+#: utils/adt/geo_ops.c:2820
 msgid "close_lb not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3093
+#: utils/adt/geo_ops.c:3097
 msgid "Unable to create bounding box for empty polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3115 utils/adt/geo_ops.c:3126
+#: utils/adt/geo_ops.c:3119 utils/adt/geo_ops.c:3130
 #, c-format
 msgid "Bad polygon external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3414
+#: utils/adt/geo_ops.c:3418
 msgid "poly_distance not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3493
+#: utils/adt/geo_ops.c:3497
 msgid "point_div:  divide by 0.0 error"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3712
+#: 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:3727
+#: utils/adt/geo_ops.c:3739
 msgid "Open path cannot be converted to polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3892 utils/adt/geo_ops.c:3900 utils/adt/geo_ops.c:3913
-#: utils/adt/geo_ops.c:3917
+#: 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 ""
 
-#: utils/adt/geo_ops.c:3937 utils/adt/geo_ops.c:3943
+#: utils/adt/geo_ops.c:3949 utils/adt/geo_ops.c:3955
 msgid "Unable to format circle"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4421
+#: utils/adt/geo_ops.c:4434
 msgid "Unable to convert circle to polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4455 utils/adt/geo_ops.c:4476
+#: 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 ""
 
@@ -10440,33 +10554,37 @@ msgstr ""
 msgid "i4toi2: '%d' causes int2 overflow"
 msgstr ""
 
-#: utils/adt/int8.c:88 utils/adt/int8.c:98
+#: utils/adt/int8.c:101 utils/adt/int8.c:125
 #, c-format
 msgid "Bad int8 external representation \"%s\""
 msgstr ""
 
-#: utils/adt/int8.c:94
+#: utils/adt/int8.c:114
 #, c-format
 msgid "int8 value out of range: \"%s\""
 msgstr ""
 
-#: utils/adt/int8.c:117
+#: utils/adt/int8.c:157
 msgid "Unable to format int8"
 msgstr ""
 
-#: utils/adt/int8.c:708
+#: utils/adt/int8.c:748
 msgid "int8 conversion to int4 is out of range"
 msgstr ""
 
-#: utils/adt/int8.c:731
+#: utils/adt/int8.c:771
 msgid "int8 conversion to int2 is out of range"
 msgstr ""
 
-#: utils/adt/int8.c:767
+#: utils/adt/int8.c:807 utils/adt/int8.c:844
 msgid "Floating point conversion to int8 is out of range"
 msgstr ""
 
-#: utils/adt/like.c:451 utils/adt/like_match.c:288
+#: utils/adt/int8.c:859
+msgid "int8 conversion to OID is out of range"
+msgstr ""
+
+#: 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 ""
 
@@ -10484,113 +10602,113 @@ msgstr ""
 msgid "Text is too long to convert to MAC address"
 msgstr ""
 
-#: utils/adt/nabstime.c:353 utils/adt/nabstime.c:386
+#: utils/adt/nabstime.c:352 utils/adt/nabstime.c:385
 #, c-format
 msgid "Invalid timezone '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:490
+#: utils/adt/nabstime.c:489
 #, c-format
 msgid "Bad abstime external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:494
+#: utils/adt/nabstime.c:493
 #, c-format
 msgid "Bad abstime external representation '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:524
+#: utils/adt/nabstime.c:523
 #, c-format
 msgid "Bad abstime (internal coding error) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:715 utils/adt/nabstime.c:783
+#: utils/adt/nabstime.c:714 utils/adt/nabstime.c:782
 msgid "Unable to convert timestamp to abstime"
 msgstr ""
 
-#: utils/adt/nabstime.c:739
+#: utils/adt/nabstime.c:738
 msgid "Unable to convert abstime 'invalid' to timestamp"
 msgstr ""
 
-#: utils/adt/nabstime.c:754
+#: utils/adt/nabstime.c:753
 msgid ""
 "Unable convert ABSTIME to TIMESTAMP\n"
 "\tabstime_timestamp() internal error"
 msgstr ""
 
-#: utils/adt/nabstime.c:807
+#: utils/adt/nabstime.c:806
 msgid "Unable to convert abstime 'invalid' to timestamptz"
 msgstr ""
 
-#: utils/adt/nabstime.c:822
+#: utils/adt/nabstime.c:821
 msgid ""
 "Unable convert ABSTIME to TIMESTAMP WITH TIME ZONE\n"
 "\tabstime_timestamp() internal error"
 msgstr ""
 
-#: utils/adt/nabstime.c:853
+#: utils/adt/nabstime.c:852
 #, c-format
 msgid "Bad reltime external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:857
+#: utils/adt/nabstime.c:856
 #, c-format
 msgid "Bad reltime external representation '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:867
+#: utils/adt/nabstime.c:866
 #, c-format
 msgid "Bad reltime (internal coding error) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:925
+#: utils/adt/nabstime.c:924
 #, c-format
 msgid "Unable to decode tinterval '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:1036
+#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: utils/adt/network.c:186
+#: utils/adt/network.c:185
 #, c-format
 msgid "set_masklen - invalid value '%d'"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: utils/adt/network.c:657
+#: utils/adt/network.c:656
 #, c-format
 msgid "convert_network_to_scalar: unsupported type %u"
 msgstr ""
@@ -10599,71 +10717,71 @@ msgstr ""
 msgid "int4notin: must provide relationname.attributename"
 msgstr ""
 
-#: utils/adt/numeric.c:1474
+#: utils/adt/numeric.c:1506
 msgid "Cannot convert NaN to int4"
 msgstr ""
 
-#: utils/adt/numeric.c:1524
+#: utils/adt/numeric.c:1556
 msgid "Cannot convert NaN to int8"
 msgstr ""
 
-#: utils/adt/numeric.c:1575
+#: utils/adt/numeric.c:1607
 msgid "Cannot convert NaN to int2"
 msgstr ""
 
-#: utils/adt/numeric.c:1741
+#: utils/adt/numeric.c:1803
 msgid "do_numeric_accum: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1832
+#: utils/adt/numeric.c:1894
 msgid "numeric_avg: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1868
+#: utils/adt/numeric.c:1930
 msgid "numeric_variance: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:1947
+#: utils/adt/numeric.c:2012
 msgid "numeric_stddev: expected 3-element numeric array"
 msgstr ""
 
-#: utils/adt/numeric.c:2140
+#: utils/adt/numeric.c:2208
 msgid "int2_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2160
+#: utils/adt/numeric.c:2228
 msgid "int4_avg_accum: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2178
+#: utils/adt/numeric.c:2246
 msgid "int8_avg: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2369 utils/adt/numeric.c:2384 utils/adt/numeric.c:2402
-#: utils/adt/numeric.c:2406 utils/adt/numeric.c:2417
+#: 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
 #, c-format
 msgid "Bad numeric input format '%s'"
 msgstr ""
 
-#: utils/adt/numeric.c:2736
+#: utils/adt/numeric.c:2804
 #, c-format
 msgid ""
 "overflow on numeric ABS(value) >= 10^%d for field with precision %d scale %d"
 msgstr ""
 
-#: utils/adt/numeric.c:3146
+#: utils/adt/numeric.c:3263
 msgid "division by zero on numeric"
 msgstr ""
 
-#: utils/adt/numeric.c:3490
+#: utils/adt/numeric.c:3644
 msgid "math error on numeric - cannot compute SQRT of negative value"
 msgstr ""
 
-#: utils/adt/numeric.c:3576
+#: utils/adt/numeric.c:3733
 msgid "argument for EXP() too big"
 msgstr ""
 
-#: utils/adt/numeric.c:3643
+#: utils/adt/numeric.c:3812
 msgid "math error on numeric - cannot compute LN of value <= zero"
 msgstr ""
 
@@ -10719,7 +10837,7 @@ msgstr ""
 msgid "Requested buffer is too large."
 msgstr ""
 
-#: utils/adt/pg_locale.c:147
+#: utils/adt/pg_locale.c:150
 msgid "Invalid LC_COLLATE setting"
 msgstr ""
 
@@ -10733,97 +10851,77 @@ msgstr ""
 msgid "No function memory context in set-function"
 msgstr ""
 
-#: utils/adt/regexp.c:170
+#: utils/adt/regexp.c:166
 #, c-format
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: utils/adt/regproc.c:82 utils/adt/regproc.c:249
-#, c-format
-msgid "No procedure with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:123 utils/adt/regproc.c:138 utils/adt/regproc.c:275
+#: utils/adt/regproc.c:115 utils/adt/regproc.c:130 utils/adt/regproc.c:258
 #, c-format
 msgid "No procedure with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:125 utils/adt/regproc.c:140
+#: utils/adt/regproc.c:117 utils/adt/regproc.c:132
 #, c-format
 msgid "There is more than one procedure named %s"
 msgstr ""
 
-#: utils/adt/regproc.c:397 utils/adt/regproc.c:570
-#, c-format
-msgid "No operator with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:438 utils/adt/regproc.c:453 utils/adt/regproc.c:607
+#: utils/adt/regproc.c:413 utils/adt/regproc.c:428 utils/adt/regproc.c:576
 #, c-format
 msgid "No operator with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:440 utils/adt/regproc.c:455
+#: utils/adt/regproc.c:415 utils/adt/regproc.c:430
 #, c-format
 msgid "There is more than one operator named %s"
 msgstr ""
 
-#: utils/adt/regproc.c:587
+#: utils/adt/regproc.c:556
 msgid ""
 "regoperatorin: use NONE to denote the missing argument of a unary operator"
 msgstr ""
 
-#: utils/adt/regproc.c:589
+#: utils/adt/regproc.c:558
 msgid "regoperatorin: provide two argument types for operator"
 msgstr ""
 
-#: utils/adt/regproc.c:730
-#, c-format
-msgid "No class with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:764
+#: utils/adt/regproc.c:726
 #, c-format
 msgid "No class with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:886
-#, c-format
-msgid "No type with oid %s"
-msgstr ""
-
-#: utils/adt/regproc.c:920
+#: utils/adt/regproc.c:870
 #, c-format
 msgid "No type with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:1007 utils/adt/regproc.c:1010 utils/adt/varlena.c:1352
-#: utils/adt/varlena.c:1355
+#: 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:1067
+#: utils/adt/regproc.c:1015
 #, c-format
 msgid "%s: expected a left parenthesis"
 msgstr ""
 
-#: utils/adt/regproc.c:1081
+#: utils/adt/regproc.c:1029
 #, c-format
 msgid "%s: expected a right parenthesis"
 msgstr ""
 
-#: utils/adt/regproc.c:1097
+#: utils/adt/regproc.c:1045
 #, c-format
 msgid "%s: expected a type name"
 msgstr ""
 
-#: utils/adt/regproc.c:1127
+#: utils/adt/regproc.c:1075
 #, c-format
 msgid "%s: improper type name"
 msgstr ""
 
-#: utils/adt/regproc.c:1159
+#: utils/adt/regproc.c:1107
 #, c-format
 msgid "%s: too many argument datatypes"
 msgstr ""
@@ -10849,712 +10947,720 @@ msgstr ""
 msgid "too many keys (%d max) in call to RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:280 utils/adt/ri_triggers.c:391
-#: utils/adt/ri_triggers.c:592
+#: utils/adt/ri_triggers.c:282 utils/adt/ri_triggers.c:393
+#: utils/adt/ri_triggers.c:598
 msgid "SPI_connect() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:285 utils/adt/ri_triggers.c:469
+#: utils/adt/ri_triggers.c:287 utils/adt/ri_triggers.c:471
 msgid "SPI_execp() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:290
+#: utils/adt/ri_triggers.c:292
 #, c-format
 msgid "%s referential integrity violation - no rows found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:296 utils/adt/ri_triggers.c:481
+#: utils/adt/ri_triggers.c:298 utils/adt/ri_triggers.c:483
 msgid "SPI_finish() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:308 utils/adt/ri_triggers.c:886
-#: utils/adt/ri_triggers.c:1120 utils/adt/ri_triggers.c:1320
-#: utils/adt/ri_triggers.c:1553 utils/adt/ri_triggers.c:1769
-#: utils/adt/ri_triggers.c:1999 utils/adt/ri_triggers.c:2209
-#: utils/adt/ri_triggers.c:2470 utils/adt/ri_triggers.c:2724
-#: utils/adt/ri_triggers.c:3008 utils/adt/ri_triggers.c:3092
+#: 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
 msgid "MATCH PARTIAL not yet supported"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:344
+#: utils/adt/ri_triggers.c:346
 #, 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:368 utils/adt/ri_triggers.c:578
+#: utils/adt/ri_triggers.c:370 utils/adt/ri_triggers.c:584
 msgid "MATCH PARTIAL not yet implemented"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:474
+#: utils/adt/ri_triggers.c:476
 #, c-format
 msgid ""
 "%s referential integrity violation - key referenced from %s not found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:490
+#: utils/adt/ri_triggers.c:492
 msgid "internal error #1 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:663
+#: utils/adt/ri_triggers.c:669
 msgid "SPI_execp() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:670
+#: utils/adt/ri_triggers.c:676
 msgid "SPI_finish() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:711
+#: utils/adt/ri_triggers.c:717
 msgid "RI_FKey_noaction_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:714
+#: utils/adt/ri_triggers.c:720
 msgid "RI_FKey_noaction_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:716
+#: utils/adt/ri_triggers.c:722
 msgid "RI_FKey_noaction_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:724
+#: utils/adt/ri_triggers.c:730
 msgid "wrong # of arguments in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:726
+#: utils/adt/ri_triggers.c:732
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:794
+#: utils/adt/ri_triggers.c:801
 msgid "SPI_connect() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:864
+#: utils/adt/ri_triggers.c:871
 msgid "SPI_execp() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:869 utils/adt/ri_triggers.c:1103
-#: utils/adt/ri_triggers.c:1752 utils/adt/ri_triggers.c:1982
+#: utils/adt/ri_triggers.c:876 utils/adt/ri_triggers.c:1111
+#: utils/adt/ri_triggers.c:1760 utils/adt/ri_triggers.c:1990
 #, c-format
 msgid "%s referential integrity violation - key in %s still referenced from %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:876
+#: utils/adt/ri_triggers.c:883
 msgid "SPI_finish() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:893
+#: utils/adt/ri_triggers.c:900
 msgid "internal error #2 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:934
+#: utils/adt/ri_triggers.c:941
 msgid "RI_FKey_noaction_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:937
+#: utils/adt/ri_triggers.c:944
 msgid "RI_FKey_noaction_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:939
+#: utils/adt/ri_triggers.c:946
 msgid "RI_FKey_noaction_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:947
+#: utils/adt/ri_triggers.c:954
 msgid "wrong # of arguments in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:949
+#: utils/adt/ri_triggers.c:956
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1028
+#: utils/adt/ri_triggers.c:1036
 msgid "SPI_connect() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1098
+#: utils/adt/ri_triggers.c:1106
 msgid "SPI_execp() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1110
+#: utils/adt/ri_triggers.c:1118
 msgid "SPI_finish() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1127
+#: utils/adt/ri_triggers.c:1135
 msgid "internal error #3 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1163
+#: utils/adt/ri_triggers.c:1171
 msgid "RI_FKey_cascade_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1166
+#: utils/adt/ri_triggers.c:1174
 msgid "RI_FKey_cascade_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1168
+#: utils/adt/ri_triggers.c:1176
 msgid "RI_FKey_cascade_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1176
+#: utils/adt/ri_triggers.c:1184
 msgid "wrong # of arguments in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1178
+#: utils/adt/ri_triggers.c:1186
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1236
+#: utils/adt/ri_triggers.c:1244
 msgid "SPI_connect() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1305
+#: utils/adt/ri_triggers.c:1313
 msgid "SPI_execp() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1310
+#: utils/adt/ri_triggers.c:1318
 msgid "SPI_finish() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1327
+#: utils/adt/ri_triggers.c:1335
 msgid "internal error #4 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1365
+#: utils/adt/ri_triggers.c:1373
 msgid "RI_FKey_cascade_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1368
+#: utils/adt/ri_triggers.c:1376
 msgid "RI_FKey_cascade_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1370
+#: utils/adt/ri_triggers.c:1378
 msgid "RI_FKey_cascade_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1378
+#: utils/adt/ri_triggers.c:1386
 msgid "wrong # of arguments in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1380
+#: utils/adt/ri_triggers.c:1388
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1449
+#: utils/adt/ri_triggers.c:1457
 msgid "SPI_connect() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1538
+#: utils/adt/ri_triggers.c:1546
 msgid "SPI_execp() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1543
+#: utils/adt/ri_triggers.c:1551
 msgid "SPI_finish() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1560
+#: utils/adt/ri_triggers.c:1568
 msgid "internal error #5 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1603
+#: utils/adt/ri_triggers.c:1611
 msgid "RI_FKey_restrict_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1606
+#: utils/adt/ri_triggers.c:1614
 msgid "RI_FKey_restrict_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1608
+#: utils/adt/ri_triggers.c:1616
 msgid "RI_FKey_restrict_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1616
+#: utils/adt/ri_triggers.c:1624
 msgid "wrong # of arguments in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1618
+#: utils/adt/ri_triggers.c:1626
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1676
+#: utils/adt/ri_triggers.c:1684
 msgid "SPI_connect() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1747
+#: utils/adt/ri_triggers.c:1755
 msgid "SPI_execp() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1759
+#: utils/adt/ri_triggers.c:1767
 msgid "SPI_finish() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1776
+#: utils/adt/ri_triggers.c:1784
 msgid "internal error #6 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1820
+#: utils/adt/ri_triggers.c:1828
 msgid "RI_FKey_restrict_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1823
+#: utils/adt/ri_triggers.c:1831
 msgid "RI_FKey_restrict_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1825
+#: utils/adt/ri_triggers.c:1833
 msgid "RI_FKey_restrict_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1833
+#: utils/adt/ri_triggers.c:1841
 msgid "wrong # of arguments in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1835
+#: utils/adt/ri_triggers.c:1843
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1904
+#: utils/adt/ri_triggers.c:1912
 msgid "SPI_connect() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1977
+#: utils/adt/ri_triggers.c:1985
 msgid "SPI_execp() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1989
+#: utils/adt/ri_triggers.c:1997
 msgid "SPI_finish() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2006
+#: utils/adt/ri_triggers.c:2014
 msgid "internal error #7 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2042
+#: utils/adt/ri_triggers.c:2050
 msgid "RI_FKey_setnull_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2045
+#: utils/adt/ri_triggers.c:2053
 msgid "RI_FKey_setnull_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2047
+#: utils/adt/ri_triggers.c:2055
 msgid "RI_FKey_setnull_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2055
+#: utils/adt/ri_triggers.c:2063
 msgid "wrong # of arguments in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2057
+#: utils/adt/ri_triggers.c:2065
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2115
+#: utils/adt/ri_triggers.c:2123
 msgid "SPI_connect() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2194
+#: utils/adt/ri_triggers.c:2202
 msgid "SPI_execp() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2199
+#: utils/adt/ri_triggers.c:2207
 msgid "SPI_finish() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2216
+#: utils/adt/ri_triggers.c:2224
 msgid "internal error #8 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2255
+#: utils/adt/ri_triggers.c:2263
 msgid "RI_FKey_setnull_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2258
+#: utils/adt/ri_triggers.c:2266
 msgid "RI_FKey_setnull_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2260
+#: utils/adt/ri_triggers.c:2268
 msgid "RI_FKey_setnull_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2268
+#: utils/adt/ri_triggers.c:2276
 msgid "wrong # of arguments in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2270
+#: utils/adt/ri_triggers.c:2278
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2340
+#: utils/adt/ri_triggers.c:2348
 msgid "SPI_connect() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2455
+#: utils/adt/ri_triggers.c:2464
 msgid "SPI_execp() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2460
+#: utils/adt/ri_triggers.c:2469
 msgid "SPI_finish() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2477
+#: utils/adt/ri_triggers.c:2486
 msgid "internal error #9 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2513
+#: utils/adt/ri_triggers.c:2522
 msgid "RI_FKey_setdefault_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2516
+#: utils/adt/ri_triggers.c:2525
 msgid "RI_FKey_setdefault_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2518
+#: utils/adt/ri_triggers.c:2527
 msgid "RI_FKey_setdefault_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2526
+#: utils/adt/ri_triggers.c:2535
 msgid "wrong # of arguments in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2528
+#: utils/adt/ri_triggers.c:2537
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2586
+#: utils/adt/ri_triggers.c:2595
 msgid "SPI_connect() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2709
+#: utils/adt/ri_triggers.c:2718
 msgid "SPI_execp() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2714
+#: utils/adt/ri_triggers.c:2723
 msgid "SPI_finish() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2731
+#: utils/adt/ri_triggers.c:2740
 msgid "internal error #10 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2769
+#: utils/adt/ri_triggers.c:2778
 msgid "RI_FKey_setdefault_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2772
+#: utils/adt/ri_triggers.c:2781
 msgid "RI_FKey_setdefault_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2774
+#: utils/adt/ri_triggers.c:2783
 msgid "RI_FKey_setdefault_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2782
+#: utils/adt/ri_triggers.c:2791
 msgid "wrong # of arguments in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2784
+#: utils/adt/ri_triggers.c:2793
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2855
+#: utils/adt/ri_triggers.c:2864
 msgid "SPI_connect() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2993
+#: utils/adt/ri_triggers.c:3003
 msgid "SPI_execp() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2998
+#: utils/adt/ri_triggers.c:3008
 msgid "SPI_finish() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3015
+#: utils/adt/ri_triggers.c:3025
 msgid "internal error #11 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3046
+#: utils/adt/ri_triggers.c:3056
 msgid "wrong # of arguments in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3048
+#: utils/adt/ri_triggers.c:3058
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3099
+#: utils/adt/ri_triggers.c:3109
 msgid "internal error #12 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3164
+#: utils/adt/ri_triggers.c:3174
 #, c-format
 msgid "unrecognized referential integrity MATCH type '%s'"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3214 utils/adt/ri_triggers.c:3222
-#: utils/adt/ri_triggers.c:3274
+#: utils/adt/ri_triggers.c:3224 utils/adt/ri_triggers.c:3232
+#: utils/adt/ri_triggers.c:3284
 #, c-format
 msgid "constraint %s: table %s does not have an attribute %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3402
+#: utils/adt/ri_triggers.c:3412
 msgid "out of memory for RI plan cache"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3591
+#: utils/adt/ri_triggers.c:3601
 #, c-format
 msgid "ri_AttributesEqual(): cannot find '=' operator for type %u"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3607
+#: utils/adt/ri_triggers.c:3617
 msgid "out of memory for RI operator cache"
 msgstr ""
 
-#: utils/adt/ruleutils.c:197
+#: utils/adt/ruleutils.c:198
 msgid "get_ruledef: cannot connect to SPI manager"
 msgstr ""
 
-#: utils/adt/ruleutils.c:212 utils/adt/ruleutils.c:329
+#: utils/adt/ruleutils.c:213 utils/adt/ruleutils.c:330
 #, c-format
 msgid "SPI_prepare() failed for \"%s\""
 msgstr ""
 
-#: utils/adt/ruleutils.c:223
+#: utils/adt/ruleutils.c:224
 #, c-format
 msgid "failed to get pg_rewrite tuple for %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:227 utils/adt/ruleutils.c:252
+#: utils/adt/ruleutils.c:228 utils/adt/ruleutils.c:253
 msgid "get_ruledef: SPI_finish() failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:313
+#: utils/adt/ruleutils.c:314
 msgid "get_viewdef: cannot connect to SPI manager"
 msgstr ""
 
-#: utils/adt/ruleutils.c:342
+#: utils/adt/ruleutils.c:343
 #, c-format
 msgid "failed to get pg_rewrite tuple for view %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:365
+#: utils/adt/ruleutils.c:366
 msgid "get_viewdef: SPI_finish() failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:401
+#: utils/adt/ruleutils.c:402
 #, c-format
 msgid "syscache lookup for index %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:414
+#: utils/adt/ruleutils.c:415
 #, c-format
 msgid "syscache lookup for relid %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:579
+#: utils/adt/ruleutils.c:580
 #, c-format
 msgid "Failed to find constraint with OID %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:599
+#: utils/adt/ruleutils.c:600
 #, c-format
 msgid "pg_get_constraintdef: Null conkey for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:612
+#: utils/adt/ruleutils.c:613
 #, c-format
 msgid "pg_get_constraintdef: Null confkey for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:632
+#: utils/adt/ruleutils.c:633
 #, c-format
 msgid "pg_get_constraintdef: Unknown confmatchtype '%c' for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:658
+#: utils/adt/ruleutils.c:659
 #, c-format
 msgid "pg_get_constraintdef: Unknown confupdtype '%c' for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:683
+#: utils/adt/ruleutils.c:684
 #, c-format
 msgid "pg_get_constraintdef: Unknown confdeltype '%c' for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:697
+#: utils/adt/ruleutils.c:698
 #, c-format
 msgid "pg_get_constraintdef: unsupported constraint type '%c'"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1096
+#: utils/adt/ruleutils.c:1100
 #, c-format
 msgid "get_ruledef: rule %s has unsupported event type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1298
+#: utils/adt/ruleutils.c:1302
 #, c-format
 msgid "get_query_def: unknown query command type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1534
+#: utils/adt/ruleutils.c:1537
 #, c-format
 msgid "get_setop_query: unexpected set op %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1546
+#: utils/adt/ruleutils.c:1549
 #, c-format
 msgid "get_setop_query: unexpected node %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1606
+#: utils/adt/ruleutils.c:1609
 msgid "get_insert_query_def: too many RTEs in INSERT!"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1758
+#: utils/adt/ruleutils.c:1761
 msgid "get_utility_query_def: unexpected statement type"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1789
+#: utils/adt/ruleutils.c:1792
 #, c-format
 msgid "get_names_for_var: bogus varlevelsup %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1803
+#: utils/adt/ruleutils.c:1806
 #, c-format
 msgid "get_names_for_var: bogus varno %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2019
+#: utils/adt/ruleutils.c:2036
 #, c-format
 msgid "get_rule_expr: expr opType %d not supported"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2087
+#: utils/adt/ruleutils.c:2096
 #, c-format
 msgid "Argument type %s of FieldSelect is not a tuple type"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2151
+#: utils/adt/ruleutils.c:2178
 #, c-format
 msgid "get_rule_expr: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2184
+#: utils/adt/ruleutils.c:2211
 #, c-format
 msgid "get_rule_expr: unexpected booltesttype %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2217
+#: utils/adt/ruleutils.c:2256
 #, c-format
 msgid "get_rule_expr: unknown node type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2258
+#: utils/adt/ruleutils.c:2297
 #, c-format
 msgid "cache lookup for operator %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2277
+#: utils/adt/ruleutils.c:2316
 msgid "get_rule_expr: bogus oprkind"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2686
+#: utils/adt/ruleutils.c:2676
 #, c-format
 msgid "get_sublink_expr: unsupported sublink type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2779
+#: utils/adt/ruleutils.c:2769
 #, c-format
 msgid "unexpected rte kind %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2851
+#: utils/adt/ruleutils.c:2841
 #, c-format
 msgid "get_from_clause_item: unknown join type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2901
+#: utils/adt/ruleutils.c:2891
 #, c-format
 msgid "get_from_clause_item: unexpected node type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2968 utils/cache/lsyscache.c:250
+#: utils/adt/ruleutils.c:2958 utils/cache/lsyscache.c:250
 #, c-format
 msgid "cache lookup failed for opclass %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:3008
+#: utils/adt/ruleutils.c:2998
 msgid "tleIsArrayAssign: I'm confused ..."
 msgstr ""
 
-#: utils/adt/ruleutils.c:3224
+#: utils/adt/ruleutils.c:3215
 #, c-format
 msgid "cache lookup of operator %u failed"
 msgstr ""
 
-#: utils/adt/ruleutils.c:3245
+#: utils/adt/ruleutils.c:3236
 #, c-format
 msgid "unexpected oprkind %c for operator %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:873
+#: utils/adt/selfuncs.c:878
 #, c-format
 msgid "patternsel: no = operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1054 utils/adt/selfuncs.c:1131
-#: utils/adt/selfuncs.c:1172 utils/adt/selfuncs.c:1202
+#: utils/adt/selfuncs.c:1060 utils/adt/selfuncs.c:1137
+#: utils/adt/selfuncs.c:1178 utils/adt/selfuncs.c:1208
 #, c-format
 msgid "booltestsel: unexpected booltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1240 utils/adt/selfuncs.c:1297
+#: utils/adt/selfuncs.c:1246 utils/adt/selfuncs.c:1303
 #, c-format
 msgid "nulltestsel: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2109
+#: utils/adt/selfuncs.c:2116
 #, c-format
 msgid "convert_numeric_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2296
+#: utils/adt/selfuncs.c:2303
 #, c-format
 msgid "convert_string_datum: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2485
+#: utils/adt/selfuncs.c:2492
 #, c-format
 msgid "convert_timevalue_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2881
+#: utils/adt/selfuncs.c:2719 utils/adt/selfuncs.c:3080
+msgid "Cannot perform case insensitive matching on type BYTEA"
+msgstr ""
+
+#: utils/adt/selfuncs.c:2804 utils/adt/selfuncs.c:3226
+msgid "Regex matching not supported on type BYTEA"
+msgstr ""
+
+#: utils/adt/selfuncs.c:2945
 msgid "pattern_fixed_prefix: bogus ptype"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2910
+#: utils/adt/selfuncs.c:2974
 #, c-format
 msgid "prefix_selectivity: no >= operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2933
+#: utils/adt/selfuncs.c:3001
 #, c-format
 msgid "prefix_selectivity: no < operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3168
+#: utils/adt/selfuncs.c:3270
 msgid "pattern_selectivity: bogus ptype"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3302
+#: utils/adt/selfuncs.c:3432
 #, c-format
 msgid "string_lessthan: unexpected datatype %u"
 msgstr ""
@@ -11573,332 +11679,332 @@ msgstr ""
 msgid "tidin: invalid value."
 msgstr ""
 
-#: utils/adt/tid.c:169
+#: utils/adt/tid.c:171
 msgid "ctid isn't of type TID"
 msgstr ""
 
-#: utils/adt/tid.c:174
+#: utils/adt/tid.c:176
 msgid "currtid can't handle views with no CTID"
 msgstr ""
 
-#: utils/adt/tid.c:176
+#: utils/adt/tid.c:178
 msgid "the view has no rules"
 msgstr ""
 
-#: utils/adt/tid.c:186
+#: utils/adt/tid.c:188
 msgid "only one select rule is allowed in views"
 msgstr ""
 
-#: utils/adt/tid.c:206
+#: utils/adt/tid.c:209
 msgid "currtid can't handle this view"
 msgstr ""
 
-#: utils/adt/timestamp.c:72
+#: utils/adt/timestamp.c:80
 #, c-format
 msgid "Bad timestamp external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:76 utils/adt/timestamp.c:266
+#: utils/adt/timestamp.c:84 utils/adt/timestamp.c:278
 #, c-format
 msgid "Bad timestamp external representation '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:82
+#: utils/adt/timestamp.c:90
 #, c-format
 msgid "TIMESTAMP out of range '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:98
+#: utils/adt/timestamp.c:106
 #, c-format
 msgid "TIMESTAMP '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:103
+#: utils/adt/timestamp.c:111
 #, c-format
 msgid "TIMESTAMP '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:131
+#: utils/adt/timestamp.c:139
 msgid "Unable to format timestamp; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:204
+#: utils/adt/timestamp.c:213
 #, c-format
 msgid "TIMESTAMP(%d) precision must be between %d and %d"
 msgstr ""
 
-#: utils/adt/timestamp.c:261
+#: utils/adt/timestamp.c:273
 #, c-format
 msgid "Bad timestamp with time zone external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:272
+#: utils/adt/timestamp.c:284
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE out of range '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:288
+#: utils/adt/timestamp.c:300
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:293
+#: utils/adt/timestamp.c:305
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:322
+#: utils/adt/timestamp.c:334
 msgid "Unable to format timestamp with time zone; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:381
+#: utils/adt/timestamp.c:393
 #, c-format
 msgid "Bad interval external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:385 utils/adt/timestamp.c:393
+#: utils/adt/timestamp.c:397 utils/adt/timestamp.c:405
 #, c-format
 msgid "Bad interval external representation '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:398
+#: utils/adt/timestamp.c:410
 #, c-format
 msgid "Interval '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:402
+#: utils/adt/timestamp.c:414
 #, c-format
 msgid "Interval '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:422
+#: utils/adt/timestamp.c:434
 msgid "Unable to encode interval; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:425
+#: utils/adt/timestamp.c:437
 msgid "Unable to format interval; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:679
+#: utils/adt/timestamp.c:695
 msgid "AdjustIntervalForTypmod(): internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:685
+#: utils/adt/timestamp.c:701
 #, c-format
 msgid "INTERVAL(%d) precision must be between %d and %d"
 msgstr ""
 
-#: utils/adt/timestamp.c:1503
+#: utils/adt/timestamp.c:1525
 msgid "Unable to subtract non-finite timestamps"
 msgstr ""
 
-#: utils/adt/timestamp.c:1567
+#: utils/adt/timestamp.c:1587
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamp_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1574
+#: utils/adt/timestamp.c:1594
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamp_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1652
+#: utils/adt/timestamp.c:1672
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamptz_pl_span() internal error encoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1657
+#: utils/adt/timestamp.c:1677
 msgid ""
 "Unable to add TIMESTAMP and INTERVAL\n"
 "\ttimestamptz_pl_span() internal error decoding timestamp"
 msgstr ""
 
-#: utils/adt/timestamp.c:1879
+#: utils/adt/timestamp.c:1906
 msgid "interval_div: divide by 0.0 error"
 msgstr ""
 
-#: utils/adt/timestamp.c:1924
+#: utils/adt/timestamp.c:1951
 msgid "interval_accum: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:1966
+#: utils/adt/timestamp.c:1993
 msgid "interval_avg: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:2088
+#: utils/adt/timestamp.c:2115
 msgid ""
 "Unable to encode INTERVAL\n"
 "\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2092
+#: utils/adt/timestamp.c:2119
 msgid ""
 "Unable to decode TIMESTAMP\n"
 "\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2197 utils/adt/timestamp.c:2200
+#: utils/adt/timestamp.c:2224 utils/adt/timestamp.c:2227
 msgid "Unable to decode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:2253
+#: utils/adt/timestamp.c:2280
 msgid "TIMESTAMP bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2309
+#: utils/adt/timestamp.c:2336
 msgid "TIMESTAMP WITH TIME ZONE bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2366
+#: utils/adt/timestamp.c:2393
 msgid "INTERVAL bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2399 utils/adt/timestamp.c:2463
-#: utils/adt/timestamp.c:2763 utils/adt/timestamp.c:2901
+#: 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/timestamp.c:2454 utils/adt/timestamp.c:2866
-#: utils/adt/timestamp.c:2894
+#: 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/timestamp.c:2459
+#: utils/adt/timestamp.c:2486
 #, c-format
 msgid "Unable to truncate TIMESTAMP to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2492 utils/adt/timestamp.c:2557
-#: utils/adt/timestamp.c:2931 utils/adt/timestamp.c:3084
+#: utils/adt/timestamp.c:2519 utils/adt/timestamp.c:2584
+#: utils/adt/timestamp.c:2962 utils/adt/timestamp.c:3115
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/timestamp.c:2546 utils/adt/timestamp.c:3045
-#: utils/adt/timestamp.c:3078
+#: 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/timestamp.c:2553
+#: utils/adt/timestamp.c:2580
 #, c-format
 msgid "Unable to truncate TIMESTAMP WITH TIME ZONE to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2586 utils/adt/timestamp.c:2654
-#: utils/adt/timestamp.c:3112 utils/adt/timestamp.c:3221
+#: 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/timestamp.c:2639 utils/adt/timestamp.c:3192
+#: utils/adt/timestamp.c:2666 utils/adt/timestamp.c:3223
 #, c-format
 msgid "INTERVAL units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2643
+#: utils/adt/timestamp.c:2670
 #, c-format
 msgid "Unable to truncate INTERVAL to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2648
+#: utils/adt/timestamp.c:2675
 msgid "Unable to decode INTERVAL; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2676
+#: utils/adt/timestamp.c:2703
 msgid "isoweek2date(): can't convert without year information"
 msgstr ""
 
-#: utils/adt/timestamp.c:2880 utils/adt/timestamp.c:2887
+#: utils/adt/timestamp.c:2911 utils/adt/timestamp.c:2918
 msgid "Unable to encode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:3064 utils/adt/timestamp.c:3071
+#: utils/adt/timestamp.c:3095 utils/adt/timestamp.c:3102
 msgid "Unable to encode TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: utils/adt/timestamp.c:3201
+#: utils/adt/timestamp.c:3232
 msgid ""
 "Unable to decode INTERVAL\n"
 "\tinterval_part() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:3329
+#: utils/adt/timestamp.c:3360
 msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
 msgstr ""
 
-#: utils/adt/timestamp.c:3334
+#: utils/adt/timestamp.c:3365
 msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: utils/adt/timestamp.c:3359
+#: utils/adt/timestamp.c:3390
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP (tm)"
 msgstr ""
 
-#: utils/adt/timestamp.c:3362
+#: utils/adt/timestamp.c:3393
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP"
 msgstr ""
 
-#: utils/adt/varbit.c:101 utils/adt/varbit.c:217
+#: utils/adt/varbit.c:106 utils/adt/varbit.c:231
 #, c-format
 msgid "Bit string length %d does not match type BIT(%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:122 utils/adt/varbit.c:329
+#: utils/adt/varbit.c:127 utils/adt/varbit.c:336
 #, c-format
 msgid "Cannot parse '%c' as a binary digit"
 msgstr ""
 
-#: utils/adt/varbit.c:143 utils/adt/varbit.c:350
+#: utils/adt/varbit.c:148 utils/adt/varbit.c:357
 #, c-format
 msgid "Cannot parse '%c' as a hex digit"
 msgstr ""
 
-#: utils/adt/varbit.c:308 utils/adt/varbit.c:423
+#: utils/adt/varbit.c:315 utils/adt/varbit.c:436
 #, c-format
 msgid "Bit string too long for type BIT VARYING(%d)"
 msgstr ""
 
-#: utils/adt/varbit.c:815
+#: utils/adt/varbit.c:806
 msgid "Cannot AND bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:853
+#: utils/adt/varbit.c:844
 msgid "Cannot OR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:897
+#: utils/adt/varbit.c:888
 msgid "Cannot XOR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:1112
+#: utils/adt/varbit.c:1103
 msgid "Bit string is too large to fit in type integer"
 msgstr ""
 
-#: utils/adt/varbit.c:1156 utils/adt/varbit.c:1183
+#: utils/adt/varbit.c:1147 utils/adt/varbit.c:1174
 msgid "INT64 is not supported on this platform"
 msgstr ""
 
-#: utils/adt/varbit.c:1171
+#: utils/adt/varbit.c:1162
 msgid "Bit string is too large to fit in type int64"
 msgstr ""
 
-#: utils/adt/varbit.c:1263
+#: utils/adt/varbit.c:1254
 #, c-format
 msgid "S. %d %d em=%2x sm=%2x r=%d"
 msgstr ""
 
-#: utils/adt/varchar.c:107 utils/adt/varchar.c:203
+#: utils/adt/varchar.c:107 utils/adt/varchar.c:213
 #, c-format
 msgid "value too long for type character(%d)"
 msgstr ""
 
-#: utils/adt/varchar.c:389 utils/adt/varchar.c:459
+#: utils/adt/varchar.c:369 utils/adt/varchar.c:447
 #, c-format
 msgid "value too long for type character varying(%d)"
 msgstr ""
@@ -11907,39 +12013,39 @@ msgstr ""
 msgid "Bad input string for type bytea"
 msgstr ""
 
-#: utils/adt/varlena.c:337 utils/adt/varlena.c:614 utils/adt/varlena.c:720
+#: 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/varlena.c:483 utils/adt/varlena.c:544 utils/adt/varlena.c:1040
+#: utils/adt/varlena.c:484 utils/adt/varlena.c:546 utils/adt/varlena.c:1043
 msgid "negative substring length not allowed"
 msgstr ""
 
-#: utils/adt/varlena.c:1133
+#: utils/adt/varlena.c:1136
 #, c-format
 msgid "byteaGetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1162
+#: utils/adt/varlena.c:1165
 #, c-format
 msgid "byteaGetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1196
+#: utils/adt/varlena.c:1199
 #, c-format
 msgid "byteaSetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1237
+#: utils/adt/varlena.c:1240
 #, c-format
 msgid "byteaSetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1247
+#: utils/adt/varlena.c:1250
 msgid "byteaSetBit: new bit must be 0 or 1"
 msgstr ""
 
-#: utils/adt/varlena.c:1736
+#: utils/adt/varlena.c:1741
 msgid "field position must be > 0"
 msgstr ""
 
@@ -11958,34 +12064,34 @@ msgstr ""
 msgid "Cannot display a value of type %s"
 msgstr ""
 
-#: utils/cache/catcache.c:150
+#: utils/cache/catcache.c:151
 #, c-format
 msgid "GetCCHashFunc: type %u unsupported as catcache key"
 msgstr ""
 
-#: utils/cache/catcache.c:194
+#: utils/cache/catcache.c:195
 #, c-format
 msgid "CCComputeHashValue: %d nkeys"
 msgstr ""
 
-#: utils/cache/catcache.c:259
+#: utils/cache/catcache.c:260
 #, c-format
 msgid "CCComputeTupleHashValue: %d cc_nkeys"
 msgstr ""
 
-#: utils/cache/catcache.c:283
+#: utils/cache/catcache.c:284
 #, c-format
 msgid "Catcache stats dump: %d/%d tuples in catcaches"
 msgstr ""
 
-#: utils/cache/catcache.c:290
+#: utils/cache/catcache.c:291
 #, c-format
 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/cache/catcache.c:314
+#: utils/cache/catcache.c:315
 #, c-format
 msgid ""
 "Catcache totals: %d tup, %ld srch, %ld+%ld=%ld hits, %ld+%ld=%ld loads, %ld "
@@ -12022,7 +12128,7 @@ msgstr ""
 msgid "CatalogCacheInitializeCache: load %d/%d w/%d"
 msgstr ""
 
-#: utils/cache/catcache.c:942
+#: utils/cache/catcache.c:941
 msgid "CatalogCacheInit: only sys attr supported is OID"
 msgstr ""
 
@@ -12030,12 +12136,12 @@ msgstr ""
 msgid "init_fcache: too many arguments"
 msgstr ""
 
-#: utils/cache/inval.c:452
+#: utils/cache/inval.c:453
 #, c-format
 msgid "ExecuteInvalidationMessage: bogus message id %d"
 msgstr ""
 
-#: utils/cache/inval.c:709 utils/cache/inval.c:732
+#: utils/cache/inval.c:708 utils/cache/inval.c:731
 msgid "Out of cache_callback_list slots"
 msgstr ""
 
@@ -12074,392 +12180,397 @@ msgstr ""
 msgid "get_system_catalog_relid: cannot find %s"
 msgstr ""
 
-#: utils/cache/lsyscache.c:979
+#: utils/cache/lsyscache.c:1006
 #, c-format
 msgid "get_typdefault: failed to lookup type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1096
+#: utils/cache/lsyscache.c:1087
 #, c-format
-msgid "getBaseTypeTypeMod: failed to lookup type %u"
+msgid "getBaseType: failed to lookup type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1208
+#: utils/cache/lsyscache.c:1225
 #, c-format
 msgid "getTypeInputInfo: Cache lookup of type %u failed"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1238
+#: utils/cache/lsyscache.c:1255
 #, c-format
 msgid "getTypeOutputInfo: Cache lookup of type %u failed"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1334
+#: utils/cache/lsyscache.c:1351
 msgid "get_attstatsslot: stavalues is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1356
+#: utils/cache/lsyscache.c:1373
 #, c-format
 msgid "get_attstatsslot: Cache lookup failed for type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1392
+#: utils/cache/lsyscache.c:1409
 msgid "get_attstatsslot: stanumbers is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1403
+#: utils/cache/lsyscache.c:1420
 msgid "get_attstatsslot: stanumbers is not a 1-D float4 array"
 msgstr ""
 
-#: utils/cache/relcache.c:169 utils/cache/relcache.c:177
-#: utils/cache/relcache.c:189
+#: 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:235
+#: utils/cache/relcache.c:234
 msgid "trying to delete a rd_id reldesc that does not exist."
 msgstr ""
 
-#: utils/cache/relcache.c:240
+#: utils/cache/relcache.c:239
 msgid "trying to delete a rd_node reldesc that does not exist."
 msgstr ""
 
-#: utils/cache/relcache.c:249
+#: utils/cache/relcache.c:248
 msgid "trying to delete a relname reldesc that does not exist."
 msgstr ""
 
-#: utils/cache/relcache.c:355
+#: utils/cache/relcache.c:354
 msgid "ScanPgRelation: bad buildinfo"
 msgstr ""
 
-#: utils/cache/relcache.c:506
+#: utils/cache/relcache.c:508
 #, c-format
 msgid "Bogus attribute number %d for %s"
 msgstr ""
 
-#: utils/cache/relcache.c:548
+#: utils/cache/relcache.c:550
 #, c-format
 msgid "catalog is missing %d attribute(s) for relid %u"
 msgstr ""
 
-#: utils/cache/relcache.c:960
+#: utils/cache/relcache.c:961
 #, c-format
 msgid "RelationInitIndexAccessInfo: no pg_index entry for index %u"
 msgstr ""
 
-#: utils/cache/relcache.c:975
+#: utils/cache/relcache.c:976
 #, c-format
 msgid "RelationInitIndexAccessInfo: cache lookup failed for AM %u"
 msgstr ""
 
-#: utils/cache/relcache.c:1090
+#: utils/cache/relcache.c:1091
 msgid "IndexSupportInitialize: bogus pg_index tuple"
 msgstr ""
 
-#: utils/cache/relcache.c:1196
+#: utils/cache/relcache.c:1198
 msgid "out of memory for operator class cache"
 msgstr ""
 
-#: utils/cache/relcache.c:1270
+#: utils/cache/relcache.c:1272
 #, c-format
 msgid "Bogus amopstrategy number %d for opclass %u"
 msgstr ""
 
-#: utils/cache/relcache.c:1305
+#: utils/cache/relcache.c:1307
 #, c-format
 msgid "Bogus amproc number %d for opclass %u"
 msgstr ""
 
-#: utils/cache/relcache.c:1642
+#: utils/cache/relcache.c:1645
 #, c-format
 msgid "RelationReloadClassinfo system relation id=%d doesn't exist"
 msgstr ""
 
-#: utils/cache/relcache.c:1768
+#: utils/cache/relcache.c:1775
 #, c-format
 msgid "RelationClearRelation: relation %u deleted while still in use"
 msgstr ""
 
-#: utils/cache/relcache.c:1857
+#: utils/cache/relcache.c:1865
 #, c-format
 msgid "RelationForgetRelation: relation %u is still open"
 msgstr ""
 
-#: utils/cache/relcache.c:2013
+#: utils/cache/relcache.c:2022
 #, c-format
 msgid "Relcache reference leak: relation \"%s\" has refcnt %d instead of %d"
 msgstr ""
 
-#: utils/cache/relcache.c:2298
+#: utils/cache/relcache.c:2308
 #, c-format
 msgid "RelationCacheInitializePhase2: no pg_class entry for %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2445
+#: utils/cache/relcache.c:2456
 #, c-format
 msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2453
+#: utils/cache/relcache.c:2464
 #, c-format
 msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2464
+#: utils/cache/relcache.c:2475
 #, c-format
 msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2473
+#: utils/cache/relcache.c:2484
 #, c-format
 msgid "AttrDefaultFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2507
+#: utils/cache/relcache.c:2518
 #, c-format
 msgid "CheckConstraintFetch: unexpected record found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2518
+#: utils/cache/relcache.c:2529
 #, c-format
 msgid "CheckConstraintFetch: conbin IS NULL for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2531
+#: utils/cache/relcache.c:2542
 #, c-format
 msgid "CheckConstraintFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2992
+#: utils/cache/relcache.c:3005
 #, c-format
 msgid ""
 "Cannot create init file %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: utils/cache/relcache.c:3016
+#: utils/cache/relcache.c:3029
 msgid "cannot write init file -- descriptor length"
 msgstr ""
 
-#: utils/cache/relcache.c:3020
+#: utils/cache/relcache.c:3033
 msgid "cannot write init file -- reldesc"
 msgstr ""
 
-#: utils/cache/relcache.c:3025
+#: utils/cache/relcache.c:3038
 msgid "cannot write init file -- relation tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3028
+#: utils/cache/relcache.c:3041
 msgid "cannot write init file -- relation tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3035
+#: utils/cache/relcache.c:3048
 #, c-format
 msgid "cannot write init file -- length of attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3037
+#: utils/cache/relcache.c:3050
 #, c-format
 msgid "cannot write init file -- attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3056
+#: utils/cache/relcache.c:3069
 #, c-format
 msgid "write_relcache_init_file: no pg_index entry for index %u"
 msgstr ""
 
-#: utils/cache/relcache.c:3060
+#: utils/cache/relcache.c:3073
 msgid "cannot write init file -- index tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3062
+#: utils/cache/relcache.c:3075
 msgid "cannot write init file -- index tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3068
+#: utils/cache/relcache.c:3081
 msgid "cannot write init file -- am tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3071
+#: utils/cache/relcache.c:3084
 msgid "cannot write init file -- am tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3077
+#: utils/cache/relcache.c:3090
 msgid "cannot write init file -- strategy map length"
 msgstr ""
 
-#: utils/cache/relcache.c:3080
+#: utils/cache/relcache.c:3093
 msgid "cannot write init file -- strategy map"
 msgstr ""
 
-#: utils/cache/relcache.c:3085
+#: utils/cache/relcache.c:3098
 msgid "cannot write init file -- operator vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3088
+#: utils/cache/relcache.c:3101
 msgid "cannot write init file -- operator vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3093
+#: utils/cache/relcache.c:3106
 msgid "cannot write init file -- support vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3096
+#: utils/cache/relcache.c:3109
 msgid "cannot write init file -- support vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3140
+#: utils/cache/relcache.c:3153
 #, c-format
 msgid ""
 "Cannot rename init file %s to %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: utils/cache/syscache.c:477
+#: utils/cache/syscache.c:478
 #, c-format
 msgid "InitCatalogCache: Can't init cache %s (%d)"
 msgstr ""
 
-#: utils/cache/syscache.c:535
+#: utils/cache/syscache.c:534
 #, c-format
 msgid "SearchSysCache: Bad cache id %d"
 msgstr ""
 
-#: utils/cache/syscache.c:716
+#: utils/cache/syscache.c:715
 #, c-format
 msgid "SysCacheGetAttr: Bad cache id %d"
 msgstr ""
 
-#: utils/cache/syscache.c:719
+#: utils/cache/syscache.c:718
 #, c-format
 msgid "SysCacheGetAttr: missing cache data for id %d"
 msgstr ""
 
-#: utils/cache/syscache.c:735
+#: utils/cache/syscache.c:734
 #, c-format
 msgid "SearchSysCacheList: Bad cache id %d"
 msgstr ""
 
-#: utils/error/elog.c:135
+#: utils/error/elog.c:128
 msgid "Pre-7.3 object file made an elog() call.  Recompile."
 msgstr ""
 
-#: utils/error/elog.c:225
+#: utils/error/elog.c:218
 #, c-format
 msgid "copy: line %d, "
 msgstr ""
 
 #. translator: This must fit in fmt_fixedbuf.
-#: utils/error/elog.c:248 utils/error/elog.c:344
+#: utils/error/elog.c:241 utils/error/elog.c:337
 msgid "elog: out of memory"
 msgstr ""
 
-#: utils/error/elog.c:484
+#: 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:529
+#: utils/error/elog.c:533
 #, c-format
 msgid "DebugFileOpen: open of %s: %m"
 msgstr ""
 
-#: utils/error/elog.c:538
+#: utils/error/elog.c:542
 #, c-format
 msgid "DebugFileOpen: %s reopen as stderr: %m"
 msgstr ""
 
-#: utils/error/elog.c:550
+#: utils/error/elog.c:554
 #, c-format
 msgid "DebugFileOpen: %s reopen as stdout: %m"
 msgstr ""
 
-#: utils/error/elog.c:567
+#: utils/error/elog.c:571
 msgid "DebugFileOpen: could not open debugging file"
 msgstr ""
 
-#: utils/error/elog.c:772
+#: utils/error/elog.c:776
 msgid "Numerical result out of range"
 msgstr ""
 
-#: utils/error/elog.c:786
+#: utils/error/elog.c:790
 #, c-format
 msgid "operating system error %d"
 msgstr ""
 
-#: utils/error/elog.c:808
+#: utils/error/elog.c:812
 msgid "DEBUG:  "
 msgstr ""
 
-#: utils/error/elog.c:812
+#: utils/error/elog.c:816
 msgid "LOG:  "
 msgstr ""
 
-#: utils/error/elog.c:815
+#: utils/error/elog.c:819
 msgid "INFO:  "
 msgstr ""
 
-#: utils/error/elog.c:818
+#: utils/error/elog.c:822
 msgid "NOTICE:  "
 msgstr ""
 
-#: utils/error/elog.c:821
+#: utils/error/elog.c:825
 msgid "WARNING:  "
 msgstr ""
 
-#: utils/error/elog.c:824
+#: utils/error/elog.c:828
 msgid "ERROR:  "
 msgstr ""
 
-#: utils/error/elog.c:827
+#: utils/error/elog.c:831
 msgid "FATAL:  "
 msgstr ""
 
-#: utils/error/elog.c:830
+#: utils/error/elog.c:834
 msgid "PANIC:  "
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:98
+#: utils/fmgr/dfmgr.c:97
 #, c-format
 msgid "stat failed on file '%s': %m"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:115
+#: utils/fmgr/dfmgr.c:114
 msgid "Out of memory in load_external_function"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:128
+#: utils/fmgr/dfmgr.c:127
 #, c-format
 msgid "Load of file %s failed: %s"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:155
+#: utils/fmgr/dfmgr.c:154
 #, c-format
 msgid "Can't find function %s in file %s"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:185
+#: utils/fmgr/dfmgr.c:184
 #, c-format
 msgid "LOAD: could not open file '%s': %m"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:240
+#: utils/fmgr/dfmgr.c:239
 #, c-format
 msgid "stat failed on %s: %s"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:335
+#: utils/fmgr/dfmgr.c:334
 msgid "invalid macro name in dynamic library path"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:385
+#: utils/fmgr/dfmgr.c:384
 msgid "zero length dynamic_library_path component"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:396
+#: utils/fmgr/dfmgr.c:395
 msgid "dynamic_library_path component is not absolute"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:402
+#: utils/fmgr/dfmgr.c:401
 #, c-format
 msgid "find_in_dynamic_libpath: trying %s"
 msgstr ""
@@ -12672,102 +12783,102 @@ msgstr ""
 msgid "function called in context that does not accept a set result"
 msgstr ""
 
-#: utils/fmgr/funcapi.c:74
+#: utils/fmgr/funcapi.c:68
 msgid "init_MultiFuncCall may not be called more than once"
 msgstr ""
 
-#: utils/hash/dynahash.c:662
+#: utils/hash/dynahash.c:661
 #, c-format
 msgid "hash_search: bogus action %d"
 msgstr ""
 
-#: utils/hash/dynahash.c:935 utils/hash/dynahash.c:937
+#: utils/hash/dynahash.c:934 utils/hash/dynahash.c:936
 #, c-format
 msgid "Hash table '%s' corrupted"
 msgstr ""
 
-#: utils/init/findbe.c:64
+#: utils/init/findbe.c:63
 #, c-format
 msgid "ValidateBinary: can't stat \"%s\""
 msgstr ""
 
-#: utils/init/findbe.c:70
+#: utils/init/findbe.c:69
 #, c-format
 msgid "ValidateBinary: \"%s\" is not a regular file"
 msgstr ""
 
-#: utils/init/findbe.c:92
+#: utils/init/findbe.c:91
 #, c-format
 msgid "ValidateBinary: \"%s\" is not user read/execute"
 msgstr ""
 
-#: utils/init/findbe.c:118
+#: utils/init/findbe.c:117
 #, c-format
 msgid "ValidateBinary: \"%s\" is not group read/execute"
 msgstr ""
 
-#: utils/init/findbe.c:126
+#: utils/init/findbe.c:125
 #, c-format
 msgid "ValidateBinary: \"%s\" is not other read/execute"
 msgstr ""
 
-#: utils/init/findbe.c:175
+#: utils/init/findbe.c:174
 #, c-format
 msgid "FindExec: found \"%s\" using argv[0]"
 msgstr ""
 
-#: utils/init/findbe.c:189
+#: utils/init/findbe.c:188
 msgid "FindExec: searching PATH ..."
 msgstr ""
 
-#: utils/init/findbe.c:210
+#: utils/init/findbe.c:209
 #, c-format
 msgid "FindExec: found \"%s\" using PATH"
 msgstr ""
 
-#: utils/init/miscinit.c:145 utils/init/miscinit.c:164
-#: utils/init/miscinit.c:172 utils/misc/guc.c:892 utils/misc/guc.c:1075
-#: utils/misc/guc.c:1859 utils/misc/guc.c:1873 utils/misc/guc.c:2616
-#: utils/misc/guc.c:2622 utils/misc/guc.c:2629
+#: 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
 msgid "out of memory"
 msgstr ""
 
-#: utils/init/miscinit.c:158
+#: utils/init/miscinit.c:157
 #, c-format
 msgid "cannot get current working directory: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:248
+#: utils/init/miscinit.c:247
 #, c-format
 msgid "SetCharSet: unknown tag %s in file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:403 utils/init/miscinit.c:459
+#: utils/init/miscinit.c:402 utils/init/miscinit.c:458
 #, c-format
 msgid "GetCharSetByHost: unknown tag %s in file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:638
+#: utils/init/miscinit.c:636
 #, c-format
 msgid "invalid user id %u"
 msgstr ""
 
-#: utils/init/miscinit.c:720
+#: utils/init/miscinit.c:718
 #, c-format
 msgid "Can't create lock file %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:731 utils/init/miscinit.c:734
+#: 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:744
+#: utils/init/miscinit.c:742
 #, c-format
 msgid "Bogus data in lock file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:818
+#: utils/init/miscinit.c:816
 #, c-format
 msgid ""
 "Can't remove old lock file %s: %m\n"
@@ -12775,101 +12886,105 @@ msgid ""
 "\tPlease remove the file by hand and try again."
 msgstr ""
 
-#: utils/init/miscinit.c:839
+#: utils/init/miscinit.c:837
 #, c-format
 msgid "Can't write lock file %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:930
+#: utils/init/miscinit.c:928
 #, c-format
 msgid "Failed to rewrite %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:936
+#: utils/init/miscinit.c:934
 #, c-format
 msgid "Failed to read %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:949
+#: utils/init/miscinit.c:947
 #, c-format
 msgid "Bogus data in %s"
 msgstr ""
 
-#: utils/init/miscinit.c:973
+#: utils/init/miscinit.c:971
 #, c-format
 msgid "Failed to write %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:1015
+#: utils/init/miscinit.c:1013
 #, c-format
 msgid "File %s is missing. This is not a valid data directory."
 msgstr ""
 
-#: utils/init/miscinit.c:1022
+#: utils/init/miscinit.c:1020
 #, c-format
 msgid "File %s does not contain valid data. You need to initdb."
 msgstr ""
 
-#: utils/init/miscinit.c:1027
+#: 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/init/postinit.c:116
+#: utils/init/postinit.c:114
 #, c-format
 msgid "Database \"%s\", OID %u, has disappeared from pg_database"
 msgstr ""
 
-#: utils/init/postinit.c:125
+#: utils/init/postinit.c:123
 #, c-format
 msgid "Database \"%s\" is not currently accepting connections"
 msgstr ""
 
-#: utils/init/postinit.c:258
+#: utils/init/postinit.c:256
 #, c-format
 msgid "Database \"%s\" does not exist in the system catalog."
 msgstr ""
 
-#: utils/init/postinit.c:266
+#: utils/init/postinit.c:264
 #, c-format
 msgid ""
 "Database \"%s\" does not exist.\n"
 "\tThe database subdirectory '%s' is missing."
 msgstr ""
 
-#: utils/init/postinit.c:273
+#: utils/init/postinit.c:271
 #, c-format
 msgid "Unable to change directory to '%s': %m"
 msgstr ""
 
-#: utils/init/postinit.c:302
+#: utils/init/postinit.c:300
 #, c-format
 msgid "InitPostgres: bad backend id %d"
 msgstr ""
 
-#: utils/init/postinit.c:353
+#: utils/init/postinit.c:351
 msgid "There are currently no users defined in this database system."
 msgstr ""
 
-#: utils/init/postinit.c:354
+#: utils/init/postinit.c:352
 #, c-format
 msgid ""
 "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
 msgstr ""
 
-#: utils/mb/conv.c:370
+#: utils/init/postinit.c:407
+msgid "Non-superuser connection limit exceeded"
+msgstr ""
+
+#: utils/mb/conv.c:374
 #, c-format
 msgid "UtfToLocal: could not convert UTF-8 (0x%04x). Ignored"
 msgstr ""
 
-#: utils/mb/conv.c:397
+#: utils/mb/conv.c:401
 #, c-format
 msgid "Invalid encoding number %d"
 msgstr ""
 
-#: utils/mb/conv.c:434
+#: utils/mb/conv.c:438
 #, c-format
 msgid "LocalToUtf: could not convert (0x%04x) %s to UTF-8. Ignored"
 msgstr ""
@@ -12878,31 +12993,31 @@ msgstr ""
 msgid "pg_char_to_encname_struct(): encoding name too long"
 msgstr ""
 
-#: utils/mb/mbutils.c:169
+#: utils/mb/mbutils.c:170
 #, c-format
 msgid "default conversion proc for %s to %s not found"
 msgstr ""
 
-#: utils/mb/mbutils.c:182
+#: utils/mb/mbutils.c:184
 #, c-format
 msgid "default conversion proc %u for %s to %s not found in pg_proc"
 msgstr ""
 
-#: utils/mb/mbutils.c:241
+#: utils/mb/mbutils.c:243
 #, c-format
 msgid "Invalid source encoding name %s"
 msgstr ""
 
-#: utils/mb/mbutils.c:243
+#: utils/mb/mbutils.c:245
 #, c-format
 msgid "Invalid destination encoding name %s"
 msgstr ""
 
-#: utils/mb/mbutils.c:253
+#: utils/mb/mbutils.c:255
 msgid "Encoding conversion failed"
 msgstr ""
 
-#: utils/mb/mbutils.c:468
+#: utils/mb/mbutils.c:473
 msgid "SetDatabaseEncoding(): invalid database encoding"
 msgstr ""
 
@@ -12910,177 +13025,177 @@ msgstr ""
 msgid "Could not convert UTF-8 to ISO8859-1"
 msgstr ""
 
-#: utils/misc/guc.c:1167 utils/misc/guc.c:1182 utils/misc/guc.c:1197
-#: utils/misc/guc.c:1226
+#: utils/misc/guc.c:1206 utils/misc/guc.c:1221 utils/misc/guc.c:1236
+#: utils/misc/guc.c:1265
 #, c-format
 msgid "Failed to reset %s"
 msgstr ""
 
-#: utils/misc/guc.c:1291 utils/misc/guc.c:1313 utils/misc/guc.c:1335
-#: utils/misc/guc.c:1367
+#: utils/misc/guc.c:1333 utils/misc/guc.c:1355 utils/misc/guc.c:1377
+#: utils/misc/guc.c:1407
 #, c-format
 msgid "Failed to commit %s"
 msgstr ""
 
-#: utils/misc/guc.c:1543
+#: utils/misc/guc.c:1586 utils/misc/guc.c:2136
 #, c-format
 msgid "'%s' is not a valid option name"
 msgstr ""
 
-#: utils/misc/guc.c:1560
+#: utils/misc/guc.c:1603
 #, c-format
 msgid "'%s' cannot be changed after server start"
 msgstr ""
 
-#: utils/misc/guc.c:1568
+#: utils/misc/guc.c:1611
 #, c-format
 msgid "'%s' cannot be changed now"
 msgstr ""
 
-#: utils/misc/guc.c:1595
+#: utils/misc/guc.c:1638
 #, c-format
 msgid "'%s' cannot be set after connection start"
 msgstr ""
 
-#: utils/misc/guc.c:1603
+#: utils/misc/guc.c:1646
 #, c-format
 msgid "'%s': permission denied"
 msgstr "\"%s\": r�ttighet saknas"
 
-#: utils/misc/guc.c:1631
+#: utils/misc/guc.c:1676
 #, c-format
 msgid "%s: setting ignored because previous source is higher priority"
 msgstr ""
 
-#: utils/misc/guc.c:1652
+#: utils/misc/guc.c:1697
 #, c-format
 msgid "option '%s' requires a boolean value"
 msgstr ""
 
-#: utils/misc/guc.c:1666 utils/misc/guc.c:1737
+#: utils/misc/guc.c:1711 utils/misc/guc.c:1782
 #, c-format
 msgid "invalid value for option '%s': %d"
 msgstr ""
 
-#: utils/misc/guc.c:1716
+#: utils/misc/guc.c:1761
 #, c-format
 msgid "option '%s' expects an integer value"
 msgstr ""
 
-#: utils/misc/guc.c:1722
+#: utils/misc/guc.c:1767
 #, c-format
 msgid "option '%s' value %d is outside of permissible range [%d .. %d]"
 msgstr ""
 
-#: utils/misc/guc.c:1787
+#: utils/misc/guc.c:1832
 #, c-format
 msgid "option '%s' expects a real number"
 msgstr ""
 
-#: utils/misc/guc.c:1793
+#: utils/misc/guc.c:1838
 #, c-format
 msgid "option '%s' value %g is outside of permissible range [%g .. %g]"
 msgstr ""
 
-#: utils/misc/guc.c:1808
+#: utils/misc/guc.c:1853
 #, c-format
 msgid "invalid value for option '%s': %g"
 msgstr ""
 
-#: utils/misc/guc.c:1902
+#: utils/misc/guc.c:1947
 #, c-format
 msgid "invalid value for option '%s': '%s'"
 msgstr ""
 
-#: utils/misc/guc.c:2003 utils/misc/guc.c:2037 utils/misc/guc.c:2347
+#: utils/misc/guc.c:2048 utils/misc/guc.c:2082 utils/misc/guc.c:2396
 #, c-format
 msgid "Option '%s' is not recognized"
 msgstr ""
 
-#: utils/misc/guc.c:2094
+#: utils/misc/guc.c:2143
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr ""
 
-#: utils/misc/guc.c:2107 utils/misc/guc.c:2156
+#: utils/misc/guc.c:2156 utils/misc/guc.c:2205
 msgid "flatten_set_variable_args: unexpected input"
 msgstr ""
 
-#: utils/misc/guc.c:2195
+#: utils/misc/guc.c:2244
 msgid "SET variable name is required"
 msgstr ""
 
-#: utils/misc/guc.c:2718
+#: utils/misc/guc.c:2780
 #, c-format
 msgid "cannot parse setting \"%s\""
 msgstr ""
 
-#: utils/mmgr/aset.c:332
+#: utils/mmgr/aset.c:333
 #, c-format
 msgid "Memory exhausted in AllocSetContextCreate(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:494 utils/mmgr/aset.c:691
+#: utils/mmgr/aset.c:495 utils/mmgr/aset.c:692
 #, c-format
 msgid "Memory exhausted in AllocSetAlloc(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:740
+#: utils/mmgr/aset.c:741
 #, c-format
 msgid "AllocSetFree: detected write past chunk end in %s %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:761
+#: utils/mmgr/aset.c:762
 #, c-format
 msgid "AllocSetFree: cannot find block containing chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:815
+#: utils/mmgr/aset.c:816
 #, c-format
 msgid "AllocSetRealloc: detected write past chunk end in %s %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:855
+#: utils/mmgr/aset.c:856
 #, c-format
 msgid "AllocSetRealloc: cannot find block containing chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:868
+#: utils/mmgr/aset.c:869
 #, c-format
 msgid "Memory exhausted in AllocSetReAlloc(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:1038
+#: utils/mmgr/aset.c:1039
 #, c-format
 msgid "AllocSetCheck: %s: empty block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1060
+#: 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:1063
+#: utils/mmgr/aset.c:1064
 #, c-format
 msgid "AllocSetCheck: %s: bad size %lu for chunk %p in block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1069
+#: utils/mmgr/aset.c:1070
 #, c-format
 msgid "AllocSetCheck: %s: bad single-chunk %p in block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1078
+#: utils/mmgr/aset.c:1079
 #, c-format
 msgid "AllocSetCheck: %s: bogus aset link in block %p, chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1085
+#: 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:1095
+#: utils/mmgr/aset.c:1096
 #, c-format
 msgid "AllocSetCheck: %s: found inconsistent memory block %p"
 msgstr ""
@@ -13250,3 +13365,9 @@ msgstr ""
 #: utils/sort/tuplestore.c:644 utils/sort/tuplestore.c:648
 msgid "tuplestore: write failed"
 msgstr ""
+
+#~ msgid "table \"%s\" does not exist"
+#~ msgstr "tabell \"%s\" existerar inte"
+
+#~ msgid "function %s() does not return type %s"
+#~ msgstr "funktionen %s() har inte returtyp %s"
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index 79c73990b9d3387305752467893abf017fd88ca5..cbdfc93f68adda09611081c6905fef172e4211ba 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.2 2002/09/02 22:22:12 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/nls.mk,v 1.3 2002/10/14 19:04:28 petere Exp $
 CATALOG_NAME	:= pg_controldata
-AVAIL_LANGUAGES	:= de es ru sv
+AVAIL_LANGUAGES	:= de es pt_BR ru sv zh_CN
 GETTEXT_FILES	:= pg_controldata.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_controldata/po/pt_BR.po b/src/bin/pg_controldata/po/pt_BR.po
new file mode 100644
index 0000000000000000000000000000000000000000..ce18becef7ac70349a7a9b462a2d9b57a3dac2d2
--- /dev/null
+++ b/src/bin/pg_controldata/po/pt_BR.po
@@ -0,0 +1,212 @@
+# Translation to Portuguese (Brazilian) language
+# Cesar Suga <sartre@linuxbr.com>, 2002.
+# Fair & Simple Networks Ltda.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-29 04:16-0400\n"
+"PO-Revision-Date: 2002-07-20 17:25-0300\n"
+"Last-Translator: Cesar Suga <sartre@linuxbr.com>\n"
+"Language-Team: Cesar Suga <sartre@linuxbr.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_controldata.c:28
+#, c-format
+msgid "%s displays PostgreSQL database cluster control information.\n"
+msgstr "%s mostra informa��es de controle de cluster de banco de dados de PostgreSQL.\n"
+
+#: pg_controldata.c:29
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DATADIR]\n"
+"\n"
+msgstr ""
+"Uso:\n"
+"  %s [DATADIR]\n"
+"\n"
+
+#: pg_controldata.c:30
+msgid ""
+"If not data directory is specified, the environment variable PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"Se o diret�rio de dados n�o for especificado, a vari�vel de sistema\n"
+"PGDATA � utilizada.\n"
+"\n"
+
+#: pg_controldata.c:31
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Reporte bugs a <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_controldata.c:41
+msgid "starting up"
+msgstr "iniciando opera��es"
+
+#: pg_controldata.c:43
+msgid "shut down"
+msgstr "desligar"
+
+#: pg_controldata.c:45
+msgid "shutting down"
+msgstr "desligando"
+
+#: pg_controldata.c:47
+msgid "in recovery"
+msgstr "em recovery"
+
+#: pg_controldata.c:49
+msgid "in production"
+msgstr "em produ��o"
+
+#: pg_controldata.c:51
+msgid "unrecognized status code"
+msgstr "c�digo de estado n�o reconhecido"
+
+#: pg_controldata.c:99
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: nenhum diret�rio de dados especificado\n"
+
+#: pg_controldata.c:107
+#, c-format
+msgid "%s: could not open file \"%s\" for reading (%s)\n"
+msgstr "%s: n�o pude abrir arquivo \"%s\" para leitura (%s)\n"
+
+#: pg_controldata.c:114
+#, c-format
+msgid "%s: could not read file \"%s\" (%s)\n"
+msgstr "%s: n�o pude ler arquivo \"%s\" (%s)\n"
+
+#: pg_controldata.c:128
+msgid ""
+"WARNING: Calculated CRC checksum does not match value stored in file.\n"
+"Either the file is corrupt, or it has a different layout than this program\n"
+"is expecting.  The results below are untrustworthy.\n"
+"\n"
+msgstr ""
+"AVISO: A soma calculada de CRC 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"
+"est� esperando.  Os resultados abaixo n�o s�o confi�veis.\n"
+
+#: pg_controldata.c:141
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "vers�o do pg_control n�mero:          %u\n"
+
+#: pg_controldata.c:142
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "N�mero de vers�o de cat�logo:         %u\n"
+
+#: pg_controldata.c:143
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "Estado do cluster de banco:           %s\n"
+
+#: pg_controldata.c:144
+#, c-format
+msgid "pg_control last modified:             %s\n"
+msgstr "�ltima modifica��o do pg_control:     %s\n"
+
+#: pg_controldata.c:145
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "ID de arquivo de log atual:           %u\n"
+
+#: pg_controldata.c:146
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "Pr�ximo segmento de arquivo de log:   %u\n"
+
+#: pg_controldata.c:147
+#, c-format
+msgid "Latest checkpoint location:           %X/%X\n"
+msgstr "�ltimo lugar de checkpoint:           %X/%X\n"
+
+#: pg_controldata.c:149
+#, c-format
+msgid "Prior checkpoint location:            %X/%X\n"
+msgstr "Lugar de checkpoint anterior:         %X/%X\n"
+
+#: pg_controldata.c:151
+#, c-format
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgstr "�ltimo lugar de REDO no checkpoint:   %X/%X\n"
+
+#: pg_controldata.c:153
+#, c-format
+msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+msgstr "�ltimo lugar de UNDO no checkpoint:   %X/%X\n"
+
+#: pg_controldata.c:155
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "�ltimo StartUpID no checkpoint:       %u\n"
+
+#: pg_controldata.c:156
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "�ltimo NextXID do checkpoint:         %u\n"
+
+#: pg_controldata.c:157
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "�ltimo NextOID do checkpoint:         %u\n"
+
+#: pg_controldata.c:158
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "Hora do �ltimo checkpoint:            %s\n"
+
+#: pg_controldata.c:159
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Tamanho de bloco do banco de dados:   %u\n"
+
+#: pg_controldata.c:160
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Blocos/segmento de rela��o grande:   %u\n"
+
+#: pg_controldata.c:161
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Tamanho m�ximo de identificadores:    %u\n"
+
+#: 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"
+
+#: pg_controldata.c:163
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Uso em disco do tipo date/time:       %s\n"
+
+#: pg_controldata.c:164
+msgid "64-bit integers"
+msgstr "N�meros de 64 bits"
+
+#: pg_controldata.c:164
+msgid "Floating point"
+msgstr "Ponto flutuante"
+
+#: pg_controldata.c:165
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "M�ximo tamanho do nome de localidade: %u\n"
+
+#: pg_controldata.c:166
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_controldata.c:167
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
diff --git a/src/bin/pg_controldata/po/zh_CN.po b/src/bin/pg_controldata/po/zh_CN.po
new file mode 100644
index 0000000000000000000000000000000000000000..15f50254d05e53e60da9b2a98407dedb27902d24
--- /dev/null
+++ b/src/bin/pg_controldata/po/zh_CN.po
@@ -0,0 +1,212 @@
+# simplified Chinese translation file for pg_controldata and friends
+# Bao Wei <weibao@forevertek.com>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-27 13:21+0800\n"
+"PO-Revision-Date: 2002-09-19 16:45+0800\n"
+"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_controldata.c:28
+#, c-format
+msgid "%s displays PostgreSQL database cluster control information.\n"
+msgstr "%s ��ʾ PostgreSQL ���ݿ�ؿ�����Ϣ.\n"
+
+#: pg_controldata.c:29
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [DATADIR]\n"
+"\n"
+msgstr ""
+"ʹ�÷���:\n"
+"  %s [����Ŀ¼]\n"
+"\n"
+
+#: pg_controldata.c:30
+msgid ""
+"If not data directory is specified, the environment variable PGDATA\n"
+"is used.\n"
+"\n"
+msgstr ""
+"���û��ָ������Ŀ¼, ��ʹ��\n"
+"��������PGDATA.\n"
+"\n"
+
+#: pg_controldata.c:31
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "��������� <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_controldata.c:41
+msgid "starting up"
+msgstr "��������"
+
+#: pg_controldata.c:43
+msgid "shut down"
+msgstr "�ر�"
+
+#: pg_controldata.c:45
+msgid "shutting down"
+msgstr "���ڹر�"
+
+#: pg_controldata.c:47
+msgid "in recovery"
+msgstr "�ڻָ���"
+
+#: pg_controldata.c:49
+msgid "in production"
+msgstr "��������"
+
+#: pg_controldata.c:51
+msgid "unrecognized status code"
+msgstr "�����Ͽɵ�״̬��"
+
+#: pg_controldata.c:99
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: û��ָ������Ŀ¼\n"
+
+#: pg_controldata.c:107
+#, c-format
+msgid "%s: could not open file \"%s\" for reading (%s)\n"
+msgstr "%s: �޷����ļ� \"%s\" ��ȡ��Ϣ (%s)\n"
+
+#: pg_controldata.c:114
+#, c-format
+msgid "%s: could not read file \"%s\" (%s)\n"
+msgstr "%s: �޷���ȡ�ļ� \"%s\" (%s)\n"
+
+#: pg_controldata.c:128
+msgid ""
+"WARNING: Calculated CRC checksum does not match value stored in file.\n"
+"Either the file is corrupt, or it has a different layout than this program\n"
+"is expecting.  The results below are untrustworthy.\n"
+"\n"
+msgstr ""
+"����: ���������CRCУ��ֵ���ѱ������ļ��е�ֵ��ƥ��.\n"
+"�����ļ�����,�����������������ֵ��ͬ.\n"
+"����Ľ���Dz��ɿ���.\n"
+"\n"
+
+#: pg_controldata.c:141
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control �汾:            %u\n"
+
+#: pg_controldata.c:142
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Catalog �汾:               %u\n"
+
+#: pg_controldata.c:143
+#, c-format
+msgid "Database cluster state:               %s\n"
+msgstr "���ݿ��״̬:               %s\n"
+
+#: pg_controldata.c:144
+#, c-format
+msgid "pg_control last modified:             %s\n"
+msgstr "pg_control ����޸�:             %s\n"
+
+#: pg_controldata.c:145
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "��ǰ��־�ļ�ID:                  %u\n"
+
+#: pg_controldata.c:146
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "��һ����־�ļ���:                %u\n"
+
+#: pg_controldata.c:147
+#, c-format
+msgid "Latest checkpoint location:           %X/%X\n"
+msgstr "���¼���λ��:           %X/%X\n"
+
+#: pg_controldata.c:149
+#, c-format
+msgid "Prior checkpoint location:            %X/%X\n"
+msgstr "���ȼ���λ��:            %X/%X\n"
+
+#: pg_controldata.c:151
+#, c-format
+msgid "Latest checkpoint's REDO location:    %X/%X\n"
+msgstr "���¼���� REDO λ��:    %X/%X\n"
+
+#: pg_controldata.c:153
+#, c-format
+msgid "Latest checkpoint's UNDO location:    %X/%X\n"
+msgstr "���¼���� UNDO λ��:    %X/%X\n"
+
+#: pg_controldata.c:155
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "���¼���� StartUpID:        %u\n"
+
+#: pg_controldata.c:156
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "���¼���� NextXID:          %u\n"
+
+#: pg_controldata.c:157
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "���¼���� NextOID:          %u\n"
+
+#: pg_controldata.c:158
+#, c-format
+msgid "Time of latest checkpoint:            %s\n"
+msgstr "���¼����ʱ��:            %s\n"
+
+#: pg_controldata.c:159
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "���ݿ���С:                  %u\n"
+
+#: pg_controldata.c:160
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "���ϵ��ÿ�ο���: %u\n"
+
+#: pg_controldata.c:161
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "��ʶ������󳤶�:        %u\n"
+
+#: pg_controldata.c:162
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "����������������: %u\n"
+
+#: pg_controldata.c:163
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "����/ʱ�� ���ʹ洢:               %s\n"
+
+#: pg_controldata.c:164
+msgid "64-bit integers"
+msgstr "64���"
+
+#: pg_controldata.c:164
+msgid "Floating point"
+msgstr "������"
+
+#: pg_controldata.c:165
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "�������ֵ���󳤶�:        %u\n"
+
+#: pg_controldata.c:166
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_controldata.c:167
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
diff --git a/src/bin/pg_dump/po/ru.po b/src/bin/pg_dump/po/ru.po
index 64e84c5fdf52281c5b36bdc94fbe5988b21b20d9..1129b4113aa44909764898daad8ba76bec697d49 100644
--- a/src/bin/pg_dump/po/ru.po
+++ b/src/bin/pg_dump/po/ru.po
@@ -1,12 +1,13 @@
 # ru.po
 # PG_DUMP Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/Attic/ru.po,v 1.3 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/Attic/ru.po,v 1.4 2002/10/14 19:04:28 petere Exp $
 #
 # Changelog:
-#   - September 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - September 7, 2002: Post-7.3 beta 1 fuzzy messages fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Post-7.3 beta 2, Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 14, 2002: Post-7.3 beta 1, Take II, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - September 7, 2002: Post-7.3 beta 1 fuzzy messages fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - September 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
@@ -1273,7 +1274,7 @@ msgstr "
 
 #: pg_backup_archiver.c:1480
 msgid "attempting to ascertain archive format\n"
-msgstr ""
+msgstr "������� �������������� � ������� ������\n"
 
 #: pg_backup_archiver.c:1500 pg_backup_files.c:148
 #, c-format
diff --git a/src/bin/pg_dump/po/sv.po b/src/bin/pg_dump/po/sv.po
index 31f0c02e55d64bcb571ea9b6090db89ab0f71d78..8998b5f6bb36d868e2541d79a1e4682a7cbf215e 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.3 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/sv.po,v 1.4 2002/10/14 19:04:28 petere Exp $
 #
 # Use these quotes: "%s"
 #
 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:54+0200\n"
+"POT-Creation-Date: 2002-10-03 04:19-0400\n"
+"PO-Revision-Date: 2002-10-04 07:56+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:390 pg_restore.c:254
+#: pg_dump.c:389 pg_restore.c:254
 msgid "User name: "
 msgstr "Anv�ndarnamn: "
 
-#: pg_dump.c:424 pg_restore.c:281
+#: pg_dump.c:423 pg_restore.c:281
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: ogiltig \"-X\"-flagga -- %s\n"
 
-#: pg_dump.c:426 pg_dump.c:448 pg_dumpall.c:173 pg_restore.c:283
+#: pg_dump.c:425 pg_dump.c:447 pg_dumpall.c:173 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:437
+#: pg_dump.c:436
 #, 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:456 pg_dumpall.c:181
+#: pg_dump.c:455 pg_dumpall.c:181
 #, c-format
 msgid ""
 "%s: too many command line options (first is '%s')\n"
@@ -50,67 +50,72 @@ 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:468
+#: pg_dump.c:467
 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"
 
-#: pg_dump.c:474
+#: pg_dump.c:473
 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"
 
-#: pg_dump.c:480
+#: pg_dump.c:479
 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:481
+#: pg_dump.c:480
 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:487
+#: pg_dump.c:486
 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"
 
-#: pg_dump.c:488
+#: pg_dump.c:487
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(Kommandot INSERT kan inte s�tta OID:s.)\n"
 
-#: pg_dump.c:494
+#: pg_dump.c:493
 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:495
+#: pg_dump.c:494
 msgid "(Use a different output format.)\n"
 msgstr "(Anv�nd ett annat utdataformat.)\n"
 
-#: pg_dump.c:525
+#: pg_dump.c:524
 #, c-format
-msgid "invalid output format '%s' specified\n"
+msgid "invalid output format \"%s\" specified\n"
 msgstr "ogiltigt utdataformat \"%s\" angivet\n"
 
-#: pg_dump.c:531
+#: pg_dump.c:530
 #, c-format
 msgid "could not open output file %s for writing\n"
 msgstr "kunde inte �ppna utfil %s f�r skrivning\n"
 
-#: pg_dump.c:554
+#: pg_backup_db.c:48 pg_dump.c:541
+#, c-format
+msgid "unable to parse version string \"%s\"\n"
+msgstr "kunde inte tolka versionstr�ngen \"%s\"\n"
+
+#: pg_dump.c:559
 #, c-format
 msgid "BEGIN command failed: %s"
 msgstr "BEGIN-kommandot misslyckades: %s"
 
-#: pg_dump.c:560
+#: pg_dump.c:565
 #, c-format
 msgid "could not set transaction isolation level to serializable: %s"
 msgstr "kunde inte s�tta transaktionsisolering till serialiserbar: %s"
 
-#: pg_dump.c:573
+#: pg_dump.c:578
 #, c-format
-msgid "last built-in oid is %u\n"
-msgstr "sista inbyggda oid �r %u\n"
+msgid "last built-in OID is %u\n"
+msgstr "sista inbyggda OID �r %u\n"
 
-#: pg_dump.c:653
+#: pg_dump.c:658
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -119,11 +124,11 @@ msgstr ""
 "%s dumpar en databas som en textfil eller i andra format.\n"
 "\n"
 
-#: pg_dump.c:654 pg_dumpall.c:215 pg_restore.c:377
+#: pg_dump.c:659 pg_dumpall.c:215 pg_restore.c:377
 msgid "Usage:\n"
 msgstr "Anv�ndning:\n"
 
-#: pg_dump.c:655
+#: pg_dump.c:660
 #, c-format
 msgid ""
 "  %s [OPTIONS] DBNAME\n"
@@ -132,52 +137,52 @@ msgstr ""
 "  %s [FLAGGOR] DBNAMN\n"
 "\n"
 
-#: pg_dump.c:656 pg_dumpall.c:218 pg_restore.c:379
+#: pg_dump.c:661 pg_dumpall.c:218 pg_restore.c:379
 msgid "Options:\n"
 msgstr "Flaggor:\n"
 
-#: pg_dump.c:659
+#: pg_dump.c:664
 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:660
+#: pg_dump.c:665
 msgid "  -b, --blobs              include large objects in dump\n"
 msgstr "  -b, --blobs              ta med stora objekt i dumpen\n"
 
-#: pg_dump.c:661 pg_dumpall.c:220 pg_restore.c:383
+#: pg_dump.c:666 pg_restore.c:383
 msgid "  -c, --clean              clean (drop) schema prior to create\n"
 msgstr "  -c, --clean              nollst�ll (drop) schema innan skapande\n"
 
-#: pg_dump.c:662
+#: pg_dump.c:667
 msgid ""
 "  -C, --create             include commands to create database in dump\n"
 msgstr "  -C, --create             inkludera kommandon f�r att skapa databasen i dumpen\n"
 
-#: pg_dump.c:663 pg_dumpall.c:221
+#: pg_dump.c:668 pg_dumpall.c:221
 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:664 pg_dumpall.c:222
+#: pg_dump.c:669 pg_dumpall.c:222
 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:665 pg_restore.c:386
+#: pg_dump.c:670 pg_restore.c:386
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=FILNAMN       utdatafilnamn\n"
 
-#: pg_dump.c:666
+#: pg_dump.c:671
 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:667 pg_dumpall.c:224 pg_restore.c:388
+#: pg_dump.c:672 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:668
+#: pg_dump.c:673
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 "                           pg_dump version\n"
@@ -185,22 +190,22 @@ msgstr ""
 "  -i, --ignore-version     forts�tt �ven n�r serverns version inte �r\n"
 "                           samma som pg_dump-versionen\n"
 
-#: pg_dump.c:670 pg_dumpall.c:227
+#: pg_dump.c:675 pg_dumpall.c:227
 msgid "  -o, --oids               include OIDs in dump\n"
 msgstr "  -o, --oids               inkludera OID:er i dumpning\n"
 
-#: pg_dump.c:671
+#: pg_dump.c:676
 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:673 pg_dumpall.c:228 pg_restore.c:398
+#: 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          databasens v�rdport\n"
 
-#: pg_dump.c:674
+#: pg_dump.c:679
 msgid ""
 "  -R, --no-reconnect       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
@@ -208,11 +213,11 @@ msgstr ""
 "  -R, --no-reconnect       sl� av ALLA �teruppkopplingar mot databasen\n"
 "                           i textformat\n"
 
-#: pg_dump.c:676
+#: pg_dump.c:681
 msgid "  -s, --schema-only        dump only the schema, no data\n"
 msgstr "  -s, --schema-only        dumpa bara scheman, inte data\n"
 
-#: pg_dump.c:677
+#: pg_dump.c:682
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
 "                           plain text format\n"
@@ -220,29 +225,29 @@ msgstr ""
 "  -S, --superuser=NAMN     ange superanv�ndarens anv�ndarnamn f�r\n"
 "                           anv�ndning i textformat\n"
 
-#: pg_dump.c:679
+#: pg_dump.c:684
 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:680 pg_dumpall.c:229 pg_restore.c:407
+#: 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=NAMN      anslut med datta anv�ndarnamn mot databasen\n"
 
-#: pg_dump.c:681 pg_dumpall.c:230 pg_restore.c:408
+#: pg_dump.c:686 pg_dumpall.c:230 pg_restore.c:409
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            visa mer information\n"
 
-#: pg_dump.c:682 pg_dumpall.c:231 pg_restore.c:409
+#: 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           fr�ga om l�senord (borde ske automatiskt)\n"
 
-#: pg_dump.c:683
+#: pg_dump.c:688
 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:684
+#: pg_dump.c:689
 msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
@@ -252,7 +257,7 @@ msgstr ""
 "                           skriv kommando SET SESSION AUTHORIZATION\n"
 "                           ist�llet f�r \\connect-kommando\n"
 
-#: pg_dump.c:687 pg_restore.c:414
+#: pg_dump.c:692 pg_restore.c:415
 msgid ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           disable triggers during data-only restore\n"
@@ -260,52 +265,52 @@ msgstr ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           sl� av utl�sare vid �terst�llning av enbart data\n"
 
-#: pg_dump.c:689
+#: pg_dump.c:694
 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:692
+#: pg_dump.c:697
 msgid "  -a                       dump only the data, not the schema\n"
 msgstr "  -a                       dumpa bara data, inte schema\n"
 
-#: pg_dump.c:693
+#: pg_dump.c:698
 msgid "  -b                       include large objects in dump\n"
 msgstr "  -b                       ta med stora objekt i dumpen\n"
 
-#: pg_dump.c:694 pg_dumpall.c:233 pg_restore.c:419
+#: pg_dump.c:699 pg_restore.c:420
 msgid "  -c                       clean (drop) schema prior to create\n"
 msgstr "  -c                       nollst�ll (drop) schema innan skapande\n"
 
-#: pg_dump.c:695
+#: pg_dump.c:700
 msgid ""
 "  -C                       include commands to create database in dump\n"
 msgstr "  -C                       inkludera kommandon f�r att skapa databasen i dumpen\n"
 
-#: pg_dump.c:696 pg_dumpall.c:234
+#: pg_dump.c:701 pg_dumpall.c:234
 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:697 pg_dumpall.c:235
+#: pg_dump.c:702 pg_dumpall.c:235
 msgid ""
 "  -D                       dump data as INSERT commands with column names\n"
 msgstr "  -D                       dumpa data som INSERT med kolumnnamn\n"
 
-#: pg_dump.c:698 pg_restore.c:422
+#: pg_dump.c:703 pg_restore.c:423
 msgid "  -f FILENAME              output file name\n"
 msgstr "  -f FILNAMN               utdatafilnamn\n"
 
-#: pg_dump.c:699
+#: pg_dump.c:704
 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:700 pg_dumpall.c:237 pg_restore.c:424
+#: pg_dump.c:705 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:701
+#: pg_dump.c:706
 msgid ""
 "  -i                       proceed even when server version mismatches\n"
 "                           pg_dump version\n"
@@ -313,22 +318,22 @@ msgstr ""
 "  -i                       forts�tt �ven n�r serverns version inte �r\n"
 "                           samma som pg_dump-versionen\n"
 
-#: pg_dump.c:703 pg_dumpall.c:240
+#: pg_dump.c:708 pg_dumpall.c:240
 msgid "  -o                       include OIDs in dump\n"
 msgstr "  -o                       inkludera OID:er i dumpning\n"
 
-#: pg_dump.c:704
+#: pg_dump.c:709
 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:706 pg_dumpall.c:241 pg_restore.c:434
+#: pg_dump.c:711 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:707
+#: pg_dump.c:712
 msgid ""
 "  -R                       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
@@ -336,11 +341,11 @@ msgstr ""
 "  -R                       sl� av ALLA �teruppkoppling mot databasen\n"
 "                           i textformat\n"
 
-#: pg_dump.c:709
+#: pg_dump.c:714
 msgid "  -s                       dump only the schema, no data\n"
 msgstr "  -s                       dumpa bara scheman, inte data\n"
 
-#: pg_dump.c:710
+#: pg_dump.c:715
 msgid ""
 "  -S NAME                  specify the superuser user name to use in\n"
 "                           plain text format\n"
@@ -348,29 +353,29 @@ msgstr ""
 "  -S NAMN                  ange superanv�ndarens anv�ndarnamn f�r\n"
 "                           anv�ndning i textformat\n"
 
-#: pg_dump.c:712
+#: pg_dump.c:717
 msgid "  -t TABLE                 dump this table only (* for all)\n"
 msgstr "  -t TABELL                dumpa bara denna tabell (* f�r alla)\n"
 
-#: pg_dump.c:713 pg_dumpall.c:242 pg_restore.c:443
+#: pg_dump.c:718 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:714 pg_dumpall.c:243 pg_restore.c:444
+#: pg_dump.c:719 pg_dumpall.c:243 pg_restore.c:445
 msgid "  -v                       verbose mode\n"
 msgstr "  -v                       visa mer information\n"
 
-#: pg_dump.c:715 pg_dumpall.c:244 pg_restore.c:445
+#: pg_dump.c:720 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:716
+#: pg_dump.c:721
 msgid "  -x                       do not dump privileges (grant/revoke)\n"
 msgstr "  -x                       dumpa inte r�ttigheter (grant/revoke)\n"
 
-#: pg_dump.c:717
+#: pg_dump.c:722
 msgid ""
 "  -X use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
@@ -380,15 +385,15 @@ msgstr ""
 "                           skriv kommando SET SESSION AUTHORIZATION\n"
 "                           ist�llet f�r \\connect-kommando\n"
 
-#: pg_dump.c:720 pg_restore.c:450
+#: pg_dump.c:725 pg_restore.c:451
 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"
 
-#: pg_dump.c:721
+#: pg_dump.c:726
 msgid "  -Z {0-9}                 compression level for compressed formats\n"
 msgstr "  -Z {0-9}                 komprimeringsniv� f�r komprimerade format\n"
 
-#: pg_dump.c:724
+#: pg_dump.c:729
 msgid ""
 "\n"
 "If no database name is not supplied, then the PGDATABASE environment\n"
@@ -400,505 +405,500 @@ msgstr ""
 "PGDATABASE att anv�ndas.\n"
 "\n"
 
-#: pg_dump.c:726 pg_dumpall.c:248 pg_restore.c:454
+#: pg_dump.c:731 pg_dumpall.c:248 pg_restore.c:455
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "Rapportera buggar till <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_backup_db.c:52 pg_dump.c:741
-#, c-format
-msgid "unable to parse version string \"%s\"\n"
-msgstr "kunde inte tolka versionstr�ngen \"%s\"\n"
-
-#: pg_backup_archiver.c:1296 pg_dump.c:756
+#: pg_backup_archiver.c:1288 pg_dump.c:739
 msgid "*** aborted because of error\n"
 msgstr "*** avbruten p� grund av fel\n"
 
-#: pg_dump.c:823
+#: pg_dump.c:806
 #, c-format
-msgid "dumping out the contents of table %s\n"
+msgid "dumping contents of table %s\n"
 msgstr "dumpar inneh�llet i tabellen %s\n"
 
-#: pg_dump.c:862
+#: pg_dump.c:845
 #, 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"
 
-#: pg_dump.c:864 pg_dump.c:957 pg_dump.c:1006 pg_dump.c:1020 pg_dump.c:1118
-#: pg_dump.c:1236
+#: pg_dump.c:847 pg_dump.c:936 pg_dump.c:985 pg_dump.c:999 pg_dump.c:1097
+#: pg_dump.c:1215
 #, c-format
 msgid "Error message from server: %s"
 msgstr "Felmeddelandet fr�n servern: %s"
 
-#: pg_dump.c:865 pg_dump.c:874 pg_dump.c:958 pg_dump.c:1007 pg_dump.c:1237
+#: pg_dump.c:848 pg_dump.c:857 pg_dump.c:937 pg_dump.c:986 pg_dump.c:1216
 #, c-format
 msgid "The command was: %s\n"
 msgstr "Kommandot var: %s\n"
 
-#: pg_dump.c:870
+#: pg_dump.c:853
 #, 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"
 
-#: pg_dump.c:872
+#: pg_dump.c:855
 #, 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:956
+#: pg_dump.c:935
 #, 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"
 
-#: pg_dump.c:1005 pg_dump.c:1019 pg_dump.c:1117
+#: pg_dump.c:984 pg_dump.c:998 pg_dump.c:1096
 msgid "dumpClasses(): SQL command failed\n"
 msgstr "dumpClasses(): SQL-kommando misslyckades\n"
 
-#: pg_dump.c:1021
+#: pg_dump.c:1000
 msgid "The command was: FETCH 100 FROM _pg_dump_cursor\n"
 msgstr "Kommandot var: FETCH 100 FROM _pg_dump_cursor\n"
 
-#: pg_dump.c:1119
+#: pg_dump.c:1098
 msgid "The command was: CLOSE _pg_dump_cursor\n"
 msgstr "Kommandot var: CLOSE _pg_dump_cursor\n"
 
-#: pg_dump.c:1157
+#: pg_dump.c:1136
 #, 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:1220
+#: pg_dump.c:1199
 msgid "saving database definition\n"
 msgstr "sparar databasdefinition\n"
 
-#: pg_dump.c:1235
+#: pg_dump.c:1214
 msgid "SQL command failed\n"
 msgstr "SQL-kommando misslyckades\n"
 
-#: pg_dump.c:1245
+#: pg_dump.c:1224
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "pg_database-post f�r databas \"%s\" saknas\n"
 
-#: pg_dump.c:1252
+#: pg_dump.c:1231
 #, 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"
 
-#: pg_dump.c:1319
+#: pg_dump.c:1298
 msgid "saving large objects\n"
 msgstr "sparar stora objekt\n"
 
-#: pg_dump.c:1333
+#: pg_dump.c:1312
 #, c-format
 msgid "dumpBlobs(): cursor declaration failed: %s"
 msgstr "dumpBlobs(): mark�rdeklaration misslyckades: %s"
 
-#: pg_dump.c:1348
+#: pg_dump.c:1327
 #, c-format
 msgid "dumpBlobs(): fetch from cursor failed: %s"
 msgstr "dumpBlobs(): h�mta fr�n mark�r misslyckades: %s"
 
-#: pg_dump.c:1361
+#: pg_dump.c:1340
 #, c-format
 msgid "dumpBlobs(): could not open large object: %s"
 msgstr "dumpBlobs(): kunde inte �ppna det stora objektet: %s"
 
-#: pg_dump.c:1374
+#: pg_dump.c:1353
 #, c-format
 msgid "dumpBlobs(): error reading large object: %s"
 msgstr "dumpBlobs(): fel vid l�sning av stort objekt: %s"
 
-#: pg_dump.c:1462
+#: pg_dump.c:1441
 #, 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:1486
+#: pg_dump.c:1465
 #, 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:1521
+#: pg_dump.c:1500
 #, c-format
-msgid "Failed to find namespace with OID %s.\n"
-msgstr "Kunde inte hitta namnutrymme med OID %s.\n"
+msgid "could not find namespace with OID %s\n"
+msgstr "kunde inte hitta namnutrymme med OID %s\n"
 
-#: pg_dump.c:1601
+#: pg_dump.c:1580
 #, 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:1646
+#: pg_dump.c:1625
 #, 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:1709 pg_dump.c:4014
+#: pg_dump.c:1688 pg_dump.c:4010
 #, 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:1734
+#: pg_dump.c:1713
 #, 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:1792
+#: pg_dump.c:1771
 #, c-format
-msgid "query to obtain list of opclasses failed: %s"
-msgstr "fr�ga f�r att h�mta lista med op-klasser misslyckades: %s"
+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:1817
+#: pg_dump.c:1796
 #, c-format
-msgid "WARNING: owner of opclass \"%s\" appears to be invalid\n"
-msgstr "VARNING: �gare av op-klass \"%s\" verkar vara ogiltig\n"
+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:1885 pg_dump.c:4627
+#: pg_dump.c:1864 pg_dump.c:4630
 #, 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:1911
+#: pg_dump.c:1890
 #, 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:1985
+#: pg_dump.c:1964
 #, 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:2032
+#: pg_dump.c:2011
 #, 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:2182
+#: pg_dump.c:2161
 #, 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:2278
+#: pg_dump.c:2257
 #, c-format
 msgid "Attempt to lock table \"%s\" failed.  %s"
 msgstr "F�rs�k att l�sa tabell \"%s\" misslyckades.  %s"
 
-#: pg_dump.c:2287
+#: pg_dump.c:2266
 #, 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:2329
+#: pg_dump.c:2308
 #, c-format
 msgid "query to obtain inheritance relationships failed: %s"
 msgstr "F�rs�k att h�mta arvsrelationer misslyckades. %s"
 
-#: pg_dump.c:2413
+#: pg_dump.c:2392
 #, c-format
-msgid "finding the columns and types for table %s\n"
+msgid "finding the columns and types of table %s\n"
 msgstr "hittar kolumner och typer f�r tabell %s\n"
 
-#: pg_dump.c:2462
+#: pg_dump.c:2441
 #, c-format
 msgid "query to get table columns failed: %s"
 msgstr "fr�ga f�r att h�mta tabellkolumner misslyckades: %s"
 
-#: pg_dump.c:2515
+#: pg_dump.c:2494
 #, c-format
-msgid "finding DEFAULT expressions for table %s\n"
+msgid "finding DEFAULT expressions of table %s\n"
 msgstr "hittar DEFAULT-uttrycken f�r tabell %s\n"
 
-#: pg_dump.c:2546
+#: pg_dump.c:2525
 #, 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:2558
+#: pg_dump.c:2537
 #, c-format
-msgid "bogus adnum value %d for table %s\n"
+msgid "invalid adnum value %d for table %s\n"
 msgstr "felaktigt adnum-v�rde %d f�r tabell %s\n"
 
-#: pg_dump.c:2674
+#: pg_dump.c:2654
 #, 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:2758
+#: pg_dump.c:2738
 #, 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:2841
+#: pg_dump.c:2821
 #, 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:3010
+#: pg_dump.c:2990
 #, c-format
-msgid "query to obtain type information for %s failed: %s"
-msgstr "fr�ga f�r att h�mta typinformation f�r %s misslyckades: %s"
+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:3019 pg_dump.c:3190 pg_dump.c:3684 pg_dump.c:4022 pg_dump.c:4332
-#: pg_dump.c:4636 pg_dump.c:6545
+#: 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:6590
 #, 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:3182
+#: pg_dump.c:3165
 #, 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:3282
+#: pg_dump.c:3268
 #, c-format
 msgid "query to obtain type information failed: %s"
 msgstr "fr�ga f�r att h�mta typinformation misslyckades: %s"
 
-#: pg_dump.c:3290
+#: pg_dump.c:3276
 #, c-format
 msgid "Got no rows from: %s"
 msgstr "Fick inga rader fr�n: %s"
 
-#: pg_dump.c:3418
+#: pg_dump.c:3407
 #, 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:3453
+#: pg_dump.c:3442
 #, 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:3463
+#: pg_dump.c:3452
 #, 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:3675
+#: pg_dump.c:3666
 #, c-format
-msgid "query to obtain function information for %s failed: %s"
-msgstr "fr�ga f�r att h�mta funktionsinformation f�r %s misslyckades: %s"
+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:3747
+#: pg_dump.c:3741
 #, c-format
 msgid "Unexpected provolatile value for function %s\n"
 msgstr "Ov�ntat provolatile-v�rde f�r funktion %s\n"
 
-#: pg_dump.c:3813
+#: pg_dump.c:3807
 #, 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:4240
+#: pg_dump.c:4239
 #, c-format
 msgid "WARNING: cannot find operator with OID %s\n"
 msgstr "VARNING: kan inte hitta operator med OID %s\n"
 
-#: pg_dump.c:4324
+#: pg_dump.c:4323
 #, c-format
-msgid "query to obtain opclass details failed: %s"
-msgstr "fr�ga f�r att h�mta detaljer om op-klass misslyckades: %s"
+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:4391
+#: pg_dump.c:4393
 #, c-format
-msgid "query to obtain opclass operators failed: %s"
-msgstr "fr�ga f�r att h�mta operatorer f�r op-klass misslyckades: %s"
+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:4436
+#: pg_dump.c:4438
 #, c-format
-msgid "query to obtain opclass functions failed: %s"
-msgstr "fr�ga f�r att h�mta funktioner f�r op-klass misslyckades: %s"
+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:4664
+#: pg_dump.c:4667
 #, 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"
 
-#: pg_dump.c:4887
+#: pg_dump.c:4899
 #, c-format
-msgid "could not parse ACL list ('%s') for %s %s\n"
-msgstr "kunde inte tolka ACL_listan (\"%s\") f�r %s %s\n"
+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:5120
+#: pg_dump.c:5135
 #, 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:5128
+#: pg_dump.c:5143
 #, 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:5131
+#: pg_dump.c:5146
 #, 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"
 
-#: pg_dump.c:5138
+#: pg_dump.c:5153
 #, 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:5147
+#: pg_dump.c:5162
 #, 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:5279
+#: pg_dump.c:5300
 #, c-format
 msgid "finding CHECK constraints for table %s\n"
 msgstr "hittar CHECK-villkor f�r tabell %s\n"
 
-#: pg_dump.c:5321
+#: pg_dump.c:5342
 #, 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:5327
+#: pg_dump.c:5348
 #, 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:5329
+#: pg_dump.c:5350
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(systemkatalogerna kan vara trasiga.)\n"
 
-#: pg_dump.c:5458
+#: pg_dump.c:5477
 #, 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:5546
+#: pg_dump.c:5565
 #, 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:5681
+#: pg_dump.c:5706
 #, c-format
 msgid "could not create pgdump_oid table: %s"
 msgstr "kan inte skapa tabellen pgdump_oid: %s"
 
-#: pg_dump.c:5689
+#: pg_dump.c:5714
 #, 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:5695
+#: pg_dump.c:5720
 msgid "inserted invalid oid\n"
 msgstr "satte in ogiltig oid\n"
 
-#: pg_dump.c:5703
+#: pg_dump.c:5728
 #, c-format
 msgid "could not drop pgdump_oid table: %s"
 msgstr "kan inte ta bort tabellen pgdump_oid: %s"
 
-#: pg_dump.c:5708
+#: pg_dump.c:5733
 #, c-format
 msgid "maximum system oid is %u\n"
 msgstr "st�rsta system-oid �r %u\n"
 
-#: pg_dump.c:5745
+#: pg_dump.c:5770
 #, c-format
 msgid "error in finding the last system oid: %s"
 msgstr "fel vid h�mtning av sista system-oid: %s"
 
-#: pg_dump.c:5751
+#: pg_dump.c:5776
 msgid "missing pg_database entry for this database\n"
 msgstr "pg_database-posten f�r denna databas saknas\n"
 
-#: pg_dump.c:5756
+#: pg_dump.c:5781
 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:5784
+#: pg_dump.c:5809
 #, c-format
 msgid "error in finding the template1 database: %s"
 msgstr "fel vid h�mtning av databasen template1: %s"
 
-#: pg_dump.c:5790
+#: pg_dump.c:5815
 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:5795
+#: pg_dump.c:5820
 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:5829
+#: pg_dump.c:5854
 #, 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:5835
+#: pg_dump.c:5860
 #, 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"
 
-#: pg_dump.c:5844
+#: pg_dump.c:5869
 #, 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:5964
+#: pg_dump.c:5992
 #, 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:5982
+#: pg_dump.c:6013
 #, 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"
 
-#: pg_dump.c:6069
+#: pg_dump.c:6103
 #, c-format
 msgid "dumping triggers for table %s\n"
 msgstr "dumpar utl�sare f�r tabell %s\n"
 
-#: pg_dump.c:6112
+#: pg_dump.c:6152
 #, 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:6122
+#: pg_dump.c:6163
 #, 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:6228
+#: pg_dump.c:6273
 #, 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"
 
-#: pg_dump.c:6268
+#: pg_dump.c:6313
 #, 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:6338
+#: pg_dump.c:6383
 msgid "dumping out rules\n"
 msgstr "dumpar regler\n"
 
-#: pg_dump.c:6391
+#: pg_dump.c:6436
 #, 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"
 
-#: pg_dump.c:6474
+#: pg_dump.c:6519
 #, 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:6536
+#: pg_dump.c:6581
 #, c-format
-msgid "query to obtain type name for %s failed: %s"
-msgstr "fr�ga f�r att h�mta typnamn f�r %s misslyckades: %s"
+msgid "query to obtain name of type %s failed: %s"
+msgstr "fr�ga f�r att h�mta namn p� typ %s misslyckades: %s"
 
 #: common.c:74
 msgid "reading namespaces\n"
@@ -1095,233 +1095,233 @@ msgstr "fixar till korsreferens f
 msgid "ignoring large object cross-references for %s %s\n"
 msgstr "ignorerar korsreferens f�r stort objekt %s %s\n"
 
-#: pg_backup_archiver.c:472
+#: pg_backup_archiver.c:470
 msgid "disabling triggers\n"
 msgstr "sl�r av utl�sare\n"
 
-#: pg_backup_archiver.c:539
+#: pg_backup_archiver.c:533
 msgid "enabling triggers\n"
 msgstr "sl�r p� utl�sare\n"
 
-#: pg_backup_archiver.c:590
+#: pg_backup_archiver.c:582
 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:617 pg_backup_archiver.c:1045
-#: pg_backup_archiver.c:1164 pg_backup_archiver.c:1470
-#: pg_backup_archiver.c:1612 pg_backup_archiver.c:1642 pg_backup_custom.c:141
+#: 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_custom.c:146 pg_backup_custom.c:152 pg_backup_custom.c:167
-#: pg_backup_custom.c:561 pg_backup_db.c:171 pg_backup_db.c:245
-#: pg_backup_files.c:112 pg_backup_tar.c:157 pg_backup_tar.c:957
+#: 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
 msgid "out of memory\n"
 msgstr "minnet slut\n"
 
-#: pg_backup_archiver.c:712
+#: pg_backup_archiver.c:704
 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:752 pg_backup_archiver.c:837
+#: pg_backup_archiver.c:744 pg_backup_archiver.c:829
 msgid "committing large object transactions\n"
 msgstr "commitar transaktioner f�r stora objekt\n"
 
-#: pg_backup_archiver.c:759
+#: pg_backup_archiver.c:751
 #, c-format
 msgid "restored %d large objects\n"
 msgstr "�terst�llde %d stora objekt\n"
 
-#: pg_backup_archiver.c:776
+#: pg_backup_archiver.c:768
 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:790
+#: pg_backup_archiver.c:782
 msgid "starting large object transactions\n"
 msgstr "startar transaktioner f�r stora objekt\n"
 
-#: pg_backup_archiver.c:798
+#: pg_backup_archiver.c:790
 msgid "could not create large object\n"
 msgstr "kunde inte skapa stort objekt\n"
 
-#: pg_backup_archiver.c:800
+#: pg_backup_archiver.c:792
 #, 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:806
+#: pg_backup_archiver.c:798
 msgid "could not open large object\n"
 msgstr "kunde inte �ppna stort objekt\n"
 
-#: pg_backup_archiver.c:821
+#: pg_backup_archiver.c:813
 #, 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"
 
-#: pg_backup_archiver.c:824 pg_backup_archiver.c:1221
+#: pg_backup_archiver.c:816 pg_backup_archiver.c:1213
 #, 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:961
+#: pg_backup_archiver.c:953
 msgid "could not open TOC file\n"
 msgstr "kunde inte �ppna TOC-filen\n"
 
-#: pg_backup_archiver.c:982
+#: pg_backup_archiver.c:974
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "VARNING: rad ignorerad: %s\n"
 
-#: pg_backup_archiver.c:989
+#: pg_backup_archiver.c:981
 #, 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:998 pg_backup_files.c:156 pg_backup_files.c:441
+#: pg_backup_archiver.c:990 pg_backup_files.c:156 pg_backup_files.c:441
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "kunde inte st�nga TOC-filen: %s\n"
 
-#: pg_backup_archiver.c:1113 pg_backup_files.c:130
+#: pg_backup_archiver.c:1105 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:1129
+#: pg_backup_archiver.c:1121
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "kunde inte st�nga utdatafilen: %s\n"
 
-#: pg_backup_archiver.c:1217
+#: pg_backup_archiver.c:1209
 #, 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:1239
+#: pg_backup_archiver.c:1231
 msgid "could not write to compressed archive\n"
 msgstr "kunde inte skriva till komprimerat arkiv\n"
 
-#: pg_backup_archiver.c:1247
+#: pg_backup_archiver.c:1239
 msgid "could not write to custom output routine\n"
 msgstr "kunde inte skriva till egen utdatarutin\n"
 
-#: pg_backup_archiver.c:1262
+#: pg_backup_archiver.c:1254
 #, 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:1488
+#: pg_backup_archiver.c:1480
 msgid "attempting to ascertain archive format\n"
 msgstr "f�rs�ker lista ut arkivformat\n"
 
-#: pg_backup_archiver.c:1508 pg_backup_files.c:148
+#: pg_backup_archiver.c:1500 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:1515
+#: pg_backup_archiver.c:1507
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "kan inte l�sa infilen: %s\n"
 
-#: pg_backup_archiver.c:1517
+#: pg_backup_archiver.c:1509
 #, 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:1562
+#: pg_backup_archiver.c:1554
 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:1565
+#: pg_backup_archiver.c:1557
 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:1583
+#: pg_backup_archiver.c:1575
 #, c-format
 msgid "read %lu bytes into lookahead buffer\n"
 msgstr "l�ste %lu tecken in i lookahead-bufferten\n"
 
-#: pg_backup_archiver.c:1590
+#: pg_backup_archiver.c:1582
 #, 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:1607
+#: pg_backup_archiver.c:1599
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "allokerar AH f�r %s, format %d\n"
 
-#: pg_backup_archiver.c:1658
+#: pg_backup_archiver.c:1650
 #, c-format
 msgid "archive format is %d\n"
 msgstr "arkivformat �r %d\n"
 
-#: pg_backup_archiver.c:1686
+#: pg_backup_archiver.c:1678
 #, c-format
 msgid "unrecognized file format '%d'\n"
 msgstr "k�nner inte igen filformatet '%d'\n"
 
-#: pg_backup_archiver.c:1799
+#: pg_backup_archiver.c:1791
 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:1834
+#: pg_backup_archiver.c:1826
 #, c-format
 msgid "read dependency for %s -> %s\n"
 msgstr "l�sberoende f�r %s -> %s\n"
 
-#: pg_backup_archiver.c:1853
+#: pg_backup_archiver.c:1845
 #, 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:1976
+#: pg_backup_archiver.c:1971
 #, 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:2092
+#: pg_backup_archiver.c:2085
 #, 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:2151
+#: pg_backup_archiver.c:2144
 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"
 
-#: pg_backup_archiver.c:2184
+#: pg_backup_archiver.c:2177
 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:2198
+#: pg_backup_archiver.c:2191
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "ej supportad version (%d.%d) i filhuvudet\n"
 
-#: pg_backup_archiver.c:2203
+#: pg_backup_archiver.c:2196
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "riktighetskontroll p� heltalsstorlek (%lu) misslyckades\n"
 
-#: pg_backup_archiver.c:2207
+#: pg_backup_archiver.c:2200
 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"
 
-#: pg_backup_archiver.c:2212
+#: pg_backup_archiver.c:2205
 #, 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"
 
-#: pg_backup_archiver.c:2228
+#: pg_backup_archiver.c:2221
 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"
 
-#: pg_backup_archiver.c:2246
+#: pg_backup_archiver.c:2239
 msgid "WARNING: invalid creation date in header\n"
 msgstr "VARNING: ogiltig skapandedatum i huvud\n"
 
@@ -1395,7 +1395,7 @@ msgstr "kunde inte st
 msgid "could not write byte: %s\n"
 msgstr "kunde inte skriva tecken: %s\n"
 
-#: pg_backup_custom.c:771
+#: pg_backup_custom.c:771 pg_backup_files.c:416
 #, c-format
 msgid "write error in _WriteBuf (%lu != %lu)\n"
 msgstr "fel vid skrivning i _WriteBuf (%lu != %lu)\n"
@@ -1431,148 +1431,148 @@ msgstr "kunde inte st
 msgid "archiver (db)"
 msgstr "arkiverare (db)"
 
-#: pg_backup_db.c:76
+#: pg_backup_db.c:69
 #, c-format
 msgid "could not get version from server: %s"
 msgstr "kunde inte f� versionen fr�n servern: %s"
 
-#: pg_backup_db.c:88
+#: pg_backup_db.c:81
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "server version: %s; %s version: %s\n"
 
-#: pg_backup_db.c:91
+#: pg_backup_db.c:84
 msgid "proceeding despite version mismatch\n"
 msgstr "forts�tter trots att versionerna inte matchar\n"
 
-#: pg_backup_db.c:93
+#: pg_backup_db.c:86
 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"
 
-#: pg_backup_db.c:165
+#: pg_backup_db.c:158
 #, 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:169 pg_backup_db.c:202 pg_backup_db.c:243 pg_backup_db.c:272
-#: pg_dumpall.c:610 pg_dumpall.c:636
+#: 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
 msgid "Password: "
 msgstr "L�senord: "
 
-#: pg_backup_db.c:181
+#: pg_backup_db.c:174
 msgid "failed to reconnect to database\n"
 msgstr "misslyckades att �teruppkoppla mot databasen\n"
 
-#: pg_backup_db.c:205
+#: pg_backup_db.c:198
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "kunde inte �teruppkoppla mot databasen: %s"
 
-#: pg_backup_db.c:239
+#: pg_backup_db.c:232
 msgid "already connected to a database\n"
 msgstr "�r redan uppkopplad mot en databas\n"
 
-#: pg_backup_db.c:262
+#: pg_backup_db.c:255
 msgid "failed to connect to database\n"
 msgstr "misslyckades med att koppla upp mot databas\n"
 
-#: pg_backup_db.c:281
+#: pg_backup_db.c:274
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "uppkoppling mot databas \"%s\" misslyckades: %s"
 
-#: pg_backup_db.c:296
+#: pg_backup_db.c:289
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:324
+#: pg_backup_db.c:317
 #, c-format
 msgid "%s: no result from server\n"
 msgstr "%s: inget resultat fr�n servern\n"
 
-#: pg_backup_db.c:331
+#: pg_backup_db.c:324
 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:336
+#: pg_backup_db.c:329
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: pg_backup_db.c:410
+#: pg_backup_db.c:403
 msgid "error returned by PQputline\n"
 msgstr "fel returnerat av PQputline\n"
 
-#: pg_backup_db.c:421
+#: pg_backup_db.c:414
 msgid "error returned by PQendcopy\n"
 msgstr "fel returnerat av PQendcopy\n"
 
-#: pg_backup_db.c:466
+#: pg_backup_db.c:459
 msgid "could not execute query"
 msgstr "kunde inte utf�ra fr�ga"
 
-#: pg_backup_db.c:607
+#: pg_backup_db.c:600
 #, 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:613
+#: pg_backup_db.c:606
 #, c-format
 msgid "no OID type columns in table %s\n"
 msgstr "ingga OID-typ-kolumner i tabell %s\n"
 
-#: pg_backup_db.c:620
+#: pg_backup_db.c:613
 #, 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:636
+#: pg_backup_db.c:629
 #, c-format
 msgid "SQL: %s\n"
 msgstr "SQL: %s\n"
 
-#: pg_backup_db.c:641
+#: pg_backup_db.c:634
 #, 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:646
+#: pg_backup_db.c:639
 #, 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:669
+#: pg_backup_db.c:662
 msgid "creating table for large object cross-references\n"
 msgstr "skapar tabell f�r korsreferenser till stora objekt\n"
 
-#: pg_backup_db.c:673
+#: pg_backup_db.c:666
 msgid "could not create large object cross-reference table"
 msgstr "kunde inte skapa tabell f�r korsreferenser till stora objekt"
 
-#: pg_backup_db.c:678
+#: pg_backup_db.c:671
 msgid "could not create index on large object cross-reference table"
 msgstr "kunde inte skapa index f�r tabellen med korsreferenser till stora objekt"
 
-#: pg_backup_db.c:692
+#: pg_backup_db.c:685
 msgid "could not create large object cross-reference entry"
 msgstr "kunde inte skapa post f�r korsreferens till stort objekt"
 
-#: pg_backup_db.c:704
+#: pg_backup_db.c:697
 msgid "could not start database transaction"
 msgstr "kunde inte starta databastransaktionen"
 
-#: pg_backup_db.c:718
+#: pg_backup_db.c:711
 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:731
+#: pg_backup_db.c:724
 msgid "could not commit database transaction"
 msgstr "kunde inte genomf�ra databastransaktionen"
 
-#: pg_backup_db.c:744
+#: pg_backup_db.c:737
 msgid "could not commit transaction for large object cross-references"
 msgstr "kunde inte genomf�ra transaktion f�r korsreferens till stort objekt"
 
@@ -1620,17 +1620,12 @@ msgstr "kunde inte st
 msgid "could not write byte\n"
 msgstr "kunde inte skriva tecken\n"
 
-#: pg_backup_files.c:416
-#, c-format
-msgid "write error in _WriteBuf (%d != %d)\n"
-msgstr "fel vid skrivning i _WriteBuf (%d != %d)\n"
-
 #: pg_backup_files.c:475
 #, 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:879
+#: pg_backup_files.c:496 pg_backup_tar.c:890
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "ogiltig OID f�r stort objekt (%u)\n"
@@ -1647,170 +1642,153 @@ msgstr "kunde inte st
 msgid "this format cannot be read\n"
 msgstr "detta format kan inte l�sas\n"
 
-#: pg_backup_tar.c:95
+#: pg_backup_tar.c:106
 msgid "tar archiver"
 msgstr "tar-arkiverare"
 
-#: pg_backup_tar.c:172
+#: pg_backup_tar.c:183
 #, 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:197
+#: pg_backup_tar.c:208
 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:209
+#: pg_backup_tar.c:220
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "kunde inte �ppna TOC-fil f�r l�sning: %s\n"
 
-#: pg_backup_tar.c:331
+#: pg_backup_tar.c:342
 #, c-format
 msgid "could not find file %s in archive\n"
 msgstr "kunde inte hitta fil %s i arkiv\n"
 
-#: pg_backup_tar.c:342
+#: pg_backup_tar.c:353
 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:358
+#: pg_backup_tar.c:369
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "kunde inte generera tempor�rt filnamn: %s\n"
 
-#: pg_backup_tar.c:367
+#: pg_backup_tar.c:378
 msgid "could not gzdopen temporary file\n"
 msgstr "kunde inte gzdopen tempor�r fil\n"
 
-#: pg_backup_tar.c:397
+#: pg_backup_tar.c:408
 msgid "could not close tar member\n"
 msgstr "kunde inte st�nga tar-medlem\n"
 
-#: pg_backup_tar.c:497
+#: pg_backup_tar.c:508
 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:501
+#: pg_backup_tar.c:512
 #, 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:540
+#: pg_backup_tar.c:551
 #, 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:629
+#: pg_backup_tar.c:640
 #, 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:647
+#: pg_backup_tar.c:658
 #, 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"
 
-#: pg_backup_tar.c:683
+#: pg_backup_tar.c:694
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "�terst�ller stort objekt OID %u\n"
 
-#: pg_backup_tar.c:822
+#: pg_backup_tar.c:833
 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:1018
+#: pg_backup_tar.c:1021
+msgid "archive member too large for tar format\n"
+msgstr "arkivdel f�r stor f�r formatet tar\n"
+
+#: pg_backup_tar.c:1031
 #, 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:1024
+#: pg_backup_tar.c:1037
 #, c-format
 msgid "could not close tar member: %s\n"
 msgstr "kunde inte st�nka tar-medlem: %s\n"
 
-#: pg_backup_tar.c:1027
-msgid "actual file length ("
-msgstr "verklig fill�ngd ("
-
-#: pg_backup_tar.c:1027
-msgid ") does not match expected ("
-msgstr ") matchar inte det f�rv�ntade ("
-
-#: pg_backup_tar.c:1027 pg_backup_tar.c:1129
-msgid ")\n"
-msgstr ")\n"
+#: pg_backup_tar.c:1046
+#, 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:1034
+#: pg_backup_tar.c:1054
 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:1058
-msgid "moving from position "
-msgstr "flyttar fr�n position "
-
-#: pg_backup_tar.c:1058
-msgid " to next member at file position "
-msgstr " till n�sta medlem vid filposition "
-
-#: pg_backup_tar.c:1058 pg_backup_tar.c:1065 pg_backup_tar.c:1179
-msgid "\n"
-msgstr "\n"
+#: pg_backup_tar.c:1083
+#, 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:1065
-msgid "now at file position "
-msgstr "nu p� filposition "
+#: pg_backup_tar.c:1094
+#, c-format
+msgid "now at file position %s\n"
+msgstr "nu p� filposition %s\n"
 
-#: pg_backup_tar.c:1073 pg_backup_tar.c:1100
+#: pg_backup_tar.c:1103 pg_backup_tar.c:1130
 #, 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:1084
+#: pg_backup_tar.c:1114
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "hoppar �ver tar-medlem %s\n"
 
-#: pg_backup_tar.c:1088
+#: pg_backup_tar.c:1118
 #, 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"
 
-#: pg_backup_tar.c:1129
-msgid "mismatch in actual vs. predicted file position ("
-msgstr "miss i verklig j�mf�rt med f�rv�ntad filposition ("
-
-#: pg_backup_tar.c:1129
-msgid " vs. "
-msgstr " mot "
+#: pg_backup_tar.c:1166
+#, 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:1143
+#: pg_backup_tar.c:1181
 #, c-format
 msgid "incomplete tar header found (%lu bytes)\n"
 msgstr "inkomplett tar-huvud hittat (%lu bytes)\n"
 
-#: pg_backup_tar.c:1173
+#: pg_backup_tar.c:1216
 #, c-format
-msgid "TOC Entry %s at "
-msgstr "TOC-post %s vid "
+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:1173
-#, c-format
-msgid " (length %lu, checksum %d)\n"
-msgstr " (l�ngd %lu, kontrollsumma %d)\n"
-
-#: pg_backup_tar.c:1178
+#: pg_backup_tar.c:1226
 #, c-format
 msgid ""
-"corrupt tar header found in %s (expected %d, computed %d) file position "
-msgstr "trasigt tar-huvud hittat i %s (f�rv�ntade %d, ber�knad %d) filposition "
+"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"
 
-#: pg_backup_tar.c:1254
+#: pg_backup_tar.c:1316
 msgid "unable to write tar header\n"
 msgstr "kan inte skriva tar-huvud\n"
 
@@ -1886,43 +1864,47 @@ msgstr ""
 "                           objekt�garen\n"
 
 #: pg_restore.c:399
-msgid "  -P, --function=NAME(args)restore named function\n"
-msgstr "  -P, --function=NAMN(arg) �terst�ll namngiven funktion\n"
+msgid ""
+"  -P, --function=NAME(args)\n"
+"                           restore named function\n"
+msgstr ""
+"  -P, --function=NAMN(argument)\n"
+"                           �terst�ll namngiven funktion\n"
 
-#: pg_restore.c:400
+#: pg_restore.c:401
 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"
 
-#: pg_restore.c:401
+#: pg_restore.c:402
 msgid "  -R, --no-reconnect       disallow ALL reconnections to the database\n"
-msgstr "  -R, --no-reconnect       till�t inte n�gon �teruppkoppling mot databasen\n"
+msgstr "  -R, --no-reconnect       till�t inte �teruppkoppling mot databasen\n"
 
-#: pg_restore.c:402
+#: pg_restore.c:403
 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:403
+#: pg_restore.c:404
 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"
 
-#: pg_restore.c:405
+#: pg_restore.c:406
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NAMN         �terst�ll namngiven tabell\n"
 
-#: pg_restore.c:406
+#: pg_restore.c:407
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NAMN       �terst�ll namngiven utl�sare\n"
 
-#: pg_restore.c:410
+#: pg_restore.c:411
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr "  -x, --no-privileges      �terst�ll inte �tkomstr�ttigheter (grant/revoke)\n"
 
-#: pg_restore.c:411
+#: pg_restore.c:412
 msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
@@ -1932,36 +1914,36 @@ msgstr ""
 "                           anv�nd kommandot SET SESSION AUTHORIZATION\n"
 "                           om m�jligt ist�llet f�r att �teruppkoppla\n"
 
-#: pg_restore.c:418
+#: pg_restore.c:419
 msgid "  -a                       restore only the data, no schema\n"
 msgstr "  -a                       �terst�ll bara data, inte schema\n"
 
-#: pg_restore.c:420
+#: pg_restore.c:421
 msgid "  -C                       issue commands to create the database\n"
 msgstr "  -C                       utf�r kommandon f�r att skapa databasen\n"
 
-#: pg_restore.c:421
+#: pg_restore.c:422
 msgid "  -d NAME                  output database name\n"
 msgstr "  -d NAMN                  databasnamn f�r utmatning\n"
 
-#: pg_restore.c:423
+#: 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:425
+#: 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:426
+#: pg_restore.c:427
 msgid "  -I NAME                  restore named index\n"
 msgstr "  -I NAMN                  �terst�ll namngivet index\n"
 
-#: pg_restore.c:427
+#: 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:428
+#: pg_restore.c:429
 msgid ""
 "  -L FILENAME              use specified table of contents for ordering\n"
 "                           output from this file\n"
@@ -1969,15 +1951,15 @@ msgstr ""
 "  -L FILNAMN               anv�nd angiven TOC f�r att f� utdata-ordning\n"
 "                           fr�n denna fil\n"
 
-#: pg_restore.c:430
+#: pg_restore.c:431
 msgid "  -N                       restore in original dump order\n"
 msgstr "  -N                       �terst�ll i originalordning fr�n dumpningen\n"
 
-#: pg_restore.c:431
+#: pg_restore.c:432
 msgid "  -o                       restore in OID order\n"
 msgstr "  -o                       �terst�ll i OID-ordning\n"
 
-#: pg_restore.c:432
+#: pg_restore.c:433
 msgid ""
 "  -O                       do not reconnect to database to match\n"
 "                           object owner\n"
@@ -1985,44 +1967,44 @@ msgstr ""
 "  -O                       �teruppkoppla inte mot databas f�r att match\n"
 "                           objekt�garen\n"
 
-#: pg_restore.c:435
+#: pg_restore.c:436
 msgid "  -P NAME(args)            restore named function\n"
 msgstr "  -P NAMN(arg)             �terst�ll namngiven funktion\n"
 
-#: pg_restore.c:436
+#: pg_restore.c:437
 msgid ""
 "  -r                       rearrange output to put indexes etc. at end\n"
 msgstr "  -r                       kasta om utdata s� att index osv. kommer sist\n"
 
-#: pg_restore.c:437
+#: pg_restore.c:438
 msgid "  -R                       disallow ALL reconnections to the database\n"
 msgstr "  -R                       till�t inte n�gon �teruppkoppling mot databasen\n"
 
-#: pg_restore.c:438
+#: pg_restore.c:439
 msgid "  -s                       restore only the schema, no data\n"
 msgstr "  -s                       �terst�ll bara scheman, inte data\n"
 
-#: pg_restore.c:439
+#: pg_restore.c:440
 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"
 
-#: pg_restore.c:441
+#: pg_restore.c:442
 msgid "  -t NAME                  restore named table\n"
 msgstr "  -t NAMN                  �terst�ll namngiven tabell\n"
 
-#: pg_restore.c:442
+#: pg_restore.c:443
 msgid "  -T NAME                  restore named trigger\n"
 msgstr "  -T NAMN                  �terst�ll namngiven utl�sare\n"
 
-#: pg_restore.c:446
+#: pg_restore.c:447
 msgid ""
 "  -x                       skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr "  -x                       �terst�ll inte �tkomstr�ttigheter (grant/revoke)\n"
 
-#: pg_restore.c:447
+#: pg_restore.c:448
 msgid ""
 "  -X use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
@@ -2032,7 +2014,7 @@ msgstr ""
 "                           anv�nd kommandot SET SESSION AUTHORIZATION\n"
 "                           om m�jligt ist�llet f�r att �teruppkoppla\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:454
 msgid ""
 "\n"
 "If no input file name is supplied, then standard input is used.\n"
@@ -2047,7 +2029,9 @@ msgstr ""
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
 "\n"
-msgstr "%s extraherar ett PostgreSQL databaskluster till en SQL-scriptfil.\n\n"
+msgstr ""
+"%s extraherar ett PostgreSQL databaskluster till en SQL-scriptfil.\n"
+"\n"
 
 #: pg_dumpall.c:216
 #, c-format
@@ -2058,8 +2042,12 @@ msgstr ""
 "  %s [FLAGGOR]\n"
 "\n"
 
+#: pg_dumpall.c:220
+msgid "  -c, --clean              clean (drop) databases prior to create\n"
+msgstr "  -c, --clean              nollst�ll (drop) databaser innan skapande\n"
+
 #: pg_dumpall.c:223
-msgid "  -g, --globals-only       only dump global objects, no databases\n"
+msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr "  -g, --globals-only       dumpa bara globala objekt, inte databaser\n"
 
 #: pg_dumpall.c:225
@@ -2070,8 +2058,12 @@ msgstr ""
 "  -i, --ignore-version     forts�tt �ven n�r serverns version inte �r\n"
 "                           samma som pg_dumpall-versionen\n"
 
+#: pg_dumpall.c:233
+msgid "  -c                       clean (drop) databases prior to create\n"
+msgstr "  -c                       nollst�ll (drop) databaser innan skapande\n"
+
 #: pg_dumpall.c:236
-msgid "  -g                       only dump global objects, no databases\n"
+msgid "  -g                       dump only global objects, no databases\n"
 msgstr "  -g                       dumpa bara globala objekt, inte databaser\n"
 
 #: pg_dumpall.c:238
@@ -2087,44 +2079,57 @@ msgid ""
 "\n"
 "The SQL script will be written to the standard output.\n"
 "\n"
-msgstr "\nSQL-scriptet kommer att skrivas till standard ut.\n\n"
+msgstr ""
+"\n"
+"SQL-scriptet kommer att skrivas till standard ut.\n"
+"\n"
 
-#: pg_dumpall.c:556
+#: pg_dumpall.c:562
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: dumpar databas \"%s\"...\n"
 
-#: pg_dumpall.c:562
+#: pg_dumpall.c:568
 #, c-format
 msgid "%s: pg_dump failed on %s, exiting\n"
 msgstr "%s: pg_dump misslyckades med %s, avslutar\n"
 
-#: pg_dumpall.c:584
+#: pg_dumpall.c:590
 #, c-format
 msgid "%s: running %s\n"
 msgstr "%s: k�r %s\n"
 
-#: pg_dumpall.c:623
+#: pg_dumpall.c:630
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: kunde inte ansluta till databasen %s\n"
 
-#: pg_dumpall.c:646
+#: pg_dumpall.c:653
 #, 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:668
+#: pg_dumpall.c:661
+#, c-format
+msgid "%s: could not get server version\n"
+msgstr "%s: kunde inte h�mta serverversionen\n"
+
+#: pg_dumpall.c:670
+#, c-format
+msgid "%s: could not parse server version \"%s\"\n"
+msgstr "%s: kunde inte tolka versionstr�ngen \"%s\"\n"
+
+#: pg_dumpall.c:692
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: fr�ga misslyckades: %s"
 
-#: pg_dumpall.c:669
+#: pg_dumpall.c:693
 #, c-format
-msgid "%s: query was: %s"
-msgstr "%s: fr�gan var: %s"
+msgid "%s: query was: %s\n"
+msgstr "%s: fr�gan var: %s\n"
 
-#: pg_dumpall.c:714
+#: pg_dumpall.c:739
 #, c-format
 msgid ""
 "%s: could not find pg_dump\n"
@@ -2132,3 +2137,4 @@ msgid ""
 msgstr ""
 "%s: kan inte hitta pg_dump\n"
 "Kontrollera att den finns i s�kv�gen eller i samma katalog som %s.\n"
+
diff --git a/src/bin/pg_dump/po/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po
index d1f06eb4cd5fae983552e1a5a4fbee0c014e9eb7..b2e21f3e12701c231749d8bcfad1878db8a376b7 100644
--- a/src/bin/pg_dump/po/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
@@ -1,11 +1,11 @@
 # simplified Chinese translation file for pg_dump and friends
 # Weiping He <laser@zhengmai.com.cn>, 2001.
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.1 2002/08/21 20:42:26 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.2 2002/10/14 19:04:28 petere Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-11-30 22:18+0800\n"
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-27 13:24+0800\n"
 "PO-Revision-Date: 2001-12-07 20:38:59+0800\n"
 "Last-Translator: Weiping He <laser@zhengmai.com.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -13,7 +13,105 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_dump.c:136
+#: pg_dump.c:389 pg_restore.c:254
+msgid "User name: "
+msgstr "�û���: "
+
+#: pg_dump.c:423 pg_restore.c:281
+#, c-format
+msgid "%s: invalid -X option -- %s\n"
+msgstr "%s: ��Ч�� -X ѡ�� -- %s\n"
+
+#: pg_dump.c:425 pg_dump.c:447 pg_dumpall.c:173 pg_restore.c:283
+#: pg_restore.c:295
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "���� '%s --help' ��ȡ�������Ϣ.\n"
+
+#: pg_dump.c:436
+#, c-format
+msgid ""
+"%s was compiled without support for long options.\n"
+"Use --help for help on invocation options.\n"
+msgstr ""
+"%s ����ʱû�г�ѡ��֧��.\n"
+"�� --help ��ȡ����ѡ��İ���.\n"
+
+#: pg_dump.c:455 pg_dumpall.c:181
+#, c-format
+msgid ""
+"%s: too many command line options (first is '%s')\n"
+"Try '%s --help' for more information.\n"
+msgstr ""
+"%s: �����в���̫�� (��һ���� '%s')\n"
+"���� '%s --help' ��ȡ������Ϣ.\n"
+
+#: pg_dump.c:467
+msgid ""
+"The options \"schema only\" (-s) and \"data only\" (-a) cannot be used "
+"together.\n"
+msgstr "ѡ�� \"ֻת�����\" (-s) �� \"ֻת������\" (-a) ����ͬʱʹ��.\n"
+
+#: pg_dump.c:473
+msgid ""
+"The options \"clean\" (-c) and \"data only\" (-a) cannot be used together.\n"
+msgstr "ѡ�� \"���\" (-s) �� \"ֻת������\" (-a) ����ͬʱʹ��.\n"
+
+#: pg_dump.c:479
+msgid "Large object output is not supported for a single table.\n"
+msgstr "��֧�ֵ������Ĵ�������.\n"
+
+#: pg_dump.c:480
+msgid "Use all tables or a full dump instead.\n"
+msgstr "Ӧ�������б����߽���һ��������ת��.\n"
+
+#: pg_dump.c:486
+msgid "INSERT (-d, -D) and OID (-o) options cannot be used together.\n"
+msgstr "INSERT (-d, -D) �� OID (-o) ѡ���ͬʱʹ��.\n"
+
+#: pg_dump.c:487
+msgid "(The INSERT command cannot set OIDs.)\n"
+msgstr "(INSERT �����޷����ö����ʶ(oid).)\n"
+
+#: pg_dump.c:493
+msgid "large object output is not supported for plain text dump files.\n"
+msgstr "���ı�ת���ļ���֧����������.\n"
+
+#: pg_dump.c:494
+msgid "(Use a different output format.)\n"
+msgstr "(ʹ�ò�ͬ�������ʽ.)\n"
+
+#: pg_dump.c:524
+#, c-format
+msgid "invalid output format \"%s\" specified\n"
+msgstr "�����˷Ƿ��������ʽ \"%s\"\n"
+
+#: pg_dump.c:530
+#, c-format
+msgid "could not open output file %s for writing\n"
+msgstr "�޷�������ļ� %s ����д��\n"
+
+#: pg_backup_db.c:48 pg_dump.c:541
+#, c-format
+msgid "unable to parse version string \"%s\"\n"
+msgstr "�޷������汾�ִ� \"%s\"\n"
+
+#: pg_dump.c:559
+#, c-format
+msgid "BEGIN command failed: %s"
+msgstr "BEGIN ����ʧ��: %s"
+
+#: pg_dump.c:565
+#, c-format
+msgid "could not set transaction isolation level to serializable: %s"
+msgstr "�޷���������뼶������Ϊ�ɴ��л�: %s"
+
+#: pg_dump.c:578
+#, c-format
+msgid "last built-in OID is %u\n"
+msgstr "�������� OID �� %u\n"
+
+#: pg_dump.c:658
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -22,1206 +120,1224 @@ msgstr ""
 "%s ��һ�����ݿ�ת��Ϊ���ı��ļ�������������ʽ.\n"
 "\n"
 
-#: pg_dump.c:137
-msgid "Usage:"
-msgstr "�÷�:"
+#: pg_dump.c:659 pg_dumpall.c:215 pg_restore.c:377
+msgid "Usage:\n"
+msgstr "�÷�:\n"
 
-#: pg_dump.c:138
+#: pg_dump.c:660
 #, c-format
 msgid ""
-"  %s [options] dbname\n"
+"  %s [OPTIONS] DBNAME\n"
 "\n"
 msgstr ""
-"  %s [ѡ��] ���ݿ���\n"
+"  %s [ѡ��] ���ݿ�����\n"
 "\n"
 
-#: pg_dump.c:139
-msgid "Options:"
-msgstr "ѡ��:"
+#: pg_dump.c:661 pg_dumpall.c:218 pg_restore.c:379
+msgid "Options:\n"
+msgstr "ѡ��:\n"
 
-#
-#: pg_dump.c:143
+#: pg_dump.c:664
+msgid "  -a, --data-only          dump only the data, not the schema\n"
+msgstr "  -a, --data-only          ֻת������,���������\n"
+
+#: pg_dump.c:665
+msgid "  -b, --blobs              include large objects in dump\n"
+msgstr "  -b, --blobs              ��ת���а��������\n"
+
+#: pg_dump.c:666 pg_restore.c:383
+msgid "  -c, --clean              clean (drop) schema prior to create\n"
+msgstr "  -c, --clean              �����(ɾ��)Ԥ�ȵĴ��,�ٽ���\n"
+
+#: pg_dump.c:667
 msgid ""
-"  -a, --data-only          dump only the data, not the schema\n"
-"  -b, --blobs              include large objects in dump\n"
-"  -c, --clean              clean (drop) schema prior to create\n"
 "  -C, --create             include commands to create database in dump\n"
+msgstr "  -C, --create             ��ת���а�������,�Ա㴴�����ݿ�\n"
+
+#: pg_dump.c:668 pg_dumpall.c:221
+msgid ""
 "  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"
+msgstr ""
+"  -d, --inserts            �� INSERT һ����ת������, �൱�� COPY, ����\n"
+
+#: pg_dump.c:669 pg_dumpall.c:222
+msgid ""
 "  -D, --column-inserts     dump data as INSERT commands with column names\n"
-"  -f, --file=FILENAME      output file name\n"
+msgstr "  -D, --column-inserts     �� INSERT ���ֶ���������һ��ת������\n"
+
+#: pg_dump.c:670 pg_restore.c:386
+msgid "  -f, --file=FILENAME      output file name\n"
+msgstr "  -f, --file=�ļ���        ����ļ���\n"
+
+#: pg_dump.c:671
+msgid ""
 "  -F, --format {c|t|p}     output file format (custom, tar, plain text)\n"
-"  -h, --host=HOSTNAME      database server host name\n"
+msgstr "  -F, --format {c|t|p}     ����ļ���ʽ (����, tar, ����)\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=������        ���ݿ��������������\n"
+
+#: pg_dump.c:673
+msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 "                           pg_dump version\n"
-"  -n, --no-quotes          suppress most quotes around identifiers\n"
-"  -N, --quotes             enable most quotes around identifiers\n"
-"  -o, --oids               include oids in dump\n"
+msgstr ""
+"  -i, --ignore-version     ���������İ汾���� pg_dump �İ汾�Ų�ƥ��ʱ\n"
+"                           �Լ�������\n"
+
+#: pg_dump.c:675 pg_dumpall.c:227
+msgid "  -o, --oids               include OIDs in dump\n"
+msgstr "  -o, --oids               ��ת���а��� OID\n"
+
+#: pg_dump.c:676
+msgid ""
 "  -O, --no-owner           do not output \\connect commands in plain\n"
 "                           text format\n"
-"  -p, --port=PORT          database server port number\n"
+msgstr ""
+"  -O, --no-owner           �����ĸ�ʽ��, ����ʾ \\connect ����\n"
+"                           �����\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=�˿ں�        ���ݿ�������Ķ˿ں�\n"
+
+#: pg_dump.c:679
+msgid ""
 "  -R, --no-reconnect       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
-"  -s, --schema-only        dump only the schema, no data\n"
+msgstr ""
+"  -R, --no-reconnect       �����ĸ�ʽ��, ȡ�������������ݿ��\n"
+"                           ������\n"
+
+#: pg_dump.c:681
+msgid "  -s, --schema-only        dump only the schema, no data\n"
+msgstr "  -s, --schema-only        ֻת�����, ����������\n"
+
+#: pg_dump.c:682
+msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
 "                           plain text format\n"
-"  -t, --table=TABLE        dump this table only (* for all)\n"
-"  -U, --username=NAME      connect as specified database user\n"
-"  -v, --verbose            verbose mode\n"
+msgstr ""
+"  -S, --superuser=����     �����ĸ�ʽ��, ʹ��ָ���ij����û�\n"
+"                           ����\n"
+
+#: pg_dump.c:684
+msgid "  -t, --table=TABLE        dump this table only (* for all)\n"
+msgstr "  -t, --table=������       ֻת���˱� (* Ϊ����)\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=����      ��ָ�������ݿ��û�����\n"
+
+#: pg_dump.c:686 pg_dumpall.c:230 pg_restore.c:409
+msgid "  -v, --verbose            verbose mode\n"
+msgstr "  -v, --verbose            ��ϸģʽ\n"
+
+#: pg_dump.c:687 pg_dumpall.c:231 pg_restore.c:410
+msgid ""
 "  -W, --password           force password prompt (should happen "
 "automatically)\n"
-"  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
+msgstr "  -W, --password           ǿ�ƿ�����ʾ (�Զ�)\n"
+
+#: pg_dump.c:688
+msgid "  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
+msgstr "  -x, --no-privileges      ��Ҫת��Ȩ�� (grant/revoke)\n"
+
+#: pg_dump.c:689
+msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
 "                           than \\connect commands\n"
-"  -Z, --compress {0-9}     compression level for compressed formats\n"
 msgstr ""
-"  -a, --data-only          ֻת������, ��������\n"
-"  -b, --blobs              ��ת���а������������\n"
-"  -c, --clean              �ڴ���֮ǰ����(ɾ��)���\n"
-"  -C, --create             ��ת���а����������ݿ������\n"
-"  -d, --inserts            �������� INSERT ����ʽת��, ���� COPY �������ʽ\n"
-"  -D, --column-inserts     �������Դ����ֶ����� INSERT ������ʽת��\n"
-"  -f, --file=�ļ���        ����ļ���\n"
-"  -F, --format {c|t|p}     ����ļ���ʽ(�ͻ�, tar, ���ı�)\n"
-"  -h, --host=������        ���ݿ������������\n"
-"  -i, --ignore-version     ��ʹ�������汾�� pg_dump �汾��ƥ��Ҳ������ȥ\n"
-"  -n, --no-quotes          ��ֹ��ʶ����Χ�ľ��󲿷�����\n"
-"  -N, --quotes             ������ʶ����Χ�ľ��󲿷�����\n"
-"  -o, --oids               ��ת���а��� oid (�����ʶ)\n"
-"  -O, --no-owner           �ڴ��ı���ʽ�в�Ҫ���� \\connect ����\n"
-"  -p, --port=PORT          ���ݿ�������˿ں�\n"
-"  -R, --no-reconnect       �ڴ��ı���ʽ�йر����������ݿ��������\n"
-"  -s, --schema-only        ֻת����������, ��ת������\n"
-"  -S, --superuser=����     �����ڴ��ı�ģʽ��ʹ�õij����û����û���\n"
-"  -t, --table=������       ֻת������� (* ��ʾת�����б�)\n"
-"  -U, --username=����      �����������ݿ��û�����\n"
-"  -v, --verbose            �߳�ģʽ\n"
-"  -W, --password           ǿ�ƿ�����ʾ (Ӧ���Զ�����)\n"
-"  -x, --no-privileges      ��ת��Ȩ�� (grant/revoke)\n"
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           ��� SET SESSION AUTHORIZATION ���������\n"
+"                           ��� SET SESSION AUTHORIZATION ����, �൱��\n"
 "                           \\connect ����\n"
-"  -Z, --compress {0-9}     ѹ����ʽ��ѹ������\n"
 
-#: pg_dump.c:177
+#: pg_dump.c:692 pg_restore.c:415
+msgid ""
+"  -X disable-triggers, --disable-triggers\n"
+"                           disable triggers during data-only restore\n"
+msgstr ""
+"  -X disable-triggers, --disable-triggers\n"
+"                           ��ֻ�ָ����ݵĹ�����ȡ��������\n"
+
+#: pg_dump.c:694
+msgid "  -Z, --compress {0-9}     compression level for compressed formats\n"
+msgstr "  -Z, --compress {0-9}     ��ѹ����ʽ��ѹ������\n"
+
+#: pg_dump.c:697
+msgid "  -a                       dump only the data, not the schema\n"
+msgstr "  -a                       ֻת������, ���������\n"
+
+#: pg_dump.c:698
+msgid "  -b                       include large objects in dump\n"
+msgstr "  -b                       ��ת���а��������\n"
+
+#: pg_dump.c:699 pg_restore.c:420
+msgid "  -c                       clean (drop) schema prior to create\n"
+msgstr "  -c                       �����(ɾ��)Ԥ�ȵĴ��,�ٽ���\n"
+
+#: pg_dump.c:700
 msgid ""
-"  -a                       dump only the data, not the schema\n"
-"  -b                       include large objects in dump\n"
-"  -c                       clean (drop) schema prior to create\n"
 "  -C                       include commands to create database in dump\n"
+msgstr "  -C                       ��ת���а�������,�Ա㴴�����ݿ�\n"
+
+#: pg_dump.c:701 pg_dumpall.c:234
+msgid ""
 "  -d                       dump data as INSERT, rather than COPY, commands\n"
+msgstr ""
+"  -d                       �� INSERT һ����ת������, �൱�� COPY, ����\n"
+
+#: pg_dump.c:702 pg_dumpall.c:235
+msgid ""
 "  -D                       dump data as INSERT commands with column names\n"
-"  -f FILENAME              output file name\n"
+msgstr "  -D                       �� INSERT ���ֶ���������һ��ת������\n"
+
+#: pg_dump.c:703 pg_restore.c:423
+msgid "  -f FILENAME              output file name\n"
+msgstr "  -f �ļ���                ����ļ���\n"
+
+#: pg_dump.c:704
+msgid ""
 "  -F {c|t|p}               output file format (custom, tar, plain text)\n"
-"  -h HOSTNAME              database server host name\n"
+msgstr "  -F {c|t|p}               ����ļ���ʽ (����, tar, ����)\n"
+
+#: pg_dump.c:705 pg_dumpall.c:237 pg_restore.c:425
+msgid "  -h HOSTNAME              database server host name\n"
+msgstr "  -h ������                ���ݿ��������������\n"
+
+#: pg_dump.c:706
+msgid ""
 "  -i                       proceed even when server version mismatches\n"
 "                           pg_dump version\n"
-"  -n                       suppress most quotes around identifiers\n"
-"  -N                       enable most quotes around identifiers\n"
-"  -o                       include oids in dump\n"
+msgstr ""
+"  -i                       ���������İ汾���� pg_dump �İ汾�Ų�ƥ��ʱ\n"
+"                           �Լ�������\n"
+
+#: pg_dump.c:708 pg_dumpall.c:240
+msgid "  -o                       include OIDs in dump\n"
+msgstr "  -o                       ��ת���а��� OID\n"
+
+#: pg_dump.c:709
+msgid ""
 "  -O                       do not output \\connect commands in plain\n"
 "                           text format\n"
-"  -p PORT                  database server port number\n"
+msgstr ""
+"  -O                       �����ĸ�ʽ��, ����ʾ \\connect ����\n"
+"                           �����\n"
+
+#: pg_dump.c:711 pg_dumpall.c:241 pg_restore.c:435
+msgid "  -p PORT                  database server port number\n"
+msgstr "  -p �˿ں�                ���ݿ�������Ķ˿ں�\n"
+
+#: pg_dump.c:712
+msgid ""
 "  -R                       disable ALL reconnections to the database in\n"
 "                           plain text format\n"
-"  -s                       dump only the schema, no data\n"
+msgstr ""
+"  -R                       �����ĸ�ʽ��, ȡ�������������ݿ��\n"
+"                           ������\n"
+
+#: pg_dump.c:714
+msgid "  -s                       dump only the schema, no data\n"
+msgstr "  -s                       ֻת�����, ����������\n"
+
+#: pg_dump.c:715
+msgid ""
 "  -S NAME                  specify the superuser user name to use in\n"
 "                           plain text format\n"
-"  -t TABLE                 dump this table only (* for all)\n"
-"  -U NAME                  connect as specified database user\n"
-"  -v                       verbose mode\n"
+msgstr ""
+"  -S ����                  �����ĸ�ʽ��, ʹ��ָ���ij����û�\n"
+"                           ����\n"
+
+#: pg_dump.c:717
+msgid "  -t TABLE                 dump this table only (* for all)\n"
+msgstr "  -t ������                ֻת���˱� (* Ϊ����)\n"
+
+#: pg_dump.c:718 pg_dumpall.c:242 pg_restore.c:444
+msgid "  -U NAME                  connect as specified database user\n"
+msgstr "  -U ����                  ��ָ�������ݿ��û�����\n"
+
+#: pg_dump.c:719 pg_dumpall.c:243 pg_restore.c:445
+msgid "  -v                       verbose mode\n"
+msgstr "  -v                       ��ϸģʽ\n"
+
+#: pg_dump.c:720 pg_dumpall.c:244 pg_restore.c:446
+msgid ""
 "  -W                       force password prompt (should happen "
 "automatically)\n"
-"  -x                       do not dump privileges (grant/revoke)\n"
+msgstr "  -W                       ǿ�ƿ�����ʾ (�Զ�)\n"
+
+#: pg_dump.c:721
+msgid "  -x                       do not dump privileges (grant/revoke)\n"
+msgstr "  -x                       ��Ҫת��Ȩ�� (grant/revoke)\n"
+
+#: pg_dump.c:722
+msgid ""
 "  -X use-set-session-authorization\n"
 "                           output SET SESSION AUTHORIZATION commands rather\n"
 "                           than \\connect commands\n"
-"  -Z {0-9}                 compression level for compressed formats\n"
 msgstr ""
-"  -a                       ֻת������, ���������\n"
-"  -b                       ��ת���а��������\n"
-"  -c                       �ڴ���֮ǰ����(ɾ��)���\n"
-"  -C                       ��ת���а����������ݿ������\n"
-"  -d                       �������� INSERT ��ʽת��, ���� COPY ����\n"
-"  -D                       �������Դ��ֶ����� INSERT ������ʽת��\n"
-"  -f �ļ���                ����ļ���\n"
-"  -F {c|t|p}               ����ļ���ʽ(�ͻ�, tar, ���ı�)\n"
-"  -h ������                ���ݿ������������\n"
-"  -i                       ��ʹ�������汾�� pg_dump �汾��һ��Ҳ��������\n"
-"  -n                       ��ֹ�ڴ������ʶ����Χ������\n"
-"  -N                       �����ڴ������ʶ����Χ������\n"
-"  -o                       ��ת���а��� oid\n"
-"  -O                       �ڴ��ı���ʽ�в���� \\connect ����\n"
-"  -p �˿�                  ���ݿ�������˿ں�\n"
-"  -R                       �ڴ��ı���ʽ�йر����������ݿ��������\n"
-"  -s                       ֻת�����, ����������\n"
-"  -S ����                  �����ڴ��ı���ʽ��ʹ�õij����û�����\n"
-"  -t ������                ֻת������� (* ��ʾȫ��)\n"
-"  -U ����                  �����������ݿ��û���������\n"
-"  -v                       �߳�ģʽ\n"
-"  -W                       ǿ�ƿ�����ʾ (Ӧ���Զ�����)\n"
-"  -x                       ��ת��Ȩ�� (grant/revoke)\n"
 "  -X use-set-session-authorization\n"
-"                           ��� SET SESSION AUTHORIZATION ����, ������\n"
+"                           ��� SET SESSION AUTHORIZATION ����, �൱��\n"
 "                           \\connect ����\n"
-"  -Z {0-9}                 ѹ����ʽ��ѹ������\n"
 
-#: pg_dump.c:210
+#: pg_dump.c:725 pg_restore.c:451
+msgid "  -X disable-triggers      disable triggers during data-only restore\n"
+msgstr "  -X disable-triggers      ��ֻ�ָ����ݵĹ�����ȡ��������\n"
+
+#: pg_dump.c:726
+msgid "  -Z {0-9}                 compression level for compressed formats\n"
+msgstr "  -Z {0-9}                 ��ѹ����ʽ��ѹ������\n"
+
+#: pg_dump.c:729
 msgid ""
+"\n"
 "If no database name is not supplied, then the PGDATABASE environment\n"
 "variable value is used.\n"
 "\n"
-"Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr ""
-"���û���ṩ���ݿ�����, ��ôʹ�� PGDATABASE ������������ֵ.\n"
 "\n"
-"�� <pgsql-bugs@postgresql.org> �������."
+"���û���ṩ���ݿ�����, ��ôʹ�� PGDATABASE ��������\n"
+"����ֵ.\n"
+"\n"
+
+#: pg_dump.c:731 pg_dumpall.c:248 pg_restore.c:455
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "��������� <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_backup_archiver.c:1298 pg_dump.c:221
+#: pg_backup_archiver.c:1288 pg_dump.c:739
 msgid "*** aborted because of error\n"
 msgstr "*** ��Ϊ�����˳�\n"
 
-#: pg_dump.c:249
+#: pg_dump.c:806
 #, c-format
-msgid "dumping out the contents of table %s\n"
-msgstr "ת���� %s ������\n"
+msgid "dumping contents of table %s\n"
+msgstr "����ת���� %s ������\n"
 
-#: pg_dump.c:280
+#: pg_dump.c:845
 #, c-format
 msgid "SQL command to dump the contents of table \"%s\" failed\n"
 msgstr "ת���� \"%s\" �����ݵ� SQL ����ʧ��\n"
 
-#: pg_dump.c:282 pg_dump.c:378 pg_dump.c:409 pg_dump.c:423 pg_dump.c:494
-#: pg_dump.c:1159
+#: pg_dump.c:847 pg_dump.c:936 pg_dump.c:985 pg_dump.c:999 pg_dump.c:1097
+#: pg_dump.c:1215
 #, c-format
 msgid "Error message from server: %s"
 msgstr "���Է������Ĵ�����Ϣ: %s"
 
-#: pg_dump.c:283 pg_dump.c:294 pg_dump.c:379 pg_dump.c:410 pg_dump.c:1160
+#: pg_dump.c:848 pg_dump.c:857 pg_dump.c:937 pg_dump.c:986 pg_dump.c:1216
 #, c-format
 msgid "The command was: %s\n"
 msgstr "������: %s\n"
 
-#: pg_dump.c:290
+#: pg_dump.c:853
 #, c-format
 msgid "SQL command to dump the contents of table \"%s\" executed abnormally.\n"
 msgstr "ת���� \"%s\" �����ݵ� SQL ���������ִ��.\n"
 
-#: pg_dump.c:292
+#: pg_dump.c:855
 #, c-format
 msgid "The server returned status %d when %d was expected.\n"
 msgstr "����״̬ %2$d ��ʱ�����������״̬ %1$d.\n"
 
-#: pg_dump.c:377
+#: pg_dump.c:935
 #, c-format
 msgid ""
 "SQL command to dump the contents of table \"%s\" failed: PQendcopy() "
 "failed.\n"
 msgstr "ת���� \"%s\" �����ݵ� SQL ����ʧ��: PQendcopy() ʧ��.\n"
 
-#: pg_dump.c:408 pg_dump.c:422 pg_dump.c:493
+#: pg_dump.c:984 pg_dump.c:998 pg_dump.c:1096
 msgid "dumpClasses(): SQL command failed\n"
 msgstr "dumpClasses(): SQL ����ʧ��\n"
 
-#: pg_dump.c:424
+#: pg_dump.c:1000
 msgid "The command was: FETCH 100 FROM _pg_dump_cursor\n"
 msgstr "������: FETCH 100 FROM _pg_dump_cursor\n"
 
-#: pg_dump.c:495
+#: pg_dump.c:1098
 msgid "The command was: CLOSE _pg_dump_cursor\n"
 msgstr "������: CLOSE _pg_dump_cursor\n"
 
-#: pg_dump.c:561
-#, c-format
-msgid "preparing to dump the contents of all %d tables/sequences\n"
-msgstr "׼��ת������ %d ����/���е�����\n"
-
-#: pg_dump.c:563
-msgid "preparing to dump the contents of only one table/sequence\n"
-msgstr "׼��ֻת��һ����/���е�����\n"
-
-#: pg_dump.c:580
+#: pg_dump.c:1136
 #, c-format
 msgid "preparing to dump the contents of table %s\n"
 msgstr "׼��ת���� %s ������\n"
 
-#: pg_backup_db.c:167 pg_dump.c:629
-#, c-format
-msgid "unable to parse version string \"%s\"\n"
-msgstr "�޷������汾�ִ� \"%s\"\n"
-
-#: pg_dump.c:874 pg_restore.c:263
-msgid "User name: "
-msgstr "�û���: "
-
-#: pg_dump.c:906 pg_restore.c:288
-#, c-format
-msgid "%s: invalid -X option -- %s\n"
-msgstr "%s: ��Ч�� -X ѡ�� -- %s\n"
-
-#: pg_dump.c:908 pg_dump.c:930 pg_restore.c:290 pg_restore.c:302
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "���� '%s --help' ��ȡ������Ϣ.\n"
-
-#: pg_dump.c:919
-#, c-format
-msgid ""
-"%s was compiled without support for long options.\n"
-"Use --help for help on invocation options.\n"
-msgstr ""
-"%s û�д���ѡ��֧�ֱ���.\n"
-"�� --help ��ȡ����ѡ��İ���.\n"
-
-#: pg_dump.c:938
-#, c-format
-msgid ""
-"%s: too many command line options (first is '%s')\n"
-"Try '%s --help' for more information.\n"
-msgstr ""
-"%s: �����в���̫�� (��һ���� '%s')\n"
-"���� '%s --help' ��ȡ������Ϣ.\n"
-
-#: pg_backup_db.c:407 pg_dump.c:951
-msgid "no database name specified\n"
-msgstr "û���������ݿ���\n"
-
-#: pg_dump.c:957
-msgid ""
-"The options \"schema only\" (-s) and \"data only\" (-a) cannot be used "
-"together.\n"
-msgstr "ѡ�� \"ֻת�����\" (-s) �� \"ֻת������\" (-a) ����ͬʱʹ��.\n"
-
-#: pg_dump.c:963
-msgid "Large object output is not supported for a single table.\n"
-msgstr "��֧�ֵ������Ĵ�������.\n"
-
-#: pg_dump.c:964
-msgid "Use all tables or a full dump instead.\n"
-msgstr "Ӧ�������б����߽���һ��������ת��.\n"
-
-#: pg_dump.c:970
-msgid "INSERT (-d, -D) and OID (-o) options cannot be used together.\n"
-msgstr "INSERT (-d, -D) �� OID (-o) ѡ���ͬʱʹ��.\n"
-
-#: pg_dump.c:971
-msgid "(The INSERT command cannot set oids.)\n"
-msgstr "(INSERT �����޷����ö����ʶ(oid).)\n"
-
-#: pg_dump.c:977
-msgid "large object output is not supported for plain text dump files.\n"
-msgstr "���ı�ת���ļ���֧����������.\n"
-
-#: pg_dump.c:978
-msgid "(Use a different output format.)\n"
-msgstr "(ʹ�ò�ͬ�������ʽ.)\n"
-
-#: pg_dump.c:1008
-#, c-format
-msgid "invalid output format '%s' specified\n"
-msgstr "�����˷Ƿ��������ʽ '%s'\n"
-
-#: pg_dump.c:1014
-#, c-format
-msgid "could not open output file %s for writing\n"
-msgstr "�޷�������ļ� %s ����д��\n"
-
-#: pg_dump.c:1037
-#, c-format
-msgid "BEGIN command failed: %s"
-msgstr "BEGIN ����ʧ��: %s"
-
-#: pg_dump.c:1043
-#, c-format
-msgid "could not set transaction isolation level to serializable: %s"
-msgstr "�޷���������뼶������Ϊ�ɴ��л�: %s"
-
-#: pg_dump.c:1062
-#, c-format
-msgid "last built-in oid is %u\n"
-msgstr "�������� oid �� %u\n"
-
-#: pg_dump.c:1147
+#: pg_dump.c:1199
 msgid "saving database definition\n"
 msgstr "�������ݿⶨ��\n"
 
-#: pg_dump.c:1158
+#: pg_dump.c:1214
 msgid "SQL command failed\n"
 msgstr "SQL ����ʧ��\n"
 
-#: pg_dump.c:1168
+#: pg_dump.c:1224
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "ȱ������ \"%s\" �� pg_database ��¼\n"
 
-#: pg_dump.c:1174
+#: pg_dump.c:1231
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr "��ѯΪ���ݿ� \"%2$s\" �����˳���һ�� (%1$d) pg_database ��¼\n"
 
-#: pg_dump.c:1220
+#: pg_dump.c:1298
 msgid "saving large objects\n"
 msgstr "��������\n"
 
-#: pg_dump.c:1231
+#: pg_dump.c:1312
 #, c-format
 msgid "dumpBlobs(): cursor declaration failed: %s"
 msgstr "dumpBlobs(): �α�����ʧ��: %s"
 
-#: pg_dump.c:1246
+#: pg_dump.c:1327
 #, c-format
 msgid "dumpBlobs(): fetch from cursor failed: %s"
 msgstr "dumpBlobs(): ���α�ץȡʧ��: %s"
 
-#: pg_dump.c:1259
+#: pg_dump.c:1340
 #, c-format
 msgid "dumpBlobs(): could not open large object: %s"
 msgstr "dumpBlobs(): �޷��򿪴����: %s"
 
-#: pg_dump.c:1272
+#: pg_dump.c:1353
 #, c-format
 msgid "dumpBlobs(): error reading large object: %s"
 msgstr "dumpBlobs(): ��ȡ��������: %s"
 
-#: pg_dump.c:1363
+#: pg_dump.c:1441
+#, c-format
+msgid "query to obtain list of namespaces failed: %s"
+msgstr "��ȡ���ֿռ��б��IJ�ѯʧ��: %s"
+
+#: pg_dump.c:1465
+#, c-format
+msgid "WARNING: owner of namespace %s appears to be invalid\n"
+msgstr "����: ���ֿռ� %s �������߷Ƿ�\n"
+
+#: pg_dump.c:1500
+#, c-format
+msgid "could not find namespace with OID %s\n"
+msgstr "�޷����Ҵ��� OID �����ֿռ� %s\n"
+
+#: pg_dump.c:1580
 #, c-format
 msgid "query to obtain list of data types failed: %s"
 msgstr "��ȡ���������б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:1415
+#: pg_dump.c:1625
 #, c-format
 msgid "WARNING: owner of data type %s appears to be invalid\n"
 msgstr "����: �������� \"%s\" �������߷Ƿ�\n"
 
-#: pg_dump.c:1494
+#: pg_dump.c:1688 pg_dump.c:4010
 #, c-format
 msgid "query to obtain list of operators failed: %s"
 msgstr "��ȡ�������б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:1536
+#: pg_dump.c:1713
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "����: ������ \"%s\" �������߷Ƿ�\n"
 
-#: pg_dump.c:1860
+#: pg_dump.c:1771
+#, c-format
+msgid "query to obtain list of operator classes failed: %s"
+msgstr "��ȡ���������б��IJ�ѯʧ��: %s"
+
+#: pg_dump.c:1796
+#, c-format
+msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
+msgstr "����: �������� \"%s\" ��Ч\n"
+
+#: pg_dump.c:1864 pg_dump.c:4630
 #, c-format
 msgid "query to obtain list of aggregate functions failed: %s"
 msgstr "��ȡ�ۼ������б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:1891
+#: pg_dump.c:1890
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "����: �ۼ����� \"%s\" �������߷Ƿ�\n"
 
-#: pg_dump.c:1965
+#: pg_dump.c:1964
 #, c-format
 msgid "query to obtain list of functions failed: %s"
 msgstr "��ȡ�����б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:2008
+#: pg_dump.c:2011
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "����: ���� \"%s\" �������߷Ƿ�\n"
 
-#: pg_dump.c:2013
-#, c-format
-msgid ""
-"failed sanity check: function %s has more than %d (namely %d) arguments\n"
-msgstr "��ȫ���ʧ��: ���� %s �г��� %d (���ߵ��� %d) ������\n"
-
-#: pg_dump.c:2123
+#: pg_dump.c:2161
 #, c-format
 msgid "query to obtain list of tables failed: %s"
 msgstr "��ȡ���ݱ��б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:2155
-#, c-format
-msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
-msgstr "����: ���ݱ� \"%s\" �������߷Ƿ�\n"
-
-#: pg_dump.c:2179
-#, c-format
-msgid "query to obtain definition of view \"%s\" failed: %s"
-msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯʧ��: %s"
-
-#: pg_dump.c:2187
-#, c-format
-msgid "query to obtain definition of view \"%s\" returned no data\n"
-msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯû�з�������\n"
-
-#: pg_dump.c:2190
-#, c-format
-msgid ""
-"query to obtain definition of view \"%s\" returned more than one definition\n"
-msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯ���س���һ������\n"
-
-#: pg_dump.c:2197
-#, c-format
-msgid "query to obtain definition of view \"%s\" returned NULL oid\n"
-msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯ���� NULL oid\n"
-
-#: pg_dump.c:2207
+#: pg_dump.c:2257
 #, c-format
-msgid "definition of view \"%s\" appears to be empty (length zero)\n"
-msgstr "��ͼ \"%s\" �Ķ����ǿյ�(�㳤)\n"
-
-#: pg_dump.c:2232
-#, c-format
-msgid "finding CHECK constraints for table %s\n"
-msgstr "Ϊ�� \"%s\" ���� CHECK Լ��\n"
+msgid "Attempt to lock table \"%s\" failed.  %s"
+msgstr "������ס�� \"%s\" ʧ��. %s"
 
-#: pg_dump.c:2253
+#: pg_dump.c:2266
 #, c-format
-msgid "query to obtain check constraints failed: %s"
-msgstr "��ȡ���Լ���IJ�ѯʧ��: %s"
-
-#: pg_dump.c:2259
-#, c-format
-msgid "expected %d check constraints on table \"%s\" but found %d\n"
-msgstr "Ԥ���� %d �����Լ���ڱ� \"%s\" ��, ��ֻ�ҵ� %d ��\n"
-
-#: pg_dump.c:2261
-msgid "(The system catalogs might be corrupted.)\n"
-msgstr "(ϵͳ����������.)\n"
-
-#: pg_dump.c:2305
-#, c-format
-msgid "query to obtain primary key of table \"%s\" failed: %s"
-msgstr "��ȡ�� \"%s\" �������IJ�ѯʧ��: %s"
-
-#: pg_dump.c:2312
-#, c-format
-msgid ""
-"query to obtain primary key of table \"%s\" produced more than one result\n"
-msgstr "��ȡ�� \"%s\" �������IJ�ѯ��������һ���Ľ��\n"
-
-#: pg_dump.c:2344
-#, c-format
-msgid "query to obtain name of primary key of table \"%s\" failed: %s"
-msgstr "��ȡ�� \"%s\" ���������ֵIJ�ѯʧ��: %s"
-
-#: pg_dump.c:2352
-#, c-format
-msgid ""
-"query to obtain name of primary key of table \"%s\" did not return exactly "
-"one result\n"
-msgstr "��ȡ�� \"%s\" ���������ֵIJ�û��ֻ����һ�����\n"
-
-#: pg_backup_archiver.c:654 pg_backup_archiver.c:1064
-#: pg_backup_archiver.c:1183 pg_backup_archiver.c:1472
-#: pg_backup_archiver.c:1612 pg_backup_archiver.c:1641 pg_backup_custom.c:149
-#: pg_backup_custom.c:154 pg_backup_custom.c:169 pg_backup_custom.c:562
-#: pg_backup_db.c:336 pg_backup_db.c:430 pg_backup_tar.c:984 pg_dump.c:2361
-msgid "out of memory\n"
-msgstr "�ڴ��þ�\n"
-
-#: pg_dump.c:2388
-#, c-format
-msgid "finding triggers for table %s\n"
-msgstr "Ϊ�� \"%s\" Ѱ�Ҵ�����\n"
-
-#: pg_dump.c:2404
-#, c-format
-msgid "query to obtain list of triggers failed: %s"
-msgstr "��ȡ�������IJ�ѯʧ��: %s"
-
-#: pg_dump.c:2410
-#, c-format
-msgid "expected %d triggers on table \"%s\" but found %d\n"
-msgstr "Ԥ���ڱ� \"%2$s\" ���д����� %1$d , ȴ���� %3$d\n"
-
-#: pg_dump.c:2490
-#, c-format
-msgid "query to obtain procedure name for trigger \"%s\" failed: %s"
-msgstr "Ϊ������ \"%s\" ��ȡ�������ֵIJ�ѯʧ��: %s"
-
-#: pg_dump.c:2499
-#, c-format
-msgid ""
-"query to obtain procedure name for trigger \"%s\" did not return exactly one "
-"result\n"
-msgstr "Ϊ������ \"%s\" ��ȡ�������ֵIJ�ѯ��δֻ����һ�����\n"
-
-#: pg_dump.c:2563
-#, c-format
-msgid ""
-"query produced NULL referenced table name for foreign key trigger \"%s\" on "
-"table \"%s\" (oid of table: %s)\n"
-msgstr ""
-"���ڱ� \"%2$s\" �ϵ���������� \"%1$s\" �ϵIJ�ѯ���� NULL �����ñ�(���� oid "
-"��: %3$s)\n"
-
-#: pg_dump.c:2593
-#, c-format
-msgid "bad argument string (%s) for trigger \"%s\" on table \"%s\"\n"
-msgstr "���� \"%3$s\" �ϵĴ����� \"%2$s\" �Ĵ������ (%1$s)\n"
+msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
+msgstr "����: ���ݱ� \"%s\" �������߷Ƿ�\n"
 
-#: pg_dump.c:2681
+#: pg_dump.c:2308
 #, c-format
 msgid "query to obtain inheritance relationships failed: %s"
 msgstr "��ȡ�̳й�ϵ�IJ�ѯʧ��: %s"
 
-#: pg_dump.c:2746
+#: pg_dump.c:2392
 #, c-format
-msgid "finding the columns and types for table %s\n"
-msgstr "Ϊ�� %s �����ֶκ�����\n"
+msgid "finding the columns and types of table %s\n"
+msgstr "���ڲ��ұ� %s ���ֶκ�����\n"
 
-#: pg_dump.c:2785
+#: pg_dump.c:2441
 #, c-format
 msgid "query to get table columns failed: %s"
 msgstr "��ȡ���ֶεIJ�ѯʧ��: %s"
 
-#: pg_dump.c:2815
-#, c-format
-msgid "query produced NULL name for data type of column %d of table %s\n"
-msgstr "��ѯΪ�� \"%2$s\" ���ֶ� %1$d ���� NULL ������\n"
-
-#: pg_dump.c:2836
+#: pg_dump.c:2494
 #, c-format
-msgid "finding DEFAULT expression for column %s\n"
-msgstr "Ϊ�ֶ� \"%s\" ���� DEFAUL ����ʽ\n"
+msgid "finding DEFAULT expressions of table %s\n"
+msgstr "���ڲ��ұ� %s �� DEFAULT ����ʽ\n"
 
-#: pg_dump.c:2847
+#: pg_dump.c:2525
 #, c-format
-msgid "query to get column default value failed: %s"
+msgid "query to get column default values failed: %s"
 msgstr "��ȡ�ֶ�ȱʡֵ�IJ�ѯʧ��: %s"
 
-#: pg_dump.c:2856
+#: pg_dump.c:2537
 #, c-format
-msgid ""
-"query to get default value for column \"%s\" returned %d rows; expected 1\n"
-msgstr "Ϊ�ֶ� \"%s\" ��ȡȱʡֵ�IJ�ѯ���� %d ��; ��Ԥ���� 1\n"
+msgid "invalid adnum value %d for table %s\n"
+msgstr "�� %2$s ����Ч adnum ��ֵΪ %1$d\n"
 
-#: pg_dump.c:2927
-#, c-format
-msgid "query to obtain list of indexes failed: %s"
-msgstr "��ȡ�����б��IJ�ѯʧ��: %s"
-
-#: pg_dump.c:3016
+#: pg_dump.c:2654
 #, c-format
 msgid "query to get comment on oid %s failed: %s"
 msgstr "��ȡ oid Ϊ %s ��ע�͵IJ�ѯʧ��: %s"
 
-#: pg_dump.c:3071
+#: pg_dump.c:2738
+#, c-format
+msgid "query to get comments on table %s failed: %s"
+msgstr "��ȡ��Ϊ %s ��ע�͵IJ�ѯʧ��: %s"
+
+#: pg_dump.c:2821
 #, c-format
 msgid "query to get database oid failed: %s"
 msgstr "��ȡ���ݿ� oid �IJ�ѯʧ��: %s"
 
-#: pg_dump.c:3184
+#: pg_dump.c:2990
 #, c-format
-msgid "notice: array type %s - type for elements (oid %s) is not dumped\n"
-msgstr "ע��: �������� %s - ����Ԫ�� (oid %s) ������δת��\n"
+msgid "query to obtain information on type %s failed: %s"
+msgstr "��ȡ���� %s ����Ϣ��ѯʧ��: %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:6590
+#, c-format
+msgid "Got %d rows instead of one from: %s"
+msgstr "�ѵõ� %d ����¼������� %s ��һ��"
+
+#: pg_dump.c:3165
+#, c-format
+msgid "query to obtain domain information failed: %s"
+msgstr "��ȡ����Ϣ�IJ�ѯʧ��: %s"
 
 #: pg_dump.c:3268
 #, c-format
+msgid "query to obtain type information failed: %s"
+msgstr "��ȡ������Ϣ�IJ�ѯʧ��: %s"
+
+#: pg_dump.c:3276
+#, c-format
+msgid "Got no rows from: %s"
+msgstr "�� %s û�õ���¼"
+
+#: pg_dump.c:3407
+#, c-format
 msgid "query to obtain list of procedural languages failed: %s"
 msgstr "��ȡ���������б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:3296
+#: pg_dump.c:3442
 #, c-format
 msgid "handler procedure for procedural language %s not found\n"
 msgstr "δ�ҵ����ڹ������� %s �ľ������\n"
 
-#: pg_dump.c:3389
+#: pg_dump.c:3452
 #, c-format
-msgid "query to get name of procedural language failed: %s"
-msgstr "��ȡ�����������ֵIJ�ѯʧ��: %s"
+msgid "validator procedure for procedural language %s not found\n"
+msgstr "δ�ҵ����ڹ������� %s ��У�����\n"
 
-#: pg_dump.c:3396
+#: pg_dump.c:3666
 #, c-format
-msgid "procedural language for function %s not found\n"
-msgstr "δ�ҵ����ں��� %s �Ĺ�������\n"
+msgid "query to obtain information on function %s failed: %s"
+msgstr "��ȡ���� %s ����Ϣ��ѯʧ��: %s"
 
-#: pg_dump.c:3438 pg_dump.c:3462
+#: pg_dump.c:3741
 #, c-format
-msgid "WARNING: function \"%s\" not dumped\n"
-msgstr "����: δת������ \"%s\"\n"
+msgid "Unexpected provolatile value for function %s\n"
+msgstr "���� %s ������������ʧֵ\n"
 
-#: pg_dump.c:3441
+#: pg_dump.c:3807
 #, c-format
-msgid "reason: data type name of argument %d (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ����� %d (oid %s) ��������������\n"
+msgid "query to obtain list of casts failed: %s"
+msgstr "��ȡ����ת���б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:3465
+#: pg_dump.c:4239
 #, c-format
-msgid "reason: name of return data type (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ������������� (oid %s) ������\n"
+msgid "WARNING: cannot find operator with OID %s\n"
+msgstr "����: δ�ҵ��� OID �IJ����� %s\n"
 
-#: pg_dump.c:3574 pg_dump.c:3590 pg_dump.c:3604 pg_dump.c:3618 pg_dump.c:3638
-#: pg_dump.c:3652
+#: pg_dump.c:4323
 #, c-format
-msgid "WARNING: operator \"%s\" (oid %s) not dumped\n"
-msgstr "����: δת�������� \"%s\"(oid %s)\n"
+msgid "query to obtain operator class details failed: %s"
+msgstr "��ȡ����������ѯʧ��: %s"
 
-#: pg_dump.c:3576
+#: pg_dump.c:4393
 #, c-format
-msgid "reason: oprleft (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� oprleft (oid %s)\n"
+msgid "query to obtain operator class operators failed: %s"
+msgstr "��ȡ���������IJ�������ѯʧ��: %s"
 
-#: pg_dump.c:3592
+#: pg_dump.c:4438
 #, c-format
-msgid "reason: oprright (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� oprright (oid %s)\n"
+msgid "query to obtain operator class functions failed: %s"
+msgstr "��ȡ���������ĺ�����ѯʧ��: %s"
 
-#: pg_dump.c:3606
+#: pg_dump.c:4667
 #, c-format
-msgid "reason: oprcom (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� oprcom (oid %s)\n"
+msgid ""
+"WARNING: aggregate function %s could not be dumped correctly for this "
+"database version; ignored\n"
+msgstr "����: �޷�Ϊ�˰汾�����ݿ���ȷת���ۼ����� \"%s\";����֮\n"
 
-#: pg_dump.c:3620
+#: pg_dump.c:4899
 #, c-format
-msgid "reason: oprnegate (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� oprnegate (oid %s)\n"
+msgid "could not parse ACL list (%s) for object %s (%s)\n"
+msgstr "Ϊ %2$s %3$s �޷�Ϊ���� ACL �б� (%1$s)\n"
 
-#: pg_dump.c:3640
+#: pg_dump.c:5135
 #, c-format
-msgid "reason: oprlsortop (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� oprlsortop (oid %s)\n"
+msgid "query to obtain definition of view \"%s\" failed: %s"
+msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯʧ��: %s"
 
-#: pg_dump.c:3654
+#: pg_dump.c:5143
 #, c-format
-msgid "reason: oprrsortop (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� oprrsortop (oid %s)\n"
+msgid "query to obtain definition of view \"%s\" returned no data\n"
+msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯû�з�������\n"
 
-#: pg_dump.c:3735
+#: pg_dump.c:5146
 #, c-format
 msgid ""
-"WARNING: aggregate function %s could not be dumped correctly for this "
-"database version; ignored\n"
-msgstr "����: �޷�Ϊ�˰汾�����ݿ���ȷת���ۼ����� \"%s\";����֮\n"
+"query to obtain definition of view \"%s\" returned more than one definition\n"
+msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯ���س���һ������\n"
+
+#: pg_dump.c:5153
+#, c-format
+msgid "query to obtain definition of view \"%s\" returned NULL oid\n"
+msgstr "��ȡ��ͼ \"%s\" ����IJ�ѯ���� NULL oid\n"
 
-#: pg_dump.c:3750 pg_dump.c:3768
+#: pg_dump.c:5162
 #, c-format
-msgid "WARNING: aggregate function \"%s\" (oid %s) not dumped\n"
-msgstr "����: δת���ۼ����� \"%s\"(oid %s)\n"
+msgid "definition of view \"%s\" appears to be empty (length zero)\n"
+msgstr "��ͼ \"%s\" �Ķ����ǿյ�(�㳤)\n"
 
-#: pg_dump.c:3752
+#: pg_dump.c:5300
 #, c-format
-msgid "reason: aggbasetype (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� aggbasetype (oid %s)\n"
+msgid "finding CHECK constraints for table %s\n"
+msgstr "Ϊ�� \"%s\" ���� CHECK Լ��\n"
 
-#: pg_dump.c:3770
+#: pg_dump.c:5342
 #, c-format
-msgid "reason: aggtranstype (oid %s) not found\n"
-msgstr "ԭ��: δ�ҵ� aggtranstype (oid %s)\n"
+msgid "query to obtain check constraints failed: %s"
+msgstr "��ȡ���Լ���IJ�ѯʧ��: %s"
 
-#: pg_dump.c:3947
+#: pg_dump.c:5348
 #, c-format
-msgid "could not parse ACL list ('%s') for relation %s\n"
-msgstr "�޷�Ϊ %2$s ���� ACL �б� ('%1$s')\n"
+msgid "expected %d check constraints on table \"%s\" but found %d\n"
+msgstr "Ԥ���� %d �����Լ���ڱ� \"%s\" ��, ��ֻ�ҵ� %d ��\n"
 
-#: pg_dump.c:4197
-#, c-format
-msgid ""
-"dumpTables(): failed sanity check, could not find index (%s) for primary key "
-"constraint\n"
-msgstr "dumpTables(): ��ȫ���ʧ��,�޷�Ϊ����Լ���ҵ����� (%s)\n"
+#: pg_dump.c:5350
+msgid "(The system catalogs might be corrupted.)\n"
+msgstr "(ϵͳ����������.)\n"
 
-#: pg_dump.c:4329
+#: pg_dump.c:5477
 #, c-format
 msgid "getAttrName(): invalid column number %d for table %s\n"
 msgstr "getAttrName(): �� \"%2$s\" ����Ч�ֶκ� %1$d\n"
 
-#: pg_dump.c:4359
+#: pg_dump.c:5565
 #, c-format
-msgid "dumpIndexes(): failed sanity check, table %s was not found\n"
-msgstr "dumpIndexes(): ��ȫ���ʧ��, δ�ҵ��� %s\n"
+msgid "query to obtain list of indexes failed: %s"
+msgstr "��ȡ�����б��IJ�ѯʧ��: %s"
 
-#: pg_dump.c:4505
+#: pg_dump.c:5706
 #, c-format
 msgid "could not create pgdump_oid table: %s"
 msgstr "�޷����� pgdump_oid ��: %s"
 
-#: pg_dump.c:4513
+#: pg_dump.c:5714
 #, c-format
 msgid "could not insert into pgdump_oid table: %s"
 msgstr "�޷����뵽 pgdump_oid ��: %s"
 
-#: pg_dump.c:4519
+#: pg_dump.c:5720
 msgid "inserted invalid oid\n"
 msgstr "�����˷Ƿ� oid\n"
 
-#: pg_dump.c:4527
+#: pg_dump.c:5728
 #, c-format
 msgid "could not drop pgdump_oid table: %s"
 msgstr "�޷�ɾ�� pgdump_oid ��: %s"
 
-#: pg_dump.c:4532
+#: pg_dump.c:5733
 #, c-format
 msgid "maximum system oid is %u\n"
 msgstr "���ϵͳ oid �� %u\n"
 
-#: pg_dump.c:4566
+#: pg_dump.c:5770
 #, c-format
 msgid "error in finding the last system oid: %s"
 msgstr "��������ϵͳ oid ʱ����: %s"
 
-#: pg_dump.c:4572
+#: pg_dump.c:5776
 msgid "missing pg_database entry for this database\n"
 msgstr "ȱ�ٴ����ݿ�� pg_database ��¼\n"
 
-#: pg_dump.c:4577
+#: pg_dump.c:5781
 msgid "found more than one pg_database entry for this database\n"
 msgstr "�ҵ������ݿ�Ķ���һ���� pg_database ��¼\n"
 
-#: pg_dump.c:4605
+#: pg_dump.c:5809
 #, c-format
 msgid "error in finding the template1 database: %s"
 msgstr "���� template1 ���ݿ����: %s"
 
-#: pg_dump.c:4611
+#: pg_dump.c:5815
 msgid "could not find template1 database entry in the pg_database table\n"
 msgstr "�޷��� pg_database �����ҵ� template1 ���ݿ��¼\n"
 
-#: pg_dump.c:4616
+#: pg_dump.c:5820
 msgid "found more than one template1 database entry in the pg_database table\n"
 msgstr "�� pg_database �����ҵ�����һ�� template1 ���ݿ��¼\n"
 
-#: pg_dump.c:4646
+#: pg_dump.c:5854
 #, c-format
 msgid "query to get data of sequence \"%s\" failed: %s"
 msgstr "��ȡ���� \"%s\" �����ݵIJ�ѯʧ��: %s"
 
-#: pg_dump.c:4652
+#: pg_dump.c:5860
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
 msgstr "��ȡ���� \"%s\" �����ݵIJ�ѯ������ %d �� (Ԥ���� 1)\n"
 
-#: pg_dump.c:4659
+#: pg_dump.c:5869
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "��ȡ���� \"%s\" �����ݵIJ�ѯ���������� \"%s\"\n"
 
-#: pg_dump.c:4738
-msgid "dumping out triggers\n"
-msgstr "ת��������\n"
+#: pg_dump.c:5992
+#, c-format
+msgid "dumping foreign key constraints for table %s\n"
+msgstr "Ϊ�� %s ת�����Լ��\n"
+
+#: pg_dump.c:6013
+#, c-format
+msgid "query to obtain list of foreign key definitions failed: %s"
+msgstr "��ȡ��������б��IJ�ѯʧ��: %s"
+
+#: pg_dump.c:6103
+#, c-format
+msgid "dumping triggers for table %s\n"
+msgstr "Ϊ�� %s ת��������\n"
+
+#: pg_dump.c:6152
+#, c-format
+msgid "query to obtain list of triggers failed: %s"
+msgstr "��ȡ�������IJ�ѯʧ��: %s"
+
+#: pg_dump.c:6163
+#, c-format
+msgid "expected %d triggers on table \"%s\" but found %d\n"
+msgstr "Ԥ���ڱ� \"%2$s\" ���д����� %1$d , ȴ���� %3$d\n"
+
+#: pg_dump.c:6273
+#, c-format
+msgid ""
+"query produced NULL referenced table name for foreign key trigger \"%s\" on "
+"table \"%s\" (oid of table: %s)\n"
+msgstr ""
+"���ڱ� \"%2$s\" �ϵ���������� \"%1$s\" �ϵIJ�ѯ���� NULL �����ñ�(���� oid "
+"��: %3$s)\n"
+
+#: pg_dump.c:6313
+#, c-format
+msgid "bad argument string (%s) for trigger \"%s\" on table \"%s\"\n"
+msgstr "���� \"%3$s\" �ϵĴ����� \"%2$s\" �Ĵ������ (%1$s)\n"
 
-#: pg_dump.c:4773
+#: pg_dump.c:6383
 msgid "dumping out rules\n"
 msgstr "ת������\n"
 
-#: pg_dump.c:4805
+#: pg_dump.c:6436
 #, c-format
 msgid "query to get rules associated with table \"%s\" failed: %s"
 msgstr "��ȡ��� \"%s\" �����Ĺ���ʧ��: %s"
 
-#: common.c:116
-#, c-format
-msgid "failed sanity check, operator with oid %s not found\n"
-msgstr "��ȫ���ʧ��, δ�ҵ� oid Ϊ %s �IJ�����\n"
-
-#: common.c:168
+#: pg_dump.c:6519
 #, c-format
-msgid "failed sanity check, parent oid %s of table %s (oid %s) not found\n"
-msgstr "��ȫ���ʧ��, δ�ҵ��� \"%2$s\" (oid %3$s) �� oid Ϊ %1$s �ĸ���\n"
+msgid "query to set search_path failed: %s"
+msgstr "���� search_path �IJ�ѯʧ��: %s"
 
-#: common.c:173
+#: pg_dump.c:6581
 #, c-format
-msgid "failed sanity check, parent oid %s of table (oid %s) not found\n"
-msgstr "��ȫ���ʧ��, �� (oid %2$s) �� oid Ϊ %1$s �ĸ���\n"
+msgid "query to obtain name of type %s failed: %s"
+msgstr "��ȡ���� %s �����ֲ�ѯʧ��: %s"
 
-#: common.c:216
-msgid "parseNumericArray: too many numbers\n"
-msgstr "parseNumbericArray: ����̫��\n"
-
-#: common.c:231
-msgid "parseNumericArray: bogus number\n"
-msgstr "parseNumericArray: ������\n"
+#: common.c:74
+msgid "reading namespaces\n"
+msgstr "��ȡ���ֿռ�\n"
 
-#: common.c:295
+#: common.c:78
 msgid "reading user-defined types\n"
 msgstr "��ȡ�û���������\n"
 
-#: common.c:299
+#: common.c:82
 msgid "reading user-defined functions\n"
 msgstr "��ȡ�û����庯��\n"
 
-#: common.c:303
+#: common.c:86
 msgid "reading user-defined aggregate functions\n"
 msgstr "��ȡ�û�����ۼ�����\n"
 
-#: common.c:307
+#: common.c:90
 msgid "reading user-defined operators\n"
 msgstr "��ȡ�û����������\n"
 
-#: common.c:311
+#: common.c:94
+msgid "reading user-defined operator classes\n"
+msgstr "��ȡ�û������������\n"
+
+#: common.c:98
 msgid "reading user-defined tables\n"
 msgstr "��ȡ�û������\n"
 
-#: common.c:315
-msgid "reading index information\n"
-msgstr "��ȡ������Ϣ\n"
-
-#: common.c:319
+#: common.c:102
 msgid "reading table inheritance information\n"
 msgstr "��ȡ���̳���Ϣ\n"
 
-#: common.c:323
-msgid "finding the column names and types for each table\n"
-msgstr "Ϊÿ���������ֶ����ֺ�����\n"
+#: common.c:107
+msgid "finding inheritance relationships\n"
+msgstr "���ڲ��ҹ�ϵ�̳�\n"
+
+#: common.c:111
+msgid "reading column info for interesting tables\n"
+msgstr "���ڶ�ȡ����Ȥ��������Ϣ\n"
 
-#: common.c:327
+#: common.c:115
 msgid "flagging inherited columns in subtables\n"
 msgstr "���ӱ����Ǽ̳��ֶ�\n"
 
-#: common.c:333
+#: common.c:121
 msgid "dumping out database comment\n"
 msgstr "ת�����ݿ�ע��\n"
 
-#: common.c:340
+#: common.c:128
+msgid "dumping out user-defined namespaces\n"
+msgstr "ת���û���������ֿռ�\n"
+
+#: common.c:135
 msgid "dumping out user-defined types\n"
 msgstr "ת���û���������\n"
 
-#: common.c:345
+#: common.c:140
 msgid "dumping out tables\n"
 msgstr "ת����\n"
 
-#: common.c:353
+#: common.c:147
 msgid "dumping out indexes\n"
 msgstr "ת������\n"
 
-#: common.c:360
+#: common.c:154
 msgid "dumping out user-defined procedural languages\n"
 msgstr "ת���û������������\n"
 
-#: common.c:367
+#: common.c:161
 msgid "dumping out user-defined functions\n"
 msgstr "ת���û����庯��\n"
 
-#: common.c:374
+#: common.c:168
 msgid "dumping out user-defined aggregate functions\n"
 msgstr "ת���û�����ۼ�����\n"
 
-#: common.c:381
+#: common.c:175
 msgid "dumping out user-defined operators\n"
 msgstr "ת���û����������\n"
 
-#: common.c:467
+#: common.c:182
+msgid "dumping out user-defined operator classes\n"
+msgstr "ת���û������������\n"
+
+#: common.c:189
+msgid "dumping out user-defined casts\n"
+msgstr "ת���û���������ת��\n"
+
+#: common.c:444
+#, c-format
+msgid "failed sanity check, operator with oid %s not found\n"
+msgstr "��ȫ���ʧ��, δ�ҵ� oid Ϊ %s �IJ�����\n"
+
+#: common.c:494
 #, c-format
-msgid "failed sanity check, table \"%s\" not found by flagInhAttrs\n"
-msgstr "��ȫ���ʧ��, flagInhAttrs û���ҵ��� \"%s\"\n"
+msgid "failed sanity check, parent oid %s of table %s (oid %s) not found\n"
+msgstr "��ȫ���ʧ��, δ�ҵ��� \"%2$s\" (oid %3$s) �� oid Ϊ %1$s �ĸ���\n"
+
+#: common.c:499
+#, c-format
+msgid "failed sanity check, parent oid %s of table (oid %s) not found\n"
+msgstr "��ȫ���ʧ��, �� (oid %2$s) �� oid Ϊ %1$s �ĸ���\n"
+
+#: common.c:537
+msgid "parseNumericArray: too many numbers\n"
+msgstr "parseNumbericArray: ����̫��\n"
+
+#: common.c:552
+msgid "parseNumericArray: bogus number\n"
+msgstr "parseNumericArray: ������\n"
 
-#: pg_backup_archiver.c:106
+#: pg_backup_archiver.c:67
 msgid "archiver"
 msgstr "�鵵"
 
-#: pg_backup_archiver.c:161
+#: pg_backup_archiver.c:122
 msgid "could not close the output file in CloseArchive\n"
 msgstr "�޷��ر� CloseArchive �������ļ�\n"
 
-#: pg_backup_archiver.c:187
+#: pg_backup_archiver.c:149
 msgid "-C and -R are incompatible options\n"
 msgstr "-C �� -R �ǻ������ݵ�ѡ��\n"
 
-#: pg_backup_archiver.c:190
+#: pg_backup_archiver.c:152
 msgid "-C and -c are incompatible options\n"
 msgstr "-C �� -c �ǻ������ݵ�ѡ��\n"
 
-#: pg_backup_archiver.c:197
+#: pg_backup_archiver.c:159
 msgid "connecting to database for restore\n"
 msgstr "Ϊ�ָ����ݿ������ݿ�����\n"
 
-#: pg_backup_archiver.c:199
+#: pg_backup_archiver.c:161
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr "1.3 ��ǰ�Ĺ鵵�ﲻ֧��ֱ�����ݿ�����\n"
 
-#: pg_backup_archiver.c:246
+#: pg_backup_archiver.c:198
 msgid "implied data-only restore\n"
 msgstr "������ֻ�ָ�����\n"
 
-#: pg_backup_archiver.c:251
-msgid ""
-"WARNING:\n"
-"  Data restoration may fail because existing triggers cannot be disabled\n"
-"  (no superuser user name specified).  This is only a problem when\n"
-"  restoring into a database with already existing triggers.\n"
-msgstr ""
-"����:\n"
-" ���ݻָ�����ʧ��, ��Ϊ�޷��ر����д�����\n"
-" (û���ṩ�����û���). �������ֻ��������һ��\n"
-" �Ѿ����ڴ����������ݿ��лָ�����.\n"
-
-#: pg_backup_archiver.c:276
+#: pg_backup_archiver.c:222
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "ɾ�� %s %s\n"
 
-#: pg_backup_archiver.c:300 pg_backup_archiver.c:302
+#: pg_backup_archiver.c:246 pg_backup_archiver.c:248
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "����ԭʼת���ļ��ľ���: %s\n"
 
-#: pg_backup_archiver.c:312
+#: pg_backup_archiver.c:255
 #, c-format
 msgid "creating %s %s\n"
 msgstr "���� %s %s\n"
 
-#: pg_backup_archiver.c:319
+#: pg_backup_archiver.c:262
 #, c-format
 msgid "connecting to new database %s as user %s\n"
 msgstr "���û� %2$s �������ӵ������ݿ� %1$s\n"
 
-#: pg_backup_archiver.c:344
+#: pg_backup_archiver.c:287
 msgid ""
 "unable to restore from compressed archive (not configured for compression "
 "support)\n"
 msgstr "�޷���ѹ���Ĺ鵵�лָ� (δ����ѹ��֧��)\n"
 
-#: pg_backup_archiver.c:363
+#: pg_backup_archiver.c:306
 msgid "WARNING: skipping large object restoration\n"
 msgstr "����: ���Դ����Ļָ�\n"
 
-#: pg_backup_archiver.c:377
+#: pg_backup_archiver.c:321
 #, c-format
 msgid "restoring data for table %s\n"
 msgstr "Ϊ�� \"%s\" �ָ�����\n"
 
-#: pg_backup_archiver.c:402
+#: pg_backup_archiver.c:346
 #, c-format
 msgid "executing %s %s\n"
 msgstr "ִ�� %s %s\n"
 
-#: pg_backup_archiver.c:426
+#: pg_backup_archiver.c:370
 #, c-format
 msgid "checking whether we loaded %s\n"
 msgstr "��������Ƿ�װ���� %s\n"
 
-#: pg_backup_archiver.c:432
+#: pg_backup_archiver.c:376
 #, c-format
 msgid "fixing up large object cross-reference for %s\n"
 msgstr "Ϊ %s �޸������Ľ�������\n"
 
-#: pg_backup_archiver.c:437
+#: pg_backup_archiver.c:381
 #, c-format
 msgid "ignoring large object cross-references for %s %s\n"
 msgstr "Ϊ %s %s ���Դ���󽻲�����\n"
 
-#: pg_backup_archiver.c:527
+#: pg_backup_archiver.c:470
 msgid "disabling triggers\n"
 msgstr "�رմ�����\n"
 
-#: pg_backup_archiver.c:586
+#: pg_backup_archiver.c:533
 msgid "enabling triggers\n"
 msgstr "�򿪴�����\n"
 
-#: pg_backup_archiver.c:629
+#: pg_backup_archiver.c:582
 msgid ""
 "WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr "WriteData ������ DataDumper ���̵Ļ���֮�����\n"
 
-#: pg_backup_archiver.c:749
+#: 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_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
+msgid "out of memory\n"
+msgstr "�ڴ��þ�\n"
+
+#: pg_backup_archiver.c:704
 msgid "large object output not supported in chosen format\n"
 msgstr "ѡ���ĸ�ʽ��֧�ִ�������\n"
 
-#: pg_backup_archiver.c:789 pg_backup_archiver.c:856
+#: pg_backup_archiver.c:744 pg_backup_archiver.c:829
 msgid "committing large object transactions\n"
 msgstr "�ύ���������\n"
 
-#: pg_backup_archiver.c:796
+#: pg_backup_archiver.c:751
 #, c-format
 msgid "restored %d large objects\n"
 msgstr "�ָ��� %d �������\n"
 
-#: pg_backup_archiver.c:813
+#: pg_backup_archiver.c:768
 msgid "cannot restore large objects without a database connection\n"
 msgstr "û�����ݿ�����ʱ�޷��ָ������\n"
 
-#: pg_backup_archiver.c:824
+#: pg_backup_archiver.c:782
 msgid "starting large object transactions\n"
 msgstr "��ʼ���������\n"
 
-#: pg_backup_archiver.c:832
+#: pg_backup_archiver.c:790
 msgid "could not create large object\n"
 msgstr "�޷����������\n"
 
-#: pg_backup_archiver.c:834
+#: pg_backup_archiver.c:792
 #, c-format
 msgid "restoring large object with oid %u as %u\n"
 msgstr "�� oid Ϊ %u �Ĵ����ָ�Ϊ oid Ϊ %u\n"
 
-#: pg_backup_archiver.c:840
+#: pg_backup_archiver.c:798
 msgid "could not open large object\n"
 msgstr "�޷��򿪴����\n"
 
-#: pg_backup_archiver.c:980
+#: pg_backup_archiver.c:813
+#, c-format
+msgid "wrote remaining %lu bytes of large object data (result = %lu)\n"
+msgstr "д�� %lu �ֽڵĴ�������� (��� = %lu)\n"
+
+#: pg_backup_archiver.c:816 pg_backup_archiver.c:1213
+#, c-format
+msgid "could not write to large object (result: %lu, expected: %lu)\n"
+msgstr "�޷�д������ (���: %lu, Ԥ��: %lu)\n"
+
+#: pg_backup_archiver.c:953
 msgid "could not open TOC file\n"
 msgstr "�޷��� TOC �ļ�\n"
 
-#: pg_backup_archiver.c:1001
+#: pg_backup_archiver.c:974
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "����: ���Ե���: %s\n"
 
-#: pg_backup_archiver.c:1008
+#: pg_backup_archiver.c:981
 #, c-format
 msgid "could not find entry for id %d\n"
 msgstr "�޷�Ϊ id %d �ҵ���¼\n"
 
-#: pg_backup_archiver.c:1017 pg_backup_files.c:158 pg_backup_files.c:443
+#: pg_backup_archiver.c:990 pg_backup_files.c:156 pg_backup_files.c:441
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "�޷��ر� TOC �ļ�: %s\n"
 
-#: pg_backup_archiver.c:1132 pg_backup_files.c:132
+#: pg_backup_archiver.c:1105 pg_backup_files.c:130
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "�޷�������ļ�: %s\n"
 
-#: pg_backup_archiver.c:1148
+#: pg_backup_archiver.c:1121
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "�޷��ر�����ļ�: %s\n"
 
-#: pg_backup_archiver.c:1229
+#: pg_backup_archiver.c:1209
 #, c-format
-msgid "wrote %d bytes of large object data (result = %d)\n"
-msgstr "д�� %d �ֽڵĴ�������� (��� = %d)\n"
+msgid "wrote %lu bytes of large object data (result = %lu)\n"
+msgstr "д�� %lu �ֽڵĴ�������� (��� = %lu)\n"
 
-#: pg_backup_archiver.c:1232
-#, c-format
-msgid "could not write to large object (result: %d, expected: %d)\n"
-msgstr "�޷�д������ (���: %d, Ԥ��: %d)\n"
-
-#: pg_backup_archiver.c:1241
+#: pg_backup_archiver.c:1231
 msgid "could not write to compressed archive\n"
 msgstr "�޷�д��ѹ���Ĺ鵵\n"
 
-#: pg_backup_archiver.c:1249
+#: pg_backup_archiver.c:1239
 msgid "could not write to custom output routine\n"
 msgstr "�޷�д�����ͻ��������\n"
 
-#: pg_backup_archiver.c:1264
+#: pg_backup_archiver.c:1254
 #, c-format
-msgid "could not write to output file (%d != %d)\n"
-msgstr "�޷�д��������ļ� (%d != %d)\n"
+msgid "could not write to output file (%lu != %lu)\n"
+msgstr "�޷�д��������ļ� (%lu != %lu)\n"
 
-#: pg_backup_archiver.c:1490
+#: pg_backup_archiver.c:1480
 msgid "attempting to ascertain archive format\n"
 msgstr "��ͼȷ�Ϲ鵵��ʽ\n"
 
-#: pg_backup_archiver.c:1510 pg_backup_files.c:150
+#: pg_backup_archiver.c:1500 pg_backup_files.c:148
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "�޷��������ļ�: %s\n"
 
-#: pg_backup_archiver.c:1517
+#: pg_backup_archiver.c:1507
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "�޷���ȡ�����ļ�: %s\n"
 
-#: pg_backup_archiver.c:1519
+#: pg_backup_archiver.c:1509
 #, c-format
-msgid "input file is too short (read %d, expected 5)\n"
-msgstr "�����ļ�̫�� (���� %d, Ԥ�� 5)\n"
+msgid "input file is too short (read %lu, expected 5)\n"
+msgstr "�����ļ�̫�� (���� %lu, Ԥ�� 5)\n"
 
-#: pg_backup_archiver.c:1563
+#: pg_backup_archiver.c:1554
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "�����ļ�����ȥ������Ч�Ĺ鵵 (̫��?)\n"
 
-#: pg_backup_archiver.c:1566
+#: pg_backup_archiver.c:1557
 msgid "input file does not appear to be a valid archive\n"
 msgstr "�����ļ�����ȥ������Ч�Ĺ鵵\n"
 
-#: pg_backup_archiver.c:1584
+#: pg_backup_archiver.c:1575
 #, c-format
-msgid "read %d bytes into lookahead buffer\n"
-msgstr "��ȡ %d �ֽڵ�Ԥ��������\n"
+msgid "read %lu bytes into lookahead buffer\n"
+msgstr "��ȡ %lu �ֽڵ�Ԥ��������\n"
 
-#: pg_backup_archiver.c:1590
+#: pg_backup_archiver.c:1582
 #, c-format
 msgid "could not close the input file after reading header: %s\n"
 msgstr "��ȡͷ֮���޷��ر������ļ�: %s\n"
 
-#: pg_backup_archiver.c:1607
+#: pg_backup_archiver.c:1599
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "Ϊ %s ���� AH, ��ʽ %d\n"
 
-#: pg_backup_archiver.c:1657
+#: pg_backup_archiver.c:1650
 #, c-format
 msgid "archive format is %d\n"
 msgstr "�鵵��ʽ�� %d\n"
 
-#: pg_backup_archiver.c:1685
+#: pg_backup_archiver.c:1678
 #, c-format
 msgid "unrecognized file format '%d'\n"
 msgstr "����ʶ����ļ���ʽ '%d'\n"
 
-#: pg_backup_archiver.c:1797
+#: pg_backup_archiver.c:1791
 msgid "entry id out of range - perhaps a corrupt TOC\n"
 msgstr "��¼ id ������Χ - ���������˵� TOD\n"
 
-#: pg_backup_archiver.c:1829
+#: pg_backup_archiver.c:1826
 #, c-format
 msgid "read dependency for %s -> %s\n"
 msgstr "��ȡ %s -> %s ��������\n"
 
-#: pg_backup_archiver.c:1848
+#: pg_backup_archiver.c:1845
 #, c-format
 msgid "read TOC entry %d (id %d) for %s %s\n"
 msgstr "Ϊ %3$s %4$s ��ȡ TOC ��¼ %1$d (id %2$d)\n"
 
-#: pg_backup_archiver.c:1972
+#: pg_backup_archiver.c:1971
 #, c-format
 msgid "could not set session user to %s: %s"
 msgstr "�޷����ûỰ�û�Ϊ %s: %s"
 
-#: pg_backup_archiver.c:2054
+#: pg_backup_archiver.c:2085
+#, c-format
+msgid "could not set search_path to %s: %s"
+msgstr "�޷����ò���·��Ϊ %s: %s"
+
+#: pg_backup_archiver.c:2144
 msgid ""
 "WARNING: requested compression not available in this installation - archive "
 "will be uncompressed\n"
 msgstr "����: ��Ҫ���ѹ���޷��ڱ��ΰ�װ�л�ȡ - �鵵������ѹ��\n"
 
-#: pg_backup_archiver.c:2087
+#: pg_backup_archiver.c:2177
 msgid "did not find magic string in file header\n"
 msgstr "���ļ�ͷ��û���ҵ�ħ���ִ�\n"
 
-#: pg_backup_archiver.c:2101
+#: pg_backup_archiver.c:2191
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "���ļ�ͷ���в�֧�ֵİ汾 (%d.%d)\n"
 
-#: pg_backup_archiver.c:2106
+#: pg_backup_archiver.c:2196
 #, c-format
-msgid "sanity check on integer size (%d) failed\n"
-msgstr "�����ߴ� (%d) �Ľ�ȫ���ʧ��\n"
+msgid "sanity check on integer size (%lu) failed\n"
+msgstr "�����ߴ� (%lu) �Ľ�ȫ���ʧ��\n"
 
-#: pg_backup_archiver.c:2109
+#: pg_backup_archiver.c:2200
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "may fail\n"
 msgstr "����: �鵵����һ̨���Ÿ���������Ļ�����������, ��Щ��������ʧ��\n"
 
-#: pg_backup_archiver.c:2114
+#: pg_backup_archiver.c:2205
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "Ԥ�ڵĸ�ʽ (%d) �����ļ����ҵ��ĸ�ʽ (%d) ��ͬ\n"
 
-#: pg_backup_archiver.c:2130
+#: pg_backup_archiver.c:2221
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression - no data will be available\n"
 msgstr "����: �鵵��ѹ������, ���ǵ�ǰ��װ��֧��ѹ�� - ���ݽ�����ʹ��\n"
 
-#: pg_backup_archiver.c:2148
+#: pg_backup_archiver.c:2239
 msgid "WARNING: invalid creation date in header\n"
 msgstr "����: ��ͷ�еĴ���������Ч\n"
 
-#: pg_backup_custom.c:105
+#: pg_backup_custom.c:97
 msgid "custom archiver"
 msgstr "�ͻ��鵵"
 
-#: pg_backup_custom.c:183 pg_backup_custom.c:196
+#: pg_backup_custom.c:181 pg_backup_custom.c:194
 #, c-format
 msgid "could not open archive file %s: %s\n"
 msgstr "�޷��򿪹鵵�ļ� %s: %s\n"
 
-#: pg_backup_custom.c:389
+#: pg_backup_custom.c:388
 msgid "invalid OID for large object\n"
 msgstr "��������Ч OID\n"
 
-#: pg_backup_custom.c:449
+#: pg_backup_custom.c:448
 msgid ""
 "Dumping a specific TOC data block out of order is not supported without id "
 "on this input stream (fseek required)\n"
@@ -1229,250 +1345,241 @@ msgstr ""
 "����ڴ���������û�� id (��ʶ) (fseek Ҫ���), ��ô�Dz�֧������ת���ض� TOC "
 "���ݿ��\n"
 
-#: pg_backup_custom.c:468
+#: pg_backup_custom.c:467
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr "�����鵵��������ʶ������ݿ����� (%d)\n"
 
-#: pg_backup_custom.c:484
+#: pg_backup_custom.c:483
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "���ļ��ڶ�λʱ����: %s\n"
 
-#: pg_backup_custom.c:492
+#: pg_backup_custom.c:491
 #, c-format
 msgid "found unexpected block ID (%d) when reading data - expected %d\n"
 msgstr "��ȡ����ʱ�ҵ������ ID (%d) - Ԥ���� %d\n"
 
-#: pg_backup_custom.c:506
+#: pg_backup_custom.c:505
 msgid "large objects cannot be loaded without a database connection\n"
 msgstr "û�����ݿ�����ʱ�޷�װ�ش����\n"
 
-#: pg_backup_custom.c:513
+#: pg_backup_custom.c:512
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr "�ָ��鵵ʱ������ʶ������ݿ����� %d\n"
 
-#: pg_backup_custom.c:549 pg_backup_custom.c:907
+#: pg_backup_custom.c:548 pg_backup_custom.c:912
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "�޷���ʼ��ѹ����: %s\n"
 
-#: pg_backup_custom.c:570 pg_backup_custom.c:696
+#: pg_backup_custom.c:570 pg_backup_custom.c:698
 #, c-format
-msgid "could not read data block - expected %d, got %d\n"
-msgstr "�޷���ȡ���ݿ� - Ԥ�� %d, ʵ�� %d\n"
+msgid "could not read data block - expected %lu, got %lu\n"
+msgstr "�޷���ȡ���ݿ� - Ԥ�� %lu, ʵ�� %lu\n"
 
-#: pg_backup_custom.c:588 pg_backup_custom.c:620
+#: pg_backup_custom.c:589 pg_backup_custom.c:621
 #, c-format
 msgid "unable to uncompress data: %s\n"
 msgstr "�޷�ѹ������: %s\n"
 
-#: pg_backup_custom.c:626
+#: pg_backup_custom.c:627
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "�޷��ر�ѹ����: %s\n"
 
-#: pg_backup_custom.c:724
+#: pg_backup_custom.c:727
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "�޷�д�ֽ�: %s\n"
 
-#: pg_backup_custom.c:767 pg_backup_files.c:418
+#: pg_backup_custom.c:771 pg_backup_files.c:416
 #, c-format
-msgid "write error in _WriteBuf (%d != %d)\n"
-msgstr "�� _WriteBuf ������ (%d != %d)\n"
+msgid "write error in _WriteBuf (%lu != %lu)\n"
+msgstr "�� _WriteBuf ������ (%lu != %lu)\n"
 
-#: pg_backup_custom.c:837
+#: pg_backup_custom.c:842
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "�޷��رչ鵵�ļ�: %s\n"
 
-#: pg_backup_custom.c:860
+#: pg_backup_custom.c:865
 msgid "WARNING: ftell mismatch with expected position -- ftell ignored\n"
 msgstr "����: ftell ��Ԥ��λ�ò�ƥ�� -- ���� ftell\n"
 
-#: pg_backup_custom.c:939
+#: pg_backup_custom.c:944
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "�޷�ѹ������: %s\n"
 
-#: pg_backup_custom.c:959
+#: pg_backup_custom.c:964
 msgid "could not write compressed chunk\n"
 msgstr "�޷�д��ѹ���Ŀ�\n"
 
-#: pg_backup_custom.c:973
+#: pg_backup_custom.c:978
 msgid "could not write uncompressed chunk\n"
 msgstr "�޷�д��δѹ���Ŀ�\n"
 
-#: pg_backup_custom.c:1022
+#: pg_backup_custom.c:1027
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "�޷��ر�ѹ����: %s\n"
 
-#: pg_backup_db.c:40
+#: pg_backup_db.c:31
 msgid "archiver (db)"
 msgstr "�鵵 (db)"
 
-#: pg_backup_db.c:191
+#: pg_backup_db.c:69
 #, c-format
 msgid "could not get version from server: %s"
 msgstr "�޷��ӷ�������ȡ�汾: %s"
 
-#: pg_backup_db.c:203
+#: pg_backup_db.c:81
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "�������汾: %s; %s �汾: %s\n"
 
-#: pg_backup_db.c:206
+#: pg_backup_db.c:84
 msgid "proceeding despite version mismatch\n"
 msgstr "���԰汾�����������\n"
 
-#: pg_backup_db.c:208
+#: pg_backup_db.c:86
 msgid ""
 "aborting because of version mismatch  (Use the -i option to proceed "
 "anyway.)\n"
 msgstr "��汾�����˳� (�� -i ѡ����Բ����������.)\n"
 
-#: pg_backup_db.c:229
-#, c-format
-msgid "null result checking superuser status of %s\n"
-msgstr "��� %s �ij����û�״̬ʱ�յ��ս��\n"
-
-#: pg_backup_db.c:232
-#, c-format
-msgid "could not check superuser status of %s: %s"
-msgstr "�޷���� %s �ij����û�״̬: %s"
-
-#: pg_backup_db.c:330
+#: pg_backup_db.c:158
 #, c-format
 msgid "connecting to database %s as user %s\n"
 msgstr "���û� %2$s ���������ӵ����ݿ� %1$s\n"
 
-#: pg_backup_db.c:334 pg_backup_db.c:367 pg_backup_db.c:428 pg_backup_db.c:457
+#: 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
 msgid "Password: "
 msgstr "����: "
 
-#: pg_backup_db.c:346
+#: pg_backup_db.c:174
 msgid "failed to reconnect to database\n"
 msgstr "�����ݿ���������ʧ��\n"
 
-#: pg_backup_db.c:370
+#: pg_backup_db.c:198
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "�޷������ݿ���������: %s"
 
-#: pg_backup_db.c:404
+#: pg_backup_db.c:232
 msgid "already connected to a database\n"
 msgstr "�Ѿ���һ�����ݿ�����\n"
 
-#: pg_backup_db.c:447
+#: pg_backup_db.c:255
 msgid "failed to connect to database\n"
 msgstr "�����ݿ�����ʧ��\n"
 
-#: pg_backup_db.c:466
+#: pg_backup_db.c:274
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "�����ݿ� \"%s\" ����ʧ��: %s"
 
-#: pg_backup_db.c:488
+#: pg_backup_db.c:289
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: pg_backup_db.c:516
+#: pg_backup_db.c:317
 #, c-format
 msgid "%s: no result from server\n"
 msgstr "%s: û�����Է������Ľ��\n"
 
-#: pg_backup_db.c:523
+#: pg_backup_db.c:324
 msgid "COPY command executed in non-primary connection\n"
 msgstr "COPY ������û�������ӵĻ�����ִ��\n"
 
-#: pg_backup_db.c:528
+#: pg_backup_db.c:329
 #, c-format
 msgid "%s: %s"
-msgstr ""
+msgstr "%s: %s"
 
-#: pg_backup_db.c:611
+#: pg_backup_db.c:403
 msgid "error returned by PQputline\n"
 msgstr "PQputline ���ش���\n"
 
-#: pg_backup_db.c:623
+#: pg_backup_db.c:414
 msgid "error returned by PQendcopy\n"
 msgstr "PQendcopy ���ش���\n"
 
-#: pg_backup_db.c:671
+#: pg_backup_db.c:459
 msgid "could not execute query"
 msgstr "�޷�ִ�в�ѯ"
 
-#: pg_backup_db.c:763
+#: pg_backup_db.c:600
 #, c-format
 msgid "could not find oid columns of table \"%s\": %s"
 msgstr "�޷�Ѱ�ұ� \"%s\" �� oid �ֶ�: %s"
 
-#: pg_backup_db.c:769
+#: pg_backup_db.c:606
 #, c-format
 msgid "no OID type columns in table %s\n"
 msgstr "�� %s ��û�� OID �����ֶ�\n"
 
-#: pg_backup_db.c:776
+#: pg_backup_db.c:613
 #, c-format
 msgid "fixing large object cross-references for %s.%s\n"
 msgstr "Ϊ %s.%s �޲�����󽻲�����\n"
 
-#: pg_backup_db.c:791
+#: pg_backup_db.c:629
 #, c-format
 msgid "SQL: %s\n"
 msgstr "SQL: %s\n"
 
-#: pg_backup_db.c:796
+#: pg_backup_db.c:634
 #, c-format
 msgid "could not update column \"%s\" of table \"%s\": %s"
 msgstr "�޷����±� \"%2$s\" ���ֶ� \"%1$s\": %3$s"
 
-#: pg_backup_db.c:801
+#: pg_backup_db.c:639
 #, c-format
 msgid "error while updating column \"%s\" of table \"%s\": %s"
 msgstr "���±� \"%2$s\" ���ֶ� \"%1$s\" ʱ����: %3$s"
 
-#: pg_backup_db.c:823
+#: pg_backup_db.c:662
 msgid "creating table for large object cross-references\n"
 msgstr "Ϊ����󽻲����ô�����\n"
 
-#: pg_backup_db.c:827
+#: pg_backup_db.c:666
 msgid "could not create large object cross-reference table"
 msgstr "�޷���������󽻲����ñ�"
 
-#: pg_backup_db.c:832
+#: pg_backup_db.c:671
 msgid "could not create index on large object cross-reference table"
 msgstr "�޷��ڴ���󽻲����ñ��ϴ�������"
 
-#: pg_backup_db.c:844
+#: pg_backup_db.c:685
 msgid "could not create large object cross-reference entry"
 msgstr "�޷���������󽻲����ü�¼"
 
-#: pg_backup_db.c:856
+#: pg_backup_db.c:697
 msgid "could not start database transaction"
 msgstr "�޷���ʼ���ݿ�����"
 
-#: pg_backup_db.c:870
+#: pg_backup_db.c:711
 msgid "could not start transaction for large object cross-references"
 msgstr "�޷�Ϊ����󽻲�������������"
 
-#: pg_backup_db.c:883
+#: pg_backup_db.c:724
 msgid "could not commit database transaction"
 msgstr "�޷��ύ���ݿ�����"
 
-#: pg_backup_db.c:896
+#: pg_backup_db.c:737
 msgid "could not commit transaction for large object cross-references"
 msgstr "�޷�Ϊ����󽻲������ύ����"
 
-#: pg_backup_files.c:77
+#: pg_backup_files.c:69
 msgid "file archiver"
 msgstr "�ļ��鵵"
 
-#: pg_backup_files.c:122
+#: pg_backup_files.c:120
 msgid ""
 "WARNING:\n"
 "  This format is for demonstration purposes; it is not intended for\n"
@@ -1482,175 +1589,179 @@ msgstr ""
 "  �����ʽ��������ʾ; ��������һ����;.\n"
 "  �ļ���д�뵱ǰ����Ŀ¼.\n"
 
-#: pg_backup_files.c:248
+#: pg_backup_files.c:246
 msgid "could not open data file for output\n"
 msgstr "�޷�Ϊ����������ļ�\n"
 
-#: pg_backup_files.c:269
+#: pg_backup_files.c:267
 msgid "could not close data file\n"
 msgstr "�޷��ر������ļ�\n"
 
-#: pg_backup_files.c:293
+#: pg_backup_files.c:291
 msgid "could not open data file for input\n"
 msgstr "�޷�Ϊ����������ļ�\n"
 
-#: pg_backup_files.c:302
+#: pg_backup_files.c:300
 msgid "could not close data file after reading\n"
 msgstr "��ȡ֮���޷��ر������ļ�\n"
 
-#: pg_backup_files.c:366
+#: pg_backup_files.c:364
 #, c-format
 msgid "could not open large object TOC for input: %s\n"
 msgstr "�޷��򿪴���� TOC ��������: %s\n"
 
-#: pg_backup_files.c:379 pg_backup_files.c:550
+#: pg_backup_files.c:377 pg_backup_files.c:548
 #, c-format
 msgid "could not close large object TOC file: %s\n"
 msgstr "�޷��رմ���� TOC �ļ�: %s\n"
 
-#: pg_backup_files.c:391
+#: pg_backup_files.c:389
 msgid "could not write byte\n"
 msgstr "�޷�д�ֽ�\n"
 
-#: pg_backup_files.c:477
+#: pg_backup_files.c:475
 #, c-format
 msgid "could not open large object TOC for output: %s\n"
 msgstr "�޷��򿪴���� TOC �������: %s\n"
 
-#: pg_backup_files.c:498 pg_backup_tar.c:906
+#: pg_backup_files.c:496 pg_backup_tar.c:890
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "���ڴ����ķǷ� OID (%u)\n"
 
-#: pg_backup_files.c:517
+#: pg_backup_files.c:515
 msgid "could not open large object file\n"
 msgstr "�޷��򿪴�����ļ�\n"
 
-#: pg_backup_files.c:532
+#: pg_backup_files.c:530
 msgid "could not close large object file\n"
 msgstr "�޷��رմ�����ļ�\n"
 
-#: pg_backup_null.c:66
+#: pg_backup_null.c:57
 msgid "this format cannot be read\n"
 msgstr "�޷���ȡ�����ʽ\n"
 
-#: pg_backup_tar.c:103
+#: pg_backup_tar.c:106
 msgid "tar archiver"
 msgstr "tar �鵵"
 
-#: pg_backup_tar.c:174
+#: pg_backup_tar.c:183
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "�޷�Ϊ����� TOC �ļ�: %s\n"
 
-#: pg_backup_tar.c:199
+#: pg_backup_tar.c:208
 msgid "compression not supported by tar output format\n"
 msgstr "tar �����ʽ��֧��ѹ��\n"
 
-#: pg_backup_tar.c:211
+#: pg_backup_tar.c:220
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "�޷�Ϊ����� TOC �ļ�: %s\n"
 
-#: pg_backup_tar.c:333
+#: pg_backup_tar.c:342
 #, c-format
 msgid "could not find file %s in archive\n"
 msgstr "�޷��ڹ鵵���ҵ��ļ� %s\n"
 
-#: pg_backup_tar.c:344
+#: pg_backup_tar.c:353
 msgid "compression support is disabled in this format\n"
 msgstr "�������ʽ��, ѹ��֧��ʱ���ر��˵�\n"
 
-#: pg_backup_tar.c:360
+#: pg_backup_tar.c:369
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "�޷�������ʱ�ļ���: %s\n"
 
-#: pg_backup_tar.c:369
+#: pg_backup_tar.c:378
 msgid "could not gzdopen temporary file\n"
 msgstr "�޷� gzdopen ��ʱ�ļ�\n"
 
-#: pg_backup_tar.c:399
+#: pg_backup_tar.c:408
 msgid "could not close tar member\n"
 msgstr "�޷��ر� tar ��Ա\n"
 
-#: pg_backup_tar.c:499
+#: pg_backup_tar.c:508
 msgid "neither th nor fh specified in tarReadRaw() (internal error)\n"
 msgstr "�� tarReadRaw() ���δ���� th Ҳδ���� fh (�ڲ�����)\n"
 
-#: pg_backup_tar.c:503
+#: pg_backup_tar.c:512
 #, c-format
 msgid "requested %d bytes, got %d from lookahead and %d from file\n"
 msgstr "Ҫ�� %d �ֽ�, ��Ԥ���л�ȡ %d, ���ļ��л�ȡ %d\n"
 
-#: pg_backup_tar.c:542
+#: pg_backup_tar.c:551
 #, c-format
-msgid "could not write to tar member (wrote %d, attempted %d)\n"
-msgstr "�޷�д�� tar ��Ա (д�� %d, ��ͼд %d)\n"
+msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
+msgstr "�޷�д�� tar ��Ա (д�� %lu, ��ͼд %lu)\n"
 
-#: pg_backup_tar.c:630
+#: pg_backup_tar.c:640
 #, c-format
 msgid "bad COPY statement - could not find \"copy\" in string \"%s\"\n"
 msgstr "COPY ���� - �޷����ִ� \"%s\" ���ҵ� \"copy\"\n"
 
-#: pg_backup_tar.c:648
+#: pg_backup_tar.c:658
 #, c-format
 msgid ""
 "bad COPY statement - could not find \"from stdin\" in string \"%s\" starting "
-"at position %d\n"
+"at position %lu\n"
 msgstr ""
-"����� COPY ��� - �޷��ڴ� %2$d λ�ÿ�ʼ���ִ� \"%1$s\" ���ҵ� \"from stdin"
+"����� COPY ��� - �޷��ڴ� %2$lu λ�ÿ�ʼ���ִ� \"%1$s\" ���ҵ� \"from stdin"
 "\" ����\n"
 
-#: pg_backup_tar.c:711
+#: pg_backup_tar.c:694
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "�ָ� OID %u �Ĵ����\n"
 
-#: pg_backup_tar.c:849
+#: pg_backup_tar.c:833
 msgid "could not write null block at end of tar archive\n"
 msgstr "�޷��� tar �鵵ĩβд null ��\n"
 
-#: pg_backup_tar.c:1044
+#: pg_backup_tar.c:1021
+msgid "archive member too large for tar format\n"
+msgstr "�� tar ��ʽ�й鵵��Ա̫��\n"
+
+#: pg_backup_tar.c:1031
 #, c-format
-msgid "write error appending to tar archive (wrote %d, attempted %d)\n"
-msgstr "�� tar �鵵����ʱд���� (д�� %d, ��ͼд %d)\n"
+msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
+msgstr "�� tar �鵵����ʱд���� (д�� %lu, ��ͼд %lu)\n"
 
-#: pg_backup_tar.c:1049
+#: pg_backup_tar.c:1037
 #, c-format
 msgid "could not close tar member: %s\n"
 msgstr "�޷��ر� tar ��Ա: %s\n"
 
-#: pg_backup_tar.c:1052
+#: pg_backup_tar.c:1046
 #, c-format
-msgid "actual file length (%d) does not match expected (%d)\n"
-msgstr "ʵ���ļ����� (%d) ��ƥ��Ԥ�ڵij��� (%d)\n"
+msgid "actual file length (%s) does not match expected (%s)\n"
+msgstr "ʵ���ļ����� (%s) ��ƥ��Ԥ�ڵij��� (%s)\n"
 
-#: pg_backup_tar.c:1059
+#: pg_backup_tar.c:1054
 msgid "could not output padding at end of tar member\n"
 msgstr "�޷��� tar ��Աβ������������\n"
 
 #: pg_backup_tar.c:1083
 #, c-format
-msgid "moving from position %d (%x) to next member at file position %d (%x)\n"
-msgstr "��λ�� %d (%x) �ƶ����ļ�λ�� %d (%x) ����һ����Ա\n"
+msgid "moving from position %s to next member at file position %s\n"
+msgstr "��λ�� %s �ƶ����ļ�λ�� %s ����һ����Ա\n"
 
-#: pg_backup_tar.c:1091
+#: pg_backup_tar.c:1094
 #, c-format
-msgid "now at file position %d (%x)\n"
-msgstr "�������ļ���λ�� %d (%x)\n"
+msgid "now at file position %s\n"
+msgstr "�������ļ���λ�� %s\n"
 
-#: pg_backup_tar.c:1099 pg_backup_tar.c:1126
+#: pg_backup_tar.c:1103 pg_backup_tar.c:1130
 #, c-format
 msgid "could not find header for file %s in tar archive\n"
 msgstr "�޷��� tar �鵵��Ϊ�ļ� %s �ҵ�ͷ��\n"
 
-#: pg_backup_tar.c:1110
+#: pg_backup_tar.c:1114
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "���� tar ��Ա %s\n"
 
-#: pg_backup_tar.c:1114
+#: pg_backup_tar.c:1118
 #, c-format
 msgid ""
 "dumping data out of order is not supported in this archive format: %s is "
@@ -1658,188 +1769,783 @@ msgid ""
 msgstr ""
 "����鵵��ʽ�ﲻ֧������ת������: Ҫ�� %s,�����ڹ鵵�ļ���λ�� %s ǰ��.\n"
 
-#: pg_backup_tar.c:1155
+#: pg_backup_tar.c:1166
 #, c-format
-msgid "mismatch in actual vs. predicted file position (%d vs. %d)\n"
-msgstr "ʵ���ļ�λ�ú�Ԥ���ļ�λ�ò�ƥ�� (%d �� %d)\n"
+msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
+msgstr "ʵ���ļ�λ�ú�Ԥ���ļ�λ�ò�ƥ�� (%s �� %s)\n"
 
-#: pg_backup_tar.c:1168
+#: pg_backup_tar.c:1181
 #, c-format
-msgid "incomplete tar header found (%d bytes)\n"
-msgstr "���ֲ����� tar ͷ (%d �ֽ�)\n"
+msgid "incomplete tar header found (%lu bytes)\n"
+msgstr "���ֲ����� tar ͷ (%lu �ֽ�)\n"
 
-#: pg_backup_tar.c:1197
+#: pg_backup_tar.c:1216
 #, c-format
-msgid "TOC Entry %s at %d (length %d, checksum %d)\n"
-msgstr "�� %2$d �� TOC ��¼ %1$s (���� %3$d, У��� %4$d)\n"
+msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
+msgstr "�� %2$s �� TOC ��¼ %1$s (���� %3$lu, У��� %4$d)\n"
 
-#: pg_backup_tar.c:1201
+#: pg_backup_tar.c:1226
 #, c-format
 msgid ""
-"corrupt tar header found in %s (expected %d (%o), computed %d (%o)) file "
-"position %ld (%lx)\n"
+"corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr ""
-"���ļ� %1$s ��λ�� %6$ld (%7$lx) ���ֱ����� tar ͷ(Ԥ���� %2$d (%3$o), �����"
-"���� %4$d (%5$o))\n"
+"���ļ� %1$s ��λ�� %4$s ���ֱ����� tar ͷ(Ԥ���� %2$d, ��������� %3$d)\n"
 
-#: pg_backup_tar.c:1278
+#: pg_backup_tar.c:1316
 msgid "unable to write tar header\n"
 msgstr "�޷�д�� tar ͷ\n"
 
-#: pg_restore.c:383
+#: pg_restore.c:376
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
 "\n"
-"Usage:\n"
-"  %s [options] [file]\n"
-"\n"
-"Options:\n"
 msgstr ""
 "%s ��һ���鵵�лָ�һ���� pg_dump ������ PostgreSQL ���ݿ�.\n"
 "\n"
-"�÷�:\n"
-"  %s [ѡ��] [�ļ�]\n"
+
+#: pg_restore.c:378
+#, c-format
+msgid ""
+"  %s [OPTIONS] [FILE]\n"
+"\n"
+msgstr ""
+"  %s [ѡ��] [�ļ���]\n"
 "\n"
-"ѡ��:\n"
 
-#
+#: pg_restore.c:382
+msgid "  -a, --data-only          restore only the data, no schema\n"
+msgstr "  -a, --data-only          ֻ�ָ�����, ���������\n"
+
+#: pg_restore.c:384
+msgid "  -C, --create             issue commands to create the database\n"
+msgstr "  -C, --create             ������������ݿ�\n"
+
+#: pg_restore.c:385
+msgid "  -d, --dbname=NAME        output database name\n"
+msgstr "  -d, --dbname=����        ������ݿ�����\n"
+
+#: pg_restore.c:387
+msgid "  -F, --format={c|t}       specify backup file format\n"
+msgstr "  -F, --format={c|t}       ָ�������ļ���ʽ\n"
+
 #: pg_restore.c:389
 msgid ""
-"  -a, --data-only          restore only the data, no schema\n"
-"  -c, --clean              clean (drop) schema prior to create\n"
-"  -C, --create             issue commands to create the database\n"
-"  -d, --dbname=NAME        output database name\n"
-"  -f, --file=FILENAME      output file name\n"
-"  -F, --format={c|t}       specify backup file format\n"
-"  -h, --host=HOSTNAME      server host name\n"
-"  -i, --index=NAME         restore named index\n"
-"  -l, --list               print summarized TOC of the archive\n"
+"  -i, --ignore-version     proceed even when server version mismatches\n"
+msgstr "  -i, --ignore-version     ���������汾��ƥ��ʱ��������\n"
+
+#: pg_restore.c:390
+msgid "  -I, --index=NAME         restore named index\n"
+msgstr "  -I, --index=����         �ָ�ָ�����ֵ�����\n"
+
+#: pg_restore.c:391
+msgid "  -l, --list               print summarized TOC of the archive\n"
+msgstr "  -l, --list               ��ӡ�鵵�ļ��� TOC ����\n"
+
+#: pg_restore.c:392
+msgid ""
 "  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
 "                           output from this file\n"
-"  -N, --orig-order         restore in original dump order\n"
-"  -o, --oid-order          restore in OID order\n"
+msgstr ""
+"  -L, --use-list=�ļ���    ������ļ���ʹ��ָ�������ݱ�����\n"
+"                           ���\n"
+
+#: pg_restore.c:394
+msgid "  -N, --orig-order         restore in original dump order\n"
+msgstr "  -N, --orig-order         ��ԭʼ��ת��˳��ָ�\n"
+
+#: pg_restore.c:395
+msgid "  -o, --oid-order          restore in OID order\n"
+msgstr "  -o, --oid-order          �� OID ˳��ָ�\n"
+
+#: pg_restore.c:396
+msgid ""
 "  -O, --no-owner           do not reconnect to database to match\n"
 "                           object owner\n"
-"  -p, --port=PORT          server port number\n"
-"  -P, --function=NAME      restore named function\n"
+msgstr ""
+"  -O, --no-owner           ƥ�����������ʱ����������\n"
+"                           ���ݿ�\n"
+
+#: pg_restore.c:399
+msgid ""
+"  -P, --function=NAME(args)\n"
+"                           restore named function\n"
+msgstr ""
+"  -P, --function=����(����)\n"
+"                           �ָ�ָ�����ֵĺ���\n"
+
+#: pg_restore.c:401
+msgid ""
 "  -r, --rearrange          rearrange output to put indexes etc. at end\n"
-"  -R, --no-reconnect       disallow ALL reconnections to the database\n"
-"  -s, --schema-only        restore only the schema, no data\n"
+msgstr "  -r, --rearrange          �����������, ������������ĩβ\n"
+
+#: pg_restore.c:402
+msgid "  -R, --no-reconnect       disallow ALL reconnections to the database\n"
+msgstr "  -R, --no-reconnect       ���������е����ݿ�������\n"
+
+#: pg_restore.c:403
+msgid "  -s, --schema-only        restore only the schema, no data\n"
+msgstr "  -s, --schema-only        ֻ�ָ����, ����������\n"
+
+#: pg_restore.c:404
+msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use for\n"
 "                           disabling triggers\n"
-"  -t, --table=NAME         restore named table\n"
-"  -T, --trigger=NAME       restore named trigger\n"
-"  -U, --username=NAME      connect as specified database user\n"
-"  -v, --verbose            verbose mode\n"
-"  -W, --password           force password prompt (should happen "
-"automatically)\n"
+msgstr ""
+"  -S, --superuser=NAME     ʹ��ָ���ij����û���ȡ��\n"
+"                           ������\n"
+
+#: pg_restore.c:406
+msgid "  -t, --table=NAME         restore named table\n"
+msgstr "  -t, --table=����         �ָ�ָ�����ֵı�\n"
+
+#: pg_restore.c:407
+msgid "  -T, --trigger=NAME       restore named trigger\n"
+msgstr "  -T, --trigger=����       �ָ�ָ�����ֵĴ�����\n"
+
+#: pg_restore.c:411
+msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
 "revoke)\n"
+msgstr "  -x, --no-privileges      ��������Ȩ�޵Ļָ� (grant/revoke)\n"
+
+#: pg_restore.c:412
+msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
 "                           of reconnecting, if possible\n"
 msgstr ""
-"  -a, --data-only          ֻ�ָ�����, ���������\n"
-"  -c, --clean              �ڴ���֮ǰ����(ɾ��)���\n"
-"  -C, --create             �����������ݿ������\n"
-"  -d, --dbname=����        ������ݿ�����\n"
-"  -f, --file=�ļ���        ����ļ���\n"
-"  -F, --format={c|t}       ���������ļ���ʽ\n"
-"  -h, --host=HOSTNAME      ������������\n"
-"  -i, --index=����         �ָ�ָ��������\n"
-"  -l, --list               ��ӡ�鵵�ĸ�ҪĿ¼\n"
-"  -L, --use-list=�ļ���    ʹ��ָ��Ŀ¼��Ϊ���ļ���������򷽷�\n"
-"  -N, --orig-order         ����ԭʼ��ת��˳��ָ�\n"
-"  -o, --oid-order          ���� OID ˳��ָ�\n"
-"  -O, --no-owner           ��ҪΪ��ƥ����������߶������������ݿ�\n"
-"  -p, --port=PORT          �������˿ں�\n"
-"  -P, --function=����      �ָ�ָ���ĺ���\n"
-"  -r, --rearrange          �������, ������������ĩβ\n"
-"  -R, --no-reconnect       ��ֹ���������ݿ����������\n"
-"  -s, --schema-only        ֻ�ָ����, ���ָ�����\n"
-"  -S, --superuser=����     �������ڽ�ֹ�������ij����û�����\n"
-"  -t, --table=����         �ָ�ָ����\n"
-"  -T, --trigger=����       �ָ�ָ��������\n"
-"  -U, --username=����      ��ָ�����ݿ��û���������\n"
-"  -v, --verbose            �߳�ģʽ\n"
-"  -W, --password           ǿ�ƿ�����ʾ (Ӧ���Զ�����)\n"
-"  -x, --no-privileges      ���Է���Ȩ��(grant/revoke)�Ļָ�\n"
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           �������� SET SESSION AUTHORIZATION ���������\n"
-"                           ��������\n"
+"                           �������, ʹ�� SET SESSION AUTHORIZATION ������"
+"��\n"
+"                           ������\n"
 
-#
-#: pg_restore.c:425
-msgid ""
-"  -a                       restore only the data, no schema\n"
-"  -c                       clean (drop) schema prior to create\n"
-"  -C                       issue commands to create the database\n"
-"  -d NAME                  output database name\n"
-"  -f FILENAME              output file name\n"
-"  -F {c|t}                 specify backup file format\n"
-"  -h HOSTNAME              server host name\n"
-"  -i NAME                  restore named index\n"
-"  -l                       print summarized TOC of the archive\n"
+#: pg_restore.c:419
+msgid "  -a                       restore only the data, no schema\n"
+msgstr "  -a                       ֻ�ָ�����, ���������\n"
+
+#: pg_restore.c:421
+msgid "  -C                       issue commands to create the database\n"
+msgstr "  -C                       ������������ݿ�\n"
+
+#: pg_restore.c:422
+msgid "  -d NAME                  output database name\n"
+msgstr "  -d ����                  ������ݿ�����\n"
+
+#: pg_restore.c:424
+msgid "  -F {c|t}                 specify backup file format\n"
+msgstr "  -F {c|t}                 ָ�������ļ���ʽ\n"
+
+#: pg_restore.c:426
+msgid ""
+"  -i                       proceed even when server version mismatches\n"
+msgstr "  -i                       ���������汾��ƥ��ʱ��������\n"
+
+#: pg_restore.c:427
+msgid "  -I NAME                  restore named index\n"
+msgstr "  -I ����                  �ָ�ָ�����ֵ�����\n"
+
+#: pg_restore.c:428
+msgid "  -l                       print summarized TOC of the archive\n"
+msgstr "  -l                       ��ӡ�鵵�ļ��� TOC ����\n"
+
+#: pg_restore.c:429
+msgid ""
 "  -L FILENAME              use specified table of contents for ordering\n"
 "                           output from this file\n"
-"  -N                       restore in original dump order\n"
-"  -o                       restore in OID order\n"
+msgstr ""
+"  -L �ļ���                ������ļ���ʹ��ָ�������ݱ�����\n"
+"                           ���\n"
+
+#: pg_restore.c:431
+msgid "  -N                       restore in original dump order\n"
+msgstr "  -N                       ��ԭʼ��ת��˳��ָ�\n"
+
+#: pg_restore.c:432
+msgid "  -o                       restore in OID order\n"
+msgstr "  -o                       �� OID ˳��ָ�\n"
+
+#: pg_restore.c:433
+msgid ""
 "  -O                       do not reconnect to database to match\n"
 "                           object owner\n"
-"  -p PORT                  server port number\n"
-"  -P NAME                  restore named function\n"
+msgstr ""
+"  -O                       ƥ�����������ʱ����������\n"
+"                           ���ݿ�\n"
+
+#: pg_restore.c:436
+msgid "  -P NAME(args)            restore named function\n"
+msgstr "  -P ����(����)            �ָ�ָ�����ֵĺ���\n"
+
+#: pg_restore.c:437
+msgid ""
 "  -r                       rearrange output to put indexes etc. at end\n"
-"  -R                       disallow ALL reconnections to the database\n"
-"  -s                       restore only the schema, no data\n"
+msgstr "  -r                       �����������, ������������ĩβ\n"
+
+#: pg_restore.c:438
+msgid "  -R                       disallow ALL reconnections to the database\n"
+msgstr "  -R                       ���������е����ݿ�������\n"
+
+#: pg_restore.c:439
+msgid "  -s                       restore only the schema, no data\n"
+msgstr "  -s                       ֻ�ָ����, ����������\n"
+
+#: pg_restore.c:440
+msgid ""
 "  -S NAME                  specify the superuser user name to use for\n"
 "                           disabling triggers\n"
-"  -t NAME                  restore named table\n"
-"  -T NAME                  restore named trigger\n"
-"  -U NAME                  connect as specified database user\n"
-"  -v                       verbose mode\n"
-"  -W                       force password prompt (should happen "
-"automatically)\n"
+msgstr ""
+"  -S ����                  ʹ��ָ���ij����û���\n"
+"                           ȡ��������\n"
+
+#: pg_restore.c:442
+msgid "  -t NAME                  restore named table\n"
+msgstr "  -t ����                  �ָ�ָ�����ֵı�\n"
+
+#: pg_restore.c:443
+msgid "  -T NAME                  restore named trigger\n"
+msgstr "  -T ����                  �ָ�ָ�����ֵĴ�����\n"
+
+#: pg_restore.c:447
+msgid ""
 "  -x                       skip restoration of access privileges (grant/"
 "revoke)\n"
+msgstr "  -x                       ��������Ȩ�޵Ļָ� (grant/revoke)\n"
+
+#: pg_restore.c:448
+msgid ""
 "  -X use-set-session-authorization\n"
 "                           use SET SESSION AUTHORIZATION commands instead\n"
 "                           of reconnecting, if possible\n"
 msgstr ""
-"  -a                       ֻ�ָ�����, ���ָ����\n"
-"  -c                       ����֮ǰ����(ɾ��)���\n"
-"  -C                       �����������ݿ������\n"
-"  -d ����                  ������ݿ���\n"
-"  -f �ļ���                ����ļ���\n"
-"  -F {c|t}                 ���������ļ���ʽ\n"
-"  -h ������                ������������\n"
-"  -i ����                  �ָ�ָ������\n"
-"  -l                       ��ӡ�鵵�ĸ�ҪĿ¼\n"
-"  -L �ļ���                ʹ��ָ����Ŀ¼��Ϊ�Ը��ļ���������򷽷�\n"
-"  -N                       ��ԭʼ��ת��˳��ָ�\n"
-"  -o                       �� oid (�����ʶ) ��˳��ָ�\n"
-"  -O                       ��ҪΪƥ�������������������ݿ��������������\n"
-"  -p �˿�                  �������˿ں�\n"
-"  -P ����                  �ָ�ָ������\n"
-"  -r                       �����������, �������ȷŵ�ĩβ\n"
-"  -R                       ��ֹ���������ݿ����������\n"
-"  -s                       ֻ�ָ����, ���ָ�����\n"
-"  -S ����                  �������ڹرմ������ij����û���\n"
-"  -t ����                  �ָ�ָ����\n"
-"  -T ����                  �ָ�ָ��������\n"
-"  -U ����                  ��ָ�����ݿ��û���������\n"
-"  -v                       �߳�ģʽ\n"
-"  -W                       ǿ�ƿ�����ʾ(Ӧ���Զ�����)\n"
-"  -x                       ���Է���Ȩ�� (grant/reovke) �Ļָ�\n"
 "  -X use-set-session-authorization\n"
-"                           ������ʹ�� SET SESSION AUTHORIZATION ����, ����"
-"��\n"
+"                           �������, ʹ�� SET SESSION AUTHORIZATION �����"
+"��\n"
 "                           ������\n"
 
-#: pg_restore.c:458
-msgid "If no input file name is supplied, then standard input is used.\n"
-msgstr "���û���ṩ�����ļ���, ��ʹ�ñ�׼����.\n"
+#: pg_restore.c:454
+msgid ""
+"\n"
+"If no input file name is supplied, then standard input is used.\n"
+"\n"
+msgstr ""
+"\n"
+"���û���ṩ�����ļ���, ��ʹ�ñ�׼����.\n"
+"\n"
+
+#: pg_dumpall.c:214
+#, c-format
+msgid ""
+"%s extracts a PostgreSQL database cluster into an SQL script file.\n"
+"\n"
+msgstr ""
+"%s ��ȡһ�� PostgreSQL ���ݿ�ؽ�һ�� SQL �ű��ļ�.\n"
+"\n"
+
+#: pg_dumpall.c:216
+#, c-format
+msgid ""
+"  %s [OPTIONS]\n"
+"\n"
+msgstr ""
+"  %s [ѡ��]\n"
+"\n"
+
+#: pg_dumpall.c:220
+msgid "  -c, --clean              clean (drop) databases prior to create\n"
+msgstr "  -c, --clean              ��� (ɾ��) Ԥ�ȵ����ݿ�, �Ա��ٴ���\n"
+
+#: pg_dumpall.c:223
+msgid "  -g, --globals-only       dump only global objects, no databases\n"
+msgstr "  -g, --globals-only       ֻת��ȫ�ֶ���, ���������ݿ�\n"
+
+#: pg_dumpall.c:225
+msgid ""
+"  -i, --ignore-version     proceed even when server version mismatches\n"
+"                           pg_dumpall version\n"
+msgstr ""
+"  -i, --ignore-version     ���������汾�� pg_dumpall ��ƥ��ʱ\n"
+"                           ��������\n"
+
+#: pg_dumpall.c:233
+msgid "  -c                       clean (drop) databases prior to create\n"
+msgstr "  -c                       ��� (ɾ��) Ԥ�ȵ����ݿ�, �Ա��ٴ���\n"
+
+#: pg_dumpall.c:236
+msgid "  -g                       dump only global objects, no databases\n"
+msgstr "  -g                       ֻת��ȫ�ֶ���, ���������ݿ�\n"
+
+#: pg_dumpall.c:238
+msgid ""
+"  -i                       proceed even when server version mismatches\n"
+"                           pg_dumpall version\n"
+msgstr ""
+"  -i                       ���������汾�� pg_dumpall ��ƥ��ʱ\n"
+"                           ��������\n"
+
+#: pg_dumpall.c:247
+msgid ""
+"\n"
+"The SQL script will be written to the standard output.\n"
+"\n"
+msgstr ""
+"\n"
+"���� SQL �ű�д����׼�����.\n"
+"\n"
+
+#: pg_dumpall.c:562
+#, c-format
+msgid "%s: dumping database \"%s\"...\n"
+msgstr "%s: ����ת�����ݿ� \"%s\"...\n"
+
+#: pg_dumpall.c:568
+#, c-format
+msgid "%s: pg_dump failed on %s, exiting\n"
+msgstr "%s: pg_dump ʧ���� %s, �����˳�\n"
+
+#: pg_dumpall.c:590
+#, c-format
+msgid "%s: running %s\n"
+msgstr "%s: �������� %s\n"
+
+#: pg_dumpall.c:630
+#, c-format
+msgid "%s: could not connect to database %s\n"
+msgstr "%s: �޷������ݿ� %s ����\n"
+
+#: pg_dumpall.c:653
+#, c-format
+msgid "%s: could not connect to database %s: %s\n"
+msgstr "%s: �޷������ݿ� %s ����: %s\n"
+
+#: pg_dumpall.c:661
+#, c-format
+msgid "%s: could not get server version\n"
+msgstr "%s: �޷��ӷ�������ȡ�汾\n"
+
+#: pg_dumpall.c:670
+#, c-format
+msgid "%s: could not parse server version \"%s\"\n"
+msgstr "%s: �޷������汾�ִ� \"%s\"\n"
+
+#: pg_dumpall.c:692
+#, c-format
+msgid "%s: query failed: %s"
+msgstr "%s: ��ѯʧ��: %s"
+
+#: pg_dumpall.c:693
+#, c-format
+msgid "%s: query was: %s\n"
+msgstr "%s: ��ѯ��: %s\n"
+
+#: pg_dumpall.c:739
+#, c-format
+msgid ""
+"%s: could not find pg_dump\n"
+"Make sure it is in the path or in the same directory as %s.\n"
+msgstr ""
+"%s: û�ҵ� pg_dump\n"
+"ȷ����·���л��� %s һ����Ŀ¼��.\n"
+
+#~ msgid "WARNING: owner of opclass \"%s\" appears to be invalid\n"
+#~ msgstr "����: ������ \"%s\" �������߷Ƿ�\n"
+
+#~ msgid "query to obtain function information for %s failed: %s"
+#~ msgstr "��ȡ������Ϣ \"%s\" ����IJ�ѯʧ��: %s"
+
+#~ msgid ""
+#~ "  %s [options] dbname\n"
+#~ "\n"
+#~ msgstr ""
+#~ "  %s [ѡ��] ���ݿ���\n"
+#~ "\n"
+
+#
+#~ msgid ""
+#~ "  -a, --data-only          dump only the data, not the schema\n"
+#~ "  -b, --blobs              include large objects in dump\n"
+#~ "  -c, --clean              clean (drop) schema prior to create\n"
+#~ "  -C, --create             include commands to create database in dump\n"
+#~ "  -d, --inserts            dump data as INSERT, rather than COPY, "
+#~ "commands\n"
+#~ "  -D, --column-inserts     dump data as INSERT commands with column "
+#~ "names\n"
+#~ "  -f, --file=FILENAME      output file name\n"
+#~ "  -F, --format {c|t|p}     output file format (custom, tar, plain text)\n"
+#~ "  -h, --host=HOSTNAME      database server host name\n"
+#~ "  -i, --ignore-version     proceed even when server version mismatches\n"
+#~ "                           pg_dump version\n"
+#~ "  -n, --no-quotes          suppress most quotes around identifiers\n"
+#~ "  -N, --quotes             enable most quotes around identifiers\n"
+#~ "  -o, --oids               include oids in dump\n"
+#~ "  -O, --no-owner           do not output \\connect commands in plain\n"
+#~ "                           text format\n"
+#~ "  -p, --port=PORT          database server port number\n"
+#~ "  -R, --no-reconnect       disable ALL reconnections to the database in\n"
+#~ "                           plain text format\n"
+#~ "  -s, --schema-only        dump only the schema, no data\n"
+#~ "  -S, --superuser=NAME     specify the superuser user name to use in\n"
+#~ "                           plain text format\n"
+#~ "  -t, --table=TABLE        dump this table only (* for all)\n"
+#~ "  -U, --username=NAME      connect as specified database user\n"
+#~ "  -v, --verbose            verbose mode\n"
+#~ "  -W, --password           force password prompt (should happen "
+#~ "automatically)\n"
+#~ "  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
+#~ "  -X use-set-session-authorization, --use-set-session-authorization\n"
+#~ "                           output SET SESSION AUTHORIZATION commands "
+#~ "rather\n"
+#~ "                           than \\connect commands\n"
+#~ "  -Z, --compress {0-9}     compression level for compressed formats\n"
+#~ msgstr ""
+#~ "  -a, --data-only          ֻת������, ��������\n"
+#~ "  -b, --blobs              ��ת���а������������\n"
+#~ "  -c, --clean              �ڴ���֮ǰ����(ɾ��)���\n"
+#~ "  -C, --create             ��ת���а����������ݿ������\n"
+#~ "  -d, --inserts            �������� INSERT ����ʽת��, ���� COPY �������"
+#~ "ʽ\n"
+#~ "  -D, --column-inserts     �������Դ����ֶ����� INSERT ������ʽת��\n"
+#~ "  -f, --file=�ļ���        ����ļ���\n"
+#~ "  -F, --format {c|t|p}     ����ļ���ʽ(�ͻ�, tar, ���ı�)\n"
+#~ "  -h, --host=������        ���ݿ������������\n"
+#~ "  -i, --ignore-version     ��ʹ�������汾�� pg_dump �汾��ƥ��Ҳ������ȥ\n"
+#~ "  -n, --no-quotes          ��ֹ��ʶ����Χ�ľ��󲿷�����\n"
+#~ "  -N, --quotes             ������ʶ����Χ�ľ��󲿷�����\n"
+#~ "  -o, --oids               ��ת���а��� oid (�����ʶ)\n"
+#~ "  -O, --no-owner           �ڴ��ı���ʽ�в�Ҫ���� \\connect ����\n"
+#~ "  -p, --port=PORT          ���ݿ�������˿ں�\n"
+#~ "  -R, --no-reconnect       �ڴ��ı���ʽ�йر����������ݿ��������\n"
+#~ "  -s, --schema-only        ֻת����������, ��ת������\n"
+#~ "  -S, --superuser=����     �����ڴ��ı�ģʽ��ʹ�õij����û����û���\n"
+#~ "  -t, --table=������       ֻת������� (* ��ʾת�����б�)\n"
+#~ "  -U, --username=����      �����������ݿ��û�����\n"
+#~ "  -v, --verbose            �߳�ģʽ\n"
+#~ "  -W, --password           ǿ�ƿ�����ʾ (Ӧ���Զ�����)\n"
+#~ "  -x, --no-privileges      ��ת��Ȩ�� (grant/revoke)\n"
+#~ "  -X use-set-session-authorization, --use-set-session-authorization\n"
+#~ "                           ��� SET SESSION AUTHORIZATION ���������\n"
+#~ "                           \\connect ����\n"
+#~ "  -Z, --compress {0-9}     ѹ����ʽ��ѹ������\n"
+
+#~ msgid ""
+#~ "  -a                       dump only the data, not the schema\n"
+#~ "  -b                       include large objects in dump\n"
+#~ "  -c                       clean (drop) schema prior to create\n"
+#~ "  -C                       include commands to create database in dump\n"
+#~ "  -d                       dump data as INSERT, rather than COPY, "
+#~ "commands\n"
+#~ "  -D                       dump data as INSERT commands with column "
+#~ "names\n"
+#~ "  -f FILENAME              output file name\n"
+#~ "  -F {c|t|p}               output file format (custom, tar, plain text)\n"
+#~ "  -h HOSTNAME              database server host name\n"
+#~ "  -i                       proceed even when server version mismatches\n"
+#~ "                           pg_dump version\n"
+#~ "  -n                       suppress most quotes around identifiers\n"
+#~ "  -N                       enable most quotes around identifiers\n"
+#~ "  -o                       include oids in dump\n"
+#~ "  -O                       do not output \\connect commands in plain\n"
+#~ "                           text format\n"
+#~ "  -p PORT                  database server port number\n"
+#~ "  -R                       disable ALL reconnections to the database in\n"
+#~ "                           plain text format\n"
+#~ "  -s                       dump only the schema, no data\n"
+#~ "  -S NAME                  specify the superuser user name to use in\n"
+#~ "                           plain text format\n"
+#~ "  -t TABLE                 dump this table only (* for all)\n"
+#~ "  -U NAME                  connect as specified database user\n"
+#~ "  -v                       verbose mode\n"
+#~ "  -W                       force password prompt (should happen "
+#~ "automatically)\n"
+#~ "  -x                       do not dump privileges (grant/revoke)\n"
+#~ "  -X use-set-session-authorization\n"
+#~ "                           output SET SESSION AUTHORIZATION commands "
+#~ "rather\n"
+#~ "                           than \\connect commands\n"
+#~ "  -Z {0-9}                 compression level for compressed formats\n"
+#~ msgstr ""
+#~ "  -a                       ֻת������, ���������\n"
+#~ "  -b                       ��ת���а��������\n"
+#~ "  -c                       �ڴ���֮ǰ����(ɾ��)���\n"
+#~ "  -C                       ��ת���а����������ݿ������\n"
+#~ "  -d                       �������� INSERT ��ʽת��, ���� COPY ����\n"
+#~ "  -D                       �������Դ��ֶ����� INSERT ������ʽת��\n"
+#~ "  -f �ļ���                ����ļ���\n"
+#~ "  -F {c|t|p}               ����ļ���ʽ(�ͻ�, tar, ���ı�)\n"
+#~ "  -h ������                ���ݿ������������\n"
+#~ "  -i                       ��ʹ�������汾�� pg_dump �汾��һ��Ҳ��������\n"
+#~ "  -n                       ��ֹ�ڴ������ʶ����Χ������\n"
+#~ "  -N                       �����ڴ������ʶ����Χ������\n"
+#~ "  -o                       ��ת���а��� oid\n"
+#~ "  -O                       �ڴ��ı���ʽ�в���� \\connect ����\n"
+#~ "  -p �˿�                  ���ݿ�������˿ں�\n"
+#~ "  -R                       �ڴ��ı���ʽ�йر����������ݿ��������\n"
+#~ "  -s                       ֻת�����, ����������\n"
+#~ "  -S ����                  �����ڴ��ı���ʽ��ʹ�õij����û�����\n"
+#~ "  -t ������                ֻת������� (* ��ʾȫ��)\n"
+#~ "  -U ����                  �����������ݿ��û���������\n"
+#~ "  -v                       �߳�ģʽ\n"
+#~ "  -W                       ǿ�ƿ�����ʾ (Ӧ���Զ�����)\n"
+#~ "  -x                       ��ת��Ȩ�� (grant/revoke)\n"
+#~ "  -X use-set-session-authorization\n"
+#~ "                           ��� SET SESSION AUTHORIZATION ����, ������\n"
+#~ "                           \\connect ����\n"
+#~ "  -Z {0-9}                 ѹ����ʽ��ѹ������\n"
+
+#~ msgid "preparing to dump the contents of all %d tables/sequences\n"
+#~ msgstr "׼��ת������ %d ����/���е�����\n"
+
+#~ msgid "preparing to dump the contents of only one table/sequence\n"
+#~ msgstr "׼��ֻת��һ����/���е�����\n"
+
+#~ msgid "no database name specified\n"
+#~ msgstr "û���������ݿ���\n"
+
+#~ msgid ""
+#~ "failed sanity check: function %s has more than %d (namely %d) arguments\n"
+#~ msgstr "��ȫ���ʧ��: ���� %s �г��� %d (���ߵ��� %d) ������\n"
+
+#~ msgid "query to obtain primary key of table \"%s\" failed: %s"
+#~ msgstr "��ȡ�� \"%s\" �������IJ�ѯʧ��: %s"
+
+#~ msgid ""
+#~ "query to obtain primary key of table \"%s\" produced more than one "
+#~ "result\n"
+#~ msgstr "��ȡ�� \"%s\" �������IJ�ѯ��������һ���Ľ��\n"
+
+#~ msgid "query to obtain name of primary key of table \"%s\" failed: %s"
+#~ msgstr "��ȡ�� \"%s\" ���������ֵIJ�ѯʧ��: %s"
+
+#~ msgid ""
+#~ "query to obtain name of primary key of table \"%s\" did not return "
+#~ "exactly one result\n"
+#~ msgstr "��ȡ�� \"%s\" ���������ֵIJ�û��ֻ����һ�����\n"
+
+#~ msgid ""
+#~ "query to obtain procedure name for trigger \"%s\" did not return exactly "
+#~ "one result\n"
+#~ msgstr "Ϊ������ \"%s\" ��ȡ�������ֵIJ�ѯ��δֻ����һ�����\n"
+
+#~ msgid "query produced NULL name for data type of column %d of table %s\n"
+#~ msgstr "��ѯΪ�� \"%2$s\" ���ֶ� %1$d ���� NULL ������\n"
+
+#~ msgid ""
+#~ "query to get default value for column \"%s\" returned %d rows; expected "
+#~ "1\n"
+#~ msgstr "Ϊ�ֶ� \"%s\" ��ȡȱʡֵ�IJ�ѯ���� %d ��; ��Ԥ���� 1\n"
+
+#~ msgid "notice: array type %s - type for elements (oid %s) is not dumped\n"
+#~ msgstr "ע��: �������� %s - ����Ԫ�� (oid %s) ������δת��\n"
+
+#~ msgid "query to get name of procedural language failed: %s"
+#~ msgstr "��ȡ�����������ֵIJ�ѯʧ��: %s"
+
+#~ msgid "WARNING: function \"%s\" not dumped\n"
+#~ msgstr "����: δת������ \"%s\"\n"
+
+#~ msgid "reason: data type name of argument %d (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ����� %d (oid %s) ��������������\n"
+
+#~ msgid "reason: name of return data type (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ������������� (oid %s) ������\n"
+
+#~ msgid "WARNING: operator \"%s\" (oid %s) not dumped\n"
+#~ msgstr "����: δת�������� \"%s\"(oid %s)\n"
+
+#~ msgid "reason: oprleft (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� oprleft (oid %s)\n"
+
+#~ msgid "reason: oprright (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� oprright (oid %s)\n"
+
+#~ msgid "reason: oprcom (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� oprcom (oid %s)\n"
+
+#~ msgid "reason: oprnegate (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� oprnegate (oid %s)\n"
+
+#~ msgid "reason: oprlsortop (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� oprlsortop (oid %s)\n"
+
+#~ msgid "reason: oprrsortop (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� oprrsortop (oid %s)\n"
+
+#~ msgid "WARNING: aggregate function \"%s\" (oid %s) not dumped\n"
+#~ msgstr "����: δת���ۼ����� \"%s\"(oid %s)\n"
+
+#~ msgid "reason: aggbasetype (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� aggbasetype (oid %s)\n"
+
+#~ msgid "reason: aggtranstype (oid %s) not found\n"
+#~ msgstr "ԭ��: δ�ҵ� aggtranstype (oid %s)\n"
+
+#~ msgid ""
+#~ "dumpTables(): failed sanity check, could not find index (%s) for primary "
+#~ "key constraint\n"
+#~ msgstr "dumpTables(): ��ȫ���ʧ��,�޷�Ϊ����Լ���ҵ����� (%s)\n"
+
+#~ msgid "dumpIndexes(): failed sanity check, table %s was not found\n"
+#~ msgstr "dumpIndexes(): ��ȫ���ʧ��, δ�ҵ��� %s\n"
+
+#~ msgid "dumping out triggers\n"
+#~ msgstr "ת��������\n"
+
+#~ msgid "reading index information\n"
+#~ msgstr "��ȡ������Ϣ\n"
 
-#: pg_restore.c:459
-msgid "Report bugs to <pgsql-bugs@postgresql.org>."
-msgstr "�� <pgsql-bugs@postgresql.org> �������."
+#~ msgid "finding the column names and types for each table\n"
+#~ msgstr "Ϊÿ���������ֶ����ֺ�����\n"
+
+#~ msgid "failed sanity check, table \"%s\" not found by flagInhAttrs\n"
+#~ msgstr "��ȫ���ʧ��, flagInhAttrs û���ҵ��� \"%s\"\n"
+
+#~ msgid ""
+#~ "WARNING:\n"
+#~ "  Data restoration may fail because existing triggers cannot be disabled\n"
+#~ "  (no superuser user name specified).  This is only a problem when\n"
+#~ "  restoring into a database with already existing triggers.\n"
+#~ msgstr ""
+#~ "����:\n"
+#~ " ���ݻָ�����ʧ��, ��Ϊ�޷��ر����д�����\n"
+#~ " (û���ṩ�����û���). �������ֻ��������һ��\n"
+#~ " �Ѿ����ڴ����������ݿ��лָ�����.\n"
+
+#~ msgid "null result checking superuser status of %s\n"
+#~ msgstr "��� %s �ij����û�״̬ʱ�յ��ս��\n"
+
+#~ msgid "could not check superuser status of %s: %s"
+#~ msgstr "�޷���� %s �ij����û�״̬: %s"
+
+#
+#~ msgid ""
+#~ "  -a, --data-only          restore only the data, no schema\n"
+#~ "  -c, --clean              clean (drop) schema prior to create\n"
+#~ "  -C, --create             issue commands to create the database\n"
+#~ "  -d, --dbname=NAME        output database name\n"
+#~ "  -f, --file=FILENAME      output file name\n"
+#~ "  -F, --format={c|t}       specify backup file format\n"
+#~ "  -h, --host=HOSTNAME      server host name\n"
+#~ "  -i, --index=NAME         restore named index\n"
+#~ "  -l, --list               print summarized TOC of the archive\n"
+#~ "  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
+#~ "                           output from this file\n"
+#~ "  -N, --orig-order         restore in original dump order\n"
+#~ "  -o, --oid-order          restore in OID order\n"
+#~ "  -O, --no-owner           do not reconnect to database to match\n"
+#~ "                           object owner\n"
+#~ "  -p, --port=PORT          server port number\n"
+#~ "  -P, --function=NAME      restore named function\n"
+#~ "  -r, --rearrange          rearrange output to put indexes etc. at end\n"
+#~ "  -R, --no-reconnect       disallow ALL reconnections to the database\n"
+#~ "  -s, --schema-only        restore only the schema, no data\n"
+#~ "  -S, --superuser=NAME     specify the superuser user name to use for\n"
+#~ "                           disabling triggers\n"
+#~ "  -t, --table=NAME         restore named table\n"
+#~ "  -T, --trigger=NAME       restore named trigger\n"
+#~ "  -U, --username=NAME      connect as specified database user\n"
+#~ "  -v, --verbose            verbose mode\n"
+#~ "  -W, --password           force password prompt (should happen "
+#~ "automatically)\n"
+#~ "  -x, --no-privileges      skip restoration of access privileges (grant/"
+#~ "revoke)\n"
+#~ "  -X use-set-session-authorization, --use-set-session-authorization\n"
+#~ "                           use SET SESSION AUTHORIZATION commands "
+#~ "instead\n"
+#~ "                           of reconnecting, if possible\n"
+#~ msgstr ""
+#~ "  -a, --data-only          ֻ�ָ�����, ���������\n"
+#~ "  -c, --clean              �ڴ���֮ǰ����(ɾ��)���\n"
+#~ "  -C, --create             �����������ݿ������\n"
+#~ "  -d, --dbname=����        ������ݿ�����\n"
+#~ "  -f, --file=�ļ���        ����ļ���\n"
+#~ "  -F, --format={c|t}       ���������ļ���ʽ\n"
+#~ "  -h, --host=HOSTNAME      ������������\n"
+#~ "  -i, --index=����         �ָ�ָ��������\n"
+#~ "  -l, --list               ��ӡ�鵵�ĸ�ҪĿ¼\n"
+#~ "  -L, --use-list=�ļ���    ʹ��ָ��Ŀ¼��Ϊ���ļ���������򷽷�\n"
+#~ "  -N, --orig-order         ����ԭʼ��ת��˳��ָ�\n"
+#~ "  -o, --oid-order          ���� OID ˳��ָ�\n"
+#~ "  -O, --no-owner           ��ҪΪ��ƥ����������߶������������ݿ�\n"
+#~ "  -p, --port=PORT          �������˿ں�\n"
+#~ "  -P, --function=����      �ָ�ָ���ĺ���\n"
+#~ "  -r, --rearrange          �������, ������������ĩβ\n"
+#~ "  -R, --no-reconnect       ��ֹ���������ݿ����������\n"
+#~ "  -s, --schema-only        ֻ�ָ����, ���ָ�����\n"
+#~ "  -S, --superuser=����     �������ڽ�ֹ�������ij����û�����\n"
+#~ "  -t, --table=����         �ָ�ָ����\n"
+#~ "  -T, --trigger=����       �ָ�ָ��������\n"
+#~ "  -U, --username=����      ��ָ�����ݿ��û���������\n"
+#~ "  -v, --verbose            �߳�ģʽ\n"
+#~ "  -W, --password           ǿ�ƿ�����ʾ (Ӧ���Զ�����)\n"
+#~ "  -x, --no-privileges      ���Է���Ȩ��(grant/revoke)�Ļָ�\n"
+#~ "  -X use-set-session-authorization, --use-set-session-authorization\n"
+#~ "                           �������� SET SESSION AUTHORIZATION ���������\n"
+#~ "                           ��������\n"
+
+#
+#~ msgid ""
+#~ "  -a                       restore only the data, no schema\n"
+#~ "  -c                       clean (drop) schema prior to create\n"
+#~ "  -C                       issue commands to create the database\n"
+#~ "  -d NAME                  output database name\n"
+#~ "  -f FILENAME              output file name\n"
+#~ "  -F {c|t}                 specify backup file format\n"
+#~ "  -h HOSTNAME              server host name\n"
+#~ "  -i NAME                  restore named index\n"
+#~ "  -l                       print summarized TOC of the archive\n"
+#~ "  -L FILENAME              use specified table of contents for ordering\n"
+#~ "                           output from this file\n"
+#~ "  -N                       restore in original dump order\n"
+#~ "  -o                       restore in OID order\n"
+#~ "  -O                       do not reconnect to database to match\n"
+#~ "                           object owner\n"
+#~ "  -p PORT                  server port number\n"
+#~ "  -P NAME                  restore named function\n"
+#~ "  -r                       rearrange output to put indexes etc. at end\n"
+#~ "  -R                       disallow ALL reconnections to the database\n"
+#~ "  -s                       restore only the schema, no data\n"
+#~ "  -S NAME                  specify the superuser user name to use for\n"
+#~ "                           disabling triggers\n"
+#~ "  -t NAME                  restore named table\n"
+#~ "  -T NAME                  restore named trigger\n"
+#~ "  -U NAME                  connect as specified database user\n"
+#~ "  -v                       verbose mode\n"
+#~ "  -W                       force password prompt (should happen "
+#~ "automatically)\n"
+#~ "  -x                       skip restoration of access privileges (grant/"
+#~ "revoke)\n"
+#~ "  -X use-set-session-authorization\n"
+#~ "                           use SET SESSION AUTHORIZATION commands "
+#~ "instead\n"
+#~ "                           of reconnecting, if possible\n"
+#~ msgstr ""
+#~ "  -a                       ֻ�ָ�����, ���ָ����\n"
+#~ "  -c                       ����֮ǰ����(ɾ��)���\n"
+#~ "  -C                       �����������ݿ������\n"
+#~ "  -d ����                  ������ݿ���\n"
+#~ "  -f �ļ���                ����ļ���\n"
+#~ "  -F {c|t}                 ���������ļ���ʽ\n"
+#~ "  -h ������                ������������\n"
+#~ "  -i ����                  �ָ�ָ������\n"
+#~ "  -l                       ��ӡ�鵵�ĸ�ҪĿ¼\n"
+#~ "  -L �ļ���                ʹ��ָ����Ŀ¼��Ϊ�Ը��ļ���������򷽷�\n"
+#~ "  -N                       ��ԭʼ��ת��˳��ָ�\n"
+#~ "  -o                       �� oid (�����ʶ) ��˳��ָ�\n"
+#~ "  -O                       ��ҪΪƥ�������������������ݿ������������"
+#~ "��\n"
+#~ "  -p �˿�                  �������˿ں�\n"
+#~ "  -P ����                  �ָ�ָ������\n"
+#~ "  -r                       �����������, �������ȷŵ�ĩβ\n"
+#~ "  -R                       ��ֹ���������ݿ����������\n"
+#~ "  -s                       ֻ�ָ����, ���ָ�����\n"
+#~ "  -S ����                  �������ڹرմ������ij����û���\n"
+#~ "  -t ����                  �ָ�ָ����\n"
+#~ "  -T ����                  �ָ�ָ��������\n"
+#~ "  -U ����                  ��ָ�����ݿ��û���������\n"
+#~ "  -v                       �߳�ģʽ\n"
+#~ "  -W                       ǿ�ƿ�����ʾ(Ӧ���Զ�����)\n"
+#~ "  -x                       ���Է���Ȩ�� (grant/reovke) �Ļָ�\n"
+#~ "  -X use-set-session-authorization\n"
+#~ "                           ������ʹ�� SET SESSION AUTHORIZATION ����, ����"
+#~ "��\n"
+#~ "                           ������\n"
diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index 278d1a1ded45dbc8be565b8c923cf23902365f46..88062cf9f9e9236f67a740d91851a70ff5a20da5 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.3 2002/09/22 20:57:21 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/nls.mk,v 1.4 2002/10/14 19:04:28 petere Exp $
 CATALOG_NAME	:= pg_resetxlog
-AVAIL_LANGUAGES	:= de ru
+AVAIL_LANGUAGES	:= de pt_BR ru sv zh_CN
 GETTEXT_FILES	:= pg_resetxlog.c
 GETTEXT_TRIGGERS:= _
diff --git a/src/bin/pg_resetxlog/po/pt_BR.po b/src/bin/pg_resetxlog/po/pt_BR.po
new file mode 100644
index 0000000000000000000000000000000000000000..742139fd0fe6b4252cab2bd4327904582fc5838a
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/pt_BR.po
@@ -0,0 +1,278 @@
+# Translation to Portuguese (Brazilian) language
+# Cesar Suga <sartre@linuxbr.com>, 2002.
+# Fair & Simple Networks Ltda.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-29 06:35-0300\n"
+"PO-Revision-Date: 2002-09-29 06:45-0300\n"
+"Last-Translator: Cesar Suga <sartre@linuxbr.com>\n"
+"Language-Team: Cesar Suga <sartre@linuxbr.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: ID de transa��o (-x) n�o pode ser 0\n"
+
+#: pg_resetxlog.c:149
+#, c-format
+msgid "%s: invalid argument for -l 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
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Tente '%s --help' para mais informa��o.\n"
+
+#: pg_resetxlog.c:163
+#, 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
+#, 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
+#, 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"
+
+#: pg_resetxlog.c:210
+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"
+
+#: pg_resetxlog.c:222
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"O servidor de banco de dados n�o foi desativado corretamente.\n"
+"Resetar 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
+msgid "Transaction log reset\n"
+msgstr "Reset do log de transa��o\n"
+
+#: pg_resetxlog.c:276
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, do\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"Se voc� tem certeza de que o diret�rio de dados est� correto, fa�a\n"
+"  touch %s\n"
+"e tente noavmente.\n"
+
+#: pg_resetxlog.c:289
+#, c-format
+msgid "%s: could not read %s: %s\n"
+msgstr "%s: n�o pude ler %s: %s\n"
+
+#: pg_resetxlog.c:312
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control existe mas tem CRC inv�lido: prossiga com cuidado\n"
+
+#: pg_resetxlog.c:321
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control existe mas � de vers�o desconhecida ou n�o funciona; ignorando\n"
+
+#: pg_resetxlog.c:363
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: setagem de LC_COLLATE inv�lida\n"
+
+#: pg_resetxlog.c:370
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: setagem LC_CTYPE inv�lida\n"
+
+#: pg_resetxlog.c:392
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"Valores de pg_control supostos:\n"
+"\n"
+
+#: pg_resetxlog.c:394
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"Valores de pg_control:\n"
+"\n"
+
+#: pg_resetxlog.c:396
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "N�mero de vers�o do pg_control:       %u\n"
+
+#: pg_resetxlog.c:397
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "N�mero de vers�o de cat�logo:         %u\n"
+
+#: pg_resetxlog.c:398
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "ID de arquivo de log atual:           %u\n"
+
+#: pg_resetxlog.c:399
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "Pr�ximo segmento de arquivo de log:   %u\n"
+
+#: pg_resetxlog.c:400
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "�ltimo StartUpID do checkpoint:       %u\n"
+
+#: pg_resetxlog.c:401
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "�ltimo NextXID do checkpoint:         %u\n"
+
+#: pg_resetxlog.c:402
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "�ltimo NextOID do checkpoint:         %u\n"
+
+#: pg_resetxlog.c:403
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Tamanho de bloco do banco de dados:   %u\n"
+
+#: pg_resetxlog.c:404
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Blocos/segmento de rela��o grande:   %u\n"
+
+#: pg_resetxlog.c:405
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_resetxlog.c:406
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+
+#: pg_resetxlog.c:459
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr ""
+"%s: erro interno -- sizeof(ControlFileData) muito grande ... consertar xlog.c\n"
+
+#: pg_resetxlog.c:472
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: n�o pude criar arquivo de pg_control: %s\n"
+
+#: pg_resetxlog.c:483
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: n�o pude escerver arquivo de pg_control: %s\n"
+
+#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: erro de fsync: %s\n"
+
+#: pg_resetxlog.c:511
+#, c-format
+msgid "%s: could not open directory %s: %s\n"
+msgstr "%s: n�o pude abrir diret�rio %s: %s\n"
+
+#: pg_resetxlog.c:525
+#, c-format
+msgid "%s: could not delete file %s: %s\n"
+msgstr "%s: n�o pude deletar arquivo %s: %s\n"
+
+#: pg_resetxlog.c:535
+#, 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
+#, 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
+#, c-format
+msgid "%s: could not write %s: %s\n"
+msgstr "%s: n�o pude escrever %s: %s\n"
+
+#: pg_resetxlog.c:642
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s reseta o log de transa��o PostgreSQL.\n"
+"\n"
+
+#: pg_resetxlog.c:643
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTIONS] DATADIR\n"
+"\n"
+msgstr ""
+"Uso:\n"
+"  %s [OP��ES] DATADIR\n"
+"\n"
+
+#: pg_resetxlog.c:644
+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:646
+msgid ""
+"  -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"
+
+#: pg_resetxlog.c:647
+msgid ""
+"  -n                no update, just show extracted control values (for "
+"testing)\n"
+msgstr ""
+"  -n                sem update, s� mostra valores de controle extra�dos (para teste)\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:649
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Reportar bugs a <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/pg_resetxlog/po/ru.po b/src/bin/pg_resetxlog/po/ru.po
index 7bd8009ea3d8d7052658da2dcd63a347218caa29..c93c598079e8414eb7cb3f3550c43644b4b07ecb 100644
--- a/src/bin/pg_resetxlog/po/ru.po
+++ b/src/bin/pg_resetxlog/po/ru.po
@@ -1,49 +1,66 @@
 # ru.po
 # PG_RESETXLOG Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.1 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.2 2002/10/14 19:04:28 petere Exp $
 #
 # Changelog:
-#   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-09-07 19:50-0400\n"
-"PO-Revision-Date: 2002-08-31 15:17-0500\n"
+"POT-Creation-Date: 2002-10-12 13:18-0400\n"
+"PO-Revision-Date: 2002-10-12 13:27-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:144
+#, c-format
+msgid "%s: invalid argument for -x option\n"
+msgstr "%s: �������� �������� ��� ����� -x\n"
+
+#: pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175 pg_resetxlog.c:182
+#: pg_resetxlog.c:188 pg_resetxlog.c:196
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "�������� '%s --help' ��� ����� ��������� ���������.\n"
+
+#: pg_resetxlog.c:150
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: ID ���������� (-x) �� ������ ���� 0\n"
 
-#: pg_resetxlog.c:149
+#: pg_resetxlog.c:159
 #, c-format
-msgid "%s: invalid argument for -l option\n"
-msgstr "%s: �������� �������� ��� ����� -l\n"
+msgid "%s: invalid argument for -o option\n"
+msgstr "%s: �������� �������� ��� ����� -o\n"
 
-#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#: pg_resetxlog.c:165
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "�������� '%s --help' ��� ����� ��������� ���������.\n"
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) �� ������ ���� 0\n"
+
+#: pg_resetxlog.c:174 pg_resetxlog.c:181
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: �������� �������� ��� ����� -l\n"
 
-#: pg_resetxlog.c:163
+#: pg_resetxlog.c:195
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: ���������� ������ �� �������\n"
 
-#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#: pg_resetxlog.c:215 pg_resetxlog.c:311
 #, c-format
 msgid "%s: could not open %s for reading: %s\n"
 msgstr "%s: �� ���������� ������� %s ��� ������: %s\n"
 
-#: pg_resetxlog.c:189
+#: pg_resetxlog.c:221
 #, c-format
 msgid ""
 "%s: lock file %s exists\n"
@@ -52,7 +69,7 @@ msgstr ""
 "%s: �������� lock-���� %s\n"
 "������� �� ������? ���� ���, ������� ���� ���� � ���������� �����.\n"
 
-#: pg_resetxlog.c:210
+#: pg_resetxlog.c:260
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -61,7 +78,7 @@ msgstr ""
 "���� ��� �������� �������� �����������, ����������� -f ��� ������ģ����� "
 "������.\n"
 
-#: pg_resetxlog.c:222
+#: pg_resetxlog.c:272
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -72,11 +89,11 @@ msgstr ""
 "���� �� �ӣ�� ������ ���������� � ����� ������, ����������� -f ��� "
 "������ģ����� ������.\n"
 
-#: pg_resetxlog.c:247
+#: pg_resetxlog.c:285
 msgid "Transaction log reset\n"
 msgstr "��� ���������� �������\n"
 
-#: pg_resetxlog.c:276
+#: pg_resetxlog.c:314
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, do\n"
@@ -87,32 +104,36 @@ msgstr ""
 "  touch %s\n"
 "� ���������� �����.\n"
 
-#: pg_resetxlog.c:289
+#: pg_resetxlog.c:327
 #, c-format
 msgid "%s: could not read %s: %s\n"
 msgstr "%s: �� ���������� ������� %s: %s\n"
 
-#: pg_resetxlog.c:312
+#: pg_resetxlog.c:350
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
-msgstr "%s: pg_control ����������, �� ��� ����������� ����� CRC �������; ����������� � �������������\n"
+msgstr ""
+"%s: pg_control ����������, �� ��� ����������� ����� CRC �������; ����������� "
+"� �������������\n"
 
-#: pg_resetxlog.c:321
+#: pg_resetxlog.c:359
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control ���������� �� ������ģ� ��� ����������� ������; ������������...\n"
+msgstr ""
+"%s: pg_control ���������� �� ������ģ� ��� ����������� ������; "
+"������������...\n"
 
-#: pg_resetxlog.c:363
+#: pg_resetxlog.c:410
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s: �������� �������� LC_COLLATE\n"
 
-#: pg_resetxlog.c:370
+#: pg_resetxlog.c:417
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s: �������� �������� LC_CTYPE\n"
 
-#: pg_resetxlog.c:392
+#: pg_resetxlog.c:439
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -120,7 +141,7 @@ msgstr ""
 "��������� �������� pg_control:\n"
 "\n"
 
-#: pg_resetxlog.c:394
+#: pg_resetxlog.c:441
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -128,109 +149,138 @@ msgstr ""
 "�������� pg_control:\n"
 "\n"
 
-#: pg_resetxlog.c:396
+#: pg_resetxlog.c:443
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "����� ������ pg_control:              %u\n"
 
-#: pg_resetxlog.c:397
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "����� ������ ��������:                %u\n"
 
-#: pg_resetxlog.c:398
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "������� ID ����� �������:             %u\n"
 
-#: pg_resetxlog.c:399
+#: pg_resetxlog.c:446
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "��������� ������� ����� �������:      %u\n"
 
-#: pg_resetxlog.c:400
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's StartUpID:        %u\n"
 msgstr "StartUpID ��������� checkpoint:       %u\n"
 
-#: pg_resetxlog.c:401
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "NextXID ��������� checkpoint:         %u\n"
 
-#: pg_resetxlog.c:402
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "NextOID ��������� checkpoint:         %u\n"
 
-#: pg_resetxlog.c:403
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "������ ����� ����:                    %u\n"
 
-#: pg_resetxlog.c:404
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "������ �� ������� ������� �����:      %u\n"
 
-#: pg_resetxlog.c:405
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "������������ ����� ���������������:   %u\n"
+
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "����. ����� ���������� �������:       %u\n"
+
+#: pg_resetxlog.c:454
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "��� �������� ����/�������:            %s\n"
+
+#: pg_resetxlog.c:455
+msgid "64-bit integers"
+msgstr "64-������ �����"
+
+#: pg_resetxlog.c:455
+msgid "Floating point"
+msgstr "��������� �������"
+
+#: pg_resetxlog.c:456
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "������������ ����� ����� ������:      %u\n"
+
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_resetxlog.c:406
+#: pg_resetxlog.c:458
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:459
+#: pg_resetxlog.c:511
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr ""
-"%s: ���������� ������ -- sizeof(ControlFileData) ������� ����� ... ���� ��������� xlog.c\n"
+"%s: ���������� ������ -- sizeof(ControlFileData) ������� ����� ... ���� "
+"��������� xlog.c\n"
 
-#: pg_resetxlog.c:472
+#: pg_resetxlog.c:524
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: �� ���������� ������� ���� pg_control: %s\n"
 
-#: pg_resetxlog.c:483
+#: pg_resetxlog.c:535
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: �� ���������� �������� � ���� pg_control: %s\n"
 
-#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#: pg_resetxlog.c:542 pg_resetxlog.c:683
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: ������ fsync: %s\n"
 
-#: pg_resetxlog.c:511
+#: pg_resetxlog.c:563
 #, c-format
 msgid "%s: could not open directory %s: %s\n"
 msgstr "%s: �� ���������� ������� ���������� %s: %s\n"
 
-#: pg_resetxlog.c:525
+#: pg_resetxlog.c:577
 #, c-format
 msgid "%s: could not delete file %s: %s\n"
 msgstr "%s: �� ���������� ������� ���� %s: %s\n"
 
-#: pg_resetxlog.c:535
+#: pg_resetxlog.c:587
 #, c-format
 msgid "%s: could not read from directory %s: %s\n"
 msgstr "%s: �� ���������� ������� �� ���������� %s: %s\n"
 
-#: pg_resetxlog.c:598
+#: pg_resetxlog.c:650
 #, c-format
 msgid "%s: could not open %s: %s\n"
 msgstr "%s: �� ���������� ������� %s: %s\n"
 
-#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#: pg_resetxlog.c:661 pg_resetxlog.c:675
 #, c-format
 msgid "%s: could not write %s: %s\n"
 msgstr "%s: �� ���������� �������� %s: %s\n"
 
-#: pg_resetxlog.c:642
+#: pg_resetxlog.c:694
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -239,7 +289,7 @@ msgstr ""
 "%s ���������� ��� ���������� PostgreSQL.\n"
 "\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetxlog.c:695
 #, c-format
 msgid ""
 "Usage:\n"
@@ -250,15 +300,15 @@ msgstr ""
 "  %s [�����] ���������\n"
 "\n"
 
-#: pg_resetxlog.c:644
+#: pg_resetxlog.c:696
 msgid "Options:\n"
 msgstr "�����:\n"
 
-#: pg_resetxlog.c:645
+#: pg_resetxlog.c:697
 msgid "  -f                force update to be done\n"
 msgstr "  -f                ������������� ���������� ����������\n"
 
-#: pg_resetxlog.c:646
+#: pg_resetxlog.c:698
 msgid ""
 "  -l FILEID,SEG     force minimum WAL starting location for new transaction "
 "log\n"
@@ -266,7 +316,7 @@ msgstr ""
 "  -l FILEID,SEG     ���������� ����������� ��������� �������� � WAL ��� "
 "������ ���� ����������\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:699
 msgid ""
 "  -n                no update, just show extracted control values (for "
 "testing)\n"
@@ -274,11 +324,15 @@ msgstr ""
 "  -n                ��� ����������, ������ �������� ��������� ����������� "
 "�������� (��� ������������)\n"
 
-#: pg_resetxlog.c:648
+#: pg_resetxlog.c:700
+msgid "  -o OID            set next OID\n"
+msgstr "  -o OID            ��������� ����������� OID\n"
+
+#: pg_resetxlog.c:701
 msgid "  -x XID            set next transaction ID\n"
 msgstr "  -x XID            ��������� ID ��������� ����������\n"
 
-#: pg_resetxlog.c:649
+#: pg_resetxlog.c:702
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/pg_resetxlog/po/sv.po b/src/bin/pg_resetxlog/po/sv.po
new file mode 100644
index 0000000000000000000000000000000000000000..4fac3f3b7a542550785386dd555d1a7fb8a03bac
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/sv.po
@@ -0,0 +1,316 @@
+# Swedish message translation file for resetxlog.
+# Dennis Bj�rklund <db@zigo.dhs.org>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-10-04 04:17-0400\n"
+"PO-Revision-Date: 2002-10-04 18:28+0200\n"
+"Last-Translator: Dennis 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_resetxlog.c:144
+#, c-format
+msgid "%s: invalid argument for -x option\n"
+msgstr "%s: ogiltigt argument till flaggan -x\n"
+
+#: pg_resetxlog.c:145 pg_resetxlog.c:160 pg_resetxlog.c:175 pg_resetxlog.c:182
+#: pg_resetxlog.c:188 pg_resetxlog.c:196
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "F�rs�k med \"%s --help\" f�r mer information.\n"
+
+#: pg_resetxlog.c:150
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: transaktions-ID (-x) f�r inte vara 0\n"
+
+#: pg_resetxlog.c:159
+#, c-format
+msgid "%s: invalid argument for -o option\n"
+msgstr "%s: ogiltigt argument till flaggan -o\n"
+
+#: pg_resetxlog.c:165
+#, c-format
+msgid "%s: OID (-o) must not be 0\n"
+msgstr "%s: OID (-o) f�r inte vara 0\n"
+
+#: pg_resetxlog.c:174 pg_resetxlog.c:181
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: ogiltigt argument till flaggan -l\n"
+
+#: pg_resetxlog.c:195
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: ingen datakatalog angiven\n"
+
+#: pg_resetxlog.c:215 pg_resetxlog.c:311
+#, c-format
+msgid "%s: could not open %s for reading: %s\n"
+msgstr "%s: kunde inte �ppna %s f�r l�sning: %s\n"
+
+#: pg_resetxlog.c:221
+#, c-format
+msgid ""
+"%s: lock file %s exists\n"
+"Is a server running? If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: l�sfil %s existerar\n"
+"K�r servern redan? Om inte, radera l�sfilen och f�rs�k igen.\n"
+
+#: pg_resetxlog.c:260
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"Om dessa v�rden verkar acceptable, anv�nd -f f�r\n"
+"att forcera �terst�llande.\n"
+
+#: pg_resetxlog.c:272
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"Databasservern st�ngdes inte ner korrekt. Att �terst�lla\n"
+"transaktionsloggen kan medf�ra att data f�rloras.\n"
+"Om du vill forts�tta �nd�, anv�nd -f f�r att forcera\n"
+"�terst�llande.\n"
+
+#: pg_resetxlog.c:285
+msgid "Transaction log reset\n"
+msgstr "�terst�llande fr�n transaktionslogg\n"
+
+#: pg_resetxlog.c:314
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, do\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"Om du �r s�ker p� att datakatalogs�kv�gen �r korrekt s� g�r\n"
+"  touch %s\n"
+"och f�rs�k igen\n"
+
+#: pg_resetxlog.c:327
+#, c-format
+msgid "%s: could not read %s: %s\n"
+msgstr "%s: kunde inte l�sa %s: %s\n"
+
+#: pg_resetxlog.c:350
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control existerar men har ogiltig CRC; forts�tt med f�rsiktighet\n"
+
+#: pg_resetxlog.c:359
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control existerar men �r trasig eller har ok�nd version; ignorerar den\n"
+
+#: pg_resetxlog.c:410
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: ogiltigt inst�llning f�r LC_COLLATE\n"
+
+#: pg_resetxlog.c:417
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: ogiltig inst�llning f�r LC_CTYPE\n"
+
+#: pg_resetxlog.c:439
+msgid ""
+"Guessed pg_control values:\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"
+
+#: pg_resetxlog.c:443
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control versionsnummer:            %u\n"
+
+#: pg_resetxlog.c:444
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Katalogversionsnummer:                %u\n"
+
+#: pg_resetxlog.c:445
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "Aktuell loggfil-ID:                   %u\n"
+
+#: pg_resetxlog.c:446
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "N�sta loggfilsegment:                 %u\n"
+
+#: pg_resetxlog.c:447
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "Senaste kontrollpunktens StartUpID:   %u\n"
+
+#: pg_resetxlog.c:448
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "Senaste kontrollpunktens NextXID:     %u\n"
+
+#: pg_resetxlog.c:449
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "Senaste kontrollpunktens NextOID:     %u\n"
+
+#: pg_resetxlog.c:450
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "Databasens blockstorlek:              %u\n"
+
+#: pg_resetxlog.c:451
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "Block per segment i stor relation:    %u\n"
+
+#: pg_resetxlog.c:452
+#, c-format
+msgid "Maximum length of identifiers:        %u\n"
+msgstr "Maximal l�ngd p� identifierare:       %u\n"
+
+#: pg_resetxlog.c:453
+#, c-format
+msgid "Maximum number of function arguments: %u\n"
+msgstr "Maximalt antal funktionsargument:     %u\n"
+
+#: pg_resetxlog.c:454
+#, c-format
+msgid "Date/time type storage:               %s\n"
+msgstr "Lagringstyp f�r datum/tid:            %s\n"
+
+#: pg_resetxlog.c:455
+msgid "64-bit integers"
+msgstr "64-bits heltal"
+
+#: pg_resetxlog.c:455
+msgid "Floating point"
+msgstr "Flyttal"
+
+#: pg_resetxlog.c:456
+#, c-format
+msgid "Maximum length of locale name:        %u\n"
+msgstr "Maximal l�ngd p� lokalnamn:           %u\n"
+
+#: pg_resetxlog.c:457
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_resetxlog.c:458
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+
+#: pg_resetxlog.c:511
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: internt fel -- sizeof(ControlFileData) �r f�r stor ... laga xlog.c\n"
+
+#: pg_resetxlog.c:524
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: kunde inte skapa pg_control-fil: %s\n"
+
+#: pg_resetxlog.c:535
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: kunde inte skriva pg_control-fil: %s\n"
+
+#: pg_resetxlog.c:542 pg_resetxlog.c:683
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsync fel: %s\n"
+
+#: pg_resetxlog.c:563
+#, c-format
+msgid "%s: could not open directory %s: %s\n"
+msgstr "%s: kunde inte �ppna katalog %s: %s\n"
+
+#: pg_resetxlog.c:577
+#, c-format
+msgid "%s: could not delete file %s: %s\n"
+msgstr "%s: kunde inte radera filen %s: %s\n"
+
+#: pg_resetxlog.c:587
+#, c-format
+msgid "%s: could not read from directory %s: %s\n"
+msgstr "%s: kunde inte l�sa fr�n katalog %s: %s\n"
+
+#: pg_resetxlog.c:650
+#, c-format
+msgid "%s: could not open %s: %s\n"
+msgstr "%s: kunde inte �ppna %s: %s\n"
+
+#: pg_resetxlog.c:661 pg_resetxlog.c:675
+#, c-format
+msgid "%s: could not write %s: %s\n"
+msgstr "%s: kunde inte skriva %s: %s\n"
+
+#: pg_resetxlog.c:694
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr "%s �terst�ller PostgreSQL transaktionslogg.\n\n"
+
+#: pg_resetxlog.c:695
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTIONS] DATADIR\n"
+"\n"
+msgstr ""
+"Anv�ndning:\n"
+"  %s [FLAGGOR] DATAKATALOG\n"
+"\n"
+
+#: pg_resetxlog.c:696
+msgid "Options:\n"
+msgstr "Flaggor:\n"
+
+#: pg_resetxlog.c:697
+msgid "  -f                force update to be done\n"
+msgstr "  -f                forcera �terst�llande\n"
+
+#: pg_resetxlog.c:698
+msgid ""
+"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"log\n"
+msgstr "  -l FILID,SEG      ange minsta WAL-startposition f�r ny transaktionslogg\n"
+
+#: pg_resetxlog.c:699
+msgid ""
+"  -n                no update, just show extracted control values (for "
+"testing)\n"
+msgstr "  -n                ingen updatering, visa bara 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"
+
+#: pg_resetxlog.c:701
+msgid "  -x XID            set next transaction ID\n"
+msgstr "  -x XID            s�tt n�sta transaktions-ID\n"
+
+#: pg_resetxlog.c:702
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "\nReportera buggar till <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/pg_resetxlog/po/zh_CN.po b/src/bin/pg_resetxlog/po/zh_CN.po
new file mode 100644
index 0000000000000000000000000000000000000000..4eca75ca4561b34ab7916833896f6b9029a4681a
--- /dev/null
+++ b/src/bin/pg_resetxlog/po/zh_CN.po
@@ -0,0 +1,274 @@
+# simplified Chinese translation file for pg_resetxlog and friends
+# Bao Wei <weibao@forevertek.com>, 2002.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-27 13:41+0800\n"
+"PO-Revision-Date: 2002-09-19 16:43+0800\n"
+"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_resetxlog.c:141
+#, c-format
+msgid "%s: transaction ID (-x) must not be 0\n"
+msgstr "%s: ���� ID (-x) ����Ϊ 0\n"
+
+#: pg_resetxlog.c:149
+#, c-format
+msgid "%s: invalid argument for -l option\n"
+msgstr "%s: Ϊ -l ѡ�����Ч����\n"
+
+#: pg_resetxlog.c:150 pg_resetxlog.c:156 pg_resetxlog.c:164
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "���� '%s --help' ��ȡ�������Ϣ.\n"
+
+#: pg_resetxlog.c:163
+#, c-format
+msgid "%s: no data directory specified\n"
+msgstr "%s: û��ָ������Ŀ¼\n"
+
+#: pg_resetxlog.c:183 pg_resetxlog.c:273
+#, c-format
+msgid "%s: could not open %s for reading: %s\n"
+msgstr "%s: �޷��� %s ��ȡ��Ϣ: %s\n"
+
+#: pg_resetxlog.c:189
+#, c-format
+msgid ""
+"%s: lock file %s exists\n"
+"Is a server running? If not, delete the lock file and try again.\n"
+msgstr ""
+"%s: ���ļ� %s �Ѿ�����\n"
+"�Ƿ���һ��������������? ���û��, ɾ���Ǹ����ļ�Ȼ������һ��.\n"
+
+#: pg_resetxlog.c:210
+msgid ""
+"\n"
+"If these values seem acceptable, use -f to force reset.\n"
+msgstr ""
+"\n"
+"�����Щֵ�ɽ���, �� -f ǿ������.\n"
+
+#: pg_resetxlog.c:222
+msgid ""
+"The database server was not shut down cleanly.\n"
+"Resetting the transaction log may cause data to be lost.\n"
+"If you want to proceed anyway, use -f to force reset.\n"
+msgstr ""
+"���ݿ������û�г��׹ر�.\n"
+"����������־�п��ܻ�����ʧ����.\n"
+"������������, �� -f ǿ������.\n"
+
+#: pg_resetxlog.c:247
+msgid "Transaction log reset\n"
+msgstr "������־����\n"
+
+#: pg_resetxlog.c:276
+#, c-format
+msgid ""
+"If you are sure the data directory path is correct, do\n"
+"  touch %s\n"
+"and try again.\n"
+msgstr ""
+"�����ȷ������Ŀ¼·������ȷ��, ����\n"
+"  touch %s\n"
+"Ȼ������һ��.\n"
+
+#: pg_resetxlog.c:289
+#, c-format
+msgid "%s: could not read %s: %s\n"
+msgstr "%s: �޷���ȡ %s: %s\n"
+
+#: pg_resetxlog.c:312
+#, c-format
+msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
+msgstr "%s: pg_control �Ѿ�����, ������Ч��CRC; ���о���ļ�������\n"
+
+#: pg_resetxlog.c:321
+#, c-format
+msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
+msgstr "%s: pg_control �Ѿ�����, �����ƻ�����Ч�汾; ������\n"
+
+#: pg_resetxlog.c:363
+#, c-format
+msgid "%s: invalid LC_COLLATE setting\n"
+msgstr "%s: ���� LC_COLLATE ����\n"
+
+#: pg_resetxlog.c:370
+#, c-format
+msgid "%s: invalid LC_CTYPE setting\n"
+msgstr "%s: ���� LC_CTYPE ����\n"
+
+#: pg_resetxlog.c:392
+msgid ""
+"Guessed pg_control values:\n"
+"\n"
+msgstr ""
+"�²�� pg_control ֵ:\n"
+"\n"
+
+#: pg_resetxlog.c:394
+msgid ""
+"pg_control values:\n"
+"\n"
+msgstr ""
+"pg_control ֵ:\n"
+"\n"
+
+#: pg_resetxlog.c:396
+#, c-format
+msgid "pg_control version number:            %u\n"
+msgstr "pg_control �汾:            %u\n"
+
+#: pg_resetxlog.c:397
+#, c-format
+msgid "Catalog version number:               %u\n"
+msgstr "Catalog �汾:               %u\n"
+
+#: pg_resetxlog.c:398
+#, c-format
+msgid "Current log file ID:                  %u\n"
+msgstr "��ǰ��־�ļ�ID:                  %u\n"
+
+#: pg_resetxlog.c:399
+#, c-format
+msgid "Next log file segment:                %u\n"
+msgstr "��һ����־�ļ���:                %u\n"
+
+#: pg_resetxlog.c:400
+#, c-format
+msgid "Latest checkpoint's StartUpID:        %u\n"
+msgstr "���¼���� StartUpID:        %u\n"
+
+#: pg_resetxlog.c:401
+#, c-format
+msgid "Latest checkpoint's NextXID:          %u\n"
+msgstr "���¼���� NextXID:          %u\n"
+
+#: pg_resetxlog.c:402
+#, c-format
+msgid "Latest checkpoint's NextOID:          %u\n"
+msgstr "���¼���� NextOID:          %u\n"
+
+#: pg_resetxlog.c:403
+#, c-format
+msgid "Database block size:                  %u\n"
+msgstr "���ݿ���С:                  %u\n"
+
+#: pg_resetxlog.c:404
+#, c-format
+msgid "Blocks per segment of large relation: %u\n"
+msgstr "���ϵ��ÿ�ο���: %u\n"
+
+#: pg_resetxlog.c:405
+#, c-format
+msgid "LC_COLLATE:                           %s\n"
+msgstr "LC_COLLATE:                           %s\n"
+
+#: pg_resetxlog.c:406
+#, c-format
+msgid "LC_CTYPE:                             %s\n"
+msgstr "LC_CTYPE:                             %s\n"
+
+#: pg_resetxlog.c:459
+#, c-format
+msgid ""
+"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: �ڲ����� -- sizeof(ControlFileData) ̫�� ... �޸� xlog.c\n"
+
+#: pg_resetxlog.c:472
+#, c-format
+msgid "%s: could not create pg_control file: %s\n"
+msgstr "%s: �޷����� pg_control �ļ�: %s\n"
+
+#: pg_resetxlog.c:483
+#, c-format
+msgid "%s: could not write pg_control file: %s\n"
+msgstr "%s: �޷�д pg_control �ļ�: %s\n"
+
+#: pg_resetxlog.c:490 pg_resetxlog.c:631
+#, c-format
+msgid "%s: fsync error: %s\n"
+msgstr "%s: fsync ����: %s\n"
+
+#: pg_resetxlog.c:511
+#, c-format
+msgid "%s: could not open directory %s: %s\n"
+msgstr "%s: �޷���Ŀ¼ %s: %s\n"
+
+#: pg_resetxlog.c:525
+#, c-format
+msgid "%s: could not delete file %s: %s\n"
+msgstr "%s: �޷�ɾ���ļ� %s: %s\n"
+
+#: pg_resetxlog.c:535
+#, c-format
+msgid "%s: could not read from directory %s: %s\n"
+msgstr "%s: �޷���Ŀ¼ %s �ж�ȡ: %s\n"
+
+#: pg_resetxlog.c:598
+#, c-format
+msgid "%s: could not open %s: %s\n"
+msgstr "%s: �޷��� %s: %s\n"
+
+#: pg_resetxlog.c:609 pg_resetxlog.c:623
+#, c-format
+msgid "%s: could not write %s: %s\n"
+msgstr "%s: �޷�д %s: %s\n"
+
+#: pg_resetxlog.c:642
+#, c-format
+msgid ""
+"%s resets the PostgreSQL transaction log.\n"
+"\n"
+msgstr ""
+"%s ���� PostgreSQL ������־.\n"
+"\n"
+
+#: pg_resetxlog.c:643
+#, c-format
+msgid ""
+"Usage:\n"
+"  %s [OPTIONS] DATADIR\n"
+"\n"
+msgstr ""
+"ʹ�÷���:\n"
+"  %s [ѡ��] ����Ŀ¼\n"
+"\n"
+
+#: pg_resetxlog.c:644
+msgid "Options:\n"
+msgstr "ѡ��:\n"
+
+#: pg_resetxlog.c:645
+msgid "  -f                force update to be done\n"
+msgstr "  -f                ǿ�Ƹ���\n"
+
+#: pg_resetxlog.c:646
+msgid ""
+"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
+"log\n"
+msgstr "  -l FILEID,SEG     ���µ�������־��ǿ����С WAL ��ʼλ��\n"
+
+#: pg_resetxlog.c:647
+msgid ""
+"  -n                no update, just show extracted control values (for "
+"testing)\n"
+msgstr "  -n                δ����, ֻ��ʾ��ȡ�Ŀ���ֵ (������;)\n"
+
+#: pg_resetxlog.c:648
+msgid "  -x XID            set next transaction ID\n"
+msgstr "  -x XID            ������һ������ ID\n"
+
+#: pg_resetxlog.c:649
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"��������� <pgsql-bugs@postgresql.org>.\n"
diff --git a/src/bin/psql/po/ru.po b/src/bin/psql/po/ru.po
index dda5c4a2b85bfac6e88d0b2a5cc205f8507147ec..06f5b5f6d530e1eaa80f794e19d356280a2a8f23 100644
--- a/src/bin/psql/po/ru.po
+++ b/src/bin/psql/po/ru.po
@@ -1,270 +1,271 @@
 # ru.po
 # PSQL Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.3 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.4 2002/10/14 19:04:28 petere Exp $
 #
 # Changelog:
-#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-09-07 19:33-0400\n"
-"PO-Revision-Date: 2001-09-07 19:46-0500\n"
+"POT-Creation-Date: 2002-10-12 14:00-0400\n"
+"PO-Revision-Date: 2001-10-12 14:18-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: command.c:155
+#: command.c:156
 msgid "Warning: This syntax is deprecated.\n"
 msgstr "��������: ���� ��������� �������.\n"
 
-#: command.c:162
+#: command.c:163
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "������������ ������� \\%s. �������� \\? ��� ���������.\n"
 
-#: command.c:164
+#: command.c:165
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "������������ ������� \\%s\n"
 
-#: command.c:291
+#: command.c:292
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "���������� ���� �������� �������� (home) ����������: %s\n"
 
-#: command.c:307
+#: command.c:308
 #, c-format
 msgid "\\%s: could not change directory to '%s': %s\n"
 msgstr "\\%s: �� ���������� �������� ���������� �� '%s': %s\n"
 
-#: command.c:403 command.c:762
+#: command.c:404 command.c:763
 msgid "no query buffer\n"
 msgstr "��� ������ ��������\n"
 
-#: command.c:458
+#: command.c:459
 #, c-format
-msgid "%s: invalid encoding name or conversion proc not found\n"
+msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr ""
 "%s: ������������ �������� ��������� �������� ��� ������� ��������� �� "
 "�������\n"
 
-#: command.c:518 command.c:549 command.c:560 command.c:574 command.c:616
-#: command.c:742 command.c:771
+#: command.c:519 command.c:550 command.c:561 command.c:575 command.c:617
+#: command.c:743 command.c:772
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: ����������� ����������� ��������\n"
 
-#: command.c:604
+#: command.c:605
 msgid "Query buffer is empty."
 msgstr "����� �������� ����."
 
-#: command.c:637
+#: command.c:638
 msgid "Query buffer reset (cleared)."
 msgstr "����� �������� ������� (������)."
 
-#: command.c:648
+#: command.c:649
 #, c-format
 msgid "Wrote history to %s.\n"
 msgstr "������� �������� � %s.\n"
 
-#: command.c:688 command.c:1142 command.c:1239 command.c:1923 common.c:56
-#: copy.c:92 mainloop.c:80 mainloop.c:386 describe.c:41
+#: command.c:689 command.c:1143 command.c:1240 command.c:1924 common.c:57
+#: copy.c:94 mainloop.c:80 mainloop.c:386 describe.c:41
 msgid "out of memory\n"
 msgstr "������������ ������\n"
 
-#: command.c:697 command.c:747
+#: command.c:698 command.c:748
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: ������\n"
 
-#: 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:787 command.c:807 command.c:1003 command.c:1016 command.c:1027
+#: command.c:1581 command.c:1594 command.c:1606 command.c:1619 command.c:1633
+#: command.c:1647 command.c:1677 common.c:106 copy.c:310
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:872
+#: command.c:873
 #, c-format
 msgid "\\%s: extra argument '%s' ignored\n"
 msgstr "\\%s: �������� ��������: '%s' - ��������\n"
 
-#: command.c:963 command.c:991 command.c:1115
+#: command.c:964 command.c:992 command.c:1116
 msgid "parse error at the end of line\n"
 msgstr "������ ��� ������� ���������� � ����� ������\n"
 
-#: command.c:1354 command.c:1378 startup.c:175 startup.c:193
+#: command.c:1355 command.c:1379 startup.c:175 startup.c:193
 msgid "Password: "
 msgstr "������: "
 
-#: command.c:1392 common.c:154 common.c:247 common.c:419
+#: command.c:1393 common.c:155 common.c:248 common.c:434
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1396
+#: command.c:1397
 msgid "Previous connection kept\n"
 msgstr "���������� ������������� ���������\n"
 
-#: command.c:1408
+#: command.c:1409
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1420
+#: command.c:1421
 #, c-format
 msgid "You are now connected to database %s.\n"
 msgstr "�� ������ ������������ � ���� ������ %s.\n"
 
-#: command.c:1422
+#: command.c:1423
 #, c-format
 msgid "You are now connected as new user %s.\n"
 msgstr "�� ������ ������������ ��� ����� ������������ %s.\n"
 
-#: command.c:1425
+#: command.c:1426
 #, c-format
 msgid "You are now connected to database %s as user %s.\n"
 msgstr "�� ������ ������������ � ���� ������ %s ��� ������������ %s.\n"
 
-#: command.c:1518
+#: command.c:1519
 #, c-format
 msgid "could not start editor %s\n"
 msgstr "�� ���������� ��������� �������� %s\n"
 
-#: command.c:1520
+#: command.c:1521
 msgid "could not start /bin/sh\n"
 msgstr "�� ���������� ��������� /bin/sh\n"
 
-#: command.c:1565
+#: command.c:1566
 #, c-format
 msgid "could not open temporary file %s: %s\n"
 msgstr "�� ���������� ������� ��������� ���� %s: %s\n"
 
-#: command.c:1749
+#: command.c:1750
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset: ����������� �������: unaligned, aligned, html � latex\n"
 
-#: command.c:1754
+#: command.c:1755
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "������ ������: %s.\n"
 
-#: command.c:1764
+#: command.c:1765
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "����� �������: %d.\n"
 
-#: command.c:1773
+#: command.c:1774
 msgid "Expanded display is on.\n"
 msgstr "����������� ������� �������.\n"
 
-#: command.c:1774
+#: command.c:1775
 msgid "Expanded display is off.\n"
 msgstr "����������� ������� ��������.\n"
 
-#: command.c:1786
+#: command.c:1787
 #, c-format
 msgid "Null display is '%s'.\n"
 msgstr "����-�������: '%s'.\n"
 
-#: command.c:1798
+#: command.c:1799
 #, c-format
 msgid "Field separator is '%s'.\n"
 msgstr "����������� �����: '%s'.\n"
 
-#: command.c:1812
+#: command.c:1813
 msgid "Record separator is <newline>."
 msgstr "����������� �������: <newline>."
 
-#: command.c:1814
+#: command.c:1815
 #, c-format
 msgid "Record separator is '%s'.\n"
 msgstr "����������� �������: '%s'.\n"
 
-#: command.c:1825
+#: command.c:1826
 msgid "Showing only tuples."
 msgstr "������������ ������ ������."
 
-#: command.c:1827
+#: command.c:1828
 msgid "Tuples only is off."
 msgstr "����� \"������ ������\" ��������."
 
-#: command.c:1843
+#: command.c:1844
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "��������: \"%s\".\n"
 
-#: command.c:1845
+#: command.c:1846
 msgid "Title is unset.\n"
 msgstr "�������� �� �������.\n"
 
-#: command.c:1861
+#: command.c:1862
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "������� �������: \"%s\".\n"
 
-#: command.c:1863
+#: command.c:1864
 msgid "Table attributes unset.\n"
 msgstr "�������� ������� �� �������.\n"
 
-#: command.c:1874
+#: command.c:1875
 msgid "Using pager is on."
 msgstr "�������� ������������� ��������."
 
-#: command.c:1876
+#: command.c:1877
 msgid "Using pager is off."
 msgstr "������������� �������� ���������."
 
-#: command.c:1887
+#: command.c:1888
 msgid "Default footer is on."
 msgstr "������ ���������� �� ��������� �������."
 
-#: command.c:1889
+#: command.c:1890
 msgid "Default footer is off."
 msgstr "������ ���������� �� ��������� ��������."
 
-#: command.c:1895
+#: command.c:1896
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: ����������� �����: %s\n"
 
-#: command.c:1938
+#: command.c:1939
 msgid "\\!: failed\n"
 msgstr "\\!: ��������\n"
 
-#: common.c:49
+#: common.c:50
 #, c-format
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr ""
 "%s: xstrdup: �� �������� ������� ����� �������� ��������� (���������� "
 "������)\n"
 
-#: common.c:215 common.c:304
+#: common.c:216 common.c:309
 msgid "You are currently not connected to a database.\n"
 msgstr "� ������ ������ �� �� ������������ � ���� ������.\n"
 
-#: common.c:254 common.c:429
+#: common.c:255 common.c:444
 msgid "connection to server was lost\n"
 msgstr "������������� � ������� ���� ��������\n"
 
-#: common.c:257 common.c:432
+#: common.c:258 common.c:447
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "������������� � ������� ���� ��������. ������� ��������������: "
 
-#: common.c:261 common.c:436
+#: common.c:262 common.c:451
 msgid "Failed.\n"
 msgstr "����������.\n"
 
-#: common.c:271 common.c:448
+#: common.c:272 common.c:463
 msgid "Succeeded.\n"
 msgstr "�������.\n"
 
-#: common.c:312
+#: common.c:317
 #, c-format
 msgid ""
 "***(Single step mode: Verify query)"
@@ -279,7 +280,7 @@ msgstr ""
 "***(������� ���� ��� ����������� ��� �������� x � ���� ��� ������)"
 "**************\n"
 
-#: common.c:408
+#: common.c:423
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -288,41 +289,41 @@ msgstr ""
 "(newline).\n"
 "��������� � �������� ������ � ������ �� ����� �����."
 
-#: common.c:454
+#: common.c:469
 #, c-format
 msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
 msgstr ""
 "������� ����������� ������ NOTIFY '%s' �� ���-���� (backend) � pid %d.\n"
 
-#: common.c:466
+#: common.c:482 common.c:485
 #, c-format
 msgid "Time: %.2f ms\n"
 msgstr "�����: %.2f ��\n"
 
-#: copy.c:86
+#: copy.c:88
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: ���������� ���������\n"
 
-#: copy.c:234
+#: copy.c:236
 #, c-format
 msgid "\\copy: parse error at '%s'\n"
 msgstr "\\copy: ������ ��� ������� ���������� � '%s'\n"
 
-#: copy.c:236
+#: copy.c:238
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: ������ ��� ������� ���������� � ����� ������\n"
 
-#: copy.c:319
+#: copy.c:321
 #, c-format
-msgid "%s: cannot COPY TO/FROM a directory\n"
+msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: ������ ������������ COPY TO/FROM ��� ����������\n"
 
-#: copy.c:340
+#: copy.c:342
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:344
+#: copy.c:346
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: ����������� ����� (%d)\n"
@@ -342,16 +343,18 @@ msgstr "
 
 #: help.c:83
 #, c-format
-msgid "This is psql %s, the PostgreSQL interactive terminal.\n"
-msgstr "��� psql %s - ������������� �������� PostgreSQL.\n"
+msgid ""
+"This is psql %s, the PostgreSQL interactive terminal.\n"
+"\n"
+msgstr "��� psql %s, ������������� �������� PostgreSQL.\n"
 
 #: help.c:85
 msgid "Usage:"
 msgstr "�������������:"
 
 #: help.c:86
-msgid "  psql [options] [dbname [username]]\n"
-msgstr "  psql [�����] [����� [������������]]\n"
+msgid "  psql [OPTIONS] [DBNAME [USERNAME]]\n"
+msgstr "  psql [�����] [����� [������������]]\n"
 
 #: help.c:87
 msgid "Options:"
@@ -554,32 +557,30 @@ msgid " \\d [NAME]      describe table, index, sequence, or view\n"
 msgstr " \\d [���]       ������� �������, ������, ������������������ ��� ���\n"
 
 #: help.c:220
-msgid " \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n"
-msgstr ""
-" \\d{t|i|s|v|S} [������]  (�������� '+' ��� ����� ��������� ����������)\n"
-
-#: help.c:221
-msgid "                list tables/indexes/sequences/views/system tables\n"
+msgid ""
+" \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
+"                list tables/indexes/sequences/views/system tables\n"
 msgstr ""
+" \\d{t|i|s|v|S} [���.���.] (�������� \"+\" ��� ����� ��������� ����������)\n"
 "                �������� �������/�������/������������������/����/��������� "
 "�������\n"
 
 #: help.c:222
 msgid " \\da [PATTERN]  list aggregate functions\n"
-msgstr " \\da [������]   �������� ���������� �������\n"
+msgstr " \\da [���.���.] �������� ���������� �������\n"
 
 #: help.c:223
 msgid " \\dd [PATTERN]  show comment for object\n"
-msgstr " \\dd [������]   �������� ���������� ��� �������\n"
+msgstr " \\dd [���.���.] �������� ���������� ��� �������\n"
 
 #: help.c:224
 msgid " \\dD [PATTERN]  list domains\n"
-msgstr " \\dD [������]   �������� ������\n"
+msgstr " \\dD [���.���.] �������� ������\n"
 
 #: help.c:225
-msgid " \\df [PATTERN]  list functions (add '+' for more detail)\n"
+msgid " \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
 msgstr ""
-" \\df [������]  �������� ������� (�������� '+' ��� ����� ��������� "
+" \\df [���.���.] �������� ������� (�������� \"+\" ��� ����� ��������� "
 "����������)\n"
 
 #: help.c:226
@@ -587,22 +588,22 @@ msgid " \\do [NAME]     list operators\n"
 msgstr " \\do [���]      �������� ���������\n"
 
 #: help.c:227
-msgid " \\dl            list large objects, same as lo_list\n"
+msgid " \\dl            list large objects, same as \\lo_list\n"
 msgstr " \\dl            �������� ������� ������� ��� lo_list\n"
 
 #: help.c:228
 msgid " \\dp [PATTERN]  list table access privileges\n"
-msgstr " \\dp [������]   �������� ���������� ������� ������\n"
+msgstr " \\dp [���.���.] �������� ���������� ������� ������\n"
 
 #: help.c:229
-msgid " \\dT [PATTERN]  list data types (add '+' for more detail)\n"
+msgid " \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
 msgstr ""
-" \\dT [PATTERN]  �������� ���� ������ (�������� '+' ��� ����� ��������� "
+" \\dT [���.���.] �������� ���� ������ (�������� \"+\" ��� ����� ��������� "
 "����������)\n"
 
 #: help.c:230
 msgid " \\du [PATTERN]  list users\n"
-msgstr " \\du [PATTERN]  �������� �������������\n"
+msgstr " \\du [���.���.] �������� �������������\n"
 
 #: help.c:231
 msgid " \\e [FILE]      edit the query buffer (or file) with external editor\n"
@@ -670,83 +671,83 @@ msgstr " \\p             
 
 #: help.c:245
 msgid ""
-" \\pset NAME [VALUE]  set table output option (NAME := {format|border|"
-"expanded|\n"
-"                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
+" \\pset NAME [VALUE]  set table output option\n"
+"                (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
+"                tuples_only|title|tableattr|pager})\n"
 msgstr ""
-" \\pset ��� [����.]   ���������� ����� ������ ������� (��� := {format|border|"
-"expanded|\n"
-"                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
+" \\pset ��� [����.]   ���������� ����� ������ �������\n"
+"                (��� := {format|border|expanded|fieldsep|null|recordsep|\n"
+"                tuples_only|title|tableattr|pager})\n"
 
-#: help.c:247
+#: help.c:248
 msgid " \\q             quit psql\n"
 msgstr " \\q             ����� �� psql\n"
 
-#: help.c:248
+#: help.c:249
 msgid " \\qecho [STRING]  write string to query output stream (see \\o)\n"
 msgstr " \\qecho [������]  �������� ����� � ����� ������ ������� (��. \\o)\n"
 
-#: help.c:249
+#: help.c:250
 msgid " \\r             reset (clear) the query buffer\n"
 msgstr " \\r             ��������� ����� ��������\n"
 
-#: help.c:250
+#: help.c:251
 msgid " \\s [FILE]      display history or save it to file\n"
 msgstr " \\s [����]      ������� ������� ��� ��������� ţ � ����\n"
 
-#: help.c:251
+#: help.c:252
 msgid ""
 " \\set [NAME [VALUE]]  set internal variable, or list all if no parameters\n"
 msgstr ""
 " \\set [��� [����.]]   ���������� ���������� ���������� (��� ��������)\n"
 
-#: help.c:252
+#: help.c:253
 #, c-format
 msgid " \\t             show only rows (currently %s)\n"
 msgstr " \\t             ���������� ������ ������ (� ������ ������: %s)\n"
 
-#: help.c:254
-msgid " \\T [STRING]    set HTML <table>-tag attributes, or unset if none\n"
+#: help.c:255
+msgid " \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
 msgstr ""
 " \\T [������]    ���������� �������� HTML-���� <table>, ��� ������� ���� "
 "������ �����\n"
 
-#: help.c:255
+#: help.c:256
 #, c-format
-msgid " \\timing        toggle timing of queries (currently %s)\n"
+msgid " \\timing        toggle timing of commands (currently %s)\n"
 msgstr ""
-" \\timing        ������������ � ����� ������ �������� (� ������ ������: %s)\n"
+" \\timing        ����������� ����� ������ �������� (� ������ ������: %s)\n"
 
-#: help.c:257
+#: help.c:258
 msgid " \\unset NAME    unset (delete) internal variable\n"
 msgstr " \\unset ���     ������� ���������� ����������\n"
 
-#: help.c:258
+#: help.c:259
 msgid " \\w [FILE]      write query buffer to file\n"
 msgstr " \\w [����]      �������� ������� ����� �������� � ����\n"
 
-#: help.c:259
+#: help.c:260
 #, c-format
 msgid " \\x             toggle expanded output (currently %s)\n"
 msgstr ""
 " \\x             ������������ � ����������� ����� ������ (�������: %s)\n"
 
-#: help.c:261
+#: help.c:262
 msgid " \\z [PATTERN]   list table access privileges (same as \\dp)\n"
 msgstr ""
 " \\z [������]    �������� ���������� ������� ������ (���� ��� � \\dp)\n"
 
-#: help.c:262
+#: help.c:263
 msgid " \\! [COMMAND]   execute command in shell or start interactive shell\n"
 msgstr ""
 " \\! [�������]   ��������� ������� � �������� ��� ��������� ������������� "
 "��������\n"
 
-#: help.c:289
+#: help.c:290
 msgid "Available help:"
 msgstr "��������� ������:"
 
-#: help.c:320
+#: help.c:321
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -761,7 +762,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:331
+#: help.c:332
 #, c-format
 msgid ""
 "No help available for '%-.*s'.\n"
@@ -892,8 +893,8 @@ msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 msgstr "%s: ��������: ����� -u ��������. ����������� -U.\n"
 
 #: startup.c:641
-msgid "contains support for readline"
-msgstr "������������ readline"
+msgid "contains support for command-line editing"
+msgstr "������������ �������������� ��������� ������"
 
 #: startup.c:644
 msgid ""
@@ -917,12 +918,12 @@ msgstr ""
 "\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:417 describe.c:1260 describe.c:1366
 msgid "Schema"
 msgstr "�����"
 
 #: 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:417 describe.c:1260 describe.c:1367
 msgid "Name"
 msgstr "���"
 
@@ -1073,7 +1074,7 @@ msgstr "
 msgid "Column"
 msgstr "�������"
 
-#: describe.c:680 describe.c:1262 describe.c:1367
+#: describe.c:680 describe.c:1262 describe.c:1368
 msgid "Type"
 msgstr "���"
 
@@ -1220,22 +1221,22 @@ msgstr "
 msgid "special"
 msgstr "���������"
 
-#: describe.c:1322
+#: describe.c:1323
 msgid "No matching relations found.\n"
 msgstr "���������� ������ �� �������.\n"
 
-#: describe.c:1324
+#: describe.c:1325
 msgid "No relations found.\n"
 msgstr "����� �� �������.\n"
 
-#: describe.c:1329
+#: describe.c:1330
 msgid "List of relations"
 msgstr "������ ������"
 
-#: describe.c:1368
+#: describe.c:1369
 msgid "Modifier"
 msgstr "������������"
 
-#: describe.c:1382
+#: describe.c:1383
 msgid "List of domains"
 msgstr "������ �������"
diff --git a/src/bin/psql/po/sv.po b/src/bin/psql/po/sv.po
index 53c439a9c2a9e0bb5684617d25d24fec9c6c402a..d3ef902f7dc6adf7b229a91118a2a66598a41ebd 100644
--- a/src/bin/psql/po/sv.po
+++ b/src/bin/psql/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/bin/psql/po/sv.po,v 1.3 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/sv.po,v 1.4 2002/10/14 19:04:28 petere Exp $
 #
 # Use these quotes: "%s"
 #
 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:58+0200\n"
+"POT-Creation-Date: 2002-10-03 04:19-0400\n"
+"PO-Revision-Date: 2002-10-04 08:04+0200\n"
 "Last-Translator: Dennis Bj�rklund <db@zigo.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -41,17 +41,17 @@ msgstr "kunde inte h
 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:764
+#: command.c:403 command.c:762
 msgid "no query buffer\n"
 msgstr "ingen fr�gebuffert\n"
 
 #: command.c:458
 #, c-format
-msgid "%s: invalid encoding name or conversion proc not found\n"
-msgstr "%s: ogiltigt kodningsnamn eller konverterings-proc hittades inte\n"
+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:744 command.c:773
+#: command.c:742 command.c:771
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: obligatoriskt argument saknas\n"
@@ -69,176 +69,176 @@ msgstr "Fr
 msgid "Wrote history to %s.\n"
 msgstr "Kommandohistorien har skrivits till %s.\n"
 
-#: command.c:688 command.c:1143 command.c:1240 command.c:1924 common.c:56
+#: 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
 msgid "out of memory\n"
 msgstr "minnet slut\n"
 
-#: command.c:697 command.c:749
+#: command.c:697 command.c:747
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: fel\n"
 
-#: command.c:727
+#: command.c:726
 msgid "Timing is on."
 msgstr "Tidstagning �r p�."
 
-#: command.c:731
+#: command.c:729
 msgid "Timing is off."
 msgstr "Tidstagning �r av."
 
-#: command.c:788 command.c:808 command.c:1004 command.c:1017 command.c:1028
-#: command.c:1581 command.c:1594 command.c:1606 command.c:1619 command.c:1633
-#: command.c:1647 command.c:1677 common.c:105 copy.c:300
+#: 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
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:874
+#: command.c:872
 #, c-format
 msgid "\\%s: extra argument '%s' ignored\n"
 msgstr "\\%s: �verfl�digt argument \"%s\" ignorerat\n"
 
-#: command.c:965 command.c:993 command.c:1116
+#: command.c:963 command.c:991 command.c:1115
 msgid "parse error at the end of line\n"
 msgstr "parsfel vid radslutet\n"
 
-#: command.c:1355 command.c:1379 startup.c:174 startup.c:192
+#: command.c:1354 command.c:1378 startup.c:175 startup.c:193
 msgid "Password: "
 msgstr "L�senord: "
 
-#: command.c:1393 common.c:154 common.c:247 common.c:422
+#: command.c:1392 common.c:154 common.c:247 common.c:419
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1397
+#: command.c:1396
 msgid "Previous connection kept\n"
 msgstr "F�reg�ende f�rbindelse bevarad\n"
 
-#: command.c:1409
+#: command.c:1408
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:1421
+#: command.c:1420
 #, c-format
 msgid "You are now connected to database %s.\n"
 msgstr "Du �r nu uppkopplad mot databasen %s.\n"
 
-#: command.c:1423
+#: command.c:1422
 #, 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:1426
+#: command.c:1425
 #, 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:1519
+#: command.c:1518
 #, c-format
 msgid "could not start editor %s\n"
 msgstr "kunde inte starta editorn %s\n"
 
-#: command.c:1521
+#: command.c:1520
 msgid "could not start /bin/sh\n"
 msgstr "kunde inte starta /bin/sh\n"
 
-#: command.c:1566
+#: command.c:1565
 #, c-format
 msgid "could not open temporary file %s: %s\n"
 msgstr "kunde inte �ppna tempor�r fil %s: %s\n"
 
-#: command.c:1750
+#: command.c:1749
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset: till�tna formaten �r unaligned, aligned, html, latex\n"
 
-#: command.c:1755
+#: command.c:1754
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Utdataformatet �r \"%s\".\n"
 
-#: command.c:1765
+#: command.c:1764
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Ramstil �r %d.\n"
 
-#: command.c:1774
+#: command.c:1773
 msgid "Expanded display is on.\n"
 msgstr "Ut�kad visning �r p�.\n"
 
-#: command.c:1775
+#: command.c:1774
 msgid "Expanded display is off.\n"
 msgstr "Ut�kad visning �r av.\n"
 
-#: command.c:1787
+#: command.c:1786
 #, c-format
 msgid "Null display is '%s'.\n"
 msgstr "Null-visare �r '%s'.\n"
 
-#: command.c:1799
+#: command.c:1798
 #, c-format
 msgid "Field separator is '%s'.\n"
 msgstr "F�ltseparatorn �r \"%s\".\n"
 
-#: command.c:1813
+#: command.c:1812
 msgid "Record separator is <newline>."
 msgstr "Postseparatorn �r <nyrad>."
 
-#: command.c:1815
+#: command.c:1814
 #, c-format
 msgid "Record separator is '%s'.\n"
 msgstr "Postseparatorn �r \"%s\".\n"
 
-#: command.c:1826
+#: command.c:1825
 msgid "Showing only tuples."
 msgstr "Visar bara tupler."
 
-#: command.c:1828
+#: command.c:1827
 msgid "Tuples only is off."
 msgstr "Visa bara tupler �r av."
 
-#: command.c:1844
+#: command.c:1843
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "Titeln �r \"%s\".\n"
 
-#: command.c:1846
+#: command.c:1845
 msgid "Title is unset.\n"
 msgstr "Titeln �r inte satt.\n"
 
-#: command.c:1862
+#: command.c:1861
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "Tabellattribut �r \"%s\".\n"
 
-#: command.c:1864
+#: command.c:1863
 msgid "Table attributes unset.\n"
 msgstr "Tabellattribut �r ej satt.\n"
 
-#: command.c:1875
+#: command.c:1874
 msgid "Using pager is on."
 msgstr "Siduppdelare �r p�."
 
-#: command.c:1877
+#: command.c:1876
 msgid "Using pager is off."
 msgstr "Siduppdelare �r av."
 
-#: command.c:1888
+#: command.c:1887
 msgid "Default footer is on."
 msgstr "Standard sidfot �r p�."
 
-#: command.c:1890
+#: command.c:1889
 msgid "Default footer is off."
 msgstr "Standard sidfot �r av."
 
-#: command.c:1896
+#: command.c:1895
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: ok�nd parameter: %s\n"
 
-#: command.c:1939
+#: command.c:1938
 msgid "\\!: failed\n"
 msgstr "\\!: misslyckades\n"
 
@@ -247,27 +247,27 @@ msgstr "\\!: misslyckades\n"
 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:303
+#: common.c:215 common.c:304
 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:432
+#: common.c:254 common.c:429
 msgid "connection to server was lost\n"
 msgstr "f�rbindelsen till servern har brutits\n"
 
-#: common.c:257 common.c:435
+#: common.c:257 common.c:432
 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:439
+#: common.c:261 common.c:436
 msgid "Failed.\n"
 msgstr "Misslyckades.\n"
 
-#: common.c:271 common.c:451
+#: common.c:271 common.c:448
 msgid "Succeeded.\n"
 msgstr "Lyckades.\n"
 
-#: common.c:311
+#: common.c:312
 #, 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:411
+#: common.c:408
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -288,12 +288,12 @@ 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:457
+#: common.c:454
 #, 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:469
+#: common.c:466
 #, c-format
 msgid "Time: %.2f ms\n"
 msgstr "Tid: %.2f ms\n"
@@ -302,26 +302,26 @@ msgstr "Tid: %.2f ms\n"
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: argument kr�vs\n"
 
-#: copy.c:226
+#: copy.c:234
 #, c-format
 msgid "\\copy: parse error at '%s'\n"
 msgstr "\\copy: parsfel vid \"%s\"\n"
 
-#: copy.c:228
+#: copy.c:236
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: parsfel vid radslutet\n"
 
-#: copy.c:311
+#: copy.c:319
 #, c-format
-msgid "%s: cannot COPY TO/FROM a directory\n"
-msgstr "%s: kan inte COPY TO/FROM en katalog\n"
+msgid "%s: cannot copy from/to a directory\n"
+msgstr "%s: kan inte kopiera fr�n/till en katalog\n"
 
-#: copy.c:332
+#: copy.c:340
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:336
+#: copy.c:344
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: ov�ntat svar (%d)\n"
@@ -341,16 +341,18 @@ msgstr "kunde inte h
 
 #: help.c:83
 #, c-format
-msgid "This is psql %s, the PostgreSQL interactive terminal.\n"
-msgstr "Detta �r psql %s, den interaktiva PostgreSQL-terminalen.\n"
+msgid ""
+"This is psql %s, the PostgreSQL interactive terminal.\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"
+msgid "  psql [OPTIONS] [DBNAME [USERNAME]]\n"
+msgstr "  psql [FLAGGOR] [DBNAMN [ANV�NDARNAMN]]\n"
 
 #: help.c:87
 msgid "Options:"
@@ -496,11 +498,11 @@ msgstr ""
 "\n"
 "Rapportera fel till <pgsql-bugs@postgresql.org>."
 
-#: help.c:206
+#: help.c:211
 msgid " \\a             toggle between unaligned and aligned output mode\n"
 msgstr " \\a             byt mellan ojusterat och justerat utdataformat\n"
 
-#: help.c:207
+#: help.c:212
 #, c-format
 msgid ""
 " \\c[onnect] [DBNAME|- [USER]]\n"
@@ -509,112 +511,111 @@ msgstr ""
 " \\c[onnect] [DBNAMN|- [ANV�NDAR]]\n"
 "                koppla upp mot ny databas (f�r n�rvarande \"%s\")\n"
 
-#: help.c:210
+#: help.c:215
 msgid " \\C [STRING]    set table title, or unset if none\n"
 msgstr " \\C [TEXT]      s�tt tabelltitel, eller nollst�ll\n"
 
-#: help.c:211
+#: help.c:216
 msgid " \\cd [DIR]      change the current working directory\n"
 msgstr " \\cd [KATALOG]  byt den aktuella katalogen\n"
 
-#: help.c:212
+#: help.c:217
 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:213
+#: help.c:218
 msgid " \\copyright     show PostgreSQL usage and distribution terms\n"
 msgstr " \\copyright     visa PostgreSQL-upphovsr�ttsinformation\n"
 
-#: help.c:214
+#: help.c:219
 msgid " \\d [NAME]      describe table, index, sequence, or view\n"
 msgstr " \\d [NAMN]      beskriv tabell, index, sekvens eller vy\n"
 
-#: help.c:215
-msgid " \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n"
-msgstr " \\d{t|i|s|v|S} [MALL] (l�gg till '+' f�r mer detaljer)\n"
-
 # XXX
-#: help.c:216
-msgid "                list tables/indexes/sequences/views/system tables\n"
+#: help.c:220
+msgid ""
+" \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
+"                list tables/indexes/sequences/views/system tables\n"
 msgstr ""
-"                lista tabeller/indexen/sekvenser/vyer/system tabeller\n"
+" \\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:217
+#: help.c:222
 msgid " \\da [PATTERN]  list aggregate functions\n"
 msgstr " \\da [MALL]     lista aggregatfunktioner\n"
 
-#: help.c:218
+#: help.c:223
 msgid " \\dd [PATTERN]  show comment for object\n"
 msgstr " \\dd [MALL]     visa kommentar f�r objekt\n"
 
-#: help.c:219
+#: help.c:224
 msgid " \\dD [PATTERN]  list domains\n"
 msgstr " \\dD [MALL]     lista dom�ner\n"
 
-#: help.c:220
-msgid " \\df [PATTERN]  list functions (add '+' for more detail)\n"
+#: help.c:225
+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:221
+#: help.c:226
 msgid " \\do [NAME]     list operators\n"
 msgstr " \\do [NAMN]     lista operat�rer\n"
 
-#: help.c:222
-msgid " \\dl            list large objects, same as lo_list\n"
-msgstr " \\dl            lista stora objekt, samma som lo_list\n"
+#: help.c:227
+msgid " \\dl            list large objects, same as \\lo_list\n"
+msgstr " \\dl            lista stora objekt, samma som \\lo_list\n"
 
-#: help.c:223
+#: help.c:228
 msgid " \\dp [PATTERN]  list table access privileges\n"
 msgstr " \\dp [MALL]     lista tabell�tkomstr�ttigheter\n"
 
-#: help.c:224
-msgid " \\dT [PATTERN]  list data types (add '+' for more detail)\n"
+#: help.c:229
+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:225
+#: help.c:230
 msgid " \\du [PATTERN]  list users\n"
 msgstr " \\du [MALL]     lista anv�ndare\n"
 
-#: help.c:226
+#: help.c:231
 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:227
+#: help.c:232
 msgid " \\echo [STRING] write string to standard output\n"
 msgstr " \\echo [TEXT]   skriv text till standard ut\n"
 
-#: help.c:228
+#: help.c:233
 msgid " \\encoding [ENCODING]  show or set client encoding\n"
 msgstr " \\encoding [KODNING]   visa eller s�tt klientens teckenkodning\n"
 
-#: help.c:229
+#: help.c:234
 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:230
+#: help.c:235
 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:231
+#: help.c:236
 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:232
+#: help.c:237
 #, 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:234
+#: help.c:239
 msgid " \\i FILE        execute commands from file\n"
 msgstr " \\i FILNAMN     k�r kommandon fr�n fil\n"
 
-#: help.c:235
+#: help.c:240
 msgid " \\l             list all databases\n"
 msgstr " \\l             lista alla databaser\n"
 
-#: help.c:236
+#: help.c:241
 msgid ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                large object operations\n"
@@ -622,85 +623,86 @@ msgstr ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                operationer p� stora objekt\n"
 
-#: help.c:238
+#: help.c:243
 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:239
+#: help.c:244
 msgid " \\p             show the contents of the query buffer\n"
 msgstr " \\p             visa inneh�llet i fr�gebufferten\n"
 
-#: help.c:240
+#: help.c:245
 msgid ""
-" \\pset NAME [VALUE]  set table output option (NAME := {format|border|"
-"expanded|\n"
-"                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
+" \\pset NAME [VALUE]  set table output option\n"
+"                (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
+"                tuples_only|title|tableattr|pager})\n"
 msgstr ""
-" \\pset NAMN [V�RDE]  s�tt tabellutskriftsvariabel (NAMN := {format|border|expanded|\n"
-"                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
+" \\pset NAMN [V�RDE]  s�tt tabellutskriftsvariabel\n"
+"                (NAMN := {format|border|expanded|fieldsep|null|recordsep|\n"
+"                tuples_only|title|tableattr|pager})\n"
 
-#: help.c:242
+#: help.c:248
 msgid " \\q             quit psql\n"
 msgstr " \\q             avsluta psql\n"
 
-#: help.c:243
+#: help.c:249
 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:244
+#: help.c:250
 msgid " \\r             reset (clear) the query buffer\n"
 msgstr " \\r             nollst�ll (radera) fr�gebufferten\n"
 
-#: help.c:245
+#: help.c:251
 msgid " \\s [FILE]      display history or save it to file\n"
 msgstr " \\s [FILNAMN]   visa kommandohistorien eller spara den i fil\n"
 
-#: help.c:246
+#: help.c:252
 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:247
+#: help.c:253
 #, c-format
 msgid " \\t             show only rows (currently %s)\n"
 msgstr " \\t             visa endast rader (f�r n�rvarande: %s)\n"
 
-#: help.c:249
-msgid " \\T [STRING]    set HTML <table>-tag attributes, or unset if none\n"
+#: help.c:255
+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:250
+#: help.c:256
 #, c-format
-msgid " \\timing        toggle timing of queries (currently %s)\n"
-msgstr " \\timing        sl� om tidstagning av fr�gor (f�r n�rvarande: %s)\n"
+msgid " \\timing        toggle timing of commands (currently %s)\n"
+msgstr " \\timing        sl� om tidstagning av kommandon (f�r n�rvarande: %s)\n"
 
-#: help.c:252
+#: help.c:258
 msgid " \\unset NAME    unset (delete) internal variable\n"
 msgstr " \\unset NAME    ta bort intern variabel\n"
 
-#: help.c:253
+#: help.c:259
 msgid " \\w [FILE]      write query buffer to file\n"
 msgstr " \\w [FILNAMN]   skriv fr�gebuffert till fil\n"
 
-#: help.c:254
+#: help.c:260
 #, 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:256
+#: help.c:262
 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:257
+#: help.c:263
 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:284
+#: help.c:290
 msgid "Available help:"
 msgstr "Tillg�nglig hj�lp:"
 
-#: help.c:315
+#: help.c:321
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -715,7 +717,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:326
+#: help.c:332
 #, c-format
 msgid ""
 "No help available for '%-.*s'.\n"
@@ -724,7 +726,7 @@ msgstr ""
 "Ingen hj�lp tillg�nglig f�r \"%-.*s\".\n"
 "F�rs�k med \\h utan argument f�r att se den tillg�ngliga hj�lpen.\n"
 
-#: input.c:174
+#: input.c:177
 #, c-format
 msgid "could not save history to %s: %s\n"
 msgstr "kunde inte skriva kommandohistorien till %s: %s\n"
@@ -749,8 +751,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:208 describe.c:269 describe.c:316
-#: describe.c:414 describe.c:689 describe.c:1263 large_obj.c:363
+#: 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
 msgid "Description"
 msgstr "Beskrivning"
 
@@ -776,16 +778,16 @@ msgstr "(1 rad)"
 msgid "(%d rows)"
 msgstr "(%d rader)"
 
-#: startup.c:133 startup.c:606
+#: startup.c:134 startup.c:612
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: minnet slut\n"
 
-#: startup.c:168
+#: startup.c:169
 msgid "User name: "
 msgstr "Anv�ndarnamn: "
 
-#: startup.c:277
+#: startup.c:278
 #, c-format
 msgid ""
 "Welcome to %s %s, the PostgreSQL interactive terminal.\n"
@@ -806,27 +808,27 @@ msgstr ""
 "        \\q f�r att avsluta\n"
 "\n"
 
-#: startup.c:451
+#: startup.c:452
 #, c-format
 msgid "%s: couldn't set printing parameter %s\n"
 msgstr "%s: kunde inte s�tta utskriftsparameter %s\n"
 
-#: startup.c:497
+#: startup.c:498
 #, c-format
 msgid "%s: could not delete variable %s\n"
 msgstr "%s: kunde inte ta bort variabeln %s\n"
 
-#: startup.c:507
+#: startup.c:508
 #, c-format
 msgid "%s: could not set variable %s\n"
 msgstr "%s: kunde inte s�tta variabeln %s\n"
 
-#: startup.c:538 startup.c:554
+#: startup.c:539 startup.c:559
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "F�rs�k med \"%s --help\" f�r mer information.\n"
 
-#: startup.c:547
+#: startup.c:552
 #, c-format
 msgid ""
 "%s was compiled without support for long options.\n"
@@ -835,21 +837,21 @@ msgstr ""
 "%s har inte kompilerats med st�d f�r l�nga flaggor.\n"
 "Anv�nda --help f�r hj�lp om flaggor.\n"
 
-#: startup.c:572
+#: startup.c:577
 #, c-format
 msgid "%s: warning: extra option %s ignored\n"
 msgstr "%s: varning: �verfl�dig flagga \"%s\" ignorerad\n"
 
-#: startup.c:579
+#: startup.c:584
 #, c-format
 msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 msgstr "%s: Varning: Flaggan -u �r f�rlegad. Anv�nd -U ist�llet.\n"
 
-#: startup.c:635
-msgid "contains support for readline"
-msgstr "inneh�ller st�d f�r readline"
+#: startup.c:641
+msgid "contains support for command-line editing"
+msgstr "inneh�ller st�d f�r kommandoradsredigering"
 
-#: startup.c:638
+#: 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"
@@ -861,7 +863,7 @@ msgstr ""
 "L�s filen COPYRIGHT eller anv�nd kommandot \\copyright f�r att l�sa\n"
 "anv�ndnings- och kopieringsvillkor."
 
-#: startup.c:663
+#: startup.c:669
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -870,13 +872,13 @@ msgstr ""
 "SSL-f�rbindelse (krypto: %s, bitar: %i)\n"
 "\n"
 
-#: describe.c:85 describe.c:126 describe.c:195 describe.c:267 describe.c:360
-#: describe.c:414 describe.c:1256 describe.c:1360
+#: describe.c:85 describe.c:126 describe.c:196 describe.c:269 describe.c:363
+#: describe.c:417 describe.c:1260 describe.c:1366
 msgid "Schema"
 msgstr "Schema"
 
-#: describe.c:85 describe.c:126 describe.c:195 describe.c:267 describe.c:309
-#: describe.c:414 describe.c:1256 describe.c:1361
+#: describe.c:85 describe.c:126 describe.c:196 describe.c:269 describe.c:311
+#: describe.c:417 describe.c:1260 describe.c:1367
 msgid "Name"
 msgstr "Namn"
 
@@ -900,7 +902,7 @@ msgstr "Resultatdatatyp"
 msgid "Argument data types"
 msgstr "Argumentdatatyp"
 
-#: describe.c:135 describe.c:309 describe.c:1258
+#: describe.c:135 describe.c:311 describe.c:1262
 msgid "Owner"
 msgstr "�gare"
 
@@ -912,287 +914,293 @@ msgstr "Spr
 msgid "Source code"
 msgstr "K�llkod"
 
-#: describe.c:169
+#: describe.c:170
 msgid "List of functions"
 msgstr "Lista med funktioner"
 
-#: describe.c:205
+#: describe.c:206
 msgid "Internal name"
 msgstr "Internt namn"
 
-#: describe.c:205
+#: describe.c:206
 msgid "Size"
 msgstr "Storlek"
 
-#: describe.c:236
+#: describe.c:238
 msgid "List of data types"
 msgstr "Lista med datatyper"
 
-#: describe.c:268
+#: describe.c:270
 msgid "Left arg type"
 msgstr "V�nster argumenttyp"
 
-#: describe.c:268
+#: describe.c:270
 msgid "Right arg type"
 msgstr "H�ger argumenttyp"
 
-#: describe.c:269
+#: describe.c:271
 msgid "Result type"
 msgstr "Resultattyp"
 
-#: describe.c:283
+#: describe.c:285
 msgid "List of operators"
 msgstr "Lista med operatorer"
 
-#: describe.c:312
+#: describe.c:314
 msgid "Encoding"
 msgstr "Kodning"
 
-#: describe.c:328
+#: describe.c:330
 msgid "List of databases"
 msgstr "Lista med databaser"
 
-#: describe.c:360 describe.c:1273
+#: describe.c:363 describe.c:1277
 msgid "Table"
 msgstr "Tabell"
 
-#: describe.c:360
+#: describe.c:363
 msgid "Access privileges"
 msgstr "�tkomstr�ttigheter"
 
-#: describe.c:382
+#: describe.c:385
 #, c-format
 msgid "Access privileges for database \"%s\""
 msgstr "�tkomstr�ttigheter f�r databasen \"%s\""
 
-#: describe.c:414
+#: describe.c:417
 msgid "Object"
 msgstr "Objekt"
 
-#: describe.c:425
+#: describe.c:428
 msgid "aggregate"
 msgstr "aggregat"
 
-#: describe.c:443
+#: describe.c:446
 msgid "function"
 msgstr "funktion"
 
-#: describe.c:457
+#: describe.c:460
 msgid "operator"
 msgstr "operat�r"
 
-#: describe.c:471
+#: describe.c:474
 msgid "data type"
 msgstr "datatyp"
 
-#: describe.c:488 describe.c:1257
+#: describe.c:491 describe.c:1261
 msgid "table"
 msgstr "tabell"
 
-#: describe.c:488 describe.c:1257
+#: describe.c:491 describe.c:1261
 msgid "view"
 msgstr "vy"
 
-#: describe.c:488 describe.c:1257
+#: describe.c:491 describe.c:1261
 msgid "index"
 msgstr "index"
 
-#: describe.c:488 describe.c:1257
+#: describe.c:491 describe.c:1261
 msgid "sequence"
 msgstr "sekvens"
 
-#: describe.c:504
+#: describe.c:507
 msgid "rule"
 msgstr "rule"
 
-#: describe.c:520
+#: describe.c:523
 msgid "trigger"
 msgstr "trigger"
 
-#: describe.c:538
+#: describe.c:541
 msgid "Object descriptions"
 msgstr "Objektbeskrivningar"
 
-#: describe.c:584
+#: describe.c:587
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "Kunde inte hitta en relation med namn \"%s\".\n"
 
-#: describe.c:663
+#: describe.c:666
 #, c-format
 msgid "Did not find any relation with oid %s.\n"
 msgstr "Kunde inte hitta en relation med oid %s.\n"
 
-#: describe.c:676
+#: describe.c:679
 msgid "Column"
 msgstr "Kolumn"
 
-#: describe.c:677 describe.c:1258 describe.c:1362
+#: describe.c:680 describe.c:1262 describe.c:1368
 msgid "Type"
 msgstr "Typ"
 
-#: describe.c:683
+#: describe.c:686
 msgid "Modifiers"
 msgstr "Modifierare"
 
-#: describe.c:783
+#: describe.c:786
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "Tabell \"%s.%s\""
 
-#: describe.c:787
+#: describe.c:790
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "Vy \"%s.%s\""
 
-#: describe.c:791
+#: describe.c:794
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "Sekvens \"%s.%s\""
 
-#: describe.c:795
+#: describe.c:798
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Index \"%s.%s\""
 
-#: describe.c:799
+#: describe.c:802
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "S�rskild relation \"%s.%s\""
 
-#: describe.c:803
+#: describe.c:806
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST-tabell \"%s.%s\""
 
-#: describe.c:807
+#: describe.c:810
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "Sammansatt typ \"%s.%s\""
 
-#: describe.c:811
+#: describe.c:814
 #, c-format
 msgid "?%c? \"%s.%s\""
 msgstr "?%c? \"%s.%s\""
 
-#: describe.c:849
+#: describe.c:853
 msgid "primary key, "
 msgstr "prim�rnyckel, "
 
-#: describe.c:851
+#: describe.c:855
 msgid "unique, "
 msgstr "unik, "
 
-#: describe.c:857
+#: describe.c:861
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "f�r tabell \"%s.%s\""
 
-#: describe.c:896
+#: describe.c:900
 #, c-format
 msgid "View definition: %s"
 msgstr "Vydefinition: %s"
 
-#: describe.c:902 describe.c:1098
+#: describe.c:906 describe.c:1102
 msgid "Rules"
 msgstr "Regler"
 
-#: describe.c:1022
+#: describe.c:1026
 msgid "Indexes"
-msgstr "Indexen"
+msgstr "Index"
 
-#: describe.c:1036
+#: describe.c:1040
 msgid " primary key"
 msgstr " prim�rnyckel"
 
-#: describe.c:1038
+#: describe.c:1042
 msgid " unique"
 msgstr " unik"
 
-#: describe.c:1059
+#: describe.c:1063
 msgid "Check constraints"
 msgstr "Kontrollera integritetsvillkor"
 
-#: describe.c:1062
+#: describe.c:1066
 #, c-format
 msgid "%s: \"%s\" %s"
 msgstr "%s: \"%s\" %s"
 
-#: describe.c:1067
+#: describe.c:1071
 #, c-format
 msgid "%*s  \"%s\" %s"
 msgstr "%*s  \"%s\" %s"
 
-#: describe.c:1077
+#: describe.c:1081
 msgid "Foreign Key constraints"
 msgstr "Fr�mmande nyckel-villkor"
 
-#: describe.c:1080
+#: describe.c:1084
 #, c-format
 msgid "%s: %s %s"
 msgstr "%s: %s %s"
 
-#: describe.c:1085
+#: describe.c:1089
 #, c-format
 msgid "%*s  %s %s"
 msgstr "%*s  %s %s"
 
-#: describe.c:1113
+#: describe.c:1117
 msgid "Triggers"
 msgstr "Utl�sare"
 
-#: describe.c:1195
+#: describe.c:1199
 msgid "User name"
 msgstr "Anv�ndarnamn"
 
-#: describe.c:1195
+#: describe.c:1199
 msgid "User ID"
 msgstr "Anv�ndar-ID"
 
-#: describe.c:1196
+#: describe.c:1200
 msgid "superuser, create database"
 msgstr "superanv�ndare, skapa databas"
 
-#: describe.c:1197
+#: describe.c:1201
 msgid "superuser"
 msgstr "superanv�ndare"
 
-#: describe.c:1197
+#: describe.c:1201
 msgid "create database"
 msgstr "skapa databas"
 
-#: describe.c:1198
+#: describe.c:1202
 msgid "Attributes"
 msgstr "Attribut"
 
-#: describe.c:1211
+#: describe.c:1215
 msgid "List of database users"
 msgstr "Lista med databasanv�ndare"
 
-#: describe.c:1258
+#: describe.c:1262
 msgid "special"
 msgstr "s�rskild"
 
-#: describe.c:1317
+#: describe.c:1323
 msgid "No matching relations found.\n"
 msgstr "Inga matchande relationer funna.\n"
 
-#: describe.c:1319
+#: describe.c:1325
 msgid "No relations found.\n"
 msgstr "Inga relationer funna.\n"
 
-#: describe.c:1324
+#: describe.c:1330
 msgid "List of relations"
 msgstr "Lista med relationer"
 
-#: describe.c:1363
+#: describe.c:1369
 msgid "Modifier"
 msgstr "Modifierare"
 
-#: describe.c:1377
+#: describe.c:1383
 msgid "List of domains"
 msgstr "Lista av dom�ner"
 
+#~ msgid "  psql [options] [dbname [username]]\n"
+#~ msgstr "  psql [flaggor] [dbnamn [anv�ndarnamn]]\n"
+
+#~ msgid " \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n"
+#~ msgstr " \\d{t|i|s|v|S} [MALL] (l�gg till '+' f�r mer detaljer)\n"
+
 #~ msgid "readline"
 #~ msgstr "readline"
 
diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index 5c023548c2d65e7c1efe72bfca887e182ce84059..d82b27a59b7ac3a0bcef2be6478ef7ce86cdc703 100644
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -1,1127 +1,1227 @@
-# simplified Chinese translation file for psql
-# Weiping He <laser@zhengmai.com.cn>, 2001.
-#
-# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/zh_CN.po,v 1.1 2002/08/21 20:42:27 petere Exp $
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-11-25 18:39+0800\n"
-"PO-Revision-Date: 2001-10-08 23:48:19+0800\n"
-"Last-Translator: Weiping He <laser@zhengmai.com.cn>\n"
-"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: command.c:154
-msgid "Warning: This syntax is deprecated.\n"
-msgstr "����: �����﷨�Ѿ�����.\n"
-
-#: command.c:161
-#, c-format
-msgid "Invalid command \\%s. Try \\? for help.\n"
-msgstr "��Ч������ \\%s. �� \\? ��ȡ����.\n"
-
-#: command.c:163
-#, c-format
-msgid "invalid command \\%s\n"
-msgstr "�������� \\%s\n"
-
-#: command.c:280
-#, c-format
-msgid "could not get home directory: %s\n"
-msgstr "�޷���ü�Ŀ¼: %s\n"
-
-#: command.c:296
-#, c-format
-msgid "\\%s: could not change directory to '%s': %s\n"
-msgstr "\\%s: ���ܸı䵽 '%s' Ŀ¼: %s\n"
-
-#: command.c:385 command.c:730
-msgid "no query buffer\n"
-msgstr "�޲�ѯ������\n"
-
-#: command.c:441
-#, c-format
-msgid "%s: invalid encoding name\n"
-msgstr "%s: ����������\n"
-
-#: command.c:450
-#, c-format
-msgid "\\%s: multibyte support is not enabled\n"
-msgstr "\\%s: ���ֽ�֧��δ��\n"
-
-#: command.c:504 command.c:535 command.c:546 command.c:560 command.c:602
-#: command.c:710 command.c:739
-#, c-format
-msgid "\\%s: missing required argument\n"
-msgstr "\\%s: ȱ���������\n"
-
-#: command.c:590
-msgid "Query buffer is empty."
-msgstr "��ѯ������Ϊ��."
-
-#: command.c:621
-msgid "Query buffer reset (cleared)."
-msgstr "����(���)��ѯ������."
-
-#: command.c:632
-#, c-format
-msgid "Wrote history to %s.\n"
-msgstr "�� %s ��д����ʷ.\n"
-
-#: command.c:672 command.c:903 command.c:1118 command.c:1174 command.c:1857
-#: common.c:57 copy.c:87 describe.c:448 mainloop.c:80 mainloop.c:384
-msgid "out of memory\n"
-msgstr "�ڴ��þ�\n"
-
-#: command.c:681 command.c:715
-#, c-format
-msgid "\\%s: error\n"
-msgstr "\\%s: ����\n"
-
-#: command.c:754 command.c:774 command.c:1009 command.c:1022 command.c:1032
-#: command.c:1514 command.c:1527 command.c:1539 command.c:1552 command.c:1566
-#: command.c:1580 command.c:1610 common.c:106 copy.c:290
-#, c-format
-msgid "%s: %s\n"
-msgstr "%s: %s\n"
-
-#: command.c:839
-#, c-format
-msgid "\\%s: extra argument '%s' ignored\n"
-msgstr "\\%s: ���Զ���IJ��� '%s'\n"
-
-#: command.c:895 command.c:970 command.c:998
-msgid "parse error at the end of line\n"
-msgstr "�������������\n"
-
-#: command.c:1289 command.c:1314 startup.c:181 startup.c:199
-msgid "Password: "
-msgstr "����: "
-
-#: command.c:1328 common.c:155 common.c:358 common.c:523
-#, c-format
-msgid "%s"
-msgstr ""
-
-#: command.c:1332
-msgid "Previous connection kept\n"
-msgstr "������һ������\n"
-
-#: command.c:1344
-#, c-format
-msgid "\\connect: %s"
-msgstr ""
-
-#: command.c:1356
-#, c-format
-msgid "You are now connected to database %s.\n"
-msgstr "�������Ѿ����ӵ����ݿ� %s.\n"
-
-#: command.c:1358
-#, c-format
-msgid "You are now connected as new user %s.\n"
-msgstr "����������Ϊ���û� %s ���ӵ�.\n"
-
-#: command.c:1361
-#, c-format
-msgid "You are now connected to database %s as user %s.\n"
-msgstr "�����������û� %s ���������ӵ����ݿ� %s .\n"
-
-#: command.c:1452
-#, c-format
-msgid "could not start editor %s\n"
-msgstr "�޷����б༭�� %s\n"
-
-#: command.c:1454
-msgid "could not start /bin/sh\n"
-msgstr "�޷����� /bin/sh\n"
-
-#: command.c:1499
-#, c-format
-msgid "could not open temporary file %s: %s\n"
-msgstr "�޷�����ʱ�ļ� %s: %s\n"
-
-#: command.c:1683
-msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
-msgstr "\\pset: �����ĸ�ʽ���޶���, ����, html, latex\n"
-
-#: command.c:1688
-#, c-format
-msgid "Output format is %s.\n"
-msgstr "�����ʽ�� %s.\n"
-
-#: command.c:1698
-#, c-format
-msgid "Border style is %d.\n"
-msgstr "�߽����� %d.\n"
-
-#: command.c:1707
-msgid "Expanded display is on.\n"
-msgstr "��չ��ʾ�Ѵ�.\n"
-
-#: command.c:1708
-msgid "Expanded display is off.\n"
-msgstr "��չ��ʾ�ѹر�.\n"
-
-#: command.c:1720
-#, c-format
-msgid "Null display is '%s'.\n"
-msgstr "Null ��ʾΪ '%s'.\n"
-
-#: command.c:1732
-#, c-format
-msgid "Field separator is '%s'.\n"
-msgstr "��ָ����� '%s'.\n"
-
-#: command.c:1746
-msgid "Record separator is <newline>."
-msgstr "��¼�ָ����� <����>."
-
-#: command.c:1748
-#, c-format
-msgid "Record separator is '%s'.\n"
-msgstr "��¼�ָ����� '%s'.\n"
-
-#: command.c:1759
-msgid "Showing only tuples."
-msgstr "ֻ��ʾԪ��."
-
-#: command.c:1761
-msgid "Tuples only is off."
-msgstr "�ر�ֻ��ʾԪ��."
-
-#: command.c:1777
-#, c-format
-msgid "Title is \"%s\".\n"
-msgstr "������ \"%s\".\n"
-
-#: command.c:1779
-msgid "Title is unset.\n"
-msgstr "�ޱ���.\n"
-
-#: command.c:1795
-#, c-format
-msgid "Table attribute is \"%s\".\n"
-msgstr "�������� \"%s\".\n"
-
-#: command.c:1797
-msgid "Table attributes unset.\n"
-msgstr "δ���ñ�����.\n"
-
-#: command.c:1808
-msgid "Using pager is on."
-msgstr "�򿪷�ҳ����ʹ��."
-
-#: command.c:1810
-msgid "Using pager is off."
-msgstr "�رշ�ҳ����ʹ��."
-
-#: command.c:1821
-msgid "Default footer is on."
-msgstr "��ȱʡ�ű�."
-
-#: command.c:1823
-msgid "Default footer is off."
-msgstr "�ر�ȱʡ�ű�."
-
-#: command.c:1829
-#, c-format
-msgid "\\pset: unknown option: %s\n"
-msgstr "\\pset: δ֪ѡ��: %s\n"
-
-#: command.c:1872
-msgid "\\!: failed\n"
-msgstr "\\!: ʧ��\n"
-
-#: common.c:50
-#, c-format
-msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
-msgstr "%s: xstrdup: �޷����ƿ�ָ��(�ڲ�����)\n"
-
-#: common.c:326 common.c:412
-msgid "You are currently not connected to a database.\n"
-msgstr "��Ŀǰû�������ݿ�����.\n"
-
-#: common.c:365 common.c:533
-msgid "connection to server was lost\n"
-msgstr "�����ݿ�����Ӷ�ʧ\n"
-
-#: common.c:368 common.c:536
-msgid "The connection to the server was lost. Attempting reset: "
-msgstr "��������������Ѷ�ʧ. ��������: "
-
-#: common.c:372 common.c:540
-msgid "Failed.\n"
-msgstr "ʧ��.\n"
-
-#: common.c:382 common.c:552
-msgid "Succeeded.\n"
-msgstr "�ɹ�.\n"
-
-#: common.c:420
-#, c-format
-msgid ""
-"***(Single step mode: Verify query)"
-"*********************************************\n"
-"%s\n"
-"***(press return to proceed or enter x and return to cancel)"
-"********************\n"
-msgstr ""
-"***(����ģʽ: ��֤ ��ѯ)**********************************************\n"
-"%s\n"
-"***(�ûس����������� x Ȼ���ûس�ȡ��)**********************\n"
-
-#: common.c:512
-msgid ""
-"Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
-msgstr ""
-"����Ҫ����������Ȼ������һ������.\n"
-"�ڶ�����һ��������һ����б����һ��������."
-
-#: common.c:558
-#, c-format
-msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
-msgstr "�յ����Խ��̺�Ϊ %2$d �ĺ�˵��첽 NOTIFY (֪ͨ) '%1$s'.\n"
-
-#: copy.c:81
-msgid "\\copy: arguments required\n"
-msgstr "\\copy: ��Ҫ����\n"
-
-#: copy.c:211
-#, c-format
-msgid "\\copy: parse error at '%s'\n"
-msgstr "\\copy: �� '%s' ��������\n"
-
-#: copy.c:213
-msgid "\\copy: parse error at end of line\n"
-msgstr "\\copy: �����������\n"
-
-#: copy.c:310
-#, c-format
-msgid "\\copy: %s"
-msgstr ""
-
-#: copy.c:314
-#, c-format
-msgid "\\copy: unexpected response (%d)\n"
-msgstr "\\copy: ������Ӧ(%d)\n"
-
-#: help.c:47
-msgid "on"
-msgstr "��"
-
-#: help.c:47
-msgid "off"
-msgstr "�ر�"
-
-#: help.c:69
-#, c-format
-msgid "could not get current user name: %s\n"
-msgstr "�޷���ȡ��ǰ�û�����: %s\n"
-
-#: help.c:78
-msgid "This is psql, the PostgreSQL interactive terminal.\n"
-msgstr "������ psql, PostgreSQL �Ľ����ն�.\n"
-
-#: help.c:79
-msgid "Usage:"
-msgstr "�÷�:"
-
-#: help.c:80
-msgid "  psql [options] [dbname [username]]\n"
-msgstr " psql [ѡ��] [���ݿ��� [�û���]]\n"
-
-#: help.c:81
-msgid "Options:"
-msgstr "ѡ��:"
-
-#: help.c:82
-msgid "  -a              Echo all input from script"
-msgstr "  -a              �����������Խű�������"
-
-#: help.c:83
-msgid "  -A              Unaligned table output mode (-P format=unaligned)"
-msgstr "  -A              �Ƕ���ı����ģʽ(-P format=unaligned)"
-
-#: help.c:84
-msgid "  -c COMMAND      Run only single command (SQL or internal) and exit"
-msgstr "  -c ����         ֻ����һ������(SQL �����ڲ�)Ȼ���˳�"
-
-#: help.c:90
-#, c-format
-msgid "  -d DBNAME       Specify database name to connect to (default: %s)\n"
-msgstr "  -d ���ݿ���     ����Ҫ���ӵ����ݿ���(ȱʡ: %s)\n"
-
-#: help.c:92
-msgid "  -e              Echo commands sent to server"
-msgstr "  -e              ���Է��͸�������������"
-
-#: help.c:93
-msgid "  -E              Display queries that internal commands generate"
-msgstr "  -E             ��ʾ�ڲ��������ɵIJ�ѯ"
-
-#: help.c:94
-msgid "  -f FILENAME     Execute commands from file, then exit"
-msgstr "  -f �ļ���      ִ�������ļ�������, Ȼ���˳�"
-
-#: help.c:95
-#, c-format
-msgid ""
-"  -F STRING       Set field separator (default: \"%s\") (-P fieldsep=)\n"
-msgstr "  -F �ִ�         ������ָ��� (ȱʡ: \"%s\") (-P fieldsep=)\n"
-
-#: help.c:100
-#, c-format
-msgid "  -h HOSTNAME     Specify database server host (default: %s)\n"
-msgstr "  -h ������      �������ݿ���������� (ȱʡ: %s)\n"
-
-#: help.c:101
-msgid "local socket"
-msgstr ""
-
-#: help.c:103
-msgid "  -H              HTML table output mode (-P format=html)"
-msgstr "  -H             HTML �����ģʽ (-P format=html)"
-
-#: help.c:104
-msgid "  -l              List available databases, then exit"
-msgstr "  -l             �г����п������ݿ�, Ȼ���˳�"
-
-#: help.c:105
-msgid "  -n              Disable enhanced command line editing (readline)"
-msgstr "  -n             �ر���ǿ�������б༭���� (readline)"
-
-#: help.c:106
-msgid "  -o FILENAME     Send query results to file (or |pipe)"
-msgstr "  -o �ļ���       ���ļ�(���� |�ܵ�)���Ͳ�ѯ���"
-
-#: help.c:110
-#, c-format
-msgid "  -p PORT         Specify database server port (default: %s)\n"
-msgstr "  -p PORT         �������ݿ�������˿� (ȱʡ: %s)\n"
-
-#: help.c:113
-msgid ""
-"  -P VAR[=ARG]    Set printing option 'VAR' to 'ARG' (see \\pset command)"
-msgstr "  -P VAR[=ARG]    �Ѵ�ӡѡ�� 'VAR' ����Ϊ 'ARG' (�� \\pset ����)"
-
-#: help.c:114
-msgid "  -q              Run quietly (no messages, only query output)"
-msgstr "  -q             �������� (û����Ϣ, ֻ�в�ѯ���)"
-
-#: help.c:115
-msgid ""
-"  -R STRING       Set record separator (default: newline) (-P recordsep=)"
-msgstr "  -R �ִ�         ���ü�¼�ָ��� (ȱʡ: ����) (-P recordsep=)"
-
-#: help.c:116
-msgid "  -s              Single step mode (confirm each query)"
-msgstr "  -s             ����ģʽ (��ʵÿ����ѯ)"
-
-#: help.c:117
-msgid "  -S              Single line mode (end of line terminates SQL command)"
-msgstr "  -S             ����ģʽ (һ�н���ͬʱҲ��־�� SQL �������)"
-
-#: help.c:118
-msgid "  -t              Print rows only (-P tuples_only)"
-msgstr "  -t             ֻ��ӡ�� (-P tuples_onle)"
-
-#: help.c:119
-msgid ""
-"  -T TEXT         Set HTML table tag attributes (width, border) (-P "
-"tableattr=)"
-msgstr "  -T �ı�         ���� HTML ��������� (����, �߿�) (-P tableattr=)"
-
-#: help.c:125
-#, c-format
-msgid "  -U NAME         Specify database user name (default: %s)\n"
-msgstr "  -U ����        �������ݿ��û��� (ȱʡ: %s)\n"
-
-#: help.c:127
-msgid "  -v NAME=VALUE   Set psql variable 'NAME' to 'VALUE'"
-msgstr "  -v ����=��ֵ   ���� psql ���� '����' Ϊ '��ֵ'"
-
-#: help.c:128
-msgid "  -V              Show version information and exit"
-msgstr "  -V             ��ʾ�汾��ϢȻ���˳�"
-
-#: help.c:129
-msgid "  -W              Prompt for password (should happen automatically)"
-msgstr "  -W             ��ʾ������� (���Զ�����)"
-
-#: help.c:130
-msgid "  -x              Turn on expanded table output (-P expanded)"
-msgstr "  -x             ����չ����� (-P expended)"
-
-#: help.c:131
-msgid "  -X              Do not read startup file (~/.psqlrc)"
-msgstr "  -X             ��Ҫ��ȡ�����ļ� (~/.psqlrc)"
-
-#: help.c:134
-msgid ""
-"\n"
-"For more information, type \"\\?\" (for internal commands) or \"\\help\"\n"
-"(for SQL commands) from within psql, or consult the psql section in\n"
-"the PostgreSQL documentation.\n"
-"\n"
-"Report bugs to <pgsql-bugs@postgresql.org>."
-msgstr ""
-"\n"
-"����������Ϣ, �� psql ����� \"\\?\" (�����ڲ�����) ���� \"\\help\"\n"
-"(���� SQL ����), ���߲ο� PostgreSQL �ĵ���� psql ��\n"
-"\n"
-"�� <pgsql-bugs@postgresql.org> �㱨����."
-
-#: help.c:192
-msgid " \\a             toggle between unaligned and aligned output mode\n"
-msgstr " \\a            �ڷǶ���Ͷ�������ģʽ֮���л�\n"
-
-#: help.c:193
-#, c-format
-msgid ""
-" \\c[onnect] [DBNAME|- [USER]]\n"
-"                connect to new database (currently \"%s\")\n"
-msgstr ""
-" \\c[onnect] [���ݿ���|- [�û���]]\n"
-"                ���ӵ��µ����ݿ� (��ǰΪ \"%s\")\n"
-
-#: help.c:196
-msgid " \\C TITLE       set table title\n"
-msgstr " \\C ����       ������\n"
-
-#: help.c:197
-msgid " \\cd [DIRNAME]  change the current working directory\n"
-msgstr " \\cd [Ŀ¼��]  �ı䵱ǰ�Ĺ���Ŀ¼\n"
-
-#: help.c:198
-msgid " \\copy ...      perform SQL COPY with data stream to the client host\n"
-msgstr " \\copy ...     ִ�� SQL COPY, ������ָ��ͻ�������\n"
-
-#: help.c:199
-msgid " \\copyright     show PostgreSQL usage and distribution terms\n"
-msgstr " \\copyright     ��ʾ PostgreSQL �÷��ͷ�����Ϣ\n"
-
-#: help.c:200
-msgid " \\d TABLE       describe table (or view, index, sequence)\n"
-msgstr " \\d ��         ������ (������ͼ, ����, ����)\n"
-
-#: help.c:201
-msgid " \\d{t|i|s|v}... list tables/indexes/sequences/views\n"
-msgstr " \\d{t|i|s|v}... �г���/����/����/��ͼ\n"
-
-#: help.c:202
-msgid ""
-" \\d{p|S|l}      list access privileges, system tables, or large objects\n"
-msgstr " \\d{p|S|l}      �г�����Ȩ��, ϵͳ��, ���ߴ����\n"
-
-#: help.c:203
-msgid " \\da            list aggregate functions\n"
-msgstr " \\da           �г��ۼ�����\n"
-
-#: help.c:204
-msgid " \\dd NAME       show comment for table, type, function, or operator\n"
-msgstr " \\dd ����      ��ʾ��, ����, ����, ���߲�������ע��\n"
-
-#: help.c:205
-msgid " \\df            list functions\n"
-msgstr " \\df           �����\n"
-
-#: help.c:206
-msgid " \\do            list operators\n"
-msgstr " \\do           �������\n"
-
-#: help.c:207
-msgid " \\dT            list data types\n"
-msgstr " \\dT           ���������\n"
-
-#: help.c:208
-msgid ""
-" \\e FILENAME    edit the current query buffer or file with external editor\n"
-msgstr " \\e �ļ���      ��һ���ⲿ�༭���༭��ǰ��ѯ�����������ļ�\n"
-
-#: help.c:209
-msgid " \\echo TEXT     write text to standard output\n"
-msgstr " \\echo TEXT    ���׼���д���ı�\n"
-
-#: help.c:210
-msgid " \\encoding ENCODING  set client encoding\n"
-msgstr " \\encoding ����     ���ÿͻ��˱���\n"
-
-#: help.c:211
-msgid " \\f STRING      set field separator\n"
-msgstr " \\f �ִ�       ������ָ���\n"
-
-#: help.c:212
-msgid ""
-" \\g FILENAME    send SQL command to server (and write results to file or |"
-"pipe)\n"
-msgstr ""
-" \\g �ļ���      ����������� SQL ���� (���Ұѽ��д���ļ����� |�ܵ�)\n"
-
-#: help.c:213
-msgid " \\h NAME        help on syntax of SQL commands, * for all commands\n"
-msgstr " \\h ����       SQL ������﷨����, �� * ���Կ���������İ���\n"
-
-#: help.c:214
-#, c-format
-msgid " \\H             toggle HTML output mode (currently %s)\n"
-msgstr " \\H            �� HTML ���ģʽ֮���л� (��ǰ�� %s)\n"
-
-#: help.c:216
-msgid " \\i FILENAME    execute commands from file\n"
-msgstr " \\i �ļ���     ִ�������ļ�������\n"
-
-#: help.c:217
-msgid " \\l             list all databases\n"
-msgstr " \\l            �г��������ݿ�\n"
-
-#: help.c:218
-msgid ""
-" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
-"                large object operations\n"
-msgstr ""
-" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
-"                ��������\n"
-
-#: help.c:220
-msgid " \\o FILENAME    send all query results to file or |pipe\n"
-msgstr " \\o �ļ���     ���ļ����� |�ܵ� �������в�ѯ���\n"
-
-#: help.c:221
-msgid " \\p             show the content of the current query buffer\n"
-msgstr " \\p            ��ʾ��ǰ��ѯ������������\n"
-
-#: help.c:222
-msgid ""
-" \\pset VAR      set table output option (VAR := {format|border|expanded|\n"
-"                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
-msgstr ""
-" \\pset VAR      ���ñ������ѡ�� (VAR := {foramt|border|expaned|\n"
-"                 fieldsep|null|recordsep|tuples_only|title|tableattr|"
-"pager})\n"
-
-#: help.c:224
-msgid " \\q             quit psql\n"
-msgstr " \\q            �˳� psql\n"
-
-#: help.c:225
-msgid " \\qecho TEXT    write text to query output stream (see \\o)\n"
-msgstr " \\qecho �ı�   ���ѯ�����д���ı� (�� \\o)\n"
-
-#: help.c:226
-msgid " \\r             reset (clear) the query buffer\n"
-msgstr " \\r            ���� (����) ��ѯ������\n"
-
-#: help.c:227
-msgid " \\s FILENAME    print history or save it to file\n"
-msgstr " \\s �ļ���     ��ӡ��ʷ���߽��䱣�浽�ļ�\n"
-
-#: help.c:228
-msgid " \\set NAME VALUE  set internal variable\n"
-msgstr " \\set ���� ��ֵ  �����ڲ�����\n"
-
-#: help.c:229
-#, c-format
-msgid " \\t             show only rows (currently %s)\n"
-msgstr " \\t            ֻ��ʾ�� (��ǰ�� %s)\n"
-
-#: help.c:231
-msgid " \\T TEXT        set HTML table tag attributes\n"
-msgstr " \\T �ı�       ���� HTML ���������\n"
-
-#: help.c:232
-msgid " \\unset NAME    unset (delete) internal variable\n"
-msgstr " \\unset ����   ɾ���ڲ�����\n"
-
-#: help.c:233
-msgid " \\w FILENAME    write current query buffer to file\n"
-msgstr " \\w �ļ���     ����ǰ��ѯ������д�����ļ�\n"
-
-#: help.c:234
-#, c-format
-msgid " \\x             toggle expanded output (currently %s)\n"
-msgstr " \\x            ����չ���֮���л� (Ŀǰ�� %s)\n"
-
-#: help.c:236
-msgid " \\z             list table access privileges\n"
-msgstr " \\z            �г�������Ȩ��\n"
-
-#: help.c:237
-msgid " \\! [COMMAND]   execute command in shell or start interactive shell\n"
-msgstr " \\! [����]     �� shell ��ִ��������߿�ʼһ�������� shell\n"
-
-#: help.c:264
-msgid "Available help:"
-msgstr "����:"
-
-#: help.c:295
-#, c-format
-msgid ""
-"Command:     %s\n"
-"Description: %s\n"
-"Syntax:\n"
-"%s\n"
-"\n"
-msgstr ""
-"����:     %s\n"
-"����:     %s\n"
-"�﷨:\n"
-"%s\n"
-"\n"
-
-#: help.c:306
-#, c-format
-msgid ""
-"No help available for '%-.*s'.\n"
-"Try \\h with no arguments to see available help.\n"
-msgstr ""
-"��û�� '%-.*s' �Ŀ��ð���.\n"
-"�ò��������� \\h ��ȡ���ð���.\n"
-
-#: input.c:176
-#, c-format
-msgid "could not save history to %s: %s\n"
-msgstr "�޷�����ʷ���浽 %s: %s\n"
-
-#: large_obj.c:69
-msgid "Warning: Your transaction in progress has been committed."
-msgstr "����: ������ڴ����������Ѿ��ύ."
-
-#: large_obj.c:71
-msgid "Warning: Your transaction in progress has been rolled back."
-msgstr "����: ������ڴ����������Ѿ��ؾ�."
-
-#: large_obj.c:98
-msgid "\\lo_export: not connected to a database\n"
-msgstr "\\lo_export: δ�����ݿ�����\n"
-
-#: large_obj.c:165
-msgid "\\lo_import: not connected to a database\n"
-msgstr "\\lo_import: δ�����ݿ�����\n"
-
-#: large_obj.c:281
-msgid "\\lo_unlink: not connected to a database\n"
-msgstr "\\lo_unlink: δ�����ݿ�����\n"
-
-#: describe.c:57 describe.c:110 describe.c:169 describe.c:220 describe.c:268
-#: describe.c:400 describe.c:529 describe.c:1033 large_obj.c:362
-msgid "Description"
-msgstr "����"
-
-#: large_obj.c:370
-msgid "Large objects"
-msgstr "�����"
-
-#: mainloop.c:242
-#, c-format
-msgid "Use \"\\q\" to leave %s.\n"
-msgstr "ʹ�� \"\\q\" �뿪 %s.\n"
-
-#: print.c:447
-msgid "(No rows)\n"
-msgstr "(û����)\n"
-
-#: print.c:1221
-msgid "(1 row)"
-msgstr "(1 ��)"
-
-#: print.c:1223
-#, c-format
-msgid "(%d rows)"
-msgstr "(%d ��)"
-
-#: startup.c:140 startup.c:611
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s: �ڴ��þ�\n"
-
-#: startup.c:175
-msgid "User name: "
-msgstr "�û���:"
-
-#: startup.c:284
-#, c-format
-msgid ""
-"Welcome to %s, the PostgreSQL interactive terminal.\n"
-"\n"
-"Type:  \\copyright for distribution terms\n"
-"       \\h for help with SQL commands\n"
-"       \\? for help on internal slash commands\n"
-"       \\g or terminate with semicolon to execute query\n"
-"       \\q to quit\n"
-"\n"
-msgstr ""
-"��ӭ���� %s, PostgreSQL �Ľ����ն�.\n"
-"\n"
-"����:  \\copyright ��ȡ������Ϣ\n"
-"       \\h ��ȡ SQL ����İ���\n"
-"       \\? ��ȡ�ڲ���б������İ���\n"
-"       \\g �����ԷֺŽ�βִ�в�ѯ\n"
-"       \\q �˳�\n"
-"\n"
-
-#: startup.c:457
-#, c-format
-msgid "%s: couldn't set printing parameter %s\n"
-msgstr "%s: �޷����ô�ӡ���� %s\n"
-
-#: startup.c:503
-#, c-format
-msgid "%s: could not delete variable %s\n"
-msgstr "%s: �޷�ɾ������ %s\n"
-
-#: startup.c:513
-#, c-format
-msgid "%s: could not set variable %s\n"
-msgstr "%s: �޷����ñ��� %s\n"
-
-#: startup.c:544 startup.c:559
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "�� '%s --help' ��ȡ������Ϣ.\n"
-
-#: startup.c:552
-#, c-format
-msgid ""
-"%s was compiled without support for long options.\n"
-"Use --help for help on invocation options.\n"
-msgstr ""
-"%s û�д��ų�ѡ��֧�ֱ���.\n"
-"�� --help ��ȡ���ڵ���ѡ��İ���.\n"
-
-#: startup.c:577
-#, c-format
-msgid "%s: warning: extra option %s ignored\n"
-msgstr "%s: ����: ���Զ����ѡ�� %s\n"
-
-#: startup.c:584
-#, c-format
-msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
-msgstr "%s: ����: -u ѡ���Ѿ�����. ���� -U.\n"
-
-#: startup.c:640
-msgid "contains support for: "
-msgstr "������֧��:"
-
-#: startup.c:643
-msgid "readline"
-msgstr ""
-
-#: startup.c:653
-msgid "history"
-msgstr "��ʷ"
-
-#: startup.c:662
-msgid "multibyte"
-msgstr "���ֽ�"
-
-#: startup.c:670
-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 ""
-"���ְ�Ȩ (c) 1996-2002, PostgreSQL ȫ�򿪷���\n"
-"���ְ�Ȩ (c) 1996, University of California ����\n"
-"�Ķ� COPYRIGHT ����ʹ�� \\copyright ����鿴\n"
-"�÷��ͷ�������."
-
-#: startup.c:695
-#, c-format
-msgid ""
-"SSL connection (cipher: %s, bits: %i)\n"
-"\n"
-msgstr ""
-"SSL ���� (����: %s, λ: %i)\n"
-"\n"
-
-#: describe.c:56 describe.c:100 describe.c:158 describe.c:219 describe.c:259
-#: describe.c:400 describe.c:1027
-msgid "Name"
-msgstr "����"
-
-#: describe.c:56
-msgid "(all types)"
-msgstr "(��������)"
-
-#: describe.c:57
-msgid "Data type"
-msgstr "��������"
-
-#: describe.c:73
-msgid "List of aggregate functions"
-msgstr "�ۼ������б�"
-
-#: describe.c:100
-msgid "Result data type"
-msgstr "�����������"
-
-#: describe.c:101
-msgid "Argument data types"
-msgstr "������������"
-
-#: describe.c:109 describe.c:259 describe.c:1028
-msgid "Owner"
-msgstr "������"
-
-#: describe.c:109
-msgid "Language"
-msgstr "����"
-
-#: describe.c:110
-msgid "Source code"
-msgstr "Դ����"
-
-#: describe.c:135
-msgid "List of functions"
-msgstr "�����б�"
-
-#: describe.c:166
-msgid "Internal name"
-msgstr "�ڲ�����"
-
-#: describe.c:166
-msgid "Size"
-msgstr "��С"
-
-#: describe.c:193
-msgid "List of data types"
-msgstr "���������б�"
-
-#: describe.c:219
-msgid "Left arg type"
-msgstr "���������"
-
-#: describe.c:219
-msgid "Right arg type"
-msgstr "�Ҳ�������"
-
-#: describe.c:220
-msgid "Result type"
-msgstr "�������"
-
-#: describe.c:235
-msgid "List of operators"
-msgstr "�������б�"
-
-#: describe.c:263
-msgid "Encoding"
-msgstr "����"
-
-#: describe.c:278
-msgid "List of databases"
-msgstr "���ݿ��б�"
-
-#: describe.c:305
-msgid "Table"
-msgstr "��"
-
-#: describe.c:305
-msgid "Access privileges"
-msgstr "����Ȩ��"
-
-#: describe.c:319
-#, c-format
-msgid "Access privileges for database \"%s\""
-msgstr "���ݿ� \"%s\" �ķ���Ȩ��"
-
-#: describe.c:400
-msgid "Object"
-msgstr "����"
-
-#: describe.c:401
-msgid "aggregate"
-msgstr "�ۼ�"
-
-#: describe.c:401
-msgid "function"
-msgstr "����"
-
-#: describe.c:401
-msgid "operator"
-msgstr "������"
-
-#: describe.c:402
-msgid "data type"
-msgstr "��������"
-
-#: describe.c:402 describe.c:1027
-msgid "table"
-msgstr "��"
-
-#: describe.c:402 describe.c:1027
-msgid "view"
-msgstr "��ͼ"
-
-#: describe.c:403 describe.c:1027
-msgid "index"
-msgstr "����"
-
-#: describe.c:403 describe.c:1027
-msgid "sequence"
-msgstr "����"
-
-#: describe.c:403
-msgid "rule"
-msgstr "����"
-
-#: describe.c:404
-msgid "trigger"
-msgstr "������"
-
-#: describe.c:421
-msgid "Object descriptions"
-msgstr "��������"
-
-#: describe.c:502
-#, c-format
-msgid "Did not find any relation named \"%s\".\n"
-msgstr "û���ҵ��κ���Ϊ \"%s\" �Ĺ�ϵ.\n"
-
-#: describe.c:516
-msgid "Column"
-msgstr "��"
-
-#: describe.c:517 describe.c:1028
-msgid "Type"
-msgstr "����"
-
-#: describe.c:523
-msgid "Modifiers"
-msgstr "���δ�"
-
-#: describe.c:627
-#, c-format
-msgid "Table \"%s\""
-msgstr "�� \"%s\""
-
-#: describe.c:630
-#, c-format
-msgid "View \"%s\""
-msgstr "��ͼ \"%s\""
-
-#: describe.c:633
-#, c-format
-msgid "Sequence \"%s\""
-msgstr "���� \"%s\""
-
-#: describe.c:636
-#, c-format
-msgid "Index \"%s\""
-msgstr "���� \"%s\""
-
-#: describe.c:639
-#, c-format
-msgid "Special relation \"%s\""
-msgstr "�����ϵ \"%s\""
-
-#: describe.c:642
-#, c-format
-msgid "TOAST table \"%s\""
-msgstr "TOAST �� \"%s\""
-
-#: describe.c:645
-#, c-format
-msgid "?%c? \"%s\""
-msgstr ""
-
-#: describe.c:675
-msgid "unique "
-msgstr "Ψһ "
-
-#: describe.c:680
-msgid " (primary key)"
-msgstr " (����)"
-
-#: describe.c:685
-#, c-format
-msgid "Index predicate: %s"
-msgstr "�����: %s"
-
-#: describe.c:700
-#, c-format
-msgid "View definition: %s"
-msgstr "��ͼ����: %s"
-
-#: describe.c:816
-msgid "Indexes"
-msgstr "����"
-
-#: describe.c:831
-msgid "Primary key"
-msgstr "����"
-
-#: describe.c:846
-msgid "Unique keys"
-msgstr "Ψһ����"
-
-#: describe.c:861
-msgid "Check constraints"
-msgstr "���Լ��"
-
-#: describe.c:864
-#, c-format
-msgid "%s: \"%s\" %s"
-msgstr ""
-
-#: describe.c:867
-#, c-format
-msgid "%*s  \"%s\" %s"
-msgstr ""
-
-#: describe.c:875
-msgid "Rules"
-msgstr "����"
-
-#: describe.c:890
-msgid "Triggers"
-msgstr "������"
-
-#: describe.c:961
-msgid "User name"
-msgstr "�û���"
-
-#: describe.c:961
-msgid "User ID"
-msgstr "�û� ID"
-
-#: describe.c:962
-msgid "superuser, create database"
-msgstr "�����û�, �������ݿ�"
-
-#: describe.c:963
-msgid "superuser"
-msgstr "�����û�"
-
-#: describe.c:963
-msgid "create database"
-msgstr "�������ݿ�"
-
-#: describe.c:964
-msgid "Attributes"
-msgstr "����"
-
-#: describe.c:978
-msgid "List of database users"
-msgstr "���ݿ��û��б�"
-
-#: describe.c:1028
-msgid "special"
-msgstr "����"
-
-#: describe.c:1071
-msgid "No matching relations found.\n"
-msgstr "û���ҵ�ƥ��Ĺ�ϵ.\n"
-
-#: describe.c:1073
-msgid "No relations found.\n"
-msgstr "û���ҵ���ϵ.\n"
-
-#: describe.c:1078
-msgid "List of relations"
-msgstr "��ϵ�б�"
+# simplified Chinese translation file for psql
+# Weiping He <laser@zhengmai.com.cn>, 2002.
+#
+# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/zh_CN.po,v 1.2 2002/10/14 19:04:28 petere Exp $
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.3\n"
+"POT-Creation-Date: 2002-09-27 13:10+0800\n"
+"PO-Revision-Date: 2001-10-08 23:48:19+0800\n"
+"Last-Translator: Weiping He <laser@zhengmai.com.cn>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: command.c:155
+msgid "Warning: This syntax is deprecated.\n"
+msgstr "����: �����﷨�Ѿ�����.\n"
+
+#: command.c:162
+#, c-format
+msgid "Invalid command \\%s. Try \\? for help.\n"
+msgstr "��Ч������ \\%s. �� \\? ��ȡ����.\n"
+
+#: command.c:164
+#, c-format
+msgid "invalid command \\%s\n"
+msgstr "�������� \\%s\n"
+
+#: command.c:291
+#, c-format
+msgid "could not get home directory: %s\n"
+msgstr "�޷���ü�Ŀ¼: %s\n"
+
+#: command.c:307
+#, c-format
+msgid "\\%s: could not change directory to '%s': %s\n"
+msgstr "\\%s: ���ܸı䵽 '%s' Ŀ¼: %s\n"
+
+#: command.c:403 command.c:762
+msgid "no query buffer\n"
+msgstr "�޲�ѯ������\n"
+
+#: command.c:458
+#, c-format
+msgid "%s: invalid encoding name or conversion procedure not found\n"
+msgstr "%s: ��Ч�������ֻ�û���ҵ�ת������\n"
+
+#: command.c:518 command.c:549 command.c:560 command.c:574 command.c:616
+#: command.c:742 command.c:771
+#, c-format
+msgid "\\%s: missing required argument\n"
+msgstr "\\%s: ȱ���������\n"
+
+#: command.c:604
+msgid "Query buffer is empty."
+msgstr "��ѯ������Ϊ��."
+
+#: command.c:637
+msgid "Query buffer reset (cleared)."
+msgstr "����(���)��ѯ������."
+
+#: command.c:648
+#, c-format
+msgid "Wrote history to %s.\n"
+msgstr "�� %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
+msgid "out of memory\n"
+msgstr "�ڴ��þ�\n"
+
+#: command.c:697 command.c:747
+#, c-format
+msgid "\\%s: error\n"
+msgstr "\\%s: ����\n"
+
+#: command.c:726
+msgid "Timing is on."
+msgstr "��ʼ��ʱ."
+
+#: command.c:729
+msgid "Timing is off."
+msgstr "������ʱ."
+
+#: 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
+#, c-format
+msgid "%s: %s\n"
+msgstr "%s: %s\n"
+
+#: command.c:872
+#, c-format
+msgid "\\%s: extra argument '%s' ignored\n"
+msgstr "\\%s: ���Զ���IJ��� '%s'\n"
+
+#: command.c:963 command.c:991 command.c:1115
+msgid "parse error at the end of line\n"
+msgstr "�������������\n"
+
+#: command.c:1354 command.c:1378 startup.c:175 startup.c:193
+msgid "Password: "
+msgstr "����: "
+
+#: command.c:1392 common.c:154 common.c:247 common.c:419
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: command.c:1396
+msgid "Previous connection kept\n"
+msgstr "������һ������\n"
+
+#: command.c:1408
+#, c-format
+msgid "\\connect: %s"
+msgstr "\\����: %s"
+
+#: command.c:1420
+#, c-format
+msgid "You are now connected to database %s.\n"
+msgstr "�������Ѿ����ӵ����ݿ� %s.\n"
+
+#: command.c:1422
+#, c-format
+msgid "You are now connected as new user %s.\n"
+msgstr "����������Ϊ���û� %s ���ӵ�.\n"
+
+#: command.c:1425
+#, c-format
+msgid "You are now connected to database %s as user %s.\n"
+msgstr "�����������û� %s ���������ӵ����ݿ� %s .\n"
+
+#: command.c:1518
+#, c-format
+msgid "could not start editor %s\n"
+msgstr "�޷����б༭�� %s\n"
+
+#: command.c:1520
+msgid "could not start /bin/sh\n"
+msgstr "�޷����� /bin/sh\n"
+
+#: command.c:1565
+#, c-format
+msgid "could not open temporary file %s: %s\n"
+msgstr "�޷�����ʱ�ļ� %s: %s\n"
+
+#: command.c:1749
+msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
+msgstr "\\pset: �����ĸ�ʽ���޶���, ����, html, latex\n"
+
+#: command.c:1754
+#, c-format
+msgid "Output format is %s.\n"
+msgstr "�����ʽ�� %s.\n"
+
+#: command.c:1764
+#, c-format
+msgid "Border style is %d.\n"
+msgstr "�߽����� %d.\n"
+
+#: command.c:1773
+msgid "Expanded display is on.\n"
+msgstr "��չ��ʾ�Ѵ�.\n"
+
+#: command.c:1774
+msgid "Expanded display is off.\n"
+msgstr "��չ��ʾ�ѹر�.\n"
+
+#: command.c:1786
+#, c-format
+msgid "Null display is '%s'.\n"
+msgstr "Null ��ʾΪ '%s'.\n"
+
+#: command.c:1798
+#, c-format
+msgid "Field separator is '%s'.\n"
+msgstr "��ָ����� '%s'.\n"
+
+#: command.c:1812
+msgid "Record separator is <newline>."
+msgstr "��¼�ָ����� <����>."
+
+#: command.c:1814
+#, c-format
+msgid "Record separator is '%s'.\n"
+msgstr "��¼�ָ����� '%s'.\n"
+
+#: command.c:1825
+msgid "Showing only tuples."
+msgstr "ֻ��ʾԪ��."
+
+#: command.c:1827
+msgid "Tuples only is off."
+msgstr "�ر�ֻ��ʾԪ��."
+
+#: command.c:1843
+#, c-format
+msgid "Title is \"%s\".\n"
+msgstr "������ \"%s\".\n"
+
+#: command.c:1845
+msgid "Title is unset.\n"
+msgstr "�ޱ���.\n"
+
+#: command.c:1861
+#, c-format
+msgid "Table attribute is \"%s\".\n"
+msgstr "�������� \"%s\".\n"
+
+#: command.c:1863
+msgid "Table attributes unset.\n"
+msgstr "δ���ñ�����.\n"
+
+#: command.c:1874
+msgid "Using pager is on."
+msgstr "�򿪷�ҳ����ʹ��."
+
+#: command.c:1876
+msgid "Using pager is off."
+msgstr "�رշ�ҳ����ʹ��."
+
+#: command.c:1887
+msgid "Default footer is on."
+msgstr "��ȱʡ�ű�."
+
+#: command.c:1889
+msgid "Default footer is off."
+msgstr "�ر�ȱʡ�ű�."
+
+#: command.c:1895
+#, c-format
+msgid "\\pset: unknown option: %s\n"
+msgstr "\\pset: δ֪ѡ��: %s\n"
+
+#: command.c:1938
+msgid "\\!: failed\n"
+msgstr "\\!: ʧ��\n"
+
+#: common.c:49
+#, c-format
+msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
+msgstr "%s: xstrdup: �޷����ƿ�ָ��(�ڲ�����)\n"
+
+#: common.c:215 common.c:304
+msgid "You are currently not connected to a database.\n"
+msgstr "��Ŀǰû�������ݿ�����.\n"
+
+#: common.c:254 common.c:429
+msgid "connection to server was lost\n"
+msgstr "�����ݿ�����Ӷ�ʧ\n"
+
+#: common.c:257 common.c:432
+msgid "The connection to the server was lost. Attempting reset: "
+msgstr "��������������Ѷ�ʧ. ��������: "
+
+#: common.c:261 common.c:436
+msgid "Failed.\n"
+msgstr "ʧ��.\n"
+
+#: common.c:271 common.c:448
+msgid "Succeeded.\n"
+msgstr "�ɹ�.\n"
+
+#: common.c:312
+#, c-format
+msgid ""
+"***(Single step mode: Verify query)"
+"*********************************************\n"
+"%s\n"
+"***(press return to proceed or enter x and return to cancel)"
+"********************\n"
+msgstr ""
+"***(����ģʽ: ��֤ ��ѯ)**********************************************\n"
+"%s\n"
+"***(�ûس����������� x Ȼ���ûس�ȡ��)**********************\n"
+
+#: common.c:408
+msgid ""
+"Enter data to be copied followed by a newline.\n"
+"End with a backslash and a period on a line by itself."
+msgstr ""
+"����Ҫ����������Ȼ������һ������.\n"
+"�ڶ�����һ��������һ����б����һ��������."
+
+#: common.c:454
+#, c-format
+msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
+msgstr "�յ����Խ��̺�Ϊ %2$d �ĺ�˵��첽 NOTIFY (֪ͨ) '%1$s'.\n"
+
+#: common.c:466
+#, c-format
+msgid "Time: %.2f ms\n"
+msgstr "ʱ��: %.2f ms\n"
+
+#: copy.c:86
+msgid "\\copy: arguments required\n"
+msgstr "\\copy: ��Ҫ����\n"
+
+#: copy.c:234
+#, c-format
+msgid "\\copy: parse error at '%s'\n"
+msgstr "\\copy: �� '%s' ��������\n"
+
+#: copy.c:236
+msgid "\\copy: parse error at end of line\n"
+msgstr "\\copy: �����������\n"
+
+#: copy.c:319
+#, c-format
+msgid "%s: cannot copy from/to a directory\n"
+msgstr "%s: �޷���һ��Ŀ¼����, �򿽱���һ��Ŀ¼\n"
+
+#: copy.c:340
+#, c-format
+msgid "\\copy: %s"
+msgstr "\\����: %s"
+
+#: copy.c:344
+#, c-format
+msgid "\\copy: unexpected response (%d)\n"
+msgstr "\\copy: ������Ӧ(%d)\n"
+
+#: help.c:48
+msgid "on"
+msgstr "��"
+
+#: help.c:48
+msgid "off"
+msgstr "�ر�"
+
+#: help.c:70
+#, c-format
+msgid "could not get current user name: %s\n"
+msgstr "�޷���ȡ��ǰ�û�����: %s\n"
+
+#: help.c:83
+#, c-format
+msgid ""
+"This is psql %s, the PostgreSQL interactive terminal.\n"
+"\n"
+msgstr ""
+"������ psql %s, PostgreSQL �Ľ����ն�.\n"
+"\n"
+
+#: help.c:85
+msgid "Usage:"
+msgstr "�÷�:"
+
+#: help.c:86
+msgid "  psql [OPTIONS] [DBNAME [USERNAME]]\n"
+msgstr "  psql [ѡ��] [���ݿ����� [�û���]]\n"
+
+#: help.c:87
+msgid "Options:"
+msgstr "ѡ��:"
+
+#: help.c:88
+msgid "  -a              Echo all input from script"
+msgstr "  -a              �����������Խű�������"
+
+#: help.c:89
+msgid "  -A              Unaligned table output mode (-P format=unaligned)"
+msgstr "  -A              �Ƕ���ı����ģʽ(-P format=unaligned)"
+
+#: help.c:90
+msgid "  -c COMMAND      Run only single command (SQL or internal) and exit"
+msgstr "  -c ����         ֻ����һ������(SQL �����ڲ�)Ȼ���˳�"
+
+#: help.c:96
+#, c-format
+msgid "  -d DBNAME       Specify database name to connect to (default: %s)\n"
+msgstr "  -d ���ݿ���     ����Ҫ���ӵ����ݿ���(ȱʡ: %s)\n"
+
+#: help.c:98
+msgid "  -e              Echo commands sent to server"
+msgstr "  -e              ���Է��͸�������������"
+
+#: help.c:99
+msgid "  -E              Display queries that internal commands generate"
+msgstr "  -E              ��ʾ�ڲ��������ɵIJ�ѯ"
+
+#: help.c:100
+msgid "  -f FILENAME     Execute commands from file, then exit"
+msgstr "  -f �ļ���       ִ�������ļ�������, Ȼ���˳�"
+
+#: help.c:101
+#, c-format
+msgid ""
+"  -F STRING       Set field separator (default: \"%s\") (-P fieldsep=)\n"
+msgstr "  -F �ִ�         ������ָ��� (ȱʡ: \"%s\") (-P fieldsep=)\n"
+
+#: help.c:106
+#, c-format
+msgid "  -h HOSTNAME     Specify database server host (default: %s)\n"
+msgstr "  -h ������       �������ݿ���������� (ȱʡ: %s)\n"
+
+#: help.c:107
+msgid "local socket"
+msgstr "�����׽���"
+
+#: help.c:109
+msgid "  -H              HTML table output mode (-P format=html)"
+msgstr "  -H              HTML �����ģʽ (-P format=html)"
+
+#: help.c:110
+msgid "  -l              List available databases, then exit"
+msgstr "  -l              �г����п������ݿ�, Ȼ���˳�"
+
+#: help.c:111
+msgid "  -n              Disable enhanced command line editing (readline)"
+msgstr "  -n              �ر���ǿ�������б༭���� (readline)"
+
+#: help.c:112
+msgid "  -o FILENAME     Send query results to file (or |pipe)"
+msgstr "  -o �ļ���       ���ļ�(���� |�ܵ�)���Ͳ�ѯ���"
+
+#: help.c:116
+#, c-format
+msgid "  -p PORT         Specify database server port (default: %s)\n"
+msgstr "  -p PORT         �������ݿ�������˿� (ȱʡ: %s)\n"
+
+#: help.c:119
+msgid ""
+"  -P VAR[=ARG]    Set printing option 'VAR' to 'ARG' (see \\pset command)"
+msgstr "  -P VAR[=ARG]    �Ѵ�ӡѡ�� 'VAR' ����Ϊ 'ARG' (�� \\pset ����)"
+
+#: help.c:120
+msgid "  -q              Run quietly (no messages, only query output)"
+msgstr "  -q              �������� (û����Ϣ, ֻ�в�ѯ���)"
+
+#: help.c:121
+msgid ""
+"  -R STRING       Set record separator (default: newline) (-P recordsep=)"
+msgstr "  -R �ִ�         ���ü�¼�ָ��� (ȱʡ: ����) (-P recordsep=)"
+
+#: help.c:122
+msgid "  -s              Single step mode (confirm each query)"
+msgstr "  -s              ����ģʽ (��ʵÿ����ѯ)"
+
+#: help.c:123
+msgid "  -S              Single line mode (end of line terminates SQL command)"
+msgstr "  -S              ����ģʽ (һ�н���ͬʱҲ��־�� SQL �������)"
+
+#: help.c:124
+msgid "  -t              Print rows only (-P tuples_only)"
+msgstr "  -t              ֻ��ӡ�� (-P tuples_onle)"
+
+#: help.c:125
+msgid ""
+"  -T TEXT         Set HTML table tag attributes (width, border) (-P "
+"tableattr=)"
+msgstr "  -T �ı�         ���� HTML ��������� (����, �߿�) (-P tableattr=)"
+
+#: help.c:131
+#, c-format
+msgid "  -U NAME         Specify database user name (default: %s)\n"
+msgstr "  -U ����         �������ݿ��û��� (ȱʡ: %s)\n"
+
+#: help.c:133
+msgid "  -v NAME=VALUE   Set psql variable 'NAME' to 'VALUE'"
+msgstr "  -v ����=��ֵ    ���� psql ���� '����' Ϊ '��ֵ'"
+
+#: help.c:134
+msgid "  -V              Show version information and exit"
+msgstr "  -V              ��ʾ�汾��ϢȻ���˳�"
+
+#: help.c:135
+msgid "  -W              Prompt for password (should happen automatically)"
+msgstr "  -W              ��ʾ������� (���Զ�����)"
+
+#: help.c:136
+msgid "  -x              Turn on expanded table output (-P expanded)"
+msgstr "  -x              ����չ����� (-P expended)"
+
+#: help.c:137
+msgid "  -X              Do not read startup file (~/.psqlrc)"
+msgstr "  -X              ��Ҫ��ȡ�����ļ� (~/.psqlrc)"
+
+#: help.c:140
+msgid ""
+"\n"
+"For more information, type \"\\?\" (for internal commands) or \"\\help\"\n"
+"(for SQL commands) from within psql, or consult the psql section in\n"
+"the PostgreSQL documentation.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>."
+msgstr ""
+"\n"
+"����������Ϣ, �� psql ����� \"\\?\" (�����ڲ�����) ���� \"\\help\"\n"
+"(���� SQL ����), ���߲ο� PostgreSQL �ĵ���� psql ��\n"
+"\n"
+"�� <pgsql-bugs@postgresql.org> �㱨����."
+
+#: help.c:211
+msgid " \\a             toggle between unaligned and aligned output mode\n"
+msgstr " \\a             �ڷǶ���Ͷ�������ģʽ֮���л�\n"
+
+#: help.c:212
+#, c-format
+msgid ""
+" \\c[onnect] [DBNAME|- [USER]]\n"
+"                connect to new database (currently \"%s\")\n"
+msgstr ""
+" \\c[onnect] [���ݿ���|- [�û���]]\n"
+"                ���ӵ��µ����ݿ� (��ǰΪ \"%s\")\n"
+
+#: help.c:215
+msgid " \\C [STRING]    set table title, or unset if none\n"
+msgstr " \\C [�ִ�]      ���ñ�����, �����������ȡ������\n"
+
+#: help.c:216
+msgid " \\cd [DIR]      change the current working directory\n"
+msgstr " \\cd [Ŀ¼��]   �ı䵱ǰ�Ĺ���Ŀ¼\n"
+
+#: help.c:217
+msgid " \\copy ...      perform SQL COPY with data stream to the client host\n"
+msgstr " \\copy ...      ִ�� SQL COPY, ������ָ��ͻ�������\n"
+
+#: help.c:218
+msgid " \\copyright     show PostgreSQL usage and distribution terms\n"
+msgstr " \\copyright     ��ʾ PostgreSQL �÷��ͷ�����Ϣ\n"
+
+#: help.c:219
+msgid " \\d [NAME]      describe table, index, sequence, or view\n"
+msgstr " \\d [����]      ������, ����, ����, ������ͼ\n"
+
+#: help.c:220
+msgid ""
+" \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
+"                list tables/indexes/sequences/views/system tables\n"
+msgstr ""
+"                �г���/����/����/��ͼ/ϵͳ��\n"
+" \\d{t|i|s|v|S} [ģʽ]    (�� \"+\" ��ȡ������Ϣ)\n"
+"                �г���/����/����/��ͼ/ϵͳ��\n"
+
+#: help.c:222
+msgid " \\da [PATTERN]  list aggregate functions\n"
+msgstr " \\da [ģʽ]     �г��ۼ�����\n"
+
+#: help.c:223
+msgid " \\dd [PATTERN]  show comment for object\n"
+msgstr " \\dd [ģʽ]     ��ʾĿ���ע��\n"
+
+#: help.c:224
+msgid " \\dD [PATTERN]  list domains\n"
+msgstr " \\dD [ģʽ]     �г���\n"
+
+#: help.c:225
+msgid " \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
+msgstr " \\df [ģʽ]     �г����� (�� \"+\" ��ȡ�������Ϣ)\n"
+
+#: help.c:226
+msgid " \\do [NAME]     list operators\n"
+msgstr " \\do [����]     �������\n"
+
+#: help.c:227
+msgid " \\dl            list large objects, same as \\lo_list\n"
+msgstr " \\dl            �г������, �� \\lo_list һ��\n"
+
+#: help.c:228
+msgid " \\dp [PATTERN]  list table access privileges\n"
+msgstr " \\dp [ģʽ]     �г�������Ȩ��\n"
+
+#: help.c:229
+msgid " \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
+msgstr " \\dT [ģʽ]     �г��������� (�� \"+\" ��ȡ�������Ϣ)\n"
+
+#: help.c:230
+msgid " \\du [PATTERN]  list users\n"
+msgstr " \\du [ģʽ]     �г��û�\n"
+
+#: help.c:231
+msgid " \\e [FILE]      edit the query buffer (or file) with external editor\n"
+msgstr " \\e [�ļ���]    ��һ���ⲿ�༭���༭��ǰ��ѯ�����������ļ�\n"
+
+#: help.c:232
+msgid " \\echo [STRING] write string to standard output\n"
+msgstr " \\echo [�ִ�]   ���׼���д���ı�\n"
+
+#: help.c:233
+msgid " \\encoding [ENCODING]  show or set client encoding\n"
+msgstr " \\encoding [����]      ���ÿͻ��˱���\n"
+
+#: help.c:234
+msgid ""
+" \\f [STRING]    show or set field separator for unaligned query output\n"
+msgstr " \\f [�ִ�]      ������ָ���\n"
+
+#: help.c:235
+msgid ""
+" \\g [FILE]      send query buffer to server (and results to file or |pipe)\n"
+msgstr ""
+" \\g �ļ���      ����������� SQL ���� (���Ұѽ��д���ļ����� |�ܵ�)\n"
+
+#: help.c:236
+msgid " \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
+msgstr " \\h [����]      SQL ������﷨����, �� * ���Կ���������İ���\n"
+
+#: help.c:237
+#, c-format
+msgid " \\H             toggle HTML output mode (currently %s)\n"
+msgstr " \\H             �� HTML ���ģʽ֮���л� (��ǰ�� %s)\n"
+
+#: help.c:239
+msgid " \\i FILE        execute commands from file\n"
+msgstr " \\i �ļ���      ִ�������ļ�������\n"
+
+#: help.c:240
+msgid " \\l             list all databases\n"
+msgstr " \\l             �г��������ݿ�\n"
+
+#: help.c:241
+msgid ""
+" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
+"                large object operations\n"
+msgstr ""
+" \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
+"                ��������\n"
+
+#: help.c:243
+msgid " \\o FILE        send all query results to file or |pipe\n"
+msgstr " \\o �ļ���      ���ļ����� |�ܵ� �������в�ѯ���\n"
+
+#: help.c:244
+msgid " \\p             show the contents of the query buffer\n"
+msgstr " \\p             ��ʾ��ǰ��ѯ������������\n"
+
+#: help.c:245
+msgid ""
+" \\pset NAME [VALUE]  set table output option\n"
+"                (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
+"                tuples_only|title|tableattr|pager})\n"
+msgstr ""
+" \\pset ���� [ֵ]     ���ñ������ѡ�� (NAME := {foramt|border|expaned|\n"
+"                (���� := {foramt|border|expanded|fieldsep|null|recordsep|\n"
+"                tuples_only|title|tableattr|pager})\n"
+
+#: help.c:248
+msgid " \\q             quit psql\n"
+msgstr " \\q             �˳� psql\n"
+
+#: help.c:249
+msgid " \\qecho [STRING]  write string to query output stream (see \\o)\n"
+msgstr " \\qecho [�ִ�]    ���ѯ�����д���ı� (�� \\o)\n"
+
+#: help.c:250
+msgid " \\r             reset (clear) the query buffer\n"
+msgstr " \\r             ���� (����) ��ѯ������\n"
+
+#: help.c:251
+msgid " \\s [FILE]      display history or save it to file\n"
+msgstr " \\s [�ļ���]    ��ӡ��ʷ���߽��䱣�浽�ļ�\n"
+
+#: help.c:252
+msgid ""
+" \\set [NAME [VALUE]]  set internal variable, or list all if no parameters\n"
+msgstr " \\set [���� [ֵ]]     �����ڲ�����, ���û�в������г�����\n"
+
+#: help.c:253
+#, c-format
+msgid " \\t             show only rows (currently %s)\n"
+msgstr " \\t             ֻ��ʾ�� (��ǰ�� %s)\n"
+
+#: help.c:255
+msgid " \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
+msgstr " \\T [�ִ�]      ���� HTML <��>�������, ���û�в�����ȡ������\n"
+
+#: help.c:256
+#, c-format
+msgid " \\timing        toggle timing of commands (currently %s)\n"
+msgstr " \\timing        ��ѯ��ʱ�����л� (Ŀǰ�� %s)\n"
+
+#: help.c:258
+msgid " \\unset NAME    unset (delete) internal variable\n"
+msgstr " \\unset ����    ȡ��(ɾ��)�ڲ�����\n"
+
+#: help.c:259
+msgid " \\w [FILE]      write query buffer to file\n"
+msgstr " \\w [�ļ���]    ����ǰ��ѯ������д�����ļ�\n"
+
+#: help.c:260
+#, c-format
+msgid " \\x             toggle expanded output (currently %s)\n"
+msgstr " \\x             ����չ���֮���л� (Ŀǰ�� %s)\n"
+
+#: help.c:262
+msgid " \\z [PATTERN]   list table access privileges (same as \\dp)\n"
+msgstr " \\z [ģʽ]      �г�������Ȩ�� (�� \\dp һ��)\n"
+
+#: help.c:263
+msgid " \\! [COMMAND]   execute command in shell or start interactive shell\n"
+msgstr " \\! [����]      �� shell ��ִ��������߿�ʼһ�������� shell\n"
+
+#: help.c:290
+msgid "Available help:"
+msgstr "����:"
+
+#: help.c:321
+#, c-format
+msgid ""
+"Command:     %s\n"
+"Description: %s\n"
+"Syntax:\n"
+"%s\n"
+"\n"
+msgstr ""
+"����:     %s\n"
+"����:     %s\n"
+"�﷨:\n"
+"%s\n"
+"\n"
+
+#: help.c:332
+#, c-format
+msgid ""
+"No help available for '%-.*s'.\n"
+"Try \\h with no arguments to see available help.\n"
+msgstr ""
+"��û�� '%-.*s' �Ŀ��ð���.\n"
+"�ò��������� \\h ��ȡ���ð���.\n"
+
+#: input.c:177
+#, c-format
+msgid "could not save history to %s: %s\n"
+msgstr "�޷�����ʷ���浽 %s: %s\n"
+
+#: large_obj.c:69
+msgid "Warning: Your transaction in progress has been committed."
+msgstr "����: ������ڴ����������Ѿ��ύ."
+
+#: large_obj.c:71
+msgid "Warning: Your transaction in progress has been rolled back."
+msgstr "����: ������ڴ����������Ѿ��ؾ�."
+
+#: large_obj.c:98
+msgid "\\lo_export: not connected to a database\n"
+msgstr "\\lo_export: δ�����ݿ�����\n"
+
+#: large_obj.c:165
+msgid "\\lo_import: not connected to a database\n"
+msgstr "\\lo_import: δ�����ݿ�����\n"
+
+#: large_obj.c:282
+msgid "\\lo_unlink: not connected to a database\n"
+msgstr "\\lo_unlink: δ�����ݿ�����\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
+msgid "Description"
+msgstr "����"
+
+#: large_obj.c:371
+msgid "Large objects"
+msgstr "�����"
+
+#: mainloop.c:242
+#, c-format
+msgid "Use \"\\q\" to leave %s.\n"
+msgstr "ʹ�� \"\\q\" �뿪 %s.\n"
+
+#: print.c:412
+msgid "(No rows)\n"
+msgstr "(û����)\n"
+
+#: print.c:1147
+msgid "(1 row)"
+msgstr "(1 ��)"
+
+#: print.c:1149
+#, c-format
+msgid "(%d rows)"
+msgstr "(%d ��)"
+
+#: startup.c:134 startup.c:612
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: �ڴ��þ�\n"
+
+#: startup.c:169
+msgid "User name: "
+msgstr "�û���:"
+
+#: startup.c:278
+#, c-format
+msgid ""
+"Welcome to %s %s, the PostgreSQL interactive terminal.\n"
+"\n"
+"Type:  \\copyright for distribution terms\n"
+"       \\h for help with SQL commands\n"
+"       \\? for help on internal slash commands\n"
+"       \\g or terminate with semicolon to execute query\n"
+"       \\q to quit\n"
+"\n"
+msgstr ""
+"��ӭ���� %s %s, PostgreSQL �Ľ����ն�.\n"
+"\n"
+"����:  \\copyright ��ȡ������Ϣ\n"
+"       \\h ��ȡ SQL ����İ���\n"
+"       \\? ��ȡ�ڲ���б������İ���\n"
+"       \\g �����ԷֺŽ�βִ�в�ѯ\n"
+"       \\q �˳�\n"
+"\n"
+
+#: startup.c:452
+#, c-format
+msgid "%s: couldn't set printing parameter %s\n"
+msgstr "%s: �޷����ô�ӡ���� %s\n"
+
+#: startup.c:498
+#, c-format
+msgid "%s: could not delete variable %s\n"
+msgstr "%s: �޷�ɾ������ %s\n"
+
+#: startup.c:508
+#, c-format
+msgid "%s: could not set variable %s\n"
+msgstr "%s: �޷����ñ��� %s\n"
+
+#: startup.c:539 startup.c:559
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "�� '%s --help' ��ȡ������Ϣ.\n"
+
+#: startup.c:552
+#, c-format
+msgid ""
+"%s was compiled without support for long options.\n"
+"Use --help for help on invocation options.\n"
+msgstr ""
+"%s û�д��ų�ѡ��֧�ֱ���.\n"
+"�� --help ��ȡ���ڵ���ѡ��İ���.\n"
+
+#: startup.c:577
+#, c-format
+msgid "%s: warning: extra option %s ignored\n"
+msgstr "%s: ����: ���Զ����ѡ�� %s\n"
+
+#: startup.c:584
+#, c-format
+msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
+msgstr "%s: ����: -u ѡ���Ѿ�����. ���� -U.\n"
+
+#: startup.c:641
+msgid "contains support for command-line editing"
+msgstr "���������б༭��֧��"
+
+#: 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 ""
+"���ְ�Ȩ (c) 1996-2002, PostgreSQL ȫ�򿪷���\n"
+"���ְ�Ȩ (c) 1996, University of California ����\n"
+"�Ķ� COPYRIGHT ����ʹ�� \\copyright ����鿴\n"
+"�÷��ͷ�������."
+
+#: startup.c:669
+#, c-format
+msgid ""
+"SSL connection (cipher: %s, bits: %i)\n"
+"\n"
+msgstr ""
+"SSL ���� (����: %s, λ: %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
+msgid "Schema"
+msgstr "ģʽ"
+
+#: describe.c:85 describe.c:126 describe.c:196 describe.c:269 describe.c:311
+#: describe.c:417 describe.c:1260 describe.c:1367
+msgid "Name"
+msgstr "����"
+
+#: describe.c:85
+msgid "(all types)"
+msgstr "(��������)"
+
+#: describe.c:86
+msgid "Data type"
+msgstr "��������"
+
+#: describe.c:100
+msgid "List of aggregate functions"
+msgstr "�ۼ������б�"
+
+#: describe.c:126
+msgid "Result data type"
+msgstr "�����������"
+
+#: describe.c:127
+msgid "Argument data types"
+msgstr "������������"
+
+#: describe.c:135 describe.c:311 describe.c:1262
+msgid "Owner"
+msgstr "������"
+
+#: describe.c:135
+msgid "Language"
+msgstr "����"
+
+#: describe.c:136
+msgid "Source code"
+msgstr "Դ����"
+
+#: describe.c:170
+msgid "List of functions"
+msgstr "�����б�"
+
+#: describe.c:206
+msgid "Internal name"
+msgstr "�ڲ�����"
+
+#: describe.c:206
+msgid "Size"
+msgstr "��С"
+
+#: describe.c:238
+msgid "List of data types"
+msgstr "���������б�"
+
+#: describe.c:270
+msgid "Left arg type"
+msgstr "���������"
+
+#: describe.c:270
+msgid "Right arg type"
+msgstr "�Ҳ�������"
+
+#: describe.c:271
+msgid "Result type"
+msgstr "�������"
+
+#: describe.c:285
+msgid "List of operators"
+msgstr "�������б�"
+
+#: describe.c:314
+msgid "Encoding"
+msgstr "����"
+
+#: describe.c:330
+msgid "List of databases"
+msgstr "���ݿ��б�"
+
+#: describe.c:363 describe.c:1277
+msgid "Table"
+msgstr "��"
+
+#: describe.c:363
+msgid "Access privileges"
+msgstr "����Ȩ��"
+
+#: describe.c:385
+#, c-format
+msgid "Access privileges for database \"%s\""
+msgstr "���ݿ� \"%s\" �ķ���Ȩ��"
+
+#: describe.c:417
+msgid "Object"
+msgstr "����"
+
+#: describe.c:428
+msgid "aggregate"
+msgstr "�ۼ�"
+
+#: describe.c:446
+msgid "function"
+msgstr "����"
+
+#: describe.c:460
+msgid "operator"
+msgstr "������"
+
+#: describe.c:474
+msgid "data type"
+msgstr "��������"
+
+#: describe.c:491 describe.c:1261
+msgid "table"
+msgstr "��"
+
+#: describe.c:491 describe.c:1261
+msgid "view"
+msgstr "��ͼ"
+
+#: describe.c:491 describe.c:1261
+msgid "index"
+msgstr "����"
+
+#: describe.c:491 describe.c:1261
+msgid "sequence"
+msgstr "����"
+
+#: describe.c:507
+msgid "rule"
+msgstr "����"
+
+#: describe.c:523
+msgid "trigger"
+msgstr "������"
+
+#: describe.c:541
+msgid "Object descriptions"
+msgstr "��������"
+
+#: describe.c:587
+#, c-format
+msgid "Did not find any relation named \"%s\".\n"
+msgstr "û���ҵ��κ���Ϊ \"%s\" �Ĺ�ϵ.\n"
+
+#: describe.c:666
+#, c-format
+msgid "Did not find any relation with oid %s.\n"
+msgstr "û���ҵ��κ� oid Ϊ \"%s\" �Ĺ�ϵ.\n"
+
+#: describe.c:679
+msgid "Column"
+msgstr "��"
+
+#: describe.c:680 describe.c:1262 describe.c:1368
+msgid "Type"
+msgstr "����"
+
+#: describe.c:686
+msgid "Modifiers"
+msgstr "���δ�"
+
+#: describe.c:786
+#, c-format
+msgid "Table \"%s.%s\""
+msgstr "�� \"%s.%s\""
+
+#: describe.c:790
+#, c-format
+msgid "View \"%s.%s\""
+msgstr "��ͼ \"%s.%s\""
+
+#: describe.c:794
+#, c-format
+msgid "Sequence \"%s.%s\""
+msgstr "���� \"%s.%s\""
+
+#: describe.c:798
+#, c-format
+msgid "Index \"%s.%s\""
+msgstr "���� \"%s.%s\""
+
+#: describe.c:802
+#, c-format
+msgid "Special relation \"%s.%s\""
+msgstr "�����ϵ \"%s.%s\""
+
+#: describe.c:806
+#, c-format
+msgid "TOAST table \"%s.%s\""
+msgstr "TOAST �� \"%s.%s\""
+
+#: describe.c:810
+#, c-format
+msgid "Composite type \"%s.%s\""
+msgstr "�������� \"%s.%s\""
+
+#: describe.c:814
+#, c-format
+msgid "?%c? \"%s.%s\""
+msgstr "?%c? \"%s.%s\""
+
+#: describe.c:853
+msgid "primary key, "
+msgstr "����, "
+
+#: describe.c:855
+msgid "unique, "
+msgstr "Ψһ, "
+
+#: describe.c:861
+#, c-format
+msgid "for table \"%s.%s\""
+msgstr "���� \"%s.%s\""
+
+#: describe.c:900
+#, c-format
+msgid "View definition: %s"
+msgstr "��ͼ����: %s"
+
+#: describe.c:906 describe.c:1102
+msgid "Rules"
+msgstr "����"
+
+#: describe.c:1026
+msgid "Indexes"
+msgstr "����"
+
+#: describe.c:1040
+msgid " primary key"
+msgstr " ����"
+
+#: describe.c:1042
+msgid " unique"
+msgstr " Ψһ"
+
+#: describe.c:1063
+msgid "Check constraints"
+msgstr "���Լ��"
+
+#: describe.c:1066
+#, c-format
+msgid "%s: \"%s\" %s"
+msgstr "%s: \"%s\" %s"
+
+#: describe.c:1071
+#, c-format
+msgid "%*s  \"%s\" %s"
+msgstr "%*s  \"%s\" %s"
+
+#: describe.c:1081
+msgid "Foreign Key constraints"
+msgstr "���Լ��"
+
+#: describe.c:1084
+#, c-format
+msgid "%s: %s %s"
+msgstr "%s: %s %s"
+
+#: describe.c:1089
+#, c-format
+msgid "%*s  %s %s"
+msgstr "%*s  %s %s"
+
+#: describe.c:1117
+msgid "Triggers"
+msgstr "������"
+
+#: describe.c:1199
+msgid "User name"
+msgstr "�û���"
+
+#: describe.c:1199
+msgid "User ID"
+msgstr "�û� ID"
+
+#: describe.c:1200
+msgid "superuser, create database"
+msgstr "�����û�, �������ݿ�"
+
+#: describe.c:1201
+msgid "superuser"
+msgstr "�����û�"
+
+#: describe.c:1201
+msgid "create database"
+msgstr "�������ݿ�"
+
+#: describe.c:1202
+msgid "Attributes"
+msgstr "����"
+
+#: describe.c:1215
+msgid "List of database users"
+msgstr "���ݿ��û��б�"
+
+#: describe.c:1262
+msgid "special"
+msgstr "����"
+
+#: describe.c:1323
+msgid "No matching relations found.\n"
+msgstr "û���ҵ�ƥ��Ĺ�ϵ.\n"
+
+#: describe.c:1325
+msgid "No relations found.\n"
+msgstr "û���ҵ���ϵ.\n"
+
+#: describe.c:1330
+msgid "List of relations"
+msgstr "��ϵ�б�"
+
+#: describe.c:1369
+msgid "Modifier"
+msgstr "�޸���"
+
+#: describe.c:1383
+msgid "List of domains"
+msgstr "���б�"
+
+#~ msgid "  psql [options] [dbname [username]]\n"
+#~ msgstr " psql [ѡ��] [���ݿ��� [�û���]]\n"
+
+#~ msgid " \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n"
+#~ msgstr " \\d{t|i|s|v|S} [ģʽ] (�� '+' ��ȡ�������Ϣ)\n"
+
+#~ msgid "\\%s: multibyte support is not enabled\n"
+#~ msgstr "\\%s: ���ֽ�֧��δ��\n"
+
+#~ msgid ""
+#~ " \\d{p|S|l}      list access privileges, system tables, or large objects\n"
+#~ msgstr " \\d{p|S|l}      �г�����Ȩ��, ϵͳ��, ���ߴ����\n"
+
+#~ msgid ""
+#~ " \\dd NAME       show comment for table, type, function, or operator\n"
+#~ msgstr " \\dd ����      ��ʾ��, ����, ����, ���߲�������ע��\n"
+
+#~ msgid " \\df            list functions\n"
+#~ msgstr " \\df           �����\n"
+
+#~ msgid " \\dT            list data types\n"
+#~ msgstr " \\dT           ���������\n"
+
+#~ msgid "history"
+#~ msgstr "��ʷ"
+
+#~ msgid "multibyte"
+#~ msgstr "���ֽ�"
+
+#~ msgid "Index predicate: %s"
+#~ msgstr "�����: %s"
+
+#~ msgid "Unique keys"
+#~ msgstr "Ψһ����"
diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po
index e604e7c7007cc49dae7069a1c7dbe353ee7f748a..b0d2d50784ae9b3457953be857aa00d1860bfb72 100644
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
@@ -1,17 +1,18 @@
 # ru.po
 # LIBPQ Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.2 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.3 2002/10/14 19:04:28 petere Exp $
 #
 # Changelog:
-#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - October 12, 2002: Post-7.3beta2 fuzzy translation fizes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-09-07 20:04-0400\n"
-"PO-Revision-Date: 2002-09-07 20:06-0500\n"
+"POT-Creation-Date: 2002-10-12 12:42-0400\n"
+"PO-Revision-Date: 2002-10-12 12:45-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
 "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -73,22 +74,22 @@ msgstr "
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ������������ ������� ��������������: %d\n"
 
-#: fe-connect.c:484
+#: fe-connect.c:483
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr ""
 "�� ���������� ���������� ����� ��� ������������ PostgreSQL ������������\n"
 
-#: fe-connect.c:708
+#: fe-connect.c:707
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "�� ���������� ���������� ����� � �� ����������� �����: %s\n"
 
-#: fe-connect.c:732
+#: fe-connect.c:731
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "�� ���������� ���������� ����� � ������������ TCP �����: %s\n"
 
-#: fe-connect.c:752
+#: fe-connect.c:751
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -99,7 +100,7 @@ msgstr ""
 "\t�������� �� ������ �������� � ���������\n"
 "\t������������� �� ������ Unix'������� ������ \"%s\"?\n"
 
-#: fe-connect.c:761
+#: fe-connect.c:760
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -110,127 +111,127 @@ msgstr ""
 "\t�������� �� ������ �� ����� %s � ���������\n"
 "\t������������� ����� TCP/IP �������� �� ���� %s?\n"
 
-#: fe-connect.c:825
+#: fe-connect.c:824
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "������������ ����� �����: %s\n"
 
-#: fe-connect.c:844
+#: fe-connect.c:843
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "����������� ��� �����: %s\n"
 
-#: fe-connect.c:891
+#: fe-connect.c:890
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "�� ���������� ������� �����: %s\n"
 
-#: fe-connect.c:959
+#: fe-connect.c:958
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "�� ���������� ��������� ����� ������������ SSL: %s\n"
 
-#: fe-connect.c:972
+#: fe-connect.c:971
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "�� ��� ������� ����� ������� �� ����� ������������ SSL: %s\n"
 
-#: fe-connect.c:1001
+#: fe-connect.c:1000
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "������� ������������ ����� �� ��������� ������������ �� SSL: %c\n"
 
-#: fe-connect.c:1010
+#: fe-connect.c:1009
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "������ �� ������������ SSL, �� ������� SSL ���� ����������\n"
 
-#: fe-connect.c:1232
+#: fe-connect.c:1218
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� �������������, ��������� ��������� �� ��������� "
 "����������� ������\n"
 
-#: fe-connect.c:1263
+#: fe-connect.c:1249
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "���������� ���� �������� ������ ������ ������: %s\n"
 
-#: fe-connect.c:1283
+#: fe-connect.c:1269
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "���������� ���� �������� ����� ������� �� ������: %s\n"
 
-#: fe-connect.c:1322
+#: fe-connect.c:1308
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "�� ���������� ��������� ��������� �����: %s\n"
 
-#: fe-connect.c:1378
+#: fe-connect.c:1364
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "�������� ������ �������������� �� �������, �� ���� ��������: %c\n"
 
-#: fe-connect.c:1490
+#: fe-connect.c:1476
 msgid "unexpected message from server during startup\n"
 msgstr "����������� ��������� �� ������� ��� �������\n"
 
-#: fe-connect.c:1549
+#: fe-connect.c:1535
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� ������������� %c, ��������� ��������� �� ��������� "
 "����������� ������\n"
 
-#: fe-connect.c:1637
+#: fe-connect.c:1623
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� setenv %c, ��������� ���������� ��������� ����������� "
 "������\n"
 
-#: fe-connect.c:1676
+#: fe-connect.c:1662
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "������������ ��� ��������� � PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1800
+#: fe-connect.c:1786
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr ""
 "������������ ��������� %c, ��������� ���������� ��������� ����������� "
 "������\n"
 
-#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+#: fe-connect.c:2413 fe-connect.c:2422 fe-connect.c:2919 fe-exec.c:1284
 #: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "������������ ������\n"
 
-#: fe-connect.c:2475
+#: fe-connect.c:2461
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr "���������� \"=\" ����� \"%s\" � ������ �������������\n"
+msgstr "����������� \"=\" ����� \"%s\" � ������ �������������\n"
 
-#: fe-connect.c:2524
+#: fe-connect.c:2510
 msgid "unterminated quoted string in connection info string\n"
 msgstr "������������ ������ (�� ������� �������) � ������ �������������\n"
 
-#: fe-connect.c:2558
+#: fe-connect.c:2544
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "������������ ����� ������������� \"%s\"\n"
 
-#: fe-connect.c:2744
+#: fe-connect.c:2730
 msgid "connection pointer is NULL\n"
 msgstr "��������� ������������� �������� NULL'��\n"
 
-#: fe-connect.c:2953
+#: fe-connect.c:2940
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
-"be u=rw (0600)"
+"be u=rw (0600)\n"
 msgstr ""
-"��������: ��������� ���� %s ������� � ������� ������ ��� ���� �/��� ������; "
-"����� ������ ���� u=rw (0600)"
+"��������: ��������� ���� %s ������� � ������� ������ ��� ���� ��� ������; "
+"����� ������ ���� u=rw (0600)\n"
 
 #: fe-exec.c:737
 msgid "command string is a null pointer\n"
@@ -428,3 +429,106 @@ msgstr ""
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "�� ���������� ������� ������ �������: %s\n"
+
+#: fe-secure.c:275 fe-secure.c:321
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "������ SSL SYSCALL: %s\n"
+
+#: fe-secure.c:280 fe-secure.c:326
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "������ SSL: %s\n"
+
+#: fe-secure.c:387
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "������ ��� ������� ������: %s\n"
+
+#: fe-secure.c:400
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "���������� ���� �������� � ������� (%s): %s\n"
+
+#: fe-secure.c:419
+msgid "unsupported protocol\n"
+msgstr "�������� �� ��������������\n"
+
+#: fe-secure.c:441
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr "��� ������� \"%s\" �� ������������� � %ld.%ld.%ld.%ld\n"
+
+#: fe-secure.c:448
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr ""
+
+#: fe-secure.c:617
+msgid "could not get user information\n"
+msgstr "���������� ���� �������� ���������� � ������������\n"
+
+#: fe-secure.c:629
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "�� � ��������� ������� ���������� (%s): %s\n"
+
+#: fe-secure.c:636
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "�� � ��������� ������� ���������� (%s): %s\n"
+
+#: fe-secure.c:649
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr ""
+
+#: fe-secure.c:658
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr ""
+
+#: fe-secure.c:665
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr ""
+
+#: fe-secure.c:674
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr ""
+
+#: fe-secure.c:681
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr ""
+
+#: fe-secure.c:693
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr ""
+
+#: fe-secure.c:721
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "�� ���������� ������� �������� SSL: %s\n"
+
+#: fe-secure.c:737 fe-secure.c:745
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "�� ���������� �������� ������ �������� ������������ (%s): %s\n"
+
+#: fe-secure.c:794
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "�� ���������� ���������� SSL-����������: %s\n"
+
+#: fe-secure.c:812
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "�� ���������� ��������� ����������: %s\n"
+
+#: fe-secure.c:824
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "�� ������� �������� ����������: %s\n"
diff --git a/src/interfaces/libpq/po/sv.po b/src/interfaces/libpq/po/sv.po
index b990ad5659ea357a2366410d2eab69b1f46c1eea..ef03b7b7c9359486f530911ae9260149dcc7357f 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.3 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/sv.po,v 1.4 2002/10/14 19:04:28 petere Exp $
 #
 # Use these quotes: "%s"
 #
 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-03 04:19-0400\n"
+"PO-Revision-Date: 2002-10-04 07: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"
@@ -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:487
+#: fe-connect.c:484
 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:709
+#: fe-connect.c:708
 #, 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:733
+#: fe-connect.c:732
 #, 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:753
+#: fe-connect.c:752
 #, 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:762
+#: fe-connect.c:761
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -108,37 +108,37 @@ msgstr ""
 "\tK�r servern p� v�rden %s och accepterar\n"
 "\tden TCP/IP-uppkopplingar p� porten %s?\n"
 
-#: fe-connect.c:826
+#: fe-connect.c:825
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "ogiltig v�rdadress: %s\n"
 
-#: fe-connect.c:845
+#: fe-connect.c:844
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "ok�nt v�rdnamn: %s\n"
 
-#: fe-connect.c:892
+#: fe-connect.c:891
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: fe-connect.c:960
+#: fe-connect.c:959
 #, 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:973
+#: fe-connect.c:972
 #, 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:1004
+#: fe-connect.c:1001
 #, 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:1013
+#: fe-connect.c:1010
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "SSL st�ds inte av servern, men SSL kr�vdes\n"
 
@@ -149,7 +149,7 @@ msgstr "ogiltigt f
 #: fe-connect.c:1263
 #, c-format
 msgid "could not get socket error status: %s\n"
-msgstr "kunde itne f� felstatus f�r uttag (socket): %s\n"
+msgstr "kunde inte h�mta felstatus f�r uttag (socket): %s\n"
 
 #: fe-connect.c:1283
 #, c-format
@@ -190,7 +190,8 @@ msgstr "ogiltigt kodningnamn i PGCLIENTENCODING: %s\n"
 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-exec.c:1273 fe-lobj.c:536
+#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+#: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "minnet slut\n"
 
@@ -212,99 +213,99 @@ msgstr "ogiltig f
 msgid "connection pointer is NULL\n"
 msgstr "anslutningspekare �r NULL\n"
 
-#: fe-connect.c:2934
+#: fe-connect.c:2953
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
-"be u=rw (0600)"
-msgstr "VARNING: L�senordsfilen %s har l�sr�ttigheter f�r v�rlden och gruppen; r�ttigheten skall vara u=rw (0600)"
+"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"
 
-#: fe-exec.c:726
+#: fe-exec.c:737
 msgid "command string is a null pointer\n"
 msgstr "kommandostr�ngen �r en null-pekare\n"
 
-#: fe-exec.c:734
+#: fe-exec.c:745
 msgid "no connection to the server\n"
 msgstr "inte f�rbunden till servern\n"
 
-#: fe-exec.c:741
+#: fe-exec.c:752
 msgid "another command is already in progress\n"
 msgstr "ett annat kommando p�g�r redan\n"
 
-#: fe-exec.c:939
+#: fe-exec.c:950
 #, c-format
 msgid "message type 0x%02x arrived from server while idle\n"
 msgstr "meddelande av typ 0x%02x kom fr�n servern n�r vi var i vilol�ge\n"
 
-#: fe-exec.c:981
+#: fe-exec.c:992
 #, c-format
 msgid ""
 "unexpected character %c following empty query response (\"I\" message)\n"
 msgstr "ov�ntat tecken %c f�ljer p� tomt fr�geresultat (\"I\"-meddelande)\n"
 
-#: fe-exec.c:1038
+#: fe-exec.c:1049
 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"
 
-#: fe-exec.c:1055
+#: 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"
 
-#: fe-exec.c:1071
+#: fe-exec.c:1082
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "ov�ntat svar fr�n server; det f�rsta mottagna tecknet var \"%c\"\n"
 
-#: fe-exec.c:1360
+#: fe-exec.c:1371
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "ov�ntad asyncStatus: %d\n"
 
-#: fe-exec.c:1410
+#: fe-exec.c:1421
 msgid "COPY state must be terminated first\n"
 msgstr "COPY-tillst�nd m�ste avslutas f�rst\n"
 
-#: fe-exec.c:1769
+#: fe-exec.c:1780
 msgid "no COPY in progress\n"
 msgstr "ingen COPY p�g�r\n"
 
-#: fe-exec.c:1808
+#: fe-exec.c:1819
 msgid "lost synchronization with server, resetting connection\n"
 msgstr "synkronisation med servern f�rlorad, f�rbindelsen omstartas\n"
 
-#: fe-exec.c:1873
+#: fe-exec.c:1884
 msgid "connection in wrong state\n"
 msgstr "f�rbindelse i felaktigt tillst�nd\n"
 
-#: fe-exec.c:1975 fe-exec.c:2009
+#: fe-exec.c:1986 fe-exec.c:2020
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "protokollfel: id=0x%x\n"
 
-#: fe-exec.c:2044
+#: fe-exec.c:2055
 msgid "invalid ExecStatusType code"
 msgstr "ogiltig ExecStatusType-kod"
 
-#: fe-exec.c:2097 fe-exec.c:2130
+#: fe-exec.c:2108 fe-exec.c:2141
 #, c-format
 msgid "column number %d is out of range 0..%d\n"
 msgstr "kolumnnummer %d �r utanf�r giltigt intervall 0..%d\n"
 
-#: fe-exec.c:2119
+#: fe-exec.c:2130
 #, c-format
 msgid "row number %d is out of range 0..%d\n"
 msgstr "radnummer %d �r utanf�r giltigt intervall 0..%d\n"
 
-#: fe-exec.c:2314
+#: fe-exec.c:2325
 #, c-format
 msgid "could not interpret result from server: %s\n"
 msgstr "kunde inte tolka svaret fr�n servern: %s\n"
 
-#: fe-exec.c:2330
+#: fe-exec.c:2341
 msgid "no row count available\n"
 msgstr "antal rader ej tillg�ngligt\n"
 
@@ -369,31 +370,31 @@ msgstr "kan inte ta reda p
 msgid "cannot determine OID of function lowrite\n"
 msgstr "kan inte ta reda p� OID f�r funktionen lowrite\n"
 
-#: fe-misc.c:295
+#: fe-misc.c:303
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt\n"
 msgstr "heltal med storlek %lu st�ds inte av pqGetInt\n"
 
-#: fe-misc.c:333
+#: fe-misc.c:341
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "heltal med storlek %lu st�ds inte av pqPutInt\n"
 
-#: fe-misc.c:381 fe-misc.c:415 fe-misc.c:831
+#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() misslyckades: %s\n"
 
-#: fe-misc.c:442 fe-misc.c:634 fe-misc.c:792
+#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
 msgid "connection not open\n"
 msgstr "f�rbindelse inte �ppen\n"
 
-#: fe-misc.c:507 fe-misc.c:587
+#: fe-misc.c:515 fe-misc.c:595
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "kan inte ta emot data fr�n servern: %s\n"
 
-#: fe-misc.c:604 fe-misc.c:678
+#: fe-misc.c:612 fe-misc.c:686
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -403,10 +404,110 @@ msgstr ""
 "\\tTroligen s� terminerade servern pga n�got fel antingen\n"
 "\\tinnan eller under tiden den bearbetade en f�rfr�gan.\n"
 
-#: fe-misc.c:694
+#: fe-misc.c:702
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "kan inte skicka data till servern: %s\n"
 
-#~ msgid "could not establish SSL connection: %s\n"
-#~ msgstr "kan inte skapa SSL-f�rbindelse: %s\n"
+#: fe-secure.c:275 fe-secure.c:321
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "SSL SYSCALL fel: %s\n"
+
+#: fe-secure.c:280 fe-secure.c:326
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "SSL-fel: %s\n"
+
+#: fe-secure.c:387
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "fel vid f�rfr�gan till uttag (socket): %s\n"
+
+#: fe-secure.c:400
+#, 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
+msgid "unsupported protocol\n"
+msgstr "protokoll st�ds inte\n"
+
+#: fe-secure.c:441
+#, 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
+#, 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
+msgid "could not get user information\n"
+msgstr "kunde inte h�mta anv�ndarinformation\n"
+
+#: fe-secure.c:629
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "kunde inte �ppna certifikat (%s): %s\n"
+
+#: fe-secure.c:636
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "kunde inte l�sa certifikat (%s): %s\n"
+
+#: fe-secure.c:649
+#, 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
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr "privata nyckeln (%s) har fel r�ttigheter\n"
+
+#: fe-secure.c:665
+#, 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
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr "privata nyckeln (%s) har �ndrats under k�rning\n"
+
+#: fe-secure.c:681
+#, 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
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr "certifikat/privat nyckel matchar inte (%s): %s\n"
+
+#: fe-secure.c:721
+#, 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
+#, 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
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "kan inte skapa SSL-f�rbindelse: %s\n"
+
+#: fe-secure.c:812
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "certifikatet kunde inte valideras: %s\n"
+
+#: fe-secure.c:824
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "certifikatet kunde inte h�mtas: %s\n"
diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index e18affc94fc0444096d06615c71357be285d7fd5..862f6d218eee216817813f10f7a79223505b25f8 100644
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,414 +1,603 @@
-# simplified Chinese translation file for libpq
-# Weiping He <laser@zhengmai.com.cn>, 2001
-#
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.1 2002/08/21 20:42:27 petere Exp $
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-11-29 17:47+0100\n"
-"PO-Revision-Date: 2001-11-27 20:22:06+0800\n"
-"Last-Translator: Weiping He <laser@zhengmai.com.cn>\n"
-"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: fe-auth.c:228
-#, c-format
-msgid "Kerberos 4 error: %s\n"
-msgstr "Kerberos 4 ����: %s\n"
-
-#: fe-auth.c:391
-#, c-format
-msgid "could not set socket to blocking mode: %s\n"
-msgstr "�޷����׽�������Ϊ����ģʽ: %s\n"
-
-#: fe-auth.c:407
-#, c-format
-msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "kerberos 5 ��֤�ܾ�: %*s\n"
-
-#: fe-auth.c:427
-#, c-format
-msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "�޷����׽���: %s �ϻָ�������ģʽ\n"
-
-#: fe-auth.c:490
-msgid "SCM_CRED authentication method not supported\n"
-msgstr "��֧�� SCM_CRED ��֤��ʽ\n"
-
-#: fe-auth.c:576
-msgid "Kerberos 4 authentication failed\n"
-msgstr "Kerberos 4 ��֤ʧ��\n"
-
-#: fe-auth.c:582
-msgid "Kerberos 4 authentication not supported\n"
-msgstr "��֧�� Kerberos 4 ��֤\n"
-
-#: fe-auth.c:593
-msgid "Kerberos 5 authentication failed\n"
-msgstr "Kerberos 5 ��֤ʧ��\n"
-
-#: fe-auth.c:599
-msgid "Kerberos 5 authentication not supported\n"
-msgstr "��֧�� Kerberos 5 ��֤\n"
-
-#: fe-auth.c:627
-#, c-format
-msgid "authentication method %u not supported\n"
-msgstr "��֧�� %u ��֤��ʽ\n"
-
-#: fe-auth.c:664
-#, c-format
-msgid "invalid authentication service name \"%s\", ignored\n"
-msgstr "���ԷǷ���֤������ \"%s\"\n"
-
-#: fe-auth.c:721
-#, c-format
-msgid "fe_getauthname: invalid authentication system: %d\n"
-msgstr "fe_getauthname: ��Ч����֤ϵͳ: %d\n"
-
-#: fe-connect.c:483
-msgid "could not determine the PostgreSQL user name to use\n"
-msgstr "�޷��ж�Ҫʹ�õ� PostgreSQL �û���\n"
-
-#: fe-connect.c:703
-#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "�޷����׽�������Ϊ������ģʽ: %s\n"
-
-#: fe-connect.c:727
-#, c-format
-msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "�޷����׽�������Ϊ TCP ���ӳ�ģʽ: %s\n"
-
-#: fe-connect.c:747
-#, c-format
-msgid ""
-"could not connect to server: %s\n"
-"\tIs the server running locally and accepting\n"
-"\tconnections on Unix domain socket \"%s\"?\n"
-msgstr ""
-"�޷����ӵ�������: %s\n"
-"\t�������Ƿ��ڱ������в����� Unix ���׽���\n"
-"\t\"%s\"��׼����������?\n"
-
-#: fe-connect.c:756
-#, c-format
-msgid ""
-"could not connect to server: %s\n"
-"\tIs the server running on host %s and accepting\n"
-"\tTCP/IP connections on port %s?\n"
-msgstr ""
-"�޷����ӵ�������: %s\n"
-"\t�������Ƿ������� %s �����в���׼�������ڶ˿�\n"
-"%s �ϵ� TCP/IP ����?\n"
-
-#: fe-connect.c:820
-#, c-format
-msgid "invalid host address: %s\n"
-msgstr "��Ч��������ַ: %s\n"
-
-#: fe-connect.c:839
-#, c-format
-msgid "unknown host name: %s\n"
-msgstr "δ֪������: %s\n"
-
-#: fe-connect.c:881
-#, c-format
-msgid "could not create socket: %s\n"
-msgstr "�޷������׽���: %s\n"
-
-#: fe-connect.c:944
-#, c-format
-msgid "could not send SSL negotiation packet: %s\n"
-msgstr "�޷����� SSL ���ְ�: %s\n"
-
-#: fe-connect.c:952
-#, c-format
-msgid "could not receive server response to SSL negotiation packet: %s\n"
-msgstr "�޷��յ��������� SSL ���ְ�����Ӧ: %s\n"
-
-#: fe-connect.c:966
-#, c-format
-msgid "could not create SSL context: %s\n"
-msgstr "�޷����� SSL ����: %s\n"
-
-#: fe-connect.c:976
-#, c-format
-msgid "could not establish SSL connection: %s\n"
-msgstr "�޷����� SSL ����: %s\n"
-
-#: fe-connect.c:999
-#, c-format
-msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "�յ��� SSL ���ֵ���Ч��Ӧ: %c\n"
-
-#: fe-connect.c:1008
-msgid "server does not support SSL, but SSL was required\n"
-msgstr "��������֧�� SSL, ����Ҫ��ʹ�� SSL\n"
-
-#: fe-connect.c:1174
-msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "��Ч������״̬, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
-
-#: fe-connect.c:1205
-#, c-format
-msgid "could not get socket error status: %s\n"
-msgstr "�޷���ȡ�׽��ִ���״̬: %s\n"
-
-#: fe-connect.c:1225
-#, c-format
-msgid "could not get client address from socket: %s\n"
-msgstr "�޷����׽��ֻ�ȡ�ͻ��˵�ַ: %s\n"
-
-#: fe-connect.c:1264
-#, c-format
-msgid "could not send startup packet: %s\n"
-msgstr "�޷�����������: %s\n"
-
-#: fe-connect.c:1320
-#, c-format
-msgid "expected authentication request from server, but received %c\n"
-msgstr "�ڴ����Է���������֤����, ȴ�յ� %c\n"
-
-#: fe-connect.c:1432
-msgid "unexpected message from server during startup\n"
-msgstr "�����������յ����Է������ķ�Ԥ����Ϣ\n"
-
-#: fe-connect.c:1491
-#, c-format
-msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "��Ч������״̬ %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
-
-#: fe-connect.c:1590
-#, c-format
-msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "��Ч�� setenv ״̬  %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
-
-#: fe-connect.c:1630
-#, c-format
-msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
-msgstr "�� PGCLIENTENCODING �еķǷ�������: %s\n"
-
-#: fe-connect.c:1755
-#, c-format
-msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "��Ч״̬ %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
-
-#: fe-connect.c:2374 fe-connect.c:2383 fe-exec.c:1184 fe-lobj.c:536
-msgid "out of memory\n"
-msgstr "�ڴ��þ�\n"
-
-#: fe-connect.c:2422
-#, c-format
-msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr "��������Ϣ�ִ���� \"%s\" ����ȱ�� \"=\"\n"
-
-#: fe-connect.c:2471
-msgid "unterminated quoted string in connection info string\n"
-msgstr "������Ϣ�ִ���δ�����������ִ�\n"
-
-#: fe-connect.c:2505
-#, c-format
-msgid "invalid connection option \"%s\"\n"
-msgstr "�Ƿ�����ѡ�� \"%s\"\n"
-
-#: fe-connect.c:2720
-msgid "connection pointer is NULL\n"
-msgstr "����ָ���� NULL\n"
-
-#: fe-exec.c:633
-msgid "command string is a null pointer\n"
-msgstr "�����ִ���һ����ָ��\n"
-
-#: fe-exec.c:641
-msgid "no connection to the server\n"
-msgstr "û�е�������������\n"
-
-#: fe-exec.c:648
-msgid "another command is already in progress\n"
-msgstr "�Ѿ�������һ�������ڴ���\n"
-
-#: fe-exec.c:846
-#, c-format
-msgid "message type 0x%02x arrived from server while idle\n"
-msgstr "����ʱ�ӷ���������������Ϊ 0x%02x ����Ϣ\n"
-
-#: fe-exec.c:888
-#, c-format
-msgid ""
-"unexpected character %c following empty query response (\"I\" message)\n"
-msgstr "�ڿյIJ�ѯ��Ӧ������ŷ�Ԥ�ڵ��ַ� %c (\"I\" ��Ϣ)\n"
-
-#: fe-exec.c:945
-msgid ""
-"server sent data (\"D\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "��������û�з�����������ǰ���·������� (\"D\" ��Ϣ) (\"T\" ��Ϣ)\n"
-
-#: fe-exec.c:962
-msgid ""
-"server sent binary data (\"B\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "��������û�з�����������ǰ���·������� (\"B\" ��Ϣ) (\"T\" ��Ϣ)\n"
-
-#: fe-exec.c:978
-#, c-format
-msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "���Է�������������Ӧ; �յ��ĵ�һ���ַ��� \"%c\"\n"
-
-#: fe-exec.c:1271
-#, c-format
-msgid "unexpected asyncStatus: %d\n"
-msgstr "����� asyncStatus(�첽״̬): %d\n"
-
-#: fe-exec.c:1321
-msgid "COPY state must be terminated first\n"
-msgstr "COPY ״̬�����Ƚ���\n"
-
-#: fe-exec.c:1672
-msgid "no COPY in progress\n"
-msgstr "û�����ڴ����� COPY\n"
-
-#: fe-exec.c:1711
-msgid "lost synchronization with server, resetting connection\n"
-msgstr "ʧȥ���������ͬ��, ��������\n"
-
-#: fe-exec.c:1776
-msgid "connection in wrong state\n"
-msgstr "���Ӵ��ڴ���״̬\n"
-
-#: fe-exec.c:1878 fe-exec.c:1912
-#, c-format
-msgid "protocol error: id=0x%x\n"
-msgstr "�����: id=0x%x\n"
-
-#: fe-exec.c:1947
-msgid "invalid ExecStatusType code"
-msgstr "�Ƿ� ExecStatusType ����"
-
-#: fe-exec.c:2000 fe-exec.c:2033
-#, c-format
-msgid "column number %d is out of range 0..%d\n"
-msgstr "�к��� %d �����˷�Χ 0..%d\n"
-
-#: fe-exec.c:2022
-#, c-format
-msgid "row number %d is out of range 0..%d\n"
-msgstr "�к��� %d �����˷�Χ 0..%d\n"
-
-#: fe-exec.c:2217
-#, c-format
-msgid "could not interpret result from server: %s\n"
-msgstr "�޷��������Է������Ľ��: %s\n"
-
-#: fe-exec.c:2233
-msgid "no row count available\n"
-msgstr "û�пɻ�õ�����\n"
-
-#: fe-lobj.c:400 fe-lobj.c:483
-#, c-format
-msgid "could not open file \"%s\": %s\n"
-msgstr "�޷����ļ� \"%s\": %s\n"
-
-#: fe-lobj.c:412
-#, c-format
-msgid "could not create large object for file \"%s\"\n"
-msgstr "�޷�Ϊ�ļ� \"%s\" ���������\n"
-
-#: fe-lobj.c:422 fe-lobj.c:472
-#, c-format
-msgid "could not open large object %u\n"
-msgstr "�޷��򿪴���� %u\n"
-
-#: fe-lobj.c:437
-#, c-format
-msgid "error while reading file \"%s\"\n"
-msgstr "��ȡ�ļ� \"%s\" ʱ����\n"
-
-#: fe-lobj.c:498
-#, c-format
-msgid "error while writing to file \"%s\"\n"
-msgstr "д���ļ� \"%s\" ʱ����\n"
-
-#: fe-lobj.c:564
-msgid "query to initialize large object functions did not return data\n"
-msgstr "��ʼ����������IJ�ѯû�з�������\n"
-
-#: fe-lobj.c:602
-msgid "cannot determine OID of function lo_open\n"
-msgstr "�޷��жϺ��� lo_open �� OID\n"
-
-#: fe-lobj.c:609
-msgid "cannot determine OID of function lo_close\n"
-msgstr "�޷��жϺ��� lo_close �� OID\n"
-
-#: fe-lobj.c:616
-msgid "cannot determine OID of function lo_creat\n"
-msgstr "�޷��жϺ��� lo_creat �� OID\n"
-
-#: fe-lobj.c:623
-msgid "cannot determine OID of function lo_unlink\n"
-msgstr "�޷��жϺ��� lo_unlink �� OID\n"
-
-#: fe-lobj.c:630
-msgid "cannot determine OID of function lo_lseek\n"
-msgstr "�޷��жϺ��� lo_lseek �� OID\n"
-
-#: fe-lobj.c:637
-msgid "cannot determine OID of function lo_tell\n"
-msgstr "�޷��жϺ��� lo_tell �� OID\n"
-
-#: fe-lobj.c:644
-msgid "cannot determine OID of function loread\n"
-msgstr "�޷��жϺ��� loread �� OID\n"
-
-#: fe-lobj.c:651
-msgid "cannot determine OID of function lowrite\n"
-msgstr "�޷��жϺ��� lowrite �� OID\n"
-
-#: fe-misc.c:132
-#, c-format
-msgid "could not flush enough data (space available: %d, space needed %d)\n"
-msgstr "�޷���ˢ�㹻������ (���ÿռ�: %d, ��Ҫ�ռ� %d)\n"
-
-#: fe-misc.c:281
-#, c-format
-msgid "integer of size %lu not supported by pqGetInt\n"
-msgstr "pgGetInt ��֧�ִ�СΪ %lu ������\n"
-
-#: fe-misc.c:319
-#, c-format
-msgid "integer of size %lu not supported by pqPutInt\n"
-msgstr "pgPutInt ��֧�ִ�СΪ %lu ������\n"
-
-#: fe-misc.c:357 fe-misc.c:391 fe-misc.c:779
-#, c-format
-msgid "select() failed: %s\n"
-msgstr "select() ʧ��: %s\n"
-
-#: fe-misc.c:418 fe-misc.c:618 fe-misc.c:758
-msgid "connection not open\n"
-msgstr "�����\n"
-
-#: fe-misc.c:489 fe-misc.c:575
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "�޷��ӷ�������������: %s\n"
-
-#: fe-misc.c:592 fe-misc.c:676
-msgid ""
-"server closed the connection unexpectedly\n"
-"\tThis probably means the server terminated abnormally\n"
-"\tbefore or while processing the request.\n"
-msgstr ""
-"����������عر�������\n"
-"\t��������ͨ����ζ�ŷ������ڴ�������֮ǰ\n"
-"�������ڴ��������ʱ��������ֹ\n"
-
-#: fe-misc.c:692
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "�޷����������������: %s\n"
+# simplified Chinese translation file for libpq
+# Bao Wei <weibao@forevertek.com>, 2002
+# 
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.2 2002/10/14 19:04:28 petere Exp $
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.2\n"
+"POT-Creation-Date: 2002-09-26 15:37+0800\n"
+"PO-Revision-Date: 2002-19-14 20:22:06+0800\n"
+"Last-Translator: Bao Wei <weibao@forevertek.com>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+# fe-auth.c:232
+#: fe-auth.c:232
+#, c-format
+msgid "Kerberos 4 error: %s\n"
+msgstr "Kerberos 4 ����: %s\n"
+
+# fe-auth.c:395
+#: fe-auth.c:395
+#, c-format
+msgid "could not set socket to blocking mode: %s\n"
+msgstr "�޷����׽�������Ϊ����ģʽ: %s\n"
+
+# fe-auth.c:412 fe-auth.c:416
+#: fe-auth.c:412 fe-auth.c:416
+#, c-format
+msgid "Kerberos 5 authentication rejected: %*s\n"
+msgstr "kerberos 5 ��֤�ܾ�: %*s\n"
+
+# fe-auth.c:440
+#: fe-auth.c:440
+#, c-format
+msgid "could not restore non-blocking mode on socket: %s\n"
+msgstr "�޷����׽���: %s �ϻָ�������ģʽ\n"
+
+# fe-auth.c:503
+#: fe-auth.c:503
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "��֧�� SCM_CRED ��֤��ʽ\n"
+
+# fe-auth.c:589
+#: fe-auth.c:589
+msgid "Kerberos 4 authentication failed\n"
+msgstr "Kerberos 4 ��֤ʧ��\n"
+
+# fe-auth.c:595
+#: fe-auth.c:595
+msgid "Kerberos 4 authentication not supported\n"
+msgstr "��֧�� Kerberos 4 ��֤\n"
+
+# fe-auth.c:606
+#: fe-auth.c:606
+msgid "Kerberos 5 authentication failed\n"
+msgstr "Kerberos 5 ��֤ʧ��\n"
+
+# fe-auth.c:612
+#: fe-auth.c:612
+msgid "Kerberos 5 authentication not supported\n"
+msgstr "��֧�� Kerberos 5 ��֤\n"
+
+# fe-auth.c:640
+#: fe-auth.c:640
+#, c-format
+msgid "authentication method %u not supported\n"
+msgstr "��֧�� %u ��֤��ʽ\n"
+
+# fe-auth.c:677
+#: fe-auth.c:677
+#, c-format
+msgid "invalid authentication service name \"%s\", ignored\n"
+msgstr "���ԷǷ���֤������ \"%s\"\n"
+
+# fe-auth.c:734
+#: fe-auth.c:734
+#, c-format
+msgid "fe_getauthname: invalid authentication system: %d\n"
+msgstr "fe_getauthname: ��Ч����֤ϵͳ: %d\n"
+
+# fe-connect.c:484
+#: fe-connect.c:484
+msgid "could not determine the PostgreSQL user name to use\n"
+msgstr "�޷��ж�Ҫʹ�õ� PostgreSQL �û���\n"
+
+# fe-connect.c:708
+#: fe-connect.c:708
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "�޷����׽�������Ϊ������ģʽ: %s\n"
+
+# fe-connect.c:732
+#: fe-connect.c:732
+#, c-format
+msgid "could not set socket to TCP no delay mode: %s\n"
+msgstr "�޷����׽�������Ϊ TCP ���ӳ�ģʽ: %s\n"
+
+# fe-connect.c:752
+#: fe-connect.c:752
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running locally and accepting\n"
+"\tconnections on Unix domain socket \"%s\"?\n"
+msgstr ""
+"�޷����ӵ�������: %s\n"
+"\t�������Ƿ��ڱ������в����� Unix ���׽���\n"
+"\t\"%s\"��׼����������?\n"
+
+# fe-connect.c:761
+#: fe-connect.c:761
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host %s and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"�޷����ӵ�������: %s\n"
+"\t�������Ƿ������� %s �����в���׼�������ڶ˿�\n"
+"%s �ϵ� TCP/IP ����?\n"
+
+# fe-connect.c:825
+#: fe-connect.c:825
+#, c-format
+msgid "invalid host address: %s\n"
+msgstr "��Ч��������ַ: %s\n"
+
+# fe-connect.c:844
+#: fe-connect.c:844
+#, c-format
+msgid "unknown host name: %s\n"
+msgstr "δ֪������: %s\n"
+
+# fe-connect.c:891
+#: fe-connect.c:891
+#, c-format
+msgid "could not create socket: %s\n"
+msgstr "�޷������׽���: %s\n"
+
+# fe-connect.c:959
+#: fe-connect.c:959
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "�޷����� SSL ���ְ�: %s\n"
+
+# fe-connect.c:972
+#: fe-connect.c:972
+#, c-format
+msgid "could not receive server response to SSL negotiation packet: %s\n"
+msgstr "�޷��յ��������� SSL ���ְ�����Ӧ: %s\n"
+
+# fe-connect.c:1001
+#: fe-connect.c:1001
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "�յ��� SSL ���ֵ���Ч��Ӧ: %c\n"
+
+# fe-connect.c:1010
+#: fe-connect.c:1010
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "��������֧�� SSL, ����Ҫ��ʹ�� SSL\n"
+
+# fe-connect.c:1232
+#: fe-connect.c:1232
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "��Ч������״̬, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
+
+# fe-connect.c:1263
+#: fe-connect.c:1263
+#, c-format
+msgid "could not get socket error status: %s\n"
+msgstr "�޷���ȡ�׽��ִ���״̬: %s\n"
+
+# fe-connect.c:1283
+#: fe-connect.c:1283
+#, c-format
+msgid "could not get client address from socket: %s\n"
+msgstr "�޷����׽��ֻ�ȡ�ͻ��˵�ַ: %s\n"
+
+# fe-connect.c:1322
+#: fe-connect.c:1322
+#, c-format
+msgid "could not send startup packet: %s\n"
+msgstr "�޷�����������: %s\n"
+
+# fe-connect.c:1378
+#: fe-connect.c:1378
+#, c-format
+msgid "expected authentication request from server, but received %c\n"
+msgstr "�ڴ����Է���������֤����, ȴ�յ� %c\n"
+
+# fe-connect.c:1490
+#: fe-connect.c:1490
+msgid "unexpected message from server during startup\n"
+msgstr "�����������յ����Է������ķ�Ԥ����Ϣ\n"
+
+# fe-connect.c:1549
+#: fe-connect.c:1549
+#, c-format
+msgid "invalid connection state %c, probably indicative of memory corruption\n"
+msgstr "��Ч������״̬ %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
+
+# fe-connect.c:1637
+#: fe-connect.c:1637
+#, c-format
+msgid "invalid setenv state %c, probably indicative of memory corruption\n"
+msgstr "��Ч�� setenv ״̬  %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
+
+# fe-connect.c:1676
+#: fe-connect.c:1676
+#, c-format
+msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
+msgstr "�� PGCLIENTENCODING �еķǷ�������: %s\n"
+
+# fe-connect.c:1800
+#: fe-connect.c:1800
+#, c-format
+msgid "invalid state %c, probably indicative of memory corruption\n"
+msgstr "��Ч״̬ %c, �����Ǵ洢�����ݱ��ƻ��ı�־\n"
+
+# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+# fe-lobj.c:536
+#: fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+#: fe-lobj.c:536
+msgid "out of memory\n"
+msgstr "�ڴ��þ�\n"
+
+# fe-connect.c:2475
+#: fe-connect.c:2475
+#, c-format
+msgid "missing \"=\" after \"%s\" in connection info string\n"
+msgstr "��������Ϣ�ִ���� \"%s\" ����ȱ�� \"=\"\n"
+
+# fe-connect.c:2524
+#: fe-connect.c:2524
+msgid "unterminated quoted string in connection info string\n"
+msgstr "������Ϣ�ִ���δ�����������ִ�\n"
+
+# fe-connect.c:2558
+#: fe-connect.c:2558
+#, c-format
+msgid "invalid connection option \"%s\"\n"
+msgstr "�Ƿ�����ѡ�� \"%s\"\n"
+
+# fe-connect.c:2744
+#: fe-connect.c:2744
+msgid "connection pointer is NULL\n"
+msgstr "����ָ���� NULL\n"
+
+# fe-connect.c:2953
+#: fe-connect.c:2953
+#, c-format
+msgid ""
+"WARNING: Password file %s has world or group read access; permission should "
+"be u=rw (0600)\n"
+msgstr "����: �����ļ� %s Ȩ�����ò���; Ȩ��Ӧ���� Ϊ u=rw (0600)\n"
+
+# fe-exec.c:737
+#: fe-exec.c:737
+msgid "command string is a null pointer\n"
+msgstr "�����ִ���һ����ָ��\n"
+
+# fe-exec.c:745
+#: fe-exec.c:745
+msgid "no connection to the server\n"
+msgstr "û�е�������������\n"
+
+# fe-exec.c:752
+#: fe-exec.c:752
+msgid "another command is already in progress\n"
+msgstr "�Ѿ�������һ�������ڴ���\n"
+
+# fe-exec.c:950
+#: fe-exec.c:950
+#, c-format
+msgid "message type 0x%02x arrived from server while idle\n"
+msgstr "����ʱ�ӷ���������������Ϊ 0x%02x ����Ϣ\n"
+
+# fe-exec.c:992
+#: fe-exec.c:992
+#, c-format
+msgid ""
+"unexpected character %c following empty query response (\"I\" message)\n"
+msgstr "�ڿյIJ�ѯ��Ӧ������ŷ�Ԥ�ڵ��ַ� %c (\"I\" ��Ϣ)\n"
+
+# fe-exec.c:1049
+#: fe-exec.c:1049
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)\n"
+msgstr "��������û�з�����������ǰ���·������� (\"D\" ��Ϣ) (\"T\" ��Ϣ)\n"
+
+# fe-exec.c:1066
+#: fe-exec.c:1066
+msgid ""
+"server sent binary data (\"B\" message) without prior row description (\"T\" "
+"message)\n"
+msgstr "��������û�з�����������ǰ���·������� (\"B\" ��Ϣ) (\"T\" ��Ϣ)\n"
+
+# fe-exec.c:1082
+#: fe-exec.c:1082
+#, c-format
+msgid "unexpected response from server; first received character was \"%c\"\n"
+msgstr "���Է�������������Ӧ; �յ��ĵ�һ���ַ��� \"%c\"\n"
+
+# fe-exec.c:1371
+#: fe-exec.c:1371
+#, c-format
+msgid "unexpected asyncStatus: %d\n"
+msgstr "����� asyncStatus(�첽״̬): %d\n"
+
+# fe-exec.c:1421
+#: fe-exec.c:1421
+msgid "COPY state must be terminated first\n"
+msgstr "COPY ״̬�����Ƚ���\n"
+
+# fe-exec.c:1780
+#: fe-exec.c:1780
+msgid "no COPY in progress\n"
+msgstr "û�����ڴ����� COPY\n"
+
+# fe-exec.c:1819
+#: fe-exec.c:1819
+msgid "lost synchronization with server, resetting connection\n"
+msgstr "ʧȥ���������ͬ��, ��������\n"
+
+# fe-exec.c:1884
+#: fe-exec.c:1884
+msgid "connection in wrong state\n"
+msgstr "���Ӵ��ڴ���״̬\n"
+
+# fe-exec.c:1986 fe-exec.c:2020
+#: fe-exec.c:1986 fe-exec.c:2020
+#, c-format
+msgid "protocol error: id=0x%x\n"
+msgstr "�����: id=0x%x\n"
+
+# fe-exec.c:2055
+#: fe-exec.c:2055
+msgid "invalid ExecStatusType code"
+msgstr "�Ƿ� ExecStatusType ����"
+
+# fe-exec.c:2108 fe-exec.c:2141
+#: fe-exec.c:2108 fe-exec.c:2141
+#, c-format
+msgid "column number %d is out of range 0..%d\n"
+msgstr "�к��� %d �����˷�Χ 0..%d\n"
+
+# fe-exec.c:2130
+#: fe-exec.c:2130
+#, c-format
+msgid "row number %d is out of range 0..%d\n"
+msgstr "�к��� %d �����˷�Χ 0..%d\n"
+
+# fe-exec.c:2325
+#: fe-exec.c:2325
+#, c-format
+msgid "could not interpret result from server: %s\n"
+msgstr "�޷��������Է������Ľ��: %s\n"
+
+# fe-exec.c:2341
+#: fe-exec.c:2341
+msgid "no row count available\n"
+msgstr "û�пɻ�õ�����\n"
+
+# fe-lobj.c:400 fe-lobj.c:483
+#: fe-lobj.c:400 fe-lobj.c:483
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "�޷����ļ� \"%s\": %s\n"
+
+# fe-lobj.c:412
+#: fe-lobj.c:412
+#, c-format
+msgid "could not create large object for file \"%s\"\n"
+msgstr "�޷�Ϊ�ļ� \"%s\" ���������\n"
+
+# fe-lobj.c:422 fe-lobj.c:472
+#: fe-lobj.c:422 fe-lobj.c:472
+#, c-format
+msgid "could not open large object %u\n"
+msgstr "�޷��򿪴���� %u\n"
+
+# fe-lobj.c:437
+#: fe-lobj.c:437
+#, c-format
+msgid "error while reading file \"%s\"\n"
+msgstr "��ȡ�ļ� \"%s\" ʱ����\n"
+
+# fe-lobj.c:498
+#: fe-lobj.c:498
+#, c-format
+msgid "error while writing to file \"%s\"\n"
+msgstr "д���ļ� \"%s\" ʱ����\n"
+
+# fe-lobj.c:564
+#: fe-lobj.c:564
+msgid "query to initialize large object functions did not return data\n"
+msgstr "��ʼ����������IJ�ѯû�з�������\n"
+
+# fe-lobj.c:602
+#: fe-lobj.c:602
+msgid "cannot determine OID of function lo_open\n"
+msgstr "�޷��жϺ��� lo_open �� OID\n"
+
+# fe-lobj.c:609
+#: fe-lobj.c:609
+msgid "cannot determine OID of function lo_close\n"
+msgstr "�޷��жϺ��� lo_close �� OID\n"
+
+# fe-lobj.c:616
+#: fe-lobj.c:616
+msgid "cannot determine OID of function lo_creat\n"
+msgstr "�޷��жϺ��� lo_creat �� OID\n"
+
+# fe-lobj.c:623
+#: fe-lobj.c:623
+msgid "cannot determine OID of function lo_unlink\n"
+msgstr "�޷��жϺ��� lo_unlink �� OID\n"
+
+# fe-lobj.c:630
+#: fe-lobj.c:630
+msgid "cannot determine OID of function lo_lseek\n"
+msgstr "�޷��жϺ��� lo_lseek �� OID\n"
+
+# fe-lobj.c:637
+#: fe-lobj.c:637
+msgid "cannot determine OID of function lo_tell\n"
+msgstr "�޷��жϺ��� lo_tell �� OID\n"
+
+# fe-lobj.c:644
+#: fe-lobj.c:644
+msgid "cannot determine OID of function loread\n"
+msgstr "�޷��жϺ��� loread �� OID\n"
+
+# fe-lobj.c:651
+#: fe-lobj.c:651
+msgid "cannot determine OID of function lowrite\n"
+msgstr "�޷��жϺ��� lowrite �� OID\n"
+
+# fe-misc.c:303
+#: fe-misc.c:303
+#, c-format
+msgid "integer of size %lu not supported by pqGetInt\n"
+msgstr "pgGetInt ��֧�ִ�СΪ %lu ������\n"
+
+# fe-misc.c:341
+#: fe-misc.c:341
+#, c-format
+msgid "integer of size %lu not supported by pqPutInt\n"
+msgstr "pgPutInt ��֧�ִ�СΪ %lu ������\n"
+
+# fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
+#, 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:798
+msgid "connection not open\n"
+msgstr "�����\n"
+
+# fe-misc.c:515 fe-misc.c:595
+#: fe-misc.c:515 fe-misc.c:595
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "�޷��ӷ�������������: %s\n"
+
+# fe-misc.c:612 fe-misc.c:686
+#: fe-misc.c:612 fe-misc.c:686
+msgid ""
+"server closed the connection unexpectedly\n"
+"\tThis probably means the server terminated abnormally\n"
+"\tbefore or while processing the request.\n"
+msgstr ""
+"����������عر�������\n"
+"\t��������ͨ����ζ�ŷ������ڴ�������֮ǰ\n"
+"�������ڴ��������ʱ��������ֹ\n"
+
+# fe-misc.c:702
+#: fe-misc.c:702
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "�޷����������������: %s\n"
+
+#: fe-secure.c:275 fe-secure.c:321
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "SSL SYSCALL ����: %s\n"
+
+# fe-auth.c:232
+#: fe-secure.c:280 fe-secure.c:326
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "SSL ����: %s\n"
+
+# fe-lobj.c:498
+#: fe-secure.c:387
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "��ѯ�׽��ִ���: %s\n"
+
+# fe-connect.c:1263
+#: fe-secure.c:400
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "�޷���ȡ�������� (%s) ����Ϣ: %s\n"
+
+#: fe-secure.c:419
+msgid "unsupported protocol\n"
+msgstr "��֧�ֵ�Э��\n"
+
+#: fe-secure.c:441
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr "���������� \"%s\" ���ܽ����� %ld.%ld.%ld.%ld\n"
+
+#: fe-secure.c:448
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr "���������� \"%s\" ���ܽ������Զ˵�ַ\n"
+
+# fe-connect.c:1263
+#: fe-secure.c:617
+msgid "could not get user information\n"
+msgstr "�޷���ȡ�û���Ϣ\n"
+
+# fe-lobj.c:400 fe-lobj.c:483
+#: fe-secure.c:629
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "�޷���֤�� (%s): %s\n"
+
+# fe-lobj.c:400 fe-lobj.c:483
+#: fe-secure.c:636
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "�޷���ȡ֤�� (%s): %s\n"
+
+#: fe-secure.c:649
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr "��֤��, ������˽Կ (%s)\n"
+
+#: fe-secure.c:658
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr "˽Կ (%s) �д��������\n"
+
+# fe-lobj.c:400 fe-lobj.c:483
+#: fe-secure.c:665
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr "�޷���˽Կ�ļ� (%s): %s\n"
+
+#: fe-secure.c:674
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr "��ִ�й�����˽Կ (%s) �ı���\n"
+
+# fe-connect.c:891
+#: fe-secure.c:681
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr "�޷���ȡ˽Կ (%s): %s\n"
+
+#: fe-secure.c:693
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr "֤��/˽Կ��ƥ�� (%s): %s\n"
+
+#: fe-secure.c:721
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "�޷����� SSL ����: %s\n"
+
+# fe-connect.c:891
+#: fe-secure.c:737 fe-secure.c:745
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "�޷���ȡ��֤���б� (%s): %s\n"
+
+#: fe-secure.c:794
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "�޷����� SSL ����: %s\n"
+
+#: fe-secure.c:812
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "�޷���֤֤��: %s\n"
+
+#: fe-secure.c:824
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "�޷����֤��: %s\n"
+
+#~ msgid "could not flush enough data (space available: %d, space needed %d)\n"
+#~ msgstr "�޷���ˢ�㹻������ (���ÿռ�: %d, ��Ҫ�ռ� %d)\n"