From dc738e7ae6a9c14992279dc2c52f71b14ced53aa Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:00:47 +0000
Subject: Lots and lots of i18n updates. Author: doogie Date: 2003-02-10
 07:34:41 GMT Lots and lots of i18n updates.

---
 methods/cdrom.cc | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'methods/cdrom.cc')

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;
-- 
cgit v1.2.3