[l10n-russian CVS] di-docs gpl.po, 1.9, 1.10 install-methods.po, 1.48, 1.49

Nikolai Prokoschenko pronik-guest at alioth.debian.org
Mon May 1 04:18:00 UTC 2006


Update of /cvsroot/l10n-russian/di-docs
In directory haydn:/tmp/cvs-serv24067

Modified Files:
	gpl.po install-methods.po 
Log Message:
Автоматическая синхронизация шаблонов

Index: gpl.po
===================================================================
RCS file: /cvsroot/l10n-russian/di-docs/gpl.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gpl.po	7 Feb 2006 17:17:32 -0000	1.9
+++ gpl.po	1 May 2006 04:17:57 -0000	1.10
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gpl\n"
 "Report-Msgid-Bugs-To: debian-boot at lists.debian.org\n"
-"POT-Creation-Date: 2006-02-07 15:07+0000\n"
+"POT-Creation-Date: 2006-04-30 23:58+0000\n"
 "PO-Revision-Date: 2005-08-04 19:47+0400\n"
 "Last-Translator: Yuri Kozlov <yuray at id.ru>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -183,25 +183,25 @@
 msgid "GNU GENERAL PUBLIC LICENSE"
 msgstr "GNU GENERAL PUBLIC LICENSE"
 
-#. Tag: para
-#: gpl.xml:93
+#. Tag: emphasis
+#: gpl.xml:95
 #, no-c-format
 msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 msgstr "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
 
 #. Tag: para
-#: gpl.xml:99
-#, no-c-format
+#: gpl.xml:98
+#, fuzzy, no-c-format
 msgid ""
-"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 \"Program\", below, refers to any such "
-"program or work, and a \"work based on the Program\" 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 \"modification\".) "
-"Each licensee is addressed as \"you\"."
+"<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 "
+"\"Program\", below, refers to any such program or work, and a \"work based "
+"on the Program\" 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 \"modification\".) Each licensee is addressed as \"you\"."
 msgstr ""
 "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 "
@@ -232,15 +232,16 @@
 "Program does."
 
 #. Tag: para
-#: gpl.xml:121
-#, no-c-format
+#: gpl.xml:120
+#, fuzzy, no-c-format
 msgid ""
-"You may copy and distribute verbatim copies of the Program's source code as "
-"you receive it, in any medium, provided that you conspicuously and "
-"appropriately publish on each copy an appropriate copyright notice and "
-"disclaimer of warranty; keep intact all the notices that refer to this "
-"License and to the absence of any warranty; and give any other recipients of "
-"the Program a copy of this License along with the Program."
+"<emphasis role=\"bold\">1.</emphasis> You may copy and distribute verbatim "
+"copies of the Program's source code as you receive it, in any medium, "
+"provided that you conspicuously and appropriately publish on each copy an "
+"appropriate copyright notice and disclaimer of warranty; keep intact all the "
+"notices that refer to this License and to the absence of any warranty; and "
+"give any other recipients of the Program a copy of this License along with "
+"the Program."
 msgstr ""
 "You may copy and distribute verbatim copies of the Program's source code as "
 "you receive it, in any medium, provided that you conspicuously and "
@@ -260,13 +261,13 @@
 "may at your option offer warranty protection in exchange for a fee."
 
 #. Tag: para
-#: gpl.xml:138
-#, no-c-format
+#: gpl.xml:137
+#, fuzzy, no-c-format
 msgid ""
-"You may modify your copy or copies of the Program or any portion of it, thus "
-"forming a work based on the Program, and copy and distribute such "
-"modifications or work under the terms of Section 1 above, provided that you "
-"also meet all of these conditions:"
+"<emphasis role=\"bold\">2.</emphasis> You may modify your copy or copies of "
+"the Program or any portion of it, thus forming a work based on the Program, "
+"and copy and distribute such modifications or work under the terms of "
+"Section 1 above, provided that you also meet all of these conditions:"
 msgstr ""
 "You may modify your copy or copies of the Program or any portion of it, thus "
 "forming a work based on the Program, and copy and distribute such "
@@ -274,21 +275,21 @@
 "also meet all of these conditions:"
 
 #. Tag: para
-#: gpl.xml:145
-#, no-c-format
+#: gpl.xml:146
+#, fuzzy, no-c-format
 msgid ""
-"a) You must cause the modified files to carry prominent notices stating that "
+"You must cause the modified files to carry prominent notices stating that "
 "you changed the files and the date of any change."
 msgstr ""
 "a) You must cause the modified files to carry prominent notices stating that "
 "you changed the files and the date of any change."
 
 #. Tag: para
-#: gpl.xml:150
-#, no-c-format
+#: gpl.xml:152
+#, fuzzy, no-c-format
 msgid ""
-"b) You must cause any work that you distribute or publish, that in whole or "
-"in part contains or is derived from the Program or any part thereof, to be "
+"You must cause any work that you distribute or publish, that in whole or in "
+"part contains or is derived from the Program or any part thereof, to be "
 "licensed as a whole at no charge to all third parties under the terms of "
 "this License."
 msgstr ""
@@ -298,11 +299,11 @@
 "this License."
 
 #. Tag: para
-#: gpl.xml:157
-#, no-c-format
+#: gpl.xml:160
+#, fuzzy, no-c-format
 msgid ""
-"c) If the modified program normally reads commands interactively when run, "
-"you must cause it, when started running for such interactive use in the most "
+"If the modified program normally reads commands interactively when run, you "
+"must cause it, when started running for such interactive use in the most "
 "ordinary way, to print or display an announcement including an appropriate "
 "copyright notice and a notice that there is no warranty (or else, saying "
 "that you provide a warranty) and that users may redistribute the program "
@@ -322,7 +323,7 @@
 "required to print an announcement.)"
 
 #. Tag: para
-#: gpl.xml:170
+#: gpl.xml:174
 #, no-c-format
 msgid ""
 "These requirements apply to the modified work as a whole. If identifiable "
@@ -346,7 +347,7 @@
 "regardless of who wrote it."
 
 #. Tag: para
-#: gpl.xml:183
+#: gpl.xml:187
 #, no-c-format
 msgid ""
 "Thus, it is not the intent of this section to claim rights or contest your "
@@ -360,7 +361,7 @@
 "based on the Program."
 
 #. Tag: para
-#: gpl.xml:190
+#: gpl.xml:194
 #, no-c-format
 msgid ""
 "In addition, mere aggregation of another work not based on the Program with "
@@ -374,35 +375,36 @@
 "License."
 
 #. Tag: para
-#: gpl.xml:198
-#, no-c-format
+#: gpl.xml:201
+#, fuzzy, no-c-format
 msgid ""
-"You may copy and distribute the Program (or a work based on it, under "
-"Section 2) in object code or executable form under the terms of Sections 1 "
-"and 2 above provided that you also do one of the following:"
+"<emphasis role=\"bold\">3.</emphasis> You may copy and distribute the "
+"Program (or a work based on it, under Section 2) in object code or "
+"executable form under the terms of Sections 1 and 2 above provided that you "
+"also do one of the following:"
 msgstr ""
 "You may copy and distribute the Program (or a work based on it, under "
 "Section 2) in object code or executable form under the terms of Sections 1 "
 "and 2 above provided that you also do one of the following:"
 
 #. Tag: para
-#: gpl.xml:205
-#, no-c-format
+#: gpl.xml:210
+#, fuzzy, no-c-format
 msgid ""
-"a) Accompany it with the complete corresponding machine-readable source "
-"code, which must be distributed under the terms of Sections 1 and 2 above on "
-"a medium customarily used for software interchange; or,"
+"Accompany it with the complete corresponding machine-readable source code, "
+"which must be distributed under the terms of Sections 1 and 2 above on a "
+"medium customarily used for software interchange; or,"
 msgstr ""
 "a) Accompany it with the complete corresponding machine-readable source "
 "code, which must be distributed under the terms of Sections 1 and 2 above on "
 "a medium customarily used for software interchange; or,"
 
 #. Tag: para
-#: gpl.xml:212
-#, no-c-format
+#: gpl.xml:218
+#, fuzzy, no-c-format
 msgid ""
-"b) Accompany it with a written offer, valid for at least three years, to "
-"give any third party, for a charge no more than your cost of physically "
+"Accompany it with a written offer, valid for at least three years, to give "
+"any third party, for a charge no more than your cost of physically "
 "performing source distribution, a complete machine-readable copy of the "
 "corresponding source code, to be distributed under the terms of Sections 1 "
 "and 2 above on a medium customarily used for software interchange; or,"
@@ -414,11 +416,11 @@
 "and 2 above on a medium customarily used for software interchange; or,"
 
 #. Tag: para
-#: gpl.xml:221
-#, no-c-format
+#: gpl.xml:228
+#, fuzzy, no-c-format
 msgid ""
-"c) Accompany it with the information you received as to the offer to "
-"distribute corresponding source code. (This alternative is allowed only for "
+"Accompany it with the information you received as to the offer to distribute "
+"corresponding source code. (This alternative is allowed only for "
 "noncommercial distribution and only if you received the program in object "
 "code or executable form with such an offer, in accord with Subsection b "
 "above.)"
@@ -430,7 +432,7 @@
 "above.)"
 
 #. Tag: para
-#: gpl.xml:229
+#: gpl.xml:237
 #, no-c-format
 msgid ""
 "The source code for a work means the preferred form of the work for making "
@@ -454,7 +456,7 @@
 "component itself accompanies the executable."
 
 #. Tag: para
-#: gpl.xml:242
+#: gpl.xml:250
 #, no-c-format
 msgid ""
 "If distribution of executable or object code is made by offering access to "
@@ -470,15 +472,16 @@
 "the object code."
 
 #. Tag: para
-#: gpl.xml:251
-#, no-c-format
+#: gpl.xml:258
+#, fuzzy, no-c-format
 msgid ""
-"You may not copy, modify, sublicense, or distribute the Program except as "
-"expressly provided under this License. Any attempt otherwise to copy, "
-"modify, sublicense or distribute the Program is void, and will automatically "
-"terminate your rights under this License. However, parties who have received "
-"copies, or rights, from you under this License will not have their licenses "
-"terminated so long as such parties remain in full compliance."
+"<emphasis role=\"bold\">4.</emphasis> You may not copy, modify, sublicense, "
+"or distribute the Program except as expressly provided under this License. "
+"Any attempt otherwise to copy, modify, sublicense or distribute the Program "
+"is void, and will automatically terminate your rights under this License. "
+"However, parties who have received copies, or rights, from you under this "
+"License will not have their licenses terminated so long as such parties "
+"remain in full compliance."
 msgstr ""
 "You may not copy, modify, sublicense, or distribute the Program except as "
 "expressly provided under this License. Any attempt otherwise to copy, "
@@ -488,16 +491,17 @@
 "terminated so long as such parties remain in full compliance."
 
 #. Tag: para
-#: gpl.xml:262
-#, no-c-format
+#: gpl.xml:269
+#, fuzzy, no-c-format
 msgid ""
-"You are not required to accept this License, since you have not signed it. "
-"However, nothing else grants you permission to modify or distribute the "
-"Program or its derivative works. These actions are prohibited by law if you "
-"do not accept this License. Therefore, by modifying or distributing the "
-"Program (or any work based on the Program), you indicate your acceptance of "
-"this License to do so, and all its terms and conditions for copying, "
-"distributing or modifying the Program or works based on it."
+"<emphasis role=\"bold\">5.</emphasis> You are not required to accept this "
+"License, since you have not signed it. However, nothing else grants you "
+"permission to modify or distribute the Program or its derivative works. "
+"These actions are prohibited by law if you do not accept this License. "
+"Therefore, by modifying or distributing the Program (or any work based on "
+"the Program), you indicate your acceptance of this License to do so, and all "
+"its terms and conditions for copying, distributing or modifying the Program "
+"or works based on it."
 msgstr ""
 "You are not required to accept this License, since you have not signed it. "
 "However, nothing else grants you permission to modify or distribute the "
@@ -508,15 +512,16 @@
 "distributing or modifying the Program or works based on it."
 
 #. Tag: para
-#: gpl.xml:274
-#, no-c-format
+#: gpl.xml:281
+#, fuzzy, no-c-format
 msgid ""
-"Each time you redistribute the Program (or any work based on the Program), "
-"the recipient automatically receives a license from the original licensor to "
-"copy, distribute or modify the Program subject to these terms and "
-"conditions. You may not impose any further restrictions on the recipients' "
-"exercise of the rights granted herein. You are not responsible for enforcing "
-"compliance by third parties to this License."
+"<emphasis role=\"bold\">6.</emphasis> Each time you redistribute the Program "
+"(or any work based on the Program), the recipient automatically receives a "
+"license from the original licensor to copy, distribute or modify the Program "
+"subject to these terms and conditions. You may not impose any further "
+"restrictions on the recipients' exercise of the rights granted herein. You "
+"are not responsible for enforcing compliance by third parties to this "
+"License."
 msgstr ""
 "Each time you redistribute the Program (or any work based on the Program), "
 "the recipient automatically receives a license from the original licensor to "
@@ -526,21 +531,21 @@
 "compliance by third parties to this License."
 
 #. Tag: para
-#: gpl.xml:285
-#, no-c-format
+#: gpl.xml:292
+#, fuzzy, no-c-format
 msgid ""
-"If, as a consequence of a court judgment or allegation of patent "
-"infringement or for any other reason (not limited to patent issues), "
-"conditions are imposed on you (whether by court order, agreement or "
-"otherwise) that contradict the conditions of this License, they do not "
-"excuse you from the conditions of this License. If you cannot distribute so "
-"as to satisfy simultaneously your obligations under this License and any "
-"other pertinent obligations, then as a consequence you may not distribute "
-"the Program at all. For example, if a patent license would not permit "
-"royalty-free redistribution of the Program by all those who receive copies "
-"directly or indirectly through you, then the only way you could satisfy both "
-"it and this License would be to refrain entirely from distribution of the "
-"Program."
+"<emphasis role=\"bold\">7.</emphasis> If, as a consequence of a court "
+"judgment or allegation of patent infringement or for any other reason (not "
+"limited to patent issues), conditions are imposed on you (whether by court "
+"order, agreement or otherwise) that contradict the conditions of this "
+"License, they do not excuse you from the conditions of this License. If you "
+"cannot distribute so as to satisfy simultaneously your obligations under "
+"this License and any other pertinent obligations, then as a consequence you "
+"may not distribute the Program at all. For example, if a patent license "
+"would not permit royalty-free redistribution of the Program by all those who "
+"receive copies directly or indirectly through you, then the only way you "
+"could satisfy both it and this License would be to refrain entirely from "
+"distribution of the Program."
 msgstr ""
 "If, as a consequence of a court judgment or allegation of patent "
 "infringement or for any other reason (not limited to patent issues), "
@@ -556,7 +561,7 @@
 "Program."
 
 #. Tag: para
-#: gpl.xml:301
+#: gpl.xml:309
 #, no-c-format
 msgid ""
 "If any portion of this section is held invalid or unenforceable under any "
@@ -568,7 +573,7 @@
 "the section as a whole is intended to apply in other circumstances."
 
 #. Tag: para
-#: gpl.xml:308
+#: gpl.xml:316
 #, no-c-format
 msgid ""
 "It is not the purpose of this section to induce you to infringe any patents "
@@ -592,7 +597,7 @@
 "licensee cannot impose that choice."
 
 #. Tag: para
-#: gpl.xml:321
+#: gpl.xml:329
 #, no-c-format
 msgid ""
 "This section is intended to make thoroughly clear what is believed to be a "
@@ -602,16 +607,16 @@
 "consequence of the rest of this License."
 
 #. Tag: para
-#: gpl.xml:327
-#, no-c-format
+#: gpl.xml:334
+#, fuzzy, no-c-format
 msgid ""
-"If the distribution and/or use of the Program is restricted in certain "
-"countries either by patents or by copyrighted interfaces, the original "
-"copyright holder who places the Program under this License may add an "
-"explicit geographical distribution limitation excluding those countries, so "
-"that distribution is permitted only in or among countries not thus excluded. "
-"In such case, this License incorporates the limitation as if written in the "
-"body of this License."
+"<emphasis role=\"bold\">8.</emphasis> If the distribution and/or use of the "
+"Program is restricted in certain countries either by patents or by "
+"copyrighted interfaces, the original copyright holder who places the Program "
+"under this License may add an explicit geographical distribution limitation "
+"excluding those countries, so that distribution is permitted only in or "
+"among countries not thus excluded. In such case, this License incorporates "
+"the limitation as if written in the body of this License."
 msgstr ""
 "If the distribution and/or use of the Program is restricted in certain "
 "countries either by patents or by copyrighted interfaces, the original "
@@ -622,19 +627,19 @@
 "body of this License."
 
 #. Tag: para
-#: gpl.xml:338
-#, no-c-format
+#: gpl.xml:345
+#, fuzzy, no-c-format
 msgid ""
-"The Free Software Foundation may publish revised and/or new versions of the "
-"General Public License from time 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 \"any later version\", 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."
+"<emphasis role=\"bold\">9.</emphasis> The Free Software Foundation may "
+"publish revised and/or new versions of the General Public License from time "
+"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 \"any later version\", 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."
 msgstr ""
 "The Free Software Foundation may publish revised and/or new versions of the "
 "General Public License from time to time. Such new versions will be similar "
@@ -648,16 +653,17 @@
 "Software Foundation."
 
 #. Tag: para
-#: gpl.xml:353
-#, no-c-format
+#: gpl.xml:360
+#, fuzzy, no-c-format
 msgid ""
-"If you wish to incorporate parts of the Program into other free programs "
-"whose distribution conditions are different, write to the author to ask for "
-"permission. For software which is copyrighted by the Free Software "
-"Foundation, write to the Free Software Foundation; we sometimes make "
-"exceptions for this. Our decision will be guided by the two goals of "
-"preserving the free status of all derivatives of our free software and of "
-"promoting the sharing and reuse of software generally."
+"<emphasis role=\"bold\">10.</emphasis> If you wish to incorporate parts of "
+"the Program into other free programs whose distribution conditions are "
+"different, write to the author to ask for permission. For software which is "
+"copyrighted by the Free Software Foundation, write to the Free Software "
+"Foundation; we sometimes make exceptions for this. Our decision will be "
+"guided by the two goals of preserving the free status of all derivatives of "
+"our free software and of promoting the sharing and reuse of software "
+"generally."
 msgstr ""
 "If you wish to incorporate parts of the Program into other free programs "
 "whose distribution conditions are different, write to the author to ask for "
@@ -667,72 +673,56 @@
 "preserving the free status of all derivatives of our free software and of "
 "promoting the sharing and reuse of software generally."
 
-#. Tag: para
-#: gpl.xml:364
+#. Tag: emphasis
+#: gpl.xml:374
 #, no-c-format
 msgid "NO WARRANTY"
 msgstr "NO WARRANTY"
 
 #. Tag: para
-#: gpl.xml:369
+#: gpl.xml:376
 #, no-c-format
 msgid ""
-"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 \"as is\" 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."
+"<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 \"AS IS\" 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."
 msgstr ""
-"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 \"as is\" 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:382
+#: gpl.xml:389
 #, no-c-format
 msgid ""
-"in no event unless required by applicable law or agreed to in writing will "
-"any copyright holder, or any other party who may modify and/or redistribute "
-"the program as permitted above, be liable to you for damages, including any "
-"general, special, incidental or consequential damages arising out of the use "
-"or inability to use the program (including but not limited to loss of data "
-"or data being rendered inaccurate or losses sustained by you or third "
-"parties or a failure of the program to operate with any other programs), "
-"even if such holder or other party has been advised of the possibility of "
-"such damages."
+"<emphasis role=\"bold\">12.</emphasis> IN NO EVENT UNLESS REQUIRED BY "
+"APPLICABLE LAW OR AGREED TO IN WRITING WILL AND COPYRIGHT HOLDER, OR ANY "
+"OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED "
+"ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, "
+"INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO "
+"USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING "
+"RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE "
+"OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR "
+"OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES."
 msgstr ""
-"in no event unless required by applicable law or agreed to in writing will "
-"any copyright holder, or any other party who may modify and/or redistribute "
-"the program as permitted above, be liable to you for damages, including any "
-"general, special, incidental or consequential damages arising out of the use "
-"or inability to use the program (including but not limited to loss of data "
-"or data being rendered inaccurate or losses sustained by you or third "
-"parties or a failure of the program to operate with any other programs), "
-"even if such holder or other party has been advised of the possibility of "
-"such damages."
 
-#. Tag: para
-#: gpl.xml:397
+#. Tag: emphasis
+#: gpl.xml:405
 #, no-c-format
 msgid "END OF TERMS AND CONDITIONS"
 msgstr "END OF TERMS AND CONDITIONS"
 
 #. Tag: title
-#: gpl.xml:404
+#: gpl.xml:410
 #, no-c-format
 msgid "How to Apply These Terms to Your New Programs"
 msgstr "How to Apply These Terms to Your New Programs"
 
 #. Tag: para
-#: gpl.xml:405
+#: gpl.xml:411
 #, no-c-format
 msgid ""
 "If you develop a new program, and you want it to be of the greatest possible "
@@ -744,7 +734,7 @@
 "which everyone can redistribute and change under these terms."
 
 #. Tag: para
-#: gpl.xml:412
+#: gpl.xml:418
 #, no-c-format
 msgid ""
 "To do so, attach the following notices to the program. It is safest to "
@@ -758,19 +748,19 @@
 "line and a pointer to where the full notice is found."
 
 #. Tag: para
-#: gpl.xml:419
+#: gpl.xml:425
 #, no-c-format
 msgid "one line to give the program's name and a brief idea of what it does."
 msgstr "one line to give the program's name and a brief idea of what it does."
 
 #. Tag: para
-#: gpl.xml:424
+#: gpl.xml:430
 #, no-c-format
 msgid "Copyright (C) year name of author"
 msgstr "Copyright (C) year name of author"
 
 #. Tag: para
-#: gpl.xml:428
+#: gpl.xml:434
 #, no-c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
@@ -784,7 +774,7 @@
 "any later version."
 
 #. Tag: para
-#: gpl.xml:435
+#: gpl.xml:441
 #, no-c-format
 msgid ""
 "This program is distributed in the hope that it will be useful, but without "
@@ -798,7 +788,7 @@
 "more details."
 
 #. Tag: para
-#: gpl.xml:442
+#: gpl.xml:448
 #, no-c-format
 msgid ""
 "You should have received a copy of the gnu General Public License along with "
@@ -810,7 +800,7 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
 #. Tag: para
-#: gpl.xml:449
+#: gpl.xml:455
 #, no-c-format
 msgid ""
 "Also add information on how to contact you by electronic and paper mail."
@@ -818,7 +808,7 @@
 "Also add information on how to contact you by electronic and paper mail."
 
 #. Tag: para
-#: gpl.xml:454
+#: gpl.xml:460
 #, no-c-format
 msgid ""
 "If the program is interactive, make it output a short notice like this when "
@@ -828,13 +818,13 @@
 "it starts in an interactive mode:"
 
 #. Tag: para
-#: gpl.xml:459
+#: gpl.xml:465
 #, no-c-format
 msgid "Gnomovision version 69, Copyright (C) year name of author"
 msgstr "Gnomovision version 69, Copyright (C) year name of author"
 
 #. Tag: para
-#: gpl.xml:463
+#: gpl.xml:469
 #, no-c-format
 msgid ""
 "Gnomovision comes with absolutely no warranty; for details type `show w'."
@@ -842,7 +832,7 @@
 "Gnomovision comes with absolutely no warranty; for details type `show w'."
 
 #. Tag: para
-#: gpl.xml:468
+#: gpl.xml:474
 #, no-c-format
 msgid ""
 "This is free software, and you are welcome to redistribute it under certain "
@@ -852,7 +842,7 @@
 "conditions; type `show c' for details."
 
 #. Tag: para
-#: gpl.xml:473
+#: gpl.xml:479
 #, no-c-format
 msgid ""
 "The hypothetical commands `show w' and `show c' should show the appropriate "
@@ -866,7 +856,7 @@
 "clicks or menu items &mdash; whatever suits your program."
 
 #. Tag: para
-#: gpl.xml:481
+#: gpl.xml:487
 #, no-c-format
 msgid ""
 "You should also get your employer (if you work as a programmer) or your "
@@ -878,7 +868,7 @@
 "necessary. Here is a sample; alter the names:"
 
 #. Tag: para
-#: gpl.xml:487
+#: gpl.xml:493
 #, no-c-format
 msgid ""
 "Yoyodyne, Inc., hereby disclaims all copyright interest in the program "
@@ -888,19 +878,19 @@
 "`Gnomovision' (which makes passes at compilers) written by James Hacker."
 
 #. Tag: para
-#: gpl.xml:493
+#: gpl.xml:499
 #, no-c-format
 msgid "signature of Ty Coon, 1 April 1989"
 msgstr "signature of Ty Coon, 1 April 1989"
 
 #. Tag: para
-#: gpl.xml:497
+#: gpl.xml:503
 #, no-c-format
 msgid "Ty Coon, President of Vice"
 msgstr "Ty Coon, President of Vice"
 
 #. Tag: para
-#: gpl.xml:501
+#: gpl.xml:507
 #, no-c-format
 msgid ""
 "This General Public License does not permit incorporating your program into "
@@ -914,3 +904,45 @@
 "consider it more useful to permit linking proprietary applications with the "
 "library. If this is what you want to do, use the gnu Library General Public "
 "License instead of this License."
+
+#~ msgid ""
+#~ "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 \"as is\" 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."
+#~ msgstr ""
+#~ "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 \"as is\" 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."
+
+#~ msgid ""
+#~ "in no event unless required by applicable law or agreed to in writing "
+#~ "will any copyright holder, or any other party who may modify and/or "
+#~ "redistribute the program as permitted above, be liable to you for "
+#~ "damages, including any general, special, incidental or consequential "
+#~ "damages arising out of the use or inability to use the program (including "
+#~ "but not limited to loss of data or data being rendered inaccurate or "
+#~ "losses sustained by you or third parties or a failure of the program to "
+#~ "operate with any other programs), even if such holder or other party has "
+#~ "been advised of the possibility of such damages."
+#~ msgstr ""
+#~ "in no event unless required by applicable law or agreed to in writing "
+#~ "will any copyright holder, or any other party who may modify and/or "
+#~ "redistribute the program as permitted above, be liable to you for "
+#~ "damages, including any general, special, incidental or consequential "
+#~ "damages arising out of the use or inability to use the program (including "
+#~ "but not limited to loss of data or data being rendered inaccurate or "
+#~ "losses sustained by you or third parties or a failure of the program to "
+#~ "operate with any other programs), even if such holder or other party has "
+#~ "been advised of the possibility of such damages."

Index: install-methods.po
===================================================================
RCS file: /cvsroot/l10n-russian/di-docs/install-methods.po,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- install-methods.po	19 Mar 2006 17:18:11 -0000	1.48
+++ install-methods.po	1 May 2006 04:17:57 -0000	1.49
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: install-methods\n"
 "Report-Msgid-Bugs-To: debian-boot at lists.debian.org\n"
-"POT-Creation-Date: 2006-03-19 13:45+0000\n"
+"POT-Creation-Date: 2006-04-30 23:58+0000\n"
 "PO-Revision-Date: 2006-01-04 06:59+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -333,7 +333,7 @@
 
 #. Tag: para
 #: install-methods.xml:263
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "If you can't boot (IPL) from the CD-ROM and you are not using VM you need to "
 "create an IPL tape first. This is described in section 3.4.3 in the <ulink "
@@ -342,7 +342,7 @@
 "you need to write to the tape are (in this order): <filename>kernel.debian</"
 "filename>, <filename>parmfile.debian</filename> and <filename>initrd.debian</"
 "filename>. The files can be downloaded from the <filename>tape</filename> "
-"sub-directory, see <xref linkend=\"where-files\"/>,"
+"sub-directory, see <xref linkend=\"where-files\"/>."
 msgstr ""
 "Если вы не смогли загрузить (IPL) с CD-ROM и не используете VM, то вам нужно "
 "создатьленту IPL. Это описано в разделе 3.4.3 в Redbook <ulink url=\"http://"
@@ -372,18 +372,22 @@
 
 #. Tag: para
 #: install-methods.xml:293
-#, no-c-format
-msgid "Floppy disk booting reportedly fails on Mac USB floppy drives."
+#, fuzzy, no-c-format
+msgid ""
+"Booting the installer from floppy disk reportedly fails on Mac USB floppy "
+"drives."
 msgstr "Загрузка с дискет не работает в дисководах Mac USB."
 
 #. Tag: para
-#: install-methods.xml:297
-#, no-c-format
-msgid "Floppy disk booting is not supported on Amigas or 68k Macs."
+#: install-methods.xml:298
+#, fuzzy, no-c-format
+msgid ""
+"Booting the installer from floppy disk is not supported on Amigas or 68k "
+"Macs."
 msgstr "Загрузка с дискет не поддерживается на Amiga или 68k Mac."
 
 #. Tag: para
-#: install-methods.xml:302
+#: install-methods.xml:303
 #, no-c-format
 msgid ""
 "Disk images are files containing the complete contents of a floppy disk in "
@@ -404,19 +408,19 @@
 "дискету."
 
 #. Tag: para
-#: install-methods.xml:313
-#, no-c-format
+#: install-methods.xml:314
+#, fuzzy, no-c-format
 msgid ""
-"There are different techniques for creating floppies from disk images, which "
-"depend on your platform. This section describes how to create floppies from "
-"disk images on different platforms."
+"There are different techniques for creating floppies from disk images. This "
+"section describes how to create floppies from disk images on different "
+"platforms."
 msgstr ""
 "Есть несколько техник (зависящих от платформы) по созданию дискет из образов "
 "дисков. В этом разделе описано, как создавать дискеты из образов дисков на "
 "различных платформах."
 
 #. Tag: para
-#: install-methods.xml:319
+#: install-methods.xml:320
 #, no-c-format
 msgid ""
 "No matter which method you use to create your floppies, you should remember "
@@ -428,13 +432,13 @@
 "непреднамеренно не повредить их."
 
 #. Tag: title
-#: install-methods.xml:327
+#: install-methods.xml:328
 #, no-c-format
 msgid "Writing Disk Images From a Linux or Unix System"
 msgstr "Запись образов дисков из систем Linux или Unix"
 
 #. Tag: para
-#: install-methods.xml:328
+#: install-methods.xml:329
 #, no-c-format
 msgid ""
 "To write the floppy disk image files to the floppy disks, you will probably "
@@ -473,7 +477,7 @@
 "<command>eject</command>, смотрите страницу руководства)</phrase>."
 
 #. Tag: para
-#: install-methods.xml:352
+#: install-methods.xml:353
 #, no-c-format
 msgid ""
 "Some systems attempt to automatically mount a floppy disk when you place it "
@@ -508,7 +512,7 @@
 "вашего системного администратора. </phrase>"
 
 #. Tag: para
-#: install-methods.xml:373
+#: install-methods.xml:374
 #, no-c-format
 msgid ""
 "If writing a floppy on powerpc Linux, you will need to eject it. The "
@@ -520,13 +524,13 @@
 "потребоваться её установка."
 
 #. Tag: title
-#: install-methods.xml:391
+#: install-methods.xml:392
 #, no-c-format
 msgid "Writing Disk Images From DOS, Windows, or OS/2"
 msgstr "Запись образов дисков из DOS, Windows или OS/2"
 
 #. Tag: para
-#: install-methods.xml:393
+#: install-methods.xml:394
 #, no-c-format
 msgid ""
 "If you have access to an i386 machine, you can use one of the following "
@@ -537,7 +541,7 @@
 "ниже."
 
 #. Tag: para
-#: install-methods.xml:398
+#: install-methods.xml:399
 #, no-c-format
 msgid ""
 "The <command>rawrite1</command> and <command>rawrite2</command> programs can "
@@ -553,7 +557,7 @@
 "emphasis> сработает."
 
 #. Tag: para
-#: install-methods.xml:406
+#: install-methods.xml:407
 #, no-c-format
 msgid ""
 "The <command>rwwrtwin</command> program runs on Windows 95, NT, 98, 2000, "
@@ -565,7 +569,7 @@
 "распаковать diskio.dll в тот же самый каталог."
 
 #. Tag: para
-#: install-methods.xml:412
+#: install-methods.xml:413
 #, no-c-format
 msgid ""
 "These tools can be found on the Official Debian CD-ROMs under the <filename>/"
@@ -575,13 +579,13 @@
 "каталоге <filename>/tools</filename>."
 
 #. Tag: title
-#: install-methods.xml:425
+#: install-methods.xml:426
 #, no-c-format
 msgid "Writing Disk Images on Atari Systems"
 msgstr "Создание образов дисков на машинах Atari"
 
 #. Tag: para
-#: install-methods.xml:426
+#: install-methods.xml:427
 #, no-c-format
 msgid ""
 "You'll find the &rawwrite.ttp; program in the same directory as the floppy "
@@ -595,13 +599,13 @@
 "диалогового окна программы TOS."
 
 #. Tag: title
-#: install-methods.xml:437
+#: install-methods.xml:438
 #, no-c-format
 msgid "Writing Disk Images on Macintosh Systems"
 msgstr "Запись образов дисков на системах Macintosh"
 
 #. Tag: para
-#: install-methods.xml:438
+#: install-methods.xml:439
 #, no-c-format
 msgid ""
 "There is no MacOS application to write images to floppy disks (and there "
@@ -617,13 +621,13 @@
 "системы и модулей."
 
 #. Tag: title
-#: install-methods.xml:456
+#: install-methods.xml:457
 #, no-c-format
 msgid "Writing Disk Images From MacOS"
 msgstr "Запись образов дисков из MacOS"
 
 #. Tag: para
-#: install-methods.xml:457
+#: install-methods.xml:458
 #, no-c-format
 msgid ""
 "An AppleScript, <application>Make Debian Floppy</application>, is available "
@@ -644,7 +648,7 @@
 "стереть дискету и записать на неё образ файла."
 
 #. Tag: para
-#: install-methods.xml:468
+#: install-methods.xml:469
 #, no-c-format
 msgid ""
 "You can also use the MacOS utility <command>Disk Copy</command> directly, or "
@@ -658,13 +662,13 @@
 "следующих методов для создания дискеты из образа."
 
 #. Tag: title
-#: install-methods.xml:479
+#: install-methods.xml:480
 #, no-c-format
 msgid "Writing Disk Images with <command>Disk Copy</command>"
 msgstr "Запись образов дисков с помощью <command>Disk Copy</command>"
 
 #. Tag: para
-#: install-methods.xml:480
+#: install-methods.xml:481
 #, no-c-format
 msgid ""
 "If you are creating the floppy image from files which were originally on the "
@@ -678,7 +682,7 @@
 "загрузили файлы образов с сервера-зеркала Debian."
 
 #. Tag: para
-#: install-methods.xml:489
+#: install-methods.xml:490
 #, no-c-format
 msgid ""
 "Obtain <ulink url=\"&url-powerpc-creator-changer;\">Creator-Changer</ulink> "
@@ -688,7 +692,7 @@
 "ulink> и используйте его для открытия файла <filename>root.bin</filename>."
 
 #. Tag: para
-#: install-methods.xml:496
+#: install-methods.xml:497
 #, no-c-format
 msgid ""
 "Change the Creator to <userinput>ddsk</userinput> (Disk Copy), and the Type "
@@ -700,7 +704,7 @@
 "данных важен."
 
 #. Tag: para
-#: install-methods.xml:503
+#: install-methods.xml:504
 #, no-c-format
 msgid ""
 "<emphasis>Important:</emphasis> In the Finder, use <userinput>Get Info</"
@@ -716,7 +720,7 @@
 "смонтирован."
 
 #. Tag: para
-#: install-methods.xml:512
+#: install-methods.xml:513
 #, no-c-format
 msgid ""
 "Obtain <command>Disk Copy</command>; if you have a MacOS system or CD it "
@@ -728,7 +732,7 @@
 "diskcopy;\"></ulink>."
 
 #. Tag: para
-#: install-methods.xml:519
+#: install-methods.xml:520
 #, no-c-format
 msgid ""
 "Run <command>Disk Copy</command>, and select <menuchoice> "
@@ -745,13 +749,13 @@
 "вылезет из дисковода."
 
 #. Tag: title
-#: install-methods.xml:534
+#: install-methods.xml:535
 #, no-c-format
 msgid "Writing Disk Images with <command>suntar</command>"
 msgstr "Запись образов дисков с помощью <command>suntar</command>"
 
 #. Tag: para
-#: install-methods.xml:538
+#: install-methods.xml:539
 #, no-c-format
 msgid ""
 "Obtain <command>suntar</command> from <ulink url=\"&url-powerpc-suntar;\"> </"
@@ -764,14 +768,14 @@
 "<quote>Overwrite Sectors...</quote> из меню <userinput>Special</userinput>."
 
 #. Tag: para
-#: install-methods.xml:546
+#: install-methods.xml:547
 #, no-c-format
 msgid ""
 "Insert the floppy disk as requested, then hit &enterkey; (start at sector 0)."
 msgstr "Вставьте дискету, нажмите &enterkey; (начало с сектора 0)."
 
 #. Tag: para
-#: install-methods.xml:552
+#: install-methods.xml:553
 #, no-c-format
 msgid ""
 "Select the <filename>root.bin</filename> file in the file-opening dialog."
@@ -779,7 +783,7 @@
 "Выберите файл <filename>root.bin</filename> в появившемся диалоговом окне."
 
 #. Tag: para
-#: install-methods.xml:557
+#: install-methods.xml:558
 #, no-c-format
 msgid ""
 "After the floppy has been created successfully, select <menuchoice> "
@@ -792,7 +796,7 @@
 "ошибки при записи дискеты, просто выньте эту и вставьте другую дискету."
 
 #. Tag: para
-#: install-methods.xml:565
+#: install-methods.xml:566
 #, no-c-format
 msgid ""
 "Before using the floppy you created, <emphasis>set the write protect tab</"
@@ -804,22 +808,21 @@
 "просто испортит её."
 
 #. Tag: title
-#: install-methods.xml:584
+#: install-methods.xml:585
 #, no-c-format
 msgid "Preparing Files for USB Memory Stick Booting"
 msgstr "Подготовка файлов для загрузки с карты памяти USB"
 
 #. Tag: para
-#: install-methods.xml:586
-#, no-c-format
+#: install-methods.xml:587
+#, fuzzy, no-c-format
 msgid ""
-"For preparing the USB stick you will need a system where GNU/Linux is "
-"already running and where USB is supported. You should ensure that the usb-"
-"storage kernel module is loaded (<userinput>modprobe usb-storage</"
-"userinput>) and try to find out which SCSI device the USB stick has been "
-"mapped to (in this example <filename>/dev/sda</filename> is used). To write "
-"to your stick, you will probably have to turn off its write protection "
-"switch."
+"To prepare the USB stick, you will need a system where GNU/Linux is already "
+"running and where USB is supported. You should ensure that the usb-storage "
+"kernel module is loaded (<userinput>modprobe usb-storage</userinput>) and "
+"try to find out which SCSI device the USB stick has been mapped to (in this "
+"example <filename>/dev/sda</filename> is used). To write to your stick, you "
+"may have to turn off its write protection switch."
 msgstr ""
 "Для подготовки карты памяти USB вам нужна система с запущенной GNU/Linux с "
 "поддержкой USB. Убедитесь, что загружен модуль ядра usb-storage "
@@ -828,10 +831,10 @@
 "<filename>/dev/sda</filename>). Также выключите защиту от записи."
 
 #. Tag: para
-#: install-methods.xml:596
-#, no-c-format
+#: install-methods.xml:597
+#, fuzzy, no-c-format
 msgid ""
-"Note, that the USB stick should be at least 128 MB in size (smaller setups "
+"Note that the USB stick should be at least 128 MB in size (smaller setups "
 "are possible if you follow <xref linkend=\"usb-copy-flexible\"/>)."
 msgstr ""
 "Заметим, что карта памяти USB должна быть как минимум 128МБ (установка на "
@@ -839,13 +842,13 @@
 ">)."
 
 #. Tag: title
-#: install-methods.xml:604
+#: install-methods.xml:605
 #, no-c-format
 msgid "Copying the files &mdash; the easy way"
 msgstr "Копирование файлов &mdash; лёгкий путь"
 
 #. Tag: para
-#: install-methods.xml:605
+#: install-methods.xml:606
 #, no-c-format
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -859,13 +862,13 @@
 "распаковать его прямо на карту памяти USB:"
 
 #. Tag: screen
-#: install-methods.xml:612
+#: install-methods.xml:613
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sda</replaceable>"
 
 #. Tag: para
-#: install-methods.xml:614
+#: install-methods.xml:615
 #, no-c-format
 msgid ""
 "There is an all-in-one file <filename>hd-media/boot.img.gz</filename> which "
@@ -882,13 +885,13 @@
 "fdisk</command> <userinput>C</userinput> и распакуйте образ на этот раздел:"
 
 #. Tag: screen
-#: install-methods.xml:623
+#: install-methods.xml:624
 #, no-c-format
 msgid "# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>"
 msgstr "# zcat boot.img.gz &gt; /dev/<replaceable>sda2</replaceable>"
 
 #. Tag: para
-#: install-methods.xml:626
+#: install-methods.xml:627
 #, no-c-format
 msgid ""
 "Using this method will destroy anything already on the device. Make sure "
@@ -898,7 +901,7 @@
 "названии устройства карты памяти USB."
 
 #. Tag: para
-#: install-methods.xml:632
+#: install-methods.xml:633
 #, no-c-format
 msgid ""
 "After that, mount the USB memory stick (<userinput>mount <replaceable arch="
@@ -919,13 +922,13 @@
 "всё готово."
 
 #. Tag: title
-#: install-methods.xml:648
+#: install-methods.xml:649
 #, no-c-format
 msgid "Copying the files &mdash; the flexible way"
 msgstr "Копирование файлов &mdash; гибкий путь"
 
 #. Tag: para
-#: install-methods.xml:649
+#: install-methods.xml:650
 #, no-c-format
 msgid ""
 "If you like more flexibility or just want to know what's going on, you "
@@ -936,13 +939,13 @@
 "на карту памяти."
 
 #. Tag: title
-#: install-methods.xml:661 install-methods.xml:753
+#: install-methods.xml:662 install-methods.xml:754
 #, no-c-format
 msgid "USB stick partitioning on &arch-title;"
 msgstr "Разметка карты памяти USB на архитектуре &arch-title;"
 
 #. Tag: para
-#: install-methods.xml:662
+#: install-methods.xml:663
 #, no-c-format
 msgid ""
 "We will show how to setup the memory stick to use the first partition, "
@@ -952,13 +955,13 @@
 "устройство."
 
 #. Tag: para
-#: install-methods.xml:667
-#, no-c-format
+#: install-methods.xml:668
+#, fuzzy, no-c-format
 msgid ""
 "Since most USB sticks come pre-configured with a single FAT16 partition, you "
 "probably won't have to repartition or reformat the stick. If you have to do "
-"that anyway, use <command>cfdisk</command> or any other partitioning tool "
-"for creating a FAT16 partition and then create the filesystem using: "
+"that anyway, use <command>cfdisk</command> or any other partitioning tool to "
+"create a FAT16 partition, and then create the filesystem using: "
 "<informalexample><screen>\n"
 "# mkdosfs /dev/<replaceable>sda1</replaceable>\n"
 "</screen></informalexample> Take care that you use the correct device name "
@@ -976,7 +979,7 @@
 "<classname>dosfstools</classname>."
 
 #. Tag: para
-#: install-methods.xml:681
+#: install-methods.xml:682
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -995,7 +998,7 @@
 "поддерживает файловую систему FAT."
 
 #. Tag: para
-#: install-methods.xml:691
+#: install-methods.xml:692
 #, no-c-format
 msgid ""
 "To put <command>SYSLINUX</command> on the FAT16 partition on your USB stick, "
@@ -1019,7 +1022,7 @@
 "загрузчика."
 
 #. Tag: para
-#: install-methods.xml:704
+#: install-methods.xml:705
 #, no-c-format
 msgid ""
 "Mount the partition (<userinput>mount /dev/sda1 /mnt</userinput>) and copy "
@@ -1042,7 +1045,7 @@
 "<command>SYSLINUX</command> работает только с файловыми именами DOS (8.3)."
 
 #. Tag: para
-#: install-methods.xml:735
+#: install-methods.xml:736
 #, no-c-format
 msgid ""
 "The <filename>syslinux.cfg</filename> configuration file should contain the "
@@ -1062,7 +1065,7 @@
 "загружаемого образа."
 
 #. Tag: para
-#: install-methods.xml:754
+#: install-methods.xml:755
 #, no-c-format
 msgid ""
 "Most USB sticks do not come pre-configured in such a way that Open Firmware "
@@ -1090,7 +1093,7 @@
 "<classname>hfsutils</classname>."
 
 #. Tag: para
-#: install-methods.xml:770
+#: install-methods.xml:771
 #, no-c-format
 msgid ""
 "In order to start the kernel after booting from the USB stick, we will put a "
@@ -1107,7 +1110,7 @@
 "поддерживает файловую систему HFS."
 
 #. Tag: para
-#: install-methods.xml:779
+#: install-methods.xml:780
 #, no-c-format
 msgid ""
 "The normal <command>ybin</command> tool that comes with <command>yaboot</"
@@ -1143,7 +1146,7 @@
 "Unix."
 
 #. Tag: para
-#: install-methods.xml:795
+#: install-methods.xml:796
 #, no-c-format
 msgid ""
 "Mount the partition (<userinput>mount /dev/sda2 /mnt</userinput>) and copy "
@@ -1153,37 +1156,37 @@
 "скопируйте следующие файлыиз архива Debian:"
 
 #. Tag: para
-#: install-methods.xml:801
+#: install-methods.xml:802
 #, no-c-format
 msgid "<filename>vmlinux</filename> (kernel binary)"
 msgstr "<filename>vmlinuх</filename> (файл ядра)"
 
 #. Tag: para
-#: install-methods.xml:806
+#: install-methods.xml:807
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (initial ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (образ ramdisk)"
 
 #. Tag: para
-#: install-methods.xml:811
+#: install-methods.xml:812
 #, no-c-format
 msgid "<filename>yaboot.conf</filename> (yaboot configuration file)"
 msgstr "<filename>yaboot.conf</filename> (конфигурационный файл yaboot)"
 
 #. Tag: para
-#: install-methods.xml:816
+#: install-methods.xml:817
 #, no-c-format
 msgid "<filename>boot.msg</filename> (optional boot message)"
 msgstr "<filename>boot.msg</filename> (необязательное загрузочное сообщение)"
 
 #. Tag: para
-#: install-methods.xml:821
+#: install-methods.xml:822
 #, no-c-format
 msgid "Optional kernel modules"
 msgstr "необязательные модули ядра"
 
 #. Tag: para
-#: install-methods.xml:828
+#: install-methods.xml:829
 #, no-c-format
 msgid ""
 "The <filename>yaboot.conf</filename> configuration file should contain the "
@@ -1218,25 +1221,27 @@
 "образа."
 
 #. Tag: title
-#: install-methods.xml:843
+#: install-methods.xml:845
 #, no-c-format
 msgid "Adding an ISO image"
 msgstr "Добавление ISO образа"
 
 #. Tag: para
-#: install-methods.xml:844
-#, no-c-format
+#: install-methods.xml:846
+#, fuzzy, no-c-format
 msgid ""
-"Now you should put any Debian ISO image (businesscard, netinst or even a "
-"full one) onto your stick (if it fits). The file name of such an image must "
-"end in <filename>.iso</filename>."
+"The installer will look for a Debian ISO image on the stick as its source "
+"for additional data needed for the installation. So your next step is to "
+"copy a Debian ISO image (businesscard, netinst or even a full CD image) onto "
+"your stick (be sure to select one that fits). The file name of the image "
+"must end in <filename>.iso</filename>."
 msgstr ""
 "Теперь вы должны положить на карту памяти какой-нибудь ISO образ Debian "
 "(businesscard, netinst или даже образ первого CD) (если он влезет). Имя "
 "файла образа обязательно должно заканчиваться на <filename>.iso</filename>."
 
 #. Tag: para
-#: install-methods.xml:850
+#: install-methods.xml:854
 #, no-c-format
 msgid ""
 "If you want to install over the network, without using an ISO image, you "
@@ -1252,7 +1257,7 @@
 "filename> нет поддержки сети."
 
 #. Tag: para
-#: install-methods.xml:859
+#: install-methods.xml:863
 #, no-c-format
 msgid ""
 "When you are done, unmount the USB memory stick (<userinput>umount /mnt</"
@@ -1262,13 +1267,13 @@
 "(<userinput>umount /mnt</userinput>) и включите защиту от записи."
 
 #. Tag: title
-#: install-methods.xml:869
+#: install-methods.xml:873
 #, no-c-format
 msgid "Booting the USB stick"
 msgstr "Загрузка с карты памяти USB"
 
 #. Tag: para
-#: install-methods.xml:870
+#: install-methods.xml:874
 #, no-c-format
 msgid ""
 "If your system refuses to boot from the memory stick, the stick may contain "
@@ -1281,19 +1286,19 @@
 "<classname>mbr</classname>:"
 
 #. Tag: screen
-#: install-methods.xml:877
+#: install-methods.xml:881
 #, no-c-format
 msgid "# install-mbr /dev/<replaceable>sda</replaceable>"
 msgstr "# install-mbr /dev/<replaceable>sda</replaceable>"
 
 #. Tag: title
-#: install-methods.xml:889
+#: install-methods.xml:892
 #, no-c-format
 msgid "Preparing Files for Hard Disk Booting"
 msgstr "Подготовка файлов для загрузки с жёсткого диска"
 
 #. Tag: para
-#: install-methods.xml:890
+#: install-methods.xml:893
 #, no-c-format
 msgid ""
 "The installer may be booted using boot files placed on an existing hard "
@@ -1305,7 +1310,7 @@
 "системы или вызовом системного загрузчика прямо из BIOS."
 
 #. Tag: para
-#: install-methods.xml:896
+#: install-methods.xml:899
 #, no-c-format
 msgid ""
 "A full, <quote>pure network</quote> installation can be achieved using this "
@@ -1318,7 +1323,7 @@
 "например поиск и прожиг CD образов или борьбы с кучей нечитаемых дискет."
 
 #. Tag: para
-#: install-methods.xml:903
+#: install-methods.xml:906
 #, no-c-format
 msgid "The installer cannot boot from files on an NTFS file system."
 msgstr ""
@@ -1326,7 +1331,7 @@
 "системе NTFS."
 
 #. Tag: para
-#: install-methods.xml:907
+#: install-methods.xml:910
 #, no-c-format
 msgid ""
 "The installer cannot boot from files on an HFS+ file system. MacOS System "
@@ -1348,7 +1353,7 @@
 "Linux, в особенности, для загрузки файлов установки."
 
 #. Tag: para
-#: install-methods.xml:918
+#: install-methods.xml:921
 #, no-c-format
 msgid ""
 "Different programs are used for hard disk installation system booting, "
@@ -1360,7 +1365,7 @@
 "<quote>OldWorld</quote>."
 
 #. Tag: title
-#: install-methods.xml:927
+#: install-methods.xml:930
 #, no-c-format
 msgid ""
 "Hard disk installer booting using <command>LILO</command> or <command>GRUB</"
@@ -1370,7 +1375,7 @@
 "command> или <command>GRUB</command>"
 
 #. Tag: para
-#: install-methods.xml:929
+#: install-methods.xml:932
 #, no-c-format
 msgid ""
 "This section explains how to add to or even replace an existing linux "
@@ -1380,7 +1385,7 @@
 "linux с помощью <command>LILO</command> или <command>GRUB</command>."
 
 #. Tag: para
-#: install-methods.xml:935
+#: install-methods.xml:938
 #, no-c-format
 msgid ""
 "At boot time, both bootloaders support loading in memory not only the "
@@ -1392,7 +1397,7 @@
 "качестве корневой файловой системы."
 
 #. Tag: para
-#: install-methods.xml:941
+#: install-methods.xml:944
 #, no-c-format
 msgid ""
 "Copy the following files from the Debian archives to a convenient location "
@@ -1402,19 +1407,19 @@
 "диске, например в <filename>/boot/newinstall/</filename>."
 
 #. Tag: para
-#: install-methods.xml:948
+#: install-methods.xml:951
 #, no-c-format
 msgid "<filename>vmlinuz</filename> (kernel binary)"
 msgstr "<filename>vmlinuz</filename> (файл ядра)"
 
 #. Tag: para
-#: install-methods.xml:953
+#: install-methods.xml:956
 #, no-c-format
 msgid "<filename>initrd.gz</filename> (ramdisk image)"
 msgstr "<filename>initrd.gz</filename> (образ ramdisk)"
 
 #. Tag: para
-#: install-methods.xml:960
+#: install-methods.xml:963
 #, no-c-format
 msgid ""
 "Finally, to configure the bootloader proceed to <xref linkend=\"boot-initrd"
@@ -1424,13 +1429,13 @@
 ">."
 
 #. Tag: title
-#: install-methods.xml:970
+#: install-methods.xml:973
 #, no-c-format
 msgid "Hard Disk Installer Booting for OldWorld Macs"
 msgstr "Загрузка программы установки с жёсткого диска для OldWorld Mac"
 
 #. Tag: para
-#: install-methods.xml:971
+#: install-methods.xml:974
 #, no-c-format
 msgid ""
 "The <filename>boot-floppy-hfs</filename> floppy uses <application>miBoot</"
@@ -1454,7 +1459,7 @@
 "модели нужно использовать <application>BootX</application>."
 
 #. Tag: para
-#: install-methods.xml:984
+#: install-methods.xml:987
 #, no-c-format
 msgid ""
 "Download and unstuff the <application>BootX</application> distribution, "
@@ -1482,13 +1487,13 @@
 "filename> в активный System Folder."
 
 #. Tag: title
-#: install-methods.xml:1004
+#: install-methods.xml:1007
 #, no-c-format
 msgid "Hard Disk Installer Booting for NewWorld Macs"
 msgstr "Загрузка программы установки с жёсткого диска для NewWorld Mac"
 
 #. Tag: para
-#: install-methods.xml:1005
+#: install-methods.xml:1008
 #, no-c-format
 msgid ""
 "NewWorld PowerMacs support booting from a network or an ISO9660 CD-ROM, as "
@@ -1509,7 +1514,7 @@
 "NewWorld PowerMac."
 
 #. Tag: para
-#: install-methods.xml:1016
+#: install-methods.xml:1019
 #, no-c-format
 msgid ""
 "<emphasis>Copy</emphasis> (not move) the following four files which you "
@@ -1523,38 +1528,38 @@
 "перетаскиваниякаждого файла на иконку жёсткого диска)."
 
 #. Tag: filename
-#: install-methods.xml:1026
+#: install-methods.xml:1029
 #, no-c-format
 msgid "vmlinux"
 msgstr "vmlinux"
 
 #. Tag: filename
-#: install-methods.xml:1031
+#: install-methods.xml:1034
 #, no-c-format
 msgid "initrd.gz"
 msgstr "initrd.gz"
 
 #. Tag: filename
-#: install-methods.xml:1036
+#: install-methods.xml:1039
 #, no-c-format
 msgid "yaboot"
 msgstr "yaboot"
 
 #. Tag: filename
-#: install-methods.xml:1041
+#: install-methods.xml:1044
 #, no-c-format
 msgid "yaboot.conf"
 msgstr "yaboot.conf"
 
 #. Tag: para
-#: install-methods.xml:1046
-#, no-c-format
+#: install-methods.xml:1049
+#, fuzzy, no-c-format
 msgid ""
 "Make a note of the partition number of the MacOS partition where you place "
 "these files. If you have the MacOS <command>pdisk</command> program, you can "
-"use the L command to check for the partition number. You will need this "
-"partition number for the command you type at the Open Firmware prompt when "
-"you boot the installer."
+"use the <command>L</command> command to check for the partition number. You "
+"will need this partition number for the command you type at the Open "
+"Firmware prompt when you boot the installer."
 msgstr ""
 "Запомните номер раздела MacOS, куда вы поместили эти файлы. Если у вас есть "
 "MacOS программа <command>pdisk</command>, то вы можете воспользоваться "
@@ -1563,7 +1568,7 @@
 "программу установки."
 
 #. Tag: para
-#: install-methods.xml:1054
+#: install-methods.xml:1057
 #, no-c-format
 msgid "To boot the installer, proceed to <xref linkend=\"boot-newworld\"/>."
 msgstr ""
@@ -1571,13 +1576,13 @@
 "newworld\"/>."
 
 #. Tag: title
-#: install-methods.xml:1067
+#: install-methods.xml:1070
 #, no-c-format
 msgid "Preparing Files for TFTP Net Booting"
 msgstr "Подготовка файлов для загрузки по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1068
+#: install-methods.xml:1071
 #, no-c-format
 msgid ""
 "If your machine is connected to a local area network, you may be able to "
@@ -1592,7 +1597,7 @@
 "поддержку загрузки вашей машины."
 
 #. Tag: para
-#: install-methods.xml:1076
+#: install-methods.xml:1079
 #, no-c-format
 msgid ""
 "You need to setup a TFTP server, and for many machines, a BOOTP server "
@@ -1604,7 +1609,7 @@
 "\"supports-dhcp\"> или DHCP сервер</phrase>."
 
 #. Tag: para
-#: install-methods.xml:1082
+#: install-methods.xml:1085
 #, no-c-format
 msgid ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
@@ -1630,7 +1635,7 @@
 "только через DHCP.</phrase>"
 
 #. Tag: para
-#: install-methods.xml:1099
+#: install-methods.xml:1102
 #, no-c-format
 msgid ""
 "For PowerPC, if you have a NewWorld Power Macintosh machine, it is a good "
@@ -1642,7 +1647,7 @@
 "загрузить с помощью BOOTP."
 
 #. Tag: para
-#: install-methods.xml:1105
+#: install-methods.xml:1108
 #, no-c-format
 msgid ""
 "Unlike the Open Firmware found on Sparc and PowerPC machines, the SRM "
@@ -1666,7 +1671,7 @@
 "SRM консоли."
 
 #. Tag: para
-#: install-methods.xml:1122
+#: install-methods.xml:1125
 #, no-c-format
 msgid ""
 "Some older HPPA machines (e.g. 715/75) use RBOOTD rather than BOOTP. There "
@@ -1676,7 +1681,7 @@
 "BOOTP. Пакет <classname>rbootd</classname> доступен в Debian."
 
 #. Tag: para
-#: install-methods.xml:1127
+#: install-methods.xml:1130
 #, no-c-format
 msgid ""
 "The Trivial File Transfer Protocol (TFTP) is used to serve the boot image to "
@@ -1691,7 +1696,7 @@
 "Solaris) и GNU/Linux."
 
 #. Tag: para
-#: install-methods.xml:1135
+#: install-methods.xml:1138
 #, no-c-format
 msgid ""
 "To use the Pre-boot Execution Environment (PXE) method of TFTP booting, you "
@@ -1706,13 +1711,13 @@
 "<classname>tftpd-hpa</classname>."
 
 #. Tag: title
-#: install-methods.xml:1153
+#: install-methods.xml:1156
 #, no-c-format
 msgid "Setting up RARP server"
 msgstr "Настройка RARP сервера"
 
 #. Tag: para
-#: install-methods.xml:1154
+#: install-methods.xml:1157
 #, no-c-format
 msgid ""
 "To setup RARP, you need to know the Ethernet address (a.k.a. the MAC "
@@ -1732,7 +1737,7 @@
 "sbin/ifconfig eth0</userinput>."
 
 #. Tag: para
-#: install-methods.xml:1166
+#: install-methods.xml:1169
 #, no-c-format
 msgid ""
 "On a RARP server system using a Linux 2.2.x kernel, you need to populate the "
@@ -1768,7 +1773,7 @@
 "</userinput>, а затем попробуйте команду <command>rarp</command> ещё раз."
 
 #. Tag: para
-#: install-methods.xml:1182
+#: install-methods.xml:1185
 #, no-c-format
 msgid ""
 "On a RARP server system using a Linux 2.4.x kernel, there is no RARP module, "
@@ -1781,7 +1786,7 @@
 "параграфа."
 
 #. Tag: para
-#: install-methods.xml:1190
+#: install-methods.xml:1193
 #, no-c-format
 msgid ""
 "Under SunOS, you need to ensure that the Ethernet hardware address for the "
@@ -1799,33 +1804,35 @@
 "используйте <userinput>/usr/sbin/rarpd -a</userinput>."
 
 #. Tag: title
-#: install-methods.xml:1209
+#: install-methods.xml:1212
 #, no-c-format
 msgid "Setting up BOOTP server"
 msgstr "Настройка BOOTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1210
-#, no-c-format
+#: install-methods.xml:1213
+#, fuzzy, no-c-format
 msgid ""
-"There are two BOOTP servers available for GNU/Linux, the CMU "
-"<command>bootpd</command> and the other is actually a DHCP server, ISC "
-"<command>dhcpd</command>, which are contained in the <classname>bootp</"
-"classname> and <classname>dhcp</classname> packages in &debian;."
+"There are two BOOTP servers available for GNU/Linux. The first is CMU "
+"<command>bootpd</command>. The other is actually a DHCP server: ISC "
+"<command>dhcpd</command>. In &debian; these are contained in the "
+"<classname>bootp</classname> and <classname>dhcp</classname> packages "
+"respectively."
 msgstr ""
 "В GNU/Linux есть два BOOTP сервера: CMU <command>bootpd</command> и ISC "
 "<command>dhcpd</command> (на самом деле DHCP сервер); они находятся в "
 "пакетах <classname>bootp</classname> и <classname>dhcp</classname>."
 
 #. Tag: para
-#: install-methods.xml:1218
+#: install-methods.xml:1221
 #, fuzzy, no-c-format
 msgid ""
 "To use CMU <command>bootpd</command>, you must first uncomment (or add) the "
 "relevant line in <filename>/etc/inetd.conf</filename>. On &debian;, you can "
 "run <userinput>update-inetd --enable bootps</userinput>, then <userinput>/"
-"etc/init.d/inetd reload</userinput> to do so. Elsewhere, the line in "
-"question should look like: <informalexample><screen>\n"
+"etc/init.d/inetd reload</userinput> to do so. Just in case your BOOTP server "
+"does not run Debian, the line in question should look like: "
+"<informalexample><screen>\n"
 "bootps  dgram  udp  wait  root  /usr/sbin/bootpd  bootpd -i -t 120\n"
 "</screen></informalexample> Now, you must create an <filename>/etc/bootptab</"
 "filename> file. This has the same sort of familiar and cryptic format as the "
@@ -1880,7 +1887,7 @@
 "userinput> содержит MAC адрес машины.</phrase>"
 
 #. Tag: para
-#: install-methods.xml:1251
+#: install-methods.xml:1254
 #, no-c-format
 msgid ""
 "By contrast, setting up BOOTP with ISC <command>dhcpd</command> is really "
@@ -1902,13 +1909,13 @@
 "restart</userinput>."
 
 #. Tag: title
-#: install-methods.xml:1272
+#: install-methods.xml:1275
 #, no-c-format
 msgid "Setting up a DHCP server"
 msgstr "Настройка DHCP сервера"
 
 #. Tag: para
-#: install-methods.xml:1273
+#: install-methods.xml:1276
 #, no-c-format
 msgid ""
 "One free software DHCP server is ISC <command>dhcpd</command>. In &debian;, "
@@ -1965,7 +1972,7 @@
 "filename>."
 
 #. Tag: para
-#: install-methods.xml:1285
+#: install-methods.xml:1288
 #, no-c-format
 msgid ""
 "In this example, there is one server <replaceable>servername</replaceable> "
@@ -1982,7 +1989,7 @@
 "содержать имя файла, который нужно получить по TFTP."
 
 #. Tag: para
-#: install-methods.xml:1295
+#: install-methods.xml:1298
 #, no-c-format
 msgid ""
 "After you have edited the <command>dhcpd</command> configuration file, "
@@ -1993,13 +2000,13 @@
 "userinput>."
 
 #. Tag: title
-#: install-methods.xml:1303
+#: install-methods.xml:1306
 #, no-c-format
 msgid "Enabling PXE Booting in the DHCP configuration"
 msgstr "Включение загрузки PXE в конфигурацию DHCP"
 
 #. Tag: para
-#: install-methods.xml:1304
+#: install-methods.xml:1307
 #, no-c-format
 msgid ""
 "Here is another example for a <filename>dhcp.conf</filename> using the Pre-"
@@ -2070,13 +2077,13 @@
 "(смотрите ниже <xref linkend=\"tftp-images\"/>)."
 
 #. Tag: title
-#: install-methods.xml:1320
+#: install-methods.xml:1323
 #, no-c-format
 msgid "Enabling the TFTP Server"
 msgstr "Включение TFTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1321
+#: install-methods.xml:1324
 #, no-c-format
 msgid ""
 "To get the TFTP server ready to go, you should first make sure that "
@@ -2095,7 +2102,7 @@
 "установке."
 
 #. Tag: para
-#: install-methods.xml:1332
+#: install-methods.xml:1335
 #, no-c-format
 msgid ""
 "Look in that file and remember the directory which is used as the argument "
@@ -2121,7 +2128,7 @@
 "pid</replaceable></userinput>."
 
 #. Tag: para
-#: install-methods.xml:1346
+#: install-methods.xml:1349
 #, fuzzy, no-c-format
 msgid ""
 "If you intend to install Debian on an SGI machine and your TFTP server is a "
@@ -2151,13 +2158,13 @@
 "используемого Linux TFTP сервером."
 
 #. Tag: title
-#: install-methods.xml:1368
+#: install-methods.xml:1371
 #, no-c-format
 msgid "Move TFTP Images Into Place"
 msgstr "Копирование TFTP образов в каталог TFTP сервера"
 
 #. Tag: para
-#: install-methods.xml:1369
+#: install-methods.xml:1372
 #, no-c-format
 msgid ""
 "Next, place the TFTP boot image you need, as found in <xref linkend=\"where-"
@@ -2175,7 +2182,7 @@
 "определяется TFTP клиентом и никак не стандартизовано."
 
 #. Tag: para
-#: install-methods.xml:1379
+#: install-methods.xml:1382
 #, no-c-format
 msgid ""
 "On NewWorld Power Macintosh machines, you will need to set up the "
@@ -2193,7 +2200,7 @@
 "каталоге TFTP."
 
 #. Tag: para
-#: install-methods.xml:1388
+#: install-methods.xml:1391
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2209,7 +2216,7 @@
 "файла."
 
 #. Tag: para
-#: install-methods.xml:1396
+#: install-methods.xml:1399
 #, no-c-format
 msgid ""
 "For PXE booting, everything you should need is set up in the "
@@ -2225,20 +2232,21 @@
 "command> в качестве имени загружаемого файла."
 
 #. Tag: title
-#: install-methods.xml:1408
+#: install-methods.xml:1411
 #, no-c-format
 msgid "DECstation TFTP Images"
 msgstr "TFTP образы для DECstation"
 
 #. Tag: para
-#: install-methods.xml:1409
-#, no-c-format
+#: install-methods.xml:1412
+#, fuzzy, no-c-format
 msgid ""
 "For DECstations, there are tftpimage files for each subarchitecture, which "
 "contain both kernel and installer in one file. The naming convention is "
-"<replaceable>subarchitecture</replaceable>/netboot-boot.img. Copy the "
-"tftpimage file you would like to use to <userinput>/tftpboot/tftpboot.img</"
-"userinput> if you work with the example BOOTP/DHCP setups described above."
+"<filename><replaceable>subarchitecture</replaceable>/netboot-boot.img</"
+"filename>. Copy the tftpimage file you would like to use to <userinput>/"
+"tftpboot/tftpboot.img</userinput> if you work with the example BOOTP/DHCP "
+"setups described above."
 msgstr ""
 "Для DECstation, для каждой субархитектуры существует свой файл tftpimage, "
 "который содержит ядро и программу установки. Правило именования:"
@@ -2248,7 +2256,7 @@
 "приведённом выше."
 
 #. Tag: para
-#: install-methods.xml:1418
+#: install-methods.xml:1422
 #, no-c-format
 msgid ""
 "The DECstation firmware boots by TFTP with the command <userinput>boot "
@@ -2267,13 +2275,13 @@
 "виде:"
 
 #. Tag: userinput
-#: install-methods.xml:1430
+#: install-methods.xml:1434
 #, no-c-format
 msgid "boot #/tftp/filename param1=value1 param2=value2 ..."
 msgstr "boot #/tftp/filename param1=value1 param2=value2 ..."
 
 #. Tag: para
-#: install-methods.xml:1432
+#: install-methods.xml:1436
 #, no-c-format
 msgid ""
 "Several DECstation firmware revisions show a problem with regard to net "
@@ -2312,13 +2320,13 @@
 "pmax/board-list.html#proms\"></ulink>."
 
 #. Tag: title
-#: install-methods.xml:1470
+#: install-methods.xml:1474
 #, no-c-format
 msgid "Alpha TFTP Booting"
 msgstr "Загрузка Alpha по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1471
+#: install-methods.xml:1475
 #, no-c-format
 msgid ""
 "On Alpha, you must specify the filename (as a relative path to the boot "
@@ -2340,27 +2348,28 @@
 "файла одним из этих методов."
 
 #. Tag: title
-#: install-methods.xml:1486
+#: install-methods.xml:1490
 #, no-c-format
 msgid "SPARC TFTP Booting"
 msgstr "Загрузка SPARC по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1487
-#, no-c-format
+#: install-methods.xml:1491
+#, fuzzy, no-c-format
 msgid ""
-"SPARC architectures for instance use the subarchitecture names, such as "
-"<quote>SUN4M</quote> or <quote>SUN4C</quote>; in some cases, the "
-"architecture is left blank, so the file the client looks for is just "
-"<filename>client-ip-in-hex</filename>. Thus, if your system subarchitecture "
-"is a SUN4C, and its IP is 192.168.1.3, the filename would be "
-"<filename>C0A80103.SUN4C</filename>. An easy way to determine this is to "
-"enter the following command in a shell (assuming the machine's intended IP "
-"is 10.0.0.4). <informalexample><screen>\n"
+"Some SPARC architectures add the subarchitecture names, such as "
+"<quote>SUN4M</quote> or <quote>SUN4C</quote>, to the filename. Thus, if your "
+"system's subarchitecture is a SUN4C, and its IP is 192.168.1.3, the filename "
+"would be <filename>C0A80103.SUN4C</filename>. However, there are also "
+"subarchitectures where the file the client looks for is just "
+"<filename>client-ip-in-hex</filename>. An easy way to determine the "
+"hexadecimal code for the IP address is to enter the following command in a "
+"shell (assuming the machine's intended IP is 10.0.0.4). "
+"<informalexample><screen>\n"
 "$ printf '%.2x%.2x%.2x%.2x\\n' 10 0 0 4\n"
-"</screen></informalexample> This will spit out the IP in hexadecimal; to get "
-"to the correct filename, you will need to change all letters to uppercase "
-"and if necessary append the subarchitecture name."
+"</screen></informalexample> To get to the correct filename, you will need to "
+"change all letters to uppercase and if necessary append the subarchitecture "
+"name."
 msgstr ""
 "На SPARC архитектурах используются имена субархитектур, например "
 "<quote>SUN4M</quote> или <quote>SUN4C</quote>; в некоторых случаях, имя "
@@ -2376,7 +2385,7 @@
 "заглавными и если нужно, добавить имя субархитектуры."
 
 #. Tag: para
-#: install-methods.xml:1504
+#: install-methods.xml:1507
 #, no-c-format
 msgid ""
 "You can also force some sparc systems to look for a specific file name by "
@@ -2390,13 +2399,13 @@
 "котором его будет искать TFTP сервер."
 
 #. Tag: title
-#: install-methods.xml:1515
+#: install-methods.xml:1518
 #, no-c-format
 msgid "BVM/Motorola TFTP Booting"
 msgstr "Загрузка BVM/Motorola по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1516
+#: install-methods.xml:1519
 #, no-c-format
 msgid ""
 "For BVM and Motorola VMEbus systems copy the files &bvme6000-tftp-files; to "
@@ -2406,7 +2415,7 @@
 "каталог<filename>/tftpboot/</filename>."
 
 #. Tag: para
-#: install-methods.xml:1521
+#: install-methods.xml:1524
 #, no-c-format
 msgid ""
 "Next, configure your boot ROMs or BOOTP server to initially load the "
@@ -2421,13 +2430,13 @@
 "субархитектуры за дополнительной специфичной конфигурационной информацией."
 
 #. Tag: title
-#: install-methods.xml:1533
+#: install-methods.xml:1536
 #, fuzzy, no-c-format
 msgid "SGI TFTP Booting"
 msgstr "Загрузка SGI Indy по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1534
+#: install-methods.xml:1537
 #, fuzzy, no-c-format
 msgid ""
 "On SGI machines you can rely on the <command>bootpd</command> to supply the "
@@ -2441,29 +2450,29 @@
 "<filename>/etc/dhcpd.conf</filename>."
 
 #. Tag: title
-#: install-methods.xml:1546
+#: install-methods.xml:1549
 #, fuzzy, no-c-format
 msgid "Broadcom BCM91250A and BCM91480B TFTP Booting"
 msgstr "Загрузка Broadcom BCM91250A по TFTP"
 
 #. Tag: para
-#: install-methods.xml:1547
-#, no-c-format
+#: install-methods.xml:1550
+#, fuzzy, no-c-format
 msgid ""
 "You don't have to configure DHCP in a special way because you'll pass the "
-"full path of the file to the loaded to CFE."
+"full path of the file to be loaded to CFE."
 msgstr ""
 "Не требуется как-то особенно настраивать DHCP, кроме как передать CFE полный "
 "путь к файлу для загрузки."
 
 #. Tag: title
-#: install-methods.xml:1652
+#: install-methods.xml:1655
 #, no-c-format
 msgid "Automatic Installation"
 msgstr "Автоматическая установка"
 
 #. Tag: para
-#: install-methods.xml:1653
+#: install-methods.xml:1656
 #, no-c-format
 msgid ""
 "For installing on multiple computers it's possible to do fully automatic "
@@ -2479,13 +2488,13 @@
 "сама программа установки Debian."
 
 #. Tag: title
-#: install-methods.xml:1666
+#: install-methods.xml:1669
 #, no-c-format
 msgid "Automatic Installation Using the Debian Installer"
 msgstr "Автоматическая установка с помощью программы установки Debian"
 
 #. Tag: para
-#: install-methods.xml:1667
+#: install-methods.xml:1670
 #, no-c-format
 msgid ""
 "The Debian Installer supports automating installs via preconfiguration "
@@ -2499,7 +2508,7 @@
 "задаваемые во время процесса установки."
 
 #. Tag: para
-#: install-methods.xml:1674
+#: install-methods.xml:1677
 #, no-c-format
 msgid ""
 "Full documentation on preseeding including a working example that you can "




More information about the l10n-russian-cvs-commits mailing list