Fix some typos from #479997

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 342b6314a3ff2adeac563bbb489efdc21e9d43ac..d804c55e5afabfec159c449b93a2568950decd7e 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -74,7 +74,7 @@ string pkgCdromTextStatus::PromptLine(const char *Text)
 
 bool pkgCdromTextStatus::AskCdromName(string &name) 
 {
 
 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 5.0.3 Disk 1'") << flush;

    name = PromptLine("");
         
    return true;
    name = PromptLine("");
         
    return true;

diff --git a/debian/changelog b/debian/changelog
index 9d3a0a868c9b0665365ebc67de8fcb6d524d1770..60986ffa14bee1c9eebb5cee730a1ea8d54e8a6c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ apt (0.7.25) UNRELEASED; urgency=low
   * po/LINGUAS. Re-disable Hebrew. Closes: #534992
   * Fix typo in apt-cache.8.xml: nessasarily
   * Fix "with with" in apt-get.8.xml
   * po/LINGUAS. Re-disable Hebrew. Closes: #534992
   * Fix typo in apt-cache.8.xml: nessasarily
   * Fix "with with" in apt-get.8.xml

+  * Fix some of the typos mentioned by the german team
+    Closes: #479997

 
  -- Christian Perrier <bubulle@debian.org>  Sat, 26 Sep 2009 11:17:25 +0200
 
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 26 Sep 2009 11:17:25 +0200
 

diff --git a/dselect/install b/dselect/install
index 61d13208e2f9c0d2fc1fa56036edd777d731c129..6779698e0ab817591a6aa1f4c20b6642e008e33d 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -98,8 +98,8 @@ if [ $RES -eq 0 ]; then
        ;;
    esac   
 else
        ;;
    esac   
 else

-   echo $"Some errors occurred while unpacking. I'm going to configure the"
-   echo $"packages that were installed. This may result in duplicate errors"
+   echo $"Some errors occurred while unpacking. Packages that were installed"
+   echo $"will be configured. This may result in duplicate errors"

    echo $"or errors caused by missing dependencies. This is OK, only the errors"
    echo $"above this message are important. Please fix them and run [I]nstall again"
    echo $"Press enter to continue."
    echo $"or errors caused by missing dependencies. This is OK, only the errors"
    echo $"above this message are important. Please fix them and run [I]nstall again"
    echo $"Press enter to continue."

diff --git a/methods/connect.cc b/methods/connect.cc
index 355bd5c4d2253f3d88f8346a614ba3622958b032..b5f48907ec97460a251bb4a035c8e7001e9e74a5 100644 (file)
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -237,6 +237,6 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
 
    if (_error->PendingError() == true)
       return false;   
 
    if (_error->PendingError() == true)
       return false;   

-   return _error->Error(_("Unable to connect to %s %s:"),Host.c_str(),ServStr);
+   return _error->Error(_("Unable to connect to %s:%s:"),Host.c_str(),ServStr);

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/