From 1c31374e3d4afa8d6e5abda950c1bb7051a4fc40 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut <peter_e@gmx.net> Date: Fri, 13 Aug 2004 16:34:31 +0000 Subject: [PATCH] Translation updates --- src/bin/pg_controldata/po/ru.po | 21 ++--- src/bin/pg_resetxlog/po/ru.po | 150 ++++++++++++++++---------------- src/bin/scripts/po/ru.po | 27 +++--- 3 files changed, 105 insertions(+), 93 deletions(-) diff --git a/src/bin/pg_controldata/po/ru.po b/src/bin/pg_controldata/po/ru.po index 838ae67dda9..d6ea6894a3c 100644 --- a/src/bin/pg_controldata/po/ru.po +++ b/src/bin/pg_controldata/po/ru.po @@ -1,19 +1,19 @@ # ru.po # PG_CONTROLDATA Translated Messages into the Russian Language (KOI8-R) # -# $PostgreSQL: pgsql/src/bin/pg_controldata/po/ru.po,v 1.9 2004/08/10 18:42:19 petere Exp $ +# $PostgreSQL: pgsql/src/bin/pg_controldata/po/ru.po,v 1.10 2004/08/13 16:34:23 petere Exp $ # # ChangeLog: -# - March 27 - August 7, 2004: Update for 8.0; <mokhov@cs.concordia.ca> -# - July 24 - August 23, 2003: Update for 7.4.*; <mokhov@cs.concordia.ca> +# - March 27 - August 11, 2004: Updates for 8.0; <mokhov@cs.concordia.ca> +# - July 24 - August 23, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca> # - September 7, 2002: Complete post 7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca> # - August 31, 2002: Initial Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca> # msgid "" msgstr "" "Project-Id-Version: PostgreSQL 8.0\n" -"POT-Creation-Date: 2004-07-17 13:09-0300\n" -"PO-Revision-Date: 2004-03-27 14:05-0500\n" +"POT-Creation-Date: 2004-08-11 07:15-0300\n" +"PO-Revision-Date: 2004-08-11 11:58-0500\n" "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n" "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n" "MIME-Version: 1.0\n" @@ -46,7 +46,7 @@ msgstr "" "�����:\n" " ��������� �������� ���������� �� ���������� �������� ��� ���������\n" " --help �������� ��� ��������� � �����\n" -" --version �������� ������ pg_controldata � �����\n" +" --version �������� ������ � �����\n" "\n" #: pg_controldata.c:41 @@ -57,8 +57,8 @@ msgid "" "\n" msgstr "" "\n" -"���� ���������� ������ �� �������, ����� �������������� �������� ����������\n" -"��������� PGDATA.\n" +"���� ���������� ������ �� �������, ����� �������������� ��������\n" +"���������� ��������� PGDATA.\n" "\n" #: pg_controldata.c:42 @@ -178,8 +178,8 @@ msgstr "UNDO #: pg_controldata.c:168 #, c-format -msgid "Latest checkpoint's StartUpID: %u\n" -msgstr "StartUpID ��������� checkpoint: %u\n" +msgid "Latest checkpoint's TimeLineID: %u\n" +msgstr "TimeLineID ��������� checkpoint: %u\n" #: pg_controldata.c:169 #, c-format @@ -248,3 +248,4 @@ msgstr "LC_COLLATE: %s\n" #, c-format msgid "LC_CTYPE: %s\n" msgstr "LC_CTYPE: %s\n" + diff --git a/src/bin/pg_resetxlog/po/ru.po b/src/bin/pg_resetxlog/po/ru.po index 4b6415bdb68..81631c5ea97 100644 --- a/src/bin/pg_resetxlog/po/ru.po +++ b/src/bin/pg_resetxlog/po/ru.po @@ -1,10 +1,10 @@ # ru.po # PG_RESETXLOG Translated Messages into the Russian Language (KOI8-R) # -# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.9 2004/08/10 18:42:20 petere Exp $ +# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/ru.po,v 1.10 2004/08/13 16:34:23 petere Exp $ # # ChangeLog: -# - April 6 - August 7, 2004: Updates for 8.0; <mokhov@cs.concordia.ca> +# - April 6 - August 11, 2004: Updates for 8.0; <mokhov@cs.concordia.ca> # - July 24 - August 23, 2003: Updates for 7.4.*; <mokhov@cs.concordia.ca> # - October 12, 2002: Complete post-7.3beta2 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca> # - September 7, 2002: Complete post-7.3beta1 Translation, Serguei A. Mokhov <mokhov@cs.concordia.ca> @@ -13,56 +13,62 @@ msgid "" msgstr "" "Project-Id-Version: PostgreSQL 8.0\n" -"POT-Creation-Date: 2004-07-17 13:09-0300\n" -"PO-Revision-Date: 2004-04-06 12:17-0500\n" +"POT-Creation-Date: 2004-08-11 19:15-0300\n" +"PO-Revision-Date: 2004-08-11 23:32-0500\n" "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n" "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#: pg_resetxlog.c:140 +#: pg_resetxlog.c:120 #, c-format msgid "%s: invalid argument for option -x\n" msgstr "%s: �������� �������� ��� ����� -x\n" -#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178 -#: pg_resetxlog.c:184 pg_resetxlog.c:192 +#: pg_resetxlog.c:121 +#: pg_resetxlog.c:136 +#: pg_resetxlog.c:151 +#: pg_resetxlog.c:158 +#: pg_resetxlog.c:164 +#: pg_resetxlog.c:172 #, c-format msgid "Try \"%s --help\" for more information.\n" msgstr "�������� \"%s --help\" ��� ����� ��������� ����������.\n" -#: pg_resetxlog.c:146 +#: pg_resetxlog.c:126 #, c-format msgid "%s: transaction ID (-x) must not be 0\n" msgstr "%s: ID ���������� (-x) �� ������ ���� 0\n" -#: pg_resetxlog.c:155 +#: pg_resetxlog.c:135 #, c-format msgid "%s: invalid argument for option -o\n" msgstr "%s: �������� �������� ��� ����� -o\n" -#: pg_resetxlog.c:161 +#: pg_resetxlog.c:141 #, c-format msgid "%s: OID (-o) must not be 0\n" msgstr "%s: OID (-o) �� ������ ���� 0\n" -#: pg_resetxlog.c:170 pg_resetxlog.c:177 +#: pg_resetxlog.c:150 +#: pg_resetxlog.c:157 #, c-format msgid "%s: invalid argument for option -l\n" msgstr "%s: �������� �������� ��� ����� -l\n" -#: pg_resetxlog.c:191 +#: pg_resetxlog.c:171 #, c-format msgid "%s: no data directory specified\n" msgstr "%s: ���������� ������ �� �������\n" -#: pg_resetxlog.c:211 pg_resetxlog.c:307 +#: pg_resetxlog.c:191 +#: pg_resetxlog.c:287 #, c-format msgid "%s: could not open file \"%s\" for reading: %s\n" msgstr "%s: �� ���������� ������� ���� \"%s\" ��� ������: %s\n" -#: pg_resetxlog.c:217 +#: pg_resetxlog.c:197 #, c-format msgid "" "%s: lock file \"%s\" exists\n" @@ -71,7 +77,7 @@ msgstr "" "%s: �������� lock-���� \"%s\"\n" "������� �� ������? ���� ���, ������� ���� ���� � ���������� �����.\n" -#: pg_resetxlog.c:256 +#: pg_resetxlog.c:236 msgid "" "\n" "If these values seem acceptable, use -f to force reset.\n" @@ -79,7 +85,7 @@ msgstr "" "\n" "���� ��� �������� �������� �����������, ����������� -f ��� ������ģ����� ������.\n" -#: pg_resetxlog.c:268 +#: pg_resetxlog.c:248 msgid "" "The database server was not shut down cleanly.\n" "Resetting the transaction log may cause data to be lost.\n" @@ -89,11 +95,11 @@ msgstr "" "����� ���� ���������� ����� �������� � ������ ������.\n" "���� �� �ӣ �� ������ ���������� �� ������ �� ���, ����������� -f ��� ������ģ����� ������.\n" -#: pg_resetxlog.c:281 +#: pg_resetxlog.c:261 msgid "Transaction log reset\n" msgstr "��� ���������� �������\n" -#: pg_resetxlog.c:310 +#: pg_resetxlog.c:290 #, c-format msgid "" "If you are sure the data directory path is correct, execute\n" @@ -104,32 +110,32 @@ msgstr "" " touch %s\n" "� ���������� �����.\n" -#: pg_resetxlog.c:323 +#: pg_resetxlog.c:303 #, c-format msgid "%s: could not read file \"%s\": %s\n" msgstr "%s: �� ���������� ������� ���� \"%s\": %s\n" -#: pg_resetxlog.c:346 +#: pg_resetxlog.c:326 #, c-format msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n" msgstr "%s: pg_control ����������, �� ��� ����������� ����� CRC �������; ����������� � �������������\n" -#: pg_resetxlog.c:355 +#: pg_resetxlog.c:335 #, c-format msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n" msgstr "%s: pg_control ����������, �� ������ģ� ��� ����������� ������; ������������...\n" -#: pg_resetxlog.c:419 +#: pg_resetxlog.c:399 #, c-format msgid "%s: invalid LC_COLLATE setting\n" msgstr "%s: �������� �������� LC_COLLATE\n" -#: pg_resetxlog.c:426 +#: pg_resetxlog.c:406 #, c-format msgid "%s: invalid LC_CTYPE setting\n" msgstr "%s: �������� �������� LC_CTYPE\n" -#: pg_resetxlog.c:450 +#: pg_resetxlog.c:430 msgid "" "Guessed pg_control values:\n" "\n" @@ -137,7 +143,7 @@ msgstr "" "��������� �������� pg_control:\n" "\n" -#: pg_resetxlog.c:452 +#: pg_resetxlog.c:432 msgid "" "pg_control values:\n" "\n" @@ -145,141 +151,142 @@ msgstr "" "�������� pg_control:\n" "\n" -#: pg_resetxlog.c:461 +#: pg_resetxlog.c:441 #, c-format msgid "pg_control version number: %u\n" msgstr "����� ������ pg_control: %u\n" -#: pg_resetxlog.c:462 +#: pg_resetxlog.c:442 #, c-format msgid "Catalog version number: %u\n" msgstr "����� ������ ��������: %u\n" -#: pg_resetxlog.c:463 +#: pg_resetxlog.c:443 #, c-format msgid "Database system identifier: %s\n" msgstr "������������� ������� ��� ������: %s\n" -#: pg_resetxlog.c:464 +#: pg_resetxlog.c:444 #, c-format msgid "Current log file ID: %u\n" msgstr "������� ID ����� �������: %u\n" -#: pg_resetxlog.c:465 +#: pg_resetxlog.c:445 #, c-format msgid "Next log file segment: %u\n" msgstr "��������� ������� ����� �������: %u\n" -#: pg_resetxlog.c:466 +#: pg_resetxlog.c:446 #, c-format -msgid "Latest checkpoint's StartUpID: %u\n" -msgstr "StartUpID ��������� checkpoint: %u\n" +msgid "Latest checkpoint's TimeLineID: %u\n" +msgstr "TimeLineID ��������� checkpoint: %u\n" -#: pg_resetxlog.c:467 +#: pg_resetxlog.c:447 #, c-format msgid "Latest checkpoint's NextXID: %u\n" msgstr "NextXID ��������� checkpoint: %u\n" -#: pg_resetxlog.c:468 +#: pg_resetxlog.c:448 #, c-format msgid "Latest checkpoint's NextOID: %u\n" msgstr "NextOID ��������� checkpoint: %u\n" -#: pg_resetxlog.c:469 +#: pg_resetxlog.c:449 #, c-format msgid "Database block size: %u\n" msgstr "������ ����� ����: %u\n" -#: pg_resetxlog.c:470 +#: pg_resetxlog.c:450 #, c-format msgid "Blocks per segment of large relation: %u\n" msgstr "������ �� ������� ������� �����: %u\n" -#: pg_resetxlog.c:471 +#: pg_resetxlog.c:451 #, c-format msgid "Maximum length of identifiers: %u\n" msgstr "������������ ����� ���������������: %u\n" -#: pg_resetxlog.c:472 +#: pg_resetxlog.c:452 #, c-format msgid "Maximum number of function arguments: %u\n" msgstr "����. ����� ���������� �������: %u\n" -#: pg_resetxlog.c:473 +#: pg_resetxlog.c:453 #, c-format msgid "Date/time type storage: %s\n" msgstr "��� �������� ����/�������: %s\n" -#: pg_resetxlog.c:474 +#: pg_resetxlog.c:454 msgid "64-bit integers" msgstr "64-������ �����" -#: pg_resetxlog.c:474 +#: pg_resetxlog.c:454 msgid "floating-point numbers" msgstr "��������� �������" -#: pg_resetxlog.c:475 +#: pg_resetxlog.c:455 #, c-format msgid "Maximum length of locale name: %u\n" msgstr "������������ ����� ����� ������: %u\n" -#: pg_resetxlog.c:476 +#: pg_resetxlog.c:456 #, c-format msgid "LC_COLLATE: %s\n" msgstr "LC_COLLATE: %s\n" -#: pg_resetxlog.c:477 +#: pg_resetxlog.c:457 #, c-format msgid "LC_CTYPE: %s\n" msgstr "LC_CTYPE: %s\n" -#: pg_resetxlog.c:538 +#: pg_resetxlog.c:518 #, c-format -msgid "" -"%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n" +msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n" msgstr "%s: ���������� ������ -- sizeof(ControlFileData) ������� ����� ... ���� ��������� xlog.c\n" -#: pg_resetxlog.c:551 +#: pg_resetxlog.c:531 #, c-format msgid "%s: could not create pg_control file: %s\n" msgstr "%s: �� ���������� ������� ���� pg_control: %s\n" -#: pg_resetxlog.c:562 +#: pg_resetxlog.c:542 #, c-format msgid "%s: could not write pg_control file: %s\n" msgstr "%s: �� ���������� �������� � ���� pg_control: %s\n" -#: pg_resetxlog.c:569 pg_resetxlog.c:744 +#: pg_resetxlog.c:549 +#: pg_resetxlog.c:704 #, c-format msgid "%s: fsync error: %s\n" msgstr "%s: ������ fsync: %s\n" -#: pg_resetxlog.c:590 +#: pg_resetxlog.c:570 #, c-format msgid "%s: could not open directory \"%s\": %s\n" msgstr "%s: �� ���������� ������� ���������� \"%s\": %s\n" -#: pg_resetxlog.c:604 +#: pg_resetxlog.c:584 #, c-format msgid "%s: could not delete file \"%s\": %s\n" msgstr "%s: �� ���������� ������� ���� \"%s\": %s\n" -#: pg_resetxlog.c:620 +#: pg_resetxlog.c:600 #, c-format msgid "%s: could not read from directory \"%s\": %s\n" msgstr "%s: �� ���������� ������� �� ���������� \"%s\": %s\n" -#: pg_resetxlog.c:711 +#: pg_resetxlog.c:671 #, c-format msgid "%s: could not open file \"%s\": %s\n" msgstr "%s: �� ���������� ������� ���� \"%s\": %s\n" -#: pg_resetxlog.c:722 pg_resetxlog.c:736 +#: pg_resetxlog.c:682 +#: pg_resetxlog.c:696 #, c-format msgid "%s: could not write file \"%s\": %s\n" msgstr "%s: �� ���������� �������� ���� \"%s\": %s\n" -#: pg_resetxlog.c:755 +#: pg_resetxlog.c:715 #, c-format msgid "" "%s resets the PostgreSQL transaction log.\n" @@ -288,7 +295,7 @@ msgstr "" "%s ���������� ��� ���������� PostgreSQL.\n" "\n" -#: pg_resetxlog.c:756 +#: pg_resetxlog.c:716 #, c-format msgid "" "Usage:\n" @@ -299,46 +306,43 @@ msgstr "" " %s [�����]... ���������\n" "\n" -#: pg_resetxlog.c:757 +#: pg_resetxlog.c:717 msgid "Options:\n" msgstr "�����:\n" -#: pg_resetxlog.c:758 +#: pg_resetxlog.c:718 msgid " -f force update to be done\n" msgstr " -f �������������� ���������� ����������\n" -#: pg_resetxlog.c:759 -msgid "" -" -l FILEID,SEG force minimum WAL starting location for new transaction " -"log\n" +#: pg_resetxlog.c:719 +msgid " -l FILEID,SEG force minimum WAL starting location for new transaction log\n" msgstr " -l FILEID,SEG ��������� ���. ��������� �������� � WAL ��� ������ ���� ����������\n" -#: pg_resetxlog.c:760 -msgid "" -" -n no update, just show extracted control values (for " -"testing)\n" +#: pg_resetxlog.c:720 +msgid " -n no update, just show extracted control values (for testing)\n" msgstr " -n ��� ����������, ������ �������� ��������� ����������� �������� (��� ������������)\n" -#: pg_resetxlog.c:761 +#: pg_resetxlog.c:721 msgid " -o OID set next OID\n" msgstr " -o OID ��������� ����������� OID\n" -#: pg_resetxlog.c:762 +#: pg_resetxlog.c:722 msgid " -x XID set next transaction ID\n" msgstr " -x XID ��������� ID ��������� ����������\n" -#: pg_resetxlog.c:763 +#: pg_resetxlog.c:723 msgid " --help show this help, then exit\n" msgstr " --help �������� ��� ��������� � �����\n" -#: pg_resetxlog.c:764 +#: pg_resetxlog.c:724 msgid " --version output version information, then exit\n" msgstr " --version �������� ������ � �����\n" -#: pg_resetxlog.c:765 +#: pg_resetxlog.c:725 msgid "" "\n" "Report bugs to <pgsql-bugs@postgresql.org>.\n" msgstr "" "\n" "��������� �� �������: <pgsql-bugs@postgresql.org>.\n" + diff --git a/src/bin/scripts/po/ru.po b/src/bin/scripts/po/ru.po index 183ecae0b47..77e540879ac 100644 --- a/src/bin/scripts/po/ru.po +++ b/src/bin/scripts/po/ru.po @@ -1,22 +1,21 @@ # ru.po # PGSCRIPTS Translated Messages into the Russian Language (KOI8-R) # -# $PostgreSQL: pgsql/src/bin/scripts/po/ru.po,v 1.7 2004/08/10 18:42:21 petere Exp $ +# $PostgreSQL: pgsql/src/bin/scripts/po/ru.po,v 1.8 2004/08/13 16:34:31 petere Exp $ # # To the new translator: # PG Russian Translation Discussion Group: <http://groups.yahoo.com/group/pgsql-rus/> # PG Glossary: <http://www.sai.msu.su/~megera/oddmuse/index.cgi?Pgsql_Glossary> # # ChangeLog: -# - May 28 - August 7, 2004: Updates for 8.0; <mokhov@cs.concordia.ca> +# - May 28 - August 11, 2004: Updates for 8.0; <mokhov@cs.concordia.ca> # - July 24 - August 25, 2003: Complete Initial Translation for 7.4.*; Serguei A. Mokhov, <mokhov@cs.concordia.ca> # - msgid "" msgstr "" "Project-Id-Version: PostgreSQL 8.0\n" -"POT-Creation-Date: 2004-07-17 13:11-0300\n" -"PO-Revision-Date: 2004-08-07 18:30-0500\n" +"POT-Creation-Date: 2004-08-11 19:17-0300\n" +"PO-Revision-Date: 2004-08-11 23:41-0500\n" "Last-Translator: Serguei A. Mokhov <mokhov@cs.concordia.ca>\n" "Language-Team: pgsql-rus <pgsql-rus@yahoogroups.com>\n" "MIME-Version: 1.0\n" @@ -156,6 +155,14 @@ msgstr "" "\n" "����� �������������:\n" +#: createdb.c:230 +msgid " -h, --host=HOSTNAME database server host or socket directory\n" +msgstr " -h, --host=���� ������ ��� ������ ��� ���������� �������\n" + +#: createdb.c:231 +msgid " -p, --port=PORT database server port\n" +msgstr " -p, --port=���� ���� ������� ��� ������\n" + #: createdb.c:232 msgid " -U, --username=USERNAME user name to connect as\n" msgstr " -U, --username=������������ ��� ������������ ��� �������������\n" @@ -210,7 +217,7 @@ msgstr " #: createlang.c:150 #: droplang.c:147 msgid "Procedural Languages" -msgstr "����������� �����" +msgstr "����������� �����" #: createlang.c:159 #: droplang.c:156 @@ -254,7 +261,7 @@ msgstr " %s [ #: createlang.c:302 msgid " -d, --dbname=DBNAME database to install language in\n" -msgstr " -d, --dbname=����� ���� � ������� ���������� ����\n" +msgstr " -d, --dbname=����� ���� � ������� ���������� ����\n" #: clusterdb.c:242 #: createlang.c:303 @@ -613,7 +620,7 @@ msgstr "%s: #: vacuumdb.c:210 #, c-format msgid "%s: vacuuming of database \"%s\" failed: %s" -msgstr "%s: vacuuming of database \"%s\" failed: %s" +msgstr "%s: ������ ��� ������ ���� \"%s\": %s" #: vacuumdb.c:247 #, c-format @@ -680,7 +687,7 @@ msgstr "" #: common.c:86 #: common.c:112 msgid "Password: " -msgstr "������:" +msgstr "������: " #: common.c:99 #, c-format @@ -700,7 +707,7 @@ msgstr "%s: #: common.c:147 #, c-format msgid "%s: query was: %s\n" -msgstr "%s: ������: %s\n" +msgstr "%s: ������ ���: %s\n" #. translator: Make sure the (y/n) prompts match the translation of this. #: common.c:161 -- GitLab