diff options
| author | Sebastian Heinlein <sebi@sebi-pc> | 2006-09-27 00:52:26 +0200 |
|---|---|---|
| committer | Sebastian Heinlein <sebi@sebi-pc> | 2006-09-27 00:52:26 +0200 |
| commit | 2c847b09b6e124bc30872ee537151c88de3bd65c (patch) | |
| tree | cef0018a21395719037ad07a80352e7a1d0eac2a | |
| parent | cf3decd2e830b53569e8dd9c12c2469914eb9b21 (diff) | |
| download | python-apt-2c847b09b6e124bc30872ee537151c88de3bd65c.tar.gz | |
* Fixed a missing import
* Hopefully some strings can now be translated
* Wording: Normal -> Distribution updates, to better separate them from
the third party updates
| -rw-r--r-- | UpdateManager/Common/utils.py | 1 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/UpdateManager/Common/utils.py b/UpdateManager/Common/utils.py index fa73b8bd..1fcd022f 100644 --- a/UpdateManager/Common/utils.py +++ b/UpdateManager/Common/utils.py @@ -1,5 +1,6 @@ import gtk from gettext import gettext as _ +import locale def str_to_bool(str): if str == "0" or str.upper() == "FALSE": diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 02a89a40..0219872c 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -237,7 +237,7 @@ class UpdateList: ("%s-updates" % dist, "Ubuntu", _("Recommended updates"), 9), ("%s-proposed" % dist, "Ubuntu", _("Proposed updates"), 8), ("%s-backports" % dist, "Ubuntu", _("Backports"), 7), - (dist, "Ubuntu", _("Normal updates"), 6)] + (dist, "Ubuntu", _("Distribution updates"), 6)] self.pkgs = {} self.matcher = {} @@ -803,16 +803,16 @@ class UpdateManager(SimpleGladeApp): for pkg in self.list.pkgs[origin]: name = xml.sax.saxutils.escape(pkg.name) summary = xml.sax.saxutils.escape(pkg.summary) - contents = "<b>%s</b>\n<small>%s\n" % (name, summary) + contents = "<b>%s</b>\n<small>%s</small>" % (name, summary) if pkg.installedVersion != None: - contents += _("From version %s to %s") % \ - (pkg.installedVersion, - pkg.candidateVersion) + version = _("From version %(old_version)s to %(new_version)s") %\ + {"old_version" : pkg.installedVersion, + "new_version" : pkg.candidateVersion} else: - contents += _("Version %s") % pkg.candidateVersion + version = _("Version %s") % pkg.candidateVersion #TRANSLATORS: the b stands for Bytes - contents += " " + _("(Size: %s)") % humanize_size(pkg.packageSize) - contents += "</small>" + size = _("(Size: %s)") % humanize_size(pkg.packageSize) + contents = "%s\n<small>%s %s</small>" % (contents, version, size) self.store.append([contents, pkg.name, pkg]) self.update_count() |