diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 17:51:15 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-03-26 17:51:15 +0000 |
| commit | b81af2c2bb8a4b41b8adbb1c351fbd0964542558 (patch) | |
| tree | 43d27059095daf9a1534b26a3b6b8cdb9761796a /methods/cdrom.cc | |
| parent | d73e594e888fbc099bba84726df72eedcee5272c (diff) | |
| parent | f71d29c87b24b470fc2ae6b051ceaa8c9faa8358 (diff) | |
Merge bubulle@debian.org--2005/apt--main--0
Patches applied:
* 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.cc | 8 |
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; } } |