diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 17:00:47 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 17:00:47 +0000 |
| commit | dc738e7ae6a9c14992279dc2c52f71b14ced53aa (patch) | |
| tree | f499d824a6da6d4fcce2a927192ba30fdbebd143 /methods/cdrom.cc | |
| parent | bac2e715204b341d7818444c4a4ad2e3e4e5b18d (diff) | |
Lots and lots of i18n updates.
Author: doogie
Date: 2003-02-10 07:34:41 GMT
Lots and lots of i18n updates.
Diffstat (limited to 'methods/cdrom.cc')
| -rw-r--r-- | methods/cdrom.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/methods/cdrom.cc b/methods/cdrom.cc index c4fde2217..f6b0bc679 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: cdrom.cc,v 1.19 2002/11/22 07:26:10 doogie Exp $ +// $Id: cdrom.cc,v 1.20 2003/02/10 07:34:41 doogie Exp $ /* ###################################################################### CDROM URI method for APT @@ -8,6 +8,7 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ +#include <apti18n.h> #include <apt-pkg/acquire-method.h> #include <apt-pkg/cdromutl.h> #include <apt-pkg/error.h> @@ -109,7 +110,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) if (FileExists(DFile) == true) { if (ReadConfigFile(Database,DFile) == false) - return _error->Error("Unable to read the cdrom database %s", + return _error->Error(_("Unable to read the cdrom database %s"), DFile.c_str()); } DatabaseLoaded = true; @@ -118,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 recognized by APT." + " apt-get update cannot be used to add new CDs")); 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"),true); return true; } @@ -159,12 +160,12 @@ bool CDROMMethod::Fetch(FetchItem *Itm) // I suppose this should prompt somehow? if (UnmountCdrom(CDROM) == false) - return _error->Error("Unable to unmount the CD-ROM in %s, it may still be in use.", + return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."), CDROM.c_str()); if (MediaFail(Get.Host,CDROM) == false) { CurrentID = "FAIL"; - Fail("Wrong CD",true); + Fail(_("Wrong CD"),true); return true; } } @@ -173,7 +174,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) Res.Filename = CDROM + File; struct stat Buf; if (stat(Res.Filename.c_str(),&Buf) != 0) - return _error->Error("File not found"); + return _error->Error(_("File not found")); if (NewID.empty() == false) CurrentID = NewID; |