Reword: "So, <literal>dist-upgrade</literal> command may remove some packages."

[apt.git] / doc / po / ja.po

diff --git a/doc/po/ja.po b/doc/po/ja.po
index b46ec4dd02521130af9df4f6b360ea3d0cfd8a63..60edbbad62cc3259c1b33f935d5b763b570bf62b 100644 (file)
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2012-05-24 15:57+0300\n"
+"POT-Creation-Date: 2012-05-29 15:35+0300\n"

 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
 "PO-Revision-Date: 2010-09-07 07:38+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"


@@ -1494,29 +1494,29 @@ msgstr ""
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32

-msgid "APT CDROM management utility"
-msgstr "APT CDROM 管理ユーティリティ"
+msgid "APT CD-ROM management utility"
+msgstr "APT CD-ROM 管理ユーティリティ"

 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml:38
 msgid ""
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml:38
 msgid ""

-"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
+"<command>apt-cdrom</command> is used to add a new CD-ROM to APT's list of "

 "available sources. <command>apt-cdrom</command> takes care of determining "
 "the structure of the disc as well as correcting for several possible mis-"
 "burns and verifying the index files."
 msgstr ""
 "<command>apt-cdrom</command> は利用可能な取得元として、APT のリストに新しい "
 "available sources. <command>apt-cdrom</command> takes care of determining "
 "the structure of the disc as well as correcting for several possible mis-"
 "burns and verifying the index files."
 msgstr ""
 "<command>apt-cdrom</command> は利用可能な取得元として、APT のリストに新しい "

-"CDROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能な"
-"限り補正し、ディスク構造の確認を助けます。また、インデックスファイルの確認を"
-"行います。"
+"CD-ROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能"
+"な限り補正し、ディスク構造の確認を助けます。また、インデックスファイルの確認"
+"を行います。"

 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 #: apt-cdrom.8.xml:45
 msgid ""
 "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "

-"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
+"system; it cannot be done by hand. Furthermore each disc in a multi-CD set "

 "must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 "APT システムに手作業で CD を追加するのは難しいため、<command>apt-cdrom</"
 "must be inserted and scanned separately to account for possible mis-burns."
 msgstr ""
 "APT システムに手作業で CD を追加するのは難しいため、<command>apt-cdrom</"


@@ -1527,26 +1527,27 @@ msgstr ""
 #: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "
 #: apt-cdrom.8.xml:56
 msgid ""
 "<literal>add</literal> is used to add a new disc to the source list. It will "

-"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
+"unmount the CD-ROM device, prompt for a disc to be inserted and then proceed "

 "to scan it and copy the index files. If the disc does not have a proper "
 "to scan it and copy the index files. If the disc does not have a proper "

-"<filename>disk</filename> directory you will be prompted for a descriptive "
+"<filename>.disk</filename> directory you will be prompted for a descriptive "

 "title."
 msgstr ""
 "title."
 msgstr ""

-"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CDROM デ"
-"バイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャン"
-"とインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</"
-"filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。"
+"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CD-ROM "
+"デバイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャ"
+"ンとインデックスファイルのコピーを行います。ディスクに正しい <filename>."
+"disk</filename> ディレクトリが存在しない場合、タイトルを入力するよう促しま"
+"す。"

 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:64
 msgid ""
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:64
 msgid ""

-"APT uses a CDROM ID to track which disc is currently in the drive and "
+"APT uses a CD-ROM ID to track which disc is currently in the drive and "

 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
 "filename>"
 msgstr ""
 "maintains a database of these IDs in <filename>&statedir;/cdroms.list</"
 "filename>"
 msgstr ""

-"APT は、現在ドライブにあるディスクのトラックから取得した、CDROM ID を使用しま"
-"す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
+"APT は、現在ドライブにあるディスクのトラックから取得した、CD-ROM ID を使用し"
+"ã\81¾ã\81\99ã\80\82ã\81¾ã\81\9fã\81\9dã\81® ID ã\82\92ã\80\81<filename>&statedir;/cdroms.list</filename> å\86\85ã\81®ã\83\87ã\83¼ã\82¿"

 "ベースで管理します。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 "ベースで管理します。"
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>


@@ -1569,7 +1570,7 @@ msgstr "オプション"
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:85
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:85
 msgid ""

-"Mount point; specify the location to mount the cdrom. This mount point must "
+"Mount point; specify the location to mount the CD-ROM. This mount point must "

 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
 "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgstr ""
 "be listed in <filename>/etc/fstab</filename> and properly configured.  "
 "Configuration Item: <literal>Acquire::cdrom::mount</literal>."
 msgstr ""


@@ -1581,9 +1582,9 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:94
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cdrom.8.xml:94
 msgid ""

-"Rename a disc; change the label of a disk or override the disks given label. "
-"This option will cause <command>apt-cdrom</command> to prompt for a new "
-"label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."
+"Rename a disc; change the label of a disc or override the disc's given "
+"label. This option will cause <command>apt-cdrom</command> to prompt for a "
+"new label.  Configuration Item: <literal>APT::CDROM::Rename</literal>."

 msgstr ""
 "ディスクの名前変更 - 指定した名前でディスクのラベルを変更・更新します。このオ"
 "プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"
 msgstr ""
 "ディスクの名前変更 - 指定した名前でディスクのラベルを変更・更新します。このオ"
 "プションにより、<command>apt-cdrom</command> が新しいラベルを入力するよう促し"


@@ -1669,7 +1670,7 @@ msgid ""
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
 "the main configuration file <filename>/etc/apt/apt.conf</filename> in a "
 "<command>apt-config</command> is an internal program used by various "
 "portions of the APT suite to provide consistent configurability. It accesses "
 "the main configuration file <filename>/etc/apt/apt.conf</filename> in a "

-"manner that is easy to use by scripted applications."
+"manner that is easy to use for scripted applications."

 msgstr ""
 "<command>apt-config</command> は、APT スイートの様々な所で一貫した設定を行う"
 "ために使用する、内部ツールです。スクリプトアプリケーションで使いやすい方法"
 msgstr ""
 "<command>apt-config</command> は、APT スイートの様々な所で一貫した設定を行う"
 "ために使用する、内部ツールです。スクリプトアプリケーションで使いやすい方法"


@@ -1679,12 +1680,19 @@ msgstr ""
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-config.8.xml:51

+#, fuzzy
+#| msgid ""
+#| "shell is used to access the configuration information from a shell "
+#| "script. It is given pairs of arguments, the first being a shell variable "
+#| "and the second the configuration value to query. As output it lists a "
+#| "series of shell assignments commands for each present value.  In a shell "
+#| "script it should be used like:"

 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "
 msgid ""
 "shell is used to access the configuration information from a shell script. "
 "It is given pairs of arguments, the first being a shell variable and the "

-"second the configuration value to query. As output it lists a series of "
-"shell assignments commands for each present value.  In a shell script it "
-"should be used like:"
+"second the configuration value to query. As output it lists shell assignment "
+"commands for each value present.  In a shell script it should be used as "
+"follows:"

 msgstr ""
 "shell は、シェルスクリプトから設定情報にアクセスするのに使用します。引数とし"
 "て、まずシェル変数、次に取得したい設定値をペアで与えます。出力として、現在の"
 msgstr ""
 "shell は、シェルスクリプトから設定情報にアクセスするのに使用します。引数とし"
 "て、まずシェル変数、次に取得したい設定値をペアで与えます。出力として、現在の"


@@ -1749,12 +1757,11 @@ msgstr ""
 #: apt-config.8.xml:96
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "
 #: apt-config.8.xml:96
 msgid ""
 "Defines the output of each config option. &percnt;t will be replaced with "

-"the name of the option, &percnt;f with the complete optionname and &percnt;v "
-"with the value of the option.  Use uppercase letters and special characters "
-"in the value will be encoded to ensure that it can e.g. be savely used in a "
-"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
-"by a newline, &percnt;N by a tab. A &percnt; can be printed by using &percnt;"
-"&percnt;."
+"its individual name, &percnt;f with its full hierarchical name and &percnt;v "
+"with its value.  Use uppercase letters and special characters in the value "
+"will be encoded to ensure that it can e.g. be safely used in a quoted-string "
+"as defined by RFC822. Additionally &percnt;n will be replaced by a newline, "
+"and &percnt;N by a tab. A &percnt; can be printed by using &percnt;&percnt;."

 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>
 msgstr ""
 
 # type: Content of: <refentry><refsect1><para>


@@ -1782,7 +1789,11 @@ msgstr "1"
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33
 # type: Content of: <refentry><refnamediv><refpurpose>
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-extracttemplates.1.xml:33

-msgid "Utility to extract DebConf config and templates from Debian packages"
+#, fuzzy
+#| msgid "Utility to extract DebConf config and templates from Debian packages"
+msgid ""
+"Utility to extract <command>debconf</command> config and templates from "
+"Debian packages"

 msgstr ""
 "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
 "ティ"
 msgstr ""
 "Debian パッケージから DebConf 設定と DebConf テンプレートを抽出するユーティリ"
 "ティ"


@@ -1834,12 +1845,13 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-extracttemplates.1.xml:58
 msgid ""

-"Temporary directory in which to write extracted debconf template files and "
-"config scripts.  Configuration Item: <literal>APT::ExtractTemplates::"
-"TempDir</literal>"
+"Temporary directory in which to write extracted <command>debconf</command> "
+"template files and config scripts.  Configuration Item: <literal>APT::"
+"ExtractTemplates::TempDir</literal>"

 msgstr ""
 msgstr ""

-"抽出した debconf テンプレートファイルや設定スクリプトを書き出す一時ディレクト"
-"リ。設定項目 - <literal>APT::ExtractTemplates::TempDir</literal>"
+"抽出した <command>debconf</command> テンプレートファイルや設定スクリプトを書"
+"き出す一時ディレクトリ。設定項目 - <literal>APT::ExtractTemplates::TempDir</"
+"literal>"

 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>
 
 # type: Content of: <refentry><refsect1><para>
 #. type: Content of: <refentry><refsect1><para>


@@ -2928,29 +2940,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:74
 msgid ""

-"<literal>dselect-upgrade</literal> is used in conjunction with the "
-"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
-"literal> follows the changes made by &dselect; to the <literal>Status</"
-"literal> field of available packages, and performs the actions necessary to "
-"realize that state (for instance, the removal of old and the installation of "
-"new packages)."
-msgstr ""
-"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント"
-"エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> "
-"は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー"
-"ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例"
-"えば、古いパッケージの削除や新しいパッケージのインストールなど)"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:84
-msgid ""

 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "
 "<literal>dist-upgrade</literal> in addition to performing the function of "
 "<literal>upgrade</literal>, also intelligently handles changing dependencies "
 "with new versions of packages; <command>apt-get</command> has a \"smart\" "
 "conflict resolution system, and it will attempt to upgrade the most "

-"important packages at the expense of less important ones if necessary.  So, "
-"<literal>dist-upgrade</literal> command may remove some packages.  The "
+"important packages at the expense of less important ones if necessary.  The <literal>dist-upgrade</literal> command may therefore remove some packages. "
+" The "

 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."
 "<filename>/etc/apt/sources.list</filename> file contains a list of locations "
 "from which to retrieve desired package files.  See also &apt-preferences; "
 "for a mechanism for overriding the general settings for individual packages."


@@ -2965,6 +2960,23 @@ msgstr ""
 "向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ"
 "さい。"
 
 "向けに、一般的な設定を上書きする機構については、&apt-preferences; をご覧くだ"
 "さい。"
 

+# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:87
+msgid ""
+"<literal>dselect-upgrade</literal> is used in conjunction with the "
+"traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</"
+"literal> follows the changes made by &dselect; to the <literal>Status</"
+"literal> field of available packages, and performs the actions necessary to "
+"realize that state (for instance, the removal of old and the installation of "
+"new packages)."
+msgstr ""
+"<literal>dselect-upgrade</literal> は、伝統的な Debian パッケージ管理フロント"
+"エンドの &dselect; と共に使用されます。<literal>dselect-upgrade</literal> "
+"は、&dselect; で作られた利用可能パッケージの<literal>Status</literal> フィー"
+"ルドの変更を追跡し、その状態を反映させるのに必要なアクションを実行します。(例"
+"えば、古いパッケージの削除や新しいパッケージのインストールなど)"
+

 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98
 # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:98


@@ -5358,8 +5370,8 @@ msgstr "/cdrom/::Mount \"foo\";"
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:430
 msgid ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:430
 msgid ""

-"CDROM URIs; the only setting for CDROM URIs is the mount point, "
-"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
+"CD-ROM URIs; the only setting for CD-ROM URIs is the mount point, "
+"<literal>cdrom::Mount</literal> which must be the mount point for the CD-ROM "

 "drive as specified in <filename>/etc/fstab</filename>. It is possible to "
 "provide alternate mount and unmount commands if your mount point cannot be "
 "listed in the fstab (such as an SMB mount and old mount packages). The "
 "drive as specified in <filename>/etc/fstab</filename>. It is possible to "
 "provide alternate mount and unmount commands if your mount point cannot be "
 "listed in the fstab (such as an SMB mount and old mount packages). The "


@@ -5367,14 +5379,14 @@ msgid ""
 "cdrom block. It is important to have the trailing slash. Unmount commands "
 "can be specified using UMount."
 msgstr ""
 "cdrom block. It is important to have the trailing slash. Unmount commands "
 "can be specified using UMount."
 msgstr ""

-"CDROM URI - CDROM URI はマウントポイントの設定のみを行います。<filename>/etc/"
-"fstab</filename> で設定されているように、CDROM ドライブのマウントポイントを "
-"<literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウントや古"
-"ã\81\84 mount ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81ªã\81©) ã\83\9eã\82¦ã\83³ã\83\88ã\83\9dã\82¤ã\83³ã\83\88ã\81\8c fstab ã\81«è¨\98è¿°ã\81§ã\81\8dã\81ªã\81\84å ´å\90\88ã\80\81ã\81\8bã\82\8fã\82\8a"
-"ã\81«ã\83\9eã\82¦ã\83³ã\83\88ã\83»ã\82¢ã\83³ã\83\9eã\82¦ã\83³ã\83\88ã\82³ã\83\9eã\83³ã\83\89ã\82\82使ç\94¨ã\81§ã\81\8dã\81¾ã\81\99ã\80\82æ§\8bæ\96\87ã\81¯ã\80\81cdrom ã\83\96ã\83­ã\83\83ã\82¯ã\82\92 "
-"<placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッシュを"
-"後につけるのが重要です。アンマウントコマンドは UMount で指定することができま"
-"す。"
+"CD-ROM URI - CD-ROM URI はマウントポイントの設定のみを行います。<filename>/"
+"etc/fstab</filename> で設定されているように、CD-ROM ドライブのマウントポイン"
+"トを <literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウン"
+"ã\83\88ã\82\84å\8f¤ã\81\84 mount ã\83\91ã\83\83ã\82±ã\83¼ã\82¸ã\81ªã\81©) ã\83\9eã\82¦ã\83³ã\83\88ã\83\9dã\82¤ã\83³ã\83\88ã\81\8c fstab ã\81«è¨\98è¿°ã\81§ã\81\8dã\81ªã\81\84å ´å\90\88ã\80\81"
+"ã\81\8bã\82\8fã\82\8aã\81«ã\83\9eã\82¦ã\83³ã\83\88ã\83»ã\82¢ã\83³ã\83\9eã\82¦ã\83³ã\83\88ã\82³ã\83\9eã\83³ã\83\89ã\82\82使ç\94¨ã\81§ã\81\8dã\81¾ã\81\99ã\80\82æ§\8bæ\96\87ã\81¯ã\80\81cdrom ã\83\96ã\83­ã\83\83ã\82¯"
+"を <placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッ"
+"シュを後につけるのが重要です。アンマウントコマンドは UMount で指定することが"
+"ã\81§ã\81\8dã\81¾ã\81\99ã\80\82"

 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 
 # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>


@@ -6067,10 +6079,10 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "

-"in CDROM IDs."
+"in CD-ROM IDs."

 msgstr ""
 msgstr ""

-"<literal>Debug::IdentCdrom</literal> は CDROM ID にある statfs データの方gain"
-"を無効にします。"
+"<literal>Debug::IdentCdrom</literal> は CD-ROM ID にある statfs データの方"
+"gainを無効にします。"

 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:785
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:785


@@ -8026,7 +8038,7 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:154
 msgid ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml:154
 msgid ""

-"The cdrom scheme allows APT to use a local CDROM drive with media swapping. "
+"The cdrom scheme allows APT to use a local CD-ROM drive with media swapping. "

 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 "cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え"
 "Use the &apt-cdrom; program to create cdrom entries in the source list."
 msgstr ""
 "cdrom スキームは、APT がローカル CD-ROM ドライブを、メディア交換しながら使え"


@@ -8553,12 +8565,12 @@ msgid ""
 "To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
 "and then choose the APT method. You will be prompted for a set of "
 "<em>Sources</em> which are places to fetch archives from. These can be "
 "To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
 "and then choose the APT method. You will be prompted for a set of "
 "<em>Sources</em> which are places to fetch archives from. These can be "

-"remote Internet sites, local Debian mirrors or CDROMs. Each source can "
+"remote Internet sites, local Debian mirrors or CD-ROMs. Each source can "

 "provide a fragment of the total Debian archive, APT will automatically "
 "provide a fragment of the total Debian archive, APT will automatically "

-"combine them to form a complete set of packages. If you have a CDROM then it "
-"is a good idea to specify it first and then specify a mirror so that you "
+"combine them to form a complete set of packages. If you have a CD-ROM then "
+"it is a good idea to specify it first and then specify a mirror so that you "

 "have access to the latest bug fixes. APT will automatically use packages on "
 "have access to the latest bug fixes. APT will automatically use packages on "

-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."

 msgstr ""
 
 #. type: <example></example>
 msgstr ""
 
 #. type: <example></example>