From 55216724b2c9a8d4b021e414a064fbe2b5d23787 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 29 May 2004 06:22:56 +0000 Subject: [PATCH] Translation update --- src/backend/po/ru.po | 7356 +++++++++++++++++++++--------------------- 1 file changed, 3753 insertions(+), 3603 deletions(-) diff --git a/src/backend/po/ru.po b/src/backend/po/ru.po index 7feefa3944..b98a0f959f 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) # -# $PostgreSQL: pgsql/src/backend/po/ru.po,v 1.13 2003/11/29 19:51:53 pgsql Exp $ +# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.14 2004/05/29 06:22:56 petere Exp $ # # ChangeLog: +# - March 27 - May 16, 2004: updates for 7.4 - 7.5 branches; # - July - August 23, 2003: updates for 7.4.x; # - January 2, 2003: Fuzzy Fixes, Serguei A. Mokhov # - October 12, 2002: Post-7.3 beta 2, Fuzzy Fixes, Serguei A. Mokhov @@ -14,67 +15,1277 @@ msgid "" msgstr "" "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" +"POT-Creation-Date: 2004-03-26 14:40-0400\n" +"PO-Revision-Date: 2004-05-16 16:13-0500\n" "Last-Translator: Serguei A. Mokhov \n" "Language-Team: pgsql-rus \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" +#: parser/parse_clause.c:336 +#, c-format +msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN" +msgstr "" + +#: gram.y:4765 +#: parser/parse_clause.c:396 +msgid "subquery in FROM must have an alias" +msgstr "подзапрос в FROM должен иметь алиас" + +#: parser/parse_clause.c:419 +msgid "subquery in FROM may not have SELECT INTO" +msgstr "подзапрос в FROM не может содержать SELECT INTO" + +#: parser/parse_clause.c:441 +msgid "subquery in FROM may not refer to other relations of same query level" +msgstr "" + +#: parser/parse_clause.c:496 +msgid "function expression in FROM may not refer to other relations of same query level" +msgstr "" + +#: parser/parse_clause.c:508 +msgid "cannot use aggregate function in function expression in FROM" +msgstr "" + +#: parser/parse_clause.c:728 +#, c-format +msgid "column name \"%s\" appears more than once in USING clause" +msgstr "имя колонки \"%s\" фигурирует больше одного раза в USING-выражении" + +#: parser/parse_clause.c:743 +#, c-format +msgid "common column name \"%s\" appears more than once in left table" +msgstr "" + +#: parser/parse_clause.c:752 +#, c-format +msgid "column \"%s\" specified in USING clause does not exist in left table" +msgstr "колонка \"%s\" в USING-выражении не существует в таблице слева" + +#: parser/parse_clause.c:766 +#, c-format +msgid "common column name \"%s\" appears more than once in right table" +msgstr "" + +#: parser/parse_clause.c:775 +#, c-format +msgid "column \"%s\" specified in USING clause does not exist in right table" +msgstr "колонка \"%s\" в USING-выражении не существует в таблице справа" + +#: parser/parse_clause.c:827 +#, c-format +msgid "column alias list for \"%s\" has too many entries" +msgstr "" + +#. translator: %s is name of a SQL construct, eg LIMIT +#: parser/parse_clause.c:1020 +#, c-format +msgid "argument of %s must not contain variables" +msgstr "аргумент к %s не должен содержать переменные" + +#. translator: %s is name of a SQL construct, eg LIMIT +#: parser/parse_clause.c:1028 +#, c-format +msgid "argument of %s must not contain aggregates" +msgstr "аргумент к %s не должен содержать аггрегаты" + +#. translator: %s is name of a SQL construct, eg LIMIT +#: parser/parse_clause.c:1036 +#, c-format +msgid "argument of %s must not contain subqueries" +msgstr "аргумент к %s не должен содержать подзапросы" + +#. translator: first %s is name of a SQL construct, eg ORDER BY +#: parser/parse_clause.c:1138 +#, c-format +msgid "%s \"%s\" is ambiguous" +msgstr "" + +#. translator: %s is name of a SQL construct, eg ORDER BY +#: parser/parse_clause.c:1160 +#, c-format +msgid "non-integer constant in %s" +msgstr "нецелочисленная константа в %s" + +#. translator: %s is name of a SQL construct, eg ORDER BY +#: parser/parse_clause.c:1177 +#, c-format +msgid "%s position %d is not in select list" +msgstr "" + +#: parser/parse_clause.c:1362 +msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list" +msgstr "для SELECT DISTINCT, выражения ORDER BY обязаны быть в списке выборки (SELECT)" + +#: parser/parse_clause.c:1402 +msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions" +msgstr "Выражения SELECT DISTINCT ON должны совпадать с изначальными выпражениями ORDER BY" + +#: parser/analyze.c:364 +msgid "CREATE VIEW specifies more column names than columns" +msgstr "CREATE VIEW указывает больше имён колонок чем имеется" + +#: parser/analyze.c:574 +msgid "INSERT ... SELECT may not specify INTO" +msgstr "INSERT ... SELECT не могут указывать INTO" + +#: parser/analyze.c:666 +msgid "INSERT has more expressions than target columns" +msgstr "INSERT содержит больше выражений чем колонок назначения" + +#: parser/analyze.c:687 +msgid "INSERT has more target columns than expressions" +msgstr "INSERT содержит больше колонок назначения чем выражений" + +#: parser/analyze.c:973 +#, 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 +#, c-format +msgid "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\"" +msgstr "конфликтующие объявления NULL/NOT NULL для колонки \"%s\" в таблице \"%s\"" + +#: parser/analyze.c:1077 +#, c-format +msgid "multiple default values specified for column \"%s\" of table \"%s\"" +msgstr "указаны многочисленные значения по умолчанию для колонки \"%s\" в таблице \"%s\"" + +#: commands/tablecmds.c:535 +#: parser/analyze.c:1188 +#: parser/analyze.c:1393 +#, c-format +msgid "inherited relation \"%s\" is not a table" +msgstr "" + +#: parser/analyze.c:1322 +#, c-format +msgid "multiple primary keys for table \"%s\" are not allowed" +msgstr "" + +#: commands/indexcmds.c:232 +#: parser/analyze.c:1442 +#, c-format +msgid "column \"%s\" named in key does not exist" +msgstr "" + +#: parser/analyze.c:1454 +#, c-format +msgid "column \"%s\" appears twice in primary key constraint" +msgstr "" + +#: parser/analyze.c:1459 +#, c-format +msgid "column \"%s\" appears twice in unique constraint" +msgstr "" + +#: parser/analyze.c:1553 +#, c-format +msgid "%s / %s%s will create implicit index \"%s\" for table \"%s\"" +msgstr "%s / %s%s создаст подразумеваемый индекс \"%s\" для таблицы \"%s\"" + +#: parser/analyze.c:1658 +msgid "index expression may not return a set" +msgstr "" + +#: parser/analyze.c:1750 +msgid "rule WHERE condition may not contain references to other relations" +msgstr "" + +#: parser/analyze.c:1756 +msgid "rule WHERE condition may not contain aggregate functions" +msgstr "" + +#: parser/analyze.c:1827 +msgid "rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions" +msgstr "" + +#: parser/analyze.c:1846 +#: parser/analyze.c:1918 +#: rewrite/rewriteHandler.c:174 +#: rewrite/rewriteManip.c:746 +#: rewrite/rewriteManip.c:802 +msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented" +msgstr "" + +#: parser/analyze.c:1864 +msgid "ON SELECT rule may not use OLD" +msgstr "нельзя использовать OLD в правиле ON SELECT" + +#: parser/analyze.c:1868 +msgid "ON SELECT rule may not use NEW" +msgstr "нельзя использовать NEW в правиле ON SELECT" + +#: parser/analyze.c:1877 +msgid "ON INSERT rule may not use OLD" +msgstr "нельзя использовать OLD в правиле ON INSERT" + +#: parser/analyze.c:1883 +msgid "ON DELETE rule may not use NEW" +msgstr "нельзя использовать NEW в правиле ON DELETE" + +#: optimizer/plan/planner.c:591 +#: parser/analyze.c:2090 +#: parser/analyze.c:2254 +#: parser/analyze.c:2809 +msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT" +msgstr "нельзя использовать SELECT FOR UPDATE в UNION/INTERSECT/EXCEPT" + +#: parser/analyze.c:2211 +msgid "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result columns" +msgstr "" + +#: parser/analyze.c:2249 +msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT" +msgstr "INTO можно использовать только в первом SELECT'е в UNION/INTERSECT/EXCEPT" + +#: parser/analyze.c:2310 +msgid "UNION/INTERSECT/EXCEPT member statement may not refer to other relations of same query level" +msgstr "" + +#: parser/analyze.c:2363 +#, c-format +msgid "each %s query must have the same number of columns" +msgstr "" + +#: parser/analyze.c:2433 +msgid "CREATE TABLE AS specifies too many column names" +msgstr "CREATE TABLE AS указывает слишком много имён для колонки" + +#: parser/analyze.c:2666 +msgid "cannot specify both SCROLL and NO SCROLL" +msgstr "нельзя указывать оба SCROLL и NO SCROLL" + +#: parser/analyze.c:2752 +#, c-format +msgid "wrong number of parameters for prepared statement \"%s\"" +msgstr "" + +#: parser/analyze.c:2754 +#, c-format +msgid "Expected %d parameters but got %d." +msgstr "Ожидалось параметров: %d, но было получено: %d." + +#: parser/analyze.c:2769 +msgid "cannot use subquery in EXECUTE parameter" +msgstr "нельзя использовать подзапрос в параметре к EXECUTE" + +#: parser/analyze.c:2773 +msgid "cannot use aggregate function in EXECUTE parameter" +msgstr "нельзя использовать агрегатную функцию в параметре к EXECUTE" + +#: parser/analyze.c:2786 +#, c-format +msgid "parameter $%d of type %s cannot be coerced to the expected type %s" +msgstr "" + +#: catalog/heap.c:1797 +#: parser/analyze.c:2790 +#: parser/parse_node.c:232 +#: parser/parse_target.c:425 +#: rewrite/rewriteHandler.c:563 +msgid "You will need to rewrite or cast the expression." +msgstr "" + +#: parser/analyze.c:2813 +msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause" +msgstr "нельзя использовать SELECT FOR UPDATE с выражением DISTINCT" + +#: parser/analyze.c:2817 +msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause" +msgstr "нельзя использовать SELECT FOR UPDATE с выражением GROUP BY" + +#: parser/analyze.c:2821 +msgid "SELECT FOR UPDATE is not allowed with aggregate functions" +msgstr "нельзя использовать SELECT FOR UPDATE с агрегатными функциями" + +#: parser/analyze.c:2901 +msgid "SELECT FOR UPDATE cannot be applied to a join" +msgstr "" + +#: parser/analyze.c:2906 +msgid "SELECT FOR UPDATE cannot be applied to NEW or OLD" +msgstr "" + +#: parser/analyze.c:2911 +msgid "SELECT FOR UPDATE cannot be applied to a function" +msgstr "SELECT FOR UPDATE: нельзя применять к функции" + +#: parser/analyze.c:2924 +#, c-format +msgid "relation \"%s\" in FOR UPDATE clause not found in FROM clause" +msgstr "" + +#: parser/analyze.c:3016 +msgid "misplaced DEFERRABLE clause" +msgstr "" + +#: parser/analyze.c:3020 +#: parser/analyze.c:3033 +msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed" +msgstr "" + +#: parser/analyze.c:3029 +msgid "misplaced NOT DEFERRABLE clause" +msgstr "" + +#: gram.y:2193 +#: gram.y:2208 +#: parser/analyze.c:3040 +#: parser/analyze.c:3064 +msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE" +msgstr "" + +#: parser/analyze.c:3047 +msgid "misplaced INITIALLY DEFERRED clause" +msgstr "" + +#: parser/analyze.c:3051 +#: parser/analyze.c:3075 +msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed" +msgstr "" + +#: parser/analyze.c:3071 +msgid "misplaced INITIALLY IMMEDIATE clause" +msgstr "" + +#: parser/analyze.c:3184 +#: parser/analyze.c:3205 +#, c-format +msgid "CREATE specifies a schema (%s) different from the one being created (%s)" +msgstr "" + +#: parser/analyze.c:3259 +#: parser/parse_coerce.c:245 +#: parser/parse_expr.c:137 +#: parser/parse_expr.c:143 +#, c-format +msgid "there is no parameter $%d" +msgstr "параметр $%d не существует" + +#: parser/analyze.c:3264 +#: tcop/postgres.c:1142 +#, c-format +msgid "could not determine data type of parameter $%d" +msgstr "" + +#: executor/execQual.c:2454 +#: optimizer/util/clauses.c:411 +#: parser/parse_agg.c:74 +msgid "aggregate function calls may not be nested" +msgstr "" + +#: parser/parse_agg.c:120 +msgid "aggregates not allowed in WHERE clause" +msgstr "" + +#: parser/parse_agg.c:124 +msgid "aggregates not allowed in JOIN conditions" +msgstr "" + +#: parser/parse_agg.c:143 +msgid "aggregates not allowed in GROUP BY clause" +msgstr "" + +#: parser/parse_agg.c:316 +#, c-format +msgid "column \"%s.%s\" must appear in the GROUP BY clause or be used in an aggregate function" +msgstr "" + +#: parser/parse_agg.c:321 +#, c-format +msgid "subquery uses ungrouped column \"%s.%s\" from outer query" +msgstr "" + +#: parser/parse_coerce.c:261 +#, c-format +msgid "inconsistent types deduced for parameter $%d" +msgstr "" + +#: 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" + +#. translator: first %s is name of a SQL construct, eg WHERE +#: parser/parse_coerce.c:579 +#, c-format +msgid "argument of %s must be type boolean, not type %s" +msgstr "тип аргумента конструкции %s должен быть boolean, а не %s" + +#. translator: %s is name of a SQL construct, eg WHERE +#: parser/parse_coerce.c:587 +#: parser/parse_coerce.c:626 +#, c-format +msgid "argument of %s must not return a set" +msgstr "" + +#. translator: first %s is name of a SQL construct, eg LIMIT +#: parser/parse_coerce.c:618 +#, c-format +msgid "argument of %s must be type integer, not type %s" +msgstr "тип аргумента конструкции %s должен быть integer, а не %s" + +#: parser/parse_coerce.c:679 +#, c-format +msgid "%s types %s and %s cannot be matched" +msgstr "%s типы %s и %s не совпадают" + +#. translator: first %s is name of a SQL construct, eg CASE +#: parser/parse_coerce.c:741 +#, c-format +msgid "%s could not convert type %s to %s" +msgstr "%s не в состоянии сконвертировать тип %s в %s" + +#: parser/parse_coerce.c:917 +msgid "arguments declared \"anyelement\" are not all alike" +msgstr "" + +#: parser/parse_coerce.c:934 +msgid "arguments declared \"anyarray\" are not all alike" +msgstr "" + +#: parser/parse_coerce.c:963 +#: parser/parse_coerce.c:1075 +#: parser/parse_coerce.c:1102 +#, c-format +msgid "argument declared \"anyarray\" is not an array but type %s" +msgstr "" + +#: parser/parse_coerce.c:980 +msgid "argument declared \"anyarray\" is not consistent with argument declared \"anyelement\"" +msgstr "" + +#: parser/parse_coerce.c:991 +msgid "could not determine anyarray/anyelement type because input has type \"unknown\"" +msgstr "" + +#: parser/parse_coerce.c:1016 +#: parser/parse_coerce.c:1033 +#: parser/parse_coerce.c:1087 +#: parser/parse_expr.c:796 +#: parser/parse_expr.c:1228 +#: parser/parse_expr.c:1267 +#: parser/parse_oper.c:920 +#, c-format +msgid "could not find array type for data type %s" +msgstr "" + +#: parser/parse_relation.c:174 +#: parser/parse_relation.c:189 +#, c-format +msgid "table reference \"%s\" is ambiguous" +msgstr "" + +#: parser/parse_relation.c:249 +#: parser/parse_relation.c:264 +#, c-format +msgid "table reference %u is ambiguous" +msgstr "" + +#: parser/parse_relation.c:356 +#: parser/parse_relation.c:368 +#, c-format +msgid "table name \"%s\" specified more than once" +msgstr "имя таблицы \"%s\" указано больше одного раза" + +#: parser/parse_relation.c:477 +#: parser/parse_relation.c:573 +#, c-format +msgid "column reference \"%s\" is ambiguous" +msgstr "" + +#: parser/parse_relation.c:668 +#: parser/parse_relation.c:763 +#: parser/parse_relation.c:858 +#: parser/parse_relation.c:978 +#, c-format +msgid "table \"%s\" has %d columns available but %d columns specified" +msgstr "" + +#: parser/parse_relation.c:935 +msgid "a column definition list is only allowed for functions returning \"record\"" +msgstr "" + +#: parser/parse_relation.c:946 +msgid "a column definition list is required for functions returning \"record\"" +msgstr "" + +#: parser/parse_relation.c:1007 +#, c-format +msgid "too many column aliases specified for function %s" +msgstr "" + +#: parser/parse_relation.c:1030 +#, c-format +msgid "function \"%s\" in FROM has unsupported return type" +msgstr "" + +#: parser/parse_relation.c:1422 +#: parser/parse_relation.c:1666 +msgid "function in FROM has unsupported return type" +msgstr "" + +#: commands/comment.c:386 +#: commands/tablecmds.c:1934 +#: commands/tablecmds.c:2078 +#: commands/tablecmds.c:2206 +#: commands/tablecmds.c:2370 +#: commands/tablecmds.c:2575 +#: 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 "column \"%s\" of relation \"%s\" does not exist" +msgstr "колонка \"%s\" для связи \"%s\" не существует" + +#: parser/parse_relation.c:1910 +#, c-format +msgid "missing FROM-clause entry in subquery for table \"%s\"" +msgstr "отсутсвует запись о FROM-выражении в подзапросе для таблицы \"%s\"" + +#: parser/parse_relation.c:1915 +#, c-format +msgid "missing FROM-clause entry for table \"%s\"" +msgstr "отсутсвует запись о FROM-выражении для таблицы \"%s\"" + +#: parser/parse_relation.c:1934 +#, c-format +msgid "adding missing FROM-clause entry in subquery for table \"%s\"" +msgstr "добавление отсутсвующей записи о FROM-выражении в подзапросе для таблицы \"%s\"" + +#: parser/parse_relation.c:1939 +#, c-format +msgid "adding missing FROM-clause entry for table \"%s\"" +msgstr "добавление отсутсвующей записи о FROM-выражении для таблицы \"%s\"" + +#: parser/parse_expr.c:105 +msgid "expression too complex" +msgstr "слишком сложное выражение" + +#: parser/parse_expr.c:106 +#, c-format +msgid "Nesting depth exceeds maximum expression depth %d." +msgstr "" + +#: parser/parse_expr.c:108 +msgid "Increase the configuration parameter \"max_expr_depth\"." +msgstr "" + +#: parser/parse_expr.c:352 +msgid "IS DISTINCT FROM requires = operator to yield boolean" +msgstr "" + +#: parser/parse_expr.c:375 +msgid "NULLIF requires = operator to yield boolean" +msgstr "" + +#: parser/parse_expr.c:497 +msgid "subquery must return a column" +msgstr "подзапрос должен вернуть колонку" + +#: parser/parse_expr.c:503 +msgid "subquery must return only one column" +msgstr "подзапрос должен вернуть только одну колонку" + +#: parser/parse_expr.c:559 +#, c-format +msgid "row comparison cannot use operator %s" +msgstr "" + +#: parser/parse_expr.c:586 +msgid "subquery has too many columns" +msgstr "слишком много колонок а подзапросе" + +#: parser/parse_expr.c:604 +#, c-format +msgid "operator %s must return type boolean, not type %s" +msgstr "оператор %s должен возвращать тип boolean, а не %s" + +#: parser/parse_expr.c:607 +#: parser/parse_expr.c:614 +msgid "The operator of a quantified predicate subquery must return type boolean." +msgstr "" + +#: parser/parse_expr.c:612 +#, c-format +msgid "operator %s must not return a set" +msgstr "" + +#: parser/parse_expr.c:624 +msgid "subquery has too few columns" +msgstr "слишком мало колонок а подзапросе" + +#: commands/indexcmds.c:337 +#: commands/tablecmds.c:1119 +#: parser/parse_expr.c:1034 +#, c-format +msgid "column \"%s\" does not exist" +msgstr "колонка \"%s\" не существует" + +#: catalog/namespace.c:167 +#: catalog/namespace.c:220 +#: catalog/namespace.c:1167 +#: parser/parse_expr.c:1118 +#: parser/parse_target.c:162 +msgid "cross-database references are not implemented" +msgstr "" + +#: catalog/namespace.c:1172 +#: gram.y:2340 +#: gram.y:7082 +#: parser/parse_expr.c:1150 +#: parser/parse_target.c:170 +#, c-format +msgid "improper qualified name (too many dotted names): %s" +msgstr "" + +#: optimizer/util/clauses.c:2432 +#: optimizer/util/clauses.c:2909 +#: parser/parse_expr.c:1323 +#, c-format +msgid "relation reference \"%s\" cannot be used in an expression" +msgstr "" + +#: parser/parse_expr.c:1531 +#, c-format +msgid "cannot cast type %s to %s" +msgstr "нельзя конвертировать тип %s в %s" + +#: parser/parse_func.c:89 +#, c-format +msgid "cannot pass more than %d arguments to a function" +msgstr "число аргументов функции не может быть более %d" + +#: parser/parse_func.c:224 +#, c-format +msgid "cannot pass result of subquery or join \"%s\" to a function" +msgstr "" + +#: parser/parse_func.c:265 +#, c-format +msgid "%s(*) specified, but %s is not an aggregate function" +msgstr "" + +#: parser/parse_func.c:271 +#, c-format +msgid "DISTINCT specified, but %s is not an aggregate function" +msgstr "DISTINCT указан, но %s не является агрегатной функцией" + +#: parser/parse_func.c:296 +#, c-format +msgid "attribute notation .%s applied to type %s, which is not a complex type" +msgstr "" + +#: parser/parse_func.c:301 +#, c-format +msgid "attribute \"%s\" not found in data type %s" +msgstr "атрибут \"%s\" не найден в типе данных %s" + +#: parser/parse_func.c:311 +#, c-format +msgid "function %s is not unique" +msgstr "функция %s не уникальна" + +#: parser/parse_func.c:314 +msgid "Could not choose a best candidate function. You may need to add explicit type casts." +msgstr "" + +#: 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 "function %s does not exist" +msgstr "функция %s не существует" + +#: parser/parse_func.c:322 +msgid "No function matches the given name and argument types. You may need to add explicit type casts." +msgstr "" + +#: parser/parse_func.c:371 +msgid "aggregates may not return sets" +msgstr "" + +#: parser/parse_func.c:1353 +#, c-format +msgid "column %s.%s.%s does not exist" +msgstr "колонка %s.%s.%s не существует" + +#: parser/parse_func.c:1358 +#, c-format +msgid "column %s.%s does not exist" +msgstr "колонка %s.%s не существует" + +#: parser/parse_func.c:1428 +#, c-format +msgid "aggregate %s(*) does not exist" +msgstr "агрегат %s(*) не существует" + +#: parser/parse_func.c:1433 +#, c-format +msgid "aggregate %s(%s) does not exist" +msgstr "агрегат %s(%s) не существует" + +#: parser/parse_func.c:1454 +#, c-format +msgid "function %s(%s) is not an aggregate" +msgstr "функция %s(%s) не является агрегатом" + +#: catalog/pg_proc.c:92 +#: commands/functioncmds.c:150 +#: parser/parse_func.c:1514 +#, c-format +msgid "functions cannot have more than %d arguments" +msgstr "функции не могут иметь число аргументов более %d" + +#: 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:1349 +#: commands/typecmds.c:1436 +#: commands/typecmds.c:2017 +#: parser/parse_func.c:1526 +#: parser/parse_type.c:201 +#: parser/parse_type.c:227 +#: tcop/utility.c:95 +#: utils/adt/regproc.c:1003 +#, c-format +msgid "type \"%s\" does not exist" +msgstr "тип \"%s\" не существует" + +#: parser/parse_node.c:124 +#, c-format +msgid "cannot subscript type %s because it is not an array" +msgstr "" + +#: parser/parse_node.c:183 +#: parser/parse_node.c:206 +msgid "array subscript must have type integer" +msgstr "" + +#: parser/parse_node.c:228 +#, c-format +msgid "array assignment requires type %s but expression is of type %s" +msgstr "" + +#: parser/parse_oper.c:84 +#: parser/parse_oper.c:785 +#: utils/adt/regproc.c:467 +#: utils/adt/regproc.c:487 +#: utils/adt/regproc.c:665 +#, c-format +msgid "operator does not exist: %s" +msgstr "оператор не существует: %s" + +#: commands/functioncmds.c:175 +#: parser/parse_oper.c:113 +#: parser/parse_oper.c:124 +#, c-format +msgid "type %s does not exist" +msgstr "тип %s не существует" + +#: parser/parse_oper.c:185 +#: utils/adt/arrayfuncs.c:2397 +#: utils/adt/ri_triggers.c:3601 +#, c-format +msgid "could not identify an equality operator for type %s" +msgstr "" + +#: parser/parse_oper.c:249 +#: parser/parse_oper.c:314 +#, c-format +msgid "could not identify an ordering operator for type %s" +msgstr "" + +#: parser/parse_oper.c:251 +#: parser/parse_oper.c:316 +msgid "Use an explicit ordering operator or modify the query." +msgstr "" + +#: parser/parse_oper.c:584 +#, c-format +msgid "operator requires run-time type coercion: %s" +msgstr "" + +#: parser/parse_oper.c:778 +#, c-format +msgid "operator is not unique: %s" +msgstr "оператор не уникален: %s" + +#: parser/parse_oper.c:780 +msgid "Could not choose a best candidate operator. You may need to add explicit type casts." +msgstr "" + +#: parser/parse_oper.c:787 +msgid "No operator matches the given name and argument type(s). You may need to add explicit type casts." +msgstr "" + +#: parser/parse_oper.c:877 +msgid "op ANY/ALL (array) requires array on right side" +msgstr "" + +#: parser/parse_oper.c:906 +msgid "op ANY/ALL (array) requires operator to yield boolean" +msgstr "" + +#: parser/parse_oper.c:910 +msgid "op ANY/ALL (array) requires operator not to return a set" +msgstr "" + +#: parser/parse_target.c:66 +#, c-format +msgid "relation reference \"%s\" cannot be used as a select-list entry" +msgstr "" + +#: parser/parse_target.c:68 +#, c-format +msgid "Write \"%s\".* to denote all the columns of the relation." +msgstr "" + +#: parser/parse_target.c:331 +#, c-format +msgid "cannot assign to system column \"%s\"" +msgstr "нельзя присвоить значение системной колонке \"%s\"" + +#: parser/parse_target.c:353 +msgid "cannot set an array element to DEFAULT" +msgstr "" + +#: parser/parse_target.c:420 +#, c-format +msgid "column \"%s\" is of type %s but expression is of type %s" +msgstr "" + +#: commands/copy.c:2225 +#: parser/parse_target.c:500 +#, c-format +msgid "column \"%s\" specified more than once" +msgstr "колонка \"%s\" указана больше одного раза" + +#: parser/parse_target.c:555 +msgid "SELECT * with no tables specified is not valid" +msgstr "" + +#: parser/parse_type.c:62 +#, c-format +msgid "improper %%TYPE reference (too few dotted names): %s" +msgstr "" + +#: parser/parse_type.c:83 +#, c-format +msgid "improper %%TYPE reference (too many dotted names): %s" +msgstr "" + +#: parser/parse_type.c:103 +#, c-format +msgid "type reference %s converted to %s" +msgstr "" + +#: parser/parse_type.c:206 +#: parser/parse_type.c:237 +#, c-format +msgid "type \"%s\" is only a shell" +msgstr "тип \"%s\" является только оболочкой" + +#: parser/parse_type.c:441 +#: parser/parse_type.c:529 +#, c-format +msgid "invalid type name \"%s\"" +msgstr "неверное имя типа \"%s\"" + +#: parser/scansup.c:181 +#, c-format +msgid "identifier \"%s\" will be truncated to \"%.*s\"" +msgstr "" + +#: scan.l:296 +msgid "unterminated /* comment" +msgstr "незакрытый коментарий /*" + +#: scan.l:324 +msgid "unterminated bit string literal" +msgstr "" + +#: scan.l:343 +msgid "unterminated hexadecimal string literal" +msgstr "" + +#: scan.l:389 +msgid "unterminated quoted string" +msgstr "" + +#: scan.l:402 +msgid "zero-length delimited identifier" +msgstr "" + +#: scan.l:415 +msgid "unterminated quoted identifier" +msgstr "" + +#. translator: %s is typically "syntax error" +#: scan.l:564 +#, c-format +msgid "%s at end of input" +msgstr "%s в конце ввода" + +#. translator: first %s is typically "syntax error" +#: scan.l:572 +#, c-format +msgid "%s at or near \"%s\"" +msgstr "" + +#: y.tab.c:9086 +msgid "syntax error: cannot back up" +msgstr "" + +#: gram.y:961 +#: gram.y:987 +msgid "time zone interval must be HOUR or HOUR TO MINUTE" +msgstr "интервал временной зоны должен быть HOUR или HOUR TO MINUTE" + +#: gram.y:972 +#: gram.y:5090 +#: gram.y:7188 +#, c-format +msgid "INTERVAL(%d) precision must not be negative" +msgstr "" + +#: gram.y:978 +#: gram.y:5096 +#: gram.y:7194 +#, c-format +msgid "INTERVAL(%d) precision reduced to maximum allowed, %d" +msgstr "" + +#: gram.y:1770 +#: utils/adt/ri_triggers.c:300 +#: utils/adt/ri_triggers.c:362 +#: utils/adt/ri_triggers.c:541 +#: utils/adt/ri_triggers.c:780 +#: utils/adt/ri_triggers.c:971 +#: utils/adt/ri_triggers.c:1132 +#: utils/adt/ri_triggers.c:1316 +#: utils/adt/ri_triggers.c:1485 +#: utils/adt/ri_triggers.c:1666 +#: utils/adt/ri_triggers.c:1836 +#: utils/adt/ri_triggers.c:2054 +#: utils/adt/ri_triggers.c:2234 +#: utils/adt/ri_triggers.c:2439 +#: utils/adt/ri_triggers.c:2535 +#: utils/adt/ri_triggers.c:2657 +msgid "MATCH PARTIAL not yet implemented" +msgstr "" + +#: gram.y:1852 +msgid "CREATE TABLE AS may not specify INTO" +msgstr "CREATE TABLE AS не может указывать INTO" + +#: gram.y:2260 +msgid "CREATE ASSERTION is not yet implemented" +msgstr "" + +#: gram.y:2276 +msgid "DROP ASSERTION is not yet implemented" +msgstr "" + +#: gram.y:3086 +msgid "CREATE FUNCTION / OUT parameters are not implemented" +msgstr "" + +#: gram.y:3093 +msgid "CREATE FUNCTION / INOUT parameters are not implemented" +msgstr "" + +#: gram.y:3247 +#: utils/adt/regproc.c:639 +msgid "missing argument" +msgstr "отсутствует аргумент" + +#: gram.y:3248 +#: utils/adt/regproc.c:640 +msgid "Use NONE to denote the missing argument of a unary operator." +msgstr "" + +#: gram.y:4150 +msgid "column name list not allowed in CREATE TABLE / AS EXECUTE" +msgstr "" + +#: gram.y:4615 +msgid "LIMIT #,# syntax is not supported" +msgstr "синтаксис LIMIT #,# не поддерживается" + +#: gram.y:4616 +msgid "Use separate LIMIT and OFFSET clauses." +msgstr "Используйте отдельные выражения LIMIT и OFFSET." + +#: gram.y:4766 +msgid "For example, FROM (SELECT ...) [AS] foo." +msgstr "Например, FROM (SELECT ...) [AS] foo." + +#: gram.y:5193 +msgid "precision for type float must be at least 1 bit" +msgstr "" + +#: gram.y:5201 +msgid "precision for type float must be less than 54 bits" +msgstr "" + +#: gram.y:5215 +#: gram.y:5230 +#, c-format +msgid "NUMERIC precision %d must be between 1 and %d" +msgstr "" + +#: gram.y:5220 +#, c-format +msgid "NUMERIC scale %d must be between 0 and precision %d" +msgstr "" + +#: gram.y:5248 +#: gram.y:5263 +#, c-format +msgid "DECIMAL precision %d must be between 1 and %d" +msgstr "" + +#: gram.y:5253 +#, c-format +msgid "DECIMAL scale %d must be between 0 and precision %d" +msgstr "" + +#: gram.y:5313 +#: gram.y:5391 +#, c-format +msgid "length for type %s must be at least 1" +msgstr "" + +#: gram.y:5318 +#: gram.y:5396 +#, c-format +msgid "length for type %s cannot exceed %d" +msgstr "" + +#: gram.y:5469 +#, c-format +msgid "TIMESTAMP(%d)%s precision must not be negative" +msgstr "" + +#: gram.y:5475 +#, c-format +msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d" +msgstr "" + +#: gram.y:5510 +#, c-format +msgid "TIME(%d)%s precision must not be negative" +msgstr "" + +#: gram.y:5516 +#, c-format +msgid "TIME(%d)%s precision reduced to maximum allowed, %d" +msgstr "" + +#: gram.y:5662 +#: gram.y:7766 +#: gram.y:7822 +msgid "unequal number of entries in row expression" +msgstr "" + +#: gram.y:6075 +msgid "UNIQUE predicate is not yet implemented" +msgstr "" + +#: gram.y:6317 +#, c-format +msgid "CURRENT_TIME(%d) precision must not be negative" +msgstr "" + +#: gram.y:6323 +#, c-format +msgid "CURRENT_TIME(%d) precision reduced to maximum allowed, %d" +msgstr "" + +#: gram.y:6371 +#, c-format +msgid "CURRENT_TIMESTAMP(%d) precision must not be negative" +msgstr "" + +#: gram.y:6377 +#, c-format +msgid "CURRENT_TIMESTAMP(%d) precision reduced to maximum allowed, %d" +msgstr "" + +#: gram.y:6424 +#, c-format +msgid "LOCALTIME(%d) precision must not be negative" +msgstr "" + +#: gram.y:6430 +#, c-format +msgid "LOCALTIME(%d) precision reduced to maximum allowed, %d" +msgstr "" + +#: gram.y:6478 +#, c-format +msgid "LOCALTIMESTAMP(%d) precision must not be negative" +msgstr "" + +#: gram.y:6484 +#, c-format +msgid "LOCALTIMESTAMP(%d) precision reduced to maximum allowed, %d" +msgstr "" + +#: gram.y:7635 +msgid "OLD used in query that is not in a rule" +msgstr "" + +#: gram.y:7644 +msgid "NEW used in query that is not in a rule" +msgstr "" + +#: y.tab.c:18246 +msgid "syntax error; also virtual memory exhausted" +msgstr "" + +#: y.tab.c:18250 +msgid "syntax error" +msgstr "ошибка синтаксиса" + +#: y.tab.c:18364 +msgid "parser stack overflow" +msgstr "" + +#: gram.y:7802 +#, c-format +msgid "operator %s is not supported for row expressions" +msgstr "" + +#: gram.y:7879 +msgid "wrong number of parameters on left side of OVERLAPS expression" +msgstr "" + +#: gram.y:7885 +msgid "wrong number of parameters on right side of OVERLAPS expression" +msgstr "" + +#: gram.y:7923 +msgid "multiple ORDER BY clauses not allowed" +msgstr "" + +#: gram.y:7931 +msgid "multiple FOR UPDATE clauses not allowed" +msgstr "" + +#: gram.y:7939 +msgid "multiple OFFSET clauses not allowed" +msgstr "" + +#: gram.y:7947 +msgid "multiple LIMIT clauses not allowed" +msgstr "" + +#: access/index/indexam.c:134 +#: access/index/indexam.c:159 +#: access/index/indexam.c:184 +#: commands/comment.c:309 +#: commands/indexcmds.c:575 +#: commands/indexcmds.c:605 +#: tcop/utility.c:91 +#, c-format +msgid "\"%s\" is not an index" +msgstr "\"%s\" не является индексом" + #: access/common/indextuple.c:57 #, c-format -msgid "number of index attributes %d exceeds limit, %d" -msgstr "число идексированных атрибутов: %d превышает лимит: %d" +msgid "number of index columns (%d) exceeds limit (%d)" +msgstr "число идексированных атрибутов (%d) превышает лимит (%d)" #: access/common/indextuple.c:165 #, c-format -msgid "index tuple requires %lu bytes, maximum size is %lu" -msgstr "строка индекса требуеи байт: %lu, при максимуме: %lu" +msgid "index row requires %lu bytes, maximum size is %lu" +msgstr "строка индекса требует байт: %lu, при максимуме: %lu" #: access/common/heaptuple.c:584 #, c-format -msgid "number of attributes %d exceeds limit, %d" -msgstr "число атрибутов: %d превышает лимит: %d" +msgid "number of columns (%d) exceeds limit (%d)" +msgstr "число колонок (%d) превышает лимит (%d)" #: access/common/printtup.c:279 #: tcop/fastpath.c:187 #: tcop/fastpath.c:517 -#: tcop/postgres.c:1430 +#: tcop/postgres.c:1428 #, c-format msgid "unsupported format code: %d" msgstr "неподдерживаемый код формата: %d" #: access/common/tupdesc.c:660 #: access/common/tupdesc.c:687 -msgid "number of aliases does not match number of attributes" -msgstr "число алиасов не совпадает с числом атрибутов" +msgid "number of aliases does not match number of columns" +msgstr "число алиасов не совпадает с числом колонок" #: access/common/tupdesc.c:681 msgid "no column alias was provided" msgstr "алиас колонки не указан" #: access/common/tupdesc.c:704 -msgid "could not determine tuple description for function returning record" -msgstr "не в состоянии определить описание строки для функции возпращающей запись" +msgid "could not determine row description for function returning record" +msgstr "не в состоянии определить описание строки для функции возвращающей запись" -#: access/hash/hashovfl.c:166 -#: access/hash/hashovfl.c:185 -#: access/hash/hashovfl.c:208 -#: access/hash/hashovfl.c:254 +#: access/hash/hashinsert.c:90 +#, c-format +msgid "index row size %lu exceeds hash maximum %lu" +msgstr "" + +#: access/hash/hashsearch.c:145 +msgid "hash indexes do not support whole-index scans" +msgstr "" + +#: access/hash/hashovfl.c:521 #, c-format msgid "out of overflow pages in hash index \"%s\"" msgstr "" -#: access/hash/hashutil.c:83 -msgid "hash indexes cannot include null keys" +#: access/hash/hashutil.c:46 +msgid "hash indexes cannot contain null keys" +msgstr "" + +#: access/hash/hashutil.c:126 +#, c-format +msgid "index \"%s\" is not a hash index" +msgstr "индекс \"%s\" не является hash-индексом" + +#: access/hash/hashutil.c:132 +#, c-format +msgid "index \"%s\" has wrong hash version" +msgstr "" + +#: access/hash/hashutil.c:133 +msgid "Please REINDEX it." msgstr "" #: access/heap/heapam.c:580 #: access/heap/heapam.c:615 #: access/heap/heapam.c:650 +#: catalog/aclchk.c:283 #, c-format -msgid "\"%s\" is an index relation" +msgid "\"%s\" is an index" msgstr "\"%s\" является индексом" #: access/heap/heapam.c:585 @@ -93,37 +1304,30 @@ msgstr "\"%s\" #: access/heap/hio.c:109 #, c-format -msgid "tuple is too big: size %lu, maximum size %lu" +msgid "row is too big: size %lu, maximum size %lu" +msgstr "строка слишком велика: размер %lu, при максимуме: %lu" + +#: access/nbtree/nbtinsert.c:254 +#, c-format +msgid "duplicate key violates unique constraint \"%s\"" msgstr "" -#: access/index/indexam.c:134 -#: access/index/indexam.c:159 -#: access/index/indexam.c:184 -#, c-format -msgid "\"%s\" is not an index relation" -msgstr "\"%s\" не является индексом" - -#: access/nbtree/nbtinsert.c:242 -#, c-format -msgid "duplicate key violates UNIQUE constraint \"%s\"" -msgstr "" - -#: access/nbtree/nbtinsert.c:394 +#: access/nbtree/nbtinsert.c:406 #: access/nbtree/nbtsort.c:402 #, c-format -msgid "index tuple size %lu exceeds btree maximum, %lu" -msgstr "" - -#: access/nbtree/nbtpage.c:150 -#: access/nbtree/nbtpage.c:329 -#, c-format -msgid "index \"%s\" is not a btree" -msgstr "индекс \"%s\" не является b-деревом" +msgid "index row size %lu exceeds btree maximum, %lu" +msgstr "размер строки индекса %lu, превышает максимум B-дерева: %lu" #: access/nbtree/nbtpage.c:156 #: access/nbtree/nbtpage.c:335 #, c-format -msgid "version mismatch in \"%s\": file version %d, code version %d" +msgid "index \"%s\" is not a btree" +msgstr "индекс \"%s\" не является b-деревом" + +#: access/nbtree/nbtpage.c:162 +#: access/nbtree/nbtpage.c:341 +#, c-format +msgid "version mismatch in index \"%s\": file version %d, code version %d" msgstr "" #: access/rtree/rtree.c:645 @@ -132,561 +1336,568 @@ msgstr "" #: access/rtree/rtree.c:785 #, c-format -msgid "index tuple size %lu exceeds rtree maximum, %lu" +msgid "index row size %lu exceeds rtree maximum, %lu" msgstr "" -#: access/transam/xact.c:405 +#: access/transam/xact.c:418 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:1374 +#: access/transam/xact.c:1386 #, c-format msgid "%s cannot run inside a transaction block" msgstr "%s не может выполняться внутри транзакционного блока" #. translator: %s represents an SQL statement name -#: access/transam/xact.c:1386 +#: access/transam/xact.c:1398 #, c-format msgid "%s cannot be executed from a function" msgstr "%s не может выполняться внутри функции" #. translator: %s represents an SQL statement name -#: access/transam/xact.c:1429 +#: access/transam/xact.c:1441 #, c-format -msgid "%s may only be used in BEGIN/END transaction blocks" -msgstr "%s может выполняться только внутри транзакционного блока BEGIN/END" +msgid "%s may only be used in transaction blocks" +msgstr "%s может выполняться только внутри блоков транзакций" -#: access/transam/xact.c:1452 +#: access/transam/xact.c:1520 msgid "there is already a transaction in progress" msgstr "транзакция уже в процессе выполнения" -#: access/transam/xact.c:1514 -#: access/transam/xact.c:1552 -#: access/transam/xact.c:1600 +#: access/transam/xact.c:1582 +#: access/transam/xact.c:1620 +#: access/transam/xact.c:1668 msgid "there is no transaction in progress" msgstr "нет транзакции в процессе выполнения" -#: access/transam/slru.c:492 +#: access/transam/slru.c:490 #, c-format msgid "file \"%s\" doesn't exist, reading as zeroes" msgstr "файл \"%s\" не существует, читается как нули" -#: 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 +#: access/transam/slru.c:611 +#: access/transam/slru.c:618 +#: access/transam/slru.c:625 +#: access/transam/slru.c:632 +#: access/transam/slru.c:639 #, c-format msgid "could not access status of transaction %u" msgstr "" -#: access/transam/slru.c:614 +#: access/transam/slru.c:612 +#: libpq/hba.c:826 +#: libpq/hba.c:850 +#: storage/smgr/smgr.c:278 +#: utils/error/elog.c:877 +#: utils/init/miscinit.c:726 +#: utils/init/miscinit.c:826 +#: utils/misc/database.c:149 #, c-format -msgid "open of file \"%s\" failed: %m" -msgstr "не удалось открыть \"%s\": %m" +msgid "could not open file \"%s\": %m" +msgstr "не получилось отктрыть файл \"%s\": %m" -#: access/transam/slru.c:621 -#: access/transam/xlog.c:1387 +#: access/transam/slru.c:619 +#: access/transam/xlog.c:1385 #, c-format -msgid "creation of file \"%s\" failed: %m" -msgstr "не удалось создать файл \"%s\": %m" +msgid "could not create file \"%s\": %m" +msgstr "не получилось создать файл \"%s\": %m" -#: access/transam/slru.c:628 +#: access/transam/slru.c:626 #, c-format -msgid "lseek of file \"%s\", offset %u failed: %m" -msgstr "не удалось выполнить lseek() для файла \"%s\", смещение %u: %m" +msgid "could not seek in file \"%s\" to offset %u: %m" +msgstr "не получилось передвинуться в файле \"%s\" на смещение %u: %m" -#: access/transam/slru.c:635 +#: access/transam/slru.c:633 #, c-format -msgid "read of file \"%s\", offset %u failed: %m" -msgstr "не удалось считать файл \"%s\", смещение %u: %m" +msgid "could not read from file \"%s\" at offset %u: %m" +msgstr "не получилось считать из файла \"%s\" со смещением %u: %m" -#: access/transam/slru.c:642 +#: access/transam/slru.c:640 #, c-format -msgid "write of file \"%s\", offset %u failed: %m" -msgstr "не удалось записать файл \"%s\", смещение %u: %m" +msgid "could not write to file \"%s\" at offset %u: %m" +msgstr "не получилось записать в файл \"%s\" при смещении %u: %m" -#: access/transam/slru.c:820 +#: access/transam/slru.c:818 #, c-format -msgid "could not truncate \"%s\": apparent wraparound" -msgstr "" +msgid "could not truncate directory \"%s\": apparent wraparound" +msgstr "не получилось удалить директорию \"%s\": явное закругление" -#: access/transam/slru.c:879 +#: access/transam/slru.c:877 #, c-format msgid "could not open directory \"%s\": %m" msgstr "не получилось отктрыть директорию \"%s\": %m" -#: access/transam/slru.c:895 +#: access/transam/slru.c:893 #, c-format msgid "removing file \"%s/%s\"" msgstr "удаление файла \"%s/%s\"" -#: access/transam/slru.c:907 +#: access/transam/slru.c:905 #, c-format msgid "could not read directory \"%s\": %m" msgstr "не получилось cчитать директорию \"%s\": %m" -#: access/transam/xlog.c:1049 -#: access/transam/xlog.c:1165 -#: access/transam/xlog.c:3555 +#: access/transam/xlog.c:1047 +#: access/transam/xlog.c:1163 +#: access/transam/xlog.c:3563 #, c-format -msgid "close of log file %u, segment %u failed: %m" -msgstr "" +msgid "could not close log file %u, segment %u: %m" +msgstr "не удалось закрыть лог-файл %u, сегмент %u: %m" -#: access/transam/xlog.c:1105 -#: access/transam/xlog.c:1867 +#: access/transam/xlog.c:1103 +#: access/transam/xlog.c:1865 #, c-format -msgid "lseek of log file %u, segment %u, offset %u failed: %m" -msgstr "" +msgid "could not seek in log file %u, segment %u to offset %u: %m" +msgstr "не удалось передвинуться в лог-файле %u, сегмент %u на смещение %u: %m" -#: access/transam/xlog.c:1119 +#: access/transam/xlog.c:1117 #, c-format -msgid "write of log file %u, segment %u, offset %u failed: %m" -msgstr "" +msgid "could not write to log file %u, segment %u at offset %u: %m" +msgstr "не удалось записать в лог-файл %u, сегмент %u, смещение %u: %m" -#: access/transam/xlog.c:1363 -#: access/transam/xlog.c:1452 -#: access/transam/xlog.c:1566 -#: access/transam/xlog.c:1572 +#: access/transam/xlog.c:1361 +#: access/transam/xlog.c:1450 +#: access/transam/xlog.c:1564 +#: access/transam/xlog.c:1570 #, c-format -msgid "open of \"%s\" (log file %u, segment %u) failed: %m" -msgstr "не удалось открыть \"%s\" (лог-файл: %u, сегмент: %u): %m" +msgid "could not open file \"%s\" (log file %u, segment %u): %m" +msgstr "не удалось открыть файл \"%s\" (лог-файл: %u, сегмент: %u): %m" -#: access/transam/xlog.c:1416 +#: access/transam/xlog.c:1414 +#: utils/init/miscinit.c:775 +#: utils/misc/guc.c:3775 #, c-format -msgid "failed to write \"%s\": %m" -msgstr "не удалось записать \"%s\": %m" +msgid "could not write to file \"%s\": %m" +msgstr "не получилось записать файл \"%s\": %m" -#: access/transam/xlog.c:1423 +#: access/transam/xlog.c:1421 #, c-format -msgid "fsync of file \"%s\" failed: %m" -msgstr "fsync файла \"%s\" не удался: %m" +msgid "could not fsync file \"%s\": %m" +msgstr "не получилось синхронизировать файл \"%s\" с fsync: %m" -#: access/transam/xlog.c:1530 +#: access/transam/xlog.c:1528 #, c-format -msgid "link from \"%s\" to \"%s\" (initialization of log file %u, segment %u) failed: %m" -msgstr "" +msgid "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m" +msgstr "не удалось cлинковать файл \"%s\" в \"%s\" (инициализация лог-файла: %u, сегмент: %u): %m" -#: access/transam/xlog.c:1537 +#: access/transam/xlog.c:1535 #, c-format -msgid "rename from \"%s\" to \"%s\" (initialization of log file %u, segment %u) failed: %m" -msgstr "не удалось переименовать \"%s\" в \"%s\" (инициализация лог-файла: %u, сегмент: %u): %m" +msgid "could not rename file \"%s\" to \"%s\" (initialization of log file %u, segment %u): %m" +msgstr "не удалось переименовать файл \"%s\" в \"%s\" (инициализация лог-файла: %u, сегмент: %u): %m" -#: access/transam/xlog.c:1624 +#: access/transam/xlog.c:1622 #, c-format msgid "could not open transaction log directory \"%s\": %m" msgstr "" -#: access/transam/xlog.c:1640 +#: access/transam/xlog.c:1638 #, c-format msgid "archiving transaction log file \"%s\"" msgstr "архивирование лога транзакций: \"%s\"" -#: access/transam/xlog.c:1657 +#: access/transam/xlog.c:1655 #, c-format msgid "recycled transaction log file \"%s\"" msgstr "переиспользование лога транзакций: \"%s\"" -#: access/transam/xlog.c:1664 +#: access/transam/xlog.c:1662 #, c-format msgid "removing transaction log file \"%s\"" msgstr "удаление лога транзакций: \"%s\"" -#: access/transam/xlog.c:1675 +#: access/transam/xlog.c:1673 #, c-format msgid "could not read transaction log directory \"%s\": %m" msgstr "не получилось считать файл директорию лога транзакций \"%s\": %m" -#: access/transam/xlog.c:1749 +#: access/transam/xlog.c:1747 #, c-format -msgid "bad resource manager data checksum in record at %X/%X" +msgid "incorrect resource manager data checksum in record at %X/%X" msgstr "" -#: access/transam/xlog.c:1772 +#: access/transam/xlog.c:1770 #, c-format -msgid "bad checksum of backup block %d in record at %X/%X" +msgid "incorrect checksum of backup block %d in record at %X/%X" msgstr "" -#: access/transam/xlog.c:1842 +#: access/transam/xlog.c:1840 #, c-format msgid "invalid record offset at %X/%X" msgstr "" -#: access/transam/xlog.c:1875 -#: access/transam/xlog.c:1965 +#: access/transam/xlog.c:1873 #, c-format -msgid "read of log file %u, segment %u, offset %u failed: %m" -msgstr "" +msgid "could not read from log file %u, segment %u at offset %u: %m" +msgstr "не удалось считать из лог-файла: %u, сегмент: %u, смещение %u: %m" -#: access/transam/xlog.c:1886 +#: access/transam/xlog.c:1884 #, c-format msgid "contrecord is requested by %X/%X" msgstr "" -#: access/transam/xlog.c:1901 +#: access/transam/xlog.c:1899 #, c-format msgid "record with zero length at %X/%X" msgstr "" -#: access/transam/xlog.c:1926 +#: access/transam/xlog.c:1924 #, c-format msgid "record length %u at %X/%X too long" msgstr "" -#: access/transam/xlog.c:1933 +#: access/transam/xlog.c:1931 #, c-format -msgid "invalid resource manager id %u at %X/%X" +msgid "invalid resource manager ID %u at %X/%X" msgstr "" -#: access/transam/xlog.c:1974 +#: access/transam/xlog.c:1963 +#, c-format +msgid "could not read from log file %u, segment %u, offset %u: %m" +msgstr "не удалось считать из лог-файла: %u, сегмент: %u, смещение %u: %m" + +#: access/transam/xlog.c:1972 #, c-format msgid "there is no contrecord flag in log file %u, segment %u, offset %u" msgstr "" -#: access/transam/xlog.c:1983 +#: access/transam/xlog.c:1981 #, c-format msgid "invalid contrecord length %u in log file %u, segment %u, offset %u" msgstr "" -#: access/transam/xlog.c:2049 +#: access/transam/xlog.c:2047 #, c-format msgid "invalid magic number %04X in log file %u, segment %u, offset %u" msgstr "" -#: access/transam/xlog.c:2056 +#: access/transam/xlog.c:2054 #, c-format msgid "invalid info bits %04X in log file %u, segment %u, offset %u" msgstr "" -#: access/transam/xlog.c:2065 +#: access/transam/xlog.c:2063 #, c-format msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u" msgstr "" #. translator: SUI = startup id -#: access/transam/xlog.c:2088 +#: access/transam/xlog.c:2086 #, c-format msgid "out-of-sequence SUI %u (after %u) in log file %u, segment %u, offset %u" msgstr "" -#: access/transam/xlog.c:2149 +#: access/transam/xlog.c:2147 msgid "invalid LC_COLLATE setting" msgstr "неверное значение LC_COLLATE" -#: access/transam/xlog.c:2154 +#: access/transam/xlog.c:2152 msgid "invalid LC_CTYPE setting" msgstr "неверное значение LC_CTYPE" -#: access/transam/xlog.c:2173 +#: access/transam/xlog.c:2171 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one" msgstr "" -#: access/transam/xlog.c:2183 +#: access/transam/xlog.c:2181 #, c-format msgid "could not create control file \"%s\": %m" msgstr "" -#: access/transam/xlog.c:2194 -#: access/transam/xlog.c:2371 +#: access/transam/xlog.c:2192 +#: access/transam/xlog.c:2369 #, c-format -msgid "write to control file failed: %m" -msgstr "" +msgid "could not write to control file: %m" +msgstr "не получилось записать в файл управления: %m" -#: access/transam/xlog.c:2200 -#: access/transam/xlog.c:2377 +#: access/transam/xlog.c:2198 +#: access/transam/xlog.c:2375 #, c-format -msgid "fsync of control file failed: %m" -msgstr "" +msgid "could not fsync control file: %m" +msgstr "не получилось сихронизировать (fsync) файл управления: %m" -#: access/transam/xlog.c:2218 -#: access/transam/xlog.c:2360 +#: access/transam/xlog.c:2216 +#: access/transam/xlog.c:2358 #, c-format msgid "could not open control file \"%s\": %m" msgstr "не получилось отктрыть файл управления \"%s\": %m" -#: access/transam/xlog.c:2224 +#: access/transam/xlog.c:2222 #, c-format -msgid "read from control file failed: %m" -msgstr "" +msgid "could not read from control file: %m" +msgstr "не получилось считать из файла управления: %m" -#: 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 +#: access/transam/xlog.c:2234 +#: access/transam/xlog.c:2264 +#: access/transam/xlog.c:2271 +#: access/transam/xlog.c:2278 +#: access/transam/xlog.c:2285 +#: access/transam/xlog.c:2292 +#: access/transam/xlog.c:2301 +#: access/transam/xlog.c:2308 +#: access/transam/xlog.c:2316 +#: utils/init/miscinit.c:844 msgid "database files are incompatible with server" msgstr "" -#: access/transam/xlog.c:2237 +#: access/transam/xlog.c:2235 #, c-format 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:2240 -#: access/transam/xlog.c:2270 +#: access/transam/xlog.c:2238 +#: access/transam/xlog.c:2268 msgid "It looks like you need to initdb." msgstr "" -#: access/transam/xlog.c:2250 -msgid "invalid checksum in control file" +#: access/transam/xlog.c:2248 +msgid "incorrect checksum in control file" msgstr "" -#: access/transam/xlog.c:2267 +#: access/transam/xlog.c:2265 #, c-format 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:2274 +#: access/transam/xlog.c:2272 #, c-format msgid "The database cluster was initialized with BLCKSZ %d, but the server was compiled with BLCKSZ %d." msgstr "" -#: 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 +#: access/transam/xlog.c:2275 +#: access/transam/xlog.c:2282 +#: access/transam/xlog.c:2289 +#: access/transam/xlog.c:2296 +#: access/transam/xlog.c:2304 +#: access/transam/xlog.c:2311 +#: access/transam/xlog.c:2320 msgid "It looks like you need to recompile or initdb." msgstr "" -#: access/transam/xlog.c:2281 +#: access/transam/xlog.c:2279 #, c-format msgid "The database cluster was initialized with RELSEG_SIZE %d, but the server was compiled with RELSEG_SIZE %d." msgstr "" -#: access/transam/xlog.c:2288 +#: access/transam/xlog.c:2286 #, c-format msgid "The database cluster was initialized with NAMEDATALEN %d, but the server was compiled with NAMEDATALEN %d." msgstr "" -#: access/transam/xlog.c:2295 +#: access/transam/xlog.c:2293 #, c-format 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:2304 +#: access/transam/xlog.c:2302 msgid "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the server was compiled with HAVE_INT64_TIMESTAMP." msgstr "" -#: access/transam/xlog.c:2311 +#: access/transam/xlog.c:2309 msgid "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the server was compiled without HAVE_INT64_TIMESTAMP." msgstr "" -#: access/transam/xlog.c:2319 +#: access/transam/xlog.c:2317 #, c-format 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:2325 -#: access/transam/xlog.c:2332 +#: access/transam/xlog.c:2323 +#: access/transam/xlog.c:2330 msgid "database files are incompatible with operating system" msgstr "" -#: access/transam/xlog.c:2326 +#: access/transam/xlog.c:2324 #, c-format msgid "The database cluster was initialized with LC_COLLATE \"%s\", which is not recognized by setlocale()." msgstr "" -#: access/transam/xlog.c:2329 -#: access/transam/xlog.c:2336 +#: access/transam/xlog.c:2327 +#: access/transam/xlog.c:2334 msgid "It looks like you need to initdb or install locale support." msgstr "" -#: access/transam/xlog.c:2333 +#: access/transam/xlog.c:2331 #, c-format msgid "The database cluster was initialized with LC_CTYPE \"%s\", which is not recognized by setlocale()." msgstr "" -#: access/transam/xlog.c:2519 +#: access/transam/xlog.c:2517 #, c-format -msgid "failed to write bootstrap xlog file: %m" -msgstr "" +msgid "could not write bootstrap transaction log file: %m" +msgstr "не получилось записать файл лога стартовых транзакций: %m" -#: access/transam/xlog.c:2525 +#: access/transam/xlog.c:2523 #, c-format -msgid "failed to fsync bootstrap xlog file: %m" -msgstr "" +msgid "could not fsync bootstrap transaction log file: %m" +msgstr "не получилось синхронизировать (fsync) файл лога стартовых транзакций: %m" -#: access/transam/xlog.c:2593 +#: access/transam/xlog.c:2591 msgid "control file contains invalid data" msgstr "" -#: access/transam/xlog.c:2597 +#: access/transam/xlog.c:2595 #, c-format msgid "database system was shut down at %s" msgstr "система была отключена: %s" -#: access/transam/xlog.c:2601 +#: access/transam/xlog.c:2599 #, c-format msgid "database system shutdown was interrupted at %s" msgstr "отключение системы было прервано: %s" -#: access/transam/xlog.c:2605 +#: access/transam/xlog.c:2603 #, c-format msgid "database system was interrupted while in recovery at %s" msgstr "система была прервана во время восстановления на %s" -#: access/transam/xlog.c:2607 +#: access/transam/xlog.c:2605 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:2611 +#: access/transam/xlog.c:2609 #, c-format msgid "database system was interrupted at %s" msgstr "система была прервана: %s" -#: access/transam/xlog.c:2629 +#: access/transam/xlog.c:2627 #, c-format msgid "checkpoint record is at %X/%X" msgstr "контрольная точка: %X/%X" -#: access/transam/xlog.c:2639 +#: access/transam/xlog.c:2637 #, c-format msgid "using previous checkpoint record at %X/%X" msgstr "используется предыдущая контрольная точка: %X/%X" -#: access/transam/xlog.c:2645 +#: access/transam/xlog.c:2643 msgid "could not locate a valid checkpoint record" msgstr "не получилось найти корректную контрольную точку" -#: access/transam/xlog.c:2652 +#: access/transam/xlog.c:2650 #, 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:2657 +#: access/transam/xlog.c:2655 #, c-format -msgid "next transaction id: %u; next oid: %u" -msgstr "id следующей транзакции: %u; следующий OID: %u" +msgid "next transaction ID: %u; next OID: %u" +msgstr "ID следующей транзакции: %u; следующий OID: %u" -#: access/transam/xlog.c:2661 -msgid "invalid next transaction id" +#: access/transam/xlog.c:2659 +msgid "invalid next transaction ID" msgstr "" -#: access/transam/xlog.c:2685 +#: access/transam/xlog.c:2683 msgid "invalid redo in checkpoint record" msgstr "" -#: access/transam/xlog.c:2694 +#: access/transam/xlog.c:2692 msgid "invalid redo/undo record in shutdown checkpoint" msgstr "" -#: access/transam/xlog.c:2706 +#: access/transam/xlog.c:2704 msgid "database system was not properly shut down; automatic recovery in progress" msgstr "" -#: access/transam/xlog.c:2734 +#: access/transam/xlog.c:2732 #, c-format msgid "redo starts at %X/%X" msgstr "" -#: access/transam/xlog.c:2766 +#: access/transam/xlog.c:2764 #, c-format msgid "redo done at %X/%X" msgstr "" -#: access/transam/xlog.c:2773 +#: access/transam/xlog.c:2771 msgid "redo is not required" msgstr "" -#: access/transam/xlog.c:2842 +#: access/transam/xlog.c:2840 #, c-format msgid "undo starts at %X/%X" msgstr "" -#: access/transam/xlog.c:2853 +#: access/transam/xlog.c:2851 #, c-format msgid "undo done at %X/%X" msgstr "" -#: access/transam/xlog.c:2858 +#: access/transam/xlog.c:2856 msgid "undo is not required" msgstr "" -#: access/transam/xlog.c:2948 +#: access/transam/xlog.c:2946 msgid "database system is ready" msgstr "система готова к использованию" -#. 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:2979 +msgid "invalid primary checkpoint link in control file" +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 "первичный" +msgid "invalid secondary checkpoint link in control file" +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 "двоичный" - -#. translator: %s is "primary" or "secondary" #: access/transam/xlog.c:2992 -#, c-format -msgid "invalid %s checkpoint record" -msgstr "неверная контрольная точка %s" +msgid "invalid primary checkpoint record" +msgstr "неверная первичная контрольная точка" -#. 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:2995 +msgid "invalid secondary checkpoint record" +msgstr "неверная вторичная контрольная точка" -#. translator: %s is "primary" or "secondary" -#: access/transam/xlog.c:3009 -#, c-format -msgid "invalid xl_info in %s checkpoint record" -msgstr "" +#: access/transam/xlog.c:3002 +msgid "invalid resource manager ID in primary checkpoint record" +msgstr "неверный ID менеджера ресурсов в первичной контрольной точке" -#. translator: %s is "primary" or "secondary" -#: access/transam/xlog.c:3017 -#, c-format -msgid "invalid length of %s checkpoint record" -msgstr "" +#: access/transam/xlog.c:3005 +msgid "invalid resource manager ID in secondary checkpoint record" +msgstr "неверный ID менеджера ресурсов во вторичной контрольной точке" -#: access/transam/xlog.c:3082 +#: access/transam/xlog.c:3013 +msgid "invalid xl_info in primary checkpoint record" +msgstr "неверное xl_info в первичной контрольной точке" + +#: access/transam/xlog.c:3016 +msgid "invalid xl_info in secondary checkpoint record" +msgstr "неверное xl_info во вторичной контрольной точке" + +#: access/transam/xlog.c:3023 +msgid "invalid length of primary checkpoint record" +msgstr "неверная длина записи первичной контрольной точки" + +#: access/transam/xlog.c:3026 +msgid "invalid length of secondary checkpoint record" +msgstr "неверная длина записи вторичной контрольной точки" + +#: access/transam/xlog.c:3090 msgid "shutting down" msgstr "отключение в процессе" -#: access/transam/xlog.c:3096 +#: access/transam/xlog.c:3104 msgid "database system is shut down" msgstr "система отключена" -#: access/transam/xlog.c:3119 +#: access/transam/xlog.c:3127 msgid "checkpoint cannot be made inside transaction block" msgstr "контрольная точка не может располагаться внутри транзакционного блока" -#: access/transam/xlog.c:3307 +#: access/transam/xlog.c:3315 msgid "concurrent transaction log activity while database system is shutting down" msgstr "" -#: 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/xlog.c:3556 #: access/transam/xlog.c:3588 #, c-format -msgid "fdatasync of log file %u, segment %u failed: %m" -msgstr "" +msgid "could not fsync log file %u, segment %u: %m" +msgstr "не удалось синхронизировать (fsync) лог-файл: %u, сегмент: %u: %m" + +#: access/transam/xlog.c:3596 +#, c-format +msgid "could not fdatasync log file %u, segment %u: %m" +msgstr "не удалось синхронизировать (fdatasync) лог-файл: %u, сегмент: %u: %m" #: bootstrap/bootstrap.c:196 msgid "" @@ -710,21 +1921,21 @@ msgstr "" #: bootstrap/bootstrap.c:319 #: postmaster/postmaster.c:567 -#: tcop/postgres.c:2407 +#: tcop/postgres.c:2409 #, c-format msgid "--%s requires a value" msgstr "--%s требует параметр" #: bootstrap/bootstrap.c:324 #: postmaster/postmaster.c:572 -#: tcop/postgres.c:2412 +#: tcop/postgres.c:2414 #, c-format msgid "-c %s requires a value" msgstr "-c %s требует параметр" #: bootstrap/bootstrap.c:357 #: postmaster/postmaster.c:314 -#: tcop/postgres.c:2482 +#: tcop/postgres.c:2484 #, c-format msgid "" "%s does not know where to find the database system data.\n" @@ -778,7 +1989,7 @@ msgstr "" #: catalog/dependency.c:691 #, c-format msgid "%s depends on %s" -msgstr "" +msgstr "%s зависит от %s" #: catalog/dependency.c:548 #: catalog/dependency.c:698 @@ -786,68 +1997,67 @@ msgstr "" msgid "drop cascades to %s" msgstr "" -#: catalog/aclchk.c:127 +#: catalog/aclchk.c:160 msgid "grant options can only be granted to individual users" msgstr "" -#: catalog/aclchk.c:194 +#: catalog/aclchk.c:165 +msgid "cannot revoke grant options from owner" +msgstr "" + +#: catalog/aclchk.c:236 #, c-format msgid "invalid privilege type %s for table" msgstr "" -#: catalog/aclchk.c:235 -#, c-format -msgid "\"%s\" is an index" -msgstr "\"%s\" является индексом" - -#: catalog/aclchk.c:297 +#: catalog/aclchk.c:343 #, c-format msgid "invalid privilege type %s for database" msgstr "" -#: catalog/aclchk.c:329 +#: catalog/aclchk.c:377 #: commands/comment.c:440 -#: commands/dbcommands.c:481 -#: commands/dbcommands.c:602 -#: commands/dbcommands.c:691 -#: utils/adt/acl.c:1311 +#: commands/dbcommands.c:502 +#: commands/dbcommands.c:623 +#: commands/dbcommands.c:712 +#: utils/adt/acl.c:1312 #: utils/init/postinit.c:261 #: utils/init/postinit.c:273 #, c-format msgid "database \"%s\" does not exist" msgstr "база данных \"%s\" не существует" -#: catalog/aclchk.c:396 +#: catalog/aclchk.c:447 #, c-format msgid "invalid privilege type %s for function" msgstr "" -#: catalog/aclchk.c:493 +#: catalog/aclchk.c:548 #, c-format msgid "invalid privilege type %s for language" msgstr "" -#: catalog/aclchk.c:521 -#: commands/functioncmds.c:440 -#: commands/proclang.c:200 -#: commands/proclang.c:255 -#: utils/adt/acl.c:1729 +#: catalog/aclchk.c:578 +#: commands/functioncmds.c:441 +#: commands/proclang.c:202 +#: commands/proclang.c:257 +#: utils/adt/acl.c:1730 #, c-format msgid "language \"%s\" does not exist" msgstr "язык \"%s\" не существует" # TO REVIEW -#: catalog/aclchk.c:527 +#: catalog/aclchk.c:598 #, c-format msgid "language \"%s\" is not trusted" msgstr "язык \"%s\" недоверямый" -#: catalog/aclchk.c:593 +#: catalog/aclchk.c:657 #, c-format msgid "invalid privilege type %s for schema" msgstr "" -#: catalog/aclchk.c:621 +#: catalog/aclchk.c:687 #: catalog/namespace.c:245 #: catalog/namespace.c:1200 #: catalog/namespace.c:1238 @@ -855,171 +2065,171 @@ msgstr "" #: commands/comment.c:490 #: commands/schemacmds.c:181 #: commands/schemacmds.c:247 -#: utils/adt/acl.c:1933 +#: utils/adt/acl.c:1934 #, c-format msgid "schema \"%s\" does not exist" msgstr "схема \"%s\" не существует" -#: catalog/aclchk.c:724 +#: catalog/aclchk.c:792 #: commands/user.c:1454 -#: commands/user.c:1696 -#: commands/user.c:1731 +#: commands/user.c:1691 +#: commands/user.c:1726 #: libpq/pqcomm.c:475 #, c-format msgid "group \"%s\" does not exist" msgstr "группа \"%s\" не существует" -#: catalog/aclchk.c:796 +#: catalog/aclchk.c:864 #, c-format msgid "group with ID %u does not exist" msgstr "группа с ID %u не существует" -#: catalog/aclchk.c:865 +#: catalog/aclchk.c:933 #, c-format msgid "permission denied for relation %s" msgstr "доступ запрещён для связи %s" -#: catalog/aclchk.c:867 +#: catalog/aclchk.c:935 #, c-format msgid "permission denied for database %s" msgstr "доступ запрещён для базы %s" -#: catalog/aclchk.c:869 +#: catalog/aclchk.c:937 #, c-format msgid "permission denied for function %s" msgstr "доступ запрещён для фунции %s" -#: catalog/aclchk.c:871 +#: catalog/aclchk.c:939 #, c-format msgid "permission denied for operator %s" msgstr "доступ запрещён для оператора %s" -#: catalog/aclchk.c:873 +#: catalog/aclchk.c:941 #, c-format msgid "permission denied for type %s" msgstr "доступ запрещён для типа %s" -#: catalog/aclchk.c:875 +#: catalog/aclchk.c:943 #, c-format msgid "permission denied for language %s" msgstr "доступ запрещён для языка %s" -#: catalog/aclchk.c:877 +#: catalog/aclchk.c:945 #, c-format msgid "permission denied for schema %s" msgstr "доступ запрещён для схемы %s" -#: catalog/aclchk.c:879 +#: catalog/aclchk.c:947 #, c-format msgid "permission denied for operator class %s" msgstr "доступ запрещён для класса операторов %s" -#: catalog/aclchk.c:881 +#: catalog/aclchk.c:949 #, c-format msgid "permission denied for conversion %s" msgstr "доступ запрещён для конверсии %s" -#: catalog/aclchk.c:887 +#: catalog/aclchk.c:955 #, c-format msgid "must be owner of relation %s" msgstr "нужно быть владельцем связи %s" -#: catalog/aclchk.c:889 +#: catalog/aclchk.c:957 #, c-format msgid "must be owner of database %s" msgstr "нужно быть владельцем базы %s" -#: catalog/aclchk.c:891 +#: catalog/aclchk.c:959 #, c-format msgid "must be owner of function %s" msgstr "нужно быть владельцем функции %s" -#: catalog/aclchk.c:893 +#: catalog/aclchk.c:961 #, c-format msgid "must be owner of operator %s" msgstr "нужно быть владельцем оператора %s" -#: catalog/aclchk.c:895 +#: catalog/aclchk.c:963 #, c-format msgid "must be owner of type %s" msgstr "нужно быть владельцем типа %s" -#: catalog/aclchk.c:897 +#: catalog/aclchk.c:965 #, c-format msgid "must be owner of language %s" msgstr "нужно быть владельцем языка %s" -#: catalog/aclchk.c:899 +#: catalog/aclchk.c:967 #, c-format msgid "must be owner of schema %s" msgstr "нужно быть владельцем схемы %s" -#: catalog/aclchk.c:901 +#: catalog/aclchk.c:969 #, c-format msgid "must be owner of operator class %s" msgstr "нужно быть владельцем класса операторов %s" -#: catalog/aclchk.c:903 +#: catalog/aclchk.c:971 #, c-format msgid "must be owner of conversion %s" msgstr "нужно быть владельцем конверсии %s" -#: catalog/aclchk.c:961 +#: catalog/aclchk.c:1030 #, c-format msgid "user with ID %u does not exist" msgstr "пользователь с ID %u не существует" -#: catalog/aclchk.c:978 -#: catalog/aclchk.c:1294 +#: catalog/aclchk.c:1047 +#: catalog/aclchk.c:1369 #, c-format msgid "relation with OID %u does not exist" msgstr "связь с OID %u не существует" -#: catalog/aclchk.c:1073 -#: catalog/aclchk.c:1473 +#: catalog/aclchk.c:1147 +#: catalog/aclchk.c:1548 #, c-format msgid "database with OID %u does not exist" msgstr "база данных с OID %u не существует" -#: catalog/aclchk.c:1130 -#: catalog/aclchk.c:1378 +#: catalog/aclchk.c:1204 +#: catalog/aclchk.c:1453 #: tcop/fastpath.c:231 #, c-format msgid "function with OID %u does not exist" msgstr "функция с OID %u не существует" -#: catalog/aclchk.c:1185 +#: catalog/aclchk.c:1259 #, c-format msgid "language with OID %u does not exist" msgstr "язык с OID %u не существует" -#: catalog/aclchk.c:1244 -#: catalog/aclchk.c:1406 +#: catalog/aclchk.c:1319 +#: catalog/aclchk.c:1481 #, c-format msgid "schema with OID %u does not exist" msgstr "схема с OID %u не существует" -#: catalog/aclchk.c:1322 +#: catalog/aclchk.c:1397 #, c-format msgid "type with OID %u does not exist" msgstr "тип с OID %u не существует" -#: catalog/aclchk.c:1350 +#: catalog/aclchk.c:1425 #, c-format msgid "operator with OID %u does not exist" msgstr "оператро с OID %u не существует" -#: catalog/aclchk.c:1434 +#: catalog/aclchk.c:1509 #, c-format msgid "operator class with OID %u does not exist" msgstr "класс операторов с OID %u не существует" #: catalog/pg_aggregate.c:80 -msgid "cannot determine transition datatype" +msgid "cannot determine transition data type" msgstr "" #: catalog/pg_aggregate.c:81 -msgid "An aggregate using ANYARRAY or ANYELEMENT as trans type must have one of them as its base type." +msgid "An aggregate using \"anyarray\" or \"anyelement\" as transition type must have one of them as its base type." msgstr "" #: catalog/pg_aggregate.c:110 @@ -1028,30 +2238,19 @@ msgid "return type of transition function %s is not %s" msgstr "" #: catalog/pg_aggregate.c:132 -msgid "must not omit initval when transfn is strict and transtype is not compatible with input type" +msgid "must not omit initial value when transition function is strict and transition type is not compatible with input type" msgstr "" #: catalog/pg_aggregate.c:165 -#: catalog/pg_proc.c:112 -#: catalog/pg_proc.c:535 -msgid "cannot determine result datatype" +#: catalog/pg_proc.c:116 +#: catalog/pg_proc.c:539 +msgid "cannot determine result data type" msgstr "" #: catalog/pg_aggregate.c:166 -msgid "An aggregate returning ANYARRAY or ANYELEMENT must have one of them as its base type." +msgid "An aggregate returning \"anyarray\" or \"anyelement\" must have one of them as its base type." msgstr "" -#: 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 "function %s does not exist" -msgstr "функция %s не существует" - #: catalog/pg_aggregate.c:285 #, c-format msgid "function %s returns a set" @@ -1073,7 +2272,7 @@ msgid "System catalog modifications are currently disallowed." msgstr "" #: catalog/heap.c:356 -#: commands/tablecmds.c:1843 +#: commands/tablecmds.c:1757 #, c-format msgid "tables can have at most %d columns" msgstr "" @@ -1090,8 +2289,8 @@ msgstr " #: catalog/heap.c:429 #, c-format -msgid "attribute \"%s\" has type UNKNOWN" -msgstr "атрибут \"%s\" имеет тип UNKNOWN" +msgid "column \"%s\" has type \"unknown\"" +msgstr "" #: catalog/heap.c:430 msgid "Proceeding with relation creation anyway." @@ -1099,110 +2298,91 @@ msgstr "" #: catalog/heap.c:437 #, c-format -msgid "attribute \"%s\" has pseudo-type %s" -msgstr "арибут \"%s\" имеет псевдо-тип %s" +msgid "column \"%s\" has pseudo-type %s" +msgstr "колонка \"%s\" имеет псевдо-тип %s" #: catalog/heap.c:447 #, c-format -msgid "attribute \"%s\" has composite type %s" -msgstr "атрибут \"%s\" имеет сложный тип %s" +msgid "column \"%s\" has composite type %s" +msgstr "колонка \"%s\" имеет сложный тип %s" #: catalog/heap.c:734 -#: catalog/index.c:543 -#: commands/tablecmds.c:1378 +#: catalog/index.c:522 +#: commands/tablecmds.c:1292 #, c-format msgid "relation \"%s\" already exists" msgstr "объект \"%s\" уже существует" #: catalog/heap.c:1556 -#: commands/tablecmds.c:2892 -#: commands/tablecmds.c:2934 +#: commands/tablecmds.c:2798 +#: commands/tablecmds.c:2840 #, c-format msgid "constraint \"%s\" for relation \"%s\" already exists" msgstr "констрейнт \"%s\" для связи \"%s\" уже существует" #: catalog/heap.c:1572 #, c-format -msgid "CHECK constraint \"%s\" already exists" +msgid "check constraint \"%s\" already exists" msgstr "CHECK-ограничение \"%s\" уже существует" #: catalog/heap.c:1634 #, c-format -msgid "only relation \"%s\" can be referenced in CHECK constraint" +msgid "only table \"%s\" can be referenced in check constraint" msgstr "" #: catalog/heap.c:1643 -#: commands/tablecmds.c:3021 -#: commands/typecmds.c:1828 -msgid "cannot use sub-select in CHECK constraint" +#: commands/tablecmds.c:2927 +#: commands/typecmds.c:1811 +msgid "cannot use subquery in check constraint" msgstr "" #: catalog/heap.c:1647 -#: commands/tablecmds.c:3025 -#: commands/typecmds.c:1832 -msgid "cannot use aggregate in CHECK constraint" +#: commands/tablecmds.c:2931 +msgid "cannot use aggregate function in check constraint" msgstr "" #: catalog/heap.c:1754 -msgid "cannot use column references in DEFAULT clause" +msgid "cannot use column references in default expression" msgstr "" #: catalog/heap.c:1762 -msgid "DEFAULT clause must not return a set" +msgid "default expression must not return a set" msgstr "" #: catalog/heap.c:1770 -msgid "cannot use sub-select in DEFAULT clause" +msgid "cannot use subquery in default expression" msgstr "" #: catalog/heap.c:1774 -msgid "cannot use aggregate in DEFAULT clause" +msgid "cannot use aggregate function in default expression" msgstr "" #: catalog/heap.c:1792 -#: rewrite/rewriteHandler.c:560 +#: rewrite/rewriteHandler.c:558 #, c-format msgid "column \"%s\" is of type %s but default expression is of type %s" msgstr "" -#: 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." +#: catalog/heap.c:2059 +msgid "cannot truncate a table referenced in a foreign key constraint" msgstr "" -#: catalog/index.c:526 -msgid "user-defined indexes on system catalogs are not supported" -msgstr "пользовательские индексы на системные каталоги не поддерживаются" +#: catalog/heap.c:2060 +#, c-format +msgid "Table \"%s\" references \"%s\" via foreign key constraint \"%s\"." +msgstr "" -#: catalog/index.c:538 +#: catalog/index.c:505 +msgid "user-defined indexes on system catalog tables are not supported" +msgstr "пользовательские индексы на таблицы системного каталога не поддерживаются" + +#: catalog/index.c:517 msgid "shared indexes cannot be created after initdb" msgstr "" -#: catalog/index.c:995 +#: catalog/index.c:1659 #, c-format -msgid "relation \"%s\" isn't an indexable relation" -msgstr "связт \"%s\" не является индексируемым объектом" - -#: catalog/index.c:1755 -#: catalog/index.c:1882 -#, c-format -msgid "the target relation %u is shared" -msgstr "" - -#: catalog/index.c:1763 -#, c-format -msgid "the target relation %u is nailed" -msgstr "" - -#: 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" +msgid "shared index \"%s\" can only be reindexed in stand-alone mode" msgstr "" #: catalog/namespace.c:187 @@ -1211,12 +2391,13 @@ msgid "relation \"%s.%s\" does not exist" msgstr "связь \"%s.%s\" не существует" #: catalog/namespace.c:192 +#: utils/adt/regproc.c:837 #, c-format msgid "relation \"%s\" does not exist" msgstr "связь \"%s\" не существует" #: catalog/namespace.c:229 -msgid "TEMP tables may not specify a schema name" +msgid "temporary tables may not specify a schema name" msgstr "" #: catalog/namespace.c:257 @@ -1224,13 +2405,6 @@ msgstr "" msgid "no schema has been selected to create in" msgstr "" -#: catalog/namespace.c:1172 -#: parser/parse_expr.c:1149 -#: parser/parse_target.c:170 -#, c-format -msgid "improper qualified name (too many dotted names): %s" -msgstr "" - #: catalog/namespace.c:1284 #, c-format msgid "improper relation name (too many dotted names): %s" @@ -1238,10 +2412,10 @@ msgstr "" #: catalog/namespace.c:1628 #, c-format -msgid "permission denied to create temp tables in database \"%s\"" +msgid "permission denied to create temporary tables in database \"%s\"" msgstr "доступ запрещён по созданию временных таблиц в базе \"%s\"" -#: catalog/pg_largeobject.c:110 +#: catalog/pg_largeobject.c:107 #: storage/large_object/inv_api.c:128 #: storage/large_object/inv_api.c:248 #, c-format @@ -1294,7 +2468,7 @@ msgid "only binary operators can hash" msgstr "" #: catalog/pg_operator.c:432 -msgid "only binary operators can mergejoin" +msgid "only binary operators can merge join" msgstr "" #: catalog/pg_operator.c:444 @@ -1306,105 +2480,98 @@ msgstr " msgid "operator cannot be its own negator or sort operator" msgstr "" -#: 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:113 -#: catalog/pg_proc.c:536 -msgid "A function returning ANYARRAY or ANYELEMENT must have at least one argument of either type." +#: catalog/pg_proc.c:117 +#: catalog/pg_proc.c:540 +msgid "A function returning \"anyarray\" or \"anyelement\" must have at least one argument of either type." msgstr "" -#: catalog/pg_proc.c:168 +#: catalog/pg_proc.c:172 #, c-format msgid "\"%s\" is already an attribute of type %s" msgstr "" -#: catalog/pg_proc.c:220 +#: catalog/pg_proc.c:224 #, c-format msgid "function \"%s\" already exists with same argument types" msgstr "функция \"%s\" с таким набором аргументов уже существует" -#: catalog/pg_proc.c:234 +#: catalog/pg_proc.c:238 msgid "cannot change return type of existing function" msgstr "нельзя поменять тип возвращаемого значения для существующей фунции" -#: catalog/pg_proc.c:235 +#: catalog/pg_proc.c:239 msgid "Use DROP FUNCTION first." msgstr "" -#: catalog/pg_proc.c:243 +#: catalog/pg_proc.c:247 #, c-format msgid "function \"%s\" is an aggregate" msgstr "функция \"%s\" является агрегатом" -#: catalog/pg_proc.c:248 +#: catalog/pg_proc.c:252 #, c-format msgid "function \"%s\" is not an aggregate" msgstr "функция \"%s\" не является агрегатом" -#: 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 +#: catalog/pg_proc.c:371 +#: catalog/pg_proc.c:392 +#: catalog/pg_proc.c:402 +#: catalog/pg_proc.c:426 +#: catalog/pg_proc.c:434 +#: catalog/pg_proc.c:486 +#: catalog/pg_proc.c:498 +#: catalog/pg_proc.c:518 #, c-format msgid "return type mismatch in function declared to return %s" msgstr "" -#: catalog/pg_proc.c:369 -#: catalog/pg_proc.c:400 +#: catalog/pg_proc.c:373 +#: catalog/pg_proc.c:404 msgid "Function's final statement must be a SELECT." msgstr "" -#: catalog/pg_proc.c:390 +#: catalog/pg_proc.c:394 msgid "Function's final statement must not be a SELECT." msgstr "" -#: catalog/pg_proc.c:424 +#: catalog/pg_proc.c:428 msgid "Final SELECT must return exactly one column." msgstr "" -#: catalog/pg_proc.c:432 +#: catalog/pg_proc.c:436 #, c-format msgid "Actual return type is %s." msgstr "" -#: catalog/pg_proc.c:484 +#: catalog/pg_proc.c:488 msgid "Final SELECT returns too many columns." msgstr "" -#: catalog/pg_proc.c:496 +#: catalog/pg_proc.c:500 #, c-format msgid "Final SELECT returns %s instead of %s at column %d." msgstr "" -#: catalog/pg_proc.c:516 +#: catalog/pg_proc.c:520 msgid "Final SELECT returns too few columns." msgstr "" -#: catalog/pg_proc.c:541 +#: catalog/pg_proc.c:545 #, c-format msgid "return type %s is not supported for SQL functions" msgstr "" -#: catalog/pg_proc.c:578 +#: catalog/pg_proc.c:587 #, c-format msgid "there is no built-in function named \"%s\"" msgstr "встроенной функции \"%s\" не существует" -#: catalog/pg_proc.c:671 +#: catalog/pg_proc.c:685 #, c-format msgid "SQL functions cannot return type %s" msgstr "SQL-функции не могут возвращать тип %s" -#: catalog/pg_proc.c:687 +#: catalog/pg_proc.c:701 #, c-format msgid "SQL functions cannot have arguments of type %s" msgstr "SQL-функции не могут иметь аргументы типа %s" @@ -1425,23 +2592,6 @@ msgstr "" msgid "type \"%s\" already exists" msgstr "тип \"%s\" уже существует" -#: 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\" не существует" - #: commands/aggregatecmds.c:97 #, c-format msgid "aggregate attribute \"%s\" not recognized" @@ -1461,7 +2611,7 @@ msgstr "" #: commands/aggregatecmds.c:138 #, c-format -msgid "aggregate transition datatype cannot be %s" +msgid "aggregate transition data type cannot be %s" msgstr "" #: commands/aggregatecmds.c:259 @@ -1470,33 +2620,39 @@ msgid "function %s(*) already exists in schema \"%s\"" msgstr "" #: commands/aggregatecmds.c:265 -#: commands/functioncmds.c:680 +#: commands/functioncmds.c:688 #, c-format msgid "function %s already exists in schema \"%s\"" msgstr "" #: commands/analyze.c:200 #, c-format -msgid "skipping \"%s\" --- only table or database owner can ANALYZE it" +msgid "skipping \"%s\" --- only table or database owner can analyze it" msgstr "" #: commands/analyze.c:215 #, c-format -msgid "skipping \"%s\" --- cannot ANALYZE indexes, views or special system tables" -msgstr "пропускается \"%s\" --- индексы, виды или специальные системные таблицы не анализируются" +msgid "skipping \"%s\" --- cannot analyze indexes, views, or special system tables" +msgstr "пропускается \"%s\" --- индексы, виды или специальные системные таблицы не анализируются для сбора статистики" #: commands/analyze.c:245 #, c-format msgid "analyzing \"%s.%s\"" msgstr "анализируется \"%s.%s\"" +#: commands/analyze.c:544 +#: commands/analyze.c:700 +#, c-format +msgid "\"%s\": %u pages, %d rows sampled, %.0f estimated total rows" +msgstr "" + #: commands/cluster.c:150 #, c-format msgid "there is no previously clustered index for table \"%s\"" msgstr "" #: commands/cluster.c:164 -#: commands/tablecmds.c:3988 +#: commands/tablecmds.c:3918 #, c-format msgid "index \"%s\" for table \"%s\" does not exist" msgstr "индекс \"%s\" для таблицы \"%s\" не существует" @@ -1511,7 +2667,7 @@ msgid "cannot cluster on partial index" msgstr "" #: commands/cluster.c:352 -msgid "cannot cluster when index access method does not handle nulls" +msgid "cannot cluster when index access method does not handle null values" msgstr "" #: commands/cluster.c:353 @@ -1520,7 +2676,7 @@ msgid "You may be able to work around this by marking column \"%s\" NOT NULL." msgstr "" #: commands/cluster.c:365 -msgid "cannot cluster on expressional index when index access method does not handle nulls" +msgid "cannot cluster on expressional index when index access method does not handle null values" msgstr "" #: commands/cluster.c:379 @@ -1529,12 +2685,7 @@ msgid "\"%s\" is a system catalog" msgstr "\"%s\" является системным каталогом" #: commands/cluster.c:389 -msgid "cannot cluster temp tables of other processes" -msgstr "" - -#: commands/async.c:225 -#, c-format -msgid "already listening on \"%s\"" +msgid "cannot cluster temporary tables of other sessions" msgstr "" #: commands/conversioncmds.c:66 @@ -1552,44 +2703,40 @@ msgstr "" msgid "conversion \"%s\" already exists in schema \"%s\"" msgstr "" -#: 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:316 +#: commands/sequence.c:794 +#: tcop/utility.c:81 #, c-format -msgid "relation \"%s\" is not a sequence" -msgstr "связь \"%s\" не является последовательностью" +msgid "\"%s\" is not a sequence" +msgstr "\"%s\" не является последовательностью" #: commands/comment.c:323 #: commands/indexcmds.c:109 -#: commands/indexcmds.c:669 +#: commands/indexcmds.c:639 +#: commands/lockcmds.c:68 +#: commands/tablecmds.c:377 +#: commands/tablecmds.c:1593 +#: commands/tablecmds.c:1884 +#: commands/tablecmds.c:2028 +#: commands/tablecmds.c:2262 +#: commands/tablecmds.c:2428 +#: commands/tablecmds.c:2554 +#: commands/tablecmds.c:2735 +#: commands/tablecmds.c:3746 +#: commands/tablecmds.c:4012 +#: commands/trigger.c:144 +#: commands/trigger.c:546 +#: tcop/utility.c:76 #, c-format -msgid "relation \"%s\" is not a table" -msgstr "объект \"%s\" не является таблицей" +msgid "\"%s\" is not a table" +msgstr "\"%s\" не является таблицей" #: commands/comment.c:330 +#: commands/view.c:113 +#: tcop/utility.c:86 #, c-format -msgid "relation \"%s\" is not a view" -msgstr "объект \"%s\" не является видом" - -#: 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 "attribute \"%s\" of relation \"%s\" does not exist" -msgstr "атрибут \"%s\" для связи \"%s\" не существует" +msgid "\"%s\" is not a view" +msgstr "\"%s\" не является видом" #: commands/comment.c:417 msgid "database name may not be qualified" @@ -1611,7 +2758,7 @@ msgstr " #: commands/comment.c:572 #, c-format -msgid "there are multiple rules \"%s\"" +msgid "there are multiple rules named \"%s\"" msgstr "" #: commands/comment.c:573 @@ -1622,23 +2769,23 @@ msgstr "" #: commands/trigger.c:484 #: commands/trigger.c:697 #, c-format -msgid "trigger \"%s\" for relation \"%s\" does not exist" -msgstr "триггер \"%s\" для связи \"%s\" не существует" +msgid "trigger \"%s\" for table \"%s\" does not exist" +msgstr "триггер \"%s\" для таблицы \"%s\" не существует" #: commands/comment.c:894 #, c-format -msgid "relation \"%s\" has multiple constraints named \"%s\"" +msgid "table \"%s\" has multiple constraints named \"%s\"" msgstr "" #: commands/comment.c:906 #, c-format -msgid "constraint \"%s\" for relation \"%s\" does not exist" -msgstr "" +msgid "constraint \"%s\" for table \"%s\" does not exist" +msgstr "констрейнт \"%s\" для таблицы \"%s\" не существует" -#: commands/copy.c:684 -#: commands/copy.c:692 #: commands/copy.c:700 #: commands/copy.c:708 +#: commands/copy.c:716 +#: commands/copy.c:724 #: commands/dbcommands.c:103 #: commands/dbcommands.c:111 #: commands/dbcommands.c:119 @@ -1688,20 +2835,20 @@ msgid "must be superuser to create database for another user" msgstr "" #: commands/dbcommands.c:203 -msgid "cannot use an alternate location on this platform" +msgid "cannot use an alternative location on this platform" msgstr "" #: commands/dbcommands.c:217 -#: commands/dbcommands.c:384 -#: commands/dbcommands.c:632 +#: commands/dbcommands.c:405 +#: commands/dbcommands.c:653 #, c-format msgid "database \"%s\" already exists" msgstr "база \"%s\" уже существует" #: commands/dbcommands.c:231 #, c-format -msgid "template \"%s\" does not exist" -msgstr "шаблон \"%s\" не существует" +msgid "template database \"%s\" does not exist" +msgstr "база данных-шаблон \"%s\" не существует" #: commands/dbcommands.c:242 #, c-format @@ -1715,8 +2862,8 @@ msgstr "" #: commands/dbcommands.c:274 #, c-format -msgid "invalid backend encoding %d" -msgstr "" +msgid "invalid server encoding %d" +msgstr "неверная кодировка сервера: %d" #: commands/dbcommands.c:304 #: commands/dbcommands.c:308 @@ -1731,286 +2878,315 @@ msgstr " #: commands/dbcommands.c:342 #, c-format -msgid "could not remove temp directory \"%s\": %m" -msgstr "" +msgid "could not remove temporary directory \"%s\": %m" +msgstr "не получилось удалить временную директорию \"%s\": %m" #: commands/dbcommands.c:353 #, c-format -msgid "could not link \"%s\" to \"%s\": %m" +msgid "could not link file \"%s\" to \"%s\": %m" +msgstr "не получилось слинковать файл \"%s\" в \"%s\": %m" + +#: commands/dbcommands.c:370 +#: commands/dbcommands.c:385 +msgid "could not initialize database directory" +msgstr "не получилось инициализировать директорию баз данных" + +#: commands/dbcommands.c:371 +#: commands/dbcommands.c:376 +#: commands/dbcommands.c:961 +#, c-format +msgid "Failing system command was: %s" msgstr "" -#: commands/dbcommands.c:462 +#: commands/dbcommands.c:372 +#: commands/dbcommands.c:377 +#: commands/dbcommands.c:962 +msgid "Look in the postmaster's stderr log for more information." +msgstr "" + +#: commands/dbcommands.c:375 +#: commands/dbcommands.c:388 +msgid "could not initialize database directory; delete failed as well" +msgstr "не получилось инициализировать директорию баз данных; также не удалось её удалить" + +#: commands/dbcommands.c:483 msgid "cannot drop the currently open database" msgstr "" -#: commands/dbcommands.c:495 +#: commands/dbcommands.c:516 msgid "cannot drop a template database" msgstr "" -#: commands/dbcommands.c:506 -#: commands/dbcommands.c:622 +#: commands/dbcommands.c:527 +#: commands/dbcommands.c:643 #, c-format msgid "database \"%s\" is being accessed by other users" msgstr "" -#: commands/dbcommands.c:613 +#: commands/dbcommands.c:634 msgid "current database may not be renamed" msgstr "" -#: commands/dbcommands.c:644 +#: commands/dbcommands.c:665 msgid "permission denied to rename database" msgstr "доступ запрещён по переименованию базы" -#: commands/dbcommands.c:863 +#: commands/dbcommands.c:884 msgid "relative paths are not allowed as database locations" msgstr "" -#: commands/dbcommands.c:867 +#: commands/dbcommands.c:888 msgid "absolute paths are not allowed as database locations" msgstr "" -#: commands/dbcommands.c:879 +#: commands/dbcommands.c:900 #, c-format msgid "postmaster environment variable \"%s\" not found" msgstr "" -#: commands/dbcommands.c:884 +#: commands/dbcommands.c:905 #, c-format msgid "postmaster environment variable \"%s\" must be absolute path" msgstr "" -#: commands/dbcommands.c:893 -msgid "alternate path is too long" +#: commands/dbcommands.c:914 +msgid "alternative path is too long" msgstr "" -#: commands/dbcommands.c:924 +#: commands/dbcommands.c:945 #, c-format -msgid "could not remove \"%s\": %m" -msgstr "не получилось удалить \"%s\": %m" +msgid "could not remove file \"%s\": %m" +msgstr "не получилось удалить файл \"%s\": %m" -#: commands/dbcommands.c:939 +#: commands/dbcommands.c:959 #, c-format -msgid "could not remove database directory \"%s\": %m" -msgstr "" +msgid "could not remove database directory \"%s\"" +msgstr "не получилось удалить директорию баз данных \"%s\"" -#: commands/copy.c:177 -#: commands/copy.c:189 -#: commands/copy.c:222 -#: commands/copy.c:232 +#: commands/copy.c:193 +#: commands/copy.c:205 +#: commands/copy.c:238 +#: commands/copy.c:248 msgid "COPY BINARY is not supported to stdout or from stdin" msgstr "" -#: commands/copy.c:285 +#: commands/copy.c:301 #, c-format -msgid "failed to write COPY file: %m" -msgstr "" +msgid "could not write to COPY file: %m" +msgstr "не получилось записать в файл COPY: %m" -#: commands/copy.c:293 +#: commands/copy.c:309 msgid "connection lost during COPY to stdout" msgstr "" -#: commands/copy.c:376 -#: commands/copy.c:394 -#: commands/copy.c:398 -#: commands/copy.c:458 -#: commands/copy.c:507 +#: commands/copy.c:392 +#: commands/copy.c:410 +#: commands/copy.c:414 +#: commands/copy.c:474 +#: commands/copy.c:523 #: tcop/fastpath.c:292 #: tcop/postgres.c:281 #: tcop/postgres.c:304 msgid "unexpected EOF on client connection" msgstr "" -#: commands/copy.c:410 +#: commands/copy.c:426 #, c-format msgid "COPY from stdin failed: %s" msgstr "" -#: commands/copy.c:425 +#: commands/copy.c:441 #, c-format msgid "unexpected message type 0x%02X during COPY from stdin" msgstr "" -#: commands/copy.c:719 +#: commands/copy.c:735 msgid "cannot specify DELIMITER in BINARY mode" msgstr "" -#: commands/copy.c:724 +#: commands/copy.c:740 msgid "cannot specify NULL in BINARY mode" msgstr "" -#: commands/copy.c:742 -#: executor/execMain.c:462 +#: commands/copy.c:758 +#: executor/execMain.c:483 #: tcop/utility.c:260 msgid "transaction is read-only" msgstr "транзакция установлена \"только для чтения\"" -#: commands/copy.c:753 +#: commands/copy.c:769 msgid "must be superuser to COPY to or from a file" msgstr "" -#: commands/copy.c:754 +#: commands/copy.c:770 msgid "Anyone can COPY to stdout or from stdin. psql's \\copy command also works for anyone." msgstr "" -#: commands/copy.c:763 +#: commands/copy.c:779 msgid "COPY delimiter must be a single character" msgstr "" -#: commands/copy.c:771 +#: commands/copy.c:787 #, c-format msgid "table \"%s\" does not have OIDs" msgstr "таблица \"%s\" не содержит OIDs" -#: commands/copy.c:799 +#: commands/copy.c:817 #, c-format msgid "cannot copy to view \"%s\"" msgstr "нельзя копировать в вид \"%s\"" -#: commands/copy.c:804 +#: commands/copy.c:822 #, c-format msgid "cannot copy to sequence \"%s\"" msgstr "нельзя копировать в последовательность \"%s\"" -#: commands/copy.c:809 +#: commands/copy.c:827 #, c-format msgid "cannot copy to non-table relation \"%s\"" msgstr "нельзя копировать в не-таблицу \"%s\"" -#: commands/copy.c:828 +#: commands/copy.c:846 #, c-format msgid "could not open file \"%s\" for reading: %m" msgstr "не получилось отктрыть файл \"%s\" для чтения: %m" -#: commands/copy.c:837 -#: commands/copy.c:899 +#: commands/copy.c:855 +#: commands/copy.c:917 #, c-format msgid "\"%s\" is a directory" msgstr "\"%s\" является директорией" -#: commands/copy.c:849 +#: commands/copy.c:867 #, c-format msgid "cannot copy from view \"%s\"" msgstr "нельзя копировать из вида \"%s\"" -#: commands/copy.c:854 +#: commands/copy.c:872 #, c-format msgid "cannot copy from sequence \"%s\"" msgstr "нельзя копировать из последовательности \"%s\"" -#: commands/copy.c:859 +#: commands/copy.c:877 #, c-format msgid "cannot copy from non-table relation \"%s\"" msgstr "нельзя копировать из не-таблицы \"%s\"" -#: commands/copy.c:881 +#: commands/copy.c:899 msgid "relative path not allowed for COPY to file" msgstr "" -#: commands/copy.c:890 +#: commands/copy.c:908 #, c-format msgid "could not open file \"%s\" for writing: %m" msgstr "не получилось отктрыть файл \"%s\" для записи: %m" -#: commands/copy.c:1114 +#: commands/copy.c:1148 #, c-format -msgid "COPY FROM, line %d" -msgstr "COPY FROM, строка %d" +msgid "COPY %s, line %d, column %s" +msgstr "COPY %s, строка %d, колонка %s" -#: commands/copy.c:1282 +#: commands/copy.c:1151 +#, c-format +msgid "COPY %s, line %d" +msgstr "COPY %s, строка %d" + +#: commands/copy.c:1159 +#, c-format +msgid "COPY %s, line %d, column %s: \"%s\"" +msgstr "" + +#: commands/copy.c:1186 +#, c-format +msgid "COPY %s, line %d: \"%s\"" +msgstr "COPY %s, строка %d: \"%s\"" + +#: commands/copy.c:1389 msgid "COPY file signature not recognized" msgstr "" -#: commands/copy.c:1288 +#: commands/copy.c:1395 msgid "invalid COPY file header (missing flags)" msgstr "" -#: commands/copy.c:1294 +#: commands/copy.c:1401 msgid "unrecognized critical flags in COPY file header" msgstr "" -#: commands/copy.c:1300 +#: commands/copy.c:1407 msgid "invalid COPY file header (missing length)" msgstr "" -#: commands/copy.c:1308 +#: commands/copy.c:1415 msgid "invalid COPY file header (wrong length)" msgstr "" -#: commands/copy.c:1376 +#: commands/copy.c:1492 msgid "null OID in COPY data" msgstr "" -#: commands/copy.c:1384 -#: commands/copy.c:1499 +#: commands/copy.c:1501 +#: commands/copy.c:1584 msgid "invalid OID in COPY data" msgstr "" -#: commands/copy.c:1403 +#: commands/copy.c:1521 #, c-format msgid "missing data for column \"%s\"" msgstr "отсутствуют данные для колонки \"%s\"" -#: commands/copy.c:1449 -#: commands/copy.c:1460 +#: commands/copy.c:1553 msgid "extra data after last expected column" msgstr "" -#: commands/copy.c:1486 +#: commands/copy.c:1570 #, c-format msgid "row field count is %d, expected %d" msgstr "" -#: commands/copy.c:1691 -#: commands/copy.c:1709 +#: commands/copy.c:1786 +#: commands/copy.c:1804 msgid "literal carriage return found in data" msgstr "" -#: commands/copy.c:1692 -#: commands/copy.c:1710 +#: commands/copy.c:1787 +#: commands/copy.c:1805 msgid "Use \"\\r\" to represent carriage return." msgstr "" -#: commands/copy.c:1728 +#: commands/copy.c:1822 msgid "literal newline found in data" msgstr "" -#: commands/copy.c:1729 +#: commands/copy.c:1823 msgid "" "Use \"\\n" "\" to represent newline." msgstr "" -#: commands/copy.c:1826 -#: commands/copy.c:1842 +#: commands/copy.c:1843 +#: commands/copy.c:1859 msgid "end-of-copy marker does not match previous newline style" msgstr "" -#: commands/copy.c:1830 -#: commands/copy.c:1836 +#: commands/copy.c:1847 +#: commands/copy.c:1853 msgid "end-of-copy marker corrupt" msgstr "" -#: commands/copy.c:1911 -#: commands/copy.c:1933 +#: commands/copy.c:2070 +#: commands/copy.c:2092 msgid "unexpected EOF in COPY data" msgstr "" -#: commands/copy.c:1920 -#, c-format -msgid "invalid size for field %d" -msgstr "" +#: commands/copy.c:2079 +msgid "invalid field size" +msgstr "неверный размер поля" -#: commands/copy.c:1947 -#, c-format -msgid "incorrect binary data format in field %d" +#: commands/copy.c:2106 +msgid "incorrect binary data format" msgstr "" -#: commands/copy.c:2067 -#: parser/parse_target.c:500 -#, c-format -msgid "attribute \"%s\" specified more than once" -msgstr "атрибут \"%s\" указан более одного раза" - #: commands/functioncmds.c:83 #, c-format msgid "SQL function cannot return shell type %s" @@ -2040,20 +3216,13 @@ msgstr "SQL- msgid "argument type %s is only a shell" msgstr "тип аргумента %s является только оболочкой" -#: commands/functioncmds.c:175 -#: parser/parse_oper.c:113 -#: parser/parse_oper.c:124 -#, c-format -msgid "type %s does not exist" -msgstr "тип %s не существует" - #: commands/functioncmds.c:182 msgid "functions cannot accept set arguments" msgstr "функции не принимают аргументы-множества (set)" #: commands/functioncmds.c:265 msgid "no function body specified" -msgstr "" +msgstr "не указано тело функции" #: commands/functioncmds.c:272 msgid "no language specified" @@ -2069,146 +3238,150 @@ msgstr "" msgid "only one AS item needed for language \"%s\"" msgstr "" -#: commands/functioncmds.c:559 -#: commands/functioncmds.c:665 +#: commands/functioncmds.c:448 +msgid "You need to use \"createlang\" to load the language into the database." +msgstr "" + +#: commands/functioncmds.c:567 +#: commands/functioncmds.c:673 #, c-format msgid "\"%s\" is an aggregate function" msgstr "функция \"%s\" является агрегатом" -#: commands/functioncmds.c:561 +#: commands/functioncmds.c:569 msgid "Use DROP AGGREGATE to drop aggregate functions." msgstr "" -#: commands/functioncmds.c:568 +#: commands/functioncmds.c:576 #, c-format msgid "removing built-in function \"%s\"" msgstr "удаление встроенной функции \"%s\"" -#: commands/functioncmds.c:667 +#: commands/functioncmds.c:675 msgid "Use ALTER AGGREGATE to rename aggregate functions." msgstr "" -#: commands/functioncmds.c:805 -#: commands/functioncmds.c:1039 +#: commands/functioncmds.c:813 +#: commands/functioncmds.c:1047 #, c-format msgid "source data type %s does not exist" msgstr "исходный тип данных %s не существует" -#: commands/functioncmds.c:812 -#: commands/functioncmds.c:1046 +#: commands/functioncmds.c:820 +#: commands/functioncmds.c:1054 #, c-format msgid "target data type %s does not exist" msgstr "тип данных назначения %s не существует" -#: commands/functioncmds.c:818 +#: commands/functioncmds.c:826 msgid "source data type and target data type are the same" msgstr "" -#: commands/functioncmds.c:824 +#: commands/functioncmds.c:832 #, c-format msgid "source data type %s is only a shell" msgstr "" -#: commands/functioncmds.c:830 +#: commands/functioncmds.c:838 #, c-format msgid "target data type %s is only a shell" msgstr "" -#: commands/functioncmds.c:836 +#: commands/functioncmds.c:844 #, c-format msgid "source data type %s is a pseudo-type" msgstr "" -#: commands/functioncmds.c:842 +#: commands/functioncmds.c:850 #, c-format msgid "target data type %s is a pseudo-type" msgstr "" -#: commands/functioncmds.c:850 -#: commands/functioncmds.c:1065 +#: commands/functioncmds.c:858 +#: commands/functioncmds.c:1073 #, c-format msgid "must be owner of type %s or type %s" msgstr "" -#: commands/functioncmds.c:872 +#: commands/functioncmds.c:880 msgid "cast function must take one argument" msgstr "" -#: commands/functioncmds.c:876 +#: commands/functioncmds.c:884 msgid "argument of cast function must match source data type" msgstr "" -#: commands/functioncmds.c:880 +#: commands/functioncmds.c:888 msgid "return data type of cast function must match target data type" msgstr "" -#: commands/functioncmds.c:891 +#: commands/functioncmds.c:899 msgid "cast function must not be volatile" msgstr "" -#: commands/functioncmds.c:896 +#: commands/functioncmds.c:904 msgid "cast function must not be an aggregate function" msgstr "" -#: commands/functioncmds.c:900 +#: commands/functioncmds.c:908 msgid "cast function must not return a set" msgstr "" -#: commands/functioncmds.c:923 +#: commands/functioncmds.c:931 msgid "must be superuser to create a cast WITHOUT FUNCTION" msgstr "" -#: commands/functioncmds.c:938 -msgid "source and target datatypes are not physically compatible" +#: commands/functioncmds.c:946 +msgid "source and target data types are not physically compatible" msgstr "" -#: commands/functioncmds.c:973 +#: commands/functioncmds.c:981 #, c-format msgid "cast from type %s to type %s already exists" msgstr "конверсия типа %s в тип %s уже существует" -#: commands/functioncmds.c:1056 +#: commands/functioncmds.c:1064 #, c-format msgid "cast from type %s to type %s does not exist" msgstr "конверсия типа %s в тип %s не существует" -#: commands/define.c:71 -#: commands/define.c:169 -#: commands/define.c:201 -#: commands/define.c:235 +#: commands/define.c:66 +#: commands/define.c:164 +#: commands/define.c:196 +#: commands/define.c:230 #, c-format msgid "%s requires a parameter" msgstr "%s требует параметр" -#: commands/define.c:110 -#: commands/define.c:121 -#: commands/define.c:136 -#: commands/define.c:154 +#: commands/define.c:105 +#: commands/define.c:116 +#: commands/define.c:131 +#: commands/define.c:149 #, c-format msgid "%s requires a numeric value" msgstr "%s требует цифровое значение" -#: commands/define.c:183 +#: commands/define.c:178 #, c-format msgid "argument of %s must be a name" msgstr "" -#: commands/define.c:219 +#: commands/define.c:214 #, c-format msgid "argument of %s must be a type name" msgstr "" -#: commands/define.c:244 +#: commands/define.c:239 #, c-format msgid "%s requires an integer value" msgstr "%s требует целое значение" -#: commands/define.c:265 +#: commands/define.c:260 #, c-format msgid "invalid argument for %s: \"%s\"" msgstr "неверный аргумент для %s: \"%s\"" -#: commands/indexcmds.c:152 +#: commands/indexcmds.c:144 #: commands/opclasscmds.c:91 #: commands/opclasscmds.c:497 #: commands/opclasscmds.c:647 @@ -2237,8 +3410,8 @@ msgstr "" #: commands/opclasscmds.c:198 #, c-format -msgid "DefineOpClass: procedure number %d appears more than once" -msgstr "" +msgid "procedure number %d appears more than once" +msgstr "номер процедуры %d указан больше одного раза" #: commands/opclasscmds.c:214 msgid "storage type specified more than once" @@ -2246,7 +3419,7 @@ msgstr "" #: commands/opclasscmds.c:241 #, c-format -msgid "storage type may not be different from datatype for access method \"%s\"" +msgid "storage type may not be different from data type for access method \"%s\"" msgstr "" #: commands/opclasscmds.c:259 @@ -2256,16 +3429,16 @@ msgstr "" #: commands/opclasscmds.c:287 #, c-format -msgid "could not make class \"%s\" be default for type %s" +msgid "could not make operator class \"%s\" be default for type %s" msgstr "" #: commands/opclasscmds.c:290 #, c-format -msgid "Class \"%s\" already is the default." -msgstr "" +msgid "Operator class \"%s\" already is the default." +msgstr "Класс операторов \"%s\" уже существует является классом по умолчанию." -#: commands/indexcmds.c:479 -#: commands/indexcmds.c:489 +#: commands/indexcmds.c:471 +#: commands/indexcmds.c:481 #: commands/opclasscmds.c:526 #: commands/opclasscmds.c:536 #: commands/opclasscmds.c:669 @@ -2280,154 +3453,94 @@ msgid "operator class \"%s\" for access method \"%s\" already exists in schema \ msgstr "" #: commands/indexcmds.c:92 -msgid "must specify at least one attribute" +msgid "must specify at least one column" msgstr "" #: commands/indexcmds.c:96 #, c-format -msgid "cannot use more than %d attributes in an index" -msgstr "" +msgid "cannot use more than %d columns in an index" +msgstr "число колонок в индексе не может превышать %d" -#: commands/indexcmds.c:120 -msgid "existing indexes are inactive" -msgstr "" - -#: commands/indexcmds.c:121 -msgid "REINDEX the table first." -msgstr "" - -#: commands/indexcmds.c:160 +#: commands/indexcmds.c:152 #, c-format -msgid "access method \"%s\" does not support UNIQUE indexes" +msgid "access method \"%s\" does not support unique indexes" msgstr "" -#: commands/indexcmds.c:165 +#: commands/indexcmds.c:157 #, c-format -msgid "access method \"%s\" does not support multi-column indexes" +msgid "access method \"%s\" does not support multicolumn indexes" msgstr "" -#: commands/indexcmds.c:179 -msgid "index expressions and predicates may refer only to the base relation" +#: commands/indexcmds.c:171 +msgid "index expressions and predicates may refer only to the table being indexed" msgstr "" -#: commands/indexcmds.c:210 +#: commands/indexcmds.c:202 msgid "primary keys cannot be expressions" msgstr "" -#: commands/indexcmds.c:240 -#: parser/analyze.c:1442 -#, c-format -msgid "column \"%s\" named in key does not exist" +#: commands/indexcmds.c:291 +msgid "cannot use subquery in index predicate" msgstr "" -#: commands/indexcmds.c:299 -msgid "cannot use sub-select in index predicate" -msgstr "" - -#: commands/indexcmds.c:303 +#: commands/indexcmds.c:295 msgid "cannot use aggregate in index predicate" msgstr "" -#: commands/indexcmds.c:312 +#: commands/indexcmds.c:304 msgid "functions in index predicate must be marked IMMUTABLE" msgstr "" -#: commands/indexcmds.c:345 -#: commands/tablecmds.c:1205 -#, c-format -msgid "attribute \"%s\" does not exist" -msgstr "атрибут \"%s\" не существует" - -#: commands/indexcmds.c:377 -msgid "cannot use sub-select in index expression" +#: commands/indexcmds.c:369 +msgid "cannot use subquery in index expression" msgstr "" -#: commands/indexcmds.c:381 -msgid "cannot use aggregate in index expression" +#: commands/indexcmds.c:373 +msgid "cannot use aggregate function in index expression" msgstr "" -#: commands/indexcmds.c:392 +#: commands/indexcmds.c:384 msgid "functions in index expression must be marked IMMUTABLE" msgstr "" -#: commands/indexcmds.c:447 +#: commands/indexcmds.c:439 #, c-format msgid "data type %s has no default operator class for access method \"%s\"" msgstr "" -#: commands/indexcmds.c:449 +#: commands/indexcmds.c:441 msgid "You must specify an operator class for the index or define a default operator class for the data type." msgstr "" -#: commands/indexcmds.c:502 +#: commands/indexcmds.c:494 #, c-format msgid "operator class \"%s\" does not accept data type %s" msgstr "" -#: commands/indexcmds.c:559 +#: commands/indexcmds.c:551 #: utils/cache/typcache.c:286 #, c-format msgid "there are multiple default operator classes for data type %s" msgstr "" -#: commands/indexcmds.c:626 -#: commands/indexcmds.c:632 +#: commands/indexcmds.c:651 #, c-format -msgid "permission denied: \"%s\" is a system index" -msgstr "доступ запрещён: \"%s\" является системным индексом" - -#: commands/indexcmds.c:628 -msgid "Do REINDEX in standalone postgres with -O -P options." +msgid "shared table \"%s\" can only be reindexed in stand-alone mode" msgstr "" -#: commands/indexcmds.c:634 -msgid "Do REINDEX in standalone postgres with -P -O options." -msgstr "" - -#: commands/indexcmds.c:649 +#: commands/indexcmds.c:658 #, c-format -msgid "index \"%s\" wasn't reindexed" -msgstr "" +msgid "table \"%s\" has no indexes" +msgstr "таблица \"%s\" не имеет идексов" #: commands/indexcmds.c:685 -#, c-format -msgid "table \"%s\" wasn't reindexed" -msgstr "" - -#: commands/indexcmds.c:712 msgid "can only reindex the currently open database" msgstr "" -#: commands/indexcmds.c:721 -msgid "REINDEX DATABASE must be done in standalone postgres with -O -P options" -msgstr "" - -#: commands/indexcmds.c:725 -msgid "REINDEX DATABASE must be done in standalone postgres with -P -O options" -msgstr "" - -#: commands/indexcmds.c:793 +#: commands/indexcmds.c:768 #, c-format -msgid "relation %u was reindexed" -msgstr "" - -#: 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 "\"%s\" is not a table" -msgstr "\"%s\" не является таблицей" +msgid "table \"%s\" was reindexed" +msgstr "таблица \"%s\" переиндексована" #: commands/operatorcmds.c:106 #: commands/operatorcmds.c:114 @@ -2444,8 +3557,8 @@ msgid "operator procedure must be specified" msgstr "" #: commands/portalcmds.c:54 -#: commands/portalcmds.c:165 -#: commands/portalcmds.c:213 +#: commands/portalcmds.c:164 +#: commands/portalcmds.c:209 msgid "invalid cursor name: must not be empty" msgstr "" @@ -2455,28 +3568,26 @@ msgstr "DECLARE CURSOR #: commands/portalcmds.c:84 msgid "DECLARE CURSOR ... FOR UPDATE is not supported" -msgstr "" +msgstr "DECLARE CURSOR ... FOR UPDATE не поддерживается" #: commands/portalcmds.c:85 msgid "Cursors must be READ ONLY." msgstr "" -#: commands/portalcmds.c:174 -#: commands/portalcmds.c:223 -#: tcop/postgres.c:1506 -#: tcop/postgres.c:1704 +#: commands/portalcmds.c:172 +#: commands/portalcmds.c:219 #, c-format -msgid "portal \"%s\" does not exist" -msgstr "портал \"%s\" не существует" +msgid "cursor \"%s\" does not exist" +msgstr "курсор \"%s\" не существует" -#: commands/portalcmds.c:313 -#: tcop/pquery.c:419 -#: tcop/pquery.c:931 +#: commands/portalcmds.c:308 +#: tcop/pquery.c:430 +#: tcop/pquery.c:945 #, c-format msgid "portal \"%s\" already active" msgstr "портал \"%s\" уже активен" -#: commands/portalcmds.c:369 +#: commands/portalcmds.c:364 msgid "could not reposition held cursor" msgstr "" @@ -2507,149 +3618,139 @@ msgstr " msgid "prepared statement \"%s\" does not exist" msgstr "заготовленная команда \"%s\" не существует" -#: commands/sequence.c:421 -#: commands/sequence.c:613 -#: commands/sequence.c:656 +#: commands/sequence.c:415 +#: commands/sequence.c:607 +#: commands/sequence.c:650 #, c-format msgid "permission denied for sequence %s" msgstr "доступ запрещён для последовательности %s" -#: commands/sequence.c:498 +#: commands/sequence.c:492 #, c-format -msgid "%s.nextval: reached MAXVALUE (%s)" +msgid "nextval: reached maximum value of sequence \"%s\" (%s)" msgstr "" -#: commands/sequence.c:521 +#: commands/sequence.c:515 #, c-format -msgid "%s.nextval: reached MINVALUE (%s)" +msgid "nextval: reached minimum value of sequence \"%s\" (%s)" msgstr "" -#: commands/sequence.c:619 +#: commands/sequence.c:613 #, c-format -msgid "%s.currval is not yet defined in this session" +msgid "currval of sequence \"%s\" is not yet defined in this session" msgstr "" -#: commands/sequence.c:673 +#: commands/sequence.c:667 #, c-format -msgid "%s.setval: value %s is out of bounds (%s..%s)" +msgid "setval: value %s is out of bounds for sequence \"%s\" (%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 +#: commands/sequence.c:814 #: executor/execGrouping.c:328 #: executor/execGrouping.c:388 -#: executor/nodeIndexscan.c:1041 -#: executor/spi.c:83 -#: executor/spi.c:165 +#: executor/nodeIndexscan.c:1043 +#: executor/spi.c:85 +#: executor/spi.c:167 +#: guc-file.l:151 +#: guc-file.l:277 +#: guc-file.l:314 #: 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 +#: libpq/auth.c:633 +#: postmaster/pgstat.c:857 +#: postmaster/pgstat.c:874 +#: postmaster/pgstat.c:2271 +#: postmaster/pgstat.c:2334 +#: postmaster/pgstat.c:2379 +#: postmaster/pgstat.c:2430 +#: postmaster/postmaster.c:1562 +#: postmaster/postmaster.c:2159 +#: postmaster/postmaster.c:2922 #: 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/file/fd.c:582 +#: storage/file/fd.c:615 +#: storage/file/fd.c:760 +#: storage/ipc/sinval.c:348 #: 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/adt/regexp.c:190 +#: utils/adt/ri_triggers.c:3431 #: utils/cache/relcache.c:172 #: utils/cache/relcache.c:182 #: utils/cache/relcache.c:196 -#: utils/cache/relcache.c:1219 +#: utils/cache/relcache.c:1218 #: 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/fmgr/dfmgr.c:119 +#: utils/init/miscinit.c:177 +#: utils/init/miscinit.c:198 +#: utils/init/miscinit.c:208 +#: utils/misc/guc.c:1659 +#: utils/misc/guc.c:1856 +#: utils/misc/guc.c:2829 +#: utils/misc/guc.c:2876 +#: utils/misc/guc.c:3762 +#: utils/misc/guc.c:3897 +#: utils/misc/guc.c:3962 +#: utils/misc/guc.c:3970 +#: utils/misc/guc.c:3979 #: utils/mmgr/aset.c:335 #: utils/mmgr/aset.c:501 -#: utils/mmgr/aset.c:701 -#: utils/mmgr/aset.c:894 +#: utils/mmgr/aset.c:698 +#: utils/mmgr/aset.c:891 #: utils/mmgr/portalmem.c:75 msgid "out of memory" msgstr "не хватает памяти" -#: commands/sequence.c:958 -msgid "cannot increment by zero" -msgstr "" +#: commands/sequence.c:955 +msgid "INCREMENT must not be zero" +msgstr "INCREMENT не может быть нулём" -#: commands/sequence.c:994 +#: commands/sequence.c:1005 #, c-format msgid "MINVALUE (%s) must be less than MAXVALUE (%s)" msgstr "" -#: commands/sequence.c:1018 +#: commands/sequence.c:1030 #, c-format msgid "START value (%s) can't be less than MINVALUE (%s)" msgstr "" -#: commands/sequence.c:1030 +#: commands/sequence.c:1042 #, c-format msgid "START value (%s) can't be greater than MAXVALUE (%s)" msgstr "" -#: commands/sequence.c:1044 +#: commands/sequence.c:1057 #, c-format msgid "CACHE (%s) must be greater than zero" msgstr "" -#: commands/proclang.c:63 +#: commands/proclang.c:64 msgid "must be superuser to create procedural language" msgstr "" -#: commands/proclang.c:76 -#: commands/proclang.c:263 +#: commands/proclang.c:77 +#: commands/proclang.c:265 #, c-format msgid "language \"%s\" already exists" msgstr "язык \"%s\" уже существует" -#: commands/proclang.c:96 +#: commands/proclang.c:97 #, c-format -msgid "changing return type of function %s() from OPAQUE to LANGUAGE_HANDLER" +msgid "changing return type of function %s from \"opaque\" to \"language_handler\"" msgstr "" -#: commands/proclang.c:103 +#: commands/proclang.c:104 #, c-format -msgid "function %s() must return LANGUAGE_HANDLER" -msgstr "функция %s() должна возвращать LANGUAGE_HANDLER" +msgid "function %s must return type \"language_handler\"" +msgstr "" -#: commands/proclang.c:186 +#: commands/proclang.c:188 msgid "must be superuser to drop procedural language" msgstr "" -#: commands/proclang.c:269 +#: commands/proclang.c:271 msgid "must be superuser to rename procedural language" msgstr "" @@ -2675,28 +3776,28 @@ msgstr "" msgid "The prefix \"pg_\" is reserved for system schemas." msgstr "" -#: commands/tablecmds.c:150 -msgid "ON COMMIT can only be used on TEMP tables" +#: commands/tablecmds.c:151 +msgid "ON COMMIT can only be used on temporary tables" msgstr "" -#: commands/tablecmds.c:210 +#: commands/tablecmds.c:211 #, c-format -msgid "duplicate CHECK constraint name \"%s\"" +msgid "duplicate check constraint name \"%s\"" msgstr "" -#: 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/tablecmds.c:388 +#: commands/tablecmds.c:1064 +#: commands/tablecmds.c:1271 +#: commands/tablecmds.c:1609 +#: commands/tablecmds.c:1895 +#: commands/tablecmds.c:2039 +#: commands/tablecmds.c:2167 +#: commands/tablecmds.c:2276 +#: commands/tablecmds.c:2439 +#: commands/tablecmds.c:2565 +#: commands/tablecmds.c:2746 +#: commands/tablecmds.c:3045 +#: commands/tablecmds.c:3757 #: commands/trigger.c:150 #: commands/trigger.c:552 #: tcop/utility.c:162 @@ -2705,275 +3806,239 @@ msgstr "" msgid "permission denied: \"%s\" is a system catalog" msgstr "доступ запрещён: \"%s\" является системным каталогом" -#: commands/tablecmds.c:403 -msgid "cannot truncate temp tables of other processes" +#: commands/tablecmds.c:398 +msgid "cannot truncate temporary tables of other sessions" msgstr "" -#: commands/tablecmds.c:429 -msgid "cannot truncate a table referenced in a foreign key constraint" -msgstr "" - -#: commands/tablecmds.c:430 +#: commands/tablecmds.c:510 #, c-format -msgid "Table \"%s\" references this one via foreign key constraint \"%s\"." -msgstr "" +msgid "column \"%s\" duplicated" +msgstr "повторное имя колонки: \"%s\"" -#: commands/tablecmds.c:543 -#, c-format -msgid "attribute \"%s\" duplicated" -msgstr "повторное имя атрибута: \"%s\"" - -#: commands/tablecmds.c:568 -#: parser/analyze.c:1188 -#, c-format -msgid "inherited relation \"%s\" is not a table" -msgstr "" - -#: commands/tablecmds.c:574 +#: commands/tablecmds.c:541 #, c-format msgid "cannot inherit from temporary relation \"%s\"" msgstr "" -#: commands/tablecmds.c:591 +#: commands/tablecmds.c:558 #, c-format msgid "inherited relation \"%s\" duplicated" msgstr "" -#: commands/tablecmds.c:645 +#: commands/tablecmds.c:611 #, c-format -msgid "merging multiple inherited definitions of attribute \"%s\"" +msgid "merging multiple inherited definitions of column \"%s\"" msgstr "" -#: commands/tablecmds.c:652 +#: commands/tablecmds.c:618 #, c-format -msgid "inherited attribute \"%s\" has a type conflict" +msgid "inherited column \"%s\" has a type conflict" msgstr "" -#: 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 +#: commands/tablecmds.c:766 #, c-format -msgid "%s versus %s" -msgstr "%s против %s" - -#: commands/tablecmds.c:800 -#, c-format -msgid "merging attribute \"%s\" with inherited definition" +msgid "merging column \"%s\" with inherited definition" msgstr "" -#: commands/tablecmds.c:807 +#: commands/tablecmds.c:773 #, c-format -msgid "attribute \"%s\" has a type conflict" +msgid "column \"%s\" has a type conflict" +msgstr "конфликт типов для колонки \"%s\"" + +#: commands/tablecmds.c:814 +#, c-format +msgid "column \"%s\" inherits conflicting default values" msgstr "" -#: commands/tablecmds.c:848 -#, c-format -msgid "attribute \"%s\" inherits conflicting default values" -msgstr "" - -#: commands/tablecmds.c:850 +#: commands/tablecmds.c:816 msgid "To resolve the conflict, specify a default explicitly." msgstr "" -#: commands/tablecmds.c:1195 +#: commands/tablecmds.c:1109 #, c-format -msgid "inherited attribute \"%s\" must be renamed in child tables too" +msgid "inherited column \"%s\" must be renamed in child tables too" msgstr "" -#: commands/tablecmds.c:1213 +#: commands/tablecmds.c:1127 #, c-format -msgid "cannot rename system attribute \"%s\"" -msgstr "нельзя переименовать системный атрибут \"%s\"" +msgid "cannot rename system column \"%s\"" +msgstr "нельзя переименовать системную колонку \"%s\"" -#: commands/tablecmds.c:1223 +#: commands/tablecmds.c:1137 #, c-format -msgid "cannot rename inherited attribute \"%s\"" -msgstr "нельзя переименовать наследованный атрибут \"%s\"" +msgid "cannot rename inherited column \"%s\"" +msgstr "нельзя переименовать наследованную колонку \"%s\"" -#: commands/tablecmds.c:1234 -#: commands/tablecmds.c:1835 +#: commands/tablecmds.c:1148 +#: commands/tablecmds.c:1749 #, c-format -msgid "attribute \"%s\" of relation \"%s\" already exists" -msgstr "атрибут \"%s\" для связи \"%s\" уже существует" +msgid "column \"%s\" of relation \"%s\" already exists" +msgstr "колонка \"%s\" для связи \"%s\" уже существует" -#: commands/tablecmds.c:1748 +#: commands/tablecmds.c:1662 #, c-format msgid "child table \"%s\" has different type for column \"%s\"" msgstr "" -#: commands/tablecmds.c:1756 +#: commands/tablecmds.c:1670 #, c-format msgid "merging definition of column \"%s\" for child \"%s\"" msgstr "" -#: commands/tablecmds.c:1788 -msgid "attribute must be added to child tables too" +#: commands/tablecmds.c:1702 +msgid "column must be added to child tables too" msgstr "" -#: commands/tablecmds.c:1807 +#: commands/tablecmds.c:1721 msgid "adding columns with defaults is not implemented" msgstr "" -#: commands/tablecmds.c:1808 +#: commands/tablecmds.c:1722 msgid "Add the column, then use ALTER TABLE SET DEFAULT." msgstr "" -#: commands/tablecmds.c:1813 +#: commands/tablecmds.c:1727 msgid "adding NOT NULL columns is not implemented" msgstr "" -#: commands/tablecmds.c:1814 +#: commands/tablecmds.c:1728 msgid "Add the column, then use ALTER TABLE SET NOT NULL." msgstr "" -#: commands/tablecmds.c:2027 -#: commands/tablecmds.c:2171 -#: commands/tablecmds.c:2299 -#: commands/tablecmds.c:2463 +#: commands/tablecmds.c:1941 +#: commands/tablecmds.c:2085 +#: commands/tablecmds.c:2213 +#: commands/tablecmds.c:2377 #, c-format -msgid "cannot alter system attribute \"%s\"" -msgstr "нельзя поменять системный атрибут \"%s\"" +msgid "cannot alter system column \"%s\"" +msgstr "нельзя поменять системную колонку \"%s\"" -#: commands/tablecmds.c:2063 +#: commands/tablecmds.c:1977 #, c-format -msgid "attribute \"%s\" is in a primary key" -msgstr "" +msgid "column \"%s\" is in a primary key" +msgstr "колонка \"%s\" находится в первичном ключе" -#: commands/tablecmds.c:2192 +#: commands/tablecmds.c:2106 #, c-format -msgid "attribute \"%s\" contains NULL values" -msgstr "" +msgid "column \"%s\" contains null values" +msgstr "колонка \"%s\" содержит значения NULL" -#: commands/tablecmds.c:2242 +#: commands/tablecmds.c:2156 #, c-format msgid "\"%s\" is not a table or view" msgstr "\"%s\" не является таблицей или видом" -#: commands/tablecmds.c:2381 +#: commands/tablecmds.c:2295 #, c-format msgid "statistics target %d is too low" msgstr "" -#: commands/tablecmds.c:2389 +#: commands/tablecmds.c:2303 #, c-format msgid "lowering statistics target to %d" msgstr "" -#: commands/tablecmds.c:2412 +#: commands/tablecmds.c:2326 #, c-format msgid "invalid storage type \"%s\"" msgstr "" -#: commands/tablecmds.c:2482 +#: commands/tablecmds.c:2396 #, c-format -msgid "column datatype %s can only have storage \"plain\"" +msgid "column data type %s can only have storage PLAIN" msgstr "" -#: commands/tablecmds.c:2572 -#, c-format -msgid "table \"%s\" is already WITH OIDS" -msgstr "" - -#: commands/tablecmds.c:2576 -#, c-format -msgid "table \"%s\" is already WITHOUT OIDS" -msgstr "" - -#: commands/tablecmds.c:2596 +#: commands/tablecmds.c:2502 msgid "ALTER TABLE WITH OIDS is not yet implemented" msgstr "" -#: commands/tablecmds.c:2677 +#: commands/tablecmds.c:2583 #, c-format -msgid "cannot drop system attribute \"%s\"" -msgstr "нельзя удалить системный атрибут \"%s\"" +msgid "cannot drop system column \"%s\"" +msgstr "нельзя удалить системную колонку \"%s\"" -#: commands/tablecmds.c:2685 +#: commands/tablecmds.c:2591 #, c-format -msgid "cannot drop inherited attribute \"%s\"" -msgstr "нельзя удалить наследованный атрибут \"%s\"" +msgid "cannot drop inherited column \"%s\"" +msgstr "нельзя удалить наследованную колонку \"%s\"" -#: commands/tablecmds.c:3012 +#: commands/tablecmds.c:2918 #, c-format -msgid "CHECK constraint may only reference relation \"%s\"" +msgid "check constraint may only reference relation \"%s\"" msgstr "" -#: commands/tablecmds.c:3076 +#: commands/tablecmds.c:2982 #, c-format -msgid "CHECK constraint \"%s\" is violated at some row(s)" +msgid "check constraint \"%s\" is violated by some row" msgstr "" -#: commands/tablecmds.c:3127 +#: commands/tablecmds.c:3033 #, c-format msgid "referenced relation \"%s\" is not a table" msgstr "" -#: commands/tablecmds.c:3152 +#: commands/tablecmds.c:3067 msgid "cannot reference temporary table from permanent table constraint" msgstr "" -#: commands/tablecmds.c:3193 -#: commands/tablecmds.c:3622 -msgid "number of referencing and referenced attributes for foreign key disagree" +#: commands/tablecmds.c:3074 +msgid "cannot reference permanent table from temporary table constraint" msgstr "" -#: commands/tablecmds.c:3275 +#: commands/tablecmds.c:3116 +#: commands/tablecmds.c:3552 +msgid "number of referencing and referenced columns for foreign key disagree" +msgstr "" + +#: commands/tablecmds.c:3198 #, c-format msgid "column \"%s\" referenced in foreign key constraint does not exist" msgstr "" -#: commands/tablecmds.c:3280 +#: commands/tablecmds.c:3203 #, c-format msgid "cannot have more than %d keys in a foreign key" msgstr "" -#: commands/tablecmds.c:3343 +#: commands/tablecmds.c:3266 #, c-format -msgid "there is no PRIMARY KEY for referenced table \"%s\"" +msgid "there is no primary key for referenced table \"%s\"" msgstr "" -#: commands/tablecmds.c:3457 +#: commands/tablecmds.c:3380 #, c-format -msgid "there is no UNIQUE constraint matching given keys for referenced table \"%s\"" +msgid "there is no unique constraint matching given keys for referenced table \"%s\"" msgstr "" -#: commands/tablecmds.c:3872 -#: commands/trigger.c:2312 +#: commands/tablecmds.c:3802 +#: commands/trigger.c:2306 #, c-format msgid "constraint \"%s\" does not exist" msgstr "" -#: commands/tablecmds.c:3877 +#: commands/tablecmds.c:3807 #, c-format msgid "multiple constraints named \"%s\" were dropped" msgstr "" -#: commands/tablecmds.c:3919 +#: commands/tablecmds.c:3849 #, c-format msgid "\"%s\" is not a table, TOAST table, index, view, or sequence" msgstr "" -#: commands/tablecmds.c:4005 -#, c-format -msgid "table \"%s\" is already being clustered on index \"%s\"" +#: commands/tablecmds.c:4033 +msgid "shared tables cannot be toasted after initdb" msgstr "" -#: commands/tablecmds.c:4106 -msgid "shared relations cannot be toasted after initdb" -msgstr "" - -#: commands/tablecmds.c:4121 +#: commands/tablecmds.c:4048 #, c-format -msgid "relation \"%s\" already has a toast table" -msgstr "" +msgid "table \"%s\" already has a TOAST table" +msgstr "таблица \"%s\" уже имеет соответствующую TOAST-таблицу" -#: commands/tablecmds.c:4138 +#: commands/tablecmds.c:4065 #, c-format -msgid "relation \"%s\" does not need a toast table" -msgstr "" +msgid "table \"%s\" does not need a TOAST table" +msgstr "таблица \"%s\" не нуждается в соответствующей TOAST-таблице" #: commands/trigger.c:137 #, c-format @@ -2981,15 +4046,15 @@ msgid "could not determine referenced table for constraint \"%s\"" msgstr "" #: commands/trigger.c:222 -msgid "double INSERT event specified" +msgid "multiple INSERT events specified" msgstr "" #: commands/trigger.c:229 -msgid "double DELETE event specified" +msgid "multiple DELETE events specified" msgstr "" #: commands/trigger.c:236 -msgid "double UPDATE event specified" +msgid "multiple UPDATE events specified" msgstr "" #: commands/trigger.c:269 @@ -3000,17 +4065,17 @@ msgstr " #: commands/trigger.c:290 #, c-format -msgid "changing return type of function %s() from OPAQUE to TRIGGER" +msgid "changing return type of function %s from \"opaque\" to \"trigger\"" msgstr "" #: commands/trigger.c:297 #, c-format -msgid "function %s() must return TRIGGER" -msgstr "функция %s() должна возвращать TRIGGER" +msgid "function %s must return type \"trigger\"" +msgstr "функция %s должна возвращать тип \"trigger\"" #: commands/trigger.c:1161 #, c-format -msgid "trigger function %u returned NULL" +msgid "trigger function %u returned null value" msgstr "" #: commands/trigger.c:1213 @@ -3020,17 +4085,17 @@ msgid "BEFORE STATEMENT trigger cannot return a value" msgstr "" #: commands/trigger.c:1582 -#: executor/execMain.c:1124 -#: executor/execMain.c:1423 -#: executor/execMain.c:1557 +#: executor/execMain.c:1194 +#: executor/execMain.c:1495 +#: executor/execMain.c:1631 msgid "could not serialize access due to concurrent update" msgstr "" -#: commands/trigger.c:2263 +#: commands/trigger.c:2257 msgid "unnamed constraints cannot be set explicitly" msgstr "" -#: commands/trigger.c:2296 +#: commands/trigger.c:2290 #, c-format msgid "constraint \"%s\" is not deferrable" msgstr "" @@ -3070,32 +4135,32 @@ msgstr "" #: commands/typecmds.c:275 #, c-format -msgid "changing return type of function %s from OPAQUE to %s" +msgid "changing return type of function %s from \"opaque\" to %s" msgstr "" #: commands/typecmds.c:282 #, c-format -msgid "type input function %s must return %s" +msgid "type input function %s must return type %s" msgstr "" #: commands/typecmds.c:292 #, c-format -msgid "changing return type of function %s from OPAQUE to CSTRING" +msgid "changing return type of function %s from \"opaque\" to \"cstring\"" msgstr "" #: commands/typecmds.c:299 #, c-format -msgid "type output function %s must return cstring" +msgid "type output function %s must return type \"cstring\"" msgstr "" #: commands/typecmds.c:308 #, c-format -msgid "type receive function %s must return %s" +msgid "type receive function %s must return type %s" msgstr "" #: commands/typecmds.c:317 #, c-format -msgid "type send function %s must return bytea" +msgid "type send function %s must return type \"bytea\"" msgstr "" #: commands/typecmds.c:520 @@ -3109,12 +4174,12 @@ msgid "\"%s\" is not a valid base type for a domain" msgstr "\"%s\" не является верным базовым типом для домена" #: commands/typecmds.c:598 -#: commands/typecmds.c:1457 -msgid "FOREIGN KEY constraints not supported for domains" -msgstr "FOREIGN KEY констрейнты не поддерживаются для доменов" +#: commands/typecmds.c:1453 +msgid "foreign key constraints not possible for domains" +msgstr "вторичные ключи не поддерживаются для доменов" #: commands/typecmds.c:618 -msgid "multiple DEFAULT expressions" +msgid "multiple default expressions" msgstr "" #: commands/typecmds.c:648 @@ -3123,72 +4188,63 @@ msgid "conflicting NULL/NOT NULL constraints" msgstr "" #: commands/typecmds.c:676 -#: commands/typecmds.c:1488 -msgid "UNIQUE constraints not supported for domains" -msgstr "UNIQUE констрейнты не поддерживаются для доменов" +#: commands/typecmds.c:1471 +msgid "unique constraints not possible for domains" +msgstr "UNIQUE-констрейнты не поддерживаются для доменов" #: commands/typecmds.c:682 -#: commands/typecmds.c:1494 -msgid "PRIMARY KEY constraints not supported for domains" -msgstr "PRIMARY KEY констрэйнты не поддерживаются для доменов" +#: commands/typecmds.c:1477 +msgid "primary key constraints not possible for domains" +msgstr "первичные ключи не поддерживаются для доменов" #: commands/typecmds.c:691 -#: commands/typecmds.c:1503 -msgid "deferrability constraints not supported for domains" +#: commands/typecmds.c:1486 +msgid "specifying constraint deferrability not supported for domains" msgstr "" #: commands/typecmds.c:808 -#: commands/typecmds.c:1737 -#: commands/typecmds.c:2048 +#: commands/typecmds.c:1720 +#: commands/typecmds.c:2031 #, c-format msgid "\"%s\" is not a domain" msgstr "\"%s\" не является доменом" #: commands/typecmds.c:878 #, c-format -msgid "changing argument type of function %s from OPAQUE to CSTRING" +msgid "changing argument type of function %s from \"opaque\" to \"cstring\"" msgstr "" #: commands/typecmds.c:948 #, c-format -msgid "changing argument type of function %s from OPAQUE to %s" +msgid "changing argument type of function %s from \"opaque\" to %s" msgstr "" #: commands/typecmds.c:1059 msgid "composite type must have at least one attribute" msgstr "" -#: commands/typecmds.c:1250 +#: commands/typecmds.c:1290 #, c-format -msgid "\"%s\" is already set to %s" -msgstr "" +msgid "column \"%s\" of table \"%s\" contains null values" +msgstr "колонка \"%s\" таблицы \"%s\" содержит значения NULL" -#: commands/typecmds.c:1294 +#: commands/typecmds.c:1557 #, c-format -msgid "relation \"%s\" attribute \"%s\" contains NULL values" +msgid "column \"%s\" of table \"%s\" contains values that violate the new constraint" msgstr "" -#: commands/typecmds.c:1471 -msgid "use ALTER DOMAIN .. SET DEFAULT instead" -msgstr "" - -#: commands/typecmds.c:1478 -msgid "use ALTER DOMAIN .. [ SET | DROP ] NOT NULL instead" -msgstr "" - -#: commands/typecmds.c:1574 -#, c-format -msgid "relation \"%s\" attribute \"%s\" contains values that violate the new constraint" -msgstr "" - -#: commands/typecmds.c:1771 +#: commands/typecmds.c:1754 #, c-format msgid "constraint \"%s\" for domain \"%s\" already exists" msgstr "" -#: commands/typecmds.c:1811 -#: commands/typecmds.c:1820 -msgid "cannot use table references in domain CHECK constraint" +#: commands/typecmds.c:1794 +#: commands/typecmds.c:1803 +msgid "cannot use table references in domain check constraint" +msgstr "" + +#: commands/typecmds.c:1815 +msgid "cannot use aggregate in check constraint" msgstr "" #: commands/user.c:149 @@ -3196,8 +4252,8 @@ msgstr "" #: commands/user.c:297 #: commands/user.c:379 #, c-format -msgid "could not write temp file \"%s\": %m" -msgstr "" +msgid "could not write to temporary file \"%s\": %m" +msgstr "не получилось записать во временный файл \"%s\": %m" #: commands/user.c:184 #, c-format @@ -3213,8 +4269,8 @@ msgstr " #: commands/user.c:258 #: commands/user.c:389 #, c-format -msgid "could not rename \"%s\" to \"%s\": %m" -msgstr "не получилось переименовать \"%s\" в \"%s\": %m" +msgid "could not rename file \"%s\" to \"%s\": %m" +msgstr "не получилось переименовать файл \"%s\" в \"%s\": %m" #: commands/user.c:354 #, c-format @@ -3222,8 +4278,8 @@ msgid "invalid user password \"%s\"" msgstr "неверный пароль \"%s\"" #: commands/user.c:587 -msgid "user id must be positive" -msgstr "" +msgid "user ID must be positive" +msgstr "ID пользователя должен быть положительным" #: commands/user.c:604 msgid "must be superuser to create users" @@ -3241,18 +4297,17 @@ msgid "user \"%s\" already exists" msgstr "пользователь \"%s\" уже существует" #: commands/user.c:651 -#: commands/user.c:1357 #, c-format -msgid "sysid %d is already assigned" -msgstr "" +msgid "user ID %d is already assigned" +msgstr "ID пользователя %d уже присвоено" #: 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 +#: utils/cache/lsyscache.c:1981 +#: utils/init/miscinit.c:310 #, c-format msgid "user \"%s\" does not exist" msgstr "пользователь \"%s\" не существует" @@ -3289,7 +4344,7 @@ msgstr "" #: commands/user.c:1230 #, c-format -msgid "before using passwords you must revoke permissions on %s" +msgid "before using passwords you must revoke privileges on %s" msgstr "" #: commands/user.c:1232 @@ -3298,12 +4353,12 @@ msgstr "" #: commands/user.c:1233 #, c-format -msgid "Try 'REVOKE ALL ON \"%s\" FROM PUBLIC'." +msgid "Try REVOKE ALL ON \"%s\" FROM PUBLIC." msgstr "" #: commands/user.c:1297 -msgid "group id must be positive" -msgstr "" +msgid "group ID must be positive" +msgstr "ID группы должен быть положительным" #: commands/user.c:1310 msgid "must be superuser to create groups" @@ -3315,152 +4370,152 @@ msgid "group name \"%s\" is reserved" msgstr "" #: commands/user.c:1352 -#: commands/user.c:1739 +#: commands/user.c:1734 #, c-format msgid "group \"%s\" already exists" msgstr "группа \"%s\" уже существует" +#: commands/user.c:1357 +#, c-format +msgid "group ID %d is already assigned" +msgstr "ID группы %d уже присвоено" + #: commands/user.c:1437 msgid "must be superuser to alter groups" msgstr "" -#: commands/user.c:1504 -#, c-format -msgid "user \"%s\" is already in group \"%s\"" -msgstr "" - -#: commands/user.c:1521 +#: commands/user.c:1516 #, c-format msgid "group \"%s\" does not have any members" msgstr "" -#: commands/user.c:1549 +#: commands/user.c:1544 #, c-format msgid "user \"%s\" is not in group \"%s\"" msgstr "пользователь \"%s\" не принадлежит группе \"%s\"" -#: commands/user.c:1681 +#: commands/user.c:1676 msgid "must be superuser to drop groups" msgstr "" -#: commands/user.c:1745 +#: commands/user.c:1740 msgid "must be superuser to rename groups" msgstr "" #: commands/vacuum.c:466 -msgid "oldest Xmin is far in the past" +msgid "oldest xmin is far in the past" msgstr "" #: commands/vacuum.c:467 msgid "Close open transactions soon to avoid wraparound problems." msgstr "" -#: commands/vacuum.c:674 +#: commands/vacuum.c:684 msgid "some databases have not been vacuumed in over 2 billion transactions" msgstr "" -#: commands/vacuum.c:675 +#: commands/vacuum.c:685 msgid "You may have already suffered transaction-wraparound data loss." msgstr "" -#: commands/vacuum.c:686 +#: commands/vacuum.c:696 msgid "some databases have not been vacuumed in over 1 billion transactions" msgstr "" -#: commands/vacuum.c:687 +#: commands/vacuum.c:697 msgid "Better vacuum them soon, or you may have a wraparound failure." msgstr "" -#: commands/vacuum.c:694 +#: commands/vacuum.c:704 #, c-format msgid "some databases have not been vacuumed in %d transactions" msgstr "" -#: commands/vacuum.c:696 +#: commands/vacuum.c:706 #, c-format msgid "Better vacuum them within %d transactions, or you may have a wraparound failure." msgstr "" -#: commands/vacuum.c:785 +#: commands/vacuum.c:795 #, c-format -msgid "skipping \"%s\" --- only table or database owner can VACUUM it" +msgid "skipping \"%s\" --- only table or database owner can vacuum it" msgstr "" -#: commands/vacuum.c:799 +#: commands/vacuum.c:809 #, c-format -msgid "skipping \"%s\" --- cannot VACUUM indexes, views or special system tables" -msgstr "" +msgid "skipping \"%s\" --- cannot vacuum indexes, views, or special system tables" +msgstr "пропускается \"%s\" --- нельзя производить сборку мусора для индексов, видов или специальных системных таблиц" -#: commands/vacuum.c:1058 +#: commands/vacuum.c:1040 #: commands/vacuumlazy.c:205 #, c-format msgid "vacuuming \"%s.%s\"" -msgstr "" +msgstr "производится сборка мусора для \"%s.%s\"" -#: commands/vacuum.c:1093 +#: commands/vacuum.c:1075 #: commands/vacuumlazy.c:263 #, c-format msgid "relation \"%s\" page %u is uninitialized --- fixing" msgstr "" -#: commands/vacuum.c:1210 +#: commands/vacuum.c:1192 #, c-format msgid "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- can't shrink relation" msgstr "" -#: commands/vacuum.c:1223 +#: commands/vacuum.c:1205 #, c-format msgid "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- can't shrink relation" msgstr "" -#: commands/vacuum.c:1385 +#: commands/vacuum.c:1367 #: commands/vacuumlazy.c:428 #, c-format -msgid "\"%s\": found %.0f removable, %.0f nonremovable tuples in %u pages" +msgid "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages" msgstr "" -#: commands/vacuum.c:1388 +#: commands/vacuum.c:1370 #, c-format msgid "" -"%.0f dead tuples cannot be removed yet.\n" -"Nonremovable tuples range from %lu to %lu bytes long.\n" +"%.0f dead row versions cannot be removed yet.\n" +"Nonremovable row versions 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" +"Total free space (including removable row versions) 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/vacuum.c:2391 +#: commands/vacuum.c:2373 #, c-format -msgid "\"%s\": moved %u tuples, truncated %u to %u pages" +msgid "\"%s\": moved %u row versions, truncated %u to %u pages" msgstr "" -#: commands/vacuum.c:2394 +#: commands/vacuum.c:2376 #: commands/vacuumlazy.c:489 #: commands/vacuumlazy.c:774 #: nodes/print.c:87 #: storage/lmgr/deadlock.c:888 -#: tcop/postgres.c:3191 +#: tcop/postgres.c:3199 #, c-format msgid "%s" msgstr "%s" -#: commands/vacuum.c:2578 +#: commands/vacuum.c:2560 #: commands/vacuumlazy.c:771 #, c-format msgid "\"%s\": truncated %u to %u pages" msgstr "" -#: commands/vacuum.c:2670 -#: commands/vacuum.c:2737 +#: commands/vacuum.c:2652 +#: commands/vacuum.c:2719 #: commands/vacuumlazy.c:597 #: commands/vacuumlazy.c:657 #, c-format -msgid "index \"%s\" now contains %.0f tuples in %u pages" +msgid "index \"%s\" now contains %.0f row versions in %u pages" msgstr "" -#: commands/vacuum.c:2674 +#: commands/vacuum.c:2656 #: commands/vacuumlazy.c:601 #, c-format msgid "" @@ -3468,22 +4523,22 @@ msgid "" "%s" msgstr "" -#: commands/vacuum.c:2688 -#: commands/vacuum.c:2757 +#: commands/vacuum.c:2670 +#: commands/vacuum.c:2739 #, c-format -msgid "index \"%s\" contains %.0f tuples, but table contains %.0f tuples" +msgid "index \"%s\" contains %.0f row versions, but table contains %.0f row versions" msgstr "" -#: commands/vacuum.c:2691 -#: commands/vacuum.c:2760 +#: commands/vacuum.c:2673 +#: commands/vacuum.c:2742 msgid "Rebuild the index with REINDEX." -msgstr "" +msgstr "Перестройте индекс с помощью REINDEX." -#: commands/vacuum.c:2741 +#: commands/vacuum.c:2723 #: commands/vacuumlazy.c:661 #, c-format msgid "" -"%.0f index tuples were removed.\n" +"%.0f index row versions were removed.\n" "%u index pages have been deleted, %u are currently reusable.\n" "%s" msgstr "" @@ -3491,7 +4546,7 @@ msgstr "" #: commands/vacuumlazy.c:431 #, c-format msgid "" -"%.0f dead tuples cannot be removed yet.\n" +"%.0f dead row versions cannot be removed yet.\n" "There were %.0f unused item pointers.\n" "%u pages are entirely empty.\n" "%s" @@ -3499,38 +4554,38 @@ msgstr "" #: commands/vacuumlazy.c:486 #, c-format -msgid "\"%s\": removed %d tuples in %d pages" +msgid "\"%s\": removed %d row versions in %d pages" msgstr "" #: commands/variable.c:75 -msgid "invalid list syntax for datestyle" +msgid "invalid list syntax for parameter \"datestyle\"" msgstr "" #: commands/variable.c:161 #, c-format -msgid "unrecognized datestyle keyword: \"%s\"" +msgid "unrecognized \"datestyle\" key word: \"%s\"" msgstr "" #: commands/variable.c:179 -msgid "conflicting datestyle specifications" +msgid "conflicting \"datestyle\" specifications" msgstr "" #: commands/variable.c:450 -msgid "invalid INTERVAL for time zone: month not allowed" +msgid "invalid interval value for time zone: month not allowed" msgstr "" #: commands/variable.c:557 #, c-format -msgid "unrecognized timezone name: \"%s\"" +msgid "unrecognized time zone name: \"%s\"" msgstr "" #: commands/variable.c:565 #, c-format -msgid "timezone \"%s\" appears to use leap seconds" +msgid "time zone \"%s\" appears to use leap seconds" msgstr "" #: commands/variable.c:567 -msgid "PostgreSQL does not support leap seconds" +msgid "PostgreSQL does not support leap seconds." msgstr "" #: commands/variable.c:636 @@ -3544,15 +4599,9 @@ msgid "conversion between %s and %s is not supported" msgstr "" #: commands/view.c:89 -msgid "view must have at least one attribute" +msgid "view must have at least one column" msgstr "" -#: commands/view.c:113 -#: tcop/utility.c:86 -#, c-format -msgid "\"%s\" is not a view" -msgstr "\"%s\" не является видом" - #: commands/view.c:169 #: commands/view.c:181 msgid "cannot change number of columns in view" @@ -3565,135 +4614,129 @@ msgstr "" #: commands/view.c:193 #, c-format -msgid "cannot change datatype of view column \"%s\"" +msgid "cannot change data type of view column \"%s\"" +msgstr "нельзя поменять тип колонки представления \"%s\"" + +#: executor/execMain.c:857 +#, c-format +msgid "cannot change sequence \"%s\"" +msgstr "нельзя изменить последовательность \"%s\"" + +#: executor/execMain.c:863 +#, c-format +msgid "cannot change TOAST relation \"%s\"" +msgstr "нельзя изменить TOAST-связь \"%s\"" + +#: executor/execMain.c:869 +#, c-format +msgid "cannot change view \"%s\"" +msgstr "нельзя измнить вид \"%s\"" + +#: executor/execMain.c:1763 +#, c-format +msgid "null value in column \"%s\" violates not-null constraint" msgstr "" -#: executor/execMain.c:844 +#: executor/execMain.c:1775 #, c-format -msgid "cannot change sequence relation \"%s\"" -msgstr "" - -#: executor/execMain.c:850 -#, c-format -msgid "cannot change toast relation \"%s\"" -msgstr "" - -#: executor/execMain.c:856 -#, c-format -msgid "cannot change view relation \"%s\"" -msgstr "" - -#: executor/execMain.c:1689 -#, c-format -msgid "null value for attribute \"%s\" violates NOT NULL constraint" -msgstr "" - -#: executor/execMain.c:1701 -#, c-format -msgid "new row for relation \"%s\" violates CHECK constraint \"%s\"" +msgid "new row for relation \"%s\" violates check constraint \"%s\"" msgstr "" #: executor/execQual.c:180 #: executor/execQual.c:204 -#: executor/execQual.c:1719 +#: executor/execQual.c:1756 #: 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 "number of array dimensions exceeds the maximum allowed, %d" -msgstr "" +msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)" +msgstr "число размерностей массива (%d) превышает лимит (%d)" -#: executor/execQual.c:500 +#: executor/execQual.c:512 #, c-format msgid "no value found for parameter \"%s\"" msgstr "" -#: executor/execQual.c:505 +#: executor/execQual.c:517 #, c-format msgid "no value found for parameter %d" msgstr "" -#: executor/execQual.c:665 +#: executor/execQual.c:694 msgid "functions and operators can take at most one set argument" msgstr "функции и операторы принимают только один аргумент-множество (set)" -#: executor/execQual.c:717 -#: executor/execQual.c:761 -#: executor/execQual.c:948 -#: executor/execQual.c:2959 +#: executor/execQual.c:746 +#: executor/execQual.c:790 +#: executor/execQual.c:985 +#: executor/execQual.c:2996 #: executor/functions.c:578 #: executor/functions.c:617 #: utils/adt/pgstatfuncs.c:191 #: utils/adt/sets.c:207 -#: utils/fmgr/funcapi.c:38 +#: utils/fmgr/funcapi.c:39 msgid "set-valued function called in context that cannot accept a set" msgstr "" -#: executor/execQual.c:1059 -#: executor/execQual.c:1100 -msgid "function returning tuple cannot return NULL" +#: executor/execQual.c:1096 +#: executor/execQual.c:1137 +msgid "function returning row cannot return null value" +msgstr "функция возвращяющая строку не может возвращать значение NULL" + +#: executor/execQual.c:1101 +msgid "function returning row did not return a valid tuple slot" msgstr "" -#: executor/execQual.c:1064 -msgid "function returning tuple did not return a valid tuple slot" -msgstr "" - -#: executor/execQual.c:1127 +#: executor/execQual.c:1164 msgid "table-function protocol for materialize mode was not followed" msgstr "" -#: executor/execQual.c:1134 +#: executor/execQual.c:1171 #, c-format msgid "unrecognized table-function returnMode: %d" msgstr "" -#: executor/execQual.c:1247 +#: executor/execQual.c:1284 msgid "IS DISTINCT FROM does not support set arguments" msgstr "" -#: executor/execQual.c:1315 +#: executor/execQual.c:1352 msgid "op ANY/ALL (array) does not support set arguments" msgstr "" -#: executor/execQual.c:1705 +#: executor/execQual.c:1742 msgid "cannot merge incompatible arrays" msgstr "" -#: executor/execQual.c:1706 +#: executor/execQual.c:1743 #, c-format msgid "Array with element type %s cannot be included in ARRAY construct with element type %s." msgstr "" -#: executor/execQual.c:1739 +#: executor/execQual.c:1776 msgid "multidimensional arrays must have array expressions with matching dimensions" msgstr "" -#: executor/execQual.c:1849 +#: executor/execQual.c:1886 msgid "NULLIF does not support set arguments" msgstr "" -#: executor/execQual.c:2030 +#: executor/execQual.c:2067 #, c-format -msgid "domain %s does not allow NULL values" +msgid "domain %s does not allow null values" msgstr "" -#: executor/execQual.c:2060 +#: executor/execQual.c:2097 #, c-format -msgid "value for domain %s violates CHECK constraint \"%s\"" -msgstr "" - -#: executor/execQual.c:2417 -#: optimizer/util/clauses.c:411 -#: parser/parse_agg.c:74 -msgid "aggregate function calls may not be nested" +msgid "value for domain %s violates check constraint \"%s\"" msgstr "" #: executor/functions.c:183 #, c-format -msgid "could not determine actual result type for function declared %s" -msgstr "" +msgid "could not determine actual result type for function declared to return type %s" +msgstr "не в состоянии определить реальный тип результата для функции задекларированной возвращать тип %s" #: executor/functions.c:254 #, c-format @@ -3702,7 +4745,7 @@ msgstr "" #: executor/functions.c:673 #, c-format -msgid "SQL function \"%s\" query %d" +msgid "SQL function \"%s\" statement %d" msgstr "SQL-функция \"%s\" запрос %d" #: executor/functions.c:686 @@ -3715,63 +4758,58 @@ msgstr "SQL- msgid "SQL function \"%s\" during startup" msgstr "SQL-функция \"%s\" при старте" -#: executor/nodeAgg.c:1314 +#: executor/nodeAgg.c:1326 #, c-format msgid "aggregate %u needs to have compatible input type and transition type" msgstr "" -#: executor/nodeIndexscan.c:970 -#, c-format -msgid "indexes of relation %u were deactivated" -msgstr "" - -#: executor/nodeFunctionscan.c:93 -msgid "query-specified return tuple and actual function return tuple do not match" +#: executor/nodeFunctionscan.c:92 +msgid "query-specified return row and actual function return row do not match" msgstr "" #: executor/nodeHashjoin.c:561 #: executor/nodeHashjoin.c:571 #, c-format -msgid "read from hashjoin temp file failed: %m" +msgid "could not read from hash-join temporary file: %m" msgstr "" #: executor/nodeHashjoin.c:629 #: executor/nodeHashjoin.c:636 #, c-format -msgid "failed to rewind hashjoin temp file: %m" +msgid "could not rewind hash-join temporary file: %m" msgstr "" #: executor/nodeHashjoin.c:687 #: executor/nodeHashjoin.c:692 #, c-format -msgid "write to hashjoin temp file failed: %m" +msgid "could not write to hash-join temporary file: %m" msgstr "" -#: executor/spi.c:725 +#: executor/spi.c:756 msgid "cannot open multi-query plan as cursor" msgstr "" -#: executor/spi.c:732 +#: executor/spi.c:763 msgid "cannot open non-SELECT query as cursor" msgstr "" -#: executor/spi.c:736 +#: executor/spi.c:767 msgid "cannot open SELECT INTO query as cursor" msgstr "" #: executor/nodeMergejoin.c:1479 -msgid "RIGHT JOIN is only supported with mergejoinable join conditions" +msgid "RIGHT JOIN is only supported with merge-joinable join conditions" msgstr "" #: executor/nodeMergejoin.c:1496 #: optimizer/path/joinpath.c:821 -msgid "FULL JOIN is only supported with mergejoinable join conditions" +msgid "FULL JOIN is only supported with merge-joinable join conditions" msgstr "" #: 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" +#: executor/nodeSubplan.c:967 +msgid "more than one row returned by a subquery used as an expression" msgstr "" #: libpq/be-fsstubs.c:124 @@ -3821,51 +4859,51 @@ msgstr " #: libpq/auth.c:113 #, c-format -msgid "kerberos error: %s" -msgstr "ошибка kerberos: %s" +msgid "Kerberos error: %s" +msgstr "ошибка Kerberos: %s" #: libpq/auth.c:119 #, c-format -msgid "kerberos protocol version \"%s\" != \"%s\"" +msgid "unexpected Kerberos protocol version received from client (received \"%s\", expected \"%s\")" msgstr "" #: libpq/auth.c:126 #: libpq/auth.c:306 #, c-format -msgid "kerberos user name \"%s\" != \"%s\"" +msgid "unexpected Kerberos user name received from client (received \"%s\", expected \"%s\")" msgstr "" #: libpq/auth.c:140 -msgid "kerberos v4 not implemented on this server" +msgid "Kerberos 4 not implemented on this server" msgstr "" #: libpq/auth.c:201 #, c-format -msgid "kerberos init returned error %d" +msgid "Kerberos initialization returned error %d" msgstr "" #: libpq/auth.c:211 #, c-format -msgid "kerberos keytab resolve returned error %d" +msgid "Kerberos keytab resolving returned error %d" msgstr "" #: libpq/auth.c:224 #, c-format -msgid "kerberos sname_to_principal(\"%s\") returned error %d" +msgid "Kerberos sname_to_principal(\"%s\") returned error %d" msgstr "" #: libpq/auth.c:269 #, c-format -msgid "kerberos recvauth returned error %d" +msgid "Kerberos recvauth returned error %d" msgstr "" #: libpq/auth.c:294 #, c-format -msgid "kerberos unparse_name returned error %d" +msgid "Kerberos unparse_name returned error %d" msgstr "" #: libpq/auth.c:327 -msgid "kerberos v5 not implemented on this server" +msgid "Kerberos 5 not implemented on this server" msgstr "" #: libpq/auth.c:394 @@ -3878,7 +4916,7 @@ msgid "missing or erroneous pg_hba.conf file" msgstr "" #: libpq/auth.c:419 -msgid "See postmaster log for details." +msgid "See server log for details." msgstr "" #: libpq/auth.c:445 @@ -3900,158 +4938,159 @@ msgid "no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\"" msgstr "" #: libpq/auth.c:463 -msgid "kerberos 4 only supports IPv4 connections" +msgid "Kerberos 4 only supports IPv4 connections" msgstr "" -#: libpq/auth.c:495 +#: libpq/auth.c:494 #, c-format -msgid "failed to enable credential receipt: %m" +msgid "could not enable credential reception: %m" msgstr "" -#: libpq/auth.c:582 +#: libpq/auth.c:581 #, c-format msgid "error from underlying PAM layer: %s" msgstr "" -#: libpq/auth.c:587 +#: libpq/auth.c:586 #, c-format msgid "unsupported PAM conversation %d/%s" msgstr "" -#: libpq/auth.c:619 +#: libpq/auth.c:618 msgid "empty password returned by client" msgstr "" -#: libpq/auth.c:679 +#: libpq/auth.c:678 #, c-format -msgid "Failed to create PAM authenticator: %s" -msgstr "" +msgid "could not create PAM authenticator: %s" +msgstr "не удалось создать аутентификатор PAM: %s" -#: libpq/auth.c:690 +#: libpq/auth.c:689 #, c-format msgid "pam_set_item(PAM_USER) failed: %s" msgstr "" -#: libpq/auth.c:701 +#: libpq/auth.c:700 #, c-format msgid "pam_set_item(PAM_CONV) failed: %s" msgstr "" -#: libpq/auth.c:712 +#: libpq/auth.c:711 #, c-format msgid "pam_authenticate failed: %s" msgstr "" -#: libpq/auth.c:723 +#: libpq/auth.c:722 #, c-format msgid "pam_acct_mgmt failed: %s" msgstr "" -#: libpq/auth.c:734 +#: libpq/auth.c:733 #, c-format -msgid "failed to release PAM authenticator: %s" +msgid "could not release PAM authenticator: %s" +msgstr "не удалось удалить аутентификатор PAM: %s" + +#: libpq/auth.c:771 +#, c-format +msgid "expected password response, got message type %d" msgstr "" -#: libpq/auth.c:772 -#, c-format -msgid "expected password response, got msg type %d" -msgstr "" - -#: libpq/auth.c:800 +#: libpq/auth.c:799 msgid "invalid password packet size" msgstr "" -#: libpq/auth.c:804 +#: libpq/auth.c:803 msgid "received password packet" msgstr "" #: libpq/be-secure.c:274 -#: libpq/be-secure.c:358 +#: libpq/be-secure.c:359 #, c-format msgid "SSL SYSCALL error: %m" -msgstr "" +msgstr "ошибка SSL SYSCALL: %m" #: libpq/be-secure.c:279 -#: libpq/be-secure.c:363 +#: libpq/be-secure.c:364 msgid "SSL SYSCALL error: EOF detected" -msgstr "" +msgstr "ошибка SSL SYSCALL error: обнаружен конец файла" #: libpq/be-secure.c:287 -#: libpq/be-secure.c:371 +#: libpq/be-secure.c:372 #, c-format msgid "SSL error: %s" msgstr "Ошибка SSL: %s" #: libpq/be-secure.c:296 -#: libpq/be-secure.c:380 -msgid "unrecognized SSL error code" +#: libpq/be-secure.c:381 +#, c-format +msgid "unrecognized SSL error code %d" msgstr "" -#: libpq/be-secure.c:326 -#: libpq/be-secure.c:330 -#: libpq/be-secure.c:340 +#: libpq/be-secure.c:327 +#: libpq/be-secure.c:331 +#: libpq/be-secure.c:341 msgid "SSL renegotiation failure" msgstr "" -#: libpq/be-secure.c:334 +#: libpq/be-secure.c:335 msgid "SSL failed to send renegotiation request" msgstr "" -#: libpq/be-secure.c:632 +#: libpq/be-secure.c:634 #, c-format msgid "could not create SSL context: %s" msgstr "не удалось создать контекст SSL: %s" -#: libpq/be-secure.c:642 +#: libpq/be-secure.c:644 #, c-format msgid "could not load server certificate file \"%s\": %s" msgstr "не удалось загрузить сертификат сервера \"%s\": %s" -#: libpq/be-secure.c:649 +#: libpq/be-secure.c:651 #, c-format msgid "could not access private key file \"%s\": %m" msgstr "" -#: libpq/be-secure.c:655 +#: libpq/be-secure.c:657 #, c-format msgid "unsafe permissions on private key file \"%s\"" msgstr "" -#: libpq/be-secure.c:657 +#: libpq/be-secure.c:659 msgid "File must be owned by the database user and must have no permissions for \"group\" or \"other\"." msgstr "" -#: libpq/be-secure.c:661 +#: libpq/be-secure.c:663 #, c-format msgid "could not load private key file \"%s\": %s" msgstr "" -#: libpq/be-secure.c:666 +#: libpq/be-secure.c:668 #, c-format msgid "check of private key failed: %s" msgstr "" -#: libpq/be-secure.c:684 -#, c-format -msgid "could not load root cert file \"%s\": %s" -msgstr "не получилось загрузить файл корневого сертификата \"%s\": %s" - #: libpq/be-secure.c:686 +#, c-format +msgid "could not load root certificate file \"%s\": %s" +msgstr "не получилось загрузить файла корневых сертификатов \"%s\": %s" + +#: libpq/be-secure.c:688 msgid "Will not verify client certificates." msgstr "" -#: libpq/be-secure.c:721 +#: libpq/be-secure.c:726 #, c-format msgid "could not initialize SSL connection: %s" msgstr "не удалось инициализировать SSL-подсоединение: %s" -#: libpq/be-secure.c:745 +#: libpq/be-secure.c:750 #, c-format -msgid "secure connection from \"%s\"" -msgstr "" +msgid "SSL connection from \"%s\"" +msgstr "SSL подсоединение от \"%s\"" #: libpq/crypt.c:62 -msgid "cannot use CRYPT auth method because password is MD5-encrypted" +msgid "cannot use authentication method \"crypt\" because password is MD5-encrypted" msgstr "" #: libpq/hba.c:129 @@ -4064,100 +5103,93 @@ msgstr "" msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m" msgstr "" -#: libpq/hba.c:666 +#: libpq/hba.c:674 #, c-format -msgid "could not interpret IP address \"%s\" in config file: %s" +msgid "invalid IP address \"%s\" in pg_hba.conf file: %s" msgstr "" -#: libpq/hba.c:742 +#: libpq/hba.c:768 #, c-format msgid "invalid entry in pg_hba.conf file at line %d, token \"%s\"" msgstr "" -#: libpq/hba.c:747 +#: libpq/hba.c:773 #, c-format msgid "missing field in pg_hba.conf file at end of line %d" msgstr "" -#: libpq/hba.c:806 -#: libpq/hba.c:830 -#: storage/smgr/smgr.c:278 -#: utils/init/miscinit.c:775 +#: guc-file.l:164 +#: libpq/hba.c:969 #, c-format -msgid "could not open \"%s\": %m" -msgstr "не получилось отктрыть \"%s\": %m" - -#: libpq/hba.c:949 -#, c-format -msgid "could not open config file \"%s\": %m" +msgid "could not open configuration file \"%s\": %m" msgstr "не получилось отктрыть файл конфигурации \"%s\": %m" -#: libpq/hba.c:1011 +#: libpq/hba.c:1031 #, c-format msgid "invalid entry in pg_ident.conf file at line %d, token \"%s\"" msgstr "" -#: libpq/hba.c:1016 +#: libpq/hba.c:1036 #, c-format msgid "missing entry in pg_ident.conf file at end of line %d" msgstr "" -#: libpq/hba.c:1048 -msgid "cannot use IDENT authentication without usermap field" +#: libpq/hba.c:1068 +msgid "cannot use Ident authentication without usermap field" msgstr "" -#: libpq/hba.c:1096 +#: libpq/hba.c:1116 #, c-format -msgid "could not open usermap file \"%s\": %m" +msgid "could not open Ident usermap file \"%s\": %m" msgstr "" -#: libpq/hba.c:1267 +#: libpq/hba.c:1287 #, c-format -msgid "could not create socket for IDENT connection: %m" -msgstr "" +msgid "could not create socket for Ident connection: %m" +msgstr "не получилось создать сокет для Ident-подсоединения: %m" -#: libpq/hba.c:1283 +#: libpq/hba.c:1303 #, c-format msgid "could not bind to local address \"%s\": %m" msgstr "" -#: libpq/hba.c:1295 -#, c-format -msgid "could not connect to IDENT server at address \"%s\", port %s): %m" -msgstr "" - #: libpq/hba.c:1315 #, c-format -msgid "could not send query to IDENT server at address \"%s\", port %s): %m" -msgstr "" +msgid "could not connect to Ident server at address \"%s\", port %s: %m" +msgstr "не получилось подсоединиться к Ident-серверу с адресом \"%s\", порт %s: %m" -#: libpq/hba.c:1330 +#: libpq/hba.c:1335 #, c-format -msgid "could not receive response from IDENT server at address \"%s\", port %s): %m" -msgstr "" +msgid "could not send query to Ident server at address \"%s\", port %s: %m" +msgstr "не получилось отправить запрос к Ident-серверу с адресом \"%s\", порт %s: %m" -#: libpq/hba.c:1371 -#: libpq/hba.c:1402 -#: libpq/hba.c:1470 +#: libpq/hba.c:1350 #, c-format -msgid "could not receive credentials: %m" +msgid "could not receive response from Ident server at address \"%s\", port %s: %m" msgstr "" -#: libpq/hba.c:1380 -#: libpq/hba.c:1411 -#: libpq/hba.c:1481 +#: libpq/hba.c:1391 +#: libpq/hba.c:1422 +#: libpq/hba.c:1490 #, c-format -msgid "local user with uid %d is not known to getpwuid" +msgid "could not get peer credentials: %m" msgstr "" -#: libpq/hba.c:1493 -msgid "IDENT auth is not supported on local connections on this platform" +#: libpq/hba.c:1400 +#: libpq/hba.c:1431 +#: libpq/hba.c:1501 +#, c-format +msgid "local user with ID %d does not exist" +msgstr "локальный пользователь с ID %d не существует" + +#: libpq/hba.c:1513 +msgid "Ident authentication is not supported on local connections on this platform" msgstr "" #: libpq/pqcomm.c:248 #, c-format -msgid "could not translate hostname \"%s\", service \"%s\" to address: %s" -msgstr "" +msgid "could not translate host name \"%s\", service \"%s\" to address: %s" +msgstr "не получилось перевести имя хоста \"%s\", сервис \"%s\" в адрес: %s" #: libpq/pqcomm.c:252 #, c-format @@ -4205,7 +5237,7 @@ msgstr "" #: libpq/pqcomm.c:358 #, c-format -msgid "Is another postmaster already running on port %d? If not, remove socket node \"%s\" and retry." +msgid "Is another postmaster already running on port %d? If not, remove socket file \"%s\" and retry." msgstr "" #: libpq/pqcomm.c:361 @@ -4221,13 +5253,13 @@ msgstr "" #: libpq/pqcomm.c:485 #, c-format -msgid "could not set group of \"%s\": %m" -msgstr "не получилось установить группу \"%s\": %m" +msgid "could not set group of file \"%s\": %m" +msgstr "не получилось установить группу файла \"%s\": %m" #: libpq/pqcomm.c:496 #, c-format -msgid "could not set permissions of \"%s\": %m" -msgstr "не получилось установить права доступа для \"%s\": %m" +msgid "could not set permissions of file \"%s\": %m" +msgstr "не получилось установить права доступа для файла \"%s\": %m" #: libpq/pqcomm.c:526 #, c-format @@ -4280,817 +5312,61 @@ msgstr "" msgid "%s: setsysinfo failed: %s\n" msgstr "" -#: main/main.c:176 +#: main/main.c:175 msgid "" "\"root\" execution of the PostgreSQL server is not permitted.\n" -"The server must be started under an unprivileged user id to prevent\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 "" -#: main/main.c:197 +#: main/main.c:196 #, c-format -msgid "%s: real and effective user ids must match\n" +msgid "%s: real and effective user IDs must match\n" msgstr "" -#: main/main.c:242 +#: main/main.c:240 #, c-format -msgid "%s: invalid effective uid: %d\n" +msgid "%s: invalid effective UID: %d\n" msgstr "" -#: main/main.c:255 +#: main/main.c:253 #, c-format -msgid "%s: GetUserName failed\n" +msgid "%s: could not determine user name (GetUserName failed)\n" +msgstr "" + +#: optimizer/plan/initsplan.c:282 +#: optimizer/prep/prepjointree.c:365 +msgid "UNION JOIN is not implemented" msgstr "" #: optimizer/path/allpaths.c:214 -msgid "SELECT FOR UPDATE is not supported for inherit queries" +msgid "SELECT FOR UPDATE is not supported for inheritance queries" msgstr "" -#: optimizer/plan/initsplan.c:101 -msgid "SELECT FOR UPDATE cannot be applied to a join" +#: optimizer/plan/initsplan.c:339 +msgid "SELECT FOR UPDATE cannot be applied to the nullable side of an outer join" msgstr "" -#: optimizer/plan/initsplan.c:290 -#: optimizer/prep/prepjointree.c:340 -msgid "UNION JOIN is not implemented yet" -msgstr "" - -#: optimizer/plan/initsplan.c:347 -msgid "SELECT FOR UPDATE cannot be applied to the nullable side of an OUTER JOIN" -msgstr "" - -#: optimizer/plan/initsplan.c:763 +#: optimizer/plan/initsplan.c:755 #, c-format msgid "could not identify an equality operator for types %s and %s" msgstr "" -#: optimizer/plan/initsplan.c:776 +#: optimizer/plan/initsplan.c:768 #, c-format -msgid "equality operator for types %s and %s should be mergejoinable, but isn't" -msgstr "" - -#: 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" +msgid "equality operator for types %s and %s should be merge-joinable, but isn't" msgstr "" #: optimizer/plan/planner.c:657 -msgid "SELECT FOR UPDATE is not allowed in subselects" +msgid "SELECT FOR UPDATE is not allowed in subqueries" msgstr "" -#: optimizer/util/clauses.c:2037 +#: optimizer/util/clauses.c:2047 #, c-format msgid "SQL function \"%s\" during inlining" msgstr "" -#: parser/parse_clause.c:336 -#, c-format -msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN" -msgstr "" - -#: parser/parse_clause.c:396 -msgid "sub-select in FROM must have an alias" -msgstr "" - -#: parser/parse_clause.c:419 -msgid "sub-select in FROM may not have SELECT INTO" -msgstr "" - -#: parser/parse_clause.c:441 -msgid "sub-select in FROM may not refer to other relations of same query level" -msgstr "" - -#: parser/parse_clause.c:496 -msgid "function expression in FROM may not refer to other relations of same query level" -msgstr "" - -#: parser/parse_clause.c:508 -msgid "cannot use aggregate function in function expression in FROM" -msgstr "" - -#: parser/parse_clause.c:728 -#, c-format -msgid "USING column name \"%s\" appears more than once" -msgstr "" - -#: parser/parse_clause.c:743 -#, c-format -msgid "common column name \"%s\" appears more than once in left table" -msgstr "" - -#: parser/parse_clause.c:752 -#, c-format -msgid "JOIN/USING column \"%s\" not found in left table" -msgstr "" - -#: parser/parse_clause.c:766 -#, c-format -msgid "common column name \"%s\" appears more than once in right table" -msgstr "" - -#: parser/parse_clause.c:775 -#, c-format -msgid "JOIN/USING column \"%s\" not found in right table" -msgstr "" - -#: parser/parse_clause.c:827 -#, c-format -msgid "column alias list for \"%s\" has too many entries" -msgstr "" - -#. translator: %s is name of a SQL construct, eg LIMIT -#: parser/parse_clause.c:1020 -#, c-format -msgid "argument of %s must not contain variables" -msgstr "" - -#. translator: %s is name of a SQL construct, eg LIMIT -#: parser/parse_clause.c:1028 -#, c-format -msgid "argument of %s must not contain aggregates" -msgstr "" - -#. translator: %s is name of a SQL construct, eg LIMIT -#: parser/parse_clause.c:1036 -#, c-format -msgid "argument of %s must not contain sub-selects" -msgstr "" - -#: parser/parse_clause.c:1142 -#, c-format -msgid "%s \"%s\" is ambiguous" -msgstr "" - -#. translator: %s is name of a SQL construct, eg ORDER BY -#: parser/parse_clause.c:1164 -#, c-format -msgid "non-integer constant in %s" -msgstr "" - -#. translator: %s is name of a SQL construct, eg ORDER BY -#: parser/parse_clause.c:1181 -#, c-format -msgid "%s position %d is not in target list" -msgstr "" - -#: parser/parse_clause.c:1366 -msgid "for SELECT DISTINCT, ORDER BY expressions must appear in target list" -msgstr "для SELECT DISTINCT, выражения ORDER BY обязаны быть в списке назназчения" - -#: 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:364 -msgid "CREATE VIEW specifies more column names than columns" -msgstr "CREATE VIEW указывает больше имён колонок чем имеется" - -#: parser/analyze.c:574 -msgid "INSERT ... SELECT may not specify INTO" -msgstr "INSERT ... SELECT не могут указывать INTO" - -#: parser/analyze.c:666 -msgid "INSERT has more expressions than target columns" -msgstr "" - -#: parser/analyze.c:687 -msgid "INSERT has more target columns than expressions" -msgstr "" - -#: parser/analyze.c:973 -#, c-format -msgid "%s will create implicit sequence \"%s\" for SERIAL column \"%s.%s\"" -msgstr "" - -#: parser/analyze.c:1057 -#: parser/analyze.c:1067 -#, c-format -msgid "conflicting NULL/NOT NULL declarations for \"%s.%s\"" -msgstr "" - -#: parser/analyze.c:1077 -#, c-format -msgid "multiple DEFAULT values specified for \"%s.%s\"" -msgstr "" - -#: parser/analyze.c:1322 -#, c-format -msgid "multiple primary keys for table \"%s\" are not allowed" -msgstr "" - -#: parser/analyze.c:1393 -#, c-format -msgid "inherited table \"%s\" is not a relation" -msgstr "" - -#. translator: second %s is PRIMARY KEY or UNIQUE -#: parser/analyze.c:1453 -#, c-format -msgid "column \"%s\" appears twice in %s constraint" -msgstr "" - -#: parser/analyze.c:1547 -#, c-format -msgid "%s / %s%s will create implicit index \"%s\" for table \"%s\"" -msgstr "%s / %s%s создаст подразумеваемый индекс \"%s\" для таблицы \"%s\"" - -#: 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:1656 -msgid "index expression may not return a set" -msgstr "" - -#: parser/analyze.c:1748 -msgid "rule WHERE condition may not contain references to other relations" -msgstr "" - -#: parser/analyze.c:1754 -msgid "rule WHERE condition may not contain aggregate functions" -msgstr "" - -#: parser/analyze.c:1825 -msgid "rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE actions" -msgstr "" - -#: 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: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 "нельзя использовать NEW в правиле ON SELECT" - -#: parser/analyze.c:1875 -msgid "ON INSERT rule may not use OLD" -msgstr "нельзя использовать OLD в правиле ON INSERT" - -#: parser/analyze.c:1881 -msgid "ON DELETE rule may not use NEW" -msgstr "нельзя использовать NEW в правиле ON DELETE" - -#: 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:2247 -msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT" -msgstr "" - -#: parser/analyze.c:2308 -msgid "UNION/INTERSECT/EXCEPT member statement may not refer to other relations of same query level" -msgstr "" - -#: parser/analyze.c:2361 -#, c-format -msgid "each %s query must have the same number of columns" -msgstr "" - -#: parser/analyze.c:2431 -msgid "CREATE TABLE AS specifies too many column names" -msgstr "CREATE TABLE AS указывает слишком много имён для колонки" - -#: parser/analyze.c:2664 -msgid "cannot specify both SCROLL and NO SCROLL" -msgstr "" - -#: parser/analyze.c:2750 -#, c-format -msgid "wrong number of parameters for prepared statement \"%s\"" -msgstr "" - -#: parser/analyze.c:2752 -#, c-format -msgid "Expected %d parameters but got %d." -msgstr "" - -#: parser/analyze.c:2767 -msgid "cannot use sub-select in EXECUTE parameter" -msgstr "" - -#: parser/analyze.c:2771 -msgid "cannot use aggregate in EXECUTE parameter" -msgstr "" - -#: parser/analyze.c:2784 -#, c-format -msgid "parameter $%d of type %s cannot be coerced to the expected type %s" -msgstr "" - -#: parser/analyze.c:2811 -msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause" -msgstr "" - -#: parser/analyze.c:2815 -msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause" -msgstr "" - -#: parser/analyze.c:2819 -msgid "SELECT FOR UPDATE is not allowed with AGGREGATE" -msgstr "" - -#: parser/analyze.c:2886 -#, c-format -msgid "relation \"%s\" in FOR UPDATE clause not found in FROM clause" -msgstr "" - -#: parser/analyze.c:2978 -msgid "misplaced DEFERRABLE clause" -msgstr "" - -#: parser/analyze.c:2982 -#: parser/analyze.c:2995 -msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed" -msgstr "" - -#: parser/analyze.c:2991 -msgid "misplaced NOT DEFERRABLE clause" -msgstr "" - -#: parser/analyze.c:3002 -#: parser/analyze.c:3026 -msgid "INITIALLY DEFERRED constraint must be DEFERRABLE" -msgstr "" - -#: parser/analyze.c:3009 -msgid "misplaced INITIALLY DEFERRED clause" -msgstr "" - -#: parser/analyze.c:3013 -#: parser/analyze.c:3037 -msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed" -msgstr "" - -#: parser/analyze.c:3033 -msgid "misplaced INITIALLY IMMEDIATE clause" -msgstr "" - -#: parser/analyze.c:3146 -#: parser/analyze.c:3167 -#, c-format -msgid "CREATE specifies a schema (%s) different from the one being created (%s)" -msgstr "" - -#: parser/analyze.c:3221 -#: parser/parse_coerce.c:237 -#: parser/parse_expr.c:136 -#: parser/parse_expr.c:142 -#, c-format -msgid "there is no parameter $%d" -msgstr "" - -#: parser/analyze.c:3226 -#: tcop/postgres.c:1144 -#, c-format -msgid "could not determine datatype of parameter $%d" -msgstr "" - -#: parser/parse_agg.c:120 -msgid "aggregates not allowed in WHERE clause" -msgstr "" - -#: parser/parse_agg.c:124 -msgid "aggregates not allowed in JOIN conditions" -msgstr "" - -#: parser/parse_agg.c:145 -msgid "aggregates not allowed in GROUP BY clause" -msgstr "" - -#: parser/parse_agg.c:305 -#, c-format -msgid "attribute \"%s.%s\" must be GROUPed or used in an aggregate function" -msgstr "" - -#: parser/parse_agg.c:310 -#, c-format -msgid "sub-select uses un-GROUPed attribute \"%s.%s\" from outer query" -msgstr "" - -#: parser/parse_coerce.c:253 -#, c-format -msgid "inconsistent types deduced for parameter $%d" -msgstr "" - -#. translator: first %s is name of a SQL construct, eg WHERE -#: parser/parse_coerce.c:579 -#, c-format -msgid "argument of %s must be type boolean, not type %s" -msgstr "тип аргумента конструкции %s должен быть boolean, а не %s" - -#. translator: %s is name of a SQL construct, eg WHERE -#: parser/parse_coerce.c:587 -#: parser/parse_coerce.c:626 -#, c-format -msgid "argument of %s must not return a set" -msgstr "" - -#. translator: first %s is name of a SQL construct, eg LIMIT -#: parser/parse_coerce.c:618 -#, c-format -msgid "argument of %s must be type integer, not type %s" -msgstr "тип аргумента конструкции %s должен быть integer, а не %s" - -#: parser/parse_coerce.c:679 -#, c-format -msgid "%s types %s and %s cannot be matched" -msgstr "%s типы %s и %s не совпадают" - -#. translator: first %s is name of a SQL construct, eg CASE -#: parser/parse_coerce.c:741 -#, c-format -msgid "%s could not convert type %s to %s" -msgstr "%s не в состоянии сконвертировать тип %s в %s" - -#: parser/parse_coerce.c:900 -msgid "arguments declared ANYELEMENT are not all alike" -msgstr "" - -#: parser/parse_coerce.c:917 -msgid "arguments declared ANYARRAY are not all alike" -msgstr "" - -#: parser/parse_coerce.c:939 -#: parser/parse_coerce.c:1050 -#: parser/parse_coerce.c:1077 -#, c-format -msgid "argument declared ANYARRAY is not an array but %s" -msgstr "" - -#: parser/parse_coerce.c:955 -msgid "argument declared ANYARRAY is not consistent with argument declared ANYELEMENT" -msgstr "" - -#: parser/parse_coerce.c:966 -msgid "could not determine ANYARRAY/ANYELEMENT type because input is UNKNOWN" -msgstr "" - -#: 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 "could not find array type for datatype %s" -msgstr "" - -#: parser/parse_relation.c:174 -#: parser/parse_relation.c:189 -#, c-format -msgid "table reference \"%s\" is ambiguous" -msgstr "" - -#: parser/parse_relation.c:249 -#: parser/parse_relation.c:264 -#, c-format -msgid "table reference %u is ambiguous" -msgstr "" - -#: parser/parse_relation.c:356 -#: parser/parse_relation.c:368 -#, c-format -msgid "table name \"%s\" specified more than once" -msgstr "имя таблицы \"%s\" указано больше одного раза" - -#: parser/parse_relation.c:477 -#: parser/parse_relation.c:573 -#, c-format -msgid "column reference \"%s\" is ambiguous" -msgstr "" - -#: parser/parse_relation.c:668 -#: parser/parse_relation.c:763 -#: parser/parse_relation.c:858 -#: parser/parse_relation.c:978 -#, c-format -msgid "table \"%s\" has %d columns available but %d columns specified" -msgstr "" - -#: parser/parse_relation.c:935 -msgid "a column definition list is only allowed for functions returning RECORD" -msgstr "" - -#: parser/parse_relation.c:946 -msgid "a column definition list is required for functions returning RECORD" -msgstr "" - -#: parser/parse_relation.c:1007 -#, c-format -msgid "too many column aliases specified for function %s" -msgstr "" - -#: parser/parse_relation.c:1030 -#, c-format -msgid "function \"%s\" in FROM has unsupported return type" -msgstr "" - -#: parser/parse_relation.c:1422 -#: parser/parse_relation.c:1666 -msgid "function in FROM has unsupported return type" -msgstr "" - -#: parser/parse_relation.c:1910 -#, c-format -msgid "missing FROM-clause entry in subquery for table \"%s\"" -msgstr "отсутсвует запись о FROM-выражении в подзапросе для таблицы \"%s\"" - -#: parser/parse_relation.c:1915 -#, c-format -msgid "missing FROM-clause entry for table \"%s\"" -msgstr "отсутсвует запись о FROM-выражении для таблицы \"%s\"" - -#: parser/parse_relation.c:1934 -#, c-format -msgid "adding missing FROM-clause entry in subquery for table \"%s\"" -msgstr "добавление отсутсвующей записи о FROM-выражении в подзапросе для таблицы \"%s\"" - -#: parser/parse_relation.c:1939 -#, c-format -msgid "adding missing FROM-clause entry for table \"%s\"" -msgstr "добавление отсутсвующей записи о FROM-выражении для таблицы \"%s\"" - -#: parser/parse_expr.c:105 -msgid "expression too complex" -msgstr "слишком сложное выражение" - -#: parser/parse_expr.c:106 -#, c-format -msgid "Nesting depth exceeds MAX_EXPR_DEPTH = %d." -msgstr "" - -#: parser/parse_expr.c:351 -msgid "IS DISTINCT FROM requires = operator to yield boolean" -msgstr "" - -#: parser/parse_expr.c:374 -msgid "NULLIF requires = operator to yield boolean" -msgstr "" - -#: parser/parse_expr.c:496 -msgid "sub-select must return a column" -msgstr "" - -#: parser/parse_expr.c:502 -msgid "sub-select must return only one column" -msgstr "" - -#: parser/parse_expr.c:558 -#, c-format -msgid "row comparison cannot use operator %s" -msgstr "" - -#: parser/parse_expr.c:585 -msgid "sub-select has too many columns" -msgstr "слишком много колонок а подзапросе" - -#: parser/parse_expr.c:603 -#, c-format -msgid "operator %s must return boolean, not type %s" -msgstr "оператор %s должен возвращать тип boolean, а не %s" - -#: parser/parse_expr.c:606 -#: parser/parse_expr.c:613 -msgid "The operator of a quantified predicate subquery must return boolean." -msgstr "" - -#: parser/parse_expr.c:611 -#, c-format -msgid "operator %s must not return a set" -msgstr "" - -#: parser/parse_expr.c:623 -msgid "sub-select has too few columns" -msgstr "" - -#: parser/parse_expr.c:1033 -#, c-format -msgid "attribute \"%s\" not found" -msgstr "атрибут \"%s\" не найден" - -#: parser/parse_expr.c:1322 -#, c-format -msgid "relation reference \"%s\" cannot be used in an expression" -msgstr "" - -#: parser/parse_expr.c:1530 -#, c-format -msgid "cannot cast type %s to %s" -msgstr "нельзя конвертировать тип %s в %s" - -#: parser/parse_func.c:89 -#, c-format -msgid "cannot pass more than %d arguments to a function" -msgstr "число аргументов функции не может быть более %d" - -#: parser/parse_func.c:224 -#, c-format -msgid "cannot pass result of sub-select or join %s to a function" -msgstr "" - -#: parser/parse_func.c:265 -#, c-format -msgid "%s(*) specified, but %s is not an aggregate function" -msgstr "" - -#: parser/parse_func.c:271 -#, c-format -msgid "DISTINCT specified, but %s is not an aggregate function" -msgstr "" - -#: parser/parse_func.c:296 -#, c-format -msgid "attribute notation .%s applied to type %s, which is not a complex type" -msgstr "" - -#: parser/parse_func.c:301 -#, c-format -msgid "attribute \"%s\" not found in datatype %s" -msgstr "атрибут \"%s\" не найден в типе %s" - -#: parser/parse_func.c:311 -#, c-format -msgid "function %s is not unique" -msgstr "функция %s не уникальна" - -#: parser/parse_func.c:314 -msgid "Could not choose a best candidate function. You may need to add explicit typecasts." -msgstr "" - -#: 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_func.c:371 -msgid "aggregates may not return sets" -msgstr "" - -#: parser/parse_func.c:1353 -#, c-format -msgid "no such attribute %s.%s.%s" -msgstr "%s.%s.%s: нет такого атрибута" - -#: parser/parse_func.c:1358 -#, c-format -msgid "no such attribute %s.%s" -msgstr "%s.%s: нет такого атрибута" - -#: parser/parse_func.c:1428 -#, c-format -msgid "aggregate %s(*) does not exist" -msgstr "агрегат %s(*) не существует" - -#: parser/parse_func.c:1433 -#, c-format -msgid "aggregate %s(%s) does not exist" -msgstr "агрегат %s(%s) не существует" - -#: parser/parse_func.c:1454 -#, c-format -msgid "function %s(%s) is not an aggregate" -msgstr "функция %s(%s) не является агрегатом" - -#: parser/parse_node.c:124 -#, c-format -msgid "cannot subscript type %s because it is not an array" -msgstr "" - -#: parser/parse_node.c:183 -#: parser/parse_node.c:206 -msgid "array subscript must have type integer" -msgstr "" - -#: parser/parse_node.c:228 -#, c-format -msgid "array assignment requires type %s but expression is of type %s" -msgstr "" - -#: parser/parse_oper.c:84 -#: parser/parse_oper.c:761 -#, c-format -msgid "operator does not exist: %s" -msgstr "оператор не существует: %s" - -#: parser/parse_oper.c:185 -#: utils/adt/arrayfuncs.c:2397 -#: utils/adt/ri_triggers.c:3436 -#, c-format -msgid "could not identify an equality operator for type %s" -msgstr "" - -#: parser/parse_oper.c:249 -#: parser/parse_oper.c:314 -#, c-format -msgid "could not identify an ordering operator for type %s" -msgstr "" - -#: parser/parse_oper.c:251 -#: parser/parse_oper.c:316 -msgid "Use an explicit ordering operator or modify the query." -msgstr "" - -#: parser/parse_oper.c:560 -#, c-format -msgid "operator requires run-time type coercion: %s" -msgstr "" - -#: parser/parse_oper.c:754 -#, c-format -msgid "operator is not unique: %s" -msgstr "" - -#: parser/parse_oper.c:756 -msgid "Could not choose a best candidate operator. You may need to add explicit typecasts." -msgstr "" - -#: 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_oper.c:853 -msgid "op ANY/ALL (array) requires array on right side" -msgstr "" - -#: parser/parse_oper.c:882 -msgid "op ANY/ALL (array) requires operator to yield boolean" -msgstr "" - -#: parser/parse_oper.c:886 -msgid "op ANY/ALL (array) requires operator not to return a set" -msgstr "" - -#: parser/parse_oper.c:896 -#, c-format -msgid "could not find datatype for array of %s" -msgstr "" - -#: parser/parse_target.c:66 -#, c-format -msgid "relation reference \"%s\" cannot be used as a targetlist entry" -msgstr "" - -#: parser/parse_target.c:68 -#, c-format -msgid "Write \"%s\".* to denote all the columns of the relation." -msgstr "" - -#: parser/parse_target.c:331 -#, c-format -msgid "cannot assign to system attribute \"%s\"" -msgstr "нельзя присвоить значение системному атрибуту \"%s\"" - -#: parser/parse_target.c:353 -msgid "cannot set an array element to DEFAULT" -msgstr "" - -#: parser/parse_target.c:420 -#, c-format -msgid "column \"%s\" is of type %s but expression is of type %s" -msgstr "" - -#: parser/parse_target.c:555 -msgid "SELECT * with no tables specified is not valid" -msgstr "" - -#: parser/parse_type.c:62 -#, c-format -msgid "improper %%TYPE reference (too few dotted names): %s" -msgstr "" - -#: parser/parse_type.c:83 -#, c-format -msgid "improper %%TYPE reference (too many dotted names): %s" -msgstr "" - -#: parser/parse_type.c:103 -#, c-format -msgid "type reference %s converted to %s" -msgstr "" - -#: parser/parse_type.c:206 -#: parser/parse_type.c:237 -#, c-format -msgid "type \"%s\" is only a shell" -msgstr "тип \"%s\" является только оболочкой" - -#: parser/parse_type.c:507 -#, c-format -msgid "invalid type name \"%s\"" -msgstr "неверное имя типа \"%s\"" - #: port/pg_sema.c:117 #: port/sysv_sema.c:117 #, c-format @@ -5100,7 +5376,7 @@ msgstr " #: port/pg_sema.c:118 #: port/sysv_sema.c:118 #, c-format -msgid "Failed syscall was semget(%d, %d, 0%o)." +msgid "Failed system call was semget(%d, %d, 0%o)." msgstr "" #: port/pg_sema.c:122 @@ -5127,14 +5403,14 @@ msgstr "" #: port/pg_shmem.c:93 #: port/sysv_shmem.c:93 #, c-format -msgid "Failed syscall was shmget(key=%d, size=%u, 0%o)." +msgid "Failed system call was shmget(key=%d, size=%u, 0%o)." msgstr "" #: port/pg_shmem.c:97 #: port/sysv_shmem.c:97 #, c-format 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" +"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 "" @@ -5172,29 +5448,31 @@ msgstr "" #: postmaster/postmaster.c:349 msgid "Permissions should be u=rwx (0700)." -msgstr "" +msgstr "Права должны быть: u=rwx (0700)." #: postmaster/postmaster.c:361 #, c-format msgid "" -"%s could not find the database system.\n" -"Expected to find it in the PGDATA directory \"%s\",\n" -"but failed to open file \"%s\": %s\n" +"%s: could not find the database system\n" +"Expected to find it in the directory \"%s\",\n" +"but could not open file \"%s\": %s\n" msgstr "" -"Модуль %s не нашёл систему баз данных.\n" -"Система ожидалась в PGDATA дириктории - \"%s\",\n" +"%s: не найдена система баз данных\n" +"Ожидалось найти её в дириктории \"%s\",\n" "но не получилось открыть файл \"%s\": %s\n" #: postmaster/postmaster.c:459 -#: tcop/postgres.c:2114 +#: tcop/postgres.c:2113 msgid "assert checking is not compiled in" msgstr "" #: postmaster/postmaster.c:585 #: postmaster/postmaster.c:598 +#: tcop/postgres.c:2565 +#: tcop/postgres.c:2581 #, c-format -msgid "Try '%s --help' for more information.\n" -msgstr "Наберите '%s --help' для более детальной информации.\n" +msgid "Try \"%s --help\" for more information.\n" +msgstr "Наберите \"%s --help\" для более детальной информации.\n" #: postmaster/postmaster.c:596 #, c-format @@ -5214,13 +5492,13 @@ msgid "invalid datetoken tables, please fix" msgstr "" #: postmaster/postmaster.c:674 -#: tcop/postgres.c:2591 +#: tcop/postgres.c:2599 #, c-format msgid "%s: could not locate postgres executable" msgstr "" #: postmaster/postmaster.c:683 -msgid "for SSL, TCP/IP connections must be enabled" +msgid "TCP/IP connections must be enabled for SSL" msgstr "" #: postmaster/postmaster.c:757 @@ -5233,20 +5511,20 @@ msgid "could not create TCP/IP listen socket" msgstr "" #: postmaster/postmaster.c:800 -msgid "could not create UNIX stream port" -msgstr "" +msgid "could not create Unix-domain socket" +msgstr "не получилось создать сокет домена UNIX" -#: postmaster/postmaster.c:920 +#: postmaster/postmaster.c:926 #, c-format msgid "could not fork background process: %s" msgstr "" -#: postmaster/postmaster.c:942 +#: postmaster/postmaster.c:948 #, c-format -msgid "could not disassociate from controlling TTY: %s" +msgid "could not dissociate from controlling TTY: %s" msgstr "" -#: postmaster/postmaster.c:962 +#: postmaster/postmaster.c:968 #, c-format msgid "" "%s is the PostgreSQL server.\n" @@ -5255,7 +5533,7 @@ msgstr "" "%s является PostgreSQL сервером.\n" "\n" -#: postmaster/postmaster.c:963 +#: postmaster/postmaster.c:969 #, c-format msgid "" "Usage:\n" @@ -5266,75 +5544,84 @@ msgstr "" " %s [ОПЦИЯ]...\n" "\n" -#: postmaster/postmaster.c:964 +#: postmaster/postmaster.c:970 +#: tcop/postgres.c:1976 msgid "Options:\n" msgstr "Опции:\n" -#: postmaster/postmaster.c:966 +#: postmaster/postmaster.c:972 +#: tcop/postgres.c:1978 msgid " -A 1|0 enable/disable run-time assert checking\n" msgstr " -A 1|0 включить/выключить проверку исключительных ситуаций\n" -#: postmaster/postmaster.c:968 +#: postmaster/postmaster.c:974 +#: tcop/postgres.c:1980 msgid " -B NBUFFERS number of shared buffers\n" msgstr " -B ЧБУФЕРОВ число общих буферов\n" -#: postmaster/postmaster.c:969 +#: postmaster/postmaster.c:975 +#: tcop/postgres.c:1981 msgid " -c NAME=VALUE set run-time parameter\n" msgstr " -c ИМЯ=ЗНАЧ. установить параметр выполнения (run-time)\n" -#: postmaster/postmaster.c:970 +#: postmaster/postmaster.c:976 msgid " -d 1-5 debugging level\n" msgstr " -d 1-5 уровень отладки\n" -#: postmaster/postmaster.c:971 +#: postmaster/postmaster.c:977 +#: tcop/postgres.c:1983 msgid " -D DATADIR database directory\n" msgstr " -D ДИРДАННЫХ директория с данными\n" -#: postmaster/postmaster.c:972 +#: postmaster/postmaster.c:978 +#: tcop/postgres.c:1986 msgid " -F turn fsync off\n" msgstr " -F выуключить fsync\n" -#: postmaster/postmaster.c:973 +#: postmaster/postmaster.c:979 msgid " -h HOSTNAME host name or IP address to listen on\n" msgstr " -h ХОСТ имя хоста или IP-адрес для прослушивания\n" -#: postmaster/postmaster.c:974 +#: postmaster/postmaster.c:980 msgid " -i enable TCP/IP connections\n" msgstr " -i подключить TCP/IP соединения\n" -#: postmaster/postmaster.c:975 +#: postmaster/postmaster.c:981 msgid " -k DIRECTORY Unix-domain socket location\n" msgstr " -k ДИРЕКТОРИЯ Местонахождния unix-domain сокетов\n" -#: postmaster/postmaster.c:977 +#: postmaster/postmaster.c:983 msgid " -l enable SSL connections\n" msgstr " -l включить SSL-подсоединения\n" -#: postmaster/postmaster.c:979 +#: postmaster/postmaster.c:985 msgid " -N MAX-CONNECT maximum number of allowed connections\n" msgstr " -N MAX-CONNECT максимально доступное число подсоединений\n" -#: postmaster/postmaster.c:980 -msgid " -o OPTIONS pass 'OPTIONS' to each backend server\n" -msgstr " -o ОПЦИИ передать 'ОПЦИИ' каждому бэк-енду (серверу)\n" +#: postmaster/postmaster.c:986 +msgid " -o OPTIONS pass \"OPTIONS\" to each server process\n" +msgstr " -o ОПЦИИ передать \"ОПЦИИ\" каждому процессу-серверу\n" -#: postmaster/postmaster.c:981 +#: postmaster/postmaster.c:987 msgid " -p PORT port number to listen on\n" msgstr " -p ПОРТ номер порта для прослушивания\n" -#: postmaster/postmaster.c:982 +#: postmaster/postmaster.c:988 msgid " -S silent mode (start in background without logging output)\n" msgstr " -S тихий режим (запустить на заднем плане без логов результатов)\n" -#: postmaster/postmaster.c:983 +#: postmaster/postmaster.c:989 +#: tcop/postgres.c:1993 msgid " --help show this help, then exit\n" msgstr " --help показать эту подсказку и выйти\n" -#: postmaster/postmaster.c:984 +#: postmaster/postmaster.c:990 +#: tcop/postgres.c:1994 msgid " --version output version information, then exit\n" msgstr " --version показать версию и выйти\n" -#: postmaster/postmaster.c:986 +#: postmaster/postmaster.c:992 +#: tcop/postgres.c:1995 msgid "" "\n" "Developer options:\n" @@ -5342,15 +5629,15 @@ msgstr "" "\n" "Опции разработчика:\n" -#: postmaster/postmaster.c:987 +#: postmaster/postmaster.c:993 msgid " -n do not reinitialize shared memory after abnormal exit\n" msgstr " -n не переинициализировать общую память после ненормального завершения\n" -#: postmaster/postmaster.c:988 +#: postmaster/postmaster.c:994 msgid " -s send SIGSTOP to all backend servers if one dies\n" msgstr " -s послать сигнал SIGSTOP всем бэк-ендам (серверам) езли один из них падает\n" -#: postmaster/postmaster.c:990 +#: postmaster/postmaster.c:996 msgid "" "\n" "Please read the documentation for the complete list of run-time\n" @@ -5360,334 +5647,339 @@ msgid "" "Report bugs to .\n" msgstr "" -#: postmaster/postmaster.c:1073 +#: postmaster/postmaster.c:1079 #, c-format -msgid "select failed in postmaster: %m" +msgid "select() failed in postmaster: %m" msgstr "" -#: postmaster/postmaster.c:1190 -#: postmaster/postmaster.c:1221 +#: postmaster/postmaster.c:1196 +#: postmaster/postmaster.c:1227 msgid "incomplete startup packet" msgstr "" -#: postmaster/postmaster.c:1202 +#: postmaster/postmaster.c:1208 msgid "invalid length of startup packet" msgstr "" -#: postmaster/postmaster.c:1254 +#: postmaster/postmaster.c:1260 #, c-format msgid "failed to send SSL negotiation response: %m" msgstr "" -#: postmaster/postmaster.c:1283 +#: postmaster/postmaster.c:1289 #, c-format msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u" msgstr "" -#: postmaster/postmaster.c:1347 +#: postmaster/postmaster.c:1353 msgid "invalid startup packet layout: expected terminator as last byte" msgstr "" -#: postmaster/postmaster.c:1376 +#: postmaster/postmaster.c:1382 msgid "no PostgreSQL user name specified in startup packet" msgstr "" -#: postmaster/postmaster.c:1431 +#: postmaster/postmaster.c:1437 msgid "the database system is starting up" msgstr "система баз данных стартует" -#: postmaster/postmaster.c:1436 +#: postmaster/postmaster.c:1442 msgid "the database system is shutting down" msgstr "система баз данныз отключается" -#: postmaster/postmaster.c:1441 +#: postmaster/postmaster.c:1447 msgid "the database system is in recovery mode" msgstr "система баз данных в режиме восстановления" -#: postmaster/postmaster.c:1446 +#: postmaster/postmaster.c:1452 #: storage/ipc/sinval.c:54 #: storage/lmgr/proc.c:226 msgid "sorry, too many clients already" msgstr "" -#: postmaster/postmaster.c:1655 +#: postmaster/postmaster.c:1661 msgid "received SIGHUP, reloading configuration files" msgstr "" -#: postmaster/postmaster.c:1699 +#: postmaster/postmaster.c:1705 msgid "received smart shutdown request" msgstr "" -#: postmaster/postmaster.c:1730 +#: postmaster/postmaster.c:1736 msgid "received fast shutdown request" msgstr "" -#: postmaster/postmaster.c:1737 +#: postmaster/postmaster.c:1743 msgid "aborting any active transactions" msgstr "" -#: postmaster/postmaster.c:1774 +#: postmaster/postmaster.c:1780 msgid "received immediate shutdown request" msgstr "" -#: postmaster/postmaster.c:1831 +#: postmaster/postmaster.c:1837 msgid "statistics collector process" msgstr "процесс сбора статистики" -#: postmaster/postmaster.c:1844 +#: postmaster/postmaster.c:1850 msgid "shutdown process" msgstr "процесс закрытия" -#: postmaster/postmaster.c:1856 +#: postmaster/postmaster.c:1862 msgid "startup process" msgstr "процесс запуска" -#: postmaster/postmaster.c:1859 +#: postmaster/postmaster.c:1865 msgid "aborting startup due to startup process failure" msgstr "" -#: postmaster/postmaster.c:1914 +#: postmaster/postmaster.c:1920 msgid "all server processes terminated; reinitializing" msgstr "" -#: postmaster/postmaster.c:1952 +#: postmaster/postmaster.c:1958 msgid "child process" msgstr "процесс-сын" -#: postmaster/postmaster.c:1998 +#: postmaster/postmaster.c:2004 msgid "checkpoint process" msgstr "процесс контольных точек" -#: postmaster/postmaster.c:1999 +#: postmaster/postmaster.c:2005 msgid "server process" msgstr "процесс сервера" -#: postmaster/postmaster.c:2002 +#: postmaster/postmaster.c:2008 msgid "terminating any other active server processes" msgstr "" -#: postmaster/postmaster.c:2071 +#: postmaster/postmaster.c:2077 #, c-format -msgid "%s (pid %d) exited with exit code %d" +msgid "%s (PID %d) exited with exit code %d" msgstr "" -#: postmaster/postmaster.c:2080 +#: postmaster/postmaster.c:2086 #, c-format -msgid "%s (pid %d) was terminated by signal %d" +msgid "%s (PID %d) was terminated by signal %d" msgstr "" -#: postmaster/postmaster.c:2089 +#: postmaster/postmaster.c:2095 #, c-format -msgid "%s (pid %d) exited with unexpected status %d" +msgid "%s (PID %d) exited with unexpected status %d" msgstr "" -#: postmaster/postmaster.c:2205 +#: postmaster/postmaster.c:2211 msgid "connection startup failed" msgstr "" -#: postmaster/postmaster.c:2221 +#: postmaster/postmaster.c:2227 #, c-format msgid "could not fork new process for connection: %m" msgstr "" -#: postmaster/postmaster.c:2257 +#: postmaster/postmaster.c:2263 msgid "could not fork new process for connection: " msgstr "" -#: postmaster/postmaster.c:2388 +#: postmaster/postmaster.c:2394 #, c-format msgid "connection received: host=%s port=%s" msgstr "" -#: postmaster/postmaster.c:2450 +#: postmaster/postmaster.c:2456 #, c-format msgid "connection authorized: user=%s database=%s" msgstr "" -#: postmaster/postmaster.c:2610 +#: postmaster/postmaster.c:2616 #, c-format msgid "checkpoints are occurring too frequently (%d seconds apart)" msgstr "" -#: postmaster/postmaster.c:2612 -msgid "Consider increasing CHECKPOINT_SEGMENTS." +#: postmaster/postmaster.c:2618 +msgid "Consider increasing the configuration parameter \"checkpoint_segments\"." msgstr "" -#: postmaster/postmaster.c:2880 +#: postmaster/postmaster.c:2886 #, c-format msgid "could not fork startup process: %m" msgstr "" -#: postmaster/postmaster.c:2884 +#: postmaster/postmaster.c:2890 #, c-format msgid "could not fork checkpoint process: %m" msgstr "" -#: postmaster/postmaster.c:2888 +#: postmaster/postmaster.c:2894 #, c-format msgid "could not fork shutdown process: %m" msgstr "" -#: postmaster/postmaster.c:2892 +#: postmaster/postmaster.c:2898 #, c-format msgid "could not fork process: %m" msgstr "" -#: postmaster/pgstat.c:200 +#: postmaster/pgstat.c:201 #, c-format msgid "could not resolve \"localhost\": %s" msgstr "" -#: postmaster/pgstat.c:220 +#: postmaster/pgstat.c:228 #, c-format -msgid "could not create socket for statistics: %m" +msgid "could not create socket for statistics collector: %m" +msgstr "не получилось создать сокет для сборщика статистики: %m" + +#: postmaster/pgstat.c:240 +#, c-format +msgid "could not bind socket for statistics collector: %m" msgstr "" -#: postmaster/pgstat.c:232 +#: postmaster/pgstat.c:251 #, c-format -msgid "could not bind socket for statistics: %m" +msgid "could not get address of socket for statistics collector: %m" msgstr "" -#: postmaster/pgstat.c:244 +#: postmaster/pgstat.c:267 #, c-format -msgid "could not get address of socket for statistics: %m" +msgid "could not connect socket for statistics collector: %m" msgstr "" -#: postmaster/pgstat.c:258 -#, c-format -msgid "could not connect socket for statistics: %m" +#: postmaster/pgstat.c:282 +msgid "disabling statistics collector for lack of working socket" msgstr "" -#: postmaster/pgstat.c:272 +#: postmaster/pgstat.c:296 #, c-format -msgid "could not set statistics socket to nonblock mode: %m" +msgid "could not set statistics collector socket to nonblocking mode: %m" msgstr "" -#: postmaster/pgstat.c:283 +#: postmaster/pgstat.c:307 #, c-format msgid "could not create pipe for statistics collector: %m" msgstr "" -#: postmaster/pgstat.c:344 +#: postmaster/pgstat.c:370 msgid "statistics collector startup skipped" msgstr "" -#: postmaster/pgstat.c:375 +#: postmaster/pgstat.c:401 #, c-format msgid "could not fork statistics buffer: %m" msgstr "" -#: postmaster/pgstat.c:785 +#: postmaster/pgstat.c:814 msgid "must be superuser to reset statistics counters" msgstr "" -#: postmaster/pgstat.c:1266 +#: postmaster/pgstat.c:1295 #, c-format msgid "could not create pipe for statistics buffer: %m" msgstr "" -#: postmaster/pgstat.c:1274 +#: postmaster/pgstat.c:1303 #, c-format msgid "could not fork statistics collector: %m" msgstr "" -#: 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 +#: postmaster/pgstat.c:1360 +#: postmaster/pgstat.c:1373 +#: postmaster/pgstat.c:1662 +#: postmaster/pgstat.c:1918 +#: postmaster/pgstat.c:1950 +#: postmaster/pgstat.c:2004 +#: postmaster/pgstat.c:2265 +#: postmaster/pgstat.c:2326 +#: postmaster/pgstat.c:2372 +#: postmaster/pgstat.c:2423 +#: postmaster/pgstat.c:2652 +#: postmaster/pgstat.c:2834 msgid "out of memory in statistics collector --- abort" msgstr "" -#: postmaster/pgstat.c:1343 -msgid "allocation of backend table failed" -msgstr "" - -#: postmaster/pgstat.c:1409 +#: postmaster/pgstat.c:1439 #, c-format -msgid "select failed in statistics collector: %m" +msgid "select() failed in statistics collector: %m" msgstr "" -#: postmaster/pgstat.c:1451 +#: postmaster/pgstat.c:1481 #, c-format -msgid "could not read from statistics pipe: %m" +msgid "could not read from statistics collector pipe: %m" msgstr "" -#: postmaster/pgstat.c:1470 +#: postmaster/pgstat.c:1500 msgid "invalid statistics message length" msgstr "" -#: postmaster/pgstat.c:1622 +#: postmaster/pgstat.c:1650 #, c-format -msgid "could not set statistics pipe to nonblock mode: %m" +msgid "could not set statistics collector pipe to nonblocking mode: %m" msgstr "" -#: postmaster/pgstat.c:1662 +#: postmaster/pgstat.c:1690 msgid "statistics buffer is full" msgstr "" -#: postmaster/pgstat.c:1695 +#: postmaster/pgstat.c:1723 #, c-format -msgid "select failed in statistics buffer: %m" +msgid "select() failed in statistics buffer: %m" msgstr "" -#: postmaster/pgstat.c:1713 +#: postmaster/pgstat.c:1739 #, c-format -msgid "failed to read statistics message: %m" +msgid "could not read statistics message: %m" +msgstr "не получилось прочитать сообщение статистики: %m" + +#: postmaster/pgstat.c:1804 +#, c-format +msgid "could not write to statistics collector pipe: %m" msgstr "" -#: postmaster/pgstat.c:1788 +#: postmaster/pgstat.c:1858 #, c-format -msgid "failed to write statistics pipe: %m" -msgstr "" +msgid "invalid server process ID %d" +msgstr "неверный ID процесса-сервера: %d" -#: postmaster/pgstat.c:1842 +#: postmaster/pgstat.c:2053 #, c-format -msgid "invalid backend ID %d" -msgstr "" +msgid "could not open temporary statistics file \"%s\": %m" +msgstr "не получилось открыть временный файл статистики \"%s\": %m" -#: postmaster/pgstat.c:2037 -#: postmaster/pgstat.c:2150 -#, c-format -msgid "could not write temp statistics file \"%s\": %m" -msgstr "" - -#: postmaster/pgstat.c:2064 +#: postmaster/pgstat.c:2080 msgid "database hash table corrupted during cleanup --- abort" msgstr "" -#: postmaster/pgstat.c:2101 +#: postmaster/pgstat.c:2117 #, c-format msgid "tables hash table for database %u corrupted during cleanup --- abort" msgstr "" -#: postmaster/pgstat.c:2159 +#: postmaster/pgstat.c:2166 #, c-format -msgid "could not rename temp statistics file \"%s\" to \"%s\": %m" +msgid "could not close temporary statistics file \"%s\": %m" +msgstr "не получилось закрыть временный файл статистики \"%s\": %m" + +#: postmaster/pgstat.c:2175 +#, c-format +msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m" +msgstr "не получилось переименовать временный файл статистики из \"%s\" в \"%s\": %m" + +#: postmaster/pgstat.c:2197 +msgid "dead-server-process hash table corrupted during cleanup --- abort" msgstr "" -#: postmaster/pgstat.c:2181 -msgid "dead-backend hash table corrupted during cleanup --- abort" -msgstr "" - -#: 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 +#: postmaster/pgstat.c:2308 +#: postmaster/pgstat.c:2340 +#: postmaster/pgstat.c:2403 +#: postmaster/pgstat.c:2436 +#: postmaster/pgstat.c:2457 +#: postmaster/pgstat.c:2503 +#: postmaster/pgstat.c:2536 msgid "corrupted pgstat.stat file" msgstr "" #: rewrite/rewriteDefine.c:103 -#: rewrite/rewriteDefine.c:553 +#: rewrite/rewriteDefine.c:575 #, c-format msgid "rule \"%s\" for relation \"%s\" already exists" msgstr "правило \"%s\" для связи \"%s\" уже существует" @@ -5709,7 +6001,7 @@ msgid "Use triggers instead." msgstr "" #: rewrite/rewriteDefine.c:256 -msgid "INSTEAD NOTHING rules on select are not implemented" +msgid "INSTEAD NOTHING rules on SELECT are not implemented" msgstr "" #: rewrite/rewriteDefine.c:257 @@ -5717,19 +6009,19 @@ msgid "Use views instead." msgstr "" #: rewrite/rewriteDefine.c:265 -msgid "multiple action rules on select are not implemented" +msgid "multiple actions for rules on SELECT are not implemented" msgstr "" #: rewrite/rewriteDefine.c:274 -msgid "only instead-select rules are currently supported on select" +msgid "rules on SELECT must have action INSTEAD SELECT" msgstr "" #: rewrite/rewriteDefine.c:282 -msgid "event qualifications are not implemented for rules on select" +msgid "event qualifications are not implemented for rules on SELECT" msgstr "" #: rewrite/rewriteDefine.c:302 -msgid "select rule's target list has too many entries" +msgid "SELECT rule's target list has too many entries" msgstr "" #: rewrite/rewriteDefine.c:318 @@ -5738,21 +6030,21 @@ msgstr "" #: 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: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 column \"%s\"" msgstr "" #: 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 column \"%s\"" msgstr "" #: rewrite/rewriteDefine.c:347 -msgid "select rule's target list has too few entries" +msgid "SELECT rule's target list has too few entries" msgstr "" #: rewrite/rewriteDefine.c:362 @@ -5765,90 +6057,116 @@ msgstr "" msgid "view rule for \"%s\" must be named \"%s\"" msgstr "" -#: rewrite/rewriteDefine.c:405 +#: rewrite/rewriteDefine.c:406 #, c-format -msgid "cannot convert non-empty table \"%s\" to a view" +msgid "could not convert table \"%s\" to a view because it is not empty" msgstr "" -#: rewrite/rewriteDefine.c:546 +#: rewrite/rewriteDefine.c:413 +#, c-format +msgid "could not convert table \"%s\" to a view because it has triggers" +msgstr "" + +#: rewrite/rewriteDefine.c:415 +msgid "In particular, the table may not be involved in any foreign key relationships." +msgstr "" + +#: rewrite/rewriteDefine.c:420 +#, c-format +msgid "could not convert table \"%s\" to a view because it has indexes" +msgstr "" + +#: rewrite/rewriteDefine.c:426 +#, c-format +msgid "could not convert table \"%s\" to a view because it has child tables" +msgstr "" + +#: rewrite/rewriteDefine.c:568 #: rewrite/rewriteRemove.c:59 #, c-format msgid "rule \"%s\" for relation \"%s\" does not exist" msgstr "правило \"%s\" для связи \"%s\" не существует" -#: rewrite/rewriteHandler.c:458 -#: rewrite/rewriteHandler.c:472 -#, c-format -msgid "multiple assignments to same attribute \"%s\"" +#: rewrite/rewriteManip.c:734 +#: rewrite/rewriteManip.c:790 +msgid "conditional utility statements are not implemented" msgstr "" -#: rewrite/rewriteHandler.c:884 -#: rewrite/rewriteHandler.c:1166 +#: rewrite/rewriteManip.c:890 +msgid "cannot handle whole-row reference" +msgstr "" + +#: rewrite/rewriteHandler.c:456 +#: rewrite/rewriteHandler.c:470 +#, c-format +msgid "multiple assignments to same column \"%s\"" +msgstr "многочисленные присвоения к одной и тоже колонке \"%s\"" + +#: rewrite/rewriteHandler.c:882 +#: rewrite/rewriteHandler.c:1164 #, c-format msgid "infinite recursion detected in rules for relation \"%s\"" msgstr "" -#: rewrite/rewriteHandler.c:1276 +#: rewrite/rewriteHandler.c:1274 msgid "cannot insert into a view" msgstr "нельзя вставлять в вид" -#: rewrite/rewriteHandler.c:1277 +#: rewrite/rewriteHandler.c:1275 msgid "You need an unconditional ON INSERT DO INSTEAD rule." msgstr "" -#: rewrite/rewriteHandler.c:1282 +#: rewrite/rewriteHandler.c:1280 msgid "cannot update a view" msgstr "нельзя обновить вид" -#: rewrite/rewriteHandler.c:1283 +#: rewrite/rewriteHandler.c:1281 msgid "You need an unconditional ON UPDATE DO INSTEAD rule." msgstr "" -#: rewrite/rewriteHandler.c:1288 +#: rewrite/rewriteHandler.c:1286 msgid "cannot delete from a view" msgstr "нельзя удалить из вида" -#: rewrite/rewriteHandler.c:1289 +#: rewrite/rewriteHandler.c:1287 msgid "You need an unconditional ON DELETE DO INSTEAD rule." msgstr "" -#: rewrite/rewriteManip.c:734 -#: rewrite/rewriteManip.c:788 -msgid "conditional utility statements are not implemented" -msgstr "" - -#: rewrite/rewriteManip.c:879 -msgid "cannot handle whole-tuple reference" -msgstr "" - #: storage/buffer/buf_table.c:128 #: storage/freespace/freespace.c:1005 +#: storage/ipc/shmem.c:170 +#: storage/ipc/shmem.c:229 +#: storage/ipc/shmem.c:349 +#: storage/lmgr/lock.c:479 +#: storage/lmgr/lock.c:527 +#: storage/lmgr/proc.c:154 +#: storage/lmgr/proc.c:170 msgid "out of shared memory" msgstr "не общей хватает памяти" -#: storage/buffer/bufmgr.c:234 +#: storage/buffer/bufmgr.c:240 #, c-format -msgid "invalid page header in block %u of \"%s\"; zeroing out page" +msgid "invalid page header in block %u of relation \"%s\"; zeroing out page" msgstr "" -#: storage/buffer/bufmgr.c:241 +#: storage/buffer/bufmgr.c:247 #, c-format -msgid "invalid page header in block %u of \"%s\"" +msgid "invalid page header in block %u of relation \"%s\"" msgstr "" -#: storage/buffer/bufmgr.c:439 -#: storage/buffer/bufmgr.c:821 -#: storage/buffer/bufmgr.c:1512 -#: storage/buffer/bufmgr.c:2154 +#: storage/buffer/bufmgr.c:445 +#: storage/buffer/bufmgr.c:827 +#: storage/buffer/bufmgr.c:1518 +#: storage/buffer/bufmgr.c:2160 #, c-format msgid "could not write block %u of %u/%u" msgstr "" -#: storage/buffer/bufmgr.c:2158 +#: storage/buffer/bufmgr.c:2164 msgid "Multiple failures --- write error may be permanent." msgstr "" -#: storage/buffer/bufmgr.c:2191 +#: storage/buffer/bufmgr.c:2197 #, c-format msgid "writing block %u of relation %u/%u" msgstr "" @@ -5861,21 +6179,22 @@ msgstr "" msgid "no empty local buffer available" msgstr "" -#: storage/file/fd.c:277 -#: storage/file/fd.c:1067 +#: storage/file/fd.c:351 +msgid "insufficient file descriptors available to start server process" +msgstr "" + +#: storage/file/fd.c:352 +#, c-format +msgid "System allows %d, we need at least %d." +msgstr "" + +#: storage/file/fd.c:393 +#: storage/file/fd.c:1133 +#: storage/file/fd.c:1206 #, c-format msgid "out of file descriptors: %m; release and retry" msgstr "" -#: storage/file/fd.c:334 -msgid "insufficient file descriptors available to start backend" -msgstr "" - -#: storage/file/fd.c:335 -#, c-format -msgid "System allows %ld, we need at least %d." -msgstr "" - #: storage/freespace/freespace.c:274 #: storage/freespace/freespace.c:291 #: storage/freespace/freespace.c:306 @@ -5898,28 +6217,33 @@ msgstr "" #: storage/freespace/freespace.c:707 #, c-format -msgid "Allocated FSM size: %d relations + %d pages = %.0f KB shared mem." +msgid "Allocated FSM size: %d relations + %d pages = %.0f kB shared memory." msgstr "" -#: storage/ipc/shmem.c:376 +#: storage/ipc/shmem.c:383 #, c-format -msgid "could not allocate \"%s\"" -msgstr "не получилось выделить \"%s\"" +msgid "could not allocate shared memory segment \"%s\"" +msgstr "не получилось выделить сегмент общей памяти \"%s\"" #: storage/lmgr/deadlock.c:867 #, c-format -msgid "Proc %d waits for %s on transaction %u; blocked by proc %d." +msgid "Process %d waits for %s on transaction %u; blocked by process %d." msgstr "" #: storage/lmgr/deadlock.c:877 #, c-format -msgid "Proc %d waits for %s on relation %u of database %u; blocked by proc %d." +msgid "Process %d waits for %s on relation %u of database %u; blocked by process %d." msgstr "" #: storage/lmgr/deadlock.c:887 msgid "deadlock detected" msgstr "" +#: storage/lmgr/lock.c:480 +#: storage/lmgr/lock.c:528 +msgid "You may need to increase max_locks_per_transaction." +msgstr "" + #: storage/page/bufpage.c:137 #: storage/page/bufpage.c:335 #: storage/page/bufpage.c:474 @@ -5939,18 +6263,18 @@ msgstr "" #: storage/page/bufpage.c:492 #, c-format -msgid "corrupted item pointer: offset = %u size = %u" +msgid "corrupted item pointer: offset = %u, size = %u" msgstr "" #: storage/smgr/smgr.c:176 #, c-format -msgid "could not create \"%s\": %m" -msgstr "не получилось создать \"%s\": %m" +msgid "could not create relation \"%s\": %m" +msgstr "не получилось создать отношение \"%s\": %m" #: storage/smgr/smgr.c:251 #, c-format -msgid "could not extend \"%s\": %m" -msgstr "не получилось расширить \"%s\": %m" +msgid "could not extend relation \"%s\": %m" +msgstr "не получилось расширить отношение \"%s\": %m" #: storage/smgr/smgr.c:253 msgid "Check free disk space." @@ -5958,17 +6282,17 @@ msgstr "" #: storage/smgr/smgr.c:295 #, c-format -msgid "could not close \"%s\": %m" -msgstr "не получилось закрыть \"%s\": %m" +msgid "could not close relation \"%s\": %m" +msgstr "не получилось закрыть отношение \"%s\": %m" #: storage/smgr/smgr.c:321 #, c-format -msgid "could not read block %d of \"%s\": %m" +msgid "could not read block %d of relation \"%s\": %m" msgstr "" #: storage/smgr/smgr.c:347 #, c-format -msgid "could not write block %d of \"%s\": %m" +msgid "could not write block %d of relation \"%s\": %m" msgstr "" #: storage/smgr/smgr.c:378 @@ -5978,12 +6302,12 @@ msgstr "" #: storage/smgr/smgr.c:407 #, c-format -msgid "could not count blocks of \"%s\": %m" +msgid "could not count blocks of relation \"%s\": %m" msgstr "" #: storage/smgr/smgr.c:439 #, c-format -msgid "could not truncate \"%s\" to %u blocks: %m" +msgid "could not truncate relation \"%s\" to %u blocks: %m" msgstr "" #: storage/smgr/smgr.c:483 @@ -5991,151 +6315,206 @@ msgstr "" msgid "could not unlink %u/%u: %m" msgstr "" -#: tcop/fastpath.c:106 -#: tcop/fastpath.c:450 -#: tcop/fastpath.c:573 -#, c-format -msgid "invalid argument size %d in function call message" -msgstr "" - -#: 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 "" - -#: tcop/fastpath.c:420 -#: tcop/fastpath.c:543 -#, c-format -msgid "function call message contains %d arguments but function requires %d" -msgstr "" - -#: tcop/fastpath.c:428 -#, c-format -msgid "function call message contains %d argument formats but %d arguments" -msgstr "" - -#: tcop/fastpath.c:511 -#: tcop/fastpath.c:596 -#, c-format -msgid "incorrect binary data format in function argument %d" -msgstr "" - #: tcop/postgres.c:331 #: tcop/postgres.c:343 #: tcop/postgres.c:354 #: tcop/postgres.c:366 -#: tcop/postgres.c:3068 +#: tcop/postgres.c:3076 #, c-format msgid "invalid frontend message type %d" msgstr "" #: tcop/postgres.c:464 #, c-format -msgid "query: %s" -msgstr "запрос: %s" - -#: tcop/postgres.c:563 -msgid "copyObject failed to produce an equal parse tree" +msgid "statement: %s" msgstr "" -#: tcop/postgres.c:608 -msgid "copyObject failed to produce an equal plan tree" +#: tcop/fastpath.c:305 +#: tcop/postgres.c:794 +#: tcop/postgres.c:1114 +#: tcop/postgres.c:1572 +msgid "current transaction is aborted, commands ignored until end of transaction block" msgstr "" -#: tcop/postgres.c:963 +#: tcop/postgres.c:957 #, c-format -msgid "duration_statement: %ld.%06ld %s" +msgid "duration: %ld.%03ld ms" msgstr "" -#: tcop/postgres.c:974 +#: tcop/postgres.c:970 #, c-format -msgid "duration: %ld.%06ld sec" +msgid "duration: %ld.%03ld ms statement: %s" msgstr "" -#: tcop/postgres.c:1080 +#: tcop/postgres.c:1078 msgid "cannot insert multiple commands into a prepared statement" msgstr "" -#: tcop/postgres.c:1274 +#: tcop/postgres.c:1272 #, c-format msgid "bind message has %d parameter formats but %d parameters" msgstr "" # [SM]: TO REVIEW -#: tcop/postgres.c:1287 -#: tcop/postgres.c:1651 +#: tcop/postgres.c:1285 +#: tcop/postgres.c:1649 msgid "unnamed prepared statement does not exist" msgstr "безымянная заготовленная команда не существует" -#: tcop/postgres.c:1293 +#: tcop/postgres.c:1291 #, c-format msgid "bind message supplies %d parameters, but prepared statement \"%s\" requires %d" msgstr "" -#: tcop/postgres.c:1423 +#: tcop/postgres.c:1421 #, c-format msgid "incorrect binary data format in bind parameter %d" msgstr "" +#: tcop/postgres.c:1504 +#: tcop/postgres.c:1702 +#, c-format +msgid "portal \"%s\" does not exist" +msgstr "портал \"%s\" не существует" + +#: tcop/postgres.c:1799 +msgid "terminating connection because of crash of another server process" +msgstr "" + #: tcop/postgres.c:1800 -msgid "terminating connection due to crash of another backend" +msgid "The postmaster has commanded this server process to roll back the current transaction and exit, because another server process exited abnormally and possibly corrupted shared memory." msgstr "" -#: 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." +#: tcop/postgres.c:1804 +msgid "In a moment you should be able to reconnect to the database and repeat your command." msgstr "" -#: tcop/postgres.c:1805 -msgid "In a moment you should be able to reconnect to the database and repeat your query." -msgstr "" - -#: tcop/postgres.c:1920 +#: tcop/postgres.c:1919 msgid "floating-point exception" msgstr "" -#: tcop/postgres.c:1921 +#: tcop/postgres.c:1920 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 "" -#: tcop/postgres.c:1956 +#: tcop/postgres.c:1955 msgid "terminating connection due to administrator command" msgstr "" -#: tcop/postgres.c:1965 +#: tcop/postgres.c:1964 msgid "canceling query due to user request" msgstr "" -#: tcop/postgres.c:2473 -msgid "query-level statistics are disabled because parser, planner, or executor statistics are on" +#: tcop/postgres.c:1973 +#, c-format +msgid "" +"%s is the PostgreSQL stand-alone backend. It is not\n" +"intended to be used by normal users.\n" +"\n" +msgstr "" +"%s является автономным бэкендом PostgreSQL и не\n" +"предполагается для использования обычными пользователями.\n" +"\n" + +#: tcop/postgres.c:1975 +#, c-format +msgid "" +"Usage:\n" +" %s [OPTION]... [DBNAME]\n" +"\n" +msgstr "" +"Использование:\n" +" %s [ОПЦИЯ]... [ИМЯБД]\n" +"\n" + +#: tcop/postgres.c:1982 +msgid " -d 0-5 debugging level (0 is off)\n" +msgstr " -d 0-5 уровень отладки (0 - выключен)\n" + +#: tcop/postgres.c:1984 +msgid " -e use European date input format (DMY)\n" +msgstr " -e использовать европейский формат дат (ДМГ)\n" + +#: tcop/postgres.c:1985 +msgid " -E echo query before execution\n" +msgstr " -E выводить запрос перед выполнением\n" + +#: tcop/postgres.c:1987 +msgid " -N do not use newline as interactive query delimiter\n" +msgstr " -N не использовать конец строки как итерактивный разделитель запросов\n" + +#: tcop/postgres.c:1988 +msgid " -o FILENAME send stdout and stderr to given file\n" +msgstr " -o ИМЯФАЙЛА перенаправить стандартный вывод и ошибки (STDOUT и STDERR) в указанный файл\n" + +#: tcop/postgres.c:1989 +msgid " -P disable system indexes\n" +msgstr " -P отключить системные индексы\n" + +#: tcop/postgres.c:1990 +msgid " -s show statistics after each query\n" +msgstr " -s показывать статистику после каждого запроса\n" + +#: tcop/postgres.c:1991 +msgid " -S SORT-MEM set amount of memory for sorts (in kbytes)\n" +msgstr " -S SORT-MEM указать объём памяти для сортировки (в килобайтах)\n" + +#: tcop/postgres.c:1992 +msgid " --describe-config describe configuration parameters, then exit\n" +msgstr " --describe-config показать параметры конфигурации и выйти\n" + +#: tcop/postgres.c:1996 +msgid " -f s|i|n|m|h forbid use of some plan types\n" +msgstr " -f s|i|n|m|h запретить использование некоторых типов планов\n" + +#: tcop/postgres.c:1997 +msgid " -i do not execute queries\n" +msgstr " -i не выполнять запросы\n" + +#: tcop/postgres.c:1998 +msgid " -O allow system table structure changes\n" +msgstr " -O позволить изменение структуры системных таблиц\n" + +#: tcop/postgres.c:1999 +msgid " -t pa|pl|ex show timings after each query\n" +msgstr " -t pa|pl|ex показать время каждого запроса\n" + +#: tcop/postgres.c:2000 +msgid " -W NUM wait NUM seconds to allow attach from a debugger\n" +msgstr " -W СЕК ждать СЕК секунд для подключения из отладчика\n" + +#: tcop/postgres.c:2001 +msgid "" +"\n" +"Report bugs to .\n" +msgstr "" +"\n" +"Сообщения об ошибках: .\n" + +#: tcop/postgres.c:2475 +msgid "statement-level statistics are disabled because parser, planner, or executor statistics are on" msgstr "" -#: tcop/postgres.c:2556 -msgid "invalid backend command-line arguments" -msgstr "" +#: tcop/postgres.c:2564 +msgid "invalid command-line arguments for server process" +msgstr "неверные аргументы командной строки для процесса-сервера" -#: tcop/postgres.c:2557 -#: tcop/postgres.c:2573 -msgid "Try -? for help." -msgstr "Наберите -? для подсказки." - -#: tcop/postgres.c:2571 +#: tcop/postgres.c:2579 #, c-format msgid "%s: invalid command-line arguments" msgstr "%s: неверные аргументы командной строки" -#: tcop/postgres.c:2581 +#: tcop/postgres.c:2589 #, c-format msgid "%s: no database nor user name specified" msgstr "" -#: tcop/postgres.c:2981 +#: tcop/postgres.c:2989 #, c-format msgid "invalid CLOSE message subtype %d" msgstr "" -#: tcop/postgres.c:3011 +#: tcop/postgres.c:3019 #, c-format msgid "invalid DESCRIBE message subtype %d" msgstr "" @@ -6145,17 +6524,17 @@ msgstr "" msgid "bind message has %d result formats but query has %d columns" msgstr "" -#: tcop/pquery.c:415 -#: tcop/pquery.c:927 +#: tcop/pquery.c:426 +#: tcop/pquery.c:941 #, c-format msgid "portal \"%s\" cannot be run anymore" msgstr "" -#: tcop/pquery.c:601 +#: tcop/pquery.c:615 msgid "cursor can only scan forward" msgstr "" -#: tcop/pquery.c:602 +#: tcop/pquery.c:616 msgid "Declare it with SCROLL option to enable backward scan." msgstr "" @@ -6191,11 +6570,6 @@ msgstr "" msgid "index \"%s\" does not exist" msgstr "" -#: tcop/utility.c:91 -#, c-format -msgid "\"%s\" is not an index" -msgstr "\"%s\" не является индексом" - #: tcop/utility.c:92 msgid "Use DROP INDEX to remove an index." msgstr "" @@ -6218,6 +6592,73 @@ msgstr "" msgid "must be superuser to do CHECKPOINT" msgstr "" +#: tcop/fastpath.c:106 +#: tcop/fastpath.c:450 +#: tcop/fastpath.c:573 +#, c-format +msgid "invalid argument size %d in function call message" +msgstr "" + +#: tcop/fastpath.c:420 +#: tcop/fastpath.c:543 +#, c-format +msgid "function call message contains %d arguments but function requires %d" +msgstr "" + +#: tcop/fastpath.c:428 +#, c-format +msgid "function call message contains %d argument formats but %d arguments" +msgstr "" + +#: tcop/fastpath.c:511 +#: tcop/fastpath.c:596 +#, c-format +msgid "incorrect binary data format in function argument %d" +msgstr "" + +#: utils/mb/encnames.c:445 +msgid "encoding name too long" +msgstr "" + +#: utils/mb/wchar.c:640 +msgid "Unicode characters greater than or equal to 0x10000 are not supported" +msgstr "" + +#: utils/mb/wchar.c:669 +#, c-format +msgid "invalid byte sequence for encoding \"%s\": 0x%s" +msgstr "неверная последовательность байт имя кодировки \"%s\": 0x%s" + +#: utils/mb/mbutils.c:252 +#, c-format +msgid "default conversion function for encoding \"%s\" to \"%s\" does not exist" +msgstr "функция конверсии по умолчанию из кодировки \"%s\" в \"%s\" не существует" + +#: utils/mb/mbutils.c:326 +#, c-format +msgid "invalid source encoding name \"%s\"" +msgstr "неверное имя исходной кодировки: \"%s\"" + +#: utils/mb/mbutils.c:331 +#, c-format +msgid "invalid destination encoding name \"%s\"" +msgstr "неверное имя кодировки назначения: \"%s\"" + +#: utils/mb/conv.c:376 +#, c-format +msgid "ignoring unconvertible UTF-8 character 0x%04x" +msgstr "" + +#: utils/mb/conv.c:406 +#, c-format +msgid "invalid encoding number: %d" +msgstr "неверный номер кодировки: %d" + +#: utils/mb/conv.c:445 +#, c-format +msgid "ignoring unconvertible %s character 0x%04x" +msgstr "" + #: utils/adt/array_userfuncs.c:50 msgid "could not determine input data types" msgstr "" @@ -6227,7 +6668,7 @@ msgid "neither input type is an array" msgstr "" #: utils/adt/array_userfuncs.c:99 -msgid "input must be empty or one-dimensional array" +msgid "argument must be empty or one-dimensional array" msgstr "" #: utils/adt/array_userfuncs.c:198 @@ -6259,8 +6700,8 @@ msgstr "" #: utils/adt/array_userfuncs.c:354 #, c-format -msgid "invalid array element type: %u" -msgstr "" +msgid "invalid array element type OID: %u" +msgstr "неверный OID типа элементов массива: %u" #: utils/adt/array_userfuncs.c:358 #: utils/adt/arrayfuncs.c:893 @@ -6282,11 +6723,11 @@ msgstr "" #: utils/adt/acl.c:190 #, c-format -msgid "unrecognized keyword: \"%s\"" +msgid "unrecognized key word: \"%s\"" msgstr "" #: utils/adt/acl.c:191 -msgid "ACL keyword must be \"group\" or \"user\"." +msgid "ACL key word must be \"group\" or \"user\"." msgstr "" #: utils/adt/acl.c:196 @@ -6294,12 +6735,12 @@ msgid "missing name" msgstr "" #: utils/adt/acl.c:197 -msgid "A name must follow the [group|user] keyword." +msgid "A name must follow the \"group\" or \"user\" key word." msgstr "" #: utils/adt/acl.c:205 msgid "missing \"=\" sign" -msgstr "" +msgstr "отсутствует знак \"=\"" #: utils/adt/acl.c:252 #, c-format @@ -6312,53 +6753,52 @@ msgstr "" #: utils/adt/acl.c:291 #, c-format -msgid "defaulting grantor to %u" +msgid "defaulting grantor to user ID %u" msgstr "" #: utils/adt/acl.c:350 msgid "extra garbage at the end of the ACL specification" msgstr "" -#: utils/adt/acl.c:703 +#: utils/adt/acl.c:717 msgid "dependent privileges exist" msgstr "" -#: utils/adt/acl.c:704 +#: utils/adt/acl.c:718 msgid "Use CASCADE to revoke them too." msgstr "" -#: utils/adt/acl.c:780 -msgid "cannot remove the world ACL" -msgstr "" - -#: utils/adt/acl.c:850 +#: utils/adt/acl.c:851 msgid "cannot specify both user and group" msgstr "" -#: 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 +#: utils/adt/acl.c:912 +#: utils/adt/acl.c:1137 +#: utils/adt/acl.c:1349 +#: utils/adt/acl.c:1553 +#: utils/adt/acl.c:1757 +#: utils/adt/acl.c:1966 #, c-format msgid "unrecognized privilege type: \"%s\"" msgstr "" -#: utils/adt/acl.c:1525 +#: utils/adt/acl.c:1526 +#: utils/adt/regproc.c:117 +#: utils/adt/regproc.c:138 +#: utils/adt/regproc.c:290 #, c-format msgid "function \"%s\" does not exist" msgstr "функция \"%s\" не существует" #: utils/adt/like.c:453 #: utils/adt/like_match.c:291 -#: utils/adt/regexp.c:459 +#: utils/adt/regexp.c:460 msgid "invalid escape string" msgstr "" #: utils/adt/like.c:454 #: utils/adt/like_match.c:292 -#: utils/adt/regexp.c:460 +#: utils/adt/regexp.c:461 msgid "Escape string must be empty or one character." msgstr "" @@ -6408,7 +6848,7 @@ msgid "wrong element type" msgstr "" #: utils/adt/arrayfuncs.c:955 -#: utils/cache/lsyscache.c:1709 +#: utils/cache/lsyscache.c:1701 #, c-format msgid "no binary input function available for type %s" msgstr "" @@ -6419,7 +6859,7 @@ msgid "improper binary format in array element %d" msgstr "" #: utils/adt/arrayfuncs.c:1129 -#: utils/cache/lsyscache.c:1745 +#: utils/cache/lsyscache.c:1737 #, c-format msgid "no binary output function available for type %s" msgstr "" @@ -6451,8 +6891,8 @@ msgstr "" #: utils/adt/arrayfuncs.c:2135 #: utils/adt/arrayfuncs.c:3031 -msgid "NULL array elements not supported" -msgstr "" +msgid "null array elements not supported" +msgstr "значения NULL как элементы массива не поддерживается" #: utils/adt/arrayfuncs.c:2375 #: utils/adt/arrayfuncs.c:2530 @@ -6478,18 +6918,18 @@ msgstr "" #: utils/adt/ascii.c:68 #, c-format -msgid "unsupported encoding conversion from %s to ASCII" -msgstr "конверсия кодировки из %s в ASCII не поддерживается" +msgid "encoding conversion from %s to ASCII not supported" +msgstr "преобразование кодировки из %s в ASCII не поддерживается" #: utils/adt/bool.c:80 #, c-format -msgid "invalid input syntax for boolean: \"%s\"" -msgstr "" +msgid "invalid input syntax for type boolean: \"%s\"" +msgstr "неверный входной синтаксис для типа boolean: \"%s\"" #: utils/adt/cash.c:198 #, c-format -msgid "invalid input syntax for money: \"%s\"" -msgstr "" +msgid "invalid input syntax for type money: \"%s\"" +msgstr "неверный входной синтаксис для типа money: \"%s\"" #: utils/adt/cash.c:496 #: utils/adt/cash.c:548 @@ -6514,117 +6954,137 @@ msgstr "" #: utils/adt/int8.c:653 #: utils/adt/int8.c:694 #: utils/adt/numeric.c:3639 -#: utils/adt/timestamp.c:2007 +#: utils/adt/timestamp.c:2002 msgid "division by zero" msgstr "деление на ноль" -#: utils/adt/date.c:72 -#: utils/adt/date.c:78 -#: utils/adt/date.c:100 -#: utils/adt/date.c:529 -#, c-format -msgid "invalid input syntax for date: \"%s\"" -msgstr "" +#: utils/adt/date.c:87 +#: utils/adt/datetime.c:1309 +#: utils/adt/datetime.c:2061 +msgid "date/time value \"current\" is no longer supported" +msgstr "значение даты/времени \"current\" больше не поддерживается" -#: utils/adt/date.c:88 -#: utils/adt/datetime.c:1276 -#: utils/adt/datetime.c:2027 -msgid "\"current\" is no longer supported" -msgstr "\"current\" больше не поддерживается" - -#: 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 +#: utils/adt/date.c:367 +#: utils/adt/date.c:439 +#: utils/adt/date.c:1001 +#: utils/adt/date.c:1038 +#: utils/adt/date.c:1940 +#: utils/adt/formatting.c:2846 +#: utils/adt/formatting.c:2871 +#: utils/adt/formatting.c:2930 +#: utils/adt/nabstime.c:630 +#: utils/adt/nabstime.c:673 +#: utils/adt/nabstime.c:703 +#: utils/adt/nabstime.c:746 +#: utils/adt/timestamp.c:155 +#: utils/adt/timestamp.c:382 +#: utils/adt/timestamp.c:1735 +#: utils/adt/timestamp.c:1756 +#: utils/adt/timestamp.c:1813 +#: utils/adt/timestamp.c:1836 +#: utils/adt/timestamp.c:2218 +#: utils/adt/timestamp.c:2329 +#: utils/adt/timestamp.c:2563 +#: utils/adt/timestamp.c:2614 +#: utils/adt/timestamp.c:2671 +#: utils/adt/timestamp.c:2723 +#: utils/adt/timestamp.c:2969 +#: utils/adt/timestamp.c:3075 +#: utils/adt/timestamp.c:3082 +#: utils/adt/timestamp.c:3095 +#: utils/adt/timestamp.c:3103 +#: utils/adt/timestamp.c:3177 +#: utils/adt/timestamp.c:3296 +#: utils/adt/timestamp.c:3304 +#: utils/adt/timestamp.c:3583 +#: utils/adt/timestamp.c:3590 +#: utils/adt/timestamp.c:3617 +#: utils/adt/timestamp.c:3621 msgid "timestamp out of range" msgstr "" -#: utils/adt/date.c:468 +#: utils/adt/date.c:466 msgid "cannot convert reserved abstime value to date" msgstr "" -#: utils/adt/date.c:570 -#: utils/adt/date.c:576 -#: utils/adt/date.c:1258 +#: utils/adt/date.c:527 #, c-format -msgid "invalid input syntax for time: \"%s\"" +msgid "invalid input syntax for type date: \"%s\"" +msgstr "неверный входной синтаксис для типа date: \"%s\"" + +#: utils/adt/date.c:1255 +#, c-format +msgid "invalid input syntax for type time: \"%s\"" +msgstr "неверный входной синтаксис для типа time: \"%s\"" + +#: utils/adt/date.c:1289 +#: utils/adt/date.c:1359 +#: utils/adt/date.c:1378 +#, c-format +msgid "\"time\" units \"%s\" not recognized" +msgstr "единицы типа \"time\" -- \"%s\" -- не распознаны" + +#: utils/adt/date.c:2018 +#, c-format +msgid "invalid input syntax for type time with time zone: \"%s\"" msgstr "" -#: utils/adt/date.c:1292 -#: utils/adt/date.c:1362 -#: utils/adt/date.c:1381 +#: utils/adt/date.c:2052 +#: utils/adt/date.c:2136 +#: utils/adt/date.c:2155 #, c-format -msgid "TIME units \"%s\" not recognized" -msgstr "" +msgid "\"time with time zone\" units \"%s\" not recognized" +msgstr "единицы типа \"time with time zone\" -- \"%s\" -- не распознаны" -#: 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 +#: utils/adt/date.c:2185 +#: utils/adt/date.c:2222 +#: utils/adt/timestamp.c:3497 +#: utils/adt/timestamp.c:3522 +#: utils/adt/timestamp.c:3649 +#: utils/adt/timestamp.c:3673 #, c-format msgid "time zone \"%s\" not recognized" msgstr "" -#: utils/adt/date.c:2250 +#: utils/adt/date.c:2244 #, c-format -msgid "INTERVAL time zone \"%s\" not legal" +msgid "\"interval\" time zone \"%s\" not valid" msgstr "" -#: utils/adt/datetime.c:1458 -#: utils/adt/datetime.c:2302 -#: utils/adt/formatting.c:3074 +#: utils/adt/datetime.c:1491 +#: utils/adt/datetime.c:2343 +#: utils/adt/formatting.c:3131 #, c-format msgid "inconsistent use of year %04d and \"BC\"" msgstr "" +#: utils/adt/datetime.c:3289 +#: utils/adt/datetime.c:3296 +#, c-format +msgid "date/time field value out of range: \"%s\"" +msgstr "" + +#: utils/adt/datetime.c:3298 +msgid "Perhaps you need a different \"datestyle\" setting." +msgstr "" + +#: utils/adt/datetime.c:3303 +#, c-format +msgid "interval field value out of range: \"%s\"" +msgstr "значение интервала вне диапазона: \"%s\"" + +#: utils/adt/datetime.c:3309 +#, c-format +msgid "time zone displacement out of range: \"%s\"" +msgstr "" + +#. translator: first %s is inet or cidr +#: utils/adt/datetime.c:3316 +#: utils/adt/network.c:90 +#, c-format +msgid "invalid input syntax for type %s: \"%s\"" +msgstr "неверный входной синтаксис для типа %s: \"%s\"" + #: utils/adt/datum.c:80 #: utils/adt/datum.c:92 msgid "invalid Datum pointer" @@ -6638,11 +7098,11 @@ msgstr "" #: utils/adt/encode.c:150 #, c-format -msgid "invalid hex digit: \"%c\"" -msgstr "" +msgid "invalid hexadecimal digit: \"%c\"" +msgstr "неверная шестнадцатеричная цифра: \"%c\"" #: utils/adt/encode.c:178 -msgid "invalid hex data: odd number of digits" +msgid "invalid hexadecimal data: odd number of digits" msgstr "" #: utils/adt/encode.c:295 @@ -6659,48 +7119,48 @@ msgstr "" #: 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" +#: utils/adt/varlena.c:118 +#: utils/adt/varlena.c:158 +msgid "invalid input syntax for type bytea" msgstr "" #: utils/adt/float.c:135 -msgid "float4 value out of range: overflow" +msgid "type \"real\" value out of range: overflow" msgstr "" #: utils/adt/float.c:139 -msgid "float4 value out of range: underflow" +msgid "type \"real\" value out of range: underflow" msgstr "" #: utils/adt/float.c:164 -msgid "float8 value out of range: overflow" +msgid "type \"double precision\" value out of range: overflow" msgstr "" #: utils/adt/float.c:168 -msgid "float8 value out of range: underflow" +msgid "type \"double precision\" value out of range: underflow" msgstr "" #: utils/adt/float.c:200 #, c-format -msgid "invalid input syntax for float4: \"%s\"" -msgstr "" +msgid "invalid input syntax for type real: \"%s\"" +msgstr "неверный входной синтаксис для типа real: \"%s\"" #: utils/adt/float.c:208 #, c-format -msgid "\"%s\" is out of range for float4" -msgstr "" +msgid "\"%s\" is out of range for type real" +msgstr "\"%s\" вне диапазона для типа real (вещественные числа)" #: utils/adt/float.c:301 #: utils/adt/numeric.c:3117 #: utils/adt/numeric.c:3143 #, c-format -msgid "invalid input syntax for float8: \"%s\"" +msgid "invalid input syntax for type double precision: \"%s\"" msgstr "" #: utils/adt/float.c:309 #, c-format -msgid "\"%s\" is out of range for float8" -msgstr "" +msgid "\"%s\" is out of range for type double precision" +msgstr "\"%s\" вне диапазона для типа double (плавающая запятая, двойной точности)" #: utils/adt/float.c:887 #: utils/adt/float.c:906 @@ -6734,13 +7194,13 @@ msgstr "" #: utils/adt/float.c:1304 #: utils/adt/float.c:1330 -msgid "cannot take log of zero" +msgid "cannot take logarithm of zero" msgstr "" #: utils/adt/float.c:1309 #: utils/adt/float.c:1335 #: utils/adt/numeric.c:4252 -msgid "cannot take log of a negative number" +msgid "cannot take logarithm of a negative number" msgstr "" #: utils/adt/float.c:1362 @@ -6754,78 +7214,78 @@ msgstr "" msgid "input is out of range" msgstr "" -#: utils/adt/formatting.c:966 +#: utils/adt/formatting.c:968 msgid "\"9\" must be ahead of \"PR\"" msgstr "" -#: utils/adt/formatting.c:985 +#: utils/adt/formatting.c:987 msgid "\"0\" must be ahead of \"PR\"" msgstr "" -#: utils/adt/formatting.c:1014 +#: utils/adt/formatting.c:1016 msgid "multiple decimal points" msgstr "" -#: utils/adt/formatting.c:1021 -#: utils/adt/formatting.c:1126 +#: utils/adt/formatting.c:1023 +#: utils/adt/formatting.c:1128 msgid "cannot use \"V\" and decimal point together" msgstr "" -#: utils/adt/formatting.c:1036 +#: utils/adt/formatting.c:1038 msgid "not unique \"S\"" msgstr "" -#: utils/adt/formatting.c:1043 +#: utils/adt/formatting.c:1045 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together" msgstr "" -#: utils/adt/formatting.c:1067 +#: utils/adt/formatting.c:1069 msgid "cannot use \"S\" and \"MI\" together" msgstr "" -#: utils/adt/formatting.c:1080 +#: utils/adt/formatting.c:1082 msgid "cannot use \"S\" and \"PL\" together" msgstr "" -#: utils/adt/formatting.c:1093 +#: utils/adt/formatting.c:1095 msgid "cannot use \"S\" and \"SG\" together" msgstr "" -#: utils/adt/formatting.c:1105 +#: utils/adt/formatting.c:1107 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together" msgstr "" -#: utils/adt/formatting.c:1135 +#: utils/adt/formatting.c:1137 msgid "\"E\" is not supported" msgstr "" -#: utils/adt/formatting.c:1396 +#: utils/adt/formatting.c:1407 #, c-format msgid "\"%s\" is not a number" msgstr "\"%s\" не является числом" -#: utils/adt/formatting.c:1659 +#: utils/adt/formatting.c:1670 msgid "invalid AM/PM string" msgstr "" -#: utils/adt/formatting.c:2005 +#: utils/adt/formatting.c:2016 msgid "\"TZ\"/\"tz\" not supported" msgstr "" -#: utils/adt/formatting.c:2015 +#: utils/adt/formatting.c:2026 #, c-format msgid "invalid value for %s" msgstr "неверное значение для %s" -#: utils/adt/formatting.c:3035 +#: utils/adt/formatting.c:3092 msgid "AM/PM hour must be between 1 and 12" msgstr "" -#: utils/adt/formatting.c:3109 -msgid "cannot convert yday without year information" +#: utils/adt/formatting.c:3166 +msgid "cannot calculate day of year without year information" msgstr "" -#: utils/adt/formatting.c:3910 +#: utils/adt/formatting.c:3943 msgid "\"RN\" not supported" msgstr "" @@ -6836,53 +7296,53 @@ msgid "too many points requested" msgstr "" #: utils/adt/geo_ops.c:315 -msgid "could not format path" +msgid "could not format \"path\" value" msgstr "" #: utils/adt/geo_ops.c:390 #, c-format -msgid "invalid input syntax for box: \"%s\"" -msgstr "" +msgid "invalid input syntax for type box: \"%s\"" +msgstr "неверный входной синтаксис для типа box: \"%s\"" #: utils/adt/geo_ops.c:903 #, c-format -msgid "invalid input syntax for line: \"%s\"" -msgstr "" +msgid "invalid input syntax for type line: \"%s\"" +msgstr "неверный входной синтаксис для типа line: \"%s\"" #: 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 "" +msgid "type \"line\" not yet implemented" +msgstr "тип \"line\" ещё не имплементирован" #: utils/adt/geo_ops.c:1329 #: utils/adt/geo_ops.c:1352 #, c-format -msgid "invalid input syntax for path: \"%s\"" -msgstr "" +msgid "invalid input syntax for type path: \"%s\"" +msgstr "неверный входной синтаксис для типа path: \"%s\"" #: utils/adt/geo_ops.c:1389 -msgid "invalid number of points in external path" +msgid "invalid number of points in external \"path\" value" msgstr "" #: utils/adt/geo_ops.c:1730 #, c-format -msgid "invalid input syntax for point: \"%s\"" -msgstr "" +msgid "invalid input syntax for type point: \"%s\"" +msgstr "неверный входной синтаксис для типа point: \"%s\"" #: utils/adt/geo_ops.c:1958 #, c-format -msgid "invalid input syntax for lseg: \"%s\"" -msgstr "" +msgid "invalid input syntax for type lseg: \"%s\"" +msgstr "неверный входной синтаксис для типа lseg: \"%s\"" #: utils/adt/geo_ops.c:2550 -msgid "dist_lb not implemented" -msgstr "" +msgid "function \"dist_lb\" not implemented" +msgstr "функция \"dist_lb\" не имплементирована" #: utils/adt/geo_ops.c:3063 -msgid "close_lb not implemented" -msgstr "" +msgid "function \"close_lb\" not implemented" +msgstr "функция \"close_lb\" не имплементирована" #: utils/adt/geo_ops.c:3342 msgid "cannot create bounding box for empty polygon" @@ -6891,19 +7351,19 @@ msgstr "" #: utils/adt/geo_ops.c:3366 #: utils/adt/geo_ops.c:3378 #, c-format -msgid "invalid input syntax for polygon: \"%s\"" -msgstr "" +msgid "invalid input syntax for type polygon: \"%s\"" +msgstr "неверный входной синтаксис для типа polygon: \"%s\"" #: utils/adt/geo_ops.c:3418 -msgid "invalid number of points in external polygon" +msgid "invalid number of points in external \"polygon\" value" msgstr "" #: utils/adt/geo_ops.c:3728 -msgid "poly_distance not implemented" +msgid "function \"poly_distance\" not implemented" msgstr "" #: utils/adt/geo_ops.c:4040 -msgid "path_center not implemented" +msgid "function \"path_center\" not implemented" msgstr "" #: utils/adt/geo_ops.c:4057 @@ -6915,20 +7375,20 @@ msgstr "" #: utils/adt/geo_ops.c:4249 #: utils/adt/geo_ops.c:4255 #, c-format -msgid "invalid input syntax for circle: \"%s\"" -msgstr "" +msgid "invalid input syntax for type circle: \"%s\"" +msgstr "неверный входной синтаксис для типа circle: \"%s\"" #: utils/adt/geo_ops.c:4277 #: utils/adt/geo_ops.c:4285 -msgid "could not format circle" +msgid "could not format \"circle\" value" msgstr "" #: utils/adt/geo_ops.c:4312 -msgid "invalid radius in external circle" +msgid "invalid radius in external \"circle\" value" msgstr "" #: utils/adt/geo_ops.c:4806 -msgid "cannot convert zero-size circle to polygon" +msgid "cannot convert circle with radius zero to polygon" msgstr "" #: utils/adt/geo_ops.c:4811 @@ -6947,8 +7407,8 @@ msgstr "" #: utils/adt/int8.c:88 #: utils/adt/int8.c:116 #, c-format -msgid "invalid input syntax for int8: \"%s\"" -msgstr "" +msgid "invalid input syntax for type bigint: \"%s\"" +msgstr "неверный входной синтаксис для типа bigint: \"%s\"" #: utils/adt/int8.c:905 msgid "OID out of range" @@ -6962,12 +7422,12 @@ msgstr "" #: utils/adt/mac.c:65 #, c-format -msgid "invalid input syntax for macaddr: \"%s\"" -msgstr "" +msgid "invalid input syntax for type macaddr: \"%s\"" +msgstr "неверный входной синтаксис для типа macaddr: \"%s\"" #: utils/adt/mac.c:72 #, c-format -msgid "invalid octet value in macaddr: \"%s\"" +msgid "invalid octet value in \"macaddr\" value: \"%s\"" msgstr "" #: utils/adt/mac.c:190 @@ -6977,43 +7437,25 @@ msgstr "" #: utils/adt/nabstime.c:244 #: utils/adt/nabstime.c:280 #, c-format -msgid "invalid timezone name: \"%s\"" +msgid "invalid time zone name: \"%s\"" +msgstr "неверное имя временной зоны: \"%s\"" + +#: utils/adt/nabstime.c:656 +#: utils/adt/nabstime.c:729 +msgid "cannot convert abstime \"invalid\" to timestamp" msgstr "" -#: utils/adt/nabstime.c:376 -#: utils/adt/nabstime.c:382 +#: utils/adt/nabstime.c:882 #, c-format -msgid "invalid input syntax for abstime: \"%s\"" +msgid "invalid input syntax for type tinterval: \"%s\"" msgstr "" -#: utils/adt/nabstime.c:657 -#: utils/adt/nabstime.c:730 -msgid "cannot convert \"invalid\" abstime to timestamp" +#: utils/adt/nabstime.c:945 +msgid "invalid status in external \"tinterval\" value" msgstr "" -#: utils/adt/nabstime.c:779 -#: utils/adt/nabstime.c:785 -#, c-format -msgid "invalid input syntax for reltime: \"%s\"" -msgstr "" - -#: utils/adt/nabstime.c:880 -#, c-format -msgid "invalid input syntax for tinterval: \"%s\"" -msgstr "" - -#: utils/adt/nabstime.c:943 -msgid "invalid status in external tinterval" -msgstr "" - -#: utils/adt/nabstime.c:1035 -msgid "cannot convert \"invalid\" reltime to interval" -msgstr "" - -#. translator: first %s is inet or cidr -#: utils/adt/network.c:90 -#, c-format -msgid "invalid input syntax for %s: \"%s\"" +#: utils/adt/nabstime.c:1037 +msgid "cannot convert reltime \"invalid\" to interval" msgstr "" #: utils/adt/network.c:102 @@ -7035,23 +7477,23 @@ msgid "could not format inet value: %m" msgstr "" #: utils/adt/network.c:194 -msgid "invalid family in external inet" +msgid "invalid address family in external \"inet\" value" msgstr "" #: utils/adt/network.c:199 -msgid "invalid bits in external inet" +msgid "invalid bits in external \"inet\" value" msgstr "" #: utils/adt/network.c:205 -msgid "invalid type in external inet" +msgid "invalid type in external \"inet\" value" msgstr "" #: utils/adt/network.c:210 -msgid "invalid length in external inet" +msgid "invalid length in external \"inet\" value" msgstr "" #: utils/adt/network.c:228 -msgid "invalid external CIDR value" +msgid "invalid external \"cidr\" value" msgstr "" #: utils/adt/network.c:315 @@ -7062,25 +7504,25 @@ msgstr "" #: 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 +#: utils/adt/varlena.c:1622 +#: utils/adt/varlena.c:1627 msgid "invalid name syntax" msgstr "" #: utils/adt/not_in.c:65 -msgid "Must provide \"relationname.attributename\"." +msgid "Must provide \"relationname.columnname\"." msgstr "" #: utils/adt/numeric.c:403 -msgid "invalid length in external numeric" -msgstr "'" +msgid "invalid length in external \"numeric\" value" +msgstr "" #: utils/adt/numeric.c:414 -msgid "invalid sign in external numeric" +msgid "invalid sign in external \"numeric\" value" msgstr "" #: utils/adt/numeric.c:424 -msgid "invalid digit in external numeric" +msgid "invalid digit in external \"numeric\" value" msgstr "" #: utils/adt/numeric.c:1592 @@ -7095,8 +7537,8 @@ msgstr "" #: utils/adt/numeric.c:2593 #: utils/adt/numeric.c:2607 #, c-format -msgid "invalid input syntax for numeric: \"%s\"" -msgstr "" +msgid "invalid input syntax for type numeric: \"%s\"" +msgstr "неверный входной синтаксис для типа numeric: \"%s\"" #: utils/adt/numeric.c:2905 msgid "value overflows numeric format" @@ -7108,11 +7550,11 @@ msgstr "" #: utils/adt/numeric.c:2976 #, c-format -msgid "ABS(value) >= 10^%d for field with precision %d, scale %d." +msgid "The absolute value is greater than or equal to 10^%d for field with precision %d, scale %d." msgstr "" #: utils/adt/numeric.c:4125 -msgid "argument for EXP() too big" +msgid "argument for function \"exp\" too big" msgstr "" #: utils/adt/numeric.c:4501 @@ -7128,145 +7570,130 @@ msgstr "" #: utils/adt/numutils.c:105 #, c-format -msgid "%s is out of range for int4" +msgid "value \"%s\" is out of range for type integer" msgstr "" #: utils/adt/numutils.c:111 #, c-format -msgid "%s is out of range for int2" +msgid "value \"%s\" is out of range for type shortint" msgstr "" #: utils/adt/numutils.c:117 #, c-format -msgid "%s is out of range for int1" +msgid "value \"%s\" is out of range for 8-bit integer" msgstr "" #: utils/adt/oid.c:49 #: utils/adt/oid.c:54 #: utils/adt/oid.c:75 #, c-format -msgid "invalid input syntax for OID: \"%s\"" -msgstr "" +msgid "invalid input syntax for type \"oid\": \"%s\"" +msgstr "неверный входной синтаксис для типа \"oid\": \"%s\"" #: utils/adt/oid.c:60 #: utils/adt/oid.c:98 #, c-format -msgid "%s is out of range for OID" -msgstr "" +msgid "value \"%s\" is out of range for type \"oid\"" +msgstr "значение \"%s\" вне диапазона для типа \"oid\"" #: utils/adt/oid.c:176 msgid "oidvector has too many elements" msgstr "" -#: 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/ri_triggers.c:334 -#: utils/adt/ri_triggers.c:3043 -#: utils/adt/ri_triggers.c:3080 +#: utils/adt/ri_triggers.c:336 +#: utils/adt/ri_triggers.c:2719 +#: utils/adt/ri_triggers.c:3208 +#: utils/adt/ri_triggers.c:3245 #, c-format -msgid "insert or update on \"%s\" violates foreign key constraint \"%s\"" +msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\"" msgstr "" -#: utils/adt/ri_triggers.c:337 -msgid "MATCH FULL does not allow mixing of NULL and non-NULL key values." +#: utils/adt/ri_triggers.c:339 +#: utils/adt/ri_triggers.c:2722 +msgid "MATCH FULL does not allow mixing of null and nonnull key values." msgstr "" -#: utils/adt/ri_triggers.c:2545 -#: utils/adt/ri_triggers.c:2803 +#: utils/adt/ri_triggers.c:2481 +#: utils/adt/ri_triggers.c:2937 #, c-format -msgid "%s() called with wrong number of trigger arguments" +msgid "function \"%s\" called with wrong number of trigger arguments" msgstr "" -#: utils/adt/ri_triggers.c:2563 -#: utils/adt/ri_triggers.c:2813 +#: utils/adt/ri_triggers.c:2499 +#: utils/adt/ri_triggers.c:2947 #, c-format -msgid "no target table given for trigger \"%s\" on \"%s\"" +msgid "no target table given for trigger \"%s\" on table \"%s\"" msgstr "" -#: 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." +#: utils/adt/ri_triggers.c:2502 +#: utils/adt/ri_triggers.c:2950 +msgid "Remove this referential integrity trigger and its mates, then do ALTER TABLE ADD CONSTRAINT." msgstr "" -#: utils/adt/ri_triggers.c:2723 -#: utils/adt/ri_triggers.c:2733 -#: utils/adt/ri_triggers.c:3142 +#: utils/adt/ri_triggers.c:2857 +#: utils/adt/ri_triggers.c:2867 +#: utils/adt/ri_triggers.c:3307 #, c-format -msgid "table \"%s\" does not have attribute \"%s\" referenced by constraint \"%s\"" -msgstr "таблица \"%s\" не имеет атрибут \"%s\" указанный констрейнтом \"%s\"" +msgid "table \"%s\" does not have column \"%s\" referenced by constraint \"%s\"" +msgstr "таблица \"%s\" не имеет колонку \"%s\" указанный констрейнтом \"%s\"" -#: utils/adt/ri_triggers.c:2753 +#: utils/adt/ri_triggers.c:2887 #, c-format -msgid "%s() was not fired by trigger manager" +msgid "function \"%s\" was not called by trigger manager" msgstr "" -#: utils/adt/ri_triggers.c:2762 +#: utils/adt/ri_triggers.c:2896 #, c-format -msgid "%s() must be fired AFTER ROW" +msgid "function \"%s\" must be fired AFTER ROW" +msgstr "функция \"%s\" должна запускаться в AFTER ROW" + +#: utils/adt/ri_triggers.c:2904 +#, c-format +msgid "function \"%s\" must be fired for INSERT" +msgstr "функция \"%s\" должна запускаться для INSERT" + +#: utils/adt/ri_triggers.c:2910 +#, c-format +msgid "function \"%s\" must be fired for UPDATE" +msgstr "функция \"%s\" должна запускаться для UPDATE" + +#: utils/adt/ri_triggers.c:2917 +#, c-format +msgid "function \"%s\" must be fired for INSERT or UPDATE" msgstr "" -#: utils/adt/ri_triggers.c:2770 +#: utils/adt/ri_triggers.c:2924 #, c-format -msgid "%s() must be fired for INSERT" -msgstr "" +msgid "function \"%s\" must be fired for DELETE" +msgstr "функция \"%s\" должна запускаться для DELETE" -#: utils/adt/ri_triggers.c:2776 -#, c-format -msgid "%s() must be fired for UPDATE" -msgstr "" - -#: utils/adt/ri_triggers.c:2783 -#, c-format -msgid "%s() must be fired for INSERT or UPDATE" -msgstr "" - -#: utils/adt/ri_triggers.c:2790 -#, c-format -msgid "%s() must be fired for DELETE" -msgstr "" - -#: utils/adt/ri_triggers.c:3013 +#: utils/adt/ri_triggers.c:3175 #, c-format msgid "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result" msgstr "" -#: utils/adt/ri_triggers.c:3017 +#: utils/adt/ri_triggers.c:3179 msgid "This is most likely due to a rule having rewritten the query." msgstr "" -#: utils/adt/ri_triggers.c:3045 +#: utils/adt/ri_triggers.c:3210 #, c-format msgid "No rows were found in \"%s\"." msgstr "" -#: utils/adt/ri_triggers.c:3082 +#: utils/adt/ri_triggers.c:3247 #, c-format -msgid "Key (%s)=(%s) is not present in \"%s\"." -msgstr "" +msgid "Key (%s)=(%s) is not present in table \"%s\"." +msgstr "Ключ (%s)=(%s) отсутствует в таблице \"%s\"." -#: utils/adt/ri_triggers.c:3088 +#: utils/adt/ri_triggers.c:3253 #, c-format msgid "update or delete on \"%s\" violates foreign key constraint \"%s\" on \"%s\"" msgstr "" -#: utils/adt/ri_triggers.c:3091 +#: utils/adt/ri_triggers.c:3256 #, c-format -msgid "Key (%s)=(%s) is still referenced from \"%s\"." +msgid "Key (%s)=(%s) is still referenced from table \"%s\"." msgstr "" #: utils/adt/pseudotypes.c:38 @@ -7332,30 +7759,16 @@ msgstr "" msgid "cannot display a value of type anyelement" msgstr "" -#: utils/adt/regexp.c:176 +#: utils/adt/regexp.c:177 #, c-format msgid "invalid regular expression: %s" msgstr "" -#: utils/adt/regproc.c:117 -#: utils/adt/regproc.c:138 -#: utils/adt/regproc.c:290 -#, c-format -msgid "no procedure with name %s" -msgstr "" - #: utils/adt/regproc.c:122 #: utils/adt/regproc.c:142 #, c-format -msgid "more than one procedure named %s" -msgstr "" - -#: utils/adt/regproc.c:467 -#: utils/adt/regproc.c:487 -#: utils/adt/regproc.c:665 -#, c-format -msgid "no operator with name %s" -msgstr "нет оператора с именем %s" +msgid "more than one function named \"%s\"" +msgstr "две или более функции с именем \"%s\"" #: utils/adt/regproc.c:471 #: utils/adt/regproc.c:491 @@ -7363,14 +7776,6 @@ msgstr " msgid "more than one operator named %s" msgstr "" -#: utils/adt/regproc.c:639 -msgid "missing argument" -msgstr "отсутствует аргумент" - -#: utils/adt/regproc.c:640 -msgid "Use NONE to denote the missing argument of a unary operator." -msgstr "" - #: utils/adt/regproc.c:644 #: utils/adt/regproc.c:1276 msgid "too many arguments" @@ -7380,16 +7785,6 @@ msgstr " msgid "Provide two argument types for operator." msgstr "" -#: utils/adt/regproc.c:837 -#, c-format -msgid "no class with name %s" -msgstr "" - -#: utils/adt/regproc.c:1003 -#, c-format -msgid "no type with name %s" -msgstr "нет типа с именем %s" - #: utils/adt/regproc.c:1174 msgid "expected a left parenthesis" msgstr "" @@ -7406,138 +7801,127 @@ msgstr " msgid "improper type name" msgstr "неверное имя типа" -#: utils/adt/ruleutils.c:1102 -#, c-format -msgid "unsupported constraint type \"%c\"" -msgstr "" - -#: utils/adt/ruleutils.c:1557 +#: utils/adt/ruleutils.c:1553 #, c-format msgid "rule \"%s\" has unsupported event type %d" msgstr "" -#: utils/adt/selfuncs.c:3122 -#: utils/adt/selfuncs.c:3485 +#: utils/adt/selfuncs.c:3129 +#: utils/adt/selfuncs.c:3512 msgid "case insensitive matching not supported on type bytea" msgstr "" -#: utils/adt/selfuncs.c:3207 -#: utils/adt/selfuncs.c:3633 -msgid "regex matching not supported on type bytea" +#: utils/adt/selfuncs.c:3234 +#: utils/adt/selfuncs.c:3673 +msgid "regular-expression matching not supported on type bytea" msgstr "" #: utils/adt/tid.c:66 #: utils/adt/tid.c:74 #: utils/adt/tid.c:82 #, c-format -msgid "invalid input syntax for tid: \"%s\"" -msgstr "" +msgid "invalid input syntax for type tid: \"%s\"" +msgstr "неверный входной синтаксис для типа tid: \"%s\"" -#: utils/adt/timestamp.c:87 -#: utils/adt/timestamp.c:94 -#: utils/adt/timestamp.c:2389 -#, c-format -msgid "invalid input syntax for timestamp: \"%s\"" -msgstr "" - -#: utils/adt/timestamp.c:103 -#: utils/adt/timestamp.c:332 +#: utils/adt/timestamp.c:100 +#: utils/adt/timestamp.c:326 #, c-format msgid "timestamp out of range: \"%s\"" msgstr "" -#: utils/adt/timestamp.c:121 -#: utils/adt/timestamp.c:350 -#: utils/adt/timestamp.c:511 +#: utils/adt/timestamp.c:118 +#: utils/adt/timestamp.c:344 +#: utils/adt/timestamp.c:506 #, c-format -msgid "\"%s\" is no longer supported" -msgstr "\"%s\" больше не поддерживается" +msgid "date/time value \"%s\" is no longer supported" +msgstr "значение даты/времени \"%s\" больше не поддерживается" -#: utils/adt/timestamp.c:261 +#: utils/adt/timestamp.c:258 #, c-format msgid "timestamp(%d) precision must be between %d and %d" msgstr "" -#: utils/adt/timestamp.c:316 -#: utils/adt/timestamp.c:323 -#: utils/adt/timestamp.c:2449 -#, c-format -msgid "invalid input syntax for timestamp with time zone: \"%s\"" -msgstr "" - -#: utils/adt/timestamp.c:486 -#: utils/adt/timestamp.c:493 -#: utils/adt/timestamp.c:2510 -#, c-format -msgid "invalid input syntax for interval: \"%s\"" -msgstr "" - -#: utils/adt/timestamp.c:504 -#: utils/adt/timestamp.c:2218 -#: utils/adt/timestamp.c:2329 -#: utils/adt/timestamp.c:2828 +#: utils/adt/timestamp.c:499 +#: utils/adt/timestamp.c:2213 +#: utils/adt/timestamp.c:2324 +#: utils/adt/timestamp.c:2823 msgid "interval out of range" msgstr "" -#: utils/adt/timestamp.c:836 +#: utils/adt/timestamp.c:831 #, c-format msgid "interval(%d) precision must be between %d and %d" msgstr "" -#: utils/adt/timestamp.c:1694 -msgid "cannot subtract non-finite timestamps" +#: utils/adt/timestamp.c:1689 +msgid "cannot subtract infinite timestamps" msgstr "" -#: utils/adt/timestamp.c:2548 -#: utils/adt/timestamp.c:2625 -#: utils/adt/timestamp.c:2950 -#: utils/adt/timestamp.c:3126 +#: utils/adt/timestamp.c:2384 +#, c-format +msgid "invalid input syntax for type timestamp: \"%s\"" +msgstr "неверный входной синтаксис для типа timestamp: \"%s\"" + +#: utils/adt/timestamp.c:2444 +#, c-format +msgid "invalid input syntax for type timestamp with time zone: \"%s\"" +msgstr "" + +#: utils/adt/timestamp.c:2505 +#, c-format +msgid "invalid input syntax for type interval: \"%s\"" +msgstr "неверный входной синтаксис для типа interval: \"%s\"" + +#: utils/adt/timestamp.c:2543 +#: utils/adt/timestamp.c:2620 +#: utils/adt/timestamp.c:2945 +#: utils/adt/timestamp.c:3121 #, c-format msgid "timestamp units \"%s\" not recognized" msgstr "" -#: utils/adt/timestamp.c:2611 -#: utils/adt/timestamp.c:3059 -#: utils/adt/timestamp.c:3116 +#: utils/adt/timestamp.c:2606 +#: utils/adt/timestamp.c:3054 +#: utils/adt/timestamp.c:3111 #, c-format msgid "timestamp units \"%s\" not supported" msgstr "" -#: utils/adt/timestamp.c:2657 -#: utils/adt/timestamp.c:2734 -#: utils/adt/timestamp.c:3158 -#: utils/adt/timestamp.c:3326 +#: utils/adt/timestamp.c:2652 +#: utils/adt/timestamp.c:2729 +#: utils/adt/timestamp.c:3153 +#: utils/adt/timestamp.c:3321 #, c-format msgid "timestamp with time zone units \"%s\" not recognized" msgstr "" -#: utils/adt/timestamp.c:2718 -#: utils/adt/timestamp.c:3279 -#: utils/adt/timestamp.c:3317 +#: utils/adt/timestamp.c:2713 +#: utils/adt/timestamp.c:3274 +#: utils/adt/timestamp.c:3312 #, c-format msgid "timestamp with time zone units \"%s\" not supported" msgstr "" -#: utils/adt/timestamp.c:2766 -#: utils/adt/timestamp.c:2837 -#: utils/adt/timestamp.c:3358 -#: utils/adt/timestamp.c:3470 +#: utils/adt/timestamp.c:2761 +#: utils/adt/timestamp.c:2832 +#: utils/adt/timestamp.c:3353 +#: utils/adt/timestamp.c:3465 #, c-format msgid "interval units \"%s\" not recognized" msgstr "" -#: utils/adt/timestamp.c:2821 -#: utils/adt/timestamp.c:3440 +#: utils/adt/timestamp.c:2816 +#: utils/adt/timestamp.c:3435 #, c-format msgid "interval units \"%s\" not supported" msgstr "" -#: utils/adt/timestamp.c:2861 -msgid "cannot convert week number without year information" +#: utils/adt/timestamp.c:2856 +msgid "cannot calculate week number without year information" msgstr "" -#: utils/adt/timestamp.c:3553 -#: utils/adt/timestamp.c:3704 +#: utils/adt/timestamp.c:3548 +#: utils/adt/timestamp.c:3699 #, c-format msgid "interval time zone \"%s\" must not specify month" msgstr "" @@ -7557,8 +7941,8 @@ msgstr "" #: utils/adt/varbit.c:156 #: utils/adt/varbit.c:395 #, c-format -msgid "\"%c\" is not a valid hex digit" -msgstr "" +msgid "\"%c\" is not a valid hexadecimal digit" +msgstr "\"%c\" не является верным шестнацатеричным разрядом" #: utils/adt/varbit.c:348 #: utils/adt/varbit.c:532 @@ -7584,7 +7968,7 @@ msgstr "" #: utils/adt/varbit.c:1257 #: utils/adt/varbit.c:1290 -msgid "int64 is not supported on this platform" +msgid "64-bit integers not supported on this platform" msgstr "" #: utils/adt/varchar.c:105 @@ -7599,163 +7983,154 @@ msgstr "" msgid "value too long for type character varying(%d)" msgstr "" -#: utils/adt/varlena.c:579 -#: utils/adt/varlena.c:643 -#: utils/adt/varlena.c:1294 +#: utils/adt/varlena.c:580 +#: utils/adt/varlena.c:644 +#: utils/adt/varlena.c:1298 msgid "negative substring length not allowed" msgstr "" -#: utils/adt/varlena.c:1389 -#: utils/adt/varlena.c:1420 -#: utils/adt/varlena.c:1456 -#: utils/adt/varlena.c:1499 +#: utils/adt/varlena.c:1393 +#: utils/adt/varlena.c:1424 +#: utils/adt/varlena.c:1460 +#: utils/adt/varlena.c:1503 #, c-format msgid "index %d out of valid range, 0..%d" msgstr "" -#: utils/adt/varlena.c:1511 +#: utils/adt/varlena.c:1515 msgid "new bit must be 0 or 1" msgstr "" -#: utils/adt/varlena.c:2008 +#: utils/adt/varlena.c:2015 msgid "field position must be greater than zero" msgstr "" -#: utils/cache/lsyscache.c:1632 -#: utils/cache/lsyscache.c:1668 -#: utils/cache/lsyscache.c:1704 -#: utils/cache/lsyscache.c:1740 +#: utils/cache/lsyscache.c:1624 +#: utils/cache/lsyscache.c:1660 +#: utils/cache/lsyscache.c:1696 +#: utils/cache/lsyscache.c:1732 #, c-format msgid "type %s is only a shell" msgstr "тип %s является только оболочкой" -#: utils/cache/lsyscache.c:1637 +#: utils/cache/lsyscache.c:1629 #, c-format msgid "no input function available for type %s" msgstr "" -#: utils/cache/lsyscache.c:1673 +#: utils/cache/lsyscache.c:1665 #, c-format msgid "no output function available for type %s" msgstr "" -#: utils/cache/relcache.c:3184 +#: utils/cache/relcache.c:3306 #, c-format -msgid "could not create init file \"%s\": %m" -msgstr "не получилось создать файл инициализации \"%s\": %m" +msgid "could not create relation-cache initialization file \"%s\": %m" +msgstr "не получилось создать файл инициализации для кэша отношений \"%s\": %m" -#: utils/cache/relcache.c:3186 -#: utils/cache/relcache.c:3327 +#: utils/cache/relcache.c:3308 +#: utils/cache/relcache.c:3449 msgid "Continuing anyway, but there's something wrong." msgstr "" -#: utils/cache/relcache.c:3325 +#: utils/cache/relcache.c:3447 #, c-format -msgid "could not rename init file \"%s\" to \"%s\": %m" -msgstr "" +msgid "could not rename relation-cache initialization file \"%s\" to \"%s\": %m" +msgstr "не получилось переименовать файл инициализации для кэша отношений \"%s\" в \"%s\": %m" -#: utils/error/elog.c:458 +#: utils/error/elog.c:459 msgid "error during error recovery, giving up" msgstr "" -#: utils/error/elog.c:874 +#: utils/error/elog.c:887 #, c-format -msgid "failed to open \"%s\": %m" -msgstr "не удалось открыть \"%s\": %m" +msgid "could not reopen file \"%s\" as stderr: %m" +msgstr "не получилось переотктрыть файл \"%s\" как stderr: %m" -#: utils/error/elog.c:884 +#: utils/error/elog.c:900 #, c-format -msgid "failed to reopen \"%s\" as stderr: %m" -msgstr "" +msgid "could not reopen file \"%s\" as stdout: %m" +msgstr "не получилось переотктрыть файл \"%s\" как stdout: %m" -#: utils/error/elog.c:897 -#, c-format -msgid "failed to reopen \"%s\" as stdout: %m" -msgstr "" - -#: utils/error/elog.c:1055 -#: utils/error/elog.c:1188 -#: utils/error/elog.c:1251 +#: utils/error/elog.c:1058 +#: utils/error/elog.c:1204 +#: utils/error/elog.c:1267 msgid "missing error text" msgstr "" -#: utils/error/elog.c:1058 -#: utils/error/elog.c:1254 +#: utils/error/elog.c:1061 +#: utils/error/elog.c:1270 #, c-format msgid " at character %d" msgstr "" -#: utils/error/elog.c:1065 -#, c-format -msgid "DETAIL: %s\n" -msgstr "ПОДРОБНОСТИ: %s\n" - -#: utils/error/elog.c:1067 -#, c-format -msgid "HINT: %s\n" -msgstr "ПОДСКАЗКА: %s\n" - #: utils/error/elog.c:1069 -#, c-format -msgid "CONTEXT: %s\n" -msgstr "КОНТЕКСТ: %s\n" +msgid "DETAIL: " +msgstr "ПОДРОБНОСТИ:" -#: utils/error/elog.c:1073 +#: utils/error/elog.c:1075 +msgid "HINT: " +msgstr "ПОДСКАЗКА:" + +#: utils/error/elog.c:1081 +msgid "CONTEXT: " +msgstr "КОНТЕКСТ:" + +#: utils/error/elog.c:1089 #, c-format msgid "LOCATION: %s, %s:%d\n" msgstr "ГДЕ: %s, %s:%d\n" -#: utils/error/elog.c:1077 +#: utils/error/elog.c:1093 #, c-format msgid "LOCATION: %s:%d\n" msgstr "ГДЕ: %s:%d\n" -#: utils/error/elog.c:1089 -#, c-format -msgid "STATEMENT: %s\n" -msgstr "КОМАНДА: %s\n" +#: utils/error/elog.c:1103 +msgid "STATEMENT: " +msgstr "КОМАНДА:" -#: utils/error/elog.c:1359 +#: utils/error/elog.c:1375 #, c-format msgid "operating system error %d" msgstr "" -#: utils/error/elog.c:1382 +#: utils/error/elog.c:1398 msgid "DEBUG" msgstr "DEBUG" -#: utils/error/elog.c:1386 +#: utils/error/elog.c:1402 msgid "LOG" msgstr "LOG" -#: utils/error/elog.c:1389 +#: utils/error/elog.c:1405 msgid "INFO" msgstr "INFO" -#: utils/error/elog.c:1392 +#: utils/error/elog.c:1408 msgid "NOTICE" msgstr "NOTICE" -#: utils/error/elog.c:1395 +#: utils/error/elog.c:1411 msgid "WARNING" msgstr "WARNING" -#: utils/error/elog.c:1398 +#: utils/error/elog.c:1414 msgid "ERROR" msgstr "ERROR" -#: utils/error/elog.c:1401 +#: utils/error/elog.c:1417 msgid "FATAL" msgstr "FATAL" -#: utils/error/elog.c:1404 +#: utils/error/elog.c:1420 msgid "PANIC" msgstr "PANIC" #: utils/fmgr/fmgr.c:223 #, c-format -msgid "internal function \"%s\" is not in table" -msgstr "внутренняя функцич \"%s\" не в таблице" +msgid "internal function \"%s\" is not in internal lookup table" +msgstr "внутренняя функция \"%s\" не во внутренней поисковой таблице" #: utils/fmgr/fmgr.c:403 #, c-format @@ -7765,151 +8140,142 @@ msgstr "" #: utils/fmgr/fmgr.c:622 #: utils/fmgr/fmgr.c:1486 #, c-format -msgid "function %u has too many arguments (%d > %d)" -msgstr "у функции %u слишком большое число аргументов (%d > %d)" +msgid "function %u has too many arguments (%d, maximum is %d)" +msgstr "функция %u содержит слишком много аргументов (%d, при максимуме %d)" #: utils/fmgr/dfmgr.c:99 -#: utils/fmgr/dfmgr.c:197 -#: utils/fmgr/dfmgr.c:254 +#: utils/fmgr/dfmgr.c:199 +#: utils/fmgr/dfmgr.c:252 #, c-format msgid "could not access file \"%s\": %m" msgstr "" -#: utils/fmgr/dfmgr.c:134 +#: utils/fmgr/dfmgr.c:135 #, c-format msgid "could not load library \"%s\": %s" msgstr "" -#: utils/fmgr/dfmgr.c:164 +#: utils/fmgr/dfmgr.c:165 #, c-format msgid "could not find function \"%s\" in file \"%s\"" msgstr "не получилось найти фунцию \"%s\" в файле \"%s\"" -#: utils/fmgr/dfmgr.c:355 +#: utils/fmgr/dfmgr.c:353 msgid "invalid macro name in dynamic library path" msgstr "" -#: utils/fmgr/dfmgr.c:407 -msgid "zero-length component in DYNAMIC_LIBRARY_PATH" +#: utils/fmgr/dfmgr.c:405 +msgid "zero-length component in parameter \"dynamic_library_path\"" msgstr "" -#: utils/fmgr/dfmgr.c:420 -msgid "DYNAMIC_LIBRARY_PATH component is not absolute" +#: utils/fmgr/dfmgr.c:418 +msgid "component in parameter \"dynamic_library_path\" is not an absolute path" msgstr "" -#: utils/init/miscinit.c:327 +#: utils/init/miscinit.c:378 msgid "permission denied to set session authorization" msgstr "доступ запрещён по установке авторизации сессии" -#: utils/init/miscinit.c:353 +#: utils/init/miscinit.c:404 #, c-format -msgid "invalid user id: %d" +msgid "invalid user ID: %d" msgstr "неверное ID пользователя: %d" -#: utils/init/miscinit.c:443 +#: utils/init/miscinit.c:494 #, c-format msgid "could not create lock file \"%s\": %m" msgstr "" -#: utils/init/miscinit.c:457 +#: utils/init/miscinit.c:508 #, c-format msgid "could not open lock file \"%s\": %m" msgstr "" -#: utils/init/miscinit.c:463 +#: utils/init/miscinit.c:514 #, c-format msgid "could not read lock file \"%s\": %m" msgstr "" -#: utils/init/miscinit.c:494 +#: utils/init/miscinit.c:545 #, c-format msgid "lock file \"%s\" already exists" msgstr "" -#: utils/init/miscinit.c:497 +#: utils/init/miscinit.c:548 #, c-format -msgid "Is another %s (pid %d) running in \"%s\"?" +msgid "Is another %s (PID %d) running in data directory \"%s\"?" msgstr "" -#: utils/init/miscinit.c:500 +#: utils/init/miscinit.c:551 #, c-format -msgid "Is another %s (pid %d) using \"%s\"?" +msgid "Is another %s (PID %d) using socket file \"%s\"?" msgstr "" -#: utils/init/miscinit.c:529 +#: utils/init/miscinit.c:580 #, c-format -msgid "pre-existing shared memory block (key %lu, id %lu) is still in use" +msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use" msgstr "" -#: utils/init/miscinit.c:532 +#: utils/init/miscinit.c:583 #, c-format -msgid "If you're sure there are no old backends still running, remove the shared memory block with ipcrm(1), or just delete \"%s\"." +msgid "If you're sure there are no old server processes still running, remove the shared memory block with the command \"ipcrm\", or just delete the file \"%s\"." msgstr "" -#: utils/init/miscinit.c:549 +#: utils/init/miscinit.c:600 #, c-format msgid "could not remove old lock file \"%s\": %m" msgstr "" -#: 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." +#: utils/init/miscinit.c:602 +msgid "The file seems accidentally left over, but it could not be removed. Please remove the file by hand and try again." msgstr "" -#: utils/init/miscinit.c:573 +#: utils/init/miscinit.c:624 #, c-format msgid "could not write lock file \"%s\": %m" msgstr "" -#: utils/init/miscinit.c:675 +#: utils/init/miscinit.c:735 +#: utils/misc/guc.c:3910 #, c-format -msgid "could not rewrite \"%s\": %m" -msgstr "не получилось перезаписать \"%s\": %m" +msgid "could not read from file \"%s\": %m" +msgstr "не получилось считать из файла \"%s\": %m" -#: utils/init/miscinit.c:684 -#, c-format -msgid "could not read \"%s\": %m" -msgstr "не получилось считать \"%s\": %m" - -#: utils/init/miscinit.c:724 -#, c-format -msgid "could not write \"%s\": %m" -msgstr "не получилось записать \"%s\": %m" - -#: utils/init/miscinit.c:769 -#: utils/init/miscinit.c:782 +#: utils/init/miscinit.c:820 +#: utils/init/miscinit.c:833 #, c-format msgid "\"%s\" is not a valid data directory" msgstr "\"%s\" не является верной директорией данных" -#: utils/init/miscinit.c:771 +#: utils/init/miscinit.c:822 #, c-format msgid "File \"%s\" is missing." msgstr "Файл \"%s\" отсутствует." -#: utils/init/miscinit.c:784 +#: utils/init/miscinit.c:835 #, c-format msgid "File \"%s\" does not contain valid data." msgstr "Файл \"%s\" не содержит верные данные." -#: utils/init/miscinit.c:786 +#: utils/init/miscinit.c:837 msgid "You may need to initdb." msgstr "" -#: utils/init/miscinit.c:794 +#: utils/init/miscinit.c:845 #, c-format msgid "The data directory was initialized by PostgreSQL version %ld.%ld, which is not compatible with this version %s." msgstr "Директория данных была инициализирована с помощьб PostgreSQL, версии %ld.%ld, которая не совместима с этой версией: %s." -#: utils/init/miscinit.c:836 -msgid "invalid list syntax for preload_libraries configuration option" +#: utils/init/miscinit.c:887 +msgid "invalid list syntax for parameter \"preload_libraries\"" msgstr "" -#: utils/init/miscinit.c:881 +#: utils/init/miscinit.c:932 #, c-format msgid "preloaded library \"%s\" with initialization function \"%s\"" msgstr "" -#: utils/init/miscinit.c:885 +#: utils/init/miscinit.c:936 #, c-format msgid "preloaded library \"%s\"" msgstr "" @@ -7945,430 +8311,235 @@ msgstr "" #: utils/init/postinit.c:372 #, c-format -msgid "You should immediately run 'CREATE USER \"%s\" WITH SYSID %d CREATEUSER;'." +msgid "You should immediately run CREATE USER \"%s\" WITH SYSID %d CREATEUSER;." msgstr "" #: utils/init/postinit.c:408 msgid "connection limit exceeded for non-superusers" msgstr "" -#: utils/mb/conv.c:376 -#, c-format -msgid "ignoring unconvertible UTF-8 character 0x%04x" -msgstr "" - -#: utils/mb/conv.c:406 -#, c-format -msgid "invalid encoding number: %d" -msgstr "неверный номер кодировки: %d" - -#: utils/mb/conv.c:445 -#, c-format -msgid "ignoring unconvertible %s character 0x%04x" -msgstr "" - -#: utils/mb/encnames.c:445 -msgid "encoding name too long" -msgstr "" - -#: utils/mb/wchar.c:640 -msgid "UNICODE characters >= 0x10000 are not supported" -msgstr "" - -#: utils/mb/wchar.c:669 -#, c-format -msgid "invalid %s character sequence: 0x%s" -msgstr "" - -#: utils/mb/mbutils.c:252 -#, c-format -msgid "default conversion proc for %s to %s does not exist" -msgstr "" - -#: utils/mb/mbutils.c:326 -#, c-format -msgid "invalid source encoding name \"%s\"" -msgstr "неверное имя исходной кодировки: \"%s\"" - -#: utils/mb/mbutils.c:331 -#, c-format -msgid "invalid destination encoding name \"%s\"" -msgstr "неверное имя кодировки назначения: \"%s\"" - -#: utils/misc/help_config.c:62 -#, c-format -msgid "" -"Name : %-20s \n" -"Context : %-20s \n" -"Group : %-20s\n" -msgstr "" -"Имя : %-20s \n" -"Контекст : %-20s \n" -"Группа : %-20s\n" - -#: utils/misc/help_config.c:63 -#, c-format -msgid "%s\t%s\t%s\t" -msgstr "%s\t%s\t%s\t" - -#: utils/misc/help_config.c:66 -#, c-format -msgid "" -"Description: %s\n" -"%s\n" -msgstr "" -"Описание: %s\n" -"%s\n" - -#: utils/misc/help_config.c:67 -#, c-format -msgid "%s\t%s\n" -msgstr "%s\t%s\n" - -#: utils/misc/help_config.c:70 -#, c-format -msgid "" -"Type : BOOL\n" -"Reset Value: %-s \n" -msgstr "" - -#: utils/misc/help_config.c:71 -#, c-format -msgid "BOOL\t%s\t\t\t" -msgstr "BOOL\t%s\t\t\t" - -#: utils/misc/help_config.c:74 -#, c-format -msgid "" -"Type : INT\n" -"Reset Value: %-20d \n" -"Min Value : %-20d \n" -"Max Value : %-20d \n" -msgstr "" - -#: utils/misc/help_config.c:75 -#, c-format -msgid "INT\t%d\t%d\t%d\t" -msgstr "INT\t%d\t%d\t%d\t" - -#: utils/misc/help_config.c:78 -#, c-format -msgid "" -"Type : REAL\n" -"Reset Value: %-20g \n" -"Min Value : %-20g \n" -"Max Value : %-20g \n" -msgstr "" - -#: utils/misc/help_config.c:79 -#, c-format -msgid "REAL\t%g\t%g\t%g\t" -msgstr "REAL\t%g\t%g\t%g\t" - -#: utils/misc/help_config.c:82 -#, c-format -msgid "" -"Type : STRING\n" -"Reset Value: %-s \n" -msgstr "" - -#: utils/misc/help_config.c:83 -#, c-format -msgid "STRING\t%s\t\t\t" -msgstr "STRING\t%s\t\t\t" - -#: utils/misc/help_config.c:87 -msgid "NAME\tCONTEXT\tGROUP\tTYPE\tRESET_VALUE\tMIN\tMAX\tSHORT_DESCRIPTION\tLONG_DESCRIPTION\n" -msgstr "" - -#: utils/misc/help_config.c:176 -#, c-format -msgid "" -"%s \n" -" Try -h for further details\n" -msgstr "" - -#: utils/misc/help_config.c:360 -msgid "FALSE" -msgstr "FALSE" - -#: utils/misc/help_config.c:360 -msgid "TRUE" -msgstr "TRUE" - -#: utils/misc/help_config.c:383 -msgid "Unrecognized variable type!\n" -msgstr "" - -#: utils/misc/help_config.c:412 -msgid "All currently defined groups\n" -msgstr "" - -#: utils/misc/help_config.c:413 -msgid "----------------------------\n" -msgstr "----------------------------\n" - -#: utils/misc/help_config.c:415 -#, c-format -msgid "%s\n" -msgstr "%s\n" - -#: utils/misc/help_config.c:421 -msgid "Usage for --help-config option: [-h] [-g ] [-l] [-G] [-m] [-M] [string]\n" -msgstr "" - -#: utils/misc/help_config.c:427 -#, c-format -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/misc/database.c:149 -#, c-format -msgid "could not open file \"%s\": %m" -msgstr "не получилось отктрыть файл \"%s\": %m" - -#: utils/misc/guc.c:239 +#: utils/misc/guc.c:240 msgid "Ungrouped" msgstr "" -#: utils/misc/guc.c:241 -msgid "Connections & Authentication" +#: utils/misc/guc.c:242 +msgid "Connections and Authentication" msgstr "" -#: utils/misc/guc.c:243 -msgid "Connections & Authentication / Connection Settings" +#: utils/misc/guc.c:244 +msgid "Connections and Authentication / Connection Settings" msgstr "" -#: utils/misc/guc.c:245 -msgid "Connections & Authentication / Security & Authentication" +#: utils/misc/guc.c:246 +msgid "Connections and Authentication / Security and Authentication" msgstr "" -#: utils/misc/guc.c:247 +#: utils/misc/guc.c:248 msgid "Resource Usage" msgstr "" -#: utils/misc/guc.c:249 +#: utils/misc/guc.c:250 msgid "Resource Usage / Memory" msgstr "" -#: utils/misc/guc.c:251 +#: utils/misc/guc.c:252 msgid "Resource Usage / Free Space Map" msgstr "" -#: utils/misc/guc.c:253 +#: utils/misc/guc.c:254 msgid "Resource Usage / Kernel Resources" msgstr "" -#: utils/misc/guc.c:255 -msgid "Write Ahead Log" +#: utils/misc/guc.c:256 +msgid "Write-Ahead Log" msgstr "" -#: utils/misc/guc.c:257 -msgid "Write Ahead Log / Settings" +#: utils/misc/guc.c:258 +msgid "Write-Ahead Log / Settings" msgstr "" -#: utils/misc/guc.c:259 -msgid "Write Ahead Log / Checkpoints" +#: utils/misc/guc.c:260 +msgid "Write-Ahead Log / Checkpoints" msgstr "" -#: utils/misc/guc.c:261 +#: utils/misc/guc.c:262 msgid "Query Tuning" msgstr "" -#: utils/misc/guc.c:263 +#: utils/misc/guc.c:264 msgid "Query Tuning / Planner Method Enabling" msgstr "" -#: utils/misc/guc.c:265 +#: utils/misc/guc.c:266 msgid "Query Tuning / Planner Cost Constants" msgstr "" -#: utils/misc/guc.c:267 +#: utils/misc/guc.c:268 msgid "Query Tuning / Genetic Query Optimizer" msgstr "" -#: utils/misc/guc.c:269 +#: utils/misc/guc.c:270 msgid "Query Tuning / Other Planner Options" msgstr "" -#: utils/misc/guc.c:271 -msgid "Reporting & Logging" +#: utils/misc/guc.c:272 +msgid "Reporting and Logging" msgstr "" -#: utils/misc/guc.c:273 -msgid "Reporting & Logging / Syslog" +#: utils/misc/guc.c:274 +msgid "Reporting and Logging / Syslog" msgstr "" -#: utils/misc/guc.c:275 -msgid "Reporting & Logging / When To Log" +#: utils/misc/guc.c:276 +msgid "Reporting and Logging / When to Log" msgstr "" -#: utils/misc/guc.c:277 -msgid "Reporting & Logging / What To Log" +#: utils/misc/guc.c:278 +msgid "Reporting and Logging / What to Log" msgstr "" -#: utils/misc/guc.c:279 +#: utils/misc/guc.c:280 msgid "Statistics" msgstr "" -#: utils/misc/guc.c:281 +#: utils/misc/guc.c:282 msgid "Statistics / Monitoring" msgstr "" -#: utils/misc/guc.c:283 -msgid "Statistics / Query & Index Statistics Collector" +#: utils/misc/guc.c:284 +msgid "Statistics / Query and Index Statistics Collector" msgstr "" -#: utils/misc/guc.c:285 +#: utils/misc/guc.c:286 msgid "Client Connection Defaults" msgstr "" -#: utils/misc/guc.c:287 +#: utils/misc/guc.c:288 msgid "Client Connection Defaults / Statement Behavior" msgstr "" -#: utils/misc/guc.c:289 +#: utils/misc/guc.c:290 msgid "Client Connection Defaults / Locale and Formatting" msgstr "" -#: utils/misc/guc.c:291 +#: utils/misc/guc.c:292 msgid "Client Connection Defaults / Other Defaults" msgstr "" -#: utils/misc/guc.c:293 +#: utils/misc/guc.c:294 msgid "Lock Management" msgstr "" -#: utils/misc/guc.c:295 -msgid "Version & Platform Compatibility" +#: utils/misc/guc.c:296 +msgid "Version and Platform Compatibility" msgstr "" -#: utils/misc/guc.c:297 -msgid "Version & Platform Compatibility / Previous Postgres Versions" +#: utils/misc/guc.c:298 +msgid "Version and Platform Compatibility / Previous PostgreSQL Versions" msgstr "" -#: utils/misc/guc.c:299 -msgid "Version & Platform Compatibility / Other Platforms & Clients" +#: utils/misc/guc.c:300 +msgid "Version and Platform Compatibility / Other Platforms and Clients" msgstr "" -#: utils/misc/guc.c:301 +#: utils/misc/guc.c:302 msgid "Developer Options" msgstr "Опции разработчика" -#: utils/misc/guc.c:352 -msgid "Enable planner's use of sequential-scan plans" +#: utils/misc/guc.c:353 +msgid "Enables the planner's use of sequential-scan plans." msgstr "" -#: utils/misc/guc.c:360 -msgid "Enable planner's use of index-scan plans" +#: utils/misc/guc.c:361 +msgid "Enables the planner's use of index-scan plans." msgstr "" -#: utils/misc/guc.c:368 -msgid "Enable planner's use of TID scan plans" +#: utils/misc/guc.c:369 +msgid "Enables the planner's use of TID scan plans." msgstr "" -#: utils/misc/guc.c:376 -msgid "Enable planner's use of explicit sort steps" +#: utils/misc/guc.c:377 +msgid "Enables the planner's use of explicit sort steps." msgstr "" -#: utils/misc/guc.c:384 -msgid "Enable planner's use of hashed aggregation plans" +#: utils/misc/guc.c:385 +msgid "Enables the planner's use of hashed aggregation plans." msgstr "" -#: utils/misc/guc.c:392 -msgid "Enable planner's use of nested-loop join plans" +#: utils/misc/guc.c:393 +msgid "Enables the planner's use of nested-loop join plans." msgstr "" -#: utils/misc/guc.c:400 -msgid "Enable planner's use of merge join plans" +#: utils/misc/guc.c:401 +msgid "Enables the planner's use of merge join plans." msgstr "" -#: utils/misc/guc.c:408 -msgid "Enable planner's use of hash join plans" -msgstr "" - -#: utils/misc/guc.c:416 -msgid "Enable genetic query optimization" +#: utils/misc/guc.c:409 +msgid "Enables the planner's use of hash join plans." msgstr "" #: utils/misc/guc.c:417 -msgid "This algorithm attempts to do planning without exhaustive searching" +msgid "Enables genetic query optimization." msgstr "" -#: utils/misc/guc.c:426 -msgid "Set to indicate current user's privilege status" +#: utils/misc/guc.c:418 +msgid "This algorithm attempts to do planning without exhaustive searching." msgstr "" -#: utils/misc/guc.c:435 -msgid "Accept TCP/IP connections" +#: utils/misc/guc.c:427 +msgid "Shows whether the current user is a superuser." msgstr "" -#: utils/misc/guc.c:443 -msgid "Enables SSL connections" -msgstr "Включает SSL-подсоединения" - -#: utils/misc/guc.c:451 -msgid "If on, server physically writes updates to disk" +#: utils/misc/guc.c:436 +msgid "Makes the server accept TCP/IP connections." msgstr "" +#: utils/misc/guc.c:444 +msgid "Enables SSL connections." +msgstr "Включает SSL-подсоединения." + #: 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" +msgid "Forces synchronization of updates to disk." msgstr "" -#: utils/misc/guc.c:462 -msgid "Continues processing past damaged page headers" +#: utils/misc/guc.c:453 +msgid "The server 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/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" +msgid "Continues processing past damaged page headers." msgstr "" -#: utils/misc/guc.c:475 -msgid "Runs the server silently" +#: utils/misc/guc.c:464 +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/misc/guc.c:476 -msgid "If this option is set, the server will automatically run in thebackground and any controlling terminals are disassociated" +msgid "Runs the server silently." msgstr "" -#: utils/misc/guc.c:484 -msgid "Logs each successful connection" +#: utils/misc/guc.c:477 +msgid "If this parameter is set, the server will automatically run in the background and any controlling terminals are dissociated." msgstr "" -#: utils/misc/guc.c:492 -msgid "Prefixes server log messages with a time stamp" +#: utils/misc/guc.c:485 +msgid "Logs each successful connection." msgstr "" -#: utils/misc/guc.c:500 -msgid "Prefixes server log messages with the server PID" +#: utils/misc/guc.c:493 +msgid "Prefixes server log messages with a time stamp." msgstr "" -#: utils/misc/guc.c:510 -msgid "Turns on various assertion checks" +#: utils/misc/guc.c:501 +msgid "Prefixes server log messages with the server PID." msgstr "" #: 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" +msgid "Turns on various assertion checks." +msgstr "" + +#: utils/misc/guc.c:512 +msgid "This is a debugging aid." msgstr "" #: utils/misc/guc.c:523 @@ -8377,70 +8548,66 @@ msgstr "" #: 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" +#: utils/misc/guc.c:1018 +#: utils/misc/guc.c:1027 +#: utils/misc/guc.c:1095 +msgid "no description available" msgstr "" #: utils/misc/guc.c:532 -msgid "Causes each SQL statement to be logged" +msgid "Logs each SQL statement." msgstr "" #: utils/misc/guc.c:540 -msgid "Duration of every completed statement is logged" +msgid "Logs the duration each completed SQL statement." msgstr "" #: utils/misc/guc.c:548 -msgid "Parse tree printed to server logs" -msgstr "" - -#: utils/misc/guc.c:549 -msgid "Parsed for each executed query" +msgid "Prints the parse tree to the server log." msgstr "" #: utils/misc/guc.c:556 -msgid "Prints query rewriter output to server log" +msgid "Prints the parse tree after rewriting to server log." msgstr "" #: utils/misc/guc.c:564 -msgid "Prints execution plan to the server log" +msgid "Prints the execution plan to server log." msgstr "" #: utils/misc/guc.c:572 -msgid "Indents displays from parse, rewritten and plan" +msgid "Indents parse and plan tree displays." msgstr "" #: utils/misc/guc.c:580 -msgid "Write parser performance stats to server log" +msgid "Writes parser performance statistics to the server log." msgstr "" #: utils/misc/guc.c:588 -msgid "Write planner performance stats to server log" +msgid "Writes planner performance statistics to the server log." msgstr "" #: utils/misc/guc.c:596 -msgid "Write executor performance stats to server log" +msgid "Writes executor performance statistics to the server log." msgstr "" #: utils/misc/guc.c:604 -msgid "Write statement performance stats to server log" +msgid "Writes cumulative performance statistics to the server log." msgstr "" #: utils/misc/guc.c:624 -msgid "Use indented output format for EXPLAIN VERBOSE" +msgid "Uses the indented output format for EXPLAIN VERBOSE." msgstr "" #: utils/misc/guc.c:632 -msgid "Start server statistics-collection subprocess" -msgstr "" +msgid "Starts the server statistics-collection subprocess." +msgstr "Запускает подпроцесс сбора статистики." #: utils/misc/guc.c:640 -msgid "Collected statistics zeroed out on server restart" +msgid "Zeroes collected statistics on server restart." msgstr "" #: utils/misc/guc.c:648 -msgid "Enable stat collection of executing commands" +msgid "Collects statistics about executing commands." msgstr "" #: utils/misc/guc.c:649 @@ -8448,615 +8615,598 @@ msgid "Enables the collection of statistics on the currently executing command o msgstr "" #: utils/misc/guc.c:658 -msgid "Enable collection of row-level stats on db activity" +msgid "Collects row-level statistics on database activity." msgstr "" #: utils/misc/guc.c:666 -msgid "Enables collection of block-level stats on db activity" +msgid "Collects block-level statistics on database activity." msgstr "" #: utils/misc/guc.c:675 -msgid "Generates debugging output for LISTEN and NOTIFY" +msgid "Generates debugging output for LISTEN and NOTIFY." msgstr "" #: utils/misc/guc.c:724 -msgid "Log hostname to connection logs" +msgid "Logs the host name in the connection logs." msgstr "" #: 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" +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/misc/guc.c:735 -msgid "Log outgoing port number of the connecting host" +msgid "Logs the outgoing port number of the connecting host." msgstr "" #: utils/misc/guc.c:744 -msgid "This controls the inheritance semantics" +msgid "Causes subtables to be included by default in various commands." msgstr "" -#: utils/misc/guc.c:745 -msgid "In particular, whether subtables are included by various commands by default" +#: utils/misc/guc.c:752 +msgid "Interprets ACST, CST, EST, and SAT as Australian time zones." msgstr "" #: utils/misc/guc.c:753 -msgid "If true, ACST, CST, EST, and SAT are interpreted as Australian time zones" +msgid "Otherwise they are interpreted as North/South American time zones and Saturday." msgstr "" -#: utils/misc/guc.c:755 -msgid "Otherwise they are interpreted as North/South American time zones and Saturday" +#: utils/misc/guc.c:761 +msgid "Encrypt passwords." msgstr "" -#: utils/misc/guc.c:763 -msgid "If unspecified the password is encrypted" +#: utils/misc/guc.c:762 +msgid "When a password is specified in CREATE USER or ALTER USER without writing either ENCRYPTED or UNENCRYPTED, this parameter determines whether the password is to be encrypted." msgstr "" -#: 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" +#: utils/misc/guc.c:771 +msgid "Treats \"expr=NULL\" as \"expr IS NULL\"." msgstr "" -#: utils/misc/guc.c:773 -msgid "expr=NULL treated as expr IS NULL" +#: utils/misc/guc.c:772 +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/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)" +#: utils/misc/guc.c:783 +msgid "Enables per-database user names." msgstr "" -#: utils/misc/guc.c:785 -msgid "This allows per-database user names" +#: utils/misc/guc.c:792 +msgid "This parameter doesn't do anything." msgstr "" -#: utils/misc/guc.c:794 -msgid "This var doesn't do anything" -msgstr "" - -#: utils/misc/guc.c:795 +#: utils/misc/guc.c:793 msgid "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-vintage clients." msgstr "" -#: utils/misc/guc.c:804 -msgid "Controls default read-only status of new transactions" +#: utils/misc/guc.c:801 +msgid "Sets the default read-only status of new transactions." msgstr "" -#: utils/misc/guc.c:812 -msgid "Current transaction's read-only status" +#: utils/misc/guc.c:809 +msgid "Shows the current transaction's read-only status." +msgstr "Показывает статус \"только для чтения\" текущей транзакции." + +#: utils/misc/guc.c:818 +msgid "Automatically adds missing table references to FROM clauses." msgstr "" -#: utils/misc/guc.c:821 -msgid "Add missing table references to FROM clauses" +#: utils/misc/guc.c:826 +msgid "Check function bodies during CREATE FUNCTION." msgstr "" -#: utils/misc/guc.c:839 -msgid "Sets the default statistics target" +#: utils/misc/guc.c:844 +msgid "Sets the default statistics target." msgstr "" -#: 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" +#: utils/misc/guc.c:845 +msgid "This applies to table columns that have not had a column-specific target set via ALTER TABLE SET STATISTICS." msgstr "" -#: utils/misc/guc.c:848 -msgid "From list size beyond which sub-queries are not collapsed" +#: utils/misc/guc.c:853 +msgid "Sets the FROM-list size beyond which subqueries are not collapsed." msgstr "" -#: 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" +#: utils/misc/guc.c:855 +msgid "The planner will merge subqueries into upper queries if the resulting FROM list would have no more than this many items." msgstr "" -#: utils/misc/guc.c:859 -msgid "From list size beyond which JOIN constructs not flattened" +#: utils/misc/guc.c:864 +msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened." msgstr "" -#: 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" +#: utils/misc/guc.c:866 +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/misc/guc.c:870 -msgid "Threshold of FROM items beyond which geqo is used" +#: utils/misc/guc.c:875 +msgid "Sets the threshold of FROM items beyond which GEQO is used." msgstr "" -#: utils/misc/guc.c:878 -msgid "The number of individuals in one population" +#: utils/misc/guc.c:883 +msgid "GEQO: number of individuals in one population." msgstr "" -#: utils/misc/guc.c:886 -msgid "Effort is used to calculate a default for generations" +#: utils/misc/guc.c:891 +msgid "GEQO: effort is used to calculate a default for generations." msgstr "" -#: utils/misc/guc.c:894 -msgid "Specifies the number of iterations in the algorithm" +#: utils/misc/guc.c:899 +msgid "GEQO: number of iterations in the algorithm." msgstr "" -#: utils/misc/guc.c:895 -msgid "The number must be a positive integer. If 0 is specified then Effort * Log2(PoolSize) is used" +#: utils/misc/guc.c:900 +msgid "The number must be a positive integer. If 0 is specified then effort * log2(poolsize) is used." msgstr "" -#: utils/misc/guc.c:903 -msgid "Can be set to get reproducible results from the algorithm" +#: utils/misc/guc.c:909 +msgid "The time in milliseconds to wait on lock before checking for deadlock." msgstr "" -#: utils/misc/guc.c:904 -msgid "If it is set to -1 then the algorithm behaves non-deterministically" +#: utils/misc/guc.c:919 +msgid "Uses syslog for logging." msgstr "" -#: utils/misc/guc.c:913 -msgid "Time to wait on lock (msec) before checking for deadlock" +#: utils/misc/guc.c:920 +msgid "If this parameter 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/misc/guc.c:923 -msgid "Allows the use of syslog for logging" +#: utils/misc/guc.c:939 +msgid "Sets the maximum number of concurrent connections." +msgstr "Устанавливает максимально доступное число подсоединений." + +#: utils/misc/guc.c:948 +msgid "Sets the number of connection slots reserved for superusers." msgstr "" -#: 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" +#: utils/misc/guc.c:957 +msgid "Sets the number of shared memory buffers used by the server." msgstr "" -#: utils/misc/guc.c:943 -msgid "Max number of concurrent connections" +#: utils/misc/guc.c:966 +msgid "Sets the TCP port the server listens on." msgstr "" -#: utils/misc/guc.c:952 -msgid "Number of connection \"slots\" reserved for superusers" +#: utils/misc/guc.c:975 +msgid "Sets the access permissions of the Unix-domain socket." msgstr "" -#: utils/misc/guc.c:961 -msgid "The number of shared memory buffers used by the server" +#: utils/misc/guc.c:976 +msgid "Unix-domain sockets use the usual Unix file system permission set. The parameter 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/misc/guc.c:970 -msgid "The TCP port the server listens on" +#: utils/misc/guc.c:988 +msgid "Sets the maximum memory to be used for sorts and hash tables." msgstr "" -#: utils/misc/guc.c:979 -msgid "Sets the access permissions of the Unix domain socket" -msgstr "" - -#: 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/misc/guc.c:992 -msgid "Max memory to be used for sorts and hash tables" -msgstr "" - -#: utils/misc/guc.c:993 +#: utils/misc/guc.c:989 msgid "Specifies the amount of memory to be used by internal sort operations and hash tables before switching to temporary disk files" msgstr "" -#: utils/misc/guc.c:1003 -msgid "Max mem used to keep track of to-be-reclaimed tuples" +#: utils/misc/guc.c:999 +msgid "Sets the maximum memory used to keep track of to-be-reclaimed rows." msgstr "" -#: utils/misc/guc.c:1012 -msgid "Max num of simultaneously open files for each subprocess" +#: utils/misc/guc.c:1008 +msgid "Sets the maximum number of simultaneously open files for each server process." msgstr "" -#: utils/misc/guc.c:1041 -msgid "Max expression nesting depth" +#: utils/misc/guc.c:1037 +msgid "Sets the maximum expression nesting depth." msgstr "" -#: utils/misc/guc.c:1050 -msgid "Max allowed duration (msec) of any statement" +#: utils/misc/guc.c:1046 +msgid "Sets the maximum allowed duration (in milliseconds) of any statement." msgstr "" -#: utils/misc/guc.c:1051 -msgid "A value of 0 turns off the timeout" +#: utils/misc/guc.c:1047 +msgid "A value of 0 turns off the timeout." msgstr "" -#: utils/misc/guc.c:1059 -msgid "Max num. of tables+indexes for which free space is tracked" +#: utils/misc/guc.c:1055 +msgid "Sets the maximum number of tables and indexes for which free space is tracked." msgstr "" -#: utils/misc/guc.c:1068 -msgid "Max num. of disk pages for which free space is tracked" +#: utils/misc/guc.c:1064 +msgid "Sets the maximum number of disk pages for which free space is tracked." msgstr "" -#: utils/misc/guc.c:1078 -msgid "Max locks per transaction" +#: utils/misc/guc.c:1074 +msgid "Sets the maximum number of locks per transaction." msgstr "" -#: utils/misc/guc.c:1079 +#: utils/misc/guc.c:1075 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/misc/guc.c:1089 -msgid "Max time (sec) to complete client authentication" +#: utils/misc/guc.c:1085 +msgid "Sets the maximum time in seconds to complete client authentication." msgstr "" -#: utils/misc/guc.c:1109 -msgid "Max distance between automatic WAL checkpoints" +#: utils/misc/guc.c:1105 +msgid "Sets the maximum distance in log segments between automatic WAL checkpoints." msgstr "" -#: utils/misc/guc.c:1118 -msgid "Max time (sec) between automatic WAL checkpoints" +#: utils/misc/guc.c:1114 +msgid "Sets the maximum time in seconds between automatic WAL checkpoints." msgstr "" -#: utils/misc/guc.c:1127 -msgid "Log if filling of checkpoint segments happens more frequently than this (sec)" +#: utils/misc/guc.c:1123 +msgid "Logs if filling of checkpoint segments happens more frequently than this (in seconds)." msgstr "" -#: 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." +#: utils/misc/guc.c:1125 +msgid "Write a message to the server log 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/misc/guc.c:1139 -msgid "Disk-page buffers in shared memory for WAL logging" +#: utils/misc/guc.c:1135 +msgid "Sets the number of disk-page buffers in shared memory for WAL." msgstr "" -#: utils/misc/guc.c:1148 -msgid "If nonzero, log WAL-related debugging output" +#: utils/misc/guc.c:1144 +msgid "If nonzero, WAL-related debugging output is logged." msgstr "" -#: utils/misc/guc.c:1158 -msgid "Delay (usec) between transaction commit and flushing WAL to disk" +#: utils/misc/guc.c:1154 +msgid "Sets the delay in microseconds between transaction commit and flushing WAL to disk." msgstr "" -#: utils/misc/guc.c:1168 -msgid "Min concurrent open trans. before performing COMMIT_DELAY" +#: utils/misc/guc.c:1164 +msgid "Sets the minimum concurrent open transactions before performing commit_delay." msgstr "" -#: utils/misc/guc.c:1178 -msgid "Adjusts number of digits displayed for floating-point values" +#: utils/misc/guc.c:1174 +msgid "Sets the number of digits displayed for floating-point values." msgstr "" -#: 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)" +#: utils/misc/guc.c:1175 +msgid "This affects real, double precision, and geometric data types. The parameter value is added to the standard number of digits (FLT_DIG or DBL_DIG as appropriate)." msgstr "" -#: utils/misc/guc.c:1190 -msgid "Min execution time (msec) above which statements will be logged" +#: utils/misc/guc.c:1185 +msgid "Sets the minimum execution time in milliseconds above which statements will be logged." msgstr "" -#: utils/misc/guc.c:1192 -msgid "The default is 0 (turning this feature off)." +#: utils/misc/guc.c:1187 +msgid "Zero prints all queries. The default is -1 (turning this feature off)." msgstr "" -#: utils/misc/guc.c:1209 -msgid "Planner's assumption about size of the disk cache" +#: utils/misc/guc.c:1204 +msgid "Sets the planner's assumption about size of the disk cache." msgstr "" -#: utils/misc/guc.c:1210 +#: utils/misc/guc.c:1205 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/misc/guc.c:1219 -msgid "Planner's estimate of the cost of a nonsequentially fetched disk page" +#: utils/misc/guc.c:1214 +msgid "Sets the planner's estimate of the cost of a nonsequentially fetched disk page." msgstr "" -#: utils/misc/guc.c:1221 +#: utils/misc/guc.c:1216 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/misc/guc.c:1231 -msgid "Planner's estimate of the cost of processing each tuple" +#: utils/misc/guc.c:1226 +msgid "Sets the planner's estimate of the cost of processing each tuple (row)." msgstr "" -#: utils/misc/guc.c:1232 -#: utils/misc/guc.c:1242 -#: utils/misc/guc.c:1251 +#: utils/misc/guc.c:1227 +#: utils/misc/guc.c:1237 +#: utils/misc/guc.c:1246 msgid "This is measured as a fraction of the cost of a sequential page fetch." msgstr "" -#: utils/misc/guc.c:1240 -msgid "Planner's estimate of processing cost for each index tuple during index scan" +#: utils/misc/guc.c:1235 +msgid "Sets the planner's estimate of processing cost for each index tuple (row) during index scan." msgstr "" -#: utils/misc/guc.c:1250 -msgid "Planner's estimate of processing cost of each op. in WHERE" +#: utils/misc/guc.c:1245 +msgid "Sets the planner's estimate of processing cost of each operator in WHERE." msgstr "" -#: utils/misc/guc.c:1260 -msgid "The selective pressure within the population" +#: utils/misc/guc.c:1255 +msgid "GEQO: selective pressure within the population." msgstr "" -#: utils/misc/guc.c:1270 -msgid "Seed for random-number generation" +#: utils/misc/guc.c:1265 +msgid "Sets the seed for random-number generation." msgstr "" -#: utils/misc/guc.c:1289 -msgid "Client's character set encoding" +#: utils/misc/guc.c:1284 +msgid "Sets the client's character set encoding." msgstr "" -#: utils/misc/guc.c:1299 -msgid "Controls which message levels are sent to the client" +#: utils/misc/guc.c:1294 +msgid "Sets the message levels that are sent to the client." msgstr "" -#: utils/misc/guc.c:1300 +#: utils/misc/guc.c:1295 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/misc/guc.c:1311 -msgid "Controls which message levels logged" +#: utils/misc/guc.c:1306 +msgid "Sets the message levels that are logged." msgstr "" -#: 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" +#: utils/misc/guc.c:1307 +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/misc/guc.c:1322 -msgid "Controls verbosity of logged messages" +#: utils/misc/guc.c:1317 +msgid "Sets the verbosity of logged messages." msgstr "" -#: utils/misc/guc.c:1323 -msgid "Valid values are TERSE, DEFAULT, and VERBOSE" +#: utils/misc/guc.c:1318 +msgid "Valid values are \"terse\", \"default\", and \"verbose\"." msgstr "" -#: utils/misc/guc.c:1331 -msgid "Controls whether the erroneous statement is logged" +#: utils/misc/guc.c:1326 +msgid "Causes all statements generating error at or above this level to be logged." msgstr "" -#: utils/misc/guc.c:1332 -msgid "All SQL statements that cause an error of the specified level, or a higher level, are logged" +#: utils/misc/guc.c:1327 +msgid "All SQL statements that cause an error of the specified level or a higher level are logged." msgstr "" -#: utils/misc/guc.c:1341 -msgid "Sets display format for date and time values" +#: utils/misc/guc.c:1336 +msgid "Sets the display format for date and time values." msgstr "" -#: utils/misc/guc.c:1342 -msgid "Also controls interpretation of ambiguous date inputs" +#: utils/misc/guc.c:1337 +msgid "Also controls interpretation of ambiguous date inputs." msgstr "" -#: utils/misc/guc.c:1352 -msgid "The default isolation level of each new transaction" +#: utils/misc/guc.c:1347 +msgid "Sets the transaction isolation level of each new transaction." msgstr "" -#: utils/misc/guc.c:1353 +#: utils/misc/guc.c:1348 msgid "Each SQL transaction has an isolation level, which can be either \"read committed\" or \"serializable\"." msgstr "" -#: utils/misc/guc.c:1362 -msgid "Path for dynamically loadable modules" +#: utils/misc/guc.c:1357 +msgid "Sets the path for dynamically loadable modules." msgstr "" -#: 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." +#: utils/misc/guc.c:1358 +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/misc/guc.c:1374 -msgid "The location of the Kerberos server key file" +#: utils/misc/guc.c:1369 +msgid "Sets the location of the Kerberos server key file." msgstr "" -#: utils/misc/guc.c:1383 -msgid "The Rendezvous broadcast service name" +#: utils/misc/guc.c:1378 +msgid "Sets the Rendezvous broadcast service name." msgstr "" -#: utils/misc/guc.c:1394 -msgid "Locale collation order" +#: utils/misc/guc.c:1389 +msgid "Shows the collation order locale." msgstr "" -#: utils/misc/guc.c:1404 -msgid "Locale character classification and case conversion" +#: utils/misc/guc.c:1399 +msgid "Shows the character classification and case conversion locale." msgstr "" -#: utils/misc/guc.c:1414 -msgid "Language in which messages are displayed" +#: utils/misc/guc.c:1409 +msgid "Sets the language in which messages are displayed." msgstr "" -#: utils/misc/guc.c:1423 -msgid "Locale for formatting monetary amounts" +#: utils/misc/guc.c:1418 +msgid "Sets the locale for formatting monetary amounts." msgstr "" -#: utils/misc/guc.c:1432 -msgid "Locale for formatting numbers" +#: utils/misc/guc.c:1427 +msgid "Sets the locale for formatting numbers." msgstr "" -#: utils/misc/guc.c:1441 -msgid "Locale for formatting date and time values" +#: utils/misc/guc.c:1436 +msgid "Sets the locale for formatting date and time values." msgstr "" -#: utils/misc/guc.c:1450 -msgid "Shared libraries to preload into postmaster" +#: utils/misc/guc.c:1445 +msgid "Lists shared libraries to preload into server." msgstr "" -#: utils/misc/guc.c:1460 -msgid "Regular expression \"flavor\"" +#: utils/misc/guc.c:1455 +msgid "Sets the regular expression \"flavor\"." msgstr "" -#: utils/misc/guc.c:1461 -msgid "This can be set to advanced, extended, or basic" +#: utils/misc/guc.c:1456 +msgid "This can be set to advanced, extended, or basic." msgstr "" -#: utils/misc/guc.c:1469 -msgid "Schema search order for names not schema-qualified" +#: utils/misc/guc.c:1464 +msgid "Sets the schema search order for names that are not schema-qualified." msgstr "" -#: utils/misc/guc.c:1480 -msgid "Server (database) character set encoding" +#: utils/misc/guc.c:1475 +msgid "Sets the server (database) character set encoding." msgstr "" -#: utils/misc/guc.c:1491 -msgid "Server version" -msgstr "Версия сервера" +#: utils/misc/guc.c:1486 +msgid "Shows the server version." +msgstr "Показываеи версия сервера." -#: utils/misc/guc.c:1502 -msgid "Current session userid" +#: utils/misc/guc.c:1497 +msgid "Shows the session user name." msgstr "" -#: utils/misc/guc.c:1513 -msgid "syslog \"facility\" to be used when syslog enabled" +#: utils/misc/guc.c:1508 +msgid "Sets the syslog \"facility\" to be used when syslog enabled." msgstr "" -#: utils/misc/guc.c:1514 -msgid "You may choose from LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7" +#: utils/misc/guc.c:1509 +msgid "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7." msgstr "" -#: utils/misc/guc.c:1522 -msgid "Program name used to identify PostgreSQL messages in syslog" +#: utils/misc/guc.c:1517 +msgid "Sets the program name used to identify PostgreSQL messages in syslog." msgstr "" -#: utils/misc/guc.c:1533 -msgid "Time zone for displaying and interpreting time stamps" +#: utils/misc/guc.c:1528 +msgid "Sets the time zone for displaying and interpreting time stamps." msgstr "" -#: utils/misc/guc.c:1542 -msgid "Current transaction's isolation level" +#: utils/misc/guc.c:1537 +msgid "Shows the current transaction's isolation level." msgstr "" -#: utils/misc/guc.c:1552 -msgid "The group owner of the Unix domain socket" +#: utils/misc/guc.c:1547 +msgid "Sets the owning group of the Unix-domain socket." msgstr "" -#: utils/misc/guc.c:1553 +#: utils/misc/guc.c:1548 msgid "(The owning user of the socket is always the user that starts the server.)" msgstr "" -#: utils/misc/guc.c:1562 -msgid "The Unix-domain socket directory to listen to" +#: utils/misc/guc.c:1557 +msgid "Sets the directory where the Unix-domain socket will be created." msgstr "" -#: utils/misc/guc.c:1571 -msgid "The host name or IP address to listen to" -msgstr "Имя хоста или IP-адрес для прослушивания" +#: utils/misc/guc.c:1566 +msgid "Sets the host name or IP address to listen to." +msgstr "Устанавливает имя хоста или IP-адрес для прослушивания." -#: utils/misc/guc.c:1580 -msgid "Method used for forcing WAL updates out to disk" +#: utils/misc/guc.c:1575 +msgid "Selects the method used for forcing WAL updates out to disk." msgstr "" -#: 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 +#: utils/misc/guc.c:2408 +#: utils/misc/guc.c:3013 +#: utils/misc/guc.c:3049 +#: utils/misc/guc.c:3105 +#: utils/misc/guc.c:3399 #, c-format -msgid "\"%s\" is not a recognized option" +msgid "unrecognized configuration parameter \"%s\"" +msgstr "не распознанный параметр конфигурации: \"%s\"" + +#: utils/misc/guc.c:2427 +#, c-format +msgid "parameter \"%s\" cannot be changed" +msgstr "параметр \"%s\" нельзя изменить" + +#: utils/misc/guc.c:2439 +#, c-format +msgid "parameter \"%s\" cannot be changed after server start" msgstr "" -#: utils/misc/guc.c:2432 +#: utils/misc/guc.c:2449 #, c-format -msgid "\"%s\" cannot be changed" +msgid "parameter \"%s\" cannot be changed now" msgstr "" -#: utils/misc/guc.c:2444 +#: utils/misc/guc.c:2479 #, c-format -msgid "\"%s\" cannot be changed after server start" +msgid "parameter \"%s\" cannot be set after connection start" msgstr "" -#: utils/misc/guc.c:2454 +#: utils/misc/guc.c:2489 +#: utils/misc/guc.c:2559 +#: utils/misc/guc.c:2656 +#: utils/misc/guc.c:2752 +#: utils/misc/guc.c:2851 #, c-format -msgid "\"%s\" cannot be changed now" -msgstr "" +msgid "permission denied to set parameter \"%s\"" +msgstr "доступ запрещён по установке параметра \"%s\"" -#: utils/misc/guc.c:2484 +#: utils/misc/guc.c:2547 #, c-format -msgid "\"%s\" cannot be set after connection start" -msgstr "" +msgid "parameter \"%s\" requires a Boolean value" +msgstr "параметр \"%s\" требует булевское значение" -#: 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 "permission denied to set option \"%s\"" -msgstr "доступ запрещён по установке опции \"%s\"" - -#: utils/misc/guc.c:2552 -#, c-format -msgid "\"%s\" requires a boolean value" -msgstr "\"%s\" требует булевское значение" - -#: utils/misc/guc.c:2566 +#: utils/misc/guc.c:2561 msgid "Must be superuser to change this value to false." msgstr "" -#: utils/misc/guc.c:2588 -#: utils/misc/guc.c:2685 +#: utils/misc/guc.c:2583 +#: utils/misc/guc.c:2680 #, c-format -msgid "invalid value for \"%s\": %d" -msgstr "неверное значение для \"%s\": %d" +msgid "invalid value for parameter \"%s\": %d" +msgstr "неверное значение для параметра \"%s\": %d" -#: utils/misc/guc.c:2640 +#: utils/misc/guc.c:2635 #, c-format -msgid "\"%s\" requires an integer value" -msgstr "\"%s\" требует целое значение" +msgid "parameter \"%s\" requires an integer value" +msgstr "параметр \"%s\" требует целое значение" -#: utils/misc/guc.c:2648 +#: utils/misc/guc.c:2643 #, c-format -msgid "%d is outside the valid range for \"%s\" (%d .. %d)" +msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)" msgstr "" -#: utils/misc/guc.c:2663 +#: utils/misc/guc.c:2658 msgid "Must be superuser to increase this value or set it to zero." msgstr "" -#: utils/misc/guc.c:2737 +#: utils/misc/guc.c:2732 #, c-format -msgid "\"%s\" requires a numeric value" -msgstr "\"%s\" требует числовое значение" +msgid "parameter \"%s\" requires a numeric value" +msgstr "параметр \"%s\" требует числовое значение" -#: utils/misc/guc.c:2745 +#: utils/misc/guc.c:2740 #, c-format -msgid "%g is outside the valid range for \"%s\" (%g .. %g)" +msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)" msgstr "" -#: utils/misc/guc.c:2759 -#: utils/misc/guc.c:2858 +#: utils/misc/guc.c:2754 +#: utils/misc/guc.c:2853 msgid "Must be superuser to increase this value." msgstr "" -#: utils/misc/guc.c:2781 +#: utils/misc/guc.c:2776 #, c-format -msgid "invalid value for \"%s\": %g" -msgstr "неверное значение для \"%s\": %g" +msgid "invalid value for parameter \"%s\": %g" +msgstr "неверное значение для параметра \"%s\": %g" -#: utils/misc/guc.c:2912 +#: utils/misc/guc.c:2907 #, c-format -msgid "invalid value for \"%s\": \"%s\"" -msgstr "неверное значение для \"%s\": \"%s\"" +msgid "invalid value for parameter \"%s\": \"%s\"" +msgstr "неверное значение для параметра \"%s\": \"%s\"" -#: utils/misc/guc.c:3119 +#: utils/misc/guc.c:3114 #, c-format msgid "SET %s takes only one argument" msgstr "SET %s принимает только один аргумент" -#: utils/misc/guc.c:3223 -msgid "SET variable name is required" -msgstr "SET требуется имя переменной" +#: utils/misc/guc.c:3218 +msgid "SET requires parameter name" +msgstr "SET требует имя параметра" -#: utils/misc/guc.c:3780 -msgid "could not write exec config params file \"" -msgstr "" - -#: utils/misc/guc.c:3781 -#: utils/misc/guc.c:3917 +#: utils/misc/guc.c:4029 #, c-format -msgid "\": %m" -msgstr "\": %m" +msgid "could not parse setting for parameter \"%s\"" +msgstr "не получилось проанализировать установки для параметра \"%s\"" -#: utils/misc/guc.c:3916 -msgid "could not read exec config params file \"" -msgstr "" - -#: utils/misc/guc.c:4036 -#, c-format -msgid "could not parse setting for \"%s\"" -msgstr "не получилось проанализировать установки для \"%s\"" - -#: utils/misc/guc.c:4383 +#: utils/misc/guc.c:4376 msgid "SET AUTOCOMMIT TO OFF is no longer supported" msgstr "SET AUTOCOMMIT TO OFF больше не поддерживается" +#: guc-file.l:267 +#, c-format +msgid "syntax error in file \"%s\" line %u, near token \"%s\"" +msgstr "" + #: utils/mmgr/aset.c:336 #, c-format msgid "Failed while creating memory context \"%s\"." msgstr "" #: utils/mmgr/aset.c:502 -#: utils/mmgr/aset.c:702 -#: utils/mmgr/aset.c:895 +#: utils/mmgr/aset.c:699 +#: utils/mmgr/aset.c:892 #, c-format msgid "Failed on request of size %lu." msgstr "" #: utils/mmgr/portalmem.c:170 #, c-format -msgid "portal \"%s\" already exists" -msgstr "портал \"%s\" уже существует" +msgid "cursor \"%s\" already exists" +msgstr "курсор \"%s\" уже существует" #: utils/mmgr/portalmem.c:174 #, c-format -msgid "closing pre-existing portal \"%s\"" +msgid "closing existing cursor \"%s\"" msgstr "" #: utils/sort/logtape.c:202 @@ -9066,7 +9216,7 @@ msgstr "" #: utils/sort/logtape.c:204 msgid "Perhaps out of disk space?" -msgstr "" +msgstr "Возможно нет места на диске?" #: utils/sort/logtape.c:221 #, c-format @@ -9079,5 +9229,5 @@ msgstr " #: utils/sort/tuplesort.c:2073 msgid "Table contains duplicated values." -msgstr "" +msgstr "Таблица содержит дубликаты."