Translation updates

author: Peter Eisentraut <peter_e@gmx.net> 2003-08-24 21:18:53 +0000
committer: Peter Eisentraut <peter_e@gmx.net> 2003-08-24 21:18:53 +0000
commit: 903fe8fc6fb0297198782e451c6b6d4396eeaa53 (patch)
tree: c57c04a41f0a9621a9e1e0476500116d8d789037 /src
parent: 693aad413b16aac85fb9a4e792d84cd87778aa9e (diff)
download: postgresql-903fe8fc6fb0297198782e451c6b6d4396eeaa53.tar.gz
postgresql-903fe8fc6fb0297198782e451c6b6d4396eeaa53.zip
9 files changed, 7191 insertions, 10505 deletions
diff --git a/src/backend/po/ru.po b/src/backend/po/ru.po
index f9fca185eab..b1d1564f2a4 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.11 2003/06/28 22:31:00 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.12 2003/08/24 21:18:50 petere Exp $
 #
-# Changelog:
+# ChangeLog:
+#   - July - August 23, 2003: updates for 7.4.x; <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>
@@ -12,8297 +13,5240 @@
 #
 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"
+"Project-Id-Version: PostgreSQL 7.4.x\n"
+"POT-Creation-Date: 2003-07-26 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 18:25-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/heaptuple.c:179
-msgid "heap_attisnull: zero attnum disallowed"
-msgstr "heap_attisnull: нулевой attnum не дозволен"
-
-#: access/common/heaptuple.c:182
-msgid "heap_attisnull: undefined negative attnum"
-msgstr "heap_attisnull: отрицательный attnum не определён"
-
-#: access/common/heaptuple.c:460
-#, c-format
-msgid "heap_getsysattr: invalid attnum %d"
-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"
-
-#: 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
-#, 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
-#: 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
-msgid "TypeGetTupleDesc: number of aliases does not match number of attributes"
-msgstr "TypeGetTupleDesc: число алиасов не совпадает с числом атрибутов"
-
-#: access/common/tupdesc.c:679
-msgid "TypeGetTupleDesc: no column alias was provided"
-msgstr "TypeGetTupleDesc: алиасы колонок не указаны"
-
-#: access/common/tupdesc.c:698
-msgid "Unable to determine tuple description for function returning \"record\""
-msgstr ""
-"Не в состоянии определить описание строки для функции возпращающей тип "
-"\"record\""
-
-#: access/common/tupdesc.c:700 catalog/pg_proc.c:463
-#: executor/nodeFunctionscan.c:234 parser/parse_relation.c:1383
-#: parser/parse_relation.c:1637
-msgid "Unknown kind of return type specified for function"
-msgstr "Указан неизвестный тип возвращаемого значения для фунции"
-
-#: 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
-#, c-format
-msgid "gist: failed to add index item to %s"
-msgstr "gist: не получилось добавить элемент индекса к %s"
-
-#: access/gist/gist.c:1666
-#, c-format
-msgid "initGISTstate: numberOfAttributes %d > %d"
-msgstr "initGISTstate: numberOfAttributes для %d > %d"
-
-#: access/gist/gist.c:1928
+#: access/common/indextuple.c:57
 #, c-format
-msgid "%sPage: %d %s blk: %d maxoff: %d free: %d"
-msgstr "%sСтр.: %d %s блк: %d макс для: %d свободно: %d"
-
-#: access/gist/gist.c:1938
-#, c-format
-msgid "%s  Tuple. blk: %d size: %d"
-msgstr "%s  Запись. блк: %d размер: %d"
-
-#: access/gist/gist.c:1953
-msgid "gist_redo: unimplemented"
-msgstr "gist_redo: не поддерживается"
-
-#: access/gist/gist.c:1959
-msgid "gist_undo: unimplemented"
-msgstr "gist_undo: не поддерживается"
-
-#: access/gist/gistscan.c:254
-#, c-format
-msgid "GiST scan list corrupted -- cannot find 0x%p"
-msgstr ""
-
-#: access/gist/gistscan.c:390
-#, c-format
-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 ""
-
-#: access/hash/hashinsert.c:166
-msgid "hash item too large"
-msgstr ""
-
-#: access/hash/hashinsert.c:231
-#, c-format
-msgid "_hash_pgaddtup: failed to add index item to %s"
-msgstr "_hash_pgaddtup: не удалось добавить элемент индекса к %s"
-
-#: access/hash/hashovfl.c:61
-msgid "_hash_addovflpage: problem with _hash_getovfladdr."
-msgstr "_hash_addovflpage: проблема с _hash_getovfladdr."
-
-#: access/hash/hashovfl.c:196
-msgid "overflow_page: problem with _hash_initbitmap."
-msgstr "overflow_page: проблема с _hash_initbitmap."
-
-#: access/hash/hashovfl.c:568
-#, c-format
-msgid "_hash_squeezebucket: failed to add index item to %s"
-msgstr "_hash_squeezebucket: не удалось добавить элемент индекса к %s"
-
-#: access/hash/hashpage.c:93
-#, c-format
-msgid "Cannot initialize non-empty hash table %s"
-msgstr ""
-
-#: access/hash/hashpage.c:151
-msgid "Problem with _hash_initbitmap."
-msgstr "Проблема с _hash_initbitmap."
-
-#: access/hash/hashpage.c:196
-msgid "_hash_getbuf: internal error: hash AM does not use P_NEW"
-msgstr ""
+msgid "number of index attributes %d exceeds limit, %d"
+msgstr "число идексированных атрибутов: %d превышает лимит: %d"
 
-#: access/hash/hashpage.c:204
+#: access/common/indextuple.c:165
 #, c-format
-msgid "_hash_getbuf: invalid access (%d) on new blk: %s"
-msgstr ""
-
-#: access/hash/hashpage.c:231
-#, c-format
-msgid "_hash_relbuf: invalid access (%d) on blk %x: %s"
-msgstr ""
-
-#: access/hash/hashpage.c:290
-#, c-format
-msgid "_hash_chgbufaccess: invalid access (%d) on blk %x: %s"
-msgstr ""
-
-#: access/hash/hashpage.c:325
-#, c-format
-msgid "_hash_setpagelock: invalid access (%d) on blk %x: %s"
-msgstr ""
-
-#: access/hash/hashpage.c:349
-#, c-format
-msgid "_hash_unsetpagelock: invalid access (%d) on blk %x: %s"
-msgstr ""
-
-#: access/hash/hashpage.c:537 access/hash/hashpage.c:674
-#, c-format
-msgid "_hash_splitpage: empty overflow page %d"
-msgstr ""
-
-#: access/hash/hashpage.c:576
-#, c-format
-msgid "_hash_splitpage: empty ovfl page %d!"
-msgstr ""
-
-#: access/hash/hashpage.c:629
-#, c-format
-msgid "_hash_splitpage: failed to add index item to %s"
-msgstr ""
-
-#: access/hash/hashscan.c:105
-#, c-format
-msgid "hash scan list trashed; can't find 0x%p"
-msgstr ""
-
-#: access/hash/hashutil.c:81
-msgid "hash indices cannot include null keys"
-msgstr ""
-
-#: access/heap/tuptoaster.c:899
-msgid "Failed to build TOAST tuple"
-msgstr ""
-
-#: access/heap/tuptoaster.c:915
-msgid "Failed to insert index entry for TOAST tuple"
-msgstr ""
-
-#: 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
-#, c-format
-msgid "unexpected chunk size %d in chunk %d for toast value %u"
-msgstr ""
-
-#: access/heap/tuptoaster.c:1092
-#, c-format
-msgid "unexpected chunk number %d for toast value %u"
-msgstr ""
-
-#: access/heap/tuptoaster.c:1110 access/heap/tuptoaster.c:1294
-#, c-format
-msgid "missing chunk number %d for toast value %u"
-msgstr ""
-
-#: access/heap/heapam.c:144
-#, c-format
-msgid "heapgettup(%s, tid=0x%x[%d,%d], dir=%d, ...)"
-msgstr ""
-
-#: access/heap/heapam.c:150
-#, c-format
-msgid "heapgettup(%s, tid=0x%x, dir=%d, ...)"
-msgstr ""
-
-#: access/heap/heapam.c:153
-#, c-format
-msgid "heapgettup(..., b=0x%x, nkeys=%d, key=0x%x"
-msgstr ""
-
-#: access/heap/heapam.c:155
-#, c-format
-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:372
-msgid "heapgettup: failed ReadBuffer"
-msgstr "heapgettup: ReadBuffer не удался"
+msgid "index tuple requires %lu bytes, maximum size is %lu"
+msgstr "строка индекса требуеи байт: %lu, при максимуме: %lu"
 
-#: access/heap/heapam.c:474
-#, c-format
-msgid "Relation %u does not exist"
-msgstr ""
-
-#: access/heap/heapam.c:553 catalog/namespace.c:189 tcop/utility.c:154
-#, c-format
-msgid "Relation \"%s\" does not exist"
-msgstr ""
-
-#: 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
-#, c-format
-msgid "%s is a special relation"
-msgstr ""
-
-#: access/heap/heapam.c:611 access/heap/heapam.c:640 access/heap/heapam.c:669
-#, c-format
-msgid "%s is a composite type"
-msgstr ""
-
-#: access/heap/heapam.c:698
-msgid "heap_beginscan: !RelationIsValid(relation)"
-msgstr ""
-
-#: access/heap/heapam.c:812
-#, c-format
-msgid "heap_getnext([%s,nkeys=%d],dir=%d) called"
-msgstr ""
-
-#: access/heap/heapam.c:816
-msgid "heap_getnext returning EOS"
-msgstr "heap_getnext возращает EOS"
-
-#: access/heap/heapam.c:819
-msgid "heap_getnext returning tuple"
-msgstr ""
-
-#: access/heap/heapam.c:842
-msgid "heap_getnext: NULL relscan"
-msgstr ""
-
-#: access/heap/heapam.c:932
-#, c-format
-msgid "heap_fetch: ReadBuffer(%s, %lu) failed"
-msgstr "heap_fetch: ReadBuffer(%s, %lu) не удался"
-
-#: access/heap/heapam.c:1042
-#, c-format
-msgid "heap_get_latest_tid: %s relation: ReadBuffer(%lx) failed"
-msgstr ""
-
-#: access/heap/heapam.c:1284
-msgid "heap_delete: failed ReadBuffer"
-msgstr "heap_delete: ReadBuffer не удался"
-
-#: access/heap/heapam.c:1303
-msgid "heap_delete: (am)invalid tid"
-msgstr ""
-
-#: access/heap/heapam.c:1436
-msgid "simple_heap_delete: tuple already updated by self"
-msgstr ""
-
-#: access/heap/heapam.c:1444
-msgid "simple_heap_delete: tuple concurrently updated"
-msgstr ""
-
-#: access/heap/heapam.c:1448 executor/execMain.c:1324
-#, c-format
-msgid "Unknown status %u from heap_delete"
-msgstr ""
-
-#: access/heap/heapam.c:1482
-msgid "heap_update: failed ReadBuffer"
-msgstr "heap_update: ReadBuffer не удался"
-
-#: access/heap/heapam.c:1507
-msgid "heap_update: (am)invalid tid"
-msgstr ""
-
-#: access/heap/heapam.c:1770
-msgid "simple_heap_update: tuple already updated by self"
-msgstr ""
-
-#: access/heap/heapam.c:1778
-msgid "simple_heap_update: tuple concurrently updated"
-msgstr ""
-
-#: access/heap/heapam.c:1782 executor/execMain.c:1462
-#, c-format
-msgid "Unknown status %u from heap_update"
-msgstr ""
-
-#: access/heap/heapam.c:1806
-msgid "heap_mark4update: failed ReadBuffer"
-msgstr "heap_mark4update: ReadBuffer не удался"
-
-#: access/heap/heapam.c:1823
-msgid "heap_mark4update: (am)invalid tid"
-msgstr ""
-
-#: access/heap/heapam.c:2123
-msgid "heap_clean_redo: no block"
-msgstr ""
-
-#: access/heap/heapam.c:2127
-msgid "heap_clean_redo: uninitialized page"
-msgstr ""
-
-#: access/heap/heapam.c:2185
-#, c-format
-msgid "heap_delete_%sdo: no block"
-msgstr ""
-
-#: access/heap/heapam.c:2189
-#, c-format
-msgid "heap_delete_%sdo: uninitialized page"
-msgstr ""
-
-#: access/heap/heapam.c:2201
-msgid "heap_delete_undo: bad page LSN"
-msgstr ""
-
-#: access/heap/heapam.c:2208
-#, c-format
-msgid "heap_delete_%sdo: invalid lp"
-msgstr "heap_delete_%sdo: не верный lp"
-
-#: access/heap/heapam.c:2228
-msgid "heap_delete_undo: unimplemented"
-msgstr ""
-
-#: access/heap/heapam.c:2256
-#, c-format
-msgid "heap_insert_%sdo: uninitialized page"
-msgstr ""
-
-#: access/heap/heapam.c:2280
-msgid "heap_insert_redo: invalid max offset number"
-msgstr ""
-
-#: access/heap/heapam.c:2304
-msgid "heap_insert_redo: failed to add tuple"
-msgstr ""
-
-#: access/heap/heapam.c:2314
-msgid "heap_insert_undo: bad page LSN"
-msgstr ""
-
-#: access/heap/heapam.c:2316
-msgid "heap_insert_undo: unimplemented"
-msgstr ""
-
-#: access/heap/heapam.c:2347
-#, c-format
-msgid "heap_update_%sdo: no block"
-msgstr "heap_update_%sdo: нет блока"
-
-#: access/heap/heapam.c:2351
-#, c-format
-msgid "heap_update_%sdo: uninitialized old page"
-msgstr ""
-
-#: access/heap/heapam.c:2365
-msgid "heap_update_undo: bad old tuple page LSN"
-msgstr ""
-
-#: access/heap/heapam.c:2372
-#, c-format
-msgid "heap_update_%sdo: invalid lp"
-msgstr ""
-
-#: access/heap/heapam.c:2407 access/heap/heapam.c:2507
-msgid "heap_update_undo: unimplemented"
-msgstr ""
-
-#: access/heap/heapam.c:2428
-#, c-format
-msgid "heap_update_%sdo: uninitialized page"
-msgstr ""
-
-#: access/heap/heapam.c:2452
-msgid "heap_update_redo: invalid max offset number"
-msgstr ""
-
-#: access/heap/heapam.c:2496
-msgid "heap_update_redo: failed to add tuple"
-msgstr ""
-
-#: access/heap/heapam.c:2505
-msgid "heap_update_undo: bad new tuple page LSN"
-msgstr ""
-
-#: access/heap/heapam.c:2523
-msgid "_heap_unlock_tuple: can't open relation"
-msgstr ""
-
-#: access/heap/heapam.c:2528
-msgid "_heap_unlock_tuple: can't read buffer"
-msgstr ""
-
-#: access/heap/heapam.c:2532
-msgid "_heap_unlock_tuple: uninitialized page"
-msgstr ""
-
-#: access/heap/heapam.c:2536
-msgid "_heap_unlock_tuple: invalid itemid"
-msgstr ""
-
-#: access/heap/heapam.c:2540
-msgid "_heap_unlock_tuple: unused/deleted tuple in rollback"
-msgstr ""
-
-#: access/heap/heapam.c:2545
-msgid "_heap_unlock_tuple: invalid xmax in rollback"
-msgstr ""
-
-#: access/heap/heapam.c:2569
-#, c-format
-msgid "heap_redo: unknown op code %u"
-msgstr ""
-
-#: access/heap/heapam.c:2589
-#, c-format
-msgid "heap_undo: unknown op code %u"
-msgstr ""
-
-#: access/heap/hio.c:53
-msgid "RelationPutHeapTuple: failed to add tuple"
-msgstr ""
-
-#: access/heap/hio.c:113
-#, c-format
-msgid "Tuple is too big: size %lu, max size %ld"
-msgstr ""
-
-#: access/heap/hio.c:277
-#, c-format
-msgid "Tuple is too big: size %lu"
-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:177
-#, c-format
-msgid "%s is not an index relation"
-msgstr ""
-
-#: access/index/indexam.c:652
-#, 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"
-msgstr ""
-
-#: access/index/istrat.c:313
-#, c-format
-msgid "RelationGetStrategy: impossible case %d"
-msgstr ""
-
-#: access/index/istrat.c:319
-msgid "RelationGetStrategy: corrupted evaluation"
-msgstr ""
-
-#: access/index/istrat.c:438
-#, c-format
-msgid "RelationInvokeStrategy: cannot evaluate strategy %d"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:250
-#, c-format
-msgid "Cannot insert a duplicate key into unique index %s"
-msgstr "Не возможно вставить повторный ключ в уникальный индекс %s"
-
-#: access/nbtree/nbtinsert.c:389
-#, c-format
-msgid "btree: index item size %lu exceeds maximum %lu"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:525
-msgid "btree: concurrent ROOT page split"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:535
-#, c-format
-msgid "bt_insertonpg[%s]: no root page found"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:538
-#, c-format
-msgid "bt_insertonpg[%s]: root page unfound - fixing upper levels"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:585
-#, c-format
-msgid ""
-"_bt_getstackbuf: my bits moved right off the end of the world!\n"
-"\tRecreate index %s."
-msgstr ""
-"_bt_getstackbuf: моя крыша съехала и рассыпалась на битики!\n"
-"\tПересоздайте индекс %s."
-
-#: access/nbtree/nbtinsert.c:588
-#, c-format
-msgid "bt_insertonpg[%s]: parent page unfound - fixing branch"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:756
-msgid "btree: failed to add hikey to the right sibling"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:782
-msgid "btree: failed to add hikey to the left sibling"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1112
-#, c-format
-msgid "_bt_findsplitloc: can't find a feasible split point for %s"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1339
-msgid "btree: failed to add leftkey to new root page"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1356
-msgid "btree: failed to add rightkey to new root page"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1442
-msgid "bt_fixroot: not valid old root page"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1573
-#, c-format
-msgid "bt_fixtree[%s]: invalid start page (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1599
-#, c-format
-msgid "bt_fixtree[%s]: fixing root page"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1647
-#, c-format
-msgid "bt_fixlevel[%s]: invalid maxoff on start page (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1654
-#, c-format
-msgid ""
-"bt_fixtlevel[%s]: non-leftmost child page of leftmost parent (need to "
-"recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1657
-#, c-format
-msgid "bt_fixtlevel[%s]: invalid start child (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1683
-#, c-format
-msgid "bt_fixlevel[%s]: invalid item order(1) (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1715
-#, c-format
-msgid "bt_fixlevel[%s]: pointer disappeared (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1734
-#, c-format
-msgid "bt_fixlevel[%s]: invalid item order(2) (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1748
-#, c-format
-msgid "bt_fixlevel[%s]: invalid item order(3) (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1878
-#, c-format
-msgid "bt_fixbranch[%s]: left pointer unfound (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1885
-#, c-format
-msgid "bt_fixbranch[%s]: invalid item order (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1894
-#, c-format
-msgid "bt_fixbranch[%s]: right pointer unfound(1) (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1902
-#, c-format
-msgid "bt_fixbranch[%s]: right pointer unfound(2) (need to recreate index)"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1950
-#, c-format
-msgid "bt_fixbranch[%s]: fixing upper levels"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1981
-#, c-format
-msgid "bt_fixup[%s]: checking/fixing upper levels"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:1996
-#, c-format
-msgid "bt_fixup[%s]: fixing root page"
-msgstr ""
-
-#: access/nbtree/nbtinsert.c:2059
-#, c-format
-msgid "btree: failed to add item to the %s for %s"
-msgstr ""
-
-#: access/nbtree/nbtpage.c:66
-#, c-format
-msgid "Cannot initialize non-empty btree %s"
-msgstr ""
-
-#: access/nbtree/nbtpage.c:127
-#, c-format
-msgid "Index %s is not a btree"
-msgstr ""
-
-#: access/nbtree/nbtpage.c:131
-#, c-format
-msgid "Version mismatch on %s: version %d file, version %d code"
-msgstr ""
-
-#: access/nbtree/nbtpage.c:258
-#, c-format
-msgid "bt_getroot[%s]: fixing root page"
-msgstr ""
-
-#: access/nbtree/nbtree.c:806
-#, c-format
-msgid ""
-"_bt_restscan: my bits moved right off the end of the world!\n"
-"\tRecreate index %s."
-msgstr ""
-
-#: access/nbtree/nbtree.c:836
-msgid "_bt_restore_page: can't add item to page"
-msgstr ""
-
-#: access/nbtree/nbtree.c:859
-msgid "btree_delete_redo: block unfound"
-msgstr ""
-
-#: access/nbtree/nbtree.c:862
-msgid "btree_delete_redo: uninitialized page"
-msgstr ""
-
-#: access/nbtree/nbtree.c:898
-#, c-format
-msgid "btree_insert_%sdo: block unfound"
-msgstr ""
-
-#: access/nbtree/nbtree.c:901
-#, c-format
-msgid "btree_insert_%sdo: uninitialized page"
-msgstr ""
-
-#: access/nbtree/nbtree.c:915
-msgid "btree_insert_redo: failed to add item"
-msgstr ""
-
-#: access/nbtree/nbtree.c:924
-msgid "btree_insert_undo: bad page LSN"
-msgstr ""
-
-#: access/nbtree/nbtree.c:932
-msgid "btree_insert_undo: unimplemented"
-msgstr ""
-
-#: access/nbtree/nbtree.c:959
-#, c-format
-msgid "btree_split_%s: lost left sibling"
-msgstr ""
-
-#: access/nbtree/nbtree.c:965
-msgid "btree_split_undo: uninitialized left sibling"
-msgstr ""
-
-#: access/nbtree/nbtree.c:988
-msgid "btree_split_undo: bad left sibling LSN"
-msgstr ""
-
-#: access/nbtree/nbtree.c:989 access/nbtree/nbtree.c:1028
-msgid "btree_split_undo: unimplemented"
-msgstr ""
-
-#: access/nbtree/nbtree.c:997
-#, c-format
-msgid "btree_split_%s: lost right sibling"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1003
-msgid "btree_split_undo: uninitialized right sibling"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1027
-msgid "btree_split_undo: bad right sibling LSN"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1041
-msgid "btree_split_redo: lost next right page"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1045
-msgid "btree_split_redo: uninitialized next right page"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1082
-msgid "btree_newroot_redo: no root page"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1085
-msgid "btree_newroot_redo: no metapage"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1139
-#, c-format
-msgid "btree_redo: unknown op code %u"
-msgstr ""
-
-#: access/nbtree/nbtree.c:1159
-#, c-format
-msgid "btree_undo: unknown op code %u"
-msgstr ""
-
-#: access/nbtree/nbtsearch.c:545
-msgid "_bt_first: btree doesn't support is(not)null, yet"
-msgstr ""
-
-#: access/nbtree/nbtsearch.c:693
-msgid "_bt_first: equal items disappeared?"
-msgstr ""
-
-#: access/nbtree/nbtsearch.c:1004
+#: access/common/heaptuple.c:584
 #, c-format
-msgid "Illegal scan direction %d"
-msgstr ""
-
-#: access/nbtree/nbtsort.c:288
-msgid "btree: failed to add item to the page in _bt_sort"
-msgstr ""
+msgid "number of attributes %d exceeds limit, %d"
+msgstr "число атрибутов: %d превышает лимит: %d"
 
-#: access/nbtree/nbtsort.c:353
+#: access/common/printtup.c:279
+#: tcop/fastpath.c:187
+#: tcop/fastpath.c:517
+#: tcop/postgres.c:1430
 #, c-format
-msgid "btree: index item size %lu exceeds maximum %ld"
-msgstr ""
+msgid "unsupported format code: %d"
+msgstr "неподдерживаемый код формата: %d"
 
-#: access/nbtree/nbtutils.c:230
-msgid "_bt_orderkeys: key(s) for attribute 1 missed"
-msgstr ""
+#: access/common/tupdesc.c:660
+#: access/common/tupdesc.c:687
+msgid "number of aliases does not match number of attributes"
+msgstr "число алиасов не совпадает с числом атрибутов"
 
-#: access/nbtree/nbtutils.c:308
-#, c-format
-msgid "_bt_orderkeys: key(s) for attribute %d missed"
-msgstr ""
-
-#: access/nbtree/nbtutils.c:465
-#, c-format
-msgid "_bt_getstrategynumber: unable to identify operator %u"
-msgstr ""
+#: access/common/tupdesc.c:681
+msgid "no column alias was provided"
+msgstr "алиас колонки не указан"
 
-#: access/rtree/rtree.c:331
-#, c-format
-msgid "rtdoinsert: failed to add index item to %s"
-msgstr ""
+#: access/common/tupdesc.c:704
+msgid "could not determine tuple description for function returning record"
+msgstr "не в состоянии определить описание строки для функции возпращающей запись"
 
-#: access/rtree/rtree.c:523 access/rtree/rtree.c:547
+#: access/hash/hashovfl.c:166
+#: access/hash/hashovfl.c:185
+#: access/hash/hashovfl.c:208
+#: access/hash/hashovfl.c:254
 #, c-format
-msgid "rtdosplit: failed to add index item to %s"
+msgid "out of overflow pages in hash index \"%s\""
 msgstr ""
 
-#: access/rtree/rtree.c:643
-msgid "Variable-length rtree keys are not supported."
+#: access/hash/hashutil.c:83
+msgid "hash indexes cannot include null keys"
 msgstr ""
 
-#: access/rtree/rtree.c:663
+#: access/heap/heapam.c:580
+#: access/heap/heapam.c:615
+#: access/heap/heapam.c:650
 #, c-format
-msgid "rtintinsert: failed to add index item to %s"
-msgstr ""
-
-#: access/rtree/rtree.c:689 access/rtree/rtree.c:694
-#, c-format
-msgid "rtnewroot: failed to add index item to %s"
-msgstr ""
+msgid "\"%s\" is an index relation"
+msgstr "\"%s\" является индексом"
 
-#: access/rtree/rtree.c:781
+#: access/heap/heapam.c:585
+#: access/heap/heapam.c:620
+#: access/heap/heapam.c:655
 #, c-format
-msgid "rtree: index item size %lu exceeds maximum %lu"
-msgstr ""
-
-#: access/rtree/rtree.c:1068
-msgid "rtpicksplit: failed to find a workable page split"
-msgstr ""
-
-#: access/rtree/rtree.c:1347
-msgid "rtree_redo: unimplemented"
-msgstr ""
-
-#: access/rtree/rtree.c:1353
-msgid "rtree_undo: unimplemented"
-msgstr ""
+msgid "\"%s\" is a special relation"
+msgstr "\"%s\" является специальной связью"
 
-#: access/rtree/rtscan.c:255
+#: access/heap/heapam.c:590
+#: access/heap/heapam.c:625
+#: access/heap/heapam.c:660
 #, c-format
-msgid "rtree scan list corrupted -- cannot find 0x%p"
-msgstr ""
+msgid "\"%s\" is a composite type"
+msgstr "\"%s\" являтся сложным типом"
 
-#: access/rtree/rtscan.c:391
+#: access/heap/hio.c:109
 #, c-format
-msgid "Bad operation in rtree scan adjust: %d"
+msgid "tuple is too big: size %lu, maximum size %lu"
 msgstr ""
 
-#: access/transam/clog.c:546 access/transam/clog.c:598
+#: access/index/indexam.c:134
+#: access/index/indexam.c:159
+#: access/index/indexam.c:184
 #, c-format
-msgid "open of %s failed: %m"
-msgstr "не удалось открыть %s: %m"
+msgid "\"%s\" is not an index relation"
+msgstr "\"%s\" не является индексом"
 
-#: access/transam/clog.c:547
+#: access/nbtree/nbtinsert.c:242
 #, c-format
-msgid "clog file %s doesn't exist, reading as zeroes"
+msgid "duplicate key violates UNIQUE constraint \"%s\""
 msgstr ""
 
-#: access/transam/clog.c:553 access/transam/clog.c:606
+#: access/nbtree/nbtinsert.c:394
+#: access/nbtree/nbtsort.c:402
 #, c-format
-msgid "lseek of clog file %u, offset %u failed: %m"
+msgid "index tuple size %lu exceeds btree maximum, %lu"
 msgstr ""
 
-#: access/transam/clog.c:558
+#: access/nbtree/nbtpage.c:150
+#: access/nbtree/nbtpage.c:329
 #, c-format
-msgid "read of clog file %u, offset %u failed: %m"
-msgstr ""
+msgid "index \"%s\" is not a btree"
+msgstr "индекс \"%s\" не является b-деревом"
 
-#: access/transam/clog.c:602 access/transam/xlog.c:1378
+#: access/nbtree/nbtpage.c:156
+#: access/nbtree/nbtpage.c:335
 #, c-format
-msgid "creation of file %s failed: %m"
+msgid "version mismatch in \"%s\": file version %d, code version %d"
 msgstr ""
 
-#: access/transam/clog.c:615
-#, c-format
-msgid "write of clog file %u, offset %u failed: %m"
+#: access/rtree/rtree.c:645
+msgid "variable-length rtree keys are not supported"
 msgstr ""
 
-#: access/transam/clog.c:834
-msgid "unable to truncate commit log: apparent wraparound"
-msgstr ""
-
-#: access/transam/clog.c:889
+#: access/rtree/rtree.c:785
 #, c-format
-msgid "could not open transaction-commit log directory (%s): %m"
+msgid "index tuple size %lu exceeds rtree maximum, %lu"
 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"
+#: access/transam/xact.c:405
+msgid "cannot have more than 2^32-1 commands in a transaction"
+msgstr "нелтьзя иметь более 2^32-1 команд в одной транзакции"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:1454
+#: access/transam/xact.c:1374
 #, c-format
 msgid "%s cannot run inside a transaction block"
 msgstr "%s не может выполняться внутри транзакционного блока"
 
 #. translator: %s represents an SQL statement name
-#: access/transam/xact.c:1464
+#: access/transam/xact.c:1386
 #, 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
+#: access/transam/xact.c:1429
 #, 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: транзакция уже в процессе выполнения"
+msgid "%s may only be used in BEGIN/END transaction blocks"
+msgstr "%s может выполняться только внутри транзакционного блока BEGIN/END"
 
-#: access/transam/xact.c:1605
-msgid "COMMIT: no transaction in progress"
-msgstr "COMMIT: нет транзакции в процессе выполнения"
+#: access/transam/xact.c:1452
+msgid "there is already a transaction in progress"
+msgstr "транзакция уже в процессе выполнения"
 
-#: access/transam/xact.c:1642 access/transam/xact.c:1689
-msgid "ROLLBACK: no transaction in progress"
-msgstr "ROLLBACK: нет транзакции в процессе выполнения"
+#: access/transam/xact.c:1514
+#: access/transam/xact.c:1552
+#: access/transam/xact.c:1600
+msgid "there is no transaction in progress"
+msgstr "нет транзакции в процессе выполнения"
 
-#: access/transam/xact.c:1768 access/transam/xact.c:1779
+#: access/transam/slru.c:492
 #, 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 ""
+msgid "file \"%s\" doesn't exist, reading as zeroes"
+msgstr "файл \"%s\" не существует, читается как нули"
 
-#: access/transam/xact.c:1814
-msgid "XactPushRollback: already installed"
+#: access/transam/slru.c:613
+#: access/transam/slru.c:620
+#: access/transam/slru.c:627
+#: access/transam/slru.c:634
+#: access/transam/slru.c:641
+#, c-format
+msgid "could not access status of transaction %u"
 msgstr ""
 
-#: access/transam/xlog.c:505
+#: access/transam/slru.c:614
 #, c-format
-msgid "XLogInsert: invalid info mask %02X"
-msgstr ""
+msgid "open of file \"%s\" failed: %m"
+msgstr "не удалось открыть \"%s\": %m"
 
-#: access/transam/xlog.c:610
+#: access/transam/slru.c:621
+#: access/transam/xlog.c:1387
 #, c-format
-msgid "XLogInsert: can backup %d blocks at most"
-msgstr ""
+msgid "creation of file \"%s\" failed: %m"
+msgstr "не удалось создать файл \"%s\": %m"
 
-#: access/transam/xlog.c:628
+#: access/transam/slru.c:628
 #, c-format
-msgid "XLogInsert: invalid record length %u"
-msgstr ""
+msgid "lseek of file \"%s\", offset %u failed: %m"
+msgstr "не удалось выполнить lseek() для файла \"%s\", смещение %u: %m"
 
-#: 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/slru.c:635
 #, c-format
-msgid "%s"
-msgstr "%s"
+msgid "read of file \"%s\", offset %u failed: %m"
+msgstr "не удалось считать файл \"%s\", смещение %u: %m"
 
-#: access/transam/xlog.c:1029
+#: access/transam/slru.c:642
 #, c-format
-msgid "XLogWrite: write request %X/%X is past end of log %X/%X"
-msgstr ""
+msgid "write of file \"%s\", offset %u failed: %m"
+msgstr "не удалось записать файл \"%s\", смещение %u: %m"
 
-#: access/transam/xlog.c:1046 access/transam/xlog.c:1156
-#: access/transam/xlog.c:3329
+#: access/transam/slru.c:820
 #, c-format
-msgid "close of log file %u, segment %u failed: %m"
+msgid "could not truncate \"%s\": apparent wraparound"
 msgstr ""
 
-#: access/transam/xlog.c:1081
-msgid "XLogWrite: time for a checkpoint, signaling postmaster"
-msgstr ""
+#: access/transam/slru.c:879
+#, c-format
+msgid "could not open directory \"%s\": %m"
+msgstr "не получилось отктрыть директорию \"%s\": %m"
 
-#: access/transam/xlog.c:1100
+#: access/transam/slru.c:895
 #, c-format
-msgid "lseek of log file %u, segment %u, offset %u failed: %m"
-msgstr ""
+msgid "removing file \"%s/%s\""
+msgstr "удаление файла \"%s/%s\""
 
-#: access/transam/xlog.c:1112
+#: access/transam/slru.c:907
 #, c-format
-msgid "write of log file %u, segment %u, offset %u failed: %m"
-msgstr ""
+msgid "could not read directory \"%s\": %m"
+msgstr "не получилось cчитать директорию \"%s\": %m"
 
-#: access/transam/xlog.c:1208
+#: access/transam/xlog.c:1049
+#: access/transam/xlog.c:1165
+#: access/transam/xlog.c:3555
 #, c-format
-msgid "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X"
+msgid "close of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1313
+#: access/transam/xlog.c:1105
+#: access/transam/xlog.c:1867
 #, c-format
-msgid "XLogFlush: request %X/%X is not satisfied --- flushed only to %X/%X"
+msgid "lseek of log file %u, segment %u, offset %u failed: %m"
 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:1119
 #, c-format
-msgid "open of %s (log file %u, segment %u) failed: %m"
-msgstr "не удалось открыть %s (лог-файл: %u, сегмент: %u): %m"
+msgid "write of log file %u, segment %u, offset %u failed: %m"
+msgstr ""
 
-#: access/transam/xlog.c:1405
+#: access/transam/xlog.c:1363
+#: access/transam/xlog.c:1452
+#: access/transam/xlog.c:1566
+#: access/transam/xlog.c:1572
 #, c-format
-msgid "ZeroFill failed to write %s: %m"
-msgstr ""
+msgid "open of \"%s\" (log file %u, segment %u) failed: %m"
+msgstr "не удалось открыть \"%s\" (лог-файл: %u, сегмент: %u): %m"
 
-#: access/transam/xlog.c:1410
+#: access/transam/xlog.c:1416
 #, c-format
-msgid "fsync of file %s failed: %m"
-msgstr ""
+msgid "failed to write \"%s\": %m"
+msgstr "не удалось записать \"%s\": %m"
 
-#: access/transam/xlog.c:1515
+#: access/transam/xlog.c:1423
 #, c-format
-msgid ""
-"link from %s to %s (initialization of log file %u, segment %u) failed: %m"
-msgstr ""
+msgid "fsync of file \"%s\" failed: %m"
+msgstr "fsync файла \"%s\" не удался: %m"
 
-#: access/transam/xlog.c:1520
+#: access/transam/xlog.c:1530
 #, c-format
-msgid ""
-"rename 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:1601
+#: access/transam/xlog.c:1537
 #, c-format
-msgid "could not open transaction log directory (%s): %m"
-msgstr ""
+msgid "rename from \"%s\" to \"%s\" (initialization of log file %u, segment %u) failed: %m"
+msgstr "не удалось переименовать \"%s\" в \"%s\" (инициализация лог-файла: %u, сегмент: %u): %m"
 
-#: access/transam/xlog.c:1616
+#: access/transam/xlog.c:1624
 #, c-format
-msgid "archiving transaction log file %s"
+msgid "could not open transaction log directory \"%s\": %m"
 msgstr ""
 
-#: access/transam/xlog.c:1618
-msgid "archiving log files is not implemented!"
-msgstr "архивация логов не поддерживается!"
-
-#: access/transam/xlog.c:1632
+#: access/transam/xlog.c:1640
 #, c-format
-msgid "recycled transaction log file %s"
-msgstr ""
+msgid "archiving transaction log file \"%s\""
+msgstr "архивирование лога транзакций: \"%s\""
 
-#: access/transam/xlog.c:1638
+#: access/transam/xlog.c:1657
 #, c-format
-msgid "removing transaction log file %s"
-msgstr "удаление лог-файла транзакций: %s"
+msgid "recycled transaction log file \"%s\""
+msgstr "переиспользование лога транзакций: \"%s\""
 
-#: access/transam/xlog.c:1647
+#: access/transam/xlog.c:1664
 #, c-format
-msgid "could not read transaction log directory (%s): %m"
-msgstr ""
+msgid "removing transaction log file \"%s\""
+msgstr "удаление лога транзакций: \"%s\""
 
-#: access/transam/xlog.c:1720
+#: access/transam/xlog.c:1675
 #, c-format
-msgid "ReadRecord: bad resource manager data checksum in record at %X/%X"
-msgstr ""
+msgid "could not read transaction log directory \"%s\": %m"
+msgstr "не получилось считать файл директорию лога транзакций \"%s\": %m"
 
-#: access/transam/xlog.c:1742
+#: access/transam/xlog.c:1749
 #, c-format
-msgid "ReadRecord: bad checksum of backup block %d in record at %X/%X"
+msgid "bad resource manager data checksum in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1811
+#: access/transam/xlog.c:1772
 #, c-format
-msgid "ReadRecord: invalid record offset at %X/%X"
+msgid "bad checksum of backup block %d in record at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1834
+#: access/transam/xlog.c:1842
 #, c-format
-msgid "ReadRecord: lseek of log file %u, segment %u, offset %u failed: %m"
+msgid "invalid record offset at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1840 access/transam/xlog.c:1924
+#: access/transam/xlog.c:1875
+#: access/transam/xlog.c:1965
 #, c-format
-msgid "ReadRecord: read of log file %u, segment %u, offset %u failed: %m"
+msgid "read of log file %u, segment %u, offset %u failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:1850
+#: access/transam/xlog.c:1886
 #, c-format
-msgid "ReadRecord: contrecord is requested by %X/%X"
+msgid "contrecord is requested by %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1864
+#: access/transam/xlog.c:1901
 #, c-format
-msgid "ReadRecord: record with zero length at %X/%X"
+msgid "record with zero length at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1888
+#: access/transam/xlog.c:1926
 #, c-format
-msgid "ReadRecord: record length %u at %X/%X too long"
+msgid "record length %u at %X/%X too long"
 msgstr ""
 
-#: access/transam/xlog.c:1894
+#: access/transam/xlog.c:1933
 #, c-format
-msgid "ReadRecord: invalid resource manager id %u at %X/%X"
+msgid "invalid resource manager id %u at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:1932
+#: access/transam/xlog.c:1974
 #, c-format
-msgid ""
-"ReadRecord: there is no ContRecord flag in log file %u, segment %u, offset %u"
+msgid "there is no contrecord flag in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:1940
+#: access/transam/xlog.c:1983
 #, c-format
-msgid ""
-"ReadRecord: invalid ContRecord length %u in log file %u, segment %u, offset %"
-"u"
+msgid "invalid contrecord length %u in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2004
+#: access/transam/xlog.c:2049
 #, c-format
-msgid ""
-"ReadRecord: invalid magic number %04X in log file %u, segment %u, offset %u"
+msgid "invalid magic number %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2010
+#: access/transam/xlog.c:2056
 #, c-format
-msgid ""
-"ReadRecord: invalid info bits %04X in log file %u, segment %u, offset %u"
+msgid "invalid info bits %04X in log file %u, segment %u, offset %u"
 msgstr ""
 
-#: access/transam/xlog.c:2018
+#: access/transam/xlog.c:2065
 #, c-format
-msgid ""
-"ReadRecord: unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
+msgid "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:2088
 #, c-format
-msgid ""
-"ReadRecord: out-of-sequence SUI %u (after %u) in log file %u, segment %u, "
-"offset %u"
+msgid "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:2149
 msgid "invalid LC_COLLATE setting"
-msgstr ""
+msgstr "неверное значение LC_COLLATE"
 
-#: access/transam/xlog.c:2103
+#: access/transam/xlog.c:2154
 msgid "invalid LC_CTYPE setting"
-msgstr ""
+msgstr "неверное значение LC_CTYPE"
 
-#: access/transam/xlog.c:2121
+#: access/transam/xlog.c:2173
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
 msgstr ""
 
-#: access/transam/xlog.c:2129
+#: access/transam/xlog.c:2183
 #, c-format
-msgid "WriteControlFile: could not create control file (%s): %m"
+msgid "could not create control file \"%s\": %m"
 msgstr ""
 
-#: access/transam/xlog.c:2138
+#: access/transam/xlog.c:2194
+#: access/transam/xlog.c:2371
 #, c-format
-msgid "WriteControlFile: write to control file failed: %m"
+msgid "write to control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2142
+#: access/transam/xlog.c:2200
+#: access/transam/xlog.c:2377
 #, c-format
-msgid "WriteControlFile: fsync of control file failed: %m"
+msgid "fsync of control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2158 access/transam/xlog.c:2281
+#: access/transam/xlog.c:2218
+#: access/transam/xlog.c:2360
 #, c-format
-msgid "could not open control file (%s): %m"
-msgstr ""
+msgid "could not open control file \"%s\": %m"
+msgstr "не получилось отктрыть файл управления \"%s\": %m"
 
-#: access/transam/xlog.c:2161
+#: access/transam/xlog.c:2224
 #, c-format
 msgid "read from control file failed: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2173
+#: access/transam/xlog.c:2236
+#: access/transam/xlog.c:2266
+#: access/transam/xlog.c:2273
+#: access/transam/xlog.c:2280
+#: access/transam/xlog.c:2287
+#: access/transam/xlog.c:2294
+#: access/transam/xlog.c:2303
+#: access/transam/xlog.c:2310
+#: access/transam/xlog.c:2318
+#: utils/init/miscinit.c:793
+msgid "database files are incompatible with server"
+msgstr ""
+
+#: access/transam/xlog.c:2237
 #, c-format
-msgid ""
-"The database cluster was initialized with PG_CONTROL_VERSION %d,\n"
-"\tbut the server was compiled with PG_CONTROL_VERSION %d.\n"
-"\tIt looks like you need to initdb."
+msgid "The database cluster was initialized with PG_CONTROL_VERSION %d, but the server was compiled with PG_CONTROL_VERSION %d."
 msgstr ""
 
-#: access/transam/xlog.c:2186
+#: access/transam/xlog.c:2240
+#: access/transam/xlog.c:2270
+msgid "It looks like you need to initdb."
+msgstr ""
+
+#: access/transam/xlog.c:2250
 msgid "invalid checksum in control file"
 msgstr ""
 
-#: access/transam/xlog.c:2202
+#: access/transam/xlog.c:2267
 #, c-format
-msgid ""
-"The database cluster was initialized with CATALOG_VERSION_NO %d,\n"
-"\tbut the backend was compiled with CATALOG_VERSION_NO %d.\n"
-"\tIt looks like you need to initdb."
+msgid "The database cluster was initialized with CATALOG_VERSION_NO %d, but the server was compiled with CATALOG_VERSION_NO %d."
 msgstr ""
 
-#: access/transam/xlog.c:2208
+#: access/transam/xlog.c:2274
 #, c-format
-msgid ""
-"The database cluster was initialized with BLCKSZ %d,\n"
-"\tbut the backend was compiled with BLCKSZ %d.\n"
-"\tIt looks like you need to initdb."
+msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d."
 msgstr ""
 
-#: access/transam/xlog.c:2214
+#: access/transam/xlog.c:2277
+#: access/transam/xlog.c:2284
+#: access/transam/xlog.c:2291
+#: access/transam/xlog.c:2298
+#: access/transam/xlog.c:2306
+#: access/transam/xlog.c:2313
+#: access/transam/xlog.c:2322
+msgid "It looks like you need to recompile or initdb."
+msgstr ""
+
+#: access/transam/xlog.c:2281
 #, c-format
-msgid ""
-"The database cluster was initialized with RELSEG_SIZE %d,\n"
-"\tbut the backend was compiled with RELSEG_SIZE %d.\n"
-"\tIt looks like you need to recompile or initdb."
+msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d."
 msgstr ""
 
-#: access/transam/xlog.c:2221
+#: access/transam/xlog.c:2288
 #, c-format
-msgid ""
-"The database cluster was initialized with NAMEDATALEN %d,\n"
-"\tbut the backend was compiled with NAMEDATALEN %d.\n"
-"\tIt looks like you need to recompile or initdb."
+msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d."
 msgstr ""
 
-#: access/transam/xlog.c:2228
+#: access/transam/xlog.c:2295
 #, c-format
-msgid ""
-"The database cluster was initialized with FUNC_MAX_ARGS %d,\n"
-"\tbut the backend was compiled with FUNC_MAX_ARGS %d.\n"
-"\tIt looks like you need to recompile or initdb."
+msgid "The database cluster was initialized with FUNC_MAX_ARGS %d, but the server was compiled with FUNC_MAX_ARGS %d."
 msgstr ""
 
-#: access/transam/xlog.c:2236
-msgid ""
-"The database cluster was initialized without HAVE_INT64_TIMESTAMP\n"
-"\tbut the backend was compiled with HAVE_INT64_TIMESTAMP.\n"
-"\tIt looks like you need to recompile or initdb."
+#: access/transam/xlog.c:2304
+msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP."
 msgstr ""
 
-#: access/transam/xlog.c:2242
-msgid ""
-"The database cluster was initialized with HAVE_INT64_TIMESTAMP\n"
-"\tbut the backend was compiled without HAVE_INT64_TIMESTAMP.\n"
-"\tIt looks like you need to recompile or initdb."
+#: access/transam/xlog.c:2311
+msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP."
 msgstr ""
 
-#: access/transam/xlog.c:2249
+#: access/transam/xlog.c:2319
 #, c-format
-msgid ""
-"The database cluster was initialized with LOCALE_NAME_BUFLEN %d,\n"
-"\tbut the backend was compiled with LOCALE_NAME_BUFLEN %d.\n"
-"\tIt looks like you need to initdb."
+msgid "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the server was compiled with LOCALE_NAME_BUFLEN %d."
 msgstr ""
 
-#: access/transam/xlog.c:2256
-#, c-format
-msgid ""
-"The database cluster was initialized with LC_COLLATE '%s',\n"
-"\twhich is not recognized by setlocale().\n"
-"\tIt looks like you need to initdb."
+#: access/transam/xlog.c:2325
+#: access/transam/xlog.c:2332
+msgid "database files are incompatible with operating system"
 msgstr ""
 
-#: access/transam/xlog.c:2262
+#: access/transam/xlog.c:2326
 #, c-format
-msgid ""
-"The database cluster was initialized with LC_CTYPE '%s',\n"
-"\twhich is not recognized by setlocale().\n"
-"\tIt looks like you need to initdb."
+msgid "The database cluster was initialized with LC_COLLATE \"%s\", which is not recognized by setlocale()."
 msgstr ""
 
-#: access/transam/xlog.c:2289
-#, c-format
-msgid "write to control file failed: %m"
+#: access/transam/xlog.c:2329
+#: access/transam/xlog.c:2336
+msgid "It looks like you need to initdb or install locale support."
 msgstr ""
 
-#: access/transam/xlog.c:2293
+#: access/transam/xlog.c:2333
 #, c-format
-msgid "fsync of control file failed: %m"
+msgid "The database cluster was initialized with LC_CTYPE \"%s\", which is not recognized by setlocale()."
 msgstr ""
 
-#: access/transam/xlog.c:2433
+#: access/transam/xlog.c:2519
 #, c-format
-msgid "BootStrapXLOG failed to write log file: %m"
+msgid "failed to write bootstrap xlog file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2437
+#: access/transam/xlog.c:2525
 #, c-format
-msgid "BootStrapXLOG failed to fsync log file: %m"
+msgid "failed to fsync bootstrap xlog file: %m"
 msgstr ""
 
-#: access/transam/xlog.c:2503
-msgid "control file context is broken"
+#: access/transam/xlog.c:2593
+msgid "control file contains invalid data"
 msgstr ""
 
-#: access/transam/xlog.c:2506
+#: access/transam/xlog.c:2597
 #, c-format
 msgid "database system was shut down at %s"
 msgstr "система была отключена: %s"
 
-#: access/transam/xlog.c:2509
+#: access/transam/xlog.c:2601
 #, c-format
 msgid "database system shutdown was interrupted at %s"
 msgstr "отключение системы было прервано: %s"
 
-#: access/transam/xlog.c:2512
+#: access/transam/xlog.c:2605
 #, c-format
-msgid ""
-"database system was interrupted being in recovery at %s\n"
-"\tThis probably means that some data blocks are corrupted\n"
-"\tand you will have to use the last backup for recovery."
+msgid "database system was interrupted while in recovery at %s"
+msgstr "система была прервана во время восстановления на %s"
+
+#: access/transam/xlog.c:2607
+msgid "This probably means that some data is corrupted and you will have to use the last backup for recovery."
 msgstr ""
 
-#: access/transam/xlog.c:2517
+#: access/transam/xlog.c:2611
 #, c-format
 msgid "database system was interrupted at %s"
 msgstr "система была прервана: %s"
 
-#: access/transam/xlog.c:2528
+#: access/transam/xlog.c:2629
 #, c-format
 msgid "checkpoint record is at %X/%X"
 msgstr "контрольная точка: %X/%X"
 
-#: access/transam/xlog.c:2537
+#: access/transam/xlog.c:2639
 #, c-format
 msgid "using previous checkpoint record at %X/%X"
 msgstr "используется предыдущая контрольная точка: %X/%X"
 
-#: access/transam/xlog.c:2542
-msgid "unable to locate a valid checkpoint record"
-msgstr "не в состоянии найти корректную контрольную точку"
+#: access/transam/xlog.c:2645
+msgid "could not locate a valid checkpoint record"
+msgstr "не получилось  найти корректную контрольную точку"
 
-#: access/transam/xlog.c:2548
+#: access/transam/xlog.c:2652
 #, 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:2657
 #, c-format
 msgid "next transaction id: %u; next oid: %u"
 msgstr "id следующей транзакции: %u; следующий OID: %u"
 
-#: access/transam/xlog.c:2555
+#: access/transam/xlog.c:2661
 msgid "invalid next transaction id"
 msgstr ""
 
-#: access/transam/xlog.c:2566
+#: access/transam/xlog.c:2685
 msgid "invalid redo in checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:2574
+#: access/transam/xlog.c:2694
 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:2706
+msgid "database system was not properly shut down; automatic recovery in progress"
 msgstr ""
 
-#: access/transam/xlog.c:2603
+#: access/transam/xlog.c:2734
 #, c-format
 msgid "redo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2634
+#: access/transam/xlog.c:2766
 #, c-format
 msgid "redo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2640
+#: access/transam/xlog.c:2773
 msgid "redo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2722
+#: access/transam/xlog.c:2842
 #, c-format
 msgid "undo starts at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2732
+#: access/transam/xlog.c:2853
 #, c-format
 msgid "undo done at %X/%X"
 msgstr ""
 
-#: access/transam/xlog.c:2736
+#: access/transam/xlog.c:2858
 msgid "undo is not required"
 msgstr ""
 
-#: access/transam/xlog.c:2770
+#: access/transam/xlog.c:2948
 msgid "database system is ready"
 msgstr "система готова к использованию"
 
-#: access/transam/xlog.c:2898
-msgid "shutting down"
-msgstr "отключение в процессе"
-
-#: access/transam/xlog.c:2911
-msgid "database system is shut down"
-msgstr "система отключена"
-
-#: access/transam/xlog.c:2932
-msgid "CreateCheckPoint: cannot be called inside transaction block"
+#. translator: %s is "primary" or "secondary"
+#: access/transam/xlog.c:2981
+#, c-format
+msgid "invalid %s checkpoint link in control file"
 msgstr ""
 
-#: access/transam/xlog.c:3047
-msgid "active transaction while database system is shutting down"
-msgstr ""
+#: access/transam/xlog.c:2982
+#: access/transam/xlog.c:2993
+#: access/transam/xlog.c:3001
+#: access/transam/xlog.c:3010
+#: access/transam/xlog.c:3018
+msgid "primary"
+msgstr "первичный"
 
-#: access/transam/xlog.c:3093
-msgid ""
-"concurrent transaction log activity while database system is shutting down"
-msgstr ""
+#: access/transam/xlog.c:2982
+#: access/transam/xlog.c:2993
+#: access/transam/xlog.c:3001
+#: access/transam/xlog.c:3010
+#: access/transam/xlog.c:3018
+msgid "secondary"
+msgstr "двоичный"
 
-#: access/transam/xlog.c:3324 access/transam/xlog.c:3352
+#. translator: %s is "primary" or "secondary"
+#: access/transam/xlog.c:2992
 #, c-format
-msgid "fsync of log file %u, segment %u failed: %m"
+msgid "invalid %s checkpoint record"
+msgstr "неверная  контрольная точка %s"
+
+#. translator: %s is "primary" or "secondary"
+#: access/transam/xlog.c:3000
+#, c-format
+msgid "invalid resource manager id in %s checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:3358
+#. translator: %s is "primary" or "secondary"
+#: access/transam/xlog.c:3009
 #, c-format
-msgid "fdatasync of log file %u, segment %u failed: %m"
+msgid "invalid xl_info in %s checkpoint record"
 msgstr ""
 
-#: access/transam/xlog.c:3366
+#. translator: %s is "primary" or "secondary"
+#: access/transam/xlog.c:3017
 #, c-format
-msgid "bogus wal_sync_method %d"
+msgid "invalid length of %s checkpoint record"
 msgstr ""
 
-#: access/transam/xlogutils.c:253
-msgid "_xl_remove_hash_entry: file was not found in cache"
+#: access/transam/xlog.c:3082
+msgid "shutting down"
+msgstr "отключение в процессе"
+
+#: access/transam/xlog.c:3096
+msgid "database system is shut down"
+msgstr "система отключена"
+
+#: access/transam/xlog.c:3119
+msgid "checkpoint cannot be made inside transaction block"
+msgstr "контрольная точка не может располагаться внутри транзакционного блока"
+
+#: access/transam/xlog.c:3307
+msgid "concurrent transaction log activity while database system is shutting down"
 msgstr ""
 
-#: access/transam/xlogutils.c:350
-msgid "XLogOpenRelation: out of memory for cache"
+#: access/transam/xlog.c:3548
+#: access/transam/xlog.c:3580
+#, c-format
+msgid "fsync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: access/transam/xlogutils.c:353
-msgid "XLogOpenRelation: file found on insert into cache"
+#: access/transam/xlog.c:3588
+#, c-format
+msgid "fdatasync of log file %u, segment %u failed: %m"
 msgstr ""
 
-#: bootstrap/bootstrap.c:194
+#: bootstrap/bootstrap.c:196
 msgid ""
 "Usage:\n"
-"  postgres -boot [-d level] [-D datadir] [-F] [-o file] [-x num] dbname\n"
-"  -d 1-5           debug mode\n"
+"  postgres -boot [OPTION]... DBNAME\n"
+"  -c NAME=VALUE    set run-time parameter\n"
+"  -d 1-5           debug level\n"
 "  -D datadir       data directory\n"
 "  -F               turn off fsync\n"
 "  -o file          send debug output to file\n"
 "  -x num           internal use\n"
 msgstr ""
 "Использование:\n"
-"  postgres -boot [-d уровень] [-D дирданных] [-F] [-o файл] [-x номер] "
-"имябд\n"
-"  -d 1-5           режим отладки\n"
-"  -D дирданных     директория с данными\n"
+"  postgres -boot [ОПЦИЯ]... ИМЯБД\n"
+"  -c ИМЯ=ЗНАЧЕНИЕ  set run-time parameter\n"
+"  -d 1-5           уровень отладки\n"
+"  -D ДИРДАННЫХ     директория с данными\n"
 "  -F               выключить fsync\n"
-"  -o файл          направить debug-вывод в файл\n"
-"  -x номер         для внутреннего использования\n"
+"  -o ФАЙЛ         направить вывод режима отладки в файл\n"
+"  -x НОМЕР         для внутреннего использования\n"
+
+#: bootstrap/bootstrap.c:319
+#: postmaster/postmaster.c:567
+#: tcop/postgres.c:2407
+#, c-format
+msgid "--%s requires a value"
+msgstr "--%s требует параметр"
+
+#: bootstrap/bootstrap.c:324
+#: postmaster/postmaster.c:572
+#: tcop/postgres.c:2412
+#, c-format
+msgid "-c %s requires a value"
+msgstr "-c %s требует параметр"
 
-#: bootstrap/bootstrap.c:308 postmaster/postmaster.c:309
+#: bootstrap/bootstrap.c:357
+#: postmaster/postmaster.c:314
+#: tcop/postgres.c:2482
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
 "You must specify the directory that contains the database system\n"
 "either by specifying the -D invocation option or by setting the\n"
 "PGDATA environment variable.\n"
-"\n"
 msgstr ""
 "Модуль %s не в состоянии найти данные (базы и т.д.) системы.\n"
 "Вы должны указать директорию, которая содержит данные\n"
 "путём указания опции -D при запуске или установив переменную\n"
 "окружения PGDATA.\n"
-"\n"
-
-#: bootstrap/bootstrap.c:408
-#, c-format
-msgid "Unsupported XLOG op %d"
-msgstr ""
-
-#: bootstrap/bootstrap.c:511
-#, c-format
-msgid "open relation %s, attrsize %d"
-msgstr ""
-
-#: bootstrap/bootstrap.c:527
-#, c-format
-msgid "create attribute %d name %s len %d num %d type %u"
-msgstr ""
-
-#: bootstrap/bootstrap.c:546
-#, c-format
-msgid "closerel: close of '%s' when '%s' was expected"
-msgstr ""
-
-#: bootstrap/bootstrap.c:550
-#, c-format
-msgid "closerel: close of '%s' before any relation was opened"
-msgstr ""
 
-#: bootstrap/bootstrap.c:555
-msgid "no open relation to close"
-msgstr ""
-
-#: bootstrap/bootstrap.c:558
+#: catalog/dependency.c:173
 #, c-format
-msgid "close relation %s"
-msgstr ""
-
-#: bootstrap/bootstrap.c:582
-msgid "warning: no open relations allowed with 'create' command"
+msgid "cannot drop %s because other objects depend on it"
 msgstr ""
 
-#: bootstrap/bootstrap.c:591
-#, c-format
-msgid "column %s %s"
-msgstr "колонка %s %s"
-
-#: bootstrap/bootstrap.c:681
-#, c-format
-msgid "inserting row oid %u, %d columns"
+#: catalog/dependency.c:175
+msgid "Use DROP ... CASCADE to drop the dependent objects too."
 msgstr ""
 
-#: bootstrap/bootstrap.c:693
-msgid "row inserted"
-msgstr "запись добавлена"
-
-#: bootstrap/bootstrap.c:715
+#: catalog/dependency.c:233
 #, c-format
-msgid "inserting column %d value '%s'"
+msgid "failed to drop all objects depending on %s"
 msgstr ""
 
-#: bootstrap/bootstrap.c:721
-msgid "Typ != NULL"
-msgstr "Typ != NULL"
-
-#: bootstrap/bootstrap.c:728
+#: catalog/dependency.c:330
+#: catalog/dependency.c:729
 #, c-format
-msgid "unable to find atttypid %u in Typ list"
+msgid "cannot drop %s because it is required by the database system"
 msgstr ""
 
-#: bootstrap/bootstrap.c:739 bootstrap/bootstrap.c:760
-#, c-format
-msgid " -> %s"
-msgstr " -> %s"
-
-#: bootstrap/bootstrap.c:750
+#: catalog/dependency.c:466
 #, c-format
-msgid "type oid %u not found"
+msgid "cannot drop %s because %s requires it"
 msgstr ""
 
-#: bootstrap/bootstrap.c:751
-#, c-format
-msgid "Typ == NULL, typeindex = %u"
-msgstr "Typ == NULL, typeindex = %u"
-
-#: bootstrap/bootstrap.c:763
-msgid "inserted"
-msgstr "добавлено"
-
-#: bootstrap/bootstrap.c:773
+#: catalog/dependency.c:468
 #, c-format
-msgid "inserting column %d NULL"
+msgid "You may drop %s instead."
 msgstr ""
 
-#: bootstrap/bootstrap.c:820
-msgid "Memory manager fault: cleanup called twice.\n"
-msgstr ""
-
-#: bootstrap/bootstrap.c:867
-#, c-format
-msgid "external type: %s"
-msgstr "внешний тип: %s"
-
-#: bootstrap/bootstrap.c:891
+#: catalog/dependency.c:536
+#: catalog/dependency.c:686
+#: catalog/dependency.c:714
 #, c-format
-msgid "Error: unknown type '%s'.\n"
-msgstr "Ошибка: неизвестный тип '%s'.\n"
-
-#: bootstrap/bootstrap.c:907
-msgid "AllocateAttribute: malloc failed"
-msgstr "AllocateAttribute: malloc не удался"
-
-#: bootstrap/bootstrap.c:1058
-msgid ""
-"There are too many string constants and identifiers for the compiler to "
-"handle."
+msgid "drop auto-cascades to %s"
 msgstr ""
 
-#: bootscanner.l:128
+#: catalog/dependency.c:541
+#: catalog/dependency.c:691
 #, c-format
-msgid "syntax error at line %d: unexpected character %s"
-msgstr "ошибка синтаксиса в строке %d: неожидаемый символ %s"
-
-#: bootscanner.l:138
-#, c-format
-msgid "syntax error at line %d: unexpected token %s"
-msgstr "ошибка синтаксиса в строке %d: неожидаемый токен %s"
-
-#: bootparse.y:59
-msgid "start transaction"
-msgstr "начало транзакции"
-
-#: bootparse.y:67
-msgid "commit transaction"
-msgstr "подтверждение транзакции"
-
-#: bootparse.y:158
-#, c-format
-msgid "creating%s%s relation %s..."
-msgstr ""
-
-#: bootparse.y:179
-msgid "create bootstrap: warning, open relation exists, closing first"
-msgstr ""
-
-#: bootparse.y:189
-msgid "bootstrap relation created"
+msgid "%s depends on %s"
 msgstr ""
 
-#: bootparse.y:202
-#, c-format
-msgid "relation created with oid %u"
-msgstr "создан объект с OID %u"
-
-#: bootparse.y:213
-#, c-format
-msgid "inserting row with oid %u..."
-msgstr "добавляется строка с OID %u..."
-
-#: bootparse.y:215
-msgid "inserting row..."
-msgstr "добавляется строка..."
-
-#: bootparse.y:221
-#, c-format
-msgid "incorrect number of columns in row (expected %d, got %d)"
-msgstr "неверое число колонок в строке (ожидалось %d, получено %d)"
-
-#: bootparse.y:225
-msgid "relation not open"
-msgstr "объект не открыт"
-
-#: bootparse.y:306
-msgid "too many columns"
-msgstr "слишком много колонок"
-
-#: catalog/aclchk.c:60
-#, c-format
-msgid "acl size = %d, # acls = %d"
-msgstr "размер acl = %d, число acl'ов = %d"
-
-#: catalog/aclchk.c:64
-#, c-format
-msgid "\tacl[%d]: %s"
-msgstr "\tacl[%d]: %s"
-
-#: catalog/aclchk.c:153
+#: catalog/dependency.c:548
+#: catalog/dependency.c:698
 #, c-format
-msgid "bogus GrantStmt.objtype %d"
+msgid "drop cascades to %s"
 msgstr ""
 
-#: catalog/aclchk.c:173
-#, c-format
-msgid "invalid privilege type %s for table object"
+#: catalog/aclchk.c:127
+msgid "grant options can only be granted to individual users"
 msgstr ""
 
-#: catalog/aclchk.c:202
+#: catalog/aclchk.c:194
 #, c-format
-msgid "relation %u not found"
+msgid "invalid privilege type %s for table"
 msgstr ""
 
-#: catalog/aclchk.c:209
+#: catalog/aclchk.c:235
 #, c-format
 msgid "\"%s\" is an index"
 msgstr "\"%s\" является индексом"
 
-#: catalog/aclchk.c:268
+#: catalog/aclchk.c:297
 #, c-format
-msgid "invalid privilege type %s for database object"
+msgid "invalid privilege type %s for database"
 msgstr ""
 
-#: catalog/aclchk.c:298
+#: catalog/aclchk.c:329
+#: commands/comment.c:440
+#: commands/dbcommands.c:481
+#: commands/dbcommands.c:602
+#: commands/dbcommands.c:691
+#: utils/adt/acl.c:1311
+#: utils/init/postinit.c:261
+#: utils/init/postinit.c:273
 #, c-format
-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
-msgid "permission denied"
-msgstr "доступ запрещён"
+msgid "database \"%s\" does not exist"
+msgstr "база данных \"%s\" не существует"
 
-#: catalog/aclchk.c:359
+#: catalog/aclchk.c:396
 #, c-format
-msgid "invalid privilege type %s for function object"
+msgid "invalid privilege type %s for function"
 msgstr ""
 
-#: catalog/aclchk.c:389 parser/parse_func.c:885 parser/parse_func.c:1332
-#, c-format
-msgid "function %u not found"
-msgstr "Функция %u не найдена"
-
-#: catalog/aclchk.c:452
+#: catalog/aclchk.c:493
 #, c-format
-msgid "invalid privilege type %s for language object"
+msgid "invalid privilege type %s for language"
 msgstr ""
 
-#: catalog/aclchk.c:481
+#: catalog/aclchk.c:521
+#: commands/functioncmds.c:440
+#: commands/proclang.c:200
+#: commands/proclang.c:255
+#: utils/adt/acl.c:1729
 #, c-format
-msgid "language \"%s\" not found"
-msgstr "язык \"%s\" не найден"
+msgid "language \"%s\" does not exist"
+msgstr "язык \"%s\" не существует"
 
 # TO REVIEW
-#: catalog/aclchk.c:485
+#: catalog/aclchk.c:527
 #, c-format
 msgid "language \"%s\" is not trusted"
 msgstr "язык \"%s\" недоверямый"
 
-#: catalog/aclchk.c:542
-#, c-format
-msgid "invalid privilege type %s for namespace object"
-msgstr ""
-
-#: catalog/aclchk.c:568
-#, c-format
-msgid "namespace \"%s\" not found"
-msgstr ""
-
-#: catalog/aclchk.c:644
-#, c-format
-msgid "privilege_to_string: unrecognized privilege %d"
-msgstr ""
-
-#: catalog/aclchk.c:666
-#, c-format
-msgid "non-existent group \"%s\""
-msgstr ""
-
-#: catalog/aclchk.c:736
-#, c-format
-msgid "in_group: group %u not found"
-msgstr ""
-
-#: catalog/aclchk.c:764
-msgid "aclcheck: null ACL, returning OK"
-msgstr ""
-
-#: catalog/aclchk.c:779
-msgid "aclcheck: zero-length ACL, returning OK"
-msgstr ""
-
-#: catalog/aclchk.c:788
-msgid "aclcheck: first entry in ACL is not 'world' entry"
-msgstr ""
-
-#: catalog/aclchk.c:792
+#: catalog/aclchk.c:593
 #, c-format
-msgid "aclcheck: using world=%d"
+msgid "invalid privilege type %s for schema"
 msgstr ""
 
-#: catalog/aclchk.c:808
+#: catalog/aclchk.c:621
+#: catalog/namespace.c:245
+#: catalog/namespace.c:1200
+#: catalog/namespace.c:1238
+#: catalog/namespace.c:1800
+#: commands/comment.c:490
+#: commands/schemacmds.c:181
+#: commands/schemacmds.c:247
+#: utils/adt/acl.c:1933
 #, c-format
-msgid "aclcheck: found user %u/%d"
-msgstr ""
+msgid "schema \"%s\" does not exist"
+msgstr "схема \"%s\" не существует"
 
-#: catalog/aclchk.c:825 catalog/aclchk.c:846
+#: catalog/aclchk.c:724
+#: commands/user.c:1454
+#: commands/user.c:1696
+#: commands/user.c:1731
+#: libpq/pqcomm.c:475
 #, c-format
-msgid "aclcheck: found group %u/%d"
-msgstr ""
+msgid "group \"%s\" does not exist"
+msgstr "группа \"%s\" не существует"
 
-#: catalog/aclchk.c:858
+#: catalog/aclchk.c:796
 #, c-format
-msgid "aclcheck: bogus ACL id type: %d"
-msgstr ""
+msgid "group with ID %u does not exist"
+msgstr "группа с ID %u не существует"
 
-#: catalog/aclchk.c:879 commands/user.c:1304
+#: catalog/aclchk.c:865
 #, c-format
-msgid "%s: permission denied"
-msgstr "%s: нет доступа"
+msgid "permission denied for relation %s"
+msgstr "доступ запрещён для связи %s"
 
-#: catalog/aclchk.c:882
+#: catalog/aclchk.c:867
 #, c-format
-msgid "%s: must be owner"
-msgstr ""
+msgid "permission denied for database %s"
+msgstr "доступ запрещён для базы %s"
 
-#: catalog/aclchk.c:885
+#: catalog/aclchk.c:869
 #, c-format
-msgid "%s: unexpected AclResult %d"
-msgstr ""
+msgid "permission denied for function %s"
+msgstr "доступ запрещён для фунции %s"
 
-#: catalog/aclchk.c:913
+#: catalog/aclchk.c:871
 #, c-format
-msgid "pg_class_aclcheck: invalid user id %u"
-msgstr ""
+msgid "permission denied for operator %s"
+msgstr "доступ запрещён для оператора %s"
 
-#: catalog/aclchk.c:928
+#: catalog/aclchk.c:873
 #, c-format
-msgid "pg_class_aclcheck: relation %u not found"
-msgstr ""
-
-#: catalog/aclchk.c:941
-msgid "pg_class_aclcheck: catalog update: permission denied"
-msgstr ""
+msgid "permission denied for type %s"
+msgstr "доступ запрещён для типа %s"
 
-#: catalog/aclchk.c:953
+#: catalog/aclchk.c:875
 #, c-format
-msgid "pg_class_aclcheck: %u is superuser"
-msgstr ""
+msgid "permission denied for language %s"
+msgstr "доступ запрещён для языка %s"
 
-#: catalog/aclchk.c:1021
+#: catalog/aclchk.c:877
 #, c-format
-msgid "pg_database_aclcheck: database %u not found"
-msgstr ""
+msgid "permission denied for schema %s"
+msgstr "доступ запрещён для схемы %s"
 
-#: catalog/aclchk.c:1076
+#: catalog/aclchk.c:879
 #, c-format
-msgid "pg_proc_aclcheck: function %u not found"
-msgstr ""
+msgid "permission denied for operator class %s"
+msgstr "доступ запрещён для класса операторов %s"
 
-#: catalog/aclchk.c:1129
+#: catalog/aclchk.c:881
 #, c-format
-msgid "pg_language_aclcheck: language %u not found"
-msgstr ""
+msgid "permission denied for conversion %s"
+msgstr "доступ запрещён для конверсии %s"
 
-#: catalog/aclchk.c:1186
+#: catalog/aclchk.c:887
 #, c-format
-msgid "pg_namespace_aclcheck: namespace %u not found"
-msgstr ""
+msgid "must be owner of relation %s"
+msgstr "нужно быть владельцем связи %s"
 
-#: catalog/aclchk.c:1234
+#: catalog/aclchk.c:889
 #, c-format
-msgid "pg_class_ownercheck: relation %u not found"
-msgstr ""
+msgid "must be owner of database %s"
+msgstr "нужно быть владельцем базы %s"
 
-#: catalog/aclchk.c:1260
+#: catalog/aclchk.c:891
 #, c-format
-msgid "pg_type_ownercheck: type %u not found"
-msgstr "pg_type_ownercheck: тип '%u не найден"
+msgid "must be owner of function %s"
+msgstr "нужно быть владельцем функции %s"
 
-#: catalog/aclchk.c:1286
+#: catalog/aclchk.c:893
 #, c-format
-msgid "pg_oper_ownercheck: operator %u not found"
-msgstr ""
+msgid "must be owner of operator %s"
+msgstr "нужно быть владельцем оператора %s"
 
-#: catalog/aclchk.c:1312
+#: catalog/aclchk.c:895
 #, c-format
-msgid "pg_proc_ownercheck: function %u not found"
-msgstr ""
+msgid "must be owner of type %s"
+msgstr "нужно быть владельцем типа %s"
 
-#: catalog/aclchk.c:1338
+#: catalog/aclchk.c:897
 #, c-format
-msgid "pg_namespace_ownercheck: namespace %u not found"
-msgstr ""
+msgid "must be owner of language %s"
+msgstr "нужно быть владельцем языка %s"
 
-#: catalog/aclchk.c:1365
+#: catalog/aclchk.c:899
 #, c-format
-msgid "pg_opclass_ownercheck: operator class %u not found"
-msgstr ""
+msgid "must be owner of schema %s"
+msgstr "нужно быть владельцем схемы %s"
 
-#: catalog/dependency.c:163
+#: catalog/aclchk.c:901
 #, c-format
-msgid ""
-"Cannot drop %s because other objects depend on it\n"
-"\tUse DROP ... CASCADE to drop the dependent objects too"
-msgstr ""
+msgid "must be owner of operator class %s"
+msgstr "нужно быть владельцем класса операторов %s"
 
-#: catalog/dependency.c:253 catalog/dependency.c:572
+#: catalog/aclchk.c:903
 #, c-format
-msgid "Cannot drop %s because it is required by the database system"
-msgstr ""
+msgid "must be owner of conversion %s"
+msgstr "нужно быть владельцем конверсии %s"
 
-#: catalog/dependency.c:257
+#: catalog/aclchk.c:961
 #, c-format
-msgid "findAutoDeletableObjects: unknown dependency type '%c' for %s"
-msgstr ""
+msgid "user with ID %u does not exist"
+msgstr "пользователь с ID %u  не существует"
 
-#: catalog/dependency.c:386
+#: catalog/aclchk.c:978
+#: catalog/aclchk.c:1294
 #, c-format
-msgid ""
-"Cannot drop %s because %s requires it\n"
-"\tYou may drop %s instead"
-msgstr ""
+msgid "relation with OID %u does not exist"
+msgstr "связь с OID %u не существует"
 
-#: catalog/dependency.c:412
+#: catalog/aclchk.c:1073
+#: catalog/aclchk.c:1473
 #, c-format
-msgid "recursiveDeletion: multiple INTERNAL dependencies for %s"
-msgstr ""
+msgid "database with OID %u does not exist"
+msgstr "база данных с OID %u не существует"
 
-#: catalog/dependency.c:424
+#: catalog/aclchk.c:1130
+#: catalog/aclchk.c:1378
+#: tcop/fastpath.c:231
 #, c-format
-msgid "recursiveDeletion: incorrect use of PIN dependency with %s"
-msgstr ""
+msgid "function with OID %u does not exist"
+msgstr "функция с OID %u не существует"
 
-#: catalog/dependency.c:428 catalog/dependency.c:576
+#: catalog/aclchk.c:1185
 #, c-format
-msgid "recursiveDeletion: unknown dependency type '%c' for %s"
-msgstr ""
+msgid "language with OID %u does not exist"
+msgstr "язык с OID %u не существует"
 
-#: catalog/dependency.c:454 catalog/dependency.c:532 catalog/dependency.c:558
+#: catalog/aclchk.c:1244
+#: catalog/aclchk.c:1406
 #, c-format
-msgid "Drop auto-cascades to %s"
-msgstr ""
+msgid "schema with OID %u does not exist"
+msgstr "схема с OID %u не существует"
 
-#: catalog/dependency.c:458 catalog/dependency.c:536
+#: catalog/aclchk.c:1322
 #, c-format
-msgid "%s depends on %s"
-msgstr ""
+msgid "type with OID %u does not exist"
+msgstr "тип с OID %u не существует"
 
-#: catalog/dependency.c:464 catalog/dependency.c:542
+#: catalog/aclchk.c:1350
 #, c-format
-msgid "Drop cascades to %s"
-msgstr ""
+msgid "operator with OID %u does not exist"
+msgstr "оператро с OID %u не существует"
 
-#: catalog/dependency.c:693
+#: catalog/aclchk.c:1434
 #, c-format
-msgid "doDeletion: Unsupported object class %u"
-msgstr ""
+msgid "operator class with OID %u does not exist"
+msgstr "класс операторов с OID %u не существует"
 
-#: catalog/dependency.c:776
-#, c-format
-msgid "find_expr_references_walker: bogus varlevelsup %d"
+#: catalog/pg_aggregate.c:80
+msgid "cannot determine transition datatype"
 msgstr ""
 
-#: catalog/dependency.c:780
-#, c-format
-msgid "find_expr_references_walker: bogus varno %d"
+#: catalog/pg_aggregate.c:81
+msgid "An aggregate using ANYARRAY or ANYELEMENT as trans type must have one of them as its base type."
 msgstr ""
 
-#: catalog/dependency.c:800
+#: catalog/pg_aggregate.c:110
 #, c-format
-msgid "find_expr_references_walker: bogus varattno %d"
+msgid "return type of transition function %s is not %s"
 msgstr ""
 
-#: catalog/dependency.c:844
-msgid "find_expr_references_walker: already-planned subqueries not supported"
+#: catalog/pg_aggregate.c:132
+msgid "must not omit initval when transfn is strict and transtype is not compatible with input type"
 msgstr ""
 
-#: catalog/dependency.c:1180
-#, c-format
-msgid "getObjectClass: Unknown object class %u"
+#: catalog/pg_aggregate.c:165
+#: catalog/pg_proc.c:112
+#: catalog/pg_proc.c:535
+msgid "cannot determine result datatype"
 msgstr ""
 
-#: catalog/dependency.c:1237
-#, c-format
-msgid "getObjectDescription: Cast %u does not exist"
+#: catalog/pg_aggregate.c:166
+msgid "An aggregate returning ANYARRAY or ANYELEMENT must have one of them as its base type."
 msgstr ""
 
-#: catalog/dependency.c:1271
+#: catalog/pg_aggregate.c:280
+#: commands/typecmds.c:896
+#: commands/typecmds.c:966
+#: commands/typecmds.c:998
+#: commands/typecmds.c:1030
+#: parser/parse_func.c:319
+#: parser/parse_func.c:1491
 #, c-format
-msgid "getObjectDescription: Constraint %u does not exist"
-msgstr ""
+msgid "function %s does not exist"
+msgstr "функция %s не существует"
 
-#: catalog/dependency.c:1301
+#: catalog/pg_aggregate.c:285
 #, c-format
-msgid "getObjectDescription: Conversion %u does not exist"
+msgid "function %s returns a set"
 msgstr ""
 
-#: catalog/dependency.c:1330
+#: catalog/pg_aggregate.c:316
+#: catalog/pg_aggregate.c:325
 #, c-format
-msgid "getObjectDescription: Default %u does not exist"
+msgid "function %s requires run-time type coercion"
 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
+#: catalog/heap.c:227
 #, c-format
-msgid "getObjectDescription: Trigger %u does not exist"
-msgstr "getObjectDescription: Триггер %u не существует"
+msgid "permission denied to create \"%s.%s\""
+msgstr "доступ запрещён по созданию \"%s.%s\""
 
-#: 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/heap.c:229
+msgid "System catalog modifications are currently disallowed."
 msgstr ""
 
-#: catalog/heap.c:156 catalog/heap.c:159
+#: catalog/heap.c:356
+#: commands/tablecmds.c:1843
 #, c-format
-msgid "SystemAttributeDefinition: invalid attribute number %d"
-msgstr "SystemAttributeDefinition: неверный номер атрибута: %d"
-
-#: catalog/heap.c:226
-#, c-format
-msgid ""
-"cannot create %s.%s: system catalog modifications are currently disallowed"
+msgid "tables can have at most %d columns"
 msgstr ""
 
-#: catalog/heap.c:353
-#, c-format
-msgid "Number of columns is out of range (0 to %d)"
-msgstr "Число колонок вне диапазона (от 0 до %d)"
-
-#: catalog/heap.c:368
+#: catalog/heap.c:373
 #, c-format
-msgid "name of column \"%s\" conflicts with an existing system column"
-msgstr "имя колонки \"%s\" конфликтует с существующей системной колонкой"
+msgid "column name \"%s\" conflicts with a system column name"
+msgstr "имя колонки \"%s\" конфликтует с системной колонкой"
 
-#: catalog/heap.c:382
+#: catalog/heap.c:389
 #, c-format
 msgid "column name \"%s\" is duplicated"
 msgstr "повторное имя колонки: \"%s\""
 
-#: catalog/heap.c:420
-#, c-format
-msgid ""
-"Attribute \"%s\" has an unknown type\n"
-"\tProceeding with relation creation anyway"
-msgstr ""
-
-#: catalog/heap.c:424
-#, c-format
-msgid "Attribute \"%s\" has pseudo-type %s"
-msgstr "Атрибут \"%s\" имеет псевдо-тип %s"
-
-#: catalog/heap.c:431
+#: catalog/heap.c:429
 #, c-format
-msgid "Attribute \"%s\" has composite type %s"
-msgstr "Атрибут \"%s\" имеет сложный тип %s"
+msgid "attribute \"%s\" has type UNKNOWN"
+msgstr "атрибут \"%s\" имеет тип UNKNOWN"
 
-#: catalog/heap.c:714
-#, c-format
-msgid "Relation '%s' already exists"
-msgstr "Объект '%s' уже существует"
-
-#: catalog/heap.c:871
-#, c-format
-msgid "DeleteRelationTuple: cache lookup failed for relation %u"
-msgstr "DeleteRelationTuple: поиск в кэше связи %u не удался"
-
-#: catalog/heap.c:950
-#, c-format
-msgid "RemoveAttributeById: Failed to find attribute %d in relation %u"
-msgstr ""
-
-#: catalog/heap.c:1029
-#, c-format
-msgid "RemoveAttrDefault: no default found for rel %u attnum %d"
+#: catalog/heap.c:430
+msgid "Proceeding with relation creation anyway."
 msgstr ""
 
-#: catalog/heap.c:1065
+#: catalog/heap.c:437
 #, c-format
-msgid "RemoveAttrDefaultById: cache lookup failed for attrdef %u"
-msgstr "RemoveAttrDefaultById: поиск в кэше attrdef %u не удался"
+msgid "attribute \"%s\" has pseudo-type %s"
+msgstr "арибут \"%s\" имеет псевдо-тип %s"
 
-#: catalog/heap.c:1088
+#: catalog/heap.c:447
 #, c-format
-msgid "RemoveAttrDefaultById: cache lookup failed for rel %u attr %d"
-msgstr "RemoveAttrDefaultById: поиск в кэше для связи %u и attr %d не удался"
+msgid "attribute \"%s\" has composite type %s"
+msgstr "атрибут \"%s\" имеет сложный тип %s"
 
-#: catalog/heap.c:1143
+#: catalog/heap.c:734
+#: catalog/index.c:543
+#: commands/tablecmds.c:1378
 #, c-format
-msgid "heap_drop_with_catalog: FlushRelationBuffers returned %d"
-msgstr "heap_drop_with_catalog: FlushRelationBuffers возвратила %d"
+msgid "relation \"%s\" already exists"
+msgstr "объект \"%s\" уже существует"
 
-#: catalog/heap.c:1264 parser/parse_relation.c:1503 utils/adt/ruleutils.c:3278
+#: catalog/heap.c:1556
+#: commands/tablecmds.c:2892
+#: commands/tablecmds.c:2934
 #, c-format
-msgid "cache lookup of attribute %d in relation %u failed"
-msgstr ""
+msgid "constraint \"%s\" for relation \"%s\" already exists"
+msgstr "констрейнт \"%s\" для связи \"%s\" уже существует"
 
-#: catalog/heap.c:1522 commands/tablecmds.c:2634 commands/tablecmds.c:2672
+#: catalog/heap.c:1572
 #, c-format
-msgid "constraint \"%s\" already exists for relation \"%s\""
-msgstr ""
-
-#: catalog/heap.c:1536 commands/tablecmds.c:206
-#, c-format
-msgid "Duplicate CHECK constraint name: '%s'"
-msgstr ""
+msgid "CHECK constraint \"%s\" already exists"
+msgstr "CHECK-ограничение \"%s\" уже существует"
 
-#: catalog/heap.c:1596
+#: catalog/heap.c:1634
 #, c-format
-msgid "Only relation \"%s\" can be referenced in CHECK constraint expression"
+msgid "only relation \"%s\" can be referenced in CHECK constraint"
 msgstr ""
 
-#: catalog/heap.c:1603 commands/tablecmds.c:2754 commands/typecmds.c:1588
-msgid "cannot use subselect in CHECK constraint expression"
+#: catalog/heap.c:1643
+#: commands/tablecmds.c:3021
+#: commands/typecmds.c:1828
+msgid "cannot use sub-select in CHECK constraint"
 msgstr ""
 
-#: catalog/heap.c:1605 commands/tablecmds.c:2756 commands/typecmds.c:1590
-msgid "cannot use aggregate function in CHECK constraint expression"
+#: catalog/heap.c:1647
+#: commands/tablecmds.c:3025
+#: commands/typecmds.c:1832
+msgid "cannot use aggregate in CHECK constraint"
 msgstr ""
 
-#: catalog/heap.c:1715
+#: catalog/heap.c:1754
 msgid "cannot use column references in DEFAULT clause"
 msgstr ""
 
-#: catalog/heap.c:1721
+#: catalog/heap.c:1762
 msgid "DEFAULT clause must not return a set"
 msgstr ""
 
-#: catalog/heap.c:1727
-msgid "cannot use subselects in DEFAULT clause"
-msgstr ""
-
-#: catalog/heap.c:1729
-msgid "cannot use aggregate functions in DEFAULT clause"
-msgstr ""
-
-#: catalog/heap.c:1750 rewrite/rewriteHandler.c:487
-#, c-format
-msgid ""
-"Column \"%s\" is of type %s but default expression is of type %s\n"
-"\tYou will need to rewrite or cast the expression"
-msgstr ""
-
-#: catalog/index.c:124
-#, c-format
-msgid "Function %u does not exist"
-msgstr "Функция %u не существует"
-
-#: catalog/index.c:143 catalog/index.c:280
-#, c-format
-msgid "Opclass %u does not exist"
-msgstr "Opclass %u не существует"
-
-#: catalog/index.c:157 catalog/index.c:293
-#, c-format
-msgid "Type %u does not exist"
-msgstr "Тип %u не существует"
-
-#: catalog/index.c:238
-#, c-format
-msgid "cannot create index: column %d does not exist"
-msgstr "нельзя создать индекс: колонка %d не существует"
-
-#: catalog/index.c:543
-msgid "must index at least one column"
-msgstr "покрайней мере одна колонка должна быть индексирована"
-
-#: catalog/index.c:548
-msgid "User-defined indexes on system catalogs are not supported"
-msgstr "Пользовательские индексы на системные каталоги не поддерживаются"
-
-#: catalog/index.c:558
-msgid "Shared indexes cannot be created after initdb"
-msgstr ""
-
-#: catalog/index.c:561
-#, c-format
-msgid "relation named \"%s\" already exists"
-msgstr "объект с именем \"%s\" уже существует"
-
-#: catalog/index.c:674
-msgid "index_create: constraint must be PRIMARY or UNIQUE"
-msgstr ""
-
-#: catalog/index.c:824
-#, c-format
-msgid "index_drop: cache lookup failed for index %u"
-msgstr "index_drop: поиск в кэше индекса %u не удался"
-
-#: catalog/index.c:837
-#, c-format
-msgid "index_drop: FlushRelationBuffers returned %d"
-msgstr "index_drop: FlushRelationBuffers возвратила %d"
-
-#: catalog/index.c:1039
-#, c-format
-msgid "relation %s isn't an indexable relation"
-msgstr "объект %s не является индексируемым"
-
-#: catalog/index.c:1110
-#, c-format
-msgid "setRelhasindex: cannot find relation %u in pg_class"
+#: catalog/heap.c:1770
+msgid "cannot use sub-select in DEFAULT clause"
 msgstr ""
 
-#: catalog/index.c:1226
-#, c-format
-msgid "setNewRelfilenode: cannot find relation %u in pg_class"
+#: catalog/heap.c:1774
+msgid "cannot use aggregate in DEFAULT clause"
 msgstr ""
 
-#: catalog/index.c:1338
+#: catalog/heap.c:1792
+#: rewrite/rewriteHandler.c:560
 #, c-format
-msgid "UpdateStats: cannot find relation %u in pg_class"
+msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr ""
 
-#: catalog/index.c:1617
-msgid "IndexBuildHeapScan: concurrent insert in progress"
+#: catalog/heap.c:1797
+#: parser/analyze.c:2788
+#: parser/parse_node.c:232
+#: parser/parse_target.c:425
+#: rewrite/rewriteHandler.c:565
+msgid "You will need to rewrite or cast the expression."
 msgstr ""
 
-#: catalog/index.c:1632
-msgid "IndexBuildHeapScan: concurrent delete in progress"
-msgstr ""
+#: catalog/index.c:526
+msgid "user-defined indexes on system catalogs are not supported"
+msgstr "пользовательские индексы на системные каталоги не поддерживаются"
 
-#: catalog/index.c:1637 commands/vacuum.c:1207 commands/vacuumlazy.c:359
-#: commands/vacuumlazy.c:846
-msgid "Unexpected HeapTupleSatisfiesVacuum result"
+#: catalog/index.c:538
+msgid "shared indexes cannot be created after initdb"
 msgstr ""
 
-#: catalog/index.c:1725
+#: catalog/index.c:995
 #, c-format
-msgid "IndexGetRelation: can't find index id %u"
-msgstr "IndexGetRelation: не получается найти индекс с id %u"
-
-#: catalog/index.c:1774
-msgid "reindex_index: can't open index relation"
-msgstr ""
-
-#: catalog/index.c:1785
-msgid "reindex_index: can't open heap relation"
-msgstr ""
+msgid "relation \"%s\" isn't an indexable relation"
+msgstr "связт \"%s\" не является индексируемым объектом"
 
-#: catalog/index.c:1799 catalog/index.c:1922
+#: catalog/index.c:1755
+#: catalog/index.c:1882
 #, c-format
 msgid "the target relation %u is shared"
 msgstr ""
 
-#: catalog/index.c:1805
+#: catalog/index.c:1763
 #, 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
-msgid "Cross-database references are not implemented"
-msgstr ""
-
-#: catalog/namespace.c:186
-#, c-format
-msgid "Relation \"%s\".\"%s\" does not exist"
-msgstr "Объект \"%s\".\"%s\" не существует"
-
-#: catalog/namespace.c:222
-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
-#, c-format
-msgid "Namespace \"%s\" does not exist"
-msgstr ""
-
-#: catalog/namespace.c:246 catalog/namespace.c:1227
-msgid "No namespace has been selected to create in"
-msgstr ""
-
-#: catalog/namespace.c:298
-#, c-format
-msgid "Cache lookup failed for relation %u"
-msgstr "Поиск в кэше связи %u не удался"
-
-#: catalog/namespace.c:380
-#, c-format
-msgid "Cache lookup failed for type %u"
+#: catalog/namespace.c:167
+#: catalog/namespace.c:220
+#: catalog/namespace.c:1167
+#: parser/parse_expr.c:1117
+#: parser/parse_target.c:162
+msgid "cross-database references are not implemented"
 msgstr ""
 
-#: catalog/namespace.c:581
-#, c-format
-msgid "Cache lookup failed for procedure %u"
-msgstr ""
-
-#: catalog/namespace.c:793
-#, c-format
-msgid "Cache lookup failed for operator %u"
-msgstr "Поиск в кэше операторы %u не удался"
-
-#: catalog/namespace.c:1006
-#, c-format
-msgid "Cache lookup failed for opclass %u"
-msgstr "Поиск в кэше опкласса %u не удался"
-
-#: catalog/namespace.c:1087
+#: catalog/namespace.c:187
 #, c-format
-msgid "Cache lookup failed for converions %u"
-msgstr "Поиск в кэше конверсии %u не удался"
-
-#: catalog/namespace.c:1156 gram.y:2291 gram.y:6839
-#, c-format
-msgid "Improper qualified name (too many dotted names): %s"
-msgstr ""
-
-#: catalog/namespace.c:1260
-msgid "Improper relation name (too many dotted names)"
-msgstr ""
-
-#: catalog/namespace.c:1472
-msgid "recomputeNamespacePath: invalid list syntax"
-msgstr ""
+msgid "relation \"%s.%s\" does not exist"
+msgstr "связь \"%s.%s\" не существует"
 
-#: catalog/namespace.c:1601
+#: catalog/namespace.c:192
 #, c-format
-msgid "%s: not authorized to create temp tables"
-msgstr ""
+msgid "relation \"%s\" does not exist"
+msgstr "связь \"%s\" не существует"
 
-#: catalog/pg_aggregate.c:62
-msgid "no aggregate name supplied"
+#: catalog/namespace.c:229
+msgid "TEMP tables may not specify a schema name"
 msgstr ""
 
-#: catalog/pg_aggregate.c:65
-msgid "aggregate must have a transition function"
+#: catalog/namespace.c:257
+#: catalog/namespace.c:1249
+msgid "no schema has been selected to create in"
 msgstr ""
 
-#: catalog/pg_aggregate.c:87
+#: catalog/namespace.c:1172
+#: parser/parse_expr.c:1149
+#: parser/parse_target.c:170
 #, 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"
+msgid "improper qualified name (too many dotted names): %s"
 msgstr ""
 
-#: catalog/pg_constraint.c:437
+#: catalog/namespace.c:1284
 #, c-format
-msgid "RemoveConstraintById: constraint %u not found"
+msgid "improper relation name (too many dotted names): %s"
 msgstr ""
 
-#: catalog/pg_constraint.c:475
+#: catalog/namespace.c:1628
 #, c-format
-msgid "RemoveConstraintById: relation %s has relchecks = 0"
-msgstr ""
+msgid "permission denied to create temp tables in database \"%s\""
+msgstr "доступ запрещён по созданию временных таблиц в базе \"%s\""
 
-#: catalog/pg_constraint.c:502
+#: catalog/pg_largeobject.c:110
+#: storage/large_object/inv_api.c:128
+#: storage/large_object/inv_api.c:248
 #, c-format
-msgid "RemoveConstraintById: Constraint %u is not a known type"
-msgstr ""
-
-#: catalog/pg_conversion.c:57
-msgid "no conversion name supplied"
+msgid "large object %u does not exist"
 msgstr ""
 
-#: catalog/pg_conversion.c:64
+#: catalog/pg_conversion.c:66
 #, c-format
-msgid "conversion name \"%s\" already exists"
-msgstr "конверсия с именем \"%s\" уже существует"
+msgid "conversion \"%s\" already exists"
+msgstr "конверсия \"%s\" уже существует"
 
-#: catalog/pg_conversion.c:75
+#: catalog/pg_conversion.c:79
 #, c-format
 msgid "default conversion for %s to %s already exists"
-msgstr ""
-
-#: catalog/pg_conversion.c:141 catalog/pg_conversion.c:308
-#, c-format
-msgid "Conversion %u search from syscache failed"
-msgstr ""
-
-#: catalog/pg_conversion.c:192
-#, c-format
-msgid "conversion %u does not exist"
-msgstr "конверсия %u не существует"
+msgstr "конверсия по умолчанию для %s в %s уже существует"
 
-#: catalog/pg_conversion.c:302 commands/conversioncmds.c:97
+#: catalog/pg_conversion.c:308
+#: commands/conversioncmds.c:109
+#: commands/conversioncmds.c:133
 #, 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 ""
+msgid "conversion \"%s\" does not exist"
+msgstr "конверсия \"%s\" не существует"
 
-#: catalog/pg_namespace.c:49
+#: catalog/pg_namespace.c:51
+#: commands/schemacmds.c:256
 #, c-format
-msgid "namespace \"%s\" already exists"
-msgstr ""
+msgid "schema \"%s\" already exists"
+msgstr "схема \"%s\" уже существует"
 
-#: catalog/pg_operator.c:215 catalog/pg_operator.c:401
+#: catalog/pg_operator.c:217
+#: catalog/pg_operator.c:406
 #, c-format
 msgid "\"%s\" is not a valid operator name"
 msgstr "\"%s\" не является верным именем оператора"
 
-#: catalog/pg_operator.c:404
+#: catalog/pg_operator.c:412
 msgid "at least one of leftarg or rightarg must be specified"
 msgstr ""
 
-#: catalog/pg_operator.c:410
+#: catalog/pg_operator.c:420
 msgid "only binary operators can have commutators"
 msgstr ""
 
-#: catalog/pg_operator.c:412
+#: catalog/pg_operator.c:424
 msgid "only binary operators can have join selectivity"
 msgstr ""
 
-#: catalog/pg_operator.c:414
+#: catalog/pg_operator.c:428
 msgid "only binary operators can hash"
 msgstr ""
 
-#: catalog/pg_operator.c:416
+#: catalog/pg_operator.c:432
 msgid "only binary operators can mergejoin"
 msgstr ""
 
-#: catalog/pg_operator.c:426
+#: catalog/pg_operator.c:444
 #, c-format
-msgid "OperatorDef: operator \"%s\" already defined"
-msgstr "OperatorDef: оператор \"%s\" уже определён"
-
-#: catalog/pg_operator.c:623
-#, c-format
-msgid "OperatorDef: operator %u not found"
-msgstr ""
+msgid "operator %s already exists"
+msgstr "оператор %s уже существует"
 
-#: catalog/pg_operator.c:711
+#: catalog/pg_operator.c:726
 msgid "operator cannot be its own negator or sort operator"
 msgstr ""
 
-#: catalog/pg_operator.c:728
-#, c-format
-msgid "OperatorDef: can't create operator shell \"%s\""
-msgstr ""
-
-#: catalog/pg_proc.c:86 commands/functioncmds.c:140 parser/parse_func.c:1393
+#: catalog/pg_proc.c:88
+#: commands/functioncmds.c:150
+#: parser/parse_func.c:1514
 #, c-format
 msgid "functions cannot have more than %d arguments"
 msgstr "функции не могут иметь число аргументов более %d"
 
-#: catalog/pg_proc.c:127
-msgid "lookup for procedure by source needs fix (Jan)"
+#: catalog/pg_proc.c:113
+#: catalog/pg_proc.c:536
+msgid "A function returning ANYARRAY or ANYELEMENT must have at least one argument of either type."
 msgstr ""
 
-#: catalog/pg_proc.c:139
+#: catalog/pg_proc.c:168
 #, c-format
-msgid "method %s already an attribute of type %s"
+msgid "\"%s\" is already an attribute of type %s"
 msgstr ""
 
-#: catalog/pg_proc.c:189
+#: catalog/pg_proc.c:220
 #, c-format
-msgid "function %s already exists with same argument types"
-msgstr ""
+msgid "function \"%s\" already exists with same argument types"
+msgstr "функция  \"%s\" с таким набором аргументов уже существует"
 
-#: catalog/pg_proc.c:192
-#, c-format
-msgid "ProcedureCreate: you do not have permission to replace function %s"
-msgstr ""
+#: catalog/pg_proc.c:234
+msgid "cannot change return type of existing function"
+msgstr "нельзя поменять тип возвращаемого значения для существующей фунции"
 
-#: catalog/pg_proc.c:201
-msgid ""
-"ProcedureCreate: cannot change return type of existing function.\n"
-"\tUse DROP FUNCTION first."
+#: catalog/pg_proc.c:235
+msgid "Use DROP FUNCTION first."
 msgstr ""
 
-#: catalog/pg_proc.c:208
+#: catalog/pg_proc.c:243
 #, c-format
-msgid "function %s is an aggregate"
-msgstr "функция %s не является агрегатом"
+msgid "function \"%s\" is an aggregate"
+msgstr "функция \"%s\" является агрегатом"
 
-#: catalog/pg_proc.c:211
+#: catalog/pg_proc.c:248
 #, c-format
-msgid "function %s is not an aggregate"
-msgstr "функция %s не является агрегатом"
+msgid "function \"%s\" is not an aggregate"
+msgstr "функция \"%s\" не является агрегатом"
 
-#: catalog/pg_proc.c:323
+#: catalog/pg_proc.c:367
+#: catalog/pg_proc.c:388
+#: catalog/pg_proc.c:398
+#: catalog/pg_proc.c:422
+#: catalog/pg_proc.c:430
+#: catalog/pg_proc.c:482
+#: catalog/pg_proc.c:494
+#: catalog/pg_proc.c:514
 #, c-format
-msgid "function declared to return %s, but no SELECT provided"
+msgid "return type mismatch in function declared to return %s"
 msgstr ""
 
-#: catalog/pg_proc.c:341
-msgid "function declared to return void, but final statement is a SELECT"
+#: catalog/pg_proc.c:369
+#: catalog/pg_proc.c:400
+msgid "Function's final statement must be a SELECT."
 msgstr ""
 
-#: catalog/pg_proc.c:347
-#, c-format
-msgid "function declared to return %s, but final statement is not a SELECT"
+#: catalog/pg_proc.c:390
+msgid "Function's final statement must not be a SELECT."
 msgstr ""
 
-#: catalog/pg_proc.c:368
-#, c-format
-msgid "function declared to return %s returns multiple columns in final SELECT"
+#: catalog/pg_proc.c:424
+msgid "Final SELECT must return exactly one column."
 msgstr ""
 
-#: catalog/pg_proc.c:373
+#: catalog/pg_proc.c:432
 #, c-format
-msgid "return type mismatch in function: declared to return %s, returns %s"
+msgid "Actual return type is %s."
 msgstr ""
 
-#: 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)"
+#: catalog/pg_proc.c:484
+msgid "Final SELECT returns too many columns."
 msgstr ""
 
-#: catalog/pg_proc.c:430
+#: catalog/pg_proc.c:496
 #, c-format
-msgid "function declared to return %s returns %s instead of %s at column %d"
+msgid "Final SELECT 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
-#, c-format
-msgid "cache lookup of function %u failed"
-msgstr "поиск в кзше функции %u не удался"
+#: catalog/pg_proc.c:516
+msgid "Final SELECT returns too few columns."
+msgstr ""
 
-#: catalog/pg_proc.c:491 catalog/pg_proc.c:530 catalog/pg_proc.c:590
-msgid "null prosrc"
-msgstr "null prosrc"
+#: catalog/pg_proc.c:541
+#, c-format
+msgid "return type %s is not supported for SQL functions"
+msgstr ""
 
-#: catalog/pg_proc.c:495
+#: catalog/pg_proc.c:578
 #, c-format
 msgid "there is no built-in function named \"%s\""
 msgstr "встроенной функции \"%s\" не существует"
 
-#: catalog/pg_proc.c:535
-msgid "null probin"
-msgstr "null probin"
-
-#: catalog/pg_proc.c:578
+#: catalog/pg_proc.c:671
 #, c-format
 msgid "SQL functions cannot return type %s"
 msgstr "SQL-функции не могут возвращать тип %s"
 
-#: catalog/pg_proc.c:584
+#: catalog/pg_proc.c:687
 #, c-format
 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:195
+#: catalog/pg_type.c:201
 #, c-format
-msgid "TypeCreate: invalid type internal size %d"
+msgid "invalid type internal size %d"
 msgstr ""
 
-#: catalog/pg_type.c:180
-msgid "TypeCreate: fixed size types must have storage PLAIN"
+#: catalog/pg_type.c:208
+msgid "fixed-size types must have storage PLAIN"
 msgstr ""
 
-#: catalog/pg_type.c:257
+#: catalog/pg_type.c:289
+#: catalog/pg_type.c:511
 #, c-format
-msgid "type %s already exists"
-msgstr "тип %s уже существует"
+msgid "type \"%s\" already exists"
+msgstr "тип \"%s\" уже существует"
 
-#: catalog/pg_type.c:437
+#: catalog/pg_type.c:503
+#: commands/functioncmds.c:109
+#: commands/typecmds.c:407
+#: commands/typecmds.c:786
+#: commands/typecmds.c:1113
+#: commands/typecmds.c:1233
+#: commands/typecmds.c:1353
+#: commands/typecmds.c:1440
+#: commands/typecmds.c:2034
+#: parser/parse_func.c:1526
+#: parser/parse_type.c:201
+#: parser/parse_type.c:227
+#: tcop/utility.c:95
 #, c-format
-msgid "type %s does not exist"
-msgstr "тип %s не существует"
+msgid "type \"%s\" does not exist"
+msgstr "тип \"%s\" не существует"
 
-#: catalog/pg_type.c:443
+#: commands/aggregatecmds.c:97
 #, c-format
-msgid "type named %s already exists"
-msgstr "тип %s уже существует"
+msgid "aggregate attribute \"%s\" not recognized"
+msgstr "агрегатный атрибут \"%s\" не распознан"
 
-#: commands/analyze.c:199
-#, c-format
-msgid "Skipping \"%s\" --- only table or database owner can ANALYZE it"
+#: commands/aggregatecmds.c:107
+msgid "aggregate basetype must be specified"
 msgstr ""
 
-#: commands/analyze.c:213 commands/vacuum.c:784
-#, c-format
-msgid ""
-"Skipping \"%s\" --- can not process indexes, views or special system tables"
+#: commands/aggregatecmds.c:111
+msgid "aggregate stype must be specified"
 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"
+#: commands/aggregatecmds.c:115
+msgid "aggregate sfunc must be specified"
 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
+#: commands/aggregatecmds.c:138
 #, c-format
-msgid "DefineAggregate: attribute \"%s\" not recognized"
-msgstr ""
-
-#: commands/aggregatecmds.c:101
-msgid "Define: \"basetype\" unspecified"
-msgstr ""
-
-#: commands/aggregatecmds.c:103
-msgid "Define: \"stype\" unspecified"
-msgstr ""
-
-#: commands/aggregatecmds.c:105
-msgid "Define: \"sfunc\" unspecified"
+msgid "aggregate transition datatype cannot be %s"
 msgstr ""
 
-#: commands/aggregatecmds.c:123
+#: commands/aggregatecmds.c:259
 #, c-format
-msgid "Aggregate transition datatype cannot be %s"
+msgid "function %s(*) already exists in schema \"%s\""
 msgstr ""
 
-#: commands/aggregatecmds.c:174
+#: commands/aggregatecmds.c:265
+#: commands/functioncmds.c:680
 #, c-format
-msgid "RemoveAggregate: couldn't find pg_proc tuple for %s"
+msgid "function %s already exists in schema \"%s\""
 msgstr ""
 
-#: commands/async.c:153
-#, c-format
-msgid "Async_Notify: %s"
-msgstr "Async_Notify: %s"
-
-#: commands/async.c:201
-#, c-format
-msgid "Async_Listen: %s"
-msgstr "Async_Listen: %s"
-
-#: commands/async.c:224
+#: commands/analyze.c:200
 #, c-format
-msgid "Async_Listen: We are already listening on %s"
+msgid "skipping \"%s\" --- only table or database owner can ANALYZE it"
 msgstr ""
 
-#: commands/async.c:296
+#: commands/analyze.c:215
 #, c-format
-msgid "Async_Unlisten %s"
-msgstr "Async_Unlisten %s"
+msgid "skipping \"%s\" --- cannot ANALYZE indexes, views or special system tables"
+msgstr "пропускается \"%s\" --- индексы, виды или специальные системные таблицы не анализируются"
 
-#: commands/async.c:354
-msgid "Async_UnlistenAll"
-msgstr "Async_UnlistenAll"
-
-#: commands/async.c:456
-msgid "AtCommit_Notify"
-msgstr "AtCommit_Notify"
-
-#: commands/async.c:488
-msgid "AtCommit_Notify: notifying self"
-msgstr ""
-
-#: commands/async.c:495
+#: commands/analyze.c:245
 #, c-format
-msgid "AtCommit_Notify: notifying pid %d"
-msgstr ""
-
-#: commands/async.c:544
-msgid "AtCommit_Notify: done"
-msgstr "AtCommit_Notify: завершено"
-
-#: commands/async.c:621
-msgid "Async_NotifyHandler: perform async notify"
-msgstr ""
-
-#: commands/async.c:626
-msgid "Async_NotifyHandler: done"
-msgstr "Async_NotifyHandler: завершено"
+msgid "analyzing \"%s.%s\""
+msgstr "анализируется \"%s.%s\""
 
-#: commands/async.c:693
-msgid "EnableNotifyInterrupt: perform async notify"
+#: commands/cluster.c:150
+#, c-format
+msgid "there is no previously clustered index for table \"%s\""
 msgstr ""
 
-#: commands/async.c:698
-msgid "EnableNotifyInterrupt: done"
-msgstr "EnableNotifyInterrupt: завершено"
-
-#: commands/async.c:749
-msgid "ProcessIncomingNotify"
-msgstr "ProcessIncomingNotify"
-
-#: commands/async.c:785
+#: commands/cluster.c:164
+#: commands/tablecmds.c:3988
 #, c-format
-msgid "ProcessIncomingNotify: received %s from %d"
-msgstr "ProcessIncomingNotify: получено %s от %d"
-
-#: commands/async.c:820
-msgid "ProcessIncomingNotify: done"
-msgstr "ProcessIncomingNotify: завершено"
+msgid "index \"%s\" for table \"%s\" does not exist"
+msgstr "индекс \"%s\" для таблицы \"%s\" не существует"
 
-#: commands/async.c:847
+#: commands/cluster.c:321
 #, c-format
-msgid "NOTIFY for %s"
-msgstr "NOTIFY для %s"
+msgid "\"%s\" is not an index for table \"%s\""
+msgstr "\"%s\" не является индексом для таблицы \"%s\""
 
-#: commands/cluster.c:119
-#, c-format
-msgid "CLUSTER: You do not own relation %s"
+#: commands/cluster.c:334
+msgid "cannot cluster on partial index"
 msgstr ""
 
-#: commands/cluster.c:137 commands/cluster.c:541 commands/cluster.c:560
-#, c-format
-msgid "Cache lookup failed for index %u"
-msgstr "Поиск в кэше индекса %u не удался"
-
-#: commands/cluster.c:150
-#, c-format
-msgid "CLUSTER: No previously clustered index found on table \"%s\""
+#: commands/cluster.c:352
+msgid "cannot cluster when index access method does not handle nulls"
 msgstr ""
 
-#: commands/cluster.c:159
+#: commands/cluster.c:353
 #, c-format
-msgid "CLUSTER: cannot find index \"%s\" for table \"%s\""
+msgid "You may be able to work around this by marking column \"%s\" NOT NULL."
 msgstr ""
 
-#: commands/cluster.c:312
-#, c-format
-msgid "CLUSTER: \"%s\" is not an index for table \"%s\""
+#: commands/cluster.c:365
+msgid "cannot cluster on expressional index when index access method does not handle nulls"
 msgstr ""
 
-#: commands/cluster.c:324
+#: commands/cluster.c:379
 #, c-format
-msgid "CLUSTER: cannot cluster system relation \"%s\""
-msgstr ""
+msgid "\"%s\" is a system catalog"
+msgstr "\"%s\" является системным каталогом"
 
-#: commands/cluster.c:332
-msgid "CLUSTER cannot be used on temp tables of other processes"
+#: commands/cluster.c:389
+msgid "cannot cluster temp tables of other processes"
 msgstr ""
 
-#: commands/cluster.c:627
+#: commands/async.c:225
 #, c-format
-msgid "cache lookup failed for index %u"
-msgstr "поиск в кэше индекса %u не удался"
-
-#: commands/cluster.c:679 commands/cluster.c:686
-#, c-format
-msgid "CLUSTER: Cannot find tuple for relation %u"
+msgid "already listening on \"%s\""
 msgstr ""
 
-#: commands/cluster.c:698 commands/cluster.c:704
+#: commands/conversioncmds.c:66
 #, c-format
-msgid "CLUSTER: FlushRelationBuffers returned %d"
-msgstr "CLUSTER: FlushRelationBuffers возвратила %d"
-
-#: commands/cluster.c:766
-msgid "CLUSTER: expected both swapped tables to have TOAST tables"
+msgid "source encoding \"%s\" does not exist"
 msgstr ""
 
-#: commands/cluster.c:772 commands/cluster.c:777
+#: commands/conversioncmds.c:73
 #, c-format
-msgid "CLUSTER: expected one dependency record for TOAST table, found %ld"
+msgid "destination encoding \"%s\" does not exist"
 msgstr ""
 
-#: commands/comment.c:111
+#: commands/conversioncmds.c:151
 #, c-format
-msgid "An attempt was made to comment on a unknown type: %d"
+msgid "conversion \"%s\" already exists in schema \"%s\""
 msgstr ""
 
-#: commands/comment.c:306
+#: commands/comment.c:309
+#: commands/indexcmds.c:583
+#: commands/indexcmds.c:617
 #, c-format
 msgid "relation \"%s\" is not an index"
 msgstr "объект \"%s\" не является индексом"
 
-#: commands/comment.c:311
+#: commands/comment.c:316
 #, c-format
 msgid "relation \"%s\" is not a sequence"
-msgstr ""
+msgstr "связь \"%s\" не является последовательностью"
 
-#: commands/comment.c:316
+#: commands/comment.c:323
+#: commands/indexcmds.c:109
+#: commands/indexcmds.c:669
 #, c-format
 msgid "relation \"%s\" is not a table"
 msgstr "объект \"%s\" не является таблицей"
 
-#: commands/comment.c:321
+#: commands/comment.c:330
 #, c-format
 msgid "relation \"%s\" is not a view"
 msgstr "объект \"%s\" не является видом"
 
-#: commands/comment.c:357
-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:386
+#: commands/tablecmds.c:2020
+#: commands/tablecmds.c:2164
+#: commands/tablecmds.c:2292
+#: commands/tablecmds.c:2456
+#: commands/tablecmds.c:2669
+#: parser/parse_func.c:1270
+#: parser/parse_relation.c:1583
+#: parser/parse_relation.c:1641
+#: parser/parse_relation.c:1820
+#: parser/parse_type.c:94
 #, c-format
-msgid "Relation \"%s\" has no column \"%s\""
-msgstr "Связь \"%s\" не имеет колонки \"%s\""
+msgid "attribute \"%s\" of relation \"%s\" does not exist"
+msgstr "атрибут \"%s\" для связи \"%s\" не существует"
 
-#: commands/comment.c:403
-msgid "CommentDatabase: database name may not be qualified"
-msgstr ""
-
-#: commands/comment.c:409 commands/dbcommands.c:531 utils/adt/acl.c:1038
-#, 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:417
+msgid "database name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:419
-msgid "Database comments may only be applied to the current database"
+#: commands/comment.c:449
+msgid "database comments may only be applied to the current database"
 msgstr ""
 
-#: commands/comment.c:442
-msgid "CommentSchema: schema name may not be qualified"
+#: commands/comment.c:481
+#: commands/schemacmds.c:172
+msgid "schema name may not be qualified"
 msgstr ""
 
-#: commands/comment.c:449
-#, c-format
-msgid "CommentSchema: Schema \"%s\" could not be found"
-msgstr "CommentSchema: Схема \"%s\" не найдена"
-
-#: commands/comment.c:521 commands/comment.c:555
+#: commands/comment.c:564
 #, c-format
 msgid "rule \"%s\" does not exist"
 msgstr "правило \"%s\" не существует"
 
-#: commands/comment.c:527
+#: commands/comment.c:572
 #, c-format
-msgid ""
-"There are multiple rules \"%s\"\n"
-"\tPlease specify a relation name as well as a rule name"
+msgid "there are multiple rules \"%s\""
 msgstr ""
 
-#: commands/comment.c:732
-msgid "CommentTrigger: must specify relation and trigger"
+#: commands/comment.c:573
+msgid "Specify a relation name as well as a rule name."
 msgstr ""
 
-#: commands/comment.c:765
+#: commands/comment.c:815
+#: commands/trigger.c:484
+#: commands/trigger.c:697
 #, c-format
 msgid "trigger \"%s\" for relation \"%s\" does not exist"
 msgstr "триггер \"%s\" для связи \"%s\" не существует"
 
-#: commands/comment.c:807
-msgid "CommentConstraint: must specify relation and constraint"
-msgstr ""
-
-#: commands/comment.c:841
+#: commands/comment.c:894
 #, c-format
-msgid "Relation \"%s\" has multiple constraints named \"%s\""
+msgid "relation \"%s\" has multiple constraints named \"%s\""
 msgstr ""
 
-#: commands/comment.c:851
+#: commands/comment.c:906
 #, 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/copy.c:684
+#: commands/copy.c:692
+#: commands/copy.c:700
+#: commands/copy.c:708
+#: commands/dbcommands.c:103
+#: commands/dbcommands.c:111
+#: commands/dbcommands.c:119
+#: commands/dbcommands.c:127
+#: commands/functioncmds.c:220
+#: commands/functioncmds.c:228
+#: commands/functioncmds.c:236
+#: commands/functioncmds.c:244
+#: commands/functioncmds.c:252
+#: commands/sequence.c:895
+#: commands/sequence.c:908
+#: commands/sequence.c:916
+#: commands/sequence.c:924
+#: commands/sequence.c:932
+#: commands/sequence.c:940
+#: commands/user.c:525
+#: commands/user.c:537
+#: commands/user.c:545
+#: commands/user.c:553
+#: commands/user.c:561
+#: commands/user.c:569
+#: commands/user.c:775
+#: commands/user.c:787
+#: commands/user.c:795
+#: commands/user.c:803
+#: commands/user.c:1275
+#: commands/user.c:1283
+msgid "conflicting or redundant options"
+msgstr ""
 
-#: commands/conversioncmds.c:62
+#: commands/dbcommands.c:153
 #, c-format
-msgid "Invalid to encoding name: %s"
-msgstr "Неверное имя кодировки назначения (to): %s"
+msgid "%d is not a valid encoding code"
+msgstr "%d не является верным кодом кодировки"
 
-#: commands/copy.c:128
+#: commands/dbcommands.c:162
 #, c-format
-msgid "CopySendData: %m"
-msgstr "CopySendData: %m"
-
-#: commands/copy.c:303
-msgid "COPY: BINARY option appears more than once"
-msgstr ""
+msgid "%s is not a valid encoding name"
+msgstr "%s не является верным именем кодировки"
 
-#: commands/copy.c:310
-msgid "COPY: OIDS option appears more than once"
-msgstr ""
+#: commands/dbcommands.c:183
+msgid "permission denied to create database"
+msgstr "доступ запрещён по созданию базы"
 
-#: commands/copy.c:317
-msgid "COPY: DELIMITER string may only be defined once in query"
+#: commands/dbcommands.c:192
+msgid "must be superuser to create database for another user"
 msgstr ""
 
-#: commands/copy.c:324
-msgid "COPY: NULL representation may only be defined once in query"
+#: commands/dbcommands.c:203
+msgid "cannot use an alternate location on this platform"
 msgstr ""
 
-#: commands/copy.c:329
+#: commands/dbcommands.c:217
+#: commands/dbcommands.c:384
+#: commands/dbcommands.c:632
 #, 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 ""
+msgid "database \"%s\" already exists"
+msgstr "база \"%s\" уже существует"
 
-#: commands/copy.c:378
+#: commands/dbcommands.c:231
 #, c-format
-msgid "COPY: table \"%s\" does not have OIDs"
-msgstr "COPY: таблица \"%s\" не содержит OIDs"
+msgid "template \"%s\" does not exist"
+msgstr "шаблон \"%s\" не существует"
 
-#: commands/copy.c:399 commands/copy.c:444
+#: commands/dbcommands.c:242
 #, c-format
-msgid "You cannot copy view %s"
-msgstr "Вы не можете копировать вид %s"
+msgid "permission denied to copy database \"%s\""
+msgstr "доступ запрещён по копированию базы \"%s\""
 
-#: commands/copy.c:402
+#: commands/dbcommands.c:263
 #, c-format
-msgid "You cannot change sequence relation %s"
+msgid "source database \"%s\" is being accessed by other users"
 msgstr ""
 
-#: commands/copy.c:405 commands/copy.c:450
-#, c-format
-msgid "You cannot copy object %s"
-msgstr "Вы не можете копировать объект %s"
-
-#: commands/copy.c:425
+#: commands/dbcommands.c:274
 #, c-format
-msgid ""
-"COPY command, running in backend with effective uid %d, could not open file "
-"'%s' for reading.  Errno = %s (%d)."
+msgid "invalid backend encoding %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"
+#: commands/dbcommands.c:304
+#: commands/dbcommands.c:308
+#: commands/dbcommands.c:312
+msgid "database path may not contain single quotes"
 msgstr ""
 
-#: commands/copy.c:474
-msgid "Relative path not allowed for server side COPY command"
-msgstr ""
+#: commands/dbcommands.c:337
+#, c-format
+msgid "could not create database directory \"%s\": %m"
+msgstr "не получилось создать директорию баз данных \"%s\": %m"
 
-#: commands/copy.c:482
+#: commands/dbcommands.c:342
 #, c-format
-msgid ""
-"COPY command, running in backend with effective uid %d, could not open file "
-"'%s' for writing.  Errno = %s (%d)."
+msgid "could not remove temp directory \"%s\": %m"
 msgstr ""
-"Команда COPY, выполняющаяся в backendе с эффективным UID %d, не смогла "
-"открыть файл '%s' для записи.  Errno = %s (%d)."
 
-#: commands/copy.c:561
+#: commands/dbcommands.c:353
 #, c-format
-msgid "COPY: couldn't lookup info for type %u"
+msgid "could not link \"%s\" to \"%s\": %m"
 msgstr ""
 
-#: commands/copy.c:565 commands/copy.c:835
-msgid "COPY BINARY: cstring not supported"
+#: commands/dbcommands.c:462
+msgid "cannot drop the currently open database"
 msgstr ""
 
-#: commands/copy.c:906
-msgid "COPY BINARY: file signature not recognized"
+#: commands/dbcommands.c:495
+msgid "cannot drop a template database"
 msgstr ""
 
-#: commands/copy.c:910
-msgid "COPY BINARY: incompatible integer layout"
+#: commands/dbcommands.c:506
+#: commands/dbcommands.c:622
+#, c-format
+msgid "database \"%s\" is being accessed by other users"
 msgstr ""
 
-#: commands/copy.c:914
-msgid "COPY BINARY: bogus file header (missing flags)"
+#: commands/dbcommands.c:613
+msgid "current database may not be renamed"
 msgstr ""
 
-#: commands/copy.c:918
-msgid "COPY BINARY: unrecognized critical flags in header"
-msgstr ""
+#: commands/dbcommands.c:644
+msgid "permission denied to rename database"
+msgstr "доступ запрещён по переименованию базы"
 
-#: commands/copy.c:922
-msgid "COPY BINARY: bogus file header (missing length)"
+#: commands/dbcommands.c:863
+msgid "relative paths are not allowed as database locations"
 msgstr ""
 
-#: commands/copy.c:928
-msgid "COPY BINARY: bogus file header (wrong length)"
+#: commands/dbcommands.c:867
+msgid "absolute paths are not allowed as database locations"
 msgstr ""
 
-#: commands/copy.c:979
-msgid "NULL Oid"
-msgstr "NULL Oid"
-
-#: commands/copy.c:985
-msgid "Invalid Oid"
-msgstr "Неверный Oid"
-
-#: commands/copy.c:1002
+#: commands/dbcommands.c:879
 #, c-format
-msgid "Missing data for column \"%s\""
-msgstr "Отсутствуют данные для колонки \"%s\""
-
-#: commands/copy.c:1034
-msgid "Extra data after last expected column"
+msgid "postmaster environment variable \"%s\" not found"
 msgstr ""
 
-#: commands/copy.c:1058
+#: commands/dbcommands.c:884
 #, c-format
-msgid "COPY BINARY: tuple field count is %d, expected %d"
+msgid "postmaster environment variable \"%s\" must be absolute path"
 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"
+#: commands/dbcommands.c:893
+msgid "alternate path is too long"
 msgstr ""
 
-#: commands/copy.c:1067
+#: commands/dbcommands.c:924
 #, c-format
-msgid "COPY BINARY: sizeof(Oid) is %d, expected %d"
-msgstr ""
-
-#: commands/copy.c:1073
-msgid "COPY BINARY: Invalid Oid"
-msgstr ""
+msgid "could not remove \"%s\": %m"
+msgstr "не получилось удалить \"%s\": %m"
 
-#: commands/copy.c:1090
+#: commands/dbcommands.c:939
 #, c-format
-msgid "COPY BINARY: sizeof(field %d) is %d, expected %d"
+msgid "could not remove database directory \"%s\": %m"
 msgstr ""
 
-#: commands/copy.c:1102
-msgid "COPY BINARY: bogus varlena length"
+#: commands/copy.c:177
+#: commands/copy.c:189
+#: commands/copy.c:222
+#: commands/copy.c:232
+msgid "COPY BINARY is not supported to stdout or from stdin"
 msgstr ""
 
-#: commands/copy.c:1284
+#: commands/copy.c:285
 #, c-format
-msgid "GetInputFunction: Cache lookup of type %u failed"
+msgid "failed to write COPY file: %m"
 msgstr ""
 
-#: commands/copy.c:1300
-#, c-format
-msgid "GetTypeElement: Cache lookup of type %u failed"
+#: commands/copy.c:293
+msgid "connection lost during COPY to stdout"
 msgstr ""
 
-#: commands/copy.c:1442
-msgid "CopyReadAttribute: end of record marker corrupted"
+#: commands/copy.c:376
+#: commands/copy.c:394
+#: commands/copy.c:398
+#: commands/copy.c:458
+#: commands/copy.c:507
+#: tcop/fastpath.c:292
+#: tcop/postgres.c:281
+#: tcop/postgres.c:304
+msgid "unexpected EOF on client connection"
 msgstr ""
 
-#: commands/copy.c:1594
+#: commands/copy.c:410
 #, 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
-msgid "CREATE DATABASE: conflicting options"
+msgid "COPY from stdin failed: %s"
 msgstr ""
 
-#: commands/dbcommands.c:121
+#: commands/copy.c:425
 #, c-format
-msgid "CREATE DATABASE: option \"%s\" not recognized"
+msgid "unexpected message type 0x%02X during COPY from stdin"
 msgstr ""
 
-#: commands/dbcommands.c:141
-#, c-format
-msgid "%d is not a valid encoding code"
-msgstr "%d не является верным кодом кодировки"
+#: commands/copy.c:719
+msgid "cannot specify DELIMITER in BINARY mode"
+msgstr ""
 
-#: commands/dbcommands.c:147
-#, c-format
-msgid "%s is not a valid encoding name"
-msgstr "%s не является верным именем кодировки"
+#: commands/copy.c:724
+msgid "cannot specify NULL in BINARY mode"
+msgstr ""
 
-#: commands/dbcommands.c:151
-msgid "CREATE DATABASE: bogus encoding parameter"
+#: commands/copy.c:742
+#: executor/execMain.c:462
+#: tcop/utility.c:260
+msgid "transaction is read-only"
+msgstr "транзакция установлена \"только для чтения\""
+
+#: commands/copy.c:753
+msgid "must be superuser to COPY to or from a file"
 msgstr ""
 
-#: commands/dbcommands.c:164 commands/dbcommands.c:171
-msgid "CREATE DATABASE: permission denied"
+#: commands/copy.c:754
+msgid "Anyone can COPY to stdout or from stdin. psql's \\copy command also works for anyone."
 msgstr ""
 
-#: commands/dbcommands.c:186 commands/dbcommands.c:326
-#, c-format
-msgid "CREATE DATABASE: database \"%s\" already exists"
+#: commands/copy.c:763
+msgid "COPY delimiter must be a single character"
 msgstr ""
 
-#: commands/dbcommands.c:198
+#: commands/copy.c:771
 #, c-format
-msgid "CREATE DATABASE: template \"%s\" does not exist"
-msgstr ""
+msgid "table \"%s\" does not have OIDs"
+msgstr "таблица \"%s\" не содержит OIDs"
 
-#: commands/dbcommands.c:208
+#: commands/copy.c:799
 #, c-format
-msgid "CREATE DATABASE: permission to copy \"%s\" denied"
-msgstr ""
+msgid "cannot copy to view \"%s\""
+msgstr "нельзя копировать в вид \"%s\""
 
-#: commands/dbcommands.c:227
+#: commands/copy.c:804
 #, c-format
-msgid ""
-"CREATE DATABASE: source database \"%s\" is being accessed by other users"
-msgstr ""
+msgid "cannot copy to sequence \"%s\""
+msgstr "нельзя копировать в последовательность \"%s\""
 
-#: commands/dbcommands.c:235
-msgid "CREATE DATABASE: invalid backend encoding"
-msgstr ""
+#: commands/copy.c:809
+#, c-format
+msgid "cannot copy to non-table relation \"%s\""
+msgstr "нельзя копировать в не-таблицу \"%s\""
 
-#: commands/dbcommands.c:263 commands/dbcommands.c:265
-#: commands/dbcommands.c:267
-msgid "database path may not contain single quotes"
-msgstr ""
+#: commands/copy.c:828
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "не получилось отктрыть файл \"%s\" для чтения: %m"
 
-#: commands/dbcommands.c:290
+#: commands/copy.c:837
+#: commands/copy.c:899
 #, c-format
-msgid "CREATE DATABASE: unable to create database directory '%s': %m"
-msgstr ""
+msgid "\"%s\" is a directory"
+msgstr "\"%s\" является директорией"
 
-#: commands/dbcommands.c:293
+#: commands/copy.c:849
 #, c-format
-msgid "CREATE DATABASE: unable to remove temp directory '%s': %m"
-msgstr ""
+msgid "cannot copy from view \"%s\""
+msgstr "нельзя копировать из вида \"%s\""
 
-#: commands/dbcommands.c:300
+#: commands/copy.c:854
 #, c-format
-msgid "CREATE DATABASE: could not link '%s' to '%s': %m"
-msgstr ""
+msgid "cannot copy from sequence \"%s\""
+msgstr "нельзя копировать из последовательности \"%s\""
 
-#: commands/dbcommands.c:310
-msgid "CREATE DATABASE: could not initialize database directory"
-msgstr ""
+#: commands/copy.c:859
+#, c-format
+msgid "cannot copy from non-table relation \"%s\""
+msgstr "нельзя копировать из не-таблицы \"%s\""
 
-#: commands/dbcommands.c:312
-msgid ""
-"CREATE DATABASE: could not initialize database directory; delete failed as "
-"well"
+#: commands/copy.c:881
+msgid "relative path not allowed for COPY to file"
 msgstr ""
 
-#: commands/dbcommands.c:402
-msgid "DROP DATABASE: cannot be executed on the currently open database"
-msgstr ""
+#: commands/copy.c:890
+#, c-format
+msgid "could not open file \"%s\" for writing: %m"
+msgstr "не получилось отктрыть файл \"%s\" для записи: %m"
 
-#: commands/dbcommands.c:419
+#: commands/copy.c:1114
 #, c-format
-msgid "DROP DATABASE: database \"%s\" does not exist"
-msgstr ""
+msgid "COPY FROM, line %d"
+msgstr "COPY FROM, строка %d"
 
-#: commands/dbcommands.c:422
-msgid "DROP DATABASE: permission denied"
+#: commands/copy.c:1282
+msgid "COPY file signature not recognized"
 msgstr ""
 
-#: commands/dbcommands.c:430
-msgid "DROP DATABASE: database is marked as a template"
+#: commands/copy.c:1288
+msgid "invalid COPY file header (missing flags)"
 msgstr ""
 
-#: commands/dbcommands.c:439
-#, c-format
-msgid "DROP DATABASE: database \"%s\" is being accessed by other users"
+#: commands/copy.c:1294
+msgid "unrecognized critical flags in COPY file header"
 msgstr ""
 
-#: commands/dbcommands.c:456
-#, c-format
-msgid ""
-"DROP DATABASE: Database \"%s\" doesn't exist despite earlier reports to the "
-"contrary"
+#: commands/copy.c:1300
+msgid "invalid COPY file header (missing length)"
 msgstr ""
 
-#: commands/dbcommands.c:700
-msgid "Relative paths are not allowed as database locations"
+#: commands/copy.c:1308
+msgid "invalid COPY file header (wrong length)"
 msgstr ""
 
-#: commands/dbcommands.c:702
-msgid "Absolute paths are not allowed as database locations"
+#: commands/copy.c:1376
+msgid "null OID in COPY data"
 msgstr ""
 
-#: commands/dbcommands.c:712
-#, c-format
-msgid "Postmaster environment variable '%s' not set"
+#: commands/copy.c:1384
+#: commands/copy.c:1499
+msgid "invalid OID in COPY data"
 msgstr ""
 
-#: commands/dbcommands.c:714
+#: commands/copy.c:1403
 #, c-format
-msgid "Postmaster environment variable '%s' must be absolute path"
-msgstr ""
+msgid "missing data for column \"%s\""
+msgstr "отсутствуют данные для колонки \"%s\""
 
-#: commands/dbcommands.c:720
-msgid "Alternate path is too long"
+#: commands/copy.c:1449
+#: commands/copy.c:1460
+msgid "extra data after last expected column"
 msgstr ""
 
-#: commands/dbcommands.c:749
+#: commands/copy.c:1486
 #, c-format
-msgid "could not remove '%s': %m"
+msgid "row field count is %d, expected %d"
 msgstr ""
 
-#: commands/dbcommands.c:758
-#, c-format
-msgid "database directory '%s' could not be removed"
+#: commands/copy.c:1691
+#: commands/copy.c:1709
+msgid "literal carriage return found in data"
 msgstr ""
 
-#: commands/dbcommands.c:830 commands/vacuum.c:581
-#, c-format
-msgid "database %u does not exist"
+#: commands/copy.c:1692
+#: commands/copy.c:1710
+msgid "Use \"\\r\" to represent carriage return."
 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"
+#: commands/copy.c:1728
+msgid "literal newline found in data"
 msgstr ""
 
-#: commands/define.c:93 commands/define.c:239
-#, c-format
-msgid "Define: cannot interpret argument of \"%s\""
+#: commands/copy.c:1729
+msgid ""
+"Use \"\\n"
+"\" to represent newline."
 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"
+#: commands/copy.c:1826
+#: commands/copy.c:1842
+msgid "end-of-copy marker does not match previous newline style"
 msgstr ""
 
-#: commands/define.c:169
-#, c-format
-msgid "Define: argument of \"%s\" must be a name"
+#: commands/copy.c:1830
+#: commands/copy.c:1836
+msgid "end-of-copy marker corrupt"
 msgstr ""
 
-#: commands/define.c:201
-#, c-format
-msgid "Define: argument of \"%s\" must be a type name"
+#: commands/copy.c:1911
+#: commands/copy.c:1933
+msgid "unexpected EOF in COPY data"
 msgstr ""
 
-#: commands/define.c:222
+#: commands/copy.c:1920
 #, c-format
-msgid "Define: \"%s\" requires an integral value"
+msgid "invalid size for field %d"
 msgstr ""
 
-#: commands/define.c:242
+#: commands/copy.c:1947
 #, c-format
-msgid "Define: invalid argument for \"%s\": \"%s\""
-msgstr "Define: неверный аргумент для \"%s\": \"%s\""
+msgid "incorrect binary data format in field %d"
+msgstr ""
 
-#: commands/explain.c:890
+#: commands/copy.c:2067
+#: parser/parse_target.c:500
 #, c-format
-msgid "show_sort_keys: no tlist entry for key %d"
-msgstr ""
+msgid "attribute \"%s\" specified more than once"
+msgstr "атрибут \"%s\" указан более одного раза"
 
-#: commands/functioncmds.c:81
+#: commands/functioncmds.c:83
 #, c-format
-msgid "SQL function cannot return shell type \"%s\""
-msgstr "SQL-функции не могут возвращать тип shell \"%s\""
+msgid "SQL function cannot return shell type %s"
+msgstr "SQL-функция не может возвращать тип оболочки %s"
 
-#: commands/functioncmds.c:84
+#: commands/functioncmds.c:88
 #, c-format
-msgid "Return type \"%s\" is only a shell"
+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
-#: parser/parse_type.c:219
+#: commands/functioncmds.c:114
 #, c-format
-msgid "Type \"%s\" does not exist"
-msgstr "Тип \"%s\" не существует"
+msgid "type \"%s\" is not yet defined"
+msgstr "тип \"%s\" ещё не определён"
 
-#: commands/functioncmds.c:106
-#, c-format
-msgid "ProcedureCreate: type %s is not yet defined"
-msgstr "ProcedureCreate: тип %s ещё не определён"
+#: commands/functioncmds.c:115
+msgid "Creating a shell type definition."
+msgstr ""
 
-#: commands/functioncmds.c:116
+#: commands/functioncmds.c:162
 #, c-format
-msgid "could not create type %s"
-msgstr "не получилось создать тип %s"
+msgid "SQL function cannot accept shell type %s"
+msgstr "SQL-функция не может принимать значение типа оболочки %s"
 
-#: commands/functioncmds.c:150
+#: commands/functioncmds.c:167
 #, c-format
-msgid "SQL function cannot accept shell type \"%s\""
-msgstr "SQL-функции не могут принимать значение типа shell \"%s\""
+msgid "argument type %s is only a shell"
+msgstr "тип аргумента %s является только оболочкой"
 
-#: commands/functioncmds.c:153
+#: commands/functioncmds.c:175
+#: parser/parse_oper.c:113
+#: parser/parse_oper.c:124
 #, c-format
-msgid "Argument type \"%s\" is only a shell"
-msgstr "Тип аргумента \"%s\" только shell"
-
-#: commands/functioncmds.c:164
-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:224
-msgid "conflicting or redundant options"
-msgstr ""
+msgid "type %s does not exist"
+msgstr "тип %s не существует"
 
-#: commands/functioncmds.c:228
-msgid "invalid CREATE FUNCTION option"
-msgstr ""
+#: commands/functioncmds.c:182
+msgid "functions cannot accept set arguments"
+msgstr "функции не принимают аргументы-множества (set)"
 
-#: commands/functioncmds.c:234
+#: commands/functioncmds.c:265
 msgid "no function body specified"
 msgstr ""
 
-#: commands/functioncmds.c:239
+#: commands/functioncmds.c:272
 msgid "no language specified"
 msgstr "язык не указан"
 
-#: commands/functioncmds.c:250
-msgid "invalid volatility"
-msgstr ""
-
-#: commands/functioncmds.c:297
-#, c-format
-msgid "Unrecognized function attribute '%s' ignored"
-msgstr ""
-
-#: commands/functioncmds.c:339
-#, c-format
-msgid "CREATE FUNCTION: only one AS item needed for %s language"
-msgstr ""
-
-#: commands/functioncmds.c:399 utils/adt/acl.c:1442
-#, c-format
-msgid "language \"%s\" does not exist"
-msgstr "язык \"%s\" не существует"
-
-#: commands/functioncmds.c:505
-#, c-format
-msgid "RemoveFunction: couldn't find tuple for function %s"
-msgstr ""
-
-#: commands/functioncmds.c:515
-#, c-format
-msgid ""
-"RemoveFunction: function '%s' is an aggregate\n"
-"\tUse DROP AGGREGATE to remove it"
-msgstr ""
-
-#: commands/functioncmds.c:522
+#: commands/functioncmds.c:333
 #, c-format
-msgid "Removing built-in function \"%s\""
+msgid "unrecognized function attribute \"%s\" ignored"
 msgstr ""
 
-#: commands/functioncmds.c:560
+#: commands/functioncmds.c:377
 #, c-format
-msgid "RemoveFunctionById: couldn't find tuple for function %u"
+msgid "only one AS item needed for language \"%s\""
 msgstr ""
 
-#: commands/functioncmds.c:582
+#: commands/functioncmds.c:559
+#: commands/functioncmds.c:665
 #, c-format
-msgid "RemoveFunctionById: couldn't find pg_aggregate tuple for %u"
-msgstr ""
-
-#: commands/functioncmds.c:614
-#, c-format
-msgid "SetFunctionReturnType: couldn't find tuple for function %u"
-msgstr ""
+msgid "\"%s\" is an aggregate function"
+msgstr "функция \"%s\" является агрегатом"
 
-#: commands/functioncmds.c:619
-#, c-format
-msgid "SetFunctionReturnType: function %u doesn't return OPAQUE"
+#: commands/functioncmds.c:561
+msgid "Use DROP AGGREGATE to drop aggregate functions."
 msgstr ""
 
-#: commands/functioncmds.c:652
+#: commands/functioncmds.c:568
 #, c-format
-msgid "SetFunctionArgType: couldn't find tuple for function %u"
-msgstr ""
+msgid "removing built-in function \"%s\""
+msgstr "удаление встроенной функции \"%s\""
 
-#: commands/functioncmds.c:658
-#, c-format
-msgid "SetFunctionArgType: function %u doesn't take OPAQUE"
+#: commands/functioncmds.c:667
+msgid "Use ALTER AGGREGATE to rename aggregate functions."
 msgstr ""
 
-#: commands/functioncmds.c:693 commands/functioncmds.c:884
+#: commands/functioncmds.c:805
+#: commands/functioncmds.c:1039
 #, c-format
 msgid "source data type %s does not exist"
 msgstr "исходный тип данных %s не существует"
 
-#: commands/functioncmds.c:698 commands/functioncmds.c:889
+#: commands/functioncmds.c:812
+#: commands/functioncmds.c:1046
 #, c-format
 msgid "target data type %s does not exist"
 msgstr "тип данных назначения %s не существует"
 
-#: commands/functioncmds.c:702
+#: commands/functioncmds.c:818
 msgid "source data type and target data type are the same"
 msgstr ""
 
-#: commands/functioncmds.c:706
+#: commands/functioncmds.c:824
 #, c-format
 msgid "source data type %s is only a shell"
 msgstr ""
 
-#: commands/functioncmds.c:710
+#: commands/functioncmds.c:830
 #, c-format
 msgid "target data type %s is only a shell"
 msgstr ""
 
-#: commands/functioncmds.c:714
+#: commands/functioncmds.c:836
 #, c-format
 msgid "source data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:718
+#: commands/functioncmds.c:842
 #, c-format
 msgid "target data type %s is a pseudo-type"
 msgstr ""
 
-#: commands/functioncmds.c:723 commands/functioncmds.c:904
+#: commands/functioncmds.c:850
+#: commands/functioncmds.c:1065
 #, c-format
 msgid "must be owner of type %s or type %s"
 msgstr ""
 
-#: commands/functioncmds.c:743
-msgid "cast function must take 1 argument"
+#: commands/functioncmds.c:872
+msgid "cast function must take one argument"
 msgstr ""
 
-#: commands/functioncmds.c:745
+#: commands/functioncmds.c:876
 msgid "argument of cast function must match source data type"
 msgstr ""
 
-#: commands/functioncmds.c:747
+#: commands/functioncmds.c:880
 msgid "return data type of cast function must match target data type"
 msgstr ""
 
-#: commands/functioncmds.c:749
+#: commands/functioncmds.c:891
 msgid "cast function must not be volatile"
 msgstr ""
 
-#: commands/functioncmds.c:751
+#: commands/functioncmds.c:896
 msgid "cast function must not be an aggregate function"
 msgstr ""
 
-#: commands/functioncmds.c:753
+#: commands/functioncmds.c:900
 msgid "cast function must not return a set"
 msgstr ""
 
-#: commands/functioncmds.c:774
-msgid "Must be superuser to create a cast WITHOUT FUNCTION"
+#: commands/functioncmds.c:923
+msgid "must be superuser to create a cast WITHOUT FUNCTION"
 msgstr ""
 
-#: commands/functioncmds.c:787
+#: commands/functioncmds.c:938
 msgid "source and target datatypes are not physically compatible"
 msgstr ""
 
-#: commands/functioncmds.c:803
+#: commands/functioncmds.c:973
 #, c-format
-msgid "CreateCast: bogus CoercionContext %c"
-msgstr ""
-
-#: commands/functioncmds.c:820
-#, c-format
-msgid "cast from data type %s to data type %s already exists"
-msgstr ""
+msgid "cast from type %s to type %s already exists"
+msgstr "конверсия типа %s в тип %s уже существует"
 
-#: commands/functioncmds.c:897
+#: commands/functioncmds.c:1056
 #, c-format
 msgid "cast from type %s to type %s does not exist"
 msgstr "конверсия типа %s в тип %s не существует"
 
-#: commands/functioncmds.c:940
+#: commands/define.c:71
+#: commands/define.c:169
+#: commands/define.c:201
+#: commands/define.c:235
 #, c-format
-msgid "could not find tuple for cast %u"
-msgstr ""
+msgid "%s requires a parameter"
+msgstr "%s требует параметр"
 
-#: commands/indexcmds.c:92
-msgid "DefineIndex: must specify at least one attribute"
-msgstr ""
-
-#: commands/indexcmds.c:94
+#: commands/define.c:110
+#: commands/define.c:121
+#: commands/define.c:136
+#: commands/define.c:154
 #, c-format
-msgid "Cannot use more than %d attributes in an index"
-msgstr ""
+msgid "%s requires a numeric value"
+msgstr "%s требует цифровое значение"
 
-#: commands/indexcmds.c:105
+#: commands/define.c:183
 #, c-format
-msgid "DefineIndex: relation \"%s\" is not a table"
+msgid "argument of %s must be a name"
 msgstr ""
 
-#: commands/indexcmds.c:114
-msgid "Existing indexes are inactive. REINDEX first"
-msgstr ""
-
-#: commands/indexcmds.c:142
+#: commands/define.c:219
 #, c-format
-msgid "DefineIndex: access method \"%s\" not found"
+msgid "argument of %s must be a type name"
 msgstr ""
 
-#: commands/indexcmds.c:148
+#: commands/define.c:244
 #, c-format
-msgid "DefineIndex: access method \"%s\" does not support UNIQUE indexes"
-msgstr ""
+msgid "%s requires an integer value"
+msgstr "%s требует целое значение"
 
-#: commands/indexcmds.c:151
+#: commands/define.c:265
 #, c-format
-msgid "DefineIndex: access method \"%s\" does not support multi-column indexes"
-msgstr ""
+msgid "invalid argument for %s: \"%s\""
+msgstr "неверный аргумент для %s: \"%s\""
 
-#: commands/indexcmds.c:185
-msgid "Functional index can only have one attribute"
-msgstr ""
-
-#: commands/indexcmds.c:189
+#: commands/indexcmds.c:152
+#: commands/opclasscmds.c:91
+#: commands/opclasscmds.c:497
+#: commands/opclasscmds.c:647
 #, c-format
-msgid "Index function can take at most %d arguments"
-msgstr ""
-
-#: commands/indexcmds.c:244
-msgid "Partial-index predicates may refer only to the base relation"
-msgstr ""
-
-#: commands/indexcmds.c:252
-msgid "Cannot use subselect in index predicate"
+msgid "access method \"%s\" does not exist"
 msgstr ""
 
-#: commands/indexcmds.c:254
-msgid "Cannot use aggregate in index predicate"
+#: commands/opclasscmds.c:112
+msgid "must be superuser to create an operator class"
 msgstr ""
 
-#: commands/indexcmds.c:261
-msgid "Functions in index predicate must be marked isImmutable"
-msgstr ""
-
-#: commands/indexcmds.c:299 commands/indexcmds.c:389
+#: commands/opclasscmds.c:154
 #, c-format
-msgid "DefineIndex: attribute \"%s\" not found"
-msgstr ""
-
-#: commands/indexcmds.c:324
-msgid "DefineIndex: functional index may not use an aggregate function"
+msgid "invalid operator number %d, must be between 1 and %d"
 msgstr ""
 
-#: commands/indexcmds.c:326
-msgid ""
-"DefineIndex: functional index must use a real function, not a type coercion\n"
-"\tTry specifying the index opclass you want to use, instead"
-msgstr ""
-
-#: commands/indexcmds.c:334
-msgid "DefineIndex: cannot index on a function returning a set"
-msgstr ""
-
-#: commands/indexcmds.c:350
-msgid "DefineIndex: index function must be marked isImmutable"
-msgstr ""
-
-#: commands/indexcmds.c:385
-msgid "missing attribute for define index"
-msgstr ""
-
-#: commands/indexcmds.c:418
+#: commands/opclasscmds.c:160
 #, c-format
-msgid ""
-"data type %s has no default operator class for access method \"%s\"\n"
-"\tYou must specify an operator class for the index or define a\n"
-"\tdefault operator class for the data type"
-msgstr ""
+msgid "operator number %d appears more than once"
+msgstr "номер оператора %d указан больше одного раза"
 
-#: commands/indexcmds.c:449 commands/indexcmds.c:457
+#: commands/opclasscmds.c:192
 #, c-format
-msgid ""
-"DefineIndex: operator class \"%s\" not supported by access method \"%s\""
+msgid "invalid procedure number %d, must be between 1 and %d"
 msgstr ""
 
-#: commands/indexcmds.c:468
+#: commands/opclasscmds.c:198
 #, c-format
-msgid "operator class \"%s\" does not accept data type %s"
+msgid "DefineOpClass: procedure number %d appears more than once"
 msgstr ""
 
-#: commands/indexcmds.c:522
-#, c-format
-msgid "pg_opclass contains multiple default opclasses for data type %s"
+#: commands/opclasscmds.c:214
+msgid "storage type specified more than once"
 msgstr ""
 
-#: commands/indexcmds.c:544 commands/indexcmds.c:576 commands/indexcmds.c:619
+#: commands/opclasscmds.c:241
 #, c-format
-msgid "relation \"%s\" is of type \"%c\""
+msgid "storage type may not be different from datatype for access method \"%s\""
 msgstr ""
 
-#: commands/indexcmds.c:573
+#: commands/opclasscmds.c:259
 #, c-format
-msgid "index \"%s\" does not exist"
+msgid "operator class \"%s\" for access method \"%s\" already exists"
 msgstr ""
 
-#: commands/indexcmds.c:584
+#: commands/opclasscmds.c:287
 #, c-format
-msgid ""
-"\"%s\" is a system index. call REINDEX under standalone postgres with -O -P "
-"options"
+msgid "could not make class \"%s\" be default for type %s"
 msgstr ""
 
-#: commands/indexcmds.c:587
+#: commands/opclasscmds.c:290
 #, c-format
-msgid ""
-"\"%s\" is a system index. call REINDEX under standalone postgres with -P -O "
-"options"
+msgid "Class \"%s\" already is the default."
 msgstr ""
 
-#: commands/indexcmds.c:602
+#: commands/indexcmds.c:479
+#: commands/indexcmds.c:489
+#: commands/opclasscmds.c:526
+#: commands/opclasscmds.c:536
+#: commands/opclasscmds.c:669
+#: commands/opclasscmds.c:680
 #, c-format
-msgid "index \"%s\" wasn't reindexed"
+msgid "operator class \"%s\" does not exist for access method \"%s\""
 msgstr ""
 
-#: commands/indexcmds.c:634
+#: commands/opclasscmds.c:701
 #, c-format
-msgid "table \"%s\" wasn't reindexed"
+msgid "operator class \"%s\" for access method \"%s\" already exists in schema \"%s\""
 msgstr ""
 
-#: commands/indexcmds.c:658
-msgid "REINDEX DATABASE: Can be executed only on the currently open database."
+#: commands/indexcmds.c:92
+msgid "must specify at least one attribute"
 msgstr ""
 
-#: commands/indexcmds.c:661
-msgid "REINDEX DATABASE: Permission denied."
+#: commands/indexcmds.c:96
+#, c-format
+msgid "cannot use more than %d attributes in an index"
 msgstr ""
 
-#: commands/indexcmds.c:664
-msgid "must be called under standalone postgres with -O -P options"
+#: commands/indexcmds.c:120
+msgid "existing indexes are inactive"
 msgstr ""
 
-#: commands/indexcmds.c:666
-msgid "must be called under standalone postgres with -P -O options"
+#: commands/indexcmds.c:121
+msgid "REINDEX the table first."
 msgstr ""
 
-#: commands/indexcmds.c:732
+#: commands/indexcmds.c:160
 #, c-format
-msgid "relation %u was reindexed"
+msgid "access method \"%s\" does not support UNIQUE indexes"
 msgstr ""
 
-#: commands/lockcmds.c:65
+#: commands/indexcmds.c:165
 #, c-format
-msgid "LOCK TABLE: %s is not a table"
+msgid "access method \"%s\" does not support multi-column indexes"
 msgstr ""
 
-#: commands/opclasscmds.c:88
-#, c-format
-msgid "DefineOpClass: access method \"%s\" not found"
+#: commands/indexcmds.c:179
+msgid "index expressions and predicates may refer only to the base relation"
 msgstr ""
 
-#: commands/opclasscmds.c:107
-msgid "Must be superuser to create an operator class"
+#: commands/indexcmds.c:210
+msgid "primary keys cannot be expressions"
 msgstr ""
 
-#: commands/opclasscmds.c:146
+#: commands/indexcmds.c:240
+#: parser/analyze.c:1442
 #, c-format
-msgid "DefineOpClass: invalid operator number %d, must be between 1 and %d"
+msgid "column \"%s\" named in key does not exist"
 msgstr ""
 
-#: commands/opclasscmds.c:150
-#, c-format
-msgid "DefineOpClass: operator number %d appears more than once"
+#: commands/indexcmds.c:299
+msgid "cannot use sub-select in index predicate"
 msgstr ""
 
-#: commands/opclasscmds.c:167
-#, c-format
-msgid "DefineOpClass: Operator '%s' for types '%s' and '%s' does not exist"
+#: commands/indexcmds.c:303
+msgid "cannot use aggregate in index predicate"
 msgstr ""
 
-#: commands/opclasscmds.c:183
-#, c-format
-msgid "DefineOpClass: invalid procedure number %d, must be between 1 and %d"
+#: commands/indexcmds.c:312
+msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr ""
 
-#: commands/opclasscmds.c:187
+#: commands/indexcmds.c:345
+#: commands/tablecmds.c:1205
 #, c-format
-msgid "DefineOpClass: procedure number %d appears more than once"
-msgstr ""
+msgid "attribute \"%s\" does not exist"
+msgstr "атрибут \"%s\" не существует"
 
-#: commands/opclasscmds.c:200
-msgid "DefineOpClass: storage type specified more than once"
+#: commands/indexcmds.c:377
+msgid "cannot use sub-select in index expression"
 msgstr ""
 
-#: commands/opclasscmds.c:204
-#, c-format
-msgid "DefineOpClass: bogus item type %d"
+#: commands/indexcmds.c:381
+msgid "cannot use aggregate in index expression"
 msgstr ""
 
-#: commands/opclasscmds.c:226
-#, c-format
-msgid "Storage type may not be different from datatype for access method %s"
+#: commands/indexcmds.c:392
+msgid "functions in index expression must be marked IMMUTABLE"
 msgstr ""
 
-#: commands/opclasscmds.c:242
+#: commands/indexcmds.c:447
 #, c-format
-msgid "Operator class \"%s\" already exists for access method \"%s\""
+msgid "data type %s has no default operator class for access method \"%s\""
 msgstr ""
 
-#: commands/opclasscmds.c:266
-#, c-format
-msgid ""
-"Can't add class \"%s\" as default for type %s\n"
-"\tclass \"%s\" already is the default"
+#: commands/indexcmds.c:449
+msgid "You must specify an operator class for the index or define a default operator class for the data type."
 msgstr ""
 
-#: commands/opclasscmds.c:474
+#: commands/indexcmds.c:502
 #, c-format
-msgid "RemoveOpClass: access method \"%s\" not found"
+msgid "operator class \"%s\" does not accept data type %s"
 msgstr ""
 
-#: commands/opclasscmds.c:501 commands/opclasscmds.c:509
+#: commands/indexcmds.c:559
+#: utils/cache/typcache.c:286
 #, c-format
-msgid ""
-"RemoveOpClass: operator class \"%s\" not supported by access method \"%s\""
+msgid "there are multiple default operator classes for data type %s"
 msgstr ""
 
-#: commands/opclasscmds.c:553
+#: commands/indexcmds.c:626
+#: commands/indexcmds.c:632
 #, c-format
-msgid "RemoveOpClassById: couldn't find pg_class entry %u"
-msgstr ""
-
-#: commands/operatorcmds.c:103
-msgid "setof type not implemented for leftarg"
-msgstr ""
+msgid "permission denied: \"%s\" is a system index"
+msgstr "доступ запрещён: \"%s\" является системным индексом"
 
-#: commands/operatorcmds.c:109
-msgid "setof type not implemented for rightarg"
-msgstr ""
-
-#: commands/operatorcmds.c:135
-#, c-format
-msgid "DefineOperator: attribute \"%s\" not recognized"
+#: commands/indexcmds.c:628
+msgid "Do REINDEX in standalone postgres with -O -P options."
 msgstr ""
 
-#: commands/operatorcmds.c:144
-msgid "Define: \"procedure\" unspecified"
-msgstr ""
-
-#: commands/operatorcmds.c:215
-#, c-format
-msgid "RemoveOperator: failed to find tuple for operator '%s'"
+#: commands/indexcmds.c:634
+msgid "Do REINDEX in standalone postgres with -P -O options."
 msgstr ""
 
-#: commands/operatorcmds.c:251
+#: commands/indexcmds.c:649
 #, c-format
-msgid "RemoveOperatorById: failed to find tuple for operator %u"
+msgid "index \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/portalcmds.c:88
-msgid "PerformPortalFetch: missing portal name"
-msgstr "PerformPortalFetch: отсутствует имя портала"
-
-#: commands/portalcmds.c:98
+#: commands/indexcmds.c:685
 #, c-format
-msgid "PerformPortalFetch: portal \"%s\" not found"
+msgid "table \"%s\" wasn't reindexed"
 msgstr ""
 
-#: commands/portalcmds.c:243
-msgid "PerformPortalClose: missing portal name"
-msgstr "PerformPortalClose: отсутствует имя портала"
-
-#: commands/portalcmds.c:253
-#, c-format
-msgid "PerformPortalClose: portal \"%s\" not found"
+#: commands/indexcmds.c:712
+msgid "can only reindex the currently open database"
 msgstr ""
 
-#: commands/prepare.c:65
-msgid "No statement name given"
-msgstr "Не указано имя команды"
-
-#: commands/prepare.c:68
-msgid "Utility statements cannot be prepared"
+#: commands/indexcmds.c:721
+msgid "REINDEX DATABASE must be done in standalone postgres with -O -P options"
 msgstr ""
 
-#: commands/prepare.c:122
-msgid "ExecuteQuery: wrong number of arguments"
-msgstr "ExecuteQuery: неверное число аргументов"
-
-#: commands/prepare.c:172
-msgid "INTO clause specified for non-SELECT query"
+#: commands/indexcmds.c:725
+msgid "REINDEX DATABASE must be done in standalone postgres with -P -O options"
 msgstr ""
 
-#: commands/prepare.c:223
-msgid "InitQueryHashTable: unable to create hash table"
+#: commands/indexcmds.c:793
+#, c-format
+msgid "relation %u was reindexed"
 msgstr ""
 
-# [SM]: TO REVIEW
-#: commands/prepare.c:253
+#: commands/lockcmds.c:68
+#: commands/tablecmds.c:382
+#: commands/tablecmds.c:1679
+#: commands/tablecmds.c:1970
+#: commands/tablecmds.c:2114
+#: commands/tablecmds.c:2348
+#: commands/tablecmds.c:2514
+#: commands/tablecmds.c:2648
+#: commands/tablecmds.c:2829
+#: commands/tablecmds.c:3816
+#: commands/tablecmds.c:4085
+#: commands/trigger.c:144
+#: commands/trigger.c:546
+#: tcop/utility.c:76
 #, c-format
-msgid "Prepared statement with name \"%s\" already exists"
-msgstr "Заготовленная команда с именем \"%s\" уже существует"
+msgid "\"%s\" is not a table"
+msgstr "\"%s\" не является таблицей"
 
-#: commands/prepare.c:283
-#, c-format
-msgid "Unable to store prepared statement \"%s\"!"
+#: commands/operatorcmds.c:106
+#: commands/operatorcmds.c:114
+msgid "setof type not allowed for operator argument"
 msgstr ""
 
-# [SM]: TO REVIEW
-#: commands/prepare.c:309 commands/prepare.c:326 commands/prepare.c:364
-#: commands/prepare.c:388
+#: commands/operatorcmds.c:141
 #, c-format
-msgid "Prepared statement with name \"%s\" does not exist"
-msgstr "Заготовленная команда с именем \"%s\" не существует"
+msgid "operator attribute \"%s\" not recognized"
+msgstr "атрибут оператора \"%s\" не распознан"
 
-#: commands/proclang.c:61
-msgid ""
-"Only users with superuser privilege are permitted to create procedural "
-"languages"
+#: commands/operatorcmds.c:151
+msgid "operator procedure must be specified"
 msgstr ""
 
-#: commands/proclang.c:73
-#, c-format
-msgid "Language %s already exists"
+#: commands/portalcmds.c:54
+#: commands/portalcmds.c:165
+#: commands/portalcmds.c:213
+msgid "invalid cursor name: must not be empty"
 msgstr ""
 
-#: commands/proclang.c:82
-#, c-format
-msgid "function %s() doesn't exist"
-msgstr "функция %s() не существует"
+#: commands/portalcmds.c:80
+msgid "DECLARE CURSOR may not specify INTO"
+msgstr "DECLARE CURSOR не может указывать INTO"
 
-#: commands/proclang.c:94
-#, c-format
-msgid ""
-"CreateProceduralLanguage: changing return type of function %s() from OPAQUE "
-"to LANGUAGE_HANDLER"
+#: commands/portalcmds.c:84
+msgid "DECLARE CURSOR ... FOR UPDATE is not supported"
 msgstr ""
 
-#: commands/proclang.c:99
-#, c-format
-msgid "CreateProceduralLanguage: function %s() must return LANGUAGE_HANDLER"
+#: commands/portalcmds.c:85
+msgid "Cursors must be READ ONLY."
 msgstr ""
 
-#: commands/proclang.c:109
+#: commands/portalcmds.c:174
+#: commands/portalcmds.c:223
+#: tcop/postgres.c:1506
+#: tcop/postgres.c:1704
 #, c-format
-msgid "function %s(oid) doesn't exist"
-msgstr "функция %s(oid) не существует"
+msgid "portal \"%s\" does not exist"
+msgstr "портал \"%s\" не существует"
 
-#: commands/proclang.c:183
-msgid ""
-"Only users with superuser privilege are permitted to drop procedural "
-"languages"
-msgstr ""
-
-#: commands/proclang.c:196
+#: commands/portalcmds.c:313
+#: tcop/pquery.c:419
+#: tcop/pquery.c:931
 #, c-format
-msgid "Language %s doesn't exist"
-msgstr "Язык %s не существует"
+msgid "portal \"%s\" already active"
+msgstr "портал \"%s\" уже активен"
 
-#: commands/proclang.c:225
-#, c-format
-msgid "DropProceduralLanguageById: language %u not found"
+#: commands/portalcmds.c:369
+msgid "could not reposition held cursor"
 msgstr ""
 
-#: commands/schemacmds.c:79
-#, c-format
-msgid ""
-"CREATE SCHEMA: permission denied\n"
-"\t\"%s\" is not a superuser, so cannot create a schema for \"%s\""
+#: commands/prepare.c:61
+msgid "invalid statement name: must not be empty"
 msgstr ""
 
-#: commands/schemacmds.c:92
-#, c-format
-msgid ""
-"CREATE SCHEMA: Illegal schema name: \"%s\" -- pg_ is reserved for system "
-"schemas"
+#: commands/prepare.c:80
+msgid "utility statements cannot be prepared"
 msgstr ""
 
-#: commands/schemacmds.c:162
-msgid "Schema name may not be qualified"
-msgstr ""
+# [SM]: TO REVIEW
+#: commands/prepare.c:168
+#: commands/prepare.c:173
+#: commands/prepare.c:536
+msgid "prepared statement is not a SELECT"
+msgstr "заготовленная команда не является SELECTом"
 
-#: commands/schemacmds.c:169
+# [SM]: TO REVIEW
+#: commands/prepare.c:308
 #, c-format
-msgid "Schema \"%s\" does not exist"
-msgstr "Схема \"%s\" не существует"
+msgid "prepared statement \"%s\" already exists"
+msgstr "заготовленная команда \"%s\" уже существует"
 
-#: commands/schemacmds.c:206
+# [SM]: TO REVIEW
+#: commands/prepare.c:388
 #, c-format
-msgid "RemoveSchemaById: schema %u not found"
-msgstr ""
+msgid "prepared statement \"%s\" does not exist"
+msgstr "заготовленная команда \"%s\" не существует"
 
-#: commands/sequence.c:208
-msgid "DefineSequence: ReadBuffer failed"
-msgstr ""
-
-#: commands/sequence.c:335
+#: commands/sequence.c:421
+#: commands/sequence.c:613
+#: commands/sequence.c:656
 #, c-format
-msgid "%s.nextval: you don't have permissions to set sequence %s"
-msgstr ""
+msgid "permission denied for sequence %s"
+msgstr "доступ запрещён для последовательности %s"
 
-#: commands/sequence.c:410
+#: commands/sequence.c:498
 #, c-format
 msgid "%s.nextval: reached MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:431
-#, c-format
-msgid "%s.nextval: reached MINVALUE (%s)"
-msgstr ""
-
 #: commands/sequence.c:521
 #, c-format
-msgid "%s.currval: you don't have permissions to read sequence %s"
+msgid "%s.nextval: reached MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:525
+#: commands/sequence.c:619
 #, c-format
 msgid "%s.currval is not yet defined in this session"
 msgstr ""
 
-#: commands/sequence.c:560
-#, c-format
-msgid "%s.setval: you don't have permissions to set sequence %s"
-msgstr ""
-
-#: commands/sequence.c:575
-#, c-format
-msgid "%s.setval: value %s is out of bounds (%s,%s)"
-msgstr ""
-
-#: commands/sequence.c:701
-#, c-format
-msgid "%s.%s: %s is not a sequence"
-msgstr ""
-
-#: commands/sequence.c:719
-msgid "Memory exhausted in init_sequence"
-msgstr ""
-
-#: commands/sequence.c:747
-#, c-format
-msgid "%s.%s: invalid number of blocks in sequence"
-msgstr ""
+#: commands/sequence.c:673
+#, c-format
+msgid "%s.setval: value %s is out of bounds (%s..%s)"
+msgstr ""
+
+#: commands/sequence.c:800
+#: tcop/utility.c:81
+#, c-format
+msgid "\"%s\" is not a sequence"
+msgstr "\"%s\" не является последовательностью"
+
+#: commands/sequence.c:820
+#: executor/execGrouping.c:328
+#: executor/execGrouping.c:388
+#: executor/nodeIndexscan.c:1041
+#: executor/spi.c:83
+#: executor/spi.c:165
+#: lib/dllist.c:43
+#: lib/dllist.c:88
+#: libpq/auth.c:634
+#: postmaster/pgstat.c:828
+#: postmaster/pgstat.c:845
+#: postmaster/pgstat.c:2255
+#: postmaster/pgstat.c:2318
+#: postmaster/pgstat.c:2363
+#: postmaster/pgstat.c:2414
+#: postmaster/postmaster.c:1556
+#: postmaster/postmaster.c:2153
+#: postmaster/postmaster.c:2916
+#: storage/buffer/localbuf.c:129
+#: storage/file/fd.c:523
+#: storage/file/fd.c:556
+#: storage/file/fd.c:701
+#: storage/ipc/shmem.c:163
+#: storage/ipc/shmem.c:222
+#: storage/ipc/shmem.c:342
+#: storage/ipc/sinval.c:342
+#: storage/lmgr/lock.c:479
+#: storage/lmgr/lock.c:527
+#: storage/lmgr/proc.c:154
+#: storage/lmgr/proc.c:170
+#: storage/smgr/mm.c:191
+#: utils/adt/cash.c:297
+#: utils/adt/cash.c:312
+#: utils/adt/regexp.c:189
+#: utils/adt/ri_triggers.c:3266
+#: utils/cache/relcache.c:172
+#: utils/cache/relcache.c:182
+#: utils/cache/relcache.c:196
+#: utils/cache/relcache.c:1219
+#: utils/cache/typcache.c:121
+#: utils/fmgr/dfmgr.c:118
+#: utils/init/miscinit.c:126
+#: utils/init/miscinit.c:147
+#: utils/init/miscinit.c:157
+#: utils/misc/guc.c:1664
+#: utils/misc/guc.c:1861
+#: utils/misc/guc.c:2834
+#: utils/misc/guc.c:2881
+#: utils/misc/guc.c:3767
+#: utils/misc/guc.c:3903
+#: utils/misc/guc.c:3969
+#: utils/misc/guc.c:3977
+#: utils/misc/guc.c:3986
+#: utils/mmgr/aset.c:335
+#: utils/mmgr/aset.c:501
+#: utils/mmgr/aset.c:701
+#: utils/mmgr/aset.c:894
+#: utils/mmgr/portalmem.c:75
+msgid "out of memory"
+msgstr "не хватает памяти"
 
-#: commands/sequence.c:752
-#, c-format
-msgid "%s.%s: ReadBuffer failed"
+#: commands/sequence.c:958
+msgid "cannot increment by zero"
 msgstr ""
 
-#: commands/sequence.c:761
+#: commands/sequence.c:994
 #, c-format
-msgid "%s.%s: bad magic (%08X)"
+msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:804
+#: commands/sequence.c:1018
 #, c-format
-msgid "DefineSequence: option \"%s\" not recognized"
+msgid "START value (%s) can't be less than MINVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:811
-msgid "DefineSequence: can't INCREMENT by 0"
-msgstr ""
-
-#: commands/sequence.c:840
+#: commands/sequence.c:1030
 #, c-format
-msgid "DefineSequence: MINVALUE (%s) must be less than MAXVALUE (%s)"
+msgid "START value (%s) can't be greater than MAXVALUE (%s)"
 msgstr ""
 
-#: commands/sequence.c:861
+#: commands/sequence.c:1044
 #, c-format
-msgid "DefineSequence: START value (%s) can't be less than MINVALUE (%s)"
+msgid "CACHE (%s) must be greater than zero"
 msgstr ""
 
-#: commands/sequence.c:871
-#, c-format
-msgid "DefineSequence: START value (%s) can't be greater than MAXVALUE (%s)"
+#: commands/proclang.c:63
+msgid "must be superuser to create procedural language"
 msgstr ""
 
-#: commands/sequence.c:882
+#: commands/proclang.c:76
+#: commands/proclang.c:263
 #, c-format
-msgid "DefineSequence: CACHE (%s) can't be <= 0"
-msgstr ""
+msgid "language \"%s\" already exists"
+msgstr "язык \"%s\" уже существует"
 
-#: commands/sequence.c:902
+#: commands/proclang.c:96
 #, c-format
-msgid "seq_redo: unknown op code %u"
+msgid "changing return type of function %s() from OPAQUE to LANGUAGE_HANDLER"
 msgstr ""
 
-#: commands/sequence.c:910
+#: commands/proclang.c:103
 #, c-format
-msgid "seq_redo: can't read block of %u/%u"
-msgstr ""
-
-#: commands/sequence.c:926
-msgid "seq_redo: failed to add item to page"
-msgstr ""
+msgid "function %s() must return LANGUAGE_HANDLER"
+msgstr "функция %s() должна возвращать LANGUAGE_HANDLER"
 
-#: commands/tablecmds.c:149
-msgid "ON COMMIT can only be used on TEMP tables"
+#: commands/proclang.c:186
+msgid "must be superuser to drop procedural language"
 msgstr ""
 
-#: commands/tablecmds.c:379
-#, c-format
-msgid "TRUNCATE cannot be used on sequences. '%s' is a sequence"
+#: commands/proclang.c:269
+msgid "must be superuser to rename procedural language"
 msgstr ""
 
-#: commands/tablecmds.c:382
-#, c-format
-msgid "TRUNCATE cannot be used on views. '%s' is a view"
-msgstr ""
-
-#: commands/tablecmds.c:385
-#, c-format
-msgid "TRUNCATE can only be used on tables. '%s' is not a table"
-msgstr ""
+#: commands/schemacmds.c:84
+#: commands/user.c:832
+#: commands/user.c:967
+msgid "permission denied"
+msgstr "доступ запрещён"
 
-#: commands/tablecmds.c:391
+#: commands/schemacmds.c:85
 #, c-format
-msgid "TRUNCATE cannot be used on system tables. '%s' is a system table"
+msgid "\"%s\" is not a superuser, so cannot create a schema for \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:402
-msgid "TRUNCATE cannot be used on temp tables of other processes"
-msgstr ""
-
-#: commands/tablecmds.c:426
+#: commands/schemacmds.c:100
+#: commands/schemacmds.c:272
 #, c-format
-msgid ""
-"TRUNCATE cannot be used as table %s references this one via foreign key "
-"constraint %s"
+msgid "unacceptable schema name \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:537
-#, c-format
-msgid "CREATE TABLE: attribute \"%s\" duplicated"
+#: commands/schemacmds.c:101
+#: commands/schemacmds.c:273
+msgid "The prefix \"pg_\" is reserved for system schemas."
 msgstr ""
 
-#: commands/tablecmds.c:560
-#, c-format
-msgid "CREATE TABLE: inherited relation \"%s\" is not a table"
+#: commands/tablecmds.c:150
+msgid "ON COMMIT can only be used on TEMP tables"
 msgstr ""
 
-#: commands/tablecmds.c:564
+#: commands/tablecmds.c:210
 #, c-format
-msgid "CREATE TABLE: cannot inherit from temp relation \"%s\""
+msgid "duplicate CHECK constraint name \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:579
+#: commands/tablecmds.c:393
+#: commands/tablecmds.c:1150
+#: commands/tablecmds.c:1357
+#: commands/tablecmds.c:1695
+#: commands/tablecmds.c:1981
+#: commands/tablecmds.c:2125
+#: commands/tablecmds.c:2253
+#: commands/tablecmds.c:2362
+#: commands/tablecmds.c:2525
+#: commands/tablecmds.c:2659
+#: commands/tablecmds.c:2840
+#: commands/tablecmds.c:3139
+#: commands/tablecmds.c:3827
+#: commands/trigger.c:150
+#: commands/trigger.c:552
+#: tcop/utility.c:162
+#: tcop/utility.c:197
 #, c-format
-msgid "CREATE TABLE: inherited relation \"%s\" duplicated"
-msgstr ""
+msgid "permission denied: \"%s\" is a system catalog"
+msgstr "доступ запрещён: \"%s\" является системным каталогом"
 
-#: commands/tablecmds.c:631
-#, c-format
-msgid ""
-"CREATE TABLE: merging multiple inherited definitions of attribute \"%s\""
+#: commands/tablecmds.c:403
+msgid "cannot truncate temp tables of other processes"
 msgstr ""
 
-#: commands/tablecmds.c:636
-#, c-format
-msgid "CREATE TABLE: inherited attribute \"%s\" type conflict (%s and %s)"
+#: commands/tablecmds.c:429
+msgid "cannot truncate a table referenced in a foreign key constraint"
 msgstr ""
 
-#: commands/tablecmds.c:782
+#: commands/tablecmds.c:430
 #, c-format
-msgid "CREATE TABLE: merging attribute \"%s\" with inherited definition"
+msgid "Table \"%s\" references this one via foreign key constraint \"%s\"."
 msgstr ""
 
-#: commands/tablecmds.c:787
+#: commands/tablecmds.c:543
 #, c-format
-msgid "CREATE TABLE: attribute \"%s\" type conflict (%s and %s)"
-msgstr ""
+msgid "attribute \"%s\" duplicated"
+msgstr "повторное имя атрибута: \"%s\""
 
-#: commands/tablecmds.c:825
+#: commands/tablecmds.c:568
+#: parser/analyze.c:1188
 #, c-format
-msgid ""
-"CREATE TABLE: attribute \"%s\" inherits conflicting default values\n"
-"\tTo resolve the conflict, specify a default explicitly"
+msgid "inherited relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:1069
+#: commands/tablecmds.c:574
 #, c-format
-msgid "setRelhassubclassInRelation: cache lookup failed for relation %u"
+msgid "cannot inherit from temporary relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1124
+#: commands/tablecmds.c:591
 #, c-format
-msgid "renameatt: class \"%s\" is a system catalog"
+msgid "inherited relation \"%s\" duplicated"
 msgstr ""
 
-#: commands/tablecmds.c:1170
+#: commands/tablecmds.c:645
 #, c-format
-msgid "Inherited attribute \"%s\" must be renamed in child tables too"
+msgid "merging multiple inherited definitions of attribute \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1178
+#: commands/tablecmds.c:652
 #, c-format
-msgid "renameatt: attribute \"%s\" does not exist"
+msgid "inherited attribute \"%s\" has a type conflict"
 msgstr ""
 
-#: commands/tablecmds.c:1183
+#: commands/tablecmds.c:654
+#: commands/tablecmds.c:809
+#: parser/parse_coerce.c:255
+#: parser/parse_coerce.c:901
+#: parser/parse_coerce.c:918
+#: parser/parse_coerce.c:956
 #, c-format
-msgid "renameatt: system attribute \"%s\" may not be renamed"
-msgstr ""
+msgid "%s versus %s"
+msgstr "%s против %s"
 
-#: commands/tablecmds.c:1191
+#: commands/tablecmds.c:800
 #, c-format
-msgid "renameatt: inherited attribute \"%s\" may not be renamed"
+msgid "merging attribute \"%s\" with inherited definition"
 msgstr ""
 
-#: commands/tablecmds.c:1200
+#: commands/tablecmds.c:807
 #, c-format
-msgid "renameatt: attribute \"%s\" exists"
+msgid "attribute \"%s\" has a type conflict"
 msgstr ""
 
-#: commands/tablecmds.c:1230
+#: commands/tablecmds.c:848
 #, c-format
-msgid "renameatt: can't find index id %u"
+msgid "attribute \"%s\" inherits conflicting default values"
 msgstr ""
 
-#: commands/tablecmds.c:1315
-#, c-format
-msgid "renamerel: system relation \"%s\" may not be renamed"
+#: commands/tablecmds.c:850
+msgid "To resolve the conflict, specify a default explicitly."
 msgstr ""
 
-#: commands/tablecmds.c:1331
+#: commands/tablecmds.c:1195
 #, c-format
-msgid "renamerel: relation \"%s\" does not exist"
+msgid "inherited attribute \"%s\" must be renamed in child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1335
+#: commands/tablecmds.c:1213
 #, c-format
-msgid "renamerel: relation \"%s\" exists"
-msgstr ""
+msgid "cannot rename system attribute \"%s\""
+msgstr "нельзя переименовать системный атрибут \"%s\""
 
-#: 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:1223
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" is not a table"
-msgstr ""
+msgid "cannot rename inherited attribute \"%s\""
+msgstr "нельзя переименовать наследованный атрибут \"%s\""
 
-#: 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:1234
+#: commands/tablecmds.c:1835
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" is a system catalog"
-msgstr ""
+msgid "attribute \"%s\" of relation \"%s\" already exists"
+msgstr "атрибут \"%s\" для связи \"%s\" уже существует"
 
-#: commands/tablecmds.c:1697
+#: commands/tablecmds.c:1748
 #, c-format
-msgid "ALTER TABLE: child table \"%s\" has different type for column \"%s\""
+msgid "child table \"%s\" has different type for column \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1705
+#: commands/tablecmds.c:1756
 #, c-format
-msgid "ALTER TABLE: merging definition of column \"%s\" for child %s"
+msgid "merging definition of column \"%s\" for child \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:1735
-msgid "Attribute must be added to child tables too"
+#: commands/tablecmds.c:1788
+msgid "attribute must be added to child tables too"
 msgstr ""
 
-#: commands/tablecmds.c:1752
-msgid ""
-"Adding columns with defaults is not implemented.\n"
-"\tAdd the column, then use ALTER TABLE SET DEFAULT."
+#: commands/tablecmds.c:1807
+msgid "adding columns with defaults is not implemented"
 msgstr ""
 
-#: commands/tablecmds.c:1756
-msgid ""
-"Adding NOT NULL columns is not implemented.\n"
-"\tAdd the column, then use ALTER TABLE ... SET NOT NULL."
+#: commands/tablecmds.c:1808
+msgid "Add the column, then use ALTER TABLE SET DEFAULT."
 msgstr ""
 
-#: commands/tablecmds.c:1765 commands/tablecmds.c:3852
-#, c-format
-msgid "ALTER TABLE: relation \"%s\" not found"
+#: commands/tablecmds.c:1813
+msgid "adding NOT NULL columns is not implemented"
 msgstr ""
 
-#: commands/tablecmds.c:1777
-#, c-format
-msgid "ALTER TABLE: column name \"%s\" already exists in table \"%s\""
+#: commands/tablecmds.c:1814
+msgid "Add the column, then use ALTER TABLE SET NOT NULL."
 msgstr ""
 
-#: commands/tablecmds.c:1783
+#: commands/tablecmds.c:2027
+#: commands/tablecmds.c:2171
+#: commands/tablecmds.c:2299
+#: commands/tablecmds.c:2463
 #, c-format
-msgid "ALTER TABLE: relations limited to %d columns"
-msgstr ""
+msgid "cannot alter system attribute \"%s\""
+msgstr "нельзя поменять системный атрибут \"%s\""
 
-#: commands/tablecmds.c:1958 commands/tablecmds.c:2092
-#: commands/tablecmds.c:2210
+#: commands/tablecmds.c:2063
 #, c-format
-msgid "ALTER TABLE: Cannot alter system attribute \"%s\""
+msgid "attribute \"%s\" is in a primary key"
 msgstr ""
 
-#: commands/tablecmds.c:1979
+#: commands/tablecmds.c:2192
 #, c-format
-msgid "ALTER TABLE: Index %u not found"
-msgstr "ALTER TABLE: Индекс %u не найден"
-
-#: commands/tablecmds.c:1994
-#, c-format
-msgid "ALTER TABLE: Attribute \"%s\" is in a primary key"
+msgid "attribute \"%s\" contains NULL values"
 msgstr ""
 
-#: commands/tablecmds.c:2010 commands/tablecmds.c:2124
-#: commands/tablecmds.c:2352
+#: commands/tablecmds.c:2242
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" has no column \"%s\""
-msgstr ""
+msgid "\"%s\" is not a table or view"
+msgstr "\"%s\" не является таблицей или видом"
 
-#: commands/tablecmds.c:2111
+#: commands/tablecmds.c:2381
 #, c-format
-msgid "ALTER TABLE: Attribute \"%s\" contains NULL values"
+msgid "statistics target %d is too low"
 msgstr ""
 
-#: commands/tablecmds.c:2160
+#: commands/tablecmds.c:2389
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" is not a table or view"
+msgid "lowering statistics target to %d"
 msgstr ""
 
-#: commands/tablecmds.c:2284
+#: commands/tablecmds.c:2412
 #, c-format
-msgid "ALTER TABLE: statistics target %d is too low"
+msgid "invalid storage type \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2289
-msgid "ALTER TABLE: lowering statistics target to 1000"
-msgstr ""
-
-# [SM]: TO REVIEW
-#: commands/tablecmds.c:2310
-#, c-format
-msgid "ALTER TABLE: \"%s\" storage not recognized"
-msgstr "ALTER TABLE: \"%s\" медия не распознана"
-
-#: commands/tablecmds.c:2315
+#: commands/tablecmds.c:2482
 #, c-format
-msgid "ALTER TABLE: Invalid column flag: %c"
+msgid "column datatype %s can only have storage \"plain\""
 msgstr ""
 
-#: commands/tablecmds.c:2357
-#, c-format
-msgid "ALTER TABLE: cannot change system attribute \"%s\""
-msgstr "ALTER TABLE: нельзя поменять системный атрибут \"%s\""
-
-#: commands/tablecmds.c:2374
+#: commands/tablecmds.c:2572
 #, c-format
-msgid "ALTER TABLE: Column datatype %s can only have storage \"plain\""
+msgid "table \"%s\" is already WITH OIDS"
 msgstr ""
 
-#: commands/tablecmds.c:2428
+#: commands/tablecmds.c:2576
 #, c-format
-msgid "ALTER TABLE: Cannot drop system attribute \"%s\""
+msgid "table \"%s\" is already WITHOUT OIDS"
 msgstr ""
 
-#: commands/tablecmds.c:2434
-#, c-format
-msgid "ALTER TABLE: Cannot drop inherited column \"%s\""
+#: commands/tablecmds.c:2596
+msgid "ALTER TABLE WITH OIDS is not yet implemented"
 msgstr ""
 
-#: commands/tablecmds.c:2463 commands/tablecmds.c:2514
+#: commands/tablecmds.c:2677
 #, c-format
-msgid "ALTER TABLE: relation %u has no column \"%s\""
-msgstr "ALTER TABLE: у связи %u нет колонки \"%s\""
+msgid "cannot drop system attribute \"%s\""
+msgstr "нельзя удалить системный атрибут \"%s\""
 
-#: commands/tablecmds.c:2468 commands/tablecmds.c:2519
+#: commands/tablecmds.c:2685
 #, 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."
-msgstr ""
+msgid "cannot drop inherited attribute \"%s\""
+msgstr "нельзя удалить наследованный атрибут \"%s\""
 
-#: commands/tablecmds.c:2687
-msgid ""
-"ALTER TABLE / ADD CONSTRAINT unable to determine type of constraint passed"
-msgstr ""
-
-#: commands/tablecmds.c:2747
+#: commands/tablecmds.c:3012
 #, c-format
-msgid "Only relation '%s' can be referenced in CHECK"
+msgid "CHECK constraint may only reference relation \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:2802
+#: commands/tablecmds.c:3076
 #, c-format
-msgid "AlterTableAddConstraint: rejected due to CHECK constraint %s"
+msgid "CHECK constraint \"%s\" is violated at some row(s)"
 msgstr ""
 
-#: commands/tablecmds.c:2858
+#: commands/tablecmds.c:3127
 #, c-format
 msgid "referenced relation \"%s\" is not a table"
 msgstr ""
 
-#: commands/tablecmds.c:2863
-#, c-format
-msgid "%s: relation \"%s\" is a system catalog"
-msgstr "%s: объект \"%s\" является системным каталогом"
-
-#: commands/tablecmds.c:2878
-#, c-format
-msgid "%s: Unable to reference temporary table from permanent table constraint"
-msgstr ""
-
-#: commands/tablecmds.c:2920
-#, c-format
-msgid ""
-"%s: number of referencing and referenced attributes for foreign key disagree"
+#: commands/tablecmds.c:3152
+msgid "cannot reference temporary table from permanent table constraint"
 msgstr ""
 
-#: commands/tablecmds.c:3001
-#, c-format
-msgid "%s: column \"%s\" referenced in foreign key constraint does not exist"
-msgstr ""
-
-#: commands/tablecmds.c:3004
-#, c-format
-msgid "Can only have %d keys in a foreign key"
+#: commands/tablecmds.c:3193
+#: commands/tablecmds.c:3622
+msgid "number of referencing and referenced attributes for foreign key disagree"
 msgstr ""
 
-#: commands/tablecmds.c:3048
+#: commands/tablecmds.c:3275
 #, c-format
-msgid "transformFkeyGetPrimaryKey: index %u not found"
+msgid "column \"%s\" referenced in foreign key constraint does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:3066
+#: commands/tablecmds.c:3280
 #, c-format
-msgid "PRIMARY KEY for referenced table \"%s\" not found"
+msgid "cannot have more than %d keys in a foreign key"
 msgstr ""
 
-#: commands/tablecmds.c:3122
+#: commands/tablecmds.c:3343
 #, c-format
-msgid "transformFkeyCheckAttrs: index %u not found"
+msgid "there is no PRIMARY KEY for referenced table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:3180
+#: commands/tablecmds.c:3457
 #, c-format
-msgid ""
-"UNIQUE constraint matching given keys for referenced table \"%s\" not found"
+msgid "there is no UNIQUE constraint matching given keys for referenced table \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:3343
+#: commands/tablecmds.c:3872
+#: commands/trigger.c:2312
 #, 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
-msgid "Unrecognized ON DELETE action for FOREIGN KEY constraint"
-msgstr ""
-
-#: commands/tablecmds.c:3465
-msgid "Unrecognized ON UPDATE action for FOREIGN KEY constraint"
+msgid "constraint \"%s\" does not exist"
 msgstr ""
 
-#: commands/tablecmds.c:3510
+#: commands/tablecmds.c:3877
 #, c-format
-msgid "fkMatchTypeToString: Unknown MATCH TYPE '%c'"
+msgid "multiple constraints named \"%s\" were dropped"
 msgstr ""
 
-#: commands/tablecmds.c:3586
+#: commands/tablecmds.c:3919
 #, c-format
-msgid "ALTER TABLE / DROP CONSTRAINT: %s does not exist"
-msgstr ""
-
-#: commands/tablecmds.c:3590
-msgid "Multiple constraints dropped"
+msgid "\"%s\" is not a table, TOAST table, index, view, or sequence"
 msgstr ""
 
-#: commands/tablecmds.c:3615
+#: commands/tablecmds.c:4005
 #, c-format
-msgid "ALTER TABLE: relation %u not found"
-msgstr "ALTER TABLE: связь %u не найдена"
-
-#: commands/tablecmds.c:3677
-#, c-format
-msgid ""
-"ALTER TABLE: relation \"%s\" is not a table, TOAST table, index, view, or "
-"sequence"
-msgstr ""
-
-#: commands/tablecmds.c:3727
-msgid "Shared relations cannot be toasted after initdb"
+msgid "table \"%s\" is already being clustered on index \"%s\""
 msgstr ""
 
-#: commands/tablecmds.c:3740
-#, c-format
-msgid "ALTER TABLE: relation \"%s\" already has a toast table"
+#: commands/tablecmds.c:4106
+msgid "shared relations cannot be toasted after initdb"
 msgstr ""
 
-#: commands/tablecmds.c:3755
+#: commands/tablecmds.c:4121
 #, c-format
-msgid "ALTER TABLE: relation \"%s\" does not need a toast table"
+msgid "relation \"%s\" already has a toast table"
 msgstr ""
 
-#: commands/trigger.c:132
+#: commands/tablecmds.c:4138
 #, c-format
-msgid "Unable to find table for constraint \"%s\""
+msgid "relation \"%s\" does not need a toast table"
 msgstr ""
 
 #: commands/trigger.c:137
 #, c-format
-msgid "CreateTrigger: relation \"%s\" is not a table"
-msgstr ""
-
-#: commands/trigger.c:141
-#, c-format
-msgid "CreateTrigger: can't create trigger for system relation %s"
-msgstr ""
-
-#: commands/trigger.c:208
-msgid "CreateTrigger: double INSERT event specified"
-msgstr ""
-
-#: commands/trigger.c:213
-msgid "CreateTrigger: double DELETE event specified"
-msgstr ""
-
-#: commands/trigger.c:218
-msgid "CreateTrigger: double UPDATE event specified"
+msgid "could not determine referenced table for constraint \"%s\""
 msgstr ""
 
 #: commands/trigger.c:222
-msgid "CreateTrigger: unknown event specified"
-msgstr ""
-
-#: commands/trigger.c:248
-#, c-format
-msgid "CreateTrigger: trigger %s already defined on relation %s"
+msgid "double INSERT event specified"
 msgstr ""
 
-#: commands/trigger.c:260
-#, c-format
-msgid "CreateTrigger: function %s() does not exist"
+#: commands/trigger.c:229
+msgid "double DELETE event specified"
 msgstr ""
 
-#: commands/trigger.c:271
-#, c-format
-msgid ""
-"CreateTrigger: changing return type of function %s() from OPAQUE to TRIGGER"
+#: commands/trigger.c:236
+msgid "double UPDATE event specified"
 msgstr ""
 
-#: commands/trigger.c:276
+#: commands/trigger.c:269
+#: commands/trigger.c:654
 #, c-format
-msgid "CreateTrigger: function %s() must return TRIGGER"
-msgstr ""
-
-#: commands/trigger.c:376
-#, c-format
-msgid "CreateTrigger: relation %s not found in pg_class"
-msgstr ""
+msgid "trigger \"%s\" for relation \"%s\" already exists"
+msgstr "триггер \"%s\" для связи \"%s\" уже существует"
 
-#: commands/trigger.c:461
+#: commands/trigger.c:290
 #, c-format
-msgid "DropTrigger: there is no trigger %s on relation %s"
+msgid "changing return type of function %s() from OPAQUE to TRIGGER"
 msgstr ""
 
-#: commands/trigger.c:510
+#: commands/trigger.c:297
 #, c-format
-msgid "RemoveTriggerById: Trigger %u does not exist"
-msgstr "RemoveTriggerById: Триггер %u не существует"
+msgid "function %s() must return TRIGGER"
+msgstr "функция %s() должна возвращать TRIGGER"
 
-#: commands/trigger.c:521
+#: commands/trigger.c:1161
 #, c-format
-msgid "DropTrigger: relation \"%s\" is not a table"
+msgid "trigger function %u returned NULL"
 msgstr ""
 
-#: commands/trigger.c:525
-#, c-format
-msgid "DropTrigger: can't drop trigger for system relation %s"
+#: commands/trigger.c:1213
+#: commands/trigger.c:1326
+#: commands/trigger.c:1455
+msgid "BEFORE STATEMENT trigger cannot return a value"
 msgstr ""
 
-#: commands/trigger.c:550
-#, c-format
-msgid "DropTrigger: relation %s not found in pg_class"
+#: commands/trigger.c:1582
+#: executor/execMain.c:1124
+#: executor/execMain.c:1423
+#: executor/execMain.c:1557
+msgid "could not serialize access due to concurrent update"
 msgstr ""
 
-#: commands/trigger.c:555
-#, c-format
-msgid "DropTrigger: relation %s has reltriggers = 0"
-msgstr ""
-
-#: commands/trigger.c:626
-#, c-format
-msgid "renametrig: trigger %s already defined on relation %s"
+#: commands/trigger.c:2263
+msgid "unnamed constraints cannot be set explicitly"
 msgstr ""
 
-#: commands/trigger.c:667
+#: commands/trigger.c:2296
 #, c-format
-msgid "renametrig: trigger %s not defined on relation %s"
+msgid "constraint \"%s\" is not deferrable"
 msgstr ""
 
-#: commands/trigger.c:730
+#: commands/typecmds.c:135
 #, c-format
-msgid "RelationBuildTriggers: unexpected record found for rel %s"
+msgid "type names must be %d characters or less"
 msgstr ""
 
-#: commands/trigger.c:758
+#: commands/typecmds.c:167
 #, c-format
-msgid "RelationBuildTriggers: tgargs IS NULL for rel %s"
+msgid "array element type cannot be %s"
 msgstr ""
 
-#: commands/trigger.c:778
+#: commands/typecmds.c:200
 #, c-format
-msgid "RelationBuildTriggers: %d record(s) not found for rel %s"
+msgid "alignment \"%s\" not recognized"
 msgstr ""
 
-#: commands/trigger.c:1129
+#: commands/typecmds.c:217
 #, c-format
-msgid "ExecCallTriggerFunc: function %u returned NULL"
+msgid "storage \"%s\" not recognized"
 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
-msgid "Can't serialize access due to concurrent update"
-msgstr ""
-
-#: commands/trigger.c:1557 executor/execMain.c:1036
+#: commands/typecmds.c:222
 #, c-format
-msgid "Unknown status %u from heap_mark4update"
-msgstr ""
-
-#: commands/trigger.c:1569
-msgid "GetTupleForTrigger: failed ReadBuffer"
-msgstr ""
+msgid "type attribute \"%s\" not recognized"
+msgstr "Атрибут типа \"%s\" не распознан"
 
-#: commands/trigger.c:1757
-msgid "DeferredTriggerExecute: failed to fetch old tuple"
+#: commands/typecmds.c:232
+msgid "type input function must be specified"
 msgstr ""
 
-#: commands/trigger.c:1764
-msgid "DeferredTriggerExecute: failed to fetch new tuple"
+#: commands/typecmds.c:236
+msgid "type output function must be specified"
 msgstr ""
 
-#: commands/trigger.c:1785
+#: commands/typecmds.c:275
 #, c-format
-msgid "DeferredTriggerExecute: can't find trigger %u"
+msgid "changing return type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/trigger.c:1931
+#: commands/typecmds.c:282
 #, c-format
-msgid "deferredTriggerInvokeEvents: relation %u has no triggers"
+msgid "type input function %s must return %s"
 msgstr ""
 
-#: commands/trigger.c:2036
-msgid "DeferredTriggerBeginXact() called while inside transaction"
-msgstr ""
-
-#: commands/trigger.c:2211
-msgid "unnamed constraints cannot be set explicitly"
-msgstr ""
-
-#: commands/trigger.c:2242
-#, c-format
-msgid "Constraint '%s' is not deferrable"
-msgstr ""
-
-#: commands/trigger.c:2256
+#: commands/typecmds.c:292
 #, c-format
-msgid "Constraint '%s' does not exist"
-msgstr ""
-
-#: commands/trigger.c:2332
-msgid "DeferredTriggerSaveEvent() called outside of transaction"
+msgid "changing return type of function %s from OPAQUE to CSTRING"
 msgstr ""
 
-#: commands/typecmds.c:117
+#: commands/typecmds.c:299
 #, c-format
-msgid "DefineType: type names must be %d characters or less"
+msgid "type output function %s must return cstring"
 msgstr ""
 
-#: commands/typecmds.c:147
+#: commands/typecmds.c:308
 #, c-format
-msgid "Array element type cannot be %s"
+msgid "type receive function %s must return %s"
 msgstr ""
 
-#: commands/typecmds.c:178
+#: commands/typecmds.c:317
 #, c-format
-msgid "DefineType: \"%s\" alignment not recognized"
+msgid "type send function %s must return bytea"
 msgstr ""
 
-#: commands/typecmds.c:194
+#: commands/typecmds.c:520
 #, c-format
-msgid "DefineType: \"%s\" storage not recognized"
+msgid "domain names must be %d characters or less"
 msgstr ""
 
-#: commands/typecmds.c:199
+#: commands/typecmds.c:541
 #, c-format
-msgid "DefineType: attribute \"%s\" not recognized"
-msgstr ""
+msgid "\"%s\" is not a valid base type for a domain"
+msgstr "\"%s\" не является верным базовым типом для домена"
 
-#: commands/typecmds.c:208
-msgid "Define: \"input\" unspecified"
-msgstr ""
+#: commands/typecmds.c:598
+#: commands/typecmds.c:1457
+msgid "FOREIGN KEY constraints not supported for domains"
+msgstr "FOREIGN KEY констрейнты не поддерживаются для доменов"
 
-#: commands/typecmds.c:210
-msgid "Define: \"output\" unspecified"
+#: commands/typecmds.c:618
+msgid "multiple DEFAULT expressions"
 msgstr ""
 
-#: commands/typecmds.c:243
-#, c-format
-msgid "TypeCreate: changing return type of function %s from OPAQUE to %s"
+#: commands/typecmds.c:648
+#: commands/typecmds.c:657
+msgid "conflicting NULL/NOT NULL constraints"
 msgstr ""
 
-#: commands/typecmds.c:248
-#, c-format
-msgid "Type input function %s must return %s"
-msgstr ""
+#: commands/typecmds.c:676
+#: commands/typecmds.c:1488
+msgid "UNIQUE constraints not supported for domains"
+msgstr "UNIQUE констрейнты не поддерживаются для доменов"
 
-#: commands/typecmds.c:256
-#, c-format
-msgid "TypeCreate: changing return type of function %s from OPAQUE to CSTRING"
-msgstr ""
+#: commands/typecmds.c:682
+#: commands/typecmds.c:1494
+msgid "PRIMARY KEY constraints not supported for domains"
+msgstr "PRIMARY KEY констрэйнты не поддерживаются для доменов"
 
-#: commands/typecmds.c:261
-#, c-format
-msgid "Type output function %s must return cstring"
+#: commands/typecmds.c:691
+#: commands/typecmds.c:1503
+msgid "deferrability constraints not supported for domains"
 msgstr ""
 
-#: commands/typecmds.c:389
+#: commands/typecmds.c:808
+#: commands/typecmds.c:1737
+#: commands/typecmds.c:2048
 #, c-format
-msgid "RemoveTypeById: type %u not found"
-msgstr "RemoveTypeById: тип %u не найден"
+msgid "\"%s\" is not a domain"
+msgstr "\"%s\" не является доменом"
 
-#: commands/typecmds.c:450
+#: commands/typecmds.c:878
 #, c-format
-msgid "CREATE DOMAIN: domain names must be %d characters or less"
+msgid "changing argument type of function %s from OPAQUE to CSTRING"
 msgstr ""
 
-#: commands/typecmds.c:469
+#: commands/typecmds.c:948
 #, 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
-msgid "CREATE DOMAIN has multiple DEFAULT expressions"
-msgstr ""
-
-#: commands/typecmds.c:565 commands/typecmds.c:572
-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:592
-msgid "CREATE DOMAIN / PRIMARY KEY not supported"
-msgstr "CREATE DOMAIN / PRIMARY KEY не поддерживаются"
-
-#: commands/typecmds.c:599
-msgid ""
-"CREATE DOMAIN: DEFERRABLE, NON DEFERRABLE, DEFERRED and IMMEDIATE not "
-"supported"
+msgid "changing argument type of function %s from OPAQUE to %s"
 msgstr ""
 
-#: commands/typecmds.c:604
-msgid "DefineDomain: unrecognized constraint subtype"
+#: commands/typecmds.c:1059
+msgid "composite type must have at least one attribute"
 msgstr ""
 
-#: commands/typecmds.c:696
-#, c-format
-msgid "RemoveDomain: type \"%s\" does not exist"
-msgstr "RemoveDomain: тип \"%s\" не существует"
-
-#: commands/typecmds.c:709 commands/typecmds.c:1507
+#: commands/typecmds.c:1250
 #, c-format
-msgid "%s is not a domain"
-msgstr "%s не является доменом"
-
-#: commands/typecmds.c:778
-#, c-format
-msgid "TypeCreate: changing argument type of function %s from OPAQUE to %s"
+msgid "\"%s\" is already set to %s"
 msgstr ""
 
-#: commands/typecmds.c:837
+#: commands/typecmds.c:1294
 #, c-format
-msgid ""
-"TypeCreate: changing argument type of function %s from OPAQUE to CSTRING"
+msgid "relation \"%s\" attribute \"%s\" contains NULL values"
 msgstr ""
 
-#: commands/typecmds.c:880
-msgid "attempted to define composite type relation with no attrs"
+#: commands/typecmds.c:1471
+msgid "use ALTER DOMAIN .. SET DEFAULT instead"
 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"
+#: commands/typecmds.c:1478
+msgid "use ALTER DOMAIN .. [ SET | DROP ] NOT NULL instead"
 msgstr ""
 
-#: commands/typecmds.c:1111
+#: commands/typecmds.c:1574
 #, c-format
-msgid "ALTER DOMAIN: Relation \"%s\" Attribute \"%s\" contains NULL values"
+msgid "relation \"%s\" attribute \"%s\" contains values that violate the new constraint"
 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
+#: commands/typecmds.c:1771
 #, 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"
+msgid "constraint \"%s\" for domain \"%s\" already exists"
 msgstr ""
 
-#: commands/typecmds.c:1582
-msgid "cannot use column references in domain CHECK clause"
+#: commands/typecmds.c:1811
+#: commands/typecmds.c:1820
+msgid "cannot use table references in domain CHECK constraint"
 msgstr ""
 
-#: commands/user.c:147
+#: commands/user.c:149
+#: commands/user.c:248
+#: commands/user.c:297
+#: commands/user.c:379
 #, c-format
-msgid "write_group_file: unable to write %s: %m"
+msgid "could not write temp file \"%s\": %m"
 msgstr ""
 
-#: commands/user.c:181
+#: commands/user.c:184
 #, c-format
-msgid "Invalid group name '%s'"
-msgstr "Неверное имя группы '%s'"
+msgid "invalid group name \"%s\""
+msgstr "неверное имя группы \"%s\""
 
-#: commands/user.c:211 commands/user.c:335
+#: commands/user.c:215
+#: commands/user.c:347
 #, c-format
-msgid "Invalid user name '%s'"
-msgstr "Неверное имя пользователя '%s'"
+msgid "invalid user name \"%s\""
+msgstr "неверное имя пользователя \"%s\""
 
-#: commands/user.c:242 commands/user.c:364
+#: commands/user.c:258
+#: commands/user.c:389
 #, c-format
-msgid "%s: %m"
-msgstr "%s: %m"
+msgid "could not rename \"%s\" to \"%s\": %m"
+msgstr "не получилось переименовать \"%s\" в \"%s\": %m"
 
-#: commands/user.c:250 commands/user.c:372
+#: commands/user.c:354
 #, c-format
-msgid "rename %s to %s: %m"
-msgstr "RENAME %s TO %s: %m"
+msgid "invalid user password \"%s\""
+msgstr "неверный пароль \"%s\""
 
-#: commands/user.c:286
-#, c-format
-msgid "write_user_file: unable to write %s: %m"
-msgstr "write_user_file: не удалось записать %s: %m"
-
-#: commands/user.c:341
-#, c-format
-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
-msgid "CREATE USER: conflicting options"
-msgstr ""
-
-#: commands/user.c:543
-#, c-format
-msgid "CREATE USER: option \"%s\" not recognized"
-msgstr ""
-
-#: commands/user.c:555
+#: commands/user.c:587
 msgid "user id must be positive"
 msgstr ""
 
-#: commands/user.c:570
-msgid "CREATE USER: permission denied"
+#: commands/user.c:604
+msgid "must be superuser to create users"
 msgstr ""
 
-#: commands/user.c:573
+#: commands/user.c:609
 #, c-format
-msgid "CREATE USER: user name \"%s\" is reserved"
+msgid "user name \"%s\" is reserved"
 msgstr ""
 
-#: commands/user.c:608
+#: commands/user.c:646
+#: commands/user.c:1191
 #, c-format
-msgid "CREATE USER: user name \"%s\" already exists"
-msgstr ""
-
-#: commands/user.c:611
-#, c-format
-msgid "CREATE USER: sysid %d is already assigned"
-msgstr ""
-
-#: 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:755
-msgid "ALTER USER: conflicting options"
-msgstr ""
+msgid "user \"%s\" already exists"
+msgstr "пользователь \"%s\" уже существует"
 
-#: commands/user.c:759
+#: commands/user.c:651
+#: commands/user.c:1357
 #, c-format
-msgid "ALTER USER: option \"%s\" not recognized"
+msgid "sysid %d is already assigned"
 msgstr ""
 
-#: commands/user.c:782
-msgid "ALTER USER: permission denied"
-msgstr "ALTER USER: нет доступа"
-
-#: commands/user.c:796
-#, c-format
-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:848
+#: commands/user.c:961
+#: commands/user.c:1053
+#: commands/user.c:1172
+#: commands/variable.c:778
+#: utils/cache/lsyscache.c:1989
+#: utils/init/miscinit.c:259
 #, c-format
 msgid "user \"%s\" does not exist"
 msgstr "пользователь \"%s\" не существует"
 
-#: commands/user.c:968
-msgid "DROP USER: permission denied"
-msgstr "DROP USER: нед доступа"
-
-#: commands/user.c:995
-#, c-format
-msgid "DROP USER: user \"%s\" does not exist (no users removed)"
+#: commands/user.c:1026
+msgid "must be superuser to drop users"
 msgstr ""
-"DROP USER: пользователь \"%s\" не существует (никто из поользователей не "
-"удалён)"
-
-#: commands/user.c:997
-#, c-format
-msgid "DROP USER: user \"%s\" does not exist"
-msgstr "DROP USER: пользователь \"%s\" не существует"
 
-#: commands/user.c:1003
+#: commands/user.c:1060
 msgid "current user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:1005
+#: commands/user.c:1064
 msgid "session user cannot be dropped"
 msgstr ""
 
-#: commands/user.c:1029
-#, c-format
-msgid "DROP USER: user \"%s\" owns database \"%s\", cannot be removed%s"
-msgstr ""
-
-#: commands/user.c:1109
-#, c-format
-msgid "CheckPgUserAclNotNull: \"%s\" not found"
-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'."
-
-#: commands/user.c:1156 commands/user.c:1162
-msgid "CREATE GROUP: conflicting options"
-msgstr "CREATE GROUP: конфликт опций"
-
-#: commands/user.c:1166
-#, c-format
-msgid "CREATE GROUP: option \"%s\" not recognized"
-msgstr "CREATE GROUP: опция \"%s\" не распознана"
-
-#: commands/user.c:1174
-msgid "group id must be positive"
-msgstr ""
-
-#: commands/user.c:1185
-msgid "CREATE GROUP: permission denied"
-msgstr "CREATE GROUP: нет доступа"
-
-#: commands/user.c:1188
-#, c-format
-msgid "CREATE GROUP: group name \"%s\" is reserved"
-msgstr ""
-
-#: commands/user.c:1223
-#, c-format
-msgid "CREATE GROUP: group name \"%s\" already exists"
-msgstr ""
-
-#: commands/user.c:1226
-#, c-format
-msgid "CREATE GROUP: group sysid %d is already assigned"
-msgstr ""
-
-#: commands/user.c:1319
-#, c-format
-msgid "%s: group \"%s\" does not exist"
-msgstr ""
-
-#: commands/user.c:1360
-#, c-format
-msgid "AlterGroup: unknown tag %s"
-msgstr ""
-
-#: commands/user.c:1372
+#: commands/user.c:1090
 #, c-format
-msgid "%s: user \"%s\" is already in group \"%s\""
-msgstr ""
-
-#: commands/user.c:1387
-#, c-format
-msgid "ALTER GROUP: group \"%s\" does not have any members"
-msgstr ""
-
-#: commands/user.c:1412
-#, c-format
-msgid "ALTER GROUP: user \"%s\" is not in group \"%s\""
-msgstr ""
-
-#: commands/user.c:1541
-msgid "DROP GROUP: permission denied"
-msgstr ""
-
-#: commands/user.c:1554
-#, c-format
-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 "user \"%s\" cannot be dropped"
 msgstr ""
 
-#: commands/vacuum.c:505 commands/vacuum.c:512
+#: commands/user.c:1091
 #, c-format
-msgid "pg_class entry for relid %u vanished during vacuuming"
+msgid "The user owns database \"%s\"."
 msgstr ""
 
-#: commands/vacuum.c:665
-msgid ""
-"Some databases have not been vacuumed in over 2 billion transactions.\n"
-"\tYou may have already suffered transaction-wraparound data loss."
+#: commands/user.c:1183
+msgid "session user may not be renamed"
 msgstr ""
 
-#: commands/vacuum.c:676
-msgid ""
-"Some databases have not been vacuumed in over 1 billion transactions.\n"
-"\tBetter vacuum them soon, or you may have a wraparound failure."
+#: commands/user.c:1197
+msgid "must be superuser to rename users"
 msgstr ""
 
-#: commands/vacuum.c:683
+#: commands/user.c:1230
 #, c-format
-msgid ""
-"Some databases have not been vacuumed in %d transactions.\n"
-"\tBetter vacuum them within %d transactions,\n"
-"\tor you may have a wraparound failure."
+msgid "before using passwords you must revoke permissions on %s"
 msgstr ""
 
-#: commands/vacuum.c:771
-#, c-format
-msgid "Skipping \"%s\" --- only table or database owner can VACUUM it"
+#: commands/user.c:1232
+msgid "This restriction is to prevent unprivileged users from reading the passwords."
 msgstr ""
 
-#: commands/vacuum.c:977
+#: commands/user.c:1233
 #, c-format
-msgid "VACUUM (full_vacuum_rel): FlushRelationBuffers returned %d"
+msgid "Try 'REVOKE ALL ON \"%s\" FROM PUBLIC'."
 msgstr ""
 
-#: commands/vacuum.c:1044 commands/vacuumlazy.c:210
-#, c-format
-msgid "--Relation %s.%s--"
+#: commands/user.c:1297
+msgid "group id must be positive"
 msgstr ""
 
-#: commands/vacuum.c:1078 commands/vacuumlazy.c:268
-#, c-format
-msgid "Rel %s: Uninitialized page %u - fixing"
+#: commands/user.c:1310
+msgid "must be superuser to create groups"
 msgstr ""
 
-#: commands/vacuum.c:1192
+#: commands/user.c:1315
 #, c-format
-msgid ""
-"Rel %s: TID %u/%u: InsertTransactionInProgress %u - can't shrink relation"
+msgid "group name \"%s\" is reserved"
 msgstr ""
 
-#: commands/vacuum.c:1202
+#: commands/user.c:1352
+#: commands/user.c:1739
 #, c-format
-msgid ""
-"Rel %s: TID %u/%u: DeleteTransactionInProgress %u - can't shrink relation"
-msgstr ""
+msgid "group \"%s\" already exists"
+msgstr "группа \"%s\" уже существует"
 
-#: commands/vacuum.c:1220 commands/vacuumlazy.c:372
-#, c-format
-msgid "Rel %s: TID %u/%u: OID IS INVALID. TUPGONE %d."
+#: commands/user.c:1437
+msgid "must be superuser to alter groups"
 msgstr ""
 
-#: commands/vacuum.c:1358
+#: commands/user.c:1504
 #, c-format
-msgid ""
-"Pages %u: Changed %u, reaped %u, Empty %u, New %u; Tup %.0f: Vac %.0f, Keep/"
-"VTL %.0f/%u, UnUsed %.0f, MinLen %lu, MaxLen %lu; Re-using: Free/Avail. "
-"Space %.0f/%.0f; EndEmpty/Avail. Pages %u/%u.\n"
-"\t%s"
-msgstr ""
-
-#: commands/vacuum.c:1582
-msgid "HEAP_MOVED_IN was not expected"
+msgid "user \"%s\" is already in group \"%s\""
 msgstr ""
 
-#: commands/vacuum.c:1592
-msgid "Invalid XVAC in tuple header"
-msgstr ""
-
-#: commands/vacuum.c:1617
-msgid "HEAP_MOVED_OFF was expected"
-msgstr ""
-
-#: commands/vacuum.c:1671 commands/vacuum.c:1793
-msgid "Parent item in update-chain not found - can't continue repair_frag"
-msgstr ""
-
-#: commands/vacuum.c:1708
-msgid ""
-"Child itemid in update-chain marked as unused - can't continue repair_frag"
-msgstr ""
-
-#: commands/vacuum.c:1805
-msgid "Parent itemid marked as unused"
-msgstr ""
-
-#: commands/vacuum.c:1829
-msgid "Too old parent tuple found - can't continue repair_frag"
-msgstr ""
-
-#: commands/vacuum.c:1958
+#: commands/user.c:1521
 #, c-format
-msgid "moving chain: failed to add item with len = %lu to page %u"
+msgid "group \"%s\" does not have any members"
 msgstr ""
 
-#: commands/vacuum.c:2102
+#: commands/user.c:1549
 #, c-format
-msgid ""
-"failed to add item with len = %lu to page %u (free space %lu, nusd %u, noff %"
-"u)"
-msgstr ""
+msgid "user \"%s\" is not in group \"%s\""
+msgstr "пользователь \"%s\" не принадлежит группе \"%s\""
 
-#: commands/vacuum.c:2191
-msgid "HEAP_MOVED_IN was not expected (2)"
+#: commands/user.c:1681
+msgid "must be superuser to drop groups"
 msgstr ""
 
-#: commands/vacuum.c:2195
-msgid "Invalid XVAC in tuple header (4)"
+#: commands/user.c:1745
+msgid "must be superuser to rename groups"
 msgstr ""
 
-#: commands/vacuum.c:2220
-msgid "HEAP_MOVED_OFF was expected (2)"
+#: commands/vacuum.c:466
+msgid "oldest Xmin is far in the past"
 msgstr ""
 
-#: commands/vacuum.c:2331
-msgid "HEAP_MOVED_OFF/HEAP_MOVED_IN was expected"
+#: commands/vacuum.c:467
+msgid "Close open transactions soon to avoid wraparound problems."
 msgstr ""
 
-#: commands/vacuum.c:2333
-msgid "Invalid XVAC in tuple header (2)"
+#: commands/vacuum.c:674
+msgid "some databases have not been vacuumed in over 2 billion transactions"
 msgstr ""
 
-#: commands/vacuum.c:2351
-#, c-format
-msgid ""
-"Rel %s: Pages: %u --> %u; Tuple(s) moved: %u.\n"
-"\t%s"
+#: commands/vacuum.c:675
+msgid "You may have already suffered transaction-wraparound data loss."
 msgstr ""
 
-#: commands/vacuum.c:2413
-msgid "Invalid XVAC in tuple header (3)"
+#: commands/vacuum.c:686
+msgid "some databases have not been vacuumed in over 1 billion transactions"
 msgstr ""
 
-#: commands/vacuum.c:2418
-msgid "HEAP_MOVED_OFF was expected (3)"
+#: commands/vacuum.c:687
+msgid "Better vacuum them soon, or you may have a wraparound failure."
 msgstr ""
 
-#: commands/vacuum.c:2468
+#: commands/vacuum.c:694
 #, c-format
-msgid "VACUUM (repair_frag): FlushRelationBuffers returned %d"
+msgid "some databases have not been vacuumed in %d transactions"
 msgstr ""
 
-#: commands/vacuum.c:2534
+#: commands/vacuum.c:696
 #, c-format
-msgid "VACUUM (vacuum_heap): FlushRelationBuffers returned %d"
+msgid "Better vacuum them within %d transactions, or you may have a wraparound failure."
 msgstr ""
 
-#: commands/vacuum.c:2540
+#: commands/vacuum.c:785
 #, c-format
-msgid "Rel %s: Pages: %u --> %u."
+msgid "skipping \"%s\" --- only table or database owner can VACUUM it"
 msgstr ""
 
-#: commands/vacuum.c:2625 commands/vacuumlazy.c:599
+#: commands/vacuum.c:799
 #, c-format
-msgid ""
-"Index %s: Pages %u; Tuples %.0f.\n"
-"\t%s"
+msgid "skipping \"%s\" --- cannot VACUUM indexes, views or special system tables"
 msgstr ""
 
-#: commands/vacuum.c:2638 commands/vacuum.c:2692
+#: commands/vacuum.c:1058
+#: commands/vacuumlazy.c:205
 #, c-format
-msgid ""
-"Index %s: NUMBER OF INDEX' TUPLES (%.0f) IS NOT THE SAME AS HEAP' (%.0f).\n"
-"\tRecreate the index."
+msgid "vacuuming \"%s.%s\""
 msgstr ""
 
-#: commands/vacuum.c:2679 commands/vacuumlazy.c:646
+#: commands/vacuum.c:1093
+#: commands/vacuumlazy.c:263
 #, c-format
-msgid ""
-"Index %s: Pages %u; Tuples %.0f: Deleted %.0f.\n"
-"\t%s"
+msgid "relation \"%s\" page %u is uninitialized --- fixing"
 msgstr ""
 
-#: commands/vacuumlazy.c:434
+#: commands/vacuum.c:1210
 #, c-format
-msgid ""
-"Pages %u: Changed %u, Empty %u; Tup %.0f: Vac %.0f, Keep %.0f, UnUsed %.0f.\n"
-"\tTotal %s"
+msgid "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- can't shrink relation"
 msgstr ""
 
-#: commands/vacuumlazy.c:484
+#: commands/vacuum.c:1223
 #, c-format
-msgid ""
-"Removed %d tuples in %d pages.\n"
-"\t%s"
+msgid "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- can't shrink relation"
 msgstr ""
 
-#: commands/vacuumlazy.c:720
+#: commands/vacuum.c:1385
+#: commands/vacuumlazy.c:428
 #, c-format
-msgid "VACUUM (lazy_truncate_heap): FlushRelationBuffers returned %d"
+msgid "\"%s\": found %.0f removable, %.0f nonremovable tuples in %u pages"
 msgstr ""
 
-#: commands/vacuumlazy.c:755
+#: commands/vacuum.c:1388
 #, c-format
 msgid ""
-"Truncated %u --> %u pages.\n"
-"\t%s"
-msgstr ""
-
-#: commands/variable.c:62
-msgid "SET DATESTYLE: invalid list syntax"
+"%.0f dead tuples cannot be removed yet.\n"
+"Nonremovable tuples range from %lu to %lu bytes long.\n"
+"There were %.0f unused item pointers.\n"
+"Total free space (including removable tuples) is %.0f bytes.\n"
+"%u pages are or will become empty, including %u at the end of the table.\n"
+"%u pages containing %.0f free bytes are potential move destinations.\n"
+"%s"
 msgstr ""
 
-#: commands/variable.c:141
+#: commands/vacuum.c:2391
 #, c-format
-msgid "SET DATESTYLE: unrecognized keyword %s"
-msgstr ""
-
-#: commands/variable.c:156
-msgid "SET DATESTYLE: conflicting specifications"
-msgstr ""
-
-#: commands/variable.c:288
-msgid "SET TIME ZONE: illegal INTERVAL; month not allowed"
-msgstr ""
-
-#: commands/variable.c:331
-msgid "Unable to clear TZ environment variable"
-msgstr ""
-
-#: commands/variable.c:351
-msgid "assign_timezone: putenv failed"
-msgstr ""
-
-#: commands/variable.c:420
-msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
+msgid "\"%s\": moved %u tuples, truncated %u to %u pages"
 msgstr ""
 
-#: commands/variable.c:495
+#: commands/vacuum.c:2394
+#: commands/vacuumlazy.c:489
+#: commands/vacuumlazy.c:774
+#: nodes/print.c:87
+#: storage/lmgr/deadlock.c:888
+#: tcop/postgres.c:3191
 #, c-format
-msgid "Conversion between %s and %s is not supported"
-msgstr ""
-
-#: commands/variable.c:507
-msgid "SET SERVER_ENCODING is not supported"
-msgstr "SET SERVER_ENCODING не поддерживается"
-
-#: commands/view.c:87
-msgid "attempted to define virtual relation with no attrs"
-msgstr ""
+msgid "%s"
+msgstr "%s"
 
-#: commands/view.c:109
+#: commands/vacuum.c:2578
+#: commands/vacuumlazy.c:771
 #, c-format
-msgid "%s is not a view"
-msgstr "%s не является видом"
-
-#: commands/view.c:162 commands/view.c:172
-msgid "Cannot change number of columns in view"
+msgid "\"%s\": truncated %u to %u pages"
 msgstr ""
 
-#: commands/view.c:175
+#: commands/vacuum.c:2670
+#: commands/vacuum.c:2737
+#: commands/vacuumlazy.c:597
+#: commands/vacuumlazy.c:657
 #, c-format
-msgid "Cannot change name of view column \"%s\""
+msgid "index \"%s\" now contains %.0f tuples in %u pages"
 msgstr ""
 
-#: commands/view.c:180
+#: commands/vacuum.c:2674
+#: commands/vacuumlazy.c:601
 #, c-format
-msgid "Cannot change datatype of view column \"%s\""
+msgid ""
+"%u index pages have been deleted, %u are currently reusable.\n"
+"%s"
 msgstr ""
 
-#: executor/execAmi.c:163
+#: commands/vacuum.c:2688
+#: commands/vacuum.c:2757
 #, c-format
-msgid "ExecReScan: node type %d not supported"
+msgid "index \"%s\" contains %.0f tuples, but table contains %.0f tuples"
 msgstr ""
 
-#: executor/execAmi.c:211
-#, c-format
-msgid "ExecMarkPos: node type %d not supported"
+#: commands/vacuum.c:2691
+#: commands/vacuum.c:2760
+msgid "Rebuild the index with REINDEX."
 msgstr ""
 
-#: executor/execAmi.c:252
+#: commands/vacuum.c:2741
+#: commands/vacuumlazy.c:661
 #, c-format
-msgid "ExecRestrPos: node type %d not supported"
+msgid ""
+"%.0f index tuples were removed.\n"
+"%u index pages have been deleted, %u are currently reusable.\n"
+"%s"
 msgstr ""
 
-#: executor/execMain.c:369
+#: commands/vacuumlazy.c:431
 #, c-format
-msgid "ExecCheckRTEPerms: bogus operation %d"
+msgid ""
+"%.0f dead tuples cannot be removed yet.\n"
+"There were %.0f unused item pointers.\n"
+"%u pages are entirely empty.\n"
+"%s"
 msgstr ""
 
-#: executor/execMain.c:741
+#: commands/vacuumlazy.c:486
 #, c-format
-msgid "You can't change sequence relation %s"
+msgid "\"%s\": removed %d tuples in %d pages"
 msgstr ""
 
-#: executor/execMain.c:745
-#, c-format
-msgid "You can't change toast relation %s"
+#: commands/variable.c:75
+msgid "invalid list syntax for datestyle"
 msgstr ""
 
-#: executor/execMain.c:749
+#: commands/variable.c:161
 #, c-format
-msgid "You can't change view relation %s"
+msgid "unrecognized datestyle keyword: \"%s\""
 msgstr ""
 
-#: executor/execMain.c:963
-msgid "ExecutePlan: NO (junk) `ctid' was found!"
+#: commands/variable.c:179
+msgid "conflicting datestyle specifications"
 msgstr ""
 
-#: executor/execMain.c:967
-msgid "ExecutePlan: (junk) `ctid' is NULL!"
+#: commands/variable.c:450
+msgid "invalid INTERVAL for time zone: month not allowed"
 msgstr ""
 
-#: executor/execMain.c:992
+#: commands/variable.c:557
 #, c-format
-msgid "ExecutePlan: NO (junk) `%s' was found!"
+msgid "unrecognized timezone name: \"%s\""
 msgstr ""
 
-#: executor/execMain.c:997
+#: commands/variable.c:565
 #, c-format
-msgid "ExecutePlan: (junk) `%s' is NULL!"
+msgid "timezone \"%s\" appears to use leap seconds"
 msgstr ""
 
-#: executor/execMain.c:1086
-msgid "ExecutePlan: unknown operation in queryDesc"
+#: commands/variable.c:567
+msgid "PostgreSQL does not support leap seconds"
 msgstr ""
 
-#: executor/execMain.c:1372
-msgid "ExecUpdate: UPDATE can't run without transactions"
+#: commands/variable.c:636
+msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query"
 msgstr ""
 
-#: executor/execMain.c:1572
+#: commands/variable.c:713
+#: utils/mb/mbutils.c:188
 #, c-format
-msgid "%s: Fail to add null value in not null attribute %s"
+msgid "conversion between %s and %s is not supported"
 msgstr ""
 
-#: executor/execMain.c:1582
-#, c-format
-msgid "%s: rejected due to CHECK constraint \"%s\" on \"%s\""
+#: commands/view.c:89
+msgid "view must have at least one attribute"
 msgstr ""
 
-#: executor/execMain.c:1625
+#: commands/view.c:113
+#: tcop/utility.c:86
 #, c-format
-msgid "EvalPlanQual: can't find RTE %d"
-msgstr ""
+msgid "\"%s\" is not a view"
+msgstr "\"%s\" не является видом"
 
-#: executor/execMain.c:1643
-msgid "EvalPlanQual: t_xmin is uncommitted ?!"
+#: commands/view.c:169
+#: commands/view.c:181
+msgid "cannot change number of columns in view"
 msgstr ""
 
-#: executor/execProcnode.c:218
+#: commands/view.c:186
 #, c-format
-msgid "ExecInitNode: node type %d unsupported"
+msgid "cannot change name of view column \"%s\""
 msgstr ""
 
-#: executor/execProcnode.c:378
+#: commands/view.c:193
 #, c-format
-msgid "ExecProcNode: node type %d unsupported"
+msgid "cannot change datatype of view column \"%s\""
 msgstr ""
 
-#: executor/execProcnode.c:471
+#: executor/execMain.c:844
 #, c-format
-msgid "ExecCountSlotsNode: node type %d unsupported"
+msgid "cannot change sequence relation \"%s\""
 msgstr ""
 
-#: executor/execProcnode.c:600
+#: executor/execMain.c:850
 #, c-format
-msgid "ExecEndNode: node type %d unsupported"
+msgid "cannot change toast relation \"%s\""
 msgstr ""
 
-#: executor/execProcnode.c:776
+#: executor/execMain.c:856
 #, c-format
-msgid "ExecGetTupType: node type %d unsupported"
+msgid "cannot change view relation \"%s\""
 msgstr ""
 
-#: executor/execQual.c:167 executor/execQual.c:189
+#: executor/execMain.c:1689
 #, c-format
-msgid "ExecEvalArrayRef: can only handle %d dimensions"
-msgstr ""
-
-#: executor/execQual.c:211
-msgid "ExecEvalArrayRef: upper and lower indices mismatch"
-msgstr ""
-
-#: executor/execQual.c:292
-msgid "ExecEvalAggref: no aggregates in this expression context"
+msgid "null value for attribute \"%s\" violates NOT NULL constraint"
 msgstr ""
 
-#: executor/execQual.c:470
+#: executor/execMain.c:1701
 #, c-format
-msgid "ExecEvalParam: invalid paramkind %d"
+msgid "new row for relation \"%s\" violates CHECK constraint \"%s\""
 msgstr ""
 
-#: executor/execQual.c:482
+#: executor/execQual.c:180
+#: executor/execQual.c:204
+#: executor/execQual.c:1719
+#: utils/adt/array_userfuncs.c:362
+#: utils/adt/arrayfuncs.c:212
+#: utils/adt/arrayfuncs.c:378
+#: utils/adt/arrayfuncs.c:897
+#: utils/adt/arrayfuncs.c:2237
 #, c-format
-msgid "ExecEvalParam: Unknown value for parameter %s"
+msgid "number of array dimensions exceeds the maximum allowed, %d"
 msgstr ""
 
-#: executor/execQual.c:485
+#: executor/execQual.c:500
 #, c-format
-msgid "ExecEvalParam: Unknown value for parameter %d"
-msgstr ""
-
-#: executor/execQual.c:517
-msgid "GetAttributeByNum: Invalid attribute number"
-msgstr ""
-
-#: executor/execQual.c:520
-msgid "GetAttributeByNum: cannot access system attributes here"
+msgid "no value found for parameter \"%s\""
 msgstr ""
 
-#: executor/execQual.c:523
-msgid "GetAttributeByNum: a NULL isNull flag was passed"
-msgstr ""
-
-#: executor/execQual.c:551
-msgid "GetAttributeByName: Invalid attribute name"
-msgstr ""
-
-#: executor/execQual.c:554
-msgid "GetAttributeByName: a NULL isNull flag was passed"
-msgstr ""
-
-#: executor/execQual.c:576
+#: executor/execQual.c:505
 #, c-format
-msgid "GetAttributeByName: attribute %s not found"
+msgid "no value found for parameter %d"
 msgstr ""
 
-#: executor/execQual.c:603
-msgid "init_fcache: too many arguments"
-msgstr ""
+#: executor/execQual.c:665
+msgid "functions and operators can take at most one set argument"
+msgstr "функции и операторы принимают только один аргумент-множество (set)"
 
-#: executor/execQual.c:645
-msgid "Functions and operators can take only one set argument"
+#: executor/execQual.c:717
+#: executor/execQual.c:761
+#: executor/execQual.c:948
+#: executor/execQual.c:2959
+#: executor/functions.c:578
+#: executor/functions.c:617
+#: utils/adt/pgstatfuncs.c:191
+#: utils/adt/sets.c:207
+#: utils/fmgr/funcapi.c:38
+msgid "set-valued function called in context that cannot accept a set"
 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
-msgid "Set-valued function called in context that cannot accept a set"
+#: executor/execQual.c:1059
+#: executor/execQual.c:1100
+msgid "function returning tuple cannot return NULL"
 msgstr ""
 
-#: executor/execQual.c:1033 executor/execQual.c:1068
-msgid ""
-"ExecMakeTableFunctionResult: Invalid result from function returning tuple"
+#: executor/execQual.c:1064
+msgid "function returning tuple did not return a valid tuple slot"
 msgstr ""
 
-#: executor/execQual.c:1093
-msgid "ExecMakeTableFunctionResult: Materialize-mode protocol not followed"
+#: executor/execQual.c:1127
+msgid "table-function protocol for materialize mode was not followed"
 msgstr ""
 
-#: executor/execQual.c:1098
+#: executor/execQual.c:1134
 #, c-format
-msgid "ExecMakeTableFunctionResult: unknown returnMode %d"
+msgid "unrecognized table-function returnMode: %d"
 msgstr ""
 
-#: executor/execQual.c:1218
+#: executor/execQual.c:1247
 msgid "IS DISTINCT FROM does not support set arguments"
 msgstr ""
 
-#: executor/execQual.c:1470
-#, c-format
-msgid "ExecEvalNullTest: unexpected nulltesttype %d"
+#: executor/execQual.c:1315
+msgid "op ANY/ALL (array) does not support set arguments"
 msgstr ""
 
-#: executor/execQual.c:1555
-#, c-format
-msgid "ExecEvalBooleanTest: unexpected booltesttype %d"
+#: executor/execQual.c:1705
+msgid "cannot merge incompatible arrays"
 msgstr ""
 
-#: executor/execQual.c:1584
+#: executor/execQual.c:1706
 #, c-format
-msgid "Domain %s does not allow NULL values"
+msgid "Array with element type %s cannot be included in ARRAY construct with element type %s."
 msgstr ""
 
-#: executor/execQual.c:1611
-#, c-format
-msgid "ExecEvalConstraintTest: Domain %s constraint %s failed"
+#: executor/execQual.c:1739
+msgid "multidimensional arrays must have array expressions with matching dimensions"
 msgstr ""
 
-#: executor/execQual.c:1619
-msgid "ExecEvalConstraintTest: Constraint type unknown"
-msgstr ""
-
-#: executor/execQual.c:1791
-#, c-format
-msgid "ExecEvalExpr: unknown boolop %d"
+#: executor/execQual.c:1849
+msgid "NULLIF does not support set arguments"
 msgstr ""
 
-#: executor/execQual.c:1845
+#: executor/execQual.c:2030
 #, c-format
-msgid "ExecEvalExpr: unknown expression type %d"
+msgid "domain %s does not allow NULL values"
 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"
-msgstr ""
-
-#: executor/execQual.c:2016 executor/execQual.c:2153
-msgid "ExecInitExpr: SubPlan not expected here"
-msgstr ""
-
-#: executor/execQual.c:2129
+#: executor/execQual.c:2060
 #, c-format
-msgid "ExecInitExpr: unknown expression type %d"
+msgid "value for domain %s violates CHECK constraint \"%s\""
 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/execQual.c:2417
+#: optimizer/util/clauses.c:411
+#: parser/parse_agg.c:74
+msgid "aggregate function calls may not be nested"
 msgstr ""
 
-#: executor/functions.c:154
+#: executor/functions.c:183
 #, c-format
-msgid "init_sql_fcache: Cache lookup failed for procedure %u"
+msgid "could not determine actual result type for function declared %s"
 msgstr ""
 
-#: executor/functions.c:166
+#: executor/functions.c:254
 #, c-format
-msgid "init_sql_fcache: Cache lookup failed for type %u"
+msgid "could not determine actual type of argument declared %s"
 msgstr ""
 
-#: executor/functions.c:228
+#: executor/functions.c:673
 #, c-format
-msgid "init_sql_fcache: null prosrc for procedure %u"
-msgstr ""
-
-#: executor/instrument.c:40
-msgid "InstrStartTimer called twice in a row"
-msgstr ""
+msgid "SQL function \"%s\" query %d"
+msgstr "SQL-функция \"%s\" запрос %d"
 
-#: executor/instrument.c:56
-msgid "InstrStopNode without start"
-msgstr ""
-
-#: executor/nodeAgg.c:1253
+#: executor/functions.c:686
 #, c-format
-msgid "ExecAgg: cache lookup failed for aggregate %u"
-msgstr "ExecAgg: поиск в кэше агрегата %u не удался"
+msgid "SQL function \"%s\""
+msgstr "SQL-функция \"%s\""
 
-#: executor/nodeAgg.c:1308
+#: executor/functions.c:692
 #, c-format
-msgid "Aggregate %u needs to have compatible input type and transition type"
-msgstr ""
+msgid "SQL function \"%s\" during startup"
+msgstr "SQL-функция \"%s\" при старте"
 
-#: executor/nodeAgg.c:1357
+#: executor/nodeAgg.c:1314
 #, c-format
-msgid ""
-"GetAggInitVal: cache lookup failed on aggregate transition function return "
-"type %u"
+msgid "aggregate %u needs to have compatible input type and transition type"
 msgstr ""
 
-#: executor/nodeAgg.c:1465
+#: executor/nodeIndexscan.c:970
 #, c-format
-msgid "Aggregate function %u called as normal function"
+msgid "indexes of relation %u were deactivated"
 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:705
-#, c-format
-msgid "ComputeHashFunc: Invalid typLen %d"
-msgstr "ComputeHashFunc: Не верный typLen %d"
-
-#: executor/nodeHashjoin.c:363
+#: executor/nodeHashjoin.c:561
+#: executor/nodeHashjoin.c:571
 #, c-format
-msgid "ExecInitHashJoin: unsupported join type %d"
-msgstr ""
-
-#: executor/nodeHashjoin.c:541 executor/nodeHashjoin.c:549
-msgid "Read from hashjoin temp file failed"
-msgstr ""
-
-#: executor/nodeHashjoin.c:605 executor/nodeHashjoin.c:610
-msgid "Failed to rewind hash temp file"
+msgid "read from hashjoin temp file failed: %m"
 msgstr ""
 
-#: executor/nodeHashjoin.c:659 executor/nodeHashjoin.c:662
-msgid "Write to hashjoin temp file failed"
-msgstr ""
-
-#: executor/nodeIndexscan.c:675
-msgid "ExecInitIndexScan: indxqual not an opclause!"
-msgstr ""
-
-#: executor/nodeIndexscan.c:777 executor/nodeIndexscan.c:814
+#: executor/nodeHashjoin.c:629
+#: executor/nodeHashjoin.c:636
 #, c-format
-msgid "ExecInitIndexScan: %s"
-msgstr "ExecInitIndexScan: %s"
-
-#: executor/nodeIndexscan.c:887
-#, 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"
+msgid "failed to rewind hashjoin temp file: %m"
 msgstr ""
 
-#: executor/nodeLimit.c:198
+#: executor/nodeHashjoin.c:687
+#: executor/nodeHashjoin.c:692
 #, c-format
-msgid "ExecLimit: impossible state %d"
+msgid "write to hashjoin temp file failed: %m"
 msgstr ""
 
-#: executor/nodeMergejoin.c:132
-msgid "MJFormSkipQuals: op not an OpExpr!"
+#: executor/spi.c:725
+msgid "cannot open multi-query plan as cursor"
 msgstr ""
 
-#: executor/nodeMergejoin.c:400
-#, c-format
-msgid "ExecMergeJoin: unsupported join type %d"
+#: executor/spi.c:732
+msgid "cannot open non-SELECT query as cursor"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1384
-#, c-format
-msgid "ExecMergeJoin: invalid join state %d, aborting"
+#: executor/spi.c:736
+msgid "cannot open SELECT INTO query as cursor"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1471
+#: executor/nodeMergejoin.c:1479
 msgid "RIGHT JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1486 optimizer/path/joinpath.c:904
+#: executor/nodeMergejoin.c:1496
+#: optimizer/path/joinpath.c:821
 msgid "FULL JOIN is only supported with mergejoinable join conditions"
 msgstr ""
 
-#: executor/nodeMergejoin.c:1489
-#, c-format
-msgid "ExecInitMergeJoin: unsupported join type %d"
-msgstr ""
-
-#: executor/nodeNestloop.c:322
-#, c-format
-msgid "ExecInitNestLoop: unsupported join type %d"
-msgstr ""
-
-#: executor/nodeSetOp.c:173
-#, c-format
-msgid "ExecSetOp: bogus command code %d"
-msgstr ""
-
-#: executor/nodeSort.c:52
-msgid "ExtractSortKeys: keycount <= 0"
-msgstr ""
-
-#: executor/nodeSubplan.c:56
-msgid "ExecSubPlan: can't set parent params from subquery"
-msgstr ""
-
-#: executor/nodeSubplan.c:125 executor/nodeSubplan.c:150
-#: executor/nodeSubplan.c:427
-msgid "More than one tuple returned by a subselect used as an expression."
-msgstr ""
-
-#: executor/nodeSubplan.c:193
-msgid "ExecSubPlan: failed to find placeholder for subplan result"
-msgstr ""
-
-#: executor/nodeSubplan.c:400
-msgid "ExecSetParamPlan: ANY/ALL subselect unsupported"
+#: executor/nodeSubplan.c:290
+#: executor/nodeSubplan.c:332
+#: executor/nodeSubplan.c:966
+msgid "more than one tuple returned by a subselect used as an expression"
 msgstr ""
 
-#: executor/nodeSubplan.c:516
-msgid "ExecReScanSetParamPlan: direct correlated subquery unsupported, yet"
-msgstr ""
-
-#: executor/nodeSubplan.c:518
-msgid "ExecReScanSetParamPlan: setParam list is NULL"
-msgstr ""
-
-#: executor/nodeSubplan.c:520
-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"
-msgstr ""
-
-#: executor/spi.c:82
-msgid "Memory exhausted in SPI_connect"
-msgstr ""
-
-#: executor/spi.c:148
-msgid "Memory exhausted in SPI_finish"
-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"
-msgstr ""
-
-#: executor/spi.c:714
-msgid "cannot open multi-query plan as cursor"
-msgstr ""
-
-#: executor/spi.c:719
-msgid "plan in SPI_cursor_open() is not a SELECT"
-msgstr ""
-
-#: executor/spi.c:721
-msgid "plan in SPI_cursor_open() must NOT be a DECLARE already"
-msgstr ""
-
-#: executor/spi.c:723
-msgid "plan in SPI_cursor_open() must NOT be a SELECT INTO"
-msgstr ""
-
-#: executor/spi.c:754
-#, c-format
-msgid "cursor \"%s\" already in use"
-msgstr ""
-
-#: executor/spi.c:760
+#: libpq/be-fsstubs.c:124
+#: libpq/be-fsstubs.c:162
+#: libpq/be-fsstubs.c:186
+#: libpq/be-fsstubs.c:214
+#: libpq/be-fsstubs.c:271
 #, c-format
-msgid "failed to create portal \"%s\""
+msgid "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:375
+msgid "must be superuser to use server-side lo_import()"
 msgstr ""
 
-#: executor/spi.c:894
-msgid "SPI: improper call to spi_printtup"
+#: libpq/be-fsstubs.c:376
+msgid "Anyone can use the client-side lo_import() provided by libpq."
 msgstr ""
 
-#: executor/spi.c:896
-msgid "SPI: stack corrupted in spi_printtup"
-msgstr ""
-
-#: executor/spi.c:1275
-msgid "SPI_select: retrieve into portal not implemented"
-msgstr ""
-
-#: executor/spi.c:1285
-msgid "SPI_select: # of processed tuples check failed"
-msgstr ""
-
-#: executor/spi.c:1384
-msgid "SPI_fetch: # of processed tuples check failed"
-msgstr ""
-
-#: lib/dllist.c:41
-msgid "Memory exhausted in DLNewList"
-msgstr ""
-
-#: lib/dllist.c:84
-msgid "Memory exhausted in DLNewElem"
-msgstr ""
-
-#: libpq/auth.c:106
-#, c-format
-msgid "pg_krb4_recvauth: kerberos error: %s"
-msgstr ""
-
-#: libpq/auth.c:112
+#: libpq/be-fsstubs.c:391
 #, c-format
-msgid "pg_krb4_recvauth: protocol version \"%s\" != \"%s\""
-msgstr ""
+msgid "could not open server file \"%s\": %m"
+msgstr "не получилось отктрыть файл сервера \"%s\": %m"
 
-#: libpq/auth.c:118
+#: libpq/be-fsstubs.c:412
 #, c-format
-msgid "pg_krb4_recvauth: name \"%s\" != \"%s\""
-msgstr ""
+msgid "could not read server file \"%s\": %m"
+msgstr "не получилось считать файл сервера \"%s\": %m"
 
-#: libpq/auth.c:130
-msgid "pg_krb4_recvauth: Kerberos not implemented on this server"
+#: libpq/be-fsstubs.c:442
+msgid "must be superuser to use server-side lo_export()"
 msgstr ""
 
-#: libpq/auth.c:190
-#, c-format
-msgid "pg_krb5_init: krb5_init_context returned Kerberos error %d"
+#: libpq/be-fsstubs.c:443
+msgid "Anyone can use the client-side lo_export() provided by libpq."
 msgstr ""
 
-#: libpq/auth.c:199
+#: libpq/be-fsstubs.c:469
 #, c-format
-msgid "pg_krb5_init: krb5_kt_resolve returned Kerberos error %d"
-msgstr ""
+msgid "could not create server file \"%s\": %m"
+msgstr "не получилось создать файл сервера \"%s\": %m"
 
-#: libpq/auth.c:211
+#: libpq/be-fsstubs.c:481
 #, c-format
-msgid "pg_krb5_init: krb5_sname_to_principal returned Kerberos error %d"
-msgstr ""
+msgid "could not write server file \"%s\": %m"
+msgstr "не получилось записать файл сервера \"%s\": %m"
 
-#: libpq/auth.c:255
+#: libpq/auth.c:113
 #, c-format
-msgid "pg_krb5_recvauth: krb5_recvauth returned Kerberos error %d"
-msgstr ""
+msgid "kerberos error: %s"
+msgstr "ошибка kerberos: %s"
 
-#: libpq/auth.c:279
+#: libpq/auth.c:119
 #, c-format
-msgid "pg_krb5_recvauth: krb5_unparse_name returned Kerberos error %d"
+msgid "kerberos protocol version \"%s\" != \"%s\""
 msgstr ""
 
-#: libpq/auth.c:290
+#: libpq/auth.c:126
+#: libpq/auth.c:306
 #, c-format
-msgid "pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\""
+msgid "kerberos user name \"%s\" != \"%s\""
 msgstr ""
 
-#: libpq/auth.c:309
-msgid "pg_krb5_recvauth: Kerberos not implemented on this server"
+#: libpq/auth.c:140
+msgid "kerberos v4 not implemented on this server"
 msgstr ""
 
-#: libpq/auth.c:374
+#: libpq/auth.c:201
 #, c-format
-msgid "%s authentication failed for user \"%s\""
-msgstr ""
-
-#: libpq/auth.c:396
-msgid "Missing or erroneous pg_hba.conf file, see postmaster log for details"
+msgid "kerberos init returned error %d"
 msgstr ""
 
-#: libpq/auth.c:417
+#: libpq/auth.c:211
 #, c-format
-msgid "No pg_hba.conf entry for host %s, user %s, database %s"
+msgid "kerberos keytab resolve returned error %d"
 msgstr ""
 
-#: libpq/auth.c:452
+#: libpq/auth.c:224
 #, c-format
-msgid "pg_local_sendauth: can't do setsockopt: %m"
+msgid "kerberos sname_to_principal(\"%s\") returned error %d"
 msgstr ""
 
-#: libpq/auth.c:541
+#: libpq/auth.c:269
 #, c-format
-msgid "pam_passwd_conv_proc: Error from underlying PAM layer: '%s'"
+msgid "kerberos recvauth returned error %d"
 msgstr ""
 
-#: libpq/auth.c:545
+#: libpq/auth.c:294
 #, c-format
-msgid "pam_passwd_conv_proc: Unexpected PAM conversation %d/'%s'"
-msgstr ""
-
-#: libpq/auth.c:575
-msgid "received PAM packet"
+msgid "kerberos unparse_name returned error %d"
 msgstr ""
 
-#: libpq/auth.c:579
-msgid "pam_passwd_conv_proc: no password"
+#: libpq/auth.c:327
+msgid "kerberos v5 not implemented on this server"
 msgstr ""
 
-#: libpq/auth.c:592
-msgid "pam_passwd_conv_proc: Out of memory!"
-msgstr ""
-
-#: libpq/auth.c:636
+#: libpq/auth.c:394
 #, c-format
-msgid "CheckPAMAuth: Failed to create PAM authenticator: '%s'"
+msgid "%s authentication failed for user \"%s\""
 msgstr ""
 
-#: libpq/auth.c:646
-#, c-format
-msgid "CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'"
+#: libpq/auth.c:418
+msgid "missing or erroneous pg_hba.conf file"
 msgstr ""
 
-#: libpq/auth.c:656
-#, c-format
-msgid "CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'"
+#: libpq/auth.c:419
+msgid "See postmaster log for details."
 msgstr ""
 
-#: libpq/auth.c:666
+#: libpq/auth.c:445
 #, c-format
-msgid "CheckPAMAuth: pam_authenticate failed: '%s'"
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s"
 msgstr ""
 
-#: libpq/auth.c:676
-#, c-format
-msgid "CheckPAMAuth: pam_acct_mgmt failed: '%s'"
-msgstr ""
+#: libpq/auth.c:447
+msgid "SSL on"
+msgstr "SSL вкл."
 
-#: libpq/auth.c:686
-#, c-format
-msgid "CheckPAMAuth: Failed to release PAM authenticator: '%s'"
-msgstr ""
+#: libpq/auth.c:447
+msgid "SSL off"
+msgstr "SSL выкл."
 
-#: libpq/auth.c:726
+#: libpq/auth.c:451
 #, c-format
-msgid "unexpected password packet size: read %d, expected %d"
+msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\""
 msgstr ""
 
-#: libpq/auth.c:730
-msgid "received password packet"
+#: libpq/auth.c:463
+msgid "kerberos 4 only supports IPv4 connections"
 msgstr ""
 
-#: libpq/be-fsstubs.c:84
+#: libpq/auth.c:495
 #, c-format
-msgid "lo_open(%u,%d)"
+msgid "failed to enable credential receipt: %m"
 msgstr ""
 
-#: libpq/be-fsstubs.c:102
+#: libpq/auth.c:582
 #, c-format
-msgid "cannot open large object %u"
+msgid "error from underlying PAM layer: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:122
+#: libpq/auth.c:587
 #, c-format
-msgid "lo_close: invalid large obj descriptor (%d)"
+msgid "unsupported PAM conversation %d/%s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:126
-#, c-format
-msgid "lo_close(%d)"
+#: libpq/auth.c:619
+msgid "empty password returned by client"
 msgstr ""
 
-#: libpq/be-fsstubs.c:158
+#: libpq/auth.c:679
 #, c-format
-msgid "lo_read: invalid large obj descriptor (%d)"
+msgid "Failed to create PAM authenticator: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:180
+#: libpq/auth.c:690
 #, c-format
-msgid "lo_write: invalid large obj descriptor (%d)"
+msgid "pam_set_item(PAM_USER) failed: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:206
+#: libpq/auth.c:701
 #, c-format
-msgid "lo_lseek: invalid large obj descriptor (%d)"
+msgid "pam_set_item(PAM_CONV) failed: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:261
+#: libpq/auth.c:712
 #, 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."
+msgid "pam_authenticate failed: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:378
+#: libpq/auth.c:723
 #, c-format
-msgid "lo_import: can't open unix file \"%s\": %m"
+msgid "pam_acct_mgmt failed: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:386
+#: libpq/auth.c:734
 #, c-format
-msgid "lo_import: can't create inv object for \"%s\""
+msgid "failed to release PAM authenticator: %s"
 msgstr ""
 
-#: libpq/be-fsstubs.c:397
+#: libpq/auth.c:772
 #, c-format
-msgid "lo_import: error while reading \"%s\""
+msgid "expected password response, got msg type %d"
 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."
-msgstr ""
-
-#: libpq/be-fsstubs.c:436
-#, c-format
-msgid "lo_export: can't open inv object %u"
+#: libpq/auth.c:800
+msgid "invalid password packet size"
 msgstr ""
 
-#: libpq/be-fsstubs.c:454
-#, c-format
-msgid "lo_export: can't open unix file \"%s\": %m"
+#: libpq/auth.c:804
+msgid "received password packet"
 msgstr ""
 
-#: libpq/be-fsstubs.c:464
+#: libpq/be-secure.c:274
+#: libpq/be-secure.c:358
 #, c-format
-msgid "lo_export: error while writing \"%s\""
+msgid "SSL SYSCALL error: %m"
 msgstr ""
 
-#: libpq/be-secure.c:292 libpq/be-secure.c:342
-#, c-format
-msgid "SSL SYSCALL error: %s"
+#: libpq/be-secure.c:279
+#: libpq/be-secure.c:363
+msgid "SSL SYSCALL error: EOF detected"
 msgstr ""
 
-#: libpq/be-secure.c:295 libpq/be-secure.c:345
+#: libpq/be-secure.c:287
+#: libpq/be-secure.c:371
 #, c-format
 msgid "SSL error: %s"
-msgstr ""
-
-#: libpq/be-secure.c:397
-#, c-format
-msgid "DH errors (%s): %d bits expected, %d bits found"
-msgstr ""
-
-#: libpq/be-secure.c:407
-#, c-format
-msgid "DH_check error (%s): %s"
-msgstr ""
+msgstr "Ошибка SSL: %s"
 
-#: libpq/be-secure.c:412
-#, c-format
-msgid "DH error (%s): p is not prime"
-msgstr ""
-
-#: libpq/be-secure.c:419
-#, c-format
-msgid "DH error (%s): neither suitable generator or safe prime"
-msgstr ""
-
-#: libpq/be-secure.c:445
-#, c-format
-msgid "DH load buffer: %s"
-msgstr ""
-
-#: libpq/be-secure.c:517
-#, c-format
-msgid "DH: generating parameters (%d bits)...."
-msgstr ""
-
-#: libpq/be-secure.c:551
-msgid "SSL: handshake start"
-msgstr ""
-
-#: libpq/be-secure.c:554
-msgid "SSL: handshake done"
+#: libpq/be-secure.c:296
+#: libpq/be-secure.c:380
+msgid "unrecognized SSL error code"
 msgstr ""
 
-#: libpq/be-secure.c:557
-msgid "SSL: accept loop"
+#: libpq/be-secure.c:326
+#: libpq/be-secure.c:330
+#: libpq/be-secure.c:340
+msgid "SSL renegotiation failure"
 msgstr ""
 
-#: libpq/be-secure.c:560
-#, c-format
-msgid "SSL: accept exit (%d)"
-msgstr ""
-
-#: libpq/be-secure.c:563
-msgid "SSL: connect loop"
-msgstr ""
-
-#: libpq/be-secure.c:566
-#, c-format
-msgid "SSL: connect exit (%d)"
-msgstr ""
-
-#: libpq/be-secure.c:569
-#, c-format
-msgid "SSL: read alert (0x%04x)"
+#: libpq/be-secure.c:334
+msgid "SSL failed to send renegotiation request"
 msgstr ""
 
-#: libpq/be-secure.c:572
-#, c-format
-msgid "SSL: write alert (0x%04x)"
-msgstr ""
-
-#: libpq/be-secure.c:593
+#: libpq/be-secure.c:632
 #, c-format
-msgid "failed to create SSL context: %s"
+msgid "could not create SSL context: %s"
 msgstr "не удалось создать контекст SSL: %s"
 
-#: libpq/be-secure.c:604
-#, c-format
-msgid "failed to load server certificate (%s): %s"
-msgstr "не удалось загрузить сертификат сервера (%s): %s"
-
-#: libpq/be-secure.c:612
-#, c-format
-msgid "failed to stat private key file (%s): %s"
-msgstr ""
-
-#: libpq/be-secure.c:619
-#, c-format
-msgid ""
-"bad permissions on private key file (%s)\n"
-"File must be owned by the proper user and must have no permissions for\n"
-"\"group\" or \"other\"."
-msgstr ""
-
-#: libpq/be-secure.c:626
+#: libpq/be-secure.c:642
 #, c-format
-msgid "failed to load private key file (%s): %s"
-msgstr ""
-
-#: libpq/be-secure.c:632
-#, c-format
-msgid "check of private key failed: %s"
-msgstr ""
+msgid "could not load server certificate file \"%s\": %s"
+msgstr "не удалось загрузить сертификат сервера \"%s\": %s"
 
 #: libpq/be-secure.c:649
 #, c-format
-msgid "could not read root cert file (%s): %s"
-msgstr "не получилось файл корневого сертификата (%s): %s"
-
-#: libpq/be-secure.c:683
-#, c-format
-msgid "failed to initialize SSL connection: %s"
-msgstr "не удалось инициализировать SSL-подсоединение: %s"
-
-#: libpq/be-secure.c:705
-#, 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' не может использоваться."
-
-#: libpq/hba.c:127
-#, c-format
-msgid "Token too long in authentication file, skipping, %s"
-msgstr ""
-
-#: libpq/hba.c:260
-#, c-format
-msgid ""
-"tokenize_inc_file: Unable to open secondary authentication file \"@%s\" as "
-"\"%s\": %m"
-msgstr ""
-
-#: libpq/hba.c:663
-#, c-format
-msgid "parse_hba: invalid syntax in pg_hba.conf file at line %d, token \"%s\""
-msgstr ""
-
-#: libpq/hba.c:716 libpq/hba.c:738
-#, c-format
-msgid "could not open %s: %m"
-msgstr "не получилось отктрыть %s: %m"
-
-#: libpq/hba.c:849
-#, c-format
-msgid "load_hba: Unable to open authentication config file \"%s\": %m"
+msgid "could not access private key file \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:909
+#: libpq/be-secure.c:655
 #, c-format
-msgid ""
-"parse_ident_usermap: invalid syntax in pg_ident.conf file at line %d, token "
-"\"%s\""
+msgid "unsafe permissions on private key file \"%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."
+#: libpq/be-secure.c:657
+msgid "File must be owned by the database user and must have no permissions for \"group\" or \"other\"."
 msgstr ""
 
-#: libpq/hba.c:991
+#: libpq/be-secure.c:661
 #, c-format
-msgid "load_ident: Unable to open usermap file \"%s\": %m"
+msgid "could not load private key file \"%s\": %s"
 msgstr ""
 
-#: libpq/hba.c:1113
+#: libpq/be-secure.c:666
 #, c-format
-msgid "Failed to create socket on which to talk to Ident server: %m"
-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 "check of private key failed: %s"
 msgstr ""
 
-#: libpq/hba.c:1172
+#: libpq/be-secure.c:684
 #, 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"
-msgstr ""
+msgid "could not load root cert file \"%s\": %s"
+msgstr "не получилось загрузить файл корневого сертификата \"%s\": %s"
 
-#: 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"
+#: libpq/be-secure.c:686
+msgid "Will not verify client certificates."
 msgstr ""
 
-#: libpq/hba.c:1230 libpq/hba.c:1258 libpq/hba.c:1323
+#: libpq/be-secure.c:721
 #, c-format
-msgid "ident_unix: error receiving credentials: %m"
-msgstr ""
+msgid "could not initialize SSL connection: %s"
+msgstr "не удалось инициализировать SSL-подсоединение: %s"
 
-#: libpq/hba.c:1238 libpq/hba.c:1266 libpq/hba.c:1332
+#: libpq/be-secure.c:745
 #, c-format
-msgid "ident_unix: unknown local user with uid %d"
+msgid "secure connection from \"%s\""
 msgstr ""
 
-#: libpq/hba.c:1342
-msgid "'ident' auth is not supported on local connections on this platform"
+#: libpq/crypt.c:62
+msgid "cannot use CRYPT auth method because password is MD5-encrypted"
 msgstr ""
 
-#: libpq/pqcomm.c:196
+#: libpq/hba.c:129
 #, c-format
-msgid "StreamServerPort: socket() failed: %m"
+msgid "authentication file token too long, skipping: \"%s\""
 msgstr ""
 
-#: libpq/pqcomm.c:205
+#: libpq/hba.c:265
 #, c-format
-msgid "StreamServerPort: setsockopt(SO_REUSEADDR) failed: %m"
+msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
 msgstr ""
 
-#: libpq/pqcomm.c:246
+#: libpq/hba.c:666
 #, c-format
-msgid "StreamServerPort: gethostbyname(%s) failed"
+msgid "could not interpret IP address \"%s\" in config file: %s"
 msgstr ""
 
-#: libpq/pqcomm.c:262
+#: libpq/hba.c:742
 #, c-format
-msgid ""
-"StreamServerPort: bind() failed: %m\n"
-"\tIs another postmaster already running on port %d?\n"
-"\tIf not, remove socket node (%s) and retry."
+msgid "invalid entry in pg_hba.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: libpq/pqcomm.c:267
-#, c-format
-msgid ""
-"StreamServerPort: bind() failed: %m\n"
-"\tIs another postmaster already running on port %d?\n"
-"\tIf not, wait a few seconds and retry."
-msgstr ""
-
-#: libpq/pqcomm.c:306
-#, c-format
-msgid "No such group as '%s'"
-msgstr "Группы '%s' нету"
-
-#: libpq/pqcomm.c:314
-#, c-format
-msgid "Could not set group of %s: %m"
-msgstr "Не получилось установить группу %s: %m"
-
-#: libpq/pqcomm.c:322
+#: libpq/hba.c:747
 #, c-format
-msgid "Could not set permissions on %s: %m"
+msgid "missing field in pg_hba.conf file at end of line %d"
 msgstr ""
 
-#: libpq/pqcomm.c:341
-#, c-format
-msgid "StreamServerPort: listen() failed: %m"
-msgstr "StreamServerPort: listen() не удался: %m"
-
-#: libpq/pqcomm.c:371
-#, c-format
-msgid "StreamConnection: accept() failed: %m"
-msgstr "StreamConnection: accept() не удался: %m"
-
-#: libpq/pqcomm.c:390
-#, c-format
-msgid "StreamConnection: getsockname() failed: %m"
-msgstr "StreamConnection: getsockname() не удался: %m"
-
-#: libpq/pqcomm.c:402
+#: libpq/hba.c:806
+#: libpq/hba.c:830
+#: storage/smgr/smgr.c:278
+#: utils/init/miscinit.c:775
 #, c-format
-msgid "StreamConnection: setsockopt(TCP_NODELAY) failed: %m"
-msgstr "StreamConnection: setsockopt(TCP_NODELAY) не удался: %m"
+msgid "could not open \"%s\": %m"
+msgstr "не получилось отктрыть \"%s\": %m"
 
-#: libpq/pqcomm.c:408
+#: libpq/hba.c:949
 #, c-format
-msgid "StreamConnection: setsockopt(SO_KEEPALIVE) failed: %m"
-msgstr "StreamConnection: setsockopt(SO_KEEPALIVE) не удался: %m"
-
-#: libpq/pqcomm.c:476
-#, c-format
-msgid "pq_recvbuf: recv() failed: %m"
-msgstr ""
-
-#: libpq/pqcomm.c:482
-msgid "pq_recvbuf: unexpected EOF on client connection"
-msgstr ""
+msgid "could not open config file \"%s\": %m"
+msgstr "не получилось отктрыть файл конфигурации \"%s\": %m"
 
-#: libpq/pqcomm.c:680
+#: libpq/hba.c:1011
 #, c-format
-msgid "pq_flush: send() failed: %m"
+msgid "invalid entry in pg_ident.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: libpq/pqcomm.c:714
+#: libpq/hba.c:1016
 #, c-format
-msgid "pq_eof: recv() failed: %m"
+msgid "missing entry in pg_ident.conf file at end of line %d"
 msgstr ""
 
-#: libpq/pqformat.c:159
-#, c-format
-msgid "pq_sendint: unsupported size %d"
+#: libpq/hba.c:1048
+msgid "cannot use IDENT authentication without usermap field"
 msgstr ""
 
-#: libpq/pqformat.c:241
+#: libpq/hba.c:1096
 #, c-format
-msgid "pq_getint: unsupported size %d"
+msgid "could not open usermap file \"%s\": %m"
 msgstr ""
 
-#: main/main.c:83
+#: libpq/hba.c:1267
 #, c-format
-msgid "%s: setsysinfo failed: %s\n"
-msgstr ""
-
-#: main/main.c:172
-msgid ""
-"\"root\" execution of the PostgreSQL server is not permitted.\n"
-"\n"
-"The server must be started under an unprivileged user id to prevent\n"
-"a possible system security compromise.  See the documentation for\n"
-"more information on how to properly start the server.\n"
-"\n"
+msgid "could not create socket for IDENT connection: %m"
 msgstr ""
 
-#: main/main.c:192
+#: libpq/hba.c:1283
 #, c-format
-msgid "%s: real and effective user ids must match\n"
+msgid "could not bind to local address \"%s\": %m"
 msgstr ""
 
-#: main/main.c:227
+#: libpq/hba.c:1295
 #, c-format
-msgid "%s: invalid current euid %d\n"
+msgid "could not connect to IDENT server at address \"%s\", port %s): %m"
 msgstr ""
 
-#: nodes/copyfuncs.c:1218
+#: libpq/hba.c:1315
 #, c-format
-msgid "_copyAConst: unknown node type %d"
+msgid "could not send query to IDENT server at address \"%s\", port %s): %m"
 msgstr ""
 
-#: nodes/copyfuncs.c:2304
+#: libpq/hba.c:1330
 #, c-format
-msgid "_copyValue: unknown node type %d"
+msgid "could not receive response from IDENT server at address \"%s\", port %s): %m"
 msgstr ""
 
-#: nodes/copyfuncs.c:2796
+#: libpq/hba.c:1371
+#: libpq/hba.c:1402
+#: libpq/hba.c:1470
 #, c-format
-msgid "copyObject: don't know how to copy node type %d"
+msgid "could not receive credentials: %m"
 msgstr ""
 
-#: nodes/equalfuncs.c:178
+#: libpq/hba.c:1380
+#: libpq/hba.c:1411
+#: libpq/hba.c:1481
 #, c-format
-msgid "_equalParam: Invalid paramkind value: %d"
+msgid "local user with uid %d is not known to getpwuid"
 msgstr ""
 
-#: nodes/equalfuncs.c:1490
-#, c-format
-msgid "_equalValue: unknown node type %d"
+#: libpq/hba.c:1493
+msgid "IDENT auth is not supported on local connections on this platform"
 msgstr ""
 
-#: nodes/equalfuncs.c:1931
+#: libpq/pqcomm.c:248
 #, c-format
-msgid "equal: don't know whether nodes of type %d are equal"
-msgstr ""
-
-#: nodes/list.c:162
-msgid "tryout to nconc a list to itself"
+msgid "could not translate hostname \"%s\", service \"%s\" to address: %s"
 msgstr ""
 
-#: nodes/list.c:245
-msgid "llast: empty list"
-msgstr "llast: пустой список"
-
-#: nodes/list.c:260
-msgid "llasti: empty list"
-msgstr "llasti: пустой список"
-
-#: nodes/outfuncs.c:1191 nodes/readfuncs.c:821
+#: libpq/pqcomm.c:252
 #, c-format
-msgid "bogus rte kind %d"
+msgid "could not translate service \"%s\" to address: %s"
 msgstr ""
 
-#: nodes/outfuncs.c:1257
-#, c-format
-msgid "_outValue: don't know how to print type %d"
-msgstr "_outValue: не известно как печатать тип %d"
-
-#: nodes/outfuncs.c:1644
-#, c-format
-msgid "_outNode: don't know how to print type %d"
-msgstr "_outNode: не известно как печатать тип %d"
-
-#: nodes/print.c:85
-#, c-format
-msgid ""
-"%s:\n"
-"%s"
-msgstr ""
-"%s:\n"
-"%s"
+#: libpq/pqcomm.c:285
+msgid "IPv4"
+msgstr "IPv4"
 
-#: nodes/print.c:353
-#, c-format
-msgid "Cache lookup for type %u failed"
-msgstr "Поиск в кзше типа %u не удался"
+#: libpq/pqcomm.c:289
+msgid "IPv6"
+msgstr "IPv6"
 
-#: nodes/read.c:296
-msgid "nodeRead: did not find '}' at end of node"
-msgstr "nodeRead: скобка '}' не была обнаружена в конце узла"
+#: libpq/pqcomm.c:294
+msgid "Unix"
+msgstr "Unix"
 
-#: nodes/read.c:376
+#: libpq/pqcomm.c:299
 #, c-format
-msgid "nodeRead: Bad type %d"
-msgstr ""
-
-#: nodes/readfuncs.c:149
-msgid "toIntList: unexpected datatype"
-msgstr ""
-
-#: nodes/readfuncs.c:183
-msgid "toOidList: unexpected datatype"
+msgid "unrecognized address family %d"
 msgstr ""
 
-#: nodes/readfuncs.c:518
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:310
 #, c-format
-msgid "_readBoolExpr: unknown boolop \"%.*s\""
-msgstr ""
+msgid "could not create %s socket: %m"
+msgstr "не получилось создать сокет %s: %m"
 
-#: nodes/readfuncs.c:926
+#: libpq/pqcomm.c:322
 #, c-format
-msgid "badly formatted node string \"%.32s\"..."
-msgstr ""
+msgid "setsockopt(SO_REUSEADDR) failed: %m"
+msgstr "setsockopt(SO_REUSEADDR) не удался: %m"
 
-#: nodes/readfuncs.c:959 nodes/readfuncs.c:991
+#: libpq/pqcomm.c:336
 #, c-format
-msgid "readDatum: expected '%s', got '%s'; length = %lu"
-msgstr ""
+msgid "setsockopt(IPV6_V6ONLY) failed: %m"
+msgstr "setsockopt(IPV6_V6ONLY) не удался: %m"
 
-#: nodes/readfuncs.c:966
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:355
 #, c-format
-msgid "readDatum: byval & length = %lu"
-msgstr ""
-
-#: optimizer/geqo/geqo_erx.c:336
-msgid "gimme_gene: Internal error - minimum_count not set"
-msgstr ""
-
-#: optimizer/geqo/geqo_erx.c:362
-msgid "gimme_gene: neither shared nor minimum number nor random edge found"
-msgstr ""
-
-#: optimizer/geqo/geqo_erx.c:422
-msgid "edge_failure(1): no edge found via random decision and total_edges == 4"
-msgstr ""
-
-#: optimizer/geqo/geqo_erx.c:447
-msgid "edge_failure(2): no edge found via random decision and remainig edges"
-msgstr ""
-
-#: optimizer/geqo/geqo_erx.c:465
-msgid "edge_failure(3): no edge found via looking for the last ununsed point"
-msgstr ""
-
-#: optimizer/geqo/geqo_erx.c:470
-msgid "edge_failure: no edge detected"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:123
-msgid "geqo_main: using edge recombination crossover [ERX]"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:127
-msgid "geqo_main: using partially matched crossover [PMX]"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:131
-msgid "geqo_main: using cycle crossover [CX]"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:136
-msgid "geqo_main: using position crossover [PX]"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:141
-msgid "geqo_main: using order crossover [OX1]"
+msgid "could not bind %s socket: %m"
 msgstr ""
 
-#: optimizer/geqo/geqo_main.c:146
-msgid "geqo_main: using order crossover [OX2]"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:211
+#: libpq/pqcomm.c:358
 #, c-format
-msgid "[GEQO] failures: %d, average: %d"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:214
-msgid "[GEQO] No edge failures detected."
+msgid "Is another postmaster already running on port %d? If not, remove socket node \"%s\" and retry."
 msgstr ""
 
-#: optimizer/geqo/geqo_main.c:220
+#: libpq/pqcomm.c:361
 #, c-format
-msgid "[GEQO] mutations: %d, generations: %d"
-msgstr ""
-
-#: optimizer/geqo/geqo_main.c:222
-msgid "[GEQO] No mutations processed."
-msgstr ""
-
-#: optimizer/geqo/geqo_misc.c:41
-msgid "avg_pool: pool_size of zero"
-msgstr ""
-
-#: optimizer/path/allpaths.c:204
-msgid "SELECT FOR UPDATE is not supported for inherit queries"
+msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr ""
 
-#: optimizer/path/allpaths.c:616
+#. translator: %s is IPv4, IPv6, or Unix
+#: libpq/pqcomm.c:395
 #, c-format
-msgid "recurse_pushdown_safe: unexpected node %d"
-msgstr "recurse_pushdown_safe: неожиданный узел %d"
-
-#: optimizer/path/allpaths.c:684
-#, c-format
-msgid "recurse_push_qual: unexpected node %d"
-msgstr "recurse_push_qual: неожиданный узел %d"
-
-#: optimizer/path/clausesel.c:533
-#, c-format
-msgid "clause_selectivity: s1 %f"
-msgstr "clause_selectivity: s1 %f"
-
-#: optimizer/path/costsize.c:1461
-#, c-format
-msgid "set_joinrel_size_estimates: unsupported join type %d"
-msgstr ""
-
-#: optimizer/path/indxpath.c:495
-msgid "extract_or_indexqual_conditions: no matching clause"
-msgstr ""
-
-#: optimizer/path/indxpath.c:1260
-msgid "pred_test_simple_clause: unknown test_op"
+msgid "could not listen on %s socket: %m"
 msgstr ""
 
-#: optimizer/path/indxpath.c:1301
-msgid "pred_test_simple_clause: null test result"
-msgstr ""
-
-#: optimizer/path/indxpath.c:2084
+#: libpq/pqcomm.c:485
 #, c-format
-msgid "prefix_quals: unexpected operator %u"
-msgstr ""
+msgid "could not set group of \"%s\": %m"
+msgstr "не получилось установить группу \"%s\": %m"
 
-#: optimizer/path/indxpath.c:2100
+#: libpq/pqcomm.c:496
 #, c-format
-msgid "prefix_quals: no = operator for type %u"
-msgstr ""
+msgid "could not set permissions of \"%s\": %m"
+msgstr "не получилось установить права доступа для \"%s\": %m"
 
-#: optimizer/path/indxpath.c:2115
+#: libpq/pqcomm.c:526
 #, c-format
-msgid "prefix_quals: no >= operator for type %u"
+msgid "could not accept new connection: %m"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2131
+#: libpq/pqcomm.c:678
 #, c-format
-msgid "prefix_quals: no < operator for type %u"
+msgid "could not receive data from client: %m"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2177
-#, c-format
-msgid "network_prefix_quals: unexpected operator %u"
+#: libpq/pqcomm.c:841
+msgid "unexpected EOF within message length word"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2190
-#, c-format
-msgid "network_prefix_quals: no %s operator for type %u"
+#: libpq/pqcomm.c:853
+msgid "invalid message length"
 msgstr ""
 
-#: optimizer/path/indxpath.c:2205
-#, c-format
-msgid "network_prefix_quals: no <= operator for type %u"
+#: libpq/pqcomm.c:867
+msgid "incomplete message from client"
 msgstr ""
 
-#: optimizer/path/joinpath.c:170
+#: libpq/pqcomm.c:946
 #, c-format
-msgid "sort_inner_and_outer: unexpected join type %d"
+msgid "could not send data to client: %m"
 msgstr ""
 
-#: optimizer/path/joinpath.c:343
-#, c-format
-msgid "match_unsorted_outer: unexpected join type %d"
+#: libpq/pqformat.c:443
+msgid "no data left in message"
 msgstr ""
 
-#: optimizer/path/joinpath.c:626
-#, c-format
-msgid "match_unsorted_inner: unexpected join type %d"
+#: libpq/pqformat.c:591
+#: libpq/pqformat.c:609
+#: libpq/pqformat.c:630
+#: utils/adt/arrayfuncs.c:1023
+msgid "insufficient data left in message"
 msgstr ""
 
-#: optimizer/path/joinrels.c:230
-#, c-format
-msgid "make_rels_by_joins: failed to build any %d-way joins"
+#: libpq/pqformat.c:671
+msgid "invalid string in message"
 msgstr ""
 
-#: optimizer/path/joinrels.c:385
-#, c-format
-msgid "make_jointree_rel: unexpected node type %d"
+#: libpq/pqformat.c:687
+msgid "invalid message format"
 msgstr ""
 
-#: optimizer/path/joinrels.c:442
+#: main/main.c:84
 #, c-format
-msgid "make_join_rel: unsupported join type %d"
+msgid "%s: setsysinfo failed: %s\n"
 msgstr ""
 
-#: optimizer/path/pathkeys.c:878
+#: main/main.c:176
 msgid ""
-"make_pathkeys_for_mergeclauses: can't identify which side of mergeclause to "
-"use"
+"\"root\" execution of the PostgreSQL server is not permitted.\n"
+"The server must be started under an unprivileged user id to prevent\n"
+"possible system security compromise.  See the documentation for\n"
+"more information on how to properly start the server.\n"
 msgstr ""
 
-#: optimizer/plan/createplan.c:150
+#: main/main.c:197
 #, c-format
-msgid "create_plan: unknown pathtype %d"
+msgid "%s: real and effective user ids must match\n"
 msgstr ""
 
-#: optimizer/plan/createplan.c:228
+#: main/main.c:242
 #, c-format
-msgid "create_scan_plan: unknown node type: %d"
+msgid "%s: invalid effective uid: %d\n"
 msgstr ""
 
-#: optimizer/plan/createplan.c:310
+#: main/main.c:255
 #, c-format
-msgid "create_join_plan: unknown node type: %d"
-msgstr ""
-
-#: optimizer/plan/createplan.c:1050
-msgid "fix_indxqual_sublist: indexqual clause is not binary opclause"
+msgid "%s: GetUserName failed\n"
 msgstr ""
 
-#: optimizer/plan/createplan.c:1139
-msgid "fix_indxqual_operand: var is not index attribute"
-msgstr ""
-
-#: optimizer/plan/createplan.c:1601
-msgid "make_sort_from_pathkeys: cannot find tlist item to sort"
+#: optimizer/path/allpaths.c:214
+msgid "SELECT FOR UPDATE is not supported for inherit queries"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:124
+#: optimizer/plan/initsplan.c:101
 msgid "SELECT FOR UPDATE cannot be applied to a join"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:127
-#, c-format
-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:290
+#: optimizer/prep/prepjointree.c:340
 msgid "UNION JOIN is not implemented yet"
 msgstr ""
 
-#: optimizer/plan/initsplan.c:311
-#, c-format
-msgid "distribute_quals_to_rels: unsupported join type %d"
-msgstr ""
-
-#: optimizer/plan/initsplan.c:321
-#, c-format
-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"
-msgstr ""
-
-#: optimizer/plan/initsplan.c:452
-msgid "JOIN qualification may not refer to other relations"
-msgstr ""
-
-#: optimizer/plan/initsplan.c:608
-msgid "distribute_qual_to_rels: can't cope with variable-free clause"
-msgstr ""
-
-#: optimizer/plan/initsplan.c:750
-#, c-format
-msgid "Unable to identify an equality operator for types '%s' and '%s'"
-msgstr ""
-
-#: optimizer/plan/initsplan.c:761
-#, c-format
-msgid ""
-"Equality operator for types '%s' and '%s' should be mergejoinable, but isn't"
-msgstr ""
-
-#: optimizer/plan/planmain.c:158
-msgid "query_planner: failed to construct a relation"
-msgstr ""
-
-#: optimizer/plan/planner.c:504
-#, c-format
-msgid "pull_up_subqueries: unexpected join type %d"
-msgstr ""
-
-#: optimizer/plan/planner.c:510
-#, c-format
-msgid "pull_up_subqueries: unexpected node type %d"
-msgstr ""
-
-#: optimizer/plan/planner.c:531
-msgid "is_simple_subquery: subquery is bogus"
+#: optimizer/plan/initsplan.c:347
+msgid "SELECT FOR UPDATE cannot be applied to the nullable side of an OUTER JOIN"
 msgstr ""
 
-#: optimizer/plan/planner.c:660
+#: optimizer/plan/initsplan.c:763
 #, c-format
-msgid "resolvenew_in_jointree: unexpected node type %d"
+msgid "could not identify an equality operator for types %s and %s"
 msgstr ""
 
-#: optimizer/plan/planner.c:739
+#: optimizer/plan/initsplan.c:776
 #, c-format
-msgid "preprocess_jointree: unexpected node type %d"
+msgid "equality operator for types %s and %s should be mergejoinable, but isn't"
 msgstr ""
 
-#: optimizer/plan/planner.c:832
-#, 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:591
+#: parser/analyze.c:2088
+#: parser/analyze.c:2252
+#: parser/analyze.c:2807
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: optimizer/plan/planner.c:1007
+#: optimizer/plan/planner.c:657
 msgid "SELECT FOR UPDATE is not allowed in subselects"
 msgstr ""
 
-#: optimizer/plan/planner.c:1849 optimizer/plan/planner.c:1855
-msgid "postprocess_setop_tlist: resjunk output columns not implemented"
-msgstr ""
-
-#: optimizer/plan/setrefs.c:210
+#: optimizer/util/clauses.c:2037
 #, c-format
-msgid "set_plan_references: unknown plan type %d"
+msgid "SQL function \"%s\" during inlining"
 msgstr ""
 
-#: optimizer/plan/setrefs.c:472
-msgid "join_references: variable not in subplan target lists"
-msgstr ""
-
-#: optimizer/plan/setrefs.c:532
-msgid "replace_vars_with_subplan_refs: variable not in subplan target list"
-msgstr ""
-
-#: optimizer/plan/subselect.c:445
+#: parser/parse_clause.c:336
 #, c-format
-msgid "cache lookup failed for operator %u"
+msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN"
 msgstr ""
 
-#: optimizer/plan/subselect.c:660
-#, c-format
-msgid "SS_finalize_plan: node %d unsupported"
+#: parser/parse_clause.c:396
+msgid "sub-select in FROM must have an alias"
 msgstr ""
 
-#: optimizer/plan/subselect.c:683
-msgid "SS_finalize_plan: plan shouldn't reference subplan's variable"
+#: parser/parse_clause.c:419
+msgid "sub-select in FROM may not have SELECT INTO"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:58
-msgid "preprocess_targetlist: subquery cannot be result relation"
+#: parser/parse_clause.c:441
+msgid "sub-select in FROM may not refer to other relations of same query level"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:208
-msgid "expand_targetlist: unexpected command_type"
+#: parser/parse_clause.c:496
+msgid "function expression in FROM may not refer to other relations of same query level"
 msgstr ""
 
-#: optimizer/prep/preptlist.c:238
-msgid "expand_targetlist: targetlist is not sorted correctly"
+#: parser/parse_clause.c:508
+msgid "cannot use aggregate function in function expression in FROM"
 msgstr ""
 
-#: optimizer/prep/prepunion.c:193
+#: parser/parse_clause.c:728
 #, c-format
-msgid "recurse_set_operations: unexpected node %d"
-msgstr ""
-
-#: optimizer/prep/prepunion.c:309
-msgid "generate_nonunion_plan: bogus operation code"
+msgid "USING column name \"%s\" appears more than once"
 msgstr ""
 
-#: optimizer/util/clauses.c:700
+#: parser/parse_clause.c:743
 #, c-format
-msgid "Sub-SELECT uses un-GROUPed attribute %s.%s from outer query"
+msgid "common column name \"%s\" appears more than once in left table"
 msgstr ""
 
-#: optimizer/util/clauses.c:1123
-msgid "CommuteClause: applied to non-binary-operator clause"
-msgstr ""
-
-#: optimizer/util/clauses.c:1128
+#: parser/parse_clause.c:752
 #, c-format
-msgid "CommuteClause: no commutator for operator %u"
+msgid "JOIN/USING column \"%s\" not found in left table"
 msgstr ""
 
-#: optimizer/util/clauses.c:1481
+#: parser/parse_clause.c:766
 #, c-format
-msgid "eval_const_expressions: unexpected boolop %d"
+msgid "common column name \"%s\" appears more than once in right table"
 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
+#: parser/parse_clause.c:775
 #, c-format
-msgid "Function OID %u does not exist"
+msgid "JOIN/USING column \"%s\" not found in right table"
 msgstr ""
 
-#: optimizer/util/clauses.c:1871
+#: parser/parse_clause.c:827
 #, c-format
-msgid "inline_function: null prosrc for procedure %u"
+msgid "column alias list for \"%s\" has too many entries"
 msgstr ""
 
-#: optimizer/util/clauses.c:2031
-msgid "substitute_actual_parameters_mutator: unexpected paramkind"
-msgstr ""
-
-#: optimizer/util/clauses.c:2033
-msgid "substitute_actual_parameters_mutator: unexpected paramid"
-msgstr ""
-
-#: optimizer/util/clauses.c:2339
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1020
 #, c-format
-msgid "expression_tree_walker: Unexpected node type %d"
+msgid "argument of %s must not contain variables"
 msgstr ""
 
-#: optimizer/util/clauses.c:2740
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1028
 #, c-format
-msgid "expression_tree_mutator: Unexpected node type %d"
+msgid "argument of %s must not contain aggregates"
 msgstr ""
 
-#: optimizer/util/pathnode.c:126
-msgid "Unable to devise a query plan for the given query"
-msgstr ""
-
-#: optimizer/util/plancat.c:57
+#. translator: %s is name of a SQL construct, eg LIMIT
+#: parser/parse_clause.c:1036
 #, c-format
-msgid "get_relation_info: Relation %u not found"
+msgid "argument of %s must not contain sub-selects"
 msgstr ""
 
-#: optimizer/util/plancat.c:225
+#: parser/parse_clause.c:1142
 #, c-format
-msgid "restriction_selectivity: bad value %f"
+msgid "%s \"%s\" is ambiguous"
 msgstr ""
 
-#: optimizer/util/plancat.c:258
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1164
 #, c-format
-msgid "join_selectivity: bad value %f"
+msgid "non-integer constant in %s"
 msgstr ""
 
-#: optimizer/util/plancat.c:330
+#. translator: %s is name of a SQL construct, eg ORDER BY
+#: parser/parse_clause.c:1181
 #, c-format
-msgid "has_subclass: Relation %u not found"
-msgstr ""
-
-#: optimizer/util/relnode.c:60
-msgid "build_base_rel: rel already exists"
-msgstr "build_base_rel: rel уже существует"
-
-#: optimizer/util/relnode.c:69
-msgid "build_base_rel: rel already exists as 'other' rel"
-msgstr ""
-
-#: optimizer/util/relnode.c:107
-msgid "build_other_rel: rel already exists as base rel"
-msgstr ""
-
-#: optimizer/util/relnode.c:181
-#, c-format
-msgid "make_base_rel: unsupported RTE kind %d"
+msgid "%s position %d is not in target list"
 msgstr ""
 
-#: optimizer/util/relnode.c:217
-#, c-format
-msgid "find_base_rel: no relation entry for relid %d"
-msgstr ""
+#: parser/parse_clause.c:1366
+msgid "for SELECT DISTINCT, ORDER BY expressions must appear in target list"
+msgstr "для SELECT DISTINCT, выражения ORDER BY обязаны быть в списке назназчения"
 
-#: optimizer/util/tlist.c:239
-msgid ""
-"get_sortgroupclause_tle: ORDER/GROUP BY expression not found in targetlist"
-msgstr ""
+#: parser/parse_clause.c:1406
+msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
+msgstr "Выражения SELECT DISTINCT ON должны совпадать с изначальными выпражениями ORDER BY"
 
-#: parser/analyze.c:256
+#: parser/analyze.c:364
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW указывает больше имён колонок чем имеется"
 
-#: parser/analyze.c:447
+#: parser/analyze.c:574
 msgid "INSERT ... SELECT may not specify INTO"
 msgstr "INSERT ... SELECT не могут указывать INTO"
 
-#: parser/analyze.c:535
+#: parser/analyze.c:666
 msgid "INSERT has more expressions than target columns"
 msgstr ""
 
-#: parser/analyze.c:569
+#: parser/analyze.c:687
 msgid "INSERT has more target columns than expressions"
 msgstr ""
 
-#: parser/analyze.c:765
-msgid "parser: unrecognized node (internal error)"
-msgstr ""
-
-#: parser/analyze.c:847
+#: parser/analyze.c:973
 #, c-format
-msgid "%s will create implicit sequence '%s' for SERIAL column '%s.%s'"
+msgid "%s will create implicit sequence \"%s\" for SERIAL column \"%s.%s\""
 msgstr ""
 
-#: parser/analyze.c:928 parser/analyze.c:936
+#: parser/analyze.c:1057
+#: parser/analyze.c:1067
 #, c-format
-msgid "%s/(NOT) NULL conflicting declaration for '%s.%s'"
+msgid "conflicting NULL/NOT NULL declarations for \"%s.%s\""
 msgstr ""
 
-#: parser/analyze.c:944
+#: parser/analyze.c:1077
 #, c-format
-msgid "%s/DEFAULT multiple values specified for '%s.%s'"
-msgstr ""
-
-#: parser/analyze.c:986 parser/analyze.c:1025
-msgid "parser: unrecognized constraint (internal error)"
+msgid "multiple DEFAULT values specified for \"%s.%s\""
 msgstr ""
 
-#: parser/analyze.c:1021
-msgid "parser: illegal context for constraint (internal error)"
-msgstr ""
-
-#: parser/analyze.c:1065
+#: parser/analyze.c:1322
 #, c-format
-msgid "%s / PRIMARY KEY multiple primary keys for table '%s' are not allowed"
+msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr ""
 
-#: parser/analyze.c:1133
+#: parser/analyze.c:1393
 #, c-format
 msgid "inherited table \"%s\" is not a relation"
 msgstr ""
 
-#: parser/analyze.c:1162
-#, c-format
-msgid ""
-"inherited attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
-"NOT NULL"
-msgstr ""
-
-#: parser/analyze.c:1188
-#, c-format
-msgid ""
-"Existing attribute \"%s\" cannot be a PRIMARY KEY because it is not marked "
-"NOT NULL"
-msgstr ""
-
-#: parser/analyze.c:1195
+#. translator: second %s is PRIMARY KEY or UNIQUE
+#: parser/analyze.c:1453
 #, c-format
-msgid "%s: column \"%s\" named in key does not exist"
+msgid "column \"%s\" appears twice in %s constraint"
 msgstr ""
 
-#: parser/analyze.c:1203
+#: parser/analyze.c:1547
 #, c-format
-msgid "%s: column \"%s\" appears twice in %s constraint"
-msgstr ""
-
-#: parser/analyze.c:1293
-#, c-format
-msgid "%s: failed to make implicit index name"
-msgstr "%s: не удалось создать имя дла неявного индекса"
+msgid "%s / %s%s will create implicit index \"%s\" for table \"%s\""
+msgstr "%s / %s%s создаст подразумеваемый индекс \"%s\" для таблицы \"%s\""
 
-#: parser/analyze.c:1296
-#, c-format
-msgid "%s / %s%s will create implicit index '%s' for table '%s'"
-msgstr "%s / %s%s создаст неявный индекс '%s' для таблицы '%s'"
-
-#: parser/analyze.c:1310
+#: parser/analyze.c:1563
 #, 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
-#, c-format
-msgid "transformRuleStmt: unexpected event type %d"
+#: parser/analyze.c:1656
+msgid "index expression may not return a set"
 msgstr ""
 
-#: parser/analyze.c:1461
-msgid "Rule WHERE condition may not contain references to other relations"
+#: parser/analyze.c:1748
+msgid "rule WHERE condition may not contain references to other relations"
 msgstr ""
 
-#: parser/analyze.c:1465
-msgid "Rule WHERE condition may not contain aggregate functions"
+#: parser/analyze.c:1754
+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:1825
+msgid "rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr ""
 
-#: parser/analyze.c:1558
-msgid "ON SELECT rule may not use OLD"
+#: parser/analyze.c:1844
+#: parser/analyze.c:1916
+#: rewrite/rewriteHandler.c:176
+#: rewrite/rewriteManip.c:746
+#: rewrite/rewriteManip.c:800
+msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr ""
 
-#: parser/analyze.c:1560
+#: parser/analyze.c:1862
+msgid "ON SELECT rule may not use OLD"
+msgstr "нельзя использовать OLD в правиле ON SELECT"
+
+#: parser/analyze.c:1866
 msgid "ON SELECT rule may not use NEW"
-msgstr ""
+msgstr "нельзя использовать NEW в правиле ON SELECT"
 
-#: parser/analyze.c:1567
+#: parser/analyze.c:1875
 msgid "ON INSERT rule may not use OLD"
-msgstr ""
+msgstr "нельзя использовать OLD в правиле ON INSERT"
 
-#: parser/analyze.c:1571
+#: parser/analyze.c:1881
 msgid "ON DELETE rule may not use NEW"
-msgstr ""
-
-#: parser/analyze.c:1636 parser/analyze.c:1844
-msgid "DECLARE CURSOR must not specify INTO"
-msgstr ""
+msgstr "нельзя использовать NEW в правиле ON DELETE"
 
-#: parser/analyze.c:1638 parser/analyze.c:1846
-msgid ""
-"DECLARE/UPDATE is not supported\n"
-"\tCursors must be READ ONLY"
+#: parser/analyze.c:2209
+msgid "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result columns"
 msgstr ""
 
-#: parser/analyze.c:1914
-msgid ""
-"ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result "
-"columns"
-msgstr ""
-
-#: parser/analyze.c:1948
+#: parser/analyze.c:2247
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr ""
 
-#: parser/analyze.c:1950
-msgid "Portal may not appear in UNION/INTERSECT/EXCEPT"
+#: parser/analyze.c:2308
+msgid "UNION/INTERSECT/EXCEPT member statement may not refer to other relations of same query level"
 msgstr ""
 
-#: parser/analyze.c:2044
+#: parser/analyze.c:2361
 #, c-format
-msgid "Each %s query must have the same number of columns"
+msgid "each %s query must have the same number of columns"
 msgstr ""
 
-#: parser/analyze.c:2102
-#, c-format
-msgid "getSetColTypes: unexpected node %d"
-msgstr "getSetColTypes: не ожиданный узел %d"
-
-#: parser/analyze.c:2113
+#: parser/analyze.c:2431
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr "CREATE TABLE AS указывает слишком много имён для колонки"
 
-#: parser/analyze.c:2196 parser/analyze.c:2205
-msgid "UPDATE target count mismatch --- internal error"
-msgstr "UPDATE target: не совпадение счёчика --- внутренняя ошибка"
-
-#: parser/analyze.c:2291
-msgid "Unexpected node type in ALTER TABLE ADD CONSTRAINT"
+#: parser/analyze.c:2664
+msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr ""
 
-#: parser/analyze.c:2374
-msgid "transformPrepareStmt: internal error"
+#: parser/analyze.c:2750
+#, c-format
+msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr ""
 
-#: parser/analyze.c:2401
+#: parser/analyze.c:2752
 #, c-format
-msgid "Wrong number of parameters, expected %d but got %d"
+msgid "Expected %d parameters but got %d."
 msgstr ""
 
-#: parser/analyze.c:2414
-msgid "Cannot use subselects in EXECUTE parameters"
+#: parser/analyze.c:2767
+msgid "cannot use sub-select in EXECUTE parameter"
 msgstr ""
 
-#: parser/analyze.c:2416
-msgid "Cannot use aggregates in EXECUTE parameters"
+#: parser/analyze.c:2771
+msgid "cannot use aggregate in EXECUTE parameter"
 msgstr ""
 
-#: parser/analyze.c:2427
+#: parser/analyze.c:2784
 #, 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"
+msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr ""
 
-#: parser/analyze.c:2450
+#: parser/analyze.c:2811
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr ""
 
-#: parser/analyze.c:2452
+#: parser/analyze.c:2815
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr ""
 
-#: parser/analyze.c:2454
+#: parser/analyze.c:2819
 msgid "SELECT FOR UPDATE is not allowed with AGGREGATE"
 msgstr ""
 
-#: parser/analyze.c:2519
+#: parser/analyze.c:2886
 #, c-format
-msgid "FOR UPDATE: relation \"%s\" not found in FROM clause"
+msgid "relation \"%s\" in FOR UPDATE clause not found in FROM clause"
 msgstr ""
 
-#: parser/analyze.c:2559
-#, c-format
-msgid "relationHasPrimaryKey: index %u not found"
+#: parser/analyze.c:2978
+msgid "misplaced DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2610
-msgid "Misplaced DEFERRABLE clause"
+#: parser/analyze.c:2982
+#: parser/analyze.c:2995
+msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr ""
 
-#: parser/analyze.c:2612 parser/analyze.c:2621
-msgid "Multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
+#: parser/analyze.c:2991
+msgid "misplaced NOT DEFERRABLE clause"
 msgstr ""
 
-#: parser/analyze.c:2619
-msgid "Misplaced NOT DEFERRABLE clause"
-msgstr ""
-
-#: parser/analyze.c:2626 parser/analyze.c:2644 gram.y:2150 gram.y:2164
+#: parser/analyze.c:3002
+#: parser/analyze.c:3026
 msgid "INITIALLY DEFERRED constraint must be DEFERRABLE"
 msgstr ""
 
-#: parser/analyze.c:2631
-msgid "Misplaced INITIALLY DEFERRED clause"
-msgstr ""
-
-#: parser/analyze.c:2633 parser/analyze.c:2651
-msgid "Multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
-msgstr ""
-
-#: parser/analyze.c:2649
-msgid "Misplaced INITIALLY IMMEDIATE clause"
-msgstr ""
-
-#: parser/analyze.c:2758
-#, c-format
-msgid ""
-"New table specifies a schema (%s) different from the one being created (%s)"
-msgstr ""
-
-#: parser/analyze.c:2777
-#, c-format
-msgid ""
-"New view specifies a schema (%s) different from the one being created (%s)"
-msgstr ""
-
-#: parser/analyze.c:2794
-msgid "parser: unsupported schema node (internal error)"
-msgstr ""
-
-#: parser/parse_agg.c:112
-#, c-format
-msgid "Attribute %s.%s must be GROUPed or used in an aggregate function"
-msgstr ""
-
-#: parser/parse_agg.c:150
-msgid "Aggregates not allowed in WHERE clause"
-msgstr ""
-
-#: parser/parse_agg.c:152
-msgid "Aggregates not allowed in JOIN conditions"
-msgstr ""
-
-#: parser/parse_agg.c:168
-msgid "Aggregates not allowed in GROUP BY clause"
-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"
+#: parser/analyze.c:3009
+msgid "misplaced INITIALLY DEFERRED clause"
 msgstr ""
 
-#: parser/parse_clause.c:626 parser/parse_clause.c:638
-msgid "transformFromClauseItem: unexpected subtree type"
+#: parser/analyze.c:3013
+#: parser/analyze.c:3037
+msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr ""
 
-#: parser/parse_clause.c:721
-#, c-format
-msgid "USING column name \"%s\" appears more than once"
+#: parser/analyze.c:3033
+msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr ""
 
-#: parser/parse_clause.c:733
+#: parser/analyze.c:3146
+#: parser/analyze.c:3167
 #, c-format
-msgid "Common column name \"%s\" appears more than once in left table"
+msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr ""
 
-#: parser/parse_clause.c:739
+#: parser/analyze.c:3221
+#: parser/parse_coerce.c:237
+#: parser/parse_expr.c:136
+#: parser/parse_expr.c:142
 #, c-format
-msgid "JOIN/USING column \"%s\" not found in left table"
+msgid "there is no parameter $%d"
 msgstr ""
 
-#: parser/parse_clause.c:751
+#: parser/analyze.c:3226
+#: tcop/postgres.c:1144
 #, c-format
-msgid "Common column name \"%s\" appears more than once in right table"
-msgstr ""
-
-#: parser/parse_clause.c:757
-#, c-format
-msgid "JOIN/USING column \"%s\" not found in right table"
+msgid "could not determine datatype of parameter $%d"
 msgstr ""
 
-#: parser/parse_clause.c:806
-#, c-format
-msgid "Column alias list for \"%s\" has too many entries"
+#: parser/parse_agg.c:120
+msgid "aggregates not allowed in WHERE clause"
 msgstr ""
 
-#: parser/parse_clause.c:833
-#, c-format
-msgid ""
-"transformFromClauseItem: unexpected node (internal error)\n"
-"\t%s"
+#: parser/parse_agg.c:124
+msgid "aggregates not allowed in JOIN conditions"
 msgstr ""
 
-#: parser/parse_clause.c:944
-#, c-format
-msgid "buildMergedJoinVar: unexpected jointype %d"
+#: parser/parse_agg.c:145
+msgid "aggregates not allowed in GROUP BY clause"
 msgstr ""
 
-#: parser/parse_clause.c:1065
+#: parser/parse_agg.c:305
 #, c-format
-msgid "%s '%s' is ambiguous"
+msgid "attribute \"%s.%s\" must be GROUPed or used in an aggregate function"
 msgstr ""
 
-#: parser/parse_clause.c:1084
+#: parser/parse_agg.c:310
 #, c-format
-msgid "Non-integer constant in %s"
+msgid "sub-select uses un-GROUPed attribute \"%s.%s\" from outer query"
 msgstr ""
 
-#: parser/parse_clause.c:1097
+#: parser/parse_coerce.c:253
 #, c-format
-msgid "%s position %d is not in target list"
-msgstr ""
-
-#: parser/parse_clause.c:1238
-msgid "For SELECT DISTINCT, ORDER BY expressions must appear in target list"
-msgstr ""
-"Для SELECT DISTINCT, выражения ORDER BY обязаны быть в списке назназчения"
-
-#: parser/parse_clause.c:1276
-msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions"
-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_coerce.c:291
-#, c-format
-msgid "coerce_type: no conversion function from %s to %s"
-msgstr "coerce_type: фунции конверсии из %s в %s не обнаружено"
-
-#: parser/parse_coerce.c:423
-#, c-format
-msgid "coerce_type_constraints: failed to lookup type %u"
-msgstr "coerce_type_constraints: тип %u не найден"
-
-#: parser/parse_coerce.c:454
-#, c-format
-msgid "coerce_type_constraints: domain %s constraint %s has NULL conbin"
+msgid "inconsistent types deduced for parameter $%d"
 msgstr ""
 
 #. translator: first %s is name of a SQL construct, eg WHERE
-#: parser/parse_coerce.c:607
+#: parser/parse_coerce.c:579
 #, c-format
-msgid "Argument of %s must be type boolean, not type %s"
-msgstr "Тип аргумента конструкции %s должен быть boolean, а не %s"
+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
-#, c-format
-msgid "Argument of %s must not be a set function"
-msgstr ""
-
-#: parser/parse_coerce.c:662
-#, c-format
-msgid "%s types '%s' and '%s' not matched"
-msgstr "%s типы '%s' и '%s' не совпадают"
-
-#: parser/parse_coerce.c:714
+#: parser/parse_coerce.c:587
+#: parser/parse_coerce.c:626
 #, c-format
-msgid "%s unable to convert to type %s"
-msgstr "%s не в состоянии сконвертировать в тип %s"
-
-#: parser/parse_coerce.c:996
-#, c-format
-msgid "find_coercion_pathway: bogus castcontext %c"
+msgid "argument of %s must not return a set"
 msgstr ""
 
-#: parser/parse_expr.c:101
+#. translator: first %s is name of a SQL construct, eg LIMIT
+#: parser/parse_coerce.c:618
 #, c-format
-msgid "Expression too complex: nesting depth exceeds max_expr_depth = %d"
-msgstr ""
+msgid "argument of %s must be type integer, not type %s"
+msgstr "тип аргумента конструкции %s должен быть integer, а не %s"
 
-#: parser/parse_expr.c:120
+#: parser/parse_coerce.c:679
 #, c-format
-msgid "Parameter '$%d' is out of range"
-msgstr ""
-
-#: parser/parse_expr.c:273
-msgid "IS DISTINCT FROM requires = operator to yield boolean"
-msgstr ""
-
-#: parser/parse_expr.c:355 parser/parse_expr.c:359
-msgid "Bad query in subselect"
-msgstr ""
-
-#: parser/parse_expr.c:381
-msgid "Subselect must have a field"
-msgstr ""
-
-#: parser/parse_expr.c:385
-msgid "Subselect must have only one field"
-msgstr ""
+msgid "%s types %s and %s cannot be matched"
+msgstr "%s типы %s и %s не совпадают"
 
-#: parser/parse_expr.c:415
+#. translator: first %s is name of a SQL construct, eg CASE
+#: parser/parse_coerce.c:741
 #, c-format
-msgid "Row comparison cannot use operator %s"
-msgstr ""
+msgid "%s could not convert type %s to %s"
+msgstr "%s не в состоянии сконвертировать тип %s в %s"
 
-#: parser/parse_expr.c:438
-msgid "Subselect has too many fields"
+#: parser/parse_coerce.c:900
+msgid "arguments declared ANYELEMENT are not all alike"
 msgstr ""
 
-#: parser/parse_expr.c:454
-#, c-format
-msgid ""
-"%s has result type of %s, but must return %s to be used with quantified "
-"predicate subquery"
+#: parser/parse_coerce.c:917
+msgid "arguments declared ANYARRAY are not all alike"
 msgstr ""
 
-#: parser/parse_expr.c:460
+#: parser/parse_coerce.c:939
+#: parser/parse_coerce.c:1050
+#: parser/parse_coerce.c:1077
 #, c-format
-msgid "%s must not return a set to be used with quantified predicate subquery"
-msgstr ""
-
-#: parser/parse_expr.c:476
-msgid "Subselect has too few fields"
+msgid "argument declared ANYARRAY is not an array but %s"
 msgstr ""
 
-#: parser/parse_expr.c:620
-#, c-format
-msgid "transformExpr: unexpected booltesttype %d"
+#: parser/parse_coerce.c:955
+msgid "argument declared ANYARRAY is not consistent with argument declared ANYELEMENT"
 msgstr ""
 
-#: parser/parse_expr.c:658
-#, c-format
-msgid "transformExpr: does not know how to transform node %d (internal error)"
+#: parser/parse_coerce.c:966
+msgid "could not determine ANYARRAY/ANYELEMENT type because input is UNKNOWN"
 msgstr ""
 
-#: parser/parse_expr.c:763
+#: parser/parse_coerce.c:991
+#: parser/parse_coerce.c:1008
+#: parser/parse_coerce.c:1062
+#: parser/parse_expr.c:795
+#: parser/parse_expr.c:1227
+#: parser/parse_expr.c:1266
 #, c-format
-msgid "Attribute \"%s\" not found"
-msgstr "Атрибут \"%s\" не найден"
-
-#: parser/parse_expr.c:875 parser/parse_target.c:153
-msgid "Invalid qualified name syntax (too many names)"
+msgid "could not find array type for datatype %s"
 msgstr ""
 
-#: parser/parse_expr.c:935
-msgid "exprType: Cannot get type for untransformed sublink"
-msgstr ""
-
-#: parser/parse_expr.c:977
+#: parser/parse_relation.c:174
+#: parser/parse_relation.c:189
 #, c-format
-msgid "Relation reference \"%s\" cannot be used in an expression"
+msgid "table reference \"%s\" is ambiguous"
 msgstr ""
 
-#: parser/parse_expr.c:982
-#, c-format
-msgid "exprType: Do not know how to get type for %d node"
-msgstr "exprType: Не известно как извлечь тип для узла %d"
-
-#: parser/parse_expr.c:1151
-#, c-format
-msgid "Cannot cast type %s to %s"
-msgstr "Нельзя конвертировать тип %s в %s"
-
-#: parser/parse_func.c:97
+#: parser/parse_relation.c:249
+#: parser/parse_relation.c:264
 #, c-format
-msgid "Cannot pass more than %d arguments to a function"
+msgid "table reference %u is ambiguous"
 msgstr ""
 
-#: parser/parse_func.c:104
+#: parser/parse_relation.c:356
+#: parser/parse_relation.c:368
 #, c-format
-msgid "Function '%s' does not allow NULL input"
-msgstr ""
+msgid "table name \"%s\" specified more than once"
+msgstr "имя таблицы \"%s\" указано больше одного раза"
 
-#: parser/parse_func.c:192
+#: parser/parse_relation.c:477
+#: parser/parse_relation.c:573
 #, c-format
-msgid "Cannot find type OID for relation %u"
+msgid "column reference \"%s\" is ambiguous"
 msgstr ""
 
-#: parser/parse_func.c:232
+#: parser/parse_relation.c:668
+#: parser/parse_relation.c:763
+#: parser/parse_relation.c:858
+#: parser/parse_relation.c:978
 #, c-format
-msgid "Cannot pass result of sub-select or join %s to a function"
+msgid "table \"%s\" has %d columns available but %d columns specified"
 msgstr ""
 
-#: parser/parse_func.c:270
-#, c-format
-msgid "%s(*) specified, but %s is not an aggregate function"
+#: parser/parse_relation.c:935
+msgid "a column definition list is only allowed for functions returning RECORD"
 msgstr ""
 
-#: parser/parse_func.c:273
-#, c-format
-msgid "DISTINCT specified, but %s is not an aggregate function"
+#: parser/parse_relation.c:946
+msgid "a column definition list is required for functions returning RECORD"
 msgstr ""
 
-#: parser/parse_func.c:296
+#: parser/parse_relation.c:1007
 #, c-format
-msgid "Attribute notation .%s applied to type %s, which is not a complex type"
+msgid "too many column aliases specified for function %s"
 msgstr ""
 
-#: parser/parse_func.c:299
+#: parser/parse_relation.c:1030
 #, c-format
-msgid "Attribute \"%s\" not found in datatype %s"
+msgid "function \"%s\" in FROM has unsupported return type"
 msgstr ""
 
-#: parser/parse_func.c:342
-msgid "Aggregates may not return sets"
+#: parser/parse_relation.c:1422
+#: parser/parse_relation.c:1666
+msgid "function in FROM has unsupported return type"
 msgstr ""
 
-#: parser/parse_func.c:1257
-#, c-format
-msgid "No such attribute %s.%s.%s"
-msgstr "%s.%s.%s: нет такого атрибута"
-
-#: parser/parse_func.c:1260
-#, c-format
-msgid "No such attribute %s.%s"
-msgstr "%s.%s: нет такого атрибута"
-
-#: parser/parse_func.c:1287
-#, c-format
-msgid "Function %s(%s) does not exist%s%s"
-msgstr "Функция %s(%s) не существует %s%s"
-
-#: parser/parse_func.c:1293
-#, c-format
-msgid "%s: function %s(%s) does not exist%s%s"
-msgstr "%s: функция %s(%s) не существует %s%s"
-
-#: parser/parse_func.c:1319
-#, c-format
-msgid "%s: aggregate %s(*) does not exist"
-msgstr "%s: агрегат %s(*) не существует"
-
-#: parser/parse_func.c:1322
+#: parser/parse_relation.c:1910
 #, c-format
-msgid "%s: aggregate %s(%s) does not exist"
-msgstr "%s: агрегат %s(%s) не существует"
+msgid "missing FROM-clause entry in subquery for table \"%s\""
+msgstr "отсутсвует запись о FROM-выражении в подзапросе для таблицы \"%s\""
 
-#: parser/parse_func.c:1338
+#: parser/parse_relation.c:1915
 #, c-format
-msgid "%s: function %s(*) is not an aggregate"
-msgstr ""
+msgid "missing FROM-clause entry for table \"%s\""
+msgstr "отсутсвует запись о FROM-выражении для таблицы \"%s\""
 
-#: parser/parse_func.c:1341
+#: parser/parse_relation.c:1934
 #, c-format
-msgid "%s: function %s(%s) is not an aggregate"
-msgstr ""
+msgid "adding missing FROM-clause entry in subquery for table \"%s\""
+msgstr "добавление отсутсвующей записи о FROM-выражении в подзапросе для таблицы \"%s\""
 
-#: parser/parse_node.c:211
+#: parser/parse_relation.c:1939
 #, c-format
-msgid "transformArraySubscripts: Cache lookup failed for array type %u"
-msgstr ""
+msgid "adding missing FROM-clause entry for table \"%s\""
+msgstr "добавление отсутсвующей записи о FROM-выражении для таблицы \"%s\""
 
-#: parser/parse_node.c:217
-#, c-format
-msgid "transformArraySubscripts: type %s is not an array"
-msgstr ""
+#: parser/parse_expr.c:105
+msgid "expression too complex"
+msgstr "слишком сложное выражение"
 
-#: parser/parse_node.c:225
+#: parser/parse_expr.c:106
 #, c-format
-msgid "transformArraySubscripts: Cache lookup failed for array element type %u"
+msgid "Nesting depth exceeds MAX_EXPR_DEPTH = %d."
 msgstr ""
 
-#: parser/parse_node.c:282 parser/parse_node.c:302
-msgid "array index expressions must be integers"
+#: parser/parse_expr.c:351
+msgid "IS DISTINCT FROM requires = operator to yield boolean"
 msgstr ""
 
-#: parser/parse_node.c:321
-#, c-format
-msgid ""
-"Array assignment requires type %s but expression is of type %s\n"
-"\tYou will need to rewrite or cast the expression"
+#: parser/parse_expr.c:374
+msgid "NULLIF requires = operator to yield boolean"
 msgstr ""
 
-#: parser/parse_node.c:431
-#, c-format
-msgid "make_const: unknown type %d"
+#: parser/parse_expr.c:496
+msgid "sub-select must return a column"
 msgstr ""
 
-#: parser/parse_oper.c:116
-#, c-format
-msgid "%s: Prefix operator '%s' for type '%s' does not exist"
-msgstr "%s: Prefix-оператор '%s' для типа '%s' не существует"
-
-#: parser/parse_oper.c:120
-#, c-format
-msgid "%s: Postfix operator '%s' for type '%s' does not exist"
-msgstr "%s: Postfix-оператор '%s' для типа '%s' не существует"
-
-#: parser/parse_oper.c:124
-#, c-format
-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"
+#: parser/parse_expr.c:502
+msgid "sub-select must return only one column"
 msgstr ""
 
-#: parser/parse_oper.c:204
+#: parser/parse_expr.c:558
 #, c-format
-msgid ""
-"Unable to identify an ordering operator for type %s\n"
-"\tUse an explicit ordering operator or modify the query"
+msgid "row comparison cannot use operator %s"
 msgstr ""
 
-#: parser/parse_oper.c:966
-#, c-format
-msgid ""
-"Left hand side of operator '%s' has an unknown type\n"
-"\tProbably a bad attribute name"
-msgstr ""
+#: parser/parse_expr.c:585
+msgid "sub-select has too many columns"
+msgstr "слишком много колонок а подзапросе"
 
-#: parser/parse_oper.c:971
+#: parser/parse_expr.c:603
 #, c-format
-msgid ""
-"Right hand side of operator %s has an unknown type\n"
-"\tProbably a bad attribute name"
-msgstr ""
+msgid "operator %s must return boolean, not type %s"
+msgstr "оператор %s должен возвращать тип boolean, а не %s"
 
-#: parser/parse_oper.c:975
-#, c-format
-msgid ""
-"Unable to identify an operator '%s' for types '%s' and '%s'\n"
-"\tYou will have to retype this query using an explicit cast"
+#: parser/parse_expr.c:606
+#: parser/parse_expr.c:613
+msgid "The operator of a quantified predicate subquery must return boolean."
 msgstr ""
 
-#: parser/parse_oper.c:991
+#: parser/parse_expr.c:611
 #, c-format
-msgid ""
-"operand of prefix operator '%s' has an unknown type\n"
-"\t(probably an invalid column reference)"
+msgid "operator %s must not return a set"
 msgstr ""
 
-#: parser/parse_oper.c:995
-#, c-format
-msgid ""
-"operand of postfix operator '%s' has an unknown type\n"
-"\t(probably an invalid column reference)"
+#: parser/parse_expr.c:623
+msgid "sub-select has too few columns"
 msgstr ""
 
-#: parser/parse_oper.c:1002
+#: parser/parse_expr.c:1033
 #, 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 ""
+msgid "attribute \"%s\" not found"
+msgstr "атрибут \"%s\" не найден"
 
-#: parser/parse_oper.c:1006
+#: parser/parse_expr.c:1322
 #, c-format
-msgid ""
-"Unable to identify a postfix operator '%s' for type '%s'\n"
-"\tYou may need to add parentheses or an explicit cast"
+msgid "relation reference \"%s\" cannot be used in an expression"
 msgstr ""
 
-#: parser/parse_relation.c:169 parser/parse_relation.c:181
+#: parser/parse_expr.c:1530
 #, c-format
-msgid "Table reference \"%s\" is ambiguous"
-msgstr ""
+msgid "cannot cast type %s to %s"
+msgstr "нельзя конвертировать тип %s в %s"
 
-#: parser/parse_relation.c:185
+#: parser/parse_func.c:89
 #, c-format
-msgid "scanNameSpaceForRefname: unexpected node type %d"
-msgstr ""
+msgid "cannot pass more than %d arguments to a function"
+msgstr "число аргументов функции не может быть более %d"
 
-#: parser/parse_relation.c:239 parser/parse_relation.c:251
+#: parser/parse_func.c:224
 #, c-format
-msgid "Table reference %u is ambiguous"
+msgid "cannot pass result of sub-select or join %s to a function"
 msgstr ""
 
-#: parser/parse_relation.c:255
-#, c-format
-msgid "scanNameSpaceForRelid: unexpected node type %d"
-msgstr "scanNameSpaceForRelid: неожиданный тип узла %d"
-
-#: parser/parse_relation.c:319
+#: parser/parse_func.c:265
 #, c-format
-msgid "checkNameSpaceConflicts: unexpected node type %d"
+msgid "%s(*) specified, but %s is not an aggregate function"
 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
+#: parser/parse_func.c:271
 #, c-format
-msgid "scanNameSpaceForConflict: unexpected node type %d"
-msgstr "scanNameSpaceForConflict: неожиданный узла %d"
-
-#: parser/parse_relation.c:408
-msgid "RTERangeTablePosn: RTE not found (internal error)"
+msgid "DISTINCT specified, but %s is not an aggregate function"
 msgstr ""
 
-#: parser/parse_relation.c:460 parser/parse_relation.c:553
+#: parser/parse_func.c:296
 #, c-format
-msgid "Column reference \"%s\" is ambiguous"
+msgid "attribute notation .%s applied to type %s, which is not a complex type"
 msgstr ""
 
-#: parser/parse_relation.c:547
+#: parser/parse_func.c:301
 #, c-format
-msgid "colnameToVar: unexpected node type %d"
-msgstr ""
+msgid "attribute \"%s\" not found in datatype %s"
+msgstr "атрибут \"%s\" не найден в типе %s"
 
-#: parser/parse_relation.c:646 parser/parse_relation.c:739
-#: parser/parse_relation.c:832 parser/parse_relation.c:946
+#: parser/parse_func.c:311
 #, c-format
-msgid "Table \"%s\" has %d columns available but %d columns specified"
-msgstr ""
+msgid "function %s is not unique"
+msgstr "функция %s не уникальна"
 
-#: parser/parse_relation.c:907
-msgid "A column definition list is only allowed for functions returning RECORD"
+#: parser/parse_func.c:314
+msgid "Could not choose a best candidate function. You may need to add explicit typecasts."
 msgstr ""
 
-#: parser/parse_relation.c:916
-msgid "A column definition list is required for functions returning RECORD"
+#: parser/parse_func.c:322
+msgid "No function matches the given name and argument types. You may need to add explicit typecasts."
 msgstr ""
 
-#: parser/parse_relation.c:972
-#, c-format
-msgid "Too many column aliases specified for function %s"
+#: parser/parse_func.c:371
+msgid "aggregates may not return sets"
 msgstr ""
 
-#: parser/parse_relation.c:993
+#: parser/parse_func.c:1353
 #, c-format
-msgid "Unknown kind of return type specified for function %s"
-msgstr ""
+msgid "no such attribute %s.%s.%s"
+msgstr "%s.%s.%s: нет такого атрибута"
 
-#: parser/parse_relation.c:1425
+#: parser/parse_func.c:1358
 #, c-format
-msgid "expandRTE: unsupported RTE kind %d"
-msgstr ""
+msgid "no such attribute %s.%s"
+msgstr "%s.%s: нет такого атрибута"
 
-#: parser/parse_relation.c:1515
+#: parser/parse_func.c:1428
 #, c-format
-msgid "Invalid attnum %d for rangetable entry %s"
-msgstr ""
+msgid "aggregate %s(*) does not exist"
+msgstr "агрегат %s(*) не существует"
 
-#: parser/parse_relation.c:1542 parser/parse_relation.c:1605
-#: parser/parse_relation.c:1683
+#: parser/parse_func.c:1433
 #, c-format
-msgid "Relation \"%s\" does not have attribute %d"
-msgstr "Связь \"%s\" не имеет атрибута %d"
+msgid "aggregate %s(%s) does not exist"
+msgstr "агрегат %s(%s) не существует"
 
-#: parser/parse_relation.c:1574
+#: parser/parse_func.c:1454
 #, c-format
-msgid "Subquery %s does not have attribute %d"
-msgstr ""
+msgid "function %s(%s) is not an aggregate"
+msgstr "функция %s(%s) не является агрегатом"
 
-#: parser/parse_relation.c:1655
+#: parser/parse_node.c:124
 #, c-format
-msgid "get_rte_attribute_type: unsupported RTE kind %d"
+msgid "cannot subscript type %s because it is not an array"
 msgstr ""
 
-#: parser/parse_relation.c:1716
-#, c-format
-msgid "Relation %s does not have attribute %d"
+#: parser/parse_node.c:183
+#: parser/parse_node.c:206
+msgid "array subscript must have type integer"
 msgstr ""
 
-#: parser/parse_relation.c:1732
+#: parser/parse_node.c:228
 #, c-format
-msgid "get_rte_attribute_is_dropped: unsupported RTE kind %d"
+msgid "array assignment requires type %s but expression is of type %s"
 msgstr ""
 
-#: parser/parse_relation.c:1815
-#, c-format
-msgid "attnumAttName: invalid attribute number %d"
-msgstr "attnumAttName: неверный номер атрибута: %d"
-
-#: parser/parse_relation.c:1837
+#: parser/parse_oper.c:84
+#: parser/parse_oper.c:761
 #, 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 ""
+msgid "operator does not exist: %s"
+msgstr "оператор не существует: %s"
 
-#: parser/parse_target.c:236
+#: parser/parse_oper.c:185
+#: utils/adt/arrayfuncs.c:2397
+#: utils/adt/ri_triggers.c:3436
 #, c-format
-msgid "Cannot assign to system attribute '%s'"
+msgid "could not identify an equality operator for type %s"
 msgstr ""
 
-#: parser/parse_target.c:298
+#: parser/parse_oper.c:249
+#: parser/parse_oper.c:314
 #, 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"
+msgid "could not identify an ordering operator for type %s"
 msgstr ""
 
-#: parser/parse_target.c:371
-#, c-format
-msgid "Attribute '%s' specified more than once"
+#: parser/parse_oper.c:251
+#: parser/parse_oper.c:316
+msgid "Use an explicit ordering operator or modify the query."
 msgstr ""
 
-#: parser/parse_target.c:406
+#: parser/parse_oper.c:560
 #, c-format
-msgid ""
-"ExpandAllTables: unexpected node (internal error)\n"
-"\t%s"
+msgid "operator requires run-time type coercion: %s"
 msgstr ""
 
-#: parser/parse_target.c:424
-msgid "Wildcard with no tables specified not allowed"
-msgstr ""
-
-#: parser/parse_type.c:60
+#: parser/parse_oper.c:754
 #, c-format
-msgid "Improper %%TYPE reference (too few dotted names): %s"
+msgid "operator is not unique: %s"
 msgstr ""
 
-#: parser/parse_type.c:79
-#, c-format
-msgid "Improper %%TYPE reference (too many dotted names): %s"
+#: parser/parse_oper.c:756
+msgid "Could not choose a best candidate operator. You may need to add explicit typecasts."
 msgstr ""
 
-#: parser/parse_type.c:96
-#, c-format
-msgid "%s converted to %s"
+#: parser/parse_oper.c:763
+msgid "No operator matches the given name and argument type(s). You may need to add explicit typecasts."
 msgstr ""
 
-#: parser/parse_type.c:194 parser/parse_type.c:222
-#: utils/cache/lsyscache.c:1265
-#, c-format
-msgid "Type \"%s\" is only a shell"
+#: parser/parse_oper.c:853
+msgid "op ANY/ALL (array) requires array on right side"
 msgstr ""
 
-#: parser/parse_type.c:247
-#, c-format
-msgid "Unable to locate type oid %u in catalog"
+#: parser/parse_oper.c:882
+msgid "op ANY/ALL (array) requires operator to yield boolean"
 msgstr ""
 
-#: parser/parse_type.c:256
-msgid "typeTypeId() called with NULL type struct"
+#: parser/parse_oper.c:886
+msgid "op ANY/ALL (array) requires operator not to return a set"
 msgstr ""
 
-#: parser/parse_type.c:389
-#, c-format
-msgid "typeidOutfunc: Invalid type - oid = %u"
-msgstr "typeidOutfunc: Не верный тип - OID = %u"
-
-#: parser/parse_type.c:410
-#, c-format
-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_oper.c:896
 #, 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"
+msgid "could not find datatype for array of %s"
 msgstr ""
 
-#: gram.y:977 gram.y:4960 gram.y:6945 utils/adt/timestamp.c:701
+#: parser/parse_target.c:66
 #, c-format
-msgid "INTERVAL(%d) precision must be between %d and %d"
+msgid "relation reference \"%s\" cannot be used as a targetlist entry"
 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
+#: parser/parse_target.c:68
 #, c-format
-msgid "CREATE TABLE / COLLATE %s not yet implemented; clause ignored"
-msgstr ""
-
-#: gram.y:1649
-msgid "LIKE in table definitions not yet supported"
+msgid "Write \"%s\".* to denote all the columns of the relation."
 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
+#: parser/parse_target.c:331
 #, 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 ""
+msgid "cannot assign to system attribute \"%s\""
+msgstr "нельзя присвоить значение системному атрибуту \"%s\""
 
-#: gram.y:5054
-msgid "precision for FLOAT must be at least 1"
+#: parser/parse_target.c:353
+msgid "cannot set an array element to DEFAULT"
 msgstr ""
 
-#: gram.y:5061
-msgid "precision for FLOAT must be less than 16"
-msgstr ""
-
-#: gram.y:5074 gram.y:5087
+#: parser/parse_target.c:420
 #, c-format
-msgid "NUMERIC precision %d must be between 1 and %d"
+msgid "column \"%s\" is of type %s but expression is of type %s"
 msgstr ""
 
-#: gram.y:5078
-#, c-format
-msgid "NUMERIC scale %d must be between 0 and precision %d"
+#: parser/parse_target.c:555
+msgid "SELECT * with no tables specified is not valid"
 msgstr ""
 
-#: gram.y:5104 gram.y:5117
+#: parser/parse_type.c:62
 #, c-format
-msgid "DECIMAL precision %d must be between 1 and %d"
+msgid "improper %%TYPE reference (too few dotted names): %s"
 msgstr ""
 
-#: gram.y:5108
+#: parser/parse_type.c:83
 #, c-format
-msgid "DECIMAL scale %d must be between 0 and precision %d"
+msgid "improper %%TYPE reference (too many dotted names): %s"
 msgstr ""
 
-#: gram.y:5163 gram.y:5237
+#: parser/parse_type.c:103
 #, c-format
-msgid "length for type '%s' must be at least 1"
+msgid "type reference %s converted to %s"
 msgstr ""
 
-#: gram.y:5166 gram.y:5240
+#: parser/parse_type.c:206
+#: parser/parse_type.c:237
 #, 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 ""
+msgid "type \"%s\" is only a shell"
+msgstr "тип \"%s\" является только оболочкой"
 
-#: gram.y:5349
+#: parser/parse_type.c:507
 #, 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 ""
+msgid "invalid type name \"%s\""
+msgstr "неверное имя типа \"%s\""
 
-#: gram.y:5913
-msgid "UNIQUE predicate is not yet implemented"
-msgstr ""
-
-#: gram.y:6142
+#: port/pg_sema.c:117
+#: port/sysv_sema.c:117
 #, c-format
-msgid "CURRENT_TIME(%d) precision must be between %d and %d"
-msgstr ""
+msgid "could not create semaphores: %m"
+msgstr "не получилось создать семафоры: %m"
 
-#: gram.y:6187
+#: port/pg_sema.c:118
+#: port/sysv_sema.c:118
 #, c-format
-msgid "CURRENT_TIMESTAMP(%d) precision must be between %d and %d"
+msgid "Failed syscall was semget(%d, %d, 0%o)."
 msgstr ""
 
-#: gram.y:6232
+#: port/pg_sema.c:122
+#: port/sysv_sema.c:122
 #, c-format
-msgid "LOCALTIME(%d) precision must be between %d and %d"
+msgid ""
+"This error does *not* mean that you have run out of disk space.\n"
+"It occurs when either the system limit for the maximum number of semaphore sets (SEMMNI), or the system wide maximum number of semaphores (SEMMNS), would be exceeded.  You need to raise the respective kernel parameter.  Alternatively, reduce PostgreSQL's consumption of semaphores by reducing its max_connections parameter (currently %d).\n"
+"The PostgreSQL documentation contains more information about configuring your system for PostgreSQL."
 msgstr ""
 
-#: gram.y:6277
+#: port/pg_sema.c:151
+#: port/sysv_sema.c:151
 #, 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"
+msgid "You possibly need to raise your kernel's SEMVMX value to be at least %d.  Look into the PostgreSQL documentation for details."
 msgstr ""
 
-#: gram.y:7537
+#: port/pg_shmem.c:92
+#: port/sysv_shmem.c:92
 #, 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"
+msgid "could not create shared memory segment: %m"
 msgstr ""
 
-#: scan.l:388
-msgid "unterminated quoted string"
-msgstr ""
-
-#: scan.l:399
-msgid "zero-length delimited identifier"
-msgstr ""
-
-#: scan.l:406 scan.l:562
+#: port/pg_shmem.c:93
+#: port/sysv_shmem.c:93
 #, c-format
-msgid "identifier \"%s\" will be truncated to \"%.*s\""
+msgid "Failed syscall was shmget(key=%d, size=%u, 0%o)."
 msgstr ""
 
-#: scan.l:420
-msgid "unterminated quoted identifier"
-msgstr ""
-
-#: scan.l:580
+#: port/pg_shmem.c:97
+#: port/sysv_shmem.c:97
 #, c-format
-msgid "parser: %s at end of input"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory segment exceeded your kernel's SHMMAX parameter.  You can either reduce the request size or reconfigure the kernel with larger SHMMAX. To reduce the request size (currently %u bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"If the request size is already small, it's possible that it is less than your kernel's SHMMIN parameter, in which case raising the request size or reconfiguring SHMMIN is called for.\n"
+"The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 
-#: scan.l:582
+#: port/pg_shmem.c:110
+#: port/sysv_shmem.c:110
 #, c-format
-msgid "parser: %s at or near \"%s\" at character %d"
-msgstr ""
-
-#: port/ipc_test.c:93 storage/ipc/ipc.c:171
-msgid "Out of on_shmem_exit slots"
-msgstr ""
-
-#: 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 ""
-
-#: port/beos/support.c:71
-msgid "Can't load this add-on "
-msgstr ""
-
-#: port/beos/support.c:95
-msgid "Can't load this add-on : map text error"
-msgstr ""
-
-#: port/beos/support.c:111
-msgid "Can't load this add-on : map data error"
+msgid ""
+"This error usually means that PostgreSQL's request for a shared memory segment exceeded available memory or swap space. To reduce the request size (currently %u bytes), reduce PostgreSQL's shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 
-#: port/beos/support.c:129
+#: port/pg_shmem.c:119
+#: port/sysv_shmem.c:119
 #, c-format
-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 ""
-
-#: port/dynloader/beos.c:66
-msgid "error while unloading add-on"
-msgstr ""
-
-#: 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
-msgid "dld: Cannot link math library!"
-msgstr ""
-
-#: port/dynloader/bsdi.c:75 port/dynloader/linux.c:87
-msgid "dld: Undefined:"
+msgid ""
+"This error does *not* mean that you have run out of disk space. It occurs either if all available shared memory IDs have been taken, in which case you need to raise the SHMMNI parameter in your kernel, or because the system's overall limit for shared memory has been reached.  If you cannot increase the shared memory limit, reduce PostgreSQL's shared memory request (currently %u bytes), by reducing its shared_buffers parameter (currently %d) and/or its max_connections parameter (currently %d).\n"
+"The PostgreSQL documentation contains more information about shared memory configuration."
 msgstr ""
 
-#: port/dynloader/bsdi.c:78 port/dynloader/linux.c:90
-#: port/dynloader/ultrix4.c:61
+#: postmaster/postmaster.c:327
 #, c-format
-msgid "  %s"
-msgstr "  %s"
+msgid "data directory \"%s\" does not exist"
+msgstr "директория данных \"%s\" не существует"
 
-#: port/dynloader/linux.c:35
-msgid "dynamic load not supported"
-msgstr ""
-
-#: port/dynloader/ultrix4.c:58
-msgid "dl: Undefined:"
-msgstr ""
-
-#: postmaster/postmaster.c:329
+#: postmaster/postmaster.c:332
 #, c-format
-msgid "data directory %s was not found"
+msgid "could not read permissions of directory \"%s\": %m"
 msgstr ""
 
-#: postmaster/postmaster.c:331
+#: postmaster/postmaster.c:347
 #, c-format
-msgid "could not read permissions of directory %s: %m"
+msgid "data directory \"%s\" has group or world access"
 msgstr ""
 
-#: postmaster/postmaster.c:336
-#, c-format
-msgid ""
-"data directory %s has group or world access; permissions should be u=rwx "
-"(0700)"
+#: postmaster/postmaster.c:349
+msgid "Permissions should be u=rwx (0700)."
 msgstr ""
 
-#: postmaster/postmaster.c:349
+#: postmaster/postmaster.c:361
 #, c-format
 msgid ""
-"%s does not find the database system.\n"
+"%s could not find the database system.\n"
 "Expected to find it in the PGDATA directory \"%s\",\n"
-"but unable to open file \"%s\": %s\n"
-"\n"
+"but failed to open file \"%s\": %s\n"
 msgstr ""
 "Модуль %s не нашёл систему баз данных.\n"
 "Система ожидалась в PGDATA дириктории - \"%s\",\n"
 "но не получилось открыть файл \"%s\": %s\n"
-"\n"
 
-#: postmaster/postmaster.c:434
-msgid "Assert checking is not compiled in."
+#: postmaster/postmaster.c:459
+#: tcop/postgres.c:2114
+msgid "assert checking is not compiled in"
 msgstr ""
 
-#: postmaster/postmaster.c:540 tcop/postgres.c:1574
-#, c-format
-msgid "--%s requires argument"
-msgstr "--%s требует параметр"
-
-#: postmaster/postmaster.c:542 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:585
+#: postmaster/postmaster.c:598
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Наберите '%s --help' для более детальной информации.\n"
 
-#: postmaster/postmaster.c:563
+#: postmaster/postmaster.c:596
 #, c-format
-msgid "invalid argument -- %s"
-msgstr "неверный аргумент -- %s"
+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:624
+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
-msgid "superuser_reserved_connections must be less than max_connections."
+#: postmaster/postmaster.c:630
+msgid "superuser_reserved_connections must be less than max_connections"
 msgstr ""
 
-#: postmaster/postmaster.c:611
-#, c-format
-msgid "%s: PostmasterMain: initial environ dump:"
+#: postmaster/postmaster.c:639
+msgid "invalid datetoken tables, please fix"
 msgstr ""
 
-#: postmaster/postmaster.c:612 postmaster/postmaster.c:615
-msgid "-----------------------------------------"
-msgstr ""
-
-#: postmaster/postmaster.c:614 postmaster/postmaster.c:2287
+#: postmaster/postmaster.c:674
+#: tcop/postgres.c:2591
 #, c-format
-msgid "\t%s"
-msgstr "\t%s"
+msgid "%s: could not locate postgres executable"
+msgstr ""
 
-#: postmaster/postmaster.c:622 tcop/postgres.c:1719
-#, c-format
-msgid "%s: could not locate executable, bailing out..."
+#: postmaster/postmaster.c:683
+msgid "for SSL, TCP/IP connections must be enabled"
 msgstr ""
 
-#: postmaster/postmaster.c:631
-msgid "For SSL, TCP/IP connections must be enabled."
+#: postmaster/postmaster.c:757
+#, c-format
+msgid "could not create listen socket for \"%s\""
 msgstr ""
 
-#: postmaster/postmaster.c:678
-msgid "cannot create INET stream port"
+#: postmaster/postmaster.c:776
+msgid "could not create TCP/IP listen socket"
 msgstr ""
 
-#: postmaster/postmaster.c:690
-msgid "cannot create UNIX stream port"
+#: postmaster/postmaster.c:800
+msgid "could not create UNIX stream port"
 msgstr ""
 
-#: postmaster/postmaster.c:810
+#: postmaster/postmaster.c:920
 #, c-format
-msgid "fork failed: %s"
-msgstr "fork не удался: %s"
+msgid "could not fork background process: %s"
+msgstr ""
 
-#: postmaster/postmaster.c:832
+#: postmaster/postmaster.c:942
 #, c-format
-msgid "cannot disassociate from controlling TTY: %s"
+msgid "could not disassociate from controlling TTY: %s"
 msgstr ""
 
-#: postmaster/postmaster.c:852
+#: postmaster/postmaster.c:962
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
@@ -8311,7 +5255,7 @@ msgstr ""
 "%s является PostgreSQL сервером.\n"
 "\n"
 
-#: postmaster/postmaster.c:853
+#: postmaster/postmaster.c:963
 #, c-format
 msgid ""
 "Usage:\n"
@@ -8322,84 +5266,75 @@ msgstr ""
 "  %s [ОПЦИЯ]...\n"
 "\n"
 
-#: postmaster/postmaster.c:854
+#: postmaster/postmaster.c:964
 msgid "Options:\n"
 msgstr "Опции:\n"
 
-#: postmaster/postmaster.c:856
+#: postmaster/postmaster.c:966
 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
-#, c-format
-msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
-msgstr "  -B ЧБУФЕРОВ     чмсло общих буферов (по умолчанию: %d)\n"
+#: postmaster/postmaster.c:968
+msgid "  -B NBUFFERS     number of shared buffers\n"
+msgstr "  -B ЧБУФЕРОВ     число общих буферов\n"
 
-#: postmaster/postmaster.c:859
+#: postmaster/postmaster.c:969
 msgid "  -c NAME=VALUE   set run-time parameter\n"
 msgstr "  -c ИМЯ=ЗНАЧ.   установить параметр выполнения (run-time)\n"
 
-#: postmaster/postmaster.c:860
+#: postmaster/postmaster.c:970
 msgid "  -d 1-5          debugging level\n"
 msgstr "  -d 1-5          уровень отладки\n"
 
-#: postmaster/postmaster.c:861
+#: postmaster/postmaster.c:971
 msgid "  -D DATADIR      database directory\n"
 msgstr "  -D ДИРДАННЫХ    директория с данными\n"
 
-#: postmaster/postmaster.c:862
+#: postmaster/postmaster.c:972
 msgid "  -F              turn fsync off\n"
 msgstr "  -F              выуключить fsync\n"
 
-#: postmaster/postmaster.c:863
+#: postmaster/postmaster.c:973
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
 msgstr "  -h ХОСТ         имя хоста или IP-адрес для прослушивания\n"
 
-#: postmaster/postmaster.c:864
+#: postmaster/postmaster.c:974
 msgid "  -i              enable TCP/IP connections\n"
 msgstr "  -i              подключить TCP/IP соединения\n"
 
-#: postmaster/postmaster.c:865
+#: postmaster/postmaster.c:975
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
 msgstr "  -k ДИРЕКТОРИЯ   Местонахождния unix-domain сокетов\n"
 
-#: postmaster/postmaster.c:867
+#: postmaster/postmaster.c:977
 msgid "  -l              enable SSL connections\n"
 msgstr "  -l              включить SSL-подсоединения\n"
 
-#: postmaster/postmaster.c:869
-#, c-format
-msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
-msgstr ""
-"  -N MAX-CONNECT  максимально доступное число подсоединений (по умолчанию: %"
-"d)\n"
+#: postmaster/postmaster.c:979
+msgid "  -N MAX-CONNECT  maximum number of allowed connections\n"
+msgstr "  -N MAX-CONNECT  максимально доступное число подсоединений\n"
 
-#: postmaster/postmaster.c:871
+#: postmaster/postmaster.c:980
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
 msgstr "  -o ОПЦИИ        передать 'ОПЦИИ' каждому бэк-енду (серверу)\n"
 
-#: postmaster/postmaster.c:872
-#, c-format
-msgid "  -p PORT         port number to listen on (default %d)\n"
-msgstr "  -p ПОРТ         номер порта для прослушивания (по умолчанию: %d)\n"
+#: postmaster/postmaster.c:981
+msgid "  -p PORT         port number to listen on\n"
+msgstr "  -p ПОРТ         номер порта для прослушивания\n"
 
-#: postmaster/postmaster.c:873
-msgid ""
-"  -S              silent mode (start in background without logging output)\n"
-msgstr ""
-"  -S              тихий режим (запустить на заднем плане без логов "
-"результатов)\n"
+#: postmaster/postmaster.c:982
+msgid "  -S              silent mode (start in background without logging output)\n"
+msgstr "  -S              тихий режим (запустить на заднем плане без логов результатов)\n"
 
-#: postmaster/postmaster.c:874
+#: postmaster/postmaster.c:983
 msgid "  --help          show this help, then exit\n"
-msgstr ""
+msgstr "  --help          показать эту подсказку и выйти\n"
 
-#: postmaster/postmaster.c:875
+#: postmaster/postmaster.c:984
 msgid "  --version       output version information, then exit\n"
-msgstr ""
+msgstr "  --version       показать версию и выйти\n"
 
-#: postmaster/postmaster.c:877
+#: postmaster/postmaster.c:986
 msgid ""
 "\n"
 "Developer options:\n"
@@ -8407,20 +5342,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:987
+msgid "  -n              do not reinitialize shared memory after abnormal exit\n"
+msgstr "  -n              не переинициализировать общую память после ненормального завершения\n"
 
-#: postmaster/postmaster.c:879
+#: postmaster/postmaster.c:988
 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:990
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -8430,5502 +5360,3724 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 
-#: postmaster/postmaster.c:963
+#: postmaster/postmaster.c:1073
 #, c-format
-msgid "ServerLoop: select failed: %m"
+msgid "select failed in postmaster: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1089 postmaster/postmaster.c:1104
+#: postmaster/postmaster.c:1190
+#: postmaster/postmaster.c:1221
 msgid "incomplete startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1097
+#: postmaster/postmaster.c:1202
 msgid "invalid length of startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1137
+#: postmaster/postmaster.c:1254
 #, c-format
 msgid "failed to send SSL negotiation response: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1159
-msgid "unsupported frontend protocol"
-msgstr ""
-
-#: postmaster/postmaster.c:1186
-msgid "no PostgreSQL user name specified in startup packet"
-msgstr ""
-
-#: postmaster/postmaster.c:1219
-msgid "The database system is starting up"
-msgstr ""
-
-#: postmaster/postmaster.c:1222
-msgid "The database system is shutting down"
-msgstr ""
-
-#: postmaster/postmaster.c:1225
-msgid "The database system is in recovery mode"
-msgstr ""
-
-#: postmaster/postmaster.c:1228 storage/ipc/sinval.c:52
-#: storage/lmgr/proc.c:219
-msgid "Sorry, too many clients already"
-msgstr ""
-
-#: postmaster/postmaster.c:1258
+#: postmaster/postmaster.c:1283
 #, c-format
-msgid "processCancelRequest: CheckPointPID in cancel request for process %d"
+msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u"
 msgstr ""
 
-#: postmaster/postmaster.c:1272
-#, c-format
-msgid "processing cancel request: sending SIGINT to process %d"
+#: postmaster/postmaster.c:1347
+msgid "invalid startup packet layout: expected terminator as last byte"
 msgstr ""
 
-#: postmaster/postmaster.c:1278
-#, c-format
-msgid "bad key in cancel request for process %d"
-msgstr ""
-
-#: postmaster/postmaster.c:1285
-#, c-format
-msgid "bad pid in cancel request for process %d"
+#: postmaster/postmaster.c:1376
+msgid "no PostgreSQL user name specified in startup packet"
 msgstr ""
 
-#: postmaster/postmaster.c:1328
-msgid "ConnCreate: malloc failed"
-msgstr "ConnCreate: malloc не удался"
+#: postmaster/postmaster.c:1431
+msgid "the database system is starting up"
+msgstr "система баз данных стартует"
 
-#: postmaster/postmaster.c:1423
-msgid "Received SIGHUP, reloading configuration files"
-msgstr ""
+#: postmaster/postmaster.c:1436
+msgid "the database system is shutting down"
+msgstr "система баз данныз отключается"
 
-#: postmaster/postmaster.c:1447
-#, c-format
-msgid "pmdie %d"
-msgstr "pmdie %d"
+#: postmaster/postmaster.c:1441
+msgid "the database system is in recovery mode"
+msgstr "система баз данных в режиме восстановления"
 
-#: postmaster/postmaster.c:1461
-msgid "smart shutdown request"
+#: postmaster/postmaster.c:1446
+#: storage/ipc/sinval.c:54
+#: storage/lmgr/proc.c:226
+msgid "sorry, too many clients already"
 msgstr ""
 
-#: postmaster/postmaster.c:1473 postmaster/postmaster.c:1517
-#, c-format
-msgid "shutdown process %d already running"
+#: postmaster/postmaster.c:1655
+msgid "received SIGHUP, reloading configuration files"
 msgstr ""
 
-#: postmaster/postmaster.c:1491
-msgid "fast shutdown request"
+#: postmaster/postmaster.c:1699
+msgid "received smart shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1497
-msgid "aborting any active transactions"
+#: postmaster/postmaster.c:1730
+msgid "received fast shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1533
-msgid "immediate shutdown request"
+#: postmaster/postmaster.c:1737
+msgid "aborting any active transactions"
 msgstr ""
 
-#: postmaster/postmaster.c:1568
-msgid "reaping dead processes"
+#: postmaster/postmaster.c:1774
+msgid "received immediate shutdown request"
 msgstr ""
 
-#: postmaster/postmaster.c:1585
+#: postmaster/postmaster.c:1831
 msgid "statistics collector process"
-msgstr ""
+msgstr "процесс сбора статистики"
 
-#: postmaster/postmaster.c:1598
+#: postmaster/postmaster.c:1844
 msgid "shutdown process"
-msgstr ""
+msgstr "процесс закрытия"
 
-#: postmaster/postmaster.c:1609
+#: postmaster/postmaster.c:1856
 msgid "startup process"
-msgstr ""
+msgstr "процесс запуска"
 
-#: postmaster/postmaster.c:1611
+#: postmaster/postmaster.c:1859
 msgid "aborting startup due to startup process failure"
 msgstr ""
 
-#: postmaster/postmaster.c:1620
-#, c-format
-msgid "startup process %d died while shutdown process %d already running"
+#: postmaster/postmaster.c:1914
+msgid "all server processes terminated; reinitializing"
 msgstr ""
 
-#: postmaster/postmaster.c:1652
-msgid ""
-"all server processes terminated; reinitializing shared memory and semaphores"
-msgstr ""
-
-#: postmaster/postmaster.c:1690
+#: postmaster/postmaster.c:1952
 msgid "child process"
-msgstr ""
+msgstr "процесс-сын"
 
-#: postmaster/postmaster.c:1735
+#: postmaster/postmaster.c:1998
+msgid "checkpoint process"
+msgstr "процесс контольных точек"
+
+#: postmaster/postmaster.c:1999
 msgid "server process"
-msgstr ""
+msgstr "процесс сервера"
 
-#: postmaster/postmaster.c:1736
+#: postmaster/postmaster.c:2002
 msgid "terminating any other active server processes"
 msgstr ""
 
-#: postmaster/postmaster.c:1757
-#, c-format
-msgid "CleanupProc: sending %s to process %d"
-msgstr ""
-
-#: postmaster/postmaster.c:1801
+#: postmaster/postmaster.c:2071
 #, c-format
 msgid "%s (pid %d) exited with exit code %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1804
+#: postmaster/postmaster.c:2080
 #, c-format
 msgid "%s (pid %d) was terminated by signal %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1807
+#: postmaster/postmaster.c:2089
 #, c-format
 msgid "%s (pid %d) exited with unexpected status %d"
 msgstr ""
 
-#: postmaster/postmaster.c:1829
-#, c-format
-msgid "SignalChildren: sending signal %d to process %d"
-msgstr ""
-
-#: postmaster/postmaster.c:1867
-msgid "out of memory; connection startup aborted"
-msgstr ""
-
-#: postmaster/postmaster.c:1918
+#: postmaster/postmaster.c:2205
 msgid "connection startup failed"
 msgstr ""
 
-#: postmaster/postmaster.c:1935
+#: postmaster/postmaster.c:2221
 #, c-format
-msgid "connection startup failed (fork failure): %s"
+msgid "could not fork new process for connection: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:1942
-#, c-format
-msgid "BackendStartup: forked pid=%d socket=%d"
+#: postmaster/postmaster.c:2257
+msgid "could not fork new process for connection: "
 msgstr ""
 
-#: postmaster/postmaster.c:1976
-msgid "Server process fork() failed: "
-msgstr ""
-
-#: postmaster/postmaster.c:2123
+#: postmaster/postmaster.c:2388
 #, c-format
-msgid "connection received: host=%s port=%hu"
+msgid "connection received: host=%s port=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2143
+#: postmaster/postmaster.c:2450
 #, c-format
-msgid "connection received: host=%s"
+msgid "connection authorized: user=%s database=%s"
 msgstr ""
 
-#: postmaster/postmaster.c:2163
-msgid "DoBackend: Unable to set timer for auth timeout"
+#: postmaster/postmaster.c:2610
+#, c-format
+msgid "checkpoints are occurring too frequently (%d seconds apart)"
 msgstr ""
 
-#: postmaster/postmaster.c:2192
-msgid "DoBackend: Unable to disable timer for auth timeout"
+#: postmaster/postmaster.c:2612
+msgid "Consider increasing CHECKPOINT_SEGMENTS."
 msgstr ""
 
-#: postmaster/postmaster.c:2196
+#: postmaster/postmaster.c:2880
 #, c-format
-msgid "connection authorized: user=%s database=%s"
+msgid "could not fork startup process: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2285
+#: postmaster/postmaster.c:2884
 #, c-format
-msgid "%s child[%d]: starting with ("
+msgid "could not fork checkpoint process: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2288
-msgid ")"
-msgstr ")"
-
-#: postmaster/postmaster.c:2350
+#: postmaster/postmaster.c:2888
 #, c-format
-msgid ""
-"Checkpoint segments are being created too frequently (%d secs)\n"
-"\tConsider increasing CHECKPOINT_SEGMENTS"
+msgid "could not fork shutdown process: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2608
+#: postmaster/postmaster.c:2892
 #, c-format
-msgid "could not launch startup process (fork failure): %m"
+msgid "could not fork process: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2611
+#: postmaster/pgstat.c:200
 #, c-format
-msgid "could not launch checkpoint process (fork failure): %m"
+msgid "could not resolve \"localhost\": %s"
 msgstr ""
 
-#: postmaster/postmaster.c:2614
+#: postmaster/pgstat.c:220
 #, c-format
-msgid "could not launch shutdown process (fork failure): %m"
+msgid "could not create socket for statistics: %m"
 msgstr ""
 
-#: postmaster/postmaster.c:2638
-msgid "CheckPointDataBase: malloc failed"
-msgstr "CheckPointDataBase: malloc не удался"
-
-#: postmaster/postmaster.c:2677
-#, c-format
-msgid "cannot create file %s: %s"
-msgstr "не получилось создать файл %s: %s"
-
-#: postmaster/postmaster.c:2689
+#: postmaster/pgstat.c:232
 #, c-format
-msgid "writing file %s failed"
-msgstr "запись файл %s не удалась"
-
-#: postmaster/pgstat.c:178
-#, c-format
-msgid "PGSTAT: socket() failed: %m"
-msgstr "PGSTAT: socket() не удался: %m"
-
-#: postmaster/pgstat.c:192
-#, c-format
-msgid "PGSTAT: bind(127.0.0.1) failed: %m"
-msgstr "PGSTAT: bind(127.0.0.1) не удался: %m"
-
-#: postmaster/pgstat.c:197
-#, c-format
-msgid "PGSTAT: getsockname() failed: %m"
-msgstr "PGSTAT: getsockname() не удался: %m"
+msgid "could not bind socket for statistics: %m"
+msgstr ""
 
-#: postmaster/pgstat.c:209
+#: postmaster/pgstat.c:244
 #, c-format
-msgid "PGSTAT: connect() failed: %m"
-msgstr "PGSTAT: connect() не удался: %m"
+msgid "could not get address of socket for statistics: %m"
+msgstr ""
 
-#: postmaster/pgstat.c:221
+#: postmaster/pgstat.c:258
 #, c-format
-msgid "PGSTAT: fcntl() failed: %m"
-msgstr "PGSTAT: fcntl() не удался: %m"
+msgid "could not connect socket for statistics: %m"
+msgstr ""
 
-#: postmaster/pgstat.c:230 postmaster/pgstat.c:1158
+#: postmaster/pgstat.c:272
 #, c-format
-msgid "PGSTAT: pipe() failed: %m"
-msgstr "PGSTAT: pipe() не удался: %m"
-
-#: postmaster/pgstat.c:273
-msgid "PGSTAT: statistics collector startup skipped"
+msgid "could not set statistics socket to nonblock mode: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:296 postmaster/pgstat.c:1165
+#: postmaster/pgstat.c:283
 #, c-format
-msgid "PGSTAT: fork() failed: %m"
-msgstr "PGSTAT: fork() не удался: %m"
-
-#: postmaster/pgstat.c:697
-msgid "Only database superusers can reset statistic counters"
+msgid "could not create pipe for statistics collector: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:764 postmaster/pgstat.c:773 postmaster/pgstat.c:820
-#: postmaster/pgstat.c:830
-msgid "PGSTATBE: malloc() failed"
+#: postmaster/pgstat.c:344
+msgid "statistics collector startup skipped"
 msgstr ""
 
-#: postmaster/pgstat.c:1219
-msgid "PGSTAT: Creation of dead backend hash table failed"
+#: postmaster/pgstat.c:375
+#, c-format
+msgid "could not fork statistics buffer: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1230
-msgid "PGSTAT: Allocation of backend table failed"
+#: postmaster/pgstat.c:785
+msgid "must be superuser to reset statistics counters"
 msgstr ""
 
-#: postmaster/pgstat.c:1294
-#, c-format
-msgid "PGSTAT: select() failed: %m"
-msgstr "PGSTAT: select() не удался: %m"
-
-#: postmaster/pgstat.c:1334
+#: postmaster/pgstat.c:1266
 #, c-format
-msgid "PGSTAT: read() failed: %m"
-msgstr "PGSTAT: read() не удался: %m"
-
-#: postmaster/pgstat.c:1352
-msgid "PGSTAT: bogus message length"
+msgid "could not create pipe for statistics buffer: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1502
+#: postmaster/pgstat.c:1274
 #, c-format
-msgid "PGSTATBUFF: fcntl() failed: %m"
+msgid "could not fork statistics collector: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1512
-msgid "PGSTATBUFF: malloc() failed"
+#: postmaster/pgstat.c:1331
+#: postmaster/pgstat.c:1634
+#: postmaster/pgstat.c:1902
+#: postmaster/pgstat.c:1934
+#: postmaster/pgstat.c:1988
+#: postmaster/pgstat.c:2249
+#: postmaster/pgstat.c:2310
+#: postmaster/pgstat.c:2356
+#: postmaster/pgstat.c:2407
+#: postmaster/pgstat.c:2636
+#: postmaster/pgstat.c:2818
+msgid "out of memory in statistics collector --- abort"
 msgstr ""
 
-#: postmaster/pgstat.c:1539
-msgid "PGSTATBUFF: Warning - receive buffer full"
+#: postmaster/pgstat.c:1343
+msgid "allocation of backend table failed"
 msgstr ""
 
-#: postmaster/pgstat.c:1570
+#: postmaster/pgstat.c:1409
 #, c-format
-msgid "PGSTATBUFF: select() failed: %m"
+msgid "select failed in statistics collector: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1586
+#: postmaster/pgstat.c:1451
 #, c-format
-msgid "PGSTATBUFF: recvfrom() failed: %m"
+msgid "could not read from statistics pipe: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1661
-#, c-format
-msgid "PGSTATBUFF: write() failed: %m"
+#: postmaster/pgstat.c:1470
+msgid "invalid statistics message length"
 msgstr ""
 
-#: postmaster/pgstat.c:1714
+#: postmaster/pgstat.c:1622
 #, c-format
-msgid "PGSTAT: Invalid backend ID %d"
-msgstr ""
-
-#: postmaster/pgstat.c:1770
-msgid "PGSTAT: DB hash table out of memory - abort"
+msgid "could not set statistics pipe to nonblock mode: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1799 postmaster/pgstat.c:2214 postmaster/pgstat.c:2221
-msgid "PGSTAT: failed to initialize hash table for new database entry"
+#: postmaster/pgstat.c:1662
+msgid "statistics buffer is full"
 msgstr ""
 
-#: postmaster/pgstat.c:1851
-msgid "PGSTAT: dead backend hash table out of memory"
-msgstr ""
-
-#: postmaster/pgstat.c:1898
+#: postmaster/pgstat.c:1695
 #, c-format
-msgid "PGSTAT: cannot open temp stats file %s: %m"
+msgid "select failed in statistics buffer: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1924
-msgid "PGSTAT: database hash table corrupted during cleanup - abort"
+#: postmaster/pgstat.c:1713
+#, c-format
+msgid "failed to read statistics message: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:1960
+#: postmaster/pgstat.c:1788
 #, c-format
-msgid ""
-"PGSTAT: tables hash table for database %d corrupted during cleanup - abort"
+msgid "failed to write statistics pipe: %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2007
+#: postmaster/pgstat.c:1842
 #, c-format
-msgid "PGSTAT: Error closing temp stats file %s: %m"
+msgid "invalid backend ID %d"
 msgstr ""
 
-#: postmaster/pgstat.c:2014
+#: postmaster/pgstat.c:2037
+#: postmaster/pgstat.c:2150
 #, c-format
-msgid "PGSTAT: Cannot rename temp stats file %s: %m"
+msgid "could not write temp statistics file \"%s\": %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2035
-msgid "PGSTAT: dead backend hash table corrupted during cleanup - abort"
+#: postmaster/pgstat.c:2064
+msgid "database hash table corrupted during cleanup --- abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2100 postmaster/pgstat.c:2104
-msgid "PGSTAT: Creation of DB hash table failed"
+#: postmaster/pgstat.c:2101
+#, c-format
+msgid "tables hash table for database %u corrupted during cleanup --- abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2142 postmaster/pgstat.c:2148 postmaster/pgstat.c:2177
-#: postmaster/pgstat.c:2183 postmaster/pgstat.c:2248 postmaster/pgstat.c:2254
-#: postmaster/pgstat.c:2287 postmaster/pgstat.c:2293 postmaster/pgstat.c:2316
-#: postmaster/pgstat.c:2322 postmaster/pgstat.c:2370 postmaster/pgstat.c:2376
-#: postmaster/pgstat.c:2411 postmaster/pgstat.c:2417
-msgid "PGSTAT: corrupted pgstat.stat file"
+#: postmaster/pgstat.c:2159
+#, c-format
+msgid "could not rename temp statistics file \"%s\" to \"%s\": %m"
 msgstr ""
 
-#: postmaster/pgstat.c:2164 postmaster/pgstat.c:2170
-msgid "PGSTAT: DB hash table out of memory"
+#: postmaster/pgstat.c:2181
+msgid "dead-backend hash table corrupted during cleanup --- abort"
 msgstr ""
 
-#: postmaster/pgstat.c:2273 postmaster/pgstat.c:2279
-msgid "PGSTAT: Tab hash table out of memory"
+#: postmaster/pgstat.c:2292
+#: postmaster/pgstat.c:2324
+#: postmaster/pgstat.c:2387
+#: postmaster/pgstat.c:2420
+#: postmaster/pgstat.c:2441
+#: postmaster/pgstat.c:2487
+#: postmaster/pgstat.c:2520
+msgid "corrupted pgstat.stat file"
 msgstr ""
 
-#: postmaster/pgstat.c:2526
+#: rewrite/rewriteDefine.c:103
+#: rewrite/rewriteDefine.c:553
 #, c-format
-msgid "PGSTAT: tables hash table out of memory for database %d - abort"
-msgstr ""
+msgid "rule \"%s\" for relation \"%s\" already exists"
+msgstr "правило \"%s\" для связи \"%s\" уже существует"
 
-#: postmaster/pgstat.c:2706
-msgid "PGSTAT: failed to reinitialize hash table for database entry"
+#: rewrite/rewriteDefine.c:233
+msgid "rule actions on OLD are not implemented"
 msgstr ""
 
-#: regex/regcomp.c:1757 regex/regcomp.c:1772
-msgid "cclass_init: out of memory"
-msgstr "cclass_init: не достаточно памяти"
+#: rewrite/rewriteDefine.c:234
+msgid "Use views or triggers instead."
+msgstr ""
 
-#: rewrite/rewriteDefine.c:100
-#, c-format
-msgid "Attempt to insert rule \"%s\" failed: already exists"
+#: rewrite/rewriteDefine.c:238
+msgid "rule actions on NEW are not implemented"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:227
-msgid ""
-"rule actions on OLD currently not supported\n"
-"\tuse views or triggers instead"
+#: rewrite/rewriteDefine.c:239
+msgid "Use triggers instead."
 msgstr ""
 
-#: rewrite/rewriteDefine.c:230
-msgid ""
-"rule actions on NEW currently not supported\n"
-"\tuse triggers instead"
+#: rewrite/rewriteDefine.c:256
+msgid "INSTEAD NOTHING rules on select are not implemented"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:247
-msgid ""
-"instead nothing rules on select currently not supported\n"
-"\tuse views instead"
+#: rewrite/rewriteDefine.c:257
+msgid "Use views instead."
 msgstr ""
 
-#: rewrite/rewriteDefine.c:255
-msgid "multiple action rules on select currently not supported"
+#: rewrite/rewriteDefine.c:265
+msgid "multiple action rules on select are not implemented"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:262
-msgid "only instead-select rules currently supported on select"
+#: rewrite/rewriteDefine.c:274
+msgid "only instead-select rules are currently supported on select"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:268
-msgid "event qualifications not supported for rules on select"
+#: rewrite/rewriteDefine.c:282
+msgid "event qualifications are not implemented for rules on select"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:286
+#: rewrite/rewriteDefine.c:302
 msgid "select rule's target list has too many entries"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:300
+#: rewrite/rewriteDefine.c:318
 msgid "cannot convert relation containing dropped columns to view"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:303
+#: rewrite/rewriteDefine.c:323
 #, c-format
-msgid "select rule's target entry %d has different column name from %s"
+msgid "select rule's target entry %d has different column name from \"%s\""
 msgstr ""
 
-#: rewrite/rewriteDefine.c:306
+#: rewrite/rewriteDefine.c:328
 #, c-format
-msgid "select rule's target entry %d has different type from attribute %s"
+msgid "select rule's target entry %d has different type from attribute \"%s\""
 msgstr ""
 
-#: rewrite/rewriteDefine.c:317
+#: rewrite/rewriteDefine.c:341
 #, c-format
-msgid "select rule's target entry %d has different size from attribute %s"
+msgid "select rule's target entry %d has different size from attribute \"%s\""
 msgstr ""
 
-#: rewrite/rewriteDefine.c:321
+#: rewrite/rewriteDefine.c:347
 msgid "select rule's target list has too few entries"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:334
+#: rewrite/rewriteDefine.c:362
 #, c-format
 msgid "\"%s\" is already a view"
 msgstr ""
 
-#: rewrite/rewriteDefine.c:356
+#: rewrite/rewriteDefine.c:386
 #, c-format
 msgid "view rule for \"%s\" must be named \"%s\""
 msgstr ""
 
-#: rewrite/rewriteDefine.c:373
-#, c-format
-msgid "Relation \"%s\" is not empty. Cannot convert it to view"
-msgstr ""
-
-#: rewrite/rewriteDefine.c:512
-#, c-format
-msgid "RenameRewriteRule: rule \"%s\" does not exist"
-msgstr ""
-
-#: rewrite/rewriteDefine.c:516
-#, c-format
-msgid "Attempt to rename rule \"%s\" failed: \"%s\" already exists"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:345
-#, c-format
-msgid "rewriteTargetList: bogus resno %d in targetlist"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:387 rewrite/rewriteHandler.c:399
+#: rewrite/rewriteDefine.c:405
 #, c-format
-msgid "Multiple assignments to same attribute \"%s\""
-msgstr ""
-
-#: rewrite/rewriteHandler.c:555
-msgid "ApplyRetrieveRule: expected just one rule action"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:557
-msgid "ApplyRetrieveRule: can't handle qualified ON SELECT rule"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:559
-msgid "ApplyRetrieveRule: can't handle per-attribute ON SELECT rule"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:837
-msgid "fireRIRrules: failed to remove aggs from qual"
+msgid "cannot convert non-empty table \"%s\" to a view"
 msgstr ""
 
-#: rewrite/rewriteHandler.c:1098
+#: rewrite/rewriteDefine.c:546
+#: rewrite/rewriteRemove.c:59
 #, c-format
-msgid "query rewritten %d times, may contain cycles"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:1210
-msgid ""
-"Cannot insert into a view\n"
-"\tYou need an unconditional ON INSERT DO INSTEAD rule"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:1214
-msgid ""
-"Cannot update a view\n"
-"\tYou need an unconditional ON UPDATE DO INSTEAD rule"
-msgstr ""
-
-#: rewrite/rewriteHandler.c:1218
-msgid ""
-"Cannot delete from a view\n"
-"\tYou need an unconditional ON DELETE DO INSTEAD rule"
-msgstr ""
+msgid "rule \"%s\" for relation \"%s\" does not exist"
+msgstr "правило \"%s\" для связи \"%s\" не существует"
 
-#: rewrite/rewriteHandler.c:1222
+#: rewrite/rewriteHandler.c:458
+#: rewrite/rewriteHandler.c:472
 #, 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"
+msgid "multiple assignments to same attribute \"%s\""
 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"
-msgstr "Правило \"%s\" не найдено"
-
-#: rewrite/rewriteRemove.c:113
+#: rewrite/rewriteHandler.c:884
+#: rewrite/rewriteHandler.c:1166
 #, c-format
-msgid "RemoveRewriteRuleById: Rule %u does not exist"
-msgstr "RemoveRewriteRuleById: Правило %u не существует"
-
-#: rewrite/rewriteSupport.c:68
-#, c-format
-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"
+msgid "infinite recursion detected in rules for relation \"%s\""
 msgstr ""
 
-#: storage/buffer/buf_table.c:138
-msgid "BufTableInsert: BufferLookup table corrupted"
-msgstr ""
+#: rewrite/rewriteHandler.c:1276
+msgid "cannot insert into a view"
+msgstr "нельзя вставлять в вид"
 
-#: storage/buffer/bufmgr.c:243
-msgid "BufRead: buffer table broken after IO error"
+#: rewrite/rewriteHandler.c:1277
+msgid "You need an unconditional ON INSERT DO INSTEAD rule."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:413
-#, c-format
-msgid "BufferAlloc: cannot write block %u for %u/%u"
-msgstr ""
-
-#: storage/buffer/bufmgr.c:431
-#, c-format
-msgid "BufferAlloc: content of block %u (%u/%u) changed while flushing"
-msgstr ""
+#: rewrite/rewriteHandler.c:1282
+msgid "cannot update a view"
+msgstr "нельзя обновить вид"
 
-#: storage/buffer/bufmgr.c:523
-msgid "buffer wasn't in the buffer table"
+#: rewrite/rewriteHandler.c:1283
+msgid "You need an unconditional ON UPDATE DO INSTEAD rule."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:531
-msgid "Buffer in lookup table twice"
-msgstr ""
+#: rewrite/rewriteHandler.c:1288
+msgid "cannot delete from a view"
+msgstr "нельзя удалить из вида"
 
-#: storage/buffer/bufmgr.c:570
-#, c-format
-msgid "write_buffer: bad buffer %d"
+#: rewrite/rewriteHandler.c:1289
+msgid "You need an unconditional ON DELETE DO INSTEAD rule."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:782
-#, c-format
-msgid "BufferSync: cannot write %u for %u/%u"
+#: rewrite/rewriteManip.c:734
+#: rewrite/rewriteManip.c:788
+msgid "conditional utility statements are not implemented"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:920
-#, c-format
-msgid ""
-"Buffer Leak: [%03d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, "
-"flags=0x%x, refcount=%d %ld)"
+#: rewrite/rewriteManip.c:879
+msgid "cannot handle whole-tuple reference"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1167
-#, c-format
-msgid "DropRelFileNodeBuffers: block %u is referenced (private %ld, global %d)"
-msgstr ""
+#: storage/buffer/buf_table.c:128
+#: storage/freespace/freespace.c:1005
+msgid "out of shared memory"
+msgstr "не общей хватает памяти"
 
-#: storage/buffer/bufmgr.c:1270 storage/buffer/bufmgr.c:1304
+#: storage/buffer/bufmgr.c:234
 #, c-format
-msgid ""
-"[%02d] (freeNext=%d, freePrev=%d, rel=%u/%u, blockNum=%u, flags=0x%x, "
-"refcount=%d %ld)"
+msgid "invalid page header in block %u of \"%s\"; zeroing out page"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1379
+#: storage/buffer/bufmgr.c:241
 #, c-format
-msgid ""
-"FlushRelationBuffers(%s (local), %u): block %u is dirty, could not flush it"
+msgid "invalid page header in block %u of \"%s\""
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1389
+#: storage/buffer/bufmgr.c:439
+#: storage/buffer/bufmgr.c:821
+#: storage/buffer/bufmgr.c:1512
+#: storage/buffer/bufmgr.c:2154
 #, c-format
-msgid "FlushRelationBuffers(%s (local), %u): block %u is referenced (%ld)"
+msgid "could not write block %u of %u/%u"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1441
-#, c-format
-msgid "FlushRelationBuffers: cannot write %u for %u/%u"
+#: storage/buffer/bufmgr.c:2158
+msgid "Multiple failures --- write error may be permanent."
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1467
+#: storage/buffer/bufmgr.c:2191
 #, c-format
-msgid ""
-"FlushRelationBuffers(%s, %u): block %u is referenced (private %ld, global %d)"
+msgid "writing block %u of relation %u/%u"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1666
-msgid "buffer alloc trace error and can't open log file"
+#: storage/buffer/freelist.c:203
+msgid "out of free buffers"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1765
-#, c-format
-msgid "SetBufferCommitInfoNeedsSave: bad buffer %d"
+#: storage/buffer/localbuf.c:85
+msgid "no empty local buffer available"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1859
+#: storage/file/fd.c:277
+#: storage/file/fd.c:1067
 #, c-format
-msgid "LockBuffer: unknown lock mode %d"
-msgstr ""
-
-#: storage/buffer/bufmgr.c:1890 storage/buffer/bufmgr.c:1897
-msgid "LockBufferForCleanup: wrong local pin count"
+msgid "out of file descriptors: %m; release and retry"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:1919
-msgid "Multiple backends attempting to wait for pincount 1"
+#: storage/file/fd.c:334
+msgid "insufficient file descriptors available to start backend"
 msgstr ""
 
-#: storage/buffer/bufmgr.c:2042
+#: storage/file/fd.c:335
 #, c-format
-msgid "write error may be permanent: cannot write block %u for %u/%u"
+msgid "System allows %ld, we need at least %d."
 msgstr ""
 
-#: storage/buffer/freelist.c:201
-msgid "out of free buffers: time to abort!"
+#: storage/freespace/freespace.c:274
+#: storage/freespace/freespace.c:291
+#: storage/freespace/freespace.c:306
+msgid "insufficient shared memory for free space map"
 msgstr ""
 
-#: storage/buffer/localbuf.c:83
-msgid "no empty local buffer."
-msgstr ""
-
-#: storage/buffer/localbuf.c:125
-msgid "Out of memory in LocalBufferAlloc"
-msgstr ""
-
-#: storage/buffer/localbuf.c:232
+#: storage/freespace/freespace.c:299
 #, c-format
-msgid ""
-"Local Buffer Leak: [%03d] (rel=%u/%u, blockNum=%u, flags=0x%x, refcount=%d %"
-"ld)"
+msgid "max_fsm_pages must exceed max_fsm_relations * %d"
 msgstr ""
 
-#: storage/file/buffile.c:477
-#, c-format
-msgid "BufFileSeek: invalid whence: %d"
+#: storage/freespace/freespace.c:334
+msgid "max_fsm_pages is too large"
 msgstr ""
 
-#: storage/file/fd.c:272
+#: storage/freespace/freespace.c:705
 #, c-format
-msgid "BasicOpenFile: not enough descs, retry, er= %d"
+msgid "free space map: %d relations, %d pages stored; %.0f total pages needed"
 msgstr ""
 
-#: storage/file/fd.c:306
+#: storage/freespace/freespace.c:707
 #, c-format
-msgid "pg_nofile: sysconf(_SC_OPEN_MAX) failed; using %ld"
+msgid "Allocated FSM size: %d relations + %d pages = %.0f KB shared mem."
 msgstr ""
 
-#: storage/file/fd.c:328
+#: storage/ipc/shmem.c:376
 #, c-format
-msgid ""
-"pg_nofile: insufficient file descriptors available to start backend.\n"
-"\tSystem allows %ld, we need at least %d."
-msgstr ""
+msgid "could not allocate \"%s\""
+msgstr "не получилось выделить \"%s\""
 
-#: storage/file/fd.c:366
+#: storage/lmgr/deadlock.c:867
 #, c-format
-msgid "Delete %d (%s)"
+msgid "Proc %d waits for %s on transaction %u; blocked by proc %d."
 msgstr ""
 
-#: storage/file/fd.c:385
+#: storage/lmgr/deadlock.c:877
 #, c-format
-msgid "LruDelete %d (%s)"
+msgid "Proc %d waits for %s on relation %u of database %u; blocked by proc %d."
 msgstr ""
 
-#: storage/file/fd.c:399
-#, c-format
-msgid "LruDelete: failed to close %s: %m"
+#: storage/lmgr/deadlock.c:887
+msgid "deadlock detected"
 msgstr ""
 
-#: storage/file/fd.c:413
+#: storage/page/bufpage.c:137
+#: storage/page/bufpage.c:335
+#: storage/page/bufpage.c:474
 #, c-format
-msgid "Insert %d (%s)"
+msgid "corrupted page pointers: lower = %u, upper = %u, special = %u"
 msgstr ""
 
-#: storage/file/fd.c:434
+#: storage/page/bufpage.c:379
 #, c-format
-msgid "LruInsert %d (%s)"
+msgid "corrupted item pointer: %u"
 msgstr ""
 
-#: storage/file/fd.c:456
+#: storage/page/bufpage.c:394
 #, c-format
-msgid "RE_OPEN FAILED: %d"
-msgstr "RE_OPEN НЕ УДАЛСЯ: %d"
-
-#: storage/file/fd.c:461
-msgid "RE_OPEN SUCCESS"
-msgstr "RE_OPEN УСПЕШЕН"
-
-#: storage/file/fd.c:487
-#, c-format
-msgid "ReleaseLruFile. Opened %d"
+msgid "corrupted item lengths: total %u, available space %u"
 msgstr ""
 
-#: storage/file/fd.c:508
+#: storage/page/bufpage.c:492
 #, c-format
-msgid "AllocateVfd. Size %d"
-msgstr ""
-
-#: storage/file/fd.c:515
-msgid "AllocateVfd: no room for VFD array"
-msgstr ""
-
-#: storage/file/fd.c:547
-msgid "AllocateVfd: no room to enlarge VFD array"
+msgid "corrupted item pointer: offset = %u size = %u"
 msgstr ""
 
-#: storage/file/fd.c:580
+#: storage/smgr/smgr.c:176
 #, c-format
-msgid "FreeVfd: %d (%s)"
-msgstr "FreeVfd: %d (%s)"
+msgid "could not create \"%s\": %m"
+msgstr "не получилось создать \"%s\": %m"
 
-#: storage/file/fd.c:630
+#: storage/smgr/smgr.c:251
 #, c-format
-msgid "FileAccess %d (%s)"
-msgstr "FileAccess %d (%s)"
+msgid "could not extend \"%s\": %m"
+msgstr "не получилось расширить \"%s\": %m"
 
-#: storage/file/fd.c:682
-msgid "fileNameOpenFile: NULL fname"
+#: storage/smgr/smgr.c:253
+msgid "Check free disk space."
 msgstr ""
 
-#: storage/file/fd.c:684
+#: storage/smgr/smgr.c:295
 #, c-format
-msgid "fileNameOpenFile: %s %x %o"
-msgstr "fileNameOpenFile: %s %x %o"
+msgid "could not close \"%s\": %m"
+msgstr "не получилось закрыть \"%s\": %m"
 
-#: storage/file/fd.c:704
+#: storage/smgr/smgr.c:321
 #, c-format
-msgid "fileNameOpenFile: success %d"
+msgid "could not read block %d of \"%s\": %m"
 msgstr ""
 
-#: storage/file/fd.c:711
-msgid "fileNameOpenFile: no room to save VFD filename"
-msgstr ""
-
-#: storage/file/fd.c:795
+#: storage/smgr/smgr.c:347
 #, c-format
-msgid "Failed to create temporary file %s"
+msgid "could not write block %d of \"%s\": %m"
 msgstr ""
 
-#: storage/file/fd.c:814
-#, c-format
-msgid "FileClose: %d (%s)"
-msgstr "FileClose: %d (%s)"
-
-#: storage/file/fd.c:826
+#: storage/smgr/smgr.c:378
 #, c-format
-msgid "FileClose: failed to close %s: %m"
+msgid "could not write block %d of %u/%u blind: %m"
 msgstr ""
 
-#: storage/file/fd.c:841
+#: storage/smgr/smgr.c:407
 #, c-format
-msgid "FileClose: failed to unlink %s: %m"
+msgid "could not count blocks of \"%s\": %m"
 msgstr ""
 
-#: storage/file/fd.c:859
+#: storage/smgr/smgr.c:439
 #, c-format
-msgid "FileUnlink: %d (%s)"
-msgstr "FileUnlink: %d (%s)"
-
-#: storage/file/fd.c:875
-#, c-format
-msgid "FileRead: %d (%s) %ld %d %p"
-msgstr "FileRead: %d (%s) %ld %d %p"
-
-#: storage/file/fd.c:896
-#, c-format
-msgid "FileWrite: %d (%s) %ld %d %p"
-msgstr "FileWrite: %d (%s) %ld %d %p"
-
-#: storage/file/fd.c:922
-#, c-format
-msgid "FileSeek: %d (%s) %ld %ld %d"
-msgstr "FileSeek: %d (%s) %ld %ld %d"
-
-#: storage/file/fd.c:932 storage/file/fd.c:953
-#, c-format
-msgid "FileSeek: invalid offset: %ld"
+msgid "could not truncate \"%s\" to %u blocks: %m"
 msgstr ""
 
-#: storage/file/fd.c:943 storage/file/fd.c:965
+#: storage/smgr/smgr.c:483
 #, c-format
-msgid "FileSeek: invalid whence: %d"
+msgid "could not unlink %u/%u: %m"
 msgstr ""
 
-#: storage/file/fd.c:980
-#, c-format
-msgid "FileTell %d (%s)"
-msgstr "FileTell %d (%s)"
-
-#: storage/file/fd.c:993
+#: tcop/fastpath.c:106
+#: tcop/fastpath.c:450
+#: tcop/fastpath.c:573
 #, c-format
-msgid "FileTruncate %d (%s)"
-msgstr "FileTruncate %d (%s)"
-
-#: storage/file/fd.c:1024
-#, c-format
-msgid "AllocateFile: Allocated %d"
-msgstr ""
-
-#: storage/file/fd.c:1027
-msgid "AllocateFile: too many private FDs demanded"
+msgid "invalid argument size %d in function call message"
 msgstr ""
 
-#: storage/file/fd.c:1041
-#, c-format
-msgid "AllocateFile: not enough descs, retry, er= %d"
+#: tcop/fastpath.c:305
+#: tcop/postgres.c:796
+#: tcop/postgres.c:1116
+#: tcop/postgres.c:1574
+msgid "current transaction is aborted, queries ignored until end of transaction block"
 msgstr ""
 
-#: storage/file/fd.c:1057
+#: tcop/fastpath.c:420
+#: tcop/fastpath.c:543
 #, c-format
-msgid "FreeFile: Allocated %d"
-msgstr ""
-
-#: storage/file/fd.c:1070
-msgid "FreeFile: file was not obtained from AllocateFile"
-msgstr ""
-
-#: storage/freespace/freespace.c:180 storage/freespace/freespace.c:195
-#: storage/freespace/freespace.c:203
-msgid "Insufficient shared memory for free space map"
-msgstr ""
-
-#: storage/freespace/freespace.c:421
-msgid "MultiRecordFreeSpace: data not in page order"
-msgstr ""
-
-#: storage/freespace/freespace.c:536
-msgid "FreeSpaceMap hashtable out of memory"
-msgstr ""
-
-#: storage/freespace/freespace.c:606
-msgid "FreeSpaceMap hashtable corrupted"
-msgstr ""
-
-#: storage/freespace/freespace.c:779
-msgid "fsm_record_free_space: unexpected match"
-msgstr ""
-
-#: storage/freespace/freespace.c:889
-msgid "insert_fsm_page_entry: entry already exists!"
+msgid "function call message contains %d arguments but function requires %d"
 msgstr ""
 
-#: storage/ipc/ipc.c:95
-#, c-format
-msgid "proc_exit(%d)"
-msgstr "proc_exit(%d)"
-
-#: storage/ipc/ipc.c:113
+#: tcop/fastpath.c:428
 #, c-format
-msgid "exit(%d)"
-msgstr "exit(%d)"
-
-#: storage/ipc/ipc.c:126
-#, c-format
-msgid "shmem_exit(%d)"
-msgstr "shmem_exit(%d)"
-
-#: storage/ipc/ipc.c:152
-msgid "Out of on_proc_exit slots"
+msgid "function call message contains %d argument formats but %d arguments"
 msgstr ""
 
-#: storage/ipc/ipci.c:73
+#: tcop/fastpath.c:511
+#: tcop/fastpath.c:596
 #, c-format
-msgid "invoking IpcMemoryCreate(size=%d)"
-msgstr ""
-
-#: storage/ipc/ipci.c:115
-msgid "Couldn't create the lock table"
-msgstr ""
-
-#: storage/ipc/shmem.c:161
-msgid "ShmemAlloc: out of memory"
-msgstr "ShmemAlloc: не хватает памяти"
-
-#: storage/ipc/shmem.c:207
-msgid "InitShmemIndex: couldn't initialize Shmem Index"
-msgstr ""
-
-#: storage/ipc/shmem.c:218
-msgid "InitShmemIndex: Shmem Index out of memory"
-msgstr ""
-
-#: storage/ipc/shmem.c:336
-msgid "ShmemInitStruct: Shmem Index out of memory"
-msgstr ""
-
-#: storage/ipc/shmem.c:351
-msgid "ShmemInitStruct: ShmemIndex entry size is wrong"
+msgid "incorrect binary data format in function argument %d"
 msgstr ""
 
-#: storage/ipc/shmem.c:368
+#: tcop/postgres.c:331
+#: tcop/postgres.c:343
+#: tcop/postgres.c:354
+#: tcop/postgres.c:366
+#: tcop/postgres.c:3068
 #, c-format
-msgid "ShmemInitStruct: cannot allocate '%s'"
+msgid "invalid frontend message type %d"
 msgstr ""
 
-#: storage/ipc/shmqueue.c:234 storage/ipc/shmqueue.c:254
+#: tcop/postgres.c:464
 #, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: storage/ipc/sinval.c:50
-msgid "Backend cache invalidation initialization failed"
-msgstr ""
-
-#: storage/ipc/sinval.c:68
-msgid "SendSharedInvalidMessage: SI buffer overflow"
-msgstr ""
+msgid "query: %s"
+msgstr "запрос: %s"
 
-#: storage/ipc/sinval.c:111
-msgid "ReceiveSharedInvalidMessages: cache state reset"
+#: tcop/postgres.c:563
+msgid "copyObject failed to produce an equal parse tree"
 msgstr ""
 
-#: storage/ipc/sinval.c:319 storage/ipc/sinval.c:329
-msgid "Memory exhausted in GetSnapshotData"
+#: tcop/postgres.c:608
+msgid "copyObject failed to produce an equal plan tree"
 msgstr ""
 
-#: storage/ipc/sinvaladt.c:124
+#: tcop/postgres.c:963
 #, c-format
-msgid "SIBackendInit: backend id %d"
+msgid "duration_statement: %ld.%06ld %s"
 msgstr ""
 
-#: storage/ipc/sinvaladt.c:229
+#: tcop/postgres.c:974
 #, c-format
-msgid "SIInsertDataEntry: table is 70%% full, signaling postmaster"
-msgstr ""
-
-#: storage/large_object/inv_api.c:48
-msgid "getbytealen: VARSIZE(data) < VARHDRSZ. This is internal error."
+msgid "duration: %ld.%06ld sec"
 msgstr ""
 
-#: storage/large_object/inv_api.c:74
-#, c-format
-msgid "inv_create: large object %u already exists. This is internal error."
+#: tcop/postgres.c:1080
+msgid "cannot insert multiple commands into a prepared statement"
 msgstr ""
 
-#: storage/large_object/inv_api.c:107
+#: tcop/postgres.c:1274
 #, c-format
-msgid "inv_create: invalid flags: %d"
+msgid "bind message has %d parameter formats but %d parameters"
 msgstr ""
 
-#: storage/large_object/inv_api.c:126
-#, c-format
-msgid "inv_open: large object %u not found"
-msgstr ""
+# [SM]: TO REVIEW
+#: tcop/postgres.c:1287
+#: tcop/postgres.c:1651
+msgid "unnamed prepared statement does not exist"
+msgstr "безымянная заготовленная команда не существует"
 
-#: storage/large_object/inv_api.c:144
+#: tcop/postgres.c:1293
 #, c-format
-msgid "inv_open: invalid flags: %d"
+msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d"
 msgstr ""
 
-#: storage/large_object/inv_api.c:244
+#: tcop/postgres.c:1423
 #, c-format
-msgid "inv_getsize: large object %u not found"
+msgid "incorrect binary data format in bind parameter %d"
 msgstr ""
 
-#: 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"
+#: tcop/postgres.c:1800
+msgid "terminating connection due to crash of another backend"
 msgstr ""
 
-#: storage/large_object/inv_api.c:275
-#, c-format
-msgid "inv_seek: invalid whence: %d"
+#: tcop/postgres.c:1801
+msgid "The postmaster has commanded this backend to roll back the current transaction and exit, because another backend exited abnormally and possibly corrupted shared memory."
 msgstr ""
 
-#: storage/lmgr/deadlock.c:275
-msgid "DeadLockCheckRecurse: inconsistent results"
+#: tcop/postgres.c:1805
+msgid "In a moment you should be able to reconnect to the database and repeat your query."
 msgstr ""
 
-#: storage/lmgr/lmgr.c:85
-msgid "InitLockTable: couldn't initialize lock table"
+#: tcop/postgres.c:1920
+msgid "floating-point exception"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:94
-msgid "InitLockTable: couldn't rename long-term lock table"
+#: tcop/postgres.c:1921
+msgid "An invalid floating-point operation was signaled. This probably means an out-of-range result or an invalid operation, such as division by zero."
 msgstr ""
 
-#: storage/lmgr/lmgr.c:135
-msgid "LockRelation: LockAcquire failed"
+#: tcop/postgres.c:1956
+msgid "terminating connection due to administrator command"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:224
-msgid "LockRelationForSession: LockAcquire failed"
+#: tcop/postgres.c:1965
+msgid "canceling query due to user request"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:262
-msgid "LockPage: LockAcquire failed"
+#: tcop/postgres.c:2473
+msgid "query-level statistics are disabled because parser, planner, or executor statistics are on"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:303
-msgid "XactLockTableInsert: LockAcquire failed"
+#: tcop/postgres.c:2556
+msgid "invalid backend command-line arguments"
 msgstr ""
 
-#: storage/lmgr/lmgr.c:326
-msgid "XactLockTableWait: LockAcquire failed"
-msgstr ""
+#: tcop/postgres.c:2557
+#: tcop/postgres.c:2573
+msgid "Try -? for help."
+msgstr "Наберите -? для подсказки."
 
-#: storage/lmgr/lock.c:110
+#: tcop/postgres.c:2571
 #, 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: invalid command-line arguments"
+msgstr "%s: неверные аргументы командной строки"
 
-#: storage/lmgr/lock.c:136
+#: tcop/postgres.c:2581
 #, c-format
-msgid ""
-"%s: holder(%lx) lock(%lx) tbl(%d) proc(%lx) xid(%u) hold(%d,%d,%d,%d,%d,%d,%"
-"d)=%d"
+msgid "%s: no database nor user name specified"
 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
+#: tcop/postgres.c:2981
 #, c-format
-msgid "LockMethodTableInit: too many lock types %d greater than %d"
+msgid "invalid CLOSE message subtype %d"
 msgstr ""
 
-#: storage/lmgr/lock.c:264 storage/lmgr/lock.c:310 storage/lmgr/lock.c:330
+#: tcop/postgres.c:3011
 #, c-format
-msgid "LockMethodTableInit: couldn't initialize %s"
+msgid "invalid DESCRIBE message subtype %d"
 msgstr ""
 
-#: storage/lmgr/lock.c:451
+#: tcop/pquery.c:352
 #, c-format
-msgid "LockAcquire: user lock [%u] %s"
+msgid "bind message has %d result formats but query has %d columns"
 msgstr ""
 
-#: storage/lmgr/lock.c:462
+#: tcop/pquery.c:415
+#: tcop/pquery.c:927
 #, c-format
-msgid "LockAcquire: bad lock table %d"
+msgid "portal \"%s\" cannot be run anymore"
 msgstr ""
 
-#: storage/lmgr/lock.c:480
-#, c-format
-msgid "LockAcquire: lock table %d is out of memory"
+#: tcop/pquery.c:601
+msgid "cursor can only scan forward"
 msgstr ""
 
-#: storage/lmgr/lock.c:527
-msgid "LockAcquire: holder table out of memory"
+#: tcop/pquery.c:602
+msgid "Declare it with SCROLL option to enable backward scan."
 msgstr ""
 
-#: storage/lmgr/lock.c:572
+#: tcop/utility.c:75
 #, c-format
-msgid "Deadlock risk: raising lock level from %s to %s on object %u/%u/%u"
-msgstr ""
+msgid "table \"%s\" does not exist"
+msgstr "таблица \"%s\" не существует"
 
-#: storage/lmgr/lock.c:652
-msgid "LockAcquire: remove holder, table corrupted"
-msgstr ""
-
-#: storage/lmgr/lock.c:908
-msgid "deadlock detected"
+#: tcop/utility.c:77
+msgid "Use DROP TABLE to remove a table."
 msgstr ""
 
-#: storage/lmgr/lock.c:989
+#: tcop/utility.c:80
 #, c-format
-msgid "LockRelease: user lock tag [%u] %d"
-msgstr ""
-
-#: storage/lmgr/lock.c:999
-msgid "lockMethodTable is null in LockRelease"
-msgstr ""
-
-#: storage/lmgr/lock.c:1021
-msgid "LockRelease: no such lock"
-msgstr ""
-
-#: storage/lmgr/lock.c:1044
-msgid "LockRelease: no lock with this tag"
-msgstr ""
+msgid "sequence \"%s\" does not exist"
+msgstr "последовательность \"%s\" не существует"
 
-#: storage/lmgr/lock.c:1047
-msgid "LockRelease: holder table corrupted"
+#: tcop/utility.c:82
+msgid "Use DROP SEQUENCE to remove a sequence."
 msgstr ""
 
-#: storage/lmgr/lock.c:1061
+#: tcop/utility.c:85
 #, c-format
-msgid "LockRelease: you don't own a lock of type %s"
-msgstr ""
-
-#: storage/lmgr/lock.c:1115
-msgid "LockRelease: remove lock, table corrupted"
-msgstr ""
+msgid "view \"%s\" does not exist"
+msgstr "вид \"%s\" не существует"
 
-#: storage/lmgr/lock.c:1144
-msgid "LockRelease: remove holder, table corrupted"
+#: tcop/utility.c:87
+msgid "Use DROP VIEW to remove a view."
 msgstr ""
 
-#: storage/lmgr/lock.c:1185
+#: tcop/utility.c:90
 #, c-format
-msgid "LockReleaseAll: lockmethod=%d, pid=%d"
+msgid "index \"%s\" does not exist"
 msgstr ""
 
-#: storage/lmgr/lock.c:1193
+#: tcop/utility.c:91
 #, c-format
-msgid "LockReleaseAll: bad lockmethod %d"
-msgstr ""
-
-#: storage/lmgr/lock.c:1297
-msgid "LockReleaseAll: holder table corrupted"
-msgstr ""
+msgid "\"%s\" is not an index"
+msgstr "\"%s\" не является индексом"
 
-#: storage/lmgr/lock.c:1315
-msgid "LockReleaseAll: cannot remove lock from HTAB"
+#: tcop/utility.c:92
+msgid "Use DROP INDEX to remove an index."
 msgstr ""
 
-#: storage/lmgr/lock.c:1330
-msgid "LockReleaseAll: done"
-msgstr ""
-
-#: storage/lmgr/lock.c:1517
-msgid "DumpAllLocks: holder->tag.lock = NULL"
-msgstr ""
-
-#: storage/lmgr/lwlock.c:71
-#, c-format
-msgid "%s(%d): excl %d shared %d head %p rOK %d"
-msgstr ""
-
-#: storage/lmgr/lwlock.c:81
+#: tcop/utility.c:96
 #, c-format
-msgid "%s(%d): %s"
-msgstr "%s(%d): %s"
-
-#: storage/lmgr/lwlock.c:184
-msgid "No more LWLockIds available"
-msgstr ""
+msgid "\"%s\" is not a type"
+msgstr "\"%s\" не является типом"
 
-#: storage/lmgr/lwlock.c:281
-msgid "LWLockAcquire: can't wait without a PGPROC structure"
+#: tcop/utility.c:97
+msgid "Use DROP TYPE to remove a type."
 msgstr ""
 
-#: storage/lmgr/lwlock.c:427
-#, c-format
-msgid "LWLockRelease: lock %d is not held"
+#: tcop/utility.c:602
+#: tcop/utility.c:664
+msgid "must be superuser to alter owner"
 msgstr ""
 
-#: storage/lmgr/proc.c:151 storage/lmgr/proc.c:165
-msgid "cannot create new proc: out of memory"
+#: tcop/utility.c:984
+msgid "must be superuser to do CHECKPOINT"
 msgstr ""
 
-#: storage/lmgr/proc.c:192
-msgid "InitProcess: Proc Header uninitialized"
+#: utils/adt/array_userfuncs.c:50
+msgid "could not determine input data types"
 msgstr ""
 
-#: storage/lmgr/proc.c:195
-msgid "InitProcess: you already exist"
+#: utils/adt/array_userfuncs.c:72
+msgid "neither input type is an array"
 msgstr ""
 
-#: storage/lmgr/proc.c:273
-msgid "InitDummyProcess: Proc Header uninitialized"
+#: utils/adt/array_userfuncs.c:99
+msgid "input must be empty or one-dimensional array"
 msgstr ""
 
-#: storage/lmgr/proc.c:276
-msgid "InitDummyProcess: you already exist"
+#: utils/adt/array_userfuncs.c:198
+#: utils/adt/array_userfuncs.c:210
+#: utils/adt/array_userfuncs.c:247
+#: utils/adt/array_userfuncs.c:280
+#: utils/adt/array_userfuncs.c:308
+msgid "cannot concatenate incompatible arrays"
 msgstr ""
 
-#: storage/lmgr/proc.c:282
+#: utils/adt/array_userfuncs.c:199
 #, c-format
-msgid "InitDummyProcess: DummyProc is in use by PID %d"
-msgstr ""
-
-#: storage/lmgr/proc.c:657
-msgid "ProcSleep: Unable to set timer for process wakeup"
-msgstr ""
-
-#: storage/lmgr/proc.c:679
-msgid "ProcSleep: Unable to disable timer for process wakeup"
-msgstr ""
-
-#: storage/lmgr/spin.c:84
-msgid "spin.c does not support S_LOCK_FREE()"
+msgid "Arrays of %d and %d dimensions are not compatible for concatenation."
 msgstr ""
 
-#: storage/page/bufpage.c:92
+#: utils/adt/array_userfuncs.c:211
 #, c-format
-msgid ""
-"PageAddItem: corrupted page pointers: lower = %u, upper = %u, special = %u"
-msgstr ""
-
-#: storage/page/bufpage.c:112
-msgid "PageAddItem: tried overwrite of used ItemId"
-msgstr ""
-
-#: storage/page/bufpage.c:139
-msgid "PageAddItem: specified offset after maxoff"
+msgid "Arrays with element types %s and %s are not compatible for concatenation."
 msgstr ""
 
-#: storage/page/bufpage.c:288
-#, c-format
-msgid ""
-"PageRepairFragmentation: corrupted page pointers: lower = %u, upper = %u, "
-"special = %u"
+#: utils/adt/array_userfuncs.c:248
+msgid "Arrays with differing element dimensions are not compatible for concatenation."
 msgstr ""
 
-#: storage/page/bufpage.c:330
-#, c-format
-msgid "PageRepairFragmentation: corrupted item pointer %u"
+#: utils/adt/array_userfuncs.c:281
+#: utils/adt/array_userfuncs.c:309
+msgid "Arrays with differing dimensions are not compatible for concatenation."
 msgstr ""
 
-#: storage/page/bufpage.c:343
+#: utils/adt/array_userfuncs.c:354
 #, c-format
-msgid "PageRepairFragmentation: corrupted item lengths, total %u, avail %u"
+msgid "invalid array element type: %u"
 msgstr ""
 
-#: storage/page/bufpage.c:422
+#: utils/adt/array_userfuncs.c:358
+#: utils/adt/arrayfuncs.c:893
+#: utils/adt/arrayfuncs.c:2233
 #, c-format
-msgid ""
-"PageIndexTupleDelete: corrupted page pointers: lower = %u, upper = %u, "
-"special = %u"
+msgid "invalid number of dimensions: %d"
 msgstr ""
 
-#: storage/page/bufpage.c:427
-#, c-format
-msgid "PageIndexTupleDelete: bad offnum %u"
+#: utils/adt/acl.c:102
+#: utils/adt/name.c:90
+msgid "identifier too long"
 msgstr ""
 
-#: storage/page/bufpage.c:438
+#: utils/adt/acl.c:103
+#: utils/adt/name.c:91
 #, c-format
-msgid "PageIndexTupleDelete: corrupted item pointer: offset = %u size = %u"
+msgid "Identifier must be less than %d characters."
 msgstr ""
 
-#: storage/smgr/smgrtype.c:51
+#: utils/adt/acl.c:190
 #, c-format
-msgid "smgrin: unknown storage manager name '%s'"
+msgid "unrecognized keyword: \"%s\""
 msgstr ""
 
-#: storage/smgr/smgrtype.c:62
-#, c-format
-msgid "Illegal storage manager id %d"
+#: utils/adt/acl.c:191
+msgid "ACL keyword must be \"group\" or \"user\"."
 msgstr ""
 
-#: storage/smgr/md.c:252 storage/smgr/md.c:424 storage/smgr/md.c:471
-#: storage/smgr/md.c:510
-msgid "seekpos too big!"
+#: utils/adt/acl.c:196
+msgid "missing name"
 msgstr ""
 
-#: storage/smgr/md.c:287
-msgid "segment too big!"
+#: utils/adt/acl.c:197
+msgid "A name must follow the [group|user] keyword."
 msgstr ""
 
-#: storage/smgr/md.c:341
-msgid "segment too big on relopen!"
+#: utils/adt/acl.c:205
+msgid "missing \"=\" sign"
 msgstr ""
 
-#: storage/smgr/md.c:519
+#: utils/adt/acl.c:252
 #, c-format
-msgid "mdblindwrt: lseek(%ld) failed: %m"
+msgid "invalid mode character: must be one of \"%s\""
 msgstr ""
 
-#: storage/smgr/md.c:533
-#, c-format
-msgid "mdblindwrt: write() failed: %m"
+#: utils/adt/acl.c:282
+msgid "a name must follow the \"/\" sign"
 msgstr ""
 
-#: storage/smgr/md.c:539
+#: utils/adt/acl.c:291
 #, c-format
-msgid "mdblindwrt: close() failed: %m"
+msgid "defaulting grantor to %u"
 msgstr ""
 
-#: storage/smgr/md.c:576
-msgid "segment too big in mdnblocks!"
+#: utils/adt/acl.c:350
+msgid "extra garbage at the end of the ACL specification"
 msgstr ""
 
-#: storage/smgr/md.c:596
-#, c-format
-msgid "cannot count blocks for %s -- open failed: %m"
+#: utils/adt/acl.c:703
+msgid "dependent privileges exist"
 msgstr ""
 
-#: storage/smgr/md.c:761
-msgid "_fdvec_alloc error"
+#: utils/adt/acl.c:704
+msgid "Use CASCADE to revoke them too."
 msgstr ""
 
-#: storage/smgr/md.c:843
-msgid "segment too big on openseg!"
+#: utils/adt/acl.c:780
+msgid "cannot remove the world ACL"
 msgstr ""
 
-#: storage/smgr/md.c:862
-#, c-format
-msgid "_mdfd_getrelnfd: cannot open relation %s: %m"
+#: utils/adt/acl.c:850
+msgid "cannot specify both user and group"
 msgstr ""
 
-#: storage/smgr/md.c:905
+#: utils/adt/acl.c:911
+#: utils/adt/acl.c:1136
+#: utils/adt/acl.c:1348
+#: utils/adt/acl.c:1552
+#: utils/adt/acl.c:1756
+#: utils/adt/acl.c:1965
 #, c-format
-msgid "cannot open segment %u of relation %s (target block %u): %m"
+msgid "unrecognized privilege type: \"%s\""
 msgstr ""
 
-#: storage/smgr/md.c:958
+#: utils/adt/acl.c:1525
 #, c-format
-msgid "_mdfd_blind_getseg: couldn't open %s: %m"
-msgstr ""
-
-#: storage/smgr/mm.c:189
-msgid "main memory storage mgr hash table out of memory"
-msgstr ""
-
-#: storage/smgr/mm.c:232
-msgid "mmunlink: cache hash table corrupted"
-msgstr ""
-
-#: storage/smgr/mm.c:249
-msgid "mmunlink: rel cache hash table corrupted"
-msgstr ""
-
-#: storage/smgr/mm.c:312
-msgid "mmextend: rel cache hash table corrupt"
-msgstr ""
+msgid "function \"%s\" does not exist"
+msgstr "функция \"%s\" не существует"
 
-#: storage/smgr/mm.c:323
-msgid "mmextend: cache hash table corrupt"
+#: utils/adt/like.c:453
+#: utils/adt/like_match.c:291
+#: utils/adt/regexp.c:459
+msgid "invalid escape string"
 msgstr ""
 
-#: storage/smgr/mm.c:434
-msgid "mmwrite: hash table missing requested page"
+#: utils/adt/like.c:454
+#: utils/adt/like_match.c:292
+#: utils/adt/regexp.c:460
+msgid "Escape string must be empty or one character."
 msgstr ""
 
-#: storage/smgr/smgr.c:132
-#, c-format
-msgid "initialization failed on %s: %m"
+#: utils/adt/arrayfuncs.c:219
+#: utils/adt/arrayfuncs.c:231
+msgid "missing dimension value"
 msgstr ""
 
-#: storage/smgr/smgr.c:154
-#, c-format
-msgid "shutdown failed on %s: %m"
+#: utils/adt/arrayfuncs.c:241
+msgid "missing \"]\" in array dimensions"
 msgstr ""
 
-#: storage/smgr/smgr.c:174
-#, c-format
-msgid "cannot create %s: %m"
+#: utils/adt/arrayfuncs.c:249
+msgid "upper bound cannot be less than lower bound"
 msgstr ""
 
-#: storage/smgr/smgr.c:246
-#, c-format
-msgid ""
-"cannot extend %s: %m.\n"
-"\tCheck free disk space."
+#: utils/adt/arrayfuncs.c:261
+msgid "array value must start with \"{\" or dimension information"
 msgstr ""
 
-#: storage/smgr/smgr.c:270 utils/init/miscinit.c:1014
-#: utils/misc/database.c:147
-#, c-format
-msgid "cannot open %s: %m"
+#: utils/adt/arrayfuncs.c:272
+msgid "missing assignment operator"
 msgstr ""
 
-#: storage/smgr/smgr.c:284
-#, c-format
-msgid "cannot close %s: %m"
+#: utils/adt/arrayfuncs.c:300
+msgid "missing left brace"
 msgstr ""
 
-#: storage/smgr/smgr.c:307
+#: utils/adt/arrayfuncs.c:358
+#: utils/adt/arrayfuncs.c:367
+#: utils/adt/arrayfuncs.c:392
+#: utils/adt/arrayfuncs.c:486
+#: utils/adt/arrayfuncs.c:498
+#: utils/adt/arrayfuncs.c:519
+#: utils/adt/arrayfuncs.c:534
+#: utils/adt/arrayfuncs.c:572
 #, c-format
-msgid "cannot read block %d of %s: %m"
+msgid "malformed array literal: \"%s\""
 msgstr ""
 
-#: storage/smgr/smgr.c:331
-#, c-format
-msgid "cannot write block %d of %s: %m"
+#: utils/adt/arrayfuncs.c:904
+msgid "invalid array flags"
 msgstr ""
 
-#: storage/smgr/smgr.c:360
-#, c-format
-msgid "cannot write block %d of %u/%u blind: %m"
+#: utils/adt/arrayfuncs.c:912
+msgid "wrong element type"
 msgstr ""
 
-#: storage/smgr/smgr.c:387
+#: utils/adt/arrayfuncs.c:955
+#: utils/cache/lsyscache.c:1709
 #, c-format
-msgid "cannot count blocks for %s: %m"
+msgid "no binary input function available for type %s"
 msgstr ""
 
-#: storage/smgr/smgr.c:417
+#: utils/adt/arrayfuncs.c:1050
 #, c-format
-msgid "cannot truncate %s to %u blocks: %m"
+msgid "improper binary format in array element %d"
 msgstr ""
 
-#: storage/smgr/smgr.c:459
+#: utils/adt/arrayfuncs.c:1129
+#: utils/cache/lsyscache.c:1745
 #, c-format
-msgid "cannot unlink %u/%u: %m"
+msgid "no binary output function available for type %s"
 msgstr ""
 
-#: storage/smgr/smgr.c:484
-#, c-format
-msgid "transaction commit failed on %s: %m"
+#: utils/adt/arrayfuncs.c:1479
+msgid "slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: storage/smgr/smgr.c:506
-#, c-format
-msgid "transaction abort failed on %s: %m"
+#: utils/adt/arrayfuncs.c:1617
+#: utils/adt/arrayfuncs.c:1622
+#: utils/adt/arrayfuncs.c:1662
+#: utils/adt/arrayfuncs.c:1684
+#: utils/adt/arrayfuncs.c:1696
+#: utils/adt/arrayfuncs.c:1851
+#: utils/adt/arrayfuncs.c:1868
+#: utils/adt/arrayfuncs.c:1879
+#: utils/adt/arrayfuncs.c:1888
+#: utils/adt/arrayfuncs.c:1899
+msgid "invalid array subscripts"
 msgstr ""
 
-#: storage/smgr/smgr.c:528
-#, c-format
-msgid "storage sync failed on %s: %m"
+#: utils/adt/arrayfuncs.c:1813
+msgid "updates on slices of fixed-length arrays not implemented"
 msgstr ""
 
-#: storage/smgr/smgr.c:542
-#, c-format
-msgid "illegal storage manager number %d"
+#: utils/adt/arrayfuncs.c:1911
+msgid "source array too small"
 msgstr ""
 
-#: tcop/fastpath.c:174
-#, c-format
-msgid "fetch_fp_info: cache lookup for function %u failed"
+#: utils/adt/arrayfuncs.c:2135
+#: utils/adt/arrayfuncs.c:3031
+msgid "NULL array elements not supported"
 msgstr ""
 
-#: tcop/fastpath.c:185 tcop/fastpath.c:190
-msgid "CSTRING not supported in fastpath protocol"
+#: utils/adt/arrayfuncs.c:2375
+#: utils/adt/arrayfuncs.c:2530
+msgid "cannot compare arrays of different element types"
 msgstr ""
 
-#: tcop/fastpath.c:278
+#: utils/adt/arrayfuncs.c:2547
 #, c-format
-msgid ""
-"HandleFunctionRequest: actual arguments (%d) != registered arguments (%d)"
+msgid "could not identify a comparison function for type %s"
 msgstr ""
 
-#: tcop/fastpath.c:297 tcop/fastpath.c:309
-#, c-format
-msgid "HandleFunctionRequest: bogus argsize %d"
+#: utils/adt/arrayfuncs.c:2921
+msgid "could not determine target array type"
 msgstr ""
 
-#: tcop/fastpath.c:322
-#, c-format
-msgid "HandleFunctionRequest: bogus argsize %d, should be %d"
+#: utils/adt/arrayfuncs.c:2927
+msgid "target type is not an array"
 msgstr ""
 
-#: tcop/fastpath.c:340 tcop/postgres.c:674
-msgid ""
-"current transaction is aborted, queries ignored until end of transaction "
-"block"
+#: utils/adt/arrayfuncs.c:2939
+msgid "array coercion to domain type elements not currently supported"
 msgstr ""
 
-#: tcop/postgres.c:284
+#: utils/adt/ascii.c:68
 #, c-format
-msgid "Socket command type %c unknown"
-msgstr ""
+msgid "unsupported encoding conversion from %s to ASCII"
+msgstr "конверсия кодировки из %s в ASCII не поддерживается"
 
-#: tcop/postgres.c:372
+#: utils/adt/bool.c:80
 #, c-format
-msgid "query: %s"
-msgstr "запрос: %s"
-
-#: tcop/postgres.c:459
-msgid "pg_analyze_and_rewrite: copyObject failed on parse tree"
+msgid "invalid input syntax for boolean: \"%s\""
 msgstr ""
 
-#: tcop/postgres.c:503
-msgid "pg_plan_query: copyObject failed on plan tree"
-msgstr ""
-
-#: tcop/postgres.c:751
-msgid "ProcessUtility"
-msgstr "ProcessUtility"
-
-#: tcop/postgres.c:833
-msgid "ProcessQuery"
-msgstr "ProcessQuery"
-
-#: tcop/postgres.c:944
+#: utils/adt/cash.c:198
 #, c-format
-msgid "duration: %ld.%06ld sec"
-msgstr ""
-
-#: tcop/postgres.c:958
-msgid "StartTransactionCommand"
-msgstr "StartTransactionCommand"
-
-#: tcop/postgres.c:976
-msgid "CommitTransactionCommand"
-msgstr "CommitTransactionCommand"
-
-#: tcop/postgres.c:1003
-msgid ""
-"Message from PostgreSQL backend:\n"
-"\tThe Postmaster has informed me that some other backend\n"
-"\tdied abnormally and possibly corrupted shared memory.\n"
-"\tI have rolled back the current transaction and am\n"
-"\tgoing to terminate your database system connection and exit.\n"
-"\tPlease reconnect to the database system and repeat your query."
-msgstr ""
-
-#: tcop/postgres.c:1121
-msgid ""
-"floating point exception! The last floating point operation either exceeded "
-"legal ranges or was a divide by zero"
-msgstr ""
-
-#: tcop/postgres.c:1154
-msgid "This connection has been terminated by the administrator."
-msgstr ""
-
-#: tcop/postgres.c:1161
-msgid "Query was canceled."
-msgstr ""
-
-#: tcop/postgres.c:1308
-msgid "Assert checking is not compiled in"
-msgstr ""
-
-#: tcop/postgres.c:1540
-msgid "only one -x flag is allowed"
-msgstr ""
-
-#: tcop/postgres.c:1558
-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 "invalid input syntax for money: \"%s\""
 msgstr ""
 
-#: tcop/postgres.c:1689 tcop/postgres.c:1701
-#, c-format
-msgid ""
-"%s: invalid command line arguments\n"
-"Try -? for help."
-msgstr ""
+#: utils/adt/cash.c:496
+#: utils/adt/cash.c:548
+#: utils/adt/cash.c:601
+#: utils/adt/cash.c:653
+#: utils/adt/char.c:186
+#: utils/adt/float.c:571
+#: utils/adt/float.c:635
+#: utils/adt/float.c:1857
+#: utils/adt/float.c:1919
+#: utils/adt/geo_ops.c:3809
+#: utils/adt/int.c:644
+#: utils/adt/int.c:709
+#: utils/adt/int.c:750
+#: utils/adt/int.c:791
+#: utils/adt/int.c:805
+#: utils/adt/int.c:819
+#: utils/adt/int.c:833
+#: utils/adt/int.c:847
+#: utils/adt/int8.c:526
+#: utils/adt/int8.c:555
+#: utils/adt/int8.c:653
+#: utils/adt/int8.c:694
+#: utils/adt/numeric.c:3639
+#: utils/adt/timestamp.c:2007
+msgid "division by zero"
+msgstr "деление на ноль"
 
-#: tcop/postgres.c:1709
+#: utils/adt/date.c:72
+#: utils/adt/date.c:78
+#: utils/adt/date.c:100
+#: utils/adt/date.c:529
 #, c-format
-msgid "%s: user name undefined and no database specified"
+msgid "invalid input syntax for date: \"%s\""
 msgstr ""
 
-#: tcop/postgres.c:1760
-msgid "InitPostgres"
-msgstr "InitPostgres"
-
-#: tcop/postgres.c:1845
-msgid "AbortCurrentTransaction"
-msgstr "AbortCurrentTransaction"
-
-#: tcop/postgres.c:2047
-msgid "unknown frontend message was received"
-msgstr ""
+#: utils/adt/date.c:88
+#: utils/adt/datetime.c:1276
+#: utils/adt/datetime.c:2027
+msgid "\"current\" is no longer supported"
+msgstr "\"current\" больше не поддерживается"
 
-#: tcop/postgres.c:2176
-#, c-format
-msgid ""
-"%s\n"
-"%s"
+#: utils/adt/date.c:369
+#: utils/adt/date.c:441
+#: utils/adt/date.c:1004
+#: utils/adt/date.c:1041
+#: utils/adt/date.c:1946
+#: utils/adt/formatting.c:2832
+#: utils/adt/formatting.c:2857
+#: utils/adt/formatting.c:3146
+#: utils/adt/nabstime.c:631
+#: utils/adt/nabstime.c:674
+#: utils/adt/nabstime.c:704
+#: utils/adt/nabstime.c:747
+#: utils/adt/timestamp.c:158
+#: utils/adt/timestamp.c:388
+#: utils/adt/timestamp.c:1740
+#: utils/adt/timestamp.c:1761
+#: utils/adt/timestamp.c:1818
+#: utils/adt/timestamp.c:1841
+#: utils/adt/timestamp.c:2223
+#: utils/adt/timestamp.c:2334
+#: utils/adt/timestamp.c:2568
+#: utils/adt/timestamp.c:2619
+#: utils/adt/timestamp.c:2676
+#: utils/adt/timestamp.c:2728
+#: utils/adt/timestamp.c:2974
+#: utils/adt/timestamp.c:3080
+#: utils/adt/timestamp.c:3087
+#: utils/adt/timestamp.c:3100
+#: utils/adt/timestamp.c:3108
+#: utils/adt/timestamp.c:3182
+#: utils/adt/timestamp.c:3301
+#: utils/adt/timestamp.c:3309
+#: utils/adt/timestamp.c:3588
+#: utils/adt/timestamp.c:3595
+#: utils/adt/timestamp.c:3622
+#: utils/adt/timestamp.c:3626
+msgid "timestamp out of range"
 msgstr ""
-"%s\n"
-"%s"
 
-#: tcop/postgres.c:2542
-#, c-format
-msgid "CreateCommandTag: unknown parse node type %d"
+#: utils/adt/date.c:468
+msgid "cannot convert reserved abstime value to date"
 msgstr ""
 
-#: tcop/pquery.c:86
+#: utils/adt/date.c:570
+#: utils/adt/date.c:576
+#: utils/adt/date.c:1258
 #, c-format
-msgid "Closing pre-existing portal \"%s\""
+msgid "invalid input syntax for time: \"%s\""
 msgstr ""
 
-#: tcop/utility.c:96
+#: utils/adt/date.c:1292
+#: utils/adt/date.c:1362
+#: utils/adt/date.c:1381
+#, c-format
+msgid "TIME units \"%s\" not recognized"
+msgstr ""
+
+#: utils/adt/date.c:1435
+#: utils/adt/date.c:1442
+#: utils/adt/date.c:2024
+#, c-format
+msgid "invalid input syntax for time with time zone: \"%s\""
+msgstr ""
+
+#: utils/adt/date.c:2058
+#: utils/adt/date.c:2142
+#: utils/adt/date.c:2161
+#, c-format
+msgid "TIMETZ units \"%s\" not recognized"
+msgstr ""
+
+#: utils/adt/date.c:2191
+#: utils/adt/date.c:2228
+#: utils/adt/timestamp.c:3502
+#: utils/adt/timestamp.c:3527
+#: utils/adt/timestamp.c:3654
+#: utils/adt/timestamp.c:3678
 #, c-format
-msgid "\"%s\" is not %s %s. Use DROP %s to remove %s %s"
+msgid "time zone \"%s\" not recognized"
 msgstr ""
 
-#: tcop/utility.c:100
+#: utils/adt/date.c:2250
 #, c-format
-msgid "\"%s\" is not %s %s"
+msgid "INTERVAL time zone \"%s\" not legal"
 msgstr ""
 
-#: tcop/utility.c:119 tcop/utility.c:124
+#: utils/adt/datetime.c:1458
+#: utils/adt/datetime.c:2302
+#: utils/adt/formatting.c:3074
 #, c-format
-msgid "%s \"%s\" does not exist"
+msgid "inconsistent use of year %04d and \"BC\""
 msgstr ""
 
-#: tcop/utility.c:137
-#, c-format
-msgid "%s \"%s\" is a system %s"
+#: utils/adt/datum.c:80
+#: utils/adt/datum.c:92
+msgid "invalid Datum pointer"
 msgstr ""
 
-#: tcop/utility.c:163
+#: utils/adt/encode.c:55
+#: utils/adt/encode.c:91
 #, c-format
-msgid "relation \"%s\" is a system catalog"
+msgid "unrecognized encoding: \"%s\""
 msgstr ""
 
-#: tcop/utility.c:442 tcop/utility.c:446
+#: utils/adt/encode.c:150
 #, c-format
-msgid "ProcessUtility: Invalid target for RENAME: %d"
+msgid "invalid hex digit: \"%c\""
 msgstr ""
 
-#: tcop/utility.c:550
-msgid "ALTER TABLE: permission denied"
-msgstr "ALTER TABLE: нет доступа"
-
-#: tcop/utility.c:556
-msgid "T_AlterTableStmt: unknown subtype"
+#: utils/adt/encode.c:178
+msgid "invalid hex data: odd number of digits"
 msgstr ""
 
-#: tcop/utility.c:599
-msgid "T_AlterDomainStmt: unknown subtype"
-msgstr ""
-
-#: tcop/utility.c:908
-#, c-format
-msgid "ProcessUtility: command #%d unsupported"
-msgstr ""
+#: utils/adt/encode.c:295
+msgid "unexpected \"=\""
+msgstr "неожиданный \"=\""
 
-#: utils/adt/arrayfuncs.c:176
-#, c-format
-msgid "array_in: more than %d dimensions"
+#: utils/adt/encode.c:307
+msgid "invalid symbol"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:179 utils/adt/arrayfuncs.c:188
-msgid "array_in: missing dimension value"
+#: utils/adt/encode.c:327
+msgid "invalid end sequence"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:196
-msgid "array_in: missing ']' in array declaration"
+#: utils/adt/encode.c:436
+#: utils/adt/encode.c:501
+#: utils/adt/varlena.c:117
+#: utils/adt/varlena.c:157
+msgid "invalid input syntax for bytea"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:201
-msgid "array_in: upper_bound cannot be < lower_bound"
+#: utils/adt/float.c:135
+msgid "float4 value out of range: overflow"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:210
-msgid "array_in: Need to specify dimension"
+#: utils/adt/float.c:139
+msgid "float4 value out of range: underflow"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:219
-msgid "array_in: missing assignment operator"
+#: utils/adt/float.c:164
+msgid "float8 value out of range: overflow"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:245
-msgid "array_in: missing left brace"
+#: utils/adt/float.c:168
+msgid "float8 value out of range: underflow"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:301 utils/adt/arrayfuncs.c:308
-#: utils/adt/arrayfuncs.c:420 utils/adt/arrayfuncs.c:430
+#: utils/adt/float.c:200
 #, 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
-msgid "array_in: illformed array constant"
-msgstr ""
-
-#: utils/adt/arrayfuncs.c:1039
-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
-msgid "Invalid array subscripts"
-msgstr ""
-
-#: utils/adt/arrayfuncs.c:1339
-msgid "Updates on slices of fixed-length arrays not implemented"
-msgstr ""
-
-#: utils/adt/arrayfuncs.c:1400
-msgid "Source array too small"
+msgid "invalid input syntax for float4: \"%s\""
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1531
+#: utils/adt/float.c:208
 #, c-format
-msgid "array_map: invalid nargs: %d"
+msgid "\"%s\" is out of range for float4"
 msgstr ""
 
-#: utils/adt/arrayfuncs.c:1533
-msgid "array_map: null input array"
-msgstr ""
-
-#: utils/adt/arrayfuncs.c:1577
-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/float.c:301
+#: utils/adt/numeric.c:3117
+#: utils/adt/numeric.c:3143
 #, c-format
-msgid "cache lookup failed for type %u"
+msgid "invalid input syntax for float8: \"%s\""
 msgstr ""
 
-#: utils/adt/acl.c:92
+#: utils/adt/float.c:309
 #, c-format
-msgid "getid: identifier must be <%d characters"
+msgid "\"%s\" is out of range for float8"
 msgstr ""
 
-#: utils/adt/acl.c:130
-#, c-format
-msgid "aclparse: input = '%s'"
+#: utils/adt/float.c:887
+#: utils/adt/float.c:906
+#: utils/adt/float.c:953
+#: utils/adt/float.c:972
+#: utils/adt/int.c:286
+#: utils/adt/int8.c:103
+#: utils/adt/int8.c:786
+#: utils/adt/int8.c:811
+#: utils/adt/int8.c:849
+#: utils/adt/int8.c:888
+#: utils/adt/numeric.c:1601
+#: utils/adt/numeric.c:1612
+#: utils/adt/numeric.c:1657
+#: utils/adt/numeric.c:1705
+#: utils/adt/numeric.c:1716
+#: utils/adt/varbit.c:1210
+#: utils/adt/varbit.c:1275
+msgid "integer out of range"
 msgstr ""
 
-#: utils/adt/acl.c:142
-msgid "aclparse: bad keyword, must be [group|user]"
+#: utils/adt/float.c:1208
+#: utils/adt/numeric.c:4035
+msgid "cannot take square root of a negative number"
 msgstr ""
 
-#: utils/adt/acl.c:145
-msgid "aclparse: a name must follow the [group|user] keyword"
+#: utils/adt/float.c:1254
+#: utils/adt/float.c:1284
+msgid "result is out of range"
 msgstr ""
 
-#: utils/adt/acl.c:162
-#, c-format
-msgid "aclparse: mode change flag must use \"%c%c%c\""
+#: utils/adt/float.c:1304
+#: utils/adt/float.c:1330
+msgid "cannot take log of zero"
 msgstr ""
 
-#: utils/adt/acl.c:208
-#, c-format
-msgid "aclparse: mode flags must use \"%s\""
+#: utils/adt/float.c:1309
+#: utils/adt/float.c:1335
+#: utils/adt/numeric.c:4252
+msgid "cannot take log of a negative number"
 msgstr ""
 
-#: utils/adt/acl.c:229
-#, c-format
-msgid "aclparse: correctly read [%x %d %x], modechg=%x"
+#: utils/adt/float.c:1362
+#: utils/adt/float.c:1387
+#: utils/adt/float.c:1412
+#: utils/adt/float.c:1438
+#: utils/adt/float.c:1463
+#: utils/adt/float.c:1488
+#: utils/adt/float.c:1514
+#: utils/adt/float.c:1539
+msgid "input is out of range"
 msgstr ""
 
-#: utils/adt/acl.c:249
-#, c-format
-msgid "makeacl: invalid size: %d"
+#: utils/adt/formatting.c:966
+msgid "\"9\" must be ahead of \"PR\""
 msgstr ""
 
-#: utils/adt/acl.c:279
-msgid "aclitemin: cannot accept anything but = ACLs"
+#: utils/adt/formatting.c:985
+msgid "\"0\" must be ahead of \"PR\""
 msgstr ""
 
-#: utils/adt/acl.c:283
-msgid "aclitemin: extra garbage at end of specification"
+#: utils/adt/formatting.c:1014
+msgid "multiple decimal points"
 msgstr ""
 
-#: utils/adt/acl.c:351
-#, c-format
-msgid "aclitemout: bad idtype: %d"
+#: utils/adt/formatting.c:1021
+#: utils/adt/formatting.c:1126
+msgid "cannot use \"V\" and decimal point together"
 msgstr ""
 
-#: utils/adt/acl.c:433
-#, c-format
-msgid "acldefault: bogus objtype %d"
+#: utils/adt/formatting.c:1036
+msgid "not unique \"S\""
 msgstr ""
 
-#: utils/adt/acl.c:506
-msgid "aclinsert3: insertion before world ACL??"
+#: utils/adt/formatting.c:1043
+msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together"
 msgstr ""
 
-#: utils/adt/acl.c:617
-msgid "aclremove: removal of the world ACL??"
+#: utils/adt/formatting.c:1067
+msgid "cannot use \"S\" and \"MI\" together"
 msgstr ""
 
-#: utils/adt/acl.c:864
-#, c-format
-msgid "has_table_privilege: invalid privilege type %s"
+#: utils/adt/formatting.c:1080
+msgid "cannot use \"S\" and \"PL\" together"
 msgstr ""
 
-#: utils/adt/acl.c:1067
-#, c-format
-msgid "has_database_privilege: invalid privilege type %s"
+#: utils/adt/formatting.c:1093
+msgid "cannot use \"S\" and \"SG\" together"
 msgstr ""
 
-#: utils/adt/acl.c:1243
-#, c-format
-msgid "function \"%s\" does not exist"
-msgstr "функция \"%s\" не существует"
-
-#: utils/adt/acl.c:1266
-#, c-format
-msgid "has_function_privilege: invalid privilege type %s"
+#: utils/adt/formatting.c:1105
+msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together"
 msgstr ""
 
-#: utils/adt/acl.c:1465
-#, c-format
-msgid "has_language_privilege: invalid privilege type %s"
+#: utils/adt/formatting.c:1135
+msgid "\"E\" is not supported"
 msgstr ""
 
-#: utils/adt/acl.c:1641
+#: utils/adt/formatting.c:1396
 #, c-format
-msgid "schema \"%s\" does not exist"
-msgstr "схема \"%s\" не существует"
+msgid "\"%s\" is not a number"
+msgstr "\"%s\" не является числом"
 
-#: utils/adt/acl.c:1667
-#, c-format
-msgid "has_schema_privilege: invalid privilege type %s"
+#: utils/adt/formatting.c:1659
+msgid "invalid AM/PM string"
 msgstr ""
 
-#: utils/adt/ascii.c:67
-#, c-format
-msgid "pg_to_ascii(): unsupported encoding from %s"
+#: utils/adt/formatting.c:2005
+msgid "\"TZ\"/\"tz\" not supported"
 msgstr ""
 
-#: utils/adt/bool.c:77
+#: utils/adt/formatting.c:2015
 #, c-format
-msgid "Bad boolean external representation '%s'"
-msgstr ""
+msgid "invalid value for %s"
+msgstr "неверное значение для %s"
 
-#: utils/adt/cash.c:195
-#, c-format
-msgid "Bad money external representation %s"
+#: utils/adt/formatting.c:3035
+msgid "AM/PM hour must be between 1 and 12"
 msgstr ""
 
-#: utils/adt/cash.c:292 utils/adt/cash.c:305
-msgid "Memory allocation failed, can't output cash"
+#: utils/adt/formatting.c:3109
+msgid "cannot convert yday without year information"
 msgstr ""
 
-#: utils/adt/cash.c:445 utils/adt/cash.c:495
-msgid "cash_div:  divide by 0.0 error"
+#: utils/adt/formatting.c:3910
+msgid "\"RN\" not supported"
 msgstr ""
 
-#: utils/adt/cash.c:546
-msgid "cash_div_int4: divide by 0 error"
+#: utils/adt/geo_ops.c:292
+#: utils/adt/geo_ops.c:3930
+#: utils/adt/geo_ops.c:4820
+msgid "too many points requested"
 msgstr ""
 
-#: utils/adt/cash.c:596
-msgid "cash_div:  divide by 0 error"
+#: utils/adt/geo_ops.c:315
+msgid "could not format path"
 msgstr ""
 
-#: utils/adt/date.c:69
+#: utils/adt/geo_ops.c:390
 #, c-format
-msgid "Bad date external representation (too long) '%s'"
+msgid "invalid input syntax for box: \"%s\""
 msgstr ""
 
-#: utils/adt/date.c:73
+#: utils/adt/geo_ops.c:903
 #, c-format
-msgid "Bad date external representation '%s'"
+msgid "invalid input syntax for line: \"%s\""
 msgstr ""
 
-#: utils/adt/date.c:81
-msgid ""
-"Date CURRENT no longer supported\n"
-"\tdate_in() internal coding error"
+#: utils/adt/geo_ops.c:910
+#: utils/adt/geo_ops.c:977
+#: utils/adt/geo_ops.c:992
+#: utils/adt/geo_ops.c:1004
+msgid "line not yet implemented"
 msgstr ""
 
-#: utils/adt/date.c:91
+#: utils/adt/geo_ops.c:1329
+#: utils/adt/geo_ops.c:1352
 #, c-format
-msgid "Unrecognized date external representation '%s'"
-msgstr ""
-
-#: utils/adt/date.c:400
-msgid "Unable to convert timestamp to date"
+msgid "invalid input syntax for path: \"%s\""
 msgstr ""
 
-#: utils/adt/date.c:425
-msgid "Unable to convert reserved abstime value to date"
+#: utils/adt/geo_ops.c:1389
+msgid "invalid number of points in external path"
 msgstr ""
 
-#: utils/adt/date.c:484
-msgid "Bad date external representation (too long)"
-msgstr ""
-
-#: utils/adt/date.c:521
+#: utils/adt/geo_ops.c:1730
 #, c-format
-msgid "Bad time external representation (too long) '%s'"
+msgid "invalid input syntax for point: \"%s\""
 msgstr ""
 
-#: utils/adt/date.c:525 utils/adt/date.c:1336
+#: utils/adt/geo_ops.c:1958
 #, c-format
-msgid "Bad time external representation '%s'"
+msgid "invalid input syntax for lseg: \"%s\""
 msgstr ""
 
-#: utils/adt/date.c:928
-msgid "Unable to convert timestamp to time"
+#: utils/adt/geo_ops.c:2550
+msgid "dist_lb not implemented"
 msgstr ""
 
-#: utils/adt/date.c:963
-msgid "Unable to convert timestamptz to time"
+#: utils/adt/geo_ops.c:3063
+msgid "close_lb not implemented"
 msgstr ""
 
-#: utils/adt/date.c:1165
-msgid "Bad time external representation (too long)"
+#: utils/adt/geo_ops.c:3342
+msgid "cannot create bounding box for empty polygon"
 msgstr ""
 
-#: utils/adt/date.c:1196 utils/adt/date.c:1279
+#: utils/adt/geo_ops.c:3366
+#: utils/adt/geo_ops.c:3378
 #, c-format
-msgid "TIME units '%s' not recognized"
+msgid "invalid input syntax for polygon: \"%s\""
 msgstr ""
 
-#: utils/adt/date.c:1263
-#, c-format
-msgid "TIME units '%s' not supported"
+#: utils/adt/geo_ops.c:3418
+msgid "invalid number of points in external polygon"
 msgstr ""
 
-#: utils/adt/date.c:1331
-#, c-format
-msgid "Bad time with time zone external representation (too long) '%s'"
+#: utils/adt/geo_ops.c:3728
+msgid "poly_distance not implemented"
 msgstr ""
 
-#: utils/adt/date.c:1795
-msgid "Unable to convert timestamptz to timetz"
+#: utils/adt/geo_ops.c:4040
+msgid "path_center not implemented"
 msgstr ""
 
-#: utils/adt/date.c:1871
-msgid "Bad timetz external representation (too long)"
+#: utils/adt/geo_ops.c:4057
+msgid "open path cannot be converted to polygon"
 msgstr ""
 
-#: utils/adt/date.c:1902 utils/adt/date.c:1998
+#: utils/adt/geo_ops.c:4224
+#: utils/adt/geo_ops.c:4234
+#: utils/adt/geo_ops.c:4249
+#: utils/adt/geo_ops.c:4255
 #, c-format
-msgid "TIMETZ units '%s' not recognized"
+msgid "invalid input syntax for circle: \"%s\""
 msgstr ""
 
-#: utils/adt/date.c:1982
-#, c-format
-msgid "TIMETZ units '%s' not supported"
+#: utils/adt/geo_ops.c:4277
+#: utils/adt/geo_ops.c:4285
+msgid "could not format circle"
 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
-#, c-format
-msgid "Time zone '%s' not recognized"
+#: utils/adt/geo_ops.c:4312
+msgid "invalid radius in external circle"
 msgstr ""
 
-#: utils/adt/date.c:2078 utils/adt/timestamp.c:3319 utils/adt/timestamp.c:3456
-#, c-format
-msgid "INTERVAL time zone '%s' not legal (month specified)"
+#: utils/adt/geo_ops.c:4806
+msgid "cannot convert zero-size circle to polygon"
 msgstr ""
 
-#: utils/adt/datetime.c:1239 utils/adt/datetime.c:1955
-msgid "'CURRENT' is no longer supported"
+#: utils/adt/geo_ops.c:4811
+msgid "must request at least 2 points"
 msgstr ""
 
-#: utils/adt/datetime.c:1418 utils/adt/datetime.c:2227
-#: utils/adt/formatting.c:3035
-#, c-format
-msgid "Inconsistent use of year %04d and 'BC'"
+#: utils/adt/geo_ops.c:4855
+#: utils/adt/geo_ops.c:4878
+msgid "cannot convert empty polygon to circle"
 msgstr ""
 
-#: utils/adt/datum.c:78 utils/adt/datum.c:87
-msgid "datumGetSize: Invalid Datum Pointer"
-msgstr ""
-
-#: utils/adt/datum.c:92
-#, c-format
-msgid "datumGetSize: Invalid typLen %d"
+#: utils/adt/int.c:126
+msgid "int2vector has too many elements"
 msgstr ""
 
-#: utils/adt/encode.c:53 utils/adt/encode.c:87
+#: utils/adt/int8.c:88
+#: utils/adt/int8.c:116
 #, c-format
-msgid "No such encoding as '%s'"
+msgid "invalid input syntax for int8: \"%s\""
 msgstr ""
 
-#: utils/adt/encode.c:62
-msgid "Overflow - encode estimate too small"
+#: utils/adt/int8.c:905
+msgid "OID out of range"
 msgstr ""
 
-#: utils/adt/encode.c:96
-msgid "Overflow - decode estimate too small"
+#: utils/adt/oracle_compat.c:206
+#: utils/adt/oracle_compat.c:303
+#: utils/adt/oracle_compat.c:927
+msgid "requested length too large"
 msgstr ""
 
-#: utils/adt/encode.c:144
+#: utils/adt/mac.c:65
 #, c-format
-msgid "Bad hex code: '%c'"
-msgstr ""
-
-#: utils/adt/encode.c:170
-msgid "hex_decode: invalid data"
-msgstr ""
-
-#: utils/adt/encode.c:284
-msgid "base64: unexpected '='"
-msgstr ""
-
-#: utils/adt/encode.c:294
-msgid "base64: Invalid symbol"
-msgstr ""
-
-#: utils/adt/encode.c:312
-msgid "base64: invalid end sequence"
-msgstr ""
-
-#: utils/adt/encode.c:419 utils/adt/encode.c:482
-msgid "decode: Bad input string for type bytea"
-msgstr ""
-
-#: utils/adt/float.c:151
-msgid "Bad float4 input format -- overflow"
-msgstr ""
-
-#: utils/adt/float.c:153
-msgid "Bad float4 input format -- underflow"
+msgid "invalid input syntax for macaddr: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:175
-msgid "Bad float8 input format -- overflow"
-msgstr ""
-
-#: utils/adt/float.c:177
-msgid "Bad float8 input format -- underflow"
-msgstr ""
-
-#: utils/adt/float.c:207
+#: utils/adt/mac.c:72
 #, c-format
-msgid "Bad float4 input format '%s'"
+msgid "invalid octet value in macaddr: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:212
-#, c-format
-msgid "Input '%s' is out of range for float4"
+#: utils/adt/mac.c:190
+msgid "text too long to convert to MAC address"
 msgstr ""
 
-#: utils/adt/float.c:278 utils/adt/numeric.c:2836 utils/adt/numeric.c:2859
+#: utils/adt/nabstime.c:244
+#: utils/adt/nabstime.c:280
 #, c-format
-msgid "Bad float8 input format '%s'"
+msgid "invalid timezone name: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:283
+#: utils/adt/nabstime.c:376
+#: utils/adt/nabstime.c:382
 #, c-format
-msgid "Input '%s' is out of range for float8"
-msgstr ""
-
-#: utils/adt/float.c:508
-msgid "float4div: divide by zero error"
+msgid "invalid input syntax for abstime: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:570
-msgid "float8div: divide by zero error"
+#: utils/adt/nabstime.c:657
+#: utils/adt/nabstime.c:730
+msgid "cannot convert \"invalid\" abstime to timestamp"
 msgstr ""
 
-#: utils/adt/float.c:820
-msgid "dtoi4: integer out of range"
-msgstr ""
-
-#: utils/adt/float.c:837
-msgid "dtoi2: integer out of range"
-msgstr ""
-
-#: utils/adt/float.c:882
-msgid "ftoi4: integer out of range"
-msgstr ""
-
-#: utils/adt/float.c:899
-msgid "ftoi2: integer out of range"
-msgstr ""
-
-#: utils/adt/float.c:1133
-msgid "can't take sqrt of a negative number"
-msgstr ""
-
-#: utils/adt/float.c:1177
-msgid "pow() result is out of range"
-msgstr ""
-
-#: utils/adt/float.c:1205
-msgid "exp() result is out of range"
-msgstr ""
-
-#: utils/adt/float.c:1223 utils/adt/float.c:1244
-msgid "can't take log of zero"
-msgstr ""
-
-#: utils/adt/float.c:1225 utils/adt/float.c:1246
-msgid "can't take log of a negative number"
-msgstr ""
-
-#: utils/adt/float.c:1271
+#: utils/adt/nabstime.c:779
+#: utils/adt/nabstime.c:785
 #, c-format
-msgid "acos(%f) input is out of range"
+msgid "invalid input syntax for reltime: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:1294
+#: utils/adt/nabstime.c:880
 #, c-format
-msgid "asin(%f) input is out of range"
+msgid "invalid input syntax for tinterval: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:1317
-#, c-format
-msgid "atan(%f) input is out of range"
+#: utils/adt/nabstime.c:943
+msgid "invalid status in external tinterval"
 msgstr ""
 
-#: utils/adt/float.c:1341
-#, c-format
-msgid "atan2(%f,%f) input is out of range"
+#: utils/adt/nabstime.c:1035
+msgid "cannot convert \"invalid\" reltime to interval"
 msgstr ""
 
-#: utils/adt/float.c:1364
+#. translator: first %s is inet or cidr
+#: utils/adt/network.c:90
 #, c-format
-msgid "cos(%f) input is out of range"
+msgid "invalid input syntax for %s: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:1387
+#: utils/adt/network.c:102
 #, c-format
-msgid "cot(%f) input is out of range"
+msgid "invalid cidr value: \"%s\""
 msgstr ""
 
-#: utils/adt/float.c:1411
-#, c-format
-msgid "sin(%f) input is out of range"
+#: utils/adt/network.c:103
+#: utils/adt/network.c:229
+msgid "Value has bits set to right of mask."
 msgstr ""
 
-#: utils/adt/float.c:1434
+#: utils/adt/network.c:149
+#: utils/adt/network.c:503
+#: utils/adt/network.c:529
+#: utils/adt/network.c:565
 #, c-format
-msgid "tan(%f) input is out of range"
+msgid "could not format inet value: %m"
 msgstr ""
 
-#: utils/adt/float.c:1545
-#, c-format
-msgid "%s: expected 3-element float8 array"
+#: utils/adt/network.c:194
+msgid "invalid family in external inet"
 msgstr ""
 
-#: utils/adt/float.c:1756
-msgid "float48div: divide by zero"
+#: utils/adt/network.c:199
+msgid "invalid bits in external inet"
 msgstr ""
 
-#: utils/adt/float.c:1816
-msgid "float84div: divide by zero"
+#: utils/adt/network.c:205
+msgid "invalid type in external inet"
 msgstr ""
 
-#: 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"
+#: utils/adt/network.c:210
+msgid "invalid length in external inet"
 msgstr ""
 
-#: utils/adt/format_type.c:315
-#, c-format
-msgid "Invalid INTERVAL typmod 0x%x"
+#: utils/adt/network.c:228
+msgid "invalid external CIDR value"
 msgstr ""
 
-#: utils/adt/formatting.c:390
+#: utils/adt/network.c:315
 #, c-format
-msgid ""
-"TMFC:\n"
-"hh %d\n"
-"am %d\n"
-"pm %d\n"
-"mi %d\n"
-"ss %d\n"
-"ssss %d\n"
-"d %d\n"
-"dd %d\n"
-"ddd %d\n"
-"mm %d\n"
-"ms: %d\n"
-"year %d\n"
-"bc %d\n"
-"iw %d\n"
-"ww %d\n"
-"w %d\n"
-"cc %d\n"
-"q %d\n"
-"j %d\n"
-"us: %d"
-msgstr ""
-
-#: utils/adt/formatting.c:396
-#, c-format
-msgid ""
-"TM:\n"
-"sec %d\n"
-"year %d\n"
-"min %d\n"
-"wday %d\n"
-"hour %d\n"
-"yday %d\n"
-"mday %d\n"
-"nisdst %d\n"
-"mon %d\n"
+msgid "invalid mask length: %d"
 msgstr ""
 
-#: utils/adt/formatting.c:963
-msgid "to_char/to_number(): '9' must be ahead of 'PR'."
+#: utils/adt/not_in.c:64
+#: utils/adt/regproc.c:1110
+#: utils/adt/regproc.c:1115
+#: utils/adt/varlena.c:1618
+#: utils/adt/varlena.c:1623
+msgid "invalid name syntax"
 msgstr ""
 
-#: utils/adt/formatting.c:980
-msgid "to_char/to_number(): '0' must be ahead of 'PR'."
+#: utils/adt/not_in.c:65
+msgid "Must provide \"relationname.attributename\"."
 msgstr ""
 
-#: utils/adt/formatting.c:1007
-msgid "to_char/to_number(): not unique decimal point."
-msgstr ""
-
-#: utils/adt/formatting.c:1012 utils/adt/formatting.c:1099
-msgid "to_char/to_number(): can't use 'V' and decimal poin together."
-msgstr ""
-
-#: utils/adt/formatting.c:1025
-msgid "to_char/to_number(): not unique 'S'."
-msgstr ""
-
-#: utils/adt/formatting.c:1030
-msgid "to_char/to_number(): can't use 'S' and 'PL'/'MI'/'SG'/'PR' together."
-msgstr ""
-
-#: utils/adt/formatting.c:1052
-msgid "to_char/to_number(): can't use 'S' and 'MI' together."
-msgstr ""
-
-#: utils/adt/formatting.c:1061
-msgid "to_char/to_number(): can't use 'S' and 'PL' together."
-msgstr ""
-
-#: utils/adt/formatting.c:1070
-msgid "to_char/to_number(): can't use 'S' and 'SG' together."
-msgstr ""
-
-#: utils/adt/formatting.c:1080
-msgid "to_char/to_number(): can't use 'PR' and 'S'/'PL'/'MI'/'SG' together."
-msgstr ""
+#: utils/adt/numeric.c:403
+msgid "invalid length in external numeric"
+msgstr "'"
 
-#: utils/adt/formatting.c:1106
-msgid "to_char/to_number(): 'E' is not supported."
+#: utils/adt/numeric.c:414
+msgid "invalid sign in external numeric"
 msgstr ""
 
-#: utils/adt/formatting.c:1130
-msgid "to_char/number(): run parser."
+#: utils/adt/numeric.c:424
+msgid "invalid digit in external numeric"
 msgstr ""
 
-#: utils/adt/formatting.c:1326
-msgid "to_from-char(): DUMP FORMAT"
+#: utils/adt/numeric.c:1592
+#: utils/adt/numeric.c:1648
+#: utils/adt/numeric.c:1696
+msgid "cannot convert NaN to integer"
 msgstr ""
 
-#: utils/adt/formatting.c:1331
+#: utils/adt/numeric.c:2539
+#: utils/adt/numeric.c:2562
+#: utils/adt/numeric.c:2586
+#: utils/adt/numeric.c:2593
+#: utils/adt/numeric.c:2607
 #, c-format
-msgid "%d:\t NODE_TYPE_ACTION '%s'\t(%s,%s)"
+msgid "invalid input syntax for numeric: \"%s\""
 msgstr ""
 
-#: utils/adt/formatting.c:1334
-#, c-format
-msgid "%d:\t NODE_TYPE_CHAR '%c'"
+#: utils/adt/numeric.c:2905
+msgid "value overflows numeric format"
 msgstr ""
 
-#: utils/adt/formatting.c:1337
-#, c-format
-msgid "%d:\t NODE_TYPE_END"
+#: utils/adt/numeric.c:2975
+msgid "numeric field overflow"
 msgstr ""
 
-#: utils/adt/formatting.c:1341
+#: utils/adt/numeric.c:2976
 #, c-format
-msgid "%d:\t UnKnown NODE !!!"
+msgid "ABS(value) >= 10^%d for field with precision %d, scale %d."
 msgstr ""
 
-#: utils/adt/formatting.c:1365
-#, c-format
-msgid "get_th: '%s' is not number."
+#: utils/adt/numeric.c:4125
+msgid "argument for EXP() too big"
 msgstr ""
 
-#: utils/adt/formatting.c:1539
-msgid "TO-FROM_CHAR: Dump KeyWord Index:"
+#: utils/adt/numeric.c:4501
+msgid "zero raised to zero is undefined"
 msgstr ""
 
-#: utils/adt/formatting.c:1545
-#, c-format
-msgid "\t%c: %s, "
-msgstr "\t%c: %s, "
-
-#: utils/adt/formatting.c:1551
-#, c-format
-msgid "\t(%d) %c %d"
-msgstr "\t(%d) %c %d"
-
-#: utils/adt/formatting.c:1554
+#: utils/adt/numutils.c:72
+#: utils/adt/numutils.c:86
+#: utils/adt/numutils.c:91
 #, c-format
-msgid ""
-"\n"
-"\t\tUsed positions: %d,\n"
-"\t\tFree positions: %d"
-msgstr ""
-
-#: utils/adt/formatting.c:1626
-msgid "to_timestamp(): bad AM/PM string"
+msgid "invalid input syntax for integer: \"%s\""
 msgstr ""
 
-#: utils/adt/formatting.c:1970
-msgid "to_timestamp(): TZ/tz not supported."
-msgstr ""
-
-#: utils/adt/formatting.c:1978
+#: utils/adt/numutils.c:105
 #, c-format
-msgid "to_timestamp(): bad value for %s"
+msgid "%s is out of range for int4"
 msgstr ""
 
-#: utils/adt/formatting.c:2612 utils/adt/formatting.c:3171
+#: utils/adt/numutils.c:111
 #, c-format
-msgid "Cache is full (%d)"
+msgid "%s is out of range for int2"
 msgstr ""
 
-#: utils/adt/formatting.c:2620 utils/adt/formatting.c:3188
+#: utils/adt/numutils.c:117
 #, c-format
-msgid "OLD: '%s' AGE: %d"
+msgid "%s is out of range for int1"
 msgstr ""
 
-#: utils/adt/formatting.c:2631 utils/adt/formatting.c:3200
+#: utils/adt/oid.c:49
+#: utils/adt/oid.c:54
+#: utils/adt/oid.c:75
 #, c-format
-msgid "NEW (%d)"
-msgstr ""
-
-#: utils/adt/formatting.c:2796 utils/adt/formatting.c:2822
-msgid "to_char(): Unable to convert timestamp to tm"
-msgstr ""
-
-#: utils/adt/formatting.c:2998
-msgid "to_timestamp(): AM/PM hour must be between 1 and 12"
-msgstr ""
-
-#: utils/adt/formatting.c:3067
-msgid "to_timestamp() cat't convert yday without year information"
-msgstr ""
-
-#: utils/adt/formatting.c:3102
-msgid "to_timestamp(): can't convert 'tm' to timestamp."
+msgid "invalid input syntax for OID: \"%s\""
 msgstr ""
 
-#: utils/adt/formatting.c:3250
+#: utils/adt/oid.c:60
+#: utils/adt/oid.c:98
 #, c-format
-msgid "REMOVING ENTRY (%s)"
+msgid "%s is out of range for OID"
 msgstr ""
 
-#: utils/adt/formatting.c:3475
-msgid "CALL: get_last_relevant_decnum()"
+#: utils/adt/oid.c:176
+msgid "oidvector has too many elements"
 msgstr ""
 
-#: utils/adt/formatting.c:3500
-msgid " --- scan start --- "
-msgstr ""
-
-#: utils/adt/formatting.c:3521
-#, c-format
-msgid "Try read sign (%c)."
+#: utils/adt/ri_triggers.c:298
+#: utils/adt/ri_triggers.c:360
+#: utils/adt/ri_triggers.c:536
+#: utils/adt/ri_triggers.c:775
+#: utils/adt/ri_triggers.c:967
+#: utils/adt/ri_triggers.c:1129
+#: utils/adt/ri_triggers.c:1314
+#: utils/adt/ri_triggers.c:1484
+#: utils/adt/ri_triggers.c:1666
+#: utils/adt/ri_triggers.c:1837
+#: utils/adt/ri_triggers.c:2056
+#: utils/adt/ri_triggers.c:2267
+#: utils/adt/ri_triggers.c:2503
+#: utils/adt/ri_triggers.c:2599
+msgid "MATCH PARTIAL not yet implemented"
 msgstr ""
 
-#: utils/adt/formatting.c:3533
+#: utils/adt/ri_triggers.c:334
+#: utils/adt/ri_triggers.c:3043
+#: utils/adt/ri_triggers.c:3080
 #, c-format
-msgid "Try read locale sign (%c)."
+msgid "insert or update on \"%s\" violates foreign key constraint \"%s\""
 msgstr ""
 
-#: utils/adt/formatting.c:3552
-#, c-format
-msgid "Try read sipmle sign (%c)."
+#: utils/adt/ri_triggers.c:337
+msgid "MATCH FULL does not allow mixing of NULL and non-NULL key values."
 msgstr ""
 
-#: utils/adt/formatting.c:3593
+#: utils/adt/ri_triggers.c:2545
+#: utils/adt/ri_triggers.c:2803
 #, c-format
-msgid "Read digit (%c)."
+msgid "%s() called with wrong number of trigger arguments"
 msgstr ""
 
-#: utils/adt/formatting.c:3604
+#: utils/adt/ri_triggers.c:2563
+#: utils/adt/ri_triggers.c:2813
 #, c-format
-msgid "Try read decimal point (%c)."
+msgid "no target table given for trigger \"%s\" on \"%s\""
 msgstr ""
 
-#: utils/adt/formatting.c:3619
-#, c-format
-msgid "Try read locale point (%c)."
+#: utils/adt/ri_triggers.c:2566
+#: utils/adt/ri_triggers.c:2816
+msgid "Remove this RI trigger and its mates, then do ALTER TABLE ADD CONSTRAINT."
 msgstr ""
 
-#: utils/adt/formatting.c:3652
+#: utils/adt/ri_triggers.c:2723
+#: utils/adt/ri_triggers.c:2733
+#: utils/adt/ri_triggers.c:3142
 #, c-format
-msgid "SIGN_WROTE: %d, CURRENT: %d, NUMBER_P: '%s', INOUT: '%s'"
-msgstr "SIGN_WROTE: %d, CURRENT: %d, NUMBER_P: '%s', INOUT: '%s'"
+msgid "table \"%s\" does not have attribute \"%s\" referenced by constraint \"%s\""
+msgstr "таблица \"%s\" не имеет атрибут \"%s\" указанный констрейнтом \"%s\""
 
-#: utils/adt/formatting.c:3667
+#: utils/adt/ri_triggers.c:2753
 #, c-format
-msgid "Writing sign to position: %d"
+msgid "%s() was not fired by trigger manager"
 msgstr ""
 
-#: utils/adt/formatting.c:3709
+#: utils/adt/ri_triggers.c:2762
 #, c-format
-msgid "Writing bracket to position %d"
+msgid "%s() must be fired AFTER ROW"
 msgstr ""
 
-#: utils/adt/formatting.c:3731
+#: utils/adt/ri_triggers.c:2770
 #, c-format
-msgid "Writing blank space to position %d"
+msgid "%s() must be fired for INSERT"
 msgstr ""
 
-#: utils/adt/formatting.c:3746
+#: utils/adt/ri_triggers.c:2776
 #, c-format
-msgid "Writing zero to position %d"
+msgid "%s() must be fired for UPDATE"
 msgstr ""
 
-#: utils/adt/formatting.c:3764
-#, c-format
-msgid "Writing decimal point to position %d"
-msgstr ""
-
-#: utils/adt/formatting.c:3813
+#: utils/adt/ri_triggers.c:2783
 #, c-format
-msgid "Writing digit '%c' to position %d"
+msgid "%s() must be fired for INSERT or UPDATE"
 msgstr ""
 
-#: utils/adt/formatting.c:3857
-msgid "to_number(): RN is not supported"
-msgstr ""
-
-#: utils/adt/formatting.c:3979
+#: utils/adt/ri_triggers.c:2790
 #, c-format
-msgid ""
-"\n"
-"\tNUM: '%s'\n"
-"\tPRE: %d\n"
-"\tPOST: %d\n"
-"\tNUM_COUNT: %d\n"
-"\tNUM_PRE: %d\n"
-"\tSIGN_POS: %d\n"
-"\tSIGN_WROTE: %s\n"
-"\tZERO: %s\n"
-"\tZERO_START: %d\n"
-"\tZERO_END: %d\n"
-"\tLAST_RELEVANT: %s"
+msgid "%s() must be fired for DELETE"
 msgstr ""
-"\n"
-"\tNUM: '%s'\n"
-"\tPRE: %d\n"
-"\tPOST: %d\n"
-"\tNUM_COUNT: %d\n"
-"\tNUM_PRE: %d\n"
-"\tSIGN_POS: %d\n"
-"\tSIGN_WROTE: %s\n"
-"\tZERO: %s\n"
-"\tZERO_START: %d\n"
-"\tZERO_END: %d\n"
-"\tLAST_RELEVANT: %s"
 
-#: utils/adt/formatting.c:4244
+#: utils/adt/ri_triggers.c:3013
 #, c-format
-msgid "TO_NUMBER (number): '%s'"
-msgstr ""
-
-#: utils/adt/geo_ops.c:290
-msgid "Too many points requested"
+msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result"
 msgstr ""
 
-#: utils/adt/geo_ops.c:311
-msgid "Unable to format path"
+#: utils/adt/ri_triggers.c:3017
+msgid "This is most likely due to a rule having rewritten the query."
 msgstr ""
 
-#: utils/adt/geo_ops.c:383
+#: utils/adt/ri_triggers.c:3045
 #, c-format
-msgid "Bad box external representation '%s'"
+msgid "No rows were found in \"%s\"."
 msgstr ""
 
-#: utils/adt/geo_ops.c:842
+#: utils/adt/ri_triggers.c:3082
 #, c-format
-msgid "Bad line external representation '%s'"
+msgid "Key (%s)=(%s) is not present in \"%s\"."
 msgstr ""
 
-#: utils/adt/geo_ops.c:847 utils/adt/geo_ops.c:911
-msgid "line not yet implemented"
-msgstr ""
-
-#: utils/adt/geo_ops.c:1237 utils/adt/geo_ops.c:1258
+#: utils/adt/ri_triggers.c:3088
 #, c-format
-msgid "Bad path external representation '%s'"
+msgid "update or delete on \"%s\" violates foreign key constraint \"%s\" on \"%s\""
 msgstr ""
 
-#: utils/adt/geo_ops.c:1574
+#: utils/adt/ri_triggers.c:3091
 #, c-format
-msgid "Bad point external representation '%s'"
+msgid "Key (%s)=(%s) is still referenced from \"%s\"."
 msgstr ""
 
-#: utils/adt/geo_ops.c:1770
-#, c-format
-msgid "Bad lseg external representation '%s'"
-msgstr ""
-
-#: utils/adt/geo_ops.c:2320
-msgid "dist_lb not implemented"
+#: utils/adt/pseudotypes.c:38
+#: utils/adt/pseudotypes.c:64
+msgid "cannot accept a value of type record"
 msgstr ""
 
-#: utils/adt/geo_ops.c:2831
-msgid "close_lb not implemented"
+#: utils/adt/pseudotypes.c:51
+#: utils/adt/pseudotypes.c:77
+msgid "cannot display a value of type record"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3108
-msgid "Unable to create bounding box for empty polygon"
+#: utils/adt/pseudotypes.c:147
+msgid "cannot accept a value of type any"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3130 utils/adt/geo_ops.c:3140
-#, c-format
-msgid "Bad polygon external representation '%s'"
+#: utils/adt/pseudotypes.c:160
+msgid "cannot display a value of type any"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3428
-msgid "poly_distance not implemented"
+#: utils/adt/pseudotypes.c:174
+#: utils/adt/pseudotypes.c:202
+msgid "cannot accept a value of type anyarray"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3507
-msgid "point_div:  divide by 0.0 error"
+#: utils/adt/pseudotypes.c:252
+msgid "cannot accept a value of type trigger"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3626
-msgid "too many points requested."
+#: utils/adt/pseudotypes.c:265
+msgid "cannot display a value of type trigger"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3734
-msgid "path_center not implemented"
+#: utils/adt/pseudotypes.c:279
+msgid "cannot accept a value of type language_handler"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3749
-msgid "Open path cannot be converted to polygon"
+#: utils/adt/pseudotypes.c:292
+msgid "cannot display a value of type language_handler"
 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
-#, c-format
-msgid "Bad circle external representation '%s'"
+#: utils/adt/pseudotypes.c:306
+msgid "cannot accept a value of type internal"
 msgstr ""
 
-#: utils/adt/geo_ops.c:3959 utils/adt/geo_ops.c:3965
-msgid "Unable to format circle"
+#: utils/adt/pseudotypes.c:319
+msgid "cannot display a value of type internal"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4445
-msgid "Unable to convert circle to polygon"
+#: utils/adt/pseudotypes.c:333
+msgid "cannot accept a value of type opaque"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4452
-msgid "too many points requested"
+#: utils/adt/pseudotypes.c:346
+msgid "cannot display a value of type opaque"
 msgstr ""
 
-#: utils/adt/geo_ops.c:4485 utils/adt/geo_ops.c:4506
-msgid "Unable to convert polygon to circle"
+#: utils/adt/pseudotypes.c:360
+msgid "cannot accept a value of type anyelement"
 msgstr ""
 
-#: utils/adt/int.c:96
-msgid "int2vector value has too many values"
+#: utils/adt/pseudotypes.c:373
+msgid "cannot display a value of type anyelement"
 msgstr ""
 
-#: utils/adt/int.c:197
+#: utils/adt/regexp.c:176
 #, c-format
-msgid "i4toi2: '%d' causes int2 underflow"
+msgid "invalid regular expression: %s"
 msgstr ""
 
-#: utils/adt/int.c:199
+#: utils/adt/regproc.c:117
+#: utils/adt/regproc.c:138
+#: utils/adt/regproc.c:290
 #, c-format
-msgid "i4toi2: '%d' causes int2 overflow"
+msgid "no procedure with name %s"
 msgstr ""
 
-#: utils/adt/int8.c:101 utils/adt/int8.c:125
+#: utils/adt/regproc.c:122
+#: utils/adt/regproc.c:142
 #, c-format
-msgid "Bad int8 external representation \"%s\""
+msgid "more than one procedure named %s"
 msgstr ""
 
-#: utils/adt/int8.c:114
+#: utils/adt/regproc.c:467
+#: utils/adt/regproc.c:487
+#: utils/adt/regproc.c:665
 #, c-format
-msgid "int8 value out of range: \"%s\""
-msgstr ""
+msgid "no operator with name %s"
+msgstr "нет оператора с именем %s"
 
-#: utils/adt/int8.c:157
-msgid "Unable to format int8"
-msgstr ""
-
-#: utils/adt/int8.c:748
-msgid "int8 conversion to int4 is out of range"
-msgstr ""
-
-#: utils/adt/int8.c:771
-msgid "int8 conversion to int2 is out of range"
-msgstr ""
-
-#: utils/adt/int8.c:807 utils/adt/int8.c:844
-msgid "Floating point conversion to int8 is out of range"
-msgstr ""
-
-#: utils/adt/int8.c:859
-msgid "int8 conversion to OID is out of range"
-msgstr ""
-
-#: utils/adt/like.c:451 utils/adt/like_match.c:289 utils/adt/regexp.c:400
-msgid "ESCAPE string must be empty or one character"
-msgstr ""
-
-#: utils/adt/mac.c:61
+#: utils/adt/regproc.c:471
+#: utils/adt/regproc.c:491
 #, c-format
-msgid "macaddr_in: error in parsing \"%s\""
+msgid "more than one operator named %s"
 msgstr ""
 
-#: utils/adt/mac.c:66
-#, c-format
-msgid "macaddr_in: illegal address \"%s\""
-msgstr ""
+#: utils/adt/regproc.c:639
+msgid "missing argument"
+msgstr "отсутствует аргумент"
 
-#: utils/adt/mac.c:139
-msgid "Text is too long to convert to MAC address"
+#: utils/adt/regproc.c:640
+msgid "Use NONE to denote the missing argument of a unary operator."
 msgstr ""
 
-#: utils/adt/nabstime.c:340 utils/adt/nabstime.c:373
-#, c-format
-msgid "Invalid timezone '%s'"
-msgstr ""
+#: utils/adt/regproc.c:644
+#: utils/adt/regproc.c:1276
+msgid "too many arguments"
+msgstr "слишком много аргументов"
 
-#: utils/adt/nabstime.c:477
-#, c-format
-msgid "Bad abstime external representation (too long) '%s'"
+#: utils/adt/regproc.c:645
+msgid "Provide two argument types for operator."
 msgstr ""
 
-#: utils/adt/nabstime.c:481
+#: utils/adt/regproc.c:837
 #, c-format
-msgid "Bad abstime external representation '%s'"
+msgid "no class with name %s"
 msgstr ""
 
-#: utils/adt/nabstime.c:511
+#: utils/adt/regproc.c:1003
 #, c-format
-msgid "Bad abstime (internal coding error) '%s'"
-msgstr ""
-
-#: utils/adt/nabstime.c:702 utils/adt/nabstime.c:770
-msgid "Unable to convert timestamp to abstime"
-msgstr ""
-
-#: utils/adt/nabstime.c:726
-msgid "Unable to convert abstime 'invalid' to timestamp"
-msgstr ""
+msgid "no type with name %s"
+msgstr "нет типа с именем %s"
 
-#: utils/adt/nabstime.c:741
-msgid ""
-"Unable to convert ABSTIME to TIMESTAMP\n"
-"\tabstime_timestamp() internal error"
+#: utils/adt/regproc.c:1174
+msgid "expected a left parenthesis"
 msgstr ""
 
-#: utils/adt/nabstime.c:794
-msgid "Unable to convert abstime 'invalid' to timestamptz"
+#: utils/adt/regproc.c:1190
+msgid "expected a right parenthesis"
 msgstr ""
 
-#: utils/adt/nabstime.c:809
-msgid ""
-"Unable to convert ABSTIME to TIMESTAMP WITH TIME ZONE\n"
-"\tabstime_timestamptz() internal error"
-msgstr ""
-
-#: utils/adt/nabstime.c:840
-#, c-format
-msgid "Bad reltime external representation (too long) '%s'"
-msgstr ""
+#: utils/adt/regproc.c:1209
+msgid "expected a type name"
+msgstr "ожидалось имя типа"
 
-#: utils/adt/nabstime.c:844
-#, c-format
-msgid "Bad reltime external representation '%s'"
-msgstr ""
+#: utils/adt/regproc.c:1241
+msgid "improper type name"
+msgstr "неверное имя типа"
 
-#: utils/adt/nabstime.c:854
+#: utils/adt/ruleutils.c:1102
 #, c-format
-msgid "Bad reltime (internal coding error) '%s'"
+msgid "unsupported constraint type \"%c\""
 msgstr ""
 
-#: utils/adt/nabstime.c:912
+#: utils/adt/ruleutils.c:1557
 #, c-format
-msgid "Unable to decode tinterval '%s'"
+msgid "rule \"%s\" has unsupported event type %d"
 msgstr ""
 
-#: utils/adt/nabstime.c:1025
-msgid "Unable to convert reltime 'invalid' to interval"
+#: utils/adt/selfuncs.c:3122
+#: utils/adt/selfuncs.c:3485
+msgid "case insensitive matching not supported on type bytea"
 msgstr ""
 
-#: utils/adt/network.c:64
-#, c-format
-msgid "invalid %s value '%s'"
+#: utils/adt/selfuncs.c:3207
+#: utils/adt/selfuncs.c:3633
+msgid "regex matching not supported on type bytea"
 msgstr ""
 
-#: utils/adt/network.c:75
+#: utils/adt/tid.c:66
+#: utils/adt/tid.c:74
+#: utils/adt/tid.c:82
 #, c-format
-msgid "invalid CIDR value '%s': has bits set to right of mask"
+msgid "invalid input syntax for tid: \"%s\""
 msgstr ""
 
-#: utils/adt/network.c:127 utils/adt/network.c:468
+#: utils/adt/timestamp.c:87
+#: utils/adt/timestamp.c:94
+#: utils/adt/timestamp.c:2389
 #, c-format
-msgid "unable to print address (%s)"
+msgid "invalid input syntax for timestamp: \"%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/timestamp.c:103
+#: utils/adt/timestamp.c:332
 #, c-format
-msgid "unknown address family (%d)"
+msgid "timestamp out of range: \"%s\""
 msgstr ""
 
-#: utils/adt/network.c:184
+#: utils/adt/timestamp.c:121
+#: utils/adt/timestamp.c:350
+#: utils/adt/timestamp.c:511
 #, c-format
-msgid "set_masklen - invalid value '%d'"
-msgstr ""
+msgid "\"%s\" is no longer supported"
+msgstr "\"%s\" больше не поддерживается"
 
-#: 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/timestamp.c:261
 #, c-format
-msgid "cannot compare address families %d and %d"
+msgid "timestamp(%d) precision must be between %d and %d"
 msgstr ""
 
-#: utils/adt/network.c:397 utils/adt/network.c:428
+#: utils/adt/timestamp.c:316
+#: utils/adt/timestamp.c:323
+#: utils/adt/timestamp.c:2449
 #, c-format
-msgid "unable to print host (%s)"
+msgid "invalid input syntax for timestamp with time zone: \"%s\""
 msgstr ""
 
-#: utils/adt/network.c:652
+#: utils/adt/timestamp.c:486
+#: utils/adt/timestamp.c:493
+#: utils/adt/timestamp.c:2510
 #, c-format
-msgid "convert_network_to_scalar: unsupported type %u"
-msgstr ""
-
-#: utils/adt/not_in.c:62
-msgid "int4notin: must provide relationname.attributename"
-msgstr ""
-
-#: utils/adt/numeric.c:1512
-msgid "Cannot convert NaN to int4"
-msgstr ""
-
-#: utils/adt/numeric.c:1562
-msgid "Cannot convert NaN to int8"
-msgstr ""
-
-#: utils/adt/numeric.c:1613
-msgid "Cannot convert NaN to int2"
-msgstr ""
-
-#: utils/adt/numeric.c:1809
-msgid "do_numeric_accum: expected 3-element numeric array"
+msgid "invalid input syntax for interval: \"%s\""
 msgstr ""
 
-#: utils/adt/numeric.c:1900
-msgid "numeric_avg: expected 3-element numeric array"
+#: utils/adt/timestamp.c:504
+#: utils/adt/timestamp.c:2218
+#: utils/adt/timestamp.c:2329
+#: utils/adt/timestamp.c:2828
+msgid "interval out of range"
 msgstr ""
 
-#: utils/adt/numeric.c:1936
-msgid "numeric_variance: expected 3-element numeric array"
-msgstr ""
-
-#: utils/adt/numeric.c:2018
-msgid "numeric_stddev: expected 3-element numeric array"
-msgstr ""
-
-#: utils/adt/numeric.c:2214
-msgid "int2_avg_accum: expected 2-element int8 array"
-msgstr ""
-
-#: utils/adt/numeric.c:2234
-msgid "int4_avg_accum: expected 2-element int8 array"
-msgstr ""
-
-#: utils/adt/numeric.c:2252
-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/timestamp.c:836
 #, 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 "interval(%d) precision must be between %d and %d"
 msgstr ""
 
-#: utils/adt/numeric.c:3269
-msgid "division by zero on numeric"
+#: utils/adt/timestamp.c:1694
+msgid "cannot subtract non-finite timestamps"
 msgstr ""
 
-#: utils/adt/numeric.c:3650
-msgid "math error on numeric - cannot compute SQRT of negative value"
-msgstr ""
-
-#: utils/adt/numeric.c:3739
-msgid "argument for EXP() too big"
-msgstr ""
-
-#: utils/adt/numeric.c:3818
-msgid "math error on numeric - cannot compute LN of value <= zero"
-msgstr ""
-
-#: utils/adt/numutils.c:71
-msgid "pg_atoi: NULL pointer"
-msgstr ""
-
-#: utils/adt/numutils.c:73
-msgid "pg_atoi: zero-length string"
-msgstr ""
-
-#: utils/adt/numutils.c: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
+#: utils/adt/timestamp.c:2548
+#: utils/adt/timestamp.c:2625
+#: utils/adt/timestamp.c:2950
+#: utils/adt/timestamp.c:3126
 #, c-format
-msgid "pg_atoi: error reading \"%s\": %m"
+msgid "timestamp units \"%s\" not recognized"
 msgstr ""
 
-#: utils/adt/numutils.c:85
+#: utils/adt/timestamp.c:2611
+#: utils/adt/timestamp.c:3059
+#: utils/adt/timestamp.c:3116
 #, c-format
-msgid "pg_atoi: error in \"%s\": can't parse \"%s\""
+msgid "timestamp units \"%s\" not supported"
 msgstr ""
 
-#: utils/adt/numutils.c:129
+#: utils/adt/timestamp.c:2657
+#: utils/adt/timestamp.c:2734
+#: utils/adt/timestamp.c:3158
+#: utils/adt/timestamp.c:3326
 #, c-format
-msgid "pg_atoi: invalid result size: %d"
+msgid "timestamp with time zone units \"%s\" not recognized"
 msgstr ""
 
-#: utils/adt/oid.c:46
+#: utils/adt/timestamp.c:2718
+#: utils/adt/timestamp.c:3279
+#: utils/adt/timestamp.c:3317
 #, c-format
-msgid "%s: error reading \"%s\": %m"
+msgid "timestamp with time zone units \"%s\" not supported"
 msgstr ""
 
-#: utils/adt/oid.c:49 utils/adt/oid.c:63
+#: utils/adt/timestamp.c:2766
+#: utils/adt/timestamp.c:2837
+#: utils/adt/timestamp.c:3358
+#: utils/adt/timestamp.c:3470
 #, c-format
-msgid "%s: error in \"%s\": can't parse \"%s\""
+msgid "interval units \"%s\" not recognized"
 msgstr ""
 
-#: utils/adt/oid.c:84
+#: utils/adt/timestamp.c:2821
+#: utils/adt/timestamp.c:3440
 #, c-format
-msgid "%s: error reading \"%s\": %s"
+msgid "interval units \"%s\" not supported"
 msgstr ""
 
-#: utils/adt/oid.c:138
-msgid "oidvector value has too many values"
+#: utils/adt/timestamp.c:2861
+msgid "cannot convert week number without year information"
 msgstr ""
 
-#: utils/adt/oracle_compat.c:199 utils/adt/oracle_compat.c:294
-msgid "Requested length too large"
-msgstr ""
-
-#: utils/adt/oracle_compat.c:857
-msgid "Requested buffer is too large."
-msgstr ""
-
-#: utils/adt/pg_locale.c:160
-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"
-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:226
+#: utils/adt/timestamp.c:3553
+#: utils/adt/timestamp.c:3704
 #, c-format
-msgid "Cannot accept a constant of type %s"
+msgid "interval time zone \"%s\" must not specify month"
 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/varbit.c:109
+#: utils/adt/varbit.c:263
 #, c-format
-msgid "Cannot display a value of type %s"
+msgid "bit string length %d does not match type bit(%d)"
 msgstr ""
 
-#: utils/adt/regexp.c:166
+#: utils/adt/varbit.c:131
+#: utils/adt/varbit.c:370
 #, c-format
-msgid "Invalid regular expression: %s"
+msgid "\"%c\" is not a valid binary digit"
 msgstr ""
 
-#: utils/adt/regproc.c:115 utils/adt/regproc.c:130 utils/adt/regproc.c:258
+#: utils/adt/varbit.c:156
+#: utils/adt/varbit.c:395
 #, c-format
-msgid "No procedure with name %s"
+msgid "\"%c\" is not a valid hex digit"
 msgstr ""
 
-#: utils/adt/regproc.c:117 utils/adt/regproc.c:132
+#: utils/adt/varbit.c:348
+#: utils/adt/varbit.c:532
 #, c-format
-msgid "There is more than one procedure named %s"
+msgid "bit string too long for type bit varying(%d)"
 msgstr ""
 
-#: utils/adt/regproc.c:413 utils/adt/regproc.c:428 utils/adt/regproc.c:576
-#, c-format
-msgid "No operator with name %s"
+#: utils/adt/varbit.c:472
+msgid "invalid length in external bit string"
 msgstr ""
 
-#: utils/adt/regproc.c:415 utils/adt/regproc.c:430
-#, c-format
-msgid "There is more than one operator named %s"
+#: utils/adt/varbit.c:905
+msgid "cannot AND bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/regproc.c:556
-msgid ""
-"regoperatorin: use NONE to denote the missing argument of a unary operator"
+#: utils/adt/varbit.c:946
+msgid "cannot OR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/regproc.c:558
-msgid "regoperatorin: provide two argument types for operator"
+#: utils/adt/varbit.c:992
+msgid "cannot XOR bit strings of different sizes"
 msgstr ""
 
-#: utils/adt/regproc.c:726
-#, c-format
-msgid "No class with name %s"
+#: utils/adt/varbit.c:1257
+#: utils/adt/varbit.c:1290
+msgid "int64 is not supported on this platform"
 msgstr ""
 
-#: utils/adt/regproc.c:870
+#: utils/adt/varchar.c:105
+#: utils/adt/varchar.c:225
 #, c-format
-msgid "No type with name %s"
+msgid "value too long for type character(%d)"
 msgstr ""
 
-#: utils/adt/regproc.c:955 utils/adt/regproc.c:958 utils/adt/varlena.c:1367
-#: utils/adt/varlena.c:1370
+#: utils/adt/varchar.c:383
+#: utils/adt/varchar.c:475
 #, c-format
-msgid "%s: invalid name syntax"
+msgid "value too long for type character varying(%d)"
 msgstr ""
 
-#: utils/adt/regproc.c:1015
-#, c-format
-msgid "%s: expected a left parenthesis"
+#: utils/adt/varlena.c:579
+#: utils/adt/varlena.c:643
+#: utils/adt/varlena.c:1294
+msgid "negative substring length not allowed"
 msgstr ""
 
-#: utils/adt/regproc.c:1029
+#: utils/adt/varlena.c:1389
+#: utils/adt/varlena.c:1420
+#: utils/adt/varlena.c:1456
+#: utils/adt/varlena.c:1499
 #, c-format
-msgid "%s: expected a right parenthesis"
+msgid "index %d out of valid range, 0..%d"
 msgstr ""
 
-#: utils/adt/regproc.c:1045
-#, c-format
-msgid "%s: expected a type name"
+#: utils/adt/varlena.c:1511
+msgid "new bit must be 0 or 1"
 msgstr ""
 
-#: utils/adt/regproc.c:1075
-#, c-format
-msgid "%s: improper type name"
+#: utils/adt/varlena.c:2008
+msgid "field position must be greater than zero"
 msgstr ""
 
-#: utils/adt/regproc.c:1107
+#: utils/cache/lsyscache.c:1632
+#: utils/cache/lsyscache.c:1668
+#: utils/cache/lsyscache.c:1704
+#: utils/cache/lsyscache.c:1740
 #, c-format
-msgid "%s: too many argument datatypes"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:186
-msgid "RI_FKey_check() not fired by trigger manager"
-msgstr ""
+msgid "type %s is only a shell"
+msgstr "тип %s является только оболочкой"
 
-#: utils/adt/ri_triggers.c:189
-msgid "RI_FKey_check() must be fired AFTER ROW"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:192
-msgid "RI_FKey_check() must be fired for INSERT or UPDATE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:200
-msgid "wrong # of arguments in call to RI_FKey_check()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:202
+#: utils/cache/lsyscache.c:1637
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_check()"
+msgid "no input function available for type %s"
 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/cache/lsyscache.c:1673
 #, c-format
-msgid ""
-"No target table given for trigger \"%s\" on \"%s\"\n"
-"\tRemove these RI triggers and do ALTER TABLE ADD CONSTRAINT"
+msgid "no output function available for type %s"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:292 utils/adt/ri_triggers.c:403
-#: utils/adt/ri_triggers.c:608
-msgid "SPI_connect() failed in RI_FKey_check()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:297 utils/adt/ri_triggers.c:481
-msgid "SPI_execp() failed in RI_FKey_check()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:302
+#: utils/cache/relcache.c:3184
 #, 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
-msgid "SPI_finish() failed in RI_FKey_check()"
-msgstr ""
+msgid "could not create init file \"%s\": %m"
+msgstr "не получилось создать файл инициализации \"%s\": %m"
 
-#: utils/adt/ri_triggers.c:320 utils/adt/ri_triggers.c:909
-#: utils/adt/ri_triggers.c:1150 utils/adt/ri_triggers.c:1356
-#: utils/adt/ri_triggers.c:1595 utils/adt/ri_triggers.c:1817
-#: utils/adt/ri_triggers.c:2053 utils/adt/ri_triggers.c:2269
-#: utils/adt/ri_triggers.c:2537 utils/adt/ri_triggers.c:2798
-#: utils/adt/ri_triggers.c:3090 utils/adt/ri_triggers.c:3180
-msgid "MATCH PARTIAL not yet supported"
+#: utils/cache/relcache.c:3186
+#: utils/cache/relcache.c:3327
+msgid "Continuing anyway, but there's something wrong."
 msgstr ""
 
-#: utils/adt/ri_triggers.c:356
+#: utils/cache/relcache.c:3325
 #, c-format
-msgid ""
-"%s referential integrity violation - MATCH FULL doesn't allow mixing of NULL "
-"and NON-NULL key values"
+msgid "could not rename init file \"%s\" to \"%s\": %m"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:380 utils/adt/ri_triggers.c:594
-msgid "MATCH PARTIAL not yet implemented"
+#: utils/error/elog.c:458
+msgid "error during error recovery, giving up"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:486
+#: utils/error/elog.c:874
 #, c-format
-msgid ""
-"%s referential integrity violation - key referenced from %s not found in %s"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:502
-msgid "internal error #1 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:679
-msgid "SPI_execp() failed in ri_Check_Pk_Match()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:686
-msgid "SPI_finish() failed in ri_Check_Pk_Match()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:727
-msgid "RI_FKey_noaction_del() not fired by trigger manager"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:730
-msgid "RI_FKey_noaction_del() must be fired AFTER ROW"
-msgstr ""
+msgid "failed to open \"%s\": %m"
+msgstr "не удалось открыть \"%s\": %m"
 
-#: utils/adt/ri_triggers.c:732
-msgid "RI_FKey_noaction_del() must be fired for DELETE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:740
-msgid "wrong # of arguments in call to RI_FKey_noaction_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:742
+#: utils/error/elog.c:884
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_noaction_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:817
-msgid "SPI_connect() failed in RI_FKey_noaction_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:887
-msgid "SPI_execp() failed in RI_FKey_noaction_del()"
+msgid "failed to reopen \"%s\" as stderr: %m"
 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/error/elog.c:897
 #, c-format
-msgid "%s referential integrity violation - key in %s still referenced from %s"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:899
-msgid "SPI_finish() failed in RI_FKey_noaction_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:916
-msgid "internal error #2 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:957
-msgid "RI_FKey_noaction_upd() not fired by trigger manager"
+msgid "failed to reopen \"%s\" as stdout: %m"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:960
-msgid "RI_FKey_noaction_upd() must be fired AFTER ROW"
+#: utils/error/elog.c:1055
+#: utils/error/elog.c:1188
+#: utils/error/elog.c:1251
+msgid "missing error text"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:962
-msgid "RI_FKey_noaction_upd() must be fired for UPDATE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:970
-msgid "wrong # of arguments in call to RI_FKey_noaction_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:972
+#: utils/error/elog.c:1058
+#: utils/error/elog.c:1254
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_noaction_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1058
-msgid "SPI_connect() failed in RI_FKey_noaction_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1128
-msgid "SPI_execp() failed in RI_FKey_noaction_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1140
-msgid "SPI_finish() failed in RI_FKey_noaction_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1157
-msgid "internal error #3 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1193
-msgid "RI_FKey_cascade_del() not fired by trigger manager"
+msgid " at character %d"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:1196
-msgid "RI_FKey_cascade_del() must be fired AFTER ROW"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1198
-msgid "RI_FKey_cascade_del() must be fired for DELETE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1206
-msgid "wrong # of arguments in call to RI_FKey_cascade_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1208
+#: utils/error/elog.c:1065
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_cascade_del()"
-msgstr ""
+msgid "DETAIL:  %s\n"
+msgstr "ПОДРОБНОСТИ:  %s\n"
 
-#: utils/adt/ri_triggers.c:1272
-msgid "SPI_connect() failed in RI_FKey_cascade_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1341
-msgid "SPI_execp() failed in RI_FKey_cascade_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1346
-msgid "SPI_finish() failed in RI_FKey_cascade_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1363
-msgid "internal error #4 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1401
-msgid "RI_FKey_cascade_upd() not fired by trigger manager"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1404
-msgid "RI_FKey_cascade_upd() must be fired AFTER ROW"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1406
-msgid "RI_FKey_cascade_upd() must be fired for UPDATE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1414
-msgid "wrong # of arguments in call to RI_FKey_cascade_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1416
+#: utils/error/elog.c:1067
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_cascade_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1491
-msgid "SPI_connect() failed in RI_FKey_cascade_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1580
-msgid "SPI_execp() failed in RI_FKey_cascade_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1585
-msgid "SPI_finish() failed in RI_FKey_cascade_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1602
-msgid "internal error #5 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1645
-msgid "RI_FKey_restrict_del() not fired by trigger manager"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1648
-msgid "RI_FKey_restrict_del() must be fired AFTER ROW"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1650
-msgid "RI_FKey_restrict_del() must be fired for DELETE"
-msgstr ""
+msgid "HINT:  %s\n"
+msgstr "ПОДСКАЗКА:  %s\n"
 
-#: utils/adt/ri_triggers.c:1658
-msgid "wrong # of arguments in call to RI_FKey_restrict_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1660
+#: utils/error/elog.c:1069
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_restrict_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1724
-msgid "SPI_connect() failed in RI_FKey_restrict_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1795
-msgid "SPI_execp() failed in RI_FKey_restrict_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1807
-msgid "SPI_finish() failed in RI_FKey_restrict_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1824
-msgid "internal error #6 in ri_triggers.c"
-msgstr ""
+msgid "CONTEXT:  %s\n"
+msgstr "КОНТЕКСТ:  %s\n"
 
-#: utils/adt/ri_triggers.c:1868
-msgid "RI_FKey_restrict_upd() not fired by trigger manager"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1871
-msgid "RI_FKey_restrict_upd() must be fired AFTER ROW"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1873
-msgid "RI_FKey_restrict_upd() must be fired for UPDATE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1881
-msgid "wrong # of arguments in call to RI_FKey_restrict_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1883
+#: utils/error/elog.c:1073
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_restrict_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:1958
-msgid "SPI_connect() failed in RI_FKey_restrict_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2031
-msgid "SPI_execp() failed in RI_FKey_restrict_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2043
-msgid "SPI_finish() failed in RI_FKey_restrict_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2060
-msgid "internal error #7 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2096
-msgid "RI_FKey_setnull_del() not fired by trigger manager"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2099
-msgid "RI_FKey_setnull_del() must be fired AFTER ROW"
-msgstr ""
+msgid "LOCATION:  %s, %s:%d\n"
+msgstr "ГДЕ:       %s, %s:%d\n"
 
-#: utils/adt/ri_triggers.c:2101
-msgid "RI_FKey_setnull_del() must be fired for DELETE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2109
-msgid "wrong # of arguments in call to RI_FKey_setnull_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2111
+#: utils/error/elog.c:1077
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setnull_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2175
-msgid "SPI_connect() failed in RI_FKey_setnull_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2254
-msgid "SPI_execp() failed in RI_FKey_setnull_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2259
-msgid "SPI_finish() failed in RI_FKey_setnull_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2276
-msgid "internal error #8 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2315
-msgid "RI_FKey_setnull_upd() not fired by trigger manager"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2318
-msgid "RI_FKey_setnull_upd() must be fired AFTER ROW"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2320
-msgid "RI_FKey_setnull_upd() must be fired for UPDATE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2328
-msgid "wrong # of arguments in call to RI_FKey_setnull_upd()"
-msgstr ""
+msgid "LOCATION:  %s:%d\n"
+msgstr "ГДЕ:       %s:%d\n"
 
-#: utils/adt/ri_triggers.c:2330
+#: utils/error/elog.c:1089
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setnull_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2406
-msgid "SPI_connect() failed in RI_FKey_setnull_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2522
-msgid "SPI_execp() failed in RI_FKey_setnull_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2527
-msgid "SPI_finish() failed in RI_FKey_setnull_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2544
-msgid "internal error #9 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2580
-msgid "RI_FKey_setdefault_del() not fired by trigger manager"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2583
-msgid "RI_FKey_setdefault_del() must be fired AFTER ROW"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2585
-msgid "RI_FKey_setdefault_del() must be fired for DELETE"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2593
-msgid "wrong # of arguments in call to RI_FKey_setdefault_del()"
-msgstr ""
+msgid "STATEMENT:  %s\n"
+msgstr "КОМАНДА:  %s\n"
 
-#: utils/adt/ri_triggers.c:2595
+#: utils/error/elog.c:1359
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setdefault_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2659
-msgid "SPI_connect() failed in RI_FKey_setdefault_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2783
-msgid "SPI_execp() failed in RI_FKey_setdefault_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2788
-msgid "SPI_finish() failed in RI_FKey_setdefault_del()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2805
-msgid "internal error #10 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2843
-msgid "RI_FKey_setdefault_upd() not fired by trigger manager"
+msgid "operating system error %d"
 msgstr ""
 
-#: utils/adt/ri_triggers.c:2846
-msgid "RI_FKey_setdefault_upd() must be fired AFTER ROW"
-msgstr ""
+#: utils/error/elog.c:1382
+msgid "DEBUG"
+msgstr "DEBUG"
 
-#: utils/adt/ri_triggers.c:2848
-msgid "RI_FKey_setdefault_upd() must be fired for UPDATE"
-msgstr ""
+#: utils/error/elog.c:1386
+msgid "LOG"
+msgstr "LOG"
 
-#: utils/adt/ri_triggers.c:2856
-msgid "wrong # of arguments in call to RI_FKey_setdefault_upd()"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:2858
-#, c-format
-msgid "too many keys (%d max) in call to RI_FKey_setdefault_upd()"
-msgstr ""
+#: utils/error/elog.c:1389
+msgid "INFO"
+msgstr "INFO"
 
-#: utils/adt/ri_triggers.c:2935
-msgid "SPI_connect() failed in RI_FKey_setdefault_upd()"
-msgstr ""
+#: utils/error/elog.c:1392
+msgid "NOTICE"
+msgstr "NOTICE"
 
-#: utils/adt/ri_triggers.c:3075
-msgid "SPI_execp() failed in RI_FKey_setdefault_upd()"
-msgstr ""
+#: utils/error/elog.c:1395
+msgid "WARNING"
+msgstr "WARNING"
 
-#: utils/adt/ri_triggers.c:3080
-msgid "SPI_finish() failed in RI_FKey_setdefault_upd()"
-msgstr ""
+#: utils/error/elog.c:1398
+msgid "ERROR"
+msgstr "ERROR"
 
-#: utils/adt/ri_triggers.c:3097
-msgid "internal error #11 in ri_triggers.c"
-msgstr ""
+#: utils/error/elog.c:1401
+msgid "FATAL"
+msgstr "FATAL"
 
-#: utils/adt/ri_triggers.c:3128
-msgid "wrong # of arguments in call to RI_FKey_keyequal_upd()"
-msgstr ""
+#: utils/error/elog.c:1404
+msgid "PANIC"
+msgstr "PANIC"
 
-#: utils/adt/ri_triggers.c:3130
+#: utils/fmgr/fmgr.c:223
 #, c-format
-msgid "too many keys (%d max) in call to RI_FKey_keyequal_upd()"
-msgstr ""
+msgid "internal function \"%s\" is not in table"
+msgstr "внутренняя функцич \"%s\" не в таблице"
 
-#: utils/adt/ri_triggers.c:3187
-msgid "internal error #12 in ri_triggers.c"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:3252
+#: utils/fmgr/fmgr.c:403
 #, c-format
-msgid "unrecognized referential integrity MATCH type '%s'"
+msgid "unrecognized API version %d reported by info function \"%s\""
 msgstr ""
 
-#: utils/adt/ri_triggers.c:3302 utils/adt/ri_triggers.c:3310
-#: utils/adt/ri_triggers.c:3362
+#: utils/fmgr/fmgr.c:622
+#: utils/fmgr/fmgr.c:1486
 #, c-format
-msgid "constraint %s: table %s does not have an attribute %s"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:3490
-msgid "out of memory for RI plan cache"
-msgstr ""
-
-#: utils/adt/ri_triggers.c:3690
-msgid "out of memory for RI operator cache"
-msgstr ""
+msgid "function %u has too many arguments (%d > %d)"
+msgstr "у функции %u слишком большое число аргументов (%d > %d)"
 
-#: utils/adt/ruleutils.c:198
-msgid "get_ruledef: cannot connect to SPI manager"
-msgstr ""
-
-#: utils/adt/ruleutils.c:213 utils/adt/ruleutils.c:330
+#: utils/fmgr/dfmgr.c:99
+#: utils/fmgr/dfmgr.c:197
+#: utils/fmgr/dfmgr.c:254
 #, c-format
-msgid "SPI_prepare() failed for \"%s\""
+msgid "could not access file \"%s\": %m"
 msgstr ""
 
-#: utils/adt/ruleutils.c:224
+#: utils/fmgr/dfmgr.c:134
 #, c-format
-msgid "failed to get pg_rewrite tuple for %u"
-msgstr ""
-
-#: utils/adt/ruleutils.c:228 utils/adt/ruleutils.c:253
-msgid "get_ruledef: SPI_finish() failed"
+msgid "could not load library \"%s\": %s"
 msgstr ""
 
-#: utils/adt/ruleutils.c:314
-msgid "get_viewdef: cannot connect to SPI manager"
-msgstr ""
-
-#: utils/adt/ruleutils.c:343
+#: utils/fmgr/dfmgr.c:164
 #, c-format
-msgid "failed to get pg_rewrite tuple for view %u"
-msgstr ""
+msgid "could not find function \"%s\" in file \"%s\""
+msgstr "не получилось найти фунцию \"%s\" в файле \"%s\""
 
-#: utils/adt/ruleutils.c:366
-msgid "get_viewdef: SPI_finish() failed"
+#: utils/fmgr/dfmgr.c:355
+msgid "invalid macro name in dynamic library path"
 msgstr ""
 
-#: utils/adt/ruleutils.c:402
-#, c-format
-msgid "syscache lookup for index %u failed"
+#: utils/fmgr/dfmgr.c:407
+msgid "zero-length component in DYNAMIC_LIBRARY_PATH"
 msgstr ""
 
-#: utils/adt/ruleutils.c:415
-#, c-format
-msgid "syscache lookup for relid %u failed"
+#: utils/fmgr/dfmgr.c:420
+msgid "DYNAMIC_LIBRARY_PATH component is not absolute"
 msgstr ""
 
-#: utils/adt/ruleutils.c:580
-#, c-format
-msgid "Failed to find constraint with OID %u"
-msgstr ""
+#: utils/init/miscinit.c:327
+msgid "permission denied to set session authorization"
+msgstr "доступ запрещён по установке авторизации сессии"
 
-#: utils/adt/ruleutils.c:600
+#: utils/init/miscinit.c:353
 #, c-format
-msgid "pg_get_constraintdef: Null conkey for constraint %u"
-msgstr ""
+msgid "invalid user id: %d"
+msgstr "неверное ID пользователя: %d"
 
-#: utils/adt/ruleutils.c:613
+#: utils/init/miscinit.c:443
 #, c-format
-msgid "pg_get_constraintdef: Null confkey for constraint %u"
+msgid "could not create lock file \"%s\": %m"
 msgstr ""
 
-#: utils/adt/ruleutils.c:633
+#: utils/init/miscinit.c:457
 #, c-format
-msgid "pg_get_constraintdef: Unknown confmatchtype '%c' for constraint %u"
+msgid "could not open lock file \"%s\": %m"
 msgstr ""
 
-#: utils/adt/ruleutils.c:659
+#: utils/init/miscinit.c:463
 #, c-format
-msgid "pg_get_constraintdef: Unknown confupdtype '%c' for constraint %u"
+msgid "could not read lock file \"%s\": %m"
 msgstr ""
 
-#: utils/adt/ruleutils.c:684
+#: utils/init/miscinit.c:494
 #, c-format
-msgid "pg_get_constraintdef: Unknown confdeltype '%c' for constraint %u"
+msgid "lock file \"%s\" already exists"
 msgstr ""
 
-#: utils/adt/ruleutils.c:698
+#: utils/init/miscinit.c:497
 #, c-format
-msgid "pg_get_constraintdef: unsupported constraint type '%c'"
+msgid "Is another %s (pid %d) running in \"%s\"?"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1100
+#: utils/init/miscinit.c:500
 #, c-format
-msgid "get_ruledef: rule %s has unsupported event type %d"
+msgid "Is another %s (pid %d) using \"%s\"?"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1302
+#: utils/init/miscinit.c:529
 #, c-format
-msgid "get_query_def: unknown query command type %d"
+msgid "pre-existing shared memory block (key %lu, id %lu) is still in use"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1537
+#: utils/init/miscinit.c:532
 #, c-format
-msgid "get_setop_query: unexpected set op %d"
+msgid "If you're sure there are no old backends still running, remove the shared memory block with ipcrm(1), or just delete \"%s\"."
 msgstr ""
 
-#: utils/adt/ruleutils.c:1549
+#: utils/init/miscinit.c:549
 #, c-format
-msgid "get_setop_query: unexpected node %d"
+msgid "could not remove old lock file \"%s\": %m"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1609
-msgid "get_insert_query_def: too many RTEs in INSERT!"
+#: utils/init/miscinit.c:551
+msgid "The file seems accidentally left over, but I couldn't remove it. Please remove the file by hand and try again."
 msgstr ""
 
-#: utils/adt/ruleutils.c:1761
-msgid "get_utility_query_def: unexpected statement type"
-msgstr ""
-
-#: utils/adt/ruleutils.c:1792
+#: utils/init/miscinit.c:573
 #, c-format
-msgid "get_names_for_var: bogus varlevelsup %d"
+msgid "could not write lock file \"%s\": %m"
 msgstr ""
 
-#: utils/adt/ruleutils.c:1806
+#: utils/init/miscinit.c:675
 #, c-format
-msgid "get_names_for_var: bogus varno %d"
-msgstr ""
+msgid "could not rewrite \"%s\": %m"
+msgstr "не получилось перезаписать \"%s\": %m"
 
-#: utils/adt/ruleutils.c:2092
+#: utils/init/miscinit.c:684
 #, c-format
-msgid "get_rule_expr: unknown boolop %d"
-msgstr ""
-
-#: utils/adt/ruleutils.c:2123
-#, c-format
-msgid "Argument type %s of FieldSelect is not a tuple type"
-msgstr ""
+msgid "could not read \"%s\": %m"
+msgstr "не получилось считать \"%s\": %m"
 
-#: utils/adt/ruleutils.c:2205
+#: utils/init/miscinit.c:724
 #, c-format
-msgid "get_rule_expr: unexpected nulltesttype %d"
-msgstr ""
+msgid "could not write \"%s\": %m"
+msgstr "не получилось записать \"%s\": %m"
 
-#: utils/adt/ruleutils.c:2238
+#: utils/init/miscinit.c:769
+#: utils/init/miscinit.c:782
 #, c-format
-msgid "get_rule_expr: unexpected booltesttype %d"
-msgstr ""
+msgid "\"%s\" is not a valid data directory"
+msgstr "\"%s\" не является верной директорией данных"
 
-#: utils/adt/ruleutils.c:2261
+#: utils/init/miscinit.c:771
 #, c-format
-msgid "get_rule_expr: unknown node type %d"
-msgstr ""
+msgid "File \"%s\" is missing."
+msgstr "Файл \"%s\" отсутствует."
 
-#: utils/adt/ruleutils.c:2302
+#: utils/init/miscinit.c:784
 #, c-format
-msgid "cache lookup for operator %u failed"
-msgstr ""
+msgid "File \"%s\" does not contain valid data."
+msgstr "Файл \"%s\" не содержит верные данные."
 
-#: utils/adt/ruleutils.c:2321
-msgid "get_rule_expr: bogus oprkind"
+#: utils/init/miscinit.c:786
+msgid "You may need to initdb."
 msgstr ""
 
-#: utils/adt/ruleutils.c:2677
+#: utils/init/miscinit.c:794
 #, c-format
-msgid "get_sublink_expr: unsupported sublink type %d"
-msgstr ""
+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/adt/ruleutils.c:2770
-#, c-format
-msgid "unexpected rte kind %d"
+#: utils/init/miscinit.c:836
+msgid "invalid list syntax for preload_libraries configuration option"
 msgstr ""
 
-#: utils/adt/ruleutils.c:2842
+#: utils/init/miscinit.c:881
 #, c-format
-msgid "get_from_clause_item: unknown join type %d"
+msgid "preloaded library \"%s\" with initialization function \"%s\""
 msgstr ""
 
-#: utils/adt/ruleutils.c:2892
+#: utils/init/miscinit.c:885
 #, c-format
-msgid "get_from_clause_item: unexpected node type %d"
+msgid "preloaded library \"%s\""
 msgstr ""
 
-#: utils/adt/ruleutils.c:2959 utils/cache/lsyscache.c:251
+#: utils/init/postinit.c:116
 #, c-format
-msgid "cache lookup failed for opclass %u"
-msgstr ""
-
-#: utils/adt/ruleutils.c:2999
-msgid "tleIsArrayAssign: I'm confused ..."
-msgstr ""
+msgid "database \"%s\", OID %u, has disappeared from pg_database"
+msgstr "база \"%s\", OID %u, исчезла из pg_database"
 
-#: utils/adt/ruleutils.c:3216
+#: utils/init/postinit.c:127
 #, c-format
-msgid "cache lookup of operator %u failed"
-msgstr "поиск в кзше оператора %u не удался"
+msgid "database \"%s\" is not currently accepting connections"
+msgstr "база \"%s\" не принимает подсоединения в данный момент"
 
-#: utils/adt/ruleutils.c:3237
+#: utils/init/postinit.c:275
 #, c-format
-msgid "unexpected oprkind %c for operator %u"
-msgstr ""
+msgid "The database subdirectory \"%s\" is missing."
+msgstr "Поддиректория баз данных \"%s\" отсутствует."
 
-#: utils/adt/selfuncs.c:880
+#: utils/init/postinit.c:280
 #, c-format
-msgid "patternsel: no = operator for type %u"
+msgid "could not access directory \"%s\": %m"
 msgstr ""
 
-#: utils/adt/selfuncs.c:1057 utils/adt/selfuncs.c:1134
-#: utils/adt/selfuncs.c:1175 utils/adt/selfuncs.c:1205
+#: utils/init/postinit.c:289
 #, c-format
-msgid "booltestsel: unexpected booltesttype %d"
-msgstr ""
+msgid "could not change directory to \"%s\": %m"
+msgstr "не получилось поменять директорию на \"%s\": %m"
 
-#: utils/adt/selfuncs.c:1240 utils/adt/selfuncs.c:1294
-#, c-format
-msgid "nulltestsel: unexpected nulltesttype %d"
+#: utils/init/postinit.c:371
+msgid "no users are defined in this database system"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2355
+#: utils/init/postinit.c:372
 #, c-format
-msgid "convert_numeric_to_scalar: unsupported type %u"
+msgid "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
 msgstr ""
 
-#: utils/adt/selfuncs.c:2542
-#, c-format
-msgid "convert_string_datum: unsupported type %u"
+#: utils/init/postinit.c:408
+msgid "connection limit exceeded for non-superusers"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2731
+#: utils/mb/conv.c:376
 #, c-format
-msgid "convert_timevalue_to_scalar: unsupported type %u"
+msgid "ignoring unconvertible UTF-8 character 0x%04x"
 msgstr ""
 
-#: utils/adt/selfuncs.c:2958 utils/adt/selfuncs.c:3326
-msgid "Cannot perform case insensitive matching on type BYTEA"
-msgstr ""
-
-#: utils/adt/selfuncs.c:3043 utils/adt/selfuncs.c:3472
-msgid "Regex matching not supported on type BYTEA"
-msgstr ""
-
-#: utils/adt/selfuncs.c:3184
-msgid "pattern_fixed_prefix: bogus ptype"
-msgstr ""
-
-#: utils/adt/selfuncs.c:3213
+#: utils/mb/conv.c:406
 #, c-format
-msgid "prefix_selectivity: no >= operator for type %u"
-msgstr ""
+msgid "invalid encoding number: %d"
+msgstr "неверный номер кодировки: %d"
 
-#: utils/adt/selfuncs.c:3244
+#: utils/mb/conv.c:445
 #, c-format
-msgid "prefix_selectivity: no < operator for type %u"
+msgid "ignoring unconvertible %s character 0x%04x"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3516
-msgid "pattern_selectivity: bogus ptype"
+#: utils/mb/encnames.c:445
+msgid "encoding name too long"
 msgstr ""
 
-#: utils/adt/selfuncs.c:3682
-#, c-format
-msgid "string_lessthan: unexpected datatype %u"
+#: utils/mb/wchar.c:640
+msgid "UNICODE characters >= 0x10000 are not supported"
 msgstr ""
 
-#: utils/adt/sets.c:86
+#: utils/mb/wchar.c:669
 #, c-format
-msgid "SetDefine: unable to define set %s"
-msgstr ""
-
-#: utils/adt/tid.c:62
-#, c-format
-msgid "invalid tid format: '%s'"
-msgstr ""
-
-#: utils/adt/tid.c:67 utils/adt/tid.c:72
-msgid "tidin: invalid value."
+msgid "invalid %s character sequence: 0x%s"
 msgstr ""
 
-#: utils/adt/tid.c:171
-msgid "ctid isn't of type TID"
-msgstr ""
-
-#: utils/adt/tid.c:176
-msgid "currtid can't handle views with no CTID"
-msgstr ""
-
-#: utils/adt/tid.c:178
-msgid "the view has no rules"
-msgstr ""
-
-#: utils/adt/tid.c:188
-msgid "only one select rule is allowed in views"
-msgstr ""
-
-#: utils/adt/tid.c:209
-msgid "currtid can't handle this view"
-msgstr ""
-
-#: utils/adt/timestamp.c:80
+#: utils/mb/mbutils.c:252
 #, c-format
-msgid "Bad timestamp external representation (too long) '%s'"
+msgid "default conversion proc for %s to %s does not exist"
 msgstr ""
 
-#: utils/adt/timestamp.c:84 utils/adt/timestamp.c:278
+#: utils/mb/mbutils.c:326
 #, c-format
-msgid "Bad timestamp external representation '%s'"
-msgstr ""
+msgid "invalid source encoding name \"%s\""
+msgstr "неверное имя исходной кодировки: \"%s\""
 
-#: utils/adt/timestamp.c:90
+#: utils/mb/mbutils.c:331
 #, c-format
-msgid "TIMESTAMP out of range '%s'"
-msgstr ""
+msgid "invalid destination encoding name \"%s\""
+msgstr "неверное имя кодировки назначения: \"%s\""
 
-#: utils/adt/timestamp.c:106
+#: utils/misc/help_config.c:62
 #, c-format
-msgid "TIMESTAMP '%s' no longer supported"
+msgid ""
+"Name       : %-20s \n"
+"Context    : %-20s \n"
+"Group      : %-20s\n"
 msgstr ""
+"Имя        : %-20s \n"
+"Контекст   : %-20s \n"
+"Группа      : %-20s\n"
 
-#: utils/adt/timestamp.c:111
+#: utils/misc/help_config.c:63
 #, c-format
-msgid "TIMESTAMP '%s' not parsed; internal coding error"
-msgstr ""
+msgid "%s\t%s\t%s\t"
+msgstr "%s\t%s\t%s\t"
 
-#: utils/adt/timestamp.c:139
-msgid "Unable to format timestamp; internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:213
+#: utils/misc/help_config.c:66
 #, c-format
-msgid "TIMESTAMP(%d) precision must be between %d and %d"
+msgid ""
+"Description: %s\n"
+"%s\n"
 msgstr ""
+"Описание: %s\n"
+"%s\n"
 
-#: utils/adt/timestamp.c:273
+#: utils/misc/help_config.c:67
 #, c-format
-msgid "Bad timestamp with time zone external representation (too long) '%s'"
-msgstr ""
+msgid "%s\t%s\n"
+msgstr "%s\t%s\n"
 
-#: utils/adt/timestamp.c:284
+#: utils/misc/help_config.c:70
 #, c-format
-msgid "TIMESTAMP WITH TIME ZONE out of range '%s'"
+msgid ""
+"Type       : BOOL\n"
+"Reset Value: %-s \n"
 msgstr ""
 
-#: utils/adt/timestamp.c:300
+#: utils/misc/help_config.c:71
 #, c-format
-msgid "TIMESTAMP WITH TIME ZONE '%s' no longer supported"
-msgstr ""
+msgid "BOOL\t%s\t\t\t"
+msgstr "BOOL\t%s\t\t\t"
 
-#: utils/adt/timestamp.c:305
+#: utils/misc/help_config.c:74
 #, c-format
-msgid "TIMESTAMP WITH TIME ZONE '%s' not parsed; internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:334
-msgid "Unable to format timestamp with time zone; internal coding error"
+msgid ""
+"Type       : INT\n"
+"Reset Value: %-20d \n"
+"Min Value  : %-20d \n"
+"Max Value  : %-20d \n"
 msgstr ""
 
-#: utils/adt/timestamp.c:393
+#: utils/misc/help_config.c:75
 #, c-format
-msgid "Bad interval external representation (too long) '%s'"
-msgstr ""
+msgid "INT\t%d\t%d\t%d\t"
+msgstr "INT\t%d\t%d\t%d\t"
 
-#: utils/adt/timestamp.c:397 utils/adt/timestamp.c:405
+#: utils/misc/help_config.c:78
 #, c-format
-msgid "Bad interval external representation '%s'"
+msgid ""
+"Type       : REAL\n"
+"Reset Value: %-20g \n"
+"Min Value  : %-20g \n"
+"Max Value  : %-20g \n"
 msgstr ""
 
-#: utils/adt/timestamp.c:410
+#: utils/misc/help_config.c:79
 #, c-format
-msgid "Interval '%s' no longer supported"
-msgstr ""
+msgid "REAL\t%g\t%g\t%g\t"
+msgstr "REAL\t%g\t%g\t%g\t"
 
-#: utils/adt/timestamp.c:414
+#: utils/misc/help_config.c:82
 #, c-format
-msgid "Interval '%s' not parsed; internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:434
-msgid "Unable to encode interval; internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:437
-msgid "Unable to format interval; internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:695
-msgid "AdjustIntervalForTypmod(): internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:1517
-msgid "Unable to subtract non-finite timestamps"
-msgstr ""
-
-#: utils/adt/timestamp.c:1579
-msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamp_pl_span() internal error encoding timestamp"
-msgstr ""
-
-#: utils/adt/timestamp.c:1586
-msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamp_pl_span() internal error decoding timestamp"
-msgstr ""
-
-#: utils/adt/timestamp.c:1664
 msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamptz_pl_span() internal error encoding timestamp"
-msgstr ""
-
-#: utils/adt/timestamp.c:1669
-msgid ""
-"Unable to add TIMESTAMP and INTERVAL\n"
-"\ttimestamptz_pl_span() internal error decoding timestamp"
-msgstr ""
-
-#: utils/adt/timestamp.c:1898
-msgid "interval_div: divide by 0.0 error"
+"Type       : STRING\n"
+"Reset Value: %-s \n"
 msgstr ""
 
-#: utils/adt/timestamp.c:1943
-msgid "interval_accum: expected 2-element interval array"
-msgstr ""
+#: utils/misc/help_config.c:83
+#, c-format
+msgid "STRING\t%s\t\t\t"
+msgstr "STRING\t%s\t\t\t"
 
-#: utils/adt/timestamp.c:1985
-msgid "interval_avg: expected 2-element interval array"
+#: utils/misc/help_config.c:87
+msgid "NAME\tCONTEXT\tGROUP\tTYPE\tRESET_VALUE\tMIN\tMAX\tSHORT_DESCRIPTION\tLONG_DESCRIPTION\n"
 msgstr ""
 
-#: utils/adt/timestamp.c:2107
-msgid ""
-"Unable to encode INTERVAL\n"
-"\ttimestamp_age() internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:2111
+#: utils/misc/help_config.c:176
+#, c-format
 msgid ""
-"Unable to decode TIMESTAMP\n"
-"\ttimestamp_age() internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:2216 utils/adt/timestamp.c:2219
-msgid "Unable to decode TIMESTAMP"
-msgstr ""
-
-#: utils/adt/timestamp.c:2272
-msgid "TIMESTAMP bad external representation (too long)"
-msgstr ""
-
-#: utils/adt/timestamp.c:2328
-msgid "TIMESTAMP WITH TIME ZONE bad external representation (too long)"
-msgstr ""
-
-#: utils/adt/timestamp.c:2385
-msgid "INTERVAL bad external representation (too long)"
+"%s \n"
+" Try -h for further details\n"
 msgstr ""
 
-#: utils/adt/timestamp.c:2418 utils/adt/timestamp.c:2482
-#: utils/adt/timestamp.c:2782 utils/adt/timestamp.c:2924
-#, c-format
-msgid "TIMESTAMP units '%s' not recognized"
-msgstr ""
+#: utils/misc/help_config.c:360
+msgid "FALSE"
+msgstr "FALSE"
 
-#: utils/adt/timestamp.c:2473 utils/adt/timestamp.c:2885
-#: utils/adt/timestamp.c:2917
-#, c-format
-msgid "TIMESTAMP units '%s' not supported"
-msgstr ""
+#: utils/misc/help_config.c:360
+msgid "TRUE"
+msgstr "TRUE"
 
-#: utils/adt/timestamp.c:2478
-#, c-format
-msgid "Unable to truncate TIMESTAMP to '%s'"
+#: utils/misc/help_config.c:383
+msgid "Unrecognized variable type!\n"
 msgstr ""
 
-#: utils/adt/timestamp.c:2511 utils/adt/timestamp.c:2576
-#: utils/adt/timestamp.c:2954 utils/adt/timestamp.c:3107
-#, c-format
-msgid "TIMESTAMP WITH TIME ZONE units '%s' not recognized"
+#: utils/misc/help_config.c:412
+msgid "All currently defined groups\n"
 msgstr ""
 
-#: utils/adt/timestamp.c:2565 utils/adt/timestamp.c:3068
-#: utils/adt/timestamp.c:3101
-#, c-format
-msgid "TIMESTAMP WITH TIME ZONE units '%s' not supported"
-msgstr ""
+#: utils/misc/help_config.c:413
+msgid "----------------------------\n"
+msgstr "----------------------------\n"
 
-#: utils/adt/timestamp.c:2572
+#: utils/misc/help_config.c:415
 #, c-format
-msgid "Unable to truncate TIMESTAMP WITH TIME ZONE to '%s'"
-msgstr ""
+msgid "%s\n"
+msgstr "%s\n"
 
-#: utils/adt/timestamp.c:2605 utils/adt/timestamp.c:2673
-#: utils/adt/timestamp.c:3135 utils/adt/timestamp.c:3244
-#, c-format
-msgid "INTERVAL units '%s' not recognized"
+#: utils/misc/help_config.c:421
+msgid "Usage for --help-config option: [-h] [-g <group>] [-l] [-G] [-m] [-M] [string]\n"
 msgstr ""
 
-#: utils/adt/timestamp.c:2658 utils/adt/timestamp.c:3215
+#: utils/misc/help_config.c:427
 #, c-format
-msgid "INTERVAL units '%s' not supported"
+msgid ""
+"Description:\n"
+"--help-config displays all the runtime options available in PostgreSQL.\n"
+"It groups them by category and sorts them by name. If available, it will\n"
+"present a short description, default, max and min values as well as other\n"
+"information about each option.\n"
+"\n"
+"With no options specified, it will output all available runtime options\n"
+"in human friendly format, grouped by category and sorted by name.\n"
+"\n"
+"%s\n"
+"General Options:\n"
+"  [string]\tAll options with names that match this string\n"
+"  -g GROUP\tAll options in categories that match GROUP\n"
+"  -l      \tPrints list of all groups / subgroups\n"
+"  -h      \tPrints this help message\n"
+"\n"
+"Output Options:\n"
+"  -G      \tDo not group by category\n"
+"  -m      \tMachine friendly format: tab separated fields\n"
+"  -M      \tSame as m, except header with column names is suppressed\n"
 msgstr ""
 
-#: utils/adt/timestamp.c:2662
+#: utils/misc/database.c:149
 #, c-format
-msgid "Unable to truncate INTERVAL to '%s'"
-msgstr ""
-
-#: utils/adt/timestamp.c:2667
-msgid "Unable to decode INTERVAL; internal coding error"
-msgstr ""
-
-#: utils/adt/timestamp.c:2695
-msgid "isoweek2date(): can't convert without year information"
-msgstr ""
-
-#: utils/adt/timestamp.c:2903 utils/adt/timestamp.c:2910
-msgid "Unable to encode TIMESTAMP"
-msgstr ""
-
-#: utils/adt/timestamp.c:3087 utils/adt/timestamp.c:3094
-msgid "Unable to encode TIMESTAMP WITH TIME ZONE"
-msgstr ""
+msgid "could not open file \"%s\": %m"
+msgstr "не получилось отктрыть файл \"%s\": %m"
 
-#: utils/adt/timestamp.c:3224
-msgid ""
-"Unable to decode INTERVAL\n"
-"\tinterval_part() internal coding error"
+#: utils/misc/guc.c:239
+msgid "Ungrouped"
 msgstr ""
 
-#: utils/adt/timestamp.c:3352
-msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE (tm)"
+#: utils/misc/guc.c:241
+msgid "Connections & Authentication"
 msgstr ""
 
-#: utils/adt/timestamp.c:3357
-msgid "Unable to convert TIMESTAMP to TIMESTAMP WITH TIME ZONE"
+#: utils/misc/guc.c:243
+msgid "Connections & Authentication / Connection Settings"
 msgstr ""
 
-#: utils/adt/timestamp.c:3382
-msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP (tm)"
+#: utils/misc/guc.c:245
+msgid "Connections & Authentication / Security & Authentication"
 msgstr ""
 
-#: utils/adt/timestamp.c:3385
-msgid "Unable to convert TIMESTAMP WITH TIME ZONE to TIMESTAMP"
-msgstr ""
-
-#: utils/adt/varbit.c:106 utils/adt/varbit.c:230
-#, c-format
-msgid "Bit string length %d does not match type BIT(%d)"
+#: utils/misc/guc.c:247
+msgid "Resource Usage"
 msgstr ""
 
-#: utils/adt/varbit.c:126 utils/adt/varbit.c:333
-#, c-format
-msgid "Cannot parse '%c' as a binary digit"
+#: utils/misc/guc.c:249
+msgid "Resource Usage / Memory"
 msgstr ""
 
-#: utils/adt/varbit.c:147 utils/adt/varbit.c:354
-#, c-format
-msgid "Cannot parse '%c' as a hex digit"
+#: utils/misc/guc.c:251
+msgid "Resource Usage / Free Space Map"
 msgstr ""
 
-#: utils/adt/varbit.c:313 utils/adt/varbit.c:433
-#, c-format
-msgid "Bit string too long for type BIT VARYING(%d)"
+#: utils/misc/guc.c:253
+msgid "Resource Usage / Kernel Resources"
 msgstr ""
 
-#: utils/adt/varbit.c:803
-msgid "Cannot AND bit strings of different sizes"
+#: utils/misc/guc.c:255
+msgid "Write Ahead Log"
 msgstr ""
 
-#: utils/adt/varbit.c:841
-msgid "Cannot OR bit strings of different sizes"
+#: utils/misc/guc.c:257
+msgid "Write Ahead Log / Settings"
 msgstr ""
 
-#: utils/adt/varbit.c:885
-msgid "Cannot XOR bit strings of different sizes"
+#: utils/misc/guc.c:259
+msgid "Write Ahead Log / Checkpoints"
 msgstr ""
 
-#: utils/adt/varbit.c:1100
-msgid "Bit string is too large to fit in type integer"
+#: utils/misc/guc.c:261
+msgid "Query Tuning"
 msgstr ""
 
-#: utils/adt/varbit.c:1144 utils/adt/varbit.c:1171
-msgid "INT64 is not supported on this platform"
+#: utils/misc/guc.c:263
+msgid "Query Tuning / Planner Method Enabling"
 msgstr ""
 
-#: utils/adt/varbit.c:1159
-msgid "Bit string is too large to fit in type int64"
+#: utils/misc/guc.c:265
+msgid "Query Tuning / Planner Cost Constants"
 msgstr ""
 
-#: utils/adt/varbit.c:1251
-#, c-format
-msgid "S. %d %d em=%2x sm=%2x r=%d"
-msgstr "S. %d %d em=%2x sm=%2x r=%d"
-
-#: utils/adt/varchar.c:107 utils/adt/varchar.c:213
-#, c-format
-msgid "value too long for type character(%d)"
+#: utils/misc/guc.c:267
+msgid "Query Tuning / Genetic Query Optimizer"
 msgstr ""
 
-#: utils/adt/varchar.c:369 utils/adt/varchar.c:447
-#, c-format
-msgid "value too long for type character varying(%d)"
+#: utils/misc/guc.c:269
+msgid "Query Tuning / Other Planner Options"
 msgstr ""
 
-#: utils/adt/varlena.c:108 utils/adt/varlena.c:146
-msgid "Bad input string for type bytea"
+#: utils/misc/guc.c:271
+msgid "Reporting & Logging"
 msgstr ""
 
-#: utils/adt/varlena.c:338 utils/adt/varlena.c:621 utils/adt/varlena.c:724
-msgid "Invalid backend encoding; encoding max length is less than one."
+#: utils/misc/guc.c:273
+msgid "Reporting & Logging / Syslog"
 msgstr ""
 
-#: utils/adt/varlena.c:485 utils/adt/varlena.c:547 utils/adt/varlena.c:1055
-msgid "negative substring length not allowed"
+#: utils/misc/guc.c:275
+msgid "Reporting & Logging / When To Log"
 msgstr ""
 
-#: utils/adt/varlena.c:1148
-#, c-format
-msgid "byteaGetByte: index %d out of range [0..%d]"
+#: utils/misc/guc.c:277
+msgid "Reporting & Logging / What To Log"
 msgstr ""
 
-#: utils/adt/varlena.c:1177
-#, c-format
-msgid "byteaGetBit: index %d out of range [0..%d]"
+#: utils/misc/guc.c:279
+msgid "Statistics"
 msgstr ""
 
-#: utils/adt/varlena.c:1211
-#, c-format
-msgid "byteaSetByte: index %d out of range [0..%d]"
+#: utils/misc/guc.c:281
+msgid "Statistics / Monitoring"
 msgstr ""
 
-#: utils/adt/varlena.c:1252
-#, c-format
-msgid "byteaSetBit: index %d out of range [0..%d]"
+#: utils/misc/guc.c:283
+msgid "Statistics / Query & Index Statistics Collector"
 msgstr ""
 
-#: utils/adt/varlena.c:1262
-msgid "byteaSetBit: new bit must be 0 or 1"
+#: utils/misc/guc.c:285
+msgid "Client Connection Defaults"
 msgstr ""
 
-#: utils/adt/varlena.c:1753
-msgid "field position must be > 0"
+#: utils/misc/guc.c:287
+msgid "Client Connection Defaults / Statement Behavior"
 msgstr ""
 
-#: utils/cache/catcache.c:151
-#, c-format
-msgid "GetCCHashFunc: type %u unsupported as catcache key"
+#: utils/misc/guc.c:289
+msgid "Client Connection Defaults / Locale and Formatting"
 msgstr ""
 
-#: utils/cache/catcache.c:195
-#, c-format
-msgid "CCComputeHashValue: %d nkeys"
+#: utils/misc/guc.c:291
+msgid "Client Connection Defaults / Other Defaults"
 msgstr ""
 
-#: utils/cache/catcache.c:260
-#, c-format
-msgid "CCComputeTupleHashValue: %d cc_nkeys"
+#: utils/misc/guc.c:293
+msgid "Lock Management"
 msgstr ""
 
-#: utils/cache/catcache.c:284
-#, c-format
-msgid "Catcache stats dump: %d/%d tuples in catcaches"
+#: utils/misc/guc.c:295
+msgid "Version & Platform Compatibility"
 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"
+#: utils/misc/guc.c:297
+msgid "Version & Platform Compatibility / Previous Postgres Versions"
 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"
+#: utils/misc/guc.c:299
+msgid "Version & Platform Compatibility / Other Platforms & Clients"
 msgstr ""
 
-#: utils/cache/catcache.c:550
-#, c-format
-msgid "Cache reference leak: cache %s (%d), list %p has count %d"
-msgstr ""
+#: utils/misc/guc.c:301
+msgid "Developer Options"
+msgstr "Опции разработчика"
 
-#: utils/cache/catcache.c:573
-#, c-format
-msgid "Cache reference leak: cache %s (%d), tuple %u has count %d"
+#: utils/misc/guc.c:352
+msgid "Enable planner's use of sequential-scan plans"
 msgstr ""
 
-#: utils/cache/catcache.c:761
-#, c-format
-msgid "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n"
+#: utils/misc/guc.c:360
+msgid "Enable planner's use of index-scan plans"
 msgstr ""
 
-#: utils/cache/catcache.c:860
-#, c-format
-msgid "CatalogCacheInitializeCache: cache @%p %s"
+#: utils/misc/guc.c:368
+msgid "Enable planner's use of TID scan plans"
 msgstr ""
 
-#: utils/cache/catcache.c:866
-#, c-format
-msgid "CatalogCacheInitializeCache: load %d/%d w/%d, %u"
+#: utils/misc/guc.c:376
+msgid "Enable planner's use of explicit sort steps"
 msgstr ""
 
-#: utils/cache/catcache.c:870
-#, c-format
-msgid "CatalogCacheInitializeCache: load %d/%d w/%d"
+#: utils/misc/guc.c:384
+msgid "Enable planner's use of hashed aggregation plans"
 msgstr ""
 
-#: utils/cache/catcache.c:940
-msgid "CatalogCacheInit: only sys attr supported is OID"
+#: utils/misc/guc.c:392
+msgid "Enable planner's use of nested-loop join plans"
 msgstr ""
 
-#: utils/cache/inval.c:453
-#, c-format
-msgid "ExecuteInvalidationMessage: bogus message id %d"
+#: utils/misc/guc.c:400
+msgid "Enable planner's use of merge join plans"
 msgstr ""
 
-#: utils/cache/inval.c:708 utils/cache/inval.c:731
-msgid "Out of cache_callback_list slots"
+#: utils/misc/guc.c:408
+msgid "Enable planner's use of hash join plans"
 msgstr ""
 
-#: utils/cache/lsyscache.c:73
-#, c-format
-msgid "op_requires_recheck: op %u is not a member of opclass %u"
+#: utils/misc/guc.c:416
+msgid "Enable genetic query optimization"
 msgstr ""
 
-#: utils/cache/lsyscache.c:218
-#, c-format
-msgid "cache lookup failed for relation %u attribute %d"
+#: utils/misc/guc.c:417
+msgid "This algorithm attempts to do planning without exhaustive searching"
 msgstr ""
 
-#: utils/cache/lsyscache.c:370
-#, c-format
-msgid "op_mergejoin_crossops: operator %u not found"
-msgstr "op_mergejoin_crossops: оператор %u не найден"
-
-#: utils/cache/lsyscache.c:378
-#, c-format
-msgid "op_mergejoin_crossops: mergejoin operator %u has no matching < operator"
+#: utils/misc/guc.c:426
+msgid "Set to indicate current user's privilege status"
 msgstr ""
 
-#: utils/cache/lsyscache.c:385
-#, c-format
-msgid "op_mergejoin_crossops: mergejoin operator %u has no matching > operator"
+#: utils/misc/guc.c:435
+msgid "Accept TCP/IP connections"
 msgstr ""
 
-#: utils/cache/lsyscache.c:430 utils/cache/lsyscache.c:446
-#, c-format
-msgid "Operator OID %u does not exist"
-msgstr ""
+#: utils/misc/guc.c:443
+msgid "Enables SSL connections"
+msgstr "Включает SSL-подсоединения"
 
-#: utils/cache/lsyscache.c:699
-#, c-format
-msgid "get_system_catalog_relid: cannot find %s"
+#: utils/misc/guc.c:451
+msgid "If on, server physically writes updates to disk"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1044
-#, c-format
-msgid "get_typdefault: failed to lookup type %u"
+#: utils/misc/guc.c:452
+msgid "It will use the fsync() system call in several places to make sure that updates are physically written to disk. This insures that a database cluster will recover to a consistent state after an operating system or hardware crash"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1123
-#, c-format
-msgid "getBaseType: failed to lookup type %u"
-msgstr "getBaseType: тип %u не найден"
-
-#: utils/cache/lsyscache.c:1261
-#, c-format
-msgid "getTypeInputInfo: Cache lookup of type %u failed"
-msgstr "getTypeInputInfo: Поиск в кзше типа %u не удался"
-
-#: utils/cache/lsyscache.c:1291
-#, c-format
-msgid "getTypeOutputInfo: Cache lookup of type %u failed"
-msgstr "getTypeOutputInfo: Поиск в кзше типа %u не удался"
-
-#: utils/cache/lsyscache.c:1387
-msgid "get_attstatsslot: stavalues is null"
+#: utils/misc/guc.c:462
+msgid "Continues processing past damaged page headers"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1409
-#, c-format
-msgid "get_attstatsslot: Cache lookup failed for type %u"
+#: utils/misc/guc.c:463
+msgid "Detection of a damaged page header normally causes PostgreSQL to report an error, aborting the current transaction. Setting zero_damaged_pages to true causes the system to instead report a warning, zero out the damaged page, and continue processing. This behavior will destroy data, namely all the rows on the damaged page"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1445
-msgid "get_attstatsslot: stanumbers is null"
+#: utils/misc/guc.c:475
+msgid "Runs the server silently"
 msgstr ""
 
-#: utils/cache/lsyscache.c:1456
-msgid "get_attstatsslot: stanumbers is not a 1-D float4 array"
+#: utils/misc/guc.c:476
+msgid "If this option is set, the server will automatically run in thebackground and any controlling terminals are disassociated"
 msgstr ""
 
-#: utils/cache/relcache.c:168 utils/cache/relcache.c:176
-#: utils/cache/relcache.c:188
-msgid "out of memory for relation descriptor cache"
+#: utils/misc/guc.c:484
+msgid "Logs each successful connection"
 msgstr ""
 
-#: utils/cache/relcache.c:234
-msgid "trying to delete a rd_id reldesc that does not exist."
+#: utils/misc/guc.c:492
+msgid "Prefixes server log messages with a time stamp"
 msgstr ""
 
-#: utils/cache/relcache.c:239
-msgid "trying to delete a rd_node reldesc that does not exist."
+#: utils/misc/guc.c:500
+msgid "Prefixes server log messages with the server PID"
 msgstr ""
 
-#: utils/cache/relcache.c:248
-msgid "trying to delete a relname reldesc that does not exist."
+#: utils/misc/guc.c:510
+msgid "Turns on various assertion checks"
 msgstr ""
 
-#: utils/cache/relcache.c:354
-msgid "ScanPgRelation: bad buildinfo"
+#: utils/misc/guc.c:511
+msgid "This is a debugging aid. To use this option, PostgreSQL must be built with the configure option --enable-cassert"
 msgstr ""
 
-#: utils/cache/relcache.c:508
-#, c-format
-msgid "Bogus attribute number %d for %s"
+#: utils/misc/guc.c:523
+#: utils/misc/guc.c:613
+#: utils/misc/guc.c:686
+#: utils/misc/guc.c:695
+#: utils/misc/guc.c:704
+#: utils/misc/guc.c:713
+#: utils/misc/guc.c:1022
+#: utils/misc/guc.c:1031
+#: utils/misc/guc.c:1099
+msgid "No Description Available"
 msgstr ""
 
-#: utils/cache/relcache.c:550
-#, c-format
-msgid "catalog is missing %d attribute(s) for relid %u"
+#: utils/misc/guc.c:532
+msgid "Causes each SQL statement to be logged"
 msgstr ""
 
-#: utils/cache/relcache.c:962
-#, c-format
-msgid "RelationInitIndexAccessInfo: no pg_index entry for index %u"
+#: utils/misc/guc.c:540
+msgid "Duration of every completed statement is logged"
 msgstr ""
 
-#: utils/cache/relcache.c:977
-#, c-format
-msgid "RelationInitIndexAccessInfo: cache lookup failed for AM %u"
-msgstr "RelationInitIndexAccessInfo: поиск в кэше AM %u не удался"
-
-#: utils/cache/relcache.c:1092
-msgid "IndexSupportInitialize: bogus pg_index tuple"
+#: utils/misc/guc.c:548
+msgid "Parse tree printed to server logs"
 msgstr ""
 
-#: utils/cache/relcache.c:1199
-msgid "out of memory for operator class cache"
+#: utils/misc/guc.c:549
+msgid "Parsed for each executed query"
 msgstr ""
 
-#: utils/cache/relcache.c:1273
-#, c-format
-msgid "Bogus amopstrategy number %d for opclass %u"
+#: utils/misc/guc.c:556
+msgid "Prints query rewriter output to server log"
 msgstr ""
 
-#: utils/cache/relcache.c:1308
-#, c-format
-msgid "Bogus amproc number %d for opclass %u"
+#: utils/misc/guc.c:564
+msgid "Prints execution plan to the server log"
 msgstr ""
 
-#: utils/cache/relcache.c:1653
-#, c-format
-msgid "RelationReloadClassinfo system relation id=%d doesn't exist"
+#: utils/misc/guc.c:572
+msgid "Indents displays from parse, rewritten and plan"
 msgstr ""
 
-#: utils/cache/relcache.c:1780
-#, c-format
-msgid "RelationClearRelation: relation %u deleted while still in use"
+#: utils/misc/guc.c:580
+msgid "Write parser performance stats to server log"
 msgstr ""
 
-#: utils/cache/relcache.c:1863
-#, c-format
-msgid "RelationForgetRelation: relation %u is still open"
+#: utils/misc/guc.c:588
+msgid "Write planner performance stats to server log"
 msgstr ""
 
-#: utils/cache/relcache.c:2020
-#, c-format
-msgid "Relcache reference leak: relation \"%s\" has refcnt %d instead of %d"
+#: utils/misc/guc.c:596
+msgid "Write executor performance stats to server log"
 msgstr ""
 
-#: utils/cache/relcache.c:2317
-#, c-format
-msgid "RelationCacheInitializePhase2: no pg_class entry for %s"
+#: utils/misc/guc.c:604
+msgid "Write statement performance stats to server log"
 msgstr ""
 
-#: utils/cache/relcache.c:2465
-#, c-format
-msgid "AttrDefaultFetch: second record found for attr %s in rel %s"
+#: utils/misc/guc.c:624
+msgid "Use indented output format for EXPLAIN VERBOSE"
 msgstr ""
 
-#: utils/cache/relcache.c:2473
-#, c-format
-msgid "AttrDefaultFetch: adbin IS NULL for attr %s in rel %s"
+#: utils/misc/guc.c:632
+msgid "Start server statistics-collection subprocess"
 msgstr ""
 
-#: utils/cache/relcache.c:2484
-#, c-format
-msgid "AttrDefaultFetch: unexpected record found for attr %d in rel %s"
+#: utils/misc/guc.c:640
+msgid "Collected statistics zeroed out on server restart"
 msgstr ""
 
-#: utils/cache/relcache.c:2493
-#, c-format
-msgid "AttrDefaultFetch: %d record(s) not found for rel %s"
+#: utils/misc/guc.c:648
+msgid "Enable stat collection of executing commands"
 msgstr ""
 
-#: utils/cache/relcache.c:2527
-#, c-format
-msgid "CheckConstraintFetch: unexpected record found for rel %s"
+#: utils/misc/guc.c:649
+msgid "Enables the collection of statistics on the currently executing command of each session, along with the time at which that command began execution."
 msgstr ""
 
-#: utils/cache/relcache.c:2538
-#, c-format
-msgid "CheckConstraintFetch: conbin IS NULL for rel %s"
+#: utils/misc/guc.c:658
+msgid "Enable collection of row-level stats on db activity"
 msgstr ""
 
-#: utils/cache/relcache.c:2551
-#, c-format
-msgid "CheckConstraintFetch: %d record(s) not found for rel %s"
+#: utils/misc/guc.c:666
+msgid "Enables collection of block-level stats on db activity"
 msgstr ""
 
-#: utils/cache/relcache.c:3027
-#, c-format
-msgid ""
-"Cannot create init file %s: %m\n"
-"\tContinuing anyway, but there's something wrong."
+#: utils/misc/guc.c:675
+msgid "Generates debugging output for LISTEN and NOTIFY"
 msgstr ""
 
-#: utils/cache/relcache.c:3051
-msgid "cannot write init file -- descriptor length"
+#: utils/misc/guc.c:724
+msgid "Log hostname to connection logs"
 msgstr ""
 
-#: utils/cache/relcache.c:3055
-msgid "cannot write init file -- reldesc"
+#: utils/misc/guc.c:725
+msgid "By default, connection logs only show the IP address of the connecting host. If you want them to show the host name you can turn this on, but depending on your host name resolution setup it might impose a non-negligible performance penalty"
 msgstr ""
 
-#: utils/cache/relcache.c:3060
-msgid "cannot write init file -- relation tuple form length"
+#: utils/misc/guc.c:735
+msgid "Log outgoing port number of the connecting host"
 msgstr ""
 
-#: utils/cache/relcache.c:3063
-msgid "cannot write init file -- relation tuple form"
+#: utils/misc/guc.c:744
+msgid "This controls the inheritance semantics"
 msgstr ""
 
-#: utils/cache/relcache.c:3070
-#, c-format
-msgid "cannot write init file -- length of attdesc %d"
+#: utils/misc/guc.c:745
+msgid "In particular, whether subtables are included by various commands by default"
 msgstr ""
 
-#: utils/cache/relcache.c:3072
-#, c-format
-msgid "cannot write init file -- attdesc %d"
+#: utils/misc/guc.c:753
+msgid "If true, ACST, CST, EST, and SAT are interpreted as Australian time zones"
 msgstr ""
 
-#: utils/cache/relcache.c:3091
-#, c-format
-msgid "write_relcache_init_file: no pg_index entry for index %u"
+#: utils/misc/guc.c:755
+msgid "Otherwise they are interpreted as North/South American time zones and Saturday"
 msgstr ""
 
-#: utils/cache/relcache.c:3095
-msgid "cannot write init file -- index tuple form length"
+#: utils/misc/guc.c:763
+msgid "If unspecified the password is encrypted"
 msgstr ""
 
-#: utils/cache/relcache.c:3097
-msgid "cannot write init file -- index tuple form"
+#: utils/misc/guc.c:764
+msgid "When a password is specified in CREATE USER or ALTER USER without writing either ENCRYPTED or UNENCRYPTED, this option determines whether the password is to be encrypted"
 msgstr ""
 
-#: utils/cache/relcache.c:3103
-msgid "cannot write init file -- am tuple form length"
+#: utils/misc/guc.c:773
+msgid "expr=NULL treated as expr IS NULL"
 msgstr ""
 
-#: utils/cache/relcache.c:3106
-msgid "cannot write init file -- am tuple form"
+#: utils/misc/guc.c:774
+msgid "When turned on, expressions of the form expr = NULL (or NULL = expr) are treated as expr IS NULL, that is, they return true if expr evaluates to the null value, and false otherwise. The correct behavior of expr = NULL is to always return null (unknown)"
 msgstr ""
 
-#: utils/cache/relcache.c:3112
-msgid "cannot write init file -- strategy map length"
+#: utils/misc/guc.c:785
+msgid "This allows per-database user names"
 msgstr ""
 
-#: utils/cache/relcache.c:3115
-msgid "cannot write init file -- strategy map"
+#: utils/misc/guc.c:794
+msgid "This var doesn't do anything"
 msgstr ""
 
-#: utils/cache/relcache.c:3120
-msgid "cannot write init file -- operator vector length"
+#: utils/misc/guc.c:795
+msgid "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-vintage clients."
 msgstr ""
 
-#: utils/cache/relcache.c:3123
-msgid "cannot write init file -- operator vector"
+#: utils/misc/guc.c:804
+msgid "Controls default read-only status of new transactions"
 msgstr ""
 
-#: utils/cache/relcache.c:3128
-msgid "cannot write init file -- support vector length"
+#: utils/misc/guc.c:812
+msgid "Current transaction's read-only status"
 msgstr ""
 
-#: utils/cache/relcache.c:3131
-msgid "cannot write init file -- support vector"
+#: utils/misc/guc.c:821
+msgid "Add missing table references to FROM clauses"
 msgstr ""
 
-#: utils/cache/relcache.c:3175
-#, c-format
-msgid ""
-"Cannot rename init file %s to %s: %m\n"
-"\tContinuing anyway, but there's something wrong."
+#: utils/misc/guc.c:839
+msgid "Sets the default statistics target"
 msgstr ""
 
-#: utils/cache/syscache.c:478
-#, c-format
-msgid "InitCatalogCache: Can't init cache %s (%d)"
+#: utils/misc/guc.c:840
+msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS"
 msgstr ""
 
-#: utils/cache/syscache.c:534
-#, c-format
-msgid "SearchSysCache: Bad cache id %d"
+#: utils/misc/guc.c:848
+msgid "From list size beyond which sub-queries are not collapsed"
 msgstr ""
 
-#: utils/cache/syscache.c:715
-#, c-format
-msgid "SysCacheGetAttr: Bad cache id %d"
+#: utils/misc/guc.c:850
+msgid "The planner will merge sub-queries into upper queries if the resulting FROM list would have no more than this many items"
 msgstr ""
 
-#: utils/cache/syscache.c:718
-#, c-format
-msgid "SysCacheGetAttr: missing cache data for id %d"
+#: utils/misc/guc.c:859
+msgid "From list size beyond which JOIN constructs not flattened"
 msgstr ""
 
-#: utils/cache/syscache.c:734
-#, c-format
-msgid "SearchSysCacheList: Bad cache id %d"
+#: utils/misc/guc.c:861
+msgid "The planner will flatten explicit inner JOIN constructs into lists of FROM items whenever a list of no more than this many items would result"
 msgstr ""
 
-#: utils/error/elog.c:128
-msgid "Pre-7.3 object file made an elog() call.  Recompile."
+#: utils/misc/guc.c:870
+msgid "Threshold of FROM items beyond which geqo is used"
 msgstr ""
 
-#: utils/error/elog.c:218
-#, c-format
-msgid "copy: line %d, "
+#: utils/misc/guc.c:878
+msgid "The number of individuals in one population"
 msgstr ""
 
-#. translator: This must fit in fmt_fixedbuf.
-#: utils/error/elog.c:241 utils/error/elog.c:337
-msgid "elog: out of memory"
-msgstr "elog: не достаточно памяти"
-
-#: utils/error/elog.c:438
-#, c-format
-msgid "statement: %s"
+#: utils/misc/guc.c:886
+msgid "Effort is used to calculate a default for generations"
 msgstr ""
 
-#: utils/error/elog.c:488
-msgid "elog: error during error recovery, giving up!"
+#: utils/misc/guc.c:894
+msgid "Specifies the number of iterations in the algorithm"
 msgstr ""
 
-#: utils/error/elog.c:533
-#, c-format
-msgid "DebugFileOpen: open of %s: %m"
-msgstr "DebugFileOpen: открытие %s: %m"
-
-#: utils/error/elog.c:542
-#, c-format
-msgid "DebugFileOpen: %s reopen as stderr: %m"
+#: utils/misc/guc.c:895
+msgid "The number must be a positive integer. If 0 is specified then Effort * Log2(PoolSize) is used"
 msgstr ""
 
-#: utils/error/elog.c:554
-#, c-format
-msgid "DebugFileOpen: %s reopen as stdout: %m"
+#: utils/misc/guc.c:903
+msgid "Can be set to get reproducible results from the algorithm"
 msgstr ""
 
-#: utils/error/elog.c:571
-msgid "DebugFileOpen: could not open debugging file"
+#: utils/misc/guc.c:904
+msgid "If it is set to -1 then the algorithm behaves non-deterministically"
 msgstr ""
 
-#: utils/error/elog.c:776
-msgid "Numerical result out of range"
+#: utils/misc/guc.c:913
+msgid "Time to wait on lock (msec) before checking for deadlock"
 msgstr ""
 
-#: utils/error/elog.c:790
-#, c-format
-msgid "operating system error %d"
+#: utils/misc/guc.c:923
+msgid "Allows the use of syslog for logging"
 msgstr ""
 
-#: utils/error/elog.c:812
-msgid "DEBUG:  "
-msgstr "DEBUG:  "
-
-#: utils/error/elog.c:816
-msgid "LOG:  "
-msgstr "LOG:  "
-
-#: utils/error/elog.c:819
-msgid "INFO:  "
-msgstr "INFO:  "
-
-#: utils/error/elog.c:822
-msgid "NOTICE:  "
-msgstr "NOTICE:  "
-
-#: utils/error/elog.c:825
-msgid "WARNING:  "
-msgstr "WARNING:  "
-
-#: utils/error/elog.c:828
-msgid "ERROR:  "
-msgstr "ERROR:  "
-
-#: utils/error/elog.c:831
-msgid "FATAL:  "
-msgstr "FATAL:  "
-
-#: utils/error/elog.c:834
-msgid "PANIC:  "
-msgstr "PANIC:  "
-
-#: utils/fmgr/funcapi.c:36
-msgid "function called in context that does not accept a set result"
+#: utils/misc/guc.c:924
+msgid "If this option is 1, messages go both to syslog and the standard output. A value of 2 sends output only to syslog. (Some messages will still go to the standard output/error.) The default is 0, which means syslog is off"
 msgstr ""
 
-#: utils/fmgr/funcapi.c:68
-msgid "init_MultiFuncCall may not be called more than once"
+#: utils/misc/guc.c:943
+msgid "Max number of concurrent connections"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:97
-#, c-format
-msgid "stat failed on file '%s': %m"
+#: utils/misc/guc.c:952
+msgid "Number of connection \"slots\" reserved for superusers"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:114
-msgid "Out of memory in load_external_function"
+#: utils/misc/guc.c:961
+msgid "The number of shared memory buffers used by the server"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:127
-#, c-format
-msgid "Load of file %s failed: %s"
+#: utils/misc/guc.c:970
+msgid "The TCP port the server listens on"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:154
-#, c-format
-msgid "Can't find function %s in file %s"
+#: utils/misc/guc.c:979
+msgid "Sets the access permissions of the Unix domain socket"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:184
-#, c-format
-msgid "LOAD: could not open file '%s': %m"
+#: utils/misc/guc.c:980
+msgid "Unix domain sockets use the usual Unix file system permission set. The option value is expected to be an numeric mode specification in the form accepted by the chmod and umask system calls. (To use the customary octal format the number must start with a 0 (zero).)"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:239
-#, c-format
-msgid "stat failed on %s: %s"
+#: utils/misc/guc.c:992
+msgid "Max memory to be used for sorts and hash tables"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:334
-msgid "invalid macro name in dynamic library path"
+#: utils/misc/guc.c:993
+msgid "Specifies the amount of memory to be used by internal sort operations and hash tables before switching to temporary disk files"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:384
-msgid "zero length dynamic_library_path component"
+#: utils/misc/guc.c:1003
+msgid "Max mem used to keep track of to-be-reclaimed tuples"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:395
-msgid "dynamic_library_path component is not absolute"
+#: utils/misc/guc.c:1012
+msgid "Max num of simultaneously open files for each subprocess"
 msgstr ""
 
-#: utils/fmgr/dfmgr.c:401
-#, c-format
-msgid "find_in_dynamic_libpath: trying %s"
+#: utils/misc/guc.c:1041
+msgid "Max expression nesting depth"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:187
-#, c-format
-msgid "fmgr_info: function %u: cache lookup failed"
+#: utils/misc/guc.c:1050
+msgid "Max allowed duration (msec) of any statement"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:220
-#, c-format
-msgid "fmgr_info: function %s not in internal table"
+#: utils/misc/guc.c:1051
+msgid "A value of 0 turns off the timeout"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:267
-#, c-format
-msgid "fmgr: Could not extract prosrc for %u from pg_proc"
+#: utils/misc/guc.c:1059
+msgid "Max num. of tables+indexes for which free space is tracked"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:274
-#, c-format
-msgid "fmgr: Could not extract probin for %u from pg_proc"
+#: utils/misc/guc.c:1068
+msgid "Max num. of disk pages for which free space is tracked"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:307
-#, c-format
-msgid "Unknown function API version %d"
+#: utils/misc/guc.c:1078
+msgid "Max locks per transaction"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:333
-#, c-format
-msgid "fmgr_info: cache lookup for language %u failed"
+#: utils/misc/guc.c:1079
+msgid "The shared lock table is sized on the assumption that at most max_locks_per_transaction * max_connections distinct objects will need to be locked at any one time."
 msgstr ""
 
-#: utils/fmgr/fmgr.c:346
-#, c-format
-msgid "fmgr_info: language %u has old-style handler"
+#: utils/misc/guc.c:1089
+msgid "Max time (sec) to complete client authentication"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:394
-#, c-format
-msgid "Null result from %s"
+#: utils/misc/guc.c:1109
+msgid "Max distance between automatic WAL checkpoints"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:402
-#, c-format
-msgid "Unknown version %d reported by %s"
+#: utils/misc/guc.c:1118
+msgid "Max time (sec) between automatic WAL checkpoints"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:470
-msgid "Internal error: fmgr_oldstyle received NULL pointer"
+#: utils/misc/guc.c:1127
+msgid "Log if filling of checkpoint segments happens more frequently than this (sec)"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:619
-#, c-format
-msgid "fmgr_oldstyle: function %u: too many arguments (%d > %d)"
+#: utils/misc/guc.c:1129
+msgid "Send a message to the server logs if checkpoints caused by the filling of checkpoint segment files happens more frequently than this number of seconds. Zero turns off the warning."
 msgstr ""
 
-#: utils/fmgr/fmgr.c:666
-#, c-format
-msgid "fmgr_security_definer: function %u: cache lookup failed"
+#: utils/misc/guc.c:1139
+msgid "Disk-page buffers in shared memory for WAL logging"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:728
-#, c-format
-msgid "DirectFunctionCall1: function %p returned NULL"
+#: utils/misc/guc.c:1148
+msgid "If nonzero, log WAL-related debugging output"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:756
-#, c-format
-msgid "DirectFunctionCall2: function %p returned NULL"
+#: utils/misc/guc.c:1158
+msgid "Delay (usec) between transaction commit and flushing WAL to disk"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:779
-#, c-format
-msgid "DirectFunctionCall3: function %p returned NULL"
+#: utils/misc/guc.c:1168
+msgid "Min concurrent open trans. before performing COMMIT_DELAY"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:803
-#, c-format
-msgid "DirectFunctionCall4: function %p returned NULL"
+#: utils/misc/guc.c:1178
+msgid "Adjusts number of digits displayed for floating-point values"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:828
-#, c-format
-msgid "DirectFunctionCall5: function %p returned NULL"
+#: utils/misc/guc.c:1180
+msgid "This affects float4, float8, and geometric data types. The parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate)"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:855
-#, c-format
-msgid "DirectFunctionCall6: function %p returned NULL"
+#: utils/misc/guc.c:1190
+msgid "Min execution time (msec) above which statements will be logged"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:883
-#, c-format
-msgid "DirectFunctionCall7: function %p returned NULL"
+#: utils/misc/guc.c:1192
+msgid "The default is 0 (turning this feature off)."
 msgstr ""
 
-#: utils/fmgr/fmgr.c:912
-#, c-format
-msgid "DirectFunctionCall8: function %p returned NULL"
+#: utils/misc/guc.c:1209
+msgid "Planner's assumption about size of the disk cache"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:943
-#, c-format
-msgid "DirectFunctionCall9: function %p returned NULL"
+#: utils/misc/guc.c:1210
+msgid "That is, the portion of the kernel's disk cache that will be used for PostgreSQL data files. This is measured in disk pages, which are normally 8 kB each."
 msgstr ""
 
-#: utils/fmgr/fmgr.c:974
-#, c-format
-msgid "FunctionCall1: function %u returned NULL"
+#: utils/misc/guc.c:1219
+msgid "Planner's estimate of the cost of a nonsequentially fetched disk page"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1002 utils/sort/tuplesort.c:1823
-#, c-format
-msgid "FunctionCall2: function %u returned NULL"
+#: utils/misc/guc.c:1221
+msgid "This is measured as a multiple of the cost of a sequential page fetch. A higher value makes it more likely a sequential scan will be used, a lower value makes it more likely an index scan will be used."
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1026
-#, c-format
-msgid "FunctionCall3: function %u returned NULL"
+#: utils/misc/guc.c:1231
+msgid "Planner's estimate of the cost of processing each tuple"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1051
-#, c-format
-msgid "FunctionCall4: function %u returned NULL"
+#: utils/misc/guc.c:1232
+#: utils/misc/guc.c:1242
+#: utils/misc/guc.c:1251
+msgid "This is measured as a fraction of the cost of a sequential page fetch."
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1077
-#, c-format
-msgid "FunctionCall5: function %u returned NULL"
+#: utils/misc/guc.c:1240
+msgid "Planner's estimate of processing cost for each index tuple during index scan"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1105
-#, c-format
-msgid "FunctionCall6: function %u returned NULL"
+#: utils/misc/guc.c:1250
+msgid "Planner's estimate of processing cost of each op. in WHERE"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1134
-#, c-format
-msgid "FunctionCall7: function %u returned NULL"
+#: utils/misc/guc.c:1260
+msgid "The selective pressure within the population"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1164
-#, c-format
-msgid "FunctionCall8: function %u returned NULL"
+#: utils/misc/guc.c:1270
+msgid "Seed for random-number generation"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1196
-#, c-format
-msgid "FunctionCall9: function %u returned NULL"
+#: utils/misc/guc.c:1289
+msgid "Client's character set encoding"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1227
-#, c-format
-msgid "OidFunctionCall1: function %u returned NULL"
+#: utils/misc/guc.c:1299
+msgid "Controls which message levels are sent to the client"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1252
-#, c-format
-msgid "OidFunctionCall2: function %u returned NULL"
+#: utils/misc/guc.c:1300
+msgid "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, LOG, NOTICE, WARNING, and ERROR. Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1279
-#, c-format
-msgid "OidFunctionCall3: function %u returned NULL"
+#: utils/misc/guc.c:1311
+msgid "Controls which message levels logged"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1307
-#, c-format
-msgid "OidFunctionCall4: function %u returned NULL"
+#: utils/misc/guc.c:1312
+msgid "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO, NOTICE, WARNING, ERROR, LOG, FATAL, and PANIC. Each level includes all the levels that follow it"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1336
-#, c-format
-msgid "OidFunctionCall5: function %u returned NULL"
+#: utils/misc/guc.c:1322
+msgid "Controls verbosity of logged messages"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1367
-#, c-format
-msgid "OidFunctionCall6: function %u returned NULL"
+#: utils/misc/guc.c:1323
+msgid "Valid values are TERSE, DEFAULT, and VERBOSE"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1399
-#, c-format
-msgid "OidFunctionCall7: function %u returned NULL"
+#: utils/misc/guc.c:1331
+msgid "Controls whether the erroneous statement is logged"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1432
-#, c-format
-msgid "OidFunctionCall8: function %u returned NULL"
+#: utils/misc/guc.c:1332
+msgid "All SQL statements that cause an error of the specified level, or a higher level, are logged"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1467
-#, c-format
-msgid "OidFunctionCall9: function %u returned NULL"
+#: utils/misc/guc.c:1341
+msgid "Sets display format for date and time values"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1506
-#, c-format
-msgid "fmgr: function %u: too many arguments (%d > %d)"
+#: utils/misc/guc.c:1342
+msgid "Also controls interpretation of ambiguous date inputs"
 msgstr ""
 
-#: utils/fmgr/fmgr.c:1518
-#, c-format
-msgid "fmgr: function %u returned NULL"
+#: utils/misc/guc.c:1352
+msgid "The default isolation level of each new transaction"
 msgstr ""
 
-#: utils/hash/dynahash.c:662
-#, c-format
-msgid "hash_search: bogus action %d"
+#: utils/misc/guc.c:1353
+msgid "Each SQL transaction has an isolation level, which can be either \"read committed\" or \"serializable\"."
 msgstr ""
 
-#: utils/hash/dynahash.c:935 utils/hash/dynahash.c:937
-#, c-format
-msgid "Hash table '%s' corrupted"
+#: utils/misc/guc.c:1362
+msgid "Path for dynamically loadable modules"
 msgstr ""
 
-#: utils/init/findbe.c:63
-#, c-format
-msgid "ValidateBinary: can't stat \"%s\""
+#: utils/misc/guc.c:1363
+msgid "If a dynamically loadable module needs to be opened and the specified name does not have a directory component (i.e. the name does not contain a slash), the system will search this path for the specified file."
 msgstr ""
 
-#: utils/init/findbe.c:69
-#, c-format
-msgid "ValidateBinary: \"%s\" is not a regular file"
+#: utils/misc/guc.c:1374
+msgid "The location of the Kerberos server key file"
 msgstr ""
 
-#: utils/init/findbe.c:91
-#, c-format
-msgid "ValidateBinary: \"%s\" is not user read/execute"
+#: utils/misc/guc.c:1383
+msgid "The Rendezvous broadcast service name"
 msgstr ""
 
-#: utils/init/findbe.c:117
-#, c-format
-msgid "ValidateBinary: \"%s\" is not group read/execute"
+#: utils/misc/guc.c:1394
+msgid "Locale collation order"
 msgstr ""
 
-#: utils/init/findbe.c:125
-#, c-format
-msgid "ValidateBinary: \"%s\" is not other read/execute"
+#: utils/misc/guc.c:1404
+msgid "Locale character classification and case conversion"
 msgstr ""
 
-#: utils/init/findbe.c:174
-#, c-format
-msgid "FindExec: found \"%s\" using argv[0]"
+#: utils/misc/guc.c:1414
+msgid "Language in which messages are displayed"
 msgstr ""
 
-#: utils/init/findbe.c:177
-#, c-format
-msgid "FindExec: invalid binary \"%s\""
+#: utils/misc/guc.c:1423
+msgid "Locale for formatting monetary amounts"
 msgstr ""
 
-#: utils/init/findbe.c:187
-msgid "FindExec: searching PATH ..."
+#: utils/misc/guc.c:1432
+msgid "Locale for formatting numbers"
 msgstr ""
 
-#: utils/init/findbe.c:208
-#, c-format
-msgid "FindExec: found \"%s\" using PATH"
+#: utils/misc/guc.c:1441
+msgid "Locale for formatting date and time values"
 msgstr ""
 
-#: utils/init/findbe.c:215
-#, c-format
-msgid "FindExec: could not read binary \"%s\""
+#: utils/misc/guc.c:1450
+msgid "Shared libraries to preload into postmaster"
 msgstr ""
 
-#: utils/init/findbe.c:225
-#, c-format
-msgid "FindExec: could not find a %s to execute"
+#: utils/misc/guc.c:1460
+msgid "Regular expression \"flavor\""
 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
-#, c-format
-msgid "cannot get current working directory: %m"
+#: utils/misc/guc.c:1461
+msgid "This can be set to advanced, extended, or basic"
 msgstr ""
 
-#: utils/init/miscinit.c:246
-#, c-format
-msgid "SetCharSet: unknown tag %s in file %s"
+#: utils/misc/guc.c:1469
+msgid "Schema search order for names not schema-qualified"
 msgstr ""
 
-#: utils/init/miscinit.c:401 utils/init/miscinit.c:457
-#, c-format
-msgid "GetCharSetByHost: unknown tag %s in file %s"
+#: utils/misc/guc.c:1480
+msgid "Server (database) character set encoding"
 msgstr ""
 
-#: utils/init/miscinit.c:635
-#, c-format
-msgid "invalid user id %d"
-msgstr "неверное ID пользователя: %d"
-
-#: utils/init/miscinit.c:717
-#, c-format
-msgid "Can't create lock file %s: %m"
-msgstr ""
+#: utils/misc/guc.c:1491
+msgid "Server version"
+msgstr "Версия сервера"
 
-#: utils/init/miscinit.c:728 utils/init/miscinit.c:731
-#, c-format
-msgid "Can't read lock file %s: %m"
+#: utils/misc/guc.c:1502
+msgid "Current session userid"
 msgstr ""
 
-#: utils/init/miscinit.c:741
-#, c-format
-msgid "Bogus data in lock file %s"
+#: utils/misc/guc.c:1513
+msgid "syslog \"facility\" to be used when syslog enabled"
 msgstr ""
 
-#: utils/init/miscinit.c:815
-#, c-format
-msgid ""
-"Can't remove old lock file %s: %m\n"
-"\tThe file seems accidentally left, but I couldn't remove it.\n"
-"\tPlease remove the file by hand and try again."
+#: utils/misc/guc.c:1514
+msgid "You may choose from LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7"
 msgstr ""
 
-#: utils/init/miscinit.c:836
-#, c-format
-msgid "Can't write lock file %s: %m"
+#: utils/misc/guc.c:1522
+msgid "Program name used to identify PostgreSQL messages in syslog"
 msgstr ""
 
-#: utils/init/miscinit.c:927
-#, c-format
-msgid "Failed to rewrite %s: %m"
-msgstr "Не удалось перезаписать %s: %m"
-
-#: utils/init/miscinit.c:933
-#, c-format
-msgid "Failed to read %s: %m"
-msgstr "Не удалось прочитать %s: %m"
-
-#: utils/init/miscinit.c:946
-#, c-format
-msgid "Bogus data in %s"
-msgstr "\"Левые\" данные в %s"
-
-#: utils/init/miscinit.c:970
-#, c-format
-msgid "Failed to write %s: %m"
-msgstr "Не удалось записать %s: %m"
-
-#: utils/init/miscinit.c:1012
-#, c-format
-msgid "File %s is missing. This is not a valid data directory."
-msgstr "Файл %s отсутствует. Это неверная директория данных."
-
-#: utils/init/miscinit.c:1019
-#, c-format
-msgid "File %s does not contain valid data. You need to initdb."
-msgstr "Файл %s не содержит верные данные. Вам надо выполнить initdb."
-
-#: utils/init/miscinit.c:1024
-#, c-format
-msgid ""
-"The data directory was initialized by PostgreSQL version %ld.%ld, which is "
-"not compatible with this version %s."
+#: utils/misc/guc.c:1533
+msgid "Time zone for displaying and interpreting time stamps"
 msgstr ""
-"Директория данных была инициализирована с помощьб PostgreSQL, версии %ld.%"
-"ld, которая не совместима с этой версией: %s."
-
-#: utils/init/postinit.c:114
-#, c-format
-msgid "Database \"%s\", OID %u, has disappeared from pg_database"
-msgstr "База \"%s\", OID %u, исчезла из pg_database"
-
-#: utils/init/postinit.c:123
-#, c-format
-msgid "Database \"%s\" is not currently accepting connections"
-msgstr "База \"%s\" не принимает подсоединения в данный момент"
 
-#: utils/init/postinit.c:259
-#, c-format
-msgid "Database \"%s\" does not exist in the system catalog."
-msgstr "База \"%s\" не существует в системном каталоге."
-
-#: utils/init/postinit.c:267
-#, c-format
-msgid ""
-"Database \"%s\" does not exist.\n"
-"\tThe database subdirectory '%s' is missing."
+#: utils/misc/guc.c:1542
+msgid "Current transaction's isolation level"
 msgstr ""
-"База данных \"%s\" не существует.\n"
-"\tПоддиректорий '%s' не найден."
 
-#: utils/init/postinit.c:274
-#, c-format
-msgid "Unable to change directory to '%s': %m"
-msgstr "Не получилось поменять директорию на '%s': %m"
-
-#: utils/init/postinit.c:303
-#, c-format
-msgid "InitPostgres: bad backend id %d"
+#: utils/misc/guc.c:1552
+msgid "The group owner of the Unix domain socket"
 msgstr ""
 
-#: utils/init/postinit.c:354
-msgid "There are currently no users defined in this database system."
+#: utils/misc/guc.c:1553
+msgid "(The owning user of the socket is always the user that starts the server.)"
 msgstr ""
 
-#: utils/init/postinit.c:355
-#, c-format
-msgid ""
-"You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'."
+#: utils/misc/guc.c:1562
+msgid "The Unix-domain socket directory to listen to"
 msgstr ""
 
-#: utils/init/postinit.c:390
-msgid "Non-superuser connection limit exceeded"
-msgstr ""
+#: utils/misc/guc.c:1571
+msgid "The host name or IP address to listen to"
+msgstr "Имя хоста или IP-адрес для прослушивания"
 
-#: utils/mb/encnames.c:445
-msgid "pg_char_to_encname_struct(): encoding name too long"
+#: utils/misc/guc.c:1580
+msgid "Method used for forcing WAL updates out to disk"
 msgstr ""
 
-#: utils/mb/conv.c:374
+#: utils/misc/guc.c:2413
+#: utils/misc/guc.c:3018
+#: utils/misc/guc.c:3054
+#: utils/misc/guc.c:3110
+#: utils/misc/guc.c:3404
 #, c-format
-msgid "UtfToLocal: could not convert UTF-8 (0x%04x). Ignored"
+msgid "\"%s\" is not a recognized option"
 msgstr ""
 
-#: utils/mb/conv.c:401
+#: utils/misc/guc.c:2432
 #, c-format
-msgid "Invalid encoding number %d"
-msgstr "Неверный номер кодировки %d"
-
-#: utils/mb/conv.c:438
-#, c-format
-msgid "LocalToUtf: could not convert (0x%04x) %s to UTF-8. Ignored"
+msgid "\"%s\" cannot be changed"
 msgstr ""
 
-#: utils/mb/mbutils.c:174
+#: utils/misc/guc.c:2444
 #, c-format
-msgid "default conversion proc for %s to %s not found"
+msgid "\"%s\" cannot be changed after server start"
 msgstr ""
 
-#: utils/mb/mbutils.c:188
+#: utils/misc/guc.c:2454
 #, c-format
-msgid "default conversion proc %u for %s to %s not found in pg_proc"
+msgid "\"%s\" cannot be changed now"
 msgstr ""
 
-#: utils/mb/mbutils.c:247
+#: utils/misc/guc.c:2484
 #, c-format
-msgid "Invalid source encoding name %s"
-msgstr "Неверное имя исходной кодировки: %s"
-
-#: utils/mb/mbutils.c:249
-#, c-format
-msgid "Invalid destination encoding name %s"
-msgstr "Неверное имя кодировки назначения: %s"
-
-#: utils/mb/mbutils.c:259
-msgid "Encoding conversion failed"
+msgid "\"%s\" cannot be set after connection start"
 msgstr ""
 
-#: utils/mb/mbutils.c:480
-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:2494
+#: utils/misc/guc.c:2564
+#: utils/misc/guc.c:2661
+#: utils/misc/guc.c:2757
+#: utils/misc/guc.c:2856
 #, c-format
-msgid "Failed to reset %s"
-msgstr ""
+msgid "permission denied to set option \"%s\""
+msgstr "доступ запрещён по установке опции \"%s\""
 
-#: utils/misc/guc.c:1346 utils/misc/guc.c:1368 utils/misc/guc.c:1390
-#: utils/misc/guc.c:1420
+#: utils/misc/guc.c:2552
 #, c-format
-msgid "Failed to commit %s"
-msgstr ""
+msgid "\"%s\" requires a boolean value"
+msgstr "\"%s\" требует булевское значение"
 
-#: utils/misc/guc.c:1599 utils/misc/guc.c:2149
-#, c-format
-msgid "'%s' is not a valid option name"
+#: utils/misc/guc.c:2566
+msgid "Must be superuser to change this value to false."
 msgstr ""
 
-#: utils/misc/guc.c:1616
+#: utils/misc/guc.c:2588
+#: utils/misc/guc.c:2685
 #, c-format
-msgid "'%s' cannot be changed after server start"
-msgstr ""
+msgid "invalid value for \"%s\": %d"
+msgstr "неверное значение для \"%s\": %d"
 
-#: utils/misc/guc.c:1624
+#: utils/misc/guc.c:2640
 #, c-format
-msgid "'%s' cannot be changed now"
-msgstr ""
+msgid "\"%s\" requires an integer value"
+msgstr "\"%s\" требует целое значение"
 
-#: utils/misc/guc.c:1651
+#: utils/misc/guc.c:2648
 #, c-format
-msgid "'%s' cannot be set after connection start"
+msgid "%d is outside the valid range for \"%s\" (%d .. %d)"
 msgstr ""
 
-#: utils/misc/guc.c:1659
-#, c-format
-msgid "'%s': permission denied"
-msgstr "'%s': нет доступа"
-
-#: utils/misc/guc.c:1689
-#, c-format
-msgid "%s: setting ignored because previous source is higher priority"
+#: utils/misc/guc.c:2663
+msgid "Must be superuser to increase this value or set it to zero."
 msgstr ""
 
-#: utils/misc/guc.c:1710
+#: utils/misc/guc.c:2737
 #, c-format
-msgid "option '%s' requires a boolean value"
-msgstr "опция '%s' требует булевское значение"
+msgid "\"%s\" requires a numeric value"
+msgstr "\"%s\" требует числовое значение"
 
-#: utils/misc/guc.c:1724 utils/misc/guc.c:1795
+#: utils/misc/guc.c:2745
 #, c-format
-msgid "invalid value for option '%s': %d"
-msgstr "не верное значение для опции '%s': %d"
-
-#: utils/misc/guc.c:1774
-#, c-format
-msgid "option '%s' expects an integer value"
-msgstr "опция '%s' ожидает целое значение"
-
-#: utils/misc/guc.c:1780
-#, c-format
-msgid "option '%s' value %d is outside of permissible range [%d .. %d]"
+msgid "%g is outside the valid range for \"%s\" (%g .. %g)"
 msgstr ""
 
-#: utils/misc/guc.c:1845
-#, c-format
-msgid "option '%s' expects a real number"
-msgstr "опция '%s' ожидает реальное число"
-
-#: utils/misc/guc.c:1851
-#, c-format
-msgid "option '%s' value %g is outside of permissible range [%g .. %g]"
+#: utils/misc/guc.c:2759
+#: utils/misc/guc.c:2858
+msgid "Must be superuser to increase this value."
 msgstr ""
 
-#: utils/misc/guc.c:1866
+#: utils/misc/guc.c:2781
 #, c-format
-msgid "invalid value for option '%s': %g"
-msgstr "не верное значение для опции '%s': %g"
+msgid "invalid value for \"%s\": %g"
+msgstr "неверное значение для \"%s\": %g"
 
-#: utils/misc/guc.c:1960
+#: utils/misc/guc.c:2912
 #, c-format
-msgid "invalid value for option '%s': '%s'"
-msgstr "не верное значение для опции '%s': '%s'"
+msgid "invalid value for \"%s\": \"%s\""
+msgstr "неверное значение для \"%s\": \"%s\""
 
-#: utils/misc/guc.c:2061 utils/misc/guc.c:2095 utils/misc/guc.c:2409
-#, c-format
-msgid "Option '%s' is not recognized"
-msgstr "Опция '%s' не распознана"
-
-#: utils/misc/guc.c:2156
+#: utils/misc/guc.c:3119
 #, c-format
 msgid "SET %s takes only one argument"
 msgstr "SET %s принимает только один аргумент"
 
-#: utils/misc/guc.c:2169 utils/misc/guc.c:2218
-msgid "flatten_set_variable_args: unexpected input"
-msgstr ""
-
-#: utils/misc/guc.c:2257
+#: utils/misc/guc.c:3223
 msgid "SET variable name is required"
 msgstr "SET требуется имя переменной"
 
-#: utils/misc/guc.c:2793
-#, c-format
-msgid "cannot parse setting \"%s\""
-msgstr "не получилось проанализировать опцию \"%s\""
-
-#: guc-file.l:158
-msgid "could not read configuration file `"
-msgstr "не получилось считать файл конфигурации `"
-
-#: guc-file.l:158
-#, c-format
-msgid "': %s"
-msgstr "': %s"
-
-#: guc-file.l:259
-#, c-format
-msgid ":%u: syntax error, token=\"%s\""
-msgstr ":%u: ошибка синтаксиса, токен=\"%s\""
-
-#: utils/mmgr/portalmem.c:78
-msgid "out of memory in PortalHashTable"
-msgstr "не хватает памяти в PortalHashTable"
-
-#: 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
-#, c-format
-msgid "Memory exhausted in AllocSetAlloc(%lu)"
-msgstr ""
-
-#: utils/mmgr/aset.c:757
-#, c-format
-msgid "AllocSetFree: detected write past chunk end in %s %p"
-msgstr ""
-
-#: utils/mmgr/aset.c:778
-#, c-format
-msgid "AllocSetFree: cannot find block containing chunk %p"
-msgstr ""
-
-#: utils/mmgr/aset.c:832
-#, c-format
-msgid "AllocSetRealloc: detected write past chunk end in %s %p"
-msgstr ""
-
-#: utils/mmgr/aset.c:872
-#, c-format
-msgid "AllocSetRealloc: cannot find block containing chunk %p"
-msgstr ""
-
-#: utils/mmgr/aset.c:885
-#, c-format
-msgid "Memory exhausted in AllocSetReAlloc(%lu)"
-msgstr ""
-
-#: utils/mmgr/aset.c:1055
-#, c-format
-msgid "AllocSetCheck: %s: empty block %p"
-msgstr ""
-
-#: utils/mmgr/aset.c:1077
-#, c-format
-msgid "AllocSetCheck: %s: req size > alloc size for chunk %p in block %p"
+#: utils/misc/guc.c:3780
+msgid "could not write exec config params file \""
 msgstr ""
 
-#: utils/mmgr/aset.c:1080
+#: utils/misc/guc.c:3781
+#: utils/misc/guc.c:3917
 #, c-format
-msgid "AllocSetCheck: %s: bad size %lu for chunk %p in block %p"
-msgstr ""
+msgid "\": %m"
+msgstr "\": %m"
 
-#: utils/mmgr/aset.c:1086
-#, c-format
-msgid "AllocSetCheck: %s: bad single-chunk %p in block %p"
+#: utils/misc/guc.c:3916
+msgid "could not read exec config params file \""
 msgstr ""
 
-#: utils/mmgr/aset.c:1095
+#: utils/misc/guc.c:4036
 #, c-format
-msgid "AllocSetCheck: %s: bogus aset link in block %p, chunk %p"
-msgstr ""
+msgid "could not parse setting for \"%s\""
+msgstr "не получилось проанализировать установки для \"%s\""
 
-#: utils/mmgr/aset.c:1102
-#, c-format
-msgid "AllocSetCheck: %s: detected write past chunk end in block %p, chunk %p"
-msgstr ""
+#: utils/misc/guc.c:4383
+msgid "SET AUTOCOMMIT TO OFF is no longer supported"
+msgstr "SET AUTOCOMMIT TO OFF больше не поддерживается"
 
-#: utils/mmgr/aset.c:1112
+#: utils/mmgr/aset.c:336
 #, c-format
-msgid "AllocSetCheck: %s: found inconsistent memory block %p"
+msgid "Failed while creating memory context \"%s\"."
 msgstr ""
 
-#: utils/mmgr/mcxt.c:478 utils/mmgr/mcxt.c:499 utils/mmgr/mcxt.c:524
+#: utils/mmgr/aset.c:502
+#: utils/mmgr/aset.c:702
+#: utils/mmgr/aset.c:895
 #, c-format
-msgid "MemoryContextAlloc: invalid request size %lu"
+msgid "Failed on request of size %lu."
 msgstr ""
 
-#: utils/mmgr/mcxt.c:588
+#: utils/mmgr/portalmem.c:170
 #, c-format
-msgid "repalloc: invalid request size %lu"
-msgstr ""
+msgid "portal \"%s\" already exists"
+msgstr "портал \"%s\" уже существует"
 
-#: utils/sort/logtape.c:199
+#: utils/mmgr/portalmem.c:174
 #, c-format
-msgid ""
-"ltsWriteBlock: failed to write block %ld of temporary file\n"
-"\t\tPerhaps out of disk space?"
+msgid "closing pre-existing portal \"%s\""
 msgstr ""
 
-#: utils/sort/logtape.c:214
+#: utils/sort/logtape.c:202
 #, c-format
-msgid "ltsReadBlock: failed to read block %ld of temporary file"
-msgstr ""
-
-#: utils/sort/logtape.c:569
-msgid "LogicalTapeWrite: impossible state"
-msgstr ""
-
-#: utils/sort/logtape.c:831
-msgid "LogicalTapeBackspace: unexpected end of tape"
-msgstr ""
-
-#: utils/sort/logtape.c:888 utils/sort/logtape.c:898
-msgid "LogicalTapeSeek: unexpected end of tape"
-msgstr ""
-
-#: utils/sort/tuplesort.c:694
-msgid "tuplesort_puttuple: invalid state"
-msgstr "tuplesort_puttuple: неверное состояние"
-
-#: utils/sort/tuplesort.c:741
-msgid "tuplesort_performsort: invalid state"
-msgstr "tuplesort_performsort: неверное состояние"
-
-#: utils/sort/tuplesort.c:859 utils/sort/tuplesort.c:874
-msgid "tuplesort_gettuple: bogus tuple len in backward scan"
-msgstr ""
-
-#: utils/sort/tuplesort.c:926
-msgid "tuplesort_gettuple: invalid state"
-msgstr "tuplesort_gettuple: неверное состояние"
-
-#: utils/sort/tuplesort.c:1486
-msgid "tuplesort_rescan: invalid state"
-msgstr "tuplesort_rescan: неверное состояние"
-
-#: utils/sort/tuplesort.c:1513
-msgid "tuplesort_markpos: invalid state"
-msgstr "tuplesort_markpos: неверное состояние"
-
-#: utils/sort/tuplesort.c:1538
-msgid "tuplesort_restorepos failed"
-msgstr "tuplesort_restorepos не удался"
-
-#: utils/sort/tuplesort.c:1542
-msgid "tuplesort_restorepos: invalid state"
-msgstr "tuplesort_restorepos: неверное состояние"
-
-#: utils/sort/tuplesort.c:1665
-msgid "tuplesort: unexpected end of tape"
+msgid "could not write block %ld of temporary file: %m"
 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:2209
-msgid "tuplesort: unexpected end of data"
-msgstr "tuplesort: неожиданный конец данных"
-
-#: utils/sort/tuplesort.c:1785
-#, c-format
-msgid "SelectSortFunction: cache lookup failed for operator %u"
+#: utils/sort/logtape.c:204
+msgid "Perhaps out of disk space?"
 msgstr ""
 
-#: utils/sort/tuplesort.c:1897
+#: utils/sort/logtape.c:221
 #, c-format
-msgid "Invalid SortFunctionKind %d"
-msgstr "Не верный SortFunctionKind %d"
-
-#: utils/sort/tuplesort.c:2085
-msgid "Cannot create unique index. Table contains non-unique values"
-msgstr ""
-
-#: utils/sort/tuplesort.c:2161
-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"
+msgid "could not read block %ld of temporary file: %m"
 msgstr ""
 
-#: utils/sort/tuplestore.c:482
-msgid "tuplestore_gettuple: invalid state"
-msgstr "tuplestore_gettuple: неверное состояние"
+#: utils/sort/tuplesort.c:2072
+msgid "could not create unique index"
+msgstr "не получилось создать уникальный индекс"
 
-#: 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"
+#: utils/sort/tuplesort.c:2073
+msgid "Table contains duplicated values."
 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 2ae92051b50..8e30bdb5fbd 100644
--- a/src/bin/pg_controldata/po/ru.po
+++ b/src/bin/pg_controldata/po/ru.po
@@ -1,18 +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.4 2003/08/04 14:01:32 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_controldata/po/Attic/ru.po,v 1.5 2003/08/24 21:18:51 petere Exp $
 #
 # ChangeLog:
-#   - July 24-26, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24 - August 23, 2003: Update for 7.4.*; <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.4.x\n"
-"POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-08-01 14:10-0500\n"
+"POT-Creation-Date: 2003-08-23 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 13:28-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"
@@ -25,7 +25,7 @@ msgid ""
 "%s displays control information of a PostgreSQL database cluster.\n"
 "\n"
 msgstr ""
-"%s отображает информацию по управлению кластерами базы PostgreSQL.\n"
+"%s отображает информацию по управлению кластером баз PostgreSQL.\n"
 "\n"
 
 #: pg_controldata.c:32
@@ -45,7 +45,7 @@ msgstr ""
 "Опции:\n"
 "  ДИРДАННЫХ      показать информацию по управлению кластера для ДИРДАННЫХ\n"
 "  --help         показать эту подсказку и выйти\n"
-"  --version      показать версию pg_controldata и выйтиt\n"
+"  --version      показать версию pg_controldata и выйти\n"
 "\n"
 
 #: pg_controldata.c:41
@@ -116,7 +116,7 @@ msgid ""
 "\n"
 msgstr ""
 "ВНИМАНИЕ: Сосчитанная контрольная сумма CRC не совпадает со значением в файле.\n"
-"Файл либо повреждён либо его формат отличатется от ожидаемого этой программой.\n"
+"Файл либо повреждён, либо его формат отличается от ожидаемого этой программой.\n"
 "Не стоит доверять результатам представленным ниже.\n"
 "\n"
 
@@ -208,7 +208,7 @@ msgstr "Максимальная длина идентификаторов:   %u\n"
 #: pg_controldata.c:171
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
-msgstr "Максмальное число аргументов функции: %u\n"
+msgstr "Максимальное число аргументов функции: %u\n"
 
 #: pg_controldata.c:172
 #, c-format
diff --git a/src/bin/pg_resetxlog/po/ru.po b/src/bin/pg_resetxlog/po/ru.po
index bb6a8a5c918..a24532f7114 100644
--- a/src/bin/pg_resetxlog/po/ru.po
+++ b/src/bin/pg_resetxlog/po/ru.po
@@ -1,10 +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.4 2003/08/04 14:01:37 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.5 2003/08/24 21:18:51 petere Exp $
 #
 # ChangeLog:
-#   - July 24-26, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24 - August 23, 2003: Update for 7.4.*; <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>
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
-"POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-08-01 14:15-0500\n"
+"POT-Creation-Date: 2003-08-23 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 13:34-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"
@@ -105,7 +105,7 @@ msgid ""
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
-"Если вы уверены что путь к директории данных правельный, наберите\n"
+"Если вы уверены что путь к директории данных правильный, наберите\n"
 "  touch %s\n"
 "и попробуйте снова.\n"
 
@@ -122,7 +122,7 @@ msgstr "%s: pg_control существует, но его контрольная сумма CRC неверна; продолж
 #: pg_resetxlog.c:356
 #, 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:407
 #, c-format
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index 2b4f6f7463d..8bef386199d 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -1,6 +1,6 @@
-# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.8 2003/06/28 22:31:01 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.9 2003/08/24 21:18:52 petere Exp $
 CATALOG_NAME	:= psql
-AVAIL_LANGUAGES	:= cs de fr hu ru sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr hu ru sv zh_CN zh_TW
 GETTEXT_FILES	:= command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c startup.c describe.c
 GETTEXT_TRIGGERS:= _ psql_error simple_prompt
diff --git a/src/bin/psql/po/es.po b/src/bin/psql/po/es.po
new file mode 100644
index 00000000000..c41a2f0c922
--- /dev/null
+++ b/src/bin/psql/po/es.po
@@ -0,0 +1,1390 @@
+# translation of psql.
+# This file is put in the public domain.
+# <alvherre@dcc.uchile.cl>, 2003.
+#  <alvherre@dcc.uchile.cl>, 2003.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.4\n"
+"POT-Creation-Date: 2003-08-23 23:45-0400\n"
+"PO-Revision-Date: 2003-08-24 14:22-0400\n"
+"Last-Translator: аlvaro Herrera <alvherre@dcc.uchile.cl>\n"
+"Language-Team: Hackers <pgsql-hackers@postgresql.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: command.c:154
+msgid "Warning: This syntax is deprecated.\n"
+msgstr "AtenciСn: esta sintaxis estА obsoleta.\n"
+
+#: command.c:161
+#, c-format
+msgid "Invalid command \\%s. Try \\? for help.\n"
+msgstr "Comando \\%s no vАlido. Use \\? para obtener ayuda.\n"
+
+#: command.c:163
+#, c-format
+msgid "invalid command \\%s\n"
+msgstr "comando \\%s no vАlido\n"
+
+#: command.c:290
+#, c-format
+msgid "could not get home directory: %s\n"
+msgstr "No se ha podido obtener directorio home: %s\n"
+
+#: command.c:306
+#, c-format
+msgid "\\%s: could not change directory to \"%s\": %s\n"
+msgstr "\\%s: no se pudo cambiar directorio a \"%s\": %s\n"
+
+#: command.c:411 command.c:780
+msgid "no query buffer\n"
+msgstr "no hay bЗfer de consulta\n"
+
+#: command.c:476
+#, c-format
+msgid "%s: invalid encoding name or conversion procedure not found\n"
+msgstr ""
+"%s: nombre de codificaciСn no vАlido o procedimiento de conversiСn\n"
+"no encontrado\n"
+
+#: command.c:538 command.c:569 command.c:580 command.c:594 command.c:636
+#: command.c:760 command.c:789
+#, c-format
+msgid "\\%s: missing required argument\n"
+msgstr "\\%s: falta argumento requerido\n"
+
+#: command.c:624
+msgid "Query buffer is empty."
+msgstr "El bЗfer de consulta estА vacМo."
+
+#: command.c:657
+msgid "Query buffer reset (cleared)."
+msgstr "El bЗfer de consulta ha sido reiniciado (limpiado)."
+
+#: command.c:668
+#, c-format
+msgid "Wrote history to file \"%s\".\n"
+msgstr "Se escribiС historial a archivo \"%s\".\n"
+
+#: command.c:700 command.c:1160 command.c:1257 command.c:1975 common.c:81
+#: copy.c:88 copy.c:116 mainloop.c:78 mainloop.c:340 describe.c:51
+msgid "out of memory\n"
+msgstr "memoria agotada\n"
+
+#: command.c:715 command.c:765
+#, c-format
+msgid "\\%s: error\n"
+msgstr "\\%s: error\n"
+
+#: command.c:804 command.c:824 command.c:1022 command.c:1035 command.c:1046
+#: command.c:1617 command.c:1630 command.c:1642 command.c:1655 command.c:1669
+#: command.c:1691 command.c:1721 common.c:130 copy.c:379
+#, c-format
+msgid "%s: %s\n"
+msgstr "%s: %s\n"
+
+#: command.c:890
+#, c-format
+msgid "\\%s: extra argument \"%s\" ignored\n"
+msgstr "\\%s: argumento extra \"%s\" ignorado\n"
+
+#: command.c:983 command.c:1011 command.c:1133
+msgid "parse error at the end of line\n"
+msgstr "error de procesamiento en el fin de lМnea\n"
+
+#: command.c:1362 command.c:1386 startup.c:176 startup.c:194
+msgid "Password: "
+msgstr "ContraseЯa: "
+
+#: command.c:1400 common.c:176 common.c:346 common.c:396 common.c:612
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: command.c:1404
+msgid "Previous connection kept\n"
+msgstr "Se ha mantenido la conexiСn anterior\n"
+
+#: command.c:1416
+#, c-format
+msgid "\\connect: %s"
+msgstr "\\connect: %s"
+
+#: command.c:1428
+#, c-format
+msgid "You are now connected to database \"%s\".\n"
+msgstr "Ahora estА conectado a la base de datos \"%s\".\n"
+
+#: command.c:1430
+#, c-format
+msgid "You are now connected as new user \"%s\".\n"
+msgstr "Ahora estА conectado como el usuario \"%s\".\n"
+
+#: command.c:1433
+#, c-format
+msgid "You are now connected to database \"%s\" as user \"%s\".\n"
+msgstr ""
+"Ahora estА conectado a la base de datos \"%s\"\n"
+"con el usuario \"%s\".\n"
+
+#: command.c:1555
+#, c-format
+msgid "could not start editor \"%s\"\n"
+msgstr "no se ha podido iniciar el editor \"%s\"\n"
+
+#: command.c:1557
+msgid "could not start /bin/sh\n"
+msgstr "no se ha podido iniciar /bin/sh\n"
+
+#: command.c:1602
+#, c-format
+msgid "could not open temporary file \"%s\": %s\n"
+msgstr "no se ha podido abrir archivo temporal \"%s\": %s\n"
+
+#: command.c:1794
+msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
+msgstr "\\pset: formatos permitidos son unaligned, aligned, html, latex\n"
+
+#: command.c:1799
+#, c-format
+msgid "Output format is %s.\n"
+msgstr "El formato de salida es %s.\n"
+
+#: command.c:1809
+#, c-format
+msgid "Border style is %d.\n"
+msgstr "El estilo de borde es %d.\n"
+
+#: command.c:1818
+msgid "Expanded display is on.\n"
+msgstr "Se ha activado el despliegue expandido.\n"
+
+#: command.c:1819
+msgid "Expanded display is off.\n"
+msgstr "Se ha desactivado el despliegue expandido.\n"
+
+#: command.c:1831
+#, c-format
+msgid "Null display is \"%s\".\n"
+msgstr "Despliegue de nulos es \"%s\".\n"
+
+#: command.c:1843
+#, c-format
+msgid "Field separator is \"%s\".\n"
+msgstr "El separador de campos es \"%s\".\n"
+
+#: command.c:1857
+msgid "Record separator is <newline>."
+msgstr "El separador de registros es <salto de lМnea>."
+
+#: command.c:1859
+#, c-format
+msgid "Record separator is \"%s\".\n"
+msgstr "El separador de registros es \"%s\".\n"
+
+#: command.c:1870
+msgid "Showing only tuples."
+msgstr "Mostrando sСlo registros."
+
+#: command.c:1872
+msgid "Tuples only is off."
+msgstr "Mostrar sСlo registros estА desactivado."
+
+#: command.c:1888
+#, c-format
+msgid "Title is \"%s\".\n"
+msgstr "El tМtulo es \"%s\".\n"
+
+#: command.c:1890
+msgid "Title is unset.\n"
+msgstr "El tМtulo ha sido indefinido.\n"
+
+#: command.c:1906
+#, c-format
+msgid "Table attribute is \"%s\".\n"
+msgstr "Los atributos de tabla son \"%s\".\n"
+
+#: command.c:1908
+msgid "Table attributes unset.\n"
+msgstr "Los atributos de tabla han sido indefinidos.\n"
+
+#: command.c:1924
+msgid "Pager is used for long output."
+msgstr "El paginador se usarА para salida larga."
+
+#: command.c:1926
+msgid "Pager is always used."
+msgstr "El paginador se usarА siempre."
+
+#: command.c:1928
+msgid "Pager usage is off."
+msgstr "El paginador no se usarА."
+
+#: command.c:1939
+msgid "Default footer is on."
+msgstr "El pie por omisiСn estА activo."
+
+#: command.c:1941
+msgid "Default footer is off."
+msgstr "El pie de pАgina por omisiСn estА desactivado."
+
+#: command.c:1947
+#, c-format
+msgid "\\pset: unknown option: %s\n"
+msgstr "\\pset: opciСn desconocida: %s\n"
+
+#: command.c:1994
+msgid "\\!: failed\n"
+msgstr "\\!: fallС\n"
+
+#: common.c:74
+#, c-format
+msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
+msgstr "%s: xstrdup: no se puede duplicar puntero nulo (error interno)\n"
+
+#: common.c:258
+msgid "connection to server was lost\n"
+msgstr "se ha perdido la conexiСn al servidor\n"
+
+#: common.c:262
+msgid "The connection to the server was lost. Attempting reset: "
+msgstr "La conexiСn al servidor se ha perdido. Intentando reiniciar: "
+
+#: common.c:267
+msgid "Failed.\n"
+msgstr "fallС.\n"
+
+#: common.c:274
+msgid "Succeeded.\n"
+msgstr "con Иxito.\n"
+
+#: common.c:372 common.c:580
+msgid "You are currently not connected to a database.\n"
+msgstr "No estА conectado a una base de datos.\n"
+
+#: common.c:428
+#, c-format
+msgid ""
+"Asynchronous notification \"%s\" received from server process with PID %d.\n"
+msgstr ""
+"NotificaciСn asМncrona \"%s\" recibida del proceso de servidor con PID %d.\n"
+
+#: common.c:535
+msgid ""
+"Enter data to be copied followed by a newline.\n"
+"End with a backslash and a period on a line by itself."
+msgstr ""
+"Ingrese los datos a ser copiados seguidos de un fin de lМnea.\n"
+"Termine con un backslash y un punto."
+
+#: common.c:552
+#, c-format
+msgid "Time: %.2f ms\n"
+msgstr "DuraciСn: %.2f ms\n"
+
+#: common.c:588
+#, c-format
+msgid ""
+"***(Single step mode: verify "
+"command)*******************************************\n"
+"%s\n"
+"***(press return to proceed or enter x and return to "
+"cancel)********************\n"
+msgstr ""
+"***(Modo paso a paso: verifique "
+"comando)****************************************\n"
+"%s\n"
+"***(presione enter para continuar, o x y enter para "
+"cancelar)*******************\n"
+
+#: copy.c:110
+msgid "\\copy: arguments required\n"
+msgstr "\\copy: argumentos requeridos\n"
+
+#: copy.c:290
+#, c-format
+msgid "\\copy: parse error at \"%s\"\n"
+msgstr "\\copy: error de procesamiento en \"%s\"\n"
+
+#: copy.c:292
+msgid "\\copy: parse error at end of line\n"
+msgstr "\\copy: error de procesamiento al final de la lМnea\n"
+
+#: copy.c:390
+#, c-format
+msgid "%s: cannot copy from/to a directory\n"
+msgstr "%s: no se puede copiar desde/hacia un directorio\n"
+
+#: copy.c:411
+#, c-format
+msgid "\\copy: %s"
+msgstr "\\copy: %s"
+
+#: copy.c:415
+#, c-format
+msgid "\\copy: unexpected response (%d)\n"
+msgstr "\\copy: respuesta inesperada (%d)\n"
+
+#: help.c:48
+msgid "on"
+msgstr "activado"
+
+#: help.c:48
+msgid "off"
+msgstr "desactivado"
+
+#: help.c:70
+#, c-format
+msgid "could not get current user name: %s\n"
+msgstr "no se ha podido obtener el nombre de usuario actual: %s\n"
+
+#: help.c:83
+#, c-format
+msgid ""
+"This is psql %s, the PostgreSQL interactive terminal.\n"
+"\n"
+msgstr "Este es psql %s, el terminal interactivo de PostgreSQL.\n"
+
+#: help.c:85
+msgid "Usage:"
+msgstr "Modo de empleo:"
+
+#: help.c:86
+msgid "  psql [OPTIONS]... [DBNAME [USERNAME]]\n"
+msgstr "  psql [OPCIONES]...[BASE-DE-DATOS [USUARIO]]\n"
+
+#: help.c:88
+msgid "General options:"
+msgstr "Opciones generales:"
+
+#: help.c:93
+#, c-format
+msgid ""
+"  -d DBNAME       specify database name to connect to (default: \"%s\")\n"
+msgstr ""
+"  -d BASE-DE-DATOS nombre de base de datos a conectarse (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:94
+msgid "  -c COMMAND      run only single command (SQL or internal) and exit"
+msgstr ""
+"-c COMANDO         ejecutar sСlo un comando (SQL o interno) y salir"
+
+#: help.c:95
+msgid "  -f FILENAME     execute commands from file, then exit"
+msgstr ""
+"-f ARCHIVO         ejecutar comandos desde archivo, luego salir"
+
+#: help.c:96
+msgid "  -l              list available databases, then exit"
+msgstr ""
+"-l                 listar bases de datos, luego salir"
+
+#: help.c:97
+msgid "  -v NAME=VALUE   set psql variable NAME to VALUE"
+msgstr ""
+"  -v NOMBRE=VALOR  definir variable NOMBRE de psql a VALOR"
+
+#: help.c:98
+msgid "  -X              do not read startup file (~/.psqlrc)"
+msgstr ""
+"-X                 no leer archivo de configuraciСn (~/.psqlrc)"
+
+#: help.c:99
+msgid "  --help          show this help, then exit"
+msgstr ""
+"--help             mostrar esta ayuda, luego salir"
+
+#: help.c:100
+msgid "  --version       output version information, then exit"
+msgstr ""
+"--version          mostrar informaciСn de versiСn, luego salir"
+
+#: help.c:102
+msgid ""
+"\n"
+"Input and output options:"
+msgstr ""
+"\n"
+"Opciones de entrada y salida:"
+
+#: help.c:103
+msgid "  -a              echo all input from script"
+msgstr ""
+"-a                 mostrar los comandos del script"
+
+#: help.c:104
+msgid "  -e              echo commands sent to server"
+msgstr ""
+"-e                 mostrar comandos enviados al servidor"
+
+#: help.c:105
+msgid "  -E              display queries that internal commands generate"
+msgstr ""
+"  -E               mostrar consultas generadas por comandos internos"
+
+#: help.c:106
+msgid "  -q              run quietly (no messages, only query output)"
+msgstr ""
+"  -q               modo silencioso (sin mensajes, sСlo resultado de consultas)"
+
+#: help.c:107
+msgid "  -o FILENAME     send query results to file (or |pipe)"
+msgstr ""
+"  -o ARCHIVO       enviar resultados de consultas a archivo (o |comando)"
+
+#: help.c:108
+msgid "  -n              disable enhanced command line editing (readline)"
+msgstr ""
+"  -n               deshabilitar ediciСn de lМnea de comando (readline)"
+
+#: help.c:109
+msgid "  -s              single-step mode (confirm each query)"
+msgstr ""
+"  -s               modo paso a paso (confirmar cada consulta)"
+
+#: help.c:110
+msgid ""
+"  -S              single-line mode (end of line terminates SQL command)"
+msgstr ""
+"  -S               modo de lМneas (fin de lМnea termina el comando SQL)"
+
+#: help.c:112
+msgid ""
+"\n"
+"Output format options:"
+msgstr ""
+"\n"
+"Opciones de formato de salida:"
+
+#: help.c:113
+msgid "  -A              unaligned table output mode (-P format=unaligned)"
+msgstr ""
+"  -A               modo de tablas no alineadas"
+
+#: help.c:114
+msgid "  -H              HTML table output mode (-P format=html)"
+msgstr ""
+"  -H               modo de salida en tablas HTML (-P format=html)"
+
+#: help.c:115
+msgid "  -t              print rows only (-P tuples_only)"
+msgstr ""
+"  -t               mostrar sСlo registros (-P tuples_only)"
+
+#: help.c:116
+msgid ""
+"  -T TEXT         set HTML table tag attributes (width, border) (-P "
+"tableattr=)"
+msgstr ""
+"  -T TEXTO         definir atributos de marcas de tabla HTML (ancho, "
+"borde) (-P tableattr=)"
+
+#: help.c:117
+msgid "  -x              turn on expanded table output (-P expanded)"
+msgstr ""
+"  -x               activar modo expandido de salida de tablas (-P expanded)"
+
+#: help.c:118
+msgid "  -P VAR[=ARG]    set printing option VAR to ARG (see \\pset command)"
+msgstr ""
+"  -P VAR[=ARG]     definir opciСn de impresiСn VAR en ARG (ver comando \\pset)"
+
+#: help.c:119
+#, c-format
+msgid ""
+"  -F STRING       set field separator (default: \"%s\") (-P fieldsep=)\n"
+msgstr ""
+"  -F CADENA        definir separados de campos (por omisiСn: \"%s\") (-P "
+"fieldsep=)\n"
+
+#: help.c:121
+msgid ""
+"  -R STRING       set record separator (default: newline) (-P recordsep=)"
+msgstr ""
+"  -R CADENA        definir separador de registros (por omisiСn: salto de "
+"lМnea) (-P recordsep=)"
+
+#: help.c:123
+msgid ""
+"\n"
+"Connection options:"
+msgstr ""
+"\n"
+"Opciones de conexiСn:"
+
+#: help.c:126
+#, c-format
+msgid ""
+"  -h HOSTNAME     database server host or socket directory (default: \"%s\")\n"
+msgstr ""
+"  -h ANFITRIсN     nombre del anfitriСn o directorio de socket (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:127
+msgid "local socket"
+msgstr "socket local"
+
+#: help.c:130
+#, c-format
+msgid "  -p PORT         database server port (default: \"%s\")\n"
+msgstr ""
+"  -p PORT          puerto del servidor de bases de datos (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:136
+#, c-format
+msgid "  -U NAME         database user name (default: \"%s\")\n"
+msgstr ""
+"  -U NOMBRE        nombre de usuario de la base de datos (por omisiСn: "
+"\"%s\")\n"
+
+#: help.c:137
+msgid "  -W              prompt for password (should happen automatically)"
+msgstr ""
+"  -W               preguntar contraseЯa (deberМa suceder automАticamente)"
+
+#: help.c:140
+msgid ""
+"\n"
+"For more information, type \"\\?\" (for internal commands) or \"\\help\"\n"
+"(for SQL commands) from within psql, or consult the psql section in\n"
+"the PostgreSQL documentation.\n"
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>."
+msgstr ""
+"\n"
+"Para obtener mАs ayuda, digite \"\\?\" (para comandos internos) o \"\\help\"\n"
+"(para comandos SQL) dentro de psql, o consulte la secciСn de psql\n"
+"en la documentaciСn de PostgreSQL.\n"
+"\n"
+"Reporte errores a <pgsql-bugs@postgresql.org>."
+
+#: help.c:174
+msgid "General\n"
+msgstr "General\n"
+
+#: help.c:175
+#, c-format
+msgid ""
+"  \\c[onnect] [DBNAME|- [USER]]\n"
+"                 connect to new database (currently \"%s\")\n"
+msgstr ""
+"  \\c[onnect] [BASE-DE-DATOS|- [USUARIO]]\n"
+"                  conectar a una nueva base de datos (actual: \"%s\")\n"
+
+#: help.c:178
+msgid "  \\cd [DIR]      change the current working directory\n"
+msgstr ""
+"  \\cd [DIR]       cambiar el directorio de trabajo\n"
+
+#: help.c:179
+msgid "  \\copyright     show PostgreSQL usage and distribution terms\n"
+msgstr ""
+"  \\copyright      mostrar tИrminos de uso y distribuciСn de PostgreSQL\n"
+
+#: help.c:180
+msgid ""
+"  \\encoding [ENCODING]\n"
+"                 show or set client encoding\n"
+msgstr ""
+"  \\encoding [CODIFICACIсN]\n"
+"                  mostrar o definir codificaciСn del cliente\n"
+
+#: help.c:182
+msgid "  \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
+msgstr ""
+"  \\h [NOMBRE]     mostrar ayuda de sintaxis de comandos SQL,\n"
+"                   * para todos los comandos\n"
+
+#: help.c:183
+msgid "  \\q             quit psql\n"
+msgstr ""
+"  \\q              salir de psql\n"
+
+#: help.c:184
+msgid ""
+"  \\set [NAME [VALUE]]\n"
+"                 set internal variable, or list all if no parameters\n"
+msgstr ""
+"  \\set [NOMBRE [VALOR]]\n"
+"                  definir variables internas,\n"
+"                  listar todas si no se dan parАmetros\n"
+
+#: help.c:186
+#, c-format
+msgid "  \\timing        toggle timing of commands (currently %s)\n"
+msgstr ""
+"  \\timing         mostrar tiempo de ejecuciСn de comandos\n"
+"                  (actualmente %s)\n"
+
+#: help.c:188
+msgid "  \\unset NAME    unset (delete) internal variable\n"
+msgstr ""
+"  \\unset NOMBRE   indefinir (eliminar) variable interna\n"
+
+#: help.c:189
+msgid "  \\! [COMMAND]   execute command in shell or start interactive shell\n"
+msgstr ""
+"  \\! [COMANDO]    ejecutar comando en intИrprete de comandos,\n"
+"                  o iniciar intИrprete interactivo\n"
+
+#: help.c:192
+msgid "Query Buffer\n"
+msgstr "BЗfer de consulta\n"
+
+#: help.c:193
+msgid ""
+"  \\e [FILE]      edit the query buffer (or file) with external editor\n"
+msgstr ""
+"  \\e [ARCHIVO]    editar el bЗfer de consulta (o archivo) con editor "
+"externo\n"
+
+#: help.c:194
+msgid ""
+"  \\g [FILE]      send query buffer to server (and results to file or |pipe)\n"
+msgstr ""
+"  \\g [ARCHIVO]    enviar bЗfer de consulta al servidor\n"
+"                  (y resultados a archivo o |comando)\n"
+
+#: help.c:195
+msgid "  \\p             show the contents of the query buffer\n"
+msgstr ""
+"  \\p              mostrar el contenido del bЗfer de consulta\n"
+
+#: help.c:196
+msgid "  \\r             reset (clear) the query buffer\n"
+msgstr ""
+"  \\r              reiniciar (limpiar) el bЗfer de consulta\n"
+
+#: help.c:197
+msgid "  \\s [FILE]      display history or save it to file\n"
+msgstr ""
+"  \\s [ARCHIVO]    mostrar historial de comandos o guardarlo en archivo\n"
+
+#: help.c:198
+msgid "  \\w [FILE]      write query buffer to file\n"
+msgstr ""
+"  \\w [ARCHIVO]    escribir bЗfer de consulta a archivo\n"
+
+#: help.c:201
+msgid "Input/Output\n"
+msgstr "Entrada/Salida\n"
+
+#: help.c:202
+msgid "  \\echo [STRING] write string to standard output\n"
+msgstr ""
+"  \\echo [CADENA]  escribir cadena a salida estАndar\n"
+
+#: help.c:203
+msgid "  \\i FILE        execute commands from file\n"
+msgstr ""
+"  \\i ARCHIVO      ejecutar comandos desde archivo\n"
+
+#: help.c:204
+msgid "  \\o [FILE]      send all query results to file or |pipe\n"
+msgstr ""
+"  \\o [ARCHIVO]    envМar resultados de consultas a archivo o |comando\n"
+
+#: help.c:205
+msgid ""
+"  \\qecho [STRING]\n"
+"                 write string to query output stream (see \\o)\n"
+msgstr ""
+"  \\qecho [CADENA] escribir cadena a salida de consultas (ver \\o)\n"
+
+#: help.c:209
+msgid "Informational\n"
+msgstr "Informacional\n"
+
+#: help.c:210
+msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
+msgstr ""
+"  \\d [NOMBRE]     describir tabla, Мndice, secuencia o vista\n"
+
+#: help.c:211
+msgid ""
+"  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
+"                 list tables/indexes/sequences/views/system tables\n"
+msgstr ""
+"  \\d{t|i|s|v|S} [PATRсN] (agregue \"+\" para obtener mАs detalles)\n"
+"                  listar tablas/Мndices/secuencias/vistas/tablas de sistema\n"
+
+#: help.c:213
+msgid "  \\da [PATTERN]  list aggregate functions\n"
+msgstr ""
+"  \\da [PATRсN]    listar funciones de agregaciСn\n"
+
+#: help.c:214
+msgid "  \\dc [PATTERN]  list conversions\n"
+msgstr ""
+"  \\dc [PATRсN]    listar conversiones\n"
+
+#: help.c:215
+msgid "  \\dC            list casts\n"
+msgstr ""
+"  \\dC             listar conversiones de tipo (casts)\n"
+
+#: help.c:216
+msgid "  \\dd [PATTERN]  show comment for object\n"
+msgstr ""
+"  \\dd [PATRсN]    listar comentarios de objetos\n"
+
+#: help.c:217
+msgid "  \\dD [PATTERN]  list domains\n"
+msgstr ""
+"  \\dD [PATRсN]    listar dominios\n"
+
+#: help.c:218
+msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
+msgstr ""
+"  \\df [PATRсN]    listar funciones (\"+\" para mАs detalles)\n"
+
+#: help.c:219
+msgid "  \\dn [PATTERN]  list schemas\n"
+msgstr ""
+"  \\dn [PATRсN]    listar esquemas\n"
+
+#: help.c:220
+msgid "  \\do [NAME]     list operators\n"
+msgstr ""
+"  \\do [NOMBRE]    listar operadores\n"
+
+#: help.c:221
+msgid "  \\dl            list large objects, same as \\lo_list\n"
+msgstr ""
+"  \\dl             listar objetos grandes, lo mismo que \\lo_list\n"
+
+#: help.c:222
+msgid "  \\dp [PATTERN]  list table access privileges\n"
+msgstr ""
+"  \\dp [PATRсN]    listar privilegios de acceso a tablas\n"
+
+#: help.c:223
+msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
+msgstr ""
+"  \\dT [PATRсN]    listar tipos de dato (\"+\" para mАs detalles)\n"
+
+#: help.c:224
+msgid "  \\du [PATTERN]  list users\n"
+msgstr ""
+"  \\du [PATRсN]    listar usuarios\n"
+
+#: help.c:225
+msgid "  \\l             list all databases (add \"+\" for more detail)\n"
+msgstr ""
+"  \\l              listar todas las bases de datos (\"+\" para mАs detalles)\n"
+
+#: help.c:226
+msgid "  \\z [PATTERN]   list table access privileges (same as \\dp)\n"
+msgstr ""
+"  \\z [PATRсN]     listar privilegios de acceso a tablas (lo mismo que \\dp)\n"
+
+#: help.c:229
+msgid "Formatting\n"
+msgstr "Formato\n"
+
+#: help.c:230
+msgid "  \\a             toggle between unaligned and aligned output mode\n"
+msgstr ""
+"  \\a              cambiar entre modo de salida alineado y sin alinear\n"
+
+#: help.c:231
+msgid "  \\C [STRING]    set table title, or unset if none\n"
+msgstr ""
+"  \\C [CADENA]     definir tМtulo de tabla, o indefinir si es vacМo\n"
+
+#: help.c:232
+msgid ""
+"  \\f [STRING]    show or set field separator for unaligned query output\n"
+msgstr ""
+"  \\f [CADENA]     mostrar o definir separador de campos para\n"
+"                  modo de salida sin alinear\n"
+
+#: help.c:233
+#, c-format
+msgid "  \\H             toggle HTML output mode (currently %s)\n"
+msgstr ""
+"  \\H              cambiar modo de salida HTML (actualmente %s)\n"
+
+#: help.c:235
+msgid ""
+"  \\pset NAME [VALUE]\n"
+"                 set table output option\n"
+"                 (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
+"                 tuples_only|title|tableattr|pager})\n"
+msgstr ""
+"  \\pset OPCIсN [VALOR]\n"
+"                  definir opciСn de salida de tablas\n"
+"                  (OPCIсN := {format|border|expanded|fieldsep|null|\n"
+"                  recordsep|tuples_only|title|tableattr|pager})\n"
+
+#: help.c:239
+#, c-format
+msgid "  \\t             show only rows (currently %s)\n"
+msgstr ""
+"  \\t              mostrar sСlo registros (actualmente %s)\n"
+
+#: help.c:241
+msgid "  \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
+msgstr ""
+"  \\T [CADENA]     definir atributos HTML de <table>, o indefinir si es "
+"vacМo\n"
+
+#: help.c:242
+#, c-format
+msgid "  \\x             toggle expanded output (currently %s)\n"
+msgstr ""
+"  \\x              cambiar modo expandido (actualmente %s)\n"
+
+#: help.c:246
+msgid "Copy, Large Object\n"
+msgstr "Copy, Objetos Grandes\n"
+
+#: help.c:247
+msgid ""
+"  \\copy ...      perform SQL COPY with data stream to the client host\n"
+msgstr ""
+"  \\copy ...       ejecutar comando SQL COPY con flujo de datos al cliente\n"
+
+#: help.c:248
+msgid ""
+"  \\lo_export\n"
+"  \\lo_import\n"
+"  \\lo_list\n"
+"  \\lo_unlink     large object operations\n"
+msgstr ""
+"  \\lo_export\n"
+"  \\lo_import\n"
+"  \\lo_list\n"
+"  \\lo_unlink      operaciones con objetos grandes\n"
+
+#: help.c:281
+msgid "Available help:\n"
+msgstr "Ayuda disponible:\n"
+
+#: help.c:319
+#, c-format
+msgid ""
+"Command:     %s\n"
+"Description: %s\n"
+"Syntax:\n"
+"%s\n"
+"\n"
+msgstr ""
+"Comando:     %s\n"
+"DescripciСn: %s\n"
+"Sintaxis:\n"
+"%s\n"
+
+#: help.c:330
+#, c-format
+msgid ""
+"No help available for \"%-.*s\".\n"
+"Try \\h with no arguments to see available help.\n"
+msgstr ""
+"No hay ayuda disponible para \"%-.*s\".\n"
+"Pruebe \\h sin argumentos para mostrar los elementos de ayuda disponibles.\n"
+
+#: input.c:221
+#, c-format
+msgid "could not save history to file \"%s\": %s\n"
+msgstr "no se pudo guardar historial a archivo \"%s\": %s\n"
+
+#: large_obj.c:39
+#, c-format
+msgid "%s: not connected to a database\n"
+msgstr "%s: no estА conectado a una base de datos\n"
+
+#: large_obj.c:58
+#, c-format
+msgid "%s: current transaction is aborted\n"
+msgstr "%s: transacciСn en curso estА abortada\n"
+
+#: large_obj.c:61
+#, c-format
+msgid "%s: unknown transaction status\n"
+msgstr "%s: estado de transacciСn desconocido\n"
+
+#: large_obj.c:278 describe.c:106 describe.c:157 describe.c:230 describe.c:292
+#: describe.c:339 describe.c:438 describe.c:718 describe.c:1338
+msgid "Description"
+msgstr "DescripciСn"
+
+#: large_obj.c:286
+msgid "Large objects"
+msgstr "Objetos grandes"
+
+#: mainloop.c:205
+#, c-format
+msgid "Use \"\\q\" to leave %s.\n"
+msgstr "Use \"\\q\" para salir de %s.\n"
+
+#: print.c:417
+msgid "(No rows)\n"
+msgstr "(Sin registros)\n"
+
+#: print.c:1180
+msgid "(1 row)"
+msgstr "(1 registro)"
+
+#: print.c:1182
+#, c-format
+msgid "(%d rows)"
+msgstr "(%d registros)"
+
+#: startup.c:131 startup.c:570
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: memoria agotada.\n"
+
+#: startup.c:170
+msgid "User name: "
+msgstr "Nombre de usuario: "
+
+#: startup.c:266
+#, c-format
+msgid ""
+"Welcome to %s %s, the PostgreSQL interactive terminal.\n"
+"\n"
+"Type:  \\copyright for distribution terms\n"
+"       \\h for help with SQL commands\n"
+"       \\? for help on internal slash commands\n"
+"       \\g or terminate with semicolon to execute query\n"
+"       \\q to quit\n"
+"\n"
+msgstr ""
+"Bienvenido a %s %s, el terminal interactivo de PostgreSQL.\n"
+"\n"
+"Digite:  \\copyright para ver los tИrminos de distribuciСn\n"
+"         \\h para obtener ayuda sobre comandos SQL\n"
+"         \\? para obtener ayuda sobre comandos internos\n"
+"         \\g o termine con punto y coma (;) para ejecutar consulta\n"
+"         \\q para salir\n"
+
+#: startup.c:424
+#, c-format
+msgid "%s: couldn't set printing parameter \"%s\"\n"
+msgstr "%s: no se ha podido definir parАmetro de despliegue \"%s\"\n"
+
+#: startup.c:470
+#, c-format
+msgid "%s: could not delete variable \"%s\"\n"
+msgstr "%s: no se ha podido eliminar variable \"%s\"\n"
+
+#: startup.c:480
+#, c-format
+msgid "%s: could not set variable \"%s\"\n"
+msgstr "%s: no se ha podido definir variable \"%s\"\n"
+
+#: startup.c:511 startup.c:517
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Use \"%s --help\" para obtener mАs informaciСn.\n"
+
+#: startup.c:535
+#, c-format
+msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
+msgstr "%s: atenciСn: se ignorС argumento extra \"%s\" en lМnea de comandos\n"
+
+#: startup.c:542
+#, c-format
+msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
+msgstr "%s: AtenciСn: La opciСn -u estА obsoleta. Use -U.\n"
+
+#: startup.c:599
+msgid "contains support for command-line editing"
+msgstr "incluye soporte para ediciСn de lМnea de comandos"
+
+#: startup.c:622
+#, c-format
+msgid ""
+"SSL connection (cipher: %s, bits: %i)\n"
+"\n"
+msgstr "conexiСn SSL (cifrado: %s, bits: %i)\n"
+
+#: describe.c:105 describe.c:147 describe.c:217 describe.c:290 describe.c:384
+#: describe.c:438 describe.c:1331 describe.c:1437 describe.c:1485
+msgid "Schema"
+msgstr "Schema"
+
+#: describe.c:105 describe.c:147 describe.c:217 describe.c:290 describe.c:332
+#: describe.c:438 describe.c:1331 describe.c:1438 describe.c:1486
+#: describe.c:1581
+msgid "Name"
+msgstr "Nombre"
+
+#: describe.c:105
+msgid "(all types)"
+msgstr "(todos los tipos)"
+
+#: describe.c:106
+msgid "Data type"
+msgstr "Tipo de dato"
+
+#: describe.c:120
+msgid "List of aggregate functions"
+msgstr "Listado de funciones de agregaciСn"
+
+#: describe.c:147
+msgid "Result data type"
+msgstr "Tipo de dato de salida"
+
+#: describe.c:148
+msgid "Argument data types"
+msgstr "Tipos de datos de argumentos"
+
+#: describe.c:156 describe.c:332 describe.c:1333 describe.c:1582
+msgid "Owner"
+msgstr "DueЯo"
+
+#: describe.c:156
+msgid "Language"
+msgstr "Lenguaje"
+
+#: describe.c:157
+msgid "Source code"
+msgstr "CСdigo fuente"
+
+#: describe.c:191
+msgid "List of functions"
+msgstr "Listado de funciones"
+
+#: describe.c:227
+msgid "Internal name"
+msgstr "Nombre interno"
+
+#: describe.c:227
+msgid "Size"
+msgstr "TamaЯo"
+
+#: describe.c:259
+msgid "List of data types"
+msgstr "Listado de tipos de dato"
+
+#: describe.c:291
+msgid "Left arg type"
+msgstr "Tipo de 1er arg"
+
+#: describe.c:291
+msgid "Right arg type"
+msgstr "Tipo de 2o arg"
+
+#: describe.c:292
+msgid "Result type"
+msgstr "Tipo resultado"
+
+#: describe.c:306
+msgid "List of operators"
+msgstr "Listado de operadores"
+
+#: describe.c:335
+msgid "Encoding"
+msgstr "CodificaciСn"
+
+#: describe.c:351
+msgid "List of databases"
+msgstr "Listado de base de datos"
+
+#: describe.c:384 describe.c:1348
+msgid "Table"
+msgstr "Tabla"
+
+#: describe.c:384
+msgid "Access privileges"
+msgstr "Privilegios"
+
+#: describe.c:406
+#, c-format
+msgid "Access privileges for database \"%s\""
+msgstr "Privilegios para base de datos \"%s\""
+
+#: describe.c:438
+msgid "Object"
+msgstr "Objeto"
+
+#: describe.c:449
+msgid "aggregate"
+msgstr "funciСn de agregaciСn"
+
+#: describe.c:467
+msgid "function"
+msgstr "funciСn"
+
+#: describe.c:481
+msgid "operator"
+msgstr "operador"
+
+#: describe.c:495
+msgid "data type"
+msgstr "tipo de dato"
+
+#: describe.c:512 describe.c:1332
+msgid "table"
+msgstr "tabla"
+
+#: describe.c:512 describe.c:1332
+msgid "view"
+msgstr "vista"
+
+#: describe.c:512 describe.c:1332
+msgid "index"
+msgstr "Мndice"
+
+#: describe.c:512 describe.c:1332
+msgid "sequence"
+msgstr "secuencia"
+
+#: describe.c:528
+msgid "rule"
+msgstr "regla"
+
+#: describe.c:544
+msgid "trigger"
+msgstr ""
+
+#: describe.c:562
+msgid "Object descriptions"
+msgstr "Descripciones de objetos"
+
+#: describe.c:608
+#, c-format
+msgid "Did not find any relation named \"%s\".\n"
+msgstr "No se encontrС relaciСn llamada \"%s\".\n"
+
+#: describe.c:691
+#, c-format
+msgid "Did not find any relation with OID %s.\n"
+msgstr "No se encontrС relaciСn con OID %s.\n"
+
+#: describe.c:704
+msgid "Column"
+msgstr "Columna"
+
+#: describe.c:705 describe.c:1333 describe.c:1439
+msgid "Type"
+msgstr "Tipo"
+
+#: describe.c:712
+msgid "Modifiers"
+msgstr "Modificadores"
+
+#: describe.c:819
+#, c-format
+msgid "Table \"%s.%s\""
+msgstr "Tabla \"%s.%s\""
+
+#: describe.c:823
+#, c-format
+msgid "View \"%s.%s\""
+msgstr "Vista \"%s.%s\""
+
+#: describe.c:827
+#, c-format
+msgid "Sequence \"%s.%s\""
+msgstr "Secuencia \"%s.%s\""
+
+#: describe.c:831
+#, c-format
+msgid "Index \"%s.%s\""
+msgstr "мndice \"%s.%s\""
+
+#: describe.c:835
+#, c-format
+msgid "Special relation \"%s.%s\""
+msgstr "RelaciСn especial \"%s.%s\""
+
+#: describe.c:839
+#, c-format
+msgid "TOAST table \"%s.%s\""
+msgstr "Tabla TOAST \"%s.%s\""
+
+#: describe.c:843
+#, c-format
+msgid "Composite type \"%s.%s\""
+msgstr "Tipo compuesto \"%s.%s\""
+
+#: describe.c:847
+#, c-format
+msgid "?%c? \"%s.%s\""
+msgstr "?%c? \"%s.%s\""
+
+#: describe.c:883
+msgid "primary key, "
+msgstr "llave primaria, "
+
+#: describe.c:885
+msgid "unique, "
+msgstr "Зnico, "
+
+#: describe.c:891
+#, c-format
+msgid "for table \"%s.%s\""
+msgstr "de tabla \"%s.%s\""
+
+#: describe.c:929
+#, c-format
+msgid "View definition: %s"
+msgstr "DefiniciСn de vista: %s"
+
+#: describe.c:935
+msgid "Rules"
+msgstr "Reglas"
+
+#: describe.c:1083
+msgid "Indexes:"
+msgstr "мndices:"
+
+#: describe.c:1091
+#, c-format
+msgid "    \"%s\""
+msgstr "    \"%s\""
+
+#: describe.c:1097
+msgid " primary key,"
+msgstr " llave primaria,"
+
+#: describe.c:1099
+msgid " unique,"
+msgstr " Зnico,"
+
+#: describe.c:1116
+msgid "Check constraints:"
+msgstr "Restricciones CHECK:"
+
+#: describe.c:1120
+#, c-format
+msgid "    \"%s\" CHECK %s"
+msgstr "    \"%s\" CHECK %s"
+
+#: describe.c:1130
+msgid "Foreign-key constraints:"
+msgstr "Restricciones de llave forАnea:"
+
+#: describe.c:1134
+#, c-format
+msgid "    \"%s\" %s"
+msgstr "    \"%s\" %s"
+
+#: describe.c:1144
+msgid "Rules:"
+msgstr "Reglas:"
+
+#: describe.c:1162
+msgid "Triggers:"
+msgstr ""
+
+#: describe.c:1184
+msgid "Inherits"
+msgstr "Hereda"
+
+#: describe.c:1270
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#: describe.c:1270
+msgid "User ID"
+msgstr "ID de usuario"
+
+#: describe.c:1271
+msgid "superuser, create database"
+msgstr "superusuario, crea bases de datos"
+
+#: describe.c:1272
+msgid "superuser"
+msgstr "superusuario"
+
+#: describe.c:1272
+msgid "create database"
+msgstr "crea bases de datos"
+
+#: describe.c:1273
+msgid "Attributes"
+msgstr "Atributos"
+
+#: describe.c:1286
+msgid "List of database users"
+msgstr "Listado de usuarios de la base de datos"
+
+#: describe.c:1333
+msgid "special"
+msgstr "especial"
+
+#: describe.c:1394
+msgid "No matching relations found.\n"
+msgstr "No se encontraron relaciones coincidentes.\n"
+
+#: describe.c:1396
+msgid "No relations found.\n"
+msgstr "No se encontraron relaciones.\n"
+
+#: describe.c:1401
+msgid "List of relations"
+msgstr "Listado de relaciones"
+
+#: describe.c:1440
+msgid "Modifier"
+msgstr "Modificador"
+
+#: describe.c:1454
+msgid "List of domains"
+msgstr "Listado de dominios"
+
+#: describe.c:1487
+msgid "Source"
+msgstr "Fuente"
+
+#: describe.c:1488
+msgid "Destination"
+msgstr "Destino"
+
+#: describe.c:1489 describe.c:1546
+msgid "yes"
+msgstr "sМ"
+
+#: describe.c:1490 describe.c:1544
+msgid "no"
+msgstr "no"
+
+#: describe.c:1491
+msgid "Default?"
+msgstr "Por omisiСn?"
+
+#: describe.c:1505
+msgid "List of conversions"
+msgstr "Listado de conversiones"
+
+#: describe.c:1540
+msgid "Source type"
+msgstr "Tipo fuente"
+
+#: describe.c:1541
+msgid "Target type"
+msgstr "Tipo destino"
+
+#: describe.c:1542
+msgid "(binary compatible)"
+msgstr "(binario-compatible)"
+
+#: describe.c:1543
+msgid "Function"
+msgstr "FunciСn"
+
+#: describe.c:1545
+msgid "in assignment"
+msgstr "en asignaciСn"
+
+#: describe.c:1547
+msgid "Implicit?"
+msgstr "ImplМcito?"
+
+#: describe.c:1555
+msgid "List of casts"
+msgstr "Listado de conversiones de tipo (casts)"
+
+#: describe.c:1596
+msgid "List of schemas"
+msgstr "Listado de schemas"
+
diff --git a/src/bin/psql/po/ru.po b/src/bin/psql/po/ru.po
index 448fc7e0390..654f0aa3995 100644
--- a/src/bin/psql/po/ru.po
+++ b/src/bin/psql/po/ru.po
@@ -1,19 +1,19 @@
 # ru.po
 # PSQL Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.5 2003/08/01 16:19:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/po/Attic/ru.po,v 1.6 2003/08/24 21:18:52 petere Exp $
 #
 # ChangeLog:
-#   - July 26-31, 2003: Update for 7.4.x; <mokhov@cs.concordia.ca>
+#   - July 26 - August 23, 2003: Update for 7.4.x; <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
-#   - August 2001 - August 2002: Maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - August 2001 - August 2002: Transaltion and maintenance, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
-"POT-Creation-Date: 2003-07-26 04:19-0300\n"
-"PO-Revision-Date: 2003-07-31 22:22-0500\n"
+"POT-Creation-Date: 2003-08-23 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 14:00-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"
@@ -82,12 +82,12 @@ msgstr "История записана в файл \"%s\".\n"
 #: command.c:1160
 #: command.c:1257
 #: command.c:1975
-#: common.c:81
+#: common.c:80
 #: copy.c:88
 #: copy.c:116
 #: describe.c:51
 #: mainloop.c:78
-#: mainloop.c:340
+#: mainloop.c:341
 msgid "out of memory\n"
 msgstr "недостаточно памяти\n"
 
@@ -117,8 +117,8 @@ msgstr "Cекундомер выключен."
 #: command.c:1669
 #: command.c:1691
 #: command.c:1721
-#: common.c:130
-#: copy.c:379
+#: common.c:129
+#: copy.c:378
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
@@ -136,16 +136,16 @@ msgstr "ошибка при анализе синтаксиса в конце строки\n"
 
 #: command.c:1362
 #: command.c:1386
-#: startup.c:176
-#: startup.c:194
+#: startup.c:173
+#: startup.c:191
 msgid "Password: "
 msgstr "Пароль: "
 
 #: command.c:1400
-#: common.c:176
-#: common.c:346
+#: common.c:175
+#: common.c:345
 #: common.c:396
-#: common.c:612
+#: common.c:611
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -284,29 +284,29 @@ msgstr "\\pset: неизвестная опция: %s\n"
 msgid "\\!: failed\n"
 msgstr "\\!: неудачно\n"
 
-#: common.c:74
+#: common.c:73
 #, c-format
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: xstrdup: не возможно сделать копию нулевого указателя (внутренняя ошибка)\n"
 
-#: common.c:258
+#: common.c:257
 msgid "connection to server was lost\n"
 msgstr "подсоединение к серверу было потеряно\n"
 
-#: common.c:262
+#: common.c:261
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Подсоединение к серверу было потеряно. Попытка переустановить: "
 
-#: common.c:267
+#: common.c:266
 msgid "Failed.\n"
 msgstr "Безуспешно.\n"
 
-#: common.c:274
+#: common.c:273
 msgid "Succeeded.\n"
 msgstr "Успешно.\n"
 
 #: common.c:372
-#: common.c:580
+#: common.c:579
 msgid "You are currently not connected to a database.\n"
 msgstr "В данный момент вы не подсоединены к базе данных.\n"
 
@@ -315,7 +315,7 @@ msgstr "В данный момент вы не подсоединены к базе данных.\n"
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "Получено асинхронное оповещение \"%s\" от процесса-сервера с PID %d.\n"
 
-#: common.c:535
+#: common.c:531
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -323,12 +323,12 @@ msgstr ""
 "Введите данные для копирования с последующим символом новой строки (newline).\n"
 "Закончите с обратным слешем и точкой на самой линии."
 
-#: common.c:552
+#: common.c:550
 #, c-format
 msgid "Time: %.2f ms\n"
 msgstr "Время: %.2f тс\n"
 
-#: common.c:588
+#: common.c:587
 #, c-format
 msgid ""
 "***(Single step mode: verify command)*******************************************\n"
@@ -343,26 +343,26 @@ msgstr ""
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: необходимы аргументы\n"
 
-#: copy.c:290
+#: copy.c:289
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: ошибка при анализе синтаксиса в \"%s\"\n"
 
-#: copy.c:292
+#: copy.c:291
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: ошибка при анализе синтаксиса в конце строки\n"
 
-#: copy.c:390
+#: copy.c:389
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: нельзя использовать COPY TO/FROM для директорий\n"
 
-#: copy.c:411
+#: copy.c:410
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\copy: %s"
 
-#: copy.c:415
+#: copy.c:414
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: неожидаемый ответ (%d)\n"
@@ -428,7 +428,7 @@ msgstr "  -X              не читать файл настроек при старте (~/.psqlrc)"
 
 #: help.c:99
 msgid "  --help          show this help, then exit"
-msgstr "  --help          показать эту позсказку и выйти"
+msgstr "  --help          показать эту подсказку и выйти"
 
 #: help.c:100
 msgid "  --version       output version information, then exit"
@@ -674,7 +674,7 @@ msgstr ""
 
 #: help.c:209
 msgid "Informational\n"
-msgstr "Иформационные\n"
+msgstr "Информационные\n"
 
 #: help.c:210
 msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
@@ -839,7 +839,7 @@ msgstr ""
 "Нет справки по \"%-.*s\".\n"
 "Попробуйте \\h без аргументов для просмотра имеющейся помощи.\n"
 
-#: input.c:221
+#: input.c:226
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "не получилось сохранить историю в \"%s\": %s\n"
@@ -857,7 +857,7 @@ msgstr "%s: текущая транзакция отменена\n"
 #: large_obj.c:61
 #, c-format
 msgid "%s: unknown transaction status\n"
-msgstr "%s: неизвестное состояние транзации\n"
+msgstr "%s: неизвестное состояние транзакции\n"
 
 #: describe.c:106
 #: describe.c:157
@@ -866,7 +866,7 @@ msgstr "%s: неизвестное состояние транзации\n"
 #: describe.c:339
 #: describe.c:438
 #: describe.c:718
-#: describe.c:1338
+#: describe.c:1343
 #: large_obj.c:278
 msgid "Description"
 msgstr "Описание"
@@ -875,35 +875,35 @@ msgstr "Описание"
 msgid "Large objects"
 msgstr "Большие объекты"
 
-#: mainloop.c:205
+#: mainloop.c:206
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "Используйте \"\\q\" чтобы выйти из %s.\n"
 
-#: print.c:417
+#: print.c:421
 msgid "(No rows)\n"
 msgstr "(Нет записей)\n"
 
-#: print.c:1180
+#: print.c:1186
 msgid "(1 row)"
 msgstr "(1 запись)"
 
-#: print.c:1182
+#: print.c:1188
 #, c-format
 msgid "(%d rows)"
 msgstr "(записей: %d)"
 
-#: startup.c:131
-#: startup.c:570
+#: startup.c:128
+#: startup.c:567
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: недостаточно памяти\n"
 
-#: startup.c:170
+#: startup.c:167
 msgid "User name: "
 msgstr "Имя пользователя: "
 
-#: startup.c:266
+#: startup.c:263
 #, c-format
 msgid ""
 "Welcome to %s %s, the PostgreSQL interactive terminal.\n"
@@ -924,42 +924,42 @@ msgstr ""
 "           \\q для выхода\n"
 "\n"
 
-#: startup.c:424
+#: startup.c:421
 #, c-format
 msgid "%s: couldn't set printing parameter \"%s\"\n"
 msgstr "%s: не получилось установить параметр печати \"%s\"\n"
 
-#: startup.c:470
+#: startup.c:467
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: не получилось удалить переменную \"%s\"\n"
 
-#: startup.c:480
+#: startup.c:477
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: не получилось установить переменную \"%s\"\n"
 
-#: startup.c:511
-#: startup.c:517
+#: startup.c:508
+#: startup.c:514
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Наберите \"%s --help\" для более подробной информации.\n"
 
-#: startup.c:535
+#: startup.c:532
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: внимание: излишняя опция: \"%s\" -- проигнорирована\n"
 
-#: startup.c:542
+#: startup.c:539
 #, c-format
 msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 msgstr "%s: Внимание: Опция -u устарела. Используйте -U.\n"
 
-#: startup.c:599
+#: startup.c:596
 msgid "contains support for command-line editing"
 msgstr "поддерживает редактирование командной строки"
 
-#: startup.c:622
+#: startup.c:619
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -974,9 +974,9 @@ msgstr ""
 #: describe.c:290
 #: describe.c:384
 #: describe.c:438
-#: describe.c:1331
-#: describe.c:1437
-#: describe.c:1485
+#: describe.c:1336
+#: describe.c:1442
+#: describe.c:1490
 msgid "Schema"
 msgstr "Схема"
 
@@ -986,10 +986,10 @@ msgstr "Схема"
 #: describe.c:290
 #: describe.c:332
 #: describe.c:438
-#: describe.c:1331
-#: describe.c:1438
-#: describe.c:1486
-#: describe.c:1581
+#: describe.c:1336
+#: describe.c:1443
+#: describe.c:1491
+#: describe.c:1586
 msgid "Name"
 msgstr "Имя"
 
@@ -1007,7 +1007,7 @@ msgstr "Список агрегатных функций"
 
 #: describe.c:147
 msgid "Result data type"
-msgstr "Результирующий тип данных"
+msgstr "Тип данных результата"
 
 #: describe.c:148
 msgid "Argument data types"
@@ -1015,8 +1015,8 @@ msgstr "Типы данных аргументов"
 
 #: describe.c:156
 #: describe.c:332
-#: describe.c:1333
-#: describe.c:1582
+#: describe.c:1338
+#: describe.c:1587
 msgid "Owner"
 msgstr "Владелец"
 
@@ -1069,7 +1069,7 @@ msgid "List of databases"
 msgstr "Список баз данных"
 
 #: describe.c:384
-#: describe.c:1348
+#: describe.c:1353
 msgid "Table"
 msgstr "Таблица"
 
@@ -1103,22 +1103,22 @@ msgid "data type"
 msgstr "тип данных"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "table"
 msgstr "таблица"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "view"
 msgstr "вид"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "index"
 msgstr "индекс"
 
 #: describe.c:512
-#: describe.c:1332
+#: describe.c:1337
 msgid "sequence"
 msgstr "последовательность"
 
@@ -1149,8 +1149,8 @@ msgid "Column"
 msgstr "Колонка"
 
 #: describe.c:705
-#: describe.c:1333
-#: describe.c:1439
+#: describe.c:1338
+#: describe.c:1444
 msgid "Type"
 msgstr "Тип"
 
@@ -1213,168 +1213,172 @@ msgstr "для таблицы \"%s.%s\""
 
 #: describe.c:929
 #, c-format
-msgid "View definition: %s"
-msgstr "Определение вида: %s"
+msgid ""
+"View definition:\n"
+"%s"
+msgstr ""
+"Определение вида:\n"
+"%s"
 
 #: describe.c:935
 msgid "Rules"
 msgstr "Правила"
 
-#: describe.c:1083
+#: describe.c:1084
 msgid "Indexes:"
 msgstr "Индексы:"
 
-#: describe.c:1091
+#: describe.c:1092
 #, c-format
 msgid "    \"%s\""
 msgstr "    \"%s\""
 
-#: describe.c:1097
+#: describe.c:1098
 msgid " primary key,"
 msgstr " ключевое поле,"
 
-#: describe.c:1099
+#: describe.c:1100
 msgid " unique,"
 msgstr " unique,"
 
-#: describe.c:1116
+#: describe.c:1118
 msgid "Check constraints:"
 msgstr "CHECK-констрэйнты:"
 
-#: describe.c:1120
+#: describe.c:1122
 #, c-format
 msgid "    \"%s\" CHECK %s"
 msgstr "    \"%s\" CHECK %s"
 
 # TO REWVIEW
-#: describe.c:1130
+#: describe.c:1133
 msgid "Foreign-key constraints:"
 msgstr "Ограничения по вторичному ключу:"
 
-#: describe.c:1134
+#: describe.c:1137
 #, c-format
 msgid "    \"%s\" %s"
 msgstr "    \"%s\" %s"
 
-#: describe.c:1144
+#: describe.c:1148
 msgid "Rules:"
 msgstr "Правила:"
 
-#: describe.c:1162
+#: describe.c:1167
 msgid "Triggers:"
 msgstr "Триггеры:"
 
-#: describe.c:1184
+#: describe.c:1189
 msgid "Inherits"
 msgstr "Наследует"
 
-#: describe.c:1270
+#: describe.c:1275
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: describe.c:1270
+#: describe.c:1275
 msgid "User ID"
 msgstr "ID пользователя"
 
-#: describe.c:1271
+#: describe.c:1276
 msgid "superuser, create database"
 msgstr "superuser: создание базы данных"
 
-#: describe.c:1272
+#: describe.c:1277
 msgid "superuser"
 msgstr "superuser"
 
-#: describe.c:1272
+#: describe.c:1277
 msgid "create database"
 msgstr "создание базы данных"
 
-#: describe.c:1273
+#: describe.c:1278
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: describe.c:1286
+#: describe.c:1291
 msgid "List of database users"
 msgstr "Список пользователей базы данных"
 
-#: describe.c:1333
+#: describe.c:1338
 msgid "special"
 msgstr "особенный"
 
-#: describe.c:1394
+#: describe.c:1399
 msgid "No matching relations found.\n"
 msgstr "Подходящих связей не найдено.\n"
 
-#: describe.c:1396
+#: describe.c:1401
 msgid "No relations found.\n"
 msgstr "Связи не найдены.\n"
 
-#: describe.c:1401
+#: describe.c:1406
 msgid "List of relations"
 msgstr "Список связей"
 
-#: describe.c:1440
+#: describe.c:1445
 msgid "Modifier"
 msgstr "Модификаторы"
 
-#: describe.c:1454
+#: describe.c:1459
 msgid "List of domains"
 msgstr "Список доменов"
 
-#: describe.c:1487
+#: describe.c:1492
 msgid "Source"
 msgstr "Источник"
 
-#: describe.c:1488
+#: describe.c:1493
 msgid "Destination"
 msgstr "Назначение"
 
-#: describe.c:1489
-#: describe.c:1546
+#: describe.c:1494
+#: describe.c:1551
 msgid "yes"
 msgstr "да"
 
-#: describe.c:1490
-#: describe.c:1544
+#: describe.c:1495
+#: describe.c:1549
 msgid "no"
 msgstr "нет"
 
-#: describe.c:1491
+#: describe.c:1496
 msgid "Default?"
 msgstr "По умолчанию?"
 
-#: describe.c:1505
+#: describe.c:1510
 msgid "List of conversions"
 msgstr "Список конверсий"
 
-#: describe.c:1540
+#: describe.c:1545
 msgid "Source type"
 msgstr "Исходный тип"
 
-#: describe.c:1541
+#: describe.c:1546
 msgid "Target type"
 msgstr "Тип назначения"
 
-#: describe.c:1542
+#: describe.c:1547
 msgid "(binary compatible)"
 msgstr "(двоично-совместимый)"
 
-#: describe.c:1543
+#: describe.c:1548
 msgid "Function"
 msgstr "Функция"
 
-#: describe.c:1545
+#: describe.c:1550
 msgid "in assignment"
 msgstr "в присвоении"
 
-#: describe.c:1547
+#: describe.c:1552
 msgid "Implicit?"
-msgstr "Поздразмевается?"
+msgstr "Подразумевается?"
 
-#: describe.c:1555
+#: describe.c:1560
 msgid "List of casts"
 msgstr "Список конверсий типов"
 
-#: describe.c:1596
+#: describe.c:1601
 msgid "List of schemas"
 msgstr "Список схем"
 
diff --git a/src/bin/scripts/po/ru.po b/src/bin/scripts/po/ru.po
index eec0b094204..0fa231765da 100644
--- a/src/bin/scripts/po/ru.po
+++ b/src/bin/scripts/po/ru.po
@@ -1,24 +1,24 @@
 # ru.po
 # PGSCRIPTS Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/bin/scripts/po/Attic/ru.po,v 1.1 2003/08/01 16:19:14 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/po/Attic/ru.po,v 1.2 2003/08/24 21:18:52 petere Exp $
 #
 # ChangeLog:
-#   - July 24-26, 2003: Initial Translation for 7.4.*; Serguei A. Mokhov, <mokhov@cs.concordia.ca>
+#   - July 24 - August 23, 2003: Initial Translation for 7.4.*; Serguei A. Mokhov, <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
 "POT-Creation-Date: 2003-07-23 04:18-0300\n"
-"PO-Revision-Date: 2003-07-26 20:25-0500\n"
+"PO-Revision-Date: 2003-08-23 12:44-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"
 
-#: clusterdb.c:94
-#: clusterdb.c:109
+#: clusterdb.c:96
+#: clusterdb.c:111
 #: createdb.c:101
 #: createdb.c:120
 #: createlang.c:94
@@ -34,38 +34,38 @@ msgstr ""
 #: droplang.c:151
 #: dropuser.c:83
 #: dropuser.c:98
-#: vacuumdb.c:110
-#: vacuumdb.c:125
+#: vacuumdb.c:112
+#: vacuumdb.c:127
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Наберите \"%s --help\" для более подробной информации.\n"
 
-#: clusterdb.c:107
+#: clusterdb.c:109
 #: createdb.c:118
 #: createlang.c:113
 #: createuser.c:129
 #: dropdb.c:98
 #: droplang.c:107
 #: dropuser.c:96
-#: vacuumdb.c:123
+#: vacuumdb.c:125
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr ""
+msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
 
 #: createdb.c:128
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
-msgstr ""
+msgstr "%s: \"%s\" не является верным именем кодировки\n"
 
 #: createdb.c:170
 #, c-format
 msgid "%s: database creation failed: %s"
-msgstr ""
+msgstr "%s: создание базы не удалось: %s"
 
 #: createdb.c:195
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
-msgstr ""
+msgstr "%s: создание комментария не удалось (база была создана): %s"
 
 #: createdb.c:213
 #, c-format
@@ -73,31 +73,33 @@ msgid ""
 "%s creates a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s создаёт базу PostgreSQL.\n"
+"\n"
 
-#: clusterdb.c:228
+#: clusterdb.c:232
 #: createdb.c:214
 #: createlang.c:272
-#: createuser.c:235
+#: createuser.c:236
 #: dropdb.c:143
-#: droplang.c:241
+#: droplang.c:242
 #: dropuser.c:143
-#: vacuumdb.c:252
+#: vacuumdb.c:256
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
 #: createdb.c:215
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ИМЯБД] [ОПИСАНИЕ]\n"
 
-#: clusterdb.c:230
+#: clusterdb.c:234
 #: createdb.c:216
 #: createlang.c:274
-#: createuser.c:237
+#: createuser.c:238
 #: dropdb.c:145
-#: droplang.c:243
+#: droplang.c:244
 #: dropuser.c:145
-#: vacuumdb.c:254
+#: vacuumdb.c:258
 msgid ""
 "\n"
 "Options:\n"
@@ -107,125 +109,133 @@ msgstr ""
 
 #: createdb.c:217
 msgid "  -D, --location=PATH       alternative place to store the database\n"
-msgstr ""
+msgstr "  -D, --location=ПУТЬ       альтернативное место хранения базы\n"
 
 #: createdb.c:218
 msgid "  -E, --encoding=ENCODING   encoding for the database\n"
-msgstr ""
+msgstr "  -E, --encoding=КОДИРОВКА  кодировка для базы\n"
 
 #: createdb.c:219
 msgid "  -O, --owner=OWNER         database user to own the new database\n"
-msgstr ""
+msgstr "  -O, --owner=ВЛАДЕЛЕЦ      пользователь-владелец новой базы\n"
 
 #: createdb.c:220
 msgid "  -T, --template=TEMPLATE   template database to copy\n"
-msgstr ""
+msgstr "  -T, --template=ШАБЛОН     база-шаблон для копирования\n"
 
-#: clusterdb.c:234
+#: clusterdb.c:238
 #: createdb.c:221
 #: createlang.c:276
-#: createuser.c:246
+#: createuser.c:247
 #: dropdb.c:146
-#: droplang.c:245
+#: droplang.c:246
 #: dropuser.c:146
 msgid "  -e, --echo                show the commands being sent to the server\n"
-msgstr ""
+msgstr "  -e, --echo                показывать команды отправленные серверу\n"
 
-#: clusterdb.c:235
+#: clusterdb.c:239
 #: createdb.c:222
-#: createuser.c:247
+#: createuser.c:248
 #: dropdb.c:148
 #: dropuser.c:148
 msgid "  -q, --quiet               don't write any messages\n"
-msgstr ""
+msgstr "  -q, --quiet               не показывать никакие сообщения\n"
 
-#: clusterdb.c:236
+#: clusterdb.c:240
 #: createdb.c:223
 #: createlang.c:283
-#: createuser.c:248
+#: createuser.c:249
 #: dropdb.c:153
-#: droplang.c:251
+#: droplang.c:252
 #: dropuser.c:153
 msgid "  --help                    show this help, then exit\n"
-msgstr ""
+msgstr "  --help                    показать эту спраку и выйти\n"
 
-#: clusterdb.c:237
+#: clusterdb.c:241
 #: createdb.c:224
 #: createlang.c:284
-#: createuser.c:249
+#: createuser.c:250
 #: dropdb.c:154
-#: droplang.c:252
+#: droplang.c:253
 #: dropuser.c:154
 msgid "  --version                 output version information, then exit\n"
-msgstr ""
+msgstr "  --version                 показать версию и выйти\n"
 
-#: clusterdb.c:238
+#: clusterdb.c:242
 #: createdb.c:225
-#: createuser.c:250
-#: vacuumdb.c:265
+#: createuser.c:251
+#: vacuumdb.c:269
 msgid ""
 "\n"
 "Connection options:\n"
 msgstr ""
+"\n"
+"Опции подсоединения:\n"
 
-#: clusterdb.c:239
+#: clusterdb.c:243
 #: createdb.c:226
 #: createlang.c:279
-#: createuser.c:251
+#: createuser.c:252
 #: dropdb.c:149
-#: droplang.c:247
+#: droplang.c:248
 #: dropuser.c:149
-#: vacuumdb.c:266
+#: vacuumdb.c:270
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
-msgstr ""
+msgstr "  -h, --host=ХОСТ           сервер баз данных или директория сокетов\n"
 
-#: clusterdb.c:240
+#: clusterdb.c:244
 #: createdb.c:227
 #: createlang.c:280
-#: createuser.c:252
+#: createuser.c:253
 #: dropdb.c:150
-#: droplang.c:248
+#: droplang.c:249
 #: dropuser.c:150
-#: vacuumdb.c:267
+#: vacuumdb.c:271
 msgid "  -p, --port=PORT           database server port\n"
-msgstr ""
+msgstr "  -p, --port=ПОРТ           порт сервера баз данных\n"
 
-#: clusterdb.c:241
+#: clusterdb.c:245
 #: createdb.c:228
 #: createlang.c:281
 #: dropdb.c:151
-#: droplang.c:249
-#: vacuumdb.c:268
+#: droplang.c:250
+#: vacuumdb.c:272
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr ""
+"  -U, --username=ПОЛЬЗОВАТЕЛЬ\n"
+"                            имя пользователя для подсоединения\n"
 
-#: clusterdb.c:242
+#: clusterdb.c:246
 #: createdb.c:229
 #: createlang.c:282
 #: dropdb.c:152
-#: droplang.c:250
-#: vacuumdb.c:269
+#: droplang.c:251
+#: vacuumdb.c:273
 msgid "  -W, --password            prompt for password\n"
-msgstr ""
+msgstr "  -W, --password            запросить пароль\n"
 
 #: createdb.c:230
 msgid ""
 "\n"
 "By default, a database with the same name as the current user is created.\n"
 msgstr ""
+"\n"
+"По умолчанию имя создаваемой базы такоеже как текущее имя пользователя.\n"
 
-#: clusterdb.c:244
+#: clusterdb.c:248
 #: createdb.c:231
 #: createlang.c:285
-#: createuser.c:257
+#: createuser.c:258
 #: dropdb.c:155
-#: droplang.c:253
+#: droplang.c:254
 #: dropuser.c:155
-#: vacuumdb.c:271
+#: vacuumdb.c:275
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
+"\n"
+"Сообщать об ошибках: <pgsql-bugs@postgresql.org>.\n"
 
 #: createlang.c:140
 #: droplang.c:134
@@ -245,7 +255,7 @@ msgstr "нет"
 #: createlang.c:140
 #: droplang.c:134
 msgid "Trusted?"
-msgstr ""
+msgstr "Доверяемый?"
 
 #: createlang.c:147
 #: droplang.c:141
@@ -256,26 +266,26 @@ msgstr "Процедурные Языки"
 #: droplang.c:150
 #, c-format
 msgid "%s: missing required argument language name\n"
-msgstr ""
+msgstr "%s: отсутствует необходимый аргумент -- имя языка\n"
 
 #: createlang.c:206
 #, c-format
 msgid "%s: unsupported language \"%s\"\n"
-msgstr ""
+msgstr "%s: язык \"%s\" не поддерживается\n"
 
 #: createlang.c:207
 msgid "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and plpythonu.\n"
-msgstr ""
+msgstr "Поддерживаемые языки: plpgsql, pltcl, pltclu, plperl, plperlu и plpythonu.\n"
 
 #: createlang.c:222
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
-msgstr ""
+msgstr "%s: язык \"%s\" уже установлен в базе \"%s\"\n"
 
 #: createlang.c:256
 #, c-format
 msgid "%s: language installation failed: %s"
-msgstr ""
+msgstr "%s: установка языка не удалась: %s"
 
 #: createlang.c:271
 #, c-format
@@ -283,130 +293,139 @@ msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s устанавливает процедурный язык в базу PostgreSQL.\n"
+"\n"
 
 #: createlang.c:273
-#: droplang.c:242
+#: droplang.c:243
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... ЯЗЫК [ИМЯБД]\n"
 
 #: createlang.c:275
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
-msgstr ""
+msgstr "  -d, --dbname=ИМЯБД       база в которой установить язык\n"
 
 #: createlang.c:277
-#: droplang.c:246
+#: droplang.c:247
 msgid "  -l, --list                show a list of currently installed languages\n"
-msgstr ""
+msgstr "  -l, --list                показать список установленных языков\n"
 
 #: createlang.c:278
 msgid "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-msgstr ""
+msgstr "  -L, --pglib=ДИРЕКТОРИЯ    найти файл интерпретатора в ДИРЕКТОРИИ\n"
 
 #: createuser.c:141
 #, c-format
 msgid "%s: user ID must be a positive number\n"
-msgstr ""
+msgstr "%s: ID пользователя должно быть положительным числом\n"
 
 #: createuser.c:147
 msgid "Enter name of user to add: "
-msgstr ""
+msgstr "Введите имя добавляемого пользователя: "
 
-#: createuser.c:153
+#: createuser.c:154
 msgid "Enter password for new user: "
-msgstr ""
+msgstr "Введите пароль для нового пользователя: "
 
-#: createuser.c:154
+#: createuser.c:155
 msgid "Enter it again: "
 msgstr "Введите снова: "
 
-#: createuser.c:157
+#: createuser.c:158
 msgid "Passwords didn't match.\n"
 msgstr "Пароли не совпадают.\n"
 
-#: createuser.c:168
+#: createuser.c:169
 msgid "Shall the new user be allowed to create databases? (y/n) "
-msgstr ""
+msgstr "Разрешить новому пользователю создавать базы? (y/n) "
 
-#: createuser.c:179
+#: createuser.c:180
 msgid "Shall the new user be allowed to create more new users? (y/n) "
-msgstr ""
+msgstr "Разрешить новому пользователю создавать пользователей? (y/n) "
 
-#: createuser.c:218
+#: createuser.c:219
 #, c-format
 msgid "%s: creation of new user failed: %s"
-msgstr ""
+msgstr "%s: создание нового пользователя не удалось: %s"
 
-#: createuser.c:234
+#: createuser.c:235
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL user.\n"
 "\n"
 msgstr ""
+"%s создаёт нового пользователья PostgreSQL.\n"
+"\n"
 
-#: createuser.c:236
+#: createuser.c:237
 #: dropuser.c:144
 #, c-format
 msgid "  %s [OPTION]... [USERNAME]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ПОЛЬЗОВАТЕЛЬ]\n"
 
-#: createuser.c:238
+#: createuser.c:239
 msgid "  -a, --adduser             user can add new users\n"
-msgstr ""
+msgstr "  -a, --adduser             пользователь может создавать других пользователей\n"
 
-#: createuser.c:239
+#: createuser.c:240
 msgid "  -A, --no-adduser          user cannot add new users\n"
-msgstr ""
+msgstr "  -A, --no-adduser          пользователь не сможет создавать пользователей\n"
 
-#: createuser.c:240
+#: createuser.c:241
 msgid "  -d, --createdb            user can create new databases\n"
-msgstr ""
+msgstr "  -d, --createdb            пользователь может создавать новые базы\n"
 
-#: createuser.c:241
+#: createuser.c:242
 msgid "  -D, --no-createdb         user cannot create databases\n"
-msgstr ""
+msgstr "  -D, --no-createdb         пользователь не может создавать базы\n"
 
-#: createuser.c:242
+#: createuser.c:243
 msgid "  -P, --pwprompt            assign a password to new user\n"
-msgstr ""
+msgstr "  -P, --pwprompt            создать пароль новому пользователю\n"
 
-#: createuser.c:243
+#: createuser.c:244
 msgid "  -E, --encrypted           encrypt stored password\n"
-msgstr ""
+msgstr "  -E, --encrypted           зашифровать сохранённый пароль\n"
 
-#: createuser.c:244
+#: createuser.c:245
 msgid "  -N, --unencrypted         do no encrypt stored password\n"
-msgstr ""
+msgstr "  -N, --unencrypted         не щифровать сохранённый пароль\n"
 
-#: createuser.c:245
+#: createuser.c:246
 msgid "  -i, --sysid=SYSID         select sysid for new user\n"
-msgstr ""
+msgstr "  -i, --sysid=SYSID         выбрать sysid для нового пользователья\n"
 
-#: createuser.c:253
-msgid "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
+#: createuser.c:254
+msgid  "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
 msgstr ""
+"  -U, --username=ПОЛЬЗОВАТЕЛЬ\n"
+"                            имя пользователья для подсоединения (но не для создания)\n"
 
-#: createuser.c:254
+#: createuser.c:255
 #: dropuser.c:152
 msgid "  -W, --password            prompt for password to connect\n"
-msgstr ""
+msgstr "  -W, --password            запросить пароль для подсоединения\n"
 
-#: createuser.c:255
+#: createuser.c:256
 msgid ""
 "\n"
 "If one of -a, -A, -d, -D, and USERNAME is not specified, you will\n"
 "be prompted interactively.\n"
 msgstr ""
+"\n"
+"Если одно из: -a, -A, -d, -D и ПОЛЬЗОВАТЕЛЬ не указано, вы будете\n"
+"запрошены интерактивно.\n"
 
 #: dropdb.c:91
 #, c-format
 msgid "%s: missing required argument database name\n"
-msgstr ""
+msgstr "%s: отсутствует необходимый аргумент: имя базы\n"
 
 #: dropdb.c:108
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
-msgstr ""
+msgstr "База \"%s\" будет полностью удалена.\n"
 
 #: dropdb.c:109
 #: dropuser.c:110
@@ -416,7 +435,7 @@ msgstr "Вы уверены? (y/n) "
 #: dropdb.c:126
 #, c-format
 msgid "%s: database removal failed: %s"
-msgstr ""
+msgstr "%s: не удалось удалить базу: %s"
 
 #: dropdb.c:142
 #, c-format
@@ -424,51 +443,55 @@ msgid ""
 "%s removes a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s удаляет базу PostgreSQL.\n"
+"\n"
 
 #: dropdb.c:144
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ИМЯБД]\n"
 
 #: dropdb.c:147
 #: dropuser.c:147
 msgid "  -i, --interactive         prompt before deleting anything\n"
-msgstr ""
+msgstr "  -i, --interactive         подтвердить перед удалением чего-либо\n"
 
-#: droplang.c:169
+#: droplang.c:170
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
-msgstr ""
+msgstr "%s: язык \"%s\" не установлен в базе \"%s\"\n"
 
-#: droplang.c:185
+#: droplang.c:186
 #, c-format
 msgid "%s: still %s functions declared in language \"%s\"; language not removed\n"
-msgstr ""
+msgstr "%s: существуют ещё фунции (%s) в языке \"%s\" ; язык не удалён\n"
 
-#: droplang.c:226
+#: droplang.c:227
 #, c-format
 msgid "%s: language removal failed: %s"
-msgstr ""
+msgstr "%s: не удалось удалить язык: %s"
 
-#: droplang.c:240
+#: droplang.c:241
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
 "\n"
 msgstr ""
+"%s удаляет процедурный язык из базы.\n"
+"\n"
 
-#: droplang.c:244
+#: droplang.c:245
 msgid "  -d, --dbname=DBNAME       database from which to remove the language\n"
-msgstr ""
+msgstr "  -d, --dbname=ИМЯБД        база из которой удалить язык\n"
 
 #: dropuser.c:103
 msgid "Enter name of user to drop: "
-msgstr ""
+msgstr "Введите имя пользователя для удаления: "
 
 #: dropuser.c:109
 #, c-format
 msgid "User \"%s\" will be permanently removed.\n"
-msgstr ""
+msgstr "Пользователь \"%s\" будет полностью удалён.\n"
 
 #: dropuser.c:126
 #, c-format
@@ -481,144 +504,154 @@ msgid ""
 "%s removes a PostgreSQL user.\n"
 "\n"
 msgstr ""
+"%s удаляет пользователя PostgreSQL.\n"
+"\n"
 
 #: dropuser.c:151
 msgid "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr ""
+"  -U, --username=ПОЛЬЗОВАТЕЛЬ\n"
+"                            имя пользователя для подсоединения (не для удаления)\n"
 
-#: clusterdb.c:117
+#: clusterdb.c:119
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr ""
 
-#: clusterdb.c:123
+#: clusterdb.c:125
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr ""
 
-#: clusterdb.c:178
+#: clusterdb.c:181
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
 
-#: clusterdb.c:181
+#: clusterdb.c:184
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr ""
 
-#: clusterdb.c:213
+#: clusterdb.c:217
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr ""
 
-#: clusterdb.c:227
+#: clusterdb.c:231
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
 "\n"
 msgstr ""
 
-#: clusterdb.c:229
-#: vacuumdb.c:253
+#: clusterdb.c:233
+#: vacuumdb.c:257
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
-msgstr ""
+msgstr "  %s [ОПЦИЯ]... [ИМЯБД]\n"
 
-#: clusterdb.c:231
+#: clusterdb.c:235
 msgid "  -a, --all                 cluster all databases\n"
 msgstr ""
 
-#: clusterdb.c:232
+#: clusterdb.c:236
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr ""
 
-#: clusterdb.c:233
+#: clusterdb.c:237
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr ""
 
-#: clusterdb.c:243
+#: clusterdb.c:247
 msgid ""
 "\n"
 "Read the description of the SQL command CLUSTER for details.\n"
 msgstr ""
+"\n"
+"Читайте описание SQL-команды CLUSTER для более подробной информации.\n"
 
-#: vacuumdb.c:133
+#: vacuumdb.c:135
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr ""
 
-#: vacuumdb.c:139
+#: vacuumdb.c:141
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr ""
 
-#: vacuumdb.c:201
+#: vacuumdb.c:204
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr ""
 
-#: vacuumdb.c:204
+#: vacuumdb.c:207
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr ""
 
-#: vacuumdb.c:237
+#: vacuumdb.c:241
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr ""
 
-#: vacuumdb.c:251
+#: vacuumdb.c:255
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
 "\n"
 msgstr ""
+"%s очищает и анализирует базу PostgreSQL.\n"
+"\n"
 
-#: vacuumdb.c:255
+#: vacuumdb.c:259
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr ""
 
-#: vacuumdb.c:256
+#: vacuumdb.c:260
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr ""
 
-#: vacuumdb.c:257
+#: vacuumdb.c:261
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr ""
 
-#: vacuumdb.c:258
+#: vacuumdb.c:262
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr ""
 
-#: vacuumdb.c:259
+#: vacuumdb.c:263
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr ""
 
-#: vacuumdb.c:260
+#: vacuumdb.c:264
 msgid "  -e, --echo                      show the commands being sent to the server\n"
-msgstr ""
+msgstr "  -e, --echo                      показывать команды отправляемые серверу\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:265
 msgid "  -q, --quiet                     don't write any messages\n"
-msgstr ""
+msgstr "  -q, --quiet                     не выводить сообщения\n"
 
-#: vacuumdb.c:262
+#: vacuumdb.c:266
 msgid "  -v, --verbose                   write a lot of output\n"
-msgstr ""
+msgstr "  -v, --verbose                   многсловный вывод\n"
 
-#: vacuumdb.c:263
+#: vacuumdb.c:267
 msgid "  --help                          show this help, then exit\n"
-msgstr ""
+msgstr "  --help                          показать эту справку и выйти\n"
 
-#: vacuumdb.c:264
+#: vacuumdb.c:268
 msgid "  --version                       output version information, then exit\n"
-msgstr ""
+msgstr "  --version                       показать опцию и выйти\n"
 
-#: vacuumdb.c:270
+#: vacuumdb.c:274
 msgid ""
 "\n"
 "Read the description of the SQL command VACUUM for details.\n"
 msgstr ""
+"\n"
+"Читайте описание SQL-команды VACUUM для более подробной информации.\n"
 
 #: common.c:88
 #: common.c:114
diff --git a/src/interfaces/libpq/po/es.po b/src/interfaces/libpq/po/es.po
index 0d7010d2177..32d1794043f 100644
--- a/src/interfaces/libpq/po/es.po
+++ b/src/interfaces/libpq/po/es.po
@@ -1,401 +1,509 @@
-# Spanish message translation file for libpq
-# Karim <karim@mribti.com>, 2002.
-#
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2002-08-29 04:20-0400\n"
-"PO-Revision-Date: 2002-08-29 23:26+0100\n"
-"Last-Translator: Karim Mribti <karim@mribti.com>\n"
-"Language-Team: Karim Mribti <karim@mribti.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 0.9.6\n"
-
-#: fe-auth.c:232
-#, c-format
-msgid "Kerberos 4 error: %s\n"
-msgstr "Error de Kerberos 4: %s\n"
-
-#: fe-auth.c:395
-#, c-format
-msgid "could not set socket to blocking mode: %s\n"
-msgstr "No se ha podido poner el socket en modo de bloqueo: %s\n"
-
-#: fe-auth.c:412 fe-auth.c:416
-#, c-format
-msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "AutentificaciСn de Kerberos 5 denegada: %*s\n"
-
-#: fe-auth.c:440
-#, c-format
-msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "No se ha podido restablecer el modo de bloqueo del socket: %s\n"
-
-#: fe-auth.c:503
-msgid "SCM_CRED authentication method not supported\n"
-msgstr "El mИtodo de autentificaciСn SCM_CRED no estА soportado\n"
-
-#: fe-auth.c:589
-msgid "Kerberos 4 authentication failed\n"
-msgstr "AutentificaciСn Kerberos 4 fallida\n"
-
-#: fe-auth.c:595
-msgid "Kerberos 4 authentication not supported\n"
-msgstr "El mИtodo de autentificaciСn Kerberos 4 no estА soportado\n"
-
-#: fe-auth.c:606
-msgid "Kerberos 5 authentication failed\n"
-msgstr "AutentificaciСn Kerberos 5 fallida\n"
-
-#: fe-auth.c:612
-msgid "Kerberos 5 authentication not supported\n"
-msgstr "El mИtodo de autentificaciСn Kerberos 5 no esta soportado\n"
-
-#: fe-auth.c:640
-#, c-format
-msgid "authentication method %u not supported\n"
-msgstr "El mИtodo de autentificaciСn %u no estА soportado\n"
-
-#: fe-auth.c:677
-#, c-format
-msgid "invalid authentication service name \"%s\", ignored\n"
-msgstr "nombre de servicio de autentificaciСn \"%s\" no vАlido, ignorado\n"
-
-#: fe-auth.c:734
-#, c-format
-msgid "fe_getauthname: invalid authentication system: %d\n"
-msgstr "fe_getauthname: sistema de autentificaciСn no vАlido: %d\n"
-
-#: fe-connect.c:485
-msgid "could not determine the PostgreSQL user name to use\n"
-msgstr "No ha sido posible determinar un nombre de usuario de PostgreSQL a usar\n"
-
-#: fe-connect.c:707
-#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "No se ha podido establecer el socket en modo de no-bloqueo: %s\n"
-
-#: fe-connect.c:731
-#, c-format
-msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "No se ha podido establecer el socket en modo TCP sin retardo: %s\n"
-
-#: fe-connect.c:751
-#, c-format
-msgid ""
-"could not connect to server: %s\n"
-"\tIs the server running locally and accepting\n"
-"\tconnections on Unix domain socket \"%s\"?\n"
-msgstr ""
-"No se ha podido conectar con el servidor: %s\n"
-"\t©EstА el servidor en ejecuciСn local y acepta \n"
-"\tconexiСnes en el socket de dominio Unix \"%s\"?\n"
-
-#: fe-connect.c:760
-#, c-format
-msgid ""
-"could not connect to server: %s\n"
-"\tIs the server running on host %s and accepting\n"
-"\tTCP/IP connections on port %s?\n"
-msgstr ""
-"No se ha podido conectar con el servidor: %s\n"
-"\t©EstА el servidor en ejecuciСn en el host %s y acepta \n"
-"\tconexiСnes TCP/IP en el puerto %s?\n"
-
-#: fe-connect.c:824
-#, c-format
-msgid "invalid host address: %s\n"
-msgstr "direcciСn del host no vАlida: %s\n"
-
-#: fe-connect.c:843
-#, c-format
-msgid "unknown host name: %s\n"
-msgstr "Host desconocido: %s\n"
-
-#: fe-connect.c:890
-#, c-format
-msgid "could not create socket: %s\n"
-msgstr "No se ha podido crear el socket: %s\n"
-
-#: fe-connect.c:958
-#, c-format
-msgid "could not send SSL negotiation packet: %s\n"
-msgstr "No se ha podido enviar los paquetes de negociaciСn SSL: %s\n"
-
-#: fe-connect.c:971
-#, c-format
-msgid "could not receive server response to SSL negotiation packet: %s\n"
-msgstr "No se ha podido recibir respuesta del servidor al paquete de negociaciСn SSL: %s\n"
-
-#: fe-connect.c:1002
-#, c-format
-msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "se ha recibido una respuesta no vАlida en la negociaciСn SSL: %c\n"
-
-#: fe-connect.c:1011
-msgid "server does not support SSL, but SSL was required\n"
-msgstr "El servidor no soporta SSL, pero SSL es requerida\n"
-
-#: fe-connect.c:1230
-msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "Estado de conexiСn no vАlido, probablemente por corrupciСn de memoria\n"
-
-#: fe-connect.c:1261
-#, c-format
-msgid "could not get socket error status: %s\n"
-msgstr "No se ha podido determinar el estado de error del socket: %s\n"
-
-#: fe-connect.c:1281
-#, c-format
-msgid "could not get client address from socket: %s\n"
-msgstr "No se ha podido determinar la direcciСn del cliente desde el socket: %s\n"
-
-#: fe-connect.c:1320
-#, c-format
-msgid "could not send startup packet: %s\n"
-msgstr "No se ha podido enviar el paquete de inicio: %s\n"
-
-#: fe-connect.c:1376
-#, c-format
-msgid "expected authentication request from server, but received %c\n"
-msgstr "Se esperaba peticiСn de autentificaciСn desde servidor, pero se ha recibido %c\n"
-
-#: fe-connect.c:1488
-msgid "unexpected message from server during startup\n"
-msgstr "Mensaje del servidor no esperado durante el inicio\n"
-
-#: fe-connect.c:1547
-#, c-format
-msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "Estado de conexiСn no vАlido %c, probablemente por corrupciСn de la memoria\n"
-
-#: fe-connect.c:1635
-#, c-format
-msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "Estado de conexiСn no vАlido %c, probablemente por corrupciСn de la memoria\n"
-
-#: fe-connect.c:1674
-#, c-format
-msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
-msgstr "codificaciСn PGCLIENTENCODING no vАlida: %s\n"
-
-#: fe-connect.c:1798
-#, c-format
-msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "Estado %c no vАlido, probablemente por corrupciСn de la memoria\n"
-
-#: fe-connect.c:2425 fe-connect.c:2434 fe-exec.c:1273 fe-lobj.c:536
-msgid "out of memory\n"
-msgstr "Sin memoria\n"
-
-#: fe-connect.c:2473
-#, c-format
-msgid "missing \"=\" after \"%s\" in connection info string\n"
-msgstr "falta \"=\" despuИs de \"%s\" en la cadena de informaciСn de la conexiСn\n"
-
-#: fe-connect.c:2522
-msgid "unterminated quoted string in connection info string\n"
-msgstr ""
-
-#: fe-connect.c:2556
-#, c-format
-msgid "invalid connection option \"%s\"\n"
-msgstr "opciСn de conexiСn no vАlida \"%s\"\n"
-
-#: fe-connect.c:2742
-msgid "connection pointer is NULL\n"
-msgstr "el puntero de conexiСn es NULL\n"
-
-#: fe-exec.c:726
-msgid "command string is a null pointer\n"
-msgstr "la cadena de comando es un puntero nulo\n"
-
-#: fe-exec.c:734
-msgid "no connection to the server\n"
-msgstr "no hay conexiСn con el servidor\n"
-
-#: fe-exec.c:741
-msgid "another command is already in progress\n"
-msgstr "otro cСmando se estА ejecutando\n"
-
-#: fe-exec.c:939
-#, c-format
-msgid "message type 0x%02x arrived from server while idle\n"
-msgstr "ha llegado un mensaje de tipo 0x%02x desde el servidor mientras se estaba inactivo\n"
-
-#: fe-exec.c:981
-#, c-format
-msgid "unexpected character %c following empty query response (\"I\" message)\n"
-msgstr "caracter no esperado %c sigue a un mensaje de respuesta vacМo (mensaje \"I\")\n"
-
-#: fe-exec.c:1038
-msgid ""
-"server sent data (\"D\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "el servidor enviС datos (mensaje \"D\") sin enviar antes la descripciСn de la fila (mensaje \"T\")\n"
-
-#: fe-exec.c:1055
-msgid ""
-"server sent binary data (\"B\" message) without prior row description (\"T\" "
-"message)\n"
-msgstr "el servidor enviС datos binarios (mensaje \"B\") sin enviar antes la descripciСn de la fila (mensaje \"T\" )\n"
-
-#: fe-exec.c:1071
-#, c-format
-msgid "unexpected response from server; first received character was \"%c\"\n"
-msgstr "respuesta inesperada del servidor; el primer carАcter recibido es \"%c\"\n"
-
-#: fe-exec.c:1360
-#, c-format
-msgid "unexpected asyncStatus: %d\n"
-msgstr "asyncStatus No esperado: %d\n"
-
-#: fe-exec.c:1410
-msgid "COPY state must be terminated first\n"
-msgstr "el estado COPY debe ser terminado primero\n"
-
-#: fe-exec.c:1769
-msgid "no COPY in progress\n"
-msgstr "No hay ningЗn COPY en progreso\n"
-
-#: fe-exec.c:1808
-msgid "lost synchronization with server, resetting connection\n"
-msgstr "se perdiС la sicronizaciСn con el servidor, reiniciando la conexiСn\n"
-
-#: fe-exec.c:1873
-msgid "connection in wrong state\n"
-msgstr "la conexiСn estА en un estado incorrecto\n"
-
-#: fe-exec.c:1975 fe-exec.c:2009
-#, c-format
-msgid "protocol error: id=0x%x\n"
-msgstr "error de protocolo: id=0x%x\n"
-
-#: fe-exec.c:2044
-msgid "invalid ExecStatusType code"
-msgstr "cСdigo de ExecStatusType no vАlido"
-
-#: fe-exec.c:2097 fe-exec.c:2130
-#, c-format
-msgid "column number %d is out of range 0..%d\n"
-msgstr "columna nЗmero %d estА fuera del rango 0..%d\n"
-
-#: fe-exec.c:2119
-#, c-format
-msgid "row number %d is out of range 0..%d\n"
-msgstr "fila nЗmero %d estА fuera del rango 0..%d\n"
-
-#: fe-exec.c:2314
-#, c-format
-msgid "could not interpret result from server: %s\n"
-msgstr "no se ha podido interpretar la respuesta del servidor: %s\n"
-
-#: fe-exec.c:2330
-msgid "no row count available\n"
-msgstr "la cuenta de filas no estА disponible\n"
-
-#: fe-lobj.c:400 fe-lobj.c:483
-#, c-format
-msgid "could not open file \"%s\": %s\n"
-msgstr "no se ha podido abrir el archivo \"%s\": %s\n"
-
-#: fe-lobj.c:412
-#, c-format
-msgid "could not create large object for file \"%s\"\n"
-msgstr "no se ha podido crear un objeto grande para el archivo \"%s\"\n"
-
-#: fe-lobj.c:422 fe-lobj.c:472
-#, c-format
-msgid "could not open large object %u\n"
-msgstr "no se ha podido abrir el objeto grande %u\n"
-
-#: fe-lobj.c:437
-#, c-format
-msgid "error while reading file \"%s\"\n"
-msgstr "error al leer del archivo \"%s\"\n"
-
-#: fe-lobj.c:498
-#, c-format
-msgid "error while writing to file \"%s\"\n"
-msgstr "error al escribir en el archivo \"%s\"\n"
-
-#: fe-lobj.c:564
-msgid "query to initialize large object functions did not return data\n"
-msgstr "la consulta para inicializar las funciones de objetos grandes no devuelve datos\n"
-
-#: fe-lobj.c:602
-msgid "cannot determine OID of function lo_open\n"
-msgstr "no se ha podido determinar el OID de la funciСn lo_open\n"
-
-#: fe-lobj.c:609
-msgid "cannot determine OID of function lo_close\n"
-msgstr "no se ha podido determinar el OID de la funciСn lo_close\n"
-
-#: fe-lobj.c:616
-msgid "cannot determine OID of function lo_creat\n"
-msgstr "no se ha podido determinar el OID de la funciСn lo_creat\n"
-
-#: fe-lobj.c:623
-msgid "cannot determine OID of function lo_unlink\n"
-msgstr "no se ha podido determinar el OID de la funciСn lo_unlink\n"
-
-#: fe-lobj.c:630
-msgid "cannot determine OID of function lo_lseek\n"
-msgstr "no se ha podido determinar el OID de la funciСn lo_lseek\n"
-
-#: fe-lobj.c:637
-msgid "cannot determine OID of function lo_tell\n"
-msgstr "no se ha podido determinar el OID de la funciСn lo_tell\n"
-
-#: fe-lobj.c:644
-msgid "cannot determine OID of function loread\n"
-msgstr "no se ha podido determinar el OID de la funciСn loread\n"
-
-#: fe-lobj.c:651
-msgid "cannot determine OID of function lowrite\n"
-msgstr "no se ha podido determinar el OID de la funciСn lowrite\n"
-
-#: fe-misc.c:295
-#, c-format
-msgid "integer of size %lu not supported by pqGetInt\n"
-msgstr "el entero de tamaЯo %lu no es soportado por pqGetInt\n"
-
-#: fe-misc.c:333
-#, c-format
-msgid "integer of size %lu not supported by pqPutInt\n"
-msgstr "el entero de tamaЯo %lu no es soportado por pqPutInt\n"
-
-#: fe-misc.c:381 fe-misc.c:415 fe-misc.c:831
-#, c-format
-msgid "select() failed: %s\n"
-msgstr "select() fallida: %s\n"
-
-#: fe-misc.c:442 fe-misc.c:634 fe-misc.c:792
-msgid "connection not open\n"
-msgstr "No estА abierta la conexiСn\n"
-
-#: fe-misc.c:507 fe-misc.c:587
-#, c-format
-msgid "could not receive data from server: %s\n"
-msgstr "no se ha podido recibir datos del servidor: %s\n"
-
-#: fe-misc.c:604 fe-misc.c:678
-msgid ""
-"server closed the connection unexpectedly\n"
-"\tThis probably means the server terminated abnormally\n"
-"\tbefore or while processing the request.\n"
-msgstr ""
-"El servidor ha cerrado la conexiСn inesperadamente,\n"
-"\tprobablemente porque terminС de manera anormal\n"
-"\tantes o durante el procesamiento de la peticiСn.\n"
-
-#: fe-misc.c:694
-#, c-format
-msgid "could not send data to server: %s\n"
-msgstr "No se ha podido enviar datos al servidor: %s\n"
-
-
+# Spanish message translation file for libpq
+# Karim <karim@mribti.com>, 2002.
+# Updated on august 2003 by Alvaro Herrera <alvherre@dcc.uchile.cl>
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.4\n"
+"POT-Creation-Date: 2003-08-23 23:14-0400\n"
+"PO-Revision-Date: 2003-08-23 23:29-0400\n"
+"Last-Translator: аlvaro Herrera <alvherre@dcc.uchile.cl>\n"
+"Language-Team: Karim Mribti <karim@mribti.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: fe-auth.c:232
+#, c-format
+msgid "Kerberos 4 error: %s\n"
+msgstr "error de Kerberos 4: %s\n"
+
+#: fe-auth.c:394
+#, c-format
+msgid "could not set socket to blocking mode: %s\n"
+msgstr "no se ha podido poner el socket en modo de bloqueo: %s\n"
+
+#: fe-auth.c:411 fe-auth.c:415
+#, c-format
+msgid "Kerberos 5 authentication rejected: %*s\n"
+msgstr "autentificaciСn Kerberos 5 denegada: %*s\n"
+
+#: fe-auth.c:441
+#, c-format
+msgid "could not restore non-blocking mode on socket: %s\n"
+msgstr "no se ha podido restablecer el modo de no bloqueo en el socket: %s\n"
+
+#: fe-auth.c:509
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "el mИtodo de autentificaciСn SCM_CRED no estА soportado\n"
+
+#: fe-auth.c:600
+msgid "Kerberos 4 authentication failed\n"
+msgstr "autentificaciСn Kerberos 4 fallida\n"
+
+#: fe-auth.c:606
+msgid "Kerberos 4 authentication not supported\n"
+msgstr "el mИtodo de autentificaciСn Kerberos 4 no estА soportado\n"
+
+#: fe-auth.c:616
+msgid "Kerberos 5 authentication failed\n"
+msgstr "autentificaciСn Kerberos 5 fallida\n"
+
+#: fe-auth.c:622
+msgid "Kerberos 5 authentication not supported\n"
+msgstr "el mИtodo de autentificaciСn Kerberos 5 no estА soportado\n"
+
+#: fe-auth.c:650
+#, c-format
+msgid "authentication method %u not supported\n"
+msgstr "el mИtodo de autentificaciСn %u no estА soportado\n"
+
+#: fe-auth.c:687
+#, c-format
+msgid "invalid authentication service name \"%s\", ignored\n"
+msgstr "nombre de servicio de autentificaciСn \"%s\" no vАlido, ignorado\n"
+
+#: fe-auth.c:758
+#, c-format
+msgid "fe_getauthname: invalid authentication system: %d\n"
+msgstr "fe_getauthname: sistema de autentificaciСn no vАlido: %d\n"
+
+#: fe-connect.c:451
+#, c-format
+msgid "unrecognized sslmode: \"%s\"\n"
+msgstr "modo ssl no reconocido: \"%s\"\n"
+
+#: fe-connect.c:469
+#, c-format
+msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
+msgstr ""
+"modo ssl \"%s\" no es vАlido cuando no se ha compilado con soporte SSL\n"
+
+#: fe-connect.c:781
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "no se ha podido establecer el socket en modo de no-bloqueo: %s\n"
+
+#: fe-connect.c:808
+#, c-format
+msgid "could not set socket to TCP no delay mode: %s\n"
+msgstr "no se ha podido establecer el socket en modo TCP sin retardo: %s\n"
+
+#: fe-connect.c:839
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running locally and accepting\n"
+"\tconnections on Unix domain socket \"%s\"?\n"
+msgstr ""
+"no se ha podido conectar con el servidor: %s\n"
+"\t©EstА el servidor en ejecuciСn local y acepta \n"
+"\tconexiСnes en el socket de dominio Unix \"%s\"?\n"
+
+#: fe-connect.c:851
+#, c-format
+msgid ""
+"could not connect to server: %s\n"
+"\tIs the server running on host \"%s\" and accepting\n"
+"\tTCP/IP connections on port %s?\n"
+msgstr ""
+"no se ha podido conectar con el servidor: %s\n"
+"\t©EstА el servidor en ejecuciСn en el host %s y acepta \n"
+"\tconexiones TCP/IP en el puerto %s?\n"
+
+#: fe-connect.c:935
+#, c-format
+msgid "could not translate hostname \"%s\" to address: %s\n"
+msgstr "no se pudo traducir el nombre \"%s\" a una direcciСn: %s\n"
+
+#: fe-connect.c:939
+#, c-format
+msgid "could not translate local service to address: %s\n"
+msgstr "no se pudo traducir servicio local a direcciСn: %s\n"
+
+#: fe-connect.c:1141
+msgid "invalid connection state, probably indicative of memory corruption\n"
+msgstr "estado de conexiСn no vАlido, probablemente por corrupciСn de memoria\n"
+
+#: fe-connect.c:1184
+#, c-format
+msgid "could not create socket: %s\n"
+msgstr "no se ha podido crear el socket: %s\n"
+
+#: fe-connect.c:1290
+#, c-format
+msgid "could not get socket error status: %s\n"
+msgstr "no se ha podido determinar el estado de error del socket: %s\n"
+
+#: fe-connect.c:1327
+#, c-format
+msgid "could not get client address from socket: %s\n"
+msgstr ""
+"no se ha podido determinar la direcciСn del cliente desde el socket: %s\n"
+
+#: fe-connect.c:1368
+#, c-format
+msgid "could not send SSL negotiation packet: %s\n"
+msgstr "no se ha podido enviar el paquete de negociaciСn SSL: %s\n"
+
+#: fe-connect.c:1390 fe-connect.c:2551 fe-connect.c:2560 fe-connect.c:3127
+#: fe-lobj.c:538
+msgid "out of memory\n"
+msgstr "sin memoria\n"
+
+#: fe-connect.c:1403
+#, c-format
+msgid "could not send startup packet: %s\n"
+msgstr "no se ha podido enviar el paquete de inicio: %s\n"
+
+#: fe-connect.c:1443
+#, c-format
+msgid "could not receive server response to SSL negotiation packet: %s\n"
+msgstr ""
+"no se ha podido recibir respuesta del servidor al paquete de negociaciСn SSL: "
+"%s\n"
+
+#: fe-connect.c:1462 fe-connect.c:1488
+msgid "server does not support SSL, but SSL was required\n"
+msgstr "el servidor no soporta SSL, pero SSL es requerida\n"
+
+#: fe-connect.c:1470 fe-connect.c:1496
+msgid "server does not support SSL, and previous non-SSL attempt failed\n"
+msgstr "el servidor no soporta SSL, y el intento previo sin SSL fallС\n"
+
+#: fe-connect.c:1513
+#, c-format
+msgid "received invalid response to SSL negotiation: %c\n"
+msgstr "se ha recibido una respuesta no vАlida en la negociaciСn SSL: %c\n"
+
+#: fe-connect.c:1569 fe-connect.c:1601
+#, c-format
+msgid "expected authentication request from server, but received %c\n"
+msgstr ""
+"se esperaba peticiСn de autentificaciСn desde servidor, pero se ha recibido "
+"%c\n"
+
+#: fe-connect.c:1872
+msgid "unexpected message from server during startup\n"
+msgstr "mensaje del servidor no esperado durante el inicio\n"
+
+#: fe-connect.c:1941
+#, c-format
+msgid "invalid connection state %c, probably indicative of memory corruption\n"
+msgstr ""
+"estado de conexiСn no vАlido %c, probablemente por corrupciСn de la memoria\n"
+
+#: fe-connect.c:2599
+#, c-format
+msgid "missing \"=\" after \"%s\" in connection info string\n"
+msgstr ""
+"falta \"=\" despuИs de \"%s\" en la cadena de informaciСn de la conexiСn\n"
+
+#: fe-connect.c:2648
+msgid "unterminated quoted string in connection info string\n"
+msgstr ""
+"cadena de caracteres en comillas sin terminar en la cadena de informaciСn de "
+"conexiСn\n"
+
+#: fe-connect.c:2682
+#, c-format
+msgid "invalid connection option \"%s\"\n"
+msgstr "opciСn de conexiСn no vАlida \"%s\"\n"
+
+#: fe-connect.c:2894
+msgid "connection pointer is NULL\n"
+msgstr "el puntero de conexiСn es NULL\n"
+
+#: fe-connect.c:3145
+#, c-format
+msgid ""
+"WARNING: Password file %s has world or group read access; permission should "
+"be u=rw (0600)\n"
+msgstr ""
+"ATENCIсN: El archivo de claves %s tiene permiso de lectura para el grupo u "
+"otros; los permisos deberМan ser u=rw (0600)\n"
+
+#: fe-exec.c:474
+msgid "NOTICE"
+msgstr ""
+
+#: fe-exec.c:623 fe-exec.c:682
+msgid "command string is a null pointer\n"
+msgstr "la cadena de comando es un puntero nulo\n"
+
+#: fe-exec.c:675 fe-exec.c:1310
+msgid "function requires at least 3.0 protocol\n"
+msgstr "la funciСn requiere protocolo 3.0 o superior\n"
+
+#: fe-exec.c:821
+msgid "no connection to the server\n"
+msgstr "no hay conexiСn con el servidor\n"
+
+#: fe-exec.c:828
+msgid "another command is already in progress\n"
+msgstr "otro comando se estА ejecutando\n"
+
+#: fe-exec.c:1013
+#, c-format
+msgid "unexpected asyncStatus: %d\n"
+msgstr "asyncStatus no esperado: %d\n"
+
+#: fe-exec.c:1092
+msgid "COPY terminated by new PQexec"
+msgstr "COPY terminado por un nuevo PQexec"
+
+#: fe-exec.c:1104
+msgid "COPY IN state must be terminated first\n"
+msgstr "el estado COPY IN debe ser terminado primero\n"
+
+#: fe-exec.c:1125
+msgid "COPY OUT state must be terminated first\n"
+msgstr "el estado COPY OUT debe ser terminado primero\n"
+
+#: fe-exec.c:1225 fe-exec.c:1279 fe-exec.c:1352
+msgid "no COPY in progress\n"
+msgstr "no hay ningЗn COPY en ejecuciСn\n"
+
+#: fe-exec.c:1544
+msgid "connection in wrong state\n"
+msgstr "la conexiСn estА en un estado incorrecto\n"
+
+#: fe-exec.c:1575
+msgid "invalid ExecStatusType code"
+msgstr "cСdigo de ExecStatusType no vАlido"
+
+#: fe-exec.c:1639 fe-exec.c:1662
+#, c-format
+msgid "column number %d is out of range 0..%d"
+msgstr "el nЗmero de columna %d estА fuera del rango 0..%d"
+
+#: fe-exec.c:1655
+#, c-format
+msgid "row number %d is out of range 0..%d"
+msgstr "el nЗmero de fila %d estА fuera del rango 0..%d"
+
+#: fe-exec.c:1892
+#, c-format
+msgid "could not interpret result from server: %s"
+msgstr "no se ha podido interpretar el resultado del servidor: %s"
+
+#: fe-lobj.c:401 fe-lobj.c:485
+#, c-format
+msgid "could not open file \"%s\": %s\n"
+msgstr "no se ha podido abrir el archivo \"%s\": %s\n"
+
+#: fe-lobj.c:413
+#, c-format
+msgid "could not create large object for file \"%s\"\n"
+msgstr "no se ha podido crear un objeto grande para el archivo \"%s\"\n"
+
+#: fe-lobj.c:423 fe-lobj.c:473
+#, c-format
+msgid "could not open large object %u\n"
+msgstr "no se ha podido abrir el objeto grande %u\n"
+
+#: fe-lobj.c:438
+#, c-format
+msgid "error while reading file \"%s\"\n"
+msgstr "error al leer del archivo \"%s\"\n"
+
+#: fe-lobj.c:500
+#, c-format
+msgid "error while writing to file \"%s\"\n"
+msgstr "error al escribir en el archivo \"%s\"\n"
+
+#: fe-lobj.c:566
+msgid "query to initialize large object functions did not return data\n"
+msgstr ""
+"la consulta para inicializar las funciones de objetos grandes no devuelve "
+"datos\n"
+
+#: fe-lobj.c:604
+msgid "cannot determine OID of function lo_open\n"
+msgstr "no se ha podido determinar el OID de la funciСn lo_open\n"
+
+#: fe-lobj.c:611
+msgid "cannot determine OID of function lo_close\n"
+msgstr "no se ha podido determinar el OID de la funciСn lo_close\n"
+
+#: fe-lobj.c:618
+msgid "cannot determine OID of function lo_creat\n"
+msgstr "no se ha podido determinar el OID de la funciСn lo_creat\n"
+
+#: fe-lobj.c:625
+msgid "cannot determine OID of function lo_unlink\n"
+msgstr "no se ha podido determinar el OID de la funciСn lo_unlink\n"
+
+#: fe-lobj.c:632
+msgid "cannot determine OID of function lo_lseek\n"
+msgstr "no se ha podido determinar el OID de la funciСn lo_lseek\n"
+
+#: fe-lobj.c:639
+msgid "cannot determine OID of function lo_tell\n"
+msgstr "no se ha podido determinar el OID de la funciСn lo_tell\n"
+
+#: fe-lobj.c:646
+msgid "cannot determine OID of function loread\n"
+msgstr "no se ha podido determinar el OID de la funciСn loread\n"
+
+#: fe-lobj.c:653
+msgid "cannot determine OID of function lowrite\n"
+msgstr "no se ha podido determinar el OID de la funciСn lowrite\n"
+
+#: fe-misc.c:228
+#, c-format
+msgid "integer of size %lu not supported by pqGetInt"
+msgstr "el entero de tamaЯo %lu no estА soportado por pqGetInt"
+
+#: fe-misc.c:264
+#, c-format
+msgid "integer of size %lu not supported by pqPutInt"
+msgstr "el entero de tamaЯo %lu no estА soportado por pqPutInt"
+
+#: fe-misc.c:540 fe-misc.c:732
+msgid "connection not open\n"
+msgstr "la conexiСn no estА abierta\n"
+
+#: fe-misc.c:605 fe-misc.c:685
+#, c-format
+msgid "could not receive data from server: %s\n"
+msgstr "no se ha podido recibir datos del servidor: %s\n"
+
+#: fe-misc.c:702 fe-misc.c:770
+msgid ""
+"server closed the connection unexpectedly\n"
+"\tThis probably means the server terminated abnormally\n"
+"\tbefore or while processing the request.\n"
+msgstr ""
+"el servidor ha cerrado la conexiСn inesperadamente,\n"
+"\tprobablemente porque terminС de manera anormal\n"
+"\tantes o durante el procesamiento de la peticiСn.\n"
+
+#: fe-misc.c:787
+#, c-format
+msgid "could not send data to server: %s\n"
+msgstr "no se ha podido enviar datos al servidor: %s\n"
+
+#: fe-misc.c:889
+msgid "timeout expired\n"
+msgstr "tiempo de espera agotado\n"
+
+#: fe-misc.c:934
+msgid "socket not open\n"
+msgstr "el socket no estА abierto\n"
+
+#: fe-misc.c:959
+#, c-format
+msgid "select() failed: %s\n"
+msgstr "select() fallida: %s\n"
+
+#: fe-secure.c:246
+#, c-format
+msgid "could not establish SSL connection: %s\n"
+msgstr "no se ha podido establecer conexiСn SSL: %s\n"
+
+#: fe-secure.c:306 fe-secure.c:373 fe-secure.c:881
+#, c-format
+msgid "SSL SYSCALL error: %s\n"
+msgstr "ERROR en llamada SSL: %s\n"
+
+#: fe-secure.c:310 fe-secure.c:377 fe-secure.c:885
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "ERROR de llamada SSL: detectado fin de archivo\n"
+
+#: fe-secure.c:316 fe-secure.c:382 fe-secure.c:891
+#, c-format
+msgid "SSL error: %s\n"
+msgstr "error de SSL: %s\n"
+
+#: fe-secure.c:325 fe-secure.c:391 fe-secure.c:897
+msgid "Unknown SSL error code\n"
+msgstr "CСdigo de error SSL desconocido\n"
+
+#: fe-secure.c:447
+#, c-format
+msgid "error querying socket: %s\n"
+msgstr "error consultado el socket: %s\n"
+
+#: fe-secure.c:469
+#, c-format
+msgid "could not get information about host (%s): %s\n"
+msgstr "no se ha podido obtener informaciСn sobre el servidor (%s): %s\n"
+
+#: fe-secure.c:488
+msgid "unsupported protocol\n"
+msgstr "protocolo no soportado\n"
+
+#: fe-secure.c:510
+#, c-format
+msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
+msgstr "el nombre de servidor \"%s\" no resuelve a %ld.%ld.%ld.%ld\n"
+
+#: fe-secure.c:517
+#, c-format
+msgid "server common name \"%s\" does not resolve to peer address\n"
+msgstr ""
+"el nombre de servidor \"%s\" no resuelve a la direcciСn del interlocutor\n"
+
+#: fe-secure.c:692
+msgid "could not get user information\n"
+msgstr "no se ha podido obtener informaciСn del usuario\n"
+
+#: fe-secure.c:704
+#, c-format
+msgid "could not open certificate (%s): %s\n"
+msgstr "no se ha podido abrir el certificado (%s): %s\n"
+
+#: fe-secure.c:711
+#, c-format
+msgid "could not read certificate (%s): %s\n"
+msgstr "no se ha podido leer el certificado (%s): %s\n"
+
+#: fe-secure.c:724
+#, c-format
+msgid "certificate present, but not private key (%s)\n"
+msgstr "certificado presente, pero sin llave privada (%s)\n"
+
+#: fe-secure.c:733
+#, c-format
+msgid "private key (%s) has wrong permissions\n"
+msgstr "llave privada (%s) tiene permisos incorrectos\n"
+
+#: fe-secure.c:740
+#, c-format
+msgid "could not open private key file (%s): %s\n"
+msgstr "no se ha podido abrir llave privada (%s): %s\n"
+
+#: fe-secure.c:749
+#, c-format
+msgid "private key (%s) changed during execution\n"
+msgstr "llave privada (%s) cambiada durante la ejecuciСn\n"
+
+#: fe-secure.c:756
+#, c-format
+msgid "could not read private key (%s): %s\n"
+msgstr "no se ha podido leer llave privada (%s): %s\n"
+
+#: fe-secure.c:768
+#, c-format
+msgid "certificate/private key mismatch (%s): %s\n"
+msgstr "certificado y llave privada no coinciden (%s): %s\n"
+
+#: fe-secure.c:798
+#, c-format
+msgid "could not create SSL context: %s\n"
+msgstr "no se ha podido crear el contexto SSL: %s\n"
+
+#: fe-secure.c:815 fe-secure.c:823
+#, c-format
+msgid "could not read root certificate list (%s): %s\n"
+msgstr "no se ha podido leer la lista de certificado raМz (%s): %s\n"
+
+#: fe-secure.c:915
+#, c-format
+msgid "certificate could not be validated: %s\n"
+msgstr "el certificado no pudo ser validado: %s\n"
+
+#: fe-secure.c:927
+#, c-format
+msgid "certificate could not be obtained: %s\n"
+msgstr "el certificado no pudo ser obtenido: %s\n"
diff --git a/src/interfaces/libpq/po/ru.po b/src/interfaces/libpq/po/ru.po
index c9600d65c82..a2f84a38686 100644
--- a/src/interfaces/libpq/po/ru.po
+++ b/src/interfaces/libpq/po/ru.po
@@ -1,10 +1,10 @@
 # ru.po
 # LIBPQ Translated Messages into the Russian Language (KOI8-R)
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.6 2003/08/04 14:01:37 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/po/ru.po,v 1.7 2003/08/24 21:18:53 petere Exp $
 #
 # ChangeLog:
-#   - July 24 - August 1, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca>
+#   - July 24 - August 23, 2003: Update for 7.4.*; <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>
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
-"POT-Creation-Date: 2003-07-24 11:45+0200\n"
-"PO-Revision-Date: 2003-08-01 14:13-0500\n"
+"POT-Creation-Date: 2003-08-23 04:18-0300\n"
+"PO-Revision-Date: 2003-08-23 13:46-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,7 +24,7 @@ msgstr ""
 #: fe-auth.c:232
 #, c-format
 msgid "Kerberos 4 error: %s\n"
-msgstr "Ошибка Kerberos 4: %s\n"
+msgstr "ошибка Kerberos 4: %s\n"
 
 #: fe-auth.c:394
 #, c-format
@@ -35,7 +35,7 @@ msgstr "не получилось установить сокет в блокирующий режим: %s\n"
 #: fe-auth.c:415
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "Аутентификация Kerberos 5 отклонена: %*s\n"
+msgstr "аутентификация Kerberos 5 отклонена: %*s\n"
 
 #: fe-auth.c:441
 #, c-format
@@ -44,23 +44,23 @@ msgstr "не получилось восстановить не блокирующий режим для сокета: %s\n"
 
 #: fe-auth.c:509
 msgid "SCM_CRED authentication method not supported\n"
-msgstr "Аутентификация SCM_CRED не поддерживается\n"
+msgstr "аутентификация SCM_CRED не поддерживается\n"
 
 #: fe-auth.c:600
 msgid "Kerberos 4 authentication failed\n"
-msgstr "Аутентификация Kerberos 4 не удалась\n"
+msgstr "аутентификация Kerberos 4 не удалась\n"
 
 #: fe-auth.c:606
 msgid "Kerberos 4 authentication not supported\n"
-msgstr "Аутентификация Kerberos 4 не поддерживается\n"
+msgstr "аутентификация Kerberos 4 не поддерживается\n"
 
 #: fe-auth.c:616
 msgid "Kerberos 5 authentication failed\n"
-msgstr "Аутентификация Kerberos 5 не удалась\n"
+msgstr "аутентификация Kerberos 5 не удалась\n"
 
 #: fe-auth.c:622
 msgid "Kerberos 5 authentication not supported\n"
-msgstr "Аутентификация Kerberos 5 не поддерживается\n"
+msgstr "аутентификация Kerberos 5 не поддерживается\n"
 
 #: fe-auth.c:650
 #, c-format
@@ -77,27 +77,27 @@ msgstr "неправильное имя сервиса аутентификации \"%s\", игнорируется\n"
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: неправильная система аутентификации: %d\n"
 
-#: fe-connect.c:451
+#: fe-connect.c:452
 #, c-format
 msgid "unrecognized sslmode: \"%s\"\n"
 msgstr "нераспознанный sslmode: \"%s\"\n"
 
-#: fe-connect.c:469
+#: fe-connect.c:472
 #, c-format
 msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "sslmode \"%s\" неверен если поддержка SSL не скомпилирована\n"
 
-#: fe-connect.c:781
+#: fe-connect.c:783
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "не получилось установить сокет в не блокирующий режим: %s\n"
 
-#: fe-connect.c:808
+#: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "не получилось установить сокет в беспрерывный TCP режим: %s\n"
 
-#: fe-connect.c:839
+#: fe-connect.c:841
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -108,7 +108,7 @@ msgstr ""
 "\tРаботает ли сервер локально и принимает\n"
 "\tподсоединения по сокету Unix'овского домена \"%s\"?\n"
 
-#: fe-connect.c:851
+#: fe-connect.c:853
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -119,240 +119,239 @@ msgstr ""
 "\tРаботает ли сервер на хосте \"%s\" и принимает ли\n"
 "\tподсоединения через TCP/IP протокол на порт %s?\n"
 
-#: fe-connect.c:935
+#: fe-connect.c:937
 #, c-format
 msgid "could not translate hostname \"%s\" to address: %s\n"
 msgstr "не получилось транслировать имя хоста \"%s\" в адрес: %s\n"
 
-#: fe-connect.c:939
+#: fe-connect.c:941
 #, c-format
 msgid "could not translate local service to address: %s\n"
 msgstr "не получилось транслировать локальный сервис в адрес: %s\n"
 
-#: fe-connect.c:1141
+#: fe-connect.c:1144
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "неправильное состояние подсоединения, возможный указатель на нарушение целостности памяти\n"
 
-#: fe-connect.c:1184
+#: fe-connect.c:1187
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "не получилось создать сокет: %s\n"
 
-#: fe-connect.c:1290
+#: fe-connect.c:1298
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "невозможно было получить статус ошибки сокета: %s\n"
 
-#: fe-connect.c:1327
+#: fe-connect.c:1337
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "невозможно было получить адрес клиента из сокета: %s\n"
 
-#: fe-connect.c:1368
+#: fe-connect.c:1382
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "не получилось отправить пакет согласования SSL: %s\n"
 
-#: fe-connect.c:1390
-#: fe-connect.c:2551
-#: fe-connect.c:2560
-#: fe-connect.c:3127
-#: fe-lobj.c:538
+#: fe-connect.c:1404
+#: fe-connect.c:2511
+#: fe-connect.c:2520
+#: fe-connect.c:3087
+#: fe-lobj.c:540
 msgid "out of memory\n"
 msgstr "недостаточно памяти\n"
 
-#: fe-connect.c:1403
+#: fe-connect.c:1417
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "не получилось отправить начальный пакет: %s\n"
 
-#: fe-connect.c:1443
+#: fe-connect.c:1457
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "не был получен ответ сервера на пакет согласования SSL: %s\n"
 
-#: fe-connect.c:1462
-#: fe-connect.c:1488
+#: fe-connect.c:1476
+#: fe-connect.c:1493
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "сервер не поддерживает SSL, но наличие SSL было необходимо\n"
 
-#: fe-connect.c:1470
-#: fe-connect.c:1496
-msgid "server does not support SSL, and previous non-SSL attempt failed\n"
-msgstr "сервер не поддерживает SSL, и первая не-SSL попытка не удалась\n"
-
-#: fe-connect.c:1513
+#: fe-connect.c:1509
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "получен неправильный ответ на начальное согласование по SSL: %c\n"
 
-#: fe-connect.c:1569
-#: fe-connect.c:1601
+#: fe-connect.c:1566
+#: fe-connect.c:1598
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "ожидался запрос аутентификации от сервера, но было получено: %c\n"
 
-#: fe-connect.c:1872
+#: fe-connect.c:1834
 msgid "unexpected message from server during startup\n"
 msgstr "неожиданное сообщение от сервера при запуске\n"
 
-#: fe-connect.c:1941
+#: fe-connect.c:1904
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "неправильное состояние подсоединения %c, возможный указатель на нарушение целостности памяти\n"
 
-#: fe-connect.c:2599
+#: fe-connect.c:2559
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "отсутствует \"=\" после \"%s\" в строке подсоединения\n"
 
-#: fe-connect.c:2648
+#: fe-connect.c:2608
 msgid "unterminated quoted string in connection info string\n"
 msgstr "неоконченная строка (не хватает кавычки) в строке подсоединения\n"
 
-#: fe-connect.c:2682
+#: fe-connect.c:2642
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "неправильная опция подсоединения \"%s\"\n"
 
-#: fe-connect.c:2894
+#: fe-connect.c:2854
 msgid "connection pointer is NULL\n"
 msgstr "указатель подсоединения является NULL'ом\n"
 
-#: fe-connect.c:3145
+#: fe-connect.c:3105
 #, c-format
 msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"
 msgstr "ВНИМАНИЕ: Парольный файл %s записан с правами чтения для всех или группы; права должны быть u=rw (0600)\n"
 
-#: fe-exec.c:474
+#: fe-exec.c:484
 msgid "NOTICE"
 msgstr "NOTICE"
 
-#: fe-exec.c:623
-#: fe-exec.c:682
+#: fe-exec.c:637
+#: fe-exec.c:689
 msgid "command string is a null pointer\n"
 msgstr "командная строка является нулевым указателем\n"
 
-#: fe-exec.c:675
-#: fe-exec.c:1310
-msgid "function requires at least 3.0 protocol\n"
-msgstr "функция требует как минимум протокол 3.0\n"
+#: fe-exec.c:724
+msgid "statement name is a null pointer\n"
+msgstr "имя команды является нулевым указателем\n"
 
-#: fe-exec.c:821
+#: fe-exec.c:755
 msgid "no connection to the server\n"
 msgstr "нет подсоединения к серверу\n"
 
-#: fe-exec.c:828
+#: fe-exec.c:762
 msgid "another command is already in progress\n"
 msgstr "другая команда в процессе выполнения\n"
 
-#: fe-exec.c:1013
+#: fe-exec.c:798
+#: fe-exec.c:1432
+msgid "function requires at least 3.0 protocol\n"
+msgstr "функция требует как минимум протокол 3.0\n"
+
+#: fe-exec.c:1100
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "неожиданный asyncStatus: %d\n"
 
-#: fe-exec.c:1092
+#: fe-exec.c:1205
 msgid "COPY terminated by new PQexec"
 msgstr "COPY прекращена новой PQexec"
 
-#: fe-exec.c:1104
+#: fe-exec.c:1213
 msgid "COPY IN state must be terminated first\n"
 msgstr "сначала состояние COPY IN должно быть завершено\n"
 
-#: fe-exec.c:1125
+#: fe-exec.c:1233
 msgid "COPY OUT state must be terminated first\n"
 msgstr "сначала состояние COPY OUT должно быть завершено\n"
 
-#: fe-exec.c:1225
-#: fe-exec.c:1279
-#: fe-exec.c:1352
+#: fe-exec.c:1336
+#: fe-exec.c:1390
+#: fe-exec.c:1474
 msgid "no COPY in progress\n"
 msgstr "выполнения процесса COPY не наблюдается\n"
 
-#: fe-exec.c:1544
+#: fe-exec.c:1666
 msgid "connection in wrong state\n"
 msgstr "соединение в неверном состоянии\n"
 
-#: fe-exec.c:1575
+#: fe-exec.c:1697
 msgid "invalid ExecStatusType code"
 msgstr "неверный код ExecStatusType"
 
-#: fe-exec.c:1639
-#: fe-exec.c:1662
+#: fe-exec.c:1761
+#: fe-exec.c:1784
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "колонка N %d вне диапазона 0..%d"
 
-#: fe-exec.c:1655
+#: fe-exec.c:1777
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "ряд N %d вне диапазона 0..%d"
 
-#: fe-exec.c:1892
+#: fe-exec.c:2014
 #, c-format
 msgid "could not interpret result from server: %s"
-msgstr "не в состоянии интепретировать ответ сервера: %s"
+msgstr "не в состоянии интерпретировать ответ сервера: %s"
 
-#: fe-lobj.c:401
-#: fe-lobj.c:485
+#: fe-lobj.c:402
+#: fe-lobj.c:487
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "не в состоянии открыть файл \"%s\": %s\n"
 
-#: fe-lobj.c:413
+#: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
-msgstr "не в состоянии создать large object (LO) для файла \"%s\"\n"
+msgstr "не в состоянии создать большой объект (LO) для файла \"%s\"\n"
 
-#: fe-lobj.c:423
-#: fe-lobj.c:473
+#: fe-lobj.c:424
+#: fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
-msgstr "не в состоянии открыть large object (LO) %u\n"
+msgstr "не в состоянии открыть большой объект (LO) %u\n"
 
-#: fe-lobj.c:438
+#: fe-lobj.c:439
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "ошибка при чтении файла \"%s\"\n"
 
-#: fe-lobj.c:500
+#: fe-lobj.c:502
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "ошибка при записи в файл \"%s\"\n"
 
-#: fe-lobj.c:566
+#: fe-lobj.c:568
 msgid "query to initialize large object functions did not return data\n"
-msgstr "запрос о инициализации функций для больших объектов (LOs) не возвратил данных\n"
+msgstr "запрос об инициализации функций для больших объектов (LOs) не возвратил данных\n"
 
-#: fe-lobj.c:604
+#: fe-lobj.c:606
 msgid "cannot determine OID of function lo_open\n"
 msgstr "не в состоянии определить OID функции lo_open\n"
 
-#: fe-lobj.c:611
+#: fe-lobj.c:613
 msgid "cannot determine OID of function lo_close\n"
 msgstr "не в состоянии определить OID функции lo_close\n"
 
-#: fe-lobj.c:618
+#: fe-lobj.c:620
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "не в состоянии определить OID функции lo_creat\n"
 
-#: fe-lobj.c:625
+#: fe-lobj.c:627
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "не в состоянии определить OID функции lo_unlink\n"
 
-#: fe-lobj.c:632
+#: fe-lobj.c:634
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "не в состоянии определить OID функции lo_lseek\n"
 
-#: fe-lobj.c:639
+#: fe-lobj.c:641
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "не в состоянии определить OID функции lo_tell\n"
 
-#: fe-lobj.c:646
+#: fe-lobj.c:648
 msgid "cannot determine OID of function loread\n"
 msgstr "не в состоянии определить OID функции loread\n"
 
-#: fe-lobj.c:653
+#: fe-lobj.c:655
 msgid "cannot determine OID of function lowrite\n"
 msgstr "не в состоянии определить OID функции lowrite\n"
 
@@ -366,19 +365,19 @@ msgstr "тип integer размером %lu байт не поддерживается функцией pqGetInt"
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "тип integer размером %lu байт не поддерживается функцией pqPutInt"
 
-#: fe-misc.c:540
-#: fe-misc.c:732
+#: fe-misc.c:544
+#: fe-misc.c:748
 msgid "connection not open\n"
 msgstr "соединение не открыто\n"
 
-#: fe-misc.c:605
-#: fe-misc.c:685
+#: fe-misc.c:610
+#: fe-misc.c:701
 #, c-format
 msgid "could not receive data from server: %s\n"
-msgstr "получить данные с сервера %s не удалось\n"
+msgstr "ошибка при получении данных с сервера: %s\n"
 
-#: fe-misc.c:702
-#: fe-misc.c:770
+#: fe-misc.c:718
+#: fe-misc.c:786
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -388,20 +387,20 @@ msgstr ""
 "\tСкорее всего это означает что сервер завершил работу со сбоем\n"
 "\tдо или в течение обслуживания запроса.\n"
 
-#: fe-misc.c:787
+#: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "не получилось послать данные серверу: %s\n"
 
-#: fe-misc.c:889
+#: fe-misc.c:905
 msgid "timeout expired\n"
 msgstr "таймаут интервал истёк\n"
 
-#: fe-misc.c:934
+#: fe-misc.c:950
 msgid "socket not open\n"
 msgstr "сокет не открыт\n"
 
-#: fe-misc.c:959
+#: fe-misc.c:973
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() не удался: %s\n"
@@ -411,117 +410,117 @@ msgstr "select() не удался: %s\n"
 msgid "could not establish SSL connection: %s\n"
 msgstr "не получилось установить SSL-соединение: %s\n"
 
-#: fe-secure.c:306
-#: fe-secure.c:373
-#: fe-secure.c:881
+#: fe-secure.c:308
+#: fe-secure.c:380
+#: fe-secure.c:894
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
-msgstr "Ошибка SSL SYSCALL: %s\n"
+msgstr "ошибка SSL SYSCALL: %s\n"
 
-#: fe-secure.c:310
-#: fe-secure.c:377
-#: fe-secure.c:885
+#: fe-secure.c:313
+#: fe-secure.c:385
+#: fe-secure.c:898
 msgid "SSL SYSCALL error: EOF detected\n"
-msgstr "Ошибка SSL SYSCALL: обнаружен конец файла (EOF)\n"
+msgstr "ошибка SSL SYSCALL: обнаружен конец файла (EOF)\n"
 
-#: fe-secure.c:316
-#: fe-secure.c:382
-#: fe-secure.c:891
+#: fe-secure.c:322
+#: fe-secure.c:393
+#: fe-secure.c:904
 #, c-format
 msgid "SSL error: %s\n"
-msgstr "Ошибка SSL: %s\n"
+msgstr "ошибка SSL: %s\n"
 
-#: fe-secure.c:325
-#: fe-secure.c:391
-#: fe-secure.c:897
+#: fe-secure.c:330
+#: fe-secure.c:401
+#: fe-secure.c:910
 msgid "Unknown SSL error code\n"
 msgstr "Неизвестный код ошибки SSL\n"
 
-#: fe-secure.c:447
+#: fe-secure.c:459
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "ошибка при запросе сокета: %s\n"
 
-#: fe-secure.c:469
+#: fe-secure.c:481
 #, c-format
 msgid "could not get information about host (%s): %s\n"
-msgstr "невозможно было получить о сервере (%s): %s\n"
+msgstr "невозможно было получить информацию о сервере (%s): %s\n"
 
-#: fe-secure.c:488
+#: fe-secure.c:500
 msgid "unsupported protocol\n"
 msgstr "протокол не поддерживается\n"
 
-#: fe-secure.c:510
+#: fe-secure.c:522
 #, 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:517
+#: fe-secure.c:529
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "обычное имя сервера \"%s\" не резолвится в адрес\n"
 
-#: fe-secure.c:692
+#: fe-secure.c:704
 msgid "could not get user information\n"
 msgstr "невозможно было получить информацию о пользователе\n"
 
-#: fe-secure.c:704
+#: fe-secure.c:716
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "не в состоянии открыть сертификат (%s): %s\n"
 
-#: fe-secure.c:711
+#: fe-secure.c:723
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "не в состоянии считать сертификат (%s): %s\n"
 
-#: fe-secure.c:724
+#: fe-secure.c:736
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
-msgstr "сертификат присутсвует, но нет личноно ключа (%s)\n"
+msgstr "сертификат присутствует, но нет личного ключа (%s)\n"
 
-#: fe-secure.c:733
+#: fe-secure.c:745
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "не верные права для личного ключа (%s)\n"
 
-#: fe-secure.c:740
+#: fe-secure.c:752
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "не получилось открыть файл личного ключа (%s): %s\n"
 
-#: fe-secure.c:749
+#: fe-secure.c:761
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "личный ключ (%s) поменялся во время исполнения\n"
 
-#: fe-secure.c:756
+#: fe-secure.c:768
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "не получилось прочитать личный ключ (%s): %s\n"
 
-#: fe-secure.c:768
+#: fe-secure.c:780
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "сертификат/личный ключ не совпадают (%s): %s\n"
 
-#: fe-secure.c:798
+#: fe-secure.c:810
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "не получилось создать контекст SSL: %s\n"
 
-#: fe-secure.c:815
-#: fe-secure.c:823
+#: fe-secure.c:828
+#: fe-secure.c:836
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "не получилось прочесть список корневых сертификатов (%s): %s\n"
 
-#: fe-secure.c:915
+#: fe-secure.c:929
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "не получилось проверить сертификат: %s\n"
 
-#: fe-secure.c:927
+#: fe-secure.c:941
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "не удалось получить сертификат: %s\n"
author	Peter Eisentraut <peter_e@gmx.net>	2003-08-24 21:18:53 +0000
committer	Peter Eisentraut <peter_e@gmx.net>	2003-08-24 21:18:53 +0000
commit	903fe8fc6fb0297198782e451c6b6d4396eeaa53 (patch)
tree	c57c04a41f0a9621a9e1e0476500116d8d789037 /src
parent	693aad413b16aac85fb9a4e792d84cd87778aa9e (diff)
download	postgresql-903fe8fc6fb0297198782e451c6b6d4396eeaa53.tar.gz postgresql-903fe8fc6fb0297198782e451c6b6d4396eeaa53.zip