summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2006-10-04 21:26:42 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2006-10-04 21:26:42 +0200
commit408753014a2ffe1c52a0941e9db10b912e69a6ab (patch)
tree7262863471a44a36a8616658ca285d0b349be30a
parent3371259be1e936405b16bc447d6e90aab4809f81 (diff)
downloadpython-apt-408753014a2ffe1c52a0941e9db10b912e69a6ab.tar.gz
* DistUpgrade/DistUpgradeView.py:
- show the dsl download time first and then the modem time
-rw-r--r--DistUpgrade/DistUpgradeView.py4
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 3 deletions
diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
index a9cd16d7..40617774 100644
--- a/DistUpgrade/DistUpgradeView.py
+++ b/DistUpgrade/DistUpgradeView.py
@@ -35,8 +35,8 @@ def estimatedDownloadTime(requiredDownload):
""" get the estimated download time """
timeModem = requiredDownload/(56*1024/8) # 56 kbit
timeDSL = requiredDownload/(1024*1024/8) # 1Mbit = 1024 kbit
- s= _("This download will take about %s with a 56k modem and about %s with "
- "a 1Mbit DSL connection" % (FuzzyTimeToStr(timeModem), FuzzyTimeToStr(timeDSL)))
+ s= _("This download will take about %s with a 1Mbit DSL connection "
+ "and about %s with a 56k modem" % (FuzzyTimeToStr(timeDSL),FuzzyTimeToStr(timeModem)))
return s
diff --git a/debian/changelog b/debian/changelog
index 6bedba40..afc3c0a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ update-manager (0.44.15) edgy; urgency=low
* fix plural forms for ro, pl (lp: #46421)
* properly escape comments before displaying them (lp: #63475)
- --
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 4 Oct 2006 21:10:40 +0200
update-manager (0.44.14) edgy; urgency=low