Translation updates

author: Peter Eisentraut <peter_e@gmx.net> 2004-04-05 09:02:37 +0000
committer: Peter Eisentraut <peter_e@gmx.net> 2004-04-05 09:02:37 +0000
commit: 6122f38b0ad53ea4cf5ce42459b0149d639a03ae (patch)
tree: c2383e72d094df186f0f3315c7ae602669f6105d /src
parent: 6f8f414d30ecb8e29b077007833cb43d0761e9b5 (diff)
download: postgresql-6122f38b0ad53ea4cf5ce42459b0149d639a03ae.tar.gz
postgresql-6122f38b0ad53ea4cf5ce42459b0149d639a03ae.zip
4 files changed, 3809 insertions, 3865 deletions
diff --git a/src/backend/po/ru.po b/src/backend/po/ru.po
index ccd4d56da74..cb5b461803b 100644
--- a/src/backend/po/ru.po
+++ b/src/backend/po/ru.po
@@ -1,9 +1,10 @@
 # ru.po
 # POSTGRES Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.9.2.1 2003/01/04 10:26:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.9.2.2 2004/04/05 09:02:33 petere Exp $
 #
 # Changelog:
+#   - March 27, 2004: Fuzzy Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - January 2, 2003: Fuzzy Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Post-7.3 beta 2, Fuzzy Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 14, 2002: Post-7.3 beta 1, Take II, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -13,14 +14,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2003-01-02 13:00-0500\n"
-"PO-Revision-Date: 2003-01-02 13:33-0500\n"
+"POT-Creation-Date: 2004-03-02 17:41-0400\n"
+"PO-Revision-Date: 2004-03-27 13:43-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"
 
+#: access/common/indextuple.c:55
+#, c-format
+msgid "index_formtuple: numberOfAttributes %d > %d"
+msgstr "index_formtuple: numberOfAttributes (число атрибутов) для %d > %d"
+
+#: access/common/indextuple.c:162
+#, c-format
+msgid "index_formtuple: data takes %lu bytes, max is %d"
+msgstr "index_formtuple: данные занимают %lu байт(ов), при максимуме: %d"
+
 #: access/common/heaptuple.c:179
 msgid "heap_attisnull: zero attnum disallowed"
 msgstr "heap_attisnull: нулевой attnum не дозволен"
@@ -37,87 +48,82 @@ msgstr "heap_getsysattr: неверный attnum: %d"
 #: access/common/heaptuple.c:584
 #, c-format
 msgid "heap_formtuple: numberOfAttributes %d exceeds limit %d"
-msgstr ""
-"heap_formtuple: numberOfAttributes (число атрибутов) %d превышает лимит %d"
+msgstr "heap_formtuple: numberOfAttributes (число атрибутов) %d превышает лимит %d"
 
 #: access/common/heaptuple.c:687
 #, c-format
 msgid "heap_modifytuple: repl is \\%3d"
 msgstr "heap_modifytuple: значение repl: \\%3d"
 
-#: access/common/indextuple.c:55
-#, c-format
-msgid "index_formtuple: numberOfAttributes %d > %d"
-msgstr "index_formtuple: numberOfAttributes (число атрибутов) для %d > %d"
-
-#: access/common/indextuple.c:161
-#, c-format
-msgid "index_formtuple: data takes %lu bytes, max is %d"
-msgstr "index_formtuple: данные занимают %lu байт(ов), при максимуме: %d"
-
-#: access/common/tupdesc.c:420
+#: access/common/tupdesc.c:421
 #, c-format
 msgid "Unable to look up type id %u"
 msgstr "Тип с ID %u не найден"
 
-#: access/common/tupdesc.c:646 executor/nodeFunctionscan.c:204
-#: parser/parse_relation.c:931 parser/parse_relation.c:1286
+#: 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:660 access/common/tupdesc.c:683
+#: 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:679
+#: access/common/tupdesc.c:680
 msgid "TypeGetTupleDesc: no column alias was provided"
 msgstr "TypeGetTupleDesc: алиасы колонок не указаны"
 
-#: access/common/tupdesc.c:698
+#: access/common/tupdesc.c:699
 msgid "Unable to determine tuple description for function returning \"record\""
-msgstr ""
-"Не в состоянии определить описание строки для функции возпращающей тип "
-"\"record\""
+msgstr "Не в состоянии определить описание строки для функции возпращающей тип \"record\""
 
-#: access/common/tupdesc.c:700 catalog/pg_proc.c:463
-#: executor/nodeFunctionscan.c:234 parser/parse_relation.c:1383
+#: access/common/tupdesc.c:701
+#: catalog/pg_proc.c:463
+#: executor/nodeFunctionscan.c:230
+#: parser/parse_relation.c:1383
 #: parser/parse_relation.c:1637
 msgid "Unknown kind of return type specified for function"
 msgstr "Указан неизвестный тип возвращаемого значения для фунции"
 
-#: access/gist/gist.c:171 access/hash/hash.c:72 access/nbtree/nbtree.c:129
+#: access/gist/gist.c:171
+#: access/hash/hash.c:72
+#: access/nbtree/nbtree.c:129
 #: access/rtree/rtree.c:128
 #, c-format
 msgid "%s already contains data"
 msgstr "%s уже содержит данные"
 
-#: access/gist/gist.c:399 access/gist/gist.c:606
+#: access/gist/gist.c:399
+#: access/gist/gist.c:606
 #, c-format
 msgid "gist: failed to add index item to %s"
 msgstr "gist: не получилось добавить элемент индекса к %s"
 
-#: access/gist/gist.c:1666
+#: access/gist/gist.c:1668
 #, c-format
 msgid "initGISTstate: numberOfAttributes %d > %d"
 msgstr "initGISTstate: numberOfAttributes для %d > %d"
 
-#: access/gist/gist.c:1928
+#: access/gist/gist.c:1930
 #, c-format
 msgid "%sPage: %d %s blk: %d maxoff: %d free: %d"
 msgstr "%sСтр.: %d %s блк: %d макс для: %d свободно: %d"
 
-#: access/gist/gist.c:1938
+#: access/gist/gist.c:1940
 #, c-format
 msgid "%s  Tuple. blk: %d size: %d"
 msgstr "%s  Запись. блк: %d размер: %d"
 
-#: access/gist/gist.c:1953
+#: access/gist/gist.c:1955
 msgid "gist_redo: unimplemented"
 msgstr "gist_redo: не поддерживается"
 
-#: access/gist/gist.c:1959
+#: access/gist/gist.c:1961
 msgid "gist_undo: unimplemented"
 msgstr "gist_undo: не поддерживается"
 
@@ -131,14 +137,6 @@ msgstr ""
 msgid "Bad operation in GiST scan adjust: %d"
 msgstr ""
 
-#: access/hash/hash.c:504
-msgid "hash_redo: unimplemented"
-msgstr "hash_redo: ещё не сделано"
-
-#: access/hash/hash.c:510
-msgid "hash_undo: unimplemented"
-msgstr "hash_undo: ещё не сделано"
-
 #: access/hash/hashinsert.c:51
 msgid "Hash indices valid for only one index key."
 msgstr ""
@@ -152,6 +150,14 @@ msgstr ""
 msgid "_hash_pgaddtup: failed to add index item to %s"
 msgstr "_hash_pgaddtup: не удалось добавить элемент индекса к %s"
 
+#: access/hash/hash.c:504
+msgid "hash_redo: unimplemented"
+msgstr "hash_redo: ещё не сделано"
+
+#: access/hash/hash.c:510
+msgid "hash_undo: unimplemented"
+msgstr "hash_undo: ещё не сделано"
+
 #: access/hash/hashovfl.c:61
 msgid "_hash_addovflpage: problem with _hash_getovfladdr."
 msgstr "_hash_addovflpage: проблема с _hash_getovfladdr."
@@ -203,7 +209,8 @@ msgstr ""
 msgid "_hash_unsetpagelock: invalid access (%d) on blk %x: %s"
 msgstr ""
 
-#: access/hash/hashpage.c:537 access/hash/hashpage.c:674
+#: access/hash/hashpage.c:537
+#: access/hash/hashpage.c:674
 #, c-format
 msgid "_hash_splitpage: empty overflow page %d"
 msgstr ""
@@ -235,13 +242,16 @@ msgstr ""
 msgid "Failed to insert index entry for TOAST tuple"
 msgstr ""
 
-#: access/heap/tuptoaster.c:1074 access/heap/tuptoaster.c:1254
+#: 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:1080 access/heap/tuptoaster.c:1087
-#: access/heap/tuptoaster.c:1260 access/heap/tuptoaster.c:1267
+#: 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 ""
@@ -251,7 +261,8 @@ msgstr ""
 msgid "unexpected chunk number %d for toast value %u"
 msgstr ""
 
-#: access/heap/tuptoaster.c:1110 access/heap/tuptoaster.c:1294
+#: access/heap/tuptoaster.c:1110
+#: access/heap/tuptoaster.c:1294
 #, c-format
 msgid "missing chunk number %d for toast value %u"
 msgstr ""
@@ -276,7 +287,9 @@ msgstr ""
 msgid "heapgettup: relation(%c)=`%s', %p"
 msgstr ""
 
-#: access/heap/heapam.c:203 access/heap/heapam.c:238 access/heap/heapam.c:278
+#: access/heap/heapam.c:203
+#: access/heap/heapam.c:238
+#: access/heap/heapam.c:278
 #: access/heap/heapam.c:372
 msgid "heapgettup: failed ReadBuffer"
 msgstr "heapgettup: ReadBuffer не удался"
@@ -286,22 +299,30 @@ msgstr "heapgettup: ReadBuffer не удался"
 msgid "Relation %u does not exist"
 msgstr ""
 
-#: access/heap/heapam.c:553 catalog/namespace.c:189 tcop/utility.c:154
+#: access/heap/heapam.c:553
+#: catalog/namespace.c:184
+#: tcop/utility.c:153
 #, c-format
 msgid "Relation \"%s\" does not exist"
 msgstr ""
 
-#: access/heap/heapam.c:605 access/heap/heapam.c:634 access/heap/heapam.c:663
+#: access/heap/heapam.c:605
+#: access/heap/heapam.c:634
+#: access/heap/heapam.c:663
 #, c-format
 msgid "%s is an index relation"
 msgstr ""
 
-#: access/heap/heapam.c:608 access/heap/heapam.c:637 access/heap/heapam.c:666
+#: access/heap/heapam.c:608
+#: access/heap/heapam.c:637
+#: access/heap/heapam.c:666
 #, c-format
 msgid "%s is a special relation"
 msgstr ""
 
-#: access/heap/heapam.c:611 access/heap/heapam.c:640 access/heap/heapam.c:669
+#: access/heap/heapam.c:611
+#: access/heap/heapam.c:640
+#: access/heap/heapam.c:669
 #, c-format
 msgid "%s is a composite type"
 msgstr ""
@@ -353,7 +374,8 @@ msgstr ""
 msgid "simple_heap_delete: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1448 executor/execMain.c:1324
+#: access/heap/heapam.c:1448
+#: executor/execMain.c:1339
 #, c-format
 msgid "Unknown status %u from heap_delete"
 msgstr ""
@@ -374,7 +396,8 @@ msgstr ""
 msgid "simple_heap_update: tuple concurrently updated"
 msgstr ""
 
-#: access/heap/heapam.c:1782 executor/execMain.c:1462
+#: access/heap/heapam.c:1782
+#: executor/execMain.c:1479
 #, c-format
 msgid "Unknown status %u from heap_update"
 msgstr ""
@@ -458,7 +481,8 @@ msgstr ""
 msgid "heap_update_%sdo: invalid lp"
 msgstr ""
 
-#: access/heap/heapam.c:2407 access/heap/heapam.c:2507
+#: access/heap/heapam.c:2407
+#: access/heap/heapam.c:2507
 msgid "heap_update_undo: unimplemented"
 msgstr ""
 
@@ -527,30 +551,32 @@ msgstr ""
 msgid "Tuple is too big: size %lu"
 msgstr ""
 
-#: access/index/indexam.c:91 access/index/indexam.c:100
+#: access/index/genam.c:74
+msgid "RelationGetIndexScan: relation invalid"
+msgstr ""
+
+#: access/index/genam.c:139
+msgid "IndexScanEnd: invalid scan"
+msgstr ""
+
+#: access/index/indexam.c:91
+#: access/index/indexam.c:100
 #, c-format
 msgid "index_%s: invalid %s regproc"
 msgstr ""
 
-#: access/index/indexam.c:131 access/index/indexam.c:154
+#: access/index/indexam.c:131
+#: access/index/indexam.c:154
 #: access/index/indexam.c:177
 #, c-format
 msgid "%s is not an index relation"
 msgstr ""
 
-#: access/index/indexam.c:652
+#: access/index/indexam.c:693
 #, c-format
 msgid "Missing support function %d for attribute %d of index %s"
 msgstr ""
 
-#: access/index/genam.c:74
-msgid "RelationGetIndexScan: relation invalid"
-msgstr ""
-
-#: access/index/genam.c:136
-msgid "IndexScanEnd: invalid scan"
-msgstr ""
-
 #: access/index/istrat.c:238
 #, c-format
 msgid "StrategyTermEvaluate: impossible case %d"
@@ -570,6 +596,19 @@ msgstr ""
 msgid "RelationInvokeStrategy: cannot evaluate strategy %d"
 msgstr ""
 
+#: access/nbtree/nbtsearch.c:545
+msgid "_bt_first: btree doesn't support is(not)null, yet"
+msgstr ""
+
+#: access/nbtree/nbtsearch.c:693
+msgid "_bt_first: equal items disappeared?"
+msgstr ""
+
+#: access/nbtree/nbtsearch.c:1004
+#, c-format
+msgid "Illegal scan direction %d"
+msgstr ""
+
 #: access/nbtree/nbtinsert.c:250
 #, c-format
 msgid "Cannot insert a duplicate key into unique index %s"
@@ -608,114 +647,112 @@ msgstr ""
 msgid "bt_insertonpg[%s]: parent page unfound - fixing branch"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:756
+#: access/nbtree/nbtinsert.c:757
 msgid "btree: failed to add hikey to the right sibling"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:782
+#: access/nbtree/nbtinsert.c:783
 msgid "btree: failed to add hikey to the left sibling"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1112
+#: access/nbtree/nbtinsert.c:1113
 #, c-format
 msgid "_bt_findsplitloc: can't find a feasible split point for %s"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1339
+#: access/nbtree/nbtinsert.c:1340
 msgid "btree: failed to add leftkey to new root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1356
+#: access/nbtree/nbtinsert.c:1357
 msgid "btree: failed to add rightkey to new root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1442
+#: access/nbtree/nbtinsert.c:1443
 msgid "bt_fixroot: not valid old root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1573
+#: access/nbtree/nbtinsert.c:1574
 #, c-format
 msgid "bt_fixtree[%s]: invalid start page (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1599
+#: access/nbtree/nbtinsert.c:1600
 #, c-format
 msgid "bt_fixtree[%s]: fixing root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1647
+#: access/nbtree/nbtinsert.c:1648
 #, c-format
 msgid "bt_fixlevel[%s]: invalid maxoff on start page (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1654
+#: access/nbtree/nbtinsert.c:1655
 #, c-format
-msgid ""
-"bt_fixtlevel[%s]: non-leftmost child page of leftmost parent (need to "
-"recreate index)"
+msgid "bt_fixtlevel[%s]: non-leftmost child page of leftmost parent (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1657
+#: access/nbtree/nbtinsert.c:1658
 #, c-format
 msgid "bt_fixtlevel[%s]: invalid start child (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1683
+#: access/nbtree/nbtinsert.c:1684
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(1) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1715
+#: access/nbtree/nbtinsert.c:1716
 #, c-format
 msgid "bt_fixlevel[%s]: pointer disappeared (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1734
+#: access/nbtree/nbtinsert.c:1735
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(2) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1748
+#: access/nbtree/nbtinsert.c:1749
 #, c-format
 msgid "bt_fixlevel[%s]: invalid item order(3) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1878
+#: access/nbtree/nbtinsert.c:1879
 #, c-format
 msgid "bt_fixbranch[%s]: left pointer unfound (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1885
+#: access/nbtree/nbtinsert.c:1886
 #, c-format
 msgid "bt_fixbranch[%s]: invalid item order (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1894
+#: access/nbtree/nbtinsert.c:1895
 #, c-format
 msgid "bt_fixbranch[%s]: right pointer unfound(1) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1902
+#: access/nbtree/nbtinsert.c:1903
 #, c-format
 msgid "bt_fixbranch[%s]: right pointer unfound(2) (need to recreate index)"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1950
+#: access/nbtree/nbtinsert.c:1951
 #, c-format
 msgid "bt_fixbranch[%s]: fixing upper levels"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1981
+#: access/nbtree/nbtinsert.c:1982
 #, c-format
 msgid "bt_fixup[%s]: checking/fixing upper levels"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:1996
+#: access/nbtree/nbtinsert.c:1997
 #, c-format
 msgid "bt_fixup[%s]: fixing root page"
 msgstr ""
 
-#: access/nbtree/nbtinsert.c:2059
+#: access/nbtree/nbtinsert.c:2060
 #, c-format
 msgid "btree: failed to add item to the %s for %s"
 msgstr ""
@@ -794,7 +831,8 @@ msgstr ""
 msgid "btree_split_undo: bad left sibling LSN"
 msgstr ""
 
-#: access/nbtree/nbtree.c:989 access/nbtree/nbtree.c:1028
+#: access/nbtree/nbtree.c:989
+#: access/nbtree/nbtree.c:1028
 msgid "btree_split_undo: unimplemented"
 msgstr ""
 
@@ -837,24 +875,11 @@ msgstr ""
 msgid "btree_undo: unknown op code %u"
 msgstr ""
 
-#: access/nbtree/nbtsearch.c:545
-msgid "_bt_first: btree doesn't support is(not)null, yet"
-msgstr ""
-
-#: access/nbtree/nbtsearch.c:693
-msgid "_bt_first: equal items disappeared?"
-msgstr ""
-
-#: access/nbtree/nbtsearch.c:1004
-#, c-format
-msgid "Illegal scan direction %d"
-msgstr ""
-
-#: access/nbtree/nbtsort.c:288
+#: access/nbtree/nbtsort.c:292
 msgid "btree: failed to add item to the page in _bt_sort"
 msgstr ""
 
-#: access/nbtree/nbtsort.c:353
+#: access/nbtree/nbtsort.c:357
 #, c-format
 msgid "btree: index item size %lu exceeds maximum %ld"
 msgstr ""
@@ -878,7 +903,8 @@ msgstr ""
 msgid "rtdoinsert: failed to add index item to %s"
 msgstr ""
 
-#: access/rtree/rtree.c:523 access/rtree/rtree.c:547
+#: access/rtree/rtree.c:523
+#: access/rtree/rtree.c:547
 #, c-format
 msgid "rtdosplit: failed to add index item to %s"
 msgstr ""
@@ -892,7 +918,8 @@ msgstr ""
 msgid "rtintinsert: failed to add index item to %s"
 msgstr ""
 
-#: access/rtree/rtree.c:689 access/rtree/rtree.c:694
+#: access/rtree/rtree.c:689
+#: access/rtree/rtree.c:694
 #, c-format
 msgid "rtnewroot: failed to add index item to %s"
 msgstr ""
@@ -924,381 +951,246 @@ msgstr ""
 msgid "Bad operation in rtree scan adjust: %d"
 msgstr ""
 
-#: access/transam/clog.c:546 access/transam/clog.c:598
-#, c-format
-msgid "open of %s failed: %m"
-msgstr "не удалось открыть %s: %m"
-
-#: access/transam/clog.c:547
-#, c-format
-msgid "clog file %s doesn't exist, reading as zeroes"
-msgstr ""
-
-#: access/transam/clog.c:553 access/transam/clog.c:606
-#, c-format
-msgid "lseek of clog file %u, offset %u failed: %m"
-msgstr ""
-
-#: access/transam/clog.c:558
-#, c-format
-msgid "read of clog file %u, offset %u failed: %m"
-msgstr ""
-
-#: access/transam/clog.c:602 access/transam/xlog.c:1378
-#, c-format
-msgid "creation of file %s failed: %m"
-msgstr ""
-
-#: access/transam/clog.c:615
-#, c-format
-msgid "write of clog file %u, offset %u failed: %m"
-msgstr ""
-
-#: access/transam/clog.c:834
-msgid "unable to truncate commit log: apparent wraparound"
-msgstr ""
-
-#: access/transam/clog.c:889
-#, c-format
-msgid "could not open transaction-commit log directory (%s): %m"
-msgstr ""
-
-#: access/transam/clog.c:905
-#, c-format
-msgid "removing commit log file %s"
-msgstr "удаление commit-лог-файла %s"
-
-#: access/transam/clog.c:914
-#, c-format
-msgid "could not read transaction-commit log directory (%s): %m"
-msgstr ""
-
-#: access/transam/xact.c:412
-msgid "You may only have 2^32-1 commands per transaction"
-msgstr "Вы можете иметь до 2^32-1 команд в одной транзакции"
-
-#: access/transam/xact.c:702
-#, c-format
-msgid "RecordTransactionAbort: xact %u already committed"
-msgstr ""
-
-#: access/transam/xact.c:917
-msgid "CommitTransaction and not in in-progress state"
-msgstr ""
-
-#: access/transam/xact.c:1058
-msgid "AbortTransaction and not in in-progress state"
-msgstr ""
-
-#: access/transam/xact.c:1143
-msgid "CleanupTransaction and not in abort state"
-msgstr ""
-
-#: access/transam/xact.c:1175
-msgid "StartTransactionCommand: can't prevent chain"
-msgstr "StartTransactionCommand: не в состоянии предотвратить цепочку"
-
-#: access/transam/xact.c:1194
-msgid "StartTransactionCommand: unexpected TBLOCK_BEGIN"
-msgstr "StartTransactionCommand: неожиданный TBLOCK_BEGIN"
-
-#: access/transam/xact.c:1215
-msgid "StartTransactionCommand: unexpected TBLOCK_END"
-msgstr "StartTransactionCommand: неожиданный TBLOCK_END"
-
-#: access/transam/xact.c:1238
-msgid "StartTransactionCommand: unexpected TBLOCK_ENDABORT"
-msgstr "StartTransactionCommand: неожиданный TBLOCK_ENDABORT"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:1454
-#, c-format
-msgid "%s cannot run inside a transaction block"
-msgstr "%s не может выполняться внутри транзакционного блока"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:1464
-#, c-format
-msgid "%s cannot be executed from a function"
-msgstr "%s не может выполняться внутри функции"
-
-#: access/transam/xact.c:1468
-msgid "PreventTransactionChain: can't prevent chain"
-msgstr "PreventTransactionChain: не в состоянии предотвратить цепочку"
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:1475
-#, c-format
-msgid "%s will be committed automatically"
-msgstr ""
-
-#. translator: %s represents an SQL statement name
-#: access/transam/xact.c:1519
-#, c-format
-msgid "%s may only be used in begin/end transaction blocks"
-msgstr ""
-
-#: access/transam/xact.c:1541
-msgid "BEGIN: already a transaction in progress"
-msgstr "BEGIN: транзакция уже в процессе выполнения"
-
-#: access/transam/xact.c:1605
-msgid "COMMIT: no transaction in progress"
-msgstr "COMMIT: нет транзакции в процессе выполнения"
-
-#: access/transam/xact.c:1642 access/transam/xact.c:1689
-msgid "ROLLBACK: no transaction in progress"
-msgstr "ROLLBACK: нет транзакции в процессе выполнения"
-
-#: access/transam/xact.c:1768 access/transam/xact.c:1779
-#, c-format
-msgid "xact_redo: unknown op code %u"
-msgstr "xact_redo: неизвестный код операции: %u"
-
-#: access/transam/xact.c:1777
-msgid "xact_undo: can't undo committed xaction"
-msgstr ""
-
-#: access/transam/xact.c:1814
-msgid "XactPushRollback: already installed"
-msgstr ""
-
-#: access/transam/xlog.c:505
+#: access/transam/xlog.c:506
 #, c-format
 msgid "XLogInsert: invalid info mask %02X"
 msgstr ""
 
-#: access/transam/xlog.c:610
+#: access/transam/xlog.c:611
 #, c-format
 msgid "XLogInsert: can backup %d blocks at most"
 msgstr ""
 
-#: access/transam/xlog.c:628
+#: access/transam/xlog.c:629
 #, c-format
 msgid "XLogInsert: invalid record length %u"
 msgstr ""
 
-#: access/transam/xlog.c:785 access/transam/xlog.c:2625 scan.l:36
-#: utils/adt/name.c:52 utils/adt/varchar.c:83 utils/adt/varchar.c:357
-#: utils/adt/varlena.c:226
+#: access/transam/xlog.c:786
+#: access/transam/xlog.c:2638
+#: utils/adt/name.c:52
+#: utils/adt/varchar.c:83
+#: utils/adt/varchar.c:357
+#: utils/adt/varlena.c:225
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: access/transam/xlog.c:1029
+#: 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:1046 access/transam/xlog.c:1156
-#: access/transam/xlog.c:3329
+#: access/transam/xlog.c:1047
+#: access/transam/xlog.c:1157
+#: access/transam/xlog.c:3391
 #, c-format
 msgid "close of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1081
+#: access/transam/xlog.c:1082
 msgid "XLogWrite: time for a checkpoint, signaling postmaster"
 msgstr ""
 
-#: access/transam/xlog.c:1100
+#: access/transam/xlog.c:1101
 #, c-format
 msgid "lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1112
+#: access/transam/xlog.c:1113
 #, c-format
 msgid "write of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1208
+#: access/transam/xlog.c:1209
 #, c-format
 msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1313
+#: access/transam/xlog.c:1314
 #, c-format
 msgid "XLogFlush: request %X/%X is not satisfied --- flushed only to %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1356 access/transam/xlog.c:1437
-#: access/transam/xlog.c:1547 access/transam/xlog.c:1551
+#: access/transam/xlog.c:1357
+#: access/transam/xlog.c:1438
+#: access/transam/xlog.c:1548
+#: access/transam/xlog.c:1552
 #, c-format
 msgid "open of %s (log file %u, segment %u) failed: %m"
 msgstr "не удалось открыть %s (лог-файл: %u, сегмент: %u): %m"
 
-#: access/transam/xlog.c:1405
+#: access/transam/clog.c:602
+#: access/transam/xlog.c:1379
+#, c-format
+msgid "creation of file %s failed: %m"
+msgstr ""
+
+#: access/transam/xlog.c:1406
 #, c-format
 msgid "ZeroFill failed to write %s: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1410
+#: access/transam/xlog.c:1411
 #, c-format
 msgid "fsync of file %s failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1515
+#: access/transam/xlog.c:1516
 #, c-format
-msgid ""
-"link from %s to %s (initialization of log file %u, segment %u) failed: %m"
+msgid "link from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1520
+#: access/transam/xlog.c:1521
 #, c-format
-msgid ""
-"rename from %s to %s (initialization of log file %u, segment %u) failed: %m"
+msgid "rename from %s to %s (initialization of log file %u, segment %u) failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1601
+#: access/transam/xlog.c:1602
 #, c-format
 msgid "could not open transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1616
+#: access/transam/xlog.c:1617
 #, c-format
 msgid "archiving transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1618
+#: access/transam/xlog.c:1619
 msgid "archiving log files is not implemented!"
 msgstr "архивация логов не поддерживается!"
 
-#: access/transam/xlog.c:1632
+#: access/transam/xlog.c:1633
 #, c-format
 msgid "recycled transaction log file %s"
 msgstr ""
 
-#: access/transam/xlog.c:1638
+#: access/transam/xlog.c:1639
 #, c-format
 msgid "removing transaction log file %s"
 msgstr "удаление лог-файла транзакций: %s"
 
-#: access/transam/xlog.c:1647
+#: access/transam/xlog.c:1648
 #, c-format
 msgid "could not read transaction log directory (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:1720
+#: access/transam/xlog.c:1721
 #, c-format
 msgid "ReadRecord: bad resource manager data checksum in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1742
+#: access/transam/xlog.c:1743
 #, c-format
 msgid "ReadRecord: bad checksum of backup block %d in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1811
+#: access/transam/xlog.c:1812
 #, c-format
 msgid "ReadRecord: invalid record offset at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1834
+#: access/transam/xlog.c:1835
 #, c-format
 msgid "ReadRecord: lseek of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1840 access/transam/xlog.c:1924
+#: access/transam/xlog.c:1841
+#: access/transam/xlog.c:1925
 #, c-format
 msgid "ReadRecord: read of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1850
+#: access/transam/xlog.c:1851
 #, c-format
 msgid "ReadRecord: contrecord is requested by %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1864
+#: access/transam/xlog.c:1865
 #, c-format
 msgid "ReadRecord: record with zero length at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1888
+#: access/transam/xlog.c:1889
 #, c-format
 msgid "ReadRecord: record length %u at %X/%X too long"
 msgstr ""
 
-#: access/transam/xlog.c:1894
+#: access/transam/xlog.c:1895
 #, c-format
 msgid "ReadRecord: invalid resource manager id %u at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1932
+#: access/transam/xlog.c:1933
 #, c-format
-msgid ""
-"ReadRecord: there is no ContRecord flag in log file %u, segment %u, offset %u"
+msgid "ReadRecord: there is no ContRecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:1940
+#: access/transam/xlog.c:1941
 #, c-format
-msgid ""
-"ReadRecord: invalid ContRecord length %u in log file %u, segment %u, offset %"
-"u"
+msgid "ReadRecord: invalid ContRecord length %u in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2004
+#: access/transam/xlog.c:2005
 #, c-format
-msgid ""
-"ReadRecord: invalid magic number %04X in log file %u, segment %u, offset %u"
+msgid "ReadRecord: invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2010
+#: access/transam/xlog.c:2011
 #, c-format
-msgid ""
-"ReadRecord: invalid info bits %04X in log file %u, segment %u, offset %u"
+msgid "ReadRecord: invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2018
+#: access/transam/xlog.c:2019
 #, c-format
-msgid ""
-"ReadRecord: unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
+msgid "ReadRecord: unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
 msgstr ""
 
 #. translator: SUI = startup id
-#: access/transam/xlog.c:2040
+#: access/transam/xlog.c:2041
 #, c-format
-msgid ""
-"ReadRecord: out-of-sequence SUI %u (after %u) in log file %u, segment %u, "
-"offset %u"
+msgid "ReadRecord: out-of-sequence SUI %u (after %u) in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2099
+#: access/transam/xlog.c:2100
 msgid "invalid LC_COLLATE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2103
+#: access/transam/xlog.c:2104
 msgid "invalid LC_CTYPE setting"
 msgstr ""
 
-#: access/transam/xlog.c:2121
+#: access/transam/xlog.c:2122
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr ""
 
-#: access/transam/xlog.c:2129
+#: access/transam/xlog.c:2130
 #, c-format
 msgid "WriteControlFile: could not create control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2138
+#: access/transam/xlog.c:2139
 #, c-format
 msgid "WriteControlFile: write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2142
+#: access/transam/xlog.c:2143
 #, c-format
 msgid "WriteControlFile: fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2158 access/transam/xlog.c:2281
+#: access/transam/xlog.c:2159
+#: access/transam/xlog.c:2282
 #, c-format
 msgid "could not open control file (%s): %m"
 msgstr ""
 
-#: access/transam/xlog.c:2161
+#: access/transam/xlog.c:2162
 #, c-format
 msgid "read from control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2173
+#: access/transam/xlog.c:2174
 #, c-format
 msgid ""
 "The database cluster was initialized with PG_CONTROL_VERSION %d,\n"
@@ -1306,11 +1198,11 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2186
+#: access/transam/xlog.c:2187
 msgid "invalid checksum in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2202
+#: access/transam/xlog.c:2203
 #, c-format
 msgid ""
 "The database cluster was initialized with CATALOG_VERSION_NO %d,\n"
@@ -1318,7 +1210,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2208
+#: access/transam/xlog.c:2209
 #, c-format
 msgid ""
 "The database cluster was initialized with BLCKSZ %d,\n"
@@ -1326,7 +1218,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2214
+#: access/transam/xlog.c:2215
 #, c-format
 msgid ""
 "The database cluster was initialized with RELSEG_SIZE %d,\n"
@@ -1334,7 +1226,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2221
+#: access/transam/xlog.c:2222
 #, c-format
 msgid ""
 "The database cluster was initialized with NAMEDATALEN %d,\n"
@@ -1342,7 +1234,7 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2228
+#: access/transam/xlog.c:2229
 #, c-format
 msgid ""
 "The database cluster was initialized with FUNC_MAX_ARGS %d,\n"
@@ -1350,21 +1242,21 @@ msgid ""
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2236
+#: access/transam/xlog.c:2237
 msgid ""
 "The database cluster was initialized without HAVE_INT64_TIMESTAMP\n"
 "\tbut the backend was compiled with HAVE_INT64_TIMESTAMP.\n"
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2242
+#: access/transam/xlog.c:2243
 msgid ""
 "The database cluster was initialized with HAVE_INT64_TIMESTAMP\n"
 "\tbut the backend was compiled without HAVE_INT64_TIMESTAMP.\n"
 "\tIt looks like you need to recompile or initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2249
+#: access/transam/xlog.c:2250
 #, c-format
 msgid ""
 "The database cluster was initialized with LOCALE_NAME_BUFLEN %d,\n"
@@ -1372,7 +1264,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2256
+#: access/transam/xlog.c:2257
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_COLLATE '%s',\n"
@@ -1380,7 +1272,7 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2262
+#: access/transam/xlog.c:2263
 #, c-format
 msgid ""
 "The database cluster was initialized with LC_CTYPE '%s',\n"
@@ -1388,41 +1280,41 @@ msgid ""
 "\tIt looks like you need to initdb."
 msgstr ""
 
-#: access/transam/xlog.c:2289
+#: access/transam/xlog.c:2290
 #, c-format
 msgid "write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2293
+#: access/transam/xlog.c:2294
 #, c-format
 msgid "fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2433
+#: access/transam/xlog.c:2434
 #, c-format
 msgid "BootStrapXLOG failed to write log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2437
+#: access/transam/xlog.c:2438
 #, c-format
 msgid "BootStrapXLOG failed to fsync log file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2503
+#: access/transam/xlog.c:2505
 msgid "control file context is broken"
 msgstr ""
 
-#: access/transam/xlog.c:2506
+#: access/transam/xlog.c:2508
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "система была отключена: %s"
 
-#: access/transam/xlog.c:2509
+#: access/transam/xlog.c:2511
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr "отключение системы было прервано: %s"
 
-#: access/transam/xlog.c:2512
+#: access/transam/xlog.c:2514
 #, c-format
 msgid ""
 "database system was interrupted being in recovery at %s\n"
@@ -1430,120 +1322,297 @@ msgid ""
 "\tand you will have to use the last backup for recovery."
 msgstr ""
 
-#: access/transam/xlog.c:2517
+#: access/transam/xlog.c:2519
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr "система была прервана: %s"
 
-#: access/transam/xlog.c:2528
+#: access/transam/xlog.c:2530
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "контрольная точка: %X/%X"
 
-#: access/transam/xlog.c:2537
+#: access/transam/xlog.c:2539
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "используется предыдущая контрольная точка: %X/%X"
 
-#: access/transam/xlog.c:2542
+#: access/transam/xlog.c:2544
 msgid "unable to locate a valid checkpoint record"
 msgstr "не в состоянии найти корректную контрольную точку"
 
-#: access/transam/xlog.c:2548
+#: 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:2552
+#: access/transam/xlog.c:2554
 #, c-format
 msgid "next transaction id: %u; next oid: %u"
 msgstr "id следующей транзакции: %u; следующий OID: %u"
 
-#: access/transam/xlog.c:2555
+#: access/transam/xlog.c:2557
 msgid "invalid next transaction id"
 msgstr ""
 
-#: access/transam/xlog.c:2566
+#: access/transam/xlog.c:2579
 msgid "invalid redo in checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2574
+#: access/transam/xlog.c:2587
 msgid "invalid redo/undo record in shutdown checkpoint"
 msgstr ""
 
-#: access/transam/xlog.c:2583
-msgid ""
-"database system was not properly shut down; automatic recovery in progress"
+#: access/transam/xlog.c:2596
+msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 
-#: access/transam/xlog.c:2603
+#: access/transam/xlog.c:2616
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2634
+#: access/transam/xlog.c:2647
 #, c-format
 msgid "redo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2640
+#: access/transam/xlog.c:2653
 msgid "redo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2722
+#: access/transam/xlog.c:2720
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2732
+#: access/transam/xlog.c:2730
 #, c-format
 msgid "undo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2736
+#: access/transam/xlog.c:2734
 msgid "undo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2770
+#: access/transam/xlog.c:2801
 msgid "database system is ready"
 msgstr "система готова к использованию"
 
-#: access/transam/xlog.c:2898
+#: access/transam/xlog.c:2833
+msgid "invalid primary checkpoint link in control file"
+msgstr ""
+
+#: access/transam/xlog.c:2834
+msgid "invalid secondary checkpoint link in control file"
+msgstr ""
+
+#: access/transam/xlog.c:2843
+msgid "invalid primary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2844
+msgid "invalid secondary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2850
+msgid "invalid resource manager id in primary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2851
+msgid "invalid resource manager id in secondary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2858
+msgid "invalid xl_info in primary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2859
+msgid "invalid xl_info in secondary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2865
+msgid "invalid length of primary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2866
+msgid "invalid length of secondary checkpoint record"
+msgstr ""
+
+#: access/transam/xlog.c:2929
 msgid "shutting down"
 msgstr "отключение в процессе"
 
-#: access/transam/xlog.c:2911
+#: access/transam/xlog.c:2942
 msgid "database system is shut down"
 msgstr "система отключена"
 
-#: access/transam/xlog.c:2932
+#: access/transam/xlog.c:2963
 msgid "CreateCheckPoint: cannot be called inside transaction block"
 msgstr ""
 
-#: access/transam/xlog.c:3047
+#: access/transam/xlog.c:3090
 msgid "active transaction while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3093
-msgid ""
-"concurrent transaction log activity while database system is shutting down"
+#: access/transam/xlog.c:3147
+msgid "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlog.c:3324 access/transam/xlog.c:3352
+#: access/transam/xlog.c:3386
+#: access/transam/xlog.c:3414
 #, c-format
 msgid "fsync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3358
+#: access/transam/xlog.c:3420
 #, c-format
 msgid "fdatasync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:3366
+#: access/transam/xlog.c:3428
 #, c-format
 msgid "bogus wal_sync_method %d"
 msgstr ""
 
+#: access/transam/clog.c:546
+#: access/transam/clog.c:598
+#, c-format
+msgid "open of %s failed: %m"
+msgstr "не удалось открыть %s: %m"
+
+#: access/transam/clog.c:547
+#, c-format
+msgid "clog file %s doesn't exist, reading as zeroes"
+msgstr ""
+
+#: access/transam/clog.c:553
+#: access/transam/clog.c:606
+#, c-format
+msgid "lseek of clog file %u, offset %u failed: %m"
+msgstr ""
+
+#: access/transam/clog.c:558
+#, c-format
+msgid "read of clog file %u, offset %u failed: %m"
+msgstr ""
+
+#: access/transam/clog.c:615
+#, c-format
+msgid "write of clog file %u, offset %u failed: %m"
+msgstr ""
+
+#: access/transam/clog.c:834
+msgid "unable to truncate commit log: apparent wraparound"
+msgstr ""
+
+#: access/transam/clog.c:889
+#, c-format
+msgid "could not open transaction-commit log directory (%s): %m"
+msgstr ""
+
+#: access/transam/clog.c:905
+#, c-format
+msgid "removing commit log file %s"
+msgstr "удаление commit-лог-файла %s"
+
+#: access/transam/clog.c:914
+#, c-format
+msgid "could not read transaction-commit log directory (%s): %m"
+msgstr ""
+
+#: access/transam/xact.c:425
+msgid "You may only have 2^32-1 commands per transaction"
+msgstr "Вы можете иметь до 2^32-1 команд в одной транзакции"
+
+#: access/transam/xact.c:715
+#, c-format
+msgid "RecordTransactionAbort: xact %u already committed"
+msgstr ""
+
+#: access/transam/xact.c:944
+msgid "CommitTransaction and not in in-progress state"
+msgstr ""
+
+#: access/transam/xact.c:1079
+msgid "AbortTransaction and not in in-progress state"
+msgstr ""
+
+#: access/transam/xact.c:1164
+msgid "CleanupTransaction and not in abort state"
+msgstr ""
+
+#: access/transam/xact.c:1196
+msgid "StartTransactionCommand: can't prevent chain"
+msgstr "StartTransactionCommand: не в состоянии предотвратить цепочку"
+
+#: access/transam/xact.c:1215
+msgid "StartTransactionCommand: unexpected TBLOCK_BEGIN"
+msgstr "StartTransactionCommand: неожиданный TBLOCK_BEGIN"
+
+#: access/transam/xact.c:1236
+msgid "StartTransactionCommand: unexpected TBLOCK_END"
+msgstr "StartTransactionCommand: неожиданный TBLOCK_END"
+
+#: access/transam/xact.c:1259
+msgid "StartTransactionCommand: unexpected TBLOCK_ENDABORT"
+msgstr "StartTransactionCommand: неожиданный TBLOCK_ENDABORT"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1475
+#, c-format
+msgid "%s cannot run inside a transaction block"
+msgstr "%s не может выполняться внутри транзакционного блока"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1485
+#, c-format
+msgid "%s cannot be executed from a function"
+msgstr "%s не может выполняться внутри функции"
+
+#: access/transam/xact.c:1489
+msgid "PreventTransactionChain: can't prevent chain"
+msgstr "PreventTransactionChain: не в состоянии предотвратить цепочку"
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1496
+#, c-format
+msgid "%s will be committed automatically"
+msgstr ""
+
+#. translator: %s represents an SQL statement name
+#: access/transam/xact.c:1540
+#, c-format
+msgid "%s may only be used in begin/end transaction blocks"
+msgstr ""
+
+#: access/transam/xact.c:1562
+msgid "BEGIN: already a transaction in progress"
+msgstr "BEGIN: транзакция уже в процессе выполнения"
+
+#: access/transam/xact.c:1626
+msgid "COMMIT: no transaction in progress"
+msgstr "COMMIT: нет транзакции в процессе выполнения"
+
+#: access/transam/xact.c:1663
+#: access/transam/xact.c:1710
+msgid "ROLLBACK: no transaction in progress"
+msgstr "ROLLBACK: нет транзакции в процессе выполнения"
+
+#: access/transam/xact.c:1784
+#: access/transam/xact.c:1795
+#, c-format
+msgid "xact_redo: unknown op code %u"
+msgstr "xact_redo: неизвестный код операции: %u"
+
+#: access/transam/xact.c:1793
+msgid "xact_undo: can't undo committed xaction"
+msgstr ""
+
+#: access/transam/xact.c:1830
+msgid "XactPushRollback: already installed"
+msgstr ""
+
 #: access/transam/xlogutils.c:253
 msgid "_xl_remove_hash_entry: file was not found in cache"
 msgstr ""
@@ -1556,7 +1625,7 @@ msgstr ""
 msgid "XLogOpenRelation: file found on insert into cache"
 msgstr ""
 
-#: bootstrap/bootstrap.c:194
+#: bootstrap/bootstrap.c:193
 msgid ""
 "Usage:\n"
 "  postgres -boot [-d level] [-D datadir] [-F] [-o file] [-x num] dbname\n"
@@ -1567,15 +1636,15 @@ msgid ""
 "  -x num           internal use\n"
 msgstr ""
 "Использование:\n"
-"  postgres -boot [-d уровень] [-D дирданных] [-F] [-o файл] [-x номер] "
-"имябд\n"
+"  postgres -boot [-d уровень] [-D дирданных] [-F] [-o файл] [-x номер] имябд\n"
 "  -d 1-5           режим отладки\n"
 "  -D дирданных     директория с данными\n"
 "  -F               выключить fsync\n"
 "  -o файл          направить debug-вывод в файл\n"
 "  -x номер         для внутреннего использования\n"
 
-#: bootstrap/bootstrap.c:308 postmaster/postmaster.c:309
+#: bootstrap/bootstrap.c:307
+#: postmaster/postmaster.c:307
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -1590,177 +1659,271 @@ msgstr ""
 "окружения PGDATA.\n"
 "\n"
 
-#: bootstrap/bootstrap.c:408
+#: bootstrap/bootstrap.c:407
 #, c-format
 msgid "Unsupported XLOG op %d"
 msgstr ""
 
-#: bootstrap/bootstrap.c:511
+#: bootstrap/bootstrap.c:510
 #, c-format
 msgid "open relation %s, attrsize %d"
 msgstr ""
 
-#: bootstrap/bootstrap.c:527
+#: bootstrap/bootstrap.c:526
 #, c-format
 msgid "create attribute %d name %s len %d num %d type %u"
 msgstr ""
 
-#: bootstrap/bootstrap.c:546
+#: bootstrap/bootstrap.c:545
 #, c-format
 msgid "closerel: close of '%s' when '%s' was expected"
 msgstr ""
 
-#: bootstrap/bootstrap.c:550
+#: bootstrap/bootstrap.c:549
 #, c-format
 msgid "closerel: close of '%s' before any relation was opened"
 msgstr ""
 
-#: bootstrap/bootstrap.c:555
+#: bootstrap/bootstrap.c:554
 msgid "no open relation to close"
 msgstr ""
 
-#: bootstrap/bootstrap.c:558
+#: bootstrap/bootstrap.c:557
 #, c-format
 msgid "close relation %s"
 msgstr ""
 
-#: bootstrap/bootstrap.c:582
+#: bootstrap/bootstrap.c:581
 msgid "warning: no open relations allowed with 'create' command"
 msgstr ""
 
-#: bootstrap/bootstrap.c:591
+#: bootstrap/bootstrap.c:590
 #, c-format
 msgid "column %s %s"
 msgstr "колонка %s %s"
 
-#: bootstrap/bootstrap.c:681
+#: bootstrap/bootstrap.c:680
 #, c-format
 msgid "inserting row oid %u, %d columns"
 msgstr ""
 
-#: bootstrap/bootstrap.c:693
+#: bootstrap/bootstrap.c:692
 msgid "row inserted"
 msgstr "запись добавлена"
 
-#: bootstrap/bootstrap.c:715
+#: bootstrap/bootstrap.c:714
 #, c-format
 msgid "inserting column %d value '%s'"
 msgstr ""
 
-#: bootstrap/bootstrap.c:721
+#: bootstrap/bootstrap.c:720
 msgid "Typ != NULL"
 msgstr "Typ != NULL"
 
-#: bootstrap/bootstrap.c:728
+#: bootstrap/bootstrap.c:727
 #, c-format
 msgid "unable to find atttypid %u in Typ list"
 msgstr ""
 
-#: bootstrap/bootstrap.c:739 bootstrap/bootstrap.c:760
+#: bootstrap/bootstrap.c:738
+#: bootstrap/bootstrap.c:759
 #, c-format
 msgid " -> %s"
 msgstr " -> %s"
 
-#: bootstrap/bootstrap.c:750
+#: bootstrap/bootstrap.c:749
 #, c-format
 msgid "type oid %u not found"
 msgstr ""
 
-#: bootstrap/bootstrap.c:751
+#: bootstrap/bootstrap.c:750
 #, c-format
 msgid "Typ == NULL, typeindex = %u"
 msgstr "Typ == NULL, typeindex = %u"
 
-#: bootstrap/bootstrap.c:763
+#: bootstrap/bootstrap.c:762
 msgid "inserted"
 msgstr "добавлено"
 
-#: bootstrap/bootstrap.c:773
+#: bootstrap/bootstrap.c:772
 #, c-format
 msgid "inserting column %d NULL"
 msgstr ""
 
-#: bootstrap/bootstrap.c:820
+#: bootstrap/bootstrap.c:819
 msgid "Memory manager fault: cleanup called twice.\n"
 msgstr ""
 
-#: bootstrap/bootstrap.c:867
+#: bootstrap/bootstrap.c:866
 #, c-format
 msgid "external type: %s"
 msgstr "внешний тип: %s"
 
-#: bootstrap/bootstrap.c:891
+#: bootstrap/bootstrap.c:890
 #, c-format
 msgid "Error: unknown type '%s'.\n"
 msgstr "Ошибка: неизвестный тип '%s'.\n"
 
-#: bootstrap/bootstrap.c:907
+#: bootstrap/bootstrap.c:906
 msgid "AllocateAttribute: malloc failed"
 msgstr "AllocateAttribute: malloc не удался"
 
-#: bootstrap/bootstrap.c:1058
+#: bootstrap/bootstrap.c:1057
+msgid "There are too many string constants and identifiers for the compiler to handle."
+msgstr ""
+
+#: catalog/dependency.c:170
+#, 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:228
+#, c-format
+msgid "Failed to drop all objects depending on %s"
+msgstr ""
+
+#: catalog/dependency.c:322
+#: catalog/dependency.c:709
+#, c-format
+msgid "Cannot drop %s because it is required by the database system"
+msgstr ""
+
+#: catalog/dependency.c:326
+#, c-format
+msgid "findAutoDeletableObjects: unknown dependency type '%c' for %s"
+msgstr ""
+
+#: catalog/dependency.c:456
+#, c-format
 msgid ""
-"There are too many string constants and identifiers for the compiler to "
-"handle."
+"Cannot drop %s because %s requires it\n"
+"\tYou may drop %s instead"
+msgstr ""
+
+#: catalog/dependency.c:482
+#, c-format
+msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
+msgstr ""
+
+#: catalog/dependency.c:494
+#, c-format
+msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
+msgstr ""
+
+#: catalog/dependency.c:498
+#: catalog/dependency.c:713
+#, c-format
+msgid "recursiveDeletion: unknown dependency type '%c' for %s"
+msgstr ""
+
+#: catalog/dependency.c:524
+#: catalog/dependency.c:671
+#: catalog/dependency.c:696
+#, c-format
+msgid "Drop auto-cascades to %s"
+msgstr ""
+
+#: catalog/dependency.c:528
+#: catalog/dependency.c:675
+#, c-format
+msgid "%s depends on %s"
+msgstr ""
+
+#: catalog/dependency.c:534
+#: catalog/dependency.c:681
+#, c-format
+msgid "Drop cascades to %s"
+msgstr ""
+
+#: catalog/dependency.c:802
+#, c-format
+msgid "doDeletion: Unsupported object class %u"
 msgstr ""
 
-#: bootscanner.l:128
+#: catalog/dependency.c:885
 #, c-format
-msgid "syntax error at line %d: unexpected character %s"
-msgstr "ошибка синтаксиса в строке %d: неожидаемый символ %s"
+msgid "find_expr_references_walker: bogus varlevelsup %d"
+msgstr ""
 
-#: bootscanner.l:138
+#: catalog/dependency.c:889
 #, c-format
-msgid "syntax error at line %d: unexpected token %s"
-msgstr "ошибка синтаксиса в строке %d: неожидаемый токен %s"
+msgid "find_expr_references_walker: bogus varno %d"
+msgstr ""
 
-#: bootparse.y:59
-msgid "start transaction"
-msgstr "начало транзакции"
+#: catalog/dependency.c:909
+#, c-format
+msgid "find_expr_references_walker: bogus varattno %d"
+msgstr ""
 
-#: bootparse.y:67
-msgid "commit transaction"
-msgstr "подтверждение транзакции"
+#: catalog/dependency.c:949
+msgid "find_expr_references_walker: already-planned subqueries not supported"
+msgstr ""
 
-#: bootparse.y:158
+#: catalog/dependency.c:1285
 #, c-format
-msgid "creating%s%s relation %s..."
+msgid "getObjectClass: Unknown object class %u"
 msgstr ""
 
-#: bootparse.y:179
-msgid "create bootstrap: warning, open relation exists, closing first"
+#: catalog/dependency.c:1342
+#, c-format
+msgid "getObjectDescription: Cast %u does not exist"
 msgstr ""
 
-#: bootparse.y:189
-msgid "bootstrap relation created"
+#: catalog/dependency.c:1376
+#, c-format
+msgid "getObjectDescription: Constraint %u does not exist"
 msgstr ""
 
-#: bootparse.y:202
+#: catalog/dependency.c:1406
 #, c-format
-msgid "relation created with oid %u"
-msgstr "создан объект с OID %u"
+msgid "getObjectDescription: Conversion %u does not exist"
+msgstr ""
+
+#: catalog/dependency.c:1435
+#, c-format
+msgid "getObjectDescription: Default %u does not exist"
+msgstr ""
 
-#: bootparse.y:213
+#: catalog/dependency.c:1460
 #, c-format
-msgid "inserting row with oid %u..."
-msgstr "добавляется строка с OID %u..."
+msgid "getObjectDescription: Language %u does not exist"
+msgstr "getObjectDescription: Язык %u не существует"
 
-#: bootparse.y:215
-msgid "inserting row..."
-msgstr "добавляется строка..."
+#: catalog/dependency.c:1485
+#, c-format
+msgid "cache lookup of opclass %u failed"
+msgstr "поиск в кзше опкласса %u не удался"
 
-#: bootparse.y:221
+#: catalog/dependency.c:1503
+#: utils/adt/ruleutils.c:425
 #, c-format
-msgid "incorrect number of columns in row (expected %d, got %d)"
-msgstr "неверое число колонок в строке (ожидалось %d, получено %d)"
+msgid "syscache lookup for AM %u failed"
+msgstr "поиск в системном кзше AM %u не удался"
+
+#: catalog/dependency.c:1535
+#, c-format
+msgid "getObjectDescription: Rule %u does not exist"
+msgstr "getObjectDescription: Првило %u не существует"
+
+#: catalog/dependency.c:1569
+#, c-format
+msgid "getObjectDescription: Trigger %u does not exist"
+msgstr "getObjectDescription: Триггер %u не существует"
 
-#: bootparse.y:225
-msgid "relation not open"
-msgstr "объект не открыт"
+#: catalog/dependency.c:1589
+#, c-format
+msgid "getObjectDescription: Schema %u does not exist"
+msgstr "getObjectDescription: Схема %u не существует"
 
-#: bootparse.y:306
-msgid "too many columns"
-msgstr "слишком много колонок"
+#: catalog/dependency.c:1621
+#: catalog/heap.c:1663
+#: catalog/pg_constraint.c:445
+#: utils/adt/ruleutils.c:3131
+#, c-format
+msgid "cache lookup of relation %u failed"
+msgstr ""
 
 #: catalog/aclchk.c:60
 #, c-format
@@ -1802,9 +1965,13 @@ msgstr ""
 msgid "database \"%s\" not found"
 msgstr "база \"%s\" не найдена"
 
-#: catalog/aclchk.c:302 catalog/aclchk.c:474 catalog/pg_conversion.c:146
-#: commands/dbcommands.c:535 commands/user.c:911 tcop/utility.c:861
-#: utils/init/miscinit.c:615
+#: catalog/aclchk.c:302
+#: catalog/aclchk.c:474
+#: catalog/pg_conversion.c:146
+#: commands/dbcommands.c:535
+#: commands/user.c:911
+#: tcop/utility.c:827
+#: utils/init/miscinit.c:616
 msgid "permission denied"
 msgstr "доступ запрещён"
 
@@ -1813,7 +1980,9 @@ msgstr "доступ запрещён"
 msgid "invalid privilege type %s for function object"
 msgstr ""
 
-#: catalog/aclchk.c:389 parser/parse_func.c:885 parser/parse_func.c:1332
+#: catalog/aclchk.c:389
+#: parser/parse_func.c:891
+#: parser/parse_func.c:1366
 #, c-format
 msgid "function %u not found"
 msgstr "Функция %u не найдена"
@@ -1881,7 +2050,8 @@ msgstr ""
 msgid "aclcheck: found user %u/%d"
 msgstr ""
 
-#: catalog/aclchk.c:825 catalog/aclchk.c:846
+#: catalog/aclchk.c:825
+#: catalog/aclchk.c:846
 #, c-format
 msgid "aclcheck: found group %u/%d"
 msgstr ""
@@ -1891,7 +2061,8 @@ msgstr ""
 msgid "aclcheck: bogus ACL id type: %d"
 msgstr ""
 
-#: catalog/aclchk.c:879 commands/user.c:1304
+#: catalog/aclchk.c:879
+#: commands/user.c:1304
 #, c-format
 msgid "%s: permission denied"
 msgstr "%s: нет доступа"
@@ -1975,487 +2146,360 @@ msgstr ""
 msgid "pg_opclass_ownercheck: operator class %u not found"
 msgstr ""
 
-#: catalog/dependency.c:163
-#, c-format
-msgid ""
-"Cannot drop %s because other objects depend on it\n"
-"\tUse DROP ... CASCADE to drop the dependent objects too"
-msgstr ""
-
-#: catalog/dependency.c:253 catalog/dependency.c:572
-#, c-format
-msgid "Cannot drop %s because it is required by the database system"
-msgstr ""
-
-#: catalog/dependency.c:257
-#, c-format
-msgid "findAutoDeletableObjects: unknown dependency type '%c' for %s"
-msgstr ""
-
-#: catalog/dependency.c:386
-#, c-format
-msgid ""
-"Cannot drop %s because %s requires it\n"
-"\tYou may drop %s instead"
-msgstr ""
-
-#: catalog/dependency.c:412
-#, c-format
-msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
-msgstr ""
-
-#: catalog/dependency.c:424
-#, c-format
-msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
-msgstr ""
-
-#: catalog/dependency.c:428 catalog/dependency.c:576
-#, c-format
-msgid "recursiveDeletion: unknown dependency type '%c' for %s"
-msgstr ""
-
-#: catalog/dependency.c:454 catalog/dependency.c:532 catalog/dependency.c:558
-#, c-format
-msgid "Drop auto-cascades to %s"
-msgstr ""
-
-#: catalog/dependency.c:458 catalog/dependency.c:536
-#, c-format
-msgid "%s depends on %s"
-msgstr ""
-
-#: catalog/dependency.c:464 catalog/dependency.c:542
-#, c-format
-msgid "Drop cascades to %s"
-msgstr ""
-
-#: catalog/dependency.c:693
-#, c-format
-msgid "doDeletion: Unsupported object class %u"
-msgstr ""
-
-#: catalog/dependency.c:776
-#, c-format
-msgid "find_expr_references_walker: bogus varlevelsup %d"
-msgstr ""
-
-#: catalog/dependency.c:780
-#, c-format
-msgid "find_expr_references_walker: bogus varno %d"
-msgstr ""
-
-#: catalog/dependency.c:800
-#, c-format
-msgid "find_expr_references_walker: bogus varattno %d"
-msgstr ""
-
-#: catalog/dependency.c:844
-msgid "find_expr_references_walker: already-planned subqueries not supported"
-msgstr ""
-
-#: catalog/dependency.c:1180
-#, c-format
-msgid "getObjectClass: Unknown object class %u"
-msgstr ""
-
-#: catalog/dependency.c:1237
-#, c-format
-msgid "getObjectDescription: Cast %u does not exist"
-msgstr ""
-
-#: catalog/dependency.c:1271
-#, c-format
-msgid "getObjectDescription: Constraint %u does not exist"
+#: catalog/pg_aggregate.c:62
+msgid "no aggregate name supplied"
 msgstr ""
 
-#: catalog/dependency.c:1301
-#, c-format
-msgid "getObjectDescription: Conversion %u does not exist"
+#: catalog/pg_aggregate.c:65
+msgid "aggregate must have a transition function"
 msgstr ""
 
-#: catalog/dependency.c:1330
+#: catalog/pg_aggregate.c:87
 #, c-format
-msgid "getObjectDescription: Default %u does not exist"
+msgid "return type of transition function %s is not %s"
 msgstr ""
 
-#: catalog/dependency.c:1355
-#, c-format
-msgid "getObjectDescription: Language %u does not exist"
-msgstr "getObjectDescription: Язык %u не существует"
-
-#: catalog/dependency.c:1380
-#, c-format
-msgid "cache lookup of opclass %u failed"
-msgstr "поиск в кзше опкласса %u не удался"
-
-#: catalog/dependency.c:1398 utils/adt/ruleutils.c:425
-#, c-format
-msgid "syscache lookup for AM %u failed"
-msgstr "поиск в системном кзше AM %u не удался"
-
-#: catalog/dependency.c:1430
-#, c-format
-msgid "getObjectDescription: Rule %u does not exist"
-msgstr "getObjectDescription: Првило %u не существует"
-
-#: catalog/dependency.c:1464
-#, c-format
-msgid "getObjectDescription: Trigger %u does not exist"
-msgstr "getObjectDescription: Триггер %u не существует"
-
-#: catalog/dependency.c:1484
-#, c-format
-msgid "getObjectDescription: Schema %u does not exist"
-msgstr "getObjectDescription: Схема %u не существует"
-
-#: catalog/dependency.c:1516 catalog/heap.c:1660 catalog/pg_constraint.c:470
-#: utils/adt/ruleutils.c:3121
-#, c-format
-msgid "cache lookup of relation %u failed"
+#: catalog/pg_aggregate.c:99
+msgid "must not omit initval when transfn is strict and transtype is not compatible with input type"
 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"
+msgid "cannot create %s.%s: system catalog modifications are currently disallowed"
 msgstr ""
 
-#: catalog/heap.c:353
+#: catalog/heap.c:352
 #, c-format
 msgid "Number of columns is out of range (0 to %d)"
 msgstr "Число колонок вне диапазона (от 0 до %d)"
 
-#: catalog/heap.c:368
+#: catalog/heap.c:367
 #, c-format
 msgid "name of column \"%s\" conflicts with an existing system column"
 msgstr "имя колонки \"%s\" конфликтует с существующей системной колонкой"
 
-#: catalog/heap.c:382
+#: catalog/heap.c:381
 #, c-format
 msgid "column name \"%s\" is duplicated"
 msgstr "повторное имя колонки: \"%s\""
 
-#: catalog/heap.c:420
+#: catalog/heap.c:419
 #, c-format
 msgid ""
 "Attribute \"%s\" has an unknown type\n"
 "\tProceeding with relation creation anyway"
 msgstr ""
 
-#: catalog/heap.c:424
+#: catalog/heap.c:423
 #, c-format
 msgid "Attribute \"%s\" has pseudo-type %s"
 msgstr "Атрибут \"%s\" имеет псевдо-тип %s"
 
-#: catalog/heap.c:431
+#: catalog/heap.c:430
 #, c-format
 msgid "Attribute \"%s\" has composite type %s"
 msgstr "Атрибут \"%s\" имеет сложный тип %s"
 
-#: catalog/heap.c:714
+#: catalog/heap.c:712
 #, c-format
 msgid "Relation '%s' already exists"
 msgstr "Объект '%s' уже существует"
 
-#: catalog/heap.c:871
+#: catalog/heap.c:863
 #, c-format
 msgid "DeleteRelationTuple: cache lookup failed for relation %u"
 msgstr "DeleteRelationTuple: поиск в кэше связи %u не удался"
 
-#: catalog/heap.c:950
+#: catalog/heap.c:943
 #, c-format
 msgid "RemoveAttributeById: Failed to find attribute %d in relation %u"
 msgstr ""
 
-#: catalog/heap.c:1029
+#: catalog/heap.c:1034
 #, c-format
 msgid "RemoveAttrDefault: no default found for rel %u attnum %d"
 msgstr ""
 
-#: catalog/heap.c:1065
+#: catalog/heap.c:1070
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for attrdef %u"
 msgstr "RemoveAttrDefaultById: поиск в кэше attrdef %u не удался"
 
-#: catalog/heap.c:1088
+#: catalog/heap.c:1093
 #, c-format
 msgid "RemoveAttrDefaultById: cache lookup failed for rel %u attr %d"
 msgstr "RemoveAttrDefaultById: поиск в кэше для связи %u и attr %d не удался"
 
-#: catalog/heap.c:1143
+#: catalog/heap.c:1148
 #, c-format
 msgid "heap_drop_with_catalog: FlushRelationBuffers returned %d"
 msgstr "heap_drop_with_catalog: FlushRelationBuffers возвратила %d"
 
-#: catalog/heap.c:1264 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3278
+#: catalog/heap.c:1264
+#: parser/parse_relation.c:1503
+#: utils/adt/ruleutils.c:3288
 #, c-format
 msgid "cache lookup of attribute %d in relation %u failed"
 msgstr ""
 
-#: catalog/heap.c:1522 commands/tablecmds.c:2634 commands/tablecmds.c:2672
+#: catalog/heap.c:1521
+#: commands/tablecmds.c:2619
+#: commands/tablecmds.c:2655
 #, c-format
 msgid "constraint \"%s\" already exists for relation \"%s\""
 msgstr ""
 
-#: catalog/heap.c:1536 commands/tablecmds.c:206
+#: catalog/heap.c:1535
+#: commands/tablecmds.c:179
 #, c-format
 msgid "Duplicate CHECK constraint name: '%s'"
 msgstr ""
 
-#: catalog/heap.c:1596
+#: catalog/heap.c:1594
 #, c-format
 msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1603 commands/tablecmds.c:2754 commands/typecmds.c:1588
+#: catalog/heap.c:1601
+#: commands/tablecmds.c:2736
 msgid "cannot use subselect in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1605 commands/tablecmds.c:2756 commands/typecmds.c:1590
+#: catalog/heap.c:1603
+#: commands/tablecmds.c:2738
 msgid "cannot use aggregate function in CHECK constraint expression"
 msgstr ""
 
-#: catalog/heap.c:1715
+#: catalog/heap.c:1718
 msgid "cannot use column references in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1721
+#: catalog/heap.c:1724
 msgid "DEFAULT clause must not return a set"
 msgstr ""
 
-#: catalog/heap.c:1727
+#: catalog/heap.c:1730
 msgid "cannot use subselects in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1729
+#: catalog/heap.c:1732
 msgid "cannot use aggregate functions in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1750 rewrite/rewriteHandler.c:487
+#: catalog/heap.c:1753
+#: 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/index.c:124
+#: catalog/index.c:125
 #, c-format
 msgid "Function %u does not exist"
 msgstr "Функция %u не существует"
 
-#: catalog/index.c:143 catalog/index.c:280
+#: catalog/index.c:144
+#: catalog/index.c:281
 #, c-format
 msgid "Opclass %u does not exist"
 msgstr "Opclass %u не существует"
 
-#: catalog/index.c:157 catalog/index.c:293
+#: 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:543
+#: catalog/index.c:544
 msgid "must index at least one column"
 msgstr "покрайней мере одна колонка должна быть индексирована"
 
-#: catalog/index.c:548
+#: catalog/index.c:549
 msgid "User-defined indexes on system catalogs are not supported"
 msgstr "Пользовательские индексы на системные каталоги не поддерживаются"
 
-#: catalog/index.c:558
+#: catalog/index.c:559
 msgid "Shared indexes cannot be created after initdb"
 msgstr ""
 
-#: catalog/index.c:561
+#: catalog/index.c:562
 #, c-format
 msgid "relation named \"%s\" already exists"
 msgstr "объект с именем \"%s\" уже существует"
 
-#: catalog/index.c:674
+#: 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 "index_drop: поиск в кэше индекса %u не удался"
 
-#: catalog/index.c:837
+#: catalog/index.c:838
 #, c-format
 msgid "index_drop: FlushRelationBuffers returned %d"
 msgstr "index_drop: FlushRelationBuffers возвратила %d"
 
-#: catalog/index.c:1039
+#: catalog/index.c:1036
 #, c-format
 msgid "relation %s isn't an indexable relation"
 msgstr "объект %s не является индексируемым"
 
-#: catalog/index.c:1110
+#: catalog/index.c:1107
 #, c-format
 msgid "setRelhasindex: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1226
+#: catalog/index.c:1223
 #, c-format
 msgid "setNewRelfilenode: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1338
+#: catalog/index.c:1335
 #, c-format
 msgid "UpdateStats: cannot find relation %u in pg_class"
 msgstr ""
 
-#: catalog/index.c:1617
+#: catalog/index.c:1599
 msgid "IndexBuildHeapScan: concurrent insert in progress"
 msgstr ""
 
-#: catalog/index.c:1632
+#: catalog/index.c:1614
 msgid "IndexBuildHeapScan: concurrent delete in progress"
 msgstr ""
 
-#: catalog/index.c:1637 commands/vacuum.c:1207 commands/vacuumlazy.c:359
-#: commands/vacuumlazy.c:846
+#: catalog/index.c:1619
+#: commands/vacuum.c:1207
+#: commands/vacuumlazy.c:360
+#: commands/vacuumlazy.c:847
 msgid "Unexpected HeapTupleSatisfiesVacuum result"
 msgstr ""
 
-#: catalog/index.c:1725
+#: catalog/index.c:1706
 #, c-format
 msgid "IndexGetRelation: can't find index id %u"
 msgstr "IndexGetRelation: не получается найти индекс с id %u"
 
-#: catalog/index.c:1774
+#: catalog/index.c:1755
 msgid "reindex_index: can't open index relation"
 msgstr ""
 
-#: catalog/index.c:1785
+#: catalog/index.c:1766
 msgid "reindex_index: can't open heap relation"
 msgstr ""
 
-#: catalog/index.c:1799 catalog/index.c:1922
+#: catalog/index.c:1780
+#: catalog/index.c:1903
 #, c-format
 msgid "the target relation %u is shared"
 msgstr ""
 
-#: catalog/index.c:1805
+#: catalog/index.c:1786
 #, c-format
 msgid "the target relation %u is nailed"
 msgstr ""
 
-#: catalog/namespace.c:168 catalog/namespace.c:215 catalog/namespace.c:1153
-#: parser/parse_expr.c:845 parser/parse_target.c:147
+#: catalog/namespace.c:163
+#: catalog/namespace.c:210
+#: catalog/namespace.c:1067
+#: parser/parse_expr.c:826
+#: parser/parse_target.c:147
 msgid "Cross-database references are not implemented"
 msgstr ""
 
-#: catalog/namespace.c:186
+#: catalog/namespace.c:181
 #, c-format
 msgid "Relation \"%s\".\"%s\" does not exist"
 msgstr "Объект \"%s\".\"%s\" не существует"
 
-#: catalog/namespace.c:222
+#: catalog/namespace.c:217
 msgid "TEMP tables may not specify a namespace"
 msgstr ""
 
-#: catalog/namespace.c:236 catalog/namespace.c:1182 catalog/namespace.c:1217
-#: catalog/namespace.c:1802
+#: catalog/namespace.c:231
+#: catalog/namespace.c:1096
+#: catalog/namespace.c:1131
+#: catalog/namespace.c:1685
 #, c-format
 msgid "Namespace \"%s\" does not exist"
 msgstr ""
 
-#: catalog/namespace.c:246 catalog/namespace.c:1227
+#: catalog/namespace.c:241
+#: catalog/namespace.c:1141
 msgid "No namespace has been selected to create in"
 msgstr ""
 
-#: catalog/namespace.c:298
+#: catalog/namespace.c:293
 #, c-format
 msgid "Cache lookup failed for relation %u"
 msgstr "Поиск в кэше связи %u не удался"
 
-#: catalog/namespace.c:380
+#: catalog/namespace.c:375
 #, c-format
 msgid "Cache lookup failed for type %u"
 msgstr ""
 
-#: catalog/namespace.c:581
+#: catalog/namespace.c:576
 #, c-format
 msgid "Cache lookup failed for procedure %u"
 msgstr ""
 
-#: catalog/namespace.c:793
+#: catalog/namespace.c:788
 #, c-format
 msgid "Cache lookup failed for operator %u"
 msgstr "Поиск в кэше операторы %u не удался"
 
-#: catalog/namespace.c:1006
+#: catalog/namespace.c:1001
 #, c-format
 msgid "Cache lookup failed for opclass %u"
 msgstr "Поиск в кэше опкласса %u не удался"
 
-#: catalog/namespace.c:1087
-#, c-format
-msgid "Cache lookup failed for converions %u"
-msgstr "Поиск в кэше конверсии %u не удался"
-
-#: catalog/namespace.c:1156 gram.y:2291 gram.y:6839
+#: catalog/namespace.c:1070
 #, c-format
 msgid "Improper qualified name (too many dotted names): %s"
 msgstr ""
 
-#: catalog/namespace.c:1260
+#: catalog/namespace.c:1174
 msgid "Improper relation name (too many dotted names)"
 msgstr ""
 
-#: catalog/namespace.c:1472
+#: catalog/namespace.c:1386
 msgid "recomputeNamespacePath: invalid list syntax"
 msgstr ""
 
-#: catalog/namespace.c:1601
+#: catalog/namespace.c:1515
 #, c-format
 msgid "%s: not authorized to create temp tables"
 msgstr ""
 
-#: catalog/pg_aggregate.c:62
-msgid "no aggregate name supplied"
-msgstr ""
-
-#: catalog/pg_aggregate.c:65
-msgid "aggregate must have a transition function"
-msgstr ""
-
-#: catalog/pg_aggregate.c:87
+#: catalog/pg_largeobject.c:108
 #, c-format
-msgid "return type of transition function %s is not %s"
-msgstr ""
-
-#: catalog/pg_aggregate.c:99
-msgid ""
-"must not omit initval when transfn is strict and transtype is not compatible "
-"with input type"
-msgstr ""
+msgid "LargeObjectDrop: large object %u not found"
+msgstr "LargeObjectDrop: большой объект %u не найден"
 
-#: catalog/pg_constraint.c:437
+#: catalog/pg_constraint.c:413
 #, c-format
 msgid "RemoveConstraintById: constraint %u not found"
 msgstr ""
 
-#: catalog/pg_constraint.c:475
+#: catalog/pg_constraint.c:450
 #, c-format
 msgid "RemoveConstraintById: relation %s has relchecks = 0"
 msgstr ""
 
-#: catalog/pg_constraint.c:502
-#, c-format
-msgid "RemoveConstraintById: Constraint %u is not a known type"
-msgstr ""
-
 #: catalog/pg_conversion.c:57
 msgid "no conversion name supplied"
 msgstr ""
@@ -2470,7 +2514,8 @@ msgstr "конверсия с именем \"%s\" уже существует"
 msgid "default conversion for %s to %s already exists"
 msgstr ""
 
-#: catalog/pg_conversion.c:141 catalog/pg_conversion.c:308
+#: catalog/pg_conversion.c:141
+#: catalog/pg_conversion.c:308
 #, c-format
 msgid "Conversion %u search from syscache failed"
 msgstr ""
@@ -2480,16 +2525,12 @@ msgstr ""
 msgid "conversion %u does not exist"
 msgstr "конверсия %u не существует"
 
-#: catalog/pg_conversion.c:302 commands/conversioncmds.c:97
+#: catalog/pg_conversion.c:302
+#: commands/conversioncmds.c:97
 #, c-format
 msgid "conversion %s not found"
 msgstr ""
 
-#: catalog/pg_largeobject.c:108
-#, c-format
-msgid "LargeObjectDrop: large object %u not found"
-msgstr "LargeObjectDrop: большой объект %u не найден"
-
 #: catalog/pg_namespace.c:43
 msgid "no namespace name supplied"
 msgstr ""
@@ -2499,7 +2540,8 @@ msgstr ""
 msgid "namespace \"%s\" already exists"
 msgstr ""
 
-#: catalog/pg_operator.c:215 catalog/pg_operator.c:401
+#: catalog/pg_operator.c:215
+#: catalog/pg_operator.c:401
 #, c-format
 msgid "\"%s\" is not a valid operator name"
 msgstr "\"%s\" не является верным именем оператора"
@@ -2543,7 +2585,9 @@ msgstr ""
 msgid "OperatorDef: can't create operator shell \"%s\""
 msgstr ""
 
-#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1393
+#: catalog/pg_proc.c:86
+#: commands/functioncmds.c:140
+#: parser/parse_func.c:1427
 #, c-format
 msgid "functions cannot have more than %d arguments"
 msgstr "функции не могут иметь число аргументов более %d"
@@ -2607,11 +2651,10 @@ msgstr ""
 msgid "return type mismatch in function: declared to return %s, returns %s"
 msgstr ""
 
-#: catalog/pg_proc.c:421 catalog/pg_proc.c:447
+#: catalog/pg_proc.c:421
+#: catalog/pg_proc.c:447
 #, c-format
-msgid ""
-"function declared to return %s does not SELECT the right number of columns (%"
-"d)"
+msgid "function declared to return %s does not SELECT the right number of columns (%d)"
 msgstr ""
 
 #: catalog/pg_proc.c:430
@@ -2619,13 +2662,18 @@ msgstr ""
 msgid "function declared to return %s returns %s instead of %s at column %d"
 msgstr ""
 
-#: catalog/pg_proc.c:486 catalog/pg_proc.c:525 catalog/pg_proc.c:568
-#: commands/functioncmds.c:739 utils/adt/ruleutils.c:3163
+#: catalog/pg_proc.c:486
+#: catalog/pg_proc.c:525
+#: catalog/pg_proc.c:568
+#: commands/functioncmds.c:739
+#: utils/adt/ruleutils.c:3173
 #, c-format
 msgid "cache lookup of function %u failed"
 msgstr "поиск в кзше функции %u не удался"
 
-#: catalog/pg_proc.c:491 catalog/pg_proc.c:530 catalog/pg_proc.c:590
+#: catalog/pg_proc.c:491
+#: catalog/pg_proc.c:530
+#: catalog/pg_proc.c:590
 msgid "null prosrc"
 msgstr "null prosrc"
 
@@ -2648,58 +2696,31 @@ msgstr "SQL-функции не могут возвращать тип %s"
 msgid "SQL functions cannot have arguments of type %s"
 msgstr "SQL-функции не могут иметь аргументы типа %s"
 
-#: catalog/pg_type.c:171 catalog/pg_type.c:175
+#: catalog/pg_type.c:187
+#: catalog/pg_type.c:191
 #, c-format
 msgid "TypeCreate: invalid type internal size %d"
 msgstr ""
 
-#: catalog/pg_type.c:180
+#: catalog/pg_type.c:196
 msgid "TypeCreate: fixed size types must have storage PLAIN"
 msgstr ""
 
-#: catalog/pg_type.c:257
+#: catalog/pg_type.c:273
 #, c-format
 msgid "type %s already exists"
 msgstr "тип %s уже существует"
 
-#: catalog/pg_type.c:437
+#: catalog/pg_type.c:464
 #, c-format
 msgid "type %s does not exist"
 msgstr "тип %s не существует"
 
-#: catalog/pg_type.c:443
+#: catalog/pg_type.c:470
 #, c-format
 msgid "type named %s already exists"
 msgstr "тип %s уже существует"
 
-#: commands/analyze.c:199
-#, c-format
-msgid "Skipping \"%s\" --- only table or database owner can ANALYZE it"
-msgstr ""
-
-#: commands/analyze.c:213 commands/vacuum.c:784
-#, c-format
-msgid ""
-"Skipping \"%s\" --- can not process indexes, views or special system tables"
-msgstr ""
-"Пропускается \"%s\" --- индексы, виды илм специальные системные таблицы не "
-"обрабатываются"
-
-#: commands/analyze.c:242
-#, c-format
-msgid "Analyzing %s.%s"
-msgstr "Анализируется %s.%s"
-
-#: commands/analyze.c:431 utils/adt/ruleutils.c:2498
-#, c-format
-msgid "cache lookup of type %u failed"
-msgstr ""
-
-#: commands/analyze.c:638
-#, c-format
-msgid "acquire_sample_rows: ReadBuffer(%s,%u) failed"
-msgstr "acquire_sample_rows: ReadBuffer(%s,%u) не удался"
-
 #: commands/aggregatecmds.c:93
 #, c-format
 msgid "DefineAggregate: attribute \"%s\" not recognized"
@@ -2727,6 +2748,43 @@ msgstr ""
 msgid "RemoveAggregate: couldn't find pg_proc tuple for %s"
 msgstr ""
 
+#: commands/conversioncmds.c:58
+#, c-format
+msgid "Invalid for encoding name: %s"
+msgstr "Невернаое имя исходной кодировки (for): %s"
+
+#: commands/conversioncmds.c:62
+#, c-format
+msgid "Invalid to encoding name: %s"
+msgstr "Неверное имя кодировки назначения (to): %s"
+
+#: commands/analyze.c:199
+#, c-format
+msgid "Skipping \"%s\" --- only table or database owner can ANALYZE it"
+msgstr ""
+
+#: commands/analyze.c:213
+#: commands/vacuum.c:784
+#, c-format
+msgid "Skipping \"%s\" --- can not process indexes, views or special system tables"
+msgstr "Пропускается \"%s\" --- индексы, виды илм специальные системные таблицы не обрабатываются"
+
+#: commands/analyze.c:242
+#, c-format
+msgid "Analyzing %s.%s"
+msgstr "Анализируется %s.%s"
+
+#: commands/analyze.c:436
+#: utils/adt/ruleutils.c:2501
+#, c-format
+msgid "cache lookup of type %u failed"
+msgstr ""
+
+#: commands/analyze.c:646
+#, c-format
+msgid "acquire_sample_rows: ReadBuffer(%s,%u) failed"
+msgstr "acquire_sample_rows: ReadBuffer(%s,%u) не удался"
+
 #: commands/async.c:153
 #, c-format
 msgid "Async_Notify: %s"
@@ -2768,94 +2826,99 @@ msgstr ""
 msgid "AtCommit_Notify: done"
 msgstr "AtCommit_Notify: завершено"
 
-#: commands/async.c:621
+#: commands/async.c:631
 msgid "Async_NotifyHandler: perform async notify"
 msgstr ""
 
-#: commands/async.c:626
+#: commands/async.c:636
 msgid "Async_NotifyHandler: done"
 msgstr "Async_NotifyHandler: завершено"
 
-#: commands/async.c:693
+#: commands/async.c:710
 msgid "EnableNotifyInterrupt: perform async notify"
 msgstr ""
 
-#: commands/async.c:698
+#: commands/async.c:715
 msgid "EnableNotifyInterrupt: done"
 msgstr "EnableNotifyInterrupt: завершено"
 
-#: commands/async.c:749
+#: commands/async.c:766
 msgid "ProcessIncomingNotify"
 msgstr "ProcessIncomingNotify"
 
-#: commands/async.c:785
+#: commands/async.c:802
 #, c-format
 msgid "ProcessIncomingNotify: received %s from %d"
 msgstr "ProcessIncomingNotify: получено %s от %d"
 
-#: commands/async.c:820
+#: commands/async.c:837
 msgid "ProcessIncomingNotify: done"
 msgstr "ProcessIncomingNotify: завершено"
 
-#: commands/async.c:847
+#: commands/async.c:864
 #, c-format
 msgid "NOTIFY for %s"
 msgstr "NOTIFY для %s"
 
-#: commands/cluster.c:119
+#: commands/cluster.c:99
 #, c-format
-msgid "CLUSTER: You do not own relation %s"
+msgid "CLUSTER: cannot find index \"%s\" for table \"%s\""
 msgstr ""
 
-#: commands/cluster.c:137 commands/cluster.c:541 commands/cluster.c:560
+#: commands/cluster.c:109
 #, c-format
-msgid "Cache lookup failed for index %u"
-msgstr "Поиск в кэше индекса %u не удался"
+msgid "CLUSTER: \"%s\" is not an index for table \"%s\""
+msgstr ""
 
-#: commands/cluster.c:150
-#, c-format
-msgid "CLUSTER: No previously clustered index found on table \"%s\""
+#: commands/cluster.c:120
+msgid "CLUSTER: cannot cluster on partial index"
 msgstr ""
 
-#: commands/cluster.c:159
-#, c-format
-msgid "CLUSTER: cannot find index \"%s\" for table \"%s\""
+#: commands/cluster.c:132
+msgid "CLUSTER: cannot cluster on functional index when index access method does not handle nulls"
 msgstr ""
 
-#: commands/cluster.c:312
+#: commands/cluster.c:136
 #, c-format
-msgid "CLUSTER: \"%s\" is not an index for table \"%s\""
+msgid ""
+"CLUSTER: cannot cluster when index access method does not handle nulls\n"
+"\tYou may be able to work around this by marking column \"%s\" NOT NULL"
 msgstr ""
 
-#: commands/cluster.c:324
+#: commands/cluster.c:149
 #, c-format
 msgid "CLUSTER: cannot cluster system relation \"%s\""
 msgstr ""
 
-#: commands/cluster.c:332
-msgid "CLUSTER cannot be used on temp tables of other processes"
-msgstr ""
+#: commands/cluster.c:328
+#: commands/cluster.c:346
+#, c-format
+msgid "Cache lookup failed for index %u"
+msgstr "Поиск в кэше индекса %u не удался"
 
-#: commands/cluster.c:627
+#: commands/cluster.c:413
 #, c-format
 msgid "cache lookup failed for index %u"
 msgstr "поиск в кэше индекса %u не удался"
 
-#: commands/cluster.c:679 commands/cluster.c:686
+#: commands/cluster.c:465
+#: commands/cluster.c:472
 #, c-format
 msgid "CLUSTER: Cannot find tuple for relation %u"
 msgstr ""
 
-#: commands/cluster.c:698 commands/cluster.c:704
+#: commands/cluster.c:484
+#: commands/cluster.c:490
 #, c-format
 msgid "CLUSTER: FlushRelationBuffers returned %d"
 msgstr "CLUSTER: FlushRelationBuffers возвратила %d"
 
-#: commands/cluster.c:766
+#: commands/cluster.c:552
 msgid "CLUSTER: expected both swapped tables to have TOAST tables"
 msgstr ""
 
-#: commands/cluster.c:772 commands/cluster.c:777
+#: commands/cluster.c:558
+#: commands/cluster.c:563
 #, c-format
 msgid "CLUSTER: expected one dependency record for TOAST table, found %ld"
 msgstr ""
@@ -2889,11 +2952,18 @@ msgstr "объект \"%s\" не является видом"
 msgid "CommentAttribute: must specify relation.attribute"
 msgstr ""
 
-#: commands/comment.c:374 commands/tablecmds.c:1953 commands/tablecmds.c:2087
-#: commands/tablecmds.c:2205 commands/tablecmds.c:2422
-#: optimizer/prep/prepunion.c:802 parser/parse_func.c:1176
-#: parser/parse_relation.c:1551 parser/parse_relation.c:1614
-#: parser/parse_relation.c:1770 parser/parse_type.c:88
+#: commands/comment.c:374
+#: commands/tablecmds.c:1939
+#: commands/tablecmds.c:2073
+#: commands/tablecmds.c:2191
+#: commands/tablecmds.c:2408
+#: optimizer/prep/prepunion.c:812
+#: optimizer/prep/prepunion.c:938
+#: parser/parse_func.c:1210
+#: 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 "Связь \"%s\" не имеет колонки \"%s\""
@@ -2902,275 +2972,71 @@ msgstr "Связь \"%s\" не имеет колонки \"%s\""
 msgid "CommentDatabase: database name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:409 commands/dbcommands.c:531 utils/adt/acl.c:1038
+#: commands/comment.c:423
+#: commands/dbcommands.c:531
+#: utils/adt/acl.c:1039
 #, c-format
 msgid "database \"%s\" does not exist"
 msgstr "база данных \"%s\" не существует"
 
-#: commands/comment.c:414
-#, c-format
-msgid "you are not permitted to comment on database \"%s\""
+#: commands/comment.c:430
+msgid "Database comments may only be applied to the current database"
 msgstr ""
 
-#: commands/comment.c:419
-msgid "Database comments may only be applied to the current database"
+#: commands/comment.c:436
+#, c-format
+msgid "you are not permitted to comment on database \"%s\""
 msgstr ""
 
-#: commands/comment.c:442
+#: commands/comment.c:460
 msgid "CommentSchema: schema name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:449
+#: commands/comment.c:467
 #, c-format
 msgid "CommentSchema: Schema \"%s\" could not be found"
 msgstr "CommentSchema: Схема \"%s\" не найдена"
 
-#: commands/comment.c:521 commands/comment.c:555
+#: commands/comment.c:539
+#: commands/comment.c:573
 #, c-format
 msgid "rule \"%s\" does not exist"
 msgstr "правило \"%s\" не существует"
 
-#: commands/comment.c:527
+#: commands/comment.c:545
 #, c-format
 msgid ""
 "There are multiple rules \"%s\"\n"
 "\tPlease specify a relation name as well as a rule name"
 msgstr ""
 
-#: commands/comment.c:732
+#: commands/comment.c:750
 msgid "CommentTrigger: must specify relation and trigger"
 msgstr ""
 
-#: commands/comment.c:765
+#: commands/comment.c:783
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" does not exist"
 msgstr "триггер \"%s\" для связи \"%s\" не существует"
 
-#: commands/comment.c:807
+#: commands/comment.c:825
 msgid "CommentConstraint: must specify relation and constraint"
 msgstr ""
 
-#: commands/comment.c:841
+#: commands/comment.c:859
 #, c-format
 msgid "Relation \"%s\" has multiple constraints named \"%s\""
 msgstr ""
 
-#: commands/comment.c:851
+#: commands/comment.c:869
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" does not exist"
 msgstr ""
 
-#: commands/conversioncmds.c:58
-#, c-format
-msgid "Invalid for encoding name: %s"
-msgstr "Невернаое имя исходной кодировки (for): %s"
-
-#: commands/conversioncmds.c:62
-#, c-format
-msgid "Invalid to encoding name: %s"
-msgstr "Неверное имя кодировки назначения (to): %s"
-
-#: commands/copy.c:128
-#, c-format
-msgid "CopySendData: %m"
-msgstr "CopySendData: %m"
-
-#: commands/copy.c:303
-msgid "COPY: BINARY option appears more than once"
-msgstr ""
-
-#: commands/copy.c:310
-msgid "COPY: OIDS option appears more than once"
-msgstr ""
-
-#: commands/copy.c:317
-msgid "COPY: DELIMITER string may only be defined once in query"
-msgstr ""
-
-#: commands/copy.c:324
-msgid "COPY: NULL representation may only be defined once in query"
-msgstr ""
-
-#: commands/copy.c:329
-#, c-format
-msgid "COPY: option \"%s\" not recognized"
-msgstr ""
-
-#: commands/copy.c:334
-msgid "You can not specify the DELIMITER in BINARY mode."
-msgstr ""
-
-#: commands/copy.c:337
-msgid "You can not specify NULL in BINARY mode."
-msgstr ""
-
-#: commands/copy.c:357
-msgid ""
-"You must have Postgres superuser privilege to do a COPY directly to or from "
-"a file.  Anyone can COPY to stdout or from stdin.  Psql's \\copy command "
-"also works for anyone."
-msgstr ""
-
-#: commands/copy.c:366
-msgid "COPY BINARY is not supported to stdout or from stdin"
-msgstr ""
-
-#: commands/copy.c:372
-msgid "COPY delimiter must be a single character"
-msgstr ""
-
-#: commands/copy.c:378
-#, c-format
-msgid "COPY: table \"%s\" does not have OIDs"
-msgstr "COPY: таблица \"%s\" не содержит OIDs"
-
-#: commands/copy.c:399 commands/copy.c:444
-#, c-format
-msgid "You cannot copy view %s"
-msgstr "Вы не можете копировать вид %s"
-
-#: commands/copy.c:402
-#, c-format
-msgid "You cannot change sequence relation %s"
-msgstr ""
-
-#: commands/copy.c:405 commands/copy.c:450
-#, c-format
-msgid "You cannot copy object %s"
-msgstr "Вы не можете копировать объект %s"
-
-#: commands/copy.c:425
-#, c-format
-msgid ""
-"COPY command, running in backend with effective uid %d, could not open file "
-"'%s' for reading.  Errno = %s (%d)."
-msgstr ""
-"Команда COPY, выполняющаяся в backendе с эффективным UID %d, не смогла "
-"открыть файл '%s' для чтения.  Errno = %s (%d)."
-
-#: commands/copy.c:434 commands/copy.c:490
-#, c-format
-msgid "COPY: %s is a directory"
-msgstr "COPY: %s является директорией"
-
-#: commands/copy.c:447
-#, c-format
-msgid "You cannot copy sequence %s"
-msgstr ""
-
-#: commands/copy.c:474
-msgid "Relative path not allowed for server side COPY command"
-msgstr ""
-
-#: commands/copy.c:482
-#, c-format
-msgid ""
-"COPY command, running in backend with effective uid %d, could not open file "
-"'%s' for writing.  Errno = %s (%d)."
-msgstr ""
-"Команда COPY, выполняющаяся в backendе с эффективным UID %d, не смогла "
-"открыть файл '%s' для записи.  Errno = %s (%d)."
-
-#: commands/copy.c:561
-#, c-format
-msgid "COPY: couldn't lookup info for type %u"
-msgstr ""
-
-#: commands/copy.c:565 commands/copy.c:835
-msgid "COPY BINARY: cstring not supported"
-msgstr ""
-
-#: commands/copy.c:906
-msgid "COPY BINARY: file signature not recognized"
-msgstr ""
-
-#: commands/copy.c:910
-msgid "COPY BINARY: incompatible integer layout"
-msgstr ""
-
-#: commands/copy.c:914
-msgid "COPY BINARY: bogus file header (missing flags)"
-msgstr ""
-
-#: commands/copy.c:918
-msgid "COPY BINARY: unrecognized critical flags in header"
-msgstr ""
-
-#: commands/copy.c:922
-msgid "COPY BINARY: bogus file header (missing length)"
-msgstr ""
-
-#: commands/copy.c:928
-msgid "COPY BINARY: bogus file header (wrong length)"
-msgstr ""
-
-#: commands/copy.c:979
-msgid "NULL Oid"
-msgstr "NULL Oid"
-
-#: commands/copy.c:985
-msgid "Invalid Oid"
-msgstr "Неверный Oid"
-
-#: commands/copy.c:1002
-#, c-format
-msgid "Missing data for column \"%s\""
-msgstr "Отсутствуют данные для колонки \"%s\""
-
-#: commands/copy.c:1034
-msgid "Extra data after last expected column"
-msgstr ""
-
-#: commands/copy.c:1058
-#, c-format
-msgid "COPY BINARY: tuple field count is %d, expected %d"
-msgstr ""
-
-#: commands/copy.c:1065 commands/copy.c:1071 commands/copy.c:1086
-#: commands/copy.c:1100 commands/copy.c:1109 commands/copy.c:1121
-#: commands/copy.c:1136
-msgid "COPY BINARY: unexpected EOF"
-msgstr ""
-
-#: commands/copy.c:1067
-#, c-format
-msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
-msgstr ""
-
-#: commands/copy.c:1073
-msgid "COPY BINARY: Invalid Oid"
-msgstr ""
-
-#: commands/copy.c:1090
-#, c-format
-msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
-msgstr ""
-
-#: commands/copy.c:1102
-msgid "COPY BINARY: bogus varlena length"
-msgstr ""
-
-#: commands/copy.c:1284
-#, c-format
-msgid "GetInputFunction: Cache lookup of type %u failed"
-msgstr ""
-
-#: commands/copy.c:1300
-#, c-format
-msgid "GetTypeElement: Cache lookup of type %u failed"
-msgstr ""
-
-#: commands/copy.c:1442
-msgid "CopyReadAttribute: end of record marker corrupted"
-msgstr ""
-
-#: commands/copy.c:1594
-#, c-format
-msgid "Attribute \"%s\" specified more than once"
-msgstr "Атрибут \"%s\" указан более одного раза"
-
-#: commands/dbcommands.c:99 commands/dbcommands.c:105
-#: commands/dbcommands.c:111 commands/dbcommands.c:117
+#: commands/dbcommands.c:99
+#: commands/dbcommands.c:105
+#: commands/dbcommands.c:111
+#: commands/dbcommands.c:117
 msgid "CREATE DATABASE: conflicting options"
 msgstr ""
 
@@ -3193,11 +3059,13 @@ msgstr "%s не является верным именем кодировки"
 msgid "CREATE DATABASE: bogus encoding parameter"
 msgstr ""
 
-#: commands/dbcommands.c:164 commands/dbcommands.c:171
+#: commands/dbcommands.c:164
+#: commands/dbcommands.c:171
 msgid "CREATE DATABASE: permission denied"
 msgstr ""
 
-#: commands/dbcommands.c:186 commands/dbcommands.c:326
+#: commands/dbcommands.c:186
+#: commands/dbcommands.c:326
 #, c-format
 msgid "CREATE DATABASE: database \"%s\" already exists"
 msgstr ""
@@ -3214,15 +3082,15 @@ msgstr ""
 
 #: commands/dbcommands.c:227
 #, c-format
-msgid ""
-"CREATE DATABASE: source database \"%s\" is being accessed by other users"
+msgid "CREATE DATABASE: source database \"%s\" is being accessed by other users"
 msgstr ""
 
 #: commands/dbcommands.c:235
 msgid "CREATE DATABASE: invalid backend encoding"
 msgstr ""
 
-#: commands/dbcommands.c:263 commands/dbcommands.c:265
+#: commands/dbcommands.c:263
+#: commands/dbcommands.c:265
 #: commands/dbcommands.c:267
 msgid "database path may not contain single quotes"
 msgstr ""
@@ -3247,9 +3115,7 @@ msgid "CREATE DATABASE: could not initialize database directory"
 msgstr ""
 
 #: commands/dbcommands.c:312
-msgid ""
-"CREATE DATABASE: could not initialize database directory; delete failed as "
-"well"
+msgid "CREATE DATABASE: could not initialize database directory; delete failed as well"
 msgstr ""
 
 #: commands/dbcommands.c:402
@@ -3276,9 +3142,7 @@ msgstr ""
 
 #: commands/dbcommands.c:456
 #, c-format
-msgid ""
-"DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the "
-"contrary"
+msgid "DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the contrary"
 msgstr ""
 
 #: commands/dbcommands.c:700
@@ -3313,53 +3177,209 @@ msgstr ""
 msgid "database directory '%s' could not be removed"
 msgstr ""
 
-#: commands/dbcommands.c:830 commands/vacuum.c:581
+#: commands/dbcommands.c:830
+#: commands/vacuum.c:581
 #, c-format
 msgid "database %u does not exist"
 msgstr ""
 
-#: commands/define.c:68 commands/define.c:157 commands/define.c:185
-#: commands/define.c:215
+#: commands/copy.c:126
 #, c-format
-msgid "Define: \"%s\" requires a parameter"
+msgid "CopySendData: %m"
+msgstr "CopySendData: %m"
+
+#: commands/copy.c:301
+msgid "COPY: BINARY option appears more than once"
+msgstr ""
+
+#: commands/copy.c:308
+msgid "COPY: OIDS option appears more than once"
+msgstr ""
+
+#: commands/copy.c:315
+msgid "COPY: DELIMITER string may only be defined once in query"
 msgstr ""
 
-#: commands/define.c:93 commands/define.c:239
+#: commands/copy.c:322
+msgid "COPY: NULL representation may only be defined once in query"
+msgstr ""
+
+#: commands/copy.c:327
 #, c-format
-msgid "Define: cannot interpret argument of \"%s\""
+msgid "COPY: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/define.c:106 commands/define.c:115 commands/define.c:128
-#: commands/define.c:144
+#: commands/copy.c:332
+msgid "You can not specify the DELIMITER in BINARY mode."
+msgstr ""
+
+#: commands/copy.c:335
+msgid "You can not specify NULL in BINARY mode."
+msgstr ""
+
+#: commands/copy.c:355
+msgid "You must have Postgres superuser privilege to do a COPY directly to or from a file.  Anyone can COPY to stdout or from stdin.  Psql's \\copy command also works for anyone."
+msgstr ""
+
+#: commands/copy.c:364
+msgid "COPY BINARY is not supported to stdout or from stdin"
+msgstr ""
+
+#: commands/copy.c:370
+msgid "COPY delimiter must be a single character"
+msgstr ""
+
+#: commands/copy.c:376
 #, c-format
-msgid "Define: \"%s\" requires a numeric value"
+msgid "COPY: table \"%s\" does not have OIDs"
+msgstr "COPY: таблица \"%s\" не содержит OIDs"
+
+#: commands/copy.c:397
+#: commands/copy.c:442
+#, c-format
+msgid "You cannot copy view %s"
+msgstr "Вы не можете копировать вид %s"
+
+#: commands/copy.c:400
+#, c-format
+msgid "You cannot change sequence relation %s"
 msgstr ""
 
-#: commands/define.c:169
+#: commands/copy.c:403
+#: commands/copy.c:448
 #, c-format
-msgid "Define: argument of \"%s\" must be a name"
+msgid "You cannot copy object %s"
+msgstr "Вы не можете копировать объект %s"
+
+#: commands/copy.c:423
+#, c-format
+msgid "COPY command, running in backend with effective uid %d, could not open file '%s' for reading.  Errno = %s (%d)."
+msgstr "Команда COPY, выполняющаяся в backendе с эффективным UID %d, не смогла открыть файл '%s' для чтения.  Errno = %s (%d)."
+
+#: commands/copy.c:432
+#: commands/copy.c:488
+#, c-format
+msgid "COPY: %s is a directory"
+msgstr "COPY: %s является директорией"
+
+#: commands/copy.c:445
+#, c-format
+msgid "You cannot copy sequence %s"
 msgstr ""
 
-#: commands/define.c:201
+#: commands/copy.c:472
+msgid "Relative path not allowed for server side COPY command"
+msgstr ""
+
+#: commands/copy.c:480
 #, c-format
-msgid "Define: argument of \"%s\" must be a type name"
+msgid "COPY command, running in backend with effective uid %d, could not open file '%s' for writing.  Errno = %s (%d)."
+msgstr "Команда COPY, выполняющаяся в backendе с эффективным UID %d, не смогла открыть файл '%s' для записи.  Errno = %s (%d)."
+
+#: commands/copy.c:558
+#, c-format
+msgid "COPY: couldn't lookup info for type %u"
 msgstr ""
 
-#: commands/define.c:222
+#: commands/copy.c:562
+#: commands/copy.c:829
+msgid "COPY BINARY: cstring not supported"
+msgstr ""
+
+#: commands/copy.c:896
+msgid "COPY BINARY: file signature not recognized"
+msgstr ""
+
+#: commands/copy.c:900
+msgid "COPY BINARY: incompatible integer layout"
+msgstr ""
+
+#: commands/copy.c:904
+msgid "COPY BINARY: bogus file header (missing flags)"
+msgstr ""
+
+#: commands/copy.c:908
+msgid "COPY BINARY: unrecognized critical flags in header"
+msgstr ""
+
+#: commands/copy.c:912
+msgid "COPY BINARY: bogus file header (missing length)"
+msgstr ""
+
+#: commands/copy.c:918
+msgid "COPY BINARY: bogus file header (wrong length)"
+msgstr ""
+
+#: commands/copy.c:967
+msgid "NULL Oid"
+msgstr "NULL Oid"
+
+#: commands/copy.c:973
+msgid "Invalid Oid"
+msgstr "Неверный Oid"
+
+#: commands/copy.c:990
 #, c-format
-msgid "Define: \"%s\" requires an integral value"
+msgid "Missing data for column \"%s\""
+msgstr "Отсутствуют данные для колонки \"%s\""
+
+#: commands/copy.c:1034
+#: commands/copy.c:1043
+msgid "Extra data after last expected column"
 msgstr ""
 
-#: commands/define.c:242
+#: commands/copy.c:1068
 #, c-format
-msgid "Define: invalid argument for \"%s\": \"%s\""
-msgstr "Define: неверный аргумент для \"%s\": \"%s\""
+msgid "COPY BINARY: tuple field count is %d, expected %d"
+msgstr ""
+
+#: commands/copy.c:1075
+#: commands/copy.c:1081
+#: commands/copy.c:1096
+#: commands/copy.c:1110
+#: commands/copy.c:1119
+#: commands/copy.c:1131
+#: commands/copy.c:1146
+msgid "COPY BINARY: unexpected EOF"
+msgstr ""
 
-#: commands/explain.c:890
+#: commands/copy.c:1077
 #, c-format
-msgid "show_sort_keys: no tlist entry for key %d"
+msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
 msgstr ""
 
+#: commands/copy.c:1083
+msgid "COPY BINARY: Invalid Oid"
+msgstr ""
+
+#: commands/copy.c:1100
+#, c-format
+msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
+msgstr ""
+
+#: commands/copy.c:1112
+msgid "COPY BINARY: bogus varlena length"
+msgstr ""
+
+#: commands/copy.c:1288
+#, c-format
+msgid "GetInputFunction: Cache lookup of type %u failed"
+msgstr ""
+
+#: commands/copy.c:1304
+#, c-format
+msgid "GetTypeElement: Cache lookup of type %u failed"
+msgstr ""
+
+#: commands/copy.c:1446
+msgid "CopyReadAttribute: end of record marker corrupted"
+msgstr ""
+
+#: commands/copy.c:1605
+#, c-format
+msgid "Attribute \"%s\" specified more than once"
+msgstr "Атрибут \"%s\" указан более одного раза"
+
 #: commands/functioncmds.c:81
 #, c-format
 msgid "SQL function cannot return shell type \"%s\""
@@ -3370,11 +3390,16 @@ msgstr "SQL-функции не могут возвращать тип shell \"%s\""
 msgid "Return type \"%s\" is only a shell"
 msgstr ""
 
-#: commands/functioncmds.c:103 commands/functioncmds.c:159
-#: commands/typecmds.c:345 commands/typecmds.c:352 commands/typecmds.c:689
-#: commands/typecmds.c:933 commands/typecmds.c:1052 commands/typecmds.c:1177
-#: commands/typecmds.c:1264 parser/parse_func.c:1403 parser/parse_oper.c:98
-#: parser/parse_oper.c:107 parser/parse_type.c:191 parser/parse_type.c:213
+#: commands/functioncmds.c:103
+#: commands/functioncmds.c:159
+#: commands/typecmds.c:322
+#: commands/typecmds.c:329
+#: commands/typecmds.c:647
+#: parser/parse_func.c:1437
+#: 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"
@@ -3404,8 +3429,10 @@ msgstr "Тип аргумента \"%s\" только shell"
 msgid "Functions cannot accept set arguments"
 msgstr "Функции не принимают аргументы-множества (set)"
 
-#: commands/functioncmds.c:200 commands/functioncmds.c:206
-#: commands/functioncmds.c:212 commands/functioncmds.c:218
+#: commands/functioncmds.c:200
+#: commands/functioncmds.c:206
+#: commands/functioncmds.c:212
+#: commands/functioncmds.c:218
 #: commands/functioncmds.c:224
 msgid "conflicting or redundant options"
 msgstr ""
@@ -3436,7 +3463,8 @@ msgstr ""
 msgid "CREATE FUNCTION: only one AS item needed for %s language"
 msgstr ""
 
-#: commands/functioncmds.c:399 utils/adt/acl.c:1442
+#: commands/functioncmds.c:399
+#: utils/adt/acl.c:1443
 #, c-format
 msgid "language \"%s\" does not exist"
 msgstr "язык \"%s\" не существует"
@@ -3488,12 +3516,14 @@ msgstr ""
 msgid "SetFunctionArgType: function %u doesn't take OPAQUE"
 msgstr ""
 
-#: commands/functioncmds.c:693 commands/functioncmds.c:884
+#: commands/functioncmds.c:693
+#: commands/functioncmds.c:891
 #, c-format
 msgid "source data type %s does not exist"
 msgstr "исходный тип данных %s не существует"
 
-#: commands/functioncmds.c:698 commands/functioncmds.c:889
+#: commands/functioncmds.c:698
+#: commands/functioncmds.c:896
 #, c-format
 msgid "target data type %s does not exist"
 msgstr "тип данных назначения %s не существует"
@@ -3522,7 +3552,8 @@ msgstr ""
 msgid "target data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:723 commands/functioncmds.c:904
+#: commands/functioncmds.c:723
+#: commands/functioncmds.c:911
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr ""
@@ -3539,46 +3570,169 @@ msgstr ""
 msgid "return data type of cast function must match target data type"
 msgstr ""
 
-#: commands/functioncmds.c:749
+#: commands/functioncmds.c:755
 msgid "cast function must not be volatile"
 msgstr ""
 
-#: commands/functioncmds.c:751
+#: commands/functioncmds.c:758
 msgid "cast function must not be an aggregate function"
 msgstr ""
 
-#: commands/functioncmds.c:753
+#: commands/functioncmds.c:760
 msgid "cast function must not return a set"
 msgstr ""
 
-#: commands/functioncmds.c:774
+#: commands/functioncmds.c:781
 msgid "Must be superuser to create a cast WITHOUT FUNCTION"
 msgstr ""
 
-#: commands/functioncmds.c:787
+#: commands/functioncmds.c:794
 msgid "source and target datatypes are not physically compatible"
 msgstr ""
 
-#: commands/functioncmds.c:803
+#: commands/functioncmds.c:810
 #, c-format
 msgid "CreateCast: bogus CoercionContext %c"
 msgstr ""
 
-#: commands/functioncmds.c:820
+#: commands/functioncmds.c:827
 #, c-format
 msgid "cast from data type %s to data type %s already exists"
 msgstr ""
 
-#: commands/functioncmds.c:897
+#: commands/functioncmds.c:904
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "конверсия типа %s в тип %s не существует"
 
-#: commands/functioncmds.c:940
+#: commands/functioncmds.c:947
 #, c-format
 msgid "could not find tuple for cast %u"
 msgstr ""
 
+#: 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: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:144
+#, c-format
+msgid "Define: \"%s\" requires a numeric value"
+msgstr ""
+
+#: commands/define.c:169
+#, c-format
+msgid "Define: argument of \"%s\" must be a name"
+msgstr ""
+
+#: commands/define.c:201
+#, c-format
+msgid "Define: argument of \"%s\" must be a type name"
+msgstr ""
+
+#: commands/define.c:222
+#, c-format
+msgid "Define: \"%s\" requires an integral value"
+msgstr ""
+
+#: commands/define.c:242
+#, c-format
+msgid "Define: invalid argument for \"%s\": \"%s\""
+msgstr "Define: неверный аргумент для \"%s\": \"%s\""
+
+#: commands/explain.c:818
+#, c-format
+msgid "show_sort_keys: no tlist entry for key %d"
+msgstr ""
+
+#: commands/opclasscmds.c:88
+#, c-format
+msgid "DefineOpClass: access method \"%s\" not found"
+msgstr ""
+
+#: 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:153
+#, c-format
+msgid "DefineOpClass: operator number %d appears more than once"
+msgstr ""
+
+#: commands/opclasscmds.c:170
+#, c-format
+msgid "DefineOpClass: Operator '%s' for types '%s' and '%s' does not exist"
+msgstr ""
+
+#: commands/opclasscmds.c:186
+#, c-format
+msgid "DefineOpClass: invalid procedure number %d, must be between 1 and %d"
+msgstr ""
+
+#: commands/opclasscmds.c:190
+#, c-format
+msgid "DefineOpClass: procedure number %d appears more than once"
+msgstr ""
+
+#: commands/opclasscmds.c:203
+msgid "DefineOpClass: storage type specified more than once"
+msgstr ""
+
+#: commands/opclasscmds.c:207
+#, c-format
+msgid "DefineOpClass: bogus item type %d"
+msgstr ""
+
+#: commands/opclasscmds.c:229
+#, c-format
+msgid "Storage type may not be different from datatype for access method %s"
+msgstr ""
+
+#: commands/opclasscmds.c:245
+#, c-format
+msgid "Operator class \"%s\" already exists for access method \"%s\""
+msgstr ""
+
+#: 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:477
+#, c-format
+msgid "RemoveOpClass: access method \"%s\" not found"
+msgstr ""
+
+#: 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:556
+#, c-format
+msgid "RemoveOpClassById: couldn't find pg_class entry %u"
+msgstr ""
+
 #: commands/indexcmds.c:92
 msgid "DefineIndex: must specify at least one attribute"
 msgstr ""
@@ -3634,10 +3788,11 @@ msgid "Cannot use aggregate in index predicate"
 msgstr ""
 
 #: commands/indexcmds.c:261
-msgid "Functions in index predicate must be marked isImmutable"
+msgid "Functions in index predicate must be marked IMMUTABLE"
 msgstr ""
 
-#: commands/indexcmds.c:299 commands/indexcmds.c:389
+#: commands/indexcmds.c:299
+#: commands/indexcmds.c:389
 #, c-format
 msgid "DefineIndex: attribute \"%s\" not found"
 msgstr ""
@@ -3657,7 +3812,7 @@ msgid "DefineIndex: cannot index on a function returning a set"
 msgstr ""
 
 #: commands/indexcmds.c:350
-msgid "DefineIndex: index function must be marked isImmutable"
+msgid "DefineIndex: index function must be marked IMMUTABLE"
 msgstr ""
 
 #: commands/indexcmds.c:385
@@ -3672,10 +3827,10 @@ msgid ""
 "\tdefault operator class for the data type"
 msgstr ""
 
-#: commands/indexcmds.c:449 commands/indexcmds.c:457
+#: commands/indexcmds.c:449
+#: commands/indexcmds.c:457
 #, c-format
-msgid ""
-"DefineIndex: operator class \"%s\" not supported by access method \"%s\""
+msgid "DefineIndex: operator class \"%s\" not supported by access method \"%s\""
 msgstr ""
 
 #: commands/indexcmds.c:468
@@ -3688,7 +3843,9 @@ msgstr ""
 msgid "pg_opclass contains multiple default opclasses for data type %s"
 msgstr ""
 
-#: commands/indexcmds.c:544 commands/indexcmds.c:576 commands/indexcmds.c:619
+#: commands/indexcmds.c:544
+#: commands/indexcmds.c:576
+#: commands/indexcmds.c:619
 #, c-format
 msgid "relation \"%s\" is of type \"%c\""
 msgstr ""
@@ -3700,16 +3857,12 @@ msgstr ""
 
 #: commands/indexcmds.c:584
 #, c-format
-msgid ""
-"\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
-"options"
+msgid "\"%s\" is a system index. call REINDEX under standalone postgres with -O -P options"
 msgstr ""
 
 #: commands/indexcmds.c:587
 #, c-format
-msgid ""
-"\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
-"options"
+msgid "\"%s\" is a system index. call REINDEX under standalone postgres with -P -O options"
 msgstr ""
 
 #: commands/indexcmds.c:602
@@ -3748,80 +3901,64 @@ msgstr ""
 msgid "LOCK TABLE: %s is not a table"
 msgstr ""
 
-#: commands/opclasscmds.c:88
-#, c-format
-msgid "DefineOpClass: access method \"%s\" not found"
-msgstr ""
-
-#: commands/opclasscmds.c:107
-msgid "Must be superuser to create an operator class"
-msgstr ""
-
-#: commands/opclasscmds.c:146
-#, c-format
-msgid "DefineOpClass: invalid operator number %d, must be between 1 and %d"
-msgstr ""
-
-#: commands/opclasscmds.c:150
-#, c-format
-msgid "DefineOpClass: operator number %d appears more than once"
-msgstr ""
-
-#: commands/opclasscmds.c:167
+#: commands/vacuum.c:1044
+#: commands/vacuumlazy.c:211
 #, c-format
-msgid "DefineOpClass: Operator '%s' for types '%s' and '%s' does not exist"
+msgid "--Relation %s.%s--"
 msgstr ""
 
-#: commands/opclasscmds.c:183
+#: commands/vacuum.c:1078
+#: commands/vacuumlazy.c:269
 #, c-format
-msgid "DefineOpClass: invalid procedure number %d, must be between 1 and %d"
+msgid "Rel %s: Uninitialized page %u - fixing"
 msgstr ""
 
-#: commands/opclasscmds.c:187
+#: commands/vacuum.c:1220
+#: commands/vacuumlazy.c:373
 #, c-format
-msgid "DefineOpClass: procedure number %d appears more than once"
-msgstr ""
-
-#: commands/opclasscmds.c:200
-msgid "DefineOpClass: storage type specified more than once"
+msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
 msgstr ""
 
-#: commands/opclasscmds.c:204
+#: commands/vacuumlazy.c:435
 #, c-format
-msgid "DefineOpClass: bogus item type %d"
+msgid ""
+"Pages %u: Changed %u, Empty %u; Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n"
+"\tTotal %s"
 msgstr ""
 
-#: commands/opclasscmds.c:226
+#: commands/vacuumlazy.c:485
 #, c-format
-msgid "Storage type may not be different from datatype for access method %s"
+msgid ""
+"Removed %d tuples in %d pages.\n"
+"\t%s"
 msgstr ""
 
-#: commands/opclasscmds.c:242
+#: commands/vacuum.c:2622
+#: commands/vacuumlazy.c:600
 #, c-format
-msgid "Operator class \"%s\" already exists for access method \"%s\""
+msgid ""
+"Index %s: Pages %u; Tuples %.0f.\n"
+"\t%s"
 msgstr ""
 
-#: commands/opclasscmds.c:266
+#: commands/vacuum.c:2676
+#: commands/vacuumlazy.c:647
 #, c-format
 msgid ""
-"Can't add class \"%s\" as default for type %s\n"
-"\tclass \"%s\" already is the default"
+"Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
+"\t%s"
 msgstr ""
 
-#: commands/opclasscmds.c:474
+#: commands/vacuumlazy.c:721
 #, c-format
-msgid "RemoveOpClass: access method \"%s\" not found"
+msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/opclasscmds.c:501 commands/opclasscmds.c:509
+#: commands/vacuumlazy.c:756
 #, c-format
 msgid ""
-"RemoveOpClass: operator class \"%s\" not supported by access method \"%s\""
-msgstr ""
-
-#: commands/opclasscmds.c:553
-#, c-format
-msgid "RemoveOpClassById: couldn't find pg_class entry %u"
+"Truncated %u --> %u pages.\n"
+"\t%s"
 msgstr ""
 
 #: commands/operatorcmds.c:103
@@ -3860,57 +3997,57 @@ msgstr "PerformPortalFetch: отсутствует имя портала"
 msgid "PerformPortalFetch: portal \"%s\" not found"
 msgstr ""
 
-#: commands/portalcmds.c:243
+#: commands/portalcmds.c:201
 msgid "PerformPortalClose: missing portal name"
 msgstr "PerformPortalClose: отсутствует имя портала"
 
-#: commands/portalcmds.c:253
+#: commands/portalcmds.c:211
 #, c-format
 msgid "PerformPortalClose: portal \"%s\" not found"
 msgstr ""
 
-#: commands/prepare.c:65
+#: commands/prepare.c:66
 msgid "No statement name given"
 msgstr "Не указано имя команды"
 
-#: commands/prepare.c:68
+#: commands/prepare.c:69
 msgid "Utility statements cannot be prepared"
 msgstr ""
 
-#: commands/prepare.c:122
+#: commands/prepare.c:117
 msgid "ExecuteQuery: wrong number of arguments"
 msgstr "ExecuteQuery: неверное число аргументов"
 
-#: commands/prepare.c:172
+#: commands/prepare.c:168
 msgid "INTO clause specified for non-SELECT query"
 msgstr ""
 
-#: commands/prepare.c:223
+#: commands/prepare.c:211
 msgid "InitQueryHashTable: unable to create hash table"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:253
+#: commands/prepare.c:241
 #, c-format
 msgid "Prepared statement with name \"%s\" already exists"
 msgstr "Заготовленная команда с именем \"%s\" уже существует"
 
-#: commands/prepare.c:283
+#: commands/prepare.c:271
 #, c-format
 msgid "Unable to store prepared statement \"%s\"!"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/prepare.c:309 commands/prepare.c:326 commands/prepare.c:364
-#: commands/prepare.c:388
+#: 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:61
-msgid ""
-"Only users with superuser privilege are permitted to create procedural "
-"languages"
+msgid "Only users with superuser privilege are permitted to create procedural languages"
 msgstr ""
 
 #: commands/proclang.c:73
@@ -3925,9 +4062,7 @@ msgstr "функция %s() не существует"
 
 #: commands/proclang.c:94
 #, c-format
-msgid ""
-"CreateProceduralLanguage: changing return type of function %s() from OPAQUE "
-"to LANGUAGE_HANDLER"
+msgid "CreateProceduralLanguage: changing return type of function %s() from OPAQUE to LANGUAGE_HANDLER"
 msgstr ""
 
 #: commands/proclang.c:99
@@ -3941,9 +4076,7 @@ msgid "function %s(oid) doesn't exist"
 msgstr "функция %s(oid) не существует"
 
 #: commands/proclang.c:183
-msgid ""
-"Only users with superuser privilege are permitted to drop procedural "
-"languages"
+msgid "Only users with superuser privilege are permitted to drop procedural languages"
 msgstr ""
 
 #: commands/proclang.c:196
@@ -3965,9 +4098,7 @@ msgstr ""
 
 #: commands/schemacmds.c:92
 #, c-format
-msgid ""
-"CREATE SCHEMA: Illegal schema name: \"%s\" -- pg_ is reserved for system "
-"schemas"
+msgid "CREATE SCHEMA: Illegal schema name: \"%s\" -- pg_ is reserved for system schemas"
 msgstr ""
 
 #: commands/schemacmds.c:162
@@ -3984,531 +4115,539 @@ msgstr "Схема \"%s\" не существует"
 msgid "RemoveSchemaById: schema %u not found"
 msgstr ""
 
-#: commands/sequence.c:208
+#: commands/sequence.c:207
 msgid "DefineSequence: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:335
+#: commands/sequence.c:334
 #, c-format
 msgid "%s.nextval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:410
+#: commands/sequence.c:409
 #, c-format
 msgid "%s.nextval: reached MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:431
+#: commands/sequence.c:430
 #, c-format
 msgid "%s.nextval: reached MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:521
+#: commands/sequence.c:520
 #, c-format
 msgid "%s.currval: you don't have permissions to read sequence %s"
 msgstr ""
 
-#: commands/sequence.c:525
+#: commands/sequence.c:524
 #, c-format
 msgid "%s.currval is not yet defined in this session"
 msgstr ""
 
-#: commands/sequence.c:560
+#: commands/sequence.c:559
 #, c-format
 msgid "%s.setval: you don't have permissions to set sequence %s"
 msgstr ""
 
-#: commands/sequence.c:575
+#: commands/sequence.c:574
 #, c-format
 msgid "%s.setval: value %s is out of bounds (%s,%s)"
 msgstr ""
 
-#: commands/sequence.c:701
+#: commands/sequence.c:700
 #, c-format
 msgid "%s.%s: %s is not a sequence"
 msgstr ""
 
-#: commands/sequence.c:719
+#: commands/sequence.c:718
 msgid "Memory exhausted in init_sequence"
 msgstr ""
 
-#: commands/sequence.c:747
+#: commands/sequence.c:746
 #, c-format
 msgid "%s.%s: invalid number of blocks in sequence"
 msgstr ""
 
-#: commands/sequence.c:752
+#: commands/sequence.c:751
 #, c-format
 msgid "%s.%s: ReadBuffer failed"
 msgstr ""
 
-#: commands/sequence.c:761
+#: commands/sequence.c:760
 #, c-format
 msgid "%s.%s: bad magic (%08X)"
 msgstr ""
 
-#: commands/sequence.c:804
+#: commands/sequence.c:803
+msgid "DefineSequence: CYCLE ??"
+msgstr ""
+
+#: commands/sequence.c:807
 #, c-format
 msgid "DefineSequence: option \"%s\" not recognized"
 msgstr ""
 
-#: commands/sequence.c:811
+#: commands/sequence.c:814
 msgid "DefineSequence: can't INCREMENT by 0"
 msgstr ""
 
-#: commands/sequence.c:840
+#: commands/sequence.c:843
 #, c-format
 msgid "DefineSequence: MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:861
+#: commands/sequence.c:864
 #, c-format
 msgid "DefineSequence: START value (%s) can't be less than MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:871
+#: commands/sequence.c:874
 #, c-format
 msgid "DefineSequence: START value (%s) can't be greater than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:882
+#: commands/sequence.c:885
 #, c-format
 msgid "DefineSequence: CACHE (%s) can't be <= 0"
 msgstr ""
 
-#: commands/sequence.c:902
+#: commands/sequence.c:905
 #, c-format
 msgid "seq_redo: unknown op code %u"
 msgstr ""
 
-#: commands/sequence.c:910
+#: commands/sequence.c:913
 #, c-format
 msgid "seq_redo: can't read block of %u/%u"
 msgstr ""
 
-#: commands/sequence.c:926
+#: commands/sequence.c:929
 msgid "seq_redo: failed to add item to page"
 msgstr ""
 
-#: commands/tablecmds.c:149
-msgid "ON COMMIT can only be used on TEMP tables"
-msgstr ""
-
-#: commands/tablecmds.c:379
+#: commands/tablecmds.c:355
 #, c-format
 msgid "TRUNCATE cannot be used on sequences. '%s' is a sequence"
 msgstr ""
 
-#: commands/tablecmds.c:382
+#: commands/tablecmds.c:358
 #, c-format
 msgid "TRUNCATE cannot be used on views. '%s' is a view"
 msgstr ""
 
-#: commands/tablecmds.c:385
+#: commands/tablecmds.c:361
 #, c-format
 msgid "TRUNCATE can only be used on tables. '%s' is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:391
+#: commands/tablecmds.c:367
 #, c-format
 msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
 msgstr ""
 
-#: commands/tablecmds.c:402
+#: commands/tablecmds.c:388
 msgid "TRUNCATE cannot be used on temp tables of other processes"
 msgstr ""
 
-#: commands/tablecmds.c:426
+#: commands/tablecmds.c:412
 #, c-format
-msgid ""
-"TRUNCATE cannot be used as table %s references this one via foreign key "
-"constraint %s"
+msgid "TRUNCATE cannot be used as table %s references this one via foreign key constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:537
+#: commands/tablecmds.c:522
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:560
+#: commands/tablecmds.c:545
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:564
+#: commands/tablecmds.c:549
 #, c-format
 msgid "CREATE TABLE: cannot inherit from temp relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:579
+#: commands/tablecmds.c:564
 #, c-format
 msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:631
+#: commands/tablecmds.c:617
 #, c-format
-msgid ""
-"CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
+msgid "CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:636
+#: commands/tablecmds.c:622
 #, c-format
 msgid "CREATE TABLE: inherited attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:782
+#: commands/tablecmds.c:768
 #, c-format
 msgid "CREATE TABLE: merging attribute \"%s\" with inherited definition"
 msgstr ""
 
-#: commands/tablecmds.c:787
+#: commands/tablecmds.c:773
 #, c-format
 msgid "CREATE TABLE: attribute \"%s\" type conflict (%s and %s)"
 msgstr ""
 
-#: commands/tablecmds.c:825
+#: commands/tablecmds.c:811
 #, c-format
 msgid ""
 "CREATE TABLE: attribute \"%s\" inherits conflicting default values\n"
 "\tTo resolve the conflict, specify a default explicitly"
 msgstr ""
 
-#: commands/tablecmds.c:1069
+#: commands/tablecmds.c:1055
 #, c-format
 msgid "setRelhassubclassInRelation: cache lookup failed for relation %u"
 msgstr ""
 
-#: commands/tablecmds.c:1124
+#: commands/tablecmds.c:1110
 #, c-format
 msgid "renameatt: class \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1170
+#: commands/tablecmds.c:1156
 #, c-format
 msgid "Inherited attribute \"%s\" must be renamed in child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1178
+#: commands/tablecmds.c:1164
 #, c-format
 msgid "renameatt: attribute \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1183
+#: commands/tablecmds.c:1169
 #, c-format
 msgid "renameatt: system attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1191
+#: commands/tablecmds.c:1177
 #, c-format
 msgid "renameatt: inherited attribute \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1200
+#: commands/tablecmds.c:1186
 #, c-format
 msgid "renameatt: attribute \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1230
+#: commands/tablecmds.c:1216
 #, c-format
 msgid "renameatt: can't find index id %u"
 msgstr ""
 
-#: commands/tablecmds.c:1315
+#: commands/tablecmds.c:1301
 #, c-format
 msgid "renamerel: system relation \"%s\" may not be renamed"
 msgstr ""
 
-#: commands/tablecmds.c:1331
+#: commands/tablecmds.c:1317
 #, c-format
 msgid "renamerel: relation \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:1335
+#: commands/tablecmds.c:1321
 #, c-format
 msgid "renamerel: relation \"%s\" exists"
 msgstr ""
 
-#: commands/tablecmds.c:1633 commands/tablecmds.c:1908
-#: commands/tablecmds.c:2042 commands/tablecmds.c:2257
-#: commands/tablecmds.c:2406 commands/tablecmds.c:2576
-#: commands/tablecmds.c:3535 commands/tablecmds.c:3710
+#: commands/tablecmds.c:1619
+#: commands/tablecmds.c:1894
+#: commands/tablecmds.c:2028
+#: commands/tablecmds.c:2243
+#: commands/tablecmds.c:2392
+#: commands/tablecmds.c:2562
+#: commands/tablecmds.c:3524
+#: commands/tablecmds.c:3699
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:1644 commands/tablecmds.c:1913
-#: commands/tablecmds.c:2047 commands/tablecmds.c:2165
-#: commands/tablecmds.c:2264 commands/tablecmds.c:2411
-#: commands/tablecmds.c:2581 commands/tablecmds.c:3540
+#: commands/tablecmds.c:1630
+#: commands/tablecmds.c:1899
+#: commands/tablecmds.c:2033
+#: commands/tablecmds.c:2151
+#: commands/tablecmds.c:2250
+#: commands/tablecmds.c:2397
+#: commands/tablecmds.c:2567
+#: commands/tablecmds.c:3529
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is a system catalog"
 msgstr ""
 
-#: commands/tablecmds.c:1697
+#: commands/tablecmds.c:1683
 #, c-format
 msgid "ALTER TABLE: child table \"%s\" has different type for column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1705
+#: commands/tablecmds.c:1691
 #, c-format
 msgid "ALTER TABLE: merging definition of column \"%s\" for child %s"
 msgstr ""
 
-#: commands/tablecmds.c:1735
+#: commands/tablecmds.c:1721
 msgid "Attribute must be added to child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1752
+#: commands/tablecmds.c:1738
 msgid ""
 "Adding columns with defaults is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE SET DEFAULT."
 msgstr ""
 
-#: commands/tablecmds.c:1756
+#: commands/tablecmds.c:1742
 msgid ""
 "Adding NOT NULL columns is not implemented.\n"
 "\tAdd the column, then use ALTER TABLE ... SET NOT NULL."
 msgstr ""
 
-#: commands/tablecmds.c:1765 commands/tablecmds.c:3852
+#: commands/tablecmds.c:1751
+#: commands/tablecmds.c:3839
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:1777
+#: commands/tablecmds.c:1763
 #, c-format
 msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1783
+#: commands/tablecmds.c:1769
 #, c-format
 msgid "ALTER TABLE: relations limited to %d columns"
 msgstr ""
 
-#: commands/tablecmds.c:1958 commands/tablecmds.c:2092
-#: commands/tablecmds.c:2210
+#: commands/tablecmds.c:1944
+#: commands/tablecmds.c:2078
+#: commands/tablecmds.c:2196
 #, c-format
 msgid "ALTER TABLE: Cannot alter system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1979
+#: commands/tablecmds.c:1965
 #, c-format
 msgid "ALTER TABLE: Index %u not found"
 msgstr "ALTER TABLE: Индекс %u не найден"
 
-#: commands/tablecmds.c:1994
+#: commands/tablecmds.c:1980
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" is in a primary key"
 msgstr ""
 
-#: commands/tablecmds.c:2010 commands/tablecmds.c:2124
-#: commands/tablecmds.c:2352
+#: commands/tablecmds.c:1996
+#: commands/tablecmds.c:2110
+#: commands/tablecmds.c:2338
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2111
+#: commands/tablecmds.c:2097
 #, c-format
 msgid "ALTER TABLE: Attribute \"%s\" contains NULL values"
 msgstr ""
 
-#: commands/tablecmds.c:2160
+#: commands/tablecmds.c:2146
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" is not a table or view"
 msgstr ""
 
-#: commands/tablecmds.c:2284
+#: commands/tablecmds.c:2270
 #, c-format
 msgid "ALTER TABLE: statistics target %d is too low"
 msgstr ""
 
-#: commands/tablecmds.c:2289
+#: commands/tablecmds.c:2275
 msgid "ALTER TABLE: lowering statistics target to 1000"
 msgstr ""
 
 # [SM]: TO REVIEW
-#: commands/tablecmds.c:2310
+#: commands/tablecmds.c:2296
 #, c-format
 msgid "ALTER TABLE: \"%s\" storage not recognized"
 msgstr "ALTER TABLE: \"%s\" медия не распознана"
 
-#: commands/tablecmds.c:2315
+#: commands/tablecmds.c:2301
 #, c-format
 msgid "ALTER TABLE: Invalid column flag: %c"
 msgstr ""
 
-#: commands/tablecmds.c:2357
+#: commands/tablecmds.c:2343
 #, c-format
 msgid "ALTER TABLE: cannot change system attribute \"%s\""
 msgstr "ALTER TABLE: нельзя поменять системный атрибут \"%s\""
 
-#: commands/tablecmds.c:2374
+#: commands/tablecmds.c:2360
 #, c-format
 msgid "ALTER TABLE: Column datatype %s can only have storage \"plain\""
 msgstr ""
 
-#: commands/tablecmds.c:2428
+#: commands/tablecmds.c:2414
 #, c-format
 msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2434
+#: commands/tablecmds.c:2420
 #, c-format
 msgid "ALTER TABLE: Cannot drop inherited column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2463 commands/tablecmds.c:2514
+#: commands/tablecmds.c:2449
+#: commands/tablecmds.c:2500
 #, c-format
 msgid "ALTER TABLE: relation %u has no column \"%s\""
 msgstr "ALTER TABLE: у связи %u нет колонки \"%s\""
 
-#: commands/tablecmds.c:2468 commands/tablecmds.c:2519
+#: commands/tablecmds.c:2454
+#: commands/tablecmds.c:2505
 #, c-format
 msgid "ALTER TABLE: relation %u has non-inherited column \"%s\""
 msgstr "ALTER TABLE: у связи %u нет ненаследованной колонки \"%s\""
 
-#: commands/tablecmds.c:2655
-msgid ""
-"ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
+#: commands/tablecmds.c:2639
+msgid "ALTER TABLE / ADD CONSTRAINT is not implemented for that constraint type."
 msgstr ""
 
-#: commands/tablecmds.c:2687
-msgid ""
-"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
+#: commands/tablecmds.c:2669
+msgid "ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
 msgstr ""
 
-#: commands/tablecmds.c:2747
+#: commands/tablecmds.c:2729
 #, c-format
 msgid "Only relation '%s' can be referenced in CHECK"
 msgstr ""
 
-#: commands/tablecmds.c:2802
+#: commands/tablecmds.c:2778
 #, c-format
 msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
 msgstr ""
 
-#: commands/tablecmds.c:2858
+#: commands/tablecmds.c:2834
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:2863
+#: commands/tablecmds.c:2839
 #, c-format
 msgid "%s: relation \"%s\" is a system catalog"
 msgstr "%s: объект \"%s\" является системным каталогом"
 
-#: commands/tablecmds.c:2878
+#: commands/tablecmds.c:2854
 #, c-format
 msgid "%s: Unable to reference temporary table from permanent table constraint"
 msgstr ""
 
-#: commands/tablecmds.c:2920
+#: commands/tablecmds.c:2896
 #, c-format
-msgid ""
-"%s: number of referencing and referenced attributes for foreign key disagree"
+msgid "%s: number of referencing and referenced attributes for foreign key disagree"
 msgstr ""
 
-#: commands/tablecmds.c:3001
+#: commands/tablecmds.c:2977
 #, c-format
 msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:3004
+#: commands/tablecmds.c:2980
 #, c-format
 msgid "Can only have %d keys in a foreign key"
 msgstr ""
 
-#: commands/tablecmds.c:3048
+#: commands/tablecmds.c:3024
 #, c-format
 msgid "transformFkeyGetPrimaryKey: index %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:3066
+#: commands/tablecmds.c:3042
 #, c-format
 msgid "PRIMARY KEY for referenced table \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:3122
+#: commands/tablecmds.c:3098
 #, c-format
 msgid "transformFkeyCheckAttrs: index %u not found"
 msgstr ""
 
-#: commands/tablecmds.c:3180
+#: commands/tablecmds.c:3156
 #, c-format
-msgid ""
-"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
+msgid "UNIQUE constraint matching given keys for referenced table \"%s\" not found"
 msgstr ""
 
-#: commands/tablecmds.c:3343
+#: commands/tablecmds.c:3323
 #, 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:3399
+#: commands/tablecmds.c:3383
 msgid "Unrecognized ON DELETE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3465
+#: commands/tablecmds.c:3454
 msgid "Unrecognized ON UPDATE action for FOREIGN KEY constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3510
+#: commands/tablecmds.c:3499
 #, c-format
 msgid "fkMatchTypeToString: Unknown MATCH TYPE '%c'"
 msgstr ""
 
-#: commands/tablecmds.c:3586
+#: commands/tablecmds.c:3575
 #, c-format
 msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:3590
+#: commands/tablecmds.c:3579
 msgid "Multiple constraints dropped"
 msgstr ""
 
-#: commands/tablecmds.c:3615
+#: commands/tablecmds.c:3604
 #, c-format
 msgid "ALTER TABLE: relation %u not found"
 msgstr "ALTER TABLE: связь %u не найдена"
 
-#: commands/tablecmds.c:3677
+#: commands/tablecmds.c:3666
 #, c-format
-msgid ""
-"ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or "
-"sequence"
+msgid "ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or sequence"
 msgstr ""
 
-#: commands/tablecmds.c:3727
+#: commands/tablecmds.c:3716
 msgid "Shared relations cannot be toasted after initdb"
 msgstr ""
 
-#: commands/tablecmds.c:3740
+#: commands/tablecmds.c:3729
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" already has a toast table"
 msgstr ""
 
-#: commands/tablecmds.c:3755
+#: commands/tablecmds.c:3744
 #, c-format
 msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
 msgstr ""
 
-#: commands/trigger.c:132
+#: commands/trigger.c:133
 #, c-format
 msgid "Unable to find table for constraint \"%s\""
 msgstr ""
 
-#: commands/trigger.c:137
+#: commands/trigger.c:138
 #, c-format
 msgid "CreateTrigger: relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/trigger.c:141
+#: commands/trigger.c:142
 #, c-format
 msgid "CreateTrigger: can't create trigger for system relation %s"
 msgstr ""
 
+#: commands/trigger.c:200
+msgid "CreateTrigger: STATEMENT triggers are unimplemented, yet"
+msgstr ""
+
 #: commands/trigger.c:208
 msgid "CreateTrigger: double INSERT event specified"
 msgstr ""
@@ -4537,8 +4676,7 @@ msgstr ""
 
 #: commands/trigger.c:271
 #, c-format
-msgid ""
-"CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
+msgid "CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
 msgstr ""
 
 #: commands/trigger.c:276
@@ -4606,264 +4744,189 @@ msgstr ""
 msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
 msgstr ""
 
-#: commands/trigger.c:1129
+#: commands/trigger.c:1130
 #, c-format
 msgid "ExecCallTriggerFunc: function %u returned NULL"
 msgstr ""
 
-#: commands/trigger.c:1179 commands/trigger.c:1290 commands/trigger.c:1414
-msgid "BEFORE STATEMENT trigger cannot return a value."
-msgstr ""
-
-#: commands/trigger.c:1534 executor/execMain.c:1015 executor/execMain.c:1308
-#: executor/execMain.c:1442
+#: commands/trigger.c:1375
+#: executor/execMain.c:1048
+#: executor/execMain.c:1323
+#: executor/execMain.c:1459
 msgid "Can't serialize access due to concurrent update"
 msgstr ""
 
-#: commands/trigger.c:1557 executor/execMain.c:1036
+#: commands/trigger.c:1398
+#: executor/execMain.c:1069
 #, c-format
 msgid "Unknown status %u from heap_mark4update"
 msgstr ""
 
-#: commands/trigger.c:1569
+#: commands/trigger.c:1410
 msgid "GetTupleForTrigger: failed ReadBuffer"
 msgstr ""
 
-#: commands/trigger.c:1757
+#: commands/trigger.c:1604
 msgid "DeferredTriggerExecute: failed to fetch old tuple"
 msgstr ""
 
-#: commands/trigger.c:1764
+#: commands/trigger.c:1611
 msgid "DeferredTriggerExecute: failed to fetch new tuple"
 msgstr ""
 
-#: commands/trigger.c:1785
+#: commands/trigger.c:1632
 #, c-format
 msgid "DeferredTriggerExecute: can't find trigger %u"
 msgstr ""
 
-#: commands/trigger.c:1931
+#: commands/trigger.c:1792
 #, c-format
 msgid "deferredTriggerInvokeEvents: relation %u has no triggers"
 msgstr ""
 
-#: commands/trigger.c:2036
+#: commands/trigger.c:1906
 msgid "DeferredTriggerBeginXact() called while inside transaction"
 msgstr ""
 
-#: commands/trigger.c:2211
+#: commands/trigger.c:2083
 msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: commands/trigger.c:2242
+#: commands/trigger.c:2114
 #, c-format
 msgid "Constraint '%s' is not deferrable"
 msgstr ""
 
-#: commands/trigger.c:2256
+#: commands/trigger.c:2128
 #, c-format
 msgid "Constraint '%s' does not exist"
 msgstr ""
 
-#: commands/trigger.c:2332
+#: commands/trigger.c:2208
 msgid "DeferredTriggerSaveEvent() called outside of transaction"
 msgstr ""
 
-#: commands/typecmds.c:117
+#: commands/typecmds.c:94
 #, c-format
 msgid "DefineType: type names must be %d characters or less"
 msgstr ""
 
-#: commands/typecmds.c:147
+#: commands/typecmds.c:124
 #, c-format
 msgid "Array element type cannot be %s"
 msgstr ""
 
-#: commands/typecmds.c:178
+#: commands/typecmds.c:155
 #, c-format
 msgid "DefineType: \"%s\" alignment not recognized"
 msgstr ""
 
-#: commands/typecmds.c:194
+#: commands/typecmds.c:171
 #, c-format
 msgid "DefineType: \"%s\" storage not recognized"
 msgstr ""
 
-#: commands/typecmds.c:199
+#: commands/typecmds.c:176
 #, c-format
 msgid "DefineType: attribute \"%s\" not recognized"
 msgstr ""
 
-#: commands/typecmds.c:208
+#: commands/typecmds.c:185
 msgid "Define: \"input\" unspecified"
 msgstr ""
 
-#: commands/typecmds.c:210
+#: commands/typecmds.c:187
 msgid "Define: \"output\" unspecified"
 msgstr ""
 
-#: commands/typecmds.c:243
+#: commands/typecmds.c:220
 #, c-format
 msgid "TypeCreate: changing return type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/typecmds.c:248
+#: commands/typecmds.c:225
 #, c-format
 msgid "Type input function %s must return %s"
 msgstr ""
 
-#: commands/typecmds.c:256
+#: commands/typecmds.c:233
 #, c-format
 msgid "TypeCreate: changing return type of function %s from OPAQUE to CSTRING"
 msgstr ""
 
-#: commands/typecmds.c:261
+#: commands/typecmds.c:238
 #, c-format
 msgid "Type output function %s must return cstring"
 msgstr ""
 
-#: commands/typecmds.c:389
+#: commands/typecmds.c:366
 #, c-format
 msgid "RemoveTypeById: type %u not found"
 msgstr "RemoveTypeById: тип %u не найден"
 
-#: commands/typecmds.c:450
+#: commands/typecmds.c:426
 #, c-format
 msgid "CREATE DOMAIN: domain names must be %d characters or less"
 msgstr ""
 
-#: commands/typecmds.c:469
+#: commands/typecmds.c:445
 #, c-format
 msgid "DefineDomain: %s is not a basetype"
 msgstr ""
 
-#: commands/typecmds.c:522
-msgid "CREATE DOMAIN / FOREIGN KEY constraints not supported"
-msgstr "CREATE DOMAIN / FOREIGN KEY: коистрэйты не поддерживаются"
-
-#: commands/typecmds.c:526
-msgid "DefineDomain: unexpected constraint node type"
-msgstr ""
-
-#: commands/typecmds.c:538
+#: commands/typecmds.c:509
 msgid "CREATE DOMAIN has multiple DEFAULT expressions"
 msgstr ""
 
-#: commands/typecmds.c:565 commands/typecmds.c:572
+#: commands/typecmds.c:539
+#: commands/typecmds.c:546
 msgid "CREATE DOMAIN has conflicting NULL / NOT NULL constraint"
 msgstr ""
 
-#: commands/typecmds.c:588
-msgid "CREATE DOMAIN / UNIQUE not supported"
-msgstr "CREATE DOMAIN / UNIQUE не поддерживаются"
+#: commands/typecmds.c:552
+msgid "CREATE DOMAIN / UNIQUE indexes not supported"
+msgstr "CREATE DOMAIN / UNIQUE: индексы не поддерживаются"
 
-#: commands/typecmds.c:592
-msgid "CREATE DOMAIN / PRIMARY KEY not supported"
-msgstr "CREATE DOMAIN / PRIMARY KEY не поддерживаются"
+#: commands/typecmds.c:556
+msgid "CREATE DOMAIN / PRIMARY KEY indexes not supported"
+msgstr "CREATE DOMAIN / PRIMARY KEY: индексы не поддерживаются"
 
-#: commands/typecmds.c:599
-msgid ""
-"CREATE DOMAIN: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
-"supported"
+#: commands/typecmds.c:560
+msgid "DefineDomain: CHECK Constraints not supported"
+msgstr ""
+
+#: commands/typecmds.c:567
+msgid "DefineDomain: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not supported"
 msgstr ""
 
-#: commands/typecmds.c:604
-msgid "DefineDomain: unrecognized constraint subtype"
+#: commands/typecmds.c:571
+msgid "DefineDomain: unrecognized constraint node type"
 msgstr ""
 
-#: commands/typecmds.c:696
+#: commands/typecmds.c:654
 #, c-format
 msgid "RemoveDomain: type \"%s\" does not exist"
 msgstr "RemoveDomain: тип \"%s\" не существует"
 
-#: commands/typecmds.c:709 commands/typecmds.c:1507
+#: commands/typecmds.c:667
 #, c-format
 msgid "%s is not a domain"
 msgstr "%s не является доменом"
 
-#: commands/typecmds.c:778
+#: commands/typecmds.c:736
 #, c-format
 msgid "TypeCreate: changing argument type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/typecmds.c:837
+#: commands/typecmds.c:795
 #, c-format
-msgid ""
-"TypeCreate: changing argument type of function %s from OPAQUE to CSTRING"
+msgid "TypeCreate: changing argument type of function %s from OPAQUE to CSTRING"
 msgstr ""
 
-#: commands/typecmds.c:880
+#: commands/typecmds.c:837
 msgid "attempted to define composite type relation with no attrs"
 msgstr ""
 
-#: commands/typecmds.c:941 commands/typecmds.c:1060 commands/typecmds.c:1185
-#: commands/typecmds.c:1272
-#, c-format
-msgid "AlterDomain: type \"%s\" does not exist"
-msgstr "AlterDomain: тип \"%s\" не существует"
-
-#: commands/typecmds.c:1070
-#, c-format
-msgid "AlterDomain: %s is already set to %s"
-msgstr ""
-
-#: commands/typecmds.c:1111
-#, c-format
-msgid "ALTER DOMAIN: Relation \"%s\" Attribute \"%s\" contains NULL values"
-msgstr ""
-
-#: commands/typecmds.c:1282
-msgid "ALTER DOMAIN / FOREIGN KEY constraints not supported"
-msgstr "ALTER DOMAIN / FOREIGN KEY: констрэйнты не поддерживаются"
-
-#: commands/typecmds.c:1286
-msgid "AlterDomainAddConstraint: unexpected constraint node type"
-msgstr ""
-
-#: commands/typecmds.c:1293
-msgid "Use ALTER DOMAIN .. SET DEFAULT instead"
-msgstr ""
-
-#: commands/typecmds.c:1298
-msgid "Use ALTER DOMAIN .. [ SET | DROP ] NOT NULL instead"
-msgstr ""
-
-#: commands/typecmds.c:1306
-msgid "ALTER DOMAIN / UNIQUE indexes not supported"
-msgstr "ALTER DOMAIN / UNIQUE: индексы не поддерживаются"
-
-#: commands/typecmds.c:1310
-msgid "ALTER DOMAIN / PRIMARY KEY indexes not supported"
-msgstr "ALTER DOMAIN / PRIMARY KEY: индексы не поддерживаются"
-
-#: commands/typecmds.c:1317
-msgid ""
-"ALTER DOMAIN: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
-"supported"
-msgstr ""
-
-#: commands/typecmds.c:1322
-msgid "AlterDomainAddConstraint: unrecognized constraint node type"
-msgstr ""
-
-#: commands/typecmds.c:1387
-#, c-format
-msgid "AlterDomainAddConstraint: Domain %s constraint %s failed"
-msgstr ""
-
-#: commands/typecmds.c:1535
-#, c-format
-msgid "constraint \"%s\" already exists for domain \"%s\""
-msgstr "констрэйт \"%s\" уже существует для домена \"%s\""
-
-#: commands/typecmds.c:1575
-msgid "Relations cannot be referenced in domain CHECK constraint"
-msgstr ""
-
-#: commands/typecmds.c:1582
-msgid "cannot use column references in domain CHECK clause"
-msgstr ""
-
 #: commands/user.c:147
 #, c-format
 msgid "write_group_file: unable to write %s: %m"
@@ -4874,17 +4937,20 @@ msgstr ""
 msgid "Invalid group name '%s'"
 msgstr "Неверное имя группы '%s'"
 
-#: commands/user.c:211 commands/user.c:335
+#: commands/user.c:211
+#: commands/user.c:335
 #, c-format
 msgid "Invalid user name '%s'"
 msgstr "Неверное имя пользователя '%s'"
 
-#: commands/user.c:242 commands/user.c:364
+#: commands/user.c:242
+#: commands/user.c:364
 #, c-format
 msgid "%s: %m"
 msgstr "%s: %m"
 
-#: commands/user.c:250 commands/user.c:372
+#: commands/user.c:250
+#: commands/user.c:372
 #, c-format
 msgid "rename %s to %s: %m"
 msgstr "RENAME %s TO %s: %m"
@@ -4899,8 +4965,12 @@ msgstr "write_user_file: не удалось записать %s: %m"
 msgid "Invalid user password '%s'"
 msgstr "Неверный пароль '%s'"
 
-#: commands/user.c:505 commands/user.c:515 commands/user.c:521
-#: commands/user.c:527 commands/user.c:533 commands/user.c:539
+#: commands/user.c:505
+#: commands/user.c:515
+#: commands/user.c:521
+#: commands/user.c:527
+#: commands/user.c:533
+#: commands/user.c:539
 msgid "CREATE USER: conflicting options"
 msgstr ""
 
@@ -4932,11 +5002,14 @@ msgstr ""
 msgid "CREATE USER: sysid %d is already assigned"
 msgstr ""
 
-#: commands/user.c:642 commands/user.c:843
+#: commands/user.c:642
+#: commands/user.c:843
 msgid "CREATE USER: password encryption failed"
 msgstr ""
 
-#: commands/user.c:733 commands/user.c:743 commands/user.c:749
+#: commands/user.c:733
+#: commands/user.c:743
+#: commands/user.c:749
 #: commands/user.c:755
 msgid "ALTER USER: conflicting options"
 msgstr ""
@@ -4955,8 +5028,10 @@ msgstr "ALTER USER: нет доступа"
 msgid "ALTER USER: user \"%s\" does not exist"
 msgstr "ALTER USER: пользователь \"%s\" не существует"
 
-#: commands/user.c:907 commands/variable.c:549 utils/cache/lsyscache.c:1543
-#: utils/init/miscinit.c:555
+#: commands/user.c:907
+#: commands/variable.c:570
+#: utils/cache/lsyscache.c:1507
+#: utils/init/miscinit.c:556
 #, c-format
 msgid "user \"%s\" does not exist"
 msgstr "пользователь \"%s\" не существует"
@@ -4968,9 +5043,7 @@ msgstr "DROP USER: нед доступа"
 #: commands/user.c:995
 #, c-format
 msgid "DROP USER: user \"%s\" does not exist (no users removed)"
-msgstr ""
-"DROP USER: пользователь \"%s\" не существует (никто из поользователей не "
-"удалён)"
+msgstr "DROP USER: пользователь \"%s\" не существует (никто из поользователей не удалён)"
 
 #: commands/user.c:997
 #, c-format
@@ -4997,15 +5070,11 @@ msgstr ""
 
 #: commands/user.c:1114
 #, 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 ""
-"Для использования паролей требуется отнять права на %s так чтобы обычные "
-"пользователи не смогли их читать. Попробуйте 'REVOKE ALL ON \"%s\" FROM "
-"PUBLIC'."
+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'."
 
-#: commands/user.c:1156 commands/user.c:1162
+#: commands/user.c:1156
+#: commands/user.c:1162
 msgid "CREATE GROUP: conflicting options"
 msgstr "CREATE GROUP: конфликт опций"
 
@@ -5072,12 +5141,11 @@ msgid "DROP GROUP: group \"%s\" does not exist"
 msgstr ""
 
 #: commands/vacuum.c:459
-msgid ""
-"oldest Xmin is far in the past --- close open transactions soon to avoid "
-"wraparound problems"
+msgid "oldest Xmin is far in the past --- close open transactions soon to avoid wraparound problems"
 msgstr ""
 
-#: commands/vacuum.c:505 commands/vacuum.c:512
+#: commands/vacuum.c:505
+#: commands/vacuum.c:512
 #, c-format
 msgid "pg_class entry for relid %u vanished during vacuuming"
 msgstr ""
@@ -5112,180 +5180,120 @@ msgstr ""
 msgid "VACUUM (full_vacuum_rel): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:1044 commands/vacuumlazy.c:210
-#, c-format
-msgid "--Relation %s.%s--"
-msgstr ""
-
-#: commands/vacuum.c:1078 commands/vacuumlazy.c:268
-#, c-format
-msgid "Rel %s: Uninitialized page %u - fixing"
-msgstr ""
-
 #: commands/vacuum.c:1192
 #, c-format
-msgid ""
-"Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation"
+msgid "Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
 #: commands/vacuum.c:1202
 #, c-format
-msgid ""
-"Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
-msgstr ""
-
-#: commands/vacuum.c:1220 commands/vacuumlazy.c:372
-#, c-format
-msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
+msgid "Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
 msgstr ""
 
 #: commands/vacuum.c:1358
 #, c-format
 msgid ""
-"Pages %u: Changed %u, reaped %u, Empty %u, New %u; Tup %.0f: Vac %.0f, Keep/"
-"VTL %.0f/%u, UnUsed %.0f, MinLen %lu, MaxLen %lu; Re-using: Free/Avail. "
-"Space %.0f/%.0f; EndEmpty/Avail. Pages %u/%u.\n"
+"Pages %u: Changed %u, reaped %u, Empty %u, New %u; Tup %.0f: Vac %.0f, Keep/VTL %.0f/%u, UnUsed %.0f, MinLen %lu, MaxLen %lu; Re-using: Free/Avail. Space %.0f/%.0f; EndEmpty/Avail. Pages %u/%u.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:1582
+#: commands/vacuum.c:1581
 msgid "HEAP_MOVED_IN was not expected"
 msgstr ""
 
-#: commands/vacuum.c:1592
+#: commands/vacuum.c:1591
 msgid "Invalid XVAC in tuple header"
 msgstr ""
 
-#: commands/vacuum.c:1617
+#: commands/vacuum.c:1616
 msgid "HEAP_MOVED_OFF was expected"
 msgstr ""
 
-#: commands/vacuum.c:1671 commands/vacuum.c:1793
+#: 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:1708
-msgid ""
-"Child itemid in update-chain marked as unused - can't continue repair_frag"
+#: commands/vacuum.c:1707
+msgid "Child itemid in update-chain marked as unused - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1805
+#: commands/vacuum.c:1804
 msgid "Parent itemid marked as unused"
 msgstr ""
 
-#: commands/vacuum.c:1829
+#: commands/vacuum.c:1828
 msgid "Too old parent tuple found - can't continue repair_frag"
 msgstr ""
 
-#: commands/vacuum.c:1958
+#: commands/vacuum.c:1957
 #, c-format
 msgid "moving chain: failed to add item with len = %lu to page %u"
 msgstr ""
 
-#: commands/vacuum.c:2102
+#: commands/vacuum.c:2101
 #, c-format
-msgid ""
-"failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %"
-"u)"
+msgid "failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %u)"
 msgstr ""
 
-#: commands/vacuum.c:2191
+#: commands/vacuum.c:2190
 msgid "HEAP_MOVED_IN was not expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2195
+#: commands/vacuum.c:2194
 msgid "Invalid XVAC in tuple header (4)"
 msgstr ""
 
-#: commands/vacuum.c:2220
+#: commands/vacuum.c:2219
 msgid "HEAP_MOVED_OFF was expected (2)"
 msgstr ""
 
-#: commands/vacuum.c:2331
+#: commands/vacuum.c:2330
 msgid "HEAP_MOVED_OFF/HEAP_MOVED_IN was expected"
 msgstr ""
 
-#: commands/vacuum.c:2333
+#: commands/vacuum.c:2332
 msgid "Invalid XVAC in tuple header (2)"
 msgstr ""
 
-#: commands/vacuum.c:2351
+#: commands/vacuum.c:2350
 #, c-format
 msgid ""
 "Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n"
 "\t%s"
 msgstr ""
 
-#: commands/vacuum.c:2413
+#: commands/vacuum.c:2412
 msgid "Invalid XVAC in tuple header (3)"
 msgstr ""
 
-#: commands/vacuum.c:2418
+#: commands/vacuum.c:2417
 msgid "HEAP_MOVED_OFF was expected (3)"
 msgstr ""
 
-#: commands/vacuum.c:2468
+#: commands/vacuum.c:2467
 #, c-format
 msgid "VACUUM (repair_frag): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2534
+#: commands/vacuum.c:2531
 #, c-format
 msgid "VACUUM (vacuum_heap): FlushRelationBuffers returned %d"
 msgstr ""
 
-#: commands/vacuum.c:2540
+#: commands/vacuum.c:2537
 #, c-format
 msgid "Rel %s: Pages: %u --> %u."
 msgstr ""
 
-#: commands/vacuum.c:2625 commands/vacuumlazy.c:599
-#, c-format
-msgid ""
-"Index %s: Pages %u; Tuples %.0f.\n"
-"\t%s"
-msgstr ""
-
-#: commands/vacuum.c:2638 commands/vacuum.c:2692
+#: 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:2679 commands/vacuumlazy.c:646
-#, c-format
-msgid ""
-"Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
-"\t%s"
-msgstr ""
-
-#: commands/vacuumlazy.c:434
-#, c-format
-msgid ""
-"Pages %u: Changed %u, Empty %u; Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n"
-"\tTotal %s"
-msgstr ""
-
-#: commands/vacuumlazy.c:484
-#, c-format
-msgid ""
-"Removed %d tuples in %d pages.\n"
-"\t%s"
-msgstr ""
-
-#: commands/vacuumlazy.c:720
-#, c-format
-msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
-msgstr ""
-
-#: commands/vacuumlazy.c:755
-#, c-format
-msgid ""
-"Truncated %u --> %u pages.\n"
-"\t%s"
-msgstr ""
-
 #: commands/variable.c:62
 msgid "SET DATESTYLE: invalid list syntax"
 msgstr ""
@@ -5333,395 +5341,485 @@ msgstr ""
 msgid "%s is not a view"
 msgstr "%s не является видом"
 
-#: commands/view.c:162 commands/view.c:172
+#: commands/view.c:161
+#: commands/view.c:171
 msgid "Cannot change number of columns in view"
 msgstr ""
 
-#: commands/view.c:175
+#: commands/view.c:174
 #, c-format
 msgid "Cannot change name of view column \"%s\""
 msgstr ""
 
-#: commands/view.c:180
+#: commands/view.c:179
 #, c-format
 msgid "Cannot change datatype of view column \"%s\""
 msgstr ""
 
-#: executor/execAmi.c:163
+#: executor/execProcnode.c:228
+#, c-format
+msgid "ExecInitNode: node type %d unsupported"
+msgstr ""
+
+#: executor/execProcnode.c:361
+#, c-format
+msgid "ExecProcNode: node type %d unsupported"
+msgstr ""
+
+#: executor/execProcnode.c:448
+#, c-format
+msgid "ExecCountSlotsNode: node type %d unsupported"
+msgstr ""
+
+#: executor/execProcnode.c:574
+#, c-format
+msgid "ExecEndNode: node type %d unsupported"
+msgstr ""
+
+#: executor/execProcnode.c:753
+#, c-format
+msgid "ExecGetTupType: node type %d unsupported"
+msgstr ""
+
+#: executor/execAmi.c:161
 #, c-format
 msgid "ExecReScan: node type %d not supported"
 msgstr ""
 
-#: executor/execAmi.c:211
+#: executor/execAmi.c:213
 #, c-format
 msgid "ExecMarkPos: node type %d not supported"
 msgstr ""
 
-#: executor/execAmi.c:252
+#: executor/execAmi.c:254
 #, c-format
 msgid "ExecRestrPos: node type %d not supported"
 msgstr ""
 
-#: executor/execMain.c:369
+#: executor/execMain.c:408
 #, c-format
 msgid "ExecCheckRTEPerms: bogus operation %d"
 msgstr ""
 
-#: executor/execMain.c:741
+#: executor/execMain.c:786
 #, c-format
 msgid "You can't change sequence relation %s"
 msgstr ""
 
-#: executor/execMain.c:745
+#: executor/execMain.c:790
 #, c-format
 msgid "You can't change toast relation %s"
 msgstr ""
 
-#: executor/execMain.c:749
+#: executor/execMain.c:794
 #, c-format
 msgid "You can't change view relation %s"
 msgstr ""
 
-#: executor/execMain.c:963
+#: executor/execMain.c:996
 msgid "ExecutePlan: NO (junk) `ctid' was found!"
 msgstr ""
 
-#: executor/execMain.c:967
+#: executor/execMain.c:1000
 msgid "ExecutePlan: (junk) `ctid' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:992
+#: executor/execMain.c:1025
 #, c-format
 msgid "ExecutePlan: NO (junk) `%s' was found!"
 msgstr ""
 
-#: executor/execMain.c:997
+#: executor/execMain.c:1030
 #, c-format
 msgid "ExecutePlan: (junk) `%s' is NULL!"
 msgstr ""
 
-#: executor/execMain.c:1086
+#: executor/execMain.c:1119
 msgid "ExecutePlan: unknown operation in queryDesc"
 msgstr ""
 
-#: executor/execMain.c:1372
+#: executor/execMain.c:1388
 msgid "ExecUpdate: UPDATE can't run without transactions"
 msgstr ""
 
-#: executor/execMain.c:1572
+#: executor/execMain.c:1589
 #, c-format
 msgid "%s: Fail to add null value in not null attribute %s"
 msgstr ""
 
-#: executor/execMain.c:1582
+#: executor/execMain.c:1599
 #, c-format
 msgid "%s: rejected due to CHECK constraint \"%s\" on \"%s\""
 msgstr ""
 
-#: executor/execMain.c:1625
+#: executor/execMain.c:1643
 #, c-format
 msgid "EvalPlanQual: can't find RTE %d"
 msgstr ""
 
-#: executor/execMain.c:1643
+#: executor/execMain.c:1661
 msgid "EvalPlanQual: t_xmin is uncommitted ?!"
 msgstr ""
 
-#: executor/execProcnode.c:218
-#, c-format
-msgid "ExecInitNode: node type %d unsupported"
-msgstr ""
-
-#: executor/execProcnode.c:378
-#, c-format
-msgid "ExecProcNode: node type %d unsupported"
-msgstr ""
-
-#: executor/execProcnode.c:471
-#, c-format
-msgid "ExecCountSlotsNode: node type %d unsupported"
-msgstr ""
-
-#: executor/execProcnode.c:600
-#, c-format
-msgid "ExecEndNode: node type %d unsupported"
-msgstr ""
-
-#: executor/execProcnode.c:776
-#, c-format
-msgid "ExecGetTupType: node type %d unsupported"
+#: executor/execTuples.c:259
+msgid ""
+"Plan requires more slots than are available\n"
+"\tsend mail to your local executor guru to fix this"
 msgstr ""
 
-#: executor/execQual.c:167 executor/execQual.c:189
+#: executor/execQual.c:150
+#: executor/execQual.c:172
 #, c-format
 msgid "ExecEvalArrayRef: can only handle %d dimensions"
 msgstr ""
 
-#: executor/execQual.c:211
+#: executor/execQual.c:194
 msgid "ExecEvalArrayRef: upper and lower indices mismatch"
 msgstr ""
 
-#: executor/execQual.c:292
+#: executor/execQual.c:275
 msgid "ExecEvalAggref: no aggregates in this expression context"
 msgstr ""
 
-#: executor/execQual.c:470
-#, c-format
-msgid "ExecEvalParam: invalid paramkind %d"
+#: 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: Unknown value for parameter %s"
+msgid "ExecEvalParam: invalid paramkind %d"
 msgstr ""
 
-#: executor/execQual.c:485
+#: executor/execQual.c:500
 #, c-format
-msgid "ExecEvalParam: Unknown value for parameter %d"
+msgid "ExecEvalParam: Unknown value for parameter %s"
 msgstr ""
 
-#: executor/execQual.c:517
+#: executor/execQual.c:534
 msgid "GetAttributeByNum: Invalid attribute number"
 msgstr ""
 
-#: executor/execQual.c:520
+#: executor/execQual.c:537
 msgid "GetAttributeByNum: cannot access system attributes here"
 msgstr ""
 
-#: executor/execQual.c:523
+#: executor/execQual.c:540
 msgid "GetAttributeByNum: a NULL isNull flag was passed"
 msgstr ""
 
-#: executor/execQual.c:551
+#: executor/execQual.c:568
 msgid "GetAttributeByName: Invalid attribute name"
 msgstr ""
 
-#: executor/execQual.c:554
+#: executor/execQual.c:571
 msgid "GetAttributeByName: a NULL isNull flag was passed"
 msgstr ""
 
-#: executor/execQual.c:576
+#: executor/execQual.c:593
 #, c-format
 msgid "GetAttributeByName: attribute %s not found"
 msgstr ""
 
-#: executor/execQual.c:603
-msgid "init_fcache: too many arguments"
-msgstr ""
-
-#: executor/execQual.c:645
+#: executor/execQual.c:638
 msgid "Functions and operators can take only one set argument"
 msgstr ""
 
-#: executor/execQual.c:695 executor/execQual.c:737 executor/execQual.c:922
-#: executor/execQual.c:2427 executor/functions.c:524 executor/functions.c:559
-#: utils/adt/sets.c:204
+#: executor/execQual.c:688
+#: executor/execQual.c:730
+#: executor/execQual.c:904
+#: executor/execQual.c:2068
+#: executor/functions.c:533
+#: executor/functions.c:568
+#: utils/adt/sets.c:200
 msgid "Set-valued function called in context that cannot accept a set"
 msgstr ""
 
-#: executor/execQual.c:1033 executor/execQual.c:1068
-msgid ""
-"ExecMakeTableFunctionResult: Invalid result from function returning tuple"
+#: 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:1093
+#: executor/execQual.c:1054
 msgid "ExecMakeTableFunctionResult: Materialize-mode protocol not followed"
 msgstr ""
 
-#: executor/execQual.c:1098
+#: executor/execQual.c:1059
 #, c-format
 msgid "ExecMakeTableFunctionResult: unknown returnMode %d"
 msgstr ""
 
-#: executor/execQual.c:1218
-msgid "IS DISTINCT FROM does not support set arguments"
-msgstr ""
-
-#: executor/execQual.c:1470
+#: executor/execQual.c:1468
 #, c-format
 msgid "ExecEvalNullTest: unexpected nulltesttype %d"
 msgstr ""
 
-#: executor/execQual.c:1555
+#: executor/execQual.c:1548
 #, c-format
 msgid "ExecEvalBooleanTest: unexpected booltesttype %d"
 msgstr ""
 
-#: executor/execQual.c:1584
+#: executor/execQual.c:1573
 #, c-format
 msgid "Domain %s does not allow NULL values"
 msgstr ""
 
-#: executor/execQual.c:1611
-#, c-format
-msgid "ExecEvalConstraintTest: Domain %s constraint %s failed"
+#: executor/execQual.c:1578
+msgid "Domain CHECK Constraints not yet implemented"
 msgstr ""
 
-#: executor/execQual.c:1619
+#: executor/execQual.c:1581
 msgid "ExecEvalConstraintTest: Constraint type unknown"
 msgstr ""
 
-#: executor/execQual.c:1791
-#, c-format
-msgid "ExecEvalExpr: unknown boolop %d"
-msgstr ""
-
-#: executor/execQual.c:1845
+#: executor/execQual.c:1737
+#: executor/execQual.c:1782
 #, c-format
 msgid "ExecEvalExpr: unknown expression type %d"
 msgstr ""
 
-#: executor/execQual.c:1944 optimizer/util/clauses.c:422
-msgid "Aggregate function calls may not be nested"
-msgstr ""
-
-#: executor/execQual.c:1947
-msgid "ExecInitExpr: Aggref not expected here"
+#: executor/execQual.c:2128
+msgid "ExecTargetList: fjoin nodes not currently supported"
 msgstr ""
 
-#: executor/execQual.c:2016 executor/execQual.c:2153
-msgid "ExecInitExpr: SubPlan not expected here"
-msgstr ""
-
-#: executor/execQual.c:2129
-#, c-format
-msgid "ExecInitExpr: unknown expression type %d"
+#: executor/instrument.c:40
+msgid "InstrStartTimer called twice in a row"
 msgstr ""
 
-#: executor/execTuples.c:259
-msgid ""
-"Plan requires more slots than are available\n"
-"\tsend mail to your local executor guru to fix this"
+#: executor/instrument.c:56
+msgid "InstrStopNode without start"
 msgstr ""
 
-#: executor/functions.c:154
+#: executor/functions.c:171
 #, c-format
 msgid "init_sql_fcache: Cache lookup failed for procedure %u"
 msgstr ""
 
-#: executor/functions.c:166
+#: executor/functions.c:183
 #, c-format
 msgid "init_sql_fcache: Cache lookup failed for type %u"
 msgstr ""
 
-#: executor/functions.c:228
+#: executor/functions.c:242
 #, c-format
 msgid "init_sql_fcache: null prosrc for procedure %u"
 msgstr ""
 
-#: executor/instrument.c:40
-msgid "InstrStartTimer called twice in a row"
+#: executor/nodeAppend.c:295
+msgid "ExecProcAppend: subnode is NULL"
 msgstr ""
 
-#: executor/instrument.c:56
-msgid "InstrStopNode without start"
+#: executor/nodeAgg.c:774
+msgid "ExecInitAgg: could not find any aggregate functions"
 msgstr ""
 
-#: executor/nodeAgg.c:1253
+#: executor/nodeAgg.c:872
 #, c-format
 msgid "ExecAgg: cache lookup failed for aggregate %u"
 msgstr "ExecAgg: поиск в кэше агрегата %u не удался"
 
-#: executor/nodeAgg.c:1308
+#: executor/nodeAgg.c:927
 #, c-format
 msgid "Aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 
-#: executor/nodeAgg.c:1357
+#: executor/nodeAgg.c:950
+#: executor/nodeGroup.c:496
 #, c-format
-msgid ""
-"GetAggInitVal: cache lookup failed on aggregate transition function return "
-"type %u"
+msgid "Unable to identify an equality operator for type %s"
 msgstr ""
 
-#: executor/nodeAgg.c:1465
+#: executor/nodeAgg.c:978
+#, c-format
+msgid "GetAggInitVal: cache lookup failed on aggregate transition function return type %u"
+msgstr ""
+
+#: executor/nodeAgg.c:1060
 #, c-format
 msgid "Aggregate function %u called as normal function"
 msgstr ""
 
-#: executor/nodeFunctionscan.c:91
-msgid ""
-"Query-specified return tuple and actual function return tuple do not match"
+#: executor/nodeFunctionscan.c:93
+msgid "Query-specified return tuple and actual function return tuple do not match"
+msgstr ""
+
+#: executor/nodeHash.c:67
+msgid "ExecHash: hash table is NULL."
+msgstr ""
+
+#: executor/nodeHash.c:312
+#: executor/nodeHash.c:500
+#: executor/nodeHash.c:742
+msgid "Insufficient memory for hash table."
 msgstr ""
 
-#: executor/nodeHash.c:705
+#: executor/nodeHash.c:694
 #, c-format
-msgid "ComputeHashFunc: Invalid typLen %d"
-msgstr "ComputeHashFunc: Не верный typLen %d"
+msgid "hashFunc: Invalid typLen %d"
+msgstr "hashFunc: Не верный typLen %d"
 
-#: executor/nodeHashjoin.c:363
+#: executor/nodeHashjoin.c:357
 #, c-format
 msgid "ExecInitHashJoin: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeHashjoin.c:541 executor/nodeHashjoin.c:549
+#: executor/nodeHashjoin.c:529
+#: executor/nodeHashjoin.c:537
 msgid "Read from hashjoin temp file failed"
 msgstr ""
 
-#: executor/nodeHashjoin.c:605 executor/nodeHashjoin.c:610
+#: executor/nodeHashjoin.c:593
+#: executor/nodeHashjoin.c:598
 msgid "Failed to rewind hash temp file"
 msgstr ""
 
-#: executor/nodeHashjoin.c:659 executor/nodeHashjoin.c:662
+#: executor/nodeHashjoin.c:669
+#: executor/nodeHashjoin.c:672
 msgid "Write to hashjoin temp file failed"
 msgstr ""
 
-#: executor/nodeIndexscan.c:675
+#: executor/nodeIndexscan.c:747
 msgid "ExecInitIndexScan: indxqual not an opclause!"
 msgstr ""
 
-#: executor/nodeIndexscan.c:777 executor/nodeIndexscan.c:814
+#: executor/nodeIndexscan.c:873
+#: executor/nodeIndexscan.c:936
 #, c-format
 msgid "ExecInitIndexScan: %s"
 msgstr "ExecInitIndexScan: %s"
 
-#: executor/nodeIndexscan.c:887
+#: executor/nodeIndexscan.c:1009
 #, c-format
 msgid "indexes of the relation %u was inactivated"
 msgstr ""
 
-#: executor/nodeLimit.c:152 executor/nodeLimit.c:167
-msgid "ExecLimit: subplan failed to run backwards"
+#: executor/spi.c:70
+msgid "SPI_connect: no connection(s) expected"
+msgstr ""
+
+#: executor/spi.c:76
+msgid "SPI_connect: some connection(s) expected"
+msgstr ""
+
+#: executor/spi.c:82
+msgid "Memory exhausted in SPI_connect"
+msgstr ""
+
+#: executor/spi.c:156
+msgid "Memory exhausted in SPI_finish"
+msgstr ""
+
+#: executor/spi.c:321
+#: executor/spi.c:348
+#: executor/spi.c:377
+#: executor/spi.c:415
+#: executor/spi.c:659
+#: executor/spi.c:1481
+msgid "SPI: stack corrupted"
+msgstr ""
+
+#: executor/spi.c:726
+msgid "cannot open multi-query plan as cursor"
+msgstr ""
+
+#: executor/spi.c:731
+msgid "plan in SPI_cursor_open() is not a SELECT"
+msgstr ""
+
+#: executor/spi.c:733
+msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
+msgstr ""
+
+#: executor/spi.c:735
+msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
+msgstr ""
+
+#: executor/spi.c:766
+#, c-format
+msgid "cursor \"%s\" already in use"
 msgstr ""
 
-#: executor/nodeLimit.c:198
+#: executor/spi.c:772
 #, c-format
-msgid "ExecLimit: impossible state %d"
+msgid "failed to create portal \"%s\""
+msgstr ""
+
+#: executor/spi.c:885
+#: executor/spi.c:1387
+msgid "invalid portal in SPI cursor operation"
 msgstr ""
 
-#: executor/nodeMergejoin.c:132
-msgid "MJFormSkipQuals: op not an OpExpr!"
+#: executor/spi.c:910
+#: executor/spi.c:915
+msgid "SPI: improper call to spi_dest_setup"
 msgstr ""
 
-#: executor/nodeMergejoin.c:400
+#: executor/spi.c:912
+msgid "SPI: stack corrupted in spi_dest_setup"
+msgstr ""
+
+#: executor/spi.c:952
+#: executor/spi.c:958
+msgid "SPI: improper call to spi_printtup"
+msgstr ""
+
+#: executor/spi.c:954
+msgid "SPI: stack corrupted in spi_printtup"
+msgstr ""
+
+#: executor/spi.c:1333
+msgid "SPI_select: retrieve into portal not implemented"
+msgstr ""
+
+#: executor/spi.c:1343
+msgid "SPI_select: # of processed tuples check failed"
+msgstr ""
+
+#: executor/spi.c:1391
+msgid "SPI cursor operation called while not connected"
+msgstr ""
+
+#: executor/spi.c:1448
+msgid "SPI_fetch: # of processed tuples check failed"
+msgstr ""
+
+#: executor/nodeMergejoin.c:131
+msgid "MJFormSkipQuals: op not an Oper!"
+msgstr ""
+
+#: executor/nodeMergejoin.c:395
 #, c-format
 msgid "ExecMergeJoin: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1384
+#: executor/nodeMergejoin.c:1379
 #, c-format
 msgid "ExecMergeJoin: invalid join state %d, aborting"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1471
+#: executor/nodeMergejoin.c:1458
 msgid "RIGHT JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1486 optimizer/path/joinpath.c:904
+#: executor/nodeMergejoin.c:1473
+#: optimizer/path/joinpath.c:935
 msgid "FULL JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1489
+#: executor/nodeMergejoin.c:1476
 #, c-format
 msgid "ExecInitMergeJoin: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeNestloop.c:322
+#: executor/nodeNestloop.c:318
 #, c-format
 msgid "ExecInitNestLoop: unsupported join type %d"
 msgstr ""
 
-#: executor/nodeSetOp.c:173
+#: executor/nodeSetOp.c:174
 #, c-format
 msgid "ExecSetOp: bogus command code %d"
 msgstr ""
@@ -5730,112 +5828,124 @@ msgstr ""
 msgid "ExtractSortKeys: keycount <= 0"
 msgstr ""
 
-#: executor/nodeSubplan.c:56
+#: executor/nodeSubplan.c:53
 msgid "ExecSubPlan: can't set parent params from subquery"
 msgstr ""
 
-#: executor/nodeSubplan.c:125 executor/nodeSubplan.c:150
-#: executor/nodeSubplan.c:427
+#: executor/nodeSubplan.c:120
+#: executor/nodeSubplan.c:142
+#: executor/nodeSubplan.c:385
 msgid "More than one tuple returned by a subselect used as an expression."
 msgstr ""
 
-#: executor/nodeSubplan.c:193
+#: executor/nodeSubplan.c:180
 msgid "ExecSubPlan: failed to find placeholder for subplan result"
 msgstr ""
 
-#: executor/nodeSubplan.c:400
+#: executor/nodeSubplan.c:358
 msgid "ExecSetParamPlan: ANY/ALL subselect unsupported"
 msgstr ""
 
-#: executor/nodeSubplan.c:516
+#: executor/nodeSubplan.c:468
 msgid "ExecReScanSetParamPlan: direct correlated subquery unsupported, yet"
 msgstr ""
 
-#: executor/nodeSubplan.c:518
+#: executor/nodeSubplan.c:470
 msgid "ExecReScanSetParamPlan: setParam list is NULL"
 msgstr ""
 
-#: executor/nodeSubplan.c:520
+#: executor/nodeSubplan.c:472
 msgid "ExecReScanSetParamPlan: extParam list of plan is NULL"
 msgstr ""
 
-#: executor/spi.c:70
-msgid "SPI_connect: no connection(s) expected"
-msgstr ""
-
-#: executor/spi.c:76
-msgid "SPI_connect: some connection(s) expected"
+#: lib/dllist.c:41
+msgid "Memory exhausted in DLNewList"
 msgstr ""
 
-#: executor/spi.c:82
-msgid "Memory exhausted in SPI_connect"
+#: lib/dllist.c:84
+msgid "Memory exhausted in DLNewElem"
 msgstr ""
 
-#: executor/spi.c:148
-msgid "Memory exhausted in SPI_finish"
+#: libpq/be-fsstubs.c:84
+#, c-format
+msgid "lo_open(%u,%d)"
 msgstr ""
 
-#: executor/spi.c:310 executor/spi.c:337 executor/spi.c:366 executor/spi.c:404
-#: executor/spi.c:648 executor/spi.c:1418
-msgid "SPI: stack corrupted"
+#: libpq/be-fsstubs.c:102
+#, c-format
+msgid "cannot open large object %u"
 msgstr ""
 
-#: executor/spi.c:714
-msgid "cannot open multi-query plan as cursor"
+#: libpq/be-fsstubs.c:122
+#, c-format
+msgid "lo_close: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: executor/spi.c:719
-msgid "plan in SPI_cursor_open() is not a SELECT"
+#: libpq/be-fsstubs.c:126
+#, c-format
+msgid "lo_close(%d)"
 msgstr ""
 
-#: executor/spi.c:721
-msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
+#: libpq/be-fsstubs.c:158
+#, c-format
+msgid "lo_read: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: executor/spi.c:723
-msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
+#: libpq/be-fsstubs.c:180
+#, c-format
+msgid "lo_write: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: executor/spi.c:754
+#: libpq/be-fsstubs.c:206
 #, c-format
-msgid "cursor \"%s\" already in use"
+msgid "lo_lseek: invalid large obj descriptor (%d)"
 msgstr ""
 
-#: executor/spi.c:760
+#: libpq/be-fsstubs.c:261
 #, c-format
-msgid "failed to create portal \"%s\""
+msgid "lo_tell: invalid large object descriptor (%d)"
 msgstr ""
 
-#: executor/spi.c:869 executor/spi.c:1324
-msgid "invalid portal in SPI cursor operation"
+#: libpq/be-fsstubs.c:363
+msgid ""
+"You must have Postgres superuser privilege to use server-side lo_import().\n"
+"\tAnyone can use the client-side lo_import() provided by libpq."
 msgstr ""
 
-#: executor/spi.c:894
-msgid "SPI: improper call to spi_printtup"
+#: libpq/be-fsstubs.c:378
+#, c-format
+msgid "lo_import: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: executor/spi.c:896
-msgid "SPI: stack corrupted in spi_printtup"
+#: libpq/be-fsstubs.c:386
+#, c-format
+msgid "lo_import: can't create inv object for \"%s\""
 msgstr ""
 
-#: executor/spi.c:1275
-msgid "SPI_select: retrieve into portal not implemented"
+#: libpq/be-fsstubs.c:397
+#, c-format
+msgid "lo_import: error while reading \"%s\""
 msgstr ""
 
-#: executor/spi.c:1285
-msgid "SPI_select: # of processed tuples check failed"
+#: libpq/be-fsstubs.c:426
+msgid ""
+"You must have Postgres superuser privilege to use server-side lo_export().\n"
+"\tAnyone can use the client-side lo_export() provided by libpq."
 msgstr ""
 
-#: executor/spi.c:1384
-msgid "SPI_fetch: # of processed tuples check failed"
+#: libpq/be-fsstubs.c:436
+#, c-format
+msgid "lo_export: can't open inv object %u"
 msgstr ""
 
-#: lib/dllist.c:41
-msgid "Memory exhausted in DLNewList"
+#: libpq/be-fsstubs.c:454
+#, c-format
+msgid "lo_export: can't open unix file \"%s\": %m"
 msgstr ""
 
-#: lib/dllist.c:84
-msgid "Memory exhausted in DLNewElem"
+#: libpq/be-fsstubs.c:464
+#, c-format
+msgid "lo_export: error while writing \"%s\""
 msgstr ""
 
 #: libpq/auth.c:106
@@ -5905,246 +6015,182 @@ msgstr ""
 msgid "No pg_hba.conf entry for host %s, user %s, database %s"
 msgstr ""
 
-#: libpq/auth.c:452
+#: libpq/auth.c:450
 #, c-format
 msgid "pg_local_sendauth: can't do setsockopt: %m"
 msgstr ""
 
-#: libpq/auth.c:541
+#: libpq/auth.c:539
 #, c-format
 msgid "pam_passwd_conv_proc: Error from underlying PAM layer: '%s'"
 msgstr ""
 
-#: libpq/auth.c:545
+#: libpq/auth.c:543
 #, c-format
 msgid "pam_passwd_conv_proc: Unexpected PAM conversation %d/'%s'"
 msgstr ""
 
-#: libpq/auth.c:575
+#: libpq/auth.c:573
 msgid "received PAM packet"
 msgstr ""
 
-#: libpq/auth.c:579
+#: libpq/auth.c:577
 msgid "pam_passwd_conv_proc: no password"
 msgstr ""
 
-#: libpq/auth.c:592
+#: libpq/auth.c:590
 msgid "pam_passwd_conv_proc: Out of memory!"
 msgstr ""
 
-#: libpq/auth.c:636
+#: libpq/auth.c:634
 #, c-format
 msgid "CheckPAMAuth: Failed to create PAM authenticator: '%s'"
 msgstr ""
 
-#: libpq/auth.c:646
+#: libpq/auth.c:644
 #, c-format
 msgid "CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:656
+#: libpq/auth.c:654
 #, c-format
 msgid "CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:666
+#: libpq/auth.c:664
 #, c-format
 msgid "CheckPAMAuth: pam_authenticate failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:676
+#: libpq/auth.c:674
 #, c-format
 msgid "CheckPAMAuth: pam_acct_mgmt failed: '%s'"
 msgstr ""
 
-#: libpq/auth.c:686
+#: libpq/auth.c:684
 #, c-format
 msgid "CheckPAMAuth: Failed to release PAM authenticator: '%s'"
 msgstr ""
 
-#: libpq/auth.c:726
+#: libpq/auth.c:724
 #, c-format
 msgid "unexpected password packet size: read %d, expected %d"
 msgstr ""
 
-#: libpq/auth.c:730
+#: libpq/auth.c:728
 msgid "received password packet"
 msgstr ""
 
-#: libpq/be-fsstubs.c:84
-#, c-format
-msgid "lo_open(%u,%d)"
-msgstr ""
-
-#: libpq/be-fsstubs.c:102
-#, c-format
-msgid "cannot open large object %u"
-msgstr ""
-
-#: libpq/be-fsstubs.c:122
-#, c-format
-msgid "lo_close: invalid large obj descriptor (%d)"
-msgstr ""
-
-#: libpq/be-fsstubs.c:126
-#, c-format
-msgid "lo_close(%d)"
-msgstr ""
-
-#: libpq/be-fsstubs.c:158
-#, c-format
-msgid "lo_read: invalid large obj descriptor (%d)"
-msgstr ""
-
-#: libpq/be-fsstubs.c:180
-#, c-format
-msgid "lo_write: invalid large obj descriptor (%d)"
-msgstr ""
-
-#: libpq/be-fsstubs.c:206
-#, c-format
-msgid "lo_lseek: invalid large obj descriptor (%d)"
-msgstr ""
-
-#: libpq/be-fsstubs.c:261
-#, c-format
-msgid "lo_tell: invalid large object descriptor (%d)"
-msgstr ""
-
-#: libpq/be-fsstubs.c:363
-msgid ""
-"You must have Postgres superuser privilege to use server-side lo_import().\n"
-"\tAnyone can use the client-side lo_import() provided by libpq."
-msgstr ""
-
-#: libpq/be-fsstubs.c:378
-#, c-format
-msgid "lo_import: can't open unix file \"%s\": %m"
-msgstr ""
-
-#: libpq/be-fsstubs.c:386
-#, c-format
-msgid "lo_import: can't create inv object for \"%s\""
-msgstr ""
-
-#: libpq/be-fsstubs.c:397
+#: libpq/be-secure.c:288
+#: libpq/be-secure.c:357
 #, c-format
-msgid "lo_import: error while reading \"%s\""
+msgid "SSL SYSCALL error: %m"
 msgstr ""
 
-#: libpq/be-fsstubs.c:426
-msgid ""
-"You must have Postgres superuser privilege to use server-side lo_export().\n"
-"\tAnyone can use the client-side lo_export() provided by libpq."
+#: libpq/be-secure.c:291
+#: libpq/be-secure.c:360
+msgid "SSL SYSCALL error: EOF detected"
 msgstr ""
 
-#: libpq/be-fsstubs.c:436
+#: libpq/be-secure.c:297
+#: libpq/be-secure.c:366
 #, c-format
-msgid "lo_export: can't open inv object %u"
-msgstr ""
-
-#: libpq/be-fsstubs.c:454
-#, c-format
-msgid "lo_export: can't open unix file \"%s\": %m"
+msgid "SSL error: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:464
-#, c-format
-msgid "lo_export: error while writing \"%s\""
+#: libpq/be-secure.c:304
+#: libpq/be-secure.c:373
+msgid "Unknown SSL error code"
 msgstr ""
 
-#: libpq/be-secure.c:292 libpq/be-secure.c:342
-#, c-format
-msgid "SSL SYSCALL error: %s"
+#: libpq/be-secure.c:336
+#: libpq/be-secure.c:338
+#: libpq/be-secure.c:341
+msgid "SSL renegotiation failure"
 msgstr ""
 
-#: libpq/be-secure.c:295 libpq/be-secure.c:345
-#, c-format
-msgid "SSL error: %s"
-msgstr ""
-
-#: libpq/be-secure.c:397
+#: libpq/be-secure.c:421
 #, c-format
 msgid "DH errors (%s): %d bits expected, %d bits found"
 msgstr ""
 
-#: libpq/be-secure.c:407
+#: libpq/be-secure.c:431
 #, c-format
 msgid "DH_check error (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:412
+#: libpq/be-secure.c:436
 #, c-format
 msgid "DH error (%s): p is not prime"
 msgstr ""
 
-#: libpq/be-secure.c:419
+#: libpq/be-secure.c:443
 #, c-format
 msgid "DH error (%s): neither suitable generator or safe prime"
 msgstr ""
 
-#: libpq/be-secure.c:445
+#: libpq/be-secure.c:469
 #, c-format
 msgid "DH load buffer: %s"
 msgstr ""
 
-#: libpq/be-secure.c:517
+#: libpq/be-secure.c:541
 #, c-format
 msgid "DH: generating parameters (%d bits)...."
 msgstr ""
 
-#: libpq/be-secure.c:551
+#: libpq/be-secure.c:575
 msgid "SSL: handshake start"
 msgstr ""
 
-#: libpq/be-secure.c:554
+#: libpq/be-secure.c:578
 msgid "SSL: handshake done"
 msgstr ""
 
-#: libpq/be-secure.c:557
+#: libpq/be-secure.c:581
 msgid "SSL: accept loop"
 msgstr ""
 
-#: libpq/be-secure.c:560
+#: libpq/be-secure.c:584
 #, c-format
 msgid "SSL: accept exit (%d)"
 msgstr ""
 
-#: libpq/be-secure.c:563
+#: libpq/be-secure.c:587
 msgid "SSL: connect loop"
 msgstr ""
 
-#: libpq/be-secure.c:566
+#: libpq/be-secure.c:590
 #, c-format
 msgid "SSL: connect exit (%d)"
 msgstr ""
 
-#: libpq/be-secure.c:569
+#: libpq/be-secure.c:593
 #, c-format
 msgid "SSL: read alert (0x%04x)"
 msgstr ""
 
-#: libpq/be-secure.c:572
+#: libpq/be-secure.c:596
 #, c-format
 msgid "SSL: write alert (0x%04x)"
 msgstr ""
 
-#: libpq/be-secure.c:593
+#: libpq/be-secure.c:617
 #, c-format
 msgid "failed to create SSL context: %s"
 msgstr "не удалось создать контекст SSL: %s"
 
-#: libpq/be-secure.c:604
+#: libpq/be-secure.c:628
 #, c-format
 msgid "failed to load server certificate (%s): %s"
 msgstr "не удалось загрузить сертификат сервера (%s): %s"
 
-#: libpq/be-secure.c:612
+#: libpq/be-secure.c:636
 #, c-format
 msgid "failed to stat private key file (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:619
+#: libpq/be-secure.c:643
 #, c-format
 msgid ""
 "bad permissions on private key file (%s)\n"
@@ -6152,36 +6198,34 @@ msgid ""
 "\"group\" or \"other\"."
 msgstr ""
 
-#: libpq/be-secure.c:626
+#: libpq/be-secure.c:650
 #, c-format
 msgid "failed to load private key file (%s): %s"
 msgstr ""
 
-#: libpq/be-secure.c:632
+#: libpq/be-secure.c:656
 #, c-format
 msgid "check of private key failed: %s"
 msgstr ""
 
-#: libpq/be-secure.c:649
+#: libpq/be-secure.c:673
 #, c-format
 msgid "could not read root cert file (%s): %s"
 msgstr "не получилось файл корневого сертификата (%s): %s"
 
-#: libpq/be-secure.c:683
+#: libpq/be-secure.c:707
 #, c-format
 msgid "failed to initialize SSL connection: %s"
 msgstr "не удалось инициализировать SSL-подсоединение: %s"
 
-#: libpq/be-secure.c:705
+#: libpq/be-secure.c:729
 #, c-format
 msgid "secure connection from '%s'"
 msgstr ""
 
 #: libpq/crypt.c:61
 msgid "Password is stored MD5 encrypted.  'crypt' auth method cannot be used."
-msgstr ""
-"Пароль зашифрован и сохранён как MD5. Методы аутентификации "
-"'crypt' не может использоваться."
+msgstr "Пароль зашифрован и сохранён как MD5. Методы аутентификации 'crypt' не может использоваться."
 
 #: libpq/hba.c:127
 #, c-format
@@ -6190,9 +6234,7 @@ msgstr ""
 
 #: libpq/hba.c:260
 #, c-format
-msgid ""
-"tokenize_inc_file: Unable to open secondary authentication file \"@%s\" as "
-"\"%s\": %m"
+msgid "tokenize_inc_file: Unable to open secondary authentication file \"@%s\" as \"%s\": %m"
 msgstr ""
 
 #: libpq/hba.c:663
@@ -6200,7 +6242,8 @@ msgstr ""
 msgid "parse_hba: invalid syntax in pg_hba.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: libpq/hba.c:716 libpq/hba.c:738
+#: libpq/hba.c:716
+#: libpq/hba.c:738
 #, c-format
 msgid "could not open %s: %m"
 msgstr "не получилось отктрыть %s: %m"
@@ -6212,16 +6255,11 @@ msgstr ""
 
 #: libpq/hba.c:909
 #, c-format
-msgid ""
-"parse_ident_usermap: invalid syntax in pg_ident.conf file at line %d, token "
-"\"%s\""
+msgid "parse_ident_usermap: invalid syntax in pg_ident.conf file at line %d, token \"%s\""
 msgstr ""
 
 #: libpq/hba.c:941
-msgid ""
-"check_ident_usermap: hba configuration file does not have the usermap field "
-"filled in in the entry that pertains to this connection.  That field is "
-"essential for Ident-based authentication."
+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:991
@@ -6236,38 +6274,32 @@ msgstr ""
 
 #: libpq/hba.c:1149
 #, c-format
-msgid ""
-"Unable to connect to Ident server on the host which is trying to connect to "
-"Postgres (IP address %s, Port %d): %s"
+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:1172
 #, c-format
-msgid ""
-"Unable to send query to Ident server on the host which is trying to connect "
-"to Postgres (Host %s, Port %d), even though we successfully connected to it: "
-"%s"
+msgid "Unable to send query to Ident server on the host which is trying to connect to Postgres (Host %s, Port %d), even though we successfully connected to it: %s"
 msgstr ""
 
 #: libpq/hba.c:1189
 #, c-format
-msgid ""
-"Unable to receive response from Ident server on the host which is trying to "
-"connect to Postgres (Host %s, Port %d), even though we successfully sent our "
-"query to it: %s"
+msgid "Unable to receive response from Ident server on the host which is trying to connect to Postgres (Host %s, Port %d), even though we successfully sent our query to it: %s"
 msgstr ""
 
-#: libpq/hba.c:1230 libpq/hba.c:1258 libpq/hba.c:1323
+#: libpq/hba.c:1231
+#: libpq/hba.c:1296
 #, c-format
 msgid "ident_unix: error receiving credentials: %m"
 msgstr ""
 
-#: libpq/hba.c:1238 libpq/hba.c:1266 libpq/hba.c:1332
+#: libpq/hba.c:1239
+#: libpq/hba.c:1305
 #, c-format
 msgid "ident_unix: unknown local user with uid %d"
 msgstr ""
 
-#: libpq/hba.c:1342
+#: libpq/hba.c:1315
 msgid "'ident' auth is not supported on local connections on this platform"
 msgstr ""
 
@@ -6371,12 +6403,12 @@ msgstr ""
 msgid "pq_getint: unsupported size %d"
 msgstr ""
 
-#: main/main.c:83
+#: main/main.c:84
 #, c-format
 msgid "%s: setsysinfo failed: %s\n"
 msgstr ""
 
-#: main/main.c:172
+#: main/main.c:173
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
 "\n"
@@ -6386,44 +6418,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main/main.c:192
+#: main/main.c:193
 #, c-format
 msgid "%s: real and effective user ids must match\n"
 msgstr ""
 
-#: main/main.c:227
+#: main/main.c:228
 #, c-format
 msgid "%s: invalid current euid %d\n"
 msgstr ""
 
-#: nodes/copyfuncs.c:1218
+#: nodes/equalfuncs.c:204
 #, c-format
-msgid "_copyAConst: unknown node type %d"
+msgid "_equalParam: Invalid paramkind value: %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:2304
+#: nodes/equalfuncs.c:1987
 #, c-format
-msgid "_copyValue: unknown node type %d"
+msgid "_equalValue: unknown node type %d"
 msgstr ""
 
-#: nodes/copyfuncs.c:2796
+#: nodes/equalfuncs.c:2438
 #, c-format
-msgid "copyObject: don't know how to copy node type %d"
+msgid "equal: don't know whether nodes of type %d are equal"
 msgstr ""
 
-#: nodes/equalfuncs.c:178
+#: nodes/copyfuncs.c:1564
 #, c-format
-msgid "_equalParam: Invalid paramkind value: %d"
+msgid "_copyAConst: unknown node type %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:1490
+#: nodes/copyfuncs.c:2720
 #, c-format
-msgid "_equalValue: unknown node type %d"
+msgid "_copyValue: unknown node type %d"
 msgstr ""
 
-#: nodes/equalfuncs.c:1931
+#: nodes/copyfuncs.c:3232
 #, c-format
-msgid "equal: don't know whether nodes of type %d are equal"
+msgid "copyObject: don't know how to copy node type %d"
 msgstr ""
 
 #: nodes/list.c:162
@@ -6438,19 +6470,20 @@ msgstr "llast: пустой список"
 msgid "llasti: empty list"
 msgstr "llasti: пустой список"
 
-#: nodes/outfuncs.c:1191 nodes/readfuncs.c:821
+#: nodes/outfuncs.c:1026
+#: nodes/readfuncs.c:1694
 #, c-format
 msgid "bogus rte kind %d"
 msgstr ""
 
-#: nodes/outfuncs.c:1257
+#: nodes/outfuncs.c:1324
 #, c-format
-msgid "_outValue: don't know how to print type %d"
+msgid "_outValue: don't know how to print type %d "
 msgstr "_outValue: не известно как печатать тип %d"
 
-#: nodes/outfuncs.c:1644
+#: nodes/outfuncs.c:1782
 #, c-format
-msgid "_outNode: don't know how to print type %d"
+msgid "_outNode: don't know how to print type %d "
 msgstr "_outNode: не известно как печатать тип %d"
 
 #: nodes/print.c:85
@@ -6468,38 +6501,39 @@ msgid "Cache lookup for type %u failed"
 msgstr "Поиск в кзше типа %u не удался"
 
 #: nodes/read.c:296
-msgid "nodeRead: did not find '}' at end of node"
-msgstr "nodeRead: скобка '}' не была обнаружена в конце узла"
+msgid "nodeRead: did not find '}' at end of plan node"
+msgstr "nodeRead: скобка '}' не была обнаружена в конце узла плана"
 
 #: nodes/read.c:376
 #, c-format
 msgid "nodeRead: Bad type %d"
 msgstr ""
 
-#: nodes/readfuncs.c:149
+#: nodes/readfuncs.c:70
 msgid "toIntList: unexpected datatype"
 msgstr ""
 
-#: nodes/readfuncs.c:183
+#: nodes/readfuncs.c:104
 msgid "toOidList: unexpected datatype"
 msgstr ""
 
-#: nodes/readfuncs.c:518
+#: nodes/readfuncs.c:823
 #, c-format
-msgid "_readBoolExpr: unknown boolop \"%.*s\""
+msgid "_readExpr: unknown opType \"%.*s\""
 msgstr ""
 
-#: nodes/readfuncs.c:926
+#: nodes/readfuncs.c:2276
 #, c-format
-msgid "badly formatted node string \"%.32s\"..."
+msgid "badly formatted planstring \"%.10s\"..."
 msgstr ""
 
-#: nodes/readfuncs.c:959 nodes/readfuncs.c:991
+#: nodes/readfuncs.c:2309
+#: nodes/readfuncs.c:2341
 #, c-format
 msgid "readDatum: expected '%s', got '%s'; length = %lu"
 msgstr ""
 
-#: nodes/readfuncs.c:966
+#: nodes/readfuncs.c:2316
 #, c-format
 msgid "readDatum: byval & length = %lu"
 msgstr ""
@@ -6528,6 +6562,10 @@ msgstr ""
 msgid "edge_failure: no edge detected"
 msgstr ""
 
+#: optimizer/geqo/geqo_eval.c:139
+msgid "gimme_tree: failed to construct join rel"
+msgstr ""
+
 #: optimizer/geqo/geqo_main.c:123
 msgid "geqo_main: using edge recombination crossover [ERX]"
 msgstr ""
@@ -6570,7 +6608,7 @@ msgstr ""
 msgid "[GEQO] No mutations processed."
 msgstr ""
 
-#: optimizer/geqo/geqo_misc.c:41
+#: optimizer/geqo/geqo_misc.c:43
 msgid "avg_pool: pool_size of zero"
 msgstr ""
 
@@ -6578,12 +6616,12 @@ msgstr ""
 msgid "SELECT FOR UPDATE is not supported for inherit queries"
 msgstr ""
 
-#: optimizer/path/allpaths.c:616
+#: optimizer/path/allpaths.c:617
 #, c-format
 msgid "recurse_pushdown_safe: unexpected node %d"
 msgstr "recurse_pushdown_safe: неожиданный узел %d"
 
-#: optimizer/path/allpaths.c:684
+#: optimizer/path/allpaths.c:685
 #, c-format
 msgid "recurse_push_qual: unexpected node %d"
 msgstr "recurse_push_qual: неожиданный узел %d"
@@ -6593,59 +6631,59 @@ msgstr "recurse_push_qual: неожиданный узел %d"
 msgid "clause_selectivity: s1 %f"
 msgstr "clause_selectivity: s1 %f"
 
-#: optimizer/path/costsize.c:1461
+#: optimizer/path/costsize.c:1326
 #, c-format
 msgid "set_joinrel_size_estimates: unsupported join type %d"
 msgstr ""
 
-#: optimizer/path/indxpath.c:495
+#: optimizer/path/indxpath.c:509
 msgid "extract_or_indexqual_conditions: no matching clause"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1260
+#: optimizer/path/indxpath.c:1229
 msgid "pred_test_simple_clause: unknown test_op"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1301
+#: optimizer/path/indxpath.c:1258
 msgid "pred_test_simple_clause: null test result"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2084
+#: optimizer/path/indxpath.c:1903
 #, c-format
 msgid "prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2100
+#: optimizer/path/indxpath.c:1922
 #, c-format
 msgid "prefix_quals: no = operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2115
+#: optimizer/path/indxpath.c:1937
 #, c-format
 msgid "prefix_quals: no >= operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2131
+#: optimizer/path/indxpath.c:1953
 #, c-format
 msgid "prefix_quals: no < operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2177
+#: optimizer/path/indxpath.c:2000
 #, c-format
 msgid "network_prefix_quals: unexpected operator %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2190
+#: optimizer/path/indxpath.c:2013
 #, c-format
 msgid "network_prefix_quals: no %s operator for type %u"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2205
+#: optimizer/path/indxpath.c:2028
 #, c-format
 msgid "network_prefix_quals: no <= operator for type %u"
 msgstr ""
 
-#: optimizer/path/joinpath.c:170
+#: optimizer/path/joinpath.c:172
 #, c-format
 msgid "sort_inner_and_outer: unexpected join type %d"
 msgstr ""
@@ -6655,52 +6693,50 @@ msgstr ""
 msgid "match_unsorted_outer: unexpected join type %d"
 msgstr ""
 
-#: optimizer/path/joinpath.c:626
+#: optimizer/path/joinpath.c:602
 #, c-format
 msgid "match_unsorted_inner: unexpected join type %d"
 msgstr ""
 
-#: optimizer/path/joinrels.c:230
+#: optimizer/path/joinrels.c:226
 #, c-format
 msgid "make_rels_by_joins: failed to build any %d-way joins"
 msgstr ""
 
-#: optimizer/path/joinrels.c:385
+#: optimizer/path/joinrels.c:381
 #, c-format
 msgid "make_jointree_rel: unexpected node type %d"
 msgstr ""
 
-#: optimizer/path/joinrels.c:442
+#: optimizer/path/joinrels.c:438
 #, c-format
 msgid "make_join_rel: unsupported join type %d"
 msgstr ""
 
-#: optimizer/path/pathkeys.c:878
-msgid ""
-"make_pathkeys_for_mergeclauses: can't identify which side of mergeclause to "
-"use"
+#: optimizer/path/pathkeys.c:876
+msgid "make_pathkeys_for_mergeclauses: can't identify which side of mergeclause to use"
 msgstr ""
 
-#: optimizer/plan/createplan.c:150
+#: optimizer/plan/createplan.c:140
 #, c-format
 msgid "create_plan: unknown pathtype %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:228
+#: optimizer/plan/createplan.c:218
 #, c-format
 msgid "create_scan_plan: unknown node type: %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:310
+#: optimizer/plan/createplan.c:300
 #, c-format
 msgid "create_join_plan: unknown node type: %d"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1050
+#: optimizer/plan/createplan.c:1037
 msgid "fix_indxqual_sublist: indexqual clause is not binary opclause"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1139
+#: optimizer/plan/createplan.c:1126
 msgid "fix_indxqual_operand: var is not index attribute"
 msgstr ""
 
@@ -6708,6 +6744,29 @@ msgstr ""
 msgid "make_sort_from_pathkeys: cannot find tlist item to sort"
 msgstr ""
 
+#: optimizer/plan/subselect.c:147
+msgid "make_subplan: invalid expression structure (SubLink already processed?)"
+msgstr ""
+
+#: optimizer/plan/subselect.c:149
+msgid "make_subplan: invalid expression structure (subquery already processed?)"
+msgstr ""
+
+#: optimizer/plan/subselect.c:287
+#: optimizer/plan/subselect.c:436
+#, c-format
+msgid "cache lookup failed for operator %u"
+msgstr ""
+
+#: optimizer/plan/subselect.c:711
+#, c-format
+msgid "SS_finalize_plan: node %d unsupported"
+msgstr ""
+
+#: optimizer/plan/subselect.c:734
+msgid "SS_finalize_plan: plan shouldn't reference subplan's variable"
+msgstr ""
+
 #: optimizer/plan/initsplan.c:124
 msgid "SELECT FOR UPDATE cannot be applied to a join"
 msgstr ""
@@ -6717,7 +6776,8 @@ 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:501
+#: optimizer/plan/initsplan.c:307
+#: optimizer/plan/planner.c:461
 msgid "UNION JOIN is not implemented yet"
 msgstr ""
 
@@ -6732,173 +6792,157 @@ msgid "distribute_quals_to_rels: unexpected node type %d"
 msgstr ""
 
 #: optimizer/plan/initsplan.c:358
-msgid ""
-"SELECT FOR UPDATE cannot be applied to the nullable side of an OUTER JOIN"
+msgid "SELECT FOR UPDATE cannot be applied to the nullable side of an OUTER JOIN"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:452
+#: optimizer/plan/initsplan.c:453
 msgid "JOIN qualification may not refer to other relations"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:608
+#: optimizer/plan/initsplan.c:612
 msgid "distribute_qual_to_rels: can't cope with variable-free clause"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:750
+#: optimizer/plan/initsplan.c:754
 #, c-format
 msgid "Unable to identify an equality operator for types '%s' and '%s'"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:761
+#: optimizer/plan/initsplan.c:765
 #, c-format
-msgid ""
-"Equality operator for types '%s' and '%s' should be mergejoinable, but isn't"
+msgid "Equality operator for types '%s' and '%s' should be mergejoinable, but isn't"
 msgstr ""
 
-#: optimizer/plan/planmain.c:158
-msgid "query_planner: failed to construct a relation"
+#: optimizer/plan/planmain.c:224
+msgid "subplanner: failed to construct a relation"
 msgstr ""
 
-#: optimizer/plan/planner.c:504
+#: optimizer/plan/planner.c:464
 #, c-format
 msgid "pull_up_subqueries: unexpected join type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:510
+#: optimizer/plan/planner.c:470
 #, c-format
 msgid "pull_up_subqueries: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:531
+#: optimizer/plan/planner.c:491
 msgid "is_simple_subquery: subquery is bogus"
 msgstr ""
 
-#: optimizer/plan/planner.c:660
+#: optimizer/plan/planner.c:620
 #, c-format
 msgid "resolvenew_in_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:739
+#: optimizer/plan/planner.c:699
 #, c-format
 msgid "preprocess_jointree: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:832
+#: optimizer/plan/planner.c:811
 #, c-format
 msgid "preprocess_qual_conditions: unexpected node type %d"
 msgstr ""
 
-#: optimizer/plan/planner.c:945 parser/analyze.c:1780 parser/analyze.c:1953
-#: parser/analyze.c:2448
+#: optimizer/plan/planner.c:946
+#: parser/analyze.c:1776
+#: parser/analyze.c:1954
+#: parser/analyze.c:2452
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: optimizer/plan/planner.c:1007
+#: optimizer/plan/planner.c:999
 msgid "SELECT FOR UPDATE is not allowed in subselects"
 msgstr ""
 
-#: optimizer/plan/planner.c:1849 optimizer/plan/planner.c:1855
+#: optimizer/plan/planner.c:1603
+#: optimizer/plan/planner.c:1609
 msgid "postprocess_setop_tlist: resjunk output columns not implemented"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:210
+#: optimizer/plan/setrefs.c:215
 #, c-format
 msgid "set_plan_references: unknown plan type %d"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:472
+#: optimizer/plan/setrefs.c:458
 msgid "join_references: variable not in subplan target lists"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:532
+#: optimizer/plan/setrefs.c:519
 msgid "replace_vars_with_subplan_refs: variable not in subplan target list"
 msgstr ""
 
-#: optimizer/plan/subselect.c:445
-#, c-format
-msgid "cache lookup failed for operator %u"
-msgstr ""
-
-#: optimizer/plan/subselect.c:660
-#, c-format
-msgid "SS_finalize_plan: node %d unsupported"
-msgstr ""
-
-#: optimizer/plan/subselect.c:683
-msgid "SS_finalize_plan: plan shouldn't reference subplan's variable"
-msgstr ""
-
 #: optimizer/prep/preptlist.c:58
 msgid "preprocess_targetlist: subquery cannot be result relation"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:208
+#: optimizer/prep/preptlist.c:244
 msgid "expand_targetlist: unexpected command_type"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:238
+#: optimizer/prep/preptlist.c:274
 msgid "expand_targetlist: targetlist is not sorted correctly"
 msgstr ""
 
-#: optimizer/prep/prepunion.c:193
+#: optimizer/prep/prepunion.c:194
 #, c-format
 msgid "recurse_set_operations: unexpected node %d"
 msgstr ""
 
-#: optimizer/prep/prepunion.c:309
+#: optimizer/prep/prepunion.c:310
 msgid "generate_nonunion_plan: bogus operation code"
 msgstr ""
 
-#: optimizer/util/clauses.c:700
+#: optimizer/util/clauses.c:81
 #, c-format
-msgid "Sub-SELECT uses un-GROUPed attribute %s.%s from outer query"
+msgid "make_clause: unsupported type %d"
 msgstr ""
 
-#: optimizer/util/clauses.c:1123
-msgid "CommuteClause: applied to non-binary-operator clause"
+#: optimizer/util/clauses.c:445
+msgid "Aggregate function calls may not be nested"
 msgstr ""
 
-#: optimizer/util/clauses.c:1128
+#: optimizer/util/clauses.c:718
 #, c-format
-msgid "CommuteClause: no commutator for operator %u"
+msgid "Sub-SELECT uses un-GROUPed attribute %s.%s from outer query"
 msgstr ""
 
-#: optimizer/util/clauses.c:1481
-#, c-format
-msgid "eval_const_expressions: unexpected boolop %d"
+#: optimizer/util/clauses.c:1062
+msgid "CommuteClause: applied to non-binary-operator clause"
 msgstr ""
 
-#: optimizer/util/clauses.c:1654 utils/cache/lsyscache.c:598
-#: utils/cache/lsyscache.c:619 utils/cache/lsyscache.c:640
-#: utils/cache/lsyscache.c:661
+#: optimizer/util/clauses.c:1070
 #, c-format
-msgid "Function OID %u does not exist"
+msgid "CommuteClause: no commutator for operator %u"
 msgstr ""
 
-#: optimizer/util/clauses.c:1871
+#: optimizer/util/clauses.c:1395
 #, c-format
-msgid "inline_function: null prosrc for procedure %u"
+msgid "eval_const_expressions: unexpected opType %d"
 msgstr ""
 
-#: optimizer/util/clauses.c:2031
-msgid "substitute_actual_parameters_mutator: unexpected paramkind"
-msgstr ""
-
-#: optimizer/util/clauses.c:2033
-msgid "substitute_actual_parameters_mutator: unexpected paramid"
+#: optimizer/util/clauses.c:1631
+#: utils/cache/lsyscache.c:581
+#: utils/cache/lsyscache.c:602
+#: utils/cache/lsyscache.c:623
+#, c-format
+msgid "Function OID %u does not exist"
 msgstr ""
 
-#: optimizer/util/clauses.c:2339
+#: optimizer/util/clauses.c:1981
 #, c-format
 msgid "expression_tree_walker: Unexpected node type %d"
 msgstr ""
 
-#: optimizer/util/clauses.c:2740
+#: optimizer/util/clauses.c:2371
 #, c-format
 msgid "expression_tree_mutator: Unexpected node type %d"
 msgstr ""
 
-#: optimizer/util/pathnode.c:126
+#: optimizer/util/pathnode.c:125
 msgid "Unable to devise a query plan for the given query"
 msgstr ""
 
@@ -6907,17 +6951,17 @@ msgstr ""
 msgid "get_relation_info: Relation %u not found"
 msgstr ""
 
-#: optimizer/util/plancat.c:225
+#: optimizer/util/plancat.c:221
 #, c-format
 msgid "restriction_selectivity: bad value %f"
 msgstr ""
 
-#: optimizer/util/plancat.c:258
+#: optimizer/util/plancat.c:254
 #, c-format
 msgid "join_selectivity: bad value %f"
 msgstr ""
 
-#: optimizer/util/plancat.c:330
+#: optimizer/util/plancat.c:326
 #, c-format
 msgid "has_subclass: Relation %u not found"
 msgstr ""
@@ -6934,450 +6978,575 @@ msgstr ""
 msgid "build_other_rel: rel already exists as base rel"
 msgstr ""
 
-#: optimizer/util/relnode.c:181
+#: optimizer/util/relnode.c:180
 #, c-format
 msgid "make_base_rel: unsupported RTE kind %d"
 msgstr ""
 
-#: optimizer/util/relnode.c:217
+#: optimizer/util/relnode.c:216
 #, c-format
 msgid "find_base_rel: no relation entry for relid %d"
 msgstr ""
 
 #: optimizer/util/tlist.c:239
+msgid "get_sortgroupclause_tle: ORDER/GROUP BY expression not found in targetlist"
+msgstr ""
+
+#: parser/parse_clause.c:195
+msgid "Bogus InhOption value"
+msgstr ""
+
+#: parser/parse_clause.c:342
+#, c-format
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+msgstr ""
+
+#: parser/parse_clause.c:401
+msgid "sub-select in FROM must have an alias"
+msgstr ""
+
+#: parser/parse_clause.c:425
+#: parser/parse_clause.c:428
+msgid "Unexpected parse analysis result for subselect in FROM"
+msgstr ""
+
+#: parser/parse_clause.c:431
+msgid "Expected SELECT query from subselect in FROM"
+msgstr ""
+
+#: parser/parse_clause.c:433
+msgid "Subselect in FROM may not have SELECT INTO"
+msgstr ""
+
+#: parser/parse_clause.c:494
+msgid "FROM function expression may not refer to other relations of same query level"
+msgstr ""
+
+#: parser/parse_clause.c:503
+msgid "cannot use aggregate function in FROM function expression"
+msgstr ""
+
+#: parser/parse_clause.c:527
+msgid "Coercion function not allowed in FROM clause"
+msgstr ""
+
+#: parser/parse_clause.c:637
+#: parser/parse_clause.c:649
+msgid "transformFromClauseItem: unexpected subtree type"
+msgstr ""
+
+#: parser/parse_clause.c:732
+#, c-format
+msgid "USING column name \"%s\" appears more than once"
+msgstr ""
+
+#: parser/parse_clause.c:744
+#, c-format
+msgid "Common column name \"%s\" appears more than once in left table"
+msgstr ""
+
+#: parser/parse_clause.c:750
+#, c-format
+msgid "JOIN/USING column \"%s\" not found in left table"
+msgstr ""
+
+#: parser/parse_clause.c:762
+#, c-format
+msgid "Common column name \"%s\" appears more than once in right table"
+msgstr ""
+
+#: parser/parse_clause.c:768
+#, c-format
+msgid "JOIN/USING column \"%s\" not found in right table"
+msgstr ""
+
+#: parser/parse_clause.c:817
+#, c-format
+msgid "Column alias list for \"%s\" has too many entries"
+msgstr ""
+
+#: parser/parse_clause.c:844
+#, c-format
 msgid ""
-"get_sortgroupclause_tle: ORDER/GROUP BY expression not found in targetlist"
+"transformFromClauseItem: unexpected node (internal error)\n"
+"\t%s"
+msgstr ""
+
+#: parser/parse_clause.c:955
+#, c-format
+msgid "buildMergedJoinVar: unexpected jointype %d"
+msgstr ""
+
+#: parser/parse_clause.c:1076
+#, c-format
+msgid "%s '%s' is ambiguous"
+msgstr ""
+
+#: parser/parse_clause.c:1095
+#, c-format
+msgid "Non-integer constant in %s"
 msgstr ""
 
-#: parser/analyze.c:256
+#: parser/parse_clause.c:1108
+#, c-format
+msgid "%s position %d is not in target list"
+msgstr ""
+
+#: parser/parse_clause.c:1250
+msgid "For SELECT DISTINCT, ORDER BY expressions must appear in target list"
+msgstr "Для SELECT DISTINCT, выражения ORDER BY обязаны быть в списке назназчения"
+
+#: parser/parse_clause.c:1288
+msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgstr "Выражения SELECT DISTINCT ON должны совпадать с изначальными выпражениями ORDER BY"
+
+#: parser/parse_clause.c:1312
+msgid "transformDistinctClause: failed to add DISTINCT ON clause to target list"
+msgstr ""
+
+#: parser/analyze.c:258
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW указывает больше имён колонок чем имеется"
 
-#: parser/analyze.c:447
+#: parser/analyze.c:449
 msgid "INSERT ... SELECT may not specify INTO"
 msgstr "INSERT ... SELECT не могут указывать INTO"
 
-#: parser/analyze.c:535
+#: parser/analyze.c:532
 msgid "INSERT has more expressions than target columns"
 msgstr ""
 
-#: parser/analyze.c:569
+#: parser/analyze.c:564
 msgid "INSERT has more target columns than expressions"
 msgstr ""
 
-#: parser/analyze.c:765
+#: parser/analyze.c:760
 msgid "parser: unrecognized node (internal error)"
 msgstr ""
 
-#: parser/analyze.c:847
+#: parser/analyze.c:842
 #, c-format
 msgid "%s will create implicit sequence '%s' for SERIAL column '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:928 parser/analyze.c:936
+#: parser/analyze.c:923
+#: parser/analyze.c:931
 #, c-format
 msgid "%s/(NOT) NULL conflicting declaration for '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:944
+#: parser/analyze.c:939
 #, c-format
 msgid "%s/DEFAULT multiple values specified for '%s.%s'"
 msgstr ""
 
-#: parser/analyze.c:986 parser/analyze.c:1025
+#: parser/analyze.c:981
+#: parser/analyze.c:1020
 msgid "parser: unrecognized constraint (internal error)"
 msgstr ""
 
-#: parser/analyze.c:1021
+#: parser/analyze.c:1016
 msgid "parser: illegal context for constraint (internal error)"
 msgstr ""
 
-#: parser/analyze.c:1065
+#: parser/analyze.c:1060
 #, c-format
 msgid "%s / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
 msgstr ""
 
-#: parser/analyze.c:1133
+#: parser/analyze.c:1128
 #, c-format
 msgid "inherited table \"%s\" is not a relation"
 msgstr ""
 
-#: parser/analyze.c:1162
+#: parser/analyze.c:1157
 #, c-format
-msgid ""
-"inherited attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
-"NOT NULL"
+msgid "inherited attribute \"%s\" cannot be a PRIMARY KEY because it is not marked NOT NULL"
 msgstr ""
 
-#: parser/analyze.c:1188
+#: parser/analyze.c:1183
 #, c-format
-msgid ""
-"Existing attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
-"NOT NULL"
+msgid "Existing attribute \"%s\" cannot be a PRIMARY KEY because it is not marked NOT NULL"
 msgstr ""
 
-#: parser/analyze.c:1195
+#: parser/analyze.c:1190
 #, c-format
 msgid "%s: column \"%s\" named in key does not exist"
 msgstr ""
 
-#: parser/analyze.c:1203
+#: parser/analyze.c:1198
 #, c-format
 msgid "%s: column \"%s\" appears twice in %s constraint"
 msgstr ""
 
-#: parser/analyze.c:1293
+#: parser/analyze.c:1288
 #, c-format
 msgid "%s: failed to make implicit index name"
 msgstr "%s: не удалось создать имя дла неявного индекса"
 
-#: parser/analyze.c:1296
+#: parser/analyze.c:1291
 #, 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:1306
 #, c-format
 msgid "%s will create implicit trigger(s) for FOREIGN KEY check(s)"
 msgstr "%s создаст неявный(е) триггер(а) для проверки на FOREIGN KEY"
 
-#: parser/analyze.c:1452 parser/analyze.c:1574
+#: parser/analyze.c:1448
+#: parser/analyze.c:1570
 #, c-format
 msgid "transformRuleStmt: unexpected event type %d"
 msgstr ""
 
-#: parser/analyze.c:1461
+#: parser/analyze.c:1457
 msgid "Rule WHERE condition may not contain references to other relations"
 msgstr ""
 
-#: parser/analyze.c:1465
+#: parser/analyze.c:1461
 msgid "Rule WHERE condition may not contain aggregate functions"
 msgstr ""
 
-#: parser/analyze.c:1534
-msgid ""
-"Rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE "
-"actions"
+#: parser/analyze.c:1530
+msgid "Rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr ""
 
-#: parser/analyze.c:1558
+#: parser/analyze.c:1554
 msgid "ON SELECT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1560
+#: parser/analyze.c:1556
 msgid "ON SELECT rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1567
+#: parser/analyze.c:1563
 msgid "ON INSERT rule may not use OLD"
 msgstr ""
 
-#: parser/analyze.c:1571
+#: parser/analyze.c:1567
 msgid "ON DELETE rule may not use NEW"
 msgstr ""
 
-#: parser/analyze.c:1636 parser/analyze.c:1844
+#: parser/analyze.c:1632
+#: parser/analyze.c:1845
 msgid "DECLARE CURSOR must not specify INTO"
 msgstr ""
 
-#: parser/analyze.c:1638 parser/analyze.c:1846
+#: parser/analyze.c:1634
+#: parser/analyze.c:1847
 msgid ""
 "DECLARE/UPDATE is not supported\n"
 "\tCursors must be READ ONLY"
 msgstr ""
 
-#: parser/analyze.c:1914
-msgid ""
-"ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result "
-"columns"
+#: parser/analyze.c:1915
+msgid "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result columns"
 msgstr ""
 
-#: parser/analyze.c:1948
+#: parser/analyze.c:1949
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:1950
+#: parser/analyze.c:1951
 msgid "Portal may not appear in UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:2044
+#: parser/analyze.c:2045
 #, c-format
 msgid "Each %s query must have the same number of columns"
 msgstr ""
 
-#: parser/analyze.c:2102
+#: parser/analyze.c:2103
 #, c-format
 msgid "getSetColTypes: unexpected node %d"
 msgstr "getSetColTypes: не ожиданный узел %d"
 
-#: parser/analyze.c:2113
+#: parser/analyze.c:2114
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr "CREATE TABLE AS указывает слишком много имён для колонки"
 
-#: parser/analyze.c:2196 parser/analyze.c:2205
+#: parser/analyze.c:2197
+#: parser/analyze.c:2206
 msgid "UPDATE target count mismatch --- internal error"
 msgstr "UPDATE target: не совпадение счёчика --- внутренняя ошибка"
 
-#: parser/analyze.c:2291
+#: parser/analyze.c:2292
 msgid "Unexpected node type in ALTER TABLE ADD CONSTRAINT"
 msgstr ""
 
-#: parser/analyze.c:2374
+#: parser/analyze.c:2376
 msgid "transformPrepareStmt: internal error"
 msgstr ""
 
-#: parser/analyze.c:2401
+#: parser/analyze.c:2403
 #, c-format
 msgid "Wrong number of parameters, expected %d but got %d"
 msgstr ""
 
-#: parser/analyze.c:2414
+#: parser/analyze.c:2416
 msgid "Cannot use subselects in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2416
+#: parser/analyze.c:2418
 msgid "Cannot use aggregates in EXECUTE parameters"
 msgstr ""
 
-#: parser/analyze.c:2427
+#: parser/analyze.c:2429
 #, 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:2450
+#: parser/analyze.c:2454
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr ""
 
-#: parser/analyze.c:2452
+#: parser/analyze.c:2456
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr ""
 
-#: parser/analyze.c:2454
+#: parser/analyze.c:2458
 msgid "SELECT FOR UPDATE is not allowed with AGGREGATE"
 msgstr ""
 
-#: parser/analyze.c:2519
+#: parser/analyze.c:2523
 #, c-format
 msgid "FOR UPDATE: relation \"%s\" not found in FROM clause"
 msgstr ""
 
-#: parser/analyze.c:2559
+#: parser/analyze.c:2563
 #, c-format
 msgid "relationHasPrimaryKey: index %u not found"
 msgstr ""
 
-#: parser/analyze.c:2610
+#: parser/analyze.c:2614
 msgid "Misplaced DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2612 parser/analyze.c:2621
+#: parser/analyze.c:2616
+#: parser/analyze.c:2625
 msgid "Multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:2619
+#: parser/analyze.c:2623
 msgid "Misplaced NOT DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2626 parser/analyze.c:2644 gram.y:2150 gram.y:2164
+#: parser/analyze.c:2630
+#: parser/analyze.c:2648
 msgid "INITIALLY DEFERRED constraint must be DEFERRABLE"
 msgstr ""
 
-#: parser/analyze.c:2631
+#: parser/analyze.c:2635
 msgid "Misplaced INITIALLY DEFERRED clause"
 msgstr ""
 
-#: parser/analyze.c:2633 parser/analyze.c:2651
+#: parser/analyze.c:2637
+#: parser/analyze.c:2655
 msgid "Multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:2649
+#: parser/analyze.c:2653
 msgid "Misplaced INITIALLY IMMEDIATE clause"
 msgstr ""
 
-#: parser/analyze.c:2758
+#: parser/analyze.c:2762
 #, c-format
-msgid ""
-"New table specifies a schema (%s) different from the one being created (%s)"
+msgid "New table specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:2777
+#: parser/analyze.c:2781
 #, c-format
-msgid ""
-"New view specifies a schema (%s) different from the one being created (%s)"
+msgid "New view specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/analyze.c:2794
+#: parser/analyze.c:2798
 msgid "parser: unsupported schema node (internal error)"
 msgstr ""
 
-#: parser/parse_agg.c:112
+#: parser/parse_agg.c:113
 #, c-format
 msgid "Attribute %s.%s must be GROUPed or used in an aggregate function"
 msgstr ""
 
-#: parser/parse_agg.c:150
+#: parser/parse_agg.c:153
 msgid "Aggregates not allowed in WHERE clause"
 msgstr ""
 
-#: parser/parse_agg.c:152
+#: parser/parse_agg.c:155
 msgid "Aggregates not allowed in JOIN conditions"
 msgstr ""
 
-#: parser/parse_agg.c:168
+#: parser/parse_agg.c:171
 msgid "Aggregates not allowed in GROUP BY clause"
 msgstr ""
 
-#: parser/parse_clause.c:195
-msgid "Bogus InhOption value"
+#: parser/parse_relation.c:169
+#: parser/parse_relation.c:181
+#, c-format
+msgid "Table reference \"%s\" is ambiguous"
 msgstr ""
 
-#: parser/parse_clause.c:342
+#: parser/parse_relation.c:185
 #, c-format
-msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
+msgid "scanNameSpaceForRefname: unexpected node type %d"
 msgstr ""
 
-#: parser/parse_clause.c:401
-msgid "sub-select in FROM must have an alias"
+#: parser/parse_relation.c:239
+#: parser/parse_relation.c:251
+#, c-format
+msgid "Table reference %u is ambiguous"
 msgstr ""
 
-#: parser/parse_clause.c:425 parser/parse_clause.c:428
-msgid "Unexpected parse analysis result for subselect in FROM"
-msgstr ""
+#: parser/parse_relation.c:255
+#, c-format
+msgid "scanNameSpaceForRelid: unexpected node type %d"
+msgstr "scanNameSpaceForRelid: неожиданный тип узла %d"
 
-#: parser/parse_clause.c:431
-msgid "Expected SELECT query from subselect in FROM"
+#: parser/parse_relation.c:319
+#, c-format
+msgid "checkNameSpaceConflicts: unexpected node type %d"
 msgstr ""
 
-#: parser/parse_clause.c:433
-msgid "Subselect in FROM may not have SELECT INTO"
-msgstr ""
+#: parser/parse_relation.c:342
+#: parser/parse_relation.c:352
+#, c-format
+msgid "Table name \"%s\" specified more than once"
+msgstr "Имя таблицы \"%s\" указано больше одного раза"
 
-#: parser/parse_clause.c:494
-msgid ""
-"FROM function expression may not refer to other relations of same query level"
-msgstr ""
+#: parser/parse_relation.c:373
+#, c-format
+msgid "scanNameSpaceForConflict: unexpected node type %d"
+msgstr "scanNameSpaceForConflict: неожиданный узла %d"
 
-#: parser/parse_clause.c:503
-msgid "cannot use aggregate function in FROM function expression"
+#: parser/parse_relation.c:408
+msgid "RTERangeTablePosn: RTE not found (internal error)"
 msgstr ""
 
-#: parser/parse_clause.c:626 parser/parse_clause.c:638
-msgid "transformFromClauseItem: unexpected subtree type"
+#: parser/parse_relation.c:460
+#: parser/parse_relation.c:553
+#, c-format
+msgid "Column reference \"%s\" is ambiguous"
 msgstr ""
 
-#: parser/parse_clause.c:721
+#: parser/parse_relation.c:547
 #, c-format
-msgid "USING column name \"%s\" appears more than once"
+msgid "colnameToVar: unexpected node type %d"
 msgstr ""
 
-#: parser/parse_clause.c:733
+#: parser/parse_relation.c:646
+#: parser/parse_relation.c:739
+#: parser/parse_relation.c:832
+#: parser/parse_relation.c:946
 #, c-format
-msgid "Common column name \"%s\" appears more than once in left table"
+msgid "Table \"%s\" has %d columns available but %d columns specified"
 msgstr ""
 
-#: parser/parse_clause.c:739
-#, c-format
-msgid "JOIN/USING column \"%s\" not found in left table"
+#: parser/parse_relation.c:907
+msgid "A column definition list is only allowed for functions returning RECORD"
 msgstr ""
 
-#: parser/parse_clause.c:751
-#, c-format
-msgid "Common column name \"%s\" appears more than once in right table"
+#: parser/parse_relation.c:916
+msgid "A column definition list is required for functions returning RECORD"
 msgstr ""
 
-#: parser/parse_clause.c:757
+#: parser/parse_relation.c:972
 #, c-format
-msgid "JOIN/USING column \"%s\" not found in right table"
+msgid "Too many column aliases specified for function %s"
 msgstr ""
 
-#: parser/parse_clause.c:806
+#: parser/parse_relation.c:993
 #, c-format
-msgid "Column alias list for \"%s\" has too many entries"
+msgid "Unknown kind of return type specified for function %s"
 msgstr ""
 
-#: parser/parse_clause.c:833
+#: parser/parse_relation.c:1425
 #, c-format
-msgid ""
-"transformFromClauseItem: unexpected node (internal error)\n"
-"\t%s"
+msgid "expandRTE: unsupported RTE kind %d"
 msgstr ""
 
-#: parser/parse_clause.c:944
+#: parser/parse_relation.c:1515
 #, c-format
-msgid "buildMergedJoinVar: unexpected jointype %d"
+msgid "Invalid attnum %d for rangetable entry %s"
 msgstr ""
 
-#: parser/parse_clause.c:1065
+#: parser/parse_relation.c:1542
+#: parser/parse_relation.c:1605
+#: parser/parse_relation.c:1683
 #, c-format
-msgid "%s '%s' is ambiguous"
-msgstr ""
+msgid "Relation \"%s\" does not have attribute %d"
+msgstr "Связь \"%s\" не имеет атрибута %d"
 
-#: parser/parse_clause.c:1084
+#: parser/parse_relation.c:1574
 #, c-format
-msgid "Non-integer constant in %s"
+msgid "Subquery %s does not have attribute %d"
 msgstr ""
 
-#: parser/parse_clause.c:1097
+#: parser/parse_relation.c:1655
 #, c-format
-msgid "%s position %d is not in target list"
+msgid "get_rte_attribute_type: unsupported RTE kind %d"
 msgstr ""
 
-#: parser/parse_clause.c:1238
-msgid "For SELECT DISTINCT, ORDER BY expressions must appear in target list"
+#: parser/parse_relation.c:1716
+#, c-format
+msgid "Relation %s does not have attribute %d"
 msgstr ""
-"Для SELECT DISTINCT, выражения ORDER BY обязаны быть в списке назназчения"
 
-#: parser/parse_clause.c:1276
-msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+#: parser/parse_relation.c:1732
+#, c-format
+msgid "get_rte_attribute_is_dropped: unsupported RTE kind %d"
 msgstr ""
-"Выражения SELECT DISTINCT ON должны совпадать с изначальными выпражениями "
-"ORDER BY"
 
-#: parser/parse_clause.c:1300
-msgid ""
-"transformDistinctClause: failed to add DISTINCT ON clause to target list"
-msgstr ""
+#: parser/parse_relation.c:1815
+#, c-format
+msgid "attnumAttName: invalid attribute number %d"
+msgstr "attnumAttName: неверный номер атрибута: %d"
+
+#: parser/parse_relation.c:1837
+#, c-format
+msgid "attnumTypeId: invalid attribute number %d"
+msgstr "attnumTypeId: неверный номер атрибута: %d"
 
-#: parser/parse_coerce.c:291
+#: parser/parse_relation.c:1864
+#, c-format
+msgid "Adding missing FROM-clause entry%s for table \"%s\""
+msgstr "Добавление отсутсвующей записи%s FROM-выражения для таблицы \"%s\""
+
+#: parser/parse_coerce.c:268
 #, c-format
 msgid "coerce_type: no conversion function from %s to %s"
 msgstr "coerce_type: фунции конверсии из %s в %s не обнаружено"
 
-#: parser/parse_coerce.c:423
+#: parser/parse_coerce.c:394
 #, c-format
 msgid "coerce_type_constraints: failed to lookup type %u"
 msgstr "coerce_type_constraints: тип %u не найден"
 
-#: parser/parse_coerce.c:454
-#, c-format
-msgid "coerce_type_constraints: domain %s constraint %s has NULL conbin"
-msgstr ""
-
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:607
+#: parser/parse_coerce.c:532
 #, 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:615
+#: parser/parse_coerce.c:540
 #, c-format
 msgid "Argument of %s must not be a set function"
 msgstr ""
 
-#: parser/parse_coerce.c:662
+#: parser/parse_coerce.c:587
 #, c-format
 msgid "%s types '%s' and '%s' not matched"
 msgstr "%s типы '%s' и '%s' не совпадают"
 
-#: parser/parse_coerce.c:714
+#: parser/parse_coerce.c:639
 #, c-format
 msgid "%s unable to convert to type %s"
 msgstr "%s не в состоянии сконвертировать в тип %s"
 
-#: parser/parse_coerce.c:996
+#: parser/parse_coerce.c:921
 #, c-format
 msgid "find_coercion_pathway: bogus castcontext %c"
 msgstr ""
@@ -7392,81 +7561,77 @@ msgstr ""
 msgid "Parameter '$%d' is out of range"
 msgstr ""
 
-#: parser/parse_expr.c:273
-msgid "IS DISTINCT FROM requires = operator to yield boolean"
-msgstr ""
-
-#: parser/parse_expr.c:355 parser/parse_expr.c:359
+#: parser/parse_expr.c:358
+#: parser/parse_expr.c:362
 msgid "Bad query in subselect"
 msgstr ""
 
-#: 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 ""
 
-#: 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"
+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:476
+#: parser/parse_expr.c:475
 msgid "Subselect has too few fields"
 msgstr ""
 
-#: parser/parse_expr.c:620
+#: 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:763
+#: parser/parse_expr.c:744
 #, c-format
 msgid "Attribute \"%s\" not found"
 msgstr "Атрибут \"%s\" не найден"
 
-#: parser/parse_expr.c:875 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:935
+#: parser/parse_expr.c:913
 msgid "exprType: Cannot get type for untransformed sublink"
 msgstr ""
 
-#: parser/parse_expr.c:977
+#: parser/parse_expr.c:946
 #, c-format
 msgid "Relation reference \"%s\" cannot be used in an expression"
 msgstr ""
 
-#: parser/parse_expr.c:982
+#: parser/parse_expr.c:951
 #, c-format
 msgid "exprType: Do not know how to get type for %d node"
 msgstr "exprType: Не известно как извлечь тип для узла %d"
 
-#: parser/parse_expr.c:1151
+#: parser/parse_expr.c:1121
 #, c-format
 msgid "Cannot cast type %s to %s"
 msgstr "Нельзя конвертировать тип %s в %s"
@@ -7511,77 +7676,78 @@ msgstr ""
 msgid "Attribute \"%s\" not found in datatype %s"
 msgstr ""
 
-#: parser/parse_func.c:342
+#: parser/parse_func.c:348
 msgid "Aggregates may not return sets"
 msgstr ""
 
-#: parser/parse_func.c:1257
+#: parser/parse_func.c:1291
 #, c-format
 msgid "No such attribute %s.%s.%s"
 msgstr "%s.%s.%s: нет такого атрибута"
 
-#: parser/parse_func.c:1260
+#: parser/parse_func.c:1294
 #, c-format
 msgid "No such attribute %s.%s"
 msgstr "%s.%s: нет такого атрибута"
 
-#: parser/parse_func.c:1287
+#: parser/parse_func.c:1321
 #, c-format
 msgid "Function %s(%s) does not exist%s%s"
 msgstr "Функция %s(%s) не существует %s%s"
 
-#: parser/parse_func.c:1293
+#: parser/parse_func.c:1327
 #, c-format
 msgid "%s: function %s(%s) does not exist%s%s"
 msgstr "%s: функция %s(%s) не существует %s%s"
 
-#: parser/parse_func.c:1319
+#: parser/parse_func.c:1353
 #, c-format
 msgid "%s: aggregate %s(*) does not exist"
 msgstr "%s: агрегат %s(*) не существует"
 
-#: parser/parse_func.c:1322
+#: parser/parse_func.c:1356
 #, c-format
 msgid "%s: aggregate %s(%s) does not exist"
 msgstr "%s: агрегат %s(%s) не существует"
 
-#: parser/parse_func.c:1338
+#: parser/parse_func.c:1372
 #, c-format
 msgid "%s: function %s(*) is not an aggregate"
 msgstr ""
 
-#: parser/parse_func.c:1341
+#: parser/parse_func.c:1375
 #, c-format
 msgid "%s: function %s(%s) is not an aggregate"
 msgstr ""
 
-#: parser/parse_node.c:211
+#: parser/parse_node.c:217
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array type %u"
 msgstr ""
 
-#: parser/parse_node.c:217
+#: parser/parse_node.c:223
 #, c-format
 msgid "transformArraySubscripts: type %s is not an array"
 msgstr ""
 
-#: parser/parse_node.c:225
+#: parser/parse_node.c:231
 #, c-format
 msgid "transformArraySubscripts: Cache lookup failed for array element type %u"
 msgstr ""
 
-#: parser/parse_node.c:282 parser/parse_node.c:302
+#: parser/parse_node.c:288
+#: parser/parse_node.c:310
 msgid "array index expressions must be integers"
 msgstr ""
 
-#: parser/parse_node.c:321
+#: parser/parse_node.c:329
 #, c-format
 msgid ""
 "Array assignment requires type %s but expression is of type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: parser/parse_node.c:431
+#: parser/parse_node.c:439
 #, c-format
 msgid "make_const: unknown type %d"
 msgstr ""
@@ -7601,191 +7767,62 @@ msgstr "%s: Postfix-оператор '%s' для типа '%s' не существует"
 msgid "%s: Operator '%s' for types '%s' and '%s' does not exist"
 msgstr "%s: Оператор '%s' для типов '%s' и '%s' не существует"
 
-#: parser/parse_oper.c:166
-#, c-format
-msgid "Unable to identify an equality operator for type %s"
-msgstr ""
-
-#: parser/parse_oper.c:204
+#: parser/parse_oper.c:143
 #, c-format
 msgid ""
-"Unable to identify an ordering operator for type %s\n"
+"Unable to identify an ordering operator '%s' for type '%s'\n"
 "\tUse an explicit ordering operator or modify the query"
 msgstr ""
 
-#: parser/parse_oper.c:966
+#: 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:971
+#: 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:975
+#: 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:991
+#: 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:995
+#: 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:1002
+#: 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:1006
+#: parser/parse_oper.c:934
 #, c-format
 msgid ""
 "Unable to identify a postfix operator '%s' for type '%s'\n"
 "\tYou may need to add parentheses or an explicit cast"
 msgstr ""
 
-#: parser/parse_relation.c:169 parser/parse_relation.c:181
-#, c-format
-msgid "Table reference \"%s\" is ambiguous"
-msgstr ""
-
-#: parser/parse_relation.c:185
-#, c-format
-msgid "scanNameSpaceForRefname: unexpected node type %d"
-msgstr ""
-
-#: parser/parse_relation.c:239 parser/parse_relation.c:251
-#, c-format
-msgid "Table reference %u is ambiguous"
-msgstr ""
-
-#: parser/parse_relation.c:255
-#, c-format
-msgid "scanNameSpaceForRelid: unexpected node type %d"
-msgstr "scanNameSpaceForRelid: неожиданный тип узла %d"
-
-#: parser/parse_relation.c:319
-#, c-format
-msgid "checkNameSpaceConflicts: unexpected node type %d"
-msgstr ""
-
-#: parser/parse_relation.c:342 parser/parse_relation.c:352
-#, c-format
-msgid "Table name \"%s\" specified more than once"
-msgstr "Имя таблицы \"%s\" указано больше одного раза"
-
-#: parser/parse_relation.c:373
-#, c-format
-msgid "scanNameSpaceForConflict: unexpected node type %d"
-msgstr "scanNameSpaceForConflict: неожиданный узла %d"
-
-#: parser/parse_relation.c:408
-msgid "RTERangeTablePosn: RTE not found (internal error)"
-msgstr ""
-
-#: parser/parse_relation.c:460 parser/parse_relation.c:553
-#, c-format
-msgid "Column reference \"%s\" is ambiguous"
-msgstr ""
-
-#: parser/parse_relation.c:547
-#, c-format
-msgid "colnameToVar: unexpected node type %d"
-msgstr ""
-
-#: parser/parse_relation.c:646 parser/parse_relation.c:739
-#: parser/parse_relation.c:832 parser/parse_relation.c:946
-#, c-format
-msgid "Table \"%s\" has %d columns available but %d columns specified"
-msgstr ""
-
-#: parser/parse_relation.c:907
-msgid "A column definition list is only allowed for functions returning RECORD"
-msgstr ""
-
-#: parser/parse_relation.c:916
-msgid "A column definition list is required for functions returning RECORD"
-msgstr ""
-
-#: parser/parse_relation.c:972
-#, c-format
-msgid "Too many column aliases specified for function %s"
-msgstr ""
-
-#: parser/parse_relation.c:993
-#, c-format
-msgid "Unknown kind of return type specified for function %s"
-msgstr ""
-
-#: parser/parse_relation.c:1425
-#, c-format
-msgid "expandRTE: unsupported RTE kind %d"
-msgstr ""
-
-#: parser/parse_relation.c:1515
-#, c-format
-msgid "Invalid attnum %d for rangetable entry %s"
-msgstr ""
-
-#: 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 "Связь \"%s\" не имеет атрибута %d"
-
-#: parser/parse_relation.c:1574
-#, c-format
-msgid "Subquery %s does not have attribute %d"
-msgstr ""
-
-#: parser/parse_relation.c:1655
-#, c-format
-msgid "get_rte_attribute_type: unsupported RTE kind %d"
-msgstr ""
-
-#: parser/parse_relation.c:1716
-#, c-format
-msgid "Relation %s does not have attribute %d"
-msgstr ""
-
-#: parser/parse_relation.c:1732
-#, c-format
-msgid "get_rte_attribute_is_dropped: unsupported RTE kind %d"
-msgstr ""
-
-#: parser/parse_relation.c:1815
-#, c-format
-msgid "attnumAttName: invalid attribute number %d"
-msgstr "attnumAttName: неверный номер атрибута: %d"
-
-#: parser/parse_relation.c:1837
-#, c-format
-msgid "attnumTypeId: invalid attribute number %d"
-msgstr "attnumTypeId: неверный номер атрибута: %d"
-
-#: parser/parse_relation.c:1864
-#, c-format
-msgid "Adding missing FROM-clause entry%s for table \"%s\""
-msgstr "Добавление отсутсвующей записи%s FROM-выражения для таблицы \"%s\""
-
 #: parser/parse_target.c:62
 msgid "You can't use relation names alone in the target list, try relation.*."
 msgstr ""
@@ -7795,26 +7832,26 @@ msgstr ""
 msgid "Cannot assign to system attribute '%s'"
 msgstr ""
 
-#: parser/parse_target.c:298
+#: parser/parse_target.c:297
 #, c-format
 msgid ""
 "column \"%s\" is of type %s but expression is of type %s\n"
 "\tYou will need to rewrite or cast the expression"
 msgstr ""
 
-#: parser/parse_target.c:371
+#: parser/parse_target.c:370
 #, c-format
 msgid "Attribute '%s' specified more than once"
 msgstr ""
 
-#: parser/parse_target.c:406
+#: parser/parse_target.c:405
 #, c-format
 msgid ""
 "ExpandAllTables: unexpected node (internal error)\n"
 "\t%s"
 msgstr ""
 
-#: parser/parse_target.c:424
+#: parser/parse_target.c:423
 msgid "Wildcard with no tables specified not allowed"
 msgstr ""
 
@@ -7833,8 +7870,9 @@ msgstr ""
 msgid "%s converted to %s"
 msgstr ""
 
-#: parser/parse_type.c:194 parser/parse_type.c:222
-#: utils/cache/lsyscache.c:1265
+#: parser/parse_type.c:194
+#: parser/parse_type.c:222
+#: utils/cache/lsyscache.c:1229
 #, c-format
 msgid "Type \"%s\" is only a shell"
 msgstr ""
@@ -7858,281 +7896,24 @@ msgstr "typeidOutfunc: Не верный тип - OID = %u"
 msgid "typeidTypeRelid: Invalid type - oid = %u"
 msgstr "typeidTypeRelid: Не верный тип - OID = %u"
 
-#: 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
+#: parser/parse_type.c:447
+#: parser/parse_type.c:463
+#: parser/parse_type.c:465
+#: parser/parse_type.c:471
+#: parser/parse_type.c:477
+#: parser/parse_type.c:481
 #, c-format
 msgid "Invalid type name '%s'"
 msgstr "Неверное имя типа '%s'"
 
-#: y.tab.c:8678
-msgid "syntax error: cannot back up"
-msgstr ""
-
-#: gram.y:929
-msgid "SET TRANSACTION/READ ONLY not yet supported"
-msgstr "SET TRANSACTION/READ ONLY пока не поддерживается"
-
-#: gram.y:966 gram.y:983
-msgid "Time zone interval must be HOUR or HOUR TO MINUTE"
-msgstr ""
-
-#: gram.y:977 gram.y:4960 gram.y:6945 utils/adt/timestamp.c:701
-#, c-format
-msgid "INTERVAL(%d) precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:1421 gram.y:1427 gram.y:4368 gram.y:4375
-msgid "GLOBAL TEMPORARY TABLE is not currently supported"
-msgstr "GLOBAL TEMPORARY TABLE пока не поддерживается"
-
-#: gram.y:1465
-#, c-format
-msgid "CREATE TABLE / COLLATE %s not yet implemented; clause ignored"
-msgstr ""
-
-#: gram.y:1649
-msgid "LIKE in table definitions not yet supported"
-msgstr ""
-
-#: gram.y:1753
-msgid "FOREIGN KEY/MATCH PARTIAL not yet implemented"
-msgstr ""
-
-#: gram.y:1833
-msgid "CREATE TABLE AS may not specify INTO"
-msgstr "CREATE TABLE AS не может указывать INTO"
-
-#: gram.y:2214
-msgid "CREATE ASSERTION is not yet supported"
-msgstr "CREATE ASSERTION пока не поддерживается"
-
-#: gram.y:2228
-msgid "DROP ASSERTION is not yet supported"
-msgstr "DROP ASSERTION пока не поддерживается"
-
-#: gram.y:2715
-msgid "FETCH / ABSOLUTE not supported, using RELATIVE"
-msgstr ""
-
-#: gram.y:2877 gram.y:2885
-msgid "grant options are not implemented"
-msgstr "grant-опции не поддерживаются"
-
-#: gram.y:3061
-msgid "CREATE FUNCTION / OUT parameters are not supported"
-msgstr "CREATE FUNCTION / OUT параметры не поддерживаются"
-
-#: gram.y:3067
-msgid "CREATE FUNCTION / INOUT parameters are not supported"
-msgstr "CREATE FUNCTION / INOUT параметры не поддерживаются"
-
-#: gram.y:3219
-msgid "parser: argument type missing (use NONE for unary operators)"
-msgstr ""
-
-#: gram.y:3716
-#, c-format
-msgid "CREATE DOMAIN / COLLATE %s not yet implemented; clause ignored"
-msgstr ""
-
-#: gram.y:4454
-msgid ""
-"LIMIT #,# syntax not supported.\n"
-"\tUse separate LIMIT and OFFSET clauses."
-msgstr ""
-"Синтаксис LIMIT #,# больше не поддерживается.\n"
-"\tИспользуете LIMIT и OFFSET для этих целей."
-
-#: gram.y:4470
-msgid "LIMIT must not be negative"
-msgstr "LIMIT не должен быть отрицательным"
-
-#: gram.y:4508
-msgid "OFFSET must not be negative"
-msgstr "OFFSET не должен быть отрицательным"
-
-#: gram.y:4650
-msgid ""
-"sub-SELECT in FROM must have an alias\n"
-"\tFor example, FROM (SELECT ...) [AS] foo"
-msgstr ""
-
-#: gram.y:5054
-msgid "precision for FLOAT must be at least 1"
-msgstr ""
-
-#: gram.y:5061
-msgid "precision for FLOAT must be less than 16"
-msgstr ""
-
-#: gram.y:5074 gram.y:5087
-#, c-format
-msgid "NUMERIC precision %d must be between 1 and %d"
-msgstr ""
-
-#: gram.y:5078
-#, c-format
-msgid "NUMERIC scale %d must be between 0 and precision %d"
-msgstr ""
-
-#: gram.y:5104 gram.y:5117
-#, c-format
-msgid "DECIMAL precision %d must be between 1 and %d"
-msgstr ""
-
-#: gram.y:5108
-#, c-format
-msgid "DECIMAL scale %d must be between 0 and precision %d"
-msgstr ""
-
-#: gram.y:5163 gram.y:5237
-#, c-format
-msgid "length for type '%s' must be at least 1"
-msgstr ""
-
-#: gram.y:5166 gram.y:5240
-#, c-format
-msgid "length for type '%s' cannot exceed %d"
-msgstr ""
-
-#: gram.y:5317
-#, c-format
-msgid "TIMESTAMP(%d)%s precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:5349
-#, c-format
-msgid "TIME(%d)%s precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:5499 gram.y:7503 gram.y:7555
-msgid "Unequal number of entries in row expression"
-msgstr ""
-
-#: gram.y:5913
-msgid "UNIQUE predicate is not yet implemented"
-msgstr ""
-
-#: gram.y:6142
-#, c-format
-msgid "CURRENT_TIME(%d) precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:6187
-#, c-format
-msgid "CURRENT_TIMESTAMP(%d) precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:6232
-#, c-format
-msgid "LOCALTIME(%d) precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:6277
-#, c-format
-msgid "LOCALTIMESTAMP(%d) precision must be between %d and %d"
-msgstr ""
-
-#: gram.y:7376
-msgid "OLD used in non-rule query"
-msgstr ""
-
-#: gram.y:7383
-msgid "NEW used in non-rule query"
-msgstr ""
-
-#: y.tab.c:17467
-msgid "parse error; also virtual memory exhausted"
-msgstr ""
-
-#: y.tab.c:17471
-msgid "parse error"
-msgstr ""
-
-#: y.tab.c:17586
-msgid "parser stack overflow"
-msgstr ""
-
-#: gram.y:7537
-#, c-format
-msgid "Operator '%s' not implemented for row expressions"
-msgstr ""
-
-#: gram.y:7610
-msgid "Wrong number of parameters on left side of OVERLAPS expression"
-msgstr ""
-
-#: gram.y:7615
-msgid "Wrong number of parameters on right side of OVERLAPS expression"
-msgstr ""
-
-#: gram.y:7652
-msgid "Multiple ORDER BY clauses not allowed"
-msgstr ""
-
-#: gram.y:7658
-msgid "Multiple FOR UPDATE clauses not allowed"
-msgstr ""
-
-#: gram.y:7664
-msgid "Multiple OFFSET clauses not allowed"
-msgstr ""
-
-#: gram.y:7670
-msgid "Multiple LIMIT clauses not allowed"
-msgstr ""
-
-#: scan.l:295
-msgid "unterminated /* comment"
-msgstr ""
-
-#: scan.l:323
-msgid "unterminated bit string literal"
-msgstr ""
-
-#: scan.l:342
-msgid "unterminated hexadecimal string literal"
-msgstr ""
-
-#: scan.l:388
-msgid "unterminated quoted string"
-msgstr ""
-
-#: scan.l:399
-msgid "zero-length delimited identifier"
-msgstr ""
-
-#: scan.l:406 scan.l:562
-#, c-format
-msgid "identifier \"%s\" will be truncated to \"%.*s\""
-msgstr ""
-
-#: scan.l:420
-msgid "unterminated quoted identifier"
-msgstr ""
-
-#: scan.l:580
-#, c-format
-msgid "parser: %s at end of input"
-msgstr ""
-
-#: scan.l:582
-#, c-format
-msgid "parser: %s at or near \"%s\" at character %d"
+#: port/beos/sem.c:159
+msgid "beos : semctl error : GETNCNT not implemented"
 msgstr ""
 
-#: port/ipc_test.c:93 storage/ipc/ipc.c:171
-msgid "Out of on_shmem_exit slots"
+#: port/beos/sem.c:174
+msgid "beos : semctl error : unknown flag"
 msgstr ""
 
-#: port/posix_sema.c:168 port/sysv_sema.c:319 port/pg_sema.c:319
-msgid "Out of memory in PGReserveSemaphores"
-msgstr "Недостаточно памяти в PGReserveSemaphores"
-
-#: port/posix_sema.c:205 port/sysv_sema.c:358 port/pg_sema.c:358
-msgid "PGSemaphoreCreate: too many semaphores created"
-msgstr "PGSemaphoreCreate: создано слишком много семафоров"
-
 #: port/beos/support.c:45
 msgid "Error loading BeOS support server : can't create communication ports"
 msgstr ""
@@ -8154,14 +7935,6 @@ msgstr ""
 msgid "loading symbol '%s' failed "
 msgstr ""
 
-#: port/beos/sem.c:158
-msgid "beos : semctl error : GETNCNT not implemented"
-msgstr ""
-
-#: port/beos/sem.c:173
-msgid "beos : semctl error : unknown flag"
-msgstr ""
-
 #: port/dynloader/beos.c:55
 msgid "add-on not loaded correctly"
 msgstr ""
@@ -8170,19 +7943,23 @@ msgstr ""
 msgid "error while unloading add-on"
 msgstr ""
 
-#: port/dynloader/bsdi.c:59 port/dynloader/linux.c:71
+#: port/dynloader/bsdi.c:59
+#: port/dynloader/linux.c:71
 msgid "dld: Cannot link C library!"
 msgstr ""
 
-#: port/dynloader/bsdi.c:66 port/dynloader/linux.c:78
+#: port/dynloader/bsdi.c:66
+#: port/dynloader/linux.c:78
 msgid "dld: Cannot link math library!"
 msgstr ""
 
-#: port/dynloader/bsdi.c:75 port/dynloader/linux.c:87
+#: port/dynloader/bsdi.c:75
+#: port/dynloader/linux.c:87
 msgid "dld: Undefined:"
 msgstr ""
 
-#: port/dynloader/bsdi.c:78 port/dynloader/linux.c:90
+#: port/dynloader/bsdi.c:78
+#: port/dynloader/linux.c:90
 #: port/dynloader/ultrix4.c:61
 #, c-format
 msgid "  %s"
@@ -8196,24 +7973,45 @@ msgstr ""
 msgid "dl: Undefined:"
 msgstr ""
 
-#: postmaster/postmaster.c:329
+#: port/pg_shmem.c:423
+#: port/sysv_shmem.c:423
+#, c-format
+msgid "shmdt(%p) failed: %m"
+msgstr "shmdt(%p) не удался: %m"
+
+#: port/pg_sema.c:319
+#: port/posix_sema.c:168
+#: port/sysv_sema.c:319
+msgid "Out of memory in PGReserveSemaphores"
+msgstr "Недостаточно памяти в PGReserveSemaphores"
+
+#: port/pg_sema.c:358
+#: port/posix_sema.c:205
+#: port/sysv_sema.c:358
+msgid "PGSemaphoreCreate: too many semaphores created"
+msgstr "PGSemaphoreCreate: создано слишком много семафоров"
+
+#: port/ipc_test.c:93
+#: storage/ipc/ipc.c:171
+msgid "Out of on_shmem_exit slots"
+msgstr ""
+
+#: postmaster/postmaster.c:327
 #, c-format
 msgid "data directory %s was not found"
 msgstr ""
 
-#: postmaster/postmaster.c:331
+#: postmaster/postmaster.c:329
 #, c-format
 msgid "could not read permissions of directory %s: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:336
+#: postmaster/postmaster.c:334
 #, c-format
-msgid ""
-"data directory %s has group or world access; permissions should be u=rwx "
-"(0700)"
+msgid "data directory %s has group or world access; permissions should be u=rwx (0700)"
 msgstr ""
 
-#: postmaster/postmaster.c:349
+#: postmaster/postmaster.c:347
 #, c-format
 msgid ""
 "%s does not find the database system.\n"
@@ -8226,83 +8024,91 @@ msgstr ""
 "но не получилось открыть файл \"%s\": %s\n"
 "\n"
 
-#: postmaster/postmaster.c:434
+#: postmaster/postmaster.c:432
 msgid "Assert checking is not compiled in."
 msgstr ""
 
-#: postmaster/postmaster.c:540 tcop/postgres.c:1574
+#: postmaster/postmaster.c:538
+#: tcop/postgres.c:1574
 #, c-format
 msgid "--%s requires argument"
 msgstr "--%s требует параметр"
 
-#: postmaster/postmaster.c:542 tcop/postgres.c:1576
+#: postmaster/postmaster.c:540
+#: tcop/postgres.c:1576
 #, c-format
 msgid "-c %s requires argument"
 msgstr "-c %s требует параметр"
 
-#: postmaster/postmaster.c:553 postmaster/postmaster.c:564
-#: postmaster/postmaster.c:632
+#: postmaster/postmaster.c:551
+#: postmaster/postmaster.c:562
+#: postmaster/postmaster.c:639
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Наберите '%s --help' для более детальной информации.\n"
 
-#: postmaster/postmaster.c:563
+#: postmaster/postmaster.c:561
 #, c-format
 msgid "invalid argument -- %s"
 msgstr "неверный аргумент -- %s"
 
-#: postmaster/postmaster.c:587
-msgid ""
-"The number of buffers (-B) must be at least twice the number of allowed "
-"connections (-N) and at least 16."
+#: postmaster/postmaster.c:585
+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:593
+#: postmaster/postmaster.c:591
 msgid "superuser_reserved_connections must be less than max_connections."
 msgstr ""
 
-#: postmaster/postmaster.c:611
+#: postmaster/postmaster.c:600
+msgid "Invalid datetoken tables, please fix."
+msgstr ""
+
+#: postmaster/postmaster.c:618
 #, c-format
 msgid "%s: PostmasterMain: initial environ dump:"
 msgstr ""
 
-#: postmaster/postmaster.c:612 postmaster/postmaster.c:615
+#: postmaster/postmaster.c:619
+#: postmaster/postmaster.c:622
 msgid "-----------------------------------------"
 msgstr ""
 
-#: postmaster/postmaster.c:614 postmaster/postmaster.c:2287
+#: postmaster/postmaster.c:621
+#: postmaster/postmaster.c:2304
 #, c-format
 msgid "\t%s"
 msgstr "\t%s"
 
-#: postmaster/postmaster.c:622 tcop/postgres.c:1719
+#: postmaster/postmaster.c:629
+#: tcop/postgres.c:1719
 #, c-format
 msgid "%s: could not locate executable, bailing out..."
 msgstr ""
 
-#: postmaster/postmaster.c:631
+#: postmaster/postmaster.c:638
 msgid "For SSL, TCP/IP connections must be enabled."
 msgstr ""
 
-#: postmaster/postmaster.c:678
+#: postmaster/postmaster.c:685
 msgid "cannot create INET stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:690
+#: postmaster/postmaster.c:697
 msgid "cannot create UNIX stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:810
+#: postmaster/postmaster.c:817
 #, c-format
 msgid "fork failed: %s"
 msgstr "fork не удался: %s"
 
-#: postmaster/postmaster.c:832
+#: postmaster/postmaster.c:839
 #, c-format
 msgid "cannot disassociate from controlling TTY: %s"
 msgstr ""
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:859
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -8311,7 +8117,7 @@ msgstr ""
 "%s является PostgreSQL сервером.\n"
 "\n"
 
-#: postmaster/postmaster.c:853
+#: postmaster/postmaster.c:860
 #, c-format
 msgid ""
 "Usage:\n"
@@ -8322,84 +8128,78 @@ msgstr ""
 "  %s [ОПЦИЯ]...\n"
 "\n"
 
-#: postmaster/postmaster.c:854
+#: postmaster/postmaster.c:861
 msgid "Options:\n"
 msgstr "Опции:\n"
 
-#: postmaster/postmaster.c:856
+#: postmaster/postmaster.c:863
 msgid "  -A 1|0          enable/disable run-time assert checking\n"
-msgstr ""
-"  -A 1|0          включить/выключить проверку исключительных ситуаций\n"
+msgstr "  -A 1|0          включить/выключить проверку исключительных ситуаций\n"
 
-#: postmaster/postmaster.c:858
+#: postmaster/postmaster.c:865
 #, c-format
 msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
 msgstr "  -B ЧБУФЕРОВ     чмсло общих буферов (по умолчанию: %d)\n"
 
-#: postmaster/postmaster.c:859
+#: postmaster/postmaster.c:866
 msgid "  -c NAME=VALUE   set run-time parameter\n"
 msgstr "  -c ИМЯ=ЗНАЧ.   установить параметр выполнения (run-time)\n"
 
-#: postmaster/postmaster.c:860
+#: postmaster/postmaster.c:867
 msgid "  -d 1-5          debugging level\n"
 msgstr "  -d 1-5          уровень отладки\n"
 
-#: postmaster/postmaster.c:861
+#: postmaster/postmaster.c:868
 msgid "  -D DATADIR      database directory\n"
 msgstr "  -D ДИРДАННЫХ    директория с данными\n"
 
-#: postmaster/postmaster.c:862
+#: postmaster/postmaster.c:869
 msgid "  -F              turn fsync off\n"
 msgstr "  -F              выуключить fsync\n"
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:870
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
 msgstr "  -h ХОСТ         имя хоста или IP-адрес для прослушивания\n"
 
-#: postmaster/postmaster.c:864
+#: postmaster/postmaster.c:871
 msgid "  -i              enable TCP/IP connections\n"
 msgstr "  -i              подключить TCP/IP соединения\n"
 
-#: postmaster/postmaster.c:865
+#: postmaster/postmaster.c:872
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
 msgstr "  -k ДИРЕКТОРИЯ   Местонахождния unix-domain сокетов\n"
 
-#: postmaster/postmaster.c:867
+#: postmaster/postmaster.c:874
 msgid "  -l              enable SSL connections\n"
 msgstr "  -l              включить SSL-подсоединения\n"
 
-#: postmaster/postmaster.c:869
+#: postmaster/postmaster.c:876
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
-msgstr ""
-"  -N MAX-CONNECT  максимально доступное число подсоединений (по умолчанию: %"
-"d)\n"
+msgstr "  -N MAX-CONNECT  максимально доступное число подсоединений (по умолчанию: %d)\n"
 
-#: postmaster/postmaster.c:871
+#: postmaster/postmaster.c:878
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
 msgstr "  -o ОПЦИИ        передать 'ОПЦИИ' каждому бэк-енду (серверу)\n"
 
-#: postmaster/postmaster.c:872
+#: postmaster/postmaster.c:879
 #, c-format
 msgid "  -p PORT         port number to listen on (default %d)\n"
 msgstr "  -p ПОРТ         номер порта для прослушивания (по умолчанию: %d)\n"
 
-#: postmaster/postmaster.c:873
-msgid ""
-"  -S              silent mode (start in background without logging output)\n"
-msgstr ""
-"  -S              тихий режим (запустить на заднем плане без логов "
-"результатов)\n"
+#: postmaster/postmaster.c:880
+msgid "  -S              silent mode (start in background without logging output)\n"
+msgstr "  -S              тихий режим (запустить на заднем плане без логов результатов)\n"
 
-#: postmaster/postmaster.c:874
+#: postmaster/postmaster.c:881
 msgid "  --help          show this help, then exit\n"
 msgstr ""
 
-#: postmaster/postmaster.c:875
+#: postmaster/postmaster.c:882
 msgid "  --version       output version information, then exit\n"
 msgstr ""
 
-#: postmaster/postmaster.c:877
+#: postmaster/postmaster.c:884
 msgid ""
 "\n"
 "Developer options:\n"
@@ -8407,20 +8207,15 @@ msgstr ""
 "\n"
 "Опции разработчика:\n"
 
-#: postmaster/postmaster.c:878
-msgid ""
-"  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr ""
-"  -n              не переинициализировать общую память после ненормального "
-"завершения\n"
+#: postmaster/postmaster.c:885
+msgid "  -n              do not reinitialize shared memory after abnormal exit\n"
+msgstr "  -n              не переинициализировать общую память после ненормального завершения\n"
 
-#: postmaster/postmaster.c:879
+#: postmaster/postmaster.c:886
 msgid "  -s              send SIGSTOP to all backend servers if one dies\n"
-msgstr ""
-"  -s              послать сигнал SIGSTOP всем бэк-ендам (серверам) езли один "
-"из них падает\n"
+msgstr "  -s              послать сигнал SIGSTOP всем бэк-ендам (серверам) езли один из них падает\n"
 
-#: postmaster/postmaster.c:881
+#: postmaster/postmaster.c:888
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -8430,434 +8225,457 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 
-#: postmaster/postmaster.c:963
+#: postmaster/postmaster.c:970
 #, c-format
 msgid "ServerLoop: select failed: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1089 postmaster/postmaster.c:1104
+#: postmaster/postmaster.c:1096
+#: postmaster/postmaster.c:1113
 msgid "incomplete startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1097
+#: postmaster/postmaster.c:1104
 msgid "invalid length of startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1137
+#: postmaster/postmaster.c:1146
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1159
+#: postmaster/postmaster.c:1168
 msgid "unsupported frontend protocol"
 msgstr ""
 
-#: postmaster/postmaster.c:1186
+#: postmaster/postmaster.c:1195
 msgid "no PostgreSQL user name specified in startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1219
+#: postmaster/postmaster.c:1228
 msgid "The database system is starting up"
 msgstr ""
 
-#: postmaster/postmaster.c:1222
+#: postmaster/postmaster.c:1231
 msgid "The database system is shutting down"
 msgstr ""
 
-#: postmaster/postmaster.c:1225
+#: postmaster/postmaster.c:1234
 msgid "The database system is in recovery mode"
 msgstr ""
 
-#: postmaster/postmaster.c:1228 storage/ipc/sinval.c:52
+#: postmaster/postmaster.c:1237
+#: storage/ipc/sinval.c:52
 #: storage/lmgr/proc.c:219
 msgid "Sorry, too many clients already"
 msgstr ""
 
-#: postmaster/postmaster.c:1258
+#: postmaster/postmaster.c:1267
 #, c-format
 msgid "processCancelRequest: CheckPointPID in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1272
+#: postmaster/postmaster.c:1281
 #, c-format
 msgid "processing cancel request: sending SIGINT to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1278
+#: postmaster/postmaster.c:1287
 #, c-format
 msgid "bad key in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1285
+#: postmaster/postmaster.c:1294
 #, c-format
 msgid "bad pid in cancel request for process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1328
+#: postmaster/postmaster.c:1337
 msgid "ConnCreate: malloc failed"
 msgstr "ConnCreate: malloc не удался"
 
-#: postmaster/postmaster.c:1423
+#: postmaster/postmaster.c:1432
 msgid "Received SIGHUP, reloading configuration files"
 msgstr ""
 
-#: postmaster/postmaster.c:1447
+#: postmaster/postmaster.c:1456
 #, c-format
 msgid "pmdie %d"
 msgstr "pmdie %d"
 
-#: postmaster/postmaster.c:1461
+#: postmaster/postmaster.c:1470
 msgid "smart shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1473 postmaster/postmaster.c:1517
+#: postmaster/postmaster.c:1482
+#: postmaster/postmaster.c:1526
 #, c-format
 msgid "shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1491
+#: postmaster/postmaster.c:1500
 msgid "fast shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1497
+#: postmaster/postmaster.c:1506
 msgid "aborting any active transactions"
 msgstr ""
 
-#: postmaster/postmaster.c:1533
+#: postmaster/postmaster.c:1542
 msgid "immediate shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1568
+#: postmaster/postmaster.c:1577
 msgid "reaping dead processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1585
+#: postmaster/postmaster.c:1594
 msgid "statistics collector process"
 msgstr ""
 
-#: postmaster/postmaster.c:1598
+#: postmaster/postmaster.c:1607
 msgid "shutdown process"
 msgstr ""
 
-#: postmaster/postmaster.c:1609
+#: postmaster/postmaster.c:1618
 msgid "startup process"
 msgstr ""
 
-#: postmaster/postmaster.c:1611
+#: postmaster/postmaster.c:1620
 msgid "aborting startup due to startup process failure"
 msgstr ""
 
-#: postmaster/postmaster.c:1620
+#: postmaster/postmaster.c:1648
 #, c-format
 msgid "startup process %d died while shutdown process %d already running"
 msgstr ""
 
-#: postmaster/postmaster.c:1652
-msgid ""
-"all server processes terminated; reinitializing shared memory and semaphores"
+#: postmaster/postmaster.c:1669
+msgid "all server processes terminated; reinitializing shared memory and semaphores"
 msgstr ""
 
-#: postmaster/postmaster.c:1690
+#: postmaster/postmaster.c:1707
 msgid "child process"
 msgstr ""
 
-#: postmaster/postmaster.c:1735
+#: postmaster/postmaster.c:1752
 msgid "server process"
 msgstr ""
 
-#: postmaster/postmaster.c:1736
+#: postmaster/postmaster.c:1753
 msgid "terminating any other active server processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1757
+#: postmaster/postmaster.c:1774
 #, c-format
 msgid "CleanupProc: sending %s to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1801
+#: postmaster/postmaster.c:1818
 #, c-format
 msgid "%s (pid %d) exited with exit code %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1804
+#: postmaster/postmaster.c:1821
 #, c-format
 msgid "%s (pid %d) was terminated by signal %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1807
+#: postmaster/postmaster.c:1824
 #, c-format
 msgid "%s (pid %d) exited with unexpected status %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1829
+#: postmaster/postmaster.c:1846
 #, c-format
 msgid "SignalChildren: sending signal %d to process %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1867
+#: postmaster/postmaster.c:1884
 msgid "out of memory; connection startup aborted"
 msgstr ""
 
-#: postmaster/postmaster.c:1918
+#: postmaster/postmaster.c:1935
 msgid "connection startup failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1935
+#: postmaster/postmaster.c:1952
 #, c-format
 msgid "connection startup failed (fork failure): %s"
 msgstr ""
 
-#: postmaster/postmaster.c:1942
+#: postmaster/postmaster.c:1959
 #, c-format
 msgid "BackendStartup: forked pid=%d socket=%d"
 msgstr ""
 
-#: postmaster/postmaster.c:1976
+#: postmaster/postmaster.c:1993
 msgid "Server process fork() failed: "
 msgstr ""
 
-#: postmaster/postmaster.c:2123
+#: postmaster/postmaster.c:2140
 #, c-format
 msgid "connection received: host=%s port=%hu"
 msgstr ""
 
-#: postmaster/postmaster.c:2143
+#: postmaster/postmaster.c:2160
 #, c-format
 msgid "connection received: host=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2163
+#: postmaster/postmaster.c:2180
 msgid "DoBackend: Unable to set timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2192
+#: postmaster/postmaster.c:2209
 msgid "DoBackend: Unable to disable timer for auth timeout"
 msgstr ""
 
-#: postmaster/postmaster.c:2196
+#: postmaster/postmaster.c:2213
 #, c-format
 msgid "connection authorized: user=%s database=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2285
+#: postmaster/postmaster.c:2302
 #, c-format
 msgid "%s child[%d]: starting with ("
 msgstr ""
 
-#: postmaster/postmaster.c:2288
+#: postmaster/postmaster.c:2305
 msgid ")"
 msgstr ")"
 
-#: postmaster/postmaster.c:2350
-#, c-format
-msgid ""
-"Checkpoint segments are being created too frequently (%d secs)\n"
-"\tConsider increasing CHECKPOINT_SEGMENTS"
-msgstr ""
-
-#: postmaster/postmaster.c:2608
+#: postmaster/postmaster.c:2604
 #, c-format
 msgid "could not launch startup process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2611
+#: postmaster/postmaster.c:2607
 #, c-format
 msgid "could not launch checkpoint process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2614
+#: postmaster/postmaster.c:2610
 #, c-format
 msgid "could not launch shutdown process (fork failure): %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2638
+#: postmaster/postmaster.c:2634
 msgid "CheckPointDataBase: malloc failed"
 msgstr "CheckPointDataBase: malloc не удался"
 
-#: postmaster/postmaster.c:2677
+#: postmaster/postmaster.c:2673
 #, c-format
 msgid "cannot create file %s: %s"
 msgstr "не получилось создать файл %s: %s"
 
-#: postmaster/postmaster.c:2689
+#: postmaster/postmaster.c:2685
 #, c-format
 msgid "writing file %s failed"
 msgstr "запись файл %s не удалась"
 
-#: postmaster/pgstat.c:178
+#: postmaster/pgstat.c:181
 #, c-format
 msgid "PGSTAT: socket() failed: %m"
 msgstr "PGSTAT: socket() не удался: %m"
 
-#: postmaster/pgstat.c:192
+#: postmaster/pgstat.c:195
 #, c-format
 msgid "PGSTAT: bind(127.0.0.1) failed: %m"
 msgstr "PGSTAT: bind(127.0.0.1) не удался: %m"
 
-#: postmaster/pgstat.c:197
+#: postmaster/pgstat.c:200
 #, c-format
 msgid "PGSTAT: getsockname() failed: %m"
 msgstr "PGSTAT: getsockname() не удался: %m"
 
-#: postmaster/pgstat.c:209
+#: postmaster/pgstat.c:212
 #, c-format
 msgid "PGSTAT: connect() failed: %m"
 msgstr "PGSTAT: connect() не удался: %m"
 
-#: postmaster/pgstat.c:221
+#: postmaster/pgstat.c:224
 #, c-format
 msgid "PGSTAT: fcntl() failed: %m"
 msgstr "PGSTAT: fcntl() не удался: %m"
 
-#: postmaster/pgstat.c:230 postmaster/pgstat.c:1158
+#: postmaster/pgstat.c:233
+#: postmaster/pgstat.c:1172
 #, c-format
 msgid "PGSTAT: pipe() failed: %m"
 msgstr "PGSTAT: pipe() не удался: %m"
 
-#: postmaster/pgstat.c:273
+#: postmaster/pgstat.c:276
 msgid "PGSTAT: statistics collector startup skipped"
 msgstr ""
 
-#: postmaster/pgstat.c:296 postmaster/pgstat.c:1165
+#: postmaster/pgstat.c:299
+#: postmaster/pgstat.c:1179
 #, c-format
 msgid "PGSTAT: fork() failed: %m"
 msgstr "PGSTAT: fork() не удался: %m"
 
-#: postmaster/pgstat.c:697
+#: postmaster/pgstat.c:703
 msgid "Only database superusers can reset statistic counters"
 msgstr ""
 
-#: postmaster/pgstat.c:764 postmaster/pgstat.c:773 postmaster/pgstat.c:820
-#: postmaster/pgstat.c:830
-msgid "PGSTATBE: malloc() failed"
-msgstr ""
+#: postmaster/pgstat.c:772
+#: postmaster/pgstat.c:780
+#: postmaster/pgstat.c:832
+#: postmaster/pgstat.c:841
+#: utils/init/miscinit.c:144
+#: utils/init/miscinit.c:163
+#: utils/init/miscinit.c:171
+#: utils/misc/guc.c:930
+#: utils/misc/guc.c:1113
+#: utils/misc/guc.c:1907
+#: utils/misc/guc.c:1921
+#: utils/misc/guc.c:2676
+#: utils/misc/guc.c:2682
+#: utils/misc/guc.c:2689
+msgid "out of memory"
+msgstr "не хватает памяти"
 
-#: postmaster/pgstat.c:1219
+#: postmaster/pgstat.c:1233
 msgid "PGSTAT: Creation of dead backend hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1230
+#: postmaster/pgstat.c:1244
 msgid "PGSTAT: Allocation of backend table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1294
+#: postmaster/pgstat.c:1308
 #, c-format
 msgid "PGSTAT: select() failed: %m"
 msgstr "PGSTAT: select() не удался: %m"
 
-#: postmaster/pgstat.c:1334
+#: postmaster/pgstat.c:1348
 #, c-format
 msgid "PGSTAT: read() failed: %m"
 msgstr "PGSTAT: read() не удался: %m"
 
-#: postmaster/pgstat.c:1352
+#: postmaster/pgstat.c:1366
 msgid "PGSTAT: bogus message length"
 msgstr ""
 
-#: postmaster/pgstat.c:1502
+#: postmaster/pgstat.c:1516
 #, c-format
 msgid "PGSTATBUFF: fcntl() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1512
+#: postmaster/pgstat.c:1526
 msgid "PGSTATBUFF: malloc() failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1539
+#: postmaster/pgstat.c:1553
 msgid "PGSTATBUFF: Warning - receive buffer full"
 msgstr ""
 
-#: postmaster/pgstat.c:1570
+#: postmaster/pgstat.c:1584
 #, c-format
 msgid "PGSTATBUFF: select() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1586
+#: postmaster/pgstat.c:1600
 #, c-format
 msgid "PGSTATBUFF: recvfrom() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1661
+#: postmaster/pgstat.c:1675
 #, c-format
 msgid "PGSTATBUFF: write() failed: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1714
+#: postmaster/pgstat.c:1728
 #, c-format
 msgid "PGSTAT: Invalid backend ID %d"
 msgstr ""
 
-#: postmaster/pgstat.c:1770
+#: postmaster/pgstat.c:1784
 msgid "PGSTAT: DB hash table out of memory - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:1799 postmaster/pgstat.c:2214 postmaster/pgstat.c:2221
+#: postmaster/pgstat.c:1813
+#: postmaster/pgstat.c:2228
+#: postmaster/pgstat.c:2235
 msgid "PGSTAT: failed to initialize hash table for new database entry"
 msgstr ""
 
-#: postmaster/pgstat.c:1851
+#: postmaster/pgstat.c:1865
 msgid "PGSTAT: dead backend hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:1898
+#: postmaster/pgstat.c:1912
 #, c-format
 msgid "PGSTAT: cannot open temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1924
+#: postmaster/pgstat.c:1938
 msgid "PGSTAT: database hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:1960
+#: postmaster/pgstat.c:1974
 #, c-format
-msgid ""
-"PGSTAT: tables hash table for database %d corrupted during cleanup - abort"
+msgid "PGSTAT: tables hash table for database %d corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2007
+#: postmaster/pgstat.c:2021
 #, c-format
 msgid "PGSTAT: Error closing temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2014
+#: postmaster/pgstat.c:2028
 #, c-format
 msgid "PGSTAT: Cannot rename temp stats file %s: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2035
+#: postmaster/pgstat.c:2049
 msgid "PGSTAT: dead backend hash table corrupted during cleanup - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2100 postmaster/pgstat.c:2104
+#: postmaster/pgstat.c:2114
+#: postmaster/pgstat.c:2118
 msgid "PGSTAT: Creation of DB hash table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:2142 postmaster/pgstat.c:2148 postmaster/pgstat.c:2177
-#: postmaster/pgstat.c:2183 postmaster/pgstat.c:2248 postmaster/pgstat.c:2254
-#: postmaster/pgstat.c:2287 postmaster/pgstat.c:2293 postmaster/pgstat.c:2316
-#: postmaster/pgstat.c:2322 postmaster/pgstat.c:2370 postmaster/pgstat.c:2376
-#: postmaster/pgstat.c:2411 postmaster/pgstat.c:2417
+#: postmaster/pgstat.c:2156
+#: postmaster/pgstat.c:2162
+#: postmaster/pgstat.c:2191
+#: postmaster/pgstat.c:2197
+#: postmaster/pgstat.c:2262
+#: postmaster/pgstat.c:2268
+#: postmaster/pgstat.c:2301
+#: postmaster/pgstat.c:2307
+#: postmaster/pgstat.c:2330
+#: postmaster/pgstat.c:2336
+#: postmaster/pgstat.c:2384
+#: postmaster/pgstat.c:2390
+#: postmaster/pgstat.c:2425
+#: postmaster/pgstat.c:2431
 msgid "PGSTAT: corrupted pgstat.stat file"
 msgstr ""
 
-#: postmaster/pgstat.c:2164 postmaster/pgstat.c:2170
+#: postmaster/pgstat.c:2178
+#: postmaster/pgstat.c:2184
 msgid "PGSTAT: DB hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:2273 postmaster/pgstat.c:2279
+#: postmaster/pgstat.c:2287
+#: postmaster/pgstat.c:2293
 msgid "PGSTAT: Tab hash table out of memory"
 msgstr ""
 
-#: postmaster/pgstat.c:2526
+#: postmaster/pgstat.c:2540
 #, c-format
 msgid "PGSTAT: tables hash table out of memory for database %d - abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2706
+#: postmaster/pgstat.c:2720
 msgid "PGSTAT: failed to reinitialize hash table for database entry"
 msgstr ""
 
-#: regex/regcomp.c:1757 regex/regcomp.c:1772
+#: regex/regcomp.c:1761
+#: regex/regcomp.c:1776
 msgid "cclass_init: out of memory"
 msgstr "cclass_init: не достаточно памяти"
 
@@ -8948,76 +8766,79 @@ msgstr ""
 msgid "Attempt to rename rule \"%s\" failed: \"%s\" already exists"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:345
+#: rewrite/rewriteManip.c:583
+#: rewrite/rewriteManip.c:590
+msgid "getInsertSelectQuery: expected to find SELECT subquery"
+msgstr ""
+
+#: rewrite/rewriteManip.c:601
+msgid "getInsertSelectQuery: can't find rule placeholders"
+msgstr ""
+
+#: rewrite/rewriteManip.c:635
+#: rewrite/rewriteManip.c:677
+msgid "Conditional utility statements are not implemented"
+msgstr ""
+
+#: rewrite/rewriteManip.c:801
+msgid "ResolveNew: can't handle whole-tuple reference"
+msgstr ""
+
+#: rewrite/rewriteHandler.c:343
 #, c-format
 msgid "rewriteTargetList: bogus resno %d in targetlist"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:387 rewrite/rewriteHandler.c:399
+#: rewrite/rewriteHandler.c:385
+#: rewrite/rewriteHandler.c:397
 #, c-format
 msgid "Multiple assignments to same attribute \"%s\""
 msgstr ""
 
-#: rewrite/rewriteHandler.c:555
+#: rewrite/rewriteHandler.c:553
 msgid "ApplyRetrieveRule: expected just one rule action"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:557
+#: rewrite/rewriteHandler.c:555
 msgid "ApplyRetrieveRule: can't handle qualified ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:559
+#: rewrite/rewriteHandler.c:557
 msgid "ApplyRetrieveRule: can't handle per-attribute ON SELECT rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:837
+#: rewrite/rewriteHandler.c:835
 msgid "fireRIRrules: failed to remove aggs from qual"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1098
+#: rewrite/rewriteHandler.c:1096
 #, c-format
 msgid "query rewritten %d times, may contain cycles"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1210
+#: rewrite/rewriteHandler.c:1208
 msgid ""
 "Cannot insert into a view\n"
 "\tYou need an unconditional ON INSERT DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1214
+#: rewrite/rewriteHandler.c:1212
 msgid ""
 "Cannot update a view\n"
 "\tYou need an unconditional ON UPDATE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1218
+#: rewrite/rewriteHandler.c:1216
 msgid ""
 "Cannot delete from a view\n"
 "\tYou need an unconditional ON DELETE DO INSTEAD rule"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1222
+#: rewrite/rewriteHandler.c:1220
 #, c-format
 msgid "QueryRewrite: unexpected commandType %d"
 msgstr ""
 
-#: rewrite/rewriteManip.c:583 rewrite/rewriteManip.c:590
-msgid "getInsertSelectQuery: expected to find SELECT subquery"
-msgstr ""
-
-#: rewrite/rewriteManip.c:601
-msgid "getInsertSelectQuery: can't find rule placeholders"
-msgstr ""
-
-#: rewrite/rewriteManip.c:635 rewrite/rewriteManip.c:675
-msgid "Conditional utility statements are not implemented"
-msgstr ""
-
-#: rewrite/rewriteManip.c:790
-msgid "ResolveNew: can't handle whole-tuple reference"
-msgstr ""
-
 #: rewrite/rewriteRemove.c:57
 #, c-format
 msgid "Rule \"%s\" not found"
@@ -9033,122 +8854,128 @@ msgstr "RemoveRewriteRuleById: Правило %u не существует"
 msgid "SetRelationRuleStatus: cache lookup failed for relation %u"
 msgstr ""
 
-#: storage/buffer/buf_table.c:58
-msgid "couldn't initialize shared buffer pool Hash Tbl"
-msgstr ""
-
-#: storage/buffer/buf_table.c:100
-msgid "BufTableDelete: BufferLookup table corrupted"
-msgstr ""
-
-#: storage/buffer/buf_table.c:131
-msgid "BufTableInsert: BufferLookup table out of memory"
+#: storage/buffer/bufmgr.c:237
+#, c-format
+msgid "Invalid page header in block %u of %s; zeroing out page"
 msgstr ""
 
-#: storage/buffer/buf_table.c:138
-msgid "BufTableInsert: BufferLookup table corrupted"
+#: storage/buffer/bufmgr.c:242
+#, c-format
+msgid "Invalid page header in block %u of %s"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:243
+#: storage/buffer/bufmgr.c:268
 msgid "BufRead: buffer table broken after IO error"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:413
+#: storage/buffer/bufmgr.c:438
 #, c-format
 msgid "BufferAlloc: cannot write block %u for %u/%u"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:431
+#: storage/buffer/bufmgr.c:456
 #, c-format
 msgid "BufferAlloc: content of block %u (%u/%u) changed while flushing"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:523
+#: storage/buffer/bufmgr.c:548
 msgid "buffer wasn't in the buffer table"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:531
+#: storage/buffer/bufmgr.c:556
 msgid "Buffer in lookup table twice"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:570
+#: storage/buffer/bufmgr.c:595
 #, c-format
 msgid "write_buffer: bad buffer %d"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:782
+#: storage/buffer/bufmgr.c:807
 #, c-format
 msgid "BufferSync: cannot write %u for %u/%u"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:920
+#: storage/buffer/bufmgr.c:945
 #, c-format
-msgid ""
-"Buffer Leak: [%03d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, "
-"flags=0x%x, refcount=%d %ld)"
+msgid "Buffer Leak: [%03d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %ld)"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1167
+#: storage/buffer/bufmgr.c:1192
 #, c-format
 msgid "DropRelFileNodeBuffers: block %u is referenced (private %ld, global %d)"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1270 storage/buffer/bufmgr.c:1304
+#: storage/buffer/bufmgr.c:1295
+#: storage/buffer/bufmgr.c:1329
 #, c-format
-msgid ""
-"[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, flags=0x%x, "
-"refcount=%d %ld)"
+msgid "[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %ld)"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1379
+#: storage/buffer/bufmgr.c:1404
 #, c-format
-msgid ""
-"FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it"
+msgid "FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1389
+#: storage/buffer/bufmgr.c:1414
 #, c-format
 msgid "FlushRelationBuffers(%s (local), %u): block %u is referenced (%ld)"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1441
+#: storage/buffer/bufmgr.c:1466
 #, c-format
 msgid "FlushRelationBuffers: cannot write %u for %u/%u"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1467
+#: storage/buffer/bufmgr.c:1492
 #, c-format
-msgid ""
-"FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)"
+msgid "FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1666
+#: storage/buffer/bufmgr.c:1691
 msgid "buffer alloc trace error and can't open log file"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1765
+#: storage/buffer/bufmgr.c:1790
 #, c-format
 msgid "SetBufferCommitInfoNeedsSave: bad buffer %d"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1859
+#: storage/buffer/bufmgr.c:1884
 #, c-format
 msgid "LockBuffer: unknown lock mode %d"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1890 storage/buffer/bufmgr.c:1897
+#: storage/buffer/bufmgr.c:1915
+#: storage/buffer/bufmgr.c:1922
 msgid "LockBufferForCleanup: wrong local pin count"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1919
+#: storage/buffer/bufmgr.c:1944
 msgid "Multiple backends attempting to wait for pincount 1"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:2042
+#: storage/buffer/bufmgr.c:2067
 #, c-format
 msgid "write error may be permanent: cannot write block %u for %u/%u"
 msgstr ""
 
+#: storage/buffer/buf_table.c:58
+msgid "couldn't initialize shared buffer pool Hash Tbl"
+msgstr ""
+
+#: storage/buffer/buf_table.c:100
+msgid "BufTableDelete: BufferLookup table corrupted"
+msgstr ""
+
+#: storage/buffer/buf_table.c:131
+msgid "BufTableInsert: BufferLookup table out of memory"
+msgstr ""
+
+#: storage/buffer/buf_table.c:138
+msgid "BufTableInsert: BufferLookup table corrupted"
+msgstr ""
+
 #: storage/buffer/freelist.c:201
 msgid "out of free buffers: time to abort!"
 msgstr ""
@@ -9163,9 +8990,7 @@ msgstr ""
 
 #: storage/buffer/localbuf.c:232
 #, c-format
-msgid ""
-"Local Buffer Leak: [%03d] (rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %"
-"ld)"
+msgid "Local Buffer Leak: [%03d] (rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %ld)"
 msgstr ""
 
 #: storage/file/buffile.c:477
@@ -9310,12 +9135,14 @@ msgstr "FileWrite: %d (%s) %ld %d %p"
 msgid "FileSeek: %d (%s) %ld %ld %d"
 msgstr "FileSeek: %d (%s) %ld %ld %d"
 
-#: storage/file/fd.c:932 storage/file/fd.c:953
+#: storage/file/fd.c:932
+#: storage/file/fd.c:953
 #, c-format
 msgid "FileSeek: invalid offset: %ld"
 msgstr ""
 
-#: storage/file/fd.c:943 storage/file/fd.c:965
+#: storage/file/fd.c:943
+#: storage/file/fd.c:965
 #, c-format
 msgid "FileSeek: invalid whence: %d"
 msgstr ""
@@ -9353,7 +9180,8 @@ msgstr ""
 msgid "FreeFile: file was not obtained from AllocateFile"
 msgstr ""
 
-#: storage/freespace/freespace.c:180 storage/freespace/freespace.c:195
+#: storage/freespace/freespace.c:180
+#: storage/freespace/freespace.c:195
 #: storage/freespace/freespace.c:203
 msgid "Insufficient shared memory for free space map"
 msgstr ""
@@ -9431,7 +9259,8 @@ msgstr ""
 msgid "ShmemInitStruct: cannot allocate '%s'"
 msgstr ""
 
-#: storage/ipc/shmqueue.c:234 storage/ipc/shmqueue.c:254
+#: storage/ipc/shmqueue.c:234
+#: storage/ipc/shmqueue.c:254
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
@@ -9448,7 +9277,8 @@ msgstr ""
 msgid "ReceiveSharedInvalidMessages: cache state reset"
 msgstr ""
 
-#: storage/ipc/sinval.c:319 storage/ipc/sinval.c:329
+#: storage/ipc/sinval.c:319
+#: storage/ipc/sinval.c:329
 msgid "Memory exhausted in GetSnapshotData"
 msgstr ""
 
@@ -9491,7 +9321,8 @@ msgstr ""
 msgid "inv_getsize: large object %u not found"
 msgstr ""
 
-#: storage/large_object/inv_api.c:257 storage/large_object/inv_api.c:262
+#: 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"
@@ -9536,28 +9367,22 @@ msgstr ""
 
 #: 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 ""
-"%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)"
+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 "%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)"
 
 #: 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 ""
-"%s: holder(%lx) lock(%lx) tbl(%d) proc(%lx) xid(%u) hold(%d,%d,%d,%d,%d,%d,%"
-"d)=%d"
+msgid "%s: holder(%lx) lock(%lx) tbl(%d) proc(%lx) xid(%u) hold(%d,%d,%d,%d,%d,%d,%d)=%d"
+msgstr "%s: holder(%lx) lock(%lx) tbl(%d) proc(%lx) xid(%u) hold(%d,%d,%d,%d,%d,%d,%d)=%d"
 
 #: storage/lmgr/lock.c:245
 #, c-format
 msgid "LockMethodTableInit: too many lock types %d greater than %d"
 msgstr ""
 
-#: storage/lmgr/lock.c:264 storage/lmgr/lock.c:310 storage/lmgr/lock.c:330
+#: storage/lmgr/lock.c:264
+#: storage/lmgr/lock.c:310
+#: storage/lmgr/lock.c:330
 #, c-format
 msgid "LockMethodTableInit: couldn't initialize %s"
 msgstr ""
@@ -9677,7 +9502,8 @@ msgstr ""
 msgid "LWLockRelease: lock %d is not held"
 msgstr ""
 
-#: storage/lmgr/proc.c:151 storage/lmgr/proc.c:165
+#: storage/lmgr/proc.c:151
+#: storage/lmgr/proc.c:165
 msgid "cannot create new proc: out of memory"
 msgstr ""
 
@@ -9714,66 +9540,53 @@ msgstr ""
 msgid "spin.c does not support S_LOCK_FREE()"
 msgstr ""
 
-#: storage/page/bufpage.c:92
+#: storage/page/bufpage.c:135
 #, c-format
-msgid ""
-"PageAddItem: corrupted page pointers: lower = %u, upper = %u, special = %u"
+msgid "PageAddItem: corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 
-#: storage/page/bufpage.c:112
+#: storage/page/bufpage.c:155
 msgid "PageAddItem: tried overwrite of used ItemId"
 msgstr ""
 
-#: storage/page/bufpage.c:139
+#: storage/page/bufpage.c:182
 msgid "PageAddItem: specified offset after maxoff"
 msgstr ""
 
-#: storage/page/bufpage.c:288
+#: storage/page/bufpage.c:331
 #, c-format
-msgid ""
-"PageRepairFragmentation: corrupted page pointers: lower = %u, upper = %u, "
-"special = %u"
+msgid "PageRepairFragmentation: corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 
-#: storage/page/bufpage.c:330
+#: storage/page/bufpage.c:373
 #, c-format
 msgid "PageRepairFragmentation: corrupted item pointer %u"
 msgstr ""
 
-#: storage/page/bufpage.c:343
+#: storage/page/bufpage.c:386
 #, c-format
 msgid "PageRepairFragmentation: corrupted item lengths, total %u, avail %u"
 msgstr ""
 
-#: storage/page/bufpage.c:422
+#: storage/page/bufpage.c:465
 #, c-format
-msgid ""
-"PageIndexTupleDelete: corrupted page pointers: lower = %u, upper = %u, "
-"special = %u"
+msgid "PageIndexTupleDelete: corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 
-#: storage/page/bufpage.c:427
+#: storage/page/bufpage.c:470
 #, c-format
 msgid "PageIndexTupleDelete: bad offnum %u"
 msgstr ""
 
-#: storage/page/bufpage.c:438
+#: storage/page/bufpage.c:481
 #, c-format
 msgid "PageIndexTupleDelete: corrupted item pointer: offset = %u size = %u"
 msgstr ""
 
-#: storage/smgr/smgrtype.c:51
-#, c-format
-msgid "smgrin: unknown storage manager name '%s'"
-msgstr ""
-
-#: storage/smgr/smgrtype.c:62
-#, c-format
-msgid "Illegal storage manager id %d"
-msgstr ""
-
-#: storage/smgr/md.c:252 storage/smgr/md.c:424 storage/smgr/md.c:471
-#: storage/smgr/md.c:510
+#: storage/smgr/md.c:252
+#: storage/smgr/md.c:424
+#: storage/smgr/md.c:467
+#: storage/smgr/md.c:506
 msgid "seekpos too big!"
 msgstr ""
 
@@ -9785,49 +9598,49 @@ msgstr ""
 msgid "segment too big on relopen!"
 msgstr ""
 
-#: storage/smgr/md.c:519
+#: storage/smgr/md.c:515
 #, c-format
 msgid "mdblindwrt: lseek(%ld) failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:533
+#: storage/smgr/md.c:529
 #, c-format
 msgid "mdblindwrt: write() failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:539
+#: storage/smgr/md.c:535
 #, c-format
 msgid "mdblindwrt: close() failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:576
+#: storage/smgr/md.c:572
 msgid "segment too big in mdnblocks!"
 msgstr ""
 
-#: storage/smgr/md.c:596
+#: storage/smgr/md.c:592
 #, c-format
 msgid "cannot count blocks for %s -- open failed: %m"
 msgstr ""
 
-#: storage/smgr/md.c:761
+#: storage/smgr/md.c:757
 msgid "_fdvec_alloc error"
 msgstr ""
 
-#: storage/smgr/md.c:843
+#: storage/smgr/md.c:839
 msgid "segment too big on openseg!"
 msgstr ""
 
-#: storage/smgr/md.c:862
+#: storage/smgr/md.c:858
 #, c-format
 msgid "_mdfd_getrelnfd: cannot open relation %s: %m"
 msgstr ""
 
-#: storage/smgr/md.c:905
+#: storage/smgr/md.c:901
 #, c-format
 msgid "cannot open segment %u of relation %s (target block %u): %m"
 msgstr ""
 
-#: storage/smgr/md.c:958
+#: storage/smgr/md.c:954
 #, c-format
 msgid "_mdfd_blind_getseg: couldn't open %s: %m"
 msgstr ""
@@ -9878,8 +9691,9 @@ msgid ""
 "\tCheck free disk space."
 msgstr ""
 
-#: storage/smgr/smgr.c:270 utils/init/miscinit.c:1014
-#: utils/misc/database.c:147
+#: storage/smgr/smgr.c:270
+#: utils/init/miscinit.c:1015
+#: utils/misc/database.c:149
 #, c-format
 msgid "cannot open %s: %m"
 msgstr ""
@@ -9939,35 +9753,45 @@ msgstr ""
 msgid "illegal storage manager number %d"
 msgstr ""
 
-#: tcop/fastpath.c:174
+#: storage/smgr/smgrtype.c:51
+#, c-format
+msgid "smgrin: unknown storage manager name '%s'"
+msgstr ""
+
+#: storage/smgr/smgrtype.c:62
+#, c-format
+msgid "Illegal storage manager id %d"
+msgstr ""
+
+#: tcop/fastpath.c:175
 #, c-format
 msgid "fetch_fp_info: cache lookup for function %u failed"
 msgstr ""
 
-#: tcop/fastpath.c:185 tcop/fastpath.c:190
+#: tcop/fastpath.c:186
+#: tcop/fastpath.c:191
 msgid "CSTRING not supported in fastpath protocol"
 msgstr ""
 
-#: tcop/fastpath.c:278
+#: tcop/fastpath.c:279
 #, c-format
-msgid ""
-"HandleFunctionRequest: actual arguments (%d) != registered arguments (%d)"
+msgid "HandleFunctionRequest: actual arguments (%d) != registered arguments (%d)"
 msgstr ""
 
-#: tcop/fastpath.c:297 tcop/fastpath.c:309
+#: tcop/fastpath.c:298
+#: tcop/fastpath.c:310
 #, c-format
 msgid "HandleFunctionRequest: bogus argsize %d"
 msgstr ""
 
-#: tcop/fastpath.c:322
+#: tcop/fastpath.c:323
 #, c-format
 msgid "HandleFunctionRequest: bogus argsize %d, should be %d"
 msgstr ""
 
-#: tcop/fastpath.c:340 tcop/postgres.c:674
-msgid ""
-"current transaction is aborted, queries ignored until end of transaction "
-"block"
+#: tcop/fastpath.c:341
+#: tcop/postgres.c:674
+msgid "current transaction is aborted, queries ignored until end of transaction block"
 msgstr ""
 
 #: tcop/postgres.c:284
@@ -10020,9 +9844,7 @@ msgid ""
 msgstr ""
 
 #: tcop/postgres.c:1121
-msgid ""
-"floating point exception! The last floating point operation either exceeded "
-"legal ranges or was a divide by zero"
+msgid "floating point exception! The last floating point operation either exceeded legal ranges or was a divide by zero"
 msgstr ""
 
 #: tcop/postgres.c:1154
@@ -10030,7 +9852,7 @@ msgid "This connection has been terminated by the administrator."
 msgstr ""
 
 #: tcop/postgres.c:1161
-msgid "Query was canceled."
+msgid "Query was cancelled."
 msgstr ""
 
 #: tcop/postgres.c:1308
@@ -10046,12 +9868,11 @@ msgid "use -x {off,nor,nopull,nopm,pullall,wait}"
 msgstr ""
 
 #: tcop/postgres.c:1613
-msgid ""
-"Query statistics are disabled because parser, planner, or executor "
-"statistics are on."
+msgid "Query statistics are disabled because parser, planner, or executor statistics are on."
 msgstr ""
 
-#: tcop/postgres.c:1689 tcop/postgres.c:1701
+#: tcop/postgres.c:1689
+#: tcop/postgres.c:1701
 #, c-format
 msgid ""
 "%s: invalid command line arguments\n"
@@ -10084,59 +9905,57 @@ msgstr ""
 "%s\n"
 "%s"
 
-#: tcop/postgres.c:2542
+#: tcop/postgres.c:2538
 #, c-format
 msgid "CreateCommandTag: unknown parse node type %d"
 msgstr ""
 
-#: tcop/pquery.c:86
+#: tcop/pquery.c:112
 #, c-format
 msgid "Closing pre-existing portal \"%s\""
 msgstr ""
 
-#: tcop/utility.c:96
+#: tcop/utility.c:95
 #, c-format
 msgid "\"%s\" is not %s %s. Use DROP %s to remove %s %s"
 msgstr ""
 
-#: tcop/utility.c:100
+#: tcop/utility.c:99
 #, c-format
 msgid "\"%s\" is not %s %s"
 msgstr ""
 
-#: tcop/utility.c:119 tcop/utility.c:124
+#: tcop/utility.c:118
+#: tcop/utility.c:123
 #, c-format
 msgid "%s \"%s\" does not exist"
 msgstr ""
 
-#: tcop/utility.c:137
+#: tcop/utility.c:136
 #, c-format
 msgid "%s \"%s\" is a system %s"
 msgstr ""
 
-#: tcop/utility.c:163
+#: tcop/utility.c:162
 #, c-format
 msgid "relation \"%s\" is a system catalog"
 msgstr ""
 
-#: tcop/utility.c:442 tcop/utility.c:446
+#: tcop/utility.c:445
+#: tcop/utility.c:449
 #, c-format
 msgid "ProcessUtility: Invalid target for RENAME: %d"
 msgstr ""
 
-#: tcop/utility.c:550
+#: tcop/utility.c:553
 msgid "ALTER TABLE: permission denied"
 msgstr "ALTER TABLE: нет доступа"
 
-#: tcop/utility.c:556
+#: tcop/utility.c:559
 msgid "T_AlterTableStmt: unknown subtype"
 msgstr ""
 
-#: tcop/utility.c:599
-msgid "T_AlterDomainStmt: unknown subtype"
-msgstr ""
-
-#: tcop/utility.c:908
+#: tcop/utility.c:876
 #, c-format
 msgid "ProcessUtility: command #%d unsupported"
 msgstr ""
@@ -10146,7 +9965,8 @@ msgstr ""
 msgid "array_in: more than %d dimensions"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:179 utils/adt/arrayfuncs.c:188
+#: utils/adt/arrayfuncs.c:179
+#: utils/adt/arrayfuncs.c:188
 msgid "array_in: missing dimension value"
 msgstr ""
 
@@ -10166,57 +9986,67 @@ msgstr ""
 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:301 utils/adt/arrayfuncs.c:308
-#: utils/adt/arrayfuncs.c:420 utils/adt/arrayfuncs.c:430
+#: 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:317 utils/adt/arrayfuncs.c:328
-#: utils/adt/arrayfuncs.c:449 utils/adt/arrayfuncs.c:462
-#: utils/adt/arrayfuncs.c:498
+#: 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:1039
+#: utils/adt/arrayfuncs.c:986
 msgid "Slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1175 utils/adt/arrayfuncs.c:1177
-#: utils/adt/arrayfuncs.c:1194 utils/adt/arrayfuncs.c:1214
-#: utils/adt/arrayfuncs.c:1224 utils/adt/arrayfuncs.c:1350
-#: utils/adt/arrayfuncs.c:1365 utils/adt/arrayfuncs.c:1374
-#: utils/adt/arrayfuncs.c:1381 utils/adt/arrayfuncs.c:1390
+#: 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:1339
+#: utils/adt/arrayfuncs.c:1286
 msgid "Updates on slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1400
+#: utils/adt/arrayfuncs.c:1347
 msgid "Source array too small"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1531
+#: utils/adt/arrayfuncs.c:1478
 #, c-format
 msgid "array_map: invalid nargs: %d"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1533
+#: utils/adt/arrayfuncs.c:1480
 msgid "array_map: null input array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1577
+#: utils/adt/arrayfuncs.c:1524
 msgid "array_map: cannot handle NULL in array"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1768 utils/cache/lsyscache.c:946
-#: utils/cache/lsyscache.c:969
+#: 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 ""
@@ -10259,63 +10089,63 @@ msgstr ""
 msgid "makeacl: invalid size: %d"
 msgstr ""
 
-#: utils/adt/acl.c:279
+#: utils/adt/acl.c:280
 msgid "aclitemin: cannot accept anything but = ACLs"
 msgstr ""
 
-#: utils/adt/acl.c:283
+#: utils/adt/acl.c:284
 msgid "aclitemin: extra garbage at end of specification"
 msgstr ""
 
-#: utils/adt/acl.c:351
+#: utils/adt/acl.c:352
 #, c-format
 msgid "aclitemout: bad idtype: %d"
 msgstr ""
 
-#: utils/adt/acl.c:433
+#: utils/adt/acl.c:434
 #, c-format
 msgid "acldefault: bogus objtype %d"
 msgstr ""
 
-#: utils/adt/acl.c:506
+#: utils/adt/acl.c:507
 msgid "aclinsert3: insertion before world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:617
+#: utils/adt/acl.c:618
 msgid "aclremove: removal of the world ACL??"
 msgstr ""
 
-#: utils/adt/acl.c:864
+#: utils/adt/acl.c:865
 #, c-format
 msgid "has_table_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1067
+#: utils/adt/acl.c:1068
 #, c-format
 msgid "has_database_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1243
+#: utils/adt/acl.c:1244
 #, c-format
 msgid "function \"%s\" does not exist"
 msgstr "функция \"%s\" не существует"
 
-#: utils/adt/acl.c:1266
+#: utils/adt/acl.c:1267
 #, c-format
 msgid "has_function_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1465
+#: utils/adt/acl.c:1466
 #, c-format
 msgid "has_language_privilege: invalid privilege type %s"
 msgstr ""
 
-#: utils/adt/acl.c:1641
+#: utils/adt/acl.c:1642
 #, c-format
 msgid "schema \"%s\" does not exist"
 msgstr "схема \"%s\" не существует"
 
-#: utils/adt/acl.c:1667
+#: utils/adt/acl.c:1668
 #, c-format
 msgid "has_schema_privilege: invalid privilege type %s"
 msgstr ""
@@ -10325,32 +10155,6 @@ msgstr ""
 msgid "pg_to_ascii(): unsupported encoding from %s"
 msgstr ""
 
-#: utils/adt/bool.c:77
-#, c-format
-msgid "Bad boolean external representation '%s'"
-msgstr ""
-
-#: utils/adt/cash.c:195
-#, c-format
-msgid "Bad money external representation %s"
-msgstr ""
-
-#: utils/adt/cash.c:292 utils/adt/cash.c:305
-msgid "Memory allocation failed, can't output cash"
-msgstr ""
-
-#: utils/adt/cash.c:445 utils/adt/cash.c:495
-msgid "cash_div:  divide by 0.0 error"
-msgstr ""
-
-#: utils/adt/cash.c:546
-msgid "cash_div_int4: divide by 0 error"
-msgstr ""
-
-#: utils/adt/cash.c:596
-msgid "cash_div:  divide by 0 error"
-msgstr ""
-
 #: utils/adt/date.c:69
 #, c-format
 msgid "Bad date external representation (too long) '%s'"
@@ -10372,6 +10176,7 @@ msgstr ""
 msgid "Unrecognized date external representation '%s'"
 msgstr ""
 
+#: utils/adt/date.c:330
 #: utils/adt/date.c:400
 msgid "Unable to convert timestamp to date"
 msgstr ""
@@ -10389,79 +10194,123 @@ msgstr ""
 msgid "Bad time external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:525 utils/adt/date.c:1336
+#: utils/adt/date.c:525
+#: utils/adt/date.c:1335
 #, c-format
 msgid "Bad time external representation '%s'"
 msgstr ""
 
-#: utils/adt/date.c:928
+#: utils/adt/date.c:914
 msgid "Unable to convert timestamp to time"
 msgstr ""
 
-#: utils/adt/date.c:963
+#: utils/adt/date.c:949
 msgid "Unable to convert timestamptz to time"
 msgstr ""
 
-#: utils/adt/date.c:1165
+#: utils/adt/date.c:1164
 msgid "Bad time external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:1196 utils/adt/date.c:1279
+#: utils/adt/date.c:1195
+#: utils/adt/date.c:1278
 #, c-format
 msgid "TIME units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:1263
+#: utils/adt/date.c:1262
 #, c-format
 msgid "TIME units '%s' not supported"
 msgstr ""
 
-#: utils/adt/date.c:1331
+#: utils/adt/date.c:1330
 #, c-format
 msgid "Bad time with time zone external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/date.c:1795
+#: utils/adt/date.c:1793
 msgid "Unable to convert timestamptz to timetz"
 msgstr ""
 
-#: utils/adt/date.c:1871
+#: utils/adt/date.c:1869
 msgid "Bad timetz external representation (too long)"
 msgstr ""
 
-#: utils/adt/date.c:1902 utils/adt/date.c:1998
+#: utils/adt/date.c:1900
+#: utils/adt/date.c:1996
 #, c-format
 msgid "TIMETZ units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:1982
+#: utils/adt/date.c:1980
 #, c-format
 msgid "TIMETZ units '%s' not supported"
 msgstr ""
 
-#: utils/adt/date.c:2025 utils/adt/date.c:2059 utils/adt/timestamp.c:3274
-#: utils/adt/timestamp.c:3297 utils/adt/timestamp.c:3411
-#: utils/adt/timestamp.c:3433
+#: utils/adt/date.c:2023
+#: utils/adt/date.c:2057
+#: utils/adt/timestamp.c:3257
+#: utils/adt/timestamp.c:3280
+#: utils/adt/timestamp.c:3394
+#: utils/adt/timestamp.c:3416
 #, c-format
 msgid "Time zone '%s' not recognized"
 msgstr ""
 
-#: utils/adt/date.c:2078 utils/adt/timestamp.c:3319 utils/adt/timestamp.c:3456
+#: utils/adt/date.c:2076
+#: utils/adt/timestamp.c:3302
+#: utils/adt/timestamp.c:3439
 #, c-format
 msgid "INTERVAL time zone '%s' not legal (month specified)"
 msgstr ""
 
-#: utils/adt/datetime.c:1239 utils/adt/datetime.c:1955
+#: utils/adt/bool.c:77
+#, c-format
+msgid "Bad boolean external representation '%s'"
+msgstr ""
+
+#: utils/adt/cash.c:195
+#, c-format
+msgid "Bad money external representation %s"
+msgstr ""
+
+#: utils/adt/cash.c:292
+#: utils/adt/cash.c:305
+msgid "Memory allocation failed, can't output cash"
+msgstr ""
+
+#: utils/adt/cash.c:445
+#: utils/adt/cash.c:495
+msgid "cash_div:  divide by 0.0 error"
+msgstr ""
+
+#: utils/adt/cash.c:546
+msgid "cash_div_int4: divide by 0 error"
+msgstr ""
+
+#: utils/adt/cash.c:596
+msgid "cash_div:  divide by 0 error"
+msgstr ""
+
+#: utils/adt/datetime.c:1240
+#: utils/adt/datetime.c:1963
 msgid "'CURRENT' is no longer supported"
 msgstr ""
 
-#: utils/adt/datetime.c:1418 utils/adt/datetime.c:2227
-#: utils/adt/formatting.c:3035
+#: utils/adt/datetime.c:1417
+#: utils/adt/datetime.c:2236
+#: utils/adt/formatting.c:3046
 #, c-format
 msgid "Inconsistent use of year %04d and 'BC'"
 msgstr ""
 
-#: utils/adt/datum.c:78 utils/adt/datum.c:87
+#: utils/adt/datetime.c:3684
+#, c-format
+msgid "Ordering error in %s table: \"%.*s\" >= \"%.*s\""
+msgstr ""
+
+#: utils/adt/datum.c:78
+#: utils/adt/datum.c:87
 msgid "datumGetSize: Invalid Datum Pointer"
 msgstr ""
 
@@ -10470,7 +10319,8 @@ msgstr ""
 msgid "datumGetSize: Invalid typLen %d"
 msgstr ""
 
-#: utils/adt/encode.c:53 utils/adt/encode.c:87
+#: utils/adt/encode.c:53
+#: utils/adt/encode.c:87
 #, c-format
 msgid "No such encoding as '%s'"
 msgstr ""
@@ -10504,144 +10354,150 @@ msgstr ""
 msgid "base64: invalid end sequence"
 msgstr ""
 
-#: utils/adt/encode.c:419 utils/adt/encode.c:482
+#: utils/adt/encode.c:419
+#: utils/adt/encode.c:482
 msgid "decode: Bad input string for type bytea"
 msgstr ""
 
-#: utils/adt/float.c:151
+#: utils/adt/float.c:148
 msgid "Bad float4 input format -- overflow"
 msgstr ""
 
-#: utils/adt/float.c:153
+#: utils/adt/float.c:150
 msgid "Bad float4 input format -- underflow"
 msgstr ""
 
-#: utils/adt/float.c:175
+#: utils/adt/float.c:172
 msgid "Bad float8 input format -- overflow"
 msgstr ""
 
-#: utils/adt/float.c:177
+#: utils/adt/float.c:174
 msgid "Bad float8 input format -- underflow"
 msgstr ""
 
-#: utils/adt/float.c:207
+#: utils/adt/float.c:204
 #, c-format
 msgid "Bad float4 input format '%s'"
 msgstr ""
 
-#: utils/adt/float.c:212
+#: utils/adt/float.c:209
 #, c-format
 msgid "Input '%s' is out of range for float4"
 msgstr ""
 
-#: utils/adt/float.c:278 utils/adt/numeric.c:2836 utils/adt/numeric.c:2859
+#: utils/adt/float.c:269
+#: utils/adt/numeric.c:2836
+#: utils/adt/numeric.c:2859
 #, c-format
 msgid "Bad float8 input format '%s'"
 msgstr ""
 
-#: utils/adt/float.c:283
+#: utils/adt/float.c:274
 #, c-format
 msgid "Input '%s' is out of range for float8"
 msgstr ""
 
-#: utils/adt/float.c:508
+#: utils/adt/float.c:493
 msgid "float4div: divide by zero error"
 msgstr ""
 
-#: utils/adt/float.c:570
+#: utils/adt/float.c:555
 msgid "float8div: divide by zero error"
 msgstr ""
 
-#: utils/adt/float.c:820
+#: utils/adt/float.c:805
 msgid "dtoi4: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:837
+#: utils/adt/float.c:822
 msgid "dtoi2: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:882
+#: utils/adt/float.c:867
 msgid "ftoi4: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:899
+#: utils/adt/float.c:884
 msgid "ftoi2: integer out of range"
 msgstr ""
 
-#: utils/adt/float.c:1133
+#: utils/adt/float.c:1118
 msgid "can't take sqrt of a negative number"
 msgstr ""
 
-#: utils/adt/float.c:1177
+#: utils/adt/float.c:1162
 msgid "pow() result is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1205
+#: utils/adt/float.c:1190
 msgid "exp() result is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1223 utils/adt/float.c:1244
+#: utils/adt/float.c:1208
+#: utils/adt/float.c:1229
 msgid "can't take log of zero"
 msgstr ""
 
-#: utils/adt/float.c:1225 utils/adt/float.c:1246
+#: utils/adt/float.c:1210
+#: utils/adt/float.c:1231
 msgid "can't take log of a negative number"
 msgstr ""
 
-#: utils/adt/float.c:1271
+#: utils/adt/float.c:1256
 #, c-format
 msgid "acos(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1294
+#: utils/adt/float.c:1279
 #, c-format
 msgid "asin(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1317
+#: utils/adt/float.c:1302
 #, c-format
 msgid "atan(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1341
+#: utils/adt/float.c:1326
 #, c-format
 msgid "atan2(%f,%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1364
+#: utils/adt/float.c:1349
 #, c-format
 msgid "cos(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1387
+#: utils/adt/float.c:1372
 #, c-format
 msgid "cot(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1411
+#: utils/adt/float.c:1396
 #, c-format
 msgid "sin(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1434
+#: utils/adt/float.c:1419
 #, c-format
 msgid "tan(%f) input is out of range"
 msgstr ""
 
-#: utils/adt/float.c:1545
+#: utils/adt/float.c:1530
 #, c-format
 msgid "%s: expected 3-element float8 array"
 msgstr ""
 
-#: utils/adt/float.c:1756
+#: utils/adt/float.c:1741
 msgid "float48div: divide by zero"
 msgstr ""
 
-#: utils/adt/float.c:1816
+#: utils/adt/float.c:1801
 msgid "float84div: divide by zero"
 msgstr ""
 
-#: utils/adt/format_type.c:136 utils/adt/format_type.c:162
+#: 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 ""
@@ -10651,7 +10507,7 @@ msgstr ""
 msgid "Invalid INTERVAL typmod 0x%x"
 msgstr ""
 
-#: utils/adt/formatting.c:390
+#: utils/adt/formatting.c:391
 #, c-format
 msgid ""
 "TMFC:\n"
@@ -10677,7 +10533,7 @@ msgid ""
 "us: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:396
+#: utils/adt/formatting.c:397
 #, c-format
 msgid ""
 "TM:\n"
@@ -10692,98 +10548,99 @@ msgid ""
 "mon %d\n"
 msgstr ""
 
-#: utils/adt/formatting.c:963
+#: utils/adt/formatting.c:964
 msgid "to_char/to_number(): '9' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:980
+#: utils/adt/formatting.c:981
 msgid "to_char/to_number(): '0' must be ahead of 'PR'."
 msgstr ""
 
-#: utils/adt/formatting.c:1007
+#: utils/adt/formatting.c:1008
 msgid "to_char/to_number(): not unique decimal point."
 msgstr ""
 
-#: utils/adt/formatting.c:1012 utils/adt/formatting.c:1099
+#: 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:1025
+#: utils/adt/formatting.c:1026
 msgid "to_char/to_number(): not unique 'S'."
 msgstr ""
 
-#: utils/adt/formatting.c:1030
+#: 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:1052
+#: utils/adt/formatting.c:1053
 msgid "to_char/to_number(): can't use 'S' and 'MI' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1061
+#: utils/adt/formatting.c:1062
 msgid "to_char/to_number(): can't use 'S' and 'PL' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1070
+#: utils/adt/formatting.c:1071
 msgid "to_char/to_number(): can't use 'S' and 'SG' together."
 msgstr ""
 
-#: utils/adt/formatting.c:1080
+#: 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:1106
+#: utils/adt/formatting.c:1107
 msgid "to_char/to_number(): 'E' is not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1130
+#: utils/adt/formatting.c:1131
 msgid "to_char/number(): run parser."
 msgstr ""
 
-#: utils/adt/formatting.c:1326
+#: utils/adt/formatting.c:1337
 msgid "to_from-char(): DUMP FORMAT"
 msgstr ""
 
-#: utils/adt/formatting.c:1331
+#: utils/adt/formatting.c:1342
 #, c-format
 msgid "%d:\t NODE_TYPE_ACTION '%s'\t(%s,%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:1334
+#: utils/adt/formatting.c:1345
 #, c-format
 msgid "%d:\t NODE_TYPE_CHAR '%c'"
 msgstr ""
 
-#: utils/adt/formatting.c:1337
+#: utils/adt/formatting.c:1348
 #, c-format
 msgid "%d:\t NODE_TYPE_END"
 msgstr ""
 
-#: utils/adt/formatting.c:1341
+#: utils/adt/formatting.c:1352
 #, c-format
 msgid "%d:\t UnKnown NODE !!!"
 msgstr ""
 
-#: utils/adt/formatting.c:1365
+#: utils/adt/formatting.c:1376
 #, c-format
 msgid "get_th: '%s' is not number."
 msgstr ""
 
-#: utils/adt/formatting.c:1539
+#: utils/adt/formatting.c:1550
 msgid "TO-FROM_CHAR: Dump KeyWord Index:"
 msgstr ""
 
-#: utils/adt/formatting.c:1545
+#: utils/adt/formatting.c:1556
 #, c-format
 msgid "\t%c: %s, "
 msgstr "\t%c: %s, "
 
-#: utils/adt/formatting.c:1551
+#: utils/adt/formatting.c:1562
 #, c-format
 msgid "\t(%d) %c %d"
 msgstr "\t(%d) %c %d"
 
-#: utils/adt/formatting.c:1554
+#: utils/adt/formatting.c:1565
 #, c-format
 msgid ""
 "\n"
@@ -10791,133 +10648,137 @@ msgid ""
 "\t\tFree positions: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:1626
+#: utils/adt/formatting.c:1637
 msgid "to_timestamp(): bad AM/PM string"
 msgstr ""
 
-#: utils/adt/formatting.c:1970
+#: utils/adt/formatting.c:1981
 msgid "to_timestamp(): TZ/tz not supported."
 msgstr ""
 
-#: utils/adt/formatting.c:1978
+#: utils/adt/formatting.c:1989
 #, c-format
 msgid "to_timestamp(): bad value for %s"
 msgstr ""
 
-#: utils/adt/formatting.c:2612 utils/adt/formatting.c:3171
+#: utils/adt/formatting.c:2623
+#: utils/adt/formatting.c:3182
 #, c-format
 msgid "Cache is full (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2620 utils/adt/formatting.c:3188
+#: utils/adt/formatting.c:2631
+#: utils/adt/formatting.c:3199
 #, c-format
 msgid "OLD: '%s' AGE: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:2631 utils/adt/formatting.c:3200
+#: utils/adt/formatting.c:2642
+#: utils/adt/formatting.c:3211
 #, c-format
 msgid "NEW (%d)"
 msgstr ""
 
-#: utils/adt/formatting.c:2796 utils/adt/formatting.c:2822
+#: utils/adt/formatting.c:2807
+#: utils/adt/formatting.c:2833
 msgid "to_char(): Unable to convert timestamp to tm"
 msgstr ""
 
-#: utils/adt/formatting.c:2998
+#: utils/adt/formatting.c:3009
 msgid "to_timestamp(): AM/PM hour must be between 1 and 12"
 msgstr ""
 
-#: utils/adt/formatting.c:3067
+#: utils/adt/formatting.c:3078
 msgid "to_timestamp() cat't convert yday without year information"
 msgstr ""
 
-#: utils/adt/formatting.c:3102
+#: utils/adt/formatting.c:3113
 msgid "to_timestamp(): can't convert 'tm' to timestamp."
 msgstr ""
 
-#: utils/adt/formatting.c:3250
+#: utils/adt/formatting.c:3261
 #, c-format
 msgid "REMOVING ENTRY (%s)"
 msgstr ""
 
-#: utils/adt/formatting.c:3475
+#: utils/adt/formatting.c:3486
 msgid "CALL: get_last_relevant_decnum()"
 msgstr ""
 
-#: utils/adt/formatting.c:3500
+#: utils/adt/formatting.c:3511
 msgid " --- scan start --- "
 msgstr ""
 
-#: utils/adt/formatting.c:3521
+#: utils/adt/formatting.c:3532
 #, c-format
 msgid "Try read sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3533
+#: utils/adt/formatting.c:3544
 #, c-format
 msgid "Try read locale sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3552
+#: utils/adt/formatting.c:3563
 #, c-format
 msgid "Try read sipmle sign (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3593
+#: utils/adt/formatting.c:3604
 #, c-format
 msgid "Read digit (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3604
+#: utils/adt/formatting.c:3615
 #, c-format
 msgid "Try read decimal point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3619
+#: utils/adt/formatting.c:3630
 #, c-format
 msgid "Try read locale point (%c)."
 msgstr ""
 
-#: utils/adt/formatting.c:3652
+#: utils/adt/formatting.c:3663
 #, 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:3667
+#: utils/adt/formatting.c:3678
 #, c-format
 msgid "Writing sign to position: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3709
+#: utils/adt/formatting.c:3720
 #, c-format
 msgid "Writing bracket to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3731
+#: utils/adt/formatting.c:3742
 #, c-format
 msgid "Writing blank space to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3746
+#: utils/adt/formatting.c:3757
 #, c-format
 msgid "Writing zero to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3764
+#: utils/adt/formatting.c:3775
 #, c-format
 msgid "Writing decimal point to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3813
+#: utils/adt/formatting.c:3824
 #, c-format
 msgid "Writing digit '%c' to position %d"
 msgstr ""
 
-#: utils/adt/formatting.c:3857
+#: utils/adt/formatting.c:3868
 msgid "to_number(): RN is not supported"
 msgstr ""
 
-#: utils/adt/formatting.c:3979
+#: utils/adt/formatting.c:3990
 #, c-format
 msgid ""
 "\n"
@@ -10946,104 +10807,111 @@ msgstr ""
 "\tZERO_END: %d\n"
 "\tLAST_RELEVANT: %s"
 
-#: utils/adt/formatting.c:4244
+#: utils/adt/formatting.c:4255
 #, c-format
 msgid "TO_NUMBER (number): '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:290
+#: utils/adt/geo_ops.c:279
 msgid "Too many points requested"
 msgstr ""
 
-#: utils/adt/geo_ops.c:311
+#: utils/adt/geo_ops.c:300
 msgid "Unable to format path"
 msgstr ""
 
-#: utils/adt/geo_ops.c:383
+#: utils/adt/geo_ops.c:372
 #, c-format
 msgid "Bad box external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:842
+#: utils/adt/geo_ops.c:831
 #, c-format
 msgid "Bad line external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:847 utils/adt/geo_ops.c:911
+#: utils/adt/geo_ops.c:836
+#: utils/adt/geo_ops.c:900
 msgid "line not yet implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1237 utils/adt/geo_ops.c:1258
+#: 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:1574
+#: utils/adt/geo_ops.c:1563
 #, c-format
 msgid "Bad point external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:1770
+#: utils/adt/geo_ops.c:1759
 #, c-format
 msgid "Bad lseg external representation '%s'"
 msgstr ""
 
-#: utils/adt/geo_ops.c:2320
+#: utils/adt/geo_ops.c:2309
 msgid "dist_lb not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:2831
+#: utils/adt/geo_ops.c:2820
 msgid "close_lb not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3108
+#: utils/adt/geo_ops.c:3097
 msgid "Unable to create bounding box for empty polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3130 utils/adt/geo_ops.c:3140
+#: 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:3428
+#: utils/adt/geo_ops.c:3418
 msgid "poly_distance not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3507
+#: utils/adt/geo_ops.c:3497
 msgid "point_div:  divide by 0.0 error"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3626
+#: utils/adt/geo_ops.c:3616
 msgid "too many points requested."
 msgstr ""
 
-#: utils/adt/geo_ops.c:3734
+#: utils/adt/geo_ops.c:3724
 msgid "path_center not implemented"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3749
+#: utils/adt/geo_ops.c:3739
 msgid "Open path cannot be converted to polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3914 utils/adt/geo_ops.c:3922 utils/adt/geo_ops.c:3935
-#: utils/adt/geo_ops.c:3939
+#: 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:3959 utils/adt/geo_ops.c:3965
+#: utils/adt/geo_ops.c:3949
+#: utils/adt/geo_ops.c:3955
 msgid "Unable to format circle"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4445
+#: utils/adt/geo_ops.c:4434
 msgid "Unable to convert circle to polygon"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4452
+#: utils/adt/geo_ops.c:4441
 msgid "too many points requested"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4485 utils/adt/geo_ops.c:4506
+#: utils/adt/geo_ops.c:4474
+#: utils/adt/geo_ops.c:4495
 msgid "Unable to convert polygon to circle"
 msgstr ""
 
@@ -11061,7 +10929,8 @@ msgstr ""
 msgid "i4toi2: '%d' causes int2 overflow"
 msgstr ""
 
-#: utils/adt/int8.c:101 utils/adt/int8.c:125
+#: utils/adt/int8.c:101
+#: utils/adt/int8.c:125
 #, c-format
 msgid "Bad int8 external representation \"%s\""
 msgstr ""
@@ -11083,7 +10952,8 @@ msgstr ""
 msgid "int8 conversion to int2 is out of range"
 msgstr ""
 
-#: utils/adt/int8.c:807 utils/adt/int8.c:844
+#: utils/adt/int8.c:807
+#: utils/adt/int8.c:844
 msgid "Floating point conversion to int8 is out of range"
 msgstr ""
 
@@ -11091,7 +10961,9 @@ msgstr ""
 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
+#: 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 ""
 
@@ -11109,113 +10981,125 @@ msgstr ""
 msgid "Text is too long to convert to MAC address"
 msgstr ""
 
-#: utils/adt/nabstime.c:340 utils/adt/nabstime.c:373
+#: utils/adt/nabstime.c:339
+#: utils/adt/nabstime.c:372
 #, c-format
 msgid "Invalid timezone '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:477
+#: utils/adt/nabstime.c:476
 #, c-format
 msgid "Bad abstime external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:481
+#: utils/adt/nabstime.c:480
 #, c-format
 msgid "Bad abstime external representation '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:511
+#: utils/adt/nabstime.c:510
 #, c-format
 msgid "Bad abstime (internal coding error) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:702 utils/adt/nabstime.c:770
+#: utils/adt/nabstime.c:701
+#: utils/adt/nabstime.c:769
 msgid "Unable to convert timestamp to abstime"
 msgstr ""
 
-#: utils/adt/nabstime.c:726
+#: utils/adt/nabstime.c:725
 msgid "Unable to convert abstime 'invalid' to timestamp"
 msgstr ""
 
-#: utils/adt/nabstime.c:741
+#: utils/adt/nabstime.c:740
 msgid ""
 "Unable to convert ABSTIME to TIMESTAMP\n"
 "\tabstime_timestamp() internal error"
 msgstr ""
 
-#: utils/adt/nabstime.c:794
+#: utils/adt/nabstime.c:793
 msgid "Unable to convert abstime 'invalid' to timestamptz"
 msgstr ""
 
-#: utils/adt/nabstime.c:809
+#: utils/adt/nabstime.c:808
 msgid ""
 "Unable to convert ABSTIME to TIMESTAMP WITH TIME ZONE\n"
 "\tabstime_timestamptz() internal error"
 msgstr ""
 
-#: utils/adt/nabstime.c:840
+#: utils/adt/nabstime.c:839
 #, c-format
 msgid "Bad reltime external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:844
+#: utils/adt/nabstime.c:843
 #, c-format
 msgid "Bad reltime external representation '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:854
+#: utils/adt/nabstime.c:853
 #, c-format
 msgid "Bad reltime (internal coding error) '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:912
+#: utils/adt/nabstime.c:911
 #, c-format
 msgid "Unable to decode tinterval '%s'"
 msgstr ""
 
-#: utils/adt/nabstime.c:1025
+#: utils/adt/nabstime.c:1024
 msgid "Unable to convert reltime 'invalid' to interval"
 msgstr ""
 
-#: utils/adt/network.c:64
+#: utils/adt/network.c:65
 #, c-format
 msgid "invalid %s value '%s'"
 msgstr ""
 
-#: utils/adt/network.c:75
+#: utils/adt/network.c:76
 #, c-format
 msgid "invalid CIDR value '%s': has bits set to right of mask"
 msgstr ""
 
-#: utils/adt/network.c:127 utils/adt/network.c:468
+#: utils/adt/network.c:128
+#: utils/adt/network.c:469
 #, c-format
 msgid "unable to print address (%s)"
 msgstr ""
 
-#: utils/adt/network.c:137 utils/adt/network.c:401 utils/adt/network.c:438
-#: utils/adt/network.c:472 utils/adt/network.c:517 utils/adt/network.c:556
-#: utils/adt/network.c:597 utils/adt/network.c:633
+#: 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:184
+#: utils/adt/network.c:185
 #, c-format
 msgid "set_masklen - invalid value '%d'"
 msgstr ""
 
-#: utils/adt/network.c:225 utils/adt/network.c:314 utils/adt/network.c:334
-#: utils/adt/network.c:354 utils/adt/network.c:374
+#: 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:397 utils/adt/network.c:428
+#: utils/adt/network.c:398
+#: utils/adt/network.c:429
 #, c-format
 msgid "unable to print host (%s)"
 msgstr ""
 
-#: utils/adt/network.c:652
+#: utils/adt/network.c:656
 #, c-format
 msgid "convert_network_to_scalar: unsupported type %u"
 msgstr ""
@@ -11264,16 +11148,18 @@ msgstr ""
 msgid "int8_avg: expected 2-element int8 array"
 msgstr ""
 
-#: utils/adt/numeric.c:2443 utils/adt/numeric.c:2458 utils/adt/numeric.c:2476
-#: utils/adt/numeric.c:2480 utils/adt/numeric.c:2491
+#: utils/adt/numeric.c:2443
+#: utils/adt/numeric.c:2458
+#: utils/adt/numeric.c:2476
+#: utils/adt/numeric.c:2480
+#: utils/adt/numeric.c:2491
 #, c-format
 msgid "Bad numeric input format '%s'"
 msgstr ""
 
 #: utils/adt/numeric.c:2810
 #, c-format
-msgid ""
-"overflow on numeric ABS(value) >= 10^%d for field with precision %d scale %d"
+msgid "overflow on numeric ABS(value) >= 10^%d for field with precision %d scale %d"
 msgstr ""
 
 #: utils/adt/numeric.c:3269
@@ -11300,8 +11186,12 @@ msgstr ""
 msgid "pg_atoi: zero-length string"
 msgstr ""
 
-#: utils/adt/numutils.c:83 utils/adt/numutils.c:95 utils/adt/numutils.c:100
-#: utils/adt/numutils.c:108 utils/adt/numutils.c:113 utils/adt/numutils.c:120
+#: utils/adt/numutils.c:83
+#: utils/adt/numutils.c:95
+#: utils/adt/numutils.c:100
+#: utils/adt/numutils.c:108
+#: utils/adt/numutils.c:113
+#: utils/adt/numutils.c:120
 #: utils/adt/numutils.c:125
 #, c-format
 msgid "pg_atoi: error reading \"%s\": %m"
@@ -11322,7 +11212,8 @@ msgstr ""
 msgid "%s: error reading \"%s\": %m"
 msgstr ""
 
-#: utils/adt/oid.c:49 utils/adt/oid.c:63
+#: utils/adt/oid.c:49
+#: utils/adt/oid.c:63
 #, c-format
 msgid "%s: error in \"%s\": can't parse \"%s\""
 msgstr ""
@@ -11336,7 +11227,8 @@ msgstr ""
 msgid "oidvector value has too many values"
 msgstr ""
 
-#: utils/adt/oracle_compat.c:199 utils/adt/oracle_compat.c:294
+#: utils/adt/oracle_compat.c:199
+#: utils/adt/oracle_compat.c:294
 msgid "Requested length too large"
 msgstr ""
 
@@ -11349,26 +11241,30 @@ msgid "Invalid LC_COLLATE setting"
 msgstr ""
 
 #: utils/adt/pgstatfuncs.c:188
-msgid ""
-"pg_stat_get_backend_idset: called in context that does not accept a set "
-"result"
+msgid "pg_stat_get_backend_idset: called in context that does not accept a set result"
 msgstr ""
 
 #: utils/adt/pgstatfuncs.c:193
 msgid "No function memory context in set-function"
 msgstr ""
 
-#: utils/adt/pseudotypes.c:35 utils/adt/pseudotypes.c:86
-#: utils/adt/pseudotypes.c:109 utils/adt/pseudotypes.c:157
-#: utils/adt/pseudotypes.c:180 utils/adt/pseudotypes.c:203
+#: utils/adt/pseudotypes.c:35
+#: utils/adt/pseudotypes.c:86
+#: utils/adt/pseudotypes.c:109
+#: utils/adt/pseudotypes.c:157
+#: utils/adt/pseudotypes.c:180
+#: utils/adt/pseudotypes.c:203
 #: utils/adt/pseudotypes.c:226
 #, c-format
 msgid "Cannot accept a constant of type %s"
 msgstr ""
 
-#: utils/adt/pseudotypes.c:46 utils/adt/pseudotypes.c:97
-#: utils/adt/pseudotypes.c:168 utils/adt/pseudotypes.c:191
-#: utils/adt/pseudotypes.c:214 utils/adt/pseudotypes.c:237
+#: utils/adt/pseudotypes.c:46
+#: utils/adt/pseudotypes.c:97
+#: utils/adt/pseudotypes.c:168
+#: utils/adt/pseudotypes.c:191
+#: utils/adt/pseudotypes.c:214
+#: utils/adt/pseudotypes.c:237
 #, c-format
 msgid "Cannot display a value of type %s"
 msgstr ""
@@ -11378,29 +11274,34 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: utils/adt/regproc.c:115 utils/adt/regproc.c:130 utils/adt/regproc.c:258
+#: 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:117 utils/adt/regproc.c:132
+#: 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:413 utils/adt/regproc.c:428 utils/adt/regproc.c:576
+#: 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:415 utils/adt/regproc.c:430
+#: 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:556
-msgid ""
-"regoperatorin: use NONE to denote the missing argument of a unary operator"
+msgid "regoperatorin: use NONE to denote the missing argument of a unary operator"
 msgstr ""
 
 #: utils/adt/regproc.c:558
@@ -11417,8 +11318,10 @@ msgstr ""
 msgid "No type with name %s"
 msgstr ""
 
-#: utils/adt/regproc.c:955 utils/adt/regproc.c:958 utils/adt/varlena.c:1367
-#: utils/adt/varlena.c:1370
+#: utils/adt/regproc.c:955
+#: utils/adt/regproc.c:958
+#: utils/adt/varlena.c:1358
+#: utils/adt/varlena.c:1361
 #, c-format
 msgid "%s: invalid name syntax"
 msgstr ""
@@ -11448,500 +11351,521 @@ msgstr ""
 msgid "%s: too many argument datatypes"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:186
+#: utils/adt/ri_triggers.c:192
 msgid "RI_FKey_check() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:189
+#: utils/adt/ri_triggers.c:195
 msgid "RI_FKey_check() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:192
+#: utils/adt/ri_triggers.c:198
 msgid "RI_FKey_check() must be fired for INSERT or UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:200
+#: utils/adt/ri_triggers.c:206
 msgid "wrong # of arguments in call to RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:202
+#: utils/adt/ri_triggers.c:208
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:216 utils/adt/ri_triggers.c:759
-#: utils/adt/ri_triggers.c:989 utils/adt/ri_triggers.c:1225
-#: utils/adt/ri_triggers.c:1433 utils/adt/ri_triggers.c:1677
-#: utils/adt/ri_triggers.c:1900 utils/adt/ri_triggers.c:2128
-#: utils/adt/ri_triggers.c:2347 utils/adt/ri_triggers.c:2612
-#: utils/adt/ri_triggers.c:2875 utils/adt/ri_triggers.c:3146
+#: utils/adt/ri_triggers.c:222
+#: utils/adt/ri_triggers.c:764
+#: utils/adt/ri_triggers.c:991
+#: utils/adt/ri_triggers.c:1224
+#: utils/adt/ri_triggers.c:1429
+#: utils/adt/ri_triggers.c:1670
+#: utils/adt/ri_triggers.c:1890
+#: utils/adt/ri_triggers.c:2115
+#: utils/adt/ri_triggers.c:2331
+#: utils/adt/ri_triggers.c:2589
+#: utils/adt/ri_triggers.c:2845
+#: utils/adt/ri_triggers.c:3103
 #, 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:292 utils/adt/ri_triggers.c:403
-#: utils/adt/ri_triggers.c:608
+#: utils/adt/ri_triggers.c:273
+#: utils/adt/ri_triggers.c:414
+#: utils/adt/ri_triggers.c:616
 msgid "SPI_connect() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:297 utils/adt/ri_triggers.c:481
+#: utils/adt/ri_triggers.c:300
+#: utils/adt/ri_triggers.c:489
 msgid "SPI_execp() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:302
+#: utils/adt/ri_triggers.c:305
 #, c-format
 msgid "%s referential integrity violation - no rows found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:308 utils/adt/ri_triggers.c:493
+#: utils/adt/ri_triggers.c:311
+#: utils/adt/ri_triggers.c:501
 msgid "SPI_finish() failed in RI_FKey_check()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:320 utils/adt/ri_triggers.c:909
-#: utils/adt/ri_triggers.c:1150 utils/adt/ri_triggers.c:1356
-#: utils/adt/ri_triggers.c:1595 utils/adt/ri_triggers.c:1817
-#: utils/adt/ri_triggers.c:2053 utils/adt/ri_triggers.c:2269
-#: utils/adt/ri_triggers.c:2537 utils/adt/ri_triggers.c:2798
-#: utils/adt/ri_triggers.c:3090 utils/adt/ri_triggers.c:3180
+#: utils/adt/ri_triggers.c:323
+#: utils/adt/ri_triggers.c:911
+#: utils/adt/ri_triggers.c:1149
+#: utils/adt/ri_triggers.c:1352
+#: utils/adt/ri_triggers.c:1588
+#: utils/adt/ri_triggers.c:1807
+#: utils/adt/ri_triggers.c:2040
+#: utils/adt/ri_triggers.c:2253
+#: utils/adt/ri_triggers.c:2514
+#: utils/adt/ri_triggers.c:2768
+#: utils/adt/ri_triggers.c:3047
+#: utils/adt/ri_triggers.c:3137
 msgid "MATCH PARTIAL not yet supported"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:356
+#: utils/adt/ri_triggers.c:359
 #, c-format
-msgid ""
-"%s referential integrity violation - MATCH FULL doesn't allow mixing of NULL "
-"and NON-NULL key values"
+msgid "%s referential integrity violation - MATCH FULL doesn't allow mixing of NULL and NON-NULL key values"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:380 utils/adt/ri_triggers.c:594
+#: utils/adt/ri_triggers.c:383
+#: utils/adt/ri_triggers.c:602
 msgid "MATCH PARTIAL not yet implemented"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:486
+#: utils/adt/ri_triggers.c:494
 #, c-format
-msgid ""
-"%s referential integrity violation - key referenced from %s not found in %s"
+msgid "%s referential integrity violation - key referenced from %s not found in %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:502
+#: utils/adt/ri_triggers.c:510
 msgid "internal error #1 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:679
+#: utils/adt/ri_triggers.c:684
 msgid "SPI_execp() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:686
+#: utils/adt/ri_triggers.c:691
 msgid "SPI_finish() failed in ri_Check_Pk_Match()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:727
+#: utils/adt/ri_triggers.c:732
 msgid "RI_FKey_noaction_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:730
+#: utils/adt/ri_triggers.c:735
 msgid "RI_FKey_noaction_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:732
+#: utils/adt/ri_triggers.c:737
 msgid "RI_FKey_noaction_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:740
+#: utils/adt/ri_triggers.c:745
 msgid "wrong # of arguments in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:742
+#: utils/adt/ri_triggers.c:747
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:817
+#: utils/adt/ri_triggers.c:822
 msgid "SPI_connect() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:887
+#: utils/adt/ri_triggers.c:889
 msgid "SPI_execp() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:892 utils/adt/ri_triggers.c:1133
-#: utils/adt/ri_triggers.c:1800 utils/adt/ri_triggers.c:2036
+#: utils/adt/ri_triggers.c:894
+#: utils/adt/ri_triggers.c:1132
+#: utils/adt/ri_triggers.c:1790
+#: utils/adt/ri_triggers.c:2023
 #, c-format
 msgid "%s referential integrity violation - key in %s still referenced from %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:899
+#: utils/adt/ri_triggers.c:901
 msgid "SPI_finish() failed in RI_FKey_noaction_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:916
+#: utils/adt/ri_triggers.c:918
 msgid "internal error #2 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:957
+#: utils/adt/ri_triggers.c:959
 msgid "RI_FKey_noaction_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:960
+#: utils/adt/ri_triggers.c:962
 msgid "RI_FKey_noaction_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:962
+#: utils/adt/ri_triggers.c:964
 msgid "RI_FKey_noaction_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:970
+#: utils/adt/ri_triggers.c:972
 msgid "wrong # of arguments in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:972
+#: utils/adt/ri_triggers.c:974
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1058
+#: utils/adt/ri_triggers.c:1060
 msgid "SPI_connect() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1128
+#: utils/adt/ri_triggers.c:1127
 msgid "SPI_execp() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1140
+#: utils/adt/ri_triggers.c:1139
 msgid "SPI_finish() failed in RI_FKey_noaction_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1157
+#: utils/adt/ri_triggers.c:1156
 msgid "internal error #3 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1193
+#: utils/adt/ri_triggers.c:1192
 msgid "RI_FKey_cascade_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1196
+#: utils/adt/ri_triggers.c:1195
 msgid "RI_FKey_cascade_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1198
+#: utils/adt/ri_triggers.c:1197
 msgid "RI_FKey_cascade_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1206
+#: utils/adt/ri_triggers.c:1205
 msgid "wrong # of arguments in call to RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1208
+#: 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:1272
+#: utils/adt/ri_triggers.c:1271
 msgid "SPI_connect() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1341
+#: utils/adt/ri_triggers.c:1337
 msgid "SPI_execp() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1346
+#: utils/adt/ri_triggers.c:1342
 msgid "SPI_finish() failed in RI_FKey_cascade_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1363
+#: utils/adt/ri_triggers.c:1359
 msgid "internal error #4 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1401
+#: utils/adt/ri_triggers.c:1397
 msgid "RI_FKey_cascade_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1404
+#: utils/adt/ri_triggers.c:1400
 msgid "RI_FKey_cascade_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1406
+#: utils/adt/ri_triggers.c:1402
 msgid "RI_FKey_cascade_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1414
+#: utils/adt/ri_triggers.c:1410
 msgid "wrong # of arguments in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1416
+#: utils/adt/ri_triggers.c:1412
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1491
+#: utils/adt/ri_triggers.c:1487
 msgid "SPI_connect() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1580
+#: utils/adt/ri_triggers.c:1573
 msgid "SPI_execp() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1585
+#: utils/adt/ri_triggers.c:1578
 msgid "SPI_finish() failed in RI_FKey_cascade_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1602
+#: utils/adt/ri_triggers.c:1595
 msgid "internal error #5 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1645
+#: utils/adt/ri_triggers.c:1638
 msgid "RI_FKey_restrict_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1648
+#: utils/adt/ri_triggers.c:1641
 msgid "RI_FKey_restrict_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1650
+#: utils/adt/ri_triggers.c:1643
 msgid "RI_FKey_restrict_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1658
+#: utils/adt/ri_triggers.c:1651
 msgid "wrong # of arguments in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1660
+#: utils/adt/ri_triggers.c:1653
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1724
+#: utils/adt/ri_triggers.c:1717
 msgid "SPI_connect() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1795
+#: utils/adt/ri_triggers.c:1785
 msgid "SPI_execp() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1807
+#: utils/adt/ri_triggers.c:1797
 msgid "SPI_finish() failed in RI_FKey_restrict_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1824
+#: utils/adt/ri_triggers.c:1814
 msgid "internal error #6 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1868
+#: utils/adt/ri_triggers.c:1858
 msgid "RI_FKey_restrict_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1871
+#: utils/adt/ri_triggers.c:1861
 msgid "RI_FKey_restrict_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1873
+#: utils/adt/ri_triggers.c:1863
 msgid "RI_FKey_restrict_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1881
+#: utils/adt/ri_triggers.c:1871
 msgid "wrong # of arguments in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1883
+#: utils/adt/ri_triggers.c:1873
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1958
+#: utils/adt/ri_triggers.c:1948
 msgid "SPI_connect() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2031
+#: utils/adt/ri_triggers.c:2018
 msgid "SPI_execp() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2043
+#: utils/adt/ri_triggers.c:2030
 msgid "SPI_finish() failed in RI_FKey_restrict_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2060
+#: utils/adt/ri_triggers.c:2047
 msgid "internal error #7 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2096
+#: utils/adt/ri_triggers.c:2083
 msgid "RI_FKey_setnull_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2099
+#: utils/adt/ri_triggers.c:2086
 msgid "RI_FKey_setnull_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2101
+#: utils/adt/ri_triggers.c:2088
 msgid "RI_FKey_setnull_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2109
+#: utils/adt/ri_triggers.c:2096
 msgid "wrong # of arguments in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2111
+#: utils/adt/ri_triggers.c:2098
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2175
+#: utils/adt/ri_triggers.c:2162
 msgid "SPI_connect() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2254
+#: utils/adt/ri_triggers.c:2238
 msgid "SPI_execp() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2259
+#: utils/adt/ri_triggers.c:2243
 msgid "SPI_finish() failed in RI_FKey_setnull_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2276
+#: utils/adt/ri_triggers.c:2260
 msgid "internal error #8 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2315
+#: utils/adt/ri_triggers.c:2299
 msgid "RI_FKey_setnull_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2318
+#: utils/adt/ri_triggers.c:2302
 msgid "RI_FKey_setnull_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2320
+#: utils/adt/ri_triggers.c:2304
 msgid "RI_FKey_setnull_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2328
+#: utils/adt/ri_triggers.c:2312
 msgid "wrong # of arguments in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2330
+#: utils/adt/ri_triggers.c:2314
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2406
+#: utils/adt/ri_triggers.c:2390
 msgid "SPI_connect() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2522
+#: utils/adt/ri_triggers.c:2499
 msgid "SPI_execp() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2527
+#: utils/adt/ri_triggers.c:2504
 msgid "SPI_finish() failed in RI_FKey_setnull_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2544
+#: utils/adt/ri_triggers.c:2521
 msgid "internal error #9 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2580
+#: utils/adt/ri_triggers.c:2557
 msgid "RI_FKey_setdefault_del() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2583
+#: utils/adt/ri_triggers.c:2560
 msgid "RI_FKey_setdefault_del() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2585
+#: utils/adt/ri_triggers.c:2562
 msgid "RI_FKey_setdefault_del() must be fired for DELETE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2593
+#: utils/adt/ri_triggers.c:2570
 msgid "wrong # of arguments in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2595
+#: utils/adt/ri_triggers.c:2572
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2659
+#: utils/adt/ri_triggers.c:2636
 msgid "SPI_connect() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2783
+#: utils/adt/ri_triggers.c:2743
 msgid "SPI_execp() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2788
+#: utils/adt/ri_triggers.c:2748
 msgid "SPI_finish() failed in RI_FKey_setdefault_del()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2805
+#: utils/adt/ri_triggers.c:2775
 msgid "internal error #10 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2843
+#: utils/adt/ri_triggers.c:2813
 msgid "RI_FKey_setdefault_upd() not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2846
+#: utils/adt/ri_triggers.c:2816
 msgid "RI_FKey_setdefault_upd() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2848
+#: utils/adt/ri_triggers.c:2818
 msgid "RI_FKey_setdefault_upd() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2856
+#: utils/adt/ri_triggers.c:2826
 msgid "wrong # of arguments in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2858
+#: utils/adt/ri_triggers.c:2828
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2935
+#: utils/adt/ri_triggers.c:2905
 msgid "SPI_connect() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3075
+#: utils/adt/ri_triggers.c:3022
 msgid "SPI_execp() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3080
+#: utils/adt/ri_triggers.c:3027
 msgid "SPI_finish() failed in RI_FKey_setdefault_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3097
+#: utils/adt/ri_triggers.c:3054
 msgid "internal error #11 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3128
+#: utils/adt/ri_triggers.c:3085
 msgid "wrong # of arguments in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3130
+#: utils/adt/ri_triggers.c:3087
 #, c-format
 msgid "too many keys (%d max) in call to RI_FKey_keyequal_upd()"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3187
+#: utils/adt/ri_triggers.c:3144
 msgid "internal error #12 in ri_triggers.c"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3252
+#: utils/adt/ri_triggers.c:3255
 #, c-format
 msgid "unrecognized referential integrity MATCH type '%s'"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3302 utils/adt/ri_triggers.c:3310
-#: utils/adt/ri_triggers.c:3362
+#: utils/adt/ri_triggers.c:3305
+#: utils/adt/ri_triggers.c:3313
+#: utils/adt/ri_triggers.c:3365
 #, c-format
 msgid "constraint %s: table %s does not have an attribute %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3490
+#: utils/adt/ri_triggers.c:3493
 msgid "out of memory for RI plan cache"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3690
+#: utils/adt/ri_triggers.c:3682
+#, c-format
+msgid "ri_AttributesEqual(): cannot find '=' operator for type %u"
+msgstr ""
+
+#: utils/adt/ri_triggers.c:3698
 msgid "out of memory for RI operator cache"
 msgstr ""
 
@@ -11949,7 +11873,8 @@ msgstr ""
 msgid "get_ruledef: cannot connect to SPI manager"
 msgstr ""
 
-#: utils/adt/ruleutils.c:213 utils/adt/ruleutils.c:330
+#: utils/adt/ruleutils.c:213
+#: utils/adt/ruleutils.c:330
 #, c-format
 msgid "SPI_prepare() failed for \"%s\""
 msgstr ""
@@ -11959,7 +11884,8 @@ msgstr ""
 msgid "failed to get pg_rewrite tuple for %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:228 utils/adt/ruleutils.c:253
+#: utils/adt/ruleutils.c:228
+#: utils/adt/ruleutils.c:253
 msgid "get_ruledef: SPI_finish() failed"
 msgstr ""
 
@@ -12016,65 +11942,65 @@ msgstr ""
 msgid "pg_get_constraintdef: Unknown confdeltype '%c' for constraint %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:698
+#: utils/adt/ruleutils.c:703
 #, c-format
 msgid "pg_get_constraintdef: unsupported constraint type '%c'"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1100
+#: utils/adt/ruleutils.c:1105
 #, c-format
 msgid "get_ruledef: rule %s has unsupported event type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1302
+#: utils/adt/ruleutils.c:1307
 #, c-format
 msgid "get_query_def: unknown query command type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1537
+#: utils/adt/ruleutils.c:1542
 #, c-format
 msgid "get_setop_query: unexpected set op %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1549
+#: utils/adt/ruleutils.c:1554
 #, c-format
 msgid "get_setop_query: unexpected node %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1609
+#: utils/adt/ruleutils.c:1614
 msgid "get_insert_query_def: too many RTEs in INSERT!"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1761
+#: utils/adt/ruleutils.c:1766
 msgid "get_utility_query_def: unexpected statement type"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1792
+#: utils/adt/ruleutils.c:1797
 #, c-format
 msgid "get_names_for_var: bogus varlevelsup %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1806
+#: utils/adt/ruleutils.c:1811
 #, c-format
 msgid "get_names_for_var: bogus varno %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2092
+#: utils/adt/ruleutils.c:2041
 #, c-format
-msgid "get_rule_expr: unknown boolop %d"
+msgid "get_rule_expr: expr opType %d not supported"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2123
+#: utils/adt/ruleutils.c:2101
 #, c-format
 msgid "Argument type %s of FieldSelect is not a tuple type"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2205
+#: utils/adt/ruleutils.c:2183
 #, c-format
 msgid "get_rule_expr: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2238
+#: utils/adt/ruleutils.c:2216
 #, c-format
 msgid "get_rule_expr: unexpected booltesttype %d"
 msgstr ""
@@ -12093,108 +12019,109 @@ msgstr ""
 msgid "get_rule_expr: bogus oprkind"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2677
+#: utils/adt/ruleutils.c:2681
 #, c-format
 msgid "get_sublink_expr: unsupported sublink type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2770
+#: utils/adt/ruleutils.c:2774
 #, c-format
 msgid "unexpected rte kind %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2842
+#: utils/adt/ruleutils.c:2846
 #, c-format
 msgid "get_from_clause_item: unknown join type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2892
+#: utils/adt/ruleutils.c:2896
 #, c-format
 msgid "get_from_clause_item: unexpected node type %d"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2959 utils/cache/lsyscache.c:251
+#: utils/adt/ruleutils.c:2964
+#: utils/cache/lsyscache.c:250
 #, c-format
 msgid "cache lookup failed for opclass %u"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2999
+#: utils/adt/ruleutils.c:3009
 msgid "tleIsArrayAssign: I'm confused ..."
 msgstr ""
 
-#: utils/adt/ruleutils.c:3216
+#: utils/adt/ruleutils.c:3226
 #, c-format
 msgid "cache lookup of operator %u failed"
 msgstr "поиск в кзше оператора %u не удался"
 
-#: utils/adt/ruleutils.c:3237
+#: utils/adt/ruleutils.c:3247
 #, c-format
 msgid "unexpected oprkind %c for operator %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:880
+#: utils/adt/selfuncs.c:894
 #, c-format
 msgid "patternsel: no = operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1057 utils/adt/selfuncs.c:1134
-#: utils/adt/selfuncs.c:1175 utils/adt/selfuncs.c:1205
+#: utils/adt/selfuncs.c:1072
+#: utils/adt/selfuncs.c:1149
+#: utils/adt/selfuncs.c:1190
+#: utils/adt/selfuncs.c:1220
 #, c-format
 msgid "booltestsel: unexpected booltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1240 utils/adt/selfuncs.c:1294
+#: utils/adt/selfuncs.c:1255
+#: utils/adt/selfuncs.c:1309
 #, c-format
 msgid "nulltestsel: unexpected nulltesttype %d"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2355
+#: utils/adt/selfuncs.c:2164
 #, c-format
 msgid "convert_numeric_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2542
+#: utils/adt/selfuncs.c:2348
 #, c-format
 msgid "convert_string_datum: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2731
+#: utils/adt/selfuncs.c:2546
 #, c-format
 msgid "convert_timevalue_to_scalar: unsupported type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2958 utils/adt/selfuncs.c:3326
+#: utils/adt/selfuncs.c:2772
+#: utils/adt/selfuncs.c:3164
 msgid "Cannot perform case insensitive matching on type BYTEA"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3043 utils/adt/selfuncs.c:3472
+#: utils/adt/selfuncs.c:2876
+#: utils/adt/selfuncs.c:3323
 msgid "Regex matching not supported on type BYTEA"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3184
+#: utils/adt/selfuncs.c:3017
 msgid "pattern_fixed_prefix: bogus ptype"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3213
+#: utils/adt/selfuncs.c:3051
 #, c-format
 msgid "prefix_selectivity: no >= operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3244
+#: utils/adt/selfuncs.c:3082
 #, c-format
 msgid "prefix_selectivity: no < operator for type %u"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3516
+#: utils/adt/selfuncs.c:3367
 msgid "pattern_selectivity: bogus ptype"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3682
-#, c-format
-msgid "string_lessthan: unexpected datatype %u"
-msgstr ""
-
-#: utils/adt/sets.c:86
+#: utils/adt/sets.c:87
 #, c-format
 msgid "SetDefine: unable to define set %s"
 msgstr ""
@@ -12204,7 +12131,8 @@ msgstr ""
 msgid "invalid tid format: '%s'"
 msgstr ""
 
-#: utils/adt/tid.c:67 utils/adt/tid.c:72
+#: utils/adt/tid.c:67
+#: utils/adt/tid.c:72
 msgid "tidin: invalid value."
 msgstr ""
 
@@ -12233,7 +12161,8 @@ msgstr ""
 msgid "Bad timestamp external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:84 utils/adt/timestamp.c:278
+#: utils/adt/timestamp.c:84
+#: utils/adt/timestamp.c:261
 #, c-format
 msgid "Bad timestamp external representation '%s'"
 msgstr ""
@@ -12257,319 +12186,351 @@ msgstr ""
 msgid "Unable to format timestamp; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:213
+#: utils/adt/timestamp.c:203
 #, c-format
 msgid "TIMESTAMP(%d) precision must be between %d and %d"
 msgstr ""
 
-#: utils/adt/timestamp.c:273
+#: utils/adt/timestamp.c:256
 #, c-format
 msgid "Bad timestamp with time zone external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:284
+#: utils/adt/timestamp.c:267
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE out of range '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:300
+#: utils/adt/timestamp.c:283
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:305
+#: utils/adt/timestamp.c:288
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:334
+#: utils/adt/timestamp.c:317
 msgid "Unable to format timestamp with time zone; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:393
+#: utils/adt/timestamp.c:376
 #, c-format
 msgid "Bad interval external representation (too long) '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:397 utils/adt/timestamp.c:405
+#: utils/adt/timestamp.c:380
+#: utils/adt/timestamp.c:388
 #, c-format
 msgid "Bad interval external representation '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:410
+#: utils/adt/timestamp.c:393
 #, c-format
 msgid "Interval '%s' no longer supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:414
+#: utils/adt/timestamp.c:397
 #, c-format
 msgid "Interval '%s' not parsed; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:434
+#: utils/adt/timestamp.c:417
 msgid "Unable to encode interval; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:437
+#: utils/adt/timestamp.c:420
 msgid "Unable to format interval; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:695
+#: utils/adt/timestamp.c:668
 msgid "AdjustIntervalForTypmod(): internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:1517
+#: utils/adt/timestamp.c:674
+#, c-format
+msgid "INTERVAL(%d) precision must be between %d and %d"
+msgstr ""
+
+#: utils/adt/timestamp.c:1487
 msgid "Unable to subtract non-finite timestamps"
 msgstr ""
 
-#: utils/adt/timestamp.c:1579
+#: utils/adt/timestamp.c:1549
 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:1556
 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:1634
 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:1639
 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:1868
 msgid "interval_div: divide by 0.0 error"
 msgstr ""
 
-#: utils/adt/timestamp.c:1943
+#: utils/adt/timestamp.c:1913
 msgid "interval_accum: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:1985
+#: utils/adt/timestamp.c:1955
 msgid "interval_avg: expected 2-element interval array"
 msgstr ""
 
-#: utils/adt/timestamp.c:2107
+#: utils/adt/timestamp.c:2077
 msgid ""
 "Unable to encode INTERVAL\n"
 "\ttimestamp_age() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2111
+#: utils/adt/timestamp.c:2081
 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:2186
+#: utils/adt/timestamp.c:2189
 msgid "Unable to decode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:2272
+#: utils/adt/timestamp.c:2242
 msgid "TIMESTAMP bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2328
+#: utils/adt/timestamp.c:2298
 msgid "TIMESTAMP WITH TIME ZONE bad external representation (too long)"
 msgstr ""
 
-#: utils/adt/timestamp.c:2385
+#: utils/adt/timestamp.c:2355
 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:2388
+#: utils/adt/timestamp.c:2452
+#: utils/adt/timestamp.c:2752
+#: utils/adt/timestamp.c:2907
 #, 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:2443
+#: utils/adt/timestamp.c:2855
+#: utils/adt/timestamp.c:2900
 #, c-format
 msgid "TIMESTAMP units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2478
+#: utils/adt/timestamp.c:2448
 #, 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:2481
+#: utils/adt/timestamp.c:2546
+#: utils/adt/timestamp.c:2937
+#: utils/adt/timestamp.c:3090
 #, 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:2535
+#: utils/adt/timestamp.c:3051
+#: utils/adt/timestamp.c:3084
 #, c-format
 msgid "TIMESTAMP WITH TIME ZONE units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2572
+#: utils/adt/timestamp.c:2542
 #, 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:2575
+#: utils/adt/timestamp.c:2643
+#: utils/adt/timestamp.c:3118
+#: utils/adt/timestamp.c:3227
 #, c-format
 msgid "INTERVAL units '%s' not recognized"
 msgstr ""
 
-#: utils/adt/timestamp.c:2658 utils/adt/timestamp.c:3215
+#: utils/adt/timestamp.c:2628
+#: utils/adt/timestamp.c:3198
 #, c-format
 msgid "INTERVAL units '%s' not supported"
 msgstr ""
 
-#: utils/adt/timestamp.c:2662
+#: utils/adt/timestamp.c:2632
 #, c-format
 msgid "Unable to truncate INTERVAL to '%s'"
 msgstr ""
 
-#: utils/adt/timestamp.c:2667
+#: utils/adt/timestamp.c:2637
 msgid "Unable to decode INTERVAL; internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:2695
+#: utils/adt/timestamp.c:2665
 msgid "isoweek2date(): can't convert without year information"
 msgstr ""
 
-#: utils/adt/timestamp.c:2903 utils/adt/timestamp.c:2910
+#: utils/adt/timestamp.c:2870
+#: utils/adt/timestamp.c:3335
+msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
+msgstr ""
+
+#: utils/adt/timestamp.c:2875
+#: utils/adt/timestamp.c:3340
+msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
+msgstr ""
+
+#: utils/adt/timestamp.c:2886
+#: utils/adt/timestamp.c:2893
 msgid "Unable to encode TIMESTAMP"
 msgstr ""
 
-#: utils/adt/timestamp.c:3087 utils/adt/timestamp.c:3094
+#: utils/adt/timestamp.c:3070
+#: utils/adt/timestamp.c:3077
 msgid "Unable to encode TIMESTAMP WITH TIME ZONE"
 msgstr ""
 
-#: utils/adt/timestamp.c:3224
+#: utils/adt/timestamp.c:3207
 msgid ""
 "Unable to decode INTERVAL\n"
 "\tinterval_part() internal coding error"
 msgstr ""
 
-#: utils/adt/timestamp.c:3352
-msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
-msgstr ""
-
-#: utils/adt/timestamp.c:3357
-msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
-msgstr ""
-
-#: utils/adt/timestamp.c:3382
+#: utils/adt/timestamp.c:3365
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP (tm)"
 msgstr ""
 
-#: utils/adt/timestamp.c:3385
+#: utils/adt/timestamp.c:3368
 msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP"
 msgstr ""
 
-#: utils/adt/varbit.c:106 utils/adt/varbit.c:230
+#: 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:126 utils/adt/varbit.c:333
+#: 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:147 utils/adt/varbit.c:354
+#: 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:313 utils/adt/varbit.c:433
+#: 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:803
+#: utils/adt/varbit.c:806
 msgid "Cannot AND bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:841
+#: utils/adt/varbit.c:844
 msgid "Cannot OR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:885
+#: utils/adt/varbit.c:888
 msgid "Cannot XOR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/varbit.c:1100
+#: utils/adt/varbit.c:1103
 msgid "Bit string is too large to fit in type integer"
 msgstr ""
 
-#: utils/adt/varbit.c:1144 utils/adt/varbit.c:1171
+#: utils/adt/varbit.c:1147
+#: utils/adt/varbit.c:1174
 msgid "INT64 is not supported on this platform"
 msgstr ""
 
-#: utils/adt/varbit.c:1159
+#: utils/adt/varbit.c:1162
 msgid "Bit string is too large to fit in type int64"
 msgstr ""
 
-#: utils/adt/varbit.c:1251
+#: 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:213
+#: 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:369 utils/adt/varchar.c:447
+#: utils/adt/varchar.c:369
+#: utils/adt/varchar.c:447
 #, c-format
 msgid "value too long for type character varying(%d)"
 msgstr ""
 
-#: utils/adt/varlena.c:108 utils/adt/varlena.c:146
+#: utils/adt/varlena.c:107
+#: utils/adt/varlena.c:145
 msgid "Bad input string for type bytea"
 msgstr ""
 
-#: utils/adt/varlena.c:338 utils/adt/varlena.c:621 utils/adt/varlena.c:724
+#: utils/adt/varlena.c:337
+#: utils/adt/varlena.c:620
+#: utils/adt/varlena.c:726
 msgid "Invalid backend encoding; encoding max length is less than one."
 msgstr ""
 
-#: utils/adt/varlena.c:485 utils/adt/varlena.c:547 utils/adt/varlena.c:1055
+#: utils/adt/varlena.c:484
+#: utils/adt/varlena.c:546
+#: utils/adt/varlena.c:1046
 msgid "negative substring length not allowed"
 msgstr ""
 
-#: utils/adt/varlena.c:1148
+#: utils/adt/varlena.c:1139
 #, c-format
 msgid "byteaGetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1177
+#: utils/adt/varlena.c:1168
 #, c-format
 msgid "byteaGetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1211
+#: utils/adt/varlena.c:1202
 #, c-format
 msgid "byteaSetByte: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1252
+#: utils/adt/varlena.c:1243
 #, c-format
 msgid "byteaSetBit: index %d out of range [0..%d]"
 msgstr ""
 
-#: utils/adt/varlena.c:1262
+#: utils/adt/varlena.c:1253
 msgid "byteaSetBit: new bit must be 0 or 1"
 msgstr ""
 
-#: utils/adt/varlena.c:1753
+#: utils/adt/varlena.c:1744
 msgid "field position must be > 0"
 msgstr ""
 
@@ -12595,16 +12556,12 @@ msgstr ""
 
 #: 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"
+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:315
 #, c-format
-msgid ""
-"Catcache totals: %d tup, %ld srch, %ld+%ld=%ld hits, %ld+%ld=%ld loads, %ld "
-"invals, %ld discards, %ld lsrch, %ld lhits"
+msgid "Catcache totals: %d tup, %ld srch, %ld+%ld=%ld hits, %ld+%ld=%ld loads, %ld invals, %ld discards, %ld lsrch, %ld lhits"
 msgstr ""
 
 #: utils/cache/catcache.c:550
@@ -12622,107 +12579,113 @@ msgstr ""
 msgid "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n"
 msgstr ""
 
-#: utils/cache/catcache.c:860
+#: utils/cache/catcache.c:861
 #, c-format
 msgid "CatalogCacheInitializeCache: cache @%p %s"
 msgstr ""
 
-#: utils/cache/catcache.c:866
+#: utils/cache/catcache.c:867
 #, c-format
 msgid "CatalogCacheInitializeCache: load %d/%d w/%d, %u"
 msgstr ""
 
-#: utils/cache/catcache.c:870
+#: utils/cache/catcache.c:871
 #, c-format
 msgid "CatalogCacheInitializeCache: load %d/%d w/%d"
 msgstr ""
 
-#: utils/cache/catcache.c:940
+#: utils/cache/catcache.c:941
 msgid "CatalogCacheInit: only sys attr supported is OID"
 msgstr ""
 
+#: utils/cache/fcache.c:39
+msgid "init_fcache: too many arguments"
+msgstr ""
+
 #: utils/cache/inval.c:453
 #, c-format
 msgid "ExecuteInvalidationMessage: bogus message id %d"
 msgstr ""
 
-#: utils/cache/inval.c:708 utils/cache/inval.c:731
+#: utils/cache/inval.c:708
+#: utils/cache/inval.c:731
 msgid "Out of cache_callback_list slots"
 msgstr ""
 
-#: utils/cache/lsyscache.c:73
+#: utils/cache/lsyscache.c:72
 #, c-format
 msgid "op_requires_recheck: op %u is not a member of opclass %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:218
+#: utils/cache/lsyscache.c:217
 #, c-format
 msgid "cache lookup failed for relation %u attribute %d"
 msgstr ""
 
-#: utils/cache/lsyscache.c:370
+#: utils/cache/lsyscache.c:369
 #, c-format
 msgid "op_mergejoin_crossops: operator %u not found"
 msgstr "op_mergejoin_crossops: оператор %u не найден"
 
-#: utils/cache/lsyscache.c:378
+#: utils/cache/lsyscache.c:377
 #, c-format
 msgid "op_mergejoin_crossops: mergejoin operator %u has no matching < operator"
 msgstr ""
 
-#: utils/cache/lsyscache.c:385
+#: utils/cache/lsyscache.c:384
 #, c-format
 msgid "op_mergejoin_crossops: mergejoin operator %u has no matching > operator"
 msgstr ""
 
-#: utils/cache/lsyscache.c:430 utils/cache/lsyscache.c:446
+#: utils/cache/lsyscache.c:429
 #, c-format
 msgid "Operator OID %u does not exist"
 msgstr ""
 
-#: utils/cache/lsyscache.c:699
+#: utils/cache/lsyscache.c:661
 #, c-format
 msgid "get_system_catalog_relid: cannot find %s"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1044
+#: utils/cache/lsyscache.c:1006
 #, c-format
 msgid "get_typdefault: failed to lookup type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1123
+#: utils/cache/lsyscache.c:1087
 #, c-format
 msgid "getBaseType: failed to lookup type %u"
 msgstr "getBaseType: тип %u не найден"
 
-#: utils/cache/lsyscache.c:1261
+#: utils/cache/lsyscache.c:1225
 #, c-format
 msgid "getTypeInputInfo: Cache lookup of type %u failed"
 msgstr "getTypeInputInfo: Поиск в кзше типа %u не удался"
 
-#: utils/cache/lsyscache.c:1291
+#: utils/cache/lsyscache.c:1255
 #, c-format
 msgid "getTypeOutputInfo: Cache lookup of type %u failed"
 msgstr "getTypeOutputInfo: Поиск в кзше типа %u не удался"
 
-#: utils/cache/lsyscache.c:1387
+#: utils/cache/lsyscache.c:1351
 msgid "get_attstatsslot: stavalues is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1409
+#: utils/cache/lsyscache.c:1373
 #, c-format
 msgid "get_attstatsslot: Cache lookup failed for type %u"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1445
+#: utils/cache/lsyscache.c:1409
 msgid "get_attstatsslot: stanumbers is null"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1456
+#: utils/cache/lsyscache.c:1420
 msgid "get_attstatsslot: stanumbers is not a 1-D float4 array"
 msgstr ""
 
-#: utils/cache/relcache.c:168 utils/cache/relcache.c:176
+#: utils/cache/relcache.c:168
+#: utils/cache/relcache.c:176
 #: utils/cache/relcache.c:188
 msgid "out of memory for relation descriptor cache"
 msgstr ""
@@ -12781,145 +12744,145 @@ msgstr ""
 msgid "Bogus amproc number %d for opclass %u"
 msgstr ""
 
-#: utils/cache/relcache.c:1653
+#: utils/cache/relcache.c:1646
 #, c-format
 msgid "RelationReloadClassinfo system relation id=%d doesn't exist"
 msgstr ""
 
-#: utils/cache/relcache.c:1780
+#: utils/cache/relcache.c:1773
 #, c-format
 msgid "RelationClearRelation: relation %u deleted while still in use"
 msgstr ""
 
-#: utils/cache/relcache.c:1863
+#: utils/cache/relcache.c:1856
 #, c-format
 msgid "RelationForgetRelation: relation %u is still open"
 msgstr ""
 
-#: utils/cache/relcache.c:2020
+#: utils/cache/relcache.c:2013
 #, c-format
 msgid "Relcache reference leak: relation \"%s\" has refcnt %d instead of %d"
 msgstr ""
 
-#: utils/cache/relcache.c:2317
+#: utils/cache/relcache.c:2299
 #, c-format
 msgid "RelationCacheInitializePhase2: no pg_class entry for %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2465
+#: utils/cache/relcache.c:2447
 #, c-format
 msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2473
+#: utils/cache/relcache.c:2455
 #, c-format
 msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2484
+#: utils/cache/relcache.c:2466
 #, c-format
 msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2493
+#: utils/cache/relcache.c:2475
 #, c-format
 msgid "AttrDefaultFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2527
+#: utils/cache/relcache.c:2509
 #, c-format
 msgid "CheckConstraintFetch: unexpected record found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2538
+#: utils/cache/relcache.c:2520
 #, c-format
 msgid "CheckConstraintFetch: conbin IS NULL for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:2551
+#: utils/cache/relcache.c:2533
 #, c-format
 msgid "CheckConstraintFetch: %d record(s) not found for rel %s"
 msgstr ""
 
-#: utils/cache/relcache.c:3027
+#: utils/cache/relcache.c:2996
 #, c-format
 msgid ""
 "Cannot create init file %s: %m\n"
 "\tContinuing anyway, but there's something wrong."
 msgstr ""
 
-#: utils/cache/relcache.c:3051
+#: utils/cache/relcache.c:3020
 msgid "cannot write init file -- descriptor length"
 msgstr ""
 
-#: utils/cache/relcache.c:3055
+#: utils/cache/relcache.c:3024
 msgid "cannot write init file -- reldesc"
 msgstr ""
 
-#: utils/cache/relcache.c:3060
+#: utils/cache/relcache.c:3029
 msgid "cannot write init file -- relation tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3063
+#: utils/cache/relcache.c:3032
 msgid "cannot write init file -- relation tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3070
+#: utils/cache/relcache.c:3039
 #, c-format
 msgid "cannot write init file -- length of attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3072
+#: utils/cache/relcache.c:3041
 #, c-format
 msgid "cannot write init file -- attdesc %d"
 msgstr ""
 
-#: utils/cache/relcache.c:3091
+#: utils/cache/relcache.c:3060
 #, c-format
 msgid "write_relcache_init_file: no pg_index entry for index %u"
 msgstr ""
 
-#: utils/cache/relcache.c:3095
+#: utils/cache/relcache.c:3064
 msgid "cannot write init file -- index tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3097
+#: utils/cache/relcache.c:3066
 msgid "cannot write init file -- index tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3103
+#: utils/cache/relcache.c:3072
 msgid "cannot write init file -- am tuple form length"
 msgstr ""
 
-#: utils/cache/relcache.c:3106
+#: utils/cache/relcache.c:3075
 msgid "cannot write init file -- am tuple form"
 msgstr ""
 
-#: utils/cache/relcache.c:3112
+#: utils/cache/relcache.c:3081
 msgid "cannot write init file -- strategy map length"
 msgstr ""
 
-#: utils/cache/relcache.c:3115
+#: utils/cache/relcache.c:3084
 msgid "cannot write init file -- strategy map"
 msgstr ""
 
-#: utils/cache/relcache.c:3120
+#: utils/cache/relcache.c:3089
 msgid "cannot write init file -- operator vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3123
+#: utils/cache/relcache.c:3092
 msgid "cannot write init file -- operator vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3128
+#: utils/cache/relcache.c:3097
 msgid "cannot write init file -- support vector length"
 msgstr ""
 
-#: utils/cache/relcache.c:3131
+#: utils/cache/relcache.c:3100
 msgid "cannot write init file -- support vector"
 msgstr ""
 
-#: utils/cache/relcache.c:3175
+#: utils/cache/relcache.c:3144
 #, c-format
 msgid ""
 "Cannot rename init file %s to %s: %m\n"
@@ -12961,7 +12924,8 @@ msgid "copy: line %d, "
 msgstr ""
 
 #. translator: This must fit in fmt_fixedbuf.
-#: utils/error/elog.c:241 utils/error/elog.c:337
+#: utils/error/elog.c:241
+#: utils/error/elog.c:337
 msgid "elog: out of memory"
 msgstr "elog: не достаточно памяти"
 
@@ -13034,14 +12998,6 @@ msgstr "FATAL:  "
 msgid "PANIC:  "
 msgstr "PANIC:  "
 
-#: utils/fmgr/funcapi.c:36
-msgid "function called in context that does not accept a set result"
-msgstr ""
-
-#: utils/fmgr/funcapi.c:68
-msgid "init_MultiFuncCall may not be called more than once"
-msgstr ""
-
 #: utils/fmgr/dfmgr.c:97
 #, c-format
 msgid "stat failed on file '%s': %m"
@@ -13197,7 +13153,8 @@ msgstr ""
 msgid "FunctionCall1: function %u returned NULL"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1002 utils/sort/tuplesort.c:1823
+#: utils/fmgr/fmgr.c:1002
+#: utils/sort/tuplesort.c:1827
 #, c-format
 msgid "FunctionCall2: function %u returned NULL"
 msgstr ""
@@ -13292,12 +13249,21 @@ msgstr ""
 msgid "fmgr: function %u returned NULL"
 msgstr ""
 
+#: utils/fmgr/funcapi.c:36
+msgid "function called in context that does not accept a set result"
+msgstr ""
+
+#: utils/fmgr/funcapi.c:68
+msgid "init_MultiFuncCall may not be called more than once"
+msgstr ""
+
 #: utils/hash/dynahash.c:662
 #, c-format
 msgid "hash_search: bogus action %d"
 msgstr ""
 
-#: utils/hash/dynahash.c:935 utils/hash/dynahash.c:937
+#: utils/hash/dynahash.c:935
+#: utils/hash/dynahash.c:937
 #, c-format
 msgid "Hash table '%s' corrupted"
 msgstr ""
@@ -13356,50 +13322,44 @@ msgstr ""
 msgid "FindExec: could not find a %s to execute"
 msgstr ""
 
-#: utils/init/miscinit.c:143 utils/init/miscinit.c:162
-#: utils/init/miscinit.c:170 utils/misc/guc.c:940 utils/misc/guc.c:1123
-#: utils/misc/guc.c:1917 utils/misc/guc.c:1931 utils/misc/guc.c:2686
-#: utils/misc/guc.c:2692 utils/misc/guc.c:2699 guc-file.l:147 guc-file.l:267
-#: guc-file.l:302
-msgid "out of memory"
-msgstr "не хватает памяти"
-
-#: utils/init/miscinit.c:156
+#: utils/init/miscinit.c:157
 #, c-format
 msgid "cannot get current working directory: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:246
+#: utils/init/miscinit.c:247
 #, c-format
 msgid "SetCharSet: unknown tag %s in file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:401 utils/init/miscinit.c:457
+#: 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:635
+#: utils/init/miscinit.c:636
 #, c-format
-msgid "invalid user id %d"
-msgstr "неверное ID пользователя: %d"
+msgid "invalid user id %u"
+msgstr "неверное ID пользователя: %u"
 
-#: utils/init/miscinit.c:717
+#: utils/init/miscinit.c:718
 #, c-format
 msgid "Can't create lock file %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:728 utils/init/miscinit.c:731
+#: 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:741
+#: utils/init/miscinit.c:742
 #, c-format
 msgid "Bogus data in lock file %s"
 msgstr ""
 
-#: utils/init/miscinit.c:815
+#: utils/init/miscinit.c:816
 #, c-format
 msgid ""
 "Can't remove old lock file %s: %m\n"
@@ -13407,49 +13367,45 @@ msgid ""
 "\tPlease remove the file by hand and try again."
 msgstr ""
 
-#: utils/init/miscinit.c:836
+#: utils/init/miscinit.c:837
 #, c-format
 msgid "Can't write lock file %s: %m"
 msgstr ""
 
-#: utils/init/miscinit.c:927
+#: utils/init/miscinit.c:928
 #, c-format
 msgid "Failed to rewrite %s: %m"
 msgstr "Не удалось перезаписать %s: %m"
 
-#: utils/init/miscinit.c:933
+#: utils/init/miscinit.c:934
 #, c-format
 msgid "Failed to read %s: %m"
 msgstr "Не удалось прочитать %s: %m"
 
-#: utils/init/miscinit.c:946
+#: utils/init/miscinit.c:947
 #, c-format
 msgid "Bogus data in %s"
 msgstr "\"Левые\" данные в %s"
 
-#: utils/init/miscinit.c:970
+#: utils/init/miscinit.c:971
 #, c-format
 msgid "Failed to write %s: %m"
 msgstr "Не удалось записать %s: %m"
 
-#: utils/init/miscinit.c:1012
+#: utils/init/miscinit.c:1013
 #, c-format
 msgid "File %s is missing. This is not a valid data directory."
 msgstr "Файл %s отсутствует. Это неверная директория данных."
 
-#: utils/init/miscinit.c:1019
+#: utils/init/miscinit.c:1020
 #, c-format
 msgid "File %s does not contain valid data. You need to initdb."
 msgstr "Файл %s не содержит верные данные. Вам надо выполнить initdb."
 
-#: utils/init/miscinit.c:1024
+#: 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 ""
-"Директория данных была инициализирована с помощьб PostgreSQL, версии %ld.%"
-"ld, которая не совместима с этой версией: %s."
+msgid "The data directory was initialized by PostgreSQL version %ld.%ld, which is not compatible with this version %s."
+msgstr "Директория данных была инициализирована с помощьб PostgreSQL, версии %ld.%ld, которая не совместима с этой версией: %s."
 
 #: utils/init/postinit.c:114
 #, c-format
@@ -13491,17 +13447,16 @@ msgstr ""
 
 #: utils/init/postinit.c:355
 #, c-format
-msgid ""
-"You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
+msgid "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
 msgstr ""
 
 #: utils/init/postinit.c:390
 msgid "Non-superuser connection limit exceeded"
 msgstr ""
 
-#: utils/mb/encnames.c:445
-msgid "pg_char_to_encname_struct(): encoding name too long"
-msgstr ""
+#: utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c:87
+msgid "Could not convert UTF-8 to ISO8859-1"
+msgstr "Не получилось сконвертировать из UTF-8 в ISO8859-1"
 
 #: utils/mb/conv.c:374
 #, c-format
@@ -13518,254 +13473,308 @@ msgstr "Неверный номер кодировки %d"
 msgid "LocalToUtf: could not convert (0x%04x) %s to UTF-8. Ignored"
 msgstr ""
 
-#: utils/mb/mbutils.c:174
+#: utils/mb/encnames.c:445
+msgid "pg_char_to_encname_struct(): encoding name too long"
+msgstr ""
+
+#: utils/mb/mbutils.c:196
 #, c-format
 msgid "default conversion proc for %s to %s not found"
 msgstr ""
 
-#: utils/mb/mbutils.c:188
+#: utils/mb/mbutils.c:210
 #, c-format
 msgid "default conversion proc %u for %s to %s not found in pg_proc"
 msgstr ""
 
-#: utils/mb/mbutils.c:247
+#: utils/mb/mbutils.c:269
 #, c-format
 msgid "Invalid source encoding name %s"
 msgstr "Неверное имя исходной кодировки: %s"
 
-#: utils/mb/mbutils.c:249
+#: utils/mb/mbutils.c:271
 #, c-format
 msgid "Invalid destination encoding name %s"
 msgstr "Неверное имя кодировки назначения: %s"
 
-#: utils/mb/mbutils.c:259
+#: utils/mb/mbutils.c:281
 msgid "Encoding conversion failed"
 msgstr ""
 
-#: utils/mb/mbutils.c:480
+#: utils/mb/mbutils.c:502
 msgid "SetDatabaseEncoding(): invalid database encoding"
 msgstr ""
 
-#: utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c:87
-msgid "Could not convert UTF-8 to ISO8859-1"
-msgstr "Не получилось сконвертировать из UTF-8 в ISO8859-1"
-
-#: utils/misc/guc.c:1219 utils/misc/guc.c:1234 utils/misc/guc.c:1249
-#: utils/misc/guc.c:1278
+#: utils/misc/guc.c:1209
+#: utils/misc/guc.c:1224
+#: utils/misc/guc.c:1239
+#: utils/misc/guc.c:1268
 #, c-format
 msgid "Failed to reset %s"
 msgstr ""
 
-#: utils/misc/guc.c:1346 utils/misc/guc.c:1368 utils/misc/guc.c:1390
-#: utils/misc/guc.c:1420
+#: utils/misc/guc.c:1336
+#: utils/misc/guc.c:1358
+#: utils/misc/guc.c:1380
+#: utils/misc/guc.c:1410
 #, c-format
 msgid "Failed to commit %s"
 msgstr ""
 
-#: utils/misc/guc.c:1599 utils/misc/guc.c:2149
+#: utils/misc/guc.c:1589
+#: utils/misc/guc.c:2139
 #, c-format
 msgid "'%s' is not a valid option name"
 msgstr ""
 
-#: utils/misc/guc.c:1616
+#: utils/misc/guc.c:1606
 #, c-format
 msgid "'%s' cannot be changed after server start"
 msgstr ""
 
-#: utils/misc/guc.c:1624
+#: utils/misc/guc.c:1614
 #, c-format
 msgid "'%s' cannot be changed now"
 msgstr ""
 
-#: utils/misc/guc.c:1651
+#: utils/misc/guc.c:1641
 #, c-format
 msgid "'%s' cannot be set after connection start"
 msgstr ""
 
-#: utils/misc/guc.c:1659
+#: utils/misc/guc.c:1649
 #, c-format
 msgid "'%s': permission denied"
 msgstr "'%s': нет доступа"
 
-#: utils/misc/guc.c:1689
+#: utils/misc/guc.c:1679
 #, c-format
 msgid "%s: setting ignored because previous source is higher priority"
 msgstr ""
 
-#: utils/misc/guc.c:1710
+#: utils/misc/guc.c:1700
 #, c-format
 msgid "option '%s' requires a boolean value"
 msgstr "опция '%s' требует булевское значение"
 
-#: utils/misc/guc.c:1724 utils/misc/guc.c:1795
+#: utils/misc/guc.c:1714
+#: utils/misc/guc.c:1785
 #, c-format
 msgid "invalid value for option '%s': %d"
 msgstr "не верное значение для опции '%s': %d"
 
-#: utils/misc/guc.c:1774
+#: utils/misc/guc.c:1764
 #, c-format
 msgid "option '%s' expects an integer value"
 msgstr "опция '%s' ожидает целое значение"
 
-#: utils/misc/guc.c:1780
+#: utils/misc/guc.c:1770
 #, c-format
 msgid "option '%s' value %d is outside of permissible range [%d .. %d]"
 msgstr ""
 
-#: utils/misc/guc.c:1845
+#: utils/misc/guc.c:1835
 #, c-format
 msgid "option '%s' expects a real number"
 msgstr "опция '%s' ожидает реальное число"
 
-#: utils/misc/guc.c:1851
+#: utils/misc/guc.c:1841
 #, c-format
 msgid "option '%s' value %g is outside of permissible range [%g .. %g]"
 msgstr ""
 
-#: utils/misc/guc.c:1866
+#: utils/misc/guc.c:1856
 #, c-format
 msgid "invalid value for option '%s': %g"
 msgstr "не верное значение для опции '%s': %g"
 
-#: utils/misc/guc.c:1960
+#: utils/misc/guc.c:1950
 #, c-format
 msgid "invalid value for option '%s': '%s'"
 msgstr "не верное значение для опции '%s': '%s'"
 
-#: utils/misc/guc.c:2061 utils/misc/guc.c:2095 utils/misc/guc.c:2409
+#: utils/misc/guc.c:2051
+#: utils/misc/guc.c:2085
+#: utils/misc/guc.c:2399
 #, c-format
 msgid "Option '%s' is not recognized"
 msgstr "Опция '%s' не распознана"
 
-#: utils/misc/guc.c:2156
+#: utils/misc/guc.c:2146
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s принимает только один аргумент"
 
-#: utils/misc/guc.c:2169 utils/misc/guc.c:2218
+#: utils/misc/guc.c:2159
+#: utils/misc/guc.c:2208
 msgid "flatten_set_variable_args: unexpected input"
 msgstr ""
 
-#: utils/misc/guc.c:2257
+#: utils/misc/guc.c:2247
 msgid "SET variable name is required"
 msgstr "SET требуется имя переменной"
 
-#: utils/misc/guc.c:2793
+#: utils/misc/guc.c:2783
 #, c-format
 msgid "cannot parse setting \"%s\""
 msgstr "не получилось проанализировать опцию \"%s\""
 
-#: guc-file.l:158
-msgid "could not read configuration file `"
-msgstr "не получилось считать файл конфигурации `"
-
-#: guc-file.l:158
-#, c-format
-msgid "': %s"
-msgstr "': %s"
-
-#: guc-file.l:259
-#, c-format
-msgid ":%u: syntax error, token=\"%s\""
-msgstr ":%u: ошибка синтаксиса, токен=\"%s\""
-
-#: utils/mmgr/portalmem.c:78
-msgid "out of memory in PortalHashTable"
-msgstr "не хватает памяти в PortalHashTable"
-
-#: utils/mmgr/portalmem.c:80
-msgid "trying to insert a portal name that exists."
-msgstr ""
-
-#: utils/mmgr/portalmem.c:93
-msgid "trying to delete portal name that does not exist."
-msgstr ""
-
-#: utils/mmgr/portalmem.c:185
-#, c-format
-msgid "CreatePortal: portal \"%s\" already exists"
-msgstr "CreatePortal: портал \"%s\" уже существует"
-
 #: utils/mmgr/aset.c:333
 #, c-format
 msgid "Memory exhausted in AllocSetContextCreate(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:496 utils/mmgr/aset.c:693
+#: utils/mmgr/aset.c:495
+#: utils/mmgr/aset.c:692
 #, c-format
 msgid "Memory exhausted in AllocSetAlloc(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:757
+#: utils/mmgr/aset.c:741
 #, c-format
 msgid "AllocSetFree: detected write past chunk end in %s %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:778
+#: utils/mmgr/aset.c:762
 #, c-format
 msgid "AllocSetFree: cannot find block containing chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:832
+#: utils/mmgr/aset.c:816
 #, c-format
 msgid "AllocSetRealloc: detected write past chunk end in %s %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:872
+#: utils/mmgr/aset.c:856
 #, c-format
 msgid "AllocSetRealloc: cannot find block containing chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:885
+#: utils/mmgr/aset.c:869
 #, c-format
 msgid "Memory exhausted in AllocSetReAlloc(%lu)"
 msgstr ""
 
-#: utils/mmgr/aset.c:1055
+#: utils/mmgr/aset.c:1039
 #, c-format
 msgid "AllocSetCheck: %s: empty block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1077
+#: 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:1080
+#: utils/mmgr/aset.c:1064
 #, c-format
 msgid "AllocSetCheck: %s: bad size %lu for chunk %p in block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1086
+#: utils/mmgr/aset.c:1070
 #, c-format
 msgid "AllocSetCheck: %s: bad single-chunk %p in block %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1095
+#: utils/mmgr/aset.c:1079
 #, c-format
 msgid "AllocSetCheck: %s: bogus aset link in block %p, chunk %p"
 msgstr ""
 
-#: utils/mmgr/aset.c:1102
+#: 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:1112
+#: utils/mmgr/aset.c:1096
 #, c-format
 msgid "AllocSetCheck: %s: found inconsistent memory block %p"
 msgstr ""
 
-#: utils/mmgr/mcxt.c:478 utils/mmgr/mcxt.c:499 utils/mmgr/mcxt.c:524
+#: utils/mmgr/mcxt.c:449
 #, c-format
 msgid "MemoryContextAlloc: invalid request size %lu"
 msgstr ""
 
-#: utils/mmgr/mcxt.c:588
+#: utils/mmgr/mcxt.c:509
 #, c-format
 msgid "repalloc: invalid request size %lu"
 msgstr ""
 
+#: utils/mmgr/portalmem.c:78
+msgid "out of memory in PortalHashTable"
+msgstr "не хватает памяти в PortalHashTable"
+
+#: utils/mmgr/portalmem.c:80
+msgid "trying to insert a portal name that exists."
+msgstr ""
+
+#: utils/mmgr/portalmem.c:93
+msgid "trying to delete portal name that does not exist."
+msgstr ""
+
+#: utils/mmgr/portalmem.c:196
+#, c-format
+msgid "CreatePortal: portal \"%s\" already exists"
+msgstr "CreatePortal: портал \"%s\" уже существует"
+
+#: utils/sort/tuplestore.c:302
+msgid "tuplestore_puttuple: invalid state"
+msgstr "tuplestore_puttuple: неверное состояние"
+
+#: utils/sort/tuplestore.c:338
+msgid "tuplestore_donestoring: seek(0) failed"
+msgstr "tuplestore_donestoring: seek(0) не удался"
+
+#: utils/sort/tuplestore.c:346
+msgid "tuplestore_donestoring: invalid state"
+msgstr "tuplestore_donestoring: неверное состояние"
+
+#: utils/sort/tuplestore.c:464
+#: utils/sort/tuplestore.c:479
+msgid "tuplestore_gettuple: bogus tuple len in backward scan"
+msgstr ""
+
+#: utils/sort/tuplestore.c:484
+msgid "tuplestore_gettuple: invalid state"
+msgstr "tuplestore_gettuple: неверное состояние"
+
+#: utils/sort/tuplestore.c:520
+msgid "tuplestore_rescan: seek(0) failed"
+msgstr "tuplestore_rescan: seek(0) не удался"
+
+#: utils/sort/tuplestore.c:527
+msgid "tuplestore_rescan: invalid state"
+msgstr "tuplestore_rescan: неверное состояние"
+
+#: utils/sort/tuplestore.c:553
+msgid "tuplestore_markpos: invalid state"
+msgstr "tuplestore_markpos: неверное состояние"
+
+#: utils/sort/tuplestore.c:578
+msgid "tuplestore_restorepos failed"
+msgstr "tuplestore_restorepos не удался"
+
+#: utils/sort/tuplestore.c:582
+msgid "tuplestore_restorepos: invalid state"
+msgstr "tuplestore_restorepos: неверное состояние"
+
+#: utils/sort/tuplestore.c:598
+msgid "tuplestore: unexpected end of tape"
+msgstr "tuplestore: неожиданный конец ленты"
+
+#: utils/sort/tuplestore.c:600
+#: utils/sort/tuplestore.c:669
+#: utils/sort/tuplestore.c:673
+msgid "tuplestore: unexpected end of data"
+msgstr "tuplestore: неожиданный конец данных"
+
+#: utils/sort/tuplestore.c:610
+#: utils/sort/tuplestore.c:641
+#: utils/sort/tuplestore.c:644
+#: utils/sort/tuplestore.c:648
+msgid "tuplestore: write failed"
+msgstr "tuplestore: запись не удалась"
+
 #: utils/sort/logtape.c:199
 #, c-format
 msgid ""
@@ -13786,146 +13795,77 @@ msgstr ""
 msgid "LogicalTapeBackspace: unexpected end of tape"
 msgstr ""
 
-#: utils/sort/logtape.c:888 utils/sort/logtape.c:898
+#: utils/sort/logtape.c:888
+#: utils/sort/logtape.c:898
 msgid "LogicalTapeSeek: unexpected end of tape"
 msgstr ""
 
-#: utils/sort/tuplesort.c:694
+#: utils/sort/tuplesort.c:698
 msgid "tuplesort_puttuple: invalid state"
 msgstr "tuplesort_puttuple: неверное состояние"
 
-#: utils/sort/tuplesort.c:741
+#: utils/sort/tuplesort.c:745
 msgid "tuplesort_performsort: invalid state"
 msgstr "tuplesort_performsort: неверное состояние"
 
-#: utils/sort/tuplesort.c:859 utils/sort/tuplesort.c:874
+#: utils/sort/tuplesort.c:863
+#: utils/sort/tuplesort.c:878
 msgid "tuplesort_gettuple: bogus tuple len in backward scan"
 msgstr ""
 
-#: utils/sort/tuplesort.c:926
+#: utils/sort/tuplesort.c:930
 msgid "tuplesort_gettuple: invalid state"
 msgstr "tuplesort_gettuple: неверное состояние"
 
-#: utils/sort/tuplesort.c:1486
+#: utils/sort/tuplesort.c:1490
 msgid "tuplesort_rescan: invalid state"
 msgstr "tuplesort_rescan: неверное состояние"
 
-#: utils/sort/tuplesort.c:1513
+#: utils/sort/tuplesort.c:1517
 msgid "tuplesort_markpos: invalid state"
 msgstr "tuplesort_markpos: неверное состояние"
 
-#: utils/sort/tuplesort.c:1538
+#: utils/sort/tuplesort.c:1542
 msgid "tuplesort_restorepos failed"
 msgstr "tuplesort_restorepos не удался"
 
-#: utils/sort/tuplesort.c:1542
+#: utils/sort/tuplesort.c:1546
 msgid "tuplesort_restorepos: invalid state"
 msgstr "tuplesort_restorepos: неверное состояние"
 
-#: utils/sort/tuplesort.c:1665
+#: utils/sort/tuplesort.c:1669
 msgid "tuplesort: unexpected end of tape"
 msgstr ""
 
-#: utils/sort/tuplesort.c:1667 utils/sort/tuplesort.c:2006
-#: utils/sort/tuplesort.c:2010 utils/sort/tuplesort.c:2133
-#: utils/sort/tuplesort.c:2137 utils/sort/tuplesort.c:2205
+#: utils/sort/tuplesort.c:1671
+#: utils/sort/tuplesort.c:2010
+#: utils/sort/tuplesort.c:2014
+#: utils/sort/tuplesort.c:2137
+#: utils/sort/tuplesort.c:2141
 #: utils/sort/tuplesort.c:2209
+#: utils/sort/tuplesort.c:2213
 msgid "tuplesort: unexpected end of data"
 msgstr "tuplesort: неожиданный конец данных"
 
-#: utils/sort/tuplesort.c:1785
+#: utils/sort/tuplesort.c:1789
 #, c-format
 msgid "SelectSortFunction: cache lookup failed for operator %u"
 msgstr ""
 
-#: utils/sort/tuplesort.c:1897
+#: utils/sort/tuplesort.c:1901
 #, c-format
 msgid "Invalid SortFunctionKind %d"
 msgstr "Не верный SortFunctionKind %d"
 
-#: utils/sort/tuplesort.c:2085
+#: utils/sort/tuplesort.c:2089
 msgid "Cannot create unique index. Table contains non-unique values"
 msgstr ""
 
-#: utils/sort/tuplesort.c:2161
+#: utils/sort/tuplesort.c:2165
 msgid "copytup_datum() should not be called"
 msgstr ""
 
-#: utils/sort/tuplestore.c:300
-msgid "tuplestore_puttuple: invalid state"
-msgstr "tuplestore_puttuple: неверное состояние"
-
-#: utils/sort/tuplestore.c:336
-msgid "tuplestore_donestoring: seek(0) failed"
-msgstr "tuplestore_donestoring: seek(0) не удался"
-
-#: utils/sort/tuplestore.c:344
-msgid "tuplestore_donestoring: invalid state"
-msgstr "tuplestore_donestoring: неверное состояние"
-
-#: utils/sort/tuplestore.c:462 utils/sort/tuplestore.c:477
-msgid "tuplestore_gettuple: bogus tuple len in backward scan"
-msgstr ""
-
-#: utils/sort/tuplestore.c:482
-msgid "tuplestore_gettuple: invalid state"
-msgstr "tuplestore_gettuple: неверное состояние"
-
-#: utils/sort/tuplestore.c:518
-msgid "tuplestore_rescan: seek(0) failed"
-msgstr "tuplestore_rescan: seek(0) не удался"
-
-#: utils/sort/tuplestore.c:525
-msgid "tuplestore_rescan: invalid state"
-msgstr "tuplestore_rescan: неверное состояние"
-
-#: utils/sort/tuplestore.c:551
-msgid "tuplestore_markpos: invalid state"
-msgstr "tuplestore_markpos: неверное состояние"
-
-#: utils/sort/tuplestore.c:576
-msgid "tuplestore_restorepos failed"
-msgstr "tuplestore_restorepos не удался"
-
-#: utils/sort/tuplestore.c:580
-msgid "tuplestore_restorepos: invalid state"
-msgstr "tuplestore_restorepos: неверное состояние"
-
-#: utils/sort/tuplestore.c:596
-msgid "tuplestore: unexpected end of tape"
-msgstr "tuplestore: неожиданный конец ленты"
-
-#: utils/sort/tuplestore.c:598 utils/sort/tuplestore.c:667
-#: utils/sort/tuplestore.c:671
-msgid "tuplestore: unexpected end of data"
-msgstr "tuplestore: неожиданный конец данных"
-
-#: utils/sort/tuplestore.c:608 utils/sort/tuplestore.c:639
-#: utils/sort/tuplestore.c:642 utils/sort/tuplestore.c:646
-msgid "tuplestore: write failed"
-msgstr "tuplestore: запись не удалась"
-
 #: utils/time/tqual.c:981
 msgid "CopyQuerySnapshot: no snapshot has been set"
 msgstr ""
 
-#~ msgid "TRUNCATE TABLE cannot run inside a transaction block"
-#~ msgstr "Нельзя выполнять TRUNCATE TABLE внутри транзакционного блока"
-
-#~ msgid "Conversion does not exist"
-#~ msgstr "Конверсия не существует"
-
-#~ msgid "Function %s does not exist"
-#~ msgstr "Функция %s не существует"
-
-#~ msgid "doDeletion: Relation %u does not exist"
-#~ msgstr "doDeletion: Связь %u не существует"
-
-#~ msgid "function %s() does not return type %s"
-#~ msgstr "функция %s() не возвращает тип %s"
-
-#~ msgid "Conversion \"%s\" does not exist"
-#~ msgstr "Конверсия \"%s\" не существует"
-
-#~ msgid "getBaseTypeMod: failed to lookup type %u"
-#~ msgstr "getBaseTypeMod: тип %u не найден"
diff --git a/src/bin/pg_controldata/po/ru.po b/src/bin/pg_controldata/po/ru.po
index 514f6613e50..23c04d2235a 100644
--- a/src/bin/pg_controldata/po/ru.po
+++ b/src/bin/pg_controldata/po/ru.po
@@ -1,17 +1,18 @@
 # ru.po
 # PG_CONTROLDATA Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/Attic/ru.po,v 1.2 2002/09/14 13:46:24 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/Attic/ru.po,v 1.2.2.1 2004/04/05 09:02:36 petere Exp $
 #
 # Changelog:
-#   - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - March 27, 2004: Updates for 7.3 branch, 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:19-0400\n"
-"PO-Revision-Date: 2002-09-07 19:36-0500\n"
+"POT-Creation-Date: 2004-03-02 17:44-0400\n"
+"PO-Revision-Date: 2004-03-27 13:39-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"
@@ -20,8 +21,12 @@ msgstr ""
 
 #: pg_controldata.c:28
 #, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
-msgstr "%s отображает информацию по управлению кластерами базы PostgreSQL.\n"
+msgid ""
+"%s displays PostgreSQL database cluster control information.\n"
+"\n"
+msgstr ""
+"%s отображает информацию по управлению кластерами базы PostgreSQL.\n"
+"\n"
 
 #: pg_controldata.c:29
 #, c-format
@@ -94,10 +99,8 @@ msgid ""
 "is expecting.  The results below are untrustworthy.\n"
 "\n"
 msgstr ""
-"ВНИМАНИЕ: Сосчитанная CRC контрольная сумма не совпадает со значением в "
-"файле.\n"
-"Файл либо повреждён либо его формат оличатется от ожидаемого этой "
-"программой.\n"
+"ВНИМАНИЕ: Сосчитанная CRC контрольная сумма не совпадает со значением в файле.\n"
+"Файл либо повреждён либо его формат оличатется от ожидаемого этой программой.\n"
 "Не стоит доверять результатам представленным ниже.\n"
 "\n"
 
@@ -219,6 +222,3 @@ msgstr "LC_COLLATE:                           %s\n"
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-##
-## EOF
-##
diff --git a/src/bin/pg_resetxlog/po/ru.po b/src/bin/pg_resetxlog/po/ru.po
index c93c598079e..19f752384b7 100644
--- a/src/bin/pg_resetxlog/po/ru.po
+++ b/src/bin/pg_resetxlog/po/ru.po
@@ -1,9 +1,10 @@
 # ru.po
 # PG_RESETXLOG Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.2 2002/10/14 19:04:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.2.2.1 2004/04/05 09:02:36 petere Exp $
 #
 # Changelog:
+#   - March 27, 2004: Updates for 7.3 branch, 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>
@@ -11,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2002-10-12 13:18-0400\n"
-"PO-Revision-Date: 2002-10-12 13:27-0500\n"
+"POT-Creation-Date: 2004-03-02 17:44-0400\n"
+"PO-Revision-Date: 2004-03-27 13:38-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"
@@ -24,8 +25,12 @@ msgstr ""
 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
+#: 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"
@@ -45,7 +50,8 @@ msgstr "%s: неверный аргумент для опции -o\n"
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) не должен быть 0\n"
 
-#: pg_resetxlog.c:174 pg_resetxlog.c:181
+#: pg_resetxlog.c:174
+#: pg_resetxlog.c:181
 #, c-format
 msgid "%s: invalid argument for -l option\n"
 msgstr "%s: неверный аргумент для опции -l\n"
@@ -55,7 +61,8 @@ msgstr "%s: неверный аргумент для опции -l\n"
 msgid "%s: no data directory specified\n"
 msgstr "%s: директория данных не указана\n"
 
-#: pg_resetxlog.c:215 pg_resetxlog.c:311
+#: 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"
@@ -75,8 +82,7 @@ msgid ""
 "If these values seem acceptable, use -f to force reset.\n"
 msgstr ""
 "\n"
-"Если эти значения выглядят приемлемыми, используйте -f для принуждённого "
-"сброса.\n"
+"Если эти значения выглядят приемлемыми, используйте -f для принуждённого сброса.\n"
 
 #: pg_resetxlog.c:272
 msgid ""
@@ -86,8 +92,7 @@ msgid ""
 msgstr ""
 "Сервер баз данных не был гладко остановлен.\n"
 "Сброс логов транзакций может привести к потере данных.\n"
-"Если вы всёже хотите продолжить в любом случае, используйте -f для "
-"принуждённого сброса.\n"
+"Если вы всёже хотите продолжить в любом случае, используйте -f для принуждённого сброса.\n"
 
 #: pg_resetxlog.c:285
 msgid "Transaction log reset\n"
@@ -112,16 +117,12 @@ msgstr "%s: не получилось считать %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 существует, но его контрольная сумма CRC неверна; продолжайте "
-"с осторожностью\n"
+msgstr "%s: pg_control существует, но его контрольная сумма CRC неверна; продолжайте с осторожностью\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 существует но повреждён или неизвестной версии; "
-"игнорируется...\n"
+msgstr "%s: pg_control существует но повреждён или неизвестной версии; игнорируется...\n"
 
 #: pg_resetxlog.c:410
 #, c-format
@@ -234,11 +235,8 @@ 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: внутренняя ошибка -- sizeof(ControlFileData) слишком велик ... надо "
-"исправить xlog.c\n"
+msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
+msgstr "%s: внутренняя ошибка -- sizeof(ControlFileData) слишком велик ... надо исправить xlog.c\n"
 
 #: pg_resetxlog.c:524
 #, c-format
@@ -250,7 +248,8 @@ msgstr "%s: не получилось создать файл pg_control: %s\n"
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: не получилось записать в файл pg_control: %s\n"
 
-#: pg_resetxlog.c:542 pg_resetxlog.c:683
+#: pg_resetxlog.c:542
+#: pg_resetxlog.c:683
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: ошибка fsync: %s\n"
@@ -275,7 +274,8 @@ msgstr "%s: не получилось считать из директории %s: %s\n"
 msgid "%s: could not open %s: %s\n"
 msgstr "%s: не получилось открыть %s: %s\n"
 
-#: pg_resetxlog.c:661 pg_resetxlog.c:675
+#: pg_resetxlog.c:661
+#: pg_resetxlog.c:675
 #, c-format
 msgid "%s: could not write %s: %s\n"
 msgstr "%s: не получилось записать %s: %s\n"
@@ -293,11 +293,11 @@ msgstr ""
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTIONS] DATADIR\n"
+"  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
-"Usage:\n"
-"  %s [ОПЦИИ] ДИРДАННЫХ\n"
+"Использование:\n"
+"  %s [ОПЦИЯ]... ДИРДАННЫХ\n"
 "\n"
 
 #: pg_resetxlog.c:696
@@ -305,37 +305,38 @@ msgid "Options:\n"
 msgstr "Опции:\n"
 
 #: pg_resetxlog.c:697
-msgid "  -f                force update to be done\n"
-msgstr "  -f                принудительно выполнение обновления\n"
+msgid "  -f              force update to be done\n"
+msgstr "  -f              принудительное выполнение обновления\n"
 
 #: pg_resetxlog.c:698
-msgid ""
-"  -l FILEID,SEG     force minimum WAL starting location for new transaction "
-"log\n"
-msgstr ""
-"  -l FILEID,SEG     выставаить минимальное начальное значение в WAL для "
-"нового лога транзакций\n"
+msgid "  -l FILEID,SEG   force minimum WAL starting location for new transaction log\n"
+msgstr "  -l FILEID,SEG   выставить минимальное начальное значение в WAL для нового лога транзакций\n"
 
 #: pg_resetxlog.c:699
-msgid ""
-"  -n                no update, just show extracted control values (for "
-"testing)\n"
-msgstr ""
-"  -n                без обновления, только показать считанные контрольные "
-"значения (для тестирования)\n"
+msgid "  -n              no update, just show extracted control values (for testing)\n"
+msgstr "  -n              без обновления, только показать считанные контрольные значения (для тестирования)\n"
 
 #: pg_resetxlog.c:700
-msgid "  -o OID            set next OID\n"
-msgstr "  -o OID            выставить последующий OID\n"
+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"
+msgid "  -x XID          set next transaction ID\n"
+msgstr "  -x XID          выставить ID следующей транзакции\n"
 
 #: pg_resetxlog.c:702
+msgid "  --help          show this help, then exit\n"
+msgstr "  --help          показать эту подсказку и выйти\n"
+
+#: pg_resetxlog.c:703
+msgid "  --version       output version information, then exit\n"
+msgstr "  --version       показать версию и выйти\n"
+
+#: pg_resetxlog.c:704
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
 "Сообщения об ошибках: <pgsql-bugs@postgresql.org>.\n"
+
diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po
index 28ea97aaded..49688526d2b 100644
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
@@ -1,9 +1,10 @@
 # ru.po
 # LIBPQ Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.3.2.1 2003/01/04 10:26:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.3.2.2 2004/04/05 09:02:37 petere Exp $
 #
 # Changelog:
+#   - March 27, 2004: Updates for 7.3 branch, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - Januray 2, 2002: Completed SSL transaltion, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Post-7.3beta2 fuzzy translation fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -12,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.3.x\n"
-"POT-Creation-Date: 2003-01-02 05:05-0500\n"
-"PO-Revision-Date: 2003-01-02 12:56-0500\n"
+"POT-Creation-Date: 2004-03-02 17:44-0400\n"
+"PO-Revision-Date: 2004-03-27 13:30-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"
@@ -30,7 +31,8 @@ msgstr "Ошибка Kerberos 4: %s\n"
 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"
@@ -40,57 +42,56 @@ msgstr "Аутентификация Kerberos 5 отклонена: %*s\n"
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "не получилось восстановить не блокирующий режим для сокета: %s\n"
 
-#: fe-auth.c:505
+#: fe-auth.c:503
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "Аутентификация SCM_CRED не поддерживается\n"
 
-#: fe-auth.c:591
+#: fe-auth.c:589
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Аутентификация Kerberos 4 не удалась\n"
 
-#: fe-auth.c:597
+#: fe-auth.c:595
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Аутентификация Kerberos 4 не поддерживается\n"
 
-#: fe-auth.c:608
+#: fe-auth.c:606
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Аутентификация Kerberos 5 не удалась\n"
 
-#: fe-auth.c:614
+#: fe-auth.c:612
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Аутентификация Kerberos 5 не поддерживается\n"
 
-#: fe-auth.c:642
+#: fe-auth.c:640
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "метод аутентификации %u не поддерживается\n"
 
-#: fe-auth.c:679
+#: fe-auth.c:677
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "неправильное имя сервиса аутентификации \"%s\", игнорируется\n"
 
-#: fe-auth.c:736
+#: fe-auth.c:734
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: неправильная система аутентификации: %d\n"
 
-#: fe-connect.c:483
+#: fe-connect.c:489
 msgid "could not determine the PostgreSQL user name to use\n"
-msgstr ""
-"не получилось определить какое имя пользователя PostgreSQL использовать\n"
+msgstr "не получилось определить какое имя пользователя PostgreSQL использовать\n"
 
-#: fe-connect.c:710
+#: fe-connect.c:712
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "не получилось установить сокет в не блокирующий режим: %s\n"
 
-#: fe-connect.c:734
+#: fe-connect.c:736
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "не получилось установить сокет в беспрерывный TCP режим: %s\n"
 
-#: fe-connect.c:754
+#: fe-connect.c:756
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -101,7 +102,7 @@ msgstr ""
 "\tРаботает ли сервер локально и принимает\n"
 "\tподсоединения по сокету Unix'овского домена \"%s\"?\n"
 
-#: fe-connect.c:763
+#: fe-connect.c:765
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -112,224 +113,207 @@ msgstr ""
 "\tРаботает ли сервер на хосте %s и принимает\n"
 "\tподсоединения через TCP/IP протокол на порт %s?\n"
 
-#: fe-connect.c:827
+#: fe-connect.c:829
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "неправильный адрес хоста: %s\n"
 
-#: fe-connect.c:846
+#: fe-connect.c:848
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "неизвестное имя хоста: %s\n"
 
-#: fe-connect.c:893
+#: fe-connect.c:895
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "не получилось создать сокет: %s\n"
 
-#: fe-connect.c:961
+#: fe-connect.c:963
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "не получилось отправить пакет согласования SSL: %s\n"
 
-#: fe-connect.c:974
+#: fe-connect.c:976
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "не был получен ответ сервера на пакет согласования SSL: %s\n"
 
-#: fe-connect.c:1003
+#: fe-connect.c:1005
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "получен неправильный ответ на начальное согласование по SSL: %c\n"
 
-#: fe-connect.c:1012
+#: fe-connect.c:1014
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "сервер не поддерживает SSL, но наличие SSL было необходимо\n"
 
-#: fe-connect.c:1201
+#: fe-connect.c:1200
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr ""
-"неправильное состояние подсоединения, возможный указатель на нарушение "
-"целостности памяти\n"
+msgstr "неправильное состояние подсоединения, возможный указатель на нарушение целостности памяти\n"
 
-#: fe-connect.c:1232
+#: fe-connect.c:1231
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "невозможно было получить статус ошибки сокета: %s\n"
 
-#: fe-connect.c:1252
+#: fe-connect.c:1251
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "невозможно было получить адрес клиента из сокета: %s\n"
 
-#: fe-connect.c:1291
+#: fe-connect.c:1290
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "не получилось отправить начальный пакет: %s\n"
 
-#: fe-connect.c:1347
+#: fe-connect.c:1346
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "ожидался запрос аутентификации от сервера, но было получено: %c\n"
 
-#: fe-connect.c:1459
+#: fe-connect.c:1458
 msgid "unexpected message from server during startup\n"
 msgstr "неожиданное сообщение от сервера при запуске\n"
 
-#: fe-connect.c:1518
+#: fe-connect.c:1517
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr ""
-"неправильное состояние подсоединения %c, возможный указатель на нарушение "
-"целостности памяти\n"
+msgstr "неправильное состояние подсоединения %c, возможный указатель на нарушение целостности памяти\n"
 
-#: fe-connect.c:1604
+#: fe-connect.c:1603
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr ""
-"неправильное состояние setenv %c, возможный показатель нарушения целостности "
-"памяти\n"
+msgstr "неправильное состояние setenv %c, возможный показатель нарушения целостности памяти\n"
 
-#: fe-connect.c:1641
+#: fe-connect.c:1640
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "неправильное имя кодировки в PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1766
+#: fe-connect.c:1759
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr ""
-"неправильное состояние %c, возможный показатель нарушения целостности "
-"памяти\n"
+msgstr "неправильное состояние %c, возможный показатель нарушения целостности памяти\n"
 
-#: fe-connect.c:2394 fe-connect.c:2403 fe-connect.c:2900 fe-exec.c:1284
+#: fe-connect.c:2387
+#: fe-connect.c:2396
+#: fe-connect.c:2894
+#: fe-exec.c:1285
 #: fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "недостаточно памяти\n"
 
-#: fe-connect.c:2442
+#: fe-connect.c:2435
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "отсутствует \"=\" после \"%s\" в строке подсоединения\n"
 
-#: fe-connect.c:2491
+#: fe-connect.c:2484
 msgid "unterminated quoted string in connection info string\n"
 msgstr "неоконченная строка (не хватает кавычки) в строке подсоединения\n"
 
-#: fe-connect.c:2525
+#: fe-connect.c:2518
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "неправильная опция подсоединения \"%s\"\n"
 
-#: fe-connect.c:2711
+#: fe-connect.c:2704
 msgid "connection pointer is NULL\n"
 msgstr "указатель подсоединения является NULL'ом\n"
 
-#: fe-connect.c:2921
+#: fe-connect.c:2912
 #, c-format
-msgid ""
-"WARNING: Password file %s has world or group read access; permission should "
-"be u=rw (0600)\n"
-msgstr ""
-"ВНИМАНИЕ: Парольный файл %s записан с правами чтения для всех или группы; "
-"права должны быть u=rw (0600)\n"
+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:738
 msgid "command string is a null pointer\n"
 msgstr "командная строка является нулевым указателем\n"
 
-#: fe-exec.c:745
+#: fe-exec.c:746
 msgid "no connection to the server\n"
 msgstr "нет подсоединения к серверу\n"
 
-#: fe-exec.c:752
+#: fe-exec.c:753
 msgid "another command is already in progress\n"
 msgstr "другая команда в процессе выполнения\n"
 
-#: fe-exec.c:950
+#: fe-exec.c:951
 #, c-format
 msgid "message type 0x%02x arrived from server while idle\n"
 msgstr "пришло сообщение от сервера типа 0x%02x при холостом ходу\n"
 
-#: fe-exec.c:992
+#: fe-exec.c:993
 #, c-format
-msgid ""
-"unexpected character %c following empty query response (\"I\" message)\n"
-msgstr ""
-"неожиданный символ %c следующий за пустым ответом на запрос (сообщение \"I"
-"\")\n"
+msgid "unexpected character %c following empty query response (\"I\" message)\n"
+msgstr "неожиданный символ %c следующий за пустым ответом на запрос (сообщение \"I\")\n"
 
-#: fe-exec.c:1049
-msgid ""
-"server sent data (\"D\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr ""
-"сервер послал данные (сообщение \"D\") без предварительного описания ряда "
-"(сообщение \"T\")\n"
+#: fe-exec.c:1050
+msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
+msgstr "сервер послал данные (сообщение \"D\") без предварительного описания ряда (сообщение \"T\")\n"
 
-#: 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:1067
+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:1083
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "неожиданный ответ сервера; первым полученным символом был \"%c\"\n"
 
-#: fe-exec.c:1371
+#: fe-exec.c:1372
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "неожиданный asyncStatus: %d\n"
 
-#: fe-exec.c:1421
+#: fe-exec.c:1422
 msgid "COPY state must be terminated first\n"
 msgstr "сначала выполнение COPY должно быть завершено\n"
 
-#: fe-exec.c:1780
+#: fe-exec.c:1781
 msgid "no COPY in progress\n"
 msgstr "выполнения процесса COPY не наблюдается\n"
 
-#: fe-exec.c:1819
+#: fe-exec.c:1820
 msgid "lost synchronization with server, resetting connection\n"
 msgstr "потеряна синхронизация с сервером, переустанавливается соединение\n"
 
-#: fe-exec.c:1884
+#: fe-exec.c:1885
 msgid "connection in wrong state\n"
 msgstr "соединение в неверном состоянии\n"
 
-#: fe-exec.c:1986 fe-exec.c:2020
+#: fe-exec.c:1987
+#: fe-exec.c:2021
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "ошибка протокола: id=0x%x\n"
 
-#: fe-exec.c:2055
+#: fe-exec.c:2056
 msgid "invalid ExecStatusType code"
 msgstr "неверный код ExecStatusType"
 
-#: fe-exec.c:2108 fe-exec.c:2141
+#: fe-exec.c:2109
+#: fe-exec.c:2142
 #, c-format
 msgid "column number %d is out of range 0..%d\n"
 msgstr "колонка N %d вне диапазона 0..%d\n"
 
-#: fe-exec.c:2130
+#: fe-exec.c:2131
 #, c-format
 msgid "row number %d is out of range 0..%d\n"
 msgstr "ряд N %d вне диапазона 0..%d\n"
 
-#: fe-exec.c:2325
+#: fe-exec.c:2326
 #, c-format
 msgid "could not interpret result from server: %s\n"
 msgstr "не в состоянии интепретировать ответ сервера: %s\n"
 
-#: fe-exec.c:2341
+#: fe-exec.c:2342
 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"
@@ -339,7 +323,8 @@ msgstr "не в состоянии открыть файл \"%s\": %s\n"
 msgid "could not create large object for file \"%s\"\n"
 msgstr "не в состоянии создать large object (LO) для файла \"%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 "не в состоянии открыть large object (LO) %u\n"
@@ -356,9 +341,7 @@ msgstr "ошибка при записи в файл \"%s\"\n"
 
 #: fe-lobj.c:564
 msgid "query to initialize large object functions did not return data\n"
-msgstr ""
-"запрос о инициализации функций для больших объектов (LOs) не возвратил "
-"данных\n"
+msgstr "запрос о инициализации функций для больших объектов (LOs) не возвратил данных\n"
 
 #: fe-lobj.c:602
 msgid "cannot determine OID of function lo_open\n"
@@ -402,21 +385,27 @@ msgstr "тип integer размером %lu байт не поддерживается функцией pqGetInt\n"
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "тип integer размером %lu байт не поддерживается функцией pqPutInt\n"
 
-#: fe-misc.c:389 fe-misc.c:423 fe-misc.c:856
+#: fe-misc.c:389
+#: fe-misc.c:423
+#: fe-misc.c:867
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() не удался: %s\n"
 
-#: fe-misc.c:450 fe-misc.c:642 fe-misc.c:807
+#: fe-misc.c:450
+#: fe-misc.c:653
+#: fe-misc.c:818
 msgid "connection not open\n"
 msgstr "соединение не открыто\n"
 
-#: fe-misc.c:515 fe-misc.c:595
+#: fe-misc.c:515
+#: fe-misc.c:606
 #, 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:623
+#: fe-misc.c:697
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -426,114 +415,128 @@ msgstr ""
 "\tСкорее всего это означает что сервер завершил работу со сбоем\n"
 "\tдо или в течение обслуживания запроса.\n"
 
-#: fe-misc.c:702
+#: fe-misc.c:713
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "не получилось послать данные серверу: %s\n"
 
-#: fe-misc.c:863
+#: fe-misc.c:874
 msgid "timeout expired\n"
 msgstr "таймаут интервал истёк\n"
 
-#: fe-secure.c:275 fe-secure.c:321
+#: fe-secure.c:281
+#: fe-secure.c:341
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "Ошибка SSL SYSCALL: %s\n"
 
-#: fe-secure.c:280 fe-secure.c:326
+#: fe-secure.c:286
+#: fe-secure.c:346
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "Ошибка SSL SYSCALL: обнаружен конец файла\n"
+
+#: fe-secure.c:293
+#: fe-secure.c:353
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "Ошибка SSL: %s\n"
 
-#: fe-secure.c:387
+#: fe-secure.c:301
+#: fe-secure.c:361
+msgid "Unknown SSL error code\n"
+msgstr "Неизвестный код ошибки SSL\n"
+
+#: fe-secure.c:418
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "ошибка при запросе сокета: %s\n"
 
-#: fe-secure.c:400
+#: fe-secure.c:431
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "невозможно было получить о сервере (%s): %s\n"
 
-#: fe-secure.c:419
+#: fe-secure.c:450
 msgid "unsupported protocol\n"
 msgstr "протокол не поддерживается\n"
 
-#: fe-secure.c:441
+#: fe-secure.c:472
 #, 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
+#: fe-secure.c:479
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "обычное имя сервера \"%s\" не резолвится в адрес\n"
 
-#: fe-secure.c:617
+#: fe-secure.c:648
 msgid "could not get user information\n"
 msgstr "невозможно было получить информацию о пользователе\n"
 
-#: fe-secure.c:629
+#: fe-secure.c:660
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "не в состоянии открыть сертификат (%s): %s\n"
 
-#: fe-secure.c:636
+#: fe-secure.c:667
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "не в состоянии считать сертификат (%s): %s\n"
 
-#: fe-secure.c:649
+#: fe-secure.c:680
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "сертификат присутсвует, но нет личноно ключа (%s)\n"
 
-#: fe-secure.c:658
+#: fe-secure.c:689
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "не верные права для личного ключа (%s)\n"
 
-#: fe-secure.c:665
+#: fe-secure.c:696
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "не получилось открыть файл личного ключа (%s): %s\n"
 
-#: fe-secure.c:674
+#: fe-secure.c:705
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "личный ключ (%s) поменялся во время исполнения\n"
 
-#: fe-secure.c:681
+#: fe-secure.c:712
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "не получилось прочитать личный ключ (%s): %s\n"
 
-#: fe-secure.c:693
+#: fe-secure.c:724
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "сертификат/личный ключ не совпадают (%s): %s\n"
 
-#: fe-secure.c:721
+#: fe-secure.c:752
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "не получилось создать контекст SSL: %s\n"
 
-#: fe-secure.c:737 fe-secure.c:745
+#: fe-secure.c:768
+#: fe-secure.c:776
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "не получилось прочесть список корневых сертификатов (%s): %s\n"
 
-#: fe-secure.c:794
+#: fe-secure.c:825
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "не получилось установить SSL-соединение: %s\n"
 
-#: fe-secure.c:812
+#: fe-secure.c:843
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "не получилось проверить сертификат: %s\n"
 
-#: fe-secure.c:824
+#: fe-secure.c:855
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "не удалось получить сертификат: %s\n"
+
author	Peter Eisentraut <peter_e@gmx.net>	2004-04-05 09:02:37 +0000
committer	Peter Eisentraut <peter_e@gmx.net>	2004-04-05 09:02:37 +0000
commit	6122f38b0ad53ea4cf5ce42459b0149d639a03ae (patch)
tree	c2383e72d094df186f0f3315c7ae602669f6105d /src
parent	6f8f414d30ecb8e29b077007833cb43d0761e9b5 (diff)
download	postgresql-6122f38b0ad53ea4cf5ce42459b0149d639a03ae.tar.gz postgresql-6122f38b0ad53ea4cf5ce42459b0149d639a03ae.zip