Update of /cvsroot/l10n-russian/di-docs
In directory haydn:/tmp/cvs-serv9714
Modified Files:
boot-installer.ru.po
Log Message:
resolv conflict version
Index: boot-installer.ru.po
===================================================================
RCS file: /cvsroot/l10n-russian/di-docs/boot-installer.ru.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- boot-installer.ru.po 7 Nov 2004 22:22:51 -0000 1.14
+++ boot-installer.ru.po 8 Nov 2004 07:24:35 -0000 1.15
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: boot-installer.ru\n"
"POT-Creation-Date: 2001-02-09 01:25+0100\n"
-"PO-Revision-Date: 2004-11-07 14:32+0400\n"
+"PO-Revision-Date: 2004-11-07 15:31+0400\n"
"Last-Translator: Yuri Kozlov <[EMAIL PROTECTED]>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -1047,6 +1047,9 @@
"and read about alternate kernels and installation methods which may work for "
"you."
msgstr ""
+"ÐÐÐÐÑÐÐ, ÑÑÐ ÐÐÐÐÑÐÑÑÐ CD ÐÑÐÐÐÐÐÐ ÐÑÐÐÑ
ÑÐÐÑÐÐÐÑÐÑÐ ÐÑÐÐÐÐÑÑ, Ð ÐÐÑÑÐÐÑ ÐÐÐ "
+"ÐÐÐÐÑÑÑÐÐÑ ÐÐ ÑÐÐÐÐÑ ÑÑÐÐÐÑÑ ÑÑÑÐÐÐÐÐÐ.
ÐÑÐÐ ÐÑÐÐÐÐÐÐÐÐÐÑ ÑÑÐÐÐÐÑÑÐÐÑ
ÐÐÑÐÐÐÐÐÐÑÐÐÑÐÐÑÑ "
+"ÐÐÐÑÑÐÐÐ Ñ CD ÐÐ ÑÐÐÐÑÐÐÑ ÐÐ ÐÐÑÐÐ
ÐÐÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐ, ÐÐÑÐÑÐÑÐÑÑ Ð ÑÑÐÐ
ÐÐÐÐÐ ÑÐÐÐÐ Ð ÐÑÐÑÐÑÐÐÑÐ ÐÐ ÐÐÑÑÐÑÐÐÑÐÐÐÑÐ
ÑÐÑÐÑ Ð ÐÐÑÐÐÐÑ ÑÑÑÐÐÐÐÐÐ, ÐÐÑÐÑÑÐ ÐÐÐÑÑ
ÐÐÐ ÐÐÐÐÐÑÐ."
# index.docbook:545, index.docbook:597, index.docbook:1062,
index.docbook:1868, index.docbook:2109, index.docbook:2413
#. Tag: para
@@ -1060,6 +1063,8 @@
"system, base system, and any additional packages, point the installation "
"system at the CD-ROM drive."
msgstr ""
+"ÐÐÐÐ ÐÑÐÐ ÐÑ ÐÐ ÑÐÐÐÐÐ ÐÐÐÑÑÐÐÑÑÑÑ Ñ CD-ROM,
ÐÐÑÐÑÑÐÐ ÐÑ ÑÐÐÐÐÑÐ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑÑ
ÑÐÑÑÐÐÑ Debian Ð ÐÐÐÐÑÑ Ñ CD-ROM. ÐÑÐÑÑÐ
ÐÐÐÑÑÐÐÑÐÑÑ Ñ ÐÑÑÐÐÐÐ ÐÐÑÐÑÐÐÑ, ÐÐÐÑÐÐÐÑ Ñ
ÐÐÑÐÐÑ. "
+"ÐÐÐÐÐ ÐÑÐÐÐÑÑ ÐÑÐÐÑ ÑÑÑÐÐÐÐÐÐ
ÐÐÐÑÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÑ, ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ ÐÐÐ
ÐÐÐÐÐÐÐÑÐÐÑÐÑÑ ÐÐÐÐÑÐÐ, ÑÐÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐ
ÑÑÑÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐ CD-ROM."
# index.docbook:553, index.docbook:605, index.docbook:1070,
index.docbook:1876, index.docbook:2117, index.docbook:2421
#. Tag: para
@@ -1078,7 +1083,7 @@
msgid ""
"To boot a CD-ROM from the Cyclone console prompt, use the command "
"<command>boot cd0:cats.bin</command>"
-msgstr ""
+msgstr "ÐÑÐÐÑ ÐÐÐÑÑÐÐÑÑÑÑ Ñ CD-ROM ÐÐ ÐÐÐÑÐÐÐ
Cyclone, ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑ <command>boot
cd0:cats.bin</command>"
# index.docbook:572, index.docbook:1037, index.docbook:1837,
index.docbook:2084, index.docbook:2388
#. Tag: title
@@ -1094,6 +1099,7 @@
msgid ""
"Booting from linux using <command>LILO</command> or <command>GRUB</command>"
msgstr ""
+"ÐÐÐÑÑÐÐÐ ÐÐ linux Ñ ÐÐÐÐÑÑÑ <command>LILO</command> ÐÐÐ
<command>GRUB</command>"
# index.docbook:1670, index.docbook:2168
#. Tag: para
@@ -1103,8 +1109,7 @@
"To boot the installer from hard disk, you must first download and place the "
"needed files as described in <xref linkend=\"boot-drive-files\"/>."
msgstr ""
-"To boot the installer from hard disk, you will have already completed "
-"downloading and placing the needed files in <xref linkend=\"boot-drive-files"
+"ÐÐÑ ÐÐÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÑ ÑÑÑÐÐÐÐÐÐ Ñ
ÐÑÑÑÐÐÐÐ ÐÐÑÐÐ, Ñ ÐÐÑ ÑÐÐ ÐÐÐÐÐÑ ÐÑÑÑ
ÐÐÐÐÐÑÑÑÑ ÐÐÐÑÑÐÐÐÑÐ Ð ÐÐÐÐÐÐÐÐÑÐ
ÑÑÐÐÑÐÐÑÐ ÑÐÐÐÑ: <xref linkend=\"boot-drive-files"
"\"/>."
#. Tag: para
@@ -1117,6 +1122,10 @@
"kernel. This will allow you to repartition the hard disk from which you boot "
"the installer, although you should do so with care."
msgstr ""
+"ÐÑÐÐ ÐÑ ÐÐÐÐÑÐÐÐÐÑÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ
ÐÑÑÑÐÐÐ ÐÐÑÐ ÑÐÐÑÐÐ ÐÐÑ ÐÐÐÑÑÐÐÐ, Ð ÐÐÑÐÐ
ÐÐÐÑÑÐÑÑ "
+"ÐÑÑ ÐÐ ÑÐÑÐ, ÑÐ ÐÑ ÐÐÐÐÐÑ ÐÐÐÑÑÐÑÑ ÑÐÐÐ
<filename>netboot/"
+"debian-installer/i386/initrd.gz</filename> Ð ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÐ
ÐÐÑ ÑÐÑÐ. "
+"ÐÐ ÐÐÐÐÐÐÐÑ ÐÐÐ ÑÐÐÐÑÐÑÑ ÐÑÑÑÐÐÐ ÐÐÑÐ Ñ
ÐÐÑÐÑÐÐÐ ÐÑ ÐÐÐÑÑÐÐÐÐÑÑ, ÑÐÑÑ ÐÑ ÐÐÐÐÐÑ
ÐÐÐÐÑÑ ÑÑÐ ÐÑÑÐÑÐÐÐÐ."
#. Tag: para
#: boot-installer.xml:732
