From 41a6ea707688e2e239ee75212888d01c219f39b1 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Wed, 25 Jan 2006 14:32:38 +0100
Subject: SoftwareProperties:  * Allow a custom configuration for automatic
 internet udpates  * Wording: "Choose a key-file" -> "Import key" (Import is
 the label on the    button)  * use the update-manager icon in the window list

UpdateManager:
 * set window_main to unsensitive at the startup
 * Wording in the synaptic dialog:
   - "The updates are being applied."
       -> "Please wait, this can take some time."
   - "Upgrade is complete" -> "Update is complete"
 * set synapitc dialog to type-hint "dialog" and not "normal"
 * set the main_window to type-hint "dialog" and not "normal"
 * do not write a status message to treeview_updates during startup
   "Initializing and getting list of updates..."
 * Nicer wording in the dialog_manual_update:
   "You need to manually reload the latest information about updates"
   "Your system does not check for updates automatically. You can configure
   this behavior in "System" -> "Administration" -> "Software Properties"
---
 data/SoftwareProperties.glade | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'data/SoftwareProperties.glade')

diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade
index 6bf1aa0f..edd12320 100644
--- a/data/SoftwareProperties.glade
+++ b/data/SoftwareProperties.glade
@@ -14,6 +14,7 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon">update-manager.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -317,11 +318,7 @@
 			      <child>
 				<widget class="GtkComboBox" id="combobox_update_interval">
 				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">daily
-every two days
-weekly
-every two weeks
-custom</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"/>
-- 
cgit v1.2.3


From 79bbe42e52af6ddd5d680d118ac09a50dafc9b78 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Thu, 26 Jan 2006 19:54:10 +0100
Subject: * Do not use header capitalization in the combo box. The  HIG says
 sentence capitalization

* Add a ":" to the checkbox for automatic updates. the sentence does not include the combo box
---
 SoftwareProperties/SoftwareProperties.py | 6 +++---
 data/SoftwareProperties.glade            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'data/SoftwareProperties.glade')

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index edcd407d..961c4fdd 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -92,13 +92,13 @@ 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("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("Every two weeks")
 
     # If a custom period is defined add an corresponding entry
     if not update_days in self.combobox_interval_mapping.values():
-        self.combobox_update_interval.append_text(_("Every %s Days" 
+        self.combobox_update_interval.append_text(_("Every %s days" 
                                                   % update_days))
         self.combobox_interval_mapping[4] = update_days
     
diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade
index edd12320..0a39a13f 100644
--- a/data/SoftwareProperties.glade
+++ b/data/SoftwareProperties.glade
@@ -299,7 +299,7 @@
 				<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="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>
-- 
cgit v1.2.3