diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-10-21 19:45:27 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-10-21 19:45:27 +0000 |
| commit | efaa82c1941a2f58467c19ad4e6e08bf53e73e35 (patch) | |
| tree | 9fbcd1b208f721b6506b9a352850defe03a23303 /cmdline/apt-cdrom.cc | |
| parent | 3708af292b7c6a5a3b08f1acad8e4651fab588a9 (diff) | |
| parent | 4e0ad446347b1f3d70a66001365382db4d8e45f3 (diff) | |
Merge with Michael
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
* inital support for "apt-get source -t dist" (but no downgrades yet
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
* full support for apt-get source -t now (and honor pining too)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
* added APT::Authentication::Trust-CDROM option
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
* fix a crash in apt-ftparchive
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
* sparc64 alignment fix
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
* fix segfault when there is no Archive for a VerFile
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
* don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)
* 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
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
* renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
* implemented "TrustCDROM" mode
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
* added APT::Authentication::TrustCDROM to the configure-index
Diffstat (limited to 'cmdline/apt-cdrom.cc')
| -rw-r--r-- | cmdline/apt-cdrom.cc | 6 |
1 files changed, 3 insertions, 3 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; } /*}}}*/ |