Merge lp:~kelemeng/software-properties/bug1035544 into lp:software-properties

[Gabor Kelemen]

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2012-07-18 09:25:06 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2012-08-25 14:27:30 +0000
@@ -712,7 +712,7 @@
     self.keys_store = Gtk.ListStore(str)
     self.treeview_auth.set_model(self.keys_store)
     tr = Gtk.CellRendererText()
-    keys_col = Gtk.TreeViewColumn("Key", tr, text=0)
+    keys_col = Gtk.TreeViewColumn(_("Key"), tr, text=0)
     self.treeview_auth.append_column(keys_col)
     try:
         self.treeview_auth.enable_model_drag_dest(
@@ -1001,7 +1001,7 @@
     self.progress_bar.set_visible(True)
     self.progress_bar.set_visible(True)
 
-    self.label_driver_action.set_label("Applying changes...")
+    self.label_driver_action.set_label(_("Applying changes..."))
     self.progress_bar.set_fraction(progress / 100.0)
 
   def on_driver_changes_finish(self, transaction, exit_state):
@@ -1210,7 +1210,7 @@
       try:
         pkg = self.apt_cache[pkg_driver_name]
         installed = pkg.is_installed
-        description = "Using {} from {}".format(pkg.candidate.summary, pkg.shortname)
+        description = _("Using {} from {}").format(pkg.candidate.summary, pkg.shortname)
       except KeyError:
         print("WARNING: a driver ({}) doesn't have any available package associated: {}".format(pkg_driver_name, current_driver))
         continue
@@ -1327,7 +1327,7 @@
   def set_driver_action_status(self):
     # Update the label in case we end up having some kind of proprietary driver in use.
     if (os.path.exists('/var/run/reboot-required')):
-      self.label_driver_action.set_label("You need to restart the computer to complete the driver changes.")
+      self.label_driver_action.set_label(_("You need to restart the computer to complete the driver changes."))
       self.button_driver_restart.set_visible(True)
       self.window_main.set_urgency_hint(True)
       return
@@ -1340,9 +1340,11 @@
           self.nonfree_drivers = self.nonfree_drivers + 1
 
     if self.nonfree_drivers > 0:
-      self.label_driver_action.set_label(_("%(count)d proprietary driver%(plural)s in use.")
-                                         % { 'count': self.nonfree_drivers,
-                                             'plural': "s" if self.nonfree_drivers > 1 else "" })
+      self.label_driver_action.set_label(gettext.ngettext (
+                                                "%(count)d proprietary driver in use.",
+                                                "%(count)d proprietary drivers in use.", 
+                                                self.nonfree_drivers)
+                                                % { 'count': self.nonfree_drivers})
     else:
       self.label_driver_action.set_label(_("No proprietary drivers are in use."))