* merged from glatzor

6 files changed, 22 insertions, 65 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 237ffbdd..8c3e4878 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -100,16 +100,16 @@ class SoftwareProperties(SimpleGladeApp):
 
     update_days = apt_pkg.Config.FindI(CONF_MAP["autoupdate"])
 
-    self.combobox_update_interval.append_text("Daily")
-    self.combobox_update_interval.append_text("Every two days")
-    self.combobox_update_interval.append_text("Weekly")
-    self.combobox_update_interval.append_text("Every two weeks")
+    self.combobox_update_interval.append_text(_("Daily"))
+    self.combobox_update_interval.append_text(_("Every two days"))
+    self.combobox_update_interval.append_text(_("Weekly"))
+    self.combobox_update_interval.append_text(_("Every two weeks"))
 
     # If a custom period is defined add an corresponding entry
     if not update_days in self.combobox_interval_mapping.values():
         if update_days > 0:
-            self.combobox_update_interval.append_text(_("Every %s days" 
-                                                      % update_days))
+            self.combobox_update_interval.append_text(_("Every %s days") 
+                                                      % update_days)
             self.combobox_interval_mapping[4] = update_days
     
     for key in self.combobox_interval_mapping:
@@ -131,15 +131,15 @@ class SoftwareProperties(SimpleGladeApp):
 
     delete_days = apt_pkg.Config.FindI(CONF_MAP["max_age"])
 
-    self.combobox_delete_interval.append_text("After one week")
-    self.combobox_delete_interval.append_text("After two weeks")
-    self.combobox_delete_interval.append_text("After one month")
+    self.combobox_delete_interval.append_text(_("After one week"))
+    self.combobox_delete_interval.append_text(_("After two weeks"))
+    self.combobox_delete_interval.append_text(_("After one month"))
 
     # If a custom period is defined add an corresponding entry
     if not delete_days in self.combobox_delete_interval_mapping.values():
         if delete_days > 0 and CONF_MAP["autoclean"] != 0:
-            self.combobox_delete_interval.append_text(_("After %s days" 
-                                                      % delete_days))
+            self.combobox_delete_interval.append_text(_("After %s days") 
+                                                      % delete_days)
             self.combobox_delete_interval_mapping[3] = delete_days
     
     for key in self.combobox_delete_interval_mapping:
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 6ac83197..648d5f39 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -437,9 +437,12 @@ class UpdateManager(SimpleGladeApp):
           self.textview_changes.get_buffer().set_text("")
           self.textview_descr.get_buffer().set_text("")
       else:
-          text_header = "<big><b>"+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"</b></big>"
-          
-          text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size))
+          text_header = "<big><b>" + \
+                        gettext.ngettext("You can install %s update",
+                                         "You can install %s updates", 
+                                         len(self.store)) % \
+                                        len(self.store) + "</b></big>"
+          text_download = _("Download size: %s") % apt_pkg.SizeToStr(self.dl_size)
           self.notebook_details.set_sensitive(True)
           self.treeview_update.set_sensitive(True)
           self.button_install.grab_default()
@@ -552,51 +555,6 @@ class UpdateManager(SimpleGladeApp):
     if x > 0 and y > 0:
       self.window_main.resize(x,y)
 
-  def on_button_preferences_clicked(self, widget):
-    """ start gnome-software preferences """
-    # args: "-n" means we take care of the reloading of the
-    # package list ourself
-    #apt_pkg.PkgSystemUnLock()
-    #args = ['/usr/bin/gnome-software-properties', '-n']
-    #child = subprocess.Popen(args)
-    #self.window_main.set_sensitive(False)
-    #res = None
-    #while res == None:
-    #  res = child.poll()
-    #  time.sleep(0.05)
-    ##  while gtk.events_pending():
-    #    gtk.main_iteration()
-    # repository information changed, call "reload"
-    #try:
-    #    apt_pkg.PkgSystemLock()
-    #except SystemError:
-    #	print "Error geting the cache"
-    #    apt_pkg.PkgSystemLock()
-    #    if res > 0:
-    #      self.on_button_reload_clicked(None)
-    #    self.window_main.set_sensitive(True)
-    self.window_main.set_sensitive(False)
-    from SoftwareProperties import SoftwareProperties
-    prop = SoftwareProperties.SoftwareProperties(self.datadir, None)
-    prop.window_main.set_transient_for(self.window_main)
-    prop.run()
-    prop.window_main.hide()
-    if prop.modified:
-        primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
-                  _("Repositories changed")
-        secondary = _("You need to reload the package list from the servers "
-                      "for your changes to take effect. Do you want to do "
-                      "this now?") 
-        dialog = gtk.MessageDialog(self.window_main, 0,
-                               gtk.MESSAGE_INFO,gtk.BUTTONS_YES_NO,"")
-        dialog.set_markup(primary);
-        dialog.format_secondary_text(secondary);
-        res = dialog.run()
-        dialog.destroy()
-        if res == gtk.RESPONSE_YES:
-            self.on_button_reload_clicked(None)
-    self.window_main.set_sensitive(True)
-
   def fillstore(self):
     # use the watch cursor
     self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade
index 58584826..a1f7f8f9 100644
--- a/data/SoftwareProperties.glade
+++ b/data/SoftwareProperties.glade
@@ -390,7 +390,7 @@
 		      <child>
 			<widget class="GtkCheckButton" id="checkbutton_unattended">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Only security updates from the official Ubuntu servers will be installed automatically. The software package &quot;unattended-upgrades&quot; needs to be installed therefor</property>
+			  <property name="tooltip" translatable="yes">Only security updates from the official Ubuntu servers will be installed automatically</property>
 			  <property name="can_focus">True</property>
 			  <property name="label" translatable="yes">_Install security updates without confirmation</property>
 			  <property name="use_underline">True</property>
diff --git a/data/SoftwarePropertiesDialogs.glade b/data/SoftwarePropertiesDialogs.glade
index 549a9c7c..8c5b00c6 100644
--- a/data/SoftwarePropertiesDialogs.glade
+++ b/data/SoftwarePropertiesDialogs.glade
@@ -451,7 +451,7 @@
 		  <property name="can_focus">True</property>
 		  <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Enter the complete APT line of the channel that you want to add&lt;/b&gt;&lt;/big&gt;
 
-The APT line contains the type, location and sections of a channel, for example &lt;i&gt;&quot;deb http://ftp.debian.org sarge main&quot;&lt;/i&gt;.</property>
+The APT line includes the type, location and components of a channel, for example &lt;i&gt;&quot;deb http://ftp.debian.org sarge main&quot;&lt;/i&gt;.</property>
 		  <property name="use_underline">False</property>
 		  <property name="use_markup">True</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade
index 01660613..6600dd05 100644
--- a/data/UpdateManager.glade
+++ b/data/UpdateManager.glade
@@ -89,7 +89,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label26">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Software updates can correct errors, eliminate security vulnerabilities, and provide new features to you.</property>
+		      <property name="label" translatable="yes">Software updates correct errors, eliminate security vulnerabilities and provide new features.</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1362,9 +1362,9 @@ Your system does not check for updates automatically. You can configure this beh
       <child>
 	<widget class="GtkLabel" id="label22">
 	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Analysing your system&lt;/b&gt;&lt;/big&gt;
+	  <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Examining your system&lt;/b&gt;&lt;/big&gt;
 
-Software updates can correct errors, eliminate security vulnerabilities, and provide new features to you.</property>
+Software updates correct errors, eliminate security vulnerabilities and provide new features.</property>
 	  <property name="use_underline">False</property>
 	  <property name="use_markup">True</property>
 	  <property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/software-properties b/software-properties
index 2e1d5da6..f21a5b52 100644
--- a/software-properties
+++ b/software-properties
@@ -28,7 +28,6 @@ import gtk
 import gtk.gdk
 import gtk.glade
 import gobject
-import gnome
 import gettext
 import os
 import sys