[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Sarge Release Notes - Call to update translations

田村です。1.44 -> 1.45 の追加差分です。査読をお願いします。

→ 今井さんへ
御苦労様です。今回の diff では、翻訳とは関係のない小変更が
全 diff 内に適宜翻訳が埋め込まれた形式の方が編集作業がやり

田村 一平 <ippei1@xxxxxxxxxxxx>
Debian Description Translation Project [DDTP] 

RCS file: /cvs/debian-doc/ddp/manuals.sgml/release-notes/en/release-notes.en.sgml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ddp/manuals.sgml/release-notes/en/release-notes.en.sgml	2005/05/26 12:15:07	1.44
+++ ddp/manuals.sgml/release-notes/en/release-notes.en.sgml	2005/05/27 00:04:26	1.45

@@ -325,7 +325,7 @@
           <p>The main things you'll want to back up are the contents of
           <file>/etc</file>, <file>/var/lib/dpkg</file> and the output of
-          <tt>dpkg --get-selections \*</tt>.</p>
+          <tt>dpkg --get-selections "*"</tt> (the quotes are important).</p>
           ## 全段落を訳します。
           <p>バックアップしたくなるであろう主な対象としては、<file>/etc</file> や
           <file>/var/lib/dpkg</file> の中身、<tt>dpkg --get-selections "*"</tt>
           (引用符を忘れてはいけません) の出力などでしょう。</p>

@@ -339,36 +339,144 @@
           textmode virtual console (or a directly connected serial
           terminal), or remotely via an <prgn/ssh/ link.</p>
-          <p><em/Important/: You should <em/not/ upgrade using <prgn/telnet/,
+          <p><strong/Important!/ You should <em/not/ upgrade using <prgn/telnet/,
           <prgn/rlogin/, <prgn/rsh/, or from an X session managed by <prgn/xdm/,
           <prgn/gdm/ or <prgn/kdm/ etc on the machine you are upgrading. That is
           because each of those services may well be terminated during the
           upgrade, which can result in an <em/inaccessible/ system that is only
-          <p>The recommended method of upgrading is to use <prgn/aptitude/, as
-	  described here. The built-in dependency analysis enables smooth
-	  upgrades and easy installations.</p>
-	  <p>Any package installation operation must be run with superuser
+          <p>Any package installation operation must be run with superuser
           privileges, so either login as root or use <prgn/su/ or
           <prgn/sudo/ to gain the necessary access rights.</p>
-          <p>First the <package>aptitude</package> package needs to be installed.
-	  This is done with:</p> 
-	  <p><example>
-apt-get install aptitude
-	  </example></p>
+        </sect>
-          <p>Provided that you have a working APT configuration this will
-          install the &oldreleasename; version of
-	  <prgn>aptitude</prgn>.</p>
+        <sect id="system-status">
+        <heading>Checking system status</heading>


+        <p>The upgrade process described in this chapter has been designed for
+        upgrades from "pure" &oldreleasename; systems. It assumes your system
+        has been updated to the latest point release of &oldreleasename;.
+        If you have not or are unsure, follow the instructions in
+        <ref id="old-upgrade"></p>

         <p>この章で述べられているアップグレード手順は、"純粋な" &oldreleasename;
         システムからのアップグレード用です。システムが &oldreleasename; の最新
         アップグレード済かどうか不明なら、<ref id="old-upgrade"> 内の指示に従っ

+<![ %has-woody-aptitude [
+        <p>It also assumes you have the &oldreleasename; version of
+        <prgn/aptitude/ installed. You can check if it is installed using

         <p>また、<prgn/aptitude/ の &oldreleasename; 版がインストール済である

+        <example>
+$ dpkg -l aptitude
+        </example>
+        If the line of output does <em/not/ begin with "i", you should install
+        it before you start the upgrade using the instructions in
+        <ref id="old-aptitude">.</p>

         出力行が "i" で始まって<em/いなければ/、<ref id="old-aptitude"> の指示

+	<sect1><heading>Disabling APT pinning</heading>

    <sect1><heading>APT の pin 機能を無効にする</heading>

+	  <p>If you have configured APT to install certain packages from a
+	  distribution other than stable (e.g. from testing), you may have to
+	  change your APT pinning configuration (stored in
+	  <file>/etc/apt/preferences</file>) to allow the upgrade of packages to
+	  the versions in the new stable release. Further information on APT
+	  pinning can be found in <manref name="apt_preferences" section="5">.</p>

      <p>特定のパッケージを安定版以外 (試験版など) のディストリビューションから
      インストールするように APT を設定しているなら、当該パッケージが新しい安定
      (<file>/etc/apt/preferences</file> 内に保存されている) APT の pin 設定を
      変更する必要があるかもしれません。APT の pin 機能に関するより詳しい情報
      は、<manref name="apt_preferences" section="5"> にあります。</p>

+	</sect1>
+        <sect1><heading>Checking packages status</heading>


+          <p>Regardless of the method used for upgrading, it is recommended
+          that you check the status of all packages first, and verify that
+          all packages are in an upgradable state. The following command
+          will show any packages which have a status of Half-Installed or
+          Failed-Config, and those with any error status.


+          <example>
+# dpkg --audit
+          </example></p>
+          <p>You could also inspect the state of all packages on your system
+          using <prgn/dselect/, <prgn/aptitude/, or with commands such as

           <p><prgn/dselect/ や <prgn/aptitude/, あるいは次のようなコマンドを

+          <example>
+# dpkg -l | pager 
+          </example>
+          or


+          <example>
+# dpkg --get-selections &gt; ~/curr-pkgs.txt
+          </example></p>
+          <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

           <p>アップグレード前に、あらゆる hold 状態を解除しておいた方がよいで
           しょう。アップグレードに不可欠なパッケージが hold 状態にあるなら、
           アップグレードに失敗するでしょう。次のコマンドで hold 状態にある

+          <example>
+# dpkg --audit
+          </example></p>
+          <p>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 upgraded.

           ドしないよう hold 状態にしておかなければなりません。

+<![ %has-woody-aptitude [
+          The `hold' package state can be changed by using <prgn/aptitude/:

           パッケージの 'hold' 状態は、<prgn/aptitude/: を使って次のように実行

+          <example>
+# aptitude hold | unhold &lt;package name&gt;
+          </example>
+<![ %no-woody-aptitude [
+          The `hold' package state can be changed either by using <prgn/dselect/
+          (in the Select menu, use the `H' and `G' keys to hold and unhold,
+          respectively), or by editing the file produced by

           パッケージの 'hold' 状態を変更するには、<prgn/dselect/ を使う (新規
           hold や hold の解除には、Select メニュー内でそれぞれ 'H' や 'G' キーを
           使います) か、あるいは次のように実行して "hold" を "install" (または逆)

+          <example>
+# dpkg --get-selections &gt; ~/curr-sels.txt
+          </example>
+          to change "hold" to "install" (or vice versa), and then doing


+          <example>
+# dpkg --set-selections &lt; ~/curr-sels.txt
+          </example>
+          </p>
+          <p>If there is anything you need to fix, it is best to make sure your
+          <file/sources.list/ still refers to &oldreleasename; as explained in
+          <ref id="old-sources">.</p>

           <p>修正が必要な事があるなら、<ref id="old-sources"> で説明されている
           ように <file/sources.list/ が &oldreleasename; を指定したままにして

+        </sect1>
+        <sect1 id="backports"><heading>Unofficial sources and backports</heading>

         <sect1 id="backports"><heading>非公式なソースとバックポート</heading>

+          <p>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. If these packages were installed by adding
+          an extra package archive in your <file>/etc/apt/sources.list</file>,
+          you should check if that archive also offers packages compiled for
+          &releasename; and change the source line accordingly at the same time
+          as your source lines for Debian packages.</p>

           <p>自分のシステムに非 Debian パッケージがあるなら、依存関係の衝突の
           当該パッケージが <file>/etc/apt/sources.list</file> に特別なパッケージ
           &releasename; 用にコンパイルされたパッケージも提供しているかをチェックし、
           Debian パッケージ用のソース行と一緒にそのソース行も適切に修正すべきです。</p>

+          <p>Some users may have unofficial backported "newer" versions of
+          packages that <em/are/ in Debian installed on their &oldreleasename;
+          system. Such packages are most likely to cause problems during an
+          upgrade as they may result in file conflicts<footnote>Debian's
+          package management system normally does not allow a package to remove
+          or replace a file owned by another package; not unless it has been
+          defined to replace that package.</footnote>. Section <ref id="trouble">
+          has some information on how to deal with file conflicts if they should
+          occur.</p>

           <p>自分の &oldreleasename; システムに、Debian に<em/存在する/パッケージの
           非公式にバックポートされた "新" バージョンをインストールしているユーザも
           <footnote>Debian のパッケージ管理システムは、対象パッケージを置き換えるよ
           ファイル衝突が発生したときの対処方法については、<ref id="trouble"> セク

@@ -512,6 +562,16 @@
           name a local harddisk, then CD-ROMs, and then HTTP/FTP
+          <p>A release can often be referred to by both its codename (e.g.
+          &oldreleasename;, &releasename;) and by its status name (i.e.
+          oldstable, stable, testing, unstable). Referring to a release by its
+          codename has the advantage that you will never be surprised by a
+          new release and for this reason is the approach taken here. It
+          does of course mean that you will have to watch out for release
+          announcements yourself. If you use the status name instead, you
+          will just see loads of updates for packages available as soon as a
+          release has happened.</p>

           <p>あるリリースは、そのコードネーム (&oldreleasename; や &releasename;)
           や状態名 (旧安定版、安定版、試験版、不安定版) の両方でよく指定されます。

@@ -625,15 +680,15 @@
           <p>To verify it works, insert a CD and try running
-mount /cdrom   # this will mount the CD to the mount point
-ls -alF /cdrom # this should show the CD's root directory
-umount /cdrom  # this will unmount the CD
+# mount /cdrom    # this will mount the CD to the mount point
+# ls -alF /cdrom  # this should show the CD's root directory
+# umount /cdrom   # this will unmount the CD

# mount /cdrom    # マウントポイントに CD をマウンとします
# ls -alF /cdrom  # CD のルートディレクトリを表示します
# umount /cdrom   # CD をアンマウントします

@@ -642,25 +697,26 @@
 	<sect id="upgradingpackages"><heading>Upgrading packages</heading>
 	  <p>The recommended tool for upgrading between &debian; releases is
 	  to use the package management tool <prgn>aptitude</prgn>. This tool
 	  makes safer decisions about package installations than running
 	  <prgn>apt-get</prgn> directly.</p>
 	  <p>Don't forget to mount all needed partitions (notably the root
           and <file>/usr</file> partitions) read-write, with a command
-mount -o remount,rw /<var>mountpoint</var>
+# mount -o remount,rw /<var>mountpoint</var>
-	  <p>Next ensure that the APT source entries (in
-	  <file>/etc/apt/sources.list</file>) refer to the <tt>'stable'</tt>
-	  distribution and do not refer to it by its codename (e.g.
-	  <tt>&oldreleasename;</tt>).
+	  <p>Next you should double check that the APT source entries (in
+	  <file>/etc/apt/sources.list</file>) refer either to
+	  "<tt/&releasename;/" or to "<tt>stable</tt>". Note: source
+	  lines for a CD-ROM will often refer to "<tt/unstable/";
+	  although this may be confusing, you should <em/not/ change it.</p>

      <p>次に、(<file>/etc/apt/sources.list</file> 内の) APT ソース記述が
      "<tt/&releasename;/" か "<tt>stable</tt>" のいずれかを指定している
      注意: CD-ROM のソース行は "<tt/unstable/"; を指定していることがよく

@@ -668,44 +724,92 @@
 	  report. To start the recording, type:
-script -a ~/upgrade-to-&releasename;.typescript
+# script -a ~/upgrade-to-&releasename;.typescript
 	  or similar. Do not put the typescript file in a temporary
 	  directory such as <file>/tmp</file> or <file>/var/tmp</file> (files
 	  in those directories may be deleted during the upgrade or during any
-	  <p>First <prgn>aptitude</prgn> needs to fetch a list of new and
-	  updated packages for the new release. This is done by executing:</p>
+          <p>The typescript will also allow you to review information that has
+          scrolled off-screen. Just switch to VT2 (using <tt/alt-F2/) and, after
+          logging in, use <tt>less ~root/upgrade-to-&releasename;.typescript</tt>
+          to view the file.</p>

           <p>typescript はまた、スクロールしてスクリーンから消えた情報を見ること
           ができるようにもしてくれるでしょう。(<tt/alt-F2/ を使って) VT2 に切り換
           えるだけで、ログインして <tt>less ~root/upgrade-to-&releasename;.typescript</tt>

+          <p>After you have completed the upgrade, you can stop the typescript
+          by typing <tt/exit/ at the prompt.</p>

           <p>アップグレード完了後に typescript を停止するには、プロンプトから
           <tt/exit/ と入力してください。

+        <sect1 id="updating_lists"><heading>Updating the package list</heading>

         <sect1 id="updating_lists"><heading>パッケージリストの更新</heading>

+          <p>First the list of available packages for the new release needs to
+          be fetched. This is done by executing<footnote>We use <prgn/apt-get/
+          for this because the &oldreleasename; version <prgn/aptitude/ may fail
+          when new sources have been added to <file/sources.list/.</footnote>:</p>

           あります。次のように実行してください<footnote>&oldreleasename; 版の
           <prgn/aptitude/ では新しいソースを <file/sources.list/ に追加すると失敗
           するかもしれないので、ここでは <prgn/apt-get/ を使います</footnote>:</p>

-aptitude update
+# apt-get update
-	  <p>Once <prgn>aptitude</prgn> has information on all the available
-	  packages, the system is almost ready to be fully upgraded. First
-          however the <package>doc-base</package> package must be upgraded
-          <em>if it is installed</em>. You can find out if it is installed
-          using:</p>
+        </sect1>
+<!-- FJP: This next section can probably be dropped for etch -->
+        <sect1 id="upgrading_aptitude"><heading>Upgrading aptitude</heading>

         <sect1 id="upgrading_aptitude"><heading>aptitude のアップグレード</heading>

+          <p>Upgrade tests have shown that &releasename;'s version of
+          <prgn/aptitude/ is better at solving the complex dependencies during
+          an upgrade than either <prgn/apt-get/ or &oldreleasename;'s
+          <prgn/aptitude/.

           <p>アップグレード中の複雑な依存関係の解決には、<prgn/apt-get/ や
           &oldreleasename; の <prgn/aptitude/ よりも、&releasename; 版の
           <prgn/aptitude/ の方が優れていることがアップグレードのテスト中に

+<![ %has-woody-aptitude [
+          It should therefore be upgraded first using:


+          <example>
+# aptitude install aptitude
+          </example></p>
+<![ %no-woody-aptitude [
+          It should therefore be installed first using:


+          <example>
+# apt-get install aptitude
+          </example></p>
+          <p><prgn/aptitude/ will show you a list of the changes that will be
+          made and ask 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.</p>

           <p><prgn/aptitude/ は発生した変更点の一覧を表示し、確認を求めてくるで

+        </sect1>
+        <sect1 id="upgrading_doc-base"><heading>Upgrading doc-base</heading>

         <sect1 id="upgrading_doc-base"><heading>doc-base のアップグレード</heading>

+          <p><em>If you have <package/doc-base/ 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:</p>

           <p><em><package/doc-base/ をインストール</em> しているなら、残りのシ
           に Perl がアップグレードされると失敗する可能性があるからです。同パッ
-dpkg -l doc-base
+# dpkg -l doc-base
           <p>If the line of output begins with "i" then it is installed and
           must be upgraded before continuing.</p>

           <p>出力行が "i" で始まっていればインストールされていますので、
-aptitude install doc-base
+# aptitude install doc-base
+        </sect1>
+        <sect1 id="upgrading_other"><heading>Upgrading the rest of the system</heading>

         <sect1 id="upgrading_other"><heading>残りのシステムのアップグレード</heading>

           <p>You are now ready to continue with the main part of the
           upgrade. Execute:</p>


-aptitude -f --with-recommends dist-upgrade
+# aptitude -f --with-recommends dist-upgrade

@@ -1471,6 +1582,82 @@
+    <appendix id="old-stuff">
+    <heading>Managing your &oldreleasename; system</heading>

     <heading>&oldreleasename; システムの管理</heading>

+       <p>This appendix contains information on how to make sure you can install
+       or upgrade &oldreleasename; packages before you upgrade to &releasename;.
+       This should only be necessary in specific situations.</p>

        <p>この付録には、&releasename; へアップグレードする前に &oldreleasename;

+       <sect id="old-upgrade">
+       <heading>Upgrading your &oldreleasename; system</heading>

        <heading>&oldreleasename; システムのアップグレード</heading>

+          <p>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 your package list still contains
+          &oldreleasename; packages as explained in <ref id="old-sources">.</p>

           <p>基本的には、これまで行なってきた &oldreleasename; のあらゆるアッ
           プグレードと違いはありません。唯一異なるのは、<ref id="old-sources">
           で説明したようにパッケージリスト内に &oldreleasename; パッケージが

+       </sect>
+<![ %has-woody-aptitude [
+       <sect id="old-aptitude">
+       <heading>Installing &oldreleasename; version of aptitude</heading>

        <heading>&oldreleasename; 版 aptitude のインストール</heading>

+          <p>First you need to make sure you will install &oldreleasename;'s
+          version of <package/aptitude/ and not &releasename;'s by following
+          the instructions in <ref id="old-sources">.</p>

           <p>まず、<ref id="old-sources"> 内の指示に従って &oldreleasename; 版
           の <package/aptitude/ がインストールされ、&releasename; 版はインストー

+          <p>After that, just execute

+          <example>
+# apt-get install aptitude
+          </example>
+          to install <package/aptitude/.</p>

           <p>その後で、次のように実行して <package/aptitude/ をインストール

 # apt-get install aptitude

+       </sect>
+       <sect id="old-sources">
+       <heading>Checking your sources list</heading>


+          <p>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 already run <tt>apt-get update</tt>, you can still get
+          back without problems following the procedure below.</p>

           <p><file>/etc/apt/sources.list</file> 内で 'stable' を指定している
           行があるなら、効率よく &releasename; を "使う" 用意ができています。
           すでに <tt>apt-get update</tt> を実行済でも、以下の手順に従えば問題

+          <p>If you have also already installed packages from &releasename;,
+          there probably is not much point in installing packages from
+          &oldreleasename; anymore. In that case you will have to decide for
+          yourself whether you want to continue or not. It is possible to
+          downgrade packages, but that is not covered here.</p>

           <p>&releasename; からパッケージのインストールもしてしまっているなら、
           おそらくこれ以上 &oldreleasename; からパッケージをインストールしても

+          <p>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 ftp:</tt> for a reference to "<tt/stable/". If you find any,
+          change <tt/stable/ to <tt/&oldreleasename;/.</p>

           <p>(root になってから) お気に入りのエディタで
           <file>/etc/apt/sources.list</file> を開き、<tt>deb http:</tt> や
           <tt>deb ftp:</tt> で始まるすべて行の中に "<tt/stable/" が指定されて
           いるかどうかを調べてください。もしあるなら、<tt/stable/ を
           <tt/&oldreleasename;/ に変更してください。</p>

+          <p>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; or a &releasename; archive.</p>

           <p><tt>deb file:</tt> で始まっている行があるなら、その行が指定している
           場所が &oldreleasename; か &releasename; のどちらのアーカイブなのかを

+          <p><strong/Important!/ Do not change any lines that begin with
+          <tt>deb cdrom:</tt>. Doing so would invalidate the line and you would
+          have to run apt-cdrom again. Do not be alarmed if a 'cdrom' source
+          line refers to "<tt/unstable/". Although confusing, this is normal.</p>

           <p><strong/重要!/: <tt>deb cdrom:</tt> で始まっている行は、絶対に変更
           しないでください。変更するとその行は無効になって、もう一度 apt-cdrom を
           実行しなければならなくなるでしょう。'cdrom' ソースが "<tt/unstable/" を

+          <p>If you've made any changes, safe the file and execute
+          <example>
+# apt-get update
+          </example>
+          to refresh the package list.</p>


 # apt-get update