Translation updates

src/backend/po/ru.po

@@ -4,10 +4,10 @@
 # Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
 # Distributed under the same licensing terms as PostgreSQL itself.
 #
-# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.28 2004/11/16 22:49:44 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.29 2004/12/11 20:09:56 petere Exp $
 #
 # ChangeLog:
-#   - March 27 - November 14, 2004: Updates for 7.4.x/8.0 branches; <mokhov@cs.concordia.ca>
+#   - March 27 - December 10, 2004: Updates for 7.4.x/8.0 branches; <mokhov@cs.concordia.ca>
 #   - 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>
@@ -18,10 +18,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4.x\n"
-"POT-Creation-Date: 2004-11-01 19:32+0000\n"
-"PO-Revision-Date: 2004-11-14 18:51-0500\n"
+"POT-Creation-Date: 2004-11-18 07:17+0000\n"
+"PO-Revision-Date: 2004-12-10 22:21-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
-"Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
+"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -213,8 +213,8 @@ msgid "could not access status of transaction %u"
 msgstr "  %u  "
 
 #: access/transam/slru.c:612
-#: libpq/hba.c:831
-#: libpq/hba.c:855
+#: libpq/hba.c:832
+#: libpq/hba.c:856
 #: storage/smgr/smgr.c:278
 #: utils/error/elog.c:877
 #: utils/init/miscinit.c:726
@@ -1110,7 +1110,9 @@ msgid "System catalog modifications are currently disallowed."
 msgstr "       ."
 
 #: catalog/heap.c:356
-#: commands/tablecmds.c:1771
+#: commands/tablecmds.c:505
+#: commands/tablecmds.c:824
+#: commands/tablecmds.c:1798
 #, c-format
 msgid "tables can have at most %d columns"
 msgstr "    : %d"
@@ -1146,14 +1148,14 @@ msgstr "
 
 #: catalog/heap.c:734
 #: catalog/index.c:522
-#: commands/tablecmds.c:1292
+#: commands/tablecmds.c:1319
 #, c-format
 msgid "relation \"%s\" already exists"
 msgstr " \"%s\"  "
 
 #: catalog/heap.c:1556
-#: commands/tablecmds.c:2812
-#: commands/tablecmds.c:2854
+#: commands/tablecmds.c:2839
+#: commands/tablecmds.c:2881
 #, c-format
 msgid "constraint \"%s\" for relation \"%s\" already exists"
 msgstr " \"%s\"   \"%s\"  "
@@ -1169,13 +1171,13 @@ msgid "only table \"%s\" can be referenced in check constraint"
 msgstr "   \"%s\"    CHECK-"
 
 #: catalog/heap.c:1643
-#: commands/tablecmds.c:2941
+#: commands/tablecmds.c:2968
 #: commands/typecmds.c:1811
 msgid "cannot use subquery in check constraint"
 msgstr "    CHECK-"
 
 #: catalog/heap.c:1647
-#: commands/tablecmds.c:2945
+#: commands/tablecmds.c:2972
 msgid "cannot use aggregate function in check constraint"
 msgstr "     CHECK-"
 
@@ -1202,7 +1204,7 @@ msgid "column \"%s\" is of type %s but default expression is of type %s"
 msgstr " \"%s\"   %s      %s"
 
 #: catalog/heap.c:1797
-#: parser/analyze.c:2790
+#: parser/analyze.c:2802
 #: parser/parse_node.c:232
 #: parser/parse_target.c:425
 #: rewrite/rewriteHandler.c:563
@@ -1540,7 +1542,7 @@ msgid "there is no previously clustered index for table \"%s\""
 msgstr "       \"%s\""
 
 #: commands/cluster.c:164
-#: commands/tablecmds.c:3932
+#: commands/tablecmds.c:3959
 #, c-format
 msgid "index \"%s\" for table \"%s\" does not exist"
 msgstr " \"%s\"   \"%s\"  "
@@ -1556,16 +1558,16 @@ msgstr "
 
 #: commands/cluster.c:352
 msgid "cannot cluster when index access method does not handle null values"
-msgstr ""
+msgstr "          (NULL) "
 
 #: commands/cluster.c:353
 #, c-format
 msgid "You may be able to work around this by marking column \"%s\" NOT NULL."
-msgstr ""
+msgstr "     ԣ   \"%s\"  NOT NULL."
 
 #: commands/cluster.c:365
 msgid "cannot cluster on expressional index when index access method does not handle null values"
-msgstr ""
+msgstr "             (NULL) "
 
 #: commands/cluster.c:379
 #, c-format
@@ -1574,7 +1576,7 @@ msgstr "\"%s\"
 
 #: commands/cluster.c:389
 msgid "cannot cluster temporary tables of other sessions"
-msgstr ""
+msgstr "     "
 
 #: commands/conversioncmds.c:66
 #, c-format
@@ -1603,15 +1605,15 @@ msgstr "\"%s\"
 #: commands/indexcmds.c:639
 #: commands/lockcmds.c:68
 #: commands/tablecmds.c:377
-#: commands/tablecmds.c:1607
-#: commands/tablecmds.c:1898
-#: commands/tablecmds.c:2042
-#: commands/tablecmds.c:2276
-#: commands/tablecmds.c:2442
-#: commands/tablecmds.c:2568
-#: commands/tablecmds.c:2749
-#: commands/tablecmds.c:3760
-#: commands/tablecmds.c:4026
+#: commands/tablecmds.c:1634
+#: commands/tablecmds.c:1925
+#: commands/tablecmds.c:2069
+#: commands/tablecmds.c:2303
+#: commands/tablecmds.c:2469
+#: commands/tablecmds.c:2595
+#: commands/tablecmds.c:2776
+#: commands/tablecmds.c:3787
+#: commands/tablecmds.c:4053
 #: commands/trigger.c:144
 #: commands/trigger.c:546
 #: tcop/utility.c:76
@@ -1627,11 +1629,11 @@ msgid "\"%s\" is not a view"
 msgstr "\"%s\"   "
 
 #: commands/comment.c:386
-#: commands/tablecmds.c:1948
-#: commands/tablecmds.c:2092
-#: commands/tablecmds.c:2220
-#: commands/tablecmds.c:2384
-#: commands/tablecmds.c:2589
+#: commands/tablecmds.c:1975
+#: commands/tablecmds.c:2119
+#: commands/tablecmds.c:2247
+#: commands/tablecmds.c:2411
+#: commands/tablecmds.c:2616
 #: parser/parse_func.c:1270
 #: parser/parse_relation.c:1584
 #: parser/parse_relation.c:1642
@@ -1796,14 +1798,14 @@ msgstr "
 
 #: commands/dbcommands.c:371
 #: commands/dbcommands.c:376
-#: commands/dbcommands.c:961
+#: commands/dbcommands.c:969
 #, c-format
 msgid "Failing system command was: %s"
 msgstr "   : %s"
 
 #: commands/dbcommands.c:372
 #: commands/dbcommands.c:377
-#: commands/dbcommands.c:962
+#: commands/dbcommands.c:970
 msgid "Look in the postmaster's stderr log for more information."
 msgstr " stderr- postmaster'  ."
 
@@ -1834,34 +1836,34 @@ msgstr "
 msgid "permission denied to rename database"
 msgstr " ݣ   "
 
-#: commands/dbcommands.c:884
+#: commands/dbcommands.c:892
 msgid "relative paths are not allowed as database locations"
 msgstr "      "
 
-#: commands/dbcommands.c:888
+#: commands/dbcommands.c:896
 msgid "absolute paths are not allowed as database locations"
 msgstr "      "
 
-#: commands/dbcommands.c:900
+#: commands/dbcommands.c:908
 #, c-format
 msgid "postmaster environment variable \"%s\" not found"
 msgstr "  postmaster' \"%s\"  "
 
-#: commands/dbcommands.c:905
+#: commands/dbcommands.c:913
 #, c-format
 msgid "postmaster environment variable \"%s\" must be absolute path"
 msgstr "  postmaster' \"%s\"    "
 
-#: commands/dbcommands.c:914
+#: commands/dbcommands.c:922
 msgid "alternative path is too long"
 msgstr "   "
 
-#: commands/dbcommands.c:945
+#: commands/dbcommands.c:953
 #, c-format
 msgid "could not remove file \"%s\": %m"
 msgstr "    \"%s\": %m"
 
-#: commands/dbcommands.c:959
+#: commands/dbcommands.c:967
 #, c-format
 msgid "could not remove database directory \"%s\""
 msgstr "      \"%s\""
@@ -2006,7 +2008,7 @@ msgstr "COPY %s,
 
 #: commands/copy.c:1389
 msgid "COPY file signature not recognized"
-msgstr ""
+msgstr " COPY-  "
 
 #: commands/copy.c:1395
 msgid "invalid COPY file header (missing flags)"
@@ -2050,7 +2052,7 @@ msgstr "
 #: commands/copy.c:1786
 #: commands/copy.c:1804
 msgid "literal carriage return found in data"
-msgstr ""
+msgstr "     "
 
 #: commands/copy.c:1787
 #: commands/copy.c:1805
@@ -2059,7 +2061,7 @@ msgstr "
 
 #: commands/copy.c:1822
 msgid "literal newline found in data"
-msgstr ""
+msgstr "     "
 
 #: commands/copy.c:1823
 msgid ""
@@ -2235,15 +2237,15 @@ msgstr "
 
 #: commands/functioncmds.c:899
 msgid "cast function must not be volatile"
-msgstr ""
+msgstr "      volatile"
 
 #: commands/functioncmds.c:904
 msgid "cast function must not be an aggregate function"
-msgstr ""
+msgstr "      "
 
 #: commands/functioncmds.c:908
 msgid "cast function must not return a set"
-msgstr ""
+msgstr "      "
 
 #: commands/functioncmds.c:931
 msgid "must be superuser to create a cast WITHOUT FUNCTION"
@@ -2398,7 +2400,7 @@ msgid "primary keys cannot be expressions"
 msgstr "     "
 
 #: commands/indexcmds.c:232
-#: parser/analyze.c:1442
+#: parser/analyze.c:1454
 #, c-format
 msgid "column \"%s\" named in key does not exist"
 msgstr " \"%s\"     "
@@ -2416,7 +2418,7 @@ msgid "functions in index predicate must be marked IMMUTABLE"
 msgstr "        IMMUTABLE"
 
 #: commands/indexcmds.c:337
-#: commands/tablecmds.c:1119
+#: commands/tablecmds.c:1146
 #: parser/parse_expr.c:1034
 #, c-format
 msgid "column \"%s\" does not exist"
@@ -2473,6 +2475,287 @@ msgstr "
 msgid "table \"%s\" was reindexed"
 msgstr " \"%s\" "
 
+#: commands/tablecmds.c:151
+msgid "ON COMMIT can only be used on temporary tables"
+msgstr "ON COMMIT      "
+
+#: commands/tablecmds.c:211
+#, c-format
+msgid "duplicate check constraint name \"%s\""
+msgstr "  CHECK-: \"%s\""
+
+#: commands/tablecmds.c:388
+#: commands/tablecmds.c:1091
+#: commands/tablecmds.c:1298
+#: commands/tablecmds.c:1650
+#: commands/tablecmds.c:1936
+#: commands/tablecmds.c:2080
+#: commands/tablecmds.c:2208
+#: commands/tablecmds.c:2317
+#: commands/tablecmds.c:2480
+#: commands/tablecmds.c:2606
+#: commands/tablecmds.c:2787
+#: commands/tablecmds.c:3086
+#: commands/tablecmds.c:3798
+#: commands/trigger.c:150
+#: commands/trigger.c:552
+#: tcop/utility.c:162
+#: tcop/utility.c:197
+#, c-format
+msgid "permission denied: \"%s\" is a system catalog"
+msgstr " ݣ: \"%s\"   "
+
+#: commands/tablecmds.c:398
+msgid "cannot truncate temporary tables of other sessions"
+msgstr ""
+
+#: commands/tablecmds.c:527
+#, c-format
+msgid "column \"%s\" duplicated"
+msgstr "  : \"%s\""
+
+#: commands/tablecmds.c:552
+#: parser/analyze.c:1200
+#: parser/analyze.c:1405
+#, c-format
+msgid "inherited relation \"%s\" is not a table"
+msgstr "  \"%s\"   "
+
+#: commands/tablecmds.c:558
+#, c-format
+msgid "cannot inherit from temporary relation \"%s\""
+msgstr "    \"%s\""
+
+#: commands/tablecmds.c:575
+#, c-format
+msgid "inherited relation \"%s\" duplicated"
+msgstr "   \"%s\""
+
+#: commands/tablecmds.c:628
+#, c-format
+msgid "merging multiple inherited definitions of column \"%s\""
+msgstr "     \"%s\""
+
+#: commands/tablecmds.c:635
+#, c-format
+msgid "inherited column \"%s\" has a type conflict"
+msgstr "  \"%s\"   "
+
+#: commands/tablecmds.c:637
+#: commands/tablecmds.c:792
+#: parser/parse_coerce.c:263
+#: parser/parse_coerce.c:918
+#: parser/parse_coerce.c:935
+#: parser/parse_coerce.c:981
+#, c-format
+msgid "%s versus %s"
+msgstr "%s  %s"
+
+#: commands/tablecmds.c:783
+#, c-format
+msgid "merging column \"%s\" with inherited definition"
+msgstr "  \"%s\"   "
+
+#: commands/tablecmds.c:790
+#, c-format
+msgid "column \"%s\" has a type conflict"
+msgstr "    \"%s\""
+
+#: commands/tablecmds.c:841
+#, c-format
+msgid "column \"%s\" inherits conflicting default values"
+msgstr " \"%s\"     "
+
+#: commands/tablecmds.c:843
+msgid "To resolve the conflict, specify a default explicitly."
+msgstr "       ."
+
+#: commands/tablecmds.c:1136
+#, c-format
+msgid "inherited column \"%s\" must be renamed in child tables too"
+msgstr "  \"%s\"      -"
+
+#: commands/tablecmds.c:1154
+#, c-format
+msgid "cannot rename system column \"%s\""
+msgstr "    \"%s\""
+
+#: commands/tablecmds.c:1164
+#, c-format
+msgid "cannot rename inherited column \"%s\""
+msgstr "    \"%s\""
+
+#: commands/tablecmds.c:1175
+#: commands/tablecmds.c:1790
+#, c-format
+msgid "column \"%s\" of relation \"%s\" already exists"
+msgstr " \"%s\"   \"%s\"  "
+
+#: commands/tablecmds.c:1703
+#, c-format
+msgid "child table \"%s\" has different type for column \"%s\""
+msgstr "- \"%s\"      \"%s\""
+
+#: commands/tablecmds.c:1711
+#, c-format
+msgid "merging definition of column \"%s\" for child \"%s\""
+msgstr "   \"%s\"   \"%s\""
+
+#: commands/tablecmds.c:1743
+msgid "column must be added to child tables too"
+msgstr "      -"
+
+#: commands/tablecmds.c:1762
+msgid "adding columns with defaults is not implemented"
+msgstr "   --  "
+
+#: commands/tablecmds.c:1763
+msgid "Add the column, then use ALTER TABLE SET DEFAULT."
+msgstr "      ALTER TABLE SET DEFAULT."
+
+#: commands/tablecmds.c:1768
+msgid "adding NOT NULL columns is not implemented"
+msgstr "  NOT NULL  "
+
+#: commands/tablecmds.c:1769
+msgid "Add the column, then use ALTER TABLE SET NOT NULL."
+msgstr "     ALTER TABLE SET NOT NULL."
+
+#: commands/tablecmds.c:1982
+#: commands/tablecmds.c:2126
+#: commands/tablecmds.c:2254
+#: commands/tablecmds.c:2418
+#, c-format
+msgid "cannot alter system column \"%s\""
+msgstr "    \"%s\""
+
+#: commands/tablecmds.c:2018
+#, c-format
+msgid "column \"%s\" is in a primary key"
+msgstr " \"%s\"    "
+
+#: commands/tablecmds.c:2147
+#, c-format
+msgid "column \"%s\" contains null values"
+msgstr " \"%s\"   NULL"
+
+#: commands/tablecmds.c:2197
+#, c-format
+msgid "\"%s\" is not a table or view"
+msgstr "\"%s\"     "
+
+#: commands/tablecmds.c:2336
+#, c-format
+msgid "statistics target %d is too low"
+msgstr ""
+
+#: commands/tablecmds.c:2344
+#, c-format
+msgid "lowering statistics target to %d"
+msgstr ""
+
+#: commands/tablecmds.c:2367
+#, c-format
+msgid "invalid storage type \"%s\""
+msgstr ""
+
+#: commands/tablecmds.c:2437
+#, c-format
+msgid "column data type %s can only have storage PLAIN"
+msgstr ""
+
+#: commands/tablecmds.c:2543
+msgid "ALTER TABLE WITH OIDS is not yet implemented"
+msgstr "ALTER TABLE WITH OIDS ݣ  "
+
+#: commands/tablecmds.c:2624
+#, c-format
+msgid "cannot drop system column \"%s\""
+msgstr "    \"%s\""
+
+#: commands/tablecmds.c:2632
+#, c-format
+msgid "cannot drop inherited column \"%s\""
+msgstr "    \"%s\""
+
+#: commands/tablecmds.c:2959
+#, c-format
+msgid "check constraint may only reference relation \"%s\""
+msgstr ""
+
+#: commands/tablecmds.c:3023
+#, c-format
+msgid "check constraint \"%s\" is violated by some row"
+msgstr ""
+
+#: commands/tablecmds.c:3074
+#, c-format
+msgid "referenced relation \"%s\" is not a table"
+msgstr "  \"%s\"   "
+
+#: commands/tablecmds.c:3108
+msgid "cannot reference temporary table from permanent table constraint"
+msgstr ""
+
+#: commands/tablecmds.c:3115
+msgid "cannot reference permanent table from temporary table constraint"
+msgstr ""
+
+#: commands/tablecmds.c:3157
+#: commands/tablecmds.c:3593
+msgid "number of referencing and referenced columns for foreign key disagree"
+msgstr ""
+
+#: commands/tablecmds.c:3239
+#, c-format
+msgid "column \"%s\" referenced in foreign key constraint does not exist"
+msgstr ""
+
+#: commands/tablecmds.c:3244
+#, c-format
+msgid "cannot have more than %d keys in a foreign key"
+msgstr ""
+
+#: commands/tablecmds.c:3307
+#, c-format
+msgid "there is no primary key for referenced table \"%s\""
+msgstr ""
+
+#: commands/tablecmds.c:3421
+#, c-format
+msgid "there is no unique constraint matching given keys for referenced table \"%s\""
+msgstr ""
+
+#: commands/tablecmds.c:3843
+#: commands/trigger.c:2306
+#, c-format
+msgid "constraint \"%s\" does not exist"
+msgstr " \"%s\"  "
+
+#: commands/tablecmds.c:3848
+#, c-format
+msgid "multiple constraints named \"%s\" were dropped"
+msgstr ""
+
+#: commands/tablecmds.c:3890
+#, c-format
+msgid "\"%s\" is not a table, TOAST table, index, view, or sequence"
+msgstr "\"%s\"   , TOAST-, ,   "
+
+#: commands/tablecmds.c:4074
+msgid "shared tables cannot be toasted after initdb"
+msgstr ""
+
+#: commands/tablecmds.c:4089
+#, c-format
+msgid "table \"%s\" already has a TOAST table"
+msgstr " \"%s\"    TOAST-"
+
+#: commands/tablecmds.c:4106
+#, c-format
+msgid "table \"%s\" does not need a TOAST table"
+msgstr " \"%s\"     TOAST-"
+
 #: commands/operatorcmds.c:106
 #: commands/operatorcmds.c:114
 msgid "setof type not allowed for operator argument"
@@ -2707,287 +2990,6 @@ msgstr "
 msgid "CACHE (%s) must be greater than zero"
 msgstr "CACHE (%s)    "
 
-#: commands/tablecmds.c:151
-msgid "ON COMMIT can only be used on temporary tables"
-msgstr "ON COMMIT      "
-
-#: commands/tablecmds.c:211
-#, c-format
-msgid "duplicate check constraint name \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:388
-#: commands/tablecmds.c:1064
-#: commands/tablecmds.c:1271
-#: commands/tablecmds.c:1623
-#: commands/tablecmds.c:1909
-#: commands/tablecmds.c:2053
-#: commands/tablecmds.c:2181
-#: commands/tablecmds.c:2290
-#: commands/tablecmds.c:2453
-#: commands/tablecmds.c:2579
-#: commands/tablecmds.c:2760
-#: commands/tablecmds.c:3059
-#: commands/tablecmds.c:3771
-#: commands/trigger.c:150
-#: commands/trigger.c:552
-#: tcop/utility.c:162
-#: tcop/utility.c:197
-#, c-format
-msgid "permission denied: \"%s\" is a system catalog"
-msgstr " ݣ: \"%s\"   "
-
-#: commands/tablecmds.c:398
-msgid "cannot truncate temporary tables of other sessions"
-msgstr ""
-
-#: commands/tablecmds.c:510
-#, c-format
-msgid "column \"%s\" duplicated"
-msgstr "  : \"%s\""
-
-#: commands/tablecmds.c:535
-#: parser/analyze.c:1188
-#: parser/analyze.c:1393
-#, c-format
-msgid "inherited relation \"%s\" is not a table"
-msgstr "  \"%s\"   "
-
-#: commands/tablecmds.c:541
-#, c-format
-msgid "cannot inherit from temporary relation \"%s\""
-msgstr "    \"%s\""
-
-#: commands/tablecmds.c:558
-#, c-format
-msgid "inherited relation \"%s\" duplicated"
-msgstr "   \"%s\""
-
-#: commands/tablecmds.c:611
-#, c-format
-msgid "merging multiple inherited definitions of column \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:618
-#, c-format
-msgid "inherited column \"%s\" has a type conflict"
-msgstr "  \"%s\"   "
-
-#: commands/tablecmds.c:620
-#: commands/tablecmds.c:775
-#: parser/parse_coerce.c:263
-#: parser/parse_coerce.c:918
-#: parser/parse_coerce.c:935
-#: parser/parse_coerce.c:981
-#, c-format
-msgid "%s versus %s"
-msgstr "%s  %s"
-
-#: commands/tablecmds.c:766
-#, c-format
-msgid "merging column \"%s\" with inherited definition"
-msgstr ""
-
-#: commands/tablecmds.c:773
-#, c-format
-msgid "column \"%s\" has a type conflict"
-msgstr "    \"%s\""
-
-#: commands/tablecmds.c:814
-#, c-format
-msgid "column \"%s\" inherits conflicting default values"
-msgstr " \"%s\"     "
-
-#: commands/tablecmds.c:816
-msgid "To resolve the conflict, specify a default explicitly."
-msgstr "       ."
-
-#: commands/tablecmds.c:1109
-#, c-format
-msgid "inherited column \"%s\" must be renamed in child tables too"
-msgstr ""
-
-#: commands/tablecmds.c:1127
-#, c-format
-msgid "cannot rename system column \"%s\""
-msgstr "    \"%s\""
-
-#: commands/tablecmds.c:1137
-#, c-format
-msgid "cannot rename inherited column \"%s\""
-msgstr "    \"%s\""
-
-#: commands/tablecmds.c:1148
-#: commands/tablecmds.c:1763
-#, c-format
-msgid "column \"%s\" of relation \"%s\" already exists"
-msgstr " \"%s\"   \"%s\"  "
-
-#: commands/tablecmds.c:1676
-#, c-format
-msgid "child table \"%s\" has different type for column \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:1684
-#, c-format
-msgid "merging definition of column \"%s\" for child \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:1716
-msgid "column must be added to child tables too"
-msgstr ""
-
-#: commands/tablecmds.c:1735
-msgid "adding columns with defaults is not implemented"
-msgstr ""
-
-#: commands/tablecmds.c:1736
-msgid "Add the column, then use ALTER TABLE SET DEFAULT."
-msgstr "      ALTER TABLE SET DEFAULT."
-
-#: commands/tablecmds.c:1741
-msgid "adding NOT NULL columns is not implemented"
-msgstr "  NOT NULL  "
-
-#: commands/tablecmds.c:1742
-msgid "Add the column, then use ALTER TABLE SET NOT NULL."
-msgstr "     ALTER TABLE SET NOT NULL."
-
-#: commands/tablecmds.c:1955
-#: commands/tablecmds.c:2099
-#: commands/tablecmds.c:2227
-#: commands/tablecmds.c:2391
-#, c-format
-msgid "cannot alter system column \"%s\""
-msgstr "    \"%s\""
-
-#: commands/tablecmds.c:1991
-#, c-format
-msgid "column \"%s\" is in a primary key"
-msgstr " \"%s\"    "
-
-#: commands/tablecmds.c:2120
-#, c-format
-msgid "column \"%s\" contains null values"
-msgstr " \"%s\"   NULL"
-
-#: commands/tablecmds.c:2170
-#, c-format
-msgid "\"%s\" is not a table or view"
-msgstr "\"%s\"     "
-
-#: commands/tablecmds.c:2309
-#, c-format
-msgid "statistics target %d is too low"
-msgstr ""
-
-#: commands/tablecmds.c:2317
-#, c-format
-msgid "lowering statistics target to %d"
-msgstr ""
-
-#: commands/tablecmds.c:2340
-#, c-format
-msgid "invalid storage type \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:2410
-#, c-format
-msgid "column data type %s can only have storage PLAIN"
-msgstr ""
-
-#: commands/tablecmds.c:2516
-msgid "ALTER TABLE WITH OIDS is not yet implemented"
-msgstr "ALTER TABLE WITH OIDS ݣ  "
-
-#: commands/tablecmds.c:2597
-#, c-format
-msgid "cannot drop system column \"%s\""
-msgstr "    \"%s\""
-
-#: commands/tablecmds.c:2605
-#, c-format
-msgid "cannot drop inherited column \"%s\""
-msgstr "    \"%s\""
-
-#: commands/tablecmds.c:2932
-#, c-format
-msgid "check constraint may only reference relation \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:2996
-#, c-format
-msgid "check constraint \"%s\" is violated by some row"
-msgstr ""
-
-#: commands/tablecmds.c:3047
-#, c-format
-msgid "referenced relation \"%s\" is not a table"
-msgstr "  \"%s\"   "
-
-#: commands/tablecmds.c:3081
-msgid "cannot reference temporary table from permanent table constraint"
-msgstr ""
-
-#: commands/tablecmds.c:3088
-msgid "cannot reference permanent table from temporary table constraint"
-msgstr ""
-
-#: commands/tablecmds.c:3130
-#: commands/tablecmds.c:3566
-msgid "number of referencing and referenced columns for foreign key disagree"
-msgstr ""
-
-#: commands/tablecmds.c:3212
-#, c-format
-msgid "column \"%s\" referenced in foreign key constraint does not exist"
-msgstr ""
-
-#: commands/tablecmds.c:3217
-#, c-format
-msgid "cannot have more than %d keys in a foreign key"
-msgstr ""
-
-#: commands/tablecmds.c:3280
-#, c-format
-msgid "there is no primary key for referenced table \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:3394
-#, c-format
-msgid "there is no unique constraint matching given keys for referenced table \"%s\""
-msgstr ""
-
-#: commands/tablecmds.c:3816
-#: commands/trigger.c:2306
-#, c-format
-msgid "constraint \"%s\" does not exist"
-msgstr " \"%s\"  "
-
-#: commands/tablecmds.c:3821
-#, c-format
-msgid "multiple constraints named \"%s\" were dropped"
-msgstr ""
-
-#: commands/tablecmds.c:3863
-#, c-format
-msgid "\"%s\" is not a table, TOAST table, index, view, or sequence"
-msgstr "\"%s\"   , TOAST-, ,   "
-
-#: commands/tablecmds.c:4047
-msgid "shared tables cannot be toasted after initdb"
-msgstr ""
-
-#: commands/tablecmds.c:4062
-#, c-format
-msgid "table \"%s\" already has a TOAST table"
-msgstr " \"%s\"    TOAST-"
-
-#: commands/tablecmds.c:4079
-#, c-format
-msgid "table \"%s\" does not need a TOAST table"
-msgstr " \"%s\"     TOAST-"
-
 #: commands/trigger.c:137
 #, c-format
 msgid "could not determine referenced table for constraint \"%s\""
@@ -4060,91 +4062,91 @@ msgstr ""
 msgid "authentication file token too long, skipping: \"%s\""
 msgstr ""
 
-#: libpq/hba.c:268
+#: libpq/hba.c:267
 #, c-format
 msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:679
+#: libpq/hba.c:680
 #, c-format
 msgid "invalid IP address \"%s\" in pg_hba.conf file: %s"
 msgstr ""
 
-#: libpq/hba.c:773
+#: libpq/hba.c:774
 #, c-format
 msgid "invalid entry in pg_hba.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: libpq/hba.c:778
+#: libpq/hba.c:779
 #, c-format
 msgid "missing field in pg_hba.conf file at end of line %d"
 msgstr ""
 
 #: guc-file.l:164
-#: libpq/hba.c:974
+#: libpq/hba.c:975
 #, c-format
 msgid "could not open configuration file \"%s\": %m"
 msgstr "     \"%s\": %m"
 
-#: libpq/hba.c:1036
+#: libpq/hba.c:1037
 #, c-format
 msgid "invalid entry in pg_ident.conf file at line %d, token \"%s\""
 msgstr ""
 
-#: libpq/hba.c:1041
+#: libpq/hba.c:1042
 #, c-format
 msgid "missing entry in pg_ident.conf file at end of line %d"
 msgstr ""
 
-#: libpq/hba.c:1073
+#: libpq/hba.c:1074
 msgid "cannot use Ident authentication without usermap field"
 msgstr ""
 
-#: libpq/hba.c:1121
+#: libpq/hba.c:1122
 #, c-format
 msgid "could not open Ident usermap file \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:1292
+#: libpq/hba.c:1293
 #, c-format
 msgid "could not create socket for Ident connection: %m"
 msgstr "     Ident-: %m"
 
-#: libpq/hba.c:1308
+#: libpq/hba.c:1309
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
 msgstr ""
 
-#: libpq/hba.c:1320
+#: libpq/hba.c:1321
 #, c-format
 msgid "could not connect to Ident server at address \"%s\", port %s: %m"
 msgstr "    Ident-   \"%s\",  %s: %m"
 
-#: libpq/hba.c:1340
+#: libpq/hba.c:1341
 #, c-format
 msgid "could not send query to Ident server at address \"%s\", port %s: %m"
 msgstr "     Ident-   \"%s\",  %s: %m"
 
-#: libpq/hba.c:1355
+#: libpq/hba.c:1356
 #, c-format
 msgid "could not receive response from Ident server at address \"%s\", port %s: %m"
 msgstr ""
 
-#: libpq/hba.c:1396
-#: libpq/hba.c:1427
-#: libpq/hba.c:1495
+#: libpq/hba.c:1397
+#: libpq/hba.c:1428
+#: libpq/hba.c:1496
 #, c-format
 msgid "could not get peer credentials: %m"
 msgstr ""
 
-#: libpq/hba.c:1405
-#: libpq/hba.c:1436
-#: libpq/hba.c:1506
+#: libpq/hba.c:1406
+#: libpq/hba.c:1437
+#: libpq/hba.c:1507
 #, c-format
 msgid "local user with ID %d does not exist"
 msgstr "   ID %d  "
 
-#: libpq/hba.c:1518
+#: libpq/hba.c:1519
 msgid "Ident authentication is not supported on local connections on this platform"
 msgstr ""
 
@@ -4321,9 +4323,9 @@ msgid "equality operator for types %s and %s should be merge-joinable, but isn't
 msgstr ""
 
 #: optimizer/plan/planner.c:594
-#: parser/analyze.c:2090
-#: parser/analyze.c:2254
-#: parser/analyze.c:2809
+#: parser/analyze.c:2102
+#: parser/analyze.c:2266
+#: parser/analyze.c:2821
 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT"
 msgstr "  SELECT FOR UPDATE  UNION/INTERSECT/EXCEPT"
 
@@ -4447,211 +4449,216 @@ msgstr "
 msgid "CREATE VIEW specifies more column names than columns"
 msgstr "CREATE VIEW   ͣ    "
 
-#: parser/analyze.c:574
+#: parser/analyze.c:452
+#, c-format
+msgid "target lists can have at most %d entries"
+msgstr "     : %d"
+
+#: parser/analyze.c:586
 msgid "INSERT ... SELECT may not specify INTO"
 msgstr "INSERT ... SELECT    INTO"
 
-#: parser/analyze.c:666
+#: parser/analyze.c:678
 msgid "INSERT has more expressions than target columns"
 msgstr "INSERT      "
 
-#: parser/analyze.c:687
+#: parser/analyze.c:699
 msgid "INSERT has more target columns than expressions"
 msgstr "INSERT      "
 
-#: parser/analyze.c:973
+#: parser/analyze.c:985
 #, c-format
 msgid "%s will create implicit sequence \"%s\" for \"serial\" column \"%s.%s\""
 msgstr "%s    \"%s\"   \"%s.%s\"  \"serial\""
 
-#: parser/analyze.c:1057
-#: parser/analyze.c:1067
+#: parser/analyze.c:1069
+#: parser/analyze.c:1079
 #, c-format
 msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\""
 msgstr "  NULL/NOT NULL   \"%s\"   \"%s\""
 
-#: parser/analyze.c:1077
+#: parser/analyze.c:1089
 #, c-format
 msgid "multiple default values specified for column \"%s\" of table \"%s\""
 msgstr "       \"%s\"   \"%s\""
 
-#: parser/analyze.c:1322
+#: parser/analyze.c:1334
 #, c-format
 msgid "multiple primary keys for table \"%s\" are not allowed"
 msgstr "     \"%s\"  "
 
-#: parser/analyze.c:1454
+#: parser/analyze.c:1466
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
 msgstr " \"%s\"     "
 
-#: parser/analyze.c:1459
+#: parser/analyze.c:1471
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
 msgstr " \"%s\"     UNIQUE"
 
-#: parser/analyze.c:1553
+#: parser/analyze.c:1565
 #, c-format
 msgid "%s / %s%s will create implicit index \"%s\" for table \"%s\""
 msgstr "%s / %s%s    \"%s\"   \"%s\""
 
-#: parser/analyze.c:1658
+#: parser/analyze.c:1670
 msgid "index expression may not return a set"
 msgstr "     "
 
-#: parser/analyze.c:1750
+#: parser/analyze.c:1762
 msgid "rule WHERE condition may not contain references to other relations"
 msgstr "  WHERE       "
 
-#: parser/analyze.c:1756
+#: parser/analyze.c:1768
 msgid "rule WHERE condition may not contain aggregate functions"
 msgstr "  WHERE     "
 
-#: parser/analyze.c:1827
+#: parser/analyze.c:1839
 msgid "rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions"
 msgstr "   WHERE     SELECT, INSERT, UPDATE  DELETE"
 
-#: parser/analyze.c:1846
-#: parser/analyze.c:1918
+#: parser/analyze.c:1858
+#: parser/analyze.c:1930
 #: rewrite/rewriteHandler.c:174
 #: rewrite/rewriteManip.c:746
 #: rewrite/rewriteManip.c:802
 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented"
 msgstr "  UNION/INTERSECT/EXCEPT  "
 
-#: parser/analyze.c:1864
+#: parser/analyze.c:1876
 msgid "ON SELECT rule may not use OLD"
 msgstr "  OLD   ON SELECT"
 
-#: parser/analyze.c:1868
+#: parser/analyze.c:1880
 msgid "ON SELECT rule may not use NEW"
 msgstr "  NEW   ON SELECT"
 
-#: parser/analyze.c:1877
+#: parser/analyze.c:1889
 msgid "ON INSERT rule may not use OLD"
 msgstr "  OLD   ON INSERT"
 
-#: parser/analyze.c:1883
+#: parser/analyze.c:1895
 msgid "ON DELETE rule may not use NEW"
 msgstr "  NEW   ON DELETE"
 
-#: parser/analyze.c:2211
+#: parser/analyze.c:2223
 msgid "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result columns"
 msgstr "ORDER BY   UNION/INTERSECT/EXCEPT       "
 
-#: parser/analyze.c:2249
+#: parser/analyze.c:2261
 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT"
 msgstr "INTO      SELECT'  UNION/INTERSECT/EXCEPT"
 
-#: parser/analyze.c:2310
+#: parser/analyze.c:2322
 msgid "UNION/INTERSECT/EXCEPT member statement may not refer to other relations of same query level"
 msgstr ",   UNION/INTERSECT/EXCEPT           "
 
-#: parser/analyze.c:2363
+#: parser/analyze.c:2375
 #, c-format
 msgid "each %s query must have the same number of columns"
 msgstr "  %s     "
 
-#: parser/analyze.c:2433
+#: parser/analyze.c:2445
 msgid "CREATE TABLE AS specifies too many column names"
 msgstr "CREATE TABLE AS    ͣ  "
 
-#: parser/analyze.c:2666
+#: parser/analyze.c:2678
 msgid "cannot specify both SCROLL and NO SCROLL"
 msgstr "   SCROLL  NO SCROLL"
 
-#: parser/analyze.c:2752
+#: parser/analyze.c:2764
 #, c-format
 msgid "wrong number of parameters for prepared statement \"%s\""
 msgstr ""
 
-#: parser/analyze.c:2754
+#: parser/analyze.c:2766
 #, c-format
 msgid "Expected %d parameters but got %d."
 msgstr " : %d,   : %d."
 
-#: parser/analyze.c:2769
+#: parser/analyze.c:2781
 msgid "cannot use subquery in EXECUTE parameter"
 msgstr "      EXECUTE"
 
-#: parser/analyze.c:2773
+#: parser/analyze.c:2785
 msgid "cannot use aggregate function in EXECUTE parameter"
 msgstr "       EXECUTE"
 
-#: parser/analyze.c:2786
+#: parser/analyze.c:2798
 #, c-format
 msgid "parameter $%d of type %s cannot be coerced to the expected type %s"
 msgstr ""
 
-#: parser/analyze.c:2813
+#: parser/analyze.c:2825
 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause"
 msgstr "  SELECT FOR UPDATE   DISTINCT"
 
-#: parser/analyze.c:2817
+#: parser/analyze.c:2829
 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause"
 msgstr "  SELECT FOR UPDATE   GROUP BY"
 
-#: parser/analyze.c:2821
+#: parser/analyze.c:2833
 msgid "SELECT FOR UPDATE is not allowed with aggregate functions"
 msgstr "  SELECT FOR UPDATE   "
 
-#: parser/analyze.c:2901
+#: parser/analyze.c:2913
 msgid "SELECT FOR UPDATE cannot be applied to a join"
 msgstr "  SELECT FOR UPDATE  JOIN"
 
-#: parser/analyze.c:2906
+#: parser/analyze.c:2918
 msgid "SELECT FOR UPDATE cannot be applied to NEW or OLD"
 msgstr "  SELECT FOR UPDATE  NEW  OLD"
 
-#: parser/analyze.c:2911
+#: parser/analyze.c:2923
 msgid "SELECT FOR UPDATE cannot be applied to a function"
 msgstr "SELECT FOR UPDATE:    "
 
-#: parser/analyze.c:2924
+#: parser/analyze.c:2936
 #, c-format
 msgid "relation \"%s\" in FOR UPDATE clause not found in FROM clause"
 msgstr " \"%s\"   FOR UPDATE     FROM"
 
-#: parser/analyze.c:3016
+#: parser/analyze.c:3028
 msgid "misplaced DEFERRABLE clause"
 msgstr "   DEFERRABLE"
 
-#: parser/analyze.c:3020
-#: parser/analyze.c:3033
+#: parser/analyze.c:3032
+#: parser/analyze.c:3045
 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed"
 msgstr "  DEFERRABLE/NOT DEFERRABLE  "
 
-#: parser/analyze.c:3029
+#: parser/analyze.c:3041
 msgid "misplaced NOT DEFERRABLE clause"
 msgstr "   NOT DEFERRABLE"
 
 #: gram.y:2193
 #: gram.y:2208
-#: parser/analyze.c:3040
-#: parser/analyze.c:3064
+#: parser/analyze.c:3052
+#: parser/analyze.c:3076
 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE"
 msgstr "   INITIALLY DEFERRED    DEFERRABLE"
 
-#: parser/analyze.c:3047
+#: parser/analyze.c:3059
 msgid "misplaced INITIALLY DEFERRED clause"
 msgstr "   INITIALLY DEFERRED"
 
-#: parser/analyze.c:3051
-#: parser/analyze.c:3075
+#: parser/analyze.c:3063
+#: parser/analyze.c:3087
 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed"
 msgstr "  INITIALLY IMMEDIATE/DEFERRED  "
 
-#: parser/analyze.c:3071
+#: parser/analyze.c:3083
 msgid "misplaced INITIALLY IMMEDIATE clause"
 msgstr "   INITIALLY IMMEDIATE"
 
-#: parser/analyze.c:3184
-#: parser/analyze.c:3205
+#: parser/analyze.c:3196
+#: parser/analyze.c:3217
 #, c-format
 msgid "CREATE specifies a schema (%s) different from the one being created (%s)"
 msgstr "CREATE   (%s)    (%s)"
 
-#: parser/analyze.c:3259
+#: parser/analyze.c:3271
 #: parser/parse_coerce.c:245
 #: parser/parse_expr.c:137
 #: parser/parse_expr.c:143
@@ -4659,7 +4666,7 @@ msgstr "CREATE
 msgid "there is no parameter $%d"
 msgstr " $%d  "
 
-#: parser/analyze.c:3264
+#: parser/analyze.c:3276
 #: tcop/postgres.c:1142
 #, c-format
 msgid "could not determine data type of parameter $%d"
@@ -6194,12 +6201,12 @@ msgstr ""
 
 #: storage/file/fd.c:351
 msgid "insufficient file descriptors available to start server process"
-msgstr ""
+msgstr "      -"
 
 #: storage/file/fd.c:352
 #, c-format
 msgid "System allows %d, we need at least %d."
-msgstr ""
+msgstr " : %d,    : %d."
 
 #: storage/file/fd.c:393
 #: storage/file/fd.c:1133

src/bin/initdb/po/ru.po

@@ -4,64 +4,82 @@
 # Copyright (c) 2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
 # Distributed under the same licensing terms as PostgreSQL itself.
 #
-# $PostgreSQL: pgsql/src/bin/initdb/po/ru.po,v 1.12 2004/12/06 22:10:39 petere Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/po/ru.po,v 1.13 2004/12/11 20:09:58 petere Exp $
 #
 # ChangeLog:
-#   - March 27 - November 28, 2004: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
+#   - March 27 - December 10, 2004: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-11-28 07:09+0000\n"
-"PO-Revision-Date: 2004-11-28 20:50-0500\n"
+"POT-Creation-Date: 2004-12-10 19:06+0000\n"
+"PO-Revision-Date: 2004-12-10 21:32-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
-"Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
+"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: initdb.c:237
-#: initdb.c:251
+#: initdb.c:250
+#: initdb.c:264
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s:  \n"
 
-#: initdb.c:361
-#: initdb.c:1342
+#: initdb.c:374
+#: initdb.c:1403
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s:     \"%s\"  : %s\n"
 
-#: initdb.c:422
+#: initdb.c:435
+#: initdb.c:1035
+#: initdb.c:1062
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s:     \"%s\"  : %s\n"
 
-#: initdb.c:550
-#: initdb.c:559
-#: initdb.c:567
+#: initdb.c:443
+#: initdb.c:451
+#: initdb.c:1042
+#: initdb.c:1068
+#, c-format
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s:      \"%s\": %s\n"
+
+#: initdb.c:470
 #, c-format
-msgid "%s: failed\n"
-msgstr "%s: \n"
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
 
-#: initdb.c:556
+#: initdb.c:593
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s:    \"%s\"\n"
 
-#: initdb.c:564
+#: initdb.c:596
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s:     \n"
+
+#: initdb.c:602
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s:     \"%s\"\n"
 
-#: initdb.c:575
+#: initdb.c:605
+#, c-format
+msgid "%s: failed to remove contents of data directory\n"
+msgstr "%s:      \n"
+
+#: initdb.c:614
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s:   \"%s\"     \n"
 
-#: initdb.c:601
+#: initdb.c:640
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -72,17 +90,17 @@ msgstr ""
 ",   ()  (,\n"
 " \"su\"),      .\n"
 
-#: initdb.c:650
+#: initdb.c:689
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\"     \n"
 
-#: initdb.c:805
+#: initdb.c:844
 #, c-format
 msgid "%s: warning: encoding mismatch\n"
 msgstr "%s: :   \n"
 
-#: initdb.c:807
+#: initdb.c:846
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected\n"
@@ -97,7 +115,12 @@ msgstr ""
 "    %s    \n"
 "    .\n"
 
-#: initdb.c:959
+#: initdb.c:976
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s:     \"%s\": %s\n"
+
+#: initdb.c:1004
 #, c-format
 msgid ""
 "%s: file \"%s\" does not exist\n"
@@ -108,24 +131,24 @@ msgstr ""
 "      ģ   \n"
 "     -L.\n"
 
-#: initdb.c:1024
+#: initdb.c:1086
 msgid "selecting default max_connections ... "
 msgstr "     max_connections ... "
 
-#: initdb.c:1060
+#: initdb.c:1122
 msgid "selecting default shared_buffers ... "
 msgstr "     shared_buffers ... "
 
-#: initdb.c:1093
+#: initdb.c:1155
 msgid "creating configuration files ... "
 msgstr "   ... "
 
-#: initdb.c:1189
+#: initdb.c:1251
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "  template1  %s/base/1 ... "
 
-#: initdb.c:1205
+#: initdb.c:1267
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -134,90 +157,91 @@ msgstr ""
 "%s:   \"%s\"   PostgreSQL %s\n"
 "          -L.\n"
 
-#: initdb.c:1281
+#: initdb.c:1342
 msgid "initializing pg_shadow ... "
 msgstr " pg_shadow ... "
 
-#: initdb.c:1317
+#: initdb.c:1378
 msgid "Enter new superuser password: "
 msgstr "   : "
 
-#: initdb.c:1318
+#: initdb.c:1379
 msgid "Enter it again: "
 msgstr "  : "
 
-#: initdb.c:1321
+#: initdb.c:1382
 msgid "Passwords didn't match.\n"
 msgstr "  .\n"
 
-#: initdb.c:1348
+#: initdb.c:1409
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s:       \"%s\": %s\n"
 
-#: initdb.c:1361
+#: initdb.c:1422
 msgid "setting password ... "
 msgstr "  ... "
 
-#: initdb.c:1385
+#: initdb.c:1443
 #, c-format
 msgid "%s: The password file was not generated. Please report this problem.\n"
 msgstr "%s:    .     .\n"
 
-#: initdb.c:1415
+#: initdb.c:1471
 msgid "enabling unlimited row size for system tables ... "
 msgstr "      ... "
 
-#: initdb.c:1488
+#: initdb.c:1544
 msgid "initializing pg_depend ... "
 msgstr " pg_depend ... "
 
-#: initdb.c:1516
+#: initdb.c:1572
 msgid "creating system views ... "
 msgstr "   ... "
 
-#: initdb.c:1553
+#: initdb.c:1608
 msgid "loading pg_description ... "
 msgstr " pg_description ... "
 
-#: initdb.c:1601
+#: initdb.c:1647
 msgid "creating conversions ... "
 msgstr "  ... "
 
-#: initdb.c:1657
+#: initdb.c:1701
 msgid "setting privileges on built-in objects ... "
 msgstr "     ... "
 
-#: initdb.c:1715
+#: initdb.c:1759
 msgid "creating information schema ... "
 msgstr "   ... "
 
-#: initdb.c:1778
+#: initdb.c:1816
 msgid "vacuuming database template1 ... "
 msgstr "    template1 ... "
 
-#: initdb.c:1834
+#: initdb.c:1870
 msgid "copying template1 to template0 ... "
 msgstr " template1  template0 ... "
 
-#: initdb.c:1891
+#: initdb.c:1927
 msgid "caught signal\n"
 msgstr " \n"
 
-#: initdb.c:1896
-msgid "could not write to child process\n"
-msgstr "    -\n"
+#: initdb.c:1933
+#, c-format
+msgid "could not write to child process: %s\n"
+msgstr "    -: %s\n"
 
-#: initdb.c:1902
+#: initdb.c:1941
 msgid "ok\n"
 msgstr "\n"
 
-#: initdb.c:1949
+#: initdb.c:1989
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s:    \"%s\"\n"
 
-#: initdb.c:2016
+#: initdb.c:2056
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -226,16 +250,16 @@ msgstr ""
 "%s   PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2017
+#: initdb.c:2057
 msgid "Usage:\n"
 msgstr ":\n"
 
-#: initdb.c:2018
+#: initdb.c:2058
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s []... []\n"
 
-#: initdb.c:2019
+#: initdb.c:2059
 msgid ""
 "\n"
 "Options:\n"
@@ -243,19 +267,19 @@ msgstr ""
 "\n"
 ":\n"
 
-#: initdb.c:2020
+#: initdb.c:2060
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]        \n"
 
-#: initdb.c:2021
+#: initdb.c:2061
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=        \n"
 
-#: initdb.c:2022
+#: initdb.c:2062
 msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
 msgstr "  --locale=                 \n"
 
-#: initdb.c:2023
+#: initdb.c:2063
 msgid ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
 "  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
@@ -269,35 +293,35 @@ msgstr ""
 "                                \n"
 "                            (     )\n"
 
-#: initdb.c:2028
+#: initdb.c:2068
 msgid "  --no-locale               equivalent to --locale=C\n"
 msgstr "  --no-locale                --locale=C\n"
 
-#: initdb.c:2029
+#: initdb.c:2069
 msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
 msgstr "  -A, --auth=                \n"
 
-#: initdb.c:2030
+#: initdb.c:2070
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME          \n"
 
-#: initdb.c:2031
+#: initdb.c:2071
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt                \n"
 
-#: initdb.c:2032
+#: initdb.c:2072
 msgid "  --pwfile=FILE             read password for the new superuser from file\n"
 msgstr "  --pwfile=                   \n"
 
-#: initdb.c:2033
+#: initdb.c:2073
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                    \n"
 
-#: initdb.c:2034
+#: initdb.c:2074
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version                \n"
 
-#: initdb.c:2035
+#: initdb.c:2075
 msgid ""
 "\n"
 "Less commonly used options:\n"
@@ -305,23 +329,23 @@ msgstr ""
 "\n"
 "  :\n"
 
-#: initdb.c:2036
+#: initdb.c:2076
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug                  \n"
 
-#: initdb.c:2037
+#: initdb.c:2077
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                  \n"
 
-#: initdb.c:2038
+#: initdb.c:2078
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY                 \n"
 
-#: initdb.c:2039
+#: initdb.c:2079
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean                \n"
 
-#: initdb.c:2040
+#: initdb.c:2080
 msgid ""
 "\n"
 "If the data directory is not specified, the environment variable PGDATA\n"
@@ -330,7 +354,7 @@ msgstr ""
 "\n"
 "    ,     PGDATA.\n"
 
-#: initdb.c:2042
+#: initdb.c:2082
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -338,32 +362,32 @@ msgstr ""
 "\n"
 "  : <pgsql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2133
+#: initdb.c:2175
 msgid "Running in debug mode.\n"
 msgstr "   .\n"
 
-#: initdb.c:2137
+#: initdb.c:2179
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "   'noclean'.          .\n"
 
-#: initdb.c:2173
-#: initdb.c:2190
-#: initdb.c:2408
+#: initdb.c:2216
+#: initdb.c:2233
+#: initdb.c:2453
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr " \"%s --help\"    .\n"
 
-#: initdb.c:2188
+#: initdb.c:2231
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s:      (: \"%s\")\n"
 
-#: initdb.c:2196
+#: initdb.c:2239
 #, c-format
 msgid "%s: password prompt and password file may not be specified together\n"
 msgstr "%s:         \n"
 
-#: initdb.c:2202
+#: initdb.c:2245
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections\n"
@@ -375,17 +399,17 @@ msgstr ""
 "  ţ   pg_hba.conf    -A\n"
 "   initdb.\n"
 
-#: initdb.c:2226
+#: initdb.c:2269
 #, c-format
 msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s:    \"%s\"\n"
 
-#: initdb.c:2235
+#: initdb.c:2279
 #, c-format
 msgid "%s: must specify a password for the superuser to enable %s authentication\n"
 msgstr "%s:        %s\n"
 
-#: initdb.c:2250
+#: initdb.c:2294
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -398,7 +422,7 @@ msgstr ""
 "  .         -D\n"
 "    PGDATA.\n"
 
-#: initdb.c:2281
+#: initdb.c:2326
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the\n"
@@ -409,7 +433,7 @@ msgstr ""
 "     \"%s\".\n"
 "  .\n"
 
-#: initdb.c:2288
+#: initdb.c:2333
 #, c-format
 msgid ""
 "The program \"postgres\" was found by \"%s\"\n"
@@ -420,17 +444,17 @@ msgstr ""
 "     %s.\n"
 "  .\n"
 
-#: initdb.c:2307
+#: initdb.c:2352
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s:       ԣ\n"
 
-#: initdb.c:2315
+#: initdb.c:2360
 #, c-format
 msgid "%s: could not determine valid short version string\n"
 msgstr "%s:        \n"
 
-#: initdb.c:2368
+#: initdb.c:2413
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -441,12 +465,12 @@ msgstr ""
 "  \"%s\".  \n"
 "     .\n"
 
-#: initdb.c:2378
+#: initdb.c:2423
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "       %s.\n"
 
-#: initdb.c:2381
+#: initdb.c:2426
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -465,37 +489,37 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2406
+#: initdb.c:2451
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s:        \"%s\"\n"
 
-#: initdb.c:2407
+#: initdb.c:2452
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr " %s   -E.\n"
 
-#: initdb.c:2414
+#: initdb.c:2459
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "      %s.\n"
 
-#: initdb.c:2455
+#: initdb.c:2500
 #, c-format
 msgid "creating directory %s ... "
 msgstr "  %s ... "
 
-#: initdb.c:2469
+#: initdb.c:2514
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "     %s ... "
 
-#: initdb.c:2475
+#: initdb.c:2520
 #, c-format
 msgid "%s: could not change permissions of directory \"%s\": %s\n"
 msgstr "%s:       \"%s\": %s\n"
 
-#: initdb.c:2488
+#: initdb.c:2533
 #, c-format
 msgid ""
 "%s: directory \"%s\" exists but is not empty\n"
@@ -508,33 +532,33 @@ msgstr ""
 " \"%s\"  ţ    %s\n"
 "    \"%s\".\n"
 
-#: initdb.c:2497
+#: initdb.c:2542
 #, c-format
 msgid "%s: could not access directory \"%s\": %s\n"
 msgstr "%s:     \"%s\": %s\n"
 
-#: initdb.c:2506
+#: initdb.c:2551
 #, c-format
 msgid "creating directory %s/%s ... "
 msgstr "  %s/%s ... "
 
-#: initdb.c:2570
+#: initdb.c:2619
 #, c-format
 msgid ""
 "\n"
 "Success. You can now start the database server using:\n"
 "\n"
-"    %s%s%s/postmaster -D %s%s%s\n"
+"    %s%s%s%spostmaster -D %s%s%s\n"
 "or\n"
-"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"    %s%s%s%spg_ctl -D %s%s%s -l logfile start\n"
 "\n"
 msgstr ""
 "\n"
 ".       :\n"
 "\n"
-"    %s%s%s/postmaster -D %s%s%s\n"
-"or\n"
-"    %s%s%s/pg_ctl -D %s%s%s -l  start\n"
+"    %s%s%s%spostmaster -D %s%s%s\n"
+"\n"
+"    %s%s%s%spg_ctl -D %s%s%s -l  start\n"
 "\n"
 
 #: ../../port/dirmod.c:75

src/bin/pg_dump/po/ru.po

@@ -4,10 +4,10 @@
 # Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
 # Distributed under the same licensing terms as PostgreSQL itself.
 #
-# $PostgreSQL: pgsql/src/bin/pg_dump/po/ru.po,v 1.17 2004/12/06 22:10:41 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/po/ru.po,v 1.18 2004/12/11 20:10:09 petere Exp $
 #
 # ChangeLog:
-#   - April 6 - November 24, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
+#   - April 6 - December 10, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
 #   - July 24 - October 5, 2003: Updates for 7.4.x; <mokhov@cs.concordia.ca>
 #   - October 12, 2002: Post-7.3 beta 2, Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
 #   - September 14, 2002: Post-7.3 beta 1, Take II, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -17,10 +17,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-11-28 07:11+0000\n"
-"PO-Revision-Date: 2004-11-28 20:50-0500\n"
+"POT-Creation-Date: 2004-12-10 19:08+0000\n"
+"PO-Revision-Date: 2004-12-10 21:52-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
-"Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
+"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -233,10 +233,10 @@ msgstr "  -o, --oids
 
 #: pg_dump.c:685
 msgid ""
-"  -O, --no-owner           do not output commands to set object ownership\n"
+"  -O, --no-owner           skip restoration of object ownership\n"
 "                           in plain text format\n"
 msgstr ""
-"  -O, --no-owner                  \n"
+"  -O, --no-owner               \n"
 "                             \" \"\n"
 
 #: pg_dump.c:687
@@ -1453,76 +1453,76 @@ msgstr "
 msgid "could not write null block at end of tar archive\n"
 msgstr "       tar-\n"
 
-#: pg_backup_tar.c:1023
+#: pg_backup_tar.c:1027
 msgid "archive member too large for tar format\n"
 msgstr "      tar\n"
 
-#: pg_backup_tar.c:1033
+#: pg_backup_tar.c:1037
 #, c-format
 msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
 msgstr "     tar- (: %lu, : %lu)\n"
 
-#: pg_backup_tar.c:1039
+#: pg_backup_tar.c:1043
 #, c-format
 msgid "could not close tar member: %s\n"
 msgstr "   tar-: %s\n"
 
-#: pg_backup_tar.c:1048
+#: pg_backup_tar.c:1052
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "   (%s)    (%s)\n"
 
-#: pg_backup_tar.c:1056
+#: pg_backup_tar.c:1060
 msgid "could not output padding at end of tar member\n"
 msgstr "   \"\"   tar-\n"
 
-#: pg_backup_tar.c:1085
+#: pg_backup_tar.c:1089
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "   %s       %s\n"
 
-#: pg_backup_tar.c:1096
+#: pg_backup_tar.c:1100
 #, c-format
 msgid "now at file position %s\n"
 msgstr "    %s\n"
 
-#: pg_backup_tar.c:1105
-#: pg_backup_tar.c:1132
+#: pg_backup_tar.c:1109
+#: pg_backup_tar.c:1136
 #, c-format
 msgid "could not find header for file %s in tar archive\n"
 msgstr "     %s  tar-\n"
 
-#: pg_backup_tar.c:1116
+#: pg_backup_tar.c:1120
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr " tar- %s\n"
 
-#: pg_backup_tar.c:1120
+#: pg_backup_tar.c:1124
 #, c-format
 msgid "dumping data out of order is not supported in this archive format: %s is required, but comes before %s in the archive file.\n"
 msgstr "          : %s ,  ģ  %s   .\n"
 
-#: pg_backup_tar.c:1168
+#: pg_backup_tar.c:1172
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr "        (%s vs. %s)\n"
 
-#: pg_backup_tar.c:1183
+#: pg_backup_tar.c:1187
 #, c-format
 msgid "incomplete tar header found (%lu bytes)\n"
 msgstr "  tar- (, : %lu)\n"
 
-#: pg_backup_tar.c:1218
+#: pg_backup_tar.c:1222
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "  %s  %s (: %lu, checksum: %d)\n"
 
-#: pg_backup_tar.c:1228
+#: pg_backup_tar.c:1232
 #, c-format
 msgid "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr " ģ tar-  %s (: %d, : %d),   : %s\n"
 
-#: pg_backup_tar.c:1321
+#: pg_backup_tar.c:1325
 msgid "could not write tar header\n"
 msgstr "    tar-\n"
 
@@ -1594,9 +1594,10 @@ msgstr ""
 "  -L, --use-list=      \n"
 "                              \n"
 
+#: pg_dumpall.c:352
 #: pg_restore.c:379
-msgid "  -O, --no-owner           do not issue commands to set object ownership\n"
-msgstr "  -O, --no-owner                  \n"
+msgid "  -O, --no-owner           skip restoration of object ownership\n"
+msgstr "  -O, --no-owner               \n"
 
 #: pg_restore.c:380
 msgid ""
@@ -1696,10 +1697,6 @@ msgstr "  -c, --clean
 msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr "  -g, --globals-only          ,   \n"
 
-#: pg_dumpall.c:352
-msgid "  -O, --no-owner           do not output commands to set object ownership\n"
-msgstr "  -O, --no-owner                  \n"
-
 #: pg_dumpall.c:354
 msgid "  -S, --superuser=NAME     specify the superuser user name to use in the dump\n"
 msgstr "  -S, --superuser=        -    \n"

src/bin/psql/po/ru.po

@@ -4,10 +4,10 @@
 # Copyright (c) 2001-2004 Serguei A. Mokhov, mokhov@cs.concordia.ca
 # Distributed under the same licensing terms as PostgreSQL itself.
 #
-# $PostgreSQL: pgsql/src/bin/psql/po/ru.po,v 1.21 2004/12/06 22:10:42 petere Exp $
+# $PostgreSQL: pgsql/src/bin/psql/po/ru.po,v 1.22 2004/12/11 20:10:14 petere Exp $
 #
 # ChangeLog:
-#   - March 27 - November 24, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
+#   - March 27 - December 10, 2004: Updates for 8.0; <mokhov@cs.concordia.ca>
 #   - July 26 - October 12, 2003: Updates 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>
@@ -16,10 +16,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-11-28 07:13+0000\n"
-"PO-Revision-Date: 2004-11-28 20:50-0500\n"
+"POT-Creation-Date: 2004-12-10 19:09+0000\n"
+"PO-Revision-Date: 2004-12-10 21:59-0500\n"
 "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n"
-"Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n"
+"Language-Team: pgsql-ru-general <pgsql-ru-general@postgresql.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,7 +56,7 @@ msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s:      \"%s\": %s\n"
 
 #: command.c:374
-#: command.c:764
+#: command.c:766
 msgid "no query buffer\n"
 msgstr "  \n"
 
@@ -70,8 +70,8 @@ msgstr "%s:
 #: command.c:553
 #: command.c:570
 #: command.c:616
-#: command.c:744
-#: command.c:775
+#: command.c:746
+#: command.c:777
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s:   \n"
@@ -89,7 +89,7 @@ msgstr "
 msgid "Wrote history to file \"%s\".\n"
 msgstr "    \"%s\".\n"
 
-#: command.c:685
+#: command.c:687
 #: common.c:85
 #: common.c:99
 #: mainloop.c:71
@@ -109,30 +109,30 @@ msgstr "
 msgid "out of memory\n"
 msgstr " \n"
 
-#: command.c:700
-#: command.c:749
+#: command.c:702
+#: command.c:751
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: \n"
 
-#: command.c:730
+#: command.c:732
 msgid "Timing is on."
 msgstr "C ."
 
-#: command.c:732
+#: command.c:734
 msgid "Timing is off."
 msgstr "C ."
 
-#: command.c:792
-#: command.c:812
-#: command.c:1197
-#: command.c:1204
-#: command.c:1214
-#: command.c:1226
-#: command.c:1239
-#: command.c:1253
-#: command.c:1275
-#: command.c:1306
+#: command.c:794
+#: command.c:814
+#: command.c:1199
+#: command.c:1206
+#: command.c:1216
+#: command.c:1228
+#: command.c:1241
+#: command.c:1255
+#: command.c:1277
+#: command.c:1308
 #: common.c:170
 #: copy.c:530
 #: copy.c:575
@@ -140,14 +140,14 @@ msgstr "C
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:919
-#: command.c:943
+#: command.c:921
+#: command.c:945
 #: startup.c:188
 #: startup.c:206
 msgid "Password: "
 msgstr ": "
 
-#: command.c:957
+#: command.c:959
 #: common.c:216
 #: common.c:685
 #: common.c:740
@@ -156,142 +156,142 @@ msgstr "
 msgid "%s"
 msgstr "%s"
 
-#: command.c:961
+#: command.c:963
 msgid "Previous connection kept\n"
 msgstr "  \n"
 
-#: command.c:973
+#: command.c:975
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\connect: %s"
 
-#: command.c:985
+#: command.c:987
 #, c-format
 msgid "You are now connected to database \"%s\".\n"
 msgstr "      \"%s\".\n"
 
-#: command.c:987
+#: command.c:989
 #, c-format
 msgid "You are now connected as new user \"%s\".\n"
 msgstr "      \"%s\".\n"
 
-#: command.c:990
+#: command.c:992
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "      \"%s\"   \"%s\".\n"
 
-#: command.c:1115
+#: command.c:1117
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "    \"%s\"\n"
 
-#: command.c:1117
+#: command.c:1119
 msgid "could not start /bin/sh\n"
 msgstr "   /bin/sh\n"
 
-#: command.c:1156
+#: command.c:1158
 #, c-format
 msgid "cannot locate temporary directory: %s"
 msgstr "    : %s"
 
-#: command.c:1182
+#: command.c:1184
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "     \"%s\": %s\n"
 
-#: command.c:1374
+#: command.c:1376
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset:  : unaligned, aligned, html  latex\n"
 
-#: command.c:1379
+#: command.c:1381
 #, c-format
 msgid "Output format is %s.\n"
 msgstr " : %s.\n"
 
-#: command.c:1389
+#: command.c:1391
 #, c-format
 msgid "Border style is %d.\n"
 msgstr " : %d.\n"
 
-#: command.c:1398
+#: command.c:1400
 msgid "Expanded display is on.\n"
 msgstr "  .\n"
 
-#: command.c:1399
+#: command.c:1401
 msgid "Expanded display is off.\n"
 msgstr "  .\n"
 
-#: command.c:1411
+#: command.c:1413
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "-: \"%s\".\n"
 
-#: command.c:1423
+#: command.c:1425
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr " : \"%s\".\n"
 
-#: command.c:1437
+#: command.c:1439
 msgid "Record separator is <newline>."
 msgstr " : <newline>."
 
-#: command.c:1439
+#: command.c:1441
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr " : \"%s\".\n"
 
-#: command.c:1450
+#: command.c:1452
 msgid "Showing only tuples."
 msgstr "  ."
 
-#: command.c:1452
+#: command.c:1454
 msgid "Tuples only is off."
 msgstr " \" \" ."
 
-#: command.c:1468
+#: command.c:1470
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr ": \"%s\".\n"
 
-#: command.c:1470
+#: command.c:1472
 msgid "Title is unset.\n"
 msgstr "  .\n"
 
-#: command.c:1486
+#: command.c:1488
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr " : \"%s\".\n"
 
-#: command.c:1488
+#: command.c:1490
 msgid "Table attributes unset.\n"
 msgstr "   .\n"
 
-#: command.c:1504
+#: command.c:1506
 msgid "Pager is used for long output."
 msgstr "    ."
 
-#: command.c:1506
+#: command.c:1508
 msgid "Pager is always used."
 msgstr "  ."
 
-#: command.c:1508
+#: command.c:1510
 msgid "Pager usage is off."
 msgstr "  ."
 
-#: command.c:1519
+#: command.c:1521
 msgid "Default footer is on."
 msgstr "    ."
 
-#: command.c:1521
+#: command.c:1523
 msgid "Default footer is off."
 msgstr "    ."
 
-#: command.c:1527
+#: command.c:1529
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset:  : %s\n"
 
-#: command.c:1578
+#: command.c:1582
 msgid "\\!: failed\n"
 msgstr "\\!: \n"
 
@@ -3106,11 +3106,11 @@ msgstr "
 
 #: sql_help.h:430
 msgid ""
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column [, ...] ) ] ]"
+"VACUUM [ FULL | FREEZE ] [ VERBOSE ] [ table ]\n"
+"VACUUM [ FULL | FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column [, ...] ) ] ]"
 msgstr ""
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [  ]\n"
-"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [  [ ( [, ...] ) ] ]"
+"VACUUM [ FULL | FREEZE ] [ VERBOSE ] [  ]\n"
+"VACUUM [ FULL | FREEZE ] [ VERBOSE ] ANALYZE [  [ ( [, ...] ) ] ]"
 
 #: ../../port/exec.c:193
 #: ../../port/exec.c:307