* Change upgraded/newly installed/not fully installed o...

Author: mdz
Date: 2003-08-22 01:51:01 GMT
* Change upgraded/newly installed/not fully installed or removed
messages to be consistent and somewhat shorter (some translations
exceeded 80 characters even in the simplest case)

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 53c4f166a80d92f4051775bd4be464d928aa6cea..3c03e0fa3db1200c9c5110018bf75cbc0e218500 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: apt-get.cc,v 1.138 2003/08/09 03:07:03 mdz Exp $
+// $Id: apt-get.cc,v 1.139 2003/08/22 01:51:01 mdz Exp $

 /* ######################################################################
    
    apt-get - Cover for dpkg
 /* ######################################################################
    
    apt-get - Cover for dpkg


@@ -570,7 +570,7 @@ void Stats(ostream &out,pkgDepCache &Dep)
         ReInstall++;
    }   
 
         ReInstall++;
    }   
 

-   ioprintf(out,_("%lu packages upgraded, %lu newly installed, "),
+   ioprintf(out,_("%lu upgraded, %lu newly installed, "),

            Upgrade,Install);
    
    if (ReInstall != 0)
            Upgrade,Install);
    
    if (ReInstall != 0)


@@ -582,7 +582,7 @@ void Stats(ostream &out,pkgDepCache &Dep)
            Dep.DelCount(),Dep.KeepCount());
    
    if (Dep.BadCount() != 0)
            Dep.DelCount(),Dep.KeepCount());
    
    if (Dep.BadCount() != 0)

-      ioprintf(out,_("%lu packages not fully installed or removed.\n"),
+      ioprintf(out,_("%lu not fully installed or removed.\n"),

               Dep.BadCount());
 }
                                                                        /*}}}*/
               Dep.BadCount());
 }
                                                                        /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index 2891fb538a4d578011db87a527341286ed5bf095..71768eba8a9d2d3482af85c01390f56035a39d2c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ apt (0.5.10) unstable; urgency=low
   * Add apt-config to SEE ALSO section of apt-get (Closes: #205036)
   * Add missing "lang" attributes to refentry tags in French man pages
     (apt-cdrom, apt-extracttemplates, apt-sortpkgs)
   * Add apt-config to SEE ALSO section of apt-get (Closes: #205036)
   * Add missing "lang" attributes to refentry tags in French man pages
     (apt-cdrom, apt-extracttemplates, apt-sortpkgs)

+  * Change upgraded/newly installed/not fully installed or removed
+    messages to be consistent and somewhat shorter (some translations
+    exceeded 80 characters even in the simplest case)

 
  -- 
 
 
  -- 
 

diff --git a/po/apt-all.pot b/po/apt-all.pot
index f56b659993f776cd907d38eda1766d3f95ff565f..775727f37cf8a2bc07548fd2324886da378f1f75 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2003-08-09 01:57-0400\n"
+"POT-Creation-Date: 2003-08-17 21:45-0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -588,7 +588,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:573
 #, c-format
 
 #: cmdline/apt-get.cc:573
 #, c-format

-msgid "%lu packages upgraded, %lu newly installed, "
+msgid "%lu upgraded, %lu newly installed, "

 msgstr ""
 
 #: cmdline/apt-get.cc:577
 msgstr ""
 
 #: cmdline/apt-get.cc:577


@@ -608,7 +608,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:585
 #, c-format
 
 #: cmdline/apt-get.cc:585
 #, c-format

-msgid "%lu packages not fully installed or removed.\n"
+msgid "%lu not fully installed or removed.\n"

 msgstr ""
 
 #: cmdline/apt-get.cc:645
 msgstr ""
 
 #: cmdline/apt-get.cc:645