merge from the mvo branch

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index cdd88827b5f21a2acd245d8c7e3310b7caed2058..fe9082f63909dbb101450b7f735404f8a10dcd3a 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -331,23 +331,27 @@ string TimeToStr(unsigned long Sec)
    {
       if (Sec > 60*60*24)
       {
    {
       if (Sec > 60*60*24)
       {

-        sprintf(S,"%lid %lih%limin%lis",Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);
+        //d means days, h means hours, min means minutes, s means seconds
+        sprintf(S,_("%lid %lih %limin %lis"),Sec/60/60/24,(Sec/60/60) % 24,(Sec/60) % 60,Sec % 60);

         break;
       }
       
       if (Sec > 60*60)
       {
         break;
       }
       
       if (Sec > 60*60)
       {

-        sprintf(S,"%lih%limin%lis",Sec/60/60,(Sec/60) % 60,Sec % 60);
+        //h means hours, min means minutes, s means seconds
+        sprintf(S,_("%lih %limin %lis"),Sec/60/60,(Sec/60) % 60,Sec % 60);

         break;
       }
       
       if (Sec > 60)
       {
         break;
       }
       
       if (Sec > 60)
       {

-        sprintf(S,"%limin%lis",Sec/60,Sec % 60);
+        //min means minutes, s means seconds
+        sprintf(S,_("%limin %lis"),Sec/60,Sec % 60);

         break;
       }
         break;
       }

-      
-      sprintf(S,"%lis",Sec);
+
+      //s means seconds
+      sprintf(S,_("%lis"),Sec);

       break;
    }
    
       break;
    }
    

diff --git a/debian/changelog b/debian/changelog
index 15d5730f49c34726305d0e5051b98aa0ee9f8504..8c7b62e18b5b386a007d725eb7df6bc6eae8be90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.7.19ubuntu3) jaunty; urgency=low
+
+  * apt-pkg/contrib/strutl.cc:
+    - fix TimeToStr i18n (LP: #289807)
+
+ --
+

 apt (0.7.19ubuntu2) jaunty; urgency=low
 
   [ Michael Vogt ]
 apt (0.7.19ubuntu2) jaunty; urgency=low
 
   [ Michael Vogt ]