diff options
author | Michael Vogt <mvo@debian.org> | 2005-10-19 20:13:09 +0000 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2005-10-19 20:13:09 +0000 |
commit | 2cc1d69f0cde813351dc9d572a6cb3142bf7f579 (patch) | |
tree | 63b4b1cdbf857294f393ffbd904ff4a43dd44449 /cmdline | |
parent | f7132d28980564b0dd75aff1e27f4b02407fa5cc (diff) | |
parent | 04f9a54dc9136f2d220a0180a750a9700a177de7 (diff) |
* merged with apt--mvo, prepared another upload
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72
* corrections in the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
* init the default ScreenWidth to 79 columns by default (Closes: #324921)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
* seting section to "admin" to match override file
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76
* finalized the changelog
Diffstat (limited to 'cmdline')
-rw-r--r-- | cmdline/apt-cdrom.cc | 6 | ||||
-rw-r--r-- | cmdline/apt-get.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc index 2578f9c6b..7434a7225 100644 --- a/cmdline/apt-cdrom.cc +++ b/cmdline/apt-cdrom.cc @@ -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; @@ -90,7 +90,7 @@ void pkgCdromTextStatus::Update(string text, int current) 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; } @@ -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; } /*}}}*/ diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 6e17611cb..3475d79ae 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -66,7 +66,7 @@ ostream c0out(0); ostream c1out(0); ostream c2out(0); ofstream devnull("/dev/null"); -unsigned int ScreenWidth = 80; +unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */ // class CacheFile - Cover class for some dependency cache functions /*{{{*/ // --------------------------------------------------------------------- |