summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubulle@debian.org <>2009-09-26 19:45:15 +0200
committerbubulle@debian.org <>2009-09-26 19:45:15 +0200
commitcdd5a135d9232123dc3650ed1c1cb31d1e24de0b (patch)
tree70377a4a43882802418c4acae0a14954b6bfc9f1
parentc2205b51fef287dd03f221bf069514c95b2c6c17 (diff)
Fix some typos from #479997
-rw-r--r--cmdline/apt-cdrom.cc2
-rw-r--r--debian/changelog2
-rwxr-xr-xdselect/install4
-rw-r--r--methods/connect.cc2
4 files changed, 6 insertions, 4 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 342b6314a..d804c55e5 100644
--- 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)
{
- 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;
diff --git a/debian/changelog b/debian/changelog
index 9d3a0a868..60986ffa1 100644
--- 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
+ * 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
diff --git a/dselect/install b/dselect/install
index 61d13208e..6779698e0 100755
--- a/dselect/install
+++ b/dselect/install
@@ -98,8 +98,8 @@ if [ $RES -eq 0 ]; then
;;
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."
diff --git a/methods/connect.cc b/methods/connect.cc
index 355bd5c4d..b5f48907e 100644
--- 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;
- 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);
}
/*}}}*/