diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-01-08 13:50:07 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-01-08 13:50:07 +0100 |
| commit | 1cbc5ac38be0077742cd0e714737cfde0ca84412 (patch) | |
| tree | 6768549f3697fe15d7cf29a19e6b47b4c11f322f | |
| parent | 71da8af4dabe8680802ef291267c2f53d7942d18 (diff) | |
merge from the mvo branch
| -rw-r--r-- | apt-pkg/contrib/strutl.cc | 14 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 16 insertions, 5 deletions
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index cdd88827b..fe9082f63 100644 --- 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) { - 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) { - 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) { - sprintf(S,"%limin%lis",Sec/60,Sec % 60); + //min means minutes, s means seconds + sprintf(S,_("%limin %lis"),Sec/60,Sec % 60); break; } - - sprintf(S,"%lis",Sec); + + //s means seconds + sprintf(S,_("%lis"),Sec); break; } diff --git a/debian/changelog b/debian/changelog index 15d5730f4..8c7b62e18 100644 --- 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 ] |