summaryrefslogtreecommitdiff
path: root/methods/cdrom.cc
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@debian.org>2005-03-30 23:36:25 +0000
committerOtavio Salvador <otavio@debian.org>2005-03-30 23:36:25 +0000
commit54debba5d21783160e78706f6c21b274ca4b805b (patch)
tree2d7f87d6c6e97d2e3b34b7632741bd128b81b917 /methods/cdrom.cc
parent42ac13b328d84f385fbe09740a6bbf65f9d9b073 (diff)
parentb81af2c2bb8a4b41b8adbb1c351fbd0964542558 (diff)
Sync with apt@packages.debian.org/apt--main--0--patch-75
Patches applied: * apt@packages.debian.org/apt--main--0--patch-75 Merge bubulle@debian.org--2005/apt--main--0 * bubulle@debian.org--2005/apt--main--0--patch-58 Correct file permissions * bubulle@debian.org--2005/apt--main--0--patch-59 Bring consistency to the use of capitals in programs messages * bubulle@debian.org--2005/apt--main--0--patch-60 Correct the permission change on configure.in * bubulle@debian.org--2005/apt--main--0--patch-61 Complete unfuzzification of PO files after the capitalization fixes * bubulle@debian.org--2005/apt--main--0--patch-62 Final work of capitalization cleaning and translation unfuzzyfication * bubulle@debian.org--2005/apt--main--0--patch-63 Correct the "arbitary" typo in apt-ftparchive * bubulle@debian.org--2005/apt--main--0--patch-64 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-65 Italian translation update
Diffstat (limited to 'methods/cdrom.cc')
-rw-r--r--methods/cdrom.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index d8bb9522e..7cc036814 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -119,15 +119,15 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
// All non IMS queries for package files fail.
if (Itm->IndexFile == true || GetID(Get.Host).empty() == true)
{
- Fail(_("Please use apt-cdrom to make this CD recognized by APT."
- " apt-get update cannot be used to add new CDs"));
+ Fail(_("Please use apt-cdrom to make this CD-ROM recognized by APT."
+ " apt-get update cannot be used to add new CD-ROMs"));
return true;
}
// We already have a CD inserted, but it is the wrong one
if (CurrentID.empty() == false && Database.Find("CD::" + CurrentID) != Get.Host)
{
- Fail(_("Wrong CD"),true);
+ Fail(_("Wrong CD-ROM"),true);
return true;
}
@@ -165,7 +165,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
if (MediaFail(Get.Host,CDROM) == false)
{
CurrentID = "FAIL";
- Fail(_("Wrong CD"),true);
+ Fail(_("Wrong CD-ROM"),true);
return true;
}
}