summaryrefslogtreecommitdiff
path: root/po/ru
diff options
context:
space:
mode:
Diffstat (limited to 'po/ru')
-rw-r--r--po/ru/boot-installer.po6
-rw-r--r--po/ru/boot-new.po8
-rw-r--r--po/ru/gpl.po63
-rw-r--r--po/ru/installation-howto.po10
-rw-r--r--po/ru/preseed.po8
5 files changed, 51 insertions, 44 deletions
diff --git a/po/ru/boot-installer.po b/po/ru/boot-installer.po
index 03db37d3f..d2c7c33cb 100644
--- a/po/ru/boot-installer.po
+++ b/po/ru/boot-installer.po
@@ -1527,9 +1527,9 @@ msgid ""
msgstr ""
"Выбрав пункт <quote>Help</quote>, можно увидеть первый справочный экран, на "
"котором дано краткое описание всех доступных справочных экранов. Чтобы "
-"вернуться в загрузочное меню из справочных экранов, введите <quote>menu</quote> в "
-"приглашении к загрузке и нажмите &enterkey;. Все справочные экраны имеют "
-"приглашение к загрузке, в котором можно набрать команду загрузки: "
+"вернуться в загрузочное меню из справочных экранов, введите <quote>menu</"
+"quote> в приглашении к загрузке и нажмите &enterkey;. Все справочные экраны "
+"имеют приглашение к загрузке, в котором можно набрать команду загрузки: "
"<informalexample><screen>\n"
"Press F1 for the help index, or ENTER to boot:\n"
"</screen></informalexample> В приглашении к загрузке, вы можете просто "
diff --git a/po/ru/boot-new.po b/po/ru/boot-new.po
index 388cdf400..6e08e62a4 100644
--- a/po/ru/boot-new.po
+++ b/po/ru/boot-new.po
@@ -291,8 +291,8 @@ msgstr ""
msgid ""
"For partitions encrypted using dm-crypt you will be shown the following "
"prompt during the boot: <informalexample><screen>\n"
-"Starting early crypto disks... <replaceable>part</replaceable>_crypt"
-"(starting)\n"
+"Starting early crypto disks... <replaceable>part</"
+"replaceable>_crypt(starting)\n"
"Enter LUKS passphrase:\n"
"</screen></informalexample> In the first line of the prompt, "
"<replaceable>part</replaceable> is the name of the underlying partition, e."
@@ -310,8 +310,8 @@ msgid ""
msgstr ""
"Для разделов, зашифрованных dm-crypt, во время загрузки вы увидите следующее "
"сообщение: <informalexample><screen>\n"
-"Starting early crypto disks... <replaceable>part</replaceable>_crypt"
-"(starting)\n"
+"Starting early crypto disks... <replaceable>part</"
+"replaceable>_crypt(starting)\n"
"Enter LUKS passphrase:\n"
"</screen></informalexample> В первой строке приглашения, вместо "
"<replaceable>part</replaceable> будет указано название используемого "
diff --git a/po/ru/gpl.po b/po/ru/gpl.po
index f3824c3d1..cd72e383b 100644
--- a/po/ru/gpl.po
+++ b/po/ru/gpl.po
@@ -251,12 +251,13 @@ msgstr ""
"<emphasis role=\"bold\">0.</emphasis> This License applies to any program or "
"other work which contains a notice placed by the copyright holder saying it "
"may be distributed under the terms of this General Public License. The "
-"<quote>Program</quote>, below, refers to any such program or work, and a <quote>work based "
-"on the Program</quote> means either the Program or any derivative work under "
-"copyright law: that is to say, a work containing the Program or a portion of "
-"it, either verbatim or with modifications and/or translated into another "
-"language. (Hereinafter, translation is included without limitation in the "
-"term <quote>modification</quote>.) Each licensee is addressed as <quote>you</quote>."
+"<quote>Program</quote>, below, refers to any such program or work, and a "
+"<quote>work based on the Program</quote> means either the Program or any "
+"derivative work under copyright law: that is to say, a work containing the "
+"Program or a portion of it, either verbatim or with modifications and/or "
+"translated into another language. (Hereinafter, translation is included "
+"without limitation in the term <quote>modification</quote>.) Each licensee "
+"is addressed as <quote>you</quote>."
#. Tag: para
#: gpl.xml:134
@@ -697,11 +698,12 @@ msgstr ""
"to time. Such new versions will be similar in spirit to the present version, "
"but may differ in detail to address new problems or concerns. Each version "
"is given a distinguishing version number. If the Program specifies a version "
-"number of this License which applies to it and <quote>any later version</quote>, you "
-"have the option of following the terms and conditions either of that version "
-"or of any later version published by the Free Software Foundation. If the "
-"Program does not specify a version number of this License, you may choose "
-"any version ever published by the Free Software Foundation."
+"number of this License which applies to it and <quote>any later version</"
+"quote>, you have the option of following the terms and conditions either of "
+"that version or of any later version published by the Free Software "
+"Foundation. If the Program does not specify a version number of this "
+"License, you may choose any version ever published by the Free Software "
+"Foundation."
#. Tag: para
#: gpl.xml:383
@@ -748,12 +750,12 @@ msgstr ""
"<emphasis role=\"bold\">11.</emphasis> BECAUSE THE PROGRAM IS LICENSED FREE "
"OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY "
"APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT "
-"HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM <quote>AS IS</quote> WITHOUT WARRANTY "
-"OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE "
-"IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. "
-"THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH "
-"YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL "
-"NECESSARY SERVICING, REPAIR OR CORRECTION."
+"HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM <quote>AS IS</quote> "
+"WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT "
+"NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A "
+"PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE "
+"PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST "
+"OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION."
#. Tag: para
#: gpl.xml:412
@@ -815,8 +817,9 @@ msgid ""
msgstr ""
"To do so, attach the following notices to the program. It is safest to "
"attach them to the start of each source file to most effectively convey the "
-"exclusion of warranty; and each file should have at least the <quote>copyright</quote> "
-"line and a pointer to where the full notice is found."
+"exclusion of warranty; and each file should have at least the "
+"<quote>copyright</quote> line and a pointer to where the full notice is "
+"found."
#. Tag: screen
#: gpl.xml:448
@@ -894,8 +897,10 @@ msgstr ""
"Gnomovision version 69, Copyright (C) <replaceable>year name of author</"
"replaceable>\n"
"Gnomovision comes with absolutely no warranty; for details\n"
-"type <userinput>show w</userinput>. This is free software, and you are welcome\n"
-"to redistribute it under certain conditions; type <userinput>show c</userinput>\n"
+"type <userinput>show w</userinput>. This is free software, and you are "
+"welcome\n"
+"to redistribute it under certain conditions; type <userinput>show c</"
+"userinput>\n"
"for details."
#. Tag: para
@@ -908,10 +913,11 @@ msgid ""
"quote> and <quote>show c</quote>; they could even be mouse-clicks or menu "
"items &mdash; whatever suits your program."
msgstr ""
-"The hypothetical commands <quote>show w</quote> and <quote>show c</quote> should show the appropriate "
-"parts of the General Public License. Of course, the commands you use may be "
-"called something other than <quote>show w</quote> and <quote>show c</quote>; they could even be mouse-"
-"clicks or menu items &mdash; whatever suits your program."
+"The hypothetical commands <quote>show w</quote> and <quote>show c</quote> "
+"should show the appropriate parts of the General Public License. Of course, "
+"the commands you use may be called something other than <quote>show w</"
+"quote> and <quote>show c</quote>; they could even be mouse-clicks or menu "
+"items &mdash; whatever suits your program."
#. Tag: para
#: gpl.xml:470
@@ -922,8 +928,8 @@ msgid ""
"program, if necessary. Here is a sample; alter the names:"
msgstr ""
"You should also get your employer (if you work as a programmer) or your "
-"school, if any, to sign a <quote>copyright disclaimer</quote> for the program, if "
-"necessary. Here is a sample; alter the names:"
+"school, if any, to sign a <quote>copyright disclaimer</quote> for the "
+"program, if necessary. Here is a sample; alter the names:"
#. Tag: screen
#: gpl.xml:476
@@ -938,7 +944,8 @@ msgid ""
"Ty Coon, President of Vice"
msgstr ""
"Yoyodyne, Inc., hereby disclaims all copyright interest in the\n"
-"program <userinput>Gnomovision</userinput> (which makes passes at compilers) written\n"
+"program <userinput>Gnomovision</userinput> (which makes passes at compilers) "
+"written\n"
"by James Hacker.\n"
"\n"
"<replaceable>signature of Ty Coon</replaceable>, 1 April 1989\n"
diff --git a/po/ru/installation-howto.po b/po/ru/installation-howto.po
index bcab26956..0521b1c12 100644
--- a/po/ru/installation-howto.po
+++ b/po/ru/installation-howto.po
@@ -134,11 +134,11 @@ msgid ""
msgstr ""
"Образ CD netinst очень популярен для установки &releasename; с помощью &d-"
"i;. Он предназначены для загрузки с CD и установки дополнительных пакетов по "
-"сети, отсюда и название <quote>netinst</quote>. В нём содержатся компоненты, необходимые "
-"для запуска программы установки и базовые пакеты,предоставляющие минимальную "
-"систему &releasename;. При желании можно воспользоваться полным CD-образом, "
-"который не требует наличия сети для установки. Для этого достаточно первого "
-"диска из набора."
+"сети, отсюда и название <quote>netinst</quote>. В нём содержатся компоненты, "
+"необходимые для запуска программы установки и базовые пакеты,предоставляющие "
+"минимальную систему &releasename;. При желании можно воспользоваться полным "
+"CD-образом, который не требует наличия сети для установки. Для этого "
+"достаточно первого диска из набора."
#. Tag: para
#: installation-howto.xml:77
diff --git a/po/ru/preseed.po b/po/ru/preseed.po
index 1a2019db9..6110600c2 100644
--- a/po/ru/preseed.po
+++ b/po/ru/preseed.po
@@ -1191,10 +1191,10 @@ msgid ""
"network."
msgstr ""
"Заметим, что пример выше ограничивает использование имени файла только DHCP "
-"клиентами с идентификатором <quote>d-i</quote>, поэтому он не влияет на простых DHCP "
-"клиентов, а только на программу установки. Вы также можете поместить текст в "
-"строфу указав определённую машину, чтобы избежать автоматизации всех "
-"установок в сети."
+"клиентами с идентификатором <quote>d-i</quote>, поэтому он не влияет на "
+"простых DHCP клиентов, а только на программу установки. Вы также можете "
+"поместить текст в строфу указав определённую машину, чтобы избежать "
+"автоматизации всех установок в сети."
#. Tag: para
#: preseed.xml:582