* doc/apt-cdrom.8.xml:

  - replace CDROM with the proper CD-ROM in text

17 files changed, 156 insertions, 153 deletions

diff --git a/debian/changelog b/debian/changelog
index d598fe25e..9951ea879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
     - do not show 'list of broken packages' header if no package
       is broken as it happens e.g. for external resolver errors
+  [ Justin B Rye ]
+  * doc/apt-cdrom.8.xml:
+    - replace CDROM with the proper CD-ROM in text
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 24 May 2012 19:40:58 +0200
 
diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml
index 1dd552496..cfca8ca7b 100644
--- a/doc/apt-cdrom.8.xml
+++ b/doc/apt-cdrom.8.xml
@@ -29,13 +29,13 @@
  <!-- Man page title -->
  <refnamediv>
     <refname>apt-cdrom</refname>
-    <refpurpose>APT CDROM management utility</refpurpose>
+    <refpurpose>APT CD-ROM management utility</refpurpose>
  </refnamediv>
 
  &synopsis-command-apt-cdrom;
 
  <refsect1><title>Description</title>
-   <para><command>apt-cdrom</command> is used to add a new CDROM to APTs list
+   <para><command>apt-cdrom</command> is used to add a new CD-ROM to APTs 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 
@@ -55,13 +55,13 @@
      <varlistentry><term><option>add</option></term>
      <listitem><para><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 to 
+     CD-ROM device, prompt for a disk to be inserted and then proceed 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 
      title.
      </para>
 
-     <para>APT uses a CDROM ID to track which disc is currently in the drive and
+     <para>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>
      </para>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index bb538c660..299cc7b2a 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -427,8 +427,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term><option>cdrom</option></term>
-     <listitem><para>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 drive 
+     <listitem><para>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 syntax 
@@ -773,7 +773,7 @@ DPkg::TriggersPending "true";</literallayout></para>
        <listitem>
 	 <para>
 	   <literal>Debug::IdentCdrom</literal> disables the inclusion
-	   of statfs data in CDROM IDs.  <!-- TODO: provide a
+	   of statfs data in CD-ROM IDs.  <!-- TODO: provide a
 	   motivating example, except I haven't a clue why you'd want
 	   to do this. -->
 	 </para>
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index d377a35dc..1a15f6a4c 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -164,7 +164,7 @@ not copied into here; it is instead found as part of status or available.
 <item>methods - this directory is reserved for "method"-specific files - each
 "method" has a subdirectory underneath this directory (or at least, it can
 have). In addition, there is another subdirectory "mnt", where misc.
-filesystems (floppies, CDROMs, etc.) are mounted.
+filesystems (floppies, CD-ROMs, etc.) are mounted.
 <item>alternatives - directory used by the "update-alternatives" program. It
 contains one file for each "alternatives" interface, which contains information
 about all the needed symlinked files for each alternative.
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 49e803f91..f75b5738a 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -90,7 +90,7 @@ APT
 
   Authentication
   {
-     TrustCDROM "false";            // consider the CDROM always trusted
+     TrustCDROM "false";            // consider the CD-ROM always trusted
   };
 
   // Some general options
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index ef729e203..1aa3d6865 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,6 +1,6 @@
 # See sources.list(5) for more information, especialy
 # Remember that you can only use http, ftp or file URIs
-# CDROMs are managed through the apt-cdrom tool.
+# CD-ROMs are managed through the apt-cdrom tool.
 deb http://http.us.debian.org/debian stable main contrib non-free
 deb http://security.debian.org stable/updates main contrib non-free
 
diff --git a/doc/guide.sgml b/doc/guide.sgml
index 8d762b6f3..747c5718c 100644
--- a/doc/guide.sgml
+++ b/doc/guide.sgml
@@ -174,11 +174,11 @@ select the packages to be installed or removed and APT actually installs them.
 To enable the APT method you need to select [A]ccess in <prgn>dselect</> 
 and then choose the APT method. You will be prompted for a set of 
 <em>Sources</> which are places to fetch archives from. These can be remote
-Internet sites, local Debian mirrors or CDROMs. Each source can provide
+Internet sites, local Debian mirrors or CD-ROMs. Each source can 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 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 your CDROM before
+the latest bug fixes. APT will automatically use packages on your CD-ROM before
 downloading from the Internet.
 
 <p>
diff --git a/doc/method.sgml b/doc/method.sgml
index 3bee47d3a..27db50173 100644
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -220,7 +220,7 @@ the ones it wants.
 <tag>Local<item>The method only returns Filename: fields.
 <tag>Send-Config<item>Send configuration to the method.
 <tag>Needs-Cleanup<item>The process is kept around while the files it returned
-are being used. This is primarily intended for CDROM and File URIs that need
+are being used. This is primarily intended for CD-ROM and File URIs that need
 to unmount filesystems.
 <tag>Version<item>Version string for the method
 </taglist>
@@ -318,7 +318,7 @@ Fields: Media, Fail
 <p>
 The methods supplied by the stock apt are:
 <enumlist>
-<item>cdrom - For Multi-Disc CDROMs
+<item>cdrom - For Multi-Disc CD-ROMs
 <item>copy - (internal) For copying files around the filesystem
 <item>file - For local files
 <item>gzip - (internal) For decompression
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a723feb8e..25a6924eb 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1071,13 +1071,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. 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 APTs 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."
@@ -1095,7 +1095,7 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
@@ -1104,7 +1104,7 @@ msgstr ""
 #. 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 ""
@@ -3712,8 +3712,8 @@ msgstr ""
 #. 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 "
@@ -4255,7 +4255,7 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5643,7 +5643,7 @@ msgstr ""
 #. 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 "
+"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 ""
@@ -6086,12 +6086,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 "
-"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 "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 
 #. type: <example></example>
diff --git a/doc/po/de.po b/doc/po/de.po
index bf582cbdb..aa2d3dd9d 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -1423,13 +1423,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr "APT-CDROM-Verwaltungswerkzeug"
+msgid "APT CD-ROM management utility"
+msgstr "APT-CD-ROM-Verwaltungswerkzeug"
 
 #. 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 APTs 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."
@@ -1455,7 +1455,7 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
@@ -1469,7 +1469,7 @@ msgstr ""
 #. 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 ""
@@ -4836,7 +4836,7 @@ msgid ""
 "The CDROM subsection controls the &apt-cdrom; tool, please see its "
 "documentation for more information about the options here."
 msgstr ""
-"Der CD-ROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
+"Der CDROM-Unterabschnitt steuert das &apt-cdrom;-Werkzeug. Lesen Sie bitte "
 "dessen Dokumentation, um weitere Informationen über die Optionen hier zu "
 "erhalten."
 
@@ -5232,8 +5232,8 @@ msgstr "/cdrom/::Mount \"foo\";"
 #. 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 "
@@ -5241,7 +5241,7 @@ msgid ""
 "cdrom block. It is important to have the trailing slash. Unmount commands "
 "can be specified using UMount."
 msgstr ""
-"CDROM-URIs; Die einzige Einstellung für CDROM-URIs ist der Einhängepunkt "
+"CD-ROM-URIs; Die einzige Einstellung für CD-ROM-URIs ist der Einhängepunkt "
 "<literal>cdrom::Mount</literal>, der der Einhängepunkt des CD-ROM-Laufwerks "
 "sein muss, wie er in <filename>/etc/fstab</filename> angegeben wurde. Es ist "
 "möglich alternative Ein- und Aushängebefehle anzugeben, falls Ihr "
@@ -6053,7 +6053,7 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 "<literal>Debug::IdentCdrom</literal> schaltet das Einbeziehen von statfs-"
 "Daten in CD-ROM-IDs aus."
@@ -8000,7 +8000,7 @@ msgstr ""
 #. 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 ""
 "Das cdrom-Schema erlaubt APT ein lokales CD-ROM-Laufwerk mit Medienwechsel "
@@ -8617,12 +8617,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 "
-"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 "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 "Um die APT-Methode einzuschalten, müssen Sie [Z]ugriff in <prgn>dselect</"
 "prgn> auswählen und dann die APT-Methode wählen. Sie werden nach einer "
diff --git a/doc/po/es.po b/doc/po/es.po
index 96075a0c0..2b0722723 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -1489,13 +1489,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
 msgstr "Herramienta de APT para la gestión de discos ópticos"
 
 #. 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 APTs 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."
@@ -1521,7 +1521,7 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
@@ -1535,11 +1535,11 @@ msgstr ""
 #. 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 ""
-"APT usa un identificador de CDROM para reconocer qué disco está actualmente "
+"APT usa un identificador de CD-ROM para reconocer qué disco está actualmente "
 "en la unidad lectora y mantiene una lista de estos identificadores en "
 "<filename>&statedir;/cdroms.list</filename>"
 
@@ -5324,8 +5324,8 @@ msgstr "/cdrom/::Mount \"algo\";"
 #. 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 "
@@ -5333,9 +5333,9 @@ msgid ""
 "cdrom block. It is important to have the trailing slash. Unmount commands "
 "can be specified using UMount."
 msgstr ""
-"CDROM URI, la única opción de configuración para las URI de CDROM es el "
+"CD-ROM URI, la única opción de configuración para las URI de CD-ROM es el "
 "punto de montaje. <literal>cdrom::Mount</literal> debe ser el punto de "
-"montaje de la unidad de CDROM tal y como se especifica en <filename>/etc/"
+"montaje de la unidad de CD-ROM tal y como se especifica en <filename>/etc/"
 "fstab</filename>. Es posible proporcionar órdenes «mount» y «unmount» "
 "alternativas si el punto de montaje no se puede especificar en el fichero "
 "fstab (como con SMB y versiones antiguas de mount). La sintaxis consiste en "
@@ -6165,10 +6165,10 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 "<literal>Debug::IdentCdrom</literal> desactiva la inclusión de los datos de "
-"statfs en los identificadores de los CDROM."
+"statfs en los identificadores de los CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:785
@@ -8099,10 +8099,10 @@ msgstr ""
 #. 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 ""
-"El esquema «cdrom» permite a APT usar la unidad de CDROM local. Use el "
+"El esquema «cdrom» permite a APT usar la unidad de CD-ROM local. Use el "
 "programa &apt-cdrom; para añadir entradas de un disco óptico a «sources."
 "list»."
 
@@ -8711,12 +8711,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 "
-"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 "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para habilitar el método APT tiene que seleccionar [M]étodo en "
 "<prgn>dselect</prgn>, y después seleccionar el método APT. Se le pedirá un "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 9494231a7..3005b33b6 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -1447,13 +1447,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
 msgstr "Utilitaire de gestion des CD d'APT"
 
 #. 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 APTs 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."
@@ -1479,7 +1479,7 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
@@ -1493,7 +1493,7 @@ msgstr ""
 #. 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 ""
@@ -5291,8 +5291,8 @@ msgstr "/cdrom/::Mount \"foo\";"
 #. 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 "
@@ -6139,7 +6139,7 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 "<literal>Debug::IdentCdrom</literal> désactive l'inclusion de données de "
 "type statfs dans les identifiants de CD."
@@ -8046,7 +8046,7 @@ msgstr ""
 #. 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 ""
 "Le procédé <literal>cdrom</literal> permet l'utilisation d'un lecteur de CD "
@@ -8664,12 +8664,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 "
-"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 "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 "Pour activer la méthode APT, il est nécessaire de choisir [A]ccéder dans "
 "<prgn>dselect</prgn> puis utiliser le choix permettant d'activer APT. Des "
diff --git a/doc/po/it.po b/doc/po/it.po
index d1f0fc289..4bc5dc7fc 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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-24 17:24+0300\n"
 "PO-Revision-Date: 2003-04-26 23:26+0100\n"
 "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n"
 "Language-Team: <debian-l10n-italian@lists.debian.org>\n"
@@ -1048,13 +1048,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. 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 APTs 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."
@@ -1072,7 +1072,7 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
@@ -1081,7 +1081,7 @@ msgstr ""
 #. 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 ""
@@ -3668,8 +3668,8 @@ msgstr ""
 #. 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 "
@@ -4205,7 +4205,7 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -5585,7 +5585,7 @@ msgstr ""
 #. 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 ""
 
@@ -6158,12 +6158,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 "
-"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 "
-"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 "Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</"
 "prgn> e scegliere il metodo APT; vi verrà chiesto un insieme di fonti "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index b46ec4dd0..b1ed2c093 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -1494,20 +1494,20 @@ msgstr ""
 # 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 ""
-"<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 APTs 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 のリストに新しい "
-"CDROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能な"
+"CD-ROM を追加するのに便利です。<command>apt-cdrom</command> は焼き損じを可能な"
 "限り補正し、ディスク構造の確認を助けます。また、インデックスファイルの確認を"
 "行います。"
 
@@ -1527,12 +1527,12 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
 msgstr ""
-"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CDROM デ"
+"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CD-ROM デ"
 "バイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャン"
 "とインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</"
 "filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。"
@@ -1541,11 +1541,11 @@ msgstr ""
 #. 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 ""
-"APT は、現在ドライブにあるディスクのトラックから取得した、CDROM ID を使用しま"
+"APT は、現在ドライブにあるディスクのトラックから取得した、CD-ROM ID を使用しま"
 "す。またその ID を、<filename>&statedir;/cdroms.list</filename> 内のデータ"
 "ベースで管理します。"
 
@@ -5358,8 +5358,8 @@ msgstr "/cdrom/::Mount \"foo\";"
 #. 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 "
@@ -5367,8 +5367,8 @@ msgid ""
 "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 ドライブのマウントポイントを "
+"CD-ROM URI - CD-ROM URI はマウントポイントの設定のみを行います。<filename>/etc/"
+"fstab</filename> で設定されているように、CD-ROM ドライブのマウントポイントを "
 "<literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウントや古"
 "い mount パッケージなど) マウントポイントが fstab に記述できない場合、かわり"
 "にマウント・アンマウントコマンドも使用できます。構文は、cdrom ブロックを "
@@ -6067,9 +6067,9 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
-"<literal>Debug::IdentCdrom</literal> は CDROM ID にある statfs データの方gain"
+"<literal>Debug::IdentCdrom</literal> は CD-ROM ID にある statfs データの方gain"
 "を無効にします。"
 
 #. type: Content of: <refentry><refsect1><para>
@@ -8026,7 +8026,7 @@ msgstr ""
 #. 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 ドライブを、メディア交換しながら使え"
@@ -8553,12 +8553,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 "
-"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 "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 
 #. type: <example></example>
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 7bd7d0f92..2617efc13 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -1524,14 +1524,14 @@ msgstr ""
 #
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr "Narzędzie APT do zarządzania źródłami typu CDROM"
+msgid "APT CD-ROM management utility"
+msgstr "Narzędzie APT do zarządzania źródłami typu CD-ROM"
 
 #
 #. 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 APTs 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."
@@ -1559,19 +1559,19 @@ msgstr ""
 #, fuzzy
 #| 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 "
+#| "will unmount the CD-ROM device, prompt for a disk to be inserted and then "
 #| "procceed 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 title."
 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 disk to be inserted and then proceed "
 "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 "
 "title."
 msgstr ""
 "<literal>add</literal> jest używane do dodania nowego dysku do listy źródeł. "
-"<literal>add</literal> odmontuje urządzenie CDROM, poprosi o włożenie dysku, "
+"<literal>add</literal> odmontuje urządzenie CD-ROM, poprosi o włożenie dysku, "
 "a następnie zeskanuje go i skopiuje pliki indeksu. Jeżeli dysk nie ma "
 "właściwego katalogu <filename>disk</filename>, użytkownik zostanie "
 "poproszony o podanie opisu dysku."
@@ -1580,11 +1580,11 @@ msgstr ""
 #. 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 ""
-"APT używa identyfikatora CDROM-u do określenia, który dysk obecnie znajduje "
+"APT używa identyfikatora CD-ROM-u do określenia, który dysk obecnie znajduje "
 "się w napędzie, oraz przechowuje bazę tych identyfikatorów w pliku "
 "<filename>&statedir;/cdroms.list</filename>"
 
@@ -1638,7 +1638,7 @@ msgid ""
 "NoMount</literal>."
 msgstr ""
 "Nie montuj. Uniemożliwia programowi <command>apt-cdrom</command> montowanie "
-"i odmontowywanie CDROM-u.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
+"i odmontowywanie CD-ROM-u.  Pozycja w pliku konfiguracyjnym: <literal>APT::"
 "CDROM::NoMount</literal>."
 
 #
@@ -4801,8 +4801,8 @@ msgstr ""
 #. 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 "
@@ -5348,7 +5348,7 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6900,10 +6900,10 @@ msgstr ""
 #. 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 ""
-"Schemat cdrom pozwala APT na użycie lokalnego dysku CDROM ze zmianą dysków. "
+"Schemat cdrom pozwala APT na użycie lokalnego dysku CD-ROM ze zmianą dysków. "
 "Prosimy używać programu &apt-cdrom; do dodawania takich wpisów w sources."
 "list."
 
@@ -7516,23 +7516,23 @@ 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 "
-"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 "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 "Aby włączyć metodę APT należy wybrać opcję \"[A] Dostęp\" w programie "
 "<prgn>dselect</prgn> , a następnie wybrać metodę APT. Użytkownik zostanie "
 "poproszony o skonfigurowanie listy <em>źródeł</em>, będących lokalizacjami, "
 "z których będą pobierane pakiety. Mogą być to strony internetowe, lokalne "
-"serwery lustrzane Debiana lub CDROM-y. Każde źródło może dostarczać tylko "
+"serwery lustrzane Debiana lub CD-ROM-y. Każde źródło może dostarczać tylko "
 "fragmentu pełnego archiwum Debiana, a APT automatycznie połączy je w "
-"kompletny zbiór pakietów. Jeśli używany jest CDROM, to dobrym pomysłem jest "
+"kompletny zbiór pakietów. Jeśli używany jest CD-ROM, to dobrym pomysłem jest "
 "podanie najpierw jego, a potem podanie mirrorów umożliwiających dostęp do "
 "najnowszych wersji pakietów zawierających poprawki błędów. APT automatycznie "
-"użyje pakietów z CDROM-u zanim zacznie pobierać pakiety z Internetu."
+"użyje pakietów z CD-ROM-u zanim zacznie pobierać pakiety z Internetu."
 
 #. type: <example></example>
 #: guide.sgml:198
diff --git a/doc/po/pt.po b/doc/po/pt.po
index eed14a804..bb8447685 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -1448,18 +1448,18 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
-msgstr "Utilitário de gestão de CDROM do APT"
+msgid "APT CD-ROM management utility"
+msgstr "Utilitário de gestão de CD-ROM do APT"
 
 #. 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 APTs 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 ""
-"O <command>apt-cdrom</command> é usado para adicionar um novo CDROM à lista "
+"O <command>apt-cdrom</command> é usado para adicionar um novo CD-ROM à lista "
 "de fontes disponíveis do APT. O <command>apt-cdrom</command> encarrega-se de "
 "determinar a estrutura do disco assim como corrigir várias falhas possíveis "
 "e verificar os ficheiros de índice."
@@ -1480,13 +1480,13 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
 msgstr ""
 "<literal>add</literal> é usado para adicionar um novo disco à lista de "
-"fontes. Irá desmontar o dispositivo CDROM, pedir que seja inserido um disco "
+"fontes. Irá desmontar o dispositivo CD-ROM, pedir que seja inserido um disco "
 "e depois prosseguir com a sua sondagem e cópia dos ficheiros índice. Se o "
 "disco não possuir um directório <filename>disk</filename> apropriado, ser-"
 "lhe-à pedido um título descritivo."
@@ -1494,11 +1494,11 @@ msgstr ""
 #. 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 ""
-"O APT usa um ID de CDROM para acompanhar qual disco está actualmente na "
+"O APT usa um ID de CD-ROM para acompanhar qual disco está actualmente na "
 "drive e mantêm uma base de dados desses IDs em <filename>&statedir;/cdroms."
 "list</filename>"
 
@@ -5282,8 +5282,8 @@ msgstr "/cdrom/::Mount \"foo\";"
 #. 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 "
@@ -5291,9 +5291,9 @@ msgid ""
 "cdrom block. It is important to have the trailing slash. Unmount commands "
 "can be specified using UMount."
 msgstr ""
-"CDROM URIs; a única definição para URIs de CDROM é o ponto de montagem, "
+"CD-ROM URIs; a única definição para URIs de CD-ROM é o ponto de montagem, "
 "<literal>cdrom::Mount</literal> que deve ser o ponto de montagem para a "
-"drive de CDROM como especificado em <filename>/etc/fstab</filename>. É "
+"drive de CD-ROM como especificado em <filename>/etc/fstab</filename>. É "
 "possível fornecer comandos de montar e desmontar alternativos se o seu ponto "
 "de montagem não puder ser listado na fstab (como uma montagem SMB e pacotes "
 "de montagem antiga). A sintaxe é colocar  <placeholder type=\"literallayout"
@@ -6108,10 +6108,10 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 "<literal>Debug::IdentCdrom</literal> desactiva a inclusão de dados statfs em "
-"IDs de CDROM."
+"IDs de CD-ROM."
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:785
@@ -8061,10 +8061,10 @@ msgstr ""
 #. 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 ""
-"O esquema cdrom permite ao APT usar uma drive de CDROM local com mudança de "
+"O esquema cdrom permite ao APT usar uma drive de CD-ROM local com mudança de "
 "media. Use o programa &apt-cdrom; para criar entradas cdrom na lista de "
 "fontes."
 
@@ -8676,23 +8676,23 @@ 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 "
-"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 "
-"combine them to form a complete set of packages. If you have a CDROM then it "
+"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 "Para activar o método APT você precisa de seleccionar [A]ccess no "
 "<prgn>dselect</prgn> e depois escolher o método APT. Ser-lhe-à perguntado "
 "por um conjunto de <em>Sources</em> que são os lugares de onde obter os "
 "arquivos. Estes podem ser sites remotos da Internet, mirrors Debian locais "
-"ou CDROMs. Cada source pode disponibilizar um fragmento do arquivo Debian "
+"ou CD-ROMs. Cada source pode disponibilizar um fragmento do arquivo Debian "
 "total. O APT irá automaticamente combiná-los para formar um conjunto "
-"completo de pacotes. Se tem um CDROM, então é boa ideia especificá-lo em "
+"completo de pacotes. Se tem um CD-ROM, então é boa ideia especificá-lo em "
 "primeiro lugar e depois especificar um mirror para ter acesso às correcções "
 "de bugs mais recentes. O APT irá automaticamente usar os pacotes no seu "
-"CDROM antes de descarregar da Internet."
+"CD-ROM antes de descarregar da Internet."
 
 #. type: <example></example>
 #: guide.sgml:198
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 396e0f098..6b9be9fcd 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\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-24 17:24+0300\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1096,13 +1096,13 @@ msgstr ""
 
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-cdrom.8.xml:32
-msgid "APT CDROM management utility"
+msgid "APT CD-ROM management utility"
 msgstr ""
 
 #. 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 APTs 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."
@@ -1120,7 +1120,7 @@ msgstr ""
 #: 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 disk to be inserted and then proceed "
 "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 "
 "title."
@@ -1129,7 +1129,7 @@ msgstr ""
 #. 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 ""
@@ -3729,8 +3729,8 @@ msgstr ""
 #. 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 "
@@ -4265,7 +4265,7 @@ msgstr ""
 #: apt.conf.5.xml:775
 msgid ""
 "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
-"in CDROM IDs."
+"in CD-ROM IDs."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
@@ -6068,7 +6068,7 @@ msgstr ""
 #. 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 ""
 
@@ -6509,12 +6509,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 "
-"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 "
-"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 "
-"your CDROM before downloading from the Internet."
+"your CD-ROM before downloading from the Internet."
 msgstr ""
 
 #. type: <example></example>