Merge lp:~evfool/update-manager/stringfixes into lp:update-manager

[Robert Roth]

Simple string fixes for the following:
* LP bug #410310, update-manager and apt size inconsistencies fixed by following the Ubuntu Units policy and using base-10 units in update-manager's humanize_size
* LP bug #461780, ambiguous text in update-manager fixed by using "These software updates have been issued since this version of Ubuntu was released" instead of just "These software updates have been issued since Ubuntu was released", notice the "this version of"
* LP bug #537942, distinguish installed from candidate versions in changelog fixed by adding "Installed version: " and "Available version: " prefixes before the version strings
* Renamed _Check All and _Uncheck All context menu items to Select _All (mnemonic is A as S is used as a mnemonic for Settings) and _Deselect All, to avoid confusion for having a Check (for updates button) and Check All (context menu item), which have nothing to do with eachother, as discussed on IRC with mvo

=== modified file 'UpdateManager/Core/MyCache.py'
--- UpdateManager/Core/MyCache.py	2011-07-15 15:32:30 +0000
+++ UpdateManager/Core/MyCache.py	2011-07-25 09:51:16 +0000
@@ -280,7 +280,7 @@
     def get_changelog(self, name):
         " get the changelog file from the changelog location "
         origins = self[name].candidateOrigin
-        self.all_changes[name] = _("Changes for the versions:\n%s\n%s\n\n") % (self[name].installedVersion, self[name].candidateVersion)
+        self.all_changes[name] = _("Changes for the versions:\nInstalled version: %s\nAvailable version: %s\n\n") % (self[name].installedVersion, self[name].candidateVersion)
         if not self.CHANGELOG_ORIGIN in [o.origin for o in origins]:
             # Try non official changelog location
             changelogs_uri_binary = self._guess_third_party_changelogs_uri_by_binary(name)

=== modified file 'UpdateManager/Core/utils.py'
--- UpdateManager/Core/utils.py	2011-07-19 07:44:54 +0000
+++ UpdateManager/Core/utils.py	2011-07-25 09:51:16 +0000
@@ -401,16 +401,16 @@
     """
     if bytes == 0:
         # TRANSLATORS: download size is 0
-        return _("0 KB")
-    elif bytes < 1024:
+        return _("0 kB")
+    elif bytes < 1000:
         # TRANSLATORS: download size of very small updates
-        return _("1 KB")
-    elif bytes < 1024 * 1024:
-        # TRANSLATORS: download size of small updates, e.g. "250 KB"
-        return locale.format_string(_("%.0f KB"), bytes/1024)
+        return _("1 kB")
+    elif bytes < 1000 * 1000:
+        # TRANSLATORS: download size of small updates, e.g. "250 kB"
+        return locale.format_string(_("%.0f kB"), bytes/1000)
     else:
         # TRANSLATORS: download size of updates, e.g. "2.3 MB"
-        return locale.format_string(_("%.1f MB"), float(bytes) / 1024 / 1024)
+        return locale.format_string(_("%.1f MB"), bytes / 1000.0 / 1000.0)
 
 def get_arch():
     return apt_pkg.Config.find("APT::Architecture")

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2011-07-20 20:42:47 +0000
+++ UpdateManager/UpdateManager.py	2011-07-25 09:51:16 +0000
@@ -493,13 +493,13 @@
         # deleted when it goes out of scope and no menu is visible
         # (bug #806949)
         self.menu = menu = Gtk.Menu()
-        item_select_none = Gtk.MenuItem.new_with_mnemonic(_("_Uncheck All"))
+        item_select_none = Gtk.MenuItem.new_with_mnemonic(_("_Deselect All"))
         item_select_none.connect("activate", self.select_none_updgrades)
         menu.append(item_select_none)
         num_updates = self.cache.installCount
         if num_updates == 0:
             item_select_none.set_property("sensitive", False)
-        item_select_all = Gtk.MenuItem.new_with_mnemonic(_("_Check All"))
+        item_select_all = Gtk.MenuItem.new_with_mnemonic(_("Select _All"))
         item_select_all.connect("activate", self.select_all_updgrades)
         menu.append(item_select_all)
         menu.show_all()
@@ -675,9 +675,9 @@
           if firstrun:
               text_header = "<big><b>%s</b></big>" % _("Welcome to Ubuntu")
               if is_unity_running():
-                  text_label_main = _("These software updates have been issued since Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from Applications later.")
+                  text_label_main = _("These software updates have been issued since this version of Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from Applications later.")
               else:   
-                  text_label_main = _("These software updates have been issued since Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from the Administration Menu later.")
+                  text_label_main = _("These software updates have been issued since this version of Ubuntu was released. If you don't want to install them now, choose \"Update Manager\" from the Administration Menu later.")
               self.settings.set_boolean("first-run", False)
           else:
               text_header = "<big><b>%s</b></big>" % _("Software updates are available for this computer")