Merge with Matt and update French translation

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

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 5767062e4ccc101cfe646f4a58e0e585c4d13d03..2578f9c6b50f67b284c4653bb422378f9be566b6 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) 
 {
@@ -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");
    return true;
 }
 
-virtual OpProgress* pkgCdromTextStatus::GetOpProgress() 
+OpProgress* pkgCdromTextStatus::GetOpProgress() 
 { 
    return &Progress; 
 };
@@ -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;
 }