[l10n-russian CVS] release-notes release-notes.en.sgml,1.9,1.10 release-notes.ru.po,1.24,1.25 release-notes.ru.sgml,1.7,1.8
Nikolai Prokoschenko
debian-l10n-russian@lists.debian.org
Sat, 28 May 2005 18:36:21 +0000
- Previous message: [l10n-russian CVS] release-notes release-notes.en.sgml,1.8,1.9 release-notes.ru.po,1.23,1.24 release-notes.ru.sgml,1.6,1.7
- Next message: [l10n-russian CVS] release-notes release-notes.en.sgml,1.10,1.11 release-notes.ru.po,1.25,1.26 release-notes.ru.sgml,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/l10n-russian/release-notes
In directory haydn:/tmp/cvs-serv4706
Modified Files:
release-notes.en.sgml release-notes.ru.po
release-notes.ru.sgml
Log Message:
more syncing, this time it should be last one ;)
Index: release-notes.ru.po
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.ru.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- release-notes.ru.po 28 May 2005 15:17:22 -0000 1.24
+++ release-notes.ru.po 28 May 2005 18:36:19 -0000 1.25
@@ -794,13 +794,15 @@
"# dpkg --get-selections > ~/curr-pkgs.txt\n"
"</example>"
-#. <p> 432--438
+#. <p> 432--441
#: release-notes.en.sgml:432
+#, fuzzy
msgid ""
"It is desirable to remove any holds before upgrading. If any package that is "
"essential for the upgrade is on hold, the upgrade will fail. You can "
"identify packages on hold with <example compact=\"compact\">\n"
-"# dpkg --audit\n"
+" \n"
+"# dpkg --get-selections | grep hold\n"
" </example>"
msgstr ""
"Перед обновлением желательно снять все фиксации пакетов. Если один из "
@@ -810,8 +812,8 @@
"# dpkg --audit\n"
" </example>"
-#. <p> 440--465
-#: release-notes.en.sgml:440
+#. <p> 443--468
+#: release-notes.en.sgml:443
msgid ""
"If you changed and recompiled a package locally, and didn't rename it or put "
"an epoch in the version, you must put it on hold to prevent it from being "
@@ -829,21 +831,21 @@
" </example> ]]>"
msgstr ""
-#. <p> 468--470
-#: release-notes.en.sgml:468
+#. <p> 471--473
+#: release-notes.en.sgml:471
msgid ""
"If there is anything you need to fix, it is best to make sure your "
"<file>sources.list</file> still refers to &oldreleasename; as explained in "
"<ref id=\"old-sources\">."
msgstr ""
-#. <heading> 473--473
-#: release-notes.en.sgml:473
+#. <heading> 476--476
+#: release-notes.en.sgml:476
msgid "Unofficial sources and backports"
msgstr ""
-#. <p> 475--481
-#: release-notes.en.sgml:475
+#. <p> 478--484
+#: release-notes.en.sgml:478
msgid ""
"If you have any non-Debian packages on your system, you should be aware that "
"these may be removed during the upgrade because of conflicting dependencies. "
@@ -853,8 +855,8 @@
"accordingly at the same time as your source lines for Debian packages."
msgstr ""
-#. <p> 483--491
-#: release-notes.en.sgml:483
+#. <p> 486--494
+#: release-notes.en.sgml:486
msgid ""
"Some users may have unofficial backported \"newer\" versions of packages "
"that <em>are</em> in Debian installed on their &oldreleasename; system. Such "
@@ -866,13 +868,13 @@
"deal with file conflicts if they should occur."
msgstr ""
-#. <heading> 500--500
-#: release-notes.en.sgml:500
+#. <heading> 503--503
+#: release-notes.en.sgml:503
msgid "Checking kernel support"
msgstr "Проверка поддержки ядра"
-#. <p> 503--504
-#: release-notes.en.sgml:503
+#. <p> 506--507
+#: release-notes.en.sgml:506
msgid ""
"All machines with a 64bit SPARC CPU (sun4u) should be upgradable without any "
"special considerations about kernel support."
@@ -880,8 +882,8 @@
"Все системы с 64-битными процессорами SPARC (sun4u) должны обновиться не "
"требуя никакой специальной поддержки ядра."
-#. <p> 506--508
-#: release-notes.en.sgml:506
+#. <p> 509--511
+#: release-notes.en.sgml:509
msgid ""
"sun4c CPUs are <em>no longer supported</em> in &releasename;. The support "
"for sun4d CPUs is in a rather unknown state since they are very rare. It is "
@@ -891,8 +893,8 @@
"поддержке sun4d почти ничего неизвестно, так как они очень редки. Вполне "
"возможно, что процессоры sun4d с MMU будут работать."
-#. <p> 510--514
-#: release-notes.en.sgml:510
+#. <p> 513--517
+#: release-notes.en.sgml:513
msgid ""
"sun4m CPUs are still supported but you need to install a newer kernel "
"version first before upgrading the system. This is necessary because newer "
@@ -905,8 +907,8 @@
"содержат команды процессора, которые на некоторых машинах недоступны, "
"поэтому необходимо установить ядро, эмулирующее недостающие команды."
-#. <p> 516--519
-#: release-notes.en.sgml:516
+#. <p> 519--522
+#: release-notes.en.sgml:519
msgid ""
"Technically only <em>some</em> sun4m chips are affected, but as glibc can't "
"reliably detect whether a system is affected it will refuse to be upgraded "
@@ -917,8 +919,8 @@
"процессором, то он просто откажется устанавливаться на любую 32-битную "
"систему на базе SPARC без исправленного ядра."
-#. <p> 521--526
-#: release-notes.en.sgml:521
+#. <p> 524--529
+#: release-notes.en.sgml:524
msgid ""
"For those interested in the gory details: some of the sun4m chips, produced "
"by Cypress/ROSS, don't implement the <tt>umul</tt> instruction (RT601/"
@@ -933,8 +935,8 @@
"6xxMP. Более поздние модели использовали чипы производства TI. Пока нам "
"неизвестно, распространяется ли на них этот недостаток."
-#. <p> 531--535
-#: release-notes.en.sgml:531
+#. <p> 534--538
+#: release-notes.en.sgml:534
msgid ""
"On 64bit HPPA machines you will need to upgrade to a newer kernel version "
"first before upgrading the system. This is necessary because newer versions "
@@ -946,8 +948,8 @@
"некоторых машинах недоступны, поэтому требуется обновлённое ядро, "
"эмулирующее недостающие команды."
-#. <p> 539--541
-#: release-notes.en.sgml:539
+#. <p> 542--544
+#: release-notes.en.sgml:542
msgid ""
"True \"80386\" CPUs are <em>no longer supported</em> by &releasename;. This "
"does not affect any CPUs that are compatible with \"80486\" CPUs or above."
@@ -955,16 +957,16 @@
"\"Настоящие\" 386 (процессоры Intel 80386) <em>теперь не поддерживаются</em> "
"sarge. Это, конечно, не касается процессоров \"80486\" и более новых."
-#. <heading> 545--545
-#. <heading> 769--769
-#. <heading> 1460--1460
-#: release-notes.en.sgml:545 release-notes.en.sgml:769
-#: release-notes.en.sgml:1460
+#. <heading> 548--548
+#. <heading> 772--772
+#. <heading> 1477--1477
+#: release-notes.en.sgml:548 release-notes.en.sgml:772
+#: release-notes.en.sgml:1477
msgid "Upgrading the kernel"
msgstr "Обновление ядра"
-#. <p> 547--549
-#: release-notes.en.sgml:547
+#. <p> 550--552
+#: release-notes.en.sgml:550
msgid ""
"If (and only if) the previous section indicates that you should upgrade your "
"kernel <em>before</em> the upgrade of the system, you should do so now."
@@ -973,8 +975,8 @@
"надо обновить версию ядра <em>перед</em> обновлением системы, сделайте это "
"прямо сейчас."
-#. <p> 551--555
-#: release-notes.en.sgml:551
+#. <p> 554--558
+#: release-notes.en.sgml:554
msgid ""
"Backports are available of all tools needed to install the current kernel "
"from &releasename;. Detailed instructions on how to install the new kernel "
@@ -984,13 +986,13 @@
"адаптированном для &oldreleasename; виде. Подробные инструкции по установке "
"нового ядра можно получить тут: <ref id=\"kernel-upgrade-howto\">."
-#. <heading> 563--563
-#: release-notes.en.sgml:563
+#. <heading> 566--566
+#: release-notes.en.sgml:566
msgid "Preparing sources for APT"
msgstr "Подготовка источников APT"
-#. <p> 565--567
-#: release-notes.en.sgml:565
+#. <p> 568--570
+#: release-notes.en.sgml:568
msgid ""
"Before starting the upgrade you must set up <package>apt</package>'s "
"configuration file for package lists, <file>/etc/apt/sources.list</file>."
@@ -998,8 +1000,8 @@
"Перед началом процесса обновления вы должны настроить файл конфигурации "
"<package>apt</package> <file>/etc/apt/sources.list</file>."
-#. <p> 569--574
-#: release-notes.en.sgml:569
+#. <p> 572--577
+#: release-notes.en.sgml:572
msgid ""
"<package>apt</package> will consider all packages that can be found via any "
"\"<tt>deb</tt>\" line, and install the package with the highest version "
@@ -1014,8 +1016,8 @@
"случае использования нескольких зеркал обычно лучше первым указать каталог "
"на локальном жёстком диске, затем компакт-диск и, наконец, зеркала HTTP/FTP)."
-#. <p> 576--584
-#: release-notes.en.sgml:576
+#. <p> 579--587
+#: release-notes.en.sgml:579
msgid ""
"A release can often be referred to by both its codename (e.g. "
"&oldreleasename;, &releasename;) and by its status name (i.e. oldstable, "
@@ -1027,13 +1029,13 @@
"as a release has happened."
msgstr ""
-#. <heading> 586--586
-#: release-notes.en.sgml:586
+#. <heading> 589--589
+#: release-notes.en.sgml:589
msgid "Adding APT Internet sources"
msgstr "Как добавить Интернет-источник APT"
-#. <p> 588--591
-#: release-notes.en.sgml:588
+#. <p> 591--594
+#: release-notes.en.sgml:591
msgid ""
"The default configuration is set up for installation from main Debian "
"Internet servers, but you may wish to modify <file>/etc/apt/sources.list</"
@@ -1045,8 +1047,8 @@
"использовать другие зеркала. Лучше использовать ближайшее к вам (в смысле "
"скорости передачи данных) зеркало."
-#. <p> 599--602
-#: release-notes.en.sgml:599
+#. <p> 602--605
+#: release-notes.en.sgml:602
msgid ""
"Debian HTTP or FTP mirror addresses can be found at <url id=\"&url-debian-"
"mirrors;\"> (look at the \"Full list of mirrors\" section). HTTP mirrors are "
@@ -1056,8 +1058,8 @@
"mirrors;\"> (см. раздел \"Полный список зеркал\"). HTTP-зеркала обычно "
"быстрее, чем FTP."
-#. <p> 604--612
-#: release-notes.en.sgml:604
+#. <p> 607--615
+#: release-notes.en.sgml:607
msgid ""
"For example, suppose your closest Debian mirror is <tt>&url-debian-mirror-"
"eg;/</tt>. When inspecting that mirror with a web browser or FTP program, "
@@ -1076,8 +1078,8 @@
"&url-debian-mirror-eg;/dists/stable/contrib/binary-&architecture;/...\n"
" </example>"
-#. <p> 614--619
-#: release-notes.en.sgml:614
+#. <p> 617--622
+#: release-notes.en.sgml:617
msgid ""
"To use this mirror with <prgn>apt</prgn>, you add this line to your "
"<file>sources.list</file> file: <example compact=\"compact\">\n"
@@ -1089,9 +1091,9 @@
"deb &url-debian-mirror-eg; &releasename; main contrib\n"
" </example>"
-#. <p> 621--623
-#. <p> 661--663
-#: release-notes.en.sgml:621 release-notes.en.sgml:661
+#. <p> 624--626
+#. <p> 664--666
+#: release-notes.en.sgml:624 release-notes.en.sgml:664
msgid ""
"Note that the `<tt>dists</tt>' is added implicitly, and the arguments after "
"the release name are used to expand the path into multiple directories."
@@ -1100,9 +1102,9 @@
"параметры после имени выпуска используются для дополнения сетевого пути до "
"реальных каталогов."
-#. <p> 625--627
-#. <p> 665--667
-#: release-notes.en.sgml:625 release-notes.en.sgml:665
+#. <p> 628--630
+#. <p> 668--670
+#: release-notes.en.sgml:628 release-notes.en.sgml:668
msgid ""
"After adding your new sources, disable the previously existing \"<tt>deb</tt>"
"\" lines in <file>sources.list</file>, by placing a hash sign (<tt>#</tt>) "
@@ -1112,8 +1114,8 @@
"в файле <file>sources.list</file> строки <tt>deb</tt>, поставив в начале "
"каждой строки знак диеза (<tt>#</tt>)."
-#. <p> 629--635
-#: release-notes.en.sgml:629
+#. <p> 632--638
+#: release-notes.en.sgml:632
msgid ""
"Any package needed for installation that is fetched from the network is "
"stored in <file>/var/cache/apt/archives</file> (and the <file>partial/</"
@@ -1128,13 +1130,13 @@
"должны убедиться в том, что там достаточно места. Для обычной установки "
"понадобится приблизительно 300МБ дискового пространства."
-#. <heading> 639--639
-#: release-notes.en.sgml:639
+#. <heading> 642--642
+#: release-notes.en.sgml:642
msgid "Adding APT sources for a local mirror"
msgstr "Как добавить локальное зеркало APT"
-#. <p> 641--643
-#: release-notes.en.sgml:641
+#. <p> 644--646
+#: release-notes.en.sgml:644
msgid ""
"Instead of using HTTP or FTP packages mirrors, you may wish to modify <file>/"
"etc/apt/sources.list</file> to use a mirror on a local disk (possibly "
@@ -1144,8 +1146,8 @@
"<file>/etc/apt/sources.list</file>, использовать зеркало на локальном диске "
"(возможно, смонтированном по сети)."
-#. <p> 645--652
-#: release-notes.en.sgml:645
+#. <p> 648--655
+#: release-notes.en.sgml:648
msgid ""
"For example, your packages mirror may be under <file>/var/ftp/debian/</"
"file>, and have main directories like this: <example compact=\"compact\">\n"
@@ -1160,8 +1162,8 @@
"/var/ftp/debian/dists/stable/contrib/binary-&architecture;/...\n"
" </example>"
-#. <p> 654--659
-#: release-notes.en.sgml:654
+#. <p> 657--662
+#: release-notes.en.sgml:657
msgid ""
"To use this with <prgn>apt</prgn>, add this line to your <file>sources.list</"
"file> file: <example compact=\"compact\">\n"
@@ -1173,13 +1175,13 @@
"deb file:/var/ftp/debian &releasename; main contrib\n"
" </example>"
-#. <heading> 669--669
-#: release-notes.en.sgml:669
+#. <heading> 672--672
+#: release-notes.en.sgml:672
msgid "Adding APT source from CD-ROM or DVD"
msgstr "Как добавить источник APT на компакт-диске или DVD"
-#. <p> 671--673
-#: release-notes.en.sgml:671
+#. <p> 674--676
+#: release-notes.en.sgml:674
msgid ""
"If you want to use CDs <em>only</em>, comment out the existing \"<tt>deb</tt>"
"\" lines in <file>/etc/apt/sources.list</file> by placing a hash sign "
@@ -1189,8 +1191,8 @@
"все присутствующие в файле <file>/etc/apt/sources.list</file> строки "
"<tt>deb</tt>, поставив в начале каждой строки знак диеза (<tt>#</tt>)."
-#. <p> 677--686
-#: release-notes.en.sgml:677
+#. <p> 680--689
+#: release-notes.en.sgml:680
msgid ""
"Make sure there is a line in <file>/etc/fstab</file> that enables mounting "
"your CD-ROM drive at the <file>/cdrom</file> mount point (the exact <file>/"
@@ -1209,8 +1211,8 @@
"/dev/hdc /cdrom auto defaults,noauto,ro 0 0\n"
" </example>"
-#. <p> 688--689
-#: release-notes.en.sgml:688
+#. <p> 691--692
+#: release-notes.en.sgml:691
msgid ""
"Note that there must be <em>no spaces</em> between the words <tt>defaults,"
"noauto,ro</tt> in the fourth field."
@@ -1218,8 +1220,8 @@
"Обратите внимание на то, что между словами <tt>defaults,noauto,ro</tt> в "
"четвёртом поле строки <em>не должно быть пробелов</em>."
-#. <p> 691--697
-#: release-notes.en.sgml:691
+#. <p> 694--700
+#: release-notes.en.sgml:694
msgid ""
"To verify it works, insert a CD and try running <example compact=\"compact"
"\">\n"
@@ -1235,8 +1237,8 @@
"umount /cdrom # (размонтирование компакт-диска)\n"
" </example>"
-#. <p> 699--706
-#: release-notes.en.sgml:699
+#. <p> 702--709
+#: release-notes.en.sgml:702
msgid ""
"Next, run: <example compact=\"compact\">\n"
"# apt-cdrom add\n"
@@ -1248,13 +1250,13 @@
"apt-cdrom add\n"
"</example>."
-#. <heading> 710--710
-#: release-notes.en.sgml:710
+#. <heading> 713--713
+#: release-notes.en.sgml:713
msgid "Upgrading packages"
msgstr "Обновление пакетов"
-#. <p> 712--715
-#: release-notes.en.sgml:712
+#. <p> 715--718
+#: release-notes.en.sgml:715
msgid ""
"The recommended tool for upgrading between &debian; releases is to use the "
"package management tool <prgn>aptitude</prgn>. This tool makes safer "
@@ -1266,8 +1268,8 @@
"принимает более безопасные решения об установке пакетов, чем при "
"непосредственном запуске <prgn>apt-get</prgn>."
-#. <p> 717--723
-#: release-notes.en.sgml:717
+#. <p> 720--726
+#: release-notes.en.sgml:720
msgid ""
"Don't forget to mount all needed partitions (notably the root and <file>/"
"usr</file> partitions) read-write, with a command like: <example compact="
@@ -1281,8 +1283,8 @@
" mount -o remount,rw /<var>точка_монтирования</var>\n"
" </example>"
-#. <p> 725--729
-#: release-notes.en.sgml:725
+#. <p> 728--732
+#: release-notes.en.sgml:728
msgid ""
"Next you should double check that the APT source entries (in <file>/etc/apt/"
"sources.list</file>) refer either to \"<tt>&releasename;</tt>\" or to "
@@ -1291,8 +1293,8 @@
"em> change it."
msgstr ""
-#. <p> 731--744
-#: release-notes.en.sgml:731
+#. <p> 734--747
+#: release-notes.en.sgml:734
msgid ""
"It is strongly recommended that you use the <prgn>/usr/bin/script</prgn> "
"program to record a transcript of the upgrade session. Then if a problem "
@@ -1315,8 +1317,8 @@
"<file>/tmp</file> и <file>/var/tmp</file> - файлы в этих каталогах могут "
"быть удалены при обновлении или перезагрузке."
-#. <p> 746--749
-#: release-notes.en.sgml:746
+#. <p> 749--752
+#: release-notes.en.sgml:749
msgid ""
"The typescript will also allow you to review information that has scrolled "
"off-screen. Just switch to VT2 (using <tt>alt-F2</tt>) and, after logging "
@@ -1324,20 +1326,20 @@
"file."
msgstr ""
-#. <p> 751--752
-#: release-notes.en.sgml:751
+#. <p> 754--755
+#: release-notes.en.sgml:754
msgid ""
"After you have completed the upgrade, you can stop the typescript by typing "
"<tt>exit</tt> at the prompt."
msgstr ""
-#. <heading> 754--754
-#: release-notes.en.sgml:754
+#. <heading> 757--757
+#: release-notes.en.sgml:757
msgid "Updating the package list"
msgstr "Обновление списка пакетов"
-#. <p> 756--759
-#: release-notes.en.sgml:756
+#. <p> 759--762
+#: release-notes.en.sgml:759
msgid ""
"First the list of available packages for the new release needs to be "
"fetched. This is done by executing<footnote><p>We use <prgn>apt-get</prgn> "
@@ -1346,8 +1348,8 @@
"footnote>:"
msgstr ""
-#. <p> 761--763
-#: release-notes.en.sgml:761
+#. <p> 764--766
+#: release-notes.en.sgml:764
msgid ""
"<example compact=\"compact\">\n"
"# apt-get update\n"
@@ -1357,8 +1359,8 @@
"apt-get update\n"
"</example>"
-#. <p> 772--776
-#: release-notes.en.sgml:772
+#. <p> 775--779
+#: release-notes.en.sgml:775
msgid ""
"On &arch-title; machines you will need to upgrade to a newer kernel version "
"first before upgrading the system. This is necessary because of a "
@@ -1370,8 +1372,8 @@
"Это вызвано нечётким определением протокола связи C-библиотеки и ядра. Вам "
"понадобится ядро с обновлёнными определениями."
-#. <p> 778--779
-#: release-notes.en.sgml:778
+#. <p> 781--782
+#: release-notes.en.sgml:781
#, fuzzy
msgid ""
"Detailed instructions on how to install the new kernel can be found in <ref "
@@ -1381,20 +1383,20 @@
"адаптированном для &oldreleasename; виде. Подробные инструкции по установке "
"нового ядра можно получить тут: <ref id=\"kernel-upgrade-howto\">."
-#. <heading> 787--787
-#: release-notes.en.sgml:787
+#. <heading> 790--790
+#: release-notes.en.sgml:790
#, fuzzy
msgid "Upgrading aptitude"
msgstr "Обновление пакетов"
-#. <heading> 790--790
-#: release-notes.en.sgml:790
+#. <heading> 793--793
+#: release-notes.en.sgml:793
#, fuzzy
msgid "Installing aptitude"
msgstr "Обновление пакетов"
-#. <p> 793--802
-#: release-notes.en.sgml:793
+#. <p> 796--805
+#: release-notes.en.sgml:796
msgid ""
"Upgrade tests have shown that &releasename;'s version of <prgn>aptitude</"
"prgn> is better at solving the complex dependencies during an upgrade than "
@@ -1405,8 +1407,8 @@
" </example>"
msgstr ""
-#. <p> 806--808
-#: release-notes.en.sgml:806
+#. <p> 809--811
+#: release-notes.en.sgml:809
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
@@ -1417,30 +1419,30 @@
" apt-get install aptitude\n"
" </example>"
-#. <p> 811--814
-#: release-notes.en.sgml:811
+#. <p> 814--817
+#: release-notes.en.sgml:814
msgid ""
"You will be shown a list of the changes that will be made and asked you to "
"confirm them. You should take a careful look at the proposed changes, "
"especially packages that will be removed by the upgrade, before you confirm."
msgstr ""
-#. <heading> 818--818
-#: release-notes.en.sgml:818
+#. <heading> 821--821
+#: release-notes.en.sgml:821
#, fuzzy
msgid "Upgrading doc-base"
msgstr "Обновление пакетов"
-#. <p> 820--823
-#: release-notes.en.sgml:820
+#. <p> 823--826
+#: release-notes.en.sgml:823
msgid ""
"<em>If you have <package>doc-base</package> installed</em>, it must be "
"upgraded before the rest of the system too. Reason is that it may fail if "
"perl is upgraded at the same time. You can find out if it is installed using:"
msgstr ""
-#. <p> 825--827
-#: release-notes.en.sgml:825
+#. <p> 828--830
+#: release-notes.en.sgml:828
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
@@ -1451,8 +1453,8 @@
"dpkg -l doc-base\n"
"</example>"
-#. <p> 829--830
-#: release-notes.en.sgml:829
+#. <p> 832--833
+#: release-notes.en.sgml:832
msgid ""
"If the line of output begins with \"i\" then it is installed and must be "
"upgraded before continuing."
@@ -1460,8 +1462,8 @@
"Если первая буква в напечатанной строке - \"i\", то пакет установлен и "
"должен быть обновлён в первую очередь."
-#. <p> 832--834
-#: release-notes.en.sgml:832
+#. <p> 835--837
+#: release-notes.en.sgml:835
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
@@ -1472,20 +1474,20 @@
"aptitude install doc-base\n"
"</example>"
-#. <heading> 838--838
-#: release-notes.en.sgml:838
+#. <heading> 841--841
+#: release-notes.en.sgml:841
#, fuzzy
msgid "Upgrading the rest of the system"
msgstr "Обновление ядра"
-#. <p> 840--841
-#: release-notes.en.sgml:840
+#. <p> 843--844
+#: release-notes.en.sgml:843
msgid ""
"You are now ready to continue with the main part of the upgrade. Execute:"
msgstr "Теперь можно приступить собственно к обновлению. Выполните команду "
-#. <p> 842--844
-#: release-notes.en.sgml:842
+#. <p> 845--847
+#: release-notes.en.sgml:845
#, fuzzy
msgid ""
"<example compact=\"compact\">\n"
@@ -1496,8 +1498,8 @@
"aptitude -f --with-recommends dist-upgrade\n"
"\t </example>"
-#. <p> 846--851
-#: release-notes.en.sgml:846
+#. <p> 849--854
+#: release-notes.en.sgml:849
msgid ""
"This will perform a complete upgrade of the system, i.e. install the newest "
"available versions of all packages, and resolve all possible dependency "
@@ -1513,8 +1515,8 @@
"конфликты устаревшие пакеты (такие как <package>console-tools-libs</"
"package>)."
-#. <p> 853--856
-#: release-notes.en.sgml:853
+#. <p> 856--859
+#: release-notes.en.sgml:856
msgid ""
"When upgrading from a set of CD-ROMs, you will be asked to insert specific "
"CDs at several points during the upgrade. You might have to insert the same "
@@ -1526,8 +1528,8 @@
"один диск по нескольку раз, это вызвано тем, что взаимосвязанные пакеты "
"могут находится на разных дисках."
-#. <p> 858--863
-#: release-notes.en.sgml:858
+#. <p> 861--866
+#: release-notes.en.sgml:861
#, fuzzy
msgid ""
"New versions of currently installed packages that cannot be upgraded without "
@@ -1542,8 +1544,8 @@
"отметив такой пакет как подлежащий установке, либо выполнив команду "
"<tt>aptitude -f install <пакет></tt>."
-#. <p> 865--868
-#: release-notes.en.sgml:865
+#. <p> 868--871
+#: release-notes.en.sgml:868
msgid ""
"The <tt>--fix-broken</tt> (or just <tt>-f</tt>) option causes <package>apt</"
"package> to attempt to correct a system with broken dependencies in place. "
@@ -1555,14 +1557,14 @@
"зависимости. Система <package>apt</package> не позволяет, чтобы какие-либо "
"зависимости в системе были не удовлетворены."
-#. <heading> 872--872
-#: release-notes.en.sgml:872
+#. <heading> 875--875
+#: release-notes.en.sgml:875
#, fuzzy
msgid "Possible issues during upgrade"
msgstr "Возможные проблемы во время или после обновления"
-#. <p> 874--888
-#: release-notes.en.sgml:874
+#. <p> 877--891
+#: release-notes.en.sgml:877
msgid ""
"If an operation using <prgn>aptitude</prgn>, <prgn>apt-get</prgn> or "
"<prgn>dpkg</prgn> fails with the error <example compact=\"compact\">\n"
@@ -1577,8 +1579,8 @@
"assumes that you do not yet have this variable set in that file."
msgstr ""
-#. <p> 890--895
-#: release-notes.en.sgml:890
+#. <p> 893--898
+#: release-notes.en.sgml:893
msgid ""
"Sometimes it's necessary to enable APT::Force-LoopBreak option in APT to be "
"able to temporarily remove an essential package due to a Conflicts/Pre-"
@@ -1593,8 +1595,8 @@
"Чтобы решить эту проблему, следует указать в командной строке "
"<prgn>aptitude</prgn> параметр <tt>-o APT::Force-LoopBreak=1</tt>."
-#. <p> 898--911
-#: release-notes.en.sgml:898
+#. <p> 901--914
+#: release-notes.en.sgml:901
#, fuzzy
msgid ""
"It is possible that a system's dependency structure can be so corrupt as to "
@@ -1617,8 +1619,8 @@
"dpkg --configure --pending\n"
" </example>"
-#. <p> 913--918
-#: release-notes.en.sgml:913
+#. <p> 916--921
+#: release-notes.en.sgml:916
#, fuzzy
msgid ""
"In extreme cases you might have to force re-installation with a command like "
@@ -1631,8 +1633,37 @@
"dpkg --install /путь/к/пакету/имя_пакета.deb\n"
" </example>"
-#. <p> 924--926
-#: release-notes.en.sgml:924
+#. <p> 923--932
+#: release-notes.en.sgml:923
+msgid ""
+"File conflicts should not occur if you upgrade from a \"pure\" "
+"&oldreleasename; system, but can occur if you have unofficial backports "
+"installed. A file conflict will result in an error like: <example compact="
+"\"compact\">\n"
+"Unpacking replacement <var><package-foo></var> ...\n"
+"dpkg: error processing <var><package-name-for-foo></var> (--unpack):\n"
+" trying to overwrite `<var><some-file-name></var>',\n"
+" which is also in package <var><package-bar></var>\n"
+" </example>"
+msgstr ""
+
+#. <p> 934--939
+#: release-notes.en.sgml:934
+#, fuzzy
+msgid ""
+"You can try to solve a file conflict by forcibly removing the package "
+"mentioned on the <em>last</em> line of the error message: <example compact="
+"\"compact\">\n"
+"# dpkg -r --force-depends <var>packagename</var>\n"
+" </example>"
+msgstr ""
+"В чрезвычайных случаях вам может потребоваться принудительная переустановка "
+"пакета командой <example compact=\"compact\">\n"
+"dpkg --install /путь/к/пакету/имя_пакета.deb\n"
+" </example>"
+
+#. <p> 941--943
+#: release-notes.en.sgml:941
#, fuzzy
msgid ""
"After fixing things up, you should be able to resume the upgrade by "
@@ -1641,8 +1672,8 @@
"После исправления ошибок вы можете продолжить обновление, выполнив команду "
"<tt>dist-upgrade</tt>, как описано выше."
-#. <p> 928--936
-#: release-notes.en.sgml:928
+#. <p> 945--953
+#: release-notes.en.sgml:945
#, fuzzy
msgid ""
"During the upgrade, you will be asked questions regarding the configuration "
@@ -1662,8 +1693,8 @@
"потому что файлы конфигурации будут сохранены с расширением <tt>.dpkg-old</"
"tt>."
-#. <p> 938--941
-#: release-notes.en.sgml:938
+#. <p> 955--958
+#: release-notes.en.sgml:955
msgid ""
"If you're not sure what to do, write down the name of the package or file, "
"and sort things out at a later time. You can search in the typescript file "
@@ -1673,13 +1704,13 @@
"разберитесь с проблемой позднее. Информацию, выводившуюся на экран во время "
"обновления, вы сможете найти в файле транскрипта."
-#. <heading> 946--946
-#: release-notes.en.sgml:946
+#. <heading> 963--963
+#: release-notes.en.sgml:963
msgid "Things to do before rebooting"
msgstr "Перед перезагрузкой"
-#. <p> 948--950
-#: release-notes.en.sgml:948
+#. <p> 965--967
+#: release-notes.en.sgml:965
msgid ""
"When <tt>aptitude dist-upgrade</tt> has finished, the \"formal\" upgrade is "
"complete, but there are some other things that should be taken care of "
@@ -1689,8 +1720,8 @@
"<em>формально</em> обновление завершено, но перед перезагрузкой следует "
"проделать ещё несколько действий."
-#. <p> 952--956
-#: release-notes.en.sgml:952
+#. <p> 969--973
+#: release-notes.en.sgml:969
#, fuzzy
msgid ""
"Read <file>/usr/share/doc/xfree86-common/README.Debian-upgrade.gz</file> for "
@@ -1702,13 +1733,13 @@
"относится к пользователям всех предыдущих выпусков. Вам обязательно надо его "
"прочитать."
-#. <heading> 958--958
-#: release-notes.en.sgml:958
+#. <heading> 975--975
+#: release-notes.en.sgml:975
msgid "Upgrading your kernel"
msgstr "Обновление ядра"
-#. <p> 960--963
-#: release-notes.en.sgml:960
+#. <p> 977--980
+#: release-notes.en.sgml:977
#, fuzzy
msgid ""
"Note that the Linux kernel was <em>not</em> upgraded by these procedures. "
@@ -1721,8 +1752,8 @@
"из пакетов <package>kernel-image-*</package>, либо скомпилировав ядро из "
"исходного кода."
-#. <p> 970--972
-#: release-notes.en.sgml:970
+#. <p> 987--989
+#: release-notes.en.sgml:987
msgid ""
"&debian; comes with a &kernelversion; kernel which is in the 2.4 series, the "
"older stable Linux kernel series. You may wish to use a 2.6 series kernel "
@@ -1733,8 +1764,8 @@
"лучше поддерживающее различные устройства и обладающее улучшенной "
"производительностью."
-#. <p> 974--977
-#: release-notes.en.sgml:974
+#. <p> 991--994
+#: release-notes.en.sgml:991
msgid ""
"However, you a strongly advised <strong>not</strong> to upgrade to a 2.6 "
"kernel as part of the upgrade from &oldreleasename; to &releasename;. Some "
@@ -1745,8 +1776,8 @@
"с обновлением всей системы &oldreleasename; на &releasename;. Некоторые "
"проблемы перехода на ядро 2.6 описаны в разделе <ref id=\"upgrade-to-2.6\">."
-#. <p> 980--986
-#: release-notes.en.sgml:980
+#. <p> 997--1003
+#: release-notes.en.sgml:997
#, fuzzy
msgid ""
"To upgrade your kernel you must first choose the kernel most appropriate for "
@@ -1761,8 +1792,8 @@
" apt-cache search ^kernel-image\n"
" </example>"
-#. <p> 988--990
-#: release-notes.en.sgml:988
+#. <p> 1005--1007
+#: release-notes.en.sgml:1005
#, fuzzy
msgid ""
"You should then use <tt>aptitude install</tt> to install it. Once this new "
@@ -1772,8 +1803,8 @@
"Затем ядро нужно установить с помощью <tt>aptitude install</aptitude>. После "
"установки ядра следует перезагрузить систему при первой возможности."
-#. <p> 992--1001
-#: release-notes.en.sgml:992
+#. <p> 1009--1018
+#: release-notes.en.sgml:1009
msgid ""
"Please note that the installation system of &oldreleasename; (and previous "
"releases) did <em>not</em> install the kernel as a package in your system. "
@@ -1793,8 +1824,8 @@
"номер версии ядра (2.4 или 2.6), а <tt>АРХИТЕКТУРА</tt> - любая из "
"поддерживаемых архитектур."
-#. <p> 1003--1006
-#: release-notes.en.sgml:1003
+#. <p> 1020--1023
+#: release-notes.en.sgml:1020
#, fuzzy
msgid ""
"For the more adventurous there is an easy way to compile your own custom "
@@ -1806,13 +1837,13 @@
"прочитайте документацию в каталоге <file>/usr/share/doc/kernel-package</"
"file>."
-#. <heading> 1011--1011
-#: release-notes.en.sgml:1011
+#. <heading> 1028--1028
+#: release-notes.en.sgml:1028
msgid "Obsolete packages"
msgstr "Устаревшие пакеты"
-#. <p> 1018--1028
-#: release-notes.en.sgml:1018
+#. <p> 1035--1045
+#: release-notes.en.sgml:1035
msgid ""
"Introducing several thousand new packages, &releasename; also retires and "
"omits more than two thousand old packages that were in &oldreleasename;. It "
@@ -1835,8 +1866,8 @@
"исправления. Мы рекомендуем перейти на использование альтернативных пакетов, "
"если есть такая возможность. "
-#. <p> 1030--1036
-#: release-notes.en.sgml:1030
+#. <p> 1047--1053
+#: release-notes.en.sgml:1047
msgid ""
"There are many reasons why packages might have been removed from the "
"distribution: they are no longer maintained upstream, there is no longer a "
@@ -1853,8 +1884,8 @@
"не может быть включён в &releasename;, в этом случае пакет всё-таки доступен "
"в нестабильном (\"unstable\") дистрибутиве."
-#. <p> 1038--1051
-#: release-notes.en.sgml:1038
+#. <p> 1055--1068
+#: release-notes.en.sgml:1055
#, fuzzy
msgid ""
"Detecting which packages in an updated system are \"obsolete\" is easy since "
@@ -1884,8 +1915,8 @@
"которые вы установили явно (а не автоматически для удовлетворения "
"зависимостей)."
-#. <p> 1053--1063
-#: release-notes.en.sgml:1053
+#. <p> 1070--1080
+#: release-notes.en.sgml:1070
msgid ""
"There are additional tools you can use to find obsolete packages such as "
"<prgn>deborphan</prgn>, <prgn>debfoster</prgn> or <prgn>cruft</prgn>. "
@@ -1907,8 +1938,8 @@
"нужного. Настоятельно рекомендуем перед удалением внимательно просмотреть "
"список предложенных пакетов (прочесть описание, посмотреть входящие файлы)."
-#. <p> 1069--1074
-#: release-notes.en.sgml:1069
+#. <p> 1086--1091
+#: release-notes.en.sgml:1086
msgid ""
"The <url id=\"&url-bts;\" name=\"Debian Bug Tracking System\"> often "
"provides additional information on why the package was removed. You should "
@@ -1922,13 +1953,13 @@
"<url id=\"&url-bts;/cgi-bin/pkgreport.cgi?pkg=ftp.debian.org&archive=yes"
"\" name=\"псевдо-пакета ftp.debian.orge\">"
-#. <heading> 1076--1076
-#: release-notes.en.sgml:1076
+#. <heading> 1093--1093
+#: release-notes.en.sgml:1093
msgid "Dummy packages"
msgstr "Пакеты-пустышки"
-#. <p> 1080--1086
-#: release-notes.en.sgml:1080
+#. <p> 1097--1103
+#: release-notes.en.sgml:1097
msgid ""
"Some packages from &oldreleasename; have been split into several packages in "
"&releasename;, often to improve system maintainability. To ease the upgrade "
@@ -1946,8 +1977,8 @@
"установки \"пустышки\" становятся неиспользуемыми и их можно спокойно "
"удалять."
-#. <p> 1088--1094
-#: release-notes.en.sgml:1088
+#. <p> 1105--1111
+#: release-notes.en.sgml:1105
msgid ""
"Most (but not all) dummy packages' descriptions indicate their purpose. "
"Package descriptions for dummy packages are not uniform, however, so you "
@@ -1963,18 +1994,18 @@
"нужно, так как они впоследствии используются для определения установленной "
"версии программы."
-#. <heading> 1105--1105
-#: release-notes.en.sgml:1105
+#. <heading> 1122--1122
+#: release-notes.en.sgml:1122
msgid "Issues to be aware of for &releasename;"
msgstr "Что надо знать о &releasename;"
-#. <heading> 1136--1136
-#: release-notes.en.sgml:1136
+#. <heading> 1153--1153
+#: release-notes.en.sgml:1153
msgid "Changes to Python packages"
msgstr "Изменения в пакетах Python"
-#. <p> 1138--1142
-#: release-notes.en.sgml:1138
+#. <p> 1155--1159
+#: release-notes.en.sgml:1155
msgid ""
"None of the python2.X packages that are included with &releasename; include "
"the standard modules 'profile' and 'pstats', because they are licensed under "
@@ -1988,14 +2019,14 @@
"получить, установив пакеты python-profiler и python2.X-profiler из секции "
"non-free архива Debian."
-#. <heading> 1147--1147
-#: release-notes.en.sgml:1147
+#. <heading> 1164--1164
+#: release-notes.en.sgml:1164
#, fuzzy
msgid "Upgrading to a 2.6 kernel"
msgstr "Обновление ядра до версии 2.6"
-#. <p> 1149--1154
-#: release-notes.en.sgml:1149
+#. <p> 1166--1171
+#: release-notes.en.sgml:1166
#, fuzzy
msgid ""
"The 2.6 kernel series contains major changes from the 2.4 series. Modules "
@@ -2010,8 +2041,8 @@
"относиться легкомысленно. В этом разделе вы узнаете о некоторых проблемах, с "
"которыми вы, возможно, скоро столкнётесь."
-#. <p> 1156--1160
-#: release-notes.en.sgml:1156
+#. <p> 1173--1177
+#: release-notes.en.sgml:1173
msgid ""
"You are therefore strongly advised not to upgrade to a 2.6 kernel as part of "
"the upgrade from &oldreleasename; to &releasename;. Instead, you should "
@@ -2024,8 +2055,8 @@
"убедитесь, что система нормально работает с вашим старым ядром (или с ядром "
"2.4 из &releasename;), а затем отдельно обновите ядро до 2.6."
-#. <p> 1162--1166
-#: release-notes.en.sgml:1162
+#. <p> 1179--1183
+#: release-notes.en.sgml:1179
msgid ""
"If you compile your own kernel from source, make sure you install "
"<package>module-init-tools</package> before you reboot with the 2.6 kernel. "
@@ -2040,8 +2071,8 @@
"<package>module-init-tools</package> будет установлен автоматически, так как "
"<package>kernel-image</package> от него зависят."
-#. <p> 1168--1173
-#: release-notes.en.sgml:1168
+#. <p> 1185--1190
+#: release-notes.en.sgml:1185
msgid ""
"If you use <em>LVM</em>, you should also install <package>lvm2</package> "
"before you reboot as the 2.6 kernel does not directly support LVM1. To "
@@ -2057,8 +2088,8 @@
"<package>lvm10</package> можно не удалять, сценарии первичной загрузки "
"определят версию используемого ядра и загрузят подходящую версию пакета LVM."
-#. <p> 1175--1178
-#: release-notes.en.sgml:1175
+#. <p> 1192--1195
+#: release-notes.en.sgml:1192
msgid ""
"If you have entries in the <file>/etc/modules</file> file (the list of "
"modules to be loaded during system boot), be aware that some module names "
@@ -2070,8 +2101,8 @@
"некоторых модулей изменились. В этом случае файл надо соответствующим "
"образом исправить."
-#. <p> 1181--1186
-#: release-notes.en.sgml:1181
+#. <p> 1198--1203
+#: release-notes.en.sgml:1198
#, fuzzy
msgid ""
"For some SATA disk controllers, the device assigned to a drive and its "
@@ -2086,8 +2117,8 @@
"конфигурацию вашего загрузчика ОС. При неверной настройке компьютер может "
"перестать загружаться."
-#. <p> 1189--1194
-#: release-notes.en.sgml:1189
+#. <p> 1206--1211
+#: release-notes.en.sgml:1206
msgid ""
"Once you have installed your 2.6 kernel, but before you reboot, make sure "
"you have a recovery method. First, make sure that the bootloader "
@@ -2102,13 +2133,13 @@
"ядра. Достаньте \"спасательную\" дискету или компакт-диск на тот случай, "
"если вдруг не удастся загрузить старое ядро при помощи загрузчика."
-#. <heading> 1198--1198
-#: release-notes.en.sgml:1198
+#. <heading> 1215--1215
+#: release-notes.en.sgml:1215
msgid "Keyboard configuration"
msgstr "Настройка клавиатуры"
-#. <p> 1200--1205
-#: release-notes.en.sgml:1200
+#. <p> 1217--1222
+#: release-notes.en.sgml:1217
#, fuzzy
msgid ""
"The most invasive change in the 2.6 kernels is a fundamental change of the "
@@ -2123,8 +2154,8 @@
"типа (например, USB-MAC или производства Sun), то после загрузки ядра 2.6 "
"она, скорее всего, откажется работать."
-#. <p> 1207--1210
-#: release-notes.en.sgml:1207
+#. <p> 1224--1227
+#: release-notes.en.sgml:1224
msgid ""
"If you can SSH into the box from another system, you can resolve this issue "
"by running <tt>dpkg-reconfigure console-data</tt>, choosing the option "
@@ -2134,8 +2165,8 @@
"исправить ситуацию, запустив <tt>dpkg-reconfigure console-data</tt> и выбрав "
"клавиатуру \"pc\" из полного списка клавиатур."
-#. <p> 1212--1216
-#: release-notes.en.sgml:1212
+#. <p> 1229--1233
+#: release-notes.en.sgml:1229
#, fuzzy
msgid ""
"If your console keyboard is affected, you will probably also need to "
@@ -2150,8 +2181,8 @@
"правкой файла <file>/etc/X11/XF86Config-4</file>. Не забудьте прочесть "
"документацию, о которой упомянуто в <ref id=\"nownownow\">."
-#. <p> 1219--1221
-#: release-notes.en.sgml:1219
+#. <p> 1236--1238
+#: release-notes.en.sgml:1236
msgid ""
"This issue is unlikely to affect the &arch-title; architecture as all PS/2 "
"and most USB keyboards will already be configured as a \"normal\" PC "
@@ -2161,8 +2192,8 @@
"все клавиатуры PS/2 и большая часть клавиатур USB и раньше опознавались как "
"\"стандартная клавиатура PC\""
-#. <p> 1224--1226
-#: release-notes.en.sgml:1224
+#. <p> 1241--1243
+#: release-notes.en.sgml:1241
msgid ""
"Note that if you are using a USB keyboard, this may be configured as either "
"a \"normal\" PC keyboard or as a USB-MAC keyboard. In the first case you "
@@ -2172,13 +2203,13 @@
"\"стандартная PC\", либо как \"клавиатура USB-MAC\". В первом случае "
"проблема вас не затронет."
-#. <heading> 1231--1231
-#: release-notes.en.sgml:1231
+#. <heading> 1248--1248
+#: release-notes.en.sgml:1248
msgid "Mouse configuration"
msgstr "Настройка мыши"
-#. <p> 1233--1237
-#: release-notes.en.sgml:1233
+#. <p> 1250--1254
+#: release-notes.en.sgml:1250
msgid ""
"Again because of the changes in the input layer, you may have to reconfigure "
"the X Window System and <package>gpm</package> if your mouse is not working "
@@ -2192,8 +2223,8 @@
"всего, потому, что имя файла-устройсва мыши изменилось. Если поддержка мыши "
"была реализована в виде модуля - то имя этого модуля тоже могло измениться."
-#. <p> 1240--1241
-#: release-notes.en.sgml:1240
+#. <p> 1257--1258
+#: release-notes.en.sgml:1257
msgid ""
"If you currently have X configured for <file>/dev/sunmouse</file>, you "
"probably need to change this to <file>/dev/psaux</file>."
@@ -2202,14 +2233,14 @@
"sunmouse</file>, то после установки нового ядра имя файла-устройства надо "
"будет изменить на <file>/dev/psaux</file>."
-#. <heading> 1247--1247
-#: release-notes.en.sgml:1247
+#. <heading> 1264--1264
+#: release-notes.en.sgml:1264
#, fuzzy
msgid "Sound configuration"
msgstr "Настройка клавиатуры"
-#. <p> 1249--1254
-#: release-notes.en.sgml:1249
+#. <p> 1266--1271
+#: release-notes.en.sgml:1266
msgid ""
"For the 2.6 kernel series the ALSA sound drivers are preferred over the OSS "
"sound drivers. If you install <package>alsa-base</package>, ALSA modules for "
@@ -2219,13 +2250,13 @@
"<file>/etc/modules</file>, you should remove them."
msgstr ""
-#. <heading> 1260--1260
-#: release-notes.en.sgml:1260
+#. <heading> 1277--1277
+#: release-notes.en.sgml:1277
msgid "Switching to 2.6 may activate udev"
msgstr "Переход на 2.6 может привести в действие udev"
-#. <p> 1262--1266
-#: release-notes.en.sgml:1262
+#. <p> 1279--1283
+#: release-notes.en.sgml:1279
msgid ""
"<package>udev</package> is a userspace implementation of devfs. It is "
"mounted over the <file>/dev/</file> directory and will dynamically populate "
@@ -2240,8 +2271,8 @@
"определения подключаемых к системе устройств. Пакет <package>udev</package> "
"работает только с ядрами серии 2.6."
-#. <p> 1268--1270
-#: release-notes.en.sgml:1268
+#. <p> 1285--1287
+#: release-notes.en.sgml:1285
msgid ""
"As <package>udev</package> is automatically installed as a dependency of e."
"g. <package>gnome</package>, there is a chance that upgrading to a 2.6 "
@@ -2251,8 +2282,8 @@
"примеру, он необходим для установки <package>gnome</package>), то есть "
"вероятность, что после перехода на ядро 2.6 он может начать работать."
-#. <p> 1272--1276
-#: release-notes.en.sgml:1272
+#. <p> 1289--1293
+#: release-notes.en.sgml:1289
msgid ""
"Although <package>udev</package> has been tested extensively, you may "
"experience minor problems with some devices that will need to be fixed. The "
@@ -2266,8 +2297,8 @@
"устройства по умолчанию не могут быть созданы (например, <file>/dev/video</"
"file> и <file>/dev/radio</file>)."
-#. <p> 1278--1280
-#: release-notes.en.sgml:1278
+#. <p> 1295--1297
+#: release-notes.en.sgml:1295
msgid ""
"<package>udev</package> provides configuration mechanisms to deal with these "
"issues. See <manref section=\"8\" name=\"udev\"> and <file>/etc/udev</file> "
@@ -2277,14 +2308,14 @@
"подробная информация - в <manref section=\"8\" name=\"udev\"> и <file>/etc/"
"udev</file>."
-#. <heading> 1288--1288
-#: release-notes.en.sgml:1288
+#. <heading> 1305--1305
+#: release-notes.en.sgml:1305
#, fuzzy
msgid "X Window System fails to load"
msgstr "X Window System не может запуститься"
-#. <p> 1290--1296
-#: release-notes.en.sgml:1290
+#. <p> 1307--1313
+#: release-notes.en.sgml:1307
#, fuzzy
msgid ""
"If after booting your machine, X fails to load and you see an error "
@@ -2301,13 +2332,13 @@
"org/255744\" name=\"#255744\"). Для исправления ошибки добавьте драйвер мыши "
"(например, psmouse) в файл <file>/etc/modules</file>."
-#. <heading> 1301--1301
-#: release-notes.en.sgml:1301
+#. <heading> 1318--1318
+#: release-notes.en.sgml:1318
msgid "X Window System on Transmeta Crusoe systems"
msgstr "X Window System на компьютерах с процессором Transmeta Crusoe"
-#. <p> 1303--1316
-#: release-notes.en.sgml:1303
+#. <p> 1320--1333
+#: release-notes.en.sgml:1320
msgid ""
"The X server shipping in &releasename; contains optimized code which is not "
"properly executed by many Transmeta(TM) Crusoe(TM) processors. The result of "
@@ -2332,8 +2363,8 @@
"Serial number of failed request: 15\n"
"Current serial number in output stream: 18</example>"
-#. <p> 1318--1322
-#: release-notes.en.sgml:1318
+#. <p> 1335--1339
+#: release-notes.en.sgml:1335
#, fuzzy
msgid ""
"In practical terms, this means that after a few hours of operation, "
@@ -2347,8 +2378,8 @@
"и начнёт постоянно перезапускаться. Так будет продолжаться, пока содержащий "
"ошибку код Transmeta VLIW находится в кэше процессора."
-#. <p> 1324--1329
-#: release-notes.en.sgml:1324
+#. <p> 1341--1346
+#: release-notes.en.sgml:1341
msgid ""
"Since the bug is in the proprietary Transmeta Code Morphing Software (CMS), "
"and the laptop BIOS checks the CMS for a vendor signature at boot time, this "
@@ -2365,8 +2396,8 @@
"~fleury/bug_cms/\"> или в отчёте об ошибке Debian <url id=\"http://bugs."
"debian.org/216933\" name=\"#216933\">."
-#. <p> 1331--1332
-#: release-notes.en.sgml:1331
+#. <p> 1348--1349
+#: release-notes.en.sgml:1348
msgid ""
"The workaround for this bug is to install an X server compiled without "
"optimization, such as the <package>xserver-xfree86-dbg</package> package."
@@ -2374,19 +2405,19 @@
"В качестве временного решения можно установить X-сервер, скомпилированный "
"без оптимизации (например, из пакета <package>xserver-xfree86-dbg</package>)."
-#. <heading> 1340--1340
-#: release-notes.en.sgml:1340
+#. <heading> 1357--1357
+#: release-notes.en.sgml:1357
msgid "More information on &debian;"
msgstr "Более подробная информация о &debian;"
-#. <heading> 1342--1342
-#: release-notes.en.sgml:1342
+#. <heading> 1359--1359
+#: release-notes.en.sgml:1359
#, fuzzy
msgid "Further reading"
msgstr "Что ещё можно прочитать"
-#. <p> 1343--1349
-#: release-notes.en.sgml:1343
+#. <p> 1360--1366
+#: release-notes.en.sgml:1360
#, fuzzy
msgid ""
"Beyond these release notes and the installation guide further documentation "
@@ -2404,8 +2435,8 @@
"сопровождающего Debian, FAQ по Debian и т.д. Полную информацию о доступных "
"документах можно получить на web-сайте DDP по адресу <url id=\"&url-ddp;\">."
-#. <p> 1351--1354
-#: release-notes.en.sgml:1351
+#. <p> 1368--1371
+#: release-notes.en.sgml:1368
msgid ""
"Documentation for individual packages is installed into <file>/usr/share/doc/"
"<var>package</var></file>, this may include copyright information, Debian "
@@ -2416,14 +2447,14 @@
"авторских правах, специфичная для Debian информация и документация от "
"авторов исходной программы."
-#. <heading> 1359--1359
-#: release-notes.en.sgml:1359
+#. <heading> 1376--1376
+#: release-notes.en.sgml:1376
#, fuzzy
msgid "Getting help"
msgstr "Если нужна помощь"
-#. <p> 1361--1365
-#: release-notes.en.sgml:1361
+#. <p> 1378--1382
+#: release-notes.en.sgml:1378
msgid ""
"There are many sources of help, advice and support for Debian users, but "
"these should only be considered if research into documentation of the issue "
@@ -2435,13 +2466,13 @@
"ответа на вопрос в документации. Этот раздел содержит краткое описание "
"дополнительных источников помощи для новых пользователей."
-#. <heading> 1368--1368
-#: release-notes.en.sgml:1368
+#. <heading> 1385--1385
+#: release-notes.en.sgml:1385
msgid "Mailing lists"
msgstr "Списки рассылки"
-#. <p> 1369--1374
-#: release-notes.en.sgml:1369
+#. <p> 1386--1391
+#: release-notes.en.sgml:1386
msgid ""
"The mailing lists of most interest to Debian users are the debian-user list "
"(English) and other debian-user-<var>language</var> lists (for other "
@@ -2458,13 +2489,13 @@
"как отправить вопрос в список рассылки, поищите ответ на него в архивах. "
"Просим также придерживаться общепринятых норм почтового этикета."
-#. <heading> 1378--1378
-#: release-notes.en.sgml:1378
+#. <heading> 1395--1395
+#: release-notes.en.sgml:1395
msgid "Internet Relay Chat"
msgstr "IRC"
-#. <p> 1380--1384
-#: release-notes.en.sgml:1380
+#. <p> 1397--1401
+#: release-notes.en.sgml:1397
#, fuzzy
msgid ""
"Debian has an IRC channel dedicated to the support and aid of Debian users "
@@ -2479,8 +2510,8 @@
"каналу #debian. Для русскоязычных пользователей существует также канал "
"#debian-russian в той же сети."
-#. <p> 1386--1388
-#: release-notes.en.sgml:1386
+#. <p> 1403--1405
+#: release-notes.en.sgml:1403
#, fuzzy
msgid ""
"Please follow the channel guidelines, respecting other users fully. For more "
@@ -2491,14 +2522,14 @@
"пользователей. Более подробную информацию о сети Freenode можно получить на "
"их <url id=\"&url-irc-host;\" name=\"web-сайте\">."
-#. <heading> 1394--1394
-#: release-notes.en.sgml:1394
+#. <heading> 1411--1411
+#: release-notes.en.sgml:1411
#, fuzzy
msgid "Reporting bugs"
msgstr "Как сообщить об ошибке"
-#. <p> 1396--1402
-#: release-notes.en.sgml:1396
+#. <p> 1413--1419
+#: release-notes.en.sgml:1413
#, fuzzy
msgid ""
"We strive to make Debian GNU/Linux a high quality operating system, however "
@@ -2516,8 +2547,8 @@
"name=\"bugs.debian.org\">. Такой подход согласуется с концепцией открытой "
"разработки Debian."
-#. <p> 1404--1409
-#: release-notes.en.sgml:1404
+#. <p> 1421--1426
+#: release-notes.en.sgml:1421
msgid ""
"If you find a bug in the distribution or in packaged software that is part "
"of it, please report it so that it can be properly fixed for next releases. "
@@ -2532,8 +2563,8 @@
"связываться с отправителями отчётов об ошибках, если им понадобится "
"дополнительная информация."
-#. <p> 1411--1417
-#: release-notes.en.sgml:1411
+#. <p> 1428--1434
+#: release-notes.en.sgml:1428
#, fuzzy
msgid ""
"You can submit a bug report using the program <package>reportbug</package> "
@@ -2549,13 +2580,13 @@
"<package>doc-debian</package> или на сайте <url id=\"&url-bts;\" name="
"\"Системы отслеживания ошибок\">."
-#. <heading> 1422--1422
-#: release-notes.en.sgml:1422
+#. <heading> 1439--1439
+#: release-notes.en.sgml:1439
msgid "Contributing to Debian"
msgstr "Как помочь Debian"
-#. <p> 1424--1437
-#: release-notes.en.sgml:1424
+#. <p> 1441--1454
+#: release-notes.en.sgml:1441
msgid ""
"You do not need to be an expert to contribute to Debian. By assisting users "
"with problems on the various user support <url id=\"&url-debian-list-"
@@ -2581,8 +2612,8 @@
"name=\"документации\"> или <url id=\"&url-debian-i18n;\" name=\"переводе\"> "
"существующей документации на родной язык."
-#. <p> 1439--1447
-#: release-notes.en.sgml:1439
+#. <p> 1456--1464
+#: release-notes.en.sgml:1456
msgid ""
"If you can dedicate more time, you could manage a piece of the Free Software "
"collection within Debian. Especially helpful is if people adopt or maintain "
@@ -2604,8 +2635,8 @@
"архитектуры, проекты <url id=\"&url-debian-jr;\" name=\"Debian для детей\"> "
"и <url id=\"&url-debian-med;\" name=\"Debian в медицине\">."
-#. <p> 1449--1453
-#: release-notes.en.sgml:1449
+#. <p> 1466--1470
+#: release-notes.en.sgml:1466
msgid ""
"In any case, if you are working in the free software community in any way, "
"as a user, programmer, writer or translator you are already helping the free "
@@ -2618,8 +2649,8 @@
"удовольствие и радость, даёт возможность познакомиться с новыми людьми."
# Про "ощущение внутренней теплоты" я, пожалуй, уберу. Смеяться будут.
-#. <p> 1464--1468
-#: release-notes.en.sgml:1464
+#. <p> 1481--1485
+#: release-notes.en.sgml:1481
msgid ""
"<strong>The information in this appendix is relevant only if, for a "
"successful upgrade of the system, you need to upgrade the kernel <em>before</"
@@ -2631,8 +2662,8 @@
"обновлением системы. Чтобы узнать, нужно ли это в вашем случае - прочтите "
"<ref id=\"new-kernel\"></strong>."
-#. <p> 1470--1471
-#: release-notes.en.sgml:1470
+#. <p> 1487--1488
+#: release-notes.en.sgml:1487
#, fuzzy
msgid ""
"The following instructions explain step by step how to use the available "
@@ -2641,8 +2672,8 @@
"Данная инструкция пошагово объясняет методы применения адаптированныхк "
"стабильной среде инструментов для установки новых версий ядра:"
-#. <p> 1473--1476
-#: release-notes.en.sgml:1473
+#. <p> 1490--1493
+#: release-notes.en.sgml:1490
#, fuzzy
msgid ""
"Because packages may need to be installed from &oldreleasename;, you should "
@@ -2654,15 +2685,15 @@
"сначало надо убедиться, что ваши списки пакетов всё ещё содержат пакеты "
"&oldreleasename;, как описано в разделе <ref id=\"old-sources\">."
-#. <p> 1480--1481
-#: release-notes.en.sgml:1480
+#. <p> 1497--1498
+#: release-notes.en.sgml:1497
msgid ""
"The following instructions explain step by step how to install the newer "
"kernel."
msgstr "Подробная инструкция по установке обновлённого ядра:"
-#. <p> 1484--1627
-#: release-notes.en.sgml:1484
+#. <p> 1501--1644
+#: release-notes.en.sgml:1501
#, fuzzy
msgid ""
"\n"
@@ -2868,13 +2899,13 @@
"модули, ...</p></item>\n"
"</taglist>"
-#. <heading> 1633--1633
-#: release-notes.en.sgml:1633
+#. <heading> 1650--1650
+#: release-notes.en.sgml:1650
msgid "Managing your &oldreleasename; system"
msgstr "Управление системой &oldreleasename;"
-#. <p> 1635--1637
-#: release-notes.en.sgml:1635
+#. <p> 1652--1654
+#: release-notes.en.sgml:1652
msgid ""
"This appendix contains information on how to make sure you can install or "
"upgrade &oldreleasename; packages before you upgrade to &releasename;. This "
@@ -2884,13 +2915,13 @@
"пакеты &oldreleasename; перед обновлением до &releasename;. Это может "
"понадобиться в некоторых случаях."
-#. <heading> 1640--1640
-#: release-notes.en.sgml:1640
+#. <heading> 1657--1657
+#: release-notes.en.sgml:1657
msgid "Upgrading your &oldreleasename; system"
msgstr "Обновление системы &oldreleasename;"
-#. <p> 1642--1645
-#: release-notes.en.sgml:1642
+#. <p> 1659--1662
+#: release-notes.en.sgml:1659
msgid ""
"Basically this is no different than any other upgrade of &oldreleasename; "
"you've been doing. The only difference is that you first need to make sure "
@@ -2902,13 +2933,13 @@
"сначало надо убедиться, что ваши списки пакетов всё ещё содержат пакеты "
"&oldreleasename;, как описано в разделе <ref id=\"old-sources\">."
-#. <heading> 1651--1651
-#: release-notes.en.sgml:1651
+#. <heading> 1668--1668
+#: release-notes.en.sgml:1668
msgid "Installing &oldreleasename; version of aptitude"
msgstr "Установка aptitude для &oldreleasename;"
-#. <p> 1653--1655
-#: release-notes.en.sgml:1653
+#. <p> 1670--1672
+#: release-notes.en.sgml:1670
msgid ""
"First you need to make sure you will install &oldreleasename;'s version of "
"<package>aptitude</package> and not &releasename;'s by following the "
@@ -2918,8 +2949,8 @@
"из &oldreleasename;, а не из &releasename;.Следуйте инструкциям раздела <ref "
"id=\"old-sources\">."
-#. <p> 1657--1663
-#: release-notes.en.sgml:1657
+#. <p> 1674--1680
+#: release-notes.en.sgml:1674
msgid ""
"After that, just execute <example compact=\"compact\">\n"
"# apt-get install aptitude\n"
@@ -2929,13 +2960,13 @@
" apt-get install aptitude\n"
" </example>, чтобы установить пакет <package>aptitude</package>."
-#. <heading> 1669--1669
-#: release-notes.en.sgml:1669
+#. <heading> 1686--1686
+#: release-notes.en.sgml:1686
msgid "Checking your sources list"
msgstr "Проверка списка источников APT"
-#. <p> 1671--1674
-#: release-notes.en.sgml:1671
+#. <p> 1688--1691
+#: release-notes.en.sgml:1688
msgid ""
"If any of the lines in your <file>/etc/apt/sources.list</file> refer to "
"'stable', you are effectively already \"using\" &releasename;. If you have "
@@ -2947,8 +2978,8 @@
"&releasename;. Если вы уже запустили <tt>apt-get update</tt>, то ещё не "
"поздно всё отменить, просто выполнив инструкцию, приведённую ниже."
-#. <p> 1676--1680
-#: release-notes.en.sgml:1676
+#. <p> 1693--1697
+#: release-notes.en.sgml:1693
msgid ""
"If you have also already installed packages from &releasename;, there "
"probably is not much point in installing packages from &oldreleasename; "
@@ -2962,8 +2993,8 @@
"старых версий пакетов возможно, но эта процедура выходит за рамки данного "
"документа."
-#. <p> 1682--1685
-#: release-notes.en.sgml:1682
+#. <p> 1699--1702
+#: release-notes.en.sgml:1699
msgid ""
"Open the file <file>/etc/apt/sources.list</file> with your favorite editor "
"(as root) and check all lines beginning with <tt>deb http:</tt> or <tt>deb "
@@ -2975,8 +3006,8 @@
"начинающихся с <tt>deb http:</tt> или с <tt>deb ftp:</tt> замените "
"\"<tt>stable</tt>\" на \"<tt>&oldreleasename;</tt>\"."
-#. <p> 1687--1689
-#: release-notes.en.sgml:1687
+#. <p> 1704--1706
+#: release-notes.en.sgml:1704
msgid ""
"If you have any lines starting with <tt>deb file:</tt>, you will have to "
"check for yourself if the location they refer to contains a &oldreleasename; "
@@ -2986,8 +3017,8 @@
"самим проверить, какие пакеты хранятся в указанном каталоге - из "
"&oldreleasename; или из &releasename;."
-#. <p> 1691--1694
-#: release-notes.en.sgml:1691
+#. <p> 1708--1711
+#: release-notes.en.sgml:1708
msgid ""
"<strong>Important!</strong> Do not change any lines that begin with <tt>deb "
"cdrom:</tt>. Doing so would invalidate the line and you would have to run "
@@ -3000,8 +3031,8 @@
"ссылается на нестабильный (\"<tt>unstable</tt>\") дистрибутив. Как это ни "
"странно, так и должно быть."
-#. <p> 1696--1702
-#: release-notes.en.sgml:1696
+#. <p> 1713--1719
+#: release-notes.en.sgml:1713
msgid ""
"If you've made any changes, safe the file and execute <example compact="
"\"compact\">\n"
Index: release-notes.en.sgml
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.en.sgml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- release-notes.en.sgml 28 May 2005 15:17:22 -0000 1.9
+++ release-notes.en.sgml 28 May 2005 18:36:19 -0000 1.10
@@ -434,7 +434,10 @@
will fail. You can identify packages on hold with
<example>
-# dpkg --audit
+<!-- FJP: dpkg \-\-audit does not show held packages, at least not for Woody.
+# dpkg \-\-audit
+-->
+# dpkg --get-selections | grep hold
</example></p>
<p>If you changed and recompiled a package locally, and didn't rename
@@ -917,9 +920,23 @@
# dpkg --install <var>/path/to/packagename.deb</var>
</example></p>
-<!-- FJP Add instructions what to do in case of file conflicts
- dpkg -r \-\-force-depends <package name>
--->
+ <p>File conflicts should not occur if you upgrade from a "pure"
+ &oldreleasename; system, but can occur if you have unofficial
+ backports installed. A file conflict will result in an error like:
+
+ <example>
+Unpacking replacement <var><package-foo></var> ...
+dpkg: error processing <var><package-name-for-foo></var> (--unpack):
+ trying to overwrite `<var><some-file-name></var>',
+ which is also in package <var><package-bar></var>
+ </example></p>
+
+ <p>You can try to solve a file conflict by forcibly removing the
+ package mentioned on the <em/last/ line of the error message:
+
+ <example>
+# dpkg -r --force-depends <var>packagename</var>
+ </example></p>
<p>After fixing things up, you should be able to resume the
upgrade by repeating the previously described <tt/aptitude/
Index: release-notes.ru.sgml
===================================================================
RCS file: /cvsroot/l10n-russian/release-notes/release-notes.ru.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- release-notes.ru.sgml 28 May 2005 15:17:22 -0000 1.7
+++ release-notes.ru.sgml 28 May 2005 18:36:19 -0000 1.8
@@ -567,14 +567,11 @@
# dpkg --get-selections > ~/curr-pkgs.txt
</example></p>
- <p>Перед обновлением желательно снять
- все фиксации пакетов. Если один из
- необходимых для обновления пакетов
- зафиксирован, обновление будет
- невозможно. Определить, какие пакеты
- зафиксированы, можно с помощью
- команды <example compact="compact">
-# dpkg --audit
+ <p>It is desirable to remove any holds before upgrading. If any
+ package that is essential for the upgrade is on hold, the upgrade
+ will fail. You can identify packages on hold with <example compact="compact">
+
+# dpkg --get-selections | grep hold
</example></p>
<p>If you changed and recompiled a package locally, and didn't rename
@@ -1098,9 +1095,19 @@
# dpkg --install <var>/path/to/packagename.deb</var>
</example></p>
-<!-- FJP Add instructions what to do in case of file conflicts
- dpkg -r \-\-force-depends <package name>
--->
+ <p>File conflicts should not occur if you upgrade from a "pure"
+ &oldreleasename; system, but can occur if you have unofficial
+ backports installed. A file conflict will result in an error like: <example compact="compact">
+Unpacking replacement <var><package-foo></var> ...
+dpkg: error processing <var><package-name-for-foo></var> (--unpack):
+ trying to overwrite `<var><some-file-name></var>',
+ which is also in package <var><package-bar></var>
+ </example></p>
+
+ <p>You can try to solve a file conflict by forcibly removing the
+ package mentioned on the <em>last</em> line of the error message: <example compact="compact">
+# dpkg -r --force-depends <var>packagename</var>
+ </example></p>
<p>After fixing things up, you should be able to resume the upgrade
by repeating the previously described <tt>aptitude</tt> commands.</p>
- Previous message: [l10n-russian CVS] release-notes release-notes.en.sgml,1.8,1.9 release-notes.ru.po,1.23,1.24 release-notes.ru.sgml,1.6,1.7
- Next message: [l10n-russian CVS] release-notes release-notes.en.sgml,1.10,1.11 release-notes.ru.po,1.25,1.26 release-notes.ru.sgml,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]