apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8...

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 2578f9c6b50f67b284c4653bb422378f9be566b6..7434a7225fb89fed2b13a48c06ec2e5acbdec1bf 100644 (file)
--- 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) 
 {
 
 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;
    name = PromptLine("");
         
    return true;


@@ -90,7 +90,7 @@ void pkgCdromTextStatus::Update(string text, int current)
 
 bool pkgCdromTextStatus::ChangeCdrom() 
 {
 
 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;
 }
 
    return true;
 }
 


@@ -114,7 +114,7 @@ bool DoAdd(CommandLine &)
    pkgCdrom cdrom;
    res = cdrom.Add(&log);
    if(res)
    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;
 }
                                                                        /*}}}*/
    return res;
 }
                                                                        /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index e9f47e2d18741d6254b806e8bcb866012436f57f..9ee7179d5ec21919d6a43719251de9eab70ad588 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ apt (0.6.41.1) unstable; urgency=low
       (thanks to Fabbione for providing a test-case)
   * init the default ScreenWidth to 79 columns by default 
     (Closes: #324921)
       (thanks to Fabbione for providing a test-case)
   * init the default ScreenWidth to 79 columns by default 
     (Closes: #324921)

+  * cmdline/apt-cdrom.cc: 
+    - fix some missing gettext() calls (closes: #334539)
+  * doc/apt-cache.8.xml: fix typo (closes: #334714)

   
  -- 
 
   
  -- 
 

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 34749fd777bdb84a8928f351fe368b547d83c748..0e1d2f8d9b429de65430550965537705fee017d0 100644 (file)
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -214,7 +214,7 @@ Reverse Provides:
      </varlistentry>
 
      <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>
      </varlistentry>
 
      <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term>

-     <listitem><para><literal>rdepends</literal>shows a listing of each reverse dependency a
+     <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a

       package has.</para></listitem>
      </varlistentry>
 
       package has.</para></listitem>
      </varlistentry>