* merged with sebi

25 files changed, 317 insertions, 119 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 8da70eee..21f42cf6 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -115,6 +115,43 @@ class SoftwareProperties(SimpleGladeApp):
       self.checkbutton_auto_update.set_active(False)
       self.combobox_update_interval.set_sensitive(False)
 
+    # Automatic removal of cached packages by age
+    self.combobox_delete_interval_mapping = { 0 : 7,
+                                       1 : 14,
+                                       2 : 31 }
+
+    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("Immediatly")
+
+    # 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_mapping[3] = delete_days
+    
+    for key in self.combobox_interval_mapping:
+      if self.combobox_interval_mapping[key] == update_days:
+        self.combobox_update_interval.set_active(key)
+        break
+
+    if delete_days >= 1 and CONF_MAP["autoclean"] != 0:
+      self.checkbutton_auto_delete.set_active(True)
+      self.combobox_delete_interval.set_sensitive(True)
+    else:
+      self.checkbutton_auto_delete.set_active(False)
+      self.combobox_delete_interval.set_sensitive(False)
+
+    # Autodownload
+    if CONF_MAP["autodownload"] == 1:
+      self.checkbutton_auto_download.set_active(True)
+    else:
+      self.checkbutton_auto_download.set_active(False)
+
     # apt-key stuff
     self.apt_key = apt_key()
     self.init_keyslist()
@@ -175,7 +212,7 @@ class SoftwareProperties(SimpleGladeApp):
         apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value))
         self.write_config()
       
-  def opt_autoupdate_toggled(self, widget):  
+  def on_opt_autoupdate_toggled(self, widget):  
     if self.checkbutton_auto_update.get_active():
       self.combobox_update_interval.set_sensitive(True)
       # if no frequency was specified use daily
@@ -190,6 +227,40 @@ class SoftwareProperties(SimpleGladeApp):
     apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value))
     # FIXME: Write config options, apt_pkg should be able to do this.
     self.write_config()
+
+  def on_opt_autodownload_toggled(self, widget):  
+    if self.checkbutton_auto_download.get_active():
+        apt_pkg.Config.Set(CONF_MAP["autodownload"], str(1))
+    else:
+        apt_pkg.Config.Set(CONF_MAP["autodownload"], str(0))
+    # FIXME: Write config options, apt_pkg should be able to do this.
+    self.write_config()
+
+  def on_combobox_delete_interval_changed(self, widget):
+    i = self.combobox_delete_interval.get_active()
+    value = self.combobox_delete_interval_mapping[i]
+    # Only write the key if it has changed
+    if not value == apt_pkg.Config.FindI(CONF_MAP["max_age"]):
+        apt_pkg.Config.Set(CONF_MAP["max_age"], str(value))
+        self.write_config()
+      
+  def opt_autodelete_toggled(self, widget):  
+    if self.checkbutton_auto_delete.get_active():
+      self.combobox_delete_interval.set_sensitive(True)
+      # if no frequency was specified use daily
+      i = self.combobox_delete_interval.get_active()
+      if i == -1:
+          i = 0
+          self.combobox_delete_interval.set_active(i)
+      value_maxage = self.combobox_delete_interval_mapping[i]
+      value_clean = 1
+      apt_pkg.Config.Set(CONF_MAP["max_age"], str(value_clean))
+    else:
+      self.combobox_delete_interval.set_sensitive(False)
+      value_clean = 0
+    apt_pkg.Config.Set(CONF_MAP["autoclean"], str(value_clean))
+    # FIXME: Write config options, apt_pkg should be able to do this.
+    self.write_config()
     
   def write_config(self):
     #print "write_config()"
diff --git a/UpdateManager/GtkProgress.py b/UpdateManager/GtkProgress.py
index 704946c7..d11ca3e9 100644
--- a/UpdateManager/GtkProgress.py
+++ b/UpdateManager/GtkProgress.py
@@ -27,14 +27,17 @@ import apt_pkg
 from gettext import gettext as _
 
 class GtkOpProgress(apt.OpProgress):
-    def __init__(self, window, progressbar, status, parent):
+    def __init__(self, host_window, progressbar, status, parent):
         self._parent = parent
-        self._window = window
+        self._window = host_window
         self._status = status
         self._progressbar = progressbar
+        # Do not show the close button 
+        self._window.realize()
+        host_window.window.set_functions(gtk.gdk.FUNC_MOVE)
         #self._progressbar.set_pulse_step(0.01)
         #self._progressbar.pulse()
-        window.set_transient_for(parent)
+        self._window.set_transient_for(parent)
     def update(self, percent):
         #print percent
         #print self.Op
@@ -66,6 +69,8 @@ class GtkFetchProgress(apt.progress.FetchProgress):
         self.progress = parent.progressbar_fetch
         self.window_fetch = parent.window_fetch
         self.window_fetch.set_transient_for(parent.window_main)
+        self.window_fetch.realize()
+        self.window_fetch.window.set_functions(gtk.gdk.FUNC_MOVE)
         # set summary
         if self.summary != "":
             self.summary.set_markup("<big><b>%s</b></big> \n\n%s" %
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 3724de94..b87fb498 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -213,7 +213,13 @@ class UpdateList:
 class UpdateManager(SimpleGladeApp):
 
   def __init__(self, datadir):
- 
+    icons = gtk.icon_theme_get_default()
+    try:
+        logo=icons.load_icon("update-manager", 48, 0)
+        gtk.window_set_default_icon_list(logo)
+    except:
+        pass
+
     self.datadir = datadir
     SimpleGladeApp.__init__(self, datadir+"glade/UpdateManager.glade",
                             None, domain="update-manager")
@@ -232,7 +238,7 @@ class UpdateManager(SimpleGladeApp):
     self.expander_details.connect("notify::expanded", self.activate_details)
 
     # useful exit stuff
-    self.window_main.connect("delete_event", lambda w, ev: self.exit())
+    self.window_main.connect("delete_event", self.close)
     self.button_cancel.connect("clicked", lambda w: self.exit())
 
     # the treeview (move into it's own code!)
@@ -285,6 +291,13 @@ class UpdateManager(SimpleGladeApp):
     self.restore_state()
       
 
+  def close(self, widget, data=None):
+    if self.window_main.get_property("sensitive") is False:
+        return True
+    else:
+        self.exit()
+
+  
   def set_changes_buffer(self, changes_buffer, text, name, srcpkg):
     changes_buffer.set_text("")
     lines = text.split("\n")
@@ -549,6 +562,8 @@ class UpdateManager(SimpleGladeApp):
     win = gtk.Window()
     win.set_property("type-hint", gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
     win.set_title("")
+    win.realize()
+    win.window.set_functions(gtk.gdk.FUNC_MOVE)
     win.set_border_width(6)
     win.set_transient_for(self.window_main)
     win.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
@@ -556,9 +571,6 @@ class UpdateManager(SimpleGladeApp):
     win.set_property("skip-pager-hint", True)
     win.resize(400,200)
     win.set_resizable(False)
-    # prevent the window from closing with the delete button (there is
-    # a cancel button in the window)
-    win.connect("delete_event", lambda e,w: True);
     
     # create the socket
     socket = gtk.Socket()
@@ -578,7 +590,7 @@ class UpdateManager(SimpleGladeApp):
     while gtk.events_pending():
       gtk.main_iteration()
     self.fillstore()
-    self.window_main.set_sensitive(True)    
+    self.window_main.set_sensitive(True)
 
   def toggled(self, renderer, path_string):
     """ a toggle button in the listview was toggled """
diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade
index 0a39a13f..9df03955 100644
--- a/data/SoftwareProperties.glade
+++ b/data/SoftwareProperties.glade
@@ -42,6 +42,224 @@
 	  <property name="enable_popup">False</property>
 
 	  <child>
+	    <widget class="GtkFrame" id="frame2">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment2">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">6</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox3">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox2">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="checkbutton_auto_update">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">_Check for updates automatically:</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="opt_autoupdate_toggled" last_modification_time="Mon, 04 Jul 2005 23:22:04 GMT"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkComboBox" id="combobox_update_interval">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes"></property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			      <signal name="changed" handler="on_combobox_update_interval_changed" last_modification_time="Wed, 18 Jan 2006 09:43:34 GMT"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="checkbutton_auto_download">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Download updates in the backgound, but do not install them</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="on_opt_autodownload_toggled" last_modification_time="Wed, 01 Feb 2006 04:12:21 GMT"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="checkbutton_unattended">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Install new updates without confirmation</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="on_opt_unattended_toggled" last_modification_time="Wed, 01 Feb 2006 04:11:56 GMT"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox5">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="checkbutton_auto_delete">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">D_elete downloaded software files:</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			      <signal name="toggled" handler="on_opt_autodelete_toggled" last_modification_time="Wed, 01 Feb 2006 04:23:43 GMT"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkComboBox" id="combobox_delete_interval">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes"></property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			      <signal name="changed" handler="on_combobox_delete_interval_changed" last_modification_time="Wed, 01 Feb 2006 04:11:18 GMT"/>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label4">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Internet updates&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label8">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Internet Updates</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
 	    <widget class="GtkVBox" id="vbox2">
 	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
@@ -237,7 +455,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label3">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Sources&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Channels&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -263,113 +481,6 @@
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
-
-	      <child>
-		<widget class="GtkFrame" id="frame2">
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment2">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">6</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox3">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox2">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="checkbutton_auto_update">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Automatically check for updates:</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="opt_autoupdate_toggled" last_modification_time="Mon, 04 Jul 2005 23:22:04 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkComboBox" id="combobox_update_interval">
-				  <property name="visible">True</property>
-				  <property name="items" translatable="yes"></property>
-				  <property name="add_tearoffs">False</property>
-				  <property name="focus_on_click">True</property>
-				  <signal name="changed" handler="on_combobox_update_interval_changed" last_modification_time="Wed, 18 Jan 2006 09:43:34 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label4">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Internet updates&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="type">label_item</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade
index 2258e394..c39b94b0 100644
--- a/data/UpdateManager.glade
+++ b/data/UpdateManager.glade
@@ -1053,7 +1053,6 @@ Need to get the changes from the central server</property>
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">synaptic.xpm</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">True</property>
   <property name="skip_pager_hint">True</property>
diff --git a/help/C/figures/authentication-add.png b/help/C/figures/authentication-add.png
index 004b3fa1..cd3d189f 100644
--- a/help/C/figures/authentication-add.png
+++ b/help/C/figures/authentication-add.png
diff --git a/help/C/figures/authentication.png b/help/C/figures/authentication.png
index 07227a2e..8601ccd9 100644
--- a/help/C/figures/authentication.png
+++ b/help/C/figures/authentication.png
diff --git a/help/C/figures/download-progressbar.png b/help/C/figures/download-progressbar.png
index 9f096460..0cef6d51 100644
--- a/help/C/figures/download-progressbar.png
+++ b/help/C/figures/download-progressbar.png
diff --git a/help/C/figures/failed-repos.png b/help/C/figures/failed-repos.png
index 01b0d0e9..68e688cc 100644
--- a/help/C/figures/failed-repos.png
+++ b/help/C/figures/failed-repos.png
diff --git a/help/C/figures/install-progress-terminal.png b/help/C/figures/install-progress-terminal.png
index 06111c61..6f21faf8 100644
--- a/help/C/figures/install-progress-terminal.png
+++ b/help/C/figures/install-progress-terminal.png
diff --git a/help/C/figures/install-progress.png b/help/C/figures/install-progress.png
index 699f6219..2ab7fa51 100644
--- a/help/C/figures/install-progress.png
+++ b/help/C/figures/install-progress.png
diff --git a/help/C/figures/main-system-updates-available.png b/help/C/figures/main-system-updates-available.png
index 24dc5481..f4d9f1e6 100644
--- a/help/C/figures/main-system-updates-available.png
+++ b/help/C/figures/main-system-updates-available.png
diff --git a/help/C/figures/main-system-updates-summary-details.png b/help/C/figures/main-system-updates-summary-details.png
index 08860ec1..2b635ce1 100644
--- a/help/C/figures/main-system-updates-summary-details.png
+++ b/help/C/figures/main-system-updates-summary-details.png
diff --git a/help/C/figures/main-system-updates-summary.png b/help/C/figures/main-system-updates-summary.png
index fefea5dd..8d9b0103 100644
--- a/help/C/figures/main-system-updates-summary.png
+++ b/help/C/figures/main-system-updates-summary.png
diff --git a/help/C/figures/main-system-uptodate.png b/help/C/figures/main-system-uptodate.png
index d8c10d5f..60394d06 100644
--- a/help/C/figures/main-system-uptodate.png
+++ b/help/C/figures/main-system-uptodate.png
diff --git a/help/C/figures/main-view-monitor-update.png b/help/C/figures/main-view-monitor-update.png
index b8b2a80b..308a81ca 100644
--- a/help/C/figures/main-view-monitor-update.png
+++ b/help/C/figures/main-view-monitor-update.png
diff --git a/help/C/figures/main-view-update-detail.png b/help/C/figures/main-view-update-detail.png
index d3f8f12c..4e05e272 100644
--- a/help/C/figures/main-view-update-detail.png
+++ b/help/C/figures/main-view-update-detail.png
diff --git a/help/C/figures/preferences-add-custom.png b/help/C/figures/preferences-add-custom.png
index 97e709f6..1c7b5a89 100644
--- a/help/C/figures/preferences-add-custom.png
+++ b/help/C/figures/preferences-add-custom.png
diff --git a/help/C/figures/preferences-add.png b/help/C/figures/preferences-add.png
index e77f7523..1f2cad19 100644
--- a/help/C/figures/preferences-add.png
+++ b/help/C/figures/preferences-add.png
diff --git a/help/C/figures/preferences-edit.png b/help/C/figures/preferences-edit.png
index 5d713264..e3bc0d2b 100644
--- a/help/C/figures/preferences-edit.png
+++ b/help/C/figures/preferences-edit.png
diff --git a/help/C/figures/preferences-repos-changeinfo.png b/help/C/figures/preferences-repos-changeinfo.png
index e1fbbd9e..b012afe0 100644
--- a/help/C/figures/preferences-repos-changeinfo.png
+++ b/help/C/figures/preferences-repos-changeinfo.png
diff --git a/help/C/figures/preferences.png b/help/C/figures/preferences.png
index e59f2c29..eac98df9 100644
--- a/help/C/figures/preferences.png
+++ b/help/C/figures/preferences.png
diff --git a/help/C/figures/reload-package-info.png b/help/C/figures/reload-package-info.png
index 76156b2e..f7ca3d93 100644
--- a/help/C/figures/reload-package-info.png
+++ b/help/C/figures/reload-package-info.png
diff --git a/help/C/figures/settings.png b/help/C/figures/settings.png
index 2084c2ef..33bb325a 100644
--- a/help/C/figures/settings.png
+++ b/help/C/figures/settings.png
diff --git a/help/C/figures/synaptic-toggle-install-view.png b/help/C/figures/synaptic-toggle-install-view.png
index be04d24e..c9de71be 100644
--- a/help/C/figures/synaptic-toggle-install-view.png
+++ b/help/C/figures/synaptic-toggle-install-view.png