apt-pkg/contrib/strutl.cc: increase the size limit

[apt.git] / cmdline / apt-cdrom.cc

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 5767062e4ccc101cfe646f4a58e0e585c4d13d03..379a433ea3fd000908bd236be7962b790510b8eb 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -53,7 +53,7 @@ public:
    virtual void Update(string text, int current);
    virtual bool ChangeCdrom();
    virtual OpProgress* GetOpProgress();
-}
+};
 
 void pkgCdromTextStatus::Prompt(const char *Text) 
 {
@@ -75,7 +75,7 @@ string pkgCdromTextStatus::PromptLine(const char *Text)
 
 bool pkgCdromTextStatus::AskCdromName(string &name) 
 {
-   cout << "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" << flush;
+   cout << _("Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'") << flush;
    name = PromptLine("");
         
    return true;
@@ -88,13 +88,13 @@ void pkgCdromTextStatus::Update(string text, int current)
       cout << text << flush;
 }
 
-virtual bool pkgCdromTextStatus::ChangeCdrom() 
+bool pkgCdromTextStatus::ChangeCdrom() 
 {
-   Prompt("Please insert a Disc in the drive and press enter");
+   Prompt(_("Please insert a Disc in the drive and press enter"));
    return true;
 }
 
-virtual OpProgress* pkgCdromTextStatus::GetOpProgress() 
+OpProgress* pkgCdromTextStatus::GetOpProgress() 
 { 
    return &Progress; 
 };
@@ -114,7 +114,7 @@ bool DoAdd(CommandLine &)
    pkgCdrom cdrom;
    res = cdrom.Add(&log);
    if(res)
-      cout << "Repeat this process for the rest of the CDs in your set." << endl;
+      cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
    return res;
 }
                                                                        /*}}}*/
@@ -135,8 +135,8 @@ bool DoIdent(CommandLine &)
 /* */
 int ShowHelp()
 {
-   ioprintf(cout,_("%s %s for %s %s compiled on %s %s\n"),PACKAGE,VERSION,
-           COMMON_OS,COMMON_CPU,__DATE__,__TIME__);
+   ioprintf(cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,VERSION,
+           COMMON_ARCH,__DATE__,__TIME__);
    if (_config->FindB("version") == true)
       return 0;
    
@@ -159,7 +159,7 @@ int ShowHelp()
       "  -f   Fast mode, don't check package files\n"
       "  -a   Thorough scan mode\n"
       "  -c=? Read this configuration file\n"
-      "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+      "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
       "See fstab(5)\n";
    return 0;
 }