File gnome-packagekit.0.3.9_to_git-2008_11_07.patch of Package gnome-packagekit

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-packagekit.0.3.9_to_git-2008_11_07.patch of Package gnome-packagekit (Revision 9cd7e89c346e2436bf8093384852f3a5)

Currently displaying revision 9cd7e89c346e2436bf8093384852f3a5 , Show latest

diff --git a/configure.ac b/configure.ac
index b50f2af..6c412b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,14 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(GIO, gio-2.0)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
+CPPFLAGS=$GIO_CFLAGS
+LIBS=$GIO_LIBS
+AC_CHECK_FUNCS(g_file_make_directory_with_parents)
+
 PKG_CHECK_MODULES(DBUS, \
 dbus-glib-1 >= $DBUS_GLIB_REQUIRED \
 dbus-1 >= $DBUS_REQUIRED \
diff --git a/data/gnome-packagekit.schemas.in b/data/gnome-packagekit.schemas.in
index dbed08f..8fa6ee0 100644
--- a/data/gnome-packagekit.schemas.in
+++ b/data/gnome-packagekit.schemas.in
@@ -14,18 +14,6 @@
 </schema>
 
 <schema>
- <key>/schemas/apps/gnome-packagekit/skip_confirm_no_deps</key>
- <applyto>/apps/gnome-packagekit/skip_confirm_no_deps</applyto>
- <owner>gnome-packagekit</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Skip the confirm dialog if there are no dependencies</short>
- <long>Skip the confirm dialog when installing and removing packages if there are no dependencies</long>
- </locale>
- </schema>
-
- <schema>
 <key>/schemas/apps/gnome-packagekit/banned_firmware</key>
 <applyto>/apps/gnome-packagekit/banned_firmware</applyto>
 <owner>gnome-packagekit</owner>
@@ -33,7 +21,7 @@
 <default></default>
 <locale name="C">
 <short>Firmware files that should not be searched for</short>
- <long>Firmware files that should not be searched for, separated by comma</long>
+ <long>Firmware files that should not be searched for, separated by commas</long>
 </locale>
 </schema>
 
@@ -62,14 +50,26 @@
 </schema>
 
 <schema>
+ <key>/schemas/apps/gnome-packagekit/show_copy_confirm</key>
+ <applyto>/apps/gnome-packagekit/show_copy_confirm</applyto>
+ <owner>gnome-packagekit</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Ask the user if files should be copied to a non-private directory</short>
+ <long>Ask the user if files should be copied to a non-private directory when installing from a FUSE mount</long>
+ </locale>
+ </schema>
+
+ <schema>
 <key>/schemas/apps/gnome-packagekit/notify_update_failed</key>
 <applyto>/apps/gnome-packagekit/notify_update_failed</applyto>
 <owner>gnome-packagekit</owner>
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when we have failed an update</short>
- <long>Notify the user when we have failed an update</long>
+ <short>Notify the user when an update has failed</short>
+ <long>Notify the user when an update has failed</long>
 </locale>
 </schema>
 
@@ -80,8 +80,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when we have completed an update</short>
- <long>Notify the user when we have completed an update</long>
+ <short>Notify the user for completed updates</short>
+ <long>Notify the user for completed updates</long>
 </locale>
 </schema>
 
@@ -92,8 +92,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when we have completed an update and need to restart</short>
- <long>Notify the user when we have completed an update and need to restart</long>
+ <short>Notify the user for completed updates where the user needs to restart</short>
+ <long>Notify the user for completed updates where the user needs to restart</long>
 </locale>
 </schema>
 
@@ -104,8 +104,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when we have not started an auto-update on battery</short>
- <long>Notify the user when we have not started an auto-update on battery</long>
+ <short>Notify the user when the automatic update was not started on battery power</short>
+ <long>Notify the user when the update was not automatically started while running on battery power</long>
 </locale>
 </schema>
 
@@ -116,8 +116,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when we have started an update</short>
- <long>Notify the user when we have started an update</long>
+ <short>Notify the user when the update was started</short>
+ <long>Notify the user when the update was started</long>
 </locale>
 </schema>
 
@@ -128,8 +128,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when we have messages</short>
- <long>Notify the user when we have messages</long>
+ <short>Notify the user when there are messages</short>
+ <long>Notify the user when there are messages</long>
 </locale>
 </schema>
 
@@ -140,8 +140,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when we have errors</short>
- <long>Notify the user when we have errors</long>
+ <short>Notify the user when there are errors</short>
+ <long>Notify the user when there are errors</long>
 </locale>
 </schema>
 
@@ -152,8 +152,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>Notify the user when the task is complete</short>
- <long>Notify the user when the task is complete</long>
+ <short>Notify the user when a task is complete</short>
+ <long>Notify the user when a task is complete</long>
 </locale>
 </schema>
 
@@ -200,8 +200,8 @@
 <type>bool</type>
 <default>false</default>
 <locale name="C">
- <short>If autocompletion should be used when searching</short>
- <long>If autocompletion should be used when searching</long>
+ <short>If search terms should be completed automatically</short>
+ <long>If search terms should be completed automatically</long>
 </locale>
 </schema>
 
@@ -212,8 +212,8 @@
 <type>int</type>
 <default>300</default>
 <locale name="C">
- <short>The number of seconds at session startup to wait before we check for updates</short>
- <long>The number of seconds at session startup to wait before we check for updates</long>
+ <short>The number of seconds at session startup to wait before checking for updates</short>
+ <long>The number of seconds at session startup to wait before checking for updates</long>
 </locale>
 </schema>
 
@@ -224,9 +224,9 @@
 <type>bool</type>
 <default>false</default>
 <locale name="C">
- <short>If we should get the update list when the session starts</short>
+ <short>Get the update list when the session starts</short>
 <long>
- If we should get the update list when the session starts, even if we are not scheduled to.
+ Get the update list when the session starts, even if not scheduled to.
 This ensures the user has up to date and valid data in the tray at startup.
 </long>
 </locale>
@@ -239,8 +239,8 @@
 <type>string</type>
 <default>daily</default>
 <locale name="C">
- <short>How often we should check for updates</short>
- <long>How often we should check for updates. Options are "hourly", "daily", "weekly", "never"</long>
+ <short>How often to check for updates</short>
+ <long>How often to check for updates. Options are "hourly", "daily", "weekly", "never"</long>
 </locale>
 </schema>
 
@@ -251,8 +251,8 @@
 <type>string</type>
 <default>weekly</default>
 <locale name="C">
- <short>How often we should check for distribution upgrades</short>
- <long>How often we should check for distribution upgrades. Options are "daily", "weekly", "never"</long>
+ <short>How often to check for distribution upgrades</short>
+ <long>How often to check for distribution upgrades. Options are "daily", "weekly", "never"</long>
 </locale>
 </schema>
 
@@ -263,8 +263,8 @@
 <type>string</type>
 <default>daily</default>
 <locale name="C">
- <short>How often we should refresh the package cache</short>
- <long>How often we should refresh the package cache. Options are "daily", "weekly", "never"</long>
+ <short>How often to refresh the package cache</short>
+ <long>How often to refresh the package cache. Options are "daily", "weekly", "never"</long>
 </locale>
 </schema>
 
@@ -275,8 +275,8 @@
 <type>string</type>
 <default>none</default>
 <locale name="C">
- <short>Auto update these types of updates</short>
- <long>Auto update these types of updates. Options are "all", "security", or "none"</long>
+ <short>Automatically update these types of updates</short>
+ <long>Automatically update these types of updates. Options are "all", "security", or "none"</long>
 </locale>
 </schema>
 
@@ -287,8 +287,8 @@
 <type>bool</type>
 <default>false</default>
 <locale name="C">
- <short>If we should install updates automatically when on battery power</short>
- <long>If we should install updates automatically when on battery power</long>
+ <short>Install updates automatically when running on battery power</short>
+ <long>Install updates automatically when running on battery power</long>
 </locale>
 </schema>
 
@@ -299,8 +299,8 @@
 <type>bool</type>
 <default>false</default>
 <locale name="C">
- <short>If we should filter using basename in gpk-application</short>
- <long>If we should filter package lists using basename in gpk-application</long>
+ <short>Filter using basename in gpk-application</short>
+ <long>Filter package lists using basename in gpk-application</long>
 </locale>
 </schema>
 
@@ -311,8 +311,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>If we should filter using newest in gpk-application</short>
- <long>If we should filter package lists using newest in gpk-application</long>
+ <short>Only show the newest packages in the file lists</short>
+ <long>Only show the newest packages in the file lists</long>
 </locale>
 </schema>
 
@@ -323,8 +323,8 @@
 <type>bool</type>
 <default>false</default>
 <locale name="C">
- <short>If we should show the category group menu</short>
- <long>If we should show the category group menu. This is more complete and custom to the distribution, but takes longer to populate</long>
+ <short>Show the category group menu</short>
+ <long>Show the category group menu. This is more complete and custom to the distribution, but takes longer to populate</long>
 </locale>
 </schema>
 
@@ -335,8 +335,8 @@
 <type>bool</type>
 <default>false</default>
 <locale name="C">
- <short>If we should show all repositories in the software source viewer</short>
- <long>If we should show all repositories in the software source viewer</long>
+ <short>Show all repositories in the software source viewer</short>
+ <long>Show all repositories in the software source viewer</long>
 </locale>
 </schema>
 
@@ -347,8 +347,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>If we should precache all update details in the update viewer</short>
- <long>If we should precache all update details in the update viewer</long>
+ <short>Precache all update details in the update viewer</short>
+ <long>Precache all update details in the update viewer</long>
 </locale>
 </schema>
 
@@ -359,8 +359,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>If we should allow applications to invoke the font installer</short>
- <long>If we should allow applications to invoke the font installer</long>
+ <short>Allow applications to invoke the font installer</short>
+ <long>Allow applications to invoke the font installer</long>
 </locale>
 </schema>
 
@@ -371,8 +371,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>If we should allow applications to invoke the codec installer</short>
- <long>If we should allow applications to invoke the codec installer</long>
+ <short>Allow applications to invoke the codec installer</short>
+ <long>Allow applications to invoke the codec installer</long>
 </locale>
 </schema>
 
@@ -383,8 +383,8 @@
 <type>bool</type>
 <default>true</default>
 <locale name="C">
- <short>If we should allow applications to invoke the mime type installer</short>
- <long>If we should allow applications to invoke the mime type installer</long>
+ <short>Allow applications to invoke the mime type installer</short>
+ <long>Allow applications to invoke the mime type installer</long>
 </locale>
 </schema>
 
diff --git a/data/gpk-application.desktop.in b/data/gpk-application.desktop.in
index 2e84616..0d3497f 100644
--- a/data/gpk-application.desktop.in
+++ b/data/gpk-application.desktop.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 _Name=Add/Remove Software
 _GenericName=Add/Remove Software
-_Comment=Change the software installed on the system
+_Comment=Add or remove software installed on the system
 Icon=system-software-install
 Exec=gpk-application
 Terminal=false
diff --git a/data/gpk-application.glade b/data/gpk-application.glade
index 78175df..7c67c4c 100644
--- a/data/gpk-application.glade
+++ b/data/gpk-application.glade
@@ -50,32 +50,18 @@
 </child>
 </widget>
 </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="menuitem_view">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_View</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menu10">
- <property name="visible">True</property>
 <child>
- <widget class="GtkCheckMenuItem" id="menuitem_group_type">
+ <widget class="GtkImageMenuItem" id="menuitem_quit">
 <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use the complicated group selector</property>
- <property name="label" translatable="yes">Use category group list</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkCheckMenuItem" id="menuitem_autocomplete">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use the system package list to autocomplete package selections</property>
- <property name="label" translatable="yes">Use auto-completion</property>
+ <property name="label" translatable="yes">_Quit</property>
 <property name="use_underline">True</property>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image10">
+ <property name="visible">True</property>
+ <property name="stock">gtk-quit</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
 </widget>
 </child>
 </widget>
@@ -493,9 +479,14 @@
 <widget class="GtkImageMenuItem" id="menuitem_help">
 <property name="visible">True</property>
 <property name="tooltip" translatable="yes">Help with this software</property>
- <property name="label">gtk-help</property>
+ <property name="label" translatable="yes">_Contents</property>
 <property name="use_underline">True</property>
- <property name="use_stock">True</property>
+ <child internal-child="image">
+ <widget class="GtkImage" id="menu-item-image11">
+ <property name="stock">gtk-help</property>
+ <property name="icon_size">1</property>
+ </widget>
+ </child>
 </widget>
 </child>
 <child>
diff --git a/data/gpk-backend-status.glade b/data/gpk-backend-status.glade
index f1b5817..5179f6e 100644
--- a/data/gpk-backend-status.glade
+++ b/data/gpk-backend-status.glade
@@ -35,22 +35,14 @@
 <property name="column_spacing">5</property>
 <property name="row_spacing">5</property>
 <child>
- <widget class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Backend name:</property>
- </widget>
- <packing>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label20">
+ <widget class="GtkLabel" id="label_author">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label" translatable="yes">Backend author:</property>
+ <property name="label">Richard Hughes</property>
 </widget>
 <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
@@ -71,20 +63,28 @@
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label_author">
+ <widget class="GtkLabel" id="label20">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">Richard Hughes</property>
+ <property name="label" translatable="yes">Backend author:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
+ <child>
+ <widget class="GtkLabel" id="label19">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Backend name:</property>
+ </widget>
+ <packing>
+ <property name="y_options"></property>
+ </packing>
+ </child>
 </widget>
 </child>
 </widget>
@@ -124,115 +124,109 @@
 <property name="column_spacing">5</property>
 <property name="row_spacing">5</property>
 <child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkLabel" id="label45">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">GetUpdates:</property>
+ <property name="label">Resolve:</property>
 </widget>
 <packing>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkImage" id="image_resolve">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">RefreshCache:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label17">
+ <widget class="GtkLabel" id="label37">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">UpdateSystem:</property>
+ <property name="label">Cancel </property>
 </widget>
 <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label25">
+ <widget class="GtkImage" id="image_cancel">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">SearchName:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkImage" id="image_search_file">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">SearchDetails:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkImage" id="image_search_group">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">SearchGroup:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
 <property name="top_attach">5</property>
 <property name="bottom_attach">6</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label28">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">SearchFile:</property>
- </widget>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_get_updates">
+ <widget class="GtkImage" id="image_search_details">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_refresh_cache">
+ <widget class="GtkImage" id="image_search_name">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
@@ -252,109 +246,115 @@
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_search_name">
+ <widget class="GtkImage" id="image_refresh_cache">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_search_details">
+ <widget class="GtkImage" id="image_get_updates">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_search_group">
+ <widget class="GtkLabel" id="label28">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">SearchFile:</property>
+ </widget>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">SearchGroup:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">5</property>
 <property name="bottom_attach">6</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_search_file">
+ <widget class="GtkLabel" id="label26">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">SearchDetails:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_cancel">
+ <widget class="GtkLabel" id="label25">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">SearchName:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label37">
+ <widget class="GtkLabel" id="label17">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">Cancel </property>
+ <property name="label">UpdateSystem:</property>
 </widget>
 <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_resolve">
+ <widget class="GtkLabel" id="label16">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">RefreshCache:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label45">
+ <widget class="GtkLabel" id="label15">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">Resolve:</property>
+ <property name="label">GetUpdates:</property>
 </widget>
 <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
@@ -369,116 +369,109 @@
 <property name="column_spacing">5</property>
 <property name="row_spacing">5</property>
 <child>
- <widget class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">UpdatePackage:</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label33">
+ <widget class="GtkImage" id="image_get_files">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">InstallPackage:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label32">
+ <widget class="GtkLabel" id="label49">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">RemovePackage:</property>
+ <property name="label">GetFiles:</property>
 </widget>
 <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkImage" id="image_file_install">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">GetDepends:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label30">
+ <widget class="GtkLabel" id="label44">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">GetRequires:</property>
+ <property name="label">InstallFile:</property>
 </widget>
 <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label31">
+ <widget class="GtkLabel" id="label38">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">GetUpdate Detail:</property>
+ <property name="label">GetDescription:</property>
 </widget>
 <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_package_update">
+ <widget class="GtkImage" id="image_get_description">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_package_install">
+ <widget class="GtkImage" id="image_get_update_detail">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_package_remove">
+ <widget class="GtkImage" id="image_get_requires">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
@@ -498,111 +491,118 @@
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_get_requires">
+ <widget class="GtkImage" id="image_package_remove">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_get_update_detail">
+ <widget class="GtkImage" id="image_package_install">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_get_description">
+ <widget class="GtkImage" id="image_package_update">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label38">
+ <widget class="GtkLabel" id="label31">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">GetDescription:</property>
+ <property name="label">GetUpdate Detail:</property>
 </widget>
 <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label44">
+ <widget class="GtkLabel" id="label30">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">InstallFile:</property>
+ <property name="label">GetRequires:</property>
 </widget>
 <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_file_install">
+ <widget class="GtkLabel" id="label29">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">GetDepends:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label49">
+ <widget class="GtkLabel" id="label32">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">GetFiles:</property>
+ <property name="label">RemovePackage:</property>
 </widget>
 <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_get_files">
+ <widget class="GtkLabel" id="label33">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">InstallPackage:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label34">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">UpdatePackage:</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 </widget>
@@ -618,67 +618,56 @@
 <property name="column_spacing">5</property>
 <property name="row_spacing">5</property>
 <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">GetPackages</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_get_packages">
+ <widget class="GtkImage" id="image_what_provides">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label46">
+ <widget class="GtkLabel" id="label2">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">GetRepositoryList:</property>
+ <property name="label">WhatProvides:</property>
 </widget>
 <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label47">
+ <widget class="GtkImage" id="image_get_repo_list">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">RepositoryEnable:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label48">
+ <widget class="GtkImage" id="image_repo_set_data">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">RepositorySetData:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
 <property name="top_attach">2</property>
 <property name="bottom_attach">3</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
@@ -696,58 +685,69 @@
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_repo_set_data">
+ <widget class="GtkLabel" id="label48">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">RepositorySetData:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">2</property>
 <property name="bottom_attach">3</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_get_repo_list">
+ <widget class="GtkLabel" id="label47">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">RepositoryEnable:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="label46">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">WhatProvides:</property>
+ <property name="label">GetRepositoryList:</property>
 </widget>
 <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_what_provides">
+ <widget class="GtkImage" id="image_get_packages">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">GetPackages</property>
+ </widget>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
 </widget>
 <packing>
 <property name="position">2</property>
@@ -794,99 +794,90 @@
 <property name="column_spacing">5</property>
 <property name="row_spacing">5</property>
 <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Newest:</property>
- </widget>
- <packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkImage" id="image_newest">
+ <widget class="GtkLabel" id="label7">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">7</property>
 <property name="right_attach">8</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label14">
+ <widget class="GtkLabel" id="label1">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">GUI:</property>
 </widget>
 <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_gui">
+ <widget class="GtkImage" id="image_supported">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label12">
+ <widget class="GtkImage" id="image_visible">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Installed:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="y_options"></property>
+ <property name="left_attach">5</property>
+ <property name="right_attach">6</property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_installed">
+ <widget class="GtkLabel" id="label5">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">Supported:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkLabel" id="label4">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">Development:</property>
+ <property name="label">Visible:</property>
 </widget>
 <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="left_attach">4</property>
+ <property name="right_attach">5</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_devel">
+ <widget class="GtkImage" id="image_free">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">3</property>
 <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
@@ -906,91 +897,100 @@
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_free">
+ <widget class="GtkImage" id="image_devel">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">3</property>
 <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="label13">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">Visible:</property>
+ <property name="label">Development:</property>
 </widget>
 <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkImage" id="image_installed">
 <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">Supported:</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="left_attach">4</property>
- <property name="right_attach">5</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_visible">
+ <widget class="GtkLabel" id="label12">
 <property name="visible">True</property>
- <property name="icon_name">gtk-dialog-error</property>
+ <property name="xalign">0</property>
+ <property name="label">Installed:</property>
 </widget>
 <packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkImage" id="image_supported">
+ <widget class="GtkImage" id="image_gui">
 <property name="visible">True</property>
 <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
- <property name="left_attach">5</property>
- <property name="right_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkLabel" id="label14">
 <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">GUI:</property>
 </widget>
 <packing>
- <property name="left_attach">6</property>
- <property name="right_attach">7</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label7">
+ <widget class="GtkImage" id="image_newest">
 <property name="visible">True</property>
+ <property name="icon_name">gtk-dialog-error</property>
 </widget>
 <packing>
 <property name="left_attach">7</property>
 <property name="right_attach">8</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">Newest:</property>
+ </widget>
+ <packing>
+ <property name="left_attach">6</property>
+ <property name="right_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
 </packing>
 </child>
 </widget>
diff --git a/data/gpk-eula.glade b/data/gpk-eula.glade
index 57143fe..a927218 100644
--- a/data/gpk-eula.glade
+++ b/data/gpk-eula.glade
@@ -22,6 +22,46 @@
 <property name="column_spacing">9</property>
 <property name="row_spacing">12</property>
 <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTextView" id="textview_details">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">GTK_WRAP_WORD</property>
+ <property name="cursor_visible">False</property>
+ <property name="accepts_tab">False</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon_size">6</property>
+ </widget>
+ </child>
+ <child>
 <widget class="GtkVBox" id="vbox3">
 <property name="visible">True</property>
 <property name="spacing">12</property>
@@ -61,46 +101,6 @@
 <property name="right_attach">2</property>
 </packing>
 </child>
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">6</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="textview_details">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">GTK_WRAP_WORD</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
 </widget>
 <packing>
 <property name="expand">False</property>
diff --git a/data/gpk-log.glade b/data/gpk-log.glade
index b2696f1..2316698 100644
--- a/data/gpk-log.glade
+++ b/data/gpk-log.glade
@@ -90,7 +90,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-refresh</property>
+ <property name="label">gtk-refresh</property>
 <property name="use_stock">True</property>
 <property name="response_id">0</property>
 </widget>
diff --git a/data/gpk-prefs.glade b/data/gpk-prefs.glade
index 094a76e..df8c7aa 100644
--- a/data/gpk-prefs.glade
+++ b/data/gpk-prefs.glade
@@ -47,30 +47,41 @@
 <property name="column_spacing">20</property>
 <property name="row_spacing">5</property>
 <child>
- <widget class="GtkComboBox" id="combobox_upgrade">
+ <widget class="GtkComboBox" id="combobox_check">
 <property name="visible">True</property>
 <property name="items"></property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label_upgrade">
+ <widget class="GtkComboBox" id="combobox_install">
+ <property name="visible">True</property>
+ <property name="items"></property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label_install">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label" translatable="yes">Check for major _upgrades:</property>
+ <property name="label" translatable="yes">_Automatically install:</property>
 <property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_check</property>
+ <property name="mnemonic_widget">combobox_install</property>
 </widget>
 <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
@@ -89,41 +100,30 @@
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label_install">
+ <widget class="GtkLabel" id="label_upgrade">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label" translatable="yes">_Automatically install:</property>
+ <property name="label" translatable="yes">Check for major _upgrades:</property>
 <property name="use_underline">True</property>
- <property name="mnemonic_widget">combobox_install</property>
+ <property name="mnemonic_widget">combobox_check</property>
 </widget>
 <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options"></property>
 </packing>
 </child>
 <child>
- <widget class="GtkComboBox" id="combobox_install">
- <property name="visible">True</property>
- <property name="items"></property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="combobox_check">
+ <widget class="GtkComboBox" id="combobox_upgrade">
 <property name="visible">True</property>
 <property name="items"></property>
 </widget>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
 <property name="x_options">GTK_FILL</property>
 <property name="y_options">GTK_FILL</property>
 </packing>
diff --git a/data/gpk-service-pack.glade b/data/gpk-service-pack.glade
index 949a107..6e4c5f3 100644
--- a/data/gpk-service-pack.glade
+++ b/data/gpk-service-pack.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-
+
 <glade-interface>
 <widget class="GtkWindow" id="window_pack">
 <property name="title" translatable="yes">Service Pack Creator</property>
@@ -117,11 +117,11 @@
 <child>
 <widget class="GtkFileChooserButton" id="filechooserbutton_directory">
 <property name="visible">True</property>
- <property name="local_only">False</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 <property name="use_preview_label">False</property>
- <property name="do_overwrite_confirmation">True</property>
 <property name="preview_widget_active">False</property>
+ <property name="do_overwrite_confirmation">True</property>
+ <property name="local_only">False</property>
+ <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
 <property name="title" translatable="yes">Save New Service Pack</property>
 </widget>
 <packing>
@@ -134,9 +134,9 @@
 <child>
 <widget class="GtkFileChooserButton" id="filechooserbutton_exclude">
 <property name="visible">True</property>
- <property name="local_only">False</property>
- <property name="do_overwrite_confirmation">True</property>
 <property name="preview_widget_active">False</property>
+ <property name="do_overwrite_confirmation">True</property>
+ <property name="local_only">False</property>
 <property name="title" translatable="yes">Select A Package List File</property>
 </widget>
 <packing>
@@ -216,7 +216,6 @@
 <widget class="GtkProgressBar" id="progressbar_percentage">
 <property name="visible">True</property>
 <property name="show_text">True</property>
- <property name="text" translatable="yes"></property>
 </widget>
 </child>
 </widget>
@@ -247,7 +246,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-help</property>
+ <property name="label">gtk-help</property>
 <property name="use_stock">True</property>
 <property name="response_id">0</property>
 </widget>
@@ -274,7 +273,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
- <property name="label" translatable="yes">gtk-close</property>
+ <property name="label">gtk-close</property>
 <property name="use_stock">True</property>
 <property name="response_id">0</property>
 </widget>
diff --git a/data/gpk-update-viewer.glade b/data/gpk-update-viewer.glade
index 4dc9382..295b511 100644
--- a/data/gpk-update-viewer.glade
+++ b/data/gpk-update-viewer.glade
@@ -104,19 +104,14 @@
 <property name="column_spacing">6</property>
 <property name="row_spacing">6</property>
 <child>
- <widget class="GtkLabel" id="label_last_refresh_title">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Last refresh:</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label_last_update_title">
+ <widget class="GtkLabel" id="label_last_update">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label" translatable="yes">Last update:</property>
+ <property name="label">Unknown....</property>
 </widget>
 <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
 </packing>
@@ -133,18 +128,23 @@
 </packing>
 </child>
 <child>
- <widget class="GtkLabel" id="label_last_update">
+ <widget class="GtkLabel" id="label_last_update_title">
 <property name="visible">True</property>
 <property name="xalign">0</property>
- <property name="label">Unknown....</property>
+ <property name="label" translatable="yes">Last update:</property>
 </widget>
 <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
 </packing>
 </child>
+ <child>
+ <widget class="GtkLabel" id="label_last_refresh_title">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Last refresh:</property>
+ </widget>
+ </child>
 </widget>
 <packing>
 <property name="expand">False</property>
diff --git a/src/egg-console-kit.c b/src/egg-console-kit.c
index 0077d60..f3fc9cf 100644
--- a/src/egg-console-kit.c
+++ b/src/egg-console-kit.c
@@ -70,12 +70,17 @@ G_DEFINE_TYPE (EggConsoleKit, egg_console_kit, G_TYPE_OBJECT)
 gboolean
 egg_console_kit_is_local (EggConsoleKit *console)
 {
-	gboolean ret;
+	gboolean ret = FALSE;
 	gboolean value = FALSE;
 	GError *error = NULL;
 
 	g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE);
-	g_return_val_if_fail (console->priv->proxy_session != NULL, FALSE);
+
+	/* maybe console kit does not know about our session */
+	if (console->priv->proxy_session == NULL) {
+		egg_warning ("no ConsoleKit session");
+		goto out;
+	}
 
 	/* is our session local */
 	ret = dbus_g_proxy_call (console->priv->proxy_session, "IsLocal", &error, G_TYPE_INVALID,
@@ -105,7 +110,12 @@ egg_console_kit_is_active (EggConsoleKit *console)
 	GError *error = NULL;
 
 	g_return_val_if_fail (EGG_IS_CONSOLE_KIT (console), FALSE);
-	g_return_val_if_fail (console->priv->proxy_session != NULL, FALSE);
+
+	/* maybe console kit does not know about our session */
+	if (console->priv->proxy_session == NULL) {
+		egg_warning ("no ConsoleKit session");
+		goto out;
+	}
 
 	/* is our session active */
 	ret = dbus_g_proxy_call (console->priv->proxy_session, "IsActive", &error, G_TYPE_INVALID,
diff --git a/src/gpk-application-main.c b/src/gpk-application-main.c
index f8e7370..782f80c 100644
--- a/src/gpk-application-main.c
+++ b/src/gpk-application-main.c
@@ -73,8 +73,10 @@ main (int argc, char *argv[])
 
 	const GOptionEntry options[] = {
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
+		 /* TRANSLATORS: show the debug data on the console */
 		 _("Show extra debugging information"), NULL },
 		{ "version", '\0', 0, G_OPTION_ARG_NONE, &program_version,
+		 /* TRANSLATORS: show the program version */
 		 _("Show the program version and exit"), NULL },
 		{ NULL}
 	};
diff --git a/src/gpk-application.c b/src/gpk-application.c
index f0fba06..9accd2b 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -511,6 +511,7 @@ gpk_application_menu_files_cb (GtkAction *action, GpkApplication *application)
 
 	/* title */
 	id = pk_package_id_new_from_string (application->priv->package);
+	/* TRANSLATORS: title: how many files are installed by the application */
 	title = g_strdup_printf (ngettext ("%i file installed by %s",
 					 "%i files installed by %s",
 					 array->len), array->len, id->name);
@@ -689,7 +690,10 @@ gpk_application_menu_requires_cb (GtkAction *action, GpkApplication *application
 	list = pk_client_get_package_list (application->priv->client_files);
 	widget = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
 	if (pk_package_list_get_size (list) == 0) {
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("No packages"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: no packages returned */
+					_("No packages"),
+					/* TRANSLATORS: this package is not required by any others */
 					_("No other packages require this package"), NULL);
 	} else {
 		gchar *name;
@@ -700,10 +704,12 @@ gpk_application_menu_requires_cb (GtkAction *action, GpkApplication *application
 
 		length = pk_package_list_get_size (list);
 		name = gpk_dialog_package_id_name_join_locale (package_ids);
+		/* TRANSLATORS: title: how many packages require this package */
 		title = g_strdup_printf (ngettext ("%i additional package require %s",
 						 "%i additional packages require %s",
 						 length), length, name);
 
+		/* TRANSLATORS: show a list of packages for the package */
 		message = g_strdup_printf (ngettext ("Packages listed below require %s to function correctly.",
 						 "Packages listed below require %s to function correctly.",
 						 length), name);
@@ -761,7 +767,10 @@ gpk_application_menu_depends_cb (GtkAction *action, GpkApplication *application)
 	list = pk_client_get_package_list (application->priv->client_files);
 	widget = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
 	if (pk_package_list_get_size (list) == 0) {
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("No packages"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: no packages returned */
+					_("No packages"),
+					/* TRANSLATORS: this package does not depend on any others */
 					_("This package does not depends on any others"), NULL);
 	} else {
 		gchar *name;
@@ -772,10 +781,12 @@ gpk_application_menu_depends_cb (GtkAction *action, GpkApplication *application)
 
 		length = pk_package_list_get_size (list);
 		name = gpk_dialog_package_id_name_join_locale (package_ids);
+		/* TRANSLATORS: title: show the number of other packages we depend on */
 		title = g_strdup_printf (ngettext ("%i additional package is required for %s",
 						 "%i additional packages are required for %s",
 						 length), length, name);
 
+		/* TRANSLATORS: message: show the list of packages for this package */
 		message = g_strdup_printf (ngettext ("Packages listed below are required for %s to function correctly.",
 						 "Packages listed below are required for %s to function correctly.",
 						 length), name);
@@ -808,6 +819,7 @@ gpk_application_get_full_repo_name (GpkApplication *application, const gchar *da
 	/* if no data, we can't look up in the hash table */
 	if (egg_strzero (data)) {
 		egg_warning ("no ident data");
+		/* TRANSLATORS: the repo name is invalid or not found, fall back to this */
 		return _("Invalid");
 	}
 
@@ -963,6 +975,7 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 
 	/* if a collection, mark as such */
 	if (egg_strequal (details->id->data, "meta"))
+		/* TRANSLATORS: the type of package is a collection (metagroup) */
 		gpk_application_add_detail_item (application, _("Type"), _("Collection"), NULL);
 
 	/* homepage */
@@ -970,11 +983,12 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 	if (egg_strzero (details->url) == FALSE) {
 		gtk_widget_set_sensitive (widget, TRUE);
 
-		/* set the tooltip to where we are going */
+		/* TRANSLATORS: tooltip: go to the web address */
 		text = g_strdup_printf (_("Visit %s"), details->url);
 		gtk_widget_set_tooltip_text (widget, text);
 		g_free (text);
 
+		/* TRANSLATORS: add an entry to go to the project home page */
 		gpk_application_add_detail_item (application, _("Project"), _("Homepage"), details->url);
 
 		/* save the url for the button */
@@ -988,13 +1002,13 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 	/* group */
 	if (details->group != PK_GROUP_ENUM_UNKNOWN) {
 		group = gpk_group_enum_to_localised_text (details->group);
+		/* TRANSLATORS: the group the package belongs in */
 		gpk_application_add_detail_item (application, _("Group"), group, NULL);
 	}
 
 	/* group */
 	if (!egg_strzero (details->license)) {
-		/* This should be a licence enum value - bad API, bad.
-		 * license = pk_license_enum_to_text (license_enum); */
+		/* TRANSLATORS: the licence string for the package */
 		gpk_application_add_detail_item (application, _("License"), details->license, NULL);
 	}
 
@@ -1009,10 +1023,13 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 		/* set the size */
 		value = g_format_size_for_display (details->size);
 		if (egg_strequal (details->id->data, "meta"))
+			/* TRANSLATORS: the size of the meta package */
 			gpk_application_add_detail_item (application, _("Size"), value, NULL);
 		else if (installed)
+			/* TRANSLATORS: the installed size in bytes of the package */
 			gpk_application_add_detail_item (application, _("Installed size"), value, NULL);
 		else
+			/* TRANSLATORS: the download size of the package */
 			gpk_application_add_detail_item (application, _("Download size"), value, NULL);
 		g_free (value);
 	}
@@ -1021,6 +1038,7 @@ gpk_application_details_cb (PkClient *client, PkDetailsObj *details, GpkApplicat
 	if (!installed && !egg_strequal (details->id->data, "meta")) {
 		/* get the full name of the repo from the repo_id */
 		repo_name = gpk_application_get_full_repo_name (application, details->id->data);
+		/* TRANSLATORS: where the package came from, the software source name */
 		gpk_application_add_detail_item (application, _("Source"), repo_name, NULL);
 	}
 }
@@ -1170,6 +1188,7 @@ static void
 gpk_application_suggest_better_search (GpkApplication *application)
 {
 	const gchar *message = NULL;
+	/* TRANSLATORS: no results were found for this search */
 	const gchar *title = _("No results were found.");
 	GtkTreeIter iter;
 	gchar *text;
@@ -1177,13 +1196,15 @@ gpk_application_suggest_better_search (GpkApplication *application)
 
 	if (application->priv->search_mode == PK_MODE_GROUP ||
 	 application->priv->search_mode == PK_MODE_ALL_PACKAGES) {
-		/* this shouldn't happen */
+		/* TRANSLATORS: be helpful, but this shouldn't happen */
 		message = _("Try entering a package name in the search bar.");
 	} else {
 		if (application->priv->search_type == PK_SEARCH_NAME ||
 		 application->priv->search_type == PK_SEARCH_FILE)
+			/* TRANSLATORS: tell the user to switch to details search mode */
 			message = _("Try searching package descriptions by clicking the icon next to the search text.");
 		else
+			/* TRANSLATORS: tell the user to try harder */
 			message = _("Try again with a different search term.");
 	}
 
@@ -1286,7 +1307,10 @@ gpk_application_perform_search_name_details_file (GpkApplication *application)
 		egg_debug ("invalid input text, will fail");
 		/* TODO - make the dialog turn red... */
 		widget = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Invalid search text"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: invlid text in the search bar */
+					_("Invalid search text"),
+					/* TRANSLATORS: message: tell the user that's not allowed */
 					_("The search text contains invalid characters"), NULL);
 		return FALSE;
 	}
@@ -1320,7 +1344,10 @@ gpk_application_perform_search_name_details_file (GpkApplication *application)
 
 	if (!ret) {
 		widget = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("The search could not be completed"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: we failed to execute the mthod */
+					_("The search could not be completed"),
+					/* TRANSLATORS: low level failure, details to follow */
 					_("Running the transaction failed"), error->message);
 		g_error_free (error);
 		return FALSE;
@@ -1361,7 +1388,10 @@ gpk_application_perform_search_others (GpkApplication *application)
 
 	if (!ret) {
 		widget = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("The group could not be queried"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: could not get group data */
+					_("The group could not be queried"),
+					/* TRANSLATORS: low level failure */
 					_("Running the transaction failed"), error->message);
 		g_error_free (error);
 		return FALSE;
@@ -1434,10 +1464,13 @@ gpk_application_quit (GpkApplication *application)
 		widget = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
 		dialog = gtk_message_dialog_new (GTK_WINDOW (widget), GTK_DIALOG_MODAL,
 						 GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL,
+						 /* TRANSLATORS: title: warn the user they are quitting with unapplied changes */
 						 "%s", _("Changes not applied"));
 		gtk_dialog_add_button (GTK_DIALOG(dialog), _("Close Anyway"), GTK_RESPONSE_OK);
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog),
-							 "%s\n%s", _("You have made changes that have not yet been applied."),
+							 "%s\n%s",
+							 /* TRANSLATORS: tell the user the problem */
+							 _("You have made changes that have not yet been applied."),
 							 _("These changes will be lost if you close this window."));
 		gtk_window_set_icon_name (GTK_WINDOW(dialog), GPK_ICON_SOFTWARE_INSTALLER);
 		result = gtk_dialog_run (GTK_DIALOG(dialog));
@@ -1488,6 +1521,15 @@ gpk_application_delete_event_cb (GtkWidget	*widget,
 }
 
 /**
+ * gpk_application_menu_quit_cb:
+ **/
+static void
+gpk_application_menu_quit_cb (GtkAction *action, GpkApplication *application)
+{
+	gpk_application_quit (application);
+}
+
+/**
 * gpk_application_text_changed_cb:
 **/
 static gboolean
@@ -1690,6 +1732,8 @@ gpk_application_packages_add_columns (GpkApplication *application)
 	/* column for installed toggles */
 	renderer = gtk_cell_renderer_toggle_new ();
 	g_signal_connect (renderer, "toggled", G_CALLBACK (gpk_application_packages_installed_clicked_cb), application);
+
+	/* TRANSLATORS: column for installed status */
 	column = gtk_tree_view_column_new_with_attributes (_("Installed"), renderer,
 							 "active", PACKAGES_COLUMN_CHECKBOX,
 							 "visible", PACKAGES_COLUMN_CHECKBOX_ENABLE, NULL);
@@ -1705,6 +1749,7 @@ gpk_application_packages_add_columns (GpkApplication *application)
 
 	/* column for name */
 	renderer = gtk_cell_renderer_text_new ();
+	/* TRANSLATORS: column for package name */
 	column = gtk_tree_view_column_new_with_attributes (_("Name"), renderer,
 							 "markup", PACKAGES_COLUMN_TEXT, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, PACKAGES_COLUMN_TEXT);
@@ -1726,6 +1771,7 @@ gpk_application_groups_add_columns (GtkTreeView *treeview)
 
 	/* column for name */
 	renderer = gtk_cell_renderer_text_new ();
+	/* TRANSLATORS: column for group name */
 	column = gtk_tree_view_column_new_with_attributes (_("Name"), renderer,
 							 "text", GROUPS_COLUMN_NAME,
 							 "text", GROUPS_COLUMN_SUMMARY, NULL);
@@ -1974,6 +2020,7 @@ gpk_application_menu_search_by_name (GtkMenuItem *item, gpointer data)
 
 	/* set the new icon */
 	widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
+	/* TRANSLATORS: entry tooltip: basic search */
 	gtk_widget_set_tooltip_text (widget, _("Searching by name"));
 	icon = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
 	sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (widget), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon));
@@ -1995,6 +2042,7 @@ gpk_application_menu_search_by_description (GtkMenuItem *item, gpointer data)
 
 	/* set the new icon */
 	widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
+	/* TRANSLATORS: entry tooltip: detailed search */
 	gtk_widget_set_tooltip_text (widget, _("Searching by description"));
 	icon = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
 	sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (widget), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon));
@@ -2016,6 +2064,7 @@ gpk_application_menu_search_by_file (GtkMenuItem *item, gpointer data)
 
 	/* set the new icon */
 	widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
+	/* TRANSLATORS: entry tooltip: file search */
 	gtk_widget_set_tooltip_text (widget, _("Searching by file"));
 	icon = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
 	sexy_icon_entry_set_icon (SEXY_ICON_ENTRY (widget), SEXY_ICON_ENTRY_PRIMARY, GTK_IMAGE (icon));
@@ -2041,6 +2090,7 @@ gpk_application_entry_text_icon_pressed_cb (SexyIconEntry *entry, gint icon_pos,
 	egg_debug ("icon_pos=%i", icon_pos);
 
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_NAME)) {
+		/* TRANSLATORS: context menu item for the search type icon */
 		item = gtk_image_menu_item_new_with_mnemonic (_("Search by name"));
 		image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -2050,6 +2100,7 @@ gpk_application_entry_text_icon_pressed_cb (SexyIconEntry *entry, gint icon_pos,
 	}
 
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_DETAILS)) {
+		/* TRANSLATORS: context menu item for the search type icon */
 		item = gtk_image_menu_item_new_with_mnemonic (_("Search by description"));
 		image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -2059,6 +2110,7 @@ gpk_application_entry_text_icon_pressed_cb (SexyIconEntry *entry, gint icon_pos,
 	}
 
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_FILE)) {
+		/* TRANSLATORS: context menu item for the search type icon */
 		item = gtk_image_menu_item_new_with_mnemonic (_("Search by file name"));
 		image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -2113,6 +2165,7 @@ gpk_application_about_dialog_url_cb (GtkAboutDialog *about, const char *address,
 						 GTK_DIALOG_MODAL,
 						 GTK_MESSAGE_INFO,
 						 GTK_BUTTONS_OK,
+						 /* TRANSLATORS: packaging problem, failed to show link */
 						 _("Failed to show url"));
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog),
 							 "%s", error->message);
@@ -2166,6 +2219,7 @@ gpk_application_menu_about_cb (GtkAction *action, GpkApplication *application)
 		 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA\n"
 		 "02110-1301, USA.")
 	};
+	/* TRANSLATORS: put your own name here -- you deserve credit! */
 	const char *translators = _("translator-credits");
 	char	 *license_trans;
 
@@ -2193,6 +2247,7 @@ gpk_application_menu_about_cb (GtkAction *action, GpkApplication *application)
 			 "license", license_trans,
 			 "website-label", _("PackageKit Website"),
 			 "website", "http://www.packagekit.org",
+				/* TRANSLATORS: description of application, gpk-application that is */
 			 "comments", _("Package Manager for GNOME"),
 			 "authors", authors,
 			 "documenters", documenters,
@@ -2487,40 +2542,6 @@ gpk_application_menu_filter_newest_cb (GtkWidget *widget, GpkApplication *applic
 }
 
 /**
- * gpk_application_menu_group_type_cb:
- * @widget: The GtkWidget object
- **/
-static void
-gpk_application_menu_group_type_cb (GtkWidget *widget, GpkApplication *application)
-{
-	gboolean enabled;
-
-	g_return_if_fail (PK_IS_APPLICATION (application));
-
-	/* save users preference to gconf */
-	enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
-	gconf_client_set_bool (application->priv->gconf_client,
-			 GPK_CONF_APPLICATION_CATEGORY_GROUPS, enabled, NULL);
-}
-
-/**
- * gpk_application_menu_autocompletion_cb:
- * @widget: The GtkWidget object
- **/
-static void
-gpk_application_menu_autocompletion_cb (GtkWidget *widget, GpkApplication *application)
-{
-	gboolean enabled;
-
-	g_return_if_fail (PK_IS_APPLICATION (application));
-
-	/* save users preference to gconf */
-	enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
-	gconf_client_set_bool (application->priv->gconf_client,
-			 GPK_CONF_AUTOCOMPLETE, enabled, NULL);
-}
-
-/**
 * gpk_application_status_changed_cb:
 **/
 static void
@@ -2660,6 +2681,7 @@ gpk_application_treeview_add_columns_description (GpkApplication *application)
 	/* column for uris */
 	renderer = gpk_cell_renderer_uri_new ();
 	g_signal_connect (renderer, "clicked", G_CALLBACK (gpk_application_treeview_renderer_clicked), application);
+	/* TRANSLATORS: single column for the package details, not visible at the moment */
 	column = gtk_tree_view_column_new_with_attributes (_("Text"), renderer,
 							 "text", DETAIL_COLUMN_TEXT,
 							 "uri", DETAIL_COLUMN_URI, NULL);
@@ -2682,8 +2704,10 @@ gpk_application_add_welcome (GpkApplication *application)
 
 	/* enter something nice */
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_GROUP)) {
+		/* TRANSLATORS: welcome text if we can click the group list */
 		welcome = _("Enter a package name and then click find, or click a group to get started.");
 	} else {
+		/* TRANSLATORS: welcome text if we have to search by name */
 		welcome = _("Enter a package name and then click find to get started.");
 	}
 	gtk_list_store_set (application->priv->packages_store, &iter,
@@ -2715,7 +2739,9 @@ gpk_application_create_group_list_enum (GpkApplication *application)
 		gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
 		icon_name = gpk_role_enum_to_icon_name (PK_ROLE_ENUM_GET_PACKAGES);
 		gtk_tree_store_set (application->priv->groups_store, &iter,
+				 /* TRANSLATORS: title: all of the packages on the system and availble in sources */
 				 GROUPS_COLUMN_NAME, _("All packages"),
+				 /* TRANSLATORS: tooltip: all packages */
 				 GROUPS_COLUMN_SUMMARY, _("Show all packages"),
 				 GROUPS_COLUMN_ID, "all-packages",
 				 GROUPS_COLUMN_ACTIVE, TRUE,
@@ -2784,7 +2810,9 @@ gpk_application_categories_finished_cb (PkClient *client, PkExitEnum exit, guint
 		gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
 		icon_name = gpk_role_enum_to_icon_name (PK_ROLE_ENUM_GET_PACKAGES);
 		gtk_tree_store_set (application->priv->groups_store, &iter,
+				 /* TRANSLATORS: title: all of the packages on the system and availble in sources */
 				 GROUPS_COLUMN_NAME, _("All packages"),
+				 /* TRANSLATORS: tooltip: all packages */
 				 GROUPS_COLUMN_SUMMARY, _("Show all packages"),
 				 GROUPS_COLUMN_ID, "all-packages",
 				 GROUPS_COLUMN_ACTIVE, TRUE,
@@ -3083,6 +3111,7 @@ gpk_application_init (GpkApplication *application)
 	widget = glade_xml_get_widget (application->priv->glade_xml, "button_clear");
 	g_signal_connect (widget, "clicked",
 			 G_CALLBACK (gpk_application_button_clear_cb), application);
+	/* TRANSLATORS: tooltip on the clear button */
 	gtk_widget_set_tooltip_text (widget, _("Clear current selection"));
 
 	/* help */
@@ -3094,6 +3123,7 @@ gpk_application_init (GpkApplication *application)
 	widget = glade_xml_get_widget (application->priv->glade_xml, "button_apply");
 	g_signal_connect (widget, "clicked",
 			 G_CALLBACK (gpk_application_button_apply_cb), application);
+	/* TRANSLATORS: tooltip on the apply button */
 	gtk_widget_set_tooltip_text (widget, _("Changes are not applied instantly, this button applies all changes"));
 
 	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_about");
@@ -3115,7 +3145,8 @@ gpk_application_init (GpkApplication *application)
 	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_homepage");
 	g_signal_connect (widget, "activate",
 			 G_CALLBACK (gpk_application_menu_homepage_cb), application);
-	gtk_widget_set_tooltip_text (widget, _("Visit homepage for selected package"));
+	/* TRANSLATORS: tooltip on the homepage button */
+	gtk_widget_set_tooltip_text (widget, _("Visit home page for selected package"));
 
 	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_files");
 	g_signal_connect (widget, "activate",
@@ -3141,6 +3172,10 @@ gpk_application_init (GpkApplication *application)
 	g_signal_connect (widget, "activate",
 			 G_CALLBACK (gpk_application_menu_run_cb), application);
 
+	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_quit");
+	g_signal_connect (widget, "activate",
+			 G_CALLBACK (gpk_application_menu_quit_cb), application);
+
 	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_selection");
 	gtk_widget_hide (widget);
 
@@ -3220,16 +3255,6 @@ gpk_application_init (GpkApplication *application)
 	g_signal_connect (widget, "toggled",
 			 G_CALLBACK (gpk_application_menu_filter_newest_cb), application);
 
-	/* category menu / simple menu */
-	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_group_type");
-	g_signal_connect (widget, "toggled",
-			 G_CALLBACK (gpk_application_menu_group_type_cb), application);
-
-	/* autocompletion */
-	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_autocomplete");
-	g_signal_connect (widget, "toggled",
-			 G_CALLBACK (gpk_application_menu_autocompletion_cb), application);
-
 	/* Remove description/file list if needed. */
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_DETAILS) == FALSE) {
 		widget = glade_xml_get_widget (application->priv->glade_xml, "scrolledwindow2");
@@ -3270,12 +3295,14 @@ gpk_application_init (GpkApplication *application)
 	widget = glade_xml_get_widget (application->priv->glade_xml, "button_find");
 	g_signal_connect (widget, "clicked",
 			 G_CALLBACK (gpk_application_find_cb), application);
+	/* TRANSLATORS: tooltip on the find button */
 	gtk_widget_set_tooltip_text (widget, _("Find packages"));
 
 	/* search cancel button */
 	widget = glade_xml_get_widget (application->priv->glade_xml, "button_cancel");
 	g_signal_connect (widget, "clicked",
 			 G_CALLBACK (gpk_application_cancel_cb), application);
+	/* TRANSLATORS: tooltip on the cancel button */
 	gtk_widget_set_tooltip_text (widget, _("Cancel search"));
 
 	/* the fancy text entry widget */
@@ -3350,23 +3377,6 @@ gpk_application_init (GpkApplication *application)
 		gtk_widget_hide (widget);
 	}
 
-	/* Group type, set, or hide */
-	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_group_type");
-	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_CATEGORIES)) {
-		/* set from remembered state */
-		enabled = gconf_client_get_bool (application->priv->gconf_client,
-						 GPK_CONF_APPLICATION_CATEGORY_GROUPS, NULL);
-		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), enabled);
-	} else {
-		gtk_widget_hide (widget);
-	}
-
-	/* Set autocompletion */
-	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_autocomplete");
-	enabled = gconf_client_get_bool (application->priv->gconf_client,
-					 GPK_CONF_AUTOCOMPLETE, NULL);
-	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), enabled);
-
 	widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
 	g_signal_connect (widget, "key-press-event",
 			 G_CALLBACK (gpk_application_text_changed_cb), application);
@@ -3377,7 +3387,7 @@ gpk_application_init (GpkApplication *application)
 	gtk_widget_set_sensitive (widget, FALSE);
 
 	/* set a size, if the screen allows */
-	ret = gpk_window_set_size_request (GTK_WINDOW (main_window), 100000, 500);
+	ret = gpk_window_set_size_request (GTK_WINDOW (main_window), 1000, 500);
 
 	/* we are small form factor */
 	if (!ret) {
diff --git a/src/gpk-backend-status.c b/src/gpk-backend-status.c
index 0a0364b..2dc58eb 100644
--- a/src/gpk-backend-status.c
+++ b/src/gpk-backend-status.c
@@ -119,6 +119,7 @@ main (int argc, char *argv[])
 	/* general stuff */
 	retval = pk_control_get_backend_detail (control, &name, &author, NULL);
 	if (FALSE == retval) {
+		/* TRANSLATORS: backend is broken, and won't tell us what it supports */
 		egg_warning (_("Exiting as backend details could not be retrieved"));
 		return 1;
 	}
diff --git a/src/gpk-check-update.c b/src/gpk-check-update.c
index 7d6a22f..1bb8ad5 100644
--- a/src/gpk-check-update.c
+++ b/src/gpk-check-update.c
@@ -156,6 +156,7 @@ gpk_check_update_about_dialog_url_cb (GtkAboutDialog *about, const char *address
 						 GTK_DIALOG_MODAL,
 						 GTK_MESSAGE_INFO,
 						 GTK_BUTTONS_OK,
+						 /* TRANSLATORS: normally a packaging error, cannot launch link */
 						 _("Failed to show url"));
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (error_dialog),
 							 "%s", error->message);
@@ -213,6 +214,7 @@ gpk_check_update_show_about_cb (GtkMenuItem *item, gpointer data)
 			 "version", VERSION,
 			 "copyright", "Copyright \xc2\xa9 2007-2008 Richard Hughes",
 			 "license", license_trans,
+				/* TRANSLATORS: website label */
 			 "website-label", _("PackageKit Website"),
 			 "website", "www.packagekit.org",
 			 "comments", "PackageKit",
@@ -238,7 +240,7 @@ gpk_check_update_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint3
 
 	egg_debug ("icon right clicked");
 
-	/* Preferences */
+	/* TRANSLATORS: context menu to open the preferences */
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Preferences"));
 	image = gtk_image_new_from_icon_name (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -250,7 +252,7 @@ gpk_check_update_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint3
 	item = gtk_separator_menu_item_new ();
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-	/* No help yet */
+	/* TRANSLATORS: context menu to open the offline help file */
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Help"));
 	image = gtk_image_new_from_icon_name (GTK_STOCK_HELP, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -258,7 +260,7 @@ gpk_check_update_popup_menu_cb (GtkStatusIcon *status_icon, guint button, guint3
 			 G_CALLBACK (gpk_check_update_show_help_cb), icon);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-	/* About */
+	/* TRANSLATORS: context menu to show the about screen */
 	item = gtk_image_menu_item_new_with_mnemonic (_("_About"));
 	image = gtk_image_new_from_icon_name (GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -352,7 +354,7 @@ gpk_check_update_activate_update_cb (GtkStatusIcon *status_icon, GpkCheckUpdate
 
 	egg_debug ("icon left clicked");
 
-	/* show updates */
+	/* TRANSLATORS: context menu to execute the update viewer */
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Show Updates"));
 	image = gtk_image_new_from_icon_name (GPK_ICON_SOFTWARE_UPDATE, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -360,7 +362,7 @@ gpk_check_update_activate_update_cb (GtkStatusIcon *status_icon, GpkCheckUpdate
 			 G_CALLBACK (gpk_check_update_menuitem_show_updates_cb), icon);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
-	/* update system */
+	/* TRANSLATORS: context menu to update any pending updates */
 	item = gtk_image_menu_item_new_with_mnemonic (_("_Update System Now"));
 	image = gtk_image_new_from_icon_name (GPK_ICON_SOFTWARE_UPDATE_AVAILABLE, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -470,11 +472,12 @@ gpk_check_update_critical_updates_warning (GpkCheckUpdate *cupdate, const gchar
 		g_ptr_array_add (cupdate->priv->important_updates_array, g_strdup (package_id));
 	}
 
-	/* format title */
+	/* TRANSLATORS: title in the libnotify popup */
 	title = ngettext ("Security update available", "Security updates available", array->len);
 
 	/* format message text */
 	string = g_string_new ("");
+	/* TRANSLATORS: message when there are security updates */
 	g_string_append (string, ngettext ("The following important update is available for your computer:",
 					 "The following important updates are available for your computer:", array->len));
 	g_string_append (string, "\n\n");
@@ -496,10 +499,13 @@ gpk_check_update_critical_updates_warning (GpkCheckUpdate *cupdate, const gchar
 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL);
 	notify_notification_add_action (notification, "update-just-security",
-					_("Install security updates"), gpk_check_update_libnotify_cb, cupdate, NULL);
+					/* TRANSLATORS: button: only security updates */
+					_("Install only security updates"), gpk_check_update_libnotify_cb, cupdate, NULL);
 	notify_notification_add_action (notification, "update-all-packages",
+					/* TRANSLATORS: button: all pending updates */
 					_("Install all updates"), gpk_check_update_libnotify_cb, cupdate, NULL);
 	notify_notification_add_action (notification, "do-not-show-notify-critical",
+					/* TRANSLATORS: button: hide forever */
 					_("Do not show this again"), gpk_check_update_libnotify_cb, cupdate, NULL);
 	ret = notify_notification_show (notification, &error);
 	if (!ret) {
@@ -608,15 +614,18 @@ gpk_check_update_check_on_battery (GpkCheckUpdate *cupdate)
 		return FALSE;
 	}
 
-	/* do the bubble */
-	message = _("Automatic updates are not being installed as the computer is on battery power");
-	notification = notify_notification_new (_("Will not install updates"), message, "help-browser", NULL);
+	/* TRANSLATORS: policy says update, but we are on battery and so prompt */
+	message = _("Automatic updates are not being installed as the computer is running on battery power");
+	/* TRANSLATORS: informs user will not install by default */
+	notification = notify_notification_new (_("Updates not installed"), message, "help-browser", NULL);
 	notify_notification_set_timeout (notification, 15000);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
 	notify_notification_add_action (notification, "do-not-show-update-not-battery",
+					/* TRANSLATORS: hide this warning type forever */
 					_("Do not show this warning again"), gpk_check_update_libnotify_cb, cupdate, NULL);
 	notify_notification_add_action (notification, "update-all-packages",
-					_("Do the updates anyway"), gpk_check_update_libnotify_cb, cupdate, NULL);
+					/* TRANSLATORS: to hell with my battery life, just do it */
+					_("Install the updates anyway"), gpk_check_update_libnotify_cb, cupdate, NULL);
 	ret = notify_notification_show (notification, &error);
 	if (!ret) {
 		egg_warning ("error: %s", error->message);
@@ -731,6 +740,7 @@ gpk_check_update_query_updates (GpkCheckUpdate *cupdate)
 		/* don't have a huge notification that won't fit on the screen */
 		if (security_array->len > GPK_CHECK_UPDATE_MAX_NUMBER_SECURITY_ENTRIES) {
 			more = length - security_array->len;
+			/* TRANSLATORS: we have a notification that won't fit, so append on how many other we are not showing */
 			g_string_append_printf (status_security, ngettext ("and %d other security update",
 									 "and %d other security updates", more), more);
 			g_string_append (status_security, "...\n");
@@ -753,6 +763,7 @@ gpk_check_update_query_updates (GpkCheckUpdate *cupdate)
 	/* make tooltip */
 	if (status_security->len != 0)
 		g_string_set_size (status_security, status_security->len-1);
+	/* TRANSLATORS: tooltip: how many updates are waiting to be applied */
 	g_string_append_printf (status_tooltip, ngettext ("There is %d update pending",
 							 "There are %d updates pending", length), length);
 	gtk_status_icon_set_tooltip (GTK_STATUS_ICON (cupdate->priv->sicon), status_tooltip->str);
@@ -981,7 +992,7 @@ gpk_check_update_auto_get_upgrades_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
 	if (string->len != 0)
 		g_string_set_size (string, string->len-1);
 
-	/* do the bubble */
+	/* TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9 */
 	title = _("Distribution upgrades available");
 	notification = notify_notification_new (title, string->str, "help-browser", NULL);
 	if (notification == NULL) {
@@ -991,8 +1002,10 @@ gpk_check_update_auto_get_upgrades_cb (GpkAutoRefresh *arefresh, GpkCheckUpdate
 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
 	notify_notification_add_action (notification, "upgrade-info",
+					/* TRANSLATORS: provides more information about the upgrade */
 					_("More information"), gpk_check_update_libnotify_cb, cupdate, NULL);
 	notify_notification_add_action (notification, "do-not-show-upgrade-available",
+					/* TRANSLATORS: hides forever */
 					_("Do not show this again"), gpk_check_update_libnotify_cb, cupdate, NULL);
 	ret = notify_notification_show (notification, &error);
 	if (!ret) {
diff --git a/src/gpk-client-chooser.c b/src/gpk-client-chooser.c
index c98c5e9..9a67691 100644
--- a/src/gpk-client-chooser.c
+++ b/src/gpk-client-chooser.c
@@ -125,12 +125,14 @@ pk_treeview_add_general_columns (GtkTreeView *treeview)
 	/* image */
 	renderer = gtk_cell_renderer_pixbuf_new ();
 g_object_set (renderer, "stock-size", GTK_ICON_SIZE_DIALOG, NULL);
+	/* TRANSLATORS: column for the application icon */
 	column = gtk_tree_view_column_new_with_attributes (_("Icon"), renderer,
 							 "icon-name", GPK_CHOOSER_COLUMN_ICON, NULL);
 	gtk_tree_view_append_column (treeview, column);
 
 	/* column for text */
 	renderer = gtk_cell_renderer_text_new ();
+	/* TRANSLATORS: column for the application name */
 	column = gtk_tree_view_column_new_with_attributes (_("Package"), renderer,
 							 "markup", GPK_CHOOSER_COLUMN_TEXT, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, GPK_CHOOSER_COLUMN_TEXT);
@@ -149,6 +151,7 @@ gpk_update_viewer_setup_policykit (void)
 	PolKitAction *pk_action;
 	pk_action = polkit_action_new ();
 	polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.package-install");
+	/* TRANSLATORS: button label, install the selected package */
 	button_action = polkit_gnome_action_new_default ("install", pk_action, _("_Install"), NULL);
 	g_object_set (button_action,
 		 "no-icon-name", GTK_STOCK_FLOPPY,
diff --git a/src/gpk-client-dialog.c b/src/gpk-client-dialog.c
index 415062b..1dce319 100644
--- a/src/gpk-client-dialog.c
+++ b/src/gpk-client-dialog.c
@@ -659,6 +659,7 @@ gpk_dialog_treeview_for_package_list (GpkClientDialog *dialog)
 
 	/* column for name */
 	renderer = gtk_cell_renderer_text_new ();
+	/* TRANSLATORS: column for the package name */
 	column = gtk_tree_view_column_new_with_attributes (_("Name"), renderer,
 							 "markup", GPK_CLIENT_DIALOG_STORE_TEXT, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, GPK_CLIENT_DIALOG_STORE_TEXT);
@@ -876,7 +877,7 @@ gpk_client_dialog_test (EggTest *test)
 	gpk_client_dialog_set_title (dialog, "Button press test with a really really long title");
 	gpk_client_dialog_set_message (dialog, "Please press Uninstall\n\nThis is a really really, really,\nreally long title with formatting");
 	gpk_client_dialog_set_image (dialog, "dialog-information");
-	gpk_client_dialog_set_action (dialog, _("Uninstall"));
+	gpk_client_dialog_set_action (dialog, "Uninstall");
 	gpk_client_dialog_show_page (dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, 0, 0);
 	button = gpk_client_dialog_run (dialog);
 	if (button == GTK_RESPONSE_OK)
@@ -924,7 +925,7 @@ gpk_client_dialog_test (EggTest *test)
 	gpk_client_dialog_set_title (dialog, "Button press test");
 	gpk_client_dialog_set_message (dialog, "Please press Install if you can see the package list");
 	gpk_client_dialog_set_image (dialog, "dialog-information");
-	gpk_client_dialog_set_action (dialog, _("Install"));
+	gpk_client_dialog_set_action (dialog, "Install");
 	gpk_client_dialog_show_page (dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, GPK_CLIENT_DIALOG_PACKAGE_LIST, 0);
 	button = gpk_client_dialog_run (dialog);
 	if (button == GTK_RESPONSE_OK)
diff --git a/src/gpk-client-eula.c b/src/gpk-client-eula.c
index 74f76d8..a258aea 100644
--- a/src/gpk-client-eula.c
+++ b/src/gpk-client-eula.c
@@ -112,9 +112,8 @@ gpk_client_eula_show (GtkWindow *window, const gchar *eula_id, const gchar *pack
 
 	/* make modal if window set */
 	widget = glade_xml_get_widget (glade_xml, "window_eula");
-	if (window != NULL) {
+	if (window != NULL)
 		gtk_window_set_transient_for (GTK_WINDOW (widget), window);
-	}
 
 	/* show window */
 	gtk_widget_show (widget);
@@ -124,9 +123,8 @@ gpk_client_eula_show (GtkWindow *window, const gchar *eula_id, const gchar *pack
 	gtk_main ();
 
 	/* hide window */
-	if (GTK_IS_WIDGET (widget)) {
+	if (GTK_IS_WIDGET (widget))
 		gtk_widget_hide (widget);
-	}
 	g_object_unref (glade_xml);
 	g_object_unref (buffer);
 
diff --git a/src/gpk-client-run.c b/src/gpk-client-run.c
index ee6a582..8ec7398 100644
--- a/src/gpk-client-run.c
+++ b/src/gpk-client-run.c
@@ -132,6 +132,7 @@ gpk_update_viewer_create_custom_widget (GladeXML *xml, gchar *func_name, gchar *
 				 gint int1, gint int2, gpointer user_data)
 {
 	if (egg_strequal (name, "button_action"))
+		/* TRANSLATORS: button: execute the application */
 		return gtk_button_new_with_mnemonic (_("_Run"));
 	egg_warning ("name unknown=%s", name);
 	return NULL;
@@ -149,12 +150,14 @@ pk_treeview_add_general_columns (GtkTreeView *treeview)
 	/* image */
 	renderer = gtk_cell_renderer_pixbuf_new ();
 g_object_set (renderer, "stock-size", GTK_ICON_SIZE_DIALOG, NULL);
+	/* TRANSLATORS: column for the application icon */
 	column = gtk_tree_view_column_new_with_attributes (_("Icon"), renderer,
 							 "icon-name", GPK_CHOOSER_COLUMN_ICON, NULL);
 	gtk_tree_view_append_column (treeview, column);
 
 	/* column for text */
 	renderer = gtk_cell_renderer_text_new ();
+	/* TRANSLATORS: column for the package name */
 	column = gtk_tree_view_column_new_with_attributes (_("Package"), renderer,
 							 "markup", GPK_CHOOSER_COLUMN_TEXT, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, GPK_CHOOSER_COLUMN_TEXT);
@@ -327,6 +330,7 @@ gpk_client_run_show (gchar **package_ids)
 	/* set icon name */
 	widget = glade_xml_get_widget (glade_xml, "window_simple");
 	gtk_window_set_icon_name (GTK_WINDOW (widget), GPK_ICON_SOFTWARE_INSTALLER);
+	/* TRANSLATORS: window title: do we want to execute a program we just installed? */
 	gtk_window_set_title (GTK_WINDOW (widget), _("Run new application?"));
 
 	/* create list stores */
diff --git a/src/gpk-client-signature.c b/src/gpk-client-signature.c
index 3ec6a76..54d83a2 100644
--- a/src/gpk-client-signature.c
+++ b/src/gpk-client-signature.c
@@ -61,7 +61,7 @@ gpk_client_signature_button_help_cb (GtkWidget *widget, gpointer data)
 * Return value: if we agreed
 **/
 gboolean
-gpk_client_signature_show (const gchar *package_id, const gchar *repository_name,
+gpk_client_signature_show (GtkWindow *window, const gchar *package_id, const gchar *repository_name,
 			 const gchar *key_url, const gchar *key_userid, const gchar *key_id,
 			 const gchar *key_fingerprint, const gchar *key_timestamp)
 {
@@ -98,6 +98,11 @@ gpk_client_signature_show (const gchar *package_id, const gchar *repository_name
 	widget = glade_xml_get_widget (glade_xml, "label_id");
 	gtk_label_set_label (GTK_LABEL (widget), key_id);
 
+	/* make modal if window set */
+	widget = glade_xml_get_widget (glade_xml, "window_gpg");
+	if (window != NULL)
+		gtk_window_set_transient_for (GTK_WINDOW (widget), window);
+
 	/* show window */
 	widget = glade_xml_get_widget (glade_xml, "window_gpg");
 	gtk_widget_show (widget);
@@ -107,9 +112,8 @@ gpk_client_signature_show (const gchar *package_id, const gchar *repository_name
 	gtk_main ();
 
 	/* hide window */
-	if (GTK_IS_WIDGET (widget)) {
+	if (GTK_IS_WIDGET (widget))
 		gtk_widget_hide (widget);
-	}
 	g_object_unref (glade_xml);
 
 	return has_imported_signature;
@@ -126,9 +130,8 @@ gpk_client_signature_self_test (gpointer data)
 {
 	EggTest *test = (EggTest *) data;
 
-	if (egg_test_start (test, "GpkClientEula") == FALSE) {
+	if (egg_test_start (test, "GpkClientEula") == FALSE)
 		return;
-	}
 	egg_test_end (test);
 }
 #endif
diff --git a/src/gpk-client-signature.h b/src/gpk-client-signature.h
index 69c5991..7fb0310 100644
--- a/src/gpk-client-signature.h
+++ b/src/gpk-client-signature.h
@@ -27,7 +27,8 @@
 G_BEGIN_DECLS
 
 void		 gpk_client_signature_self_test		(gpointer	 data);
-gboolean	 gpk_client_signature_show		(const gchar	*package_id,
+gboolean	 gpk_client_signature_show		(GtkWindow	*window,
+							 const gchar	*package_id,
 							 const gchar	*repository_name,
 							 const gchar	*key_url,
 							 const gchar	*key_userid,
diff --git a/src/gpk-client-untrusted.c b/src/gpk-client-untrusted.c
index d53789f..af2d6f6 100644
--- a/src/gpk-client-untrusted.c
+++ b/src/gpk-client-untrusted.c
@@ -88,7 +88,9 @@ gpk_client_untrusted_show (PkErrorCodeEnum code)
 
 	/* message */
 	message = g_strdup_printf ("%s\n%s",
+				 /* TRANSLATORS: this is untrusted -- warn the user */
 				 _("Malicious software can damage your computer or cause other harm."),
+				 /* TRANSLATORS: ask if they are absolutely sure they want to do this */
 				 _("Are you sure you want to install this package?"));
 	widget = glade_xml_get_widget (glade_xml, "label_message");
 	gtk_label_set_markup (GTK_LABEL (widget), message);
@@ -102,7 +104,9 @@ gpk_client_untrusted_show (PkErrorCodeEnum code)
 	pk_action = polkit_action_new ();
 	polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.package-install-untrusted");
 	update_system_action = polkit_gnome_action_new_default ("package-install-untrusted", pk_action,
+								/* TRANSLATORS: button label, force the install, even though it's untrusted */
 								_("_Force install"),
+								/* TRANSLATORS: button tooltip */
 								_("Force installing package"));
 	g_object_set (update_system_action,
 		 "no-icon-name", GTK_STOCK_APPLY,
diff --git a/src/gpk-client.c b/src/gpk-client.c
index 8ad9fe0..00e92f6 100644
--- a/src/gpk-client.c
+++ b/src/gpk-client.c
@@ -33,6 +33,7 @@
 #include <glib/gi18n.h>
 #include <glib/gprintf.h>
 #include <glib/gstdio.h>
+#include <gio/gio.h>
 
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
@@ -196,6 +197,7 @@ gpk_client_libnotify_cb (NotifyNotification *notification, gchar *action, gpoint
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_UPDATE_STARTED);
 		gconf_client_set_bool (gclient->priv->gconf_client, GPK_CONF_NOTIFY_UPDATE_STARTED, FALSE, NULL);
 	} else if (egg_strequal (action, "show-error-details")) {
+		/* TRANSLATORS: detailed text about the error */
 		gpk_error_dialog (_("Error details"), _("Package Manager error details"), gclient->priv->error_details);
 	} else if (egg_strequal (action, "cancel")) {
 		/* try to cancel */
@@ -260,8 +262,9 @@ gpk_client_finished_no_progress (PkClient *client, PkExitEnum exit_code, guint r
 
 	/* notify the user if there were skipped entries */
 	if (skipped_number > 0) {
-		message = ngettext (_("One package was skipped:"),
-				 _("Some packages were skipped:"), skipped_number);
+		/* TRANSLATORS: we did the update, but some updates were skipped and not applied */
+		message = ngettext ("One package was skipped:",
+				 "Some packages were skipped:", skipped_number);
 		g_string_prepend (message_text, message);
 		g_string_append_c (message_text, '\n');
 	}
@@ -290,17 +293,20 @@ gpk_client_finished_no_progress (PkClient *client, PkExitEnum exit_code, guint r
 		return;
 	}
 
-	/* do the bubble */
+	/* TRANSLATORS: title: system update completed all okay */
 	notification = notify_notification_new (_("The system update has completed"), message_text->str, "help-browser", NULL);
 	notify_notification_set_timeout (notification, 15000);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
 	if (restart == PK_RESTART_ENUM_SYSTEM) {
 		notify_notification_add_action (notification, "restart",
+						/* TRANSLATORS: restart computer as system packages need update */
 						_("Restart computer now"), gpk_client_libnotify_cb, gclient, NULL);
 		notify_notification_add_action (notification, "do-not-show-complete-restart",
+						/* TRANSLATORS: don't show this option again (for restart) */
 						_("Do not show this again"), gpk_client_libnotify_cb, gclient, NULL);
 	} else {
 		notify_notification_add_action (notification, "do-not-show-complete",
+						/* TRANSLATORS: don't show this option again (when finished) */
 						_("Do not show this again"), gpk_client_libnotify_cb, gclient, NULL);
 	}
 	ret = notify_notification_show (notification, &error);
@@ -343,6 +349,7 @@ gpk_client_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, GpkCli
 
 	if (exit == PK_EXIT_ENUM_SUCCESS && gclient->priv->show_finished) {
 		list = pk_client_get_package_list (client);
+		/* TRANSLATORS: list the packages we just installed */
 		gpk_client_dialog_set_message (gclient->priv->dialog, _("The following packages were installed:"));
 		gpk_client_dialog_set_package_list (gclient->priv->dialog, list);
 		gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
@@ -493,6 +500,7 @@ gpk_client_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *d
 	notify_notification_set_timeout (notification, 15000);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
 	notify_notification_add_action (notification, "show-error-details",
+					/* TRANSLATORS: button: show details about the error */
 					_("Show details"), gpk_client_libnotify_cb, gclient, NULL);
 	ret = notify_notification_show (notification, &error);
 	if (!ret) {
@@ -600,7 +608,8 @@ static void
 gpk_client_error_msg (GpkClient *gclient, const gchar *title, GError *error)
 {
 	GtkWindow *window;
-	const gchar *message = _("Unknown error. Please refer to the detailed report and report in bugzilla.");
+	/* TRANSLATORS: default fallback error -- this should never happen */
+	const gchar *message = _("Unknown error. Please refer to the detailed report and report in your distribution bugtracker.");
 	const gchar *details = NULL;
 
 	if (!gclient->priv->show_warning)
@@ -610,9 +619,11 @@ gpk_client_error_msg (GpkClient *gclient, const gchar *title, GError *error)
 	if (error != NULL) {
 		if (error->code == PK_CLIENT_ERROR_FAILED_AUTH ||
 		 g_str_has_prefix (error->message, "org.freedesktop.packagekit.")) {
+			/* TRANSLATORS: failed authentication */
 			message = _("You don't have the necessary privileges to perform this action.");
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-permissions");
 		} else if (error->code == PK_CLIENT_ERROR_CANNOT_START_DAEMON) {
+			/* TRANSLATORS: could not start system service */
 			message = _("The packagekitd service could not be started.");
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-no-service");
 		} else if (error->code == PK_CLIENT_ERROR_INVALID_INPUT) {
@@ -698,7 +709,8 @@ gpk_client_install_local_files_internal (GpkClient *gclient, gboolean trusted,
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		return FALSE;
@@ -710,6 +722,7 @@ gpk_client_install_local_files_internal (GpkClient *gclient, gboolean trusted,
 		return TRUE;
 
 	length = g_strv_length (files_rel);
+	/* TRANSLATORS: title: detailed internal error why the file install failed */
 	title = ngettext ("Failed to install file", "Failed to install files", length);
 	gpk_client_error_msg (gclient, title, error_local);
 	gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
@@ -744,22 +757,30 @@ gpk_client_set_error_from_exit_enum (PkExitEnum exit, GError **error)
 }
 
 /**
- * _g_ptr_array_to_bullets:
+ * gpk_client_ptr_array_to_bullets:
 *
 * splits the strings up nicely
 *
 * Return value: a newly allocated string
 **/
 static gchar *
-_g_ptr_array_to_bullets (GPtrArray *array, const gchar *prefix)
+gpk_client_ptr_array_to_bullets (GPtrArray *array, const gchar *prefix)
 {
 	GString *string;
 	guint i;
 	gchar *text;
 
+	/* don't use a bullet for one item */
+	if (array->len == 1) {
+		if (prefix != NULL)
+			return g_strdup_printf ("%s\n\n%s", prefix, g_ptr_array_index (array, 0));
+		else
+			return g_strdup (g_ptr_array_index (array, 0));
+	}
+
 	string = g_string_new (prefix);
 	if (prefix != NULL)
-		g_string_append_c (string, '\n');
+		g_string_append (string, "\n\n");
 
 	/* prefix with bullet and suffix with newline */
 	for (i=0; i<array->len; i++) {
@@ -775,110 +796,196 @@ _g_ptr_array_to_bullets (GPtrArray *array, const gchar *prefix)
 }
 
 /**
- * _g_ptr_array_copy_deep:
+ * gpk_client_install_local_files_get_user_temp:
 *
- * Deep copy a GPtrArray of strings
+ * Return (and create if does not exist) a temporary directory
+ * that is writable only by the user, and readable by root.
 *
- * Return value: A new GPtrArray
+ * Return value: the temp directory, or %NULL for create error
 **/
-static GPtrArray *
-_g_ptr_array_copy_deep (GPtrArray *array)
+static gchar *
+gpk_client_install_local_files_get_user_temp (GpkClient *gclient, const gchar *subfolder, GError **error)
 {
-	guint i;
-	const gchar *data;
-	GPtrArray *array_new;
+	GFile *file;
+	gboolean ret;
+	gchar *path = NULL;
 
-	array_new = g_ptr_array_new ();
-	for (i=0; i<array->len; i++) {
-		data = (const gchar *) g_ptr_array_index (array, i);
-		g_ptr_array_add (array_new, g_strdup (data));
+	/* build path in home folder */
+	path = g_build_filename (g_get_home_dir (), ".PackageKit", subfolder, NULL);
+
+	/* find if exists */
+	file = g_file_new_for_path (path);
+	ret = g_file_query_exists (file, NULL);
+	if (ret)
+		goto out;
+
+	/* create as does not exist */
+#ifdef HAVE_G_GILE_MAKE_DIRECTORY_WITH_PARENTS
+	ret = g_file_make_directory_with_parents (file, NULL, error);
+	g_object_unref (file);
+	if (!ret) {
+		/* return nothing.. */
+		g_free (path);
+		path = NULL;
+	}
+#else
+	g_mkdir_with_parents(path, 0755);
+	g_object_unref (file);
+	if (ret == -1) {
+		/* return nothing.. */
+		g_free (path);
+		path = NULL;
 	}
-	return array_new;
+#endif
+out:
+	return path;
 }
 
 /**
- * gpk_check_permissions:
- * @filename: a filename to check
- * @euid: the effective user ID to check for, or the output of geteuid()
- * @egid: the effective group ID to check for, or the output of getegid()
- * @mode: bitfield of R_OK, W_OK, XOK
+ * gpk_client_install_local_files_ready_callback:
+ **/
+static void
+gpk_client_install_local_files_ready_callback (GObject *source_object, GAsyncResult *res, GpkClient *gclient)
+{
+	gboolean ret;
+	GError *error_local = NULL;
+
+	g_return_if_fail (GPK_IS_CLIENT (gclient));
+
+	ret = g_file_copy_finish (G_FILE (source_object), res, &error_local);
+	if (!ret) {
+		egg_warning ("failed to copy file: %s", error_local->message);
+		g_error_free (error_local);
+	}
+
+	gtk_main_quit ();
+}
+
+/**
+ * gpk_client_install_local_files_progress_callback:
+ **/
+static void
+gpk_client_install_local_files_progress_callback (goffset current_num_bytes, goffset total_num_bytes, GpkClient *gclient)
+{
+	guint percentage;
+	g_return_if_fail (GPK_IS_CLIENT (gclient));
+	percentage = (current_num_bytes * 100) / total_num_bytes;
+	gpk_client_dialog_set_percentage (gclient->priv->dialog, percentage);
+}
+
+/**
+ * gpk_client_install_local_files_copy_non_native:
 *
- * Like, access but a bit more accurate - access will let root do anything.
- * Does not get read-only or no-exec filesystems right.
+ * Copy the new file into a new file that can be read by packagekitd, and
+ * that can't be written into by other users.
 *
- * Return value: %TRUE if the file has access perms
+ * Return value: the new file path, or %NULL for copy error
 **/
-static gboolean
-gpk_check_permissions (const gchar *filename, guint euid, guint egid, guint mode)
-{
-	struct stat statbuf;
-
-	if (stat (filename, &statbuf) == 0) {
-		if ((mode & R_OK) &&
-		 !((statbuf.st_mode & S_IROTH) ||
-		 ((statbuf.st_mode & S_IRUSR) && euid == statbuf.st_uid) ||
-		 ((statbuf.st_mode & S_IRGRP) && egid == statbuf.st_gid)))
-			return FALSE;
-		if ((mode & W_OK) &&
-		 !((statbuf.st_mode & S_IWOTH) ||
-		 ((statbuf.st_mode & S_IWUSR) && euid == statbuf.st_uid) ||
-		 ((statbuf.st_mode & S_IWGRP) && egid == statbuf.st_gid)))
-			return FALSE;
-		if ((mode & X_OK) &&
-		 !((statbuf.st_mode & S_IXOTH) ||
-		 ((statbuf.st_mode & S_IXUSR) && euid == statbuf.st_uid) ||
-		 ((statbuf.st_mode & S_IXGRP) && egid == statbuf.st_gid)))
-			return FALSE;
-		return TRUE;
+static gchar *
+gpk_client_install_local_files_copy_non_native (GpkClient *gclient, const gchar *filename, GError **error)
+{
+	GFile *file = NULL;
+	GFile *dest = NULL;
+	gchar *basename = NULL;
+	gchar *dest_path = NULL;
+	gchar *new_path = NULL;
+	gchar *cache_path = NULL;
+	gboolean ret;
+	GAsyncResult *res;
+	GError *error_local = NULL;
+
+	/* create the non FUSE temp directory */
+	cache_path = gpk_client_install_local_files_get_user_temp (gclient, "native-cache", &error_local);
+	if (cache_path == NULL) {
+		*error = g_error_new (1, 0, "failed to create temp directory: %s", error_local->message);
+		g_error_free (error_local);
+		goto out;
 	}
-	return FALSE;
+
+	/* get the final location */
+	file = g_file_new_for_path (filename);
+	basename = g_file_get_basename (file);
+	dest_path = g_build_filename (cache_path, basename, NULL);
+
+	/* copy the file */
+	dest = g_file_new_for_path (dest_path);
+	g_file_copy_async (file, dest, G_FILE_COPY_OVERWRITE, 0, NULL,
+			 (GFileProgressCallback) gpk_client_install_local_files_progress_callback, gclient,
+			 (GAsyncReadyCallback) gpk_client_install_local_files_ready_callback, gclient);
+	gtk_main ();
+
+	/* return the modified file item */
+	new_path = g_strdup (dest_path);
+
+out:
+	if (file != NULL)
+		g_object_unref (file);
+	if (dest != NULL)
+		g_object_unref (dest);
+	g_free (basename);
+	g_free (cache_path);
+	g_free (dest_path);
+	return new_path;
 }
 
 /**
- * gpk_client_install_local_files_copy_private:
+ * gpk_client_install_local_files_native_check:
 *
- * Allow the user to confirm the package copy to /tmp
+ * Allow the user to confirm the package copy to ~/.PackageKit/native-cache
+ * as we cannot access FUSE mounts as the root user.
 *
 * Return value: %TRUE if the method succeeded
 **/
 static gboolean
-gpk_client_install_local_files_copy_private (GpkClient *gclient, GPtrArray *array, GError **error)
+gpk_client_install_local_files_native_check (GpkClient *gclient, GPtrArray *array, GError **error)
 {
 	guint i;
-	gchar *data;
+	const gchar *data;
+	gchar *cache_path = NULL;
+	gchar *filename;
 	gboolean ret;
-	GPtrArray *array_new;
+	gboolean native;
 	GPtrArray *array_missing;
 	const gchar *message_part;
 	const gchar *title;
 	gchar *message;
 	GtkResponseType button;
+	GError *error_local = NULL;
+	GFile *file;
 
-	/* see if root has access to this file, in case we have to copy it
-	 * somewhere where it does.
-	 * See https://bugzilla.redhat.com/show_bug.cgi?id=456094 */
+	/* check if any files are non-native and need to be copied */
 	array_missing = g_ptr_array_new ();
 	for (i=0; i<array->len; i++) {
-		data = (gchar *) g_ptr_array_index (array, i);
-		ret = gpk_check_permissions (data, 0, 0, R_OK);
-		if (!ret)
+		data = (const gchar *) g_ptr_array_index (array, i);
+		/* if file is non-native, it's on a FUSE mount (probably created by GVFS).
+		 * See https://bugzilla.redhat.com/show_bug.cgi?id=456094 */
+		file = g_file_new_for_path (data);
+		native = g_file_is_native (file);
+		g_object_unref (file);
+		if (!native) {
+			egg_debug ("%s is non-native", data);
 			g_ptr_array_add (array_missing, g_strdup (data));
+		}
 	}
 
 	/* optional */
-	if (gclient->priv->show_confirm && array_missing->len > 0) {
-		title = ngettext (_("Do you want to copy this file?"),
-				 _("Do you want to copy these files?"), array_missing->len);
-		message_part = ngettext (_("One package file has to be copied to a non-private location so it can be installed:"),
-					 _("Some package files have to be copied to a non-private location so they can be installed:"),
+	ret = gconf_client_get_bool (gclient->priv->gconf_client, GPK_CONF_SHOW_COPY_CONFIRM, NULL);
+	if (ret && array_missing->len > 0) {
+		/* TRANSLATORS: title: we have to copy the private files to a public location */
+		title = ngettext ("Do you want to copy this file?",
+				 "Do you want to copy these files?", array_missing->len);
+		/* TRANSLATORS: message: explain to the user what we are doing */
+		message_part = ngettext ("This package file has to be copied from a private directory so it can be installed:",
+					 "Several package files have to be copied from a private directory so they can be installed:",
 					 array_missing->len);
-		message = _g_ptr_array_to_bullets (array_missing, message_part);
+		message = gpk_client_ptr_array_to_bullets (array_missing, message_part);
 
 		/* show UI */
 		gpk_client_dialog_set_title (gclient->priv->dialog, title);
 		gpk_client_dialog_set_message (gclient->priv->dialog, message);
 		gpk_client_dialog_set_image (gclient->priv->dialog, "dialog-warning");
-		gpk_client_dialog_set_action (gclient->priv->dialog, _("Copy file"));
+		/* TRANSLATORS: button: copy file from one directory to another */
+		gpk_client_dialog_set_action (gclient->priv->dialog, ngettext ("Copy file", "Copy files", array_missing->len));
 		gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-installing-private-files");
 		g_free (message);
 
@@ -892,73 +999,63 @@ gpk_client_install_local_files_copy_private (GpkClient *gclient, GPtrArray *arra
 		}
 	}
 
-	/* copy, and re-allocate so we can pass back the same array */
-	array_new = _g_ptr_array_copy_deep (array);
-	g_ptr_array_remove_range (array, 0, array->len);
+	/* setup UI */
+	if (array_missing->len > 0) {
+		/* TRANSLATORS: title: we are about to copy files, which may take a few seconds */
+		title = ngettext ("Copying file",
+				 "Copying files", array_missing->len);
+		gpk_client_dialog_set_title (gclient->priv->dialog, title);
+		gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-installing-private-files");
+		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, 0, gclient->priv->timestamp);
+	}
 
 	/* now we have the okay to copy the files, do so */
 	ret = TRUE;
-	for (i=0; i<array_new->len; i++) {
-		gchar *command;
-		gchar *dest;
-		gchar *dest_path;
-		gint retval;
-		GError *error = NULL;
-
-		data = (gchar *) g_ptr_array_index (array_new, i);
-		ret = gpk_check_permissions (data, 0, 0, R_OK);
-		if (ret) {
-			/* just copy over the name */
-			g_ptr_array_add (array, g_strdup (data));
-		} else {
-			/* get the final location */
-			dest = g_path_get_basename (data);
-			dest_path = g_strdup_printf ("/tmp/%s", dest);
-
-			command = g_strdup_printf ("cp \"%s\" \"%s\"", data, dest_path);
-			egg_debug ("command=%s", command);
-			ret = g_spawn_command_line_sync (command, NULL, NULL, NULL, &error);
-
-			/* we failed */
-			if (!ret) {
-				egg_warning ("failed to copy %s: %s", data, error->message);
-				g_error_free (error);
-				break;
-			}
+	for (i=0; i<array->len; i++) {
+		data = (const gchar *) g_ptr_array_index (array, i);
 
-			/* make this readable by root */
-			retval = g_chmod (dest_path, 0644);
-			if (retval < 0) {
+		/* check we are not on FUSE */
+		file = g_file_new_for_path (data);
+		native = g_file_is_native (file);
+		g_object_unref (file);
+		if (!native) {
+			/* copy the file */
+			filename = gpk_client_install_local_files_copy_non_native (gclient, data, &error_local);
+			if (filename == NULL) {
+				gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, "failed to copy file %s: %s", data, error_local->message);
 				ret = FALSE;
-				egg_warning ("failed to chmod %s", dest_path);
 				break;
 			}
 
-			/* add the modified file item */
-			g_ptr_array_add (array, g_strdup (dest_path));
+			/* show progress */
+			gpk_client_dialog_set_message (gclient->priv->dialog, filename);
 
-			g_free (dest);
-			g_free (dest_path);
-			g_free (command);
+			/* swap data in array */
+			g_free (array->pdata[i]);
+			array->pdata[i] = g_strdup (filename);
+			g_free (filename);
 		}
 	}
 
 	/* did we fail to copy the files */
 	if (!ret) {
-		title = ngettext (_("The file could not be copied"),
-				 _("The files could not be copied"), array_missing->len);
+		/* TRANSLATORS: title: tell the user we failed */
+		title = ngettext ("The file could not be copied",
+				 "The files could not be copied", array_missing->len);
 
 		/* show UI */
 		gpk_client_dialog_set_title (gclient->priv->dialog, title);
-		gpk_client_dialog_set_message (gclient->priv->dialog, "");
+		gpk_client_dialog_set_message (gclient->priv->dialog, error_local->message);
 		gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_WARNING, 0, gclient->priv->timestamp);
 		gpk_client_dialog_run (gclient->priv->dialog);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, "files not copied");
 		ret = FALSE;
+		g_error_free (error_local);
 		goto out;
 	}
 out:
+	g_free (cache_path);
 	g_ptr_array_foreach (array_missing, (GFunc) g_free, NULL);
 	g_ptr_array_free (array_missing, TRUE);
 	return ret;
@@ -979,13 +1076,15 @@ gpk_client_install_local_files_verify (GpkClient *gclient, GPtrArray *array, GEr
 	gchar *message;
 	gboolean ret = TRUE;
 
-	title = ngettext (_("Do you want to install this file?"),
-			 _("Do you want to install these files?"), array->len);
-	message = _g_ptr_array_to_bullets (array, NULL);
+	/* TRANSLATORS: title: confirm the user want's to install a local file */
+	title = ngettext ("Do you want to install this file?",
+			 "Do you want to install these files?", array->len);
+	message = gpk_client_ptr_array_to_bullets (array, NULL);
 
 	/* show UI */
 	gpk_client_dialog_set_title (gclient->priv->dialog, title);
 	gpk_client_dialog_set_message (gclient->priv->dialog, message);
+	/* TRANSLATORS: title: installing local files */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-install-files");
 	gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, 0, gclient->priv->timestamp);
@@ -994,8 +1093,9 @@ gpk_client_install_local_files_verify (GpkClient *gclient, GPtrArray *array, GEr
 
 	/* did we click no or exit the window? */
 	if (button != GTK_RESPONSE_OK) {
-		title = ngettext (_("The file was not installed"),
-				 _("The files were not installed"), array->len);
+		/* TRANSLATORS: title: the user cancelled the action */
+		title = ngettext ("The file was not installed",
+				 "The files were not installed", array->len);
 		gpk_client_dialog_set_title (gclient->priv->dialog, title);
 		gpk_client_dialog_set_message (gclient->priv->dialog, "");
 		gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
@@ -1020,7 +1120,7 @@ static gboolean
 gpk_client_install_local_files_check_exists (GpkClient *gclient, GPtrArray *array, GError **error)
 {
 	guint i;
-	gchar *data;
+	const gchar *data;
 	gboolean ret;
 	GPtrArray *array_missing;
 	const gchar *message_part;
@@ -1031,7 +1131,7 @@ gpk_client_install_local_files_check_exists (GpkClient *gclient, GPtrArray *arra
 
 	/* find missing */
 	for (i=0; i<array->len; i++) {
-		data = (gchar *) g_ptr_array_index (array, i);
+		data = (const gchar *) g_ptr_array_index (array, i);
 		ret = g_file_test (data, G_FILE_TEST_EXISTS);
 		if (!ret)
 			g_ptr_array_add (array_missing, g_strdup (data));
@@ -1040,12 +1140,14 @@ gpk_client_install_local_files_check_exists (GpkClient *gclient, GPtrArray *arra
 	/* warn, set error and quit */
 	ret = TRUE;
 	if (array_missing->len > 0) {
-		title = ngettext (_("File was not found!"),
-				 _("Files were not found!"), array_missing->len);
+		/* TRANSLATORS: title: we couldn't find the file -- very hard to get this */
+		title = ngettext ("File was not found!",
+				 "Files were not found!", array_missing->len);
 
-		message_part = ngettext (_("The following file was not found:"),
-					 _("The following files were not found:"), array_missing->len);
-		message = _g_ptr_array_to_bullets (array_missing, message_part);
+		/* TRANSLATORS: message: explain what went wrong */
+		message_part = ngettext ("The following file was not found:",
+					 "The following files were not found:", array_missing->len);
+		message = gpk_client_ptr_array_to_bullets (array_missing, message_part);
 
 		/* show UI */
 		gpk_client_dialog_set_title (gclient->priv->dialog, title);
@@ -1081,7 +1183,7 @@ gpk_client_confirm_action (GpkClient *gclient, const gchar *title, const gchar *
 	if (gclient->priv->parent_title != NULL)
 		title_name = g_strdup_printf ("%s %s", gclient->priv->parent_title, title);
 	else {
-		/* translator comment -- string is an action, e.g. "wants to install a codec" */
+		/* TRANSLATORS: string is an action, e.g. "wants to install a codec" */
 		title_name = g_strdup_printf (_("A program %s"), title);
 	}
 
@@ -1125,6 +1227,7 @@ gpk_client_install_local_files (GpkClient *gclient, gchar **files_rel, GError **
 	gboolean ret;
 	gchar **files = NULL;
 	GPtrArray *array;
+	const gchar *title;
 
 	g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE);
 	g_return_val_if_fail (files_rel != NULL, FALSE);
@@ -1144,15 +1247,15 @@ gpk_client_install_local_files (GpkClient *gclient, gchar **files_rel, GError **
 		goto out;
 
 	/* check all files exist and are readable by the local user */
-	ret = gpk_client_install_local_files_copy_private (gclient, array, error);
+	ret = gpk_client_install_local_files_native_check (gclient, array, error);
 	if (!ret)
 		goto out;
 
-	/* set title */
-	gpk_client_dialog_set_title (gclient->priv->dialog, _("Install local file"));
+	/* TRANSLATORS: title: installing a local file */
+	gpk_client_dialog_set_title (gclient->priv->dialog, ngettext ("Install local file", "Install local files", array->len));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 	if (gclient->priv->show_progress)
-		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, 0, 0);
+		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, 0, gclient->priv->timestamp);
 
 	files = pk_ptr_array_to_strv (array);
 	gclient->priv->retry_untrusted_value = FALSE;
@@ -1165,6 +1268,10 @@ gpk_client_install_local_files (GpkClient *gclient, gchar **files_rel, GError **
 
 	/* do we need to try again with better auth? */
 	if (gclient->priv->retry_untrusted_value) {
+		/* TRANSLATORS: title: installing a local file that is not trusted */
+		gpk_client_dialog_set_title (gclient->priv->dialog, ngettext ("Install untrusted local file", "Install untrusted local files", array->len));
+		if (gclient->priv->show_progress)
+			gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, 0, gclient->priv->timestamp);
 		ret = gpk_client_install_local_files_internal (gclient, FALSE, files, error);
 		if (!ret)
 			goto out;
@@ -1175,6 +1282,18 @@ gpk_client_install_local_files (GpkClient *gclient, gchar **files_rel, GError **
 	/* fail the transaction and set the correct error */
 	ret = gpk_client_set_error_from_exit_enum (gclient->priv->exit, error);
 
+	/* optional, and only when successfull */
+	if (ret && gclient->priv->show_confirm) {
+		/* TRANSLATORS: title: we have installed the local file OK */
+		title = ngettext ("File was installed successfully",
+				 "Files were installed successfully", array->len);
+		gpk_client_dialog_set_title (gclient->priv->dialog, title);
+		gpk_client_dialog_set_message (gclient->priv->dialog, "");
+		gpk_client_dialog_set_image (gclient->priv->dialog, "dialog-info");
+		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_FINISHED, 0, gclient->priv->timestamp);
+		gpk_client_dialog_run (gclient->priv->dialog);
+	}
+
 out:
 	g_strfreev (files);
 	g_ptr_array_foreach (array, (GFunc) g_free, NULL);
@@ -1217,7 +1336,7 @@ gpk_client_remove_package_ids (GpkClient *gclient, gchar **package_ids, GError *
 		goto skip_checks;
 	}
 
-	/* get the packages we depend on */
+	/* TRANSLATORS: title: getting a list of other packages that depend on this one */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Finding packages we require"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-finding-requires");
 
@@ -1228,7 +1347,8 @@ gpk_client_remove_package_ids (GpkClient *gclient, gchar **package_ids, GError *
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_resolve, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset resolve client"), error_local);
+		/* TRANSLATORS: this is an internal error, and should not be seen */
+		gpk_client_error_msg (gclient, _("Failed to reset client used for searching"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -1237,6 +1357,7 @@ gpk_client_remove_package_ids (GpkClient *gclient, gchar **package_ids, GError *
 	/* find out if this would force removal of other packages */
 	ret = pk_client_get_requires (gclient->priv->client_resolve, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), package_ids, TRUE, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: we could not work out what other packages have to be removed to remove this package */
 		gpk_client_error_msg (gclient, _("Could not work out what packages would also be removed"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -1248,14 +1369,13 @@ gpk_client_remove_package_ids (GpkClient *gclient, gchar **package_ids, GError *
 
 	/* no deps */
 	length = pk_package_list_get_size (list);
-	ret = gconf_client_get_bool (gclient->priv->gconf_client, GPK_CONF_SKIP_CONFIRM_NO_DEPS, NULL);
-	if (length == 0 && ret)
+	if (length == 0)
 		goto skip_checks;
 
 	/* sort by package_id */
 	pk_package_list_sort (list);
 
-	/* title */
+	/* TRANSLATORS: title: to remove this package we also have to remove others */
 	title = g_strdup_printf (ngettext ("%i additional package also has to be removed",
 					 "%i additional packages also have to be removed",
 					 length), length);
@@ -1263,6 +1383,7 @@ gpk_client_remove_package_ids (GpkClient *gclient, gchar **package_ids, GError *
 	/* message */
 	name = gpk_dialog_package_id_name_join_locale (package_ids);
 	length = g_strv_length (package_ids);
+	/* TRANSLATORS: message: describe in detail why it must happen */
 	message = g_strdup_printf (ngettext ("To remove %s other packages that depend on it must also be removed.",
 					 "To remove %s other packages that depend on them must also be removed.",
 					 length), name);
@@ -1272,6 +1393,7 @@ gpk_client_remove_package_ids (GpkClient *gclient, gchar **package_ids, GError *
 	gpk_client_dialog_set_package_list (gclient->priv->dialog, list);
 	gpk_client_dialog_set_title (gclient->priv->dialog, title);
 	gpk_client_dialog_set_message (gclient->priv->dialog, message);
+	/* TRANSLATORS: title: removing packages */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Remove"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-remove-other-packages");
 	gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, GPK_CLIENT_DIALOG_PACKAGE_LIST, gclient->priv->timestamp);
@@ -1288,7 +1410,7 @@ gpk_client_remove_package_ids (GpkClient *gclient, gchar **package_ids, GError *
 	}
 
 skip_checks:
-	/* set title */
+	/* TRANSLATORS: title removing packages */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Remove packages"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 	gpk_client_dialog_set_message (gclient->priv->dialog, "");
@@ -1300,7 +1422,8 @@ skip_checks:
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -1309,6 +1432,7 @@ skip_checks:
 	/* try to remove the package_ids */
 	ret = pk_client_remove_packages (gclient->priv->client_action, package_ids, TRUE, FALSE, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: error: failed to remove the package we tried to remove */
 		gpk_client_error_msg (gclient, _("Failed to remove package"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -1367,8 +1491,8 @@ gpk_client_install_package_ids (GpkClient *gclient, gchar **package_ids, GError
 		goto skip_checks;
 	}
 
-	/* set title */
-	gpk_client_dialog_set_title (gclient->priv->dialog, _("Finding packages we depend on"));
+	/* TRANSLATORS: finding a list of packages that we would also need to download */
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("Finding other packages we require"));
 	gpk_client_dialog_set_message (gclient->priv->dialog, "");
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-finding-depends");
 
@@ -1379,7 +1503,8 @@ gpk_client_install_package_ids (GpkClient *gclient, gchar **package_ids, GError
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_resolve, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset resolve client"), error_local);
+		/* TRANSLATORS: this is an internal error, and should not be seen */
+		gpk_client_error_msg (gclient, _("Failed to reset client used for searching"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -1388,6 +1513,7 @@ gpk_client_install_package_ids (GpkClient *gclient, gchar **package_ids, GError
 	/* find out if this would drag in other packages */
 	ret = pk_client_get_depends (gclient->priv->client_resolve, pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED), package_ids, TRUE, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: error: could not get the extra package list when installing a package */
 		gpk_client_error_msg (gclient, _("Could not work out what packages would be also installed"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -1397,17 +1523,17 @@ gpk_client_install_package_ids (GpkClient *gclient, gchar **package_ids, GError
 	/* these are the new packages */
 	list = pk_client_get_package_list (gclient->priv->client_resolve);
 	length = pk_package_list_get_size (list);
-	ret = gconf_client_get_bool (gclient->priv->gconf_client, GPK_CONF_SKIP_CONFIRM_NO_DEPS, NULL);
-	if (length == 0 && ret)
+	if (length == 0)
 		goto skip_checks;
 
-	/* title */
+	/* TRANSLATORS: title: tell the user we have to install additional packages */
 	title = g_strdup_printf (ngettext ("%i additional package also has to be installed",
 					 "%i additional packages also have to be installed",
 					 length), length);
 
 	/* message */
 	name = gpk_dialog_package_id_name_join_locale (package_ids);
+	/* TRANSLATORS: message: explain to the user what we are doing in more detail */
 	message = g_strdup_printf (ngettext ("To install %s, an additional package also has to be downloaded.",
 					 "To install %s, additional packages also have to be downloaded.",
 					 length), name);
@@ -1416,6 +1542,7 @@ gpk_client_install_package_ids (GpkClient *gclient, gchar **package_ids, GError
 	gpk_client_dialog_set_package_list (gclient->priv->dialog, list);
 	gpk_client_dialog_set_title (gclient->priv->dialog, title);
 	gpk_client_dialog_set_message (gclient->priv->dialog, message);
+	/* TRANSLATORS: title: installing package */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-install-other-packages");
 	gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, GPK_CLIENT_DIALOG_PACKAGE_LIST, gclient->priv->timestamp);
@@ -1430,7 +1557,7 @@ gpk_client_install_package_ids (GpkClient *gclient, gchar **package_ids, GError
 	}
 
 skip_checks:
-	/* try to install the package_id */
+	/* TRANSLATORS: title: installing packages */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Installing packages"));
 	gpk_client_dialog_set_message (gclient->priv->dialog, "");
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
@@ -1440,7 +1567,8 @@ skip_checks:
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -1448,6 +1576,7 @@ skip_checks:
 
 	ret = pk_client_install_packages (gclient->priv->client_action, package_ids, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: error: failed to install, detailed error follows */
 		gpk_client_error_msg (gclient, _("Failed to install package"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -1504,17 +1633,29 @@ gpk_client_install_package_names (GpkClient *gclient, gchar **packages, GError *
 
 	string = g_string_new ("");
 	len = g_strv_length (packages);
-	for (i=0; i<len; i++)
-		g_string_append_printf (string, "• %s\n", packages[i]);
 
+	/* don't use a bullet for one item */
+	if (len == 1) {
+		g_string_append_printf (string, "%s\n", packages[0]);
+	} else {
+		for (i=0; i<len; i++)
+			g_string_append_printf (string, "• %s\n", packages[i]);
+	}
 	/* display messagebox */
 	text = g_string_free (string, FALSE);
 
 	/* check user wanted operation */
-	message = g_strdup_printf ("%s\n\n%s\n%s", _("An additional file is required"),
-				 text, _("Do you want to search for this file now?"));
+	message = g_strdup_printf ("%s\n\n%s\n%s",
+				 /* TRANSLATORS: a program needs a package, for instance openoffice-clipart */
+				 _("An additional package is required"),
+				 text,
+				 /* TRANSLATORS: ask the user if it's okay to search */
+				 _("Do you want to search for this file now?"));
+	/* TRANSLATORS: title: */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Package installer"));
+	/* TRANSLATORS: title: we want to install a package */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
+	/* TRANSLATORS: generic confirm, use the application name if we can */
 	ret = gpk_client_confirm_action (gclient, _("wants to install packages"), message);
 	g_free (text);
 	g_free (message);
@@ -1525,7 +1666,7 @@ gpk_client_install_package_names (GpkClient *gclient, gchar **packages, GError *
 	}
 
 skip_checks:
-	/* set title */
+	/* TRANSLATORS: title, searching */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Searching for packages"));
 	gpk_client_dialog_set_image_status (gclient->priv->dialog, PK_STATUS_ENUM_WAIT);
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-finding-packages");
@@ -1535,7 +1676,8 @@ skip_checks:
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_resolve, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset resolve client"), error_local);
+		/* TRANSLATORS: this is an internal error, and should not be seen */
+		gpk_client_error_msg (gclient, _("Failed to reset client used for searching"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -1544,6 +1686,7 @@ skip_checks:
 	/* find out if we can find a package */
 	ret = pk_client_resolve (gclient->priv->client_resolve, PK_FILTER_ENUM_NONE, packages, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Incorrect response from search"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -1557,11 +1700,14 @@ skip_checks:
 		if (gclient->priv->show_warning) {
 			//FIXME: shows package_id in UI
 			text = pk_package_ids_to_text (packages);
+			/* TRANSLATORS: couldn't resolve name to package */
 			title = g_strdup_printf (_("Could not find %s"), text);
 			info_url = gpk_vendor_get_not_found_url (gclient->priv->vendor, GPK_VENDOR_URL_TYPE_DEFAULT);
-			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to find package"));
+			gpk_client_dialog_set_title (gclient->priv->dialog, title);
+			/* TRANSLATORS: message: could not find */
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("The packages could not be found in any software source"));
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-package-not-found");
+			/* TRANSLATORS: button: a link to the help file */
 			gpk_client_dialog_set_action (gclient->priv->dialog, _("More information"));
 
 			/* only show the "more info" button if there is a valid link */
@@ -1598,8 +1744,10 @@ skip_checks:
 		if (gclient->priv->show_warning) {
 			//FIXME: shows package_id in UI
 			text = pk_package_ids_to_text (packages);
+			/* TRANSLATORS: title: package is already installed */
 			title = g_strdup_printf (_("Failed to install %s"), text);
-			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to install package"));
+			gpk_client_dialog_set_title (gclient->priv->dialog, title);
+			/* TRANSLATORS: message: package is already installed */
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("The package is already installed"));
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 			gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_WARNING, 0, 0);
@@ -1615,7 +1763,9 @@ skip_checks:
 	/* got junk? */
 	if (id == NULL) {
 		if (gclient->priv->show_warning) {
+			/* TRANSLATORS: failed to install, shouldn't be shown */
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to install package"));
+			/* TRANSLATORS: the search gave us the wrong result. internal error. barf. */
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("Incorrect response from search"));
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 			gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_WARNING, 0, 0);
@@ -1682,10 +1832,17 @@ gpk_client_install_provide_file (GpkClient *gclient, const gchar *full_path, GEr
 	}
 
 	/* check user wanted operation */
-	message = g_strdup_printf ("%s\n\n• %s\n\n%s", _("The following file is required:"),
-				 full_path, _("Do you want to search for this now?"));
+	message = g_strdup_printf ("%s\n\n%s\n\n%s",
+				 /* TRANSLATORS: a program wants to install a file, e.g. /lib/moo.so */
+				 _("The following file is required:"),
+				 full_path,
+				 /* TRANSLATORS: confirm with the user */
+				 _("Do you want to search for this now?"));
+	/* TRANSLATORS: title */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("File installer"));
+	/* TRANSLATORS: button: install package that provides a file */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
+	/* TRANSLATORS: generic confirm, use the application name if we can */
 	ret = gpk_client_confirm_action (gclient, _("wants to install a file"), message);
 	g_free (message);
 	if (!ret) {
@@ -1695,14 +1852,15 @@ gpk_client_install_provide_file (GpkClient *gclient, const gchar *full_path, GEr
 	}
 
 skip_checks:
-	/* set title */
+	/* TRANSLATORS: searching for the package that provides the file */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Searching for file"));
 	gpk_client_dialog_set_image_status (gclient->priv->dialog, PK_STATUS_ENUM_WAIT);
 
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_resolve, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset resolve client"), error_local);
+		/* TRANSLATORS: this is an internal error, and should not be seen */
+		gpk_client_error_msg (gclient, _("Failed to reset client used for searching"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -1711,6 +1869,7 @@ skip_checks:
 	/* do search */
 	ret = pk_client_search_file (gclient->priv->client_resolve, PK_FILTER_ENUM_NONE, full_path, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Failed to search for file"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -1723,7 +1882,9 @@ skip_checks:
 	if (len == 0) {
 		if (gclient->priv->show_warning) {
 			info_url = gpk_vendor_get_not_found_url (gclient->priv->vendor, GPK_VENDOR_URL_TYPE_DEFAULT);
+			/* TRANSLATORS: failed to fild the package for thefile */
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to find package"));
+			/* TRANSLATORS: nothing found */
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("The file could not be found in any packages"));
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-package-not-found");
 			/* only show the "more info" button if there is a valid link */
@@ -1756,7 +1917,9 @@ skip_checks:
 	/* already installed? */
 	if (already_installed) {
 		if (gclient->priv->show_warning) {
+			/* TRANSLATORS: we've already got a package that provides this file */
 			text = g_strdup_printf (_("The %s package already provides the file %s"), id->name, full_path);
+			/* TRANSLATORS: title */
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to install file"));
 			gpk_client_dialog_set_message (gclient->priv->dialog, text);
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
@@ -1793,18 +1956,16 @@ gpk_client_install_gstreamer_codec_part (GpkClient *gclient, const gchar *codec_
 	const PkPackageObj *obj;
 	guint len;
 	gchar *title;
-	gchar *codec_name_formatted;
 
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_resolve, error);
 	if (!ret)
 		return NULL;
 
-	codec_name_formatted = g_strdup_printf ("%s", codec_name);
-	title = g_strdup_printf (_("Searching for plugin: %s"), codec_name_formatted);
+	/* TRANSLATORS: title, searching for codecs */
+	title = g_strdup_printf (_("Searching for plugin: %s"), codec_name);
 	gpk_client_dialog_set_message (gclient->priv->dialog, title);
 	g_free (title);
-	g_free (codec_name_formatted);
 
 	/* get codec packages */
 	ret = pk_client_what_provides (gclient->priv->client_resolve, pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED), PK_PROVIDES_ENUM_CODEC, codec_desc, error);
@@ -1853,18 +2014,28 @@ gpk_client_install_gstreamer_codecs_confirm (GpkClient *gclient, gchar **codec_n
 	const gchar *message;
 
 	len = g_strv_length (codec_name_strings);
+	/* TRANSLATORS: title: we need a codec */
 	title = ngettext ("An additional plugin is required to play this content", "Additional plugins are required to play this content", len);
+	/* TRANSLATORS: we are listing the plugins in a box */
 	message = ngettext ("The following plugin is required:", "The following plugins are required:", len);
 
 	string = g_string_new ("");
 	g_string_append_printf (string, "%s\n%s\n\n", title, message);
-	for (i=0; i<len; i++) {
-		parts = g_strsplit (codec_name_strings[i], "|", 2);
-		g_string_append_printf (string, "• %s\n", parts[0]);
+
+	/* don't use a bullet for one item */
+	if (len == 1) {
+		parts = g_strsplit (codec_name_strings[0], "|", 2);
+		g_string_append_printf (string, "%s\n", parts[0]);
 		g_strfreev (parts);
+	} else {
+		for (i=0; i<len; i++) {
+			parts = g_strsplit (codec_name_strings[i], "|", 2);
+			g_string_append_printf (string, "• %s\n", parts[0]);
+			g_strfreev (parts);
+		}
 	}
 
-	/* trailer */
+	/* TRANSLATORS: ask for confirmation */
 	message = ngettext ("Do you want to search for this now?", "Do you want to search for these now?", len);
 	g_string_append_printf (string, "\n%s\n", message);
 
@@ -1874,8 +2045,11 @@ gpk_client_install_gstreamer_codecs_confirm (GpkClient *gclient, gchar **codec_n
 	/* display messagebox */
 	text = g_string_free (string, FALSE);
 
+	/* TRANSLATORS: title: codec installer */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Plugin installer"));
+	/* TRANSLATORS: button: search for a codec */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Search"));
+	/* TRANSLATORS: generic confirm, use the application name if we can */
 	ret = gpk_client_confirm_action (gclient, _("requires additional plugins"), text);
 	g_free (text);
 
@@ -1931,7 +2105,7 @@ gpk_client_install_gstreamer_codecs (GpkClient *gclient, gchar **codec_name_stri
 	}
 
 skip_checks:
-	/* set title */
+	/* TRANSLATORS: search for codec */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Searching for plugins"));
 	gpk_client_dialog_set_image_status (gclient->priv->dialog, PK_STATUS_ENUM_WAIT);
 	gpk_client_dialog_set_message (gclient->priv->dialog, "");
@@ -1955,7 +2129,9 @@ skip_checks:
 		if (obj_new == NULL) {
 			if (gclient->priv->show_warning) {
 				info_url = gpk_vendor_get_not_found_url (gclient->priv->vendor, GPK_VENDOR_URL_TYPE_CODEC);
+				/* TRANSLATORS: failed to search for codec */
 				gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to search for plugin"));
+				/* TRANSLATORS: no software sources have the wanted codec */
 				gpk_client_dialog_set_message (gclient->priv->dialog, _("Could not find plugin in any configured software source"));
 				gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-package-not-found");
 				/* only show the "more info" button if there is a valid link */
@@ -1999,6 +2175,7 @@ skip_checks:
 	gpk_client_dialog_set_title (gclient->priv->dialog, title);
 	gpk_client_dialog_set_message (gclient->priv->dialog, message);
 	gpk_client_dialog_set_image (gclient->priv->dialog, "dialog-information");
+	/* TRANSLATORS: button: install codecs */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 	gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, GPK_CLIENT_DIALOG_PACKAGE_LIST, gclient->priv->timestamp);
@@ -2068,11 +2245,17 @@ gpk_client_install_mime_type (GpkClient *gclient, const gchar *mime_type, GError
 	}
 
 	/* make sure the user wants to do action */
-	message = g_strdup_printf ("%s\n\n• %s\n\n%s",
+	message = g_strdup_printf ("%s\n\n%s\n\n%s",
+				 /* TRANSLATORS: message: mime type opener required */
 				 _("An additional program is required to open this type of file:"),
-				 mime_type, _("Do you want to search for a program to open this file type now?"));
+				 mime_type,
+				 /* TRANSLATORS: message: confirm with the user */
+				 _("Do you want to search for a program to open this file type now?"));
+	/* TRANSLATORS: title */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("File type installer"));
+	/* TRANSLATORS: button: search for mime installer */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Search"));
+	/* TRANSLATORS: generic confirm, use the application name if we can */
 	ret = gpk_client_confirm_action (gclient, _("requires a new mime type"), message);
 	g_free (message);
 	if (!ret) {
@@ -2082,7 +2265,7 @@ gpk_client_install_mime_type (GpkClient *gclient, const gchar *mime_type, GError
 	}
 
 skip_checks:
-	/* set title */
+	/* TRANSLATORS: title: searching for mime type handlers */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Searching for file handlers"));
 	gpk_client_dialog_set_image_status (gclient->priv->dialog, PK_STATUS_ENUM_WAIT);
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-finding-packages");
@@ -2094,7 +2277,8 @@ skip_checks:
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_resolve, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset resolve client"), error_local);
+		/* TRANSLATORS: this is an internal error, and should not be seen */
+		gpk_client_error_msg (gclient, _("Failed to reset client used for searching"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -2104,6 +2288,7 @@ skip_checks:
 	ret = pk_client_what_provides (gclient->priv->client_resolve, pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED),
 				 PK_PROVIDES_ENUM_MIMETYPE, mime_type, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Failed to search for provides"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -2116,7 +2301,9 @@ skip_checks:
 	if (len == 0) {
 		if (gclient->priv->show_warning) {
 			info_url = gpk_vendor_get_not_found_url (gclient->priv->vendor, GPK_VENDOR_URL_TYPE_MIME);
+			/* TRANSLATORS: title */
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to find software"));
+			/* TRANSLATORS: nothing found in the software sources that helps */
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("No new applications can be found to handle this type of file"));
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-package-not-found");
 			/* only show the "more info" button if there is a valid link */
@@ -2136,12 +2323,15 @@ skip_checks:
 
 	/* populate a chooser */
 	window = gpk_client_dialog_get_window (gclient->priv->dialog);
+	/* TRANSLATORS: this is the list of packages that can open this file */
 	package_id = gpk_client_chooser_show (window, list, _("Applications that can open this type of file"));
 
 	/* selected nothing */
 	if (package_id == NULL) {
 		if (gclient->priv->show_warning) {
+			/* TRANSLATORS: we failed to install */
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to install software"));
+			/* TRANSLATORS: we didn't select any applications that were returned */
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("No applications were chosen to be installed"));
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 			gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_WARNING, 0, 0);
@@ -2203,10 +2393,16 @@ gpk_client_install_font (GpkClient *gclient, const gchar *font_desc, GError **er
 	}
 
 	/* check user wanted operation */
-	message = g_strdup_printf ("%s\n\n%s", _("An additional font is required to view this file correctly"),
+	message = g_strdup_printf ("%s\n\n%s",
+				 /* TRANSLATORS: we need to download a new font package to display a document */
+				 _("An additional font is required to view this file correctly"),
+				 /* TRANSLATORS: confirm with user */
 				 _("Do you want to search for a suitable font now?"));
+	/* TRANSLATORS: title: font installer */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Font installer"));
+	/* TRANSLATORS: buttton: search for font */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Search"));
+	/* TRANSLATORS: generic confirm, use the application name if we can */
 	ret = gpk_client_confirm_action (gclient, _("wants to install a font"), message);
 	g_free (message);
 	if (!ret) {
@@ -2216,7 +2412,7 @@ gpk_client_install_font (GpkClient *gclient, const gchar *font_desc, GError **er
 	}
 
 skip_checks:
-	/* set title */
+	/* TRANSLATORS: title: we are now searching */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Searching for fonts"));
 	gpk_client_dialog_set_image_status (gclient->priv->dialog, PK_STATUS_ENUM_WAIT);
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-finding-packages");
@@ -2228,7 +2424,8 @@ skip_checks:
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_resolve, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset resolve client"), error_local);
+		/* TRANSLATORS: this is an internal error, and should not be seen */
+		gpk_client_error_msg (gclient, _("Failed to reset client used for searching"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -2238,6 +2435,7 @@ skip_checks:
 	ret = pk_client_what_provides (gclient->priv->client_resolve, pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED),
 				 PK_PROVIDES_ENUM_FONT, font_desc, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Failed to search for provides"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -2250,7 +2448,9 @@ skip_checks:
 	if (len == 0) {
 		if (gclient->priv->show_warning) {
 			info_url = gpk_vendor_get_not_found_url (gclient->priv->vendor, GPK_VENDOR_URL_TYPE_FONT);
+			/* TRANSLATORS: title: cannot find in sources */
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to find font"));
+			/* TRANSLATORS: message: tell the user we suck */
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("No new fonts can be found for this document"));
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-package-not-found");
 			/* only show the "more info" button if there is a valid link */
@@ -2275,9 +2475,12 @@ skip_checks:
 	}
 
 	gpk_client_dialog_set_package_list (gclient->priv->dialog, list);
+	/* TRANSLATORS: title: show a list of fonts */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Install the following fonts"));
+	/* TRANSLATORS: confirm */
 	gpk_client_dialog_set_message (gclient->priv->dialog, _("Do you want to install these packages now?"));
 	gpk_client_dialog_set_image (gclient->priv->dialog, "dialog-information");
+	/* TRANSLATORS: button: install a font */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 	gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, GPK_CLIENT_DIALOG_PACKAGE_LIST, gclient->priv->timestamp);
@@ -2315,13 +2518,16 @@ gpk_client_catalog_progress_cb (PkCatalog *catalog, PkCatalogProgress mode, cons
 
 	g_return_if_fail (GPK_IS_CLIENT (gclient));
 
-	if (mode == PK_CATALOG_PROGRESS_PACKAGES)
+	if (mode == PK_CATALOG_PROGRESS_PACKAGES) {
+		/* TRANSLATORS: finding the package names for a catalog */
 		message = g_strdup_printf (_("Finding package name: %s"), text);
-	else if (mode == PK_CATALOG_PROGRESS_FILES)
+	} else if (mode == PK_CATALOG_PROGRESS_FILES) {
+		/* TRANSLATORS: finding a package for a file for a catalog */
 		message = g_strdup_printf (_("Finding file name: %s"), text);
-	else if (mode == PK_CATALOG_PROGRESS_PROVIDES)
+	} else if (mode == PK_CATALOG_PROGRESS_PROVIDES) {
+		/* TRANSLATORS: finding a package which can provide a virtual provide */
 		message = g_strdup_printf (_("Finding a package to provide: %s"), text);
-
+	}
 	gpk_client_set_status (gclient, PK_STATUS_ENUM_QUERY);
 	gpk_client_dialog_set_message (gclient->priv->dialog, message);
 	g_free (message);
@@ -2354,13 +2560,14 @@ gpk_client_install_catalogs (GpkClient *gclient, gchar **filenames, GError **err
 		goto skip_checks;
 	}
 
-	title = ngettext (_("Do you want to install this catalog?"),
-			 _("Do you want to install these catalogs?"), len);
+	title = ngettext ("Do you want to install this catalog?",
+			 "Do you want to install these catalogs?", len);
 	message = g_strjoinv ("\n", filenames);
 
 	/* show UI */
 	gpk_client_dialog_set_title (gclient->priv->dialog, title);
 	gpk_client_dialog_set_message (gclient->priv->dialog, message);
+	/* TRANSLATORS: button: install catalog */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-install-catalogs");
 	gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, 0, gclient->priv->timestamp);
@@ -2372,7 +2579,7 @@ gpk_client_install_catalogs (GpkClient *gclient, gchar **filenames, GError **err
 		return FALSE;
 
 skip_checks:
-	/* set title */
+	/* TRANSLATORS: title: install package catalogs, that is, instructions for installing */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Install catalogs"));
 	gpk_client_set_status (gclient, PK_STATUS_ENUM_WAIT);
 
@@ -2391,6 +2598,7 @@ skip_checks:
 	if (len == 0) {
 		/* show UI */
 		if (gclient->priv->show_warning) {
+			/* TRANSLATORS: title: we've already got all these packages installed */
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("No packages need to be installed"));
 			gpk_client_dialog_set_message (gclient->priv->dialog, "");
 			gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-catalog-none-required");
@@ -2408,9 +2616,11 @@ skip_checks:
 		goto skip_checks2;
 	}
 
-	/* process package list */
+	/* TRANSLATORS: display a list of packages to install */
 	string = g_string_new (_("The following packages are marked to be installed from the catalog:"));
 	g_string_append (string, "\n\n");
+
+	/* process package list */
 	for (i=0; i<len; i++) {
 		obj = pk_package_list_get_obj (list, i);
 		text = gpk_package_id_format_oneline (obj->id, obj->summary);
@@ -2423,10 +2633,11 @@ skip_checks:
 	/* display messagebox */
 	text = g_string_free (string, FALSE);
 
-	/* show UI */
+	/* TRANSLATORS: title: allow user to confirm */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Install packages in catalog?"));
 	gpk_client_dialog_set_message (gclient->priv->dialog, text);
 	gpk_client_dialog_set_image (gclient->priv->dialog, "dialog-question");
+	/* TRANSLATORS: button: install packages in catalog */
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 	gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_CONFIRM, 0, gclient->priv->timestamp);
@@ -2470,13 +2681,14 @@ gpk_client_update_system (GpkClient *gclient, GError **error)
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
 
-	/* set title */
+	/* TRANSLATORS: title: update all pending updates */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("System update"));
 	gpk_client_dialog_set_message (gclient->priv->dialog, "");
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-update-system");
@@ -2484,7 +2696,7 @@ gpk_client_update_system (GpkClient *gclient, GError **error)
 	/* wrap update, but handle all the GPG and EULA stuff */
 	ret = pk_client_update_system (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		/* display and set */
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Failed to update system"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -2499,13 +2711,17 @@ gpk_client_update_system (GpkClient *gclient, GError **error)
 	ret = gconf_client_get_bool (gclient->priv->gconf_client, GPK_CONF_NOTIFY_CRITICAL, NULL);
 	if (!gclient->priv->show_progress && ret) {
 		/* do the bubble */
+		/* TRANSLATORS: title: notification when we scheduled an automatic update */
 		notification = notify_notification_new (_("Updates are being installed"),
+							/* TRANSLATORS: tell the user why the hard disk is grinding... */
 							_("Updates are being automatically installed on your computer"),
 							"software-update-urgent", NULL);
 		notify_notification_set_timeout (notification, 15000);
 		notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+		/* TRANSLATORS: button: cancel the update system */
 		notify_notification_add_action (notification, "cancel",
 						_("Cancel update"), gpk_client_libnotify_cb, gclient, NULL);
+		/* TRANSLATORS: button: don't show this again */
 		notify_notification_add_action (notification, "do-not-show-update-started",
 						_("Do not show this again"), gpk_client_libnotify_cb, gclient, NULL);
 		ret = notify_notification_show (notification, &error_local);
@@ -2543,20 +2759,21 @@ gpk_client_refresh_cache (GpkClient *gclient, GError **error)
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
 
-	/* set title */
+	/* TRANSLATORS: title: refresh the lists of packages */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Refresh package lists"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-refresh");
 
 	/* wrap update, but handle all the GPG and EULA stuff */
 	ret = pk_client_refresh_cache (gclient->priv->client_action, TRUE, &error_local);
 	if (!ret) {
-		/* display and set */
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Failed to update package lists"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -2594,7 +2811,8 @@ gpk_client_get_updates (GpkClient *gclient, GError **error)
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
@@ -2603,6 +2821,7 @@ gpk_client_get_updates (GpkClient *gclient, GError **error)
 	/* wrap update, but handle all the GPG and EULA stuff */
 	ret = pk_client_get_updates (gclient->priv->client_action, PK_FILTER_ENUM_NONE, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Failed to get updates"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
@@ -2611,7 +2830,8 @@ gpk_client_get_updates (GpkClient *gclient, GError **error)
 
 	/* ignore this if it's uninteresting */
 	if (gclient->priv->show_progress) {
-		gpk_client_dialog_set_title (gclient->priv->dialog, _("Getting update lists"));
+		/* TRANSLATORS: title: getting the list of updates */
+		gpk_client_dialog_set_title (gclient->priv->dialog, _("Getting list of updates"));
 		gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, 0, 0);
 	}
@@ -2645,7 +2865,8 @@ gpk_client_get_distro_upgrades (GpkClient *gclient, GError **error)
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		return NULL;
@@ -2660,13 +2881,14 @@ gpk_client_get_distro_upgrades (GpkClient *gclient, GError **error)
 	/* wrap update, but handle all the GPG and EULA stuff */
 	ret = pk_client_get_distro_upgrades (gclient->priv->client_action, &error_local);
 	if (!ret) {
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Getting update lists failed"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
 
-	/* setup the UI */
+	/* TRANSLATORS: get if we can go from one distro release to another */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Getting distribution upgrade information"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-get-upgrades");
 	if (gclient->priv->show_progress)
@@ -2693,7 +2915,8 @@ gpk_client_get_file_list (GpkClient *gclient, const gchar *package_id, GError **
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		return NULL;
@@ -2704,13 +2927,14 @@ gpk_client_get_file_list (GpkClient *gclient, const gchar *package_id, GError **
 	ret = pk_client_get_files (gclient->priv->client_action, package_ids, &error_local);
 	g_strfreev (package_ids);
 	if (!ret) {
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Getting file list failed"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		return NULL;
 	}
 
-	/* setup the UI */
+	/* TRANSLATORS: title: getting the files that are contained in a package */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Getting file lists"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 	if (gclient->priv->show_progress)
@@ -2748,31 +2972,28 @@ gpk_client_update_packages (GpkClient *gclient, gchar **package_ids, GError **er
 	/* reset */
 	ret = pk_client_reset (gclient->priv->client_action, &error_local);
 	if (!ret) {
-		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
+		/* TRANSLATORS: this should never happen, low level failure */
+		gpk_client_error_msg (gclient, _("Failed to reset client to perform action"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
 
-	/* set title */
-	gpk_client_dialog_set_title (gclient->priv->dialog, _("Update packages"));
-	gpk_client_dialog_set_message (gclient->priv->dialog, "");
-	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-update-packages");
-
 	/* wrap update, but handle all the GPG and EULA stuff */
 	ret = pk_client_update_packages (gclient->priv->client_action, package_ids, &error_local);
 	if (!ret) {
-		/* display and set */
+		/* TRANSLATORS: we failed to find the package, this shouldn't happen */
 		gpk_client_error_msg (gclient, _("Failed to update packages"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
 
-	/* setup the UI */
+	/* TRANSLATORS: title: update specific packages */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Update packages"));
 	gpk_client_dialog_set_message (gclient->priv->dialog, "");
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-update-packages");
+	gpk_client_dialog_set_help_id (gclient->priv->dialog, "dialog-update-packages");
 	if (gclient->priv->show_progress)
 		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, GPK_CLIENT_DIALOG_PACKAGE_PADDING, 0);
 
@@ -2801,7 +3022,8 @@ gpk_client_repo_signature_required_cb (PkClient *client, const gchar *package_id
 
 	g_return_if_fail (GPK_IS_CLIENT (gclient));
 
-	ret = gpk_client_signature_show (package_id, repository_name, key_url, key_userid,
+	widget = GTK_WIDGET (gpk_client_dialog_get_window (gclient->priv->dialog));
+	ret = gpk_client_signature_show (GTK_WINDOW (widget), package_id, repository_name, key_url, key_userid,
 					 key_id, key_fingerprint, key_timestamp);
 	/* disagreed with auth */
 	if (!ret)
@@ -2812,7 +3034,10 @@ gpk_client_repo_signature_required_cb (PkClient *client, const gchar *package_id
 	ret = pk_client_reset (gclient->priv->client_secondary, &error);
 	if (!ret) {
 		widget = GTK_WIDGET (gpk_client_dialog_get_window (gclient->priv->dialog));
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to install signature"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: failed to install package GPG signature */
+					_("Failed to install signature"),
+					/* TRANSLATORS: internal error */
 					_("The client could not be reset"), error->message);
 		g_error_free (error);
 		return;
@@ -2823,7 +3048,10 @@ gpk_client_repo_signature_required_cb (PkClient *client, const gchar *package_id
 	gclient->priv->using_secondary_client = ret;
 	if (!ret) {
 		widget = GTK_WIDGET (gpk_client_dialog_get_window (gclient->priv->dialog));
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to install signature"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: failed to install package GPG signature */
+					_("Failed to install signature"),
+					/* TRANSLATORS: method: for some reason we refused this, error follows */
 					_("The method failed"), error->message);
 		g_error_free (error);
 	}
@@ -2848,11 +3076,14 @@ gpk_client_eula_required_cb (PkClient *client, const gchar *eula_id, const gchar
 	if (!ret)
 		return;
 
-	/* install signature */
+	/* install EULA */
 	egg_debug ("accept EULA %s", eula_id);
 	ret = pk_client_reset (gclient->priv->client_secondary, &error);
 	if (!ret) {
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to accept EULA"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: failed to accept licence */
+					_("Failed to accept license agreement"),
+					/* TRANSLATORS: internal error */
 					_("The client could not be reset"), error->message);
 		g_error_free (error);
 		return;
@@ -2861,7 +3092,10 @@ gpk_client_eula_required_cb (PkClient *client, const gchar *eula_id, const gchar
 	/* this is asynchronous, else we get into livelock */
 	ret = pk_client_accept_eula (gclient->priv->client_secondary, eula_id, &error);
 	if (!ret) {
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to accept EULA"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: failed to accept licence */
+					_("Failed to accept license agreement"),
+					/* TRANSLATORS: method: for some reason we refused this, error follows */
 					_("The method failed"), error->message);
 		g_error_free (error);
 	}
@@ -2889,8 +3123,11 @@ gpk_client_secondary_now_requeue (GpkClient *gclient)
 	ret = pk_client_requeue (gclient->priv->client_action, &error);
 	if (!ret) {
 		widget = GTK_WIDGET (gpk_client_dialog_get_window (gclient->priv->dialog));
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to install"),
-					_("The install task could not be requeued"), error->message);
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: title: failed to do initial error */
+					_("Failed to install"),
+					/* TRANSLATORS: we could not requeue the transaction */
+					_("The install task could not be repeated"), error->message);
 		g_error_free (error);
 	}
 
diff --git a/src/gpk-common.c b/src/gpk-common.c
index f6693ec..d81c9e3 100644
--- a/src/gpk-common.c
+++ b/src/gpk-common.c
@@ -47,12 +47,16 @@ gboolean
 gpk_window_set_size_request (GtkWindow *window, guint width, guint height)
 {
 	GdkScreen *screen;
+	guint screen_w;
+	guint screen_h;
 
 	/* check for tiny screen, like for instance a OLPC or EEE */
 	screen = gdk_screen_get_default ();
-	if (gdk_screen_get_width (screen) < width ||
-	 gdk_screen_get_height (screen) < height) {
-		egg_debug ("using small form factor mode");
+	screen_w = gdk_screen_get_width (screen);
+	screen_h = gdk_screen_get_height (screen);
+	if (screen_w < width || screen_h < height) {
+		egg_error ("using small form factor mode as %ix%i and requested %ix%i",
+			 screen_w, screen_h, width, height);
 		gtk_window_maximize (window);
 		return FALSE;
 	}
@@ -172,21 +176,41 @@ gpk_check_privileged_user (const gchar *application_name)
 	gboolean ret = FALSE;
 	gchar *message;
 	gchar *title;
+	GtkResponseType result;
+	GtkWidget *dialog;
 
 	uid = getuid ();
 	if (uid == 0) {
 		if (application_name == NULL)
+			/* TRANSLATORS: these tools cannot run as root (unknown name) */
 			title = g_strdup (_("This application is running as a privileged user"));
 		else
+			/* TRANSLATORS: cannot run as root user, and we display the applicaiton name */
 			title = g_strdup_printf (_("%s is running as a privileged user"), application_name);
 		message = g_strjoin ("\n",
-				 _("Running graphical applications as a privileged user should be avoided for security reasons."),
-				 _("Package management applications are security sensitive and therefore this application will now close."), NULL);
-		gpk_error_dialog (title, message, "");
+				 /* TRANSLATORS: tell the user off */
+				 _("Package management applications are security sensitive."),
+				 /* TRANSLATORS: and explain why */
+				 _("Running graphical applications as a privileged user should be avoided for security reasons."), NULL);
+
+		/* give the user a choice */
+		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", title);
+		/* TRANSLATORS: button: allow the user to run this, even when insecure */
+		gtk_dialog_add_button (GTK_DIALOG(dialog), _("Continue Anyway"), GTK_RESPONSE_OK);
+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog), "%s", message);
+		gtk_window_set_icon_name (GTK_WINDOW(dialog), GPK_ICON_SOFTWARE_INSTALLER);
+		result = gtk_dialog_run (GTK_DIALOG(dialog));
+		gtk_widget_destroy (dialog);
+
 		g_free (title);
 		g_free (message);
-		egg_warning ("uid=%i so closing", uid);
-		goto out;
+
+		/* user did not agree to run insecure */
+		if (result != GTK_RESPONSE_OK) {
+			egg_warning ("uid=%i so closing", uid);
+			goto out;
+		}
 	}
 
 	/* talk to ConsoleKit */
@@ -196,11 +220,15 @@ gpk_check_privileged_user (const gchar *application_name)
 	ret = egg_console_kit_is_local (ck);
 	if (!ret) {
 		if (application_name == NULL)
+			/* TRANSLATORS: the user is not sitting in front of the keyboard */
 			title = g_strdup (_("This application is running when the session is not local"));
 		else
+			/* TRANSLATORS: same, but we know the application name */
 			title = g_strdup_printf (_("%s is running when the session is not local"), application_name);
 		message = g_strjoin ("\n",
+				 /* TRANSLATORS: tell the user off */
 				 _("These applications should be run only when on local console."),
+				 /* TRANSLATORS: explain what to do */
 				 _("This normally indicates a bug with ConsoleKit or with the way your session has started."), NULL);
 		gpk_error_dialog (title, message, "");
 		g_free (title);
@@ -213,11 +241,15 @@ gpk_check_privileged_user (const gchar *application_name)
 	ret = egg_console_kit_is_active (ck);
 	if (!ret) {
 		if (application_name == NULL)
+			/* TRANSLATORS: the user is not active, i.e. is idle */
 			title = g_strdup (_("This application is running when the session is not active"));
 		else
+			/* TRANSLATORS: same, but we know the application name */
 			title = g_strdup_printf (_("%s is running when the session is not active"), application_name);
 		message = g_strjoin ("\n",
+				 /* TRANSLATORS: tell the user off */
 				 _("These applications should be run only when on active console."),
+				 /* TRANSLATORS: explain what to do */
 				 _("This normally indicates a bug with your remote desktop implementation."), NULL);
 		gpk_error_dialog (title, message, "");
 		g_free (title);
@@ -315,6 +347,7 @@ gpk_time_to_localised_string (guint time_secs)
 
 	/* is valid? */
 	if (time_secs == 0) {
+		/* TRANSLATORS: The actions has just literally happened */
 		timestring = g_strdup_printf (_("Now"));
 		return timestring;
 	}
@@ -324,6 +357,7 @@ gpk_time_to_localised_string (guint time_secs)
 
 	/* less than a minute */
 	if (seconds < 60) {
+		/* TRANSLATORS: time */
 		timestring = g_strdup_printf (ngettext ("%i second",
 							"%i seconds",
 							seconds), seconds);
@@ -354,6 +388,7 @@ gpk_time_to_localised_string (guint time_secs)
 	hours = minutes / 60;
 	minutes = minutes % 60;
 	if (minutes == 0) {
+		/* TRANSLATORS: time */
 		timestring = g_strdup_printf (ngettext (
 				"%i hour",
 				"%i hours",
@@ -502,7 +537,7 @@ gpk_common_test (gpointer data)
 	 ************************************************************/
 	egg_test_title (test, "time zero");
 	text = gpk_time_to_localised_string (0);
-	if (text != NULL && strcmp (text, _("Now")) == 0)
+	if (text != NULL && strcmp (text, "Now") == 0)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "failed, got %s", text);
@@ -511,7 +546,7 @@ gpk_common_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "time 1s");
 	text = gpk_time_to_localised_string (1);
-	if (text != NULL && strcmp (text, _("1 second")) == 0) {
+	if (text != NULL && strcmp (text, "1 second") == 0) {
 		egg_test_success (test, NULL);
 	} else {
 		egg_test_failed (test, "failed, got %s", text);
@@ -521,7 +556,7 @@ gpk_common_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "time 1m");
 	text = gpk_time_to_localised_string (1*60);
-	if (text != NULL && strcmp (text, _("1 minute")) == 0) {
+	if (text != NULL && strcmp (text, "1 minute") == 0) {
 		egg_test_success (test, NULL);
 	} else {
 		egg_test_failed (test, "failed, got %s", text);
@@ -531,7 +566,7 @@ gpk_common_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "time 1h");
 	text = gpk_time_to_localised_string (1*60*60);
-	if (text != NULL && strcmp (text, _("1 hour")) == 0) {
+	if (text != NULL && strcmp (text, "1 hour") == 0) {
 		egg_test_success (test, NULL);
 	} else {
 		egg_test_failed (test, "failed, got %s", text);
@@ -541,7 +576,7 @@ gpk_common_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "time 30s");
 	text = gpk_time_to_localised_string (30);
-	if (text != NULL && strcmp (text, _("30 seconds")) == 0) {
+	if (text != NULL && strcmp (text, "30 seconds") == 0) {
 		egg_test_success (test, NULL);
 	} else {
 		egg_test_failed (test, "failed, got %s", text);
@@ -551,7 +586,7 @@ gpk_common_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "time 30m");
 	text = gpk_time_to_localised_string (30*60);
-	if (text != NULL && strcmp (text, _("30 minutes")) == 0) {
+	if (text != NULL && strcmp (text, "30 minutes") == 0) {
 		egg_test_success (test, NULL);
 	} else {
 		egg_test_failed (test, "failed, got %s", text);
@@ -561,7 +596,7 @@ gpk_common_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "time 30m1s");
 	text = gpk_time_to_localised_string (30*60+1);
-	if (text != NULL && strcmp (text, _("30 minutes 1 second")) == 0) {
+	if (text != NULL && strcmp (text, "30 minutes 1 second") == 0) {
 		egg_test_success (test, NULL);
 	} else {
 		egg_test_failed (test, "failed, got %s", text);
@@ -571,7 +606,7 @@ gpk_common_test (gpointer data)
 	/************************************************************/
 	egg_test_title (test, "time 30m10s");
 	text = gpk_time_to_localised_string (30*60+10);
-	if (text != NULL && strcmp (text, _("30 minutes 10 seconds")) == 0) {
+	if (text != NULL && strcmp (text, "30 minutes 10 seconds") == 0) {
 		egg_test_success (test, NULL);
 	} else {
 		egg_test_failed (test, "failed, got %s", text);
diff --git a/src/gpk-common.h b/src/gpk-common.h
index dec6706..9e1830d 100644
--- a/src/gpk-common.h
+++ b/src/gpk-common.h
@@ -51,8 +51,8 @@ G_BEGIN_DECLS
 #define GPK_CONF_AUTO_UPDATE			"/apps/gnome-packagekit/auto_update"
 #define GPK_CONF_UPDATE_BATTERY			"/apps/gnome-packagekit/update_battery"
 #define GPK_CONF_SHOW_DEPENDS			"/apps/gnome-packagekit/show_depends"
+#define GPK_CONF_SHOW_COPY_CONFIRM		"/apps/gnome-packagekit/show_copy_confirm"
 #define GPK_CONF_BANNED_FIRMWARE		"/apps/gnome-packagekit/banned_firmware"
-#define GPK_CONF_SKIP_CONFIRM_NO_DEPS		"/apps/gnome-packagekit/skip_confirm_no_deps"
 
 #define GPK_CONF_REPO_SHOW_DETAILS		"/apps/gnome-packagekit/repo/show_details"
 #define GPK_CONF_APPLICATION_FILTER_BASENAME	"/apps/gnome-packagekit/application/filter_basename"
diff --git a/src/gpk-consolekit.c b/src/gpk-consolekit.c
index 4b46fae..0f5959c 100644
--- a/src/gpk-consolekit.c
+++ b/src/gpk-consolekit.c
@@ -173,7 +173,9 @@ gpk_restart_system (void)
 				polkit_action_set_action_id (action2,
 							 "org.freedesktop.consolekit.system.restart-multiple-users");
 				if (polkit_action_equal (action, action2)) {
+					/* TRANSLATORS: could not restart the computer */
 					gpk_error_dialog (_("Failed to restart"),
+							 /* TRANSLATORS: more than one user is using this computer */
 							 _("You are not allowed to restart the computer "
 							 "because multiple users are logged in"), NULL);
 				}
diff --git a/src/gpk-dbus.c b/src/gpk-dbus.c
index a6c9e3b..b98c5a0 100644
--- a/src/gpk-dbus.c
+++ b/src/gpk-dbus.c
@@ -57,6 +57,7 @@ static void gpk_dbus_finalize	(GObject	*object);
 struct GpkDbusPrivate
 {
 	GpkClient		*gclient;
+	PkClient		*client;
 };
 
 G_DEFINE_TYPE (GpkDbus, gpk_dbus, G_TYPE_OBJECT)
@@ -295,6 +296,44 @@ gpk_dbus_install_package_name (GpkDbus *dbus, guint32 xid, guint32 timestamp, co
 }
 
 /**
+ * gpk_dbus_install_package_names:
+ **/
+void
+gpk_dbus_install_package_names (GpkDbus *dbus, guint32 xid, guint32 timestamp, gchar **package_names, DBusGMethodInvocation *context)
+{
+	gboolean ret;
+	GError *error;
+	GError *error_local = NULL;
+	gchar *sender;
+	gchar *exec;
+
+	g_return_if_fail (PK_IS_DBUS (dbus));
+
+	egg_debug ("InstallPackageNames method called: %s", package_names[0]);
+
+	gpk_dbus_set_parent_window (dbus, xid, timestamp);
+
+	/* get the program name and set */
+	sender = dbus_g_method_get_sender (context);
+	exec = gpk_dbus_get_exec_for_sender (sender);
+	gpk_client_set_parent_exec (dbus->priv->gclient, exec);
+	g_free (sender);
+	g_free (exec);
+
+	/* do the action */
+	ret = gpk_client_install_package_names (dbus->priv->gclient, package_names, &error_local);
+	if (!ret) {
+		error = g_error_new (GPK_DBUS_ERROR, GPK_DBUS_ERROR_DENIED,
+				 "Method failed: %s", error_local->message);
+		g_error_free (error_local);
+		dbus_g_method_return_error (context, error);
+		return;
+	}
+
+	dbus_g_method_return (context);
+}
+
+/**
 * gpk_dbus_install_mime_type:
 **/
 void
@@ -442,6 +481,91 @@ gpk_dbus_install_font (GpkDbus *dbus, guint32 xid, guint32 timestamp, const gcha
 }
 
 /**
+ * gpk_dbus_install_catalog:
+ **/
+void
+gpk_dbus_install_catalog (GpkDbus *dbus, guint32 xid, guint32 timestamp, const gchar *catalog_file, DBusGMethodInvocation *context)
+{
+	gboolean ret;
+	GError *error;
+	GError *error_local = NULL;
+	gchar *sender;
+	gchar **catalog_files;
+	gchar *exec;
+
+	g_return_if_fail (PK_IS_DBUS (dbus));
+
+	egg_debug ("InstallCatalog method called: %s", catalog_file);
+
+	/* check sender */
+	sender = dbus_g_method_get_sender (context);
+
+	/* just convert from char* to char** */
+	catalog_files = g_strsplit (catalog_file, "|", 1);
+	gpk_dbus_set_parent_window (dbus, xid, timestamp);
+
+	/* get the program name and set */
+	exec = gpk_dbus_get_exec_for_sender (sender);
+	gpk_client_set_parent_exec (dbus->priv->gclient, exec);
+	g_free (sender);
+	g_free (exec);
+
+	/* do the action */
+	ret = gpk_client_install_catalogs (dbus->priv->gclient, catalog_files, &error_local);
+	g_strfreev (catalog_files);
+
+	if (!ret) {
+		error = g_error_new (GPK_DBUS_ERROR, GPK_DBUS_ERROR_DENIED,
+				 "Method failed: %s", error_local->message);
+		g_error_free (error_local);
+		dbus_g_method_return_error (context, error);
+		return;
+	}
+
+	dbus_g_method_return (context);
+}
+
+/**
+ * gpk_dbus_is_package_installed:
+ **/
+gboolean
+gpk_dbus_is_package_installed (GpkDbus *dbus, const gchar *package_name, gboolean *installed, GError **error)
+{
+	gboolean ret;
+	GError *error_local = NULL;
+	PkPackageList *list = NULL;
+	gchar **package_names = NULL;
+
+	g_return_val_if_fail (PK_IS_DBUS (dbus), FALSE);
+
+	/* reset */
+	ret = pk_client_reset (dbus->priv->client, &error_local);
+	if (!ret) {
+		*error = g_error_new (GPK_DBUS_ERROR, GPK_DBUS_ERROR_DENIED, "failed to get installed status: %s", error_local->message);
+		g_error_free (error_local);
+		goto out;
+	}
+
+	/* get the package list for the installed packages */
+	package_names = g_strsplit (package_name, "|", 1);
+	ret = pk_client_resolve (dbus->priv->client, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), package_names, &error_local);
+	if (!ret) {
+		*error = g_error_new (GPK_DBUS_ERROR, GPK_DBUS_ERROR_DENIED, "failed to get installed status: %s", error_local->message);
+		g_error_free (error_local);
+		goto out;
+	}
+
+	/* more than one entry? */
+	list = pk_client_get_package_list (dbus->priv->client);
+	*installed = (PK_OBJ_LIST(list)->len > 0);
+out:
+	if (list != NULL)
+		g_object_unref (list);
+	g_strfreev (package_names);
+	return ret;
+}
+
+/**
 * gpk_dbus_class_init:
 * @klass: The GpkDbusClass
 **/
@@ -461,6 +585,9 @@ static void
 gpk_dbus_init (GpkDbus *dbus)
 {
 	dbus->priv = GPK_DBUS_GET_PRIVATE (dbus);
+	dbus->priv->client = pk_client_new ();
+	pk_client_set_use_buffer (dbus->priv->client, TRUE, NULL);
+	pk_client_set_synchronous (dbus->priv->client, TRUE, NULL);
 	dbus->priv->gclient = gpk_client_new ();
 	gpk_client_set_interaction (dbus->priv->gclient, GPK_CLIENT_INTERACT_WARNING_CONFIRM_PROGRESS);
 }
@@ -477,6 +604,7 @@ gpk_dbus_finalize (GObject *object)
 
 	dbus = GPK_DBUS (object);
 	g_return_if_fail (dbus->priv != NULL);
+	g_object_unref (dbus->priv->client);
 	g_object_unref (dbus->priv->gclient);
 
 	G_OBJECT_CLASS (gpk_dbus_parent_class)->finalize (object);
diff --git a/src/gpk-dbus.h b/src/gpk-dbus.h
index ada5b02..e56931a 100644
--- a/src/gpk-dbus.h
+++ b/src/gpk-dbus.h
@@ -75,6 +75,11 @@ void		 gpk_dbus_install_package_name		(GpkDbus	*dbus,
 							 guint32	 timestamp,
 							 const gchar	*package_name,
 							 DBusGMethodInvocation *context);
+void		 gpk_dbus_install_package_names		(GpkDbus	*dbus,
+							 guint32	 xid,
+							 guint32	 timestamp,
+							 gchar		**package_names,
+							 DBusGMethodInvocation *context);
 void		 gpk_dbus_install_mime_type		(GpkDbus	*dbus,
 							 guint32	 xid,
 							 guint32	 timestamp,
@@ -90,6 +95,15 @@ void		 gpk_dbus_install_font			(GpkDbus	*dbus,
 							 guint32	 timestamp,
 							 const gchar	*font_desc,
 							 DBusGMethodInvocation *context);
+void		 gpk_dbus_install_catalog		(GpkDbus	*dbus,
+							 guint32	 xid,
+							 guint32	 timestamp,
+							 const gchar	*catalog_file,
+							 DBusGMethodInvocation *context);
+gboolean	 gpk_dbus_is_package_installed		(GpkDbus	*dbus,
+							 const gchar	*package_name,
+							 gboolean	*installed,
+							 GError		**error);
 
 G_END_DECLS
 
diff --git a/src/gpk-enum.c b/src/gpk-enum.c
index 522b6dc..085f873 100644
--- a/src/gpk-enum.c
+++ b/src/gpk-enum.c
@@ -854,24 +854,31 @@ gpk_update_enum_to_localised_text (PkInfoEnum info, guint number)
 	gchar *text = NULL;
 	switch (info) {
 	case PK_INFO_ENUM_LOW:
+		/* TRANSLATORS: type of update */
 		text = g_strdup_printf (ngettext ("%i trivial update", "%i trivial updates", number), number);
 		break;
 	case PK_INFO_ENUM_NORMAL:
+		/* TRANSLATORS: type of update in the case that we don't have any data */
 		text = g_strdup_printf (ngettext ("%i update", "%i updates", number), number);
 		break;
 	case PK_INFO_ENUM_IMPORTANT:
+		/* TRANSLATORS: type of update */
 		text = g_strdup_printf (ngettext ("%i important update", "%i important updates", number), number);
 		break;
 	case PK_INFO_ENUM_SECURITY:
+		/* TRANSLATORS: type of update */
 		text = g_strdup_printf (ngettext ("%i security update", "%i security updates", number), number);
 		break;
 	case PK_INFO_ENUM_BUGFIX:
+		/* TRANSLATORS: type of update */
 		text = g_strdup_printf (ngettext ("%i bug fix update", "%i bug fix updates", number), number);
 		break;
 	case PK_INFO_ENUM_ENHANCEMENT:
+		/* TRANSLATORS: type of update */
 		text = g_strdup_printf (ngettext ("%i enhancement update", "%i enhancement updates", number), number);
 		break;
 	case PK_INFO_ENUM_BLOCKED:
+		/* TRANSLATORS: number of updates that cannot be installed due to deps */
 		text = g_strdup_printf (ngettext ("%i blocked update", "%i blocked updates", number), number);
 		break;
 	default:
diff --git a/src/gpk-firmware.c b/src/gpk-firmware.c
index 95eaf5e..e74560f 100644
--- a/src/gpk-firmware.c
+++ b/src/gpk-firmware.c
@@ -195,11 +195,14 @@ gpk_firmware_timeout_cb (gpointer data)
 	egg_debug ("need to install:");
 	egg_str_list_print (array);
 
+	/* TRANSLATORS: we need another package to keep udev quiet */
 	message = _("Additional firmware is required to make hardware in this computer function correctly.");
+	/* TRANSLATORS: title of libnotify bubble */
 	notification = notify_notification_new (_("Additional firmware required"), message, "help-browser", NULL);
 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
 	notify_notification_add_action (notification, "install-firmware",
+					/* TRANSLATORS: button label */
 					_("Install firmware"), gpk_firmware_libnotify_cb, firmware, NULL);
 	notify_notification_add_action (notification, "do-not-show-prompt-firmware",
 					_("Do not show this again"), gpk_firmware_libnotify_cb, firmware, NULL);
diff --git a/src/gpk-hardware.c b/src/gpk-hardware.c
index bc12cad..a08b44f 100644
--- a/src/gpk-hardware.c
+++ b/src/gpk-hardware.c
@@ -158,14 +158,18 @@ gpk_hardware_check_for_driver_available (GpkHardware *hardware, const gchar *udi
 	hardware->priv->package_ids = pk_package_list_to_strv (list);
 
 	/* TODO: tell the user what hardware, NOT JUST A UDI */
-	message = g_strdup_printf ("%s\n\t%s", _("Do you want to install needed drivers?"), package);
+	/* TRANSLATORS: we can install an extra package so this hardware works, e.g. firmware */
+	message = g_strdup_printf ("%s\n\t%s", _("Additional packages can be installed to support this hardware"), package);
+	/* TRANSLATORS: a new bit of hardware has been plugged in */
 	body = g_strdup_printf ("%s", _("New hardware attached"));
 	notification = notify_notification_new (body, message, "help-browser", NULL);
 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
 	notify_notification_add_action (notification, GPK_HARDWARE_INSTALL_ACTION,
+	/* TRANSLATORS: button text, install the packages needed for the hardware to work */
 			_("Install package"), gpk_hardware_libnotify_cb, hardware, NULL);
 	notify_notification_add_action (notification, GPK_HARDWARE_DONT_PROMPT_ACTION,
+					/* TRANSLATORS: don't pop-up the same message twice */
 					_("Do not show this again"), gpk_hardware_libnotify_cb, hardware, NULL);
 	ret = notify_notification_show (notification, &error);
 	if (!ret) {
@@ -204,8 +208,7 @@ gpk_hardware_device_added_cb (DBusGProxy *proxy, const gchar *udi, GpkHardware *
 	/* we get multiple hal signals for one device plugin. Ignore all but first one.
 	 TODO: should we act on a different one ?
 	*/
-	if (hardware->priv->udi == NULL)
-	{
+	if (hardware->priv->udi == NULL) {
 		hardware->priv->udi = g_strdup (udi);
 		g_timeout_add_seconds (GPK_HARDWARE_MULTIPLE_HAL_SIGNALS_DELAY,
 				 gpk_hardware_device_added_timeout, hardware);
diff --git a/src/gpk-inhibit.c b/src/gpk-inhibit.c
index f37609a..e40ef5f 100644
--- a/src/gpk-inhibit.c
+++ b/src/gpk-inhibit.c
@@ -95,7 +95,9 @@ gpk_inhibit_create (GpkInhibit *inhibit)
 
 	/* coldplug the battery state */
 	ret = dbus_g_proxy_call (inhibit->priv->proxy_gpm, "Inhibit", &error,
+				/* TRANSLATORS: the program name that inhibited the suspend */
 				 G_TYPE_STRING, _("Software Update Applet"),
+				/* TRANSLATORS: the reason why we've inhibited it */
 				 G_TYPE_STRING, _("A transaction that cannot be interrupted is running"),
 				 G_TYPE_INVALID,
 				 G_TYPE_UINT, &inhibit->priv->cookie,
diff --git a/src/gpk-install-catalog.c b/src/gpk-install-catalog.c
index 28b8d3a..14b4e09 100644
--- a/src/gpk-install-catalog.c
+++ b/src/gpk-install-catalog.c
@@ -49,7 +49,8 @@ main (int argc, char *argv[])
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
 		 _("Show extra debugging information"), NULL },
 		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &files,
-		 "catalogs to install", NULL },
+		/* TRANSLATORS: command line option: a list of catalogs to install */
+		 _("Catalogs files to install"), NULL },
 		{ NULL}
 	};
 
@@ -63,6 +64,7 @@ main (int argc, char *argv[])
 		g_thread_init (NULL);
 	g_type_init ();
 
+	/* TRANSLATORS: program name: application to install a catalog of software */
 	g_set_application_name (_("Catalog Installer"));
 	context = g_option_context_new ("gpk-install-catalog");
 	g_option_context_set_summary (context, _("Catalog Installer"));
@@ -80,7 +82,8 @@ main (int argc, char *argv[])
 
 	if (files == NULL) {
 		gpk_error_dialog (_("Failed to install catalog"),
-				 _("You need to specify a file to install"), NULL);
+				 /* TRANSLATORS: no filename was supplied */
+				 _("You need to specify a file name to install"), NULL);
 		return 1;
 	}
 
diff --git a/src/gpk-install-local-file.c b/src/gpk-install-local-file.c
index 6e679f7..fa0afdf 100644
--- a/src/gpk-install-local-file.c
+++ b/src/gpk-install-local-file.c
@@ -49,7 +49,8 @@ main (int argc, char *argv[])
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
 		 _("Show extra debugging information"), NULL },
 		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &files,
-		 "files to install", NULL },
+		 /* TRANSLATORS: command line option: a list of files to install */
+		 _("Files to install"), NULL },
 		{ NULL}
 	};
 
@@ -63,6 +64,7 @@ main (int argc, char *argv[])
 		g_thread_init (NULL);
 	g_type_init ();
 
+	/* TRANSLATORS: program name: application to install a package to provide a file */
 	g_set_application_name (_("PackageKit File Installer"));
 	context = g_option_context_new ("gpk-install-file");
 	g_option_context_set_summary (context, _("PackageKit File Installer"));
@@ -73,13 +75,15 @@ main (int argc, char *argv[])
 	egg_debug_init (verbose);
 	gtk_init (&argc, &argv);
 
-	/* are we running privileged */
+	/* TRANSLATORS: title to pass to to the user if there are not enough privs */
 	ret = gpk_check_privileged_user (_("Local file installer"));
 	if (!ret)
 		return 1;
 
 	if (files == NULL) {
-		gpk_error_dialog (_("Failed to install local file"),
+		/* TRANSLATORS: could not install a package that contained the file we wanted */
+		gpk_error_dialog (_("Failed to install a package to provide a file"),
+				 /* TRANSLATORS: nothing selected */
 				 _("You need to specify a file to install"), NULL);
 		return 1;
 	}
diff --git a/src/gpk-install-mime-type.c b/src/gpk-install-mime-type.c
index d966e4e..81887a9 100644
--- a/src/gpk-install-mime-type.c
+++ b/src/gpk-install-mime-type.c
@@ -60,6 +60,7 @@ main (int argc, char *argv[])
 		g_thread_init (NULL);
 	g_type_init ();
 
+	/* TRANSLATORS: program name: application to install a package to provide a mime type */
 	g_set_application_name (_("Mime Type Installer"));
 	context = g_option_context_new ("gpk-install-mime-type");
 	g_option_context_set_summary (context, _("Mime Type Installer"));
@@ -70,18 +71,22 @@ main (int argc, char *argv[])
 	egg_debug_init (verbose);
 	gtk_init (&argc, &argv);
 
-	/* are we running privileged */
+	/* TRANSLATORS: title to pass to to the user if there are not enough privs */
 	ret = gpk_check_privileged_user (_("Mime type installer"));
 	if (!ret)
 		return 1;
 
 	if (argc < 2) {
-		gpk_error_dialog (_("Failed to install file handler"),
+		/* TRANSLATORS: could not install program supporting this type */
+		gpk_error_dialog (_("Failed to install a program to handle this file type"),
+				 /* TRANSLATORS: no type given */
 				 _("You need to specify a mime-type to install"), NULL);
 		return 1;
 	}
 	if (argc > 2) {
-		gpk_error_dialog (_("Failed to install file handler"),
+		/* TRANSLATORS: could not install program supporting this type */
+		gpk_error_dialog (_("Failed to install a program to handle this file type"),
+				 /* TRANSLATORS: more than one type given */
 				 _("You can only specify one mime-type to install"), NULL);
 		return 1;
 	}
diff --git a/src/gpk-install-package-name.c b/src/gpk-install-package-name.c
index d0b26f5..3a94efd 100644
--- a/src/gpk-install-package-name.c
+++ b/src/gpk-install-package-name.c
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
 		 _("Show extra debugging information"), NULL },
 		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &packages,
-		 "packages to install", NULL },
+		 _("Packages to install"), NULL },
 		{ NULL}
 	};
 
@@ -63,9 +63,10 @@ main (int argc, char *argv[])
 		g_thread_init (NULL);
 	g_type_init ();
 
-	g_set_application_name (_("Package Installer"));
+	/* TRANSLATORS: program name: installs a package (or packages) by name */
+	g_set_application_name (_("Package Name Installer"));
 	context = g_option_context_new ("gpk-install-package");
-	g_option_context_set_summary (context, _("Package Installer"));
+	g_option_context_set_summary (context, _("Package Name Installer"));
 	g_option_context_add_main_entries (context, options, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
@@ -73,13 +74,15 @@ main (int argc, char *argv[])
 	egg_debug_init (verbose);
 	gtk_init (&argc, &argv);
 
-	/* are we running privileged */
-	ret = gpk_check_privileged_user (_("Package name installer"));
+	/* TRANSLATORS: application name to pass to to the user if there are not enough privs */
+	ret = gpk_check_privileged_user (_("Package Name Installer"));
 	if (!ret)
 		return 1;
 
 	if (packages == NULL) {
+		/* TRANSLATORS: failed */
 		gpk_error_dialog (_("Failed to install package from name"),
+				 /* TRANSLATORS: nothing was specified */
 				 _("You need to specify a package to install"), NULL);
 		return 1;
 	}
diff --git a/src/gpk-install-provide-file.c b/src/gpk-install-provide-file.c
index d1b9778..c7112cd 100644
--- a/src/gpk-install-provide-file.c
+++ b/src/gpk-install-provide-file.c
@@ -60,9 +60,10 @@ main (int argc, char *argv[])
 		g_thread_init (NULL);
 	g_type_init ();
 
-	g_set_application_name (_("Filename Installer"));
+	/* TRANSLATORS: program name, an application to install files that are provided by packages */
+	g_set_application_name (_("File Provide Installer"));
 	context = g_option_context_new ("gpk-install-filename");
-	g_option_context_set_summary (context, _("Filename Installer"));
+	g_option_context_set_summary (context, _("File Provide Installer"));
 	g_option_context_add_main_entries (context, options, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
@@ -70,18 +71,22 @@ main (int argc, char *argv[])
 	egg_debug_init (verbose);
 	gtk_init (&argc, &argv);
 
-	/* are we running privileged */
-	ret = gpk_check_privileged_user (_("Provide file installer"));
+	/* TRANSLATORS: application name to pass to to the user if there are not enough privs */
+	ret = gpk_check_privileged_user (_("Provide File Installer"));
 	if (!ret)
 		return 1;
 
 	if (argc < 2) {
+		/* TRANSLATORS: nothing done */
 		gpk_error_dialog (_("Failed to install a package to provide a file"),
+				 /* TRANSLATORS: nothig was specified */
 				 _("You need to specify a filename to install"), NULL);
 		return 1;
 	}
 	if (argc > 2) {
+		/* TRANSLATORS: nothing done */
 		gpk_error_dialog (_("Failed to install packages to provide files"),
+				 /* TRANSLATORS: more than one thing was specified */
 				 _("You can only specify one filename to install"), NULL);
 		return 1;
 	}
diff --git a/src/gpk-interface.xml b/src/gpk-interface.xml
index c342442..12406f3 100644
--- a/src/gpk-interface.xml
+++ b/src/gpk-interface.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
 <interface name="org.freedesktop.PackageKit">
+ <method name="IsPackageInstalled">
+ <arg type="s" name="package_name" direction="in"/>
+ <arg type="b" name="installed" direction="out"/>
+ </method>
 <method name="InstallLocalFile">
 <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
 <arg type="u" name="xid" direction="in"/>
@@ -19,6 +23,12 @@
 <arg type="u" name="timestamp" direction="in"/>
 <arg type="s" name="package_name" direction="in"/>
 </method>
+ <method name="InstallPackageNames">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ <arg type="u" name="xid" direction="in"/>
+ <arg type="u" name="timestamp" direction="in"/>
+ <arg type="as" name="package_names" direction="in"/>
+ </method>
 <method name="InstallMimeType">
 <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
 <arg type="u" name="xid" direction="in"/>
@@ -37,6 +47,12 @@
 <arg type="u" name="timestamp" direction="in"/>
 <arg type="s" name="font_desc" direction="in"/>
 </method>
+ <method name="InstallCatalog">
+ <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+ <arg type="u" name="xid" direction="in"/>
+ <arg type="u" name="timestamp" direction="in"/>
+ <arg type="s" name="catalog_file" direction="in"/>
+ </method>
 </interface>
 </node>
 
diff --git a/src/gpk-log.c b/src/gpk-log.c
index 315f557..6623267 100644
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -107,6 +107,7 @@ gpk_log_get_localised_date (const gchar *timespec)
 	date = g_date_new ();
 	g_date_set_time_val (date, &timeval);
 
+	/* TRANSLATORS: strftime formatted please */
 	g_date_strftime (buffer, 100, _("%A, %d %B %Y"), date);
 	g_date_free (date);
 	return g_strdup (buffer);
@@ -209,6 +210,7 @@ pk_treeview_add_general_columns (GtkTreeView *treeview)
 	/* --- column for date --- */
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "yalign", 0.0, NULL);
+	/* TRANSLATORS: column for the date */
 	column = gtk_tree_view_column_new_with_attributes (_("Date"), renderer,
 							 "markup", GPK_LOG_COLUMN_DATE, NULL);
 	gtk_tree_view_append_column (treeview, column);
@@ -217,6 +219,7 @@ pk_treeview_add_general_columns (GtkTreeView *treeview)
 
 	/* --- column for image and text --- */
 	column = gtk_tree_view_column_new ();
+	/* TRANSLATORS: column for what was done, e.g. update-system */
 	gtk_tree_view_column_set_title (column, _("Action"));
 
 	/* image */
@@ -242,6 +245,7 @@ pk_treeview_add_general_columns (GtkTreeView *treeview)
 	g_object_set (renderer, "yalign", 0.0, NULL);
 	g_object_set(renderer, "wrap-mode", PANGO_WRAP_WORD, NULL);
 	g_object_set(renderer, "wrap-width", 400, NULL);
+	/* TRANSLATORS: column for what packages were upgraded */
 	column = gtk_tree_view_column_new_with_attributes (_("Details"), renderer,
 							 "markup", GPK_LOG_COLUMN_DETAILS, NULL);
 	gtk_tree_view_append_column (treeview, column);
@@ -296,6 +300,7 @@ gpk_update_viewer_setup_policykit (void)
 	PolKitAction *pk_action;
 	pk_action = polkit_action_new ();
 	polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.system-rollback");
+	/* TRANSLATORS: button label, roll back to a previous system snapshot */
 	button_action = polkit_gnome_action_new_default ("rollback", pk_action, _("_Rollback"), NULL);
 	g_object_set (button_action,
 		 "no-icon-name", "gtk-go-back-ltr",
@@ -565,6 +570,7 @@ main (int argc, char *argv[])
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
 		 N_("Show extra debugging information"), NULL },
 		{ "filter", 'f', 0, G_OPTION_ARG_STRING, &filter,
+		 /* TRANSLATORS: preset the GtktextBox with this filter text */
 		 N_("Set the filter to this value"), NULL },
 		{ NULL}
 	};
diff --git a/src/gpk-prefs.c b/src/gpk-prefs.c
index a469b3f..17db46e 100644
--- a/src/gpk-prefs.c
+++ b/src/gpk-prefs.c
@@ -27,6 +27,7 @@
 
 #include <glade/glade.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 #include <math.h>
 #include <string.h>
 #include <dbus/dbus-glib.h>
@@ -40,13 +41,20 @@
 #include "egg-unique.h"
 #include "gpk-enum.h"
 
+/* TRANSLATORS: check once an hour */
 #define PK_FREQ_HOURLY_TEXT		_("Hourly")
+/* TRANSLATORS: check once a day */
 #define PK_FREQ_DAILY_TEXT		_("Daily")
+/* TRANSLATORS: check once a week */
 #define PK_FREQ_WEEKLY_TEXT		_("Weekly")
+/* TRANSLATORS: never check for updates/upgrades */
 #define PK_FREQ_NEVER_TEXT		_("Never")
 
+/* TRANSLATORS: update everything */
 #define PK_UPDATE_ALL_TEXT		_("All updates")
+/* TRANSLATORS: update just security updates */
 #define PK_UPDATE_SECURITY_TEXT		_("Only security updates")
+/* TRANSLATORS: don't update anything */
 #define PK_UPDATE_NONE_TEXT		_("Nothing")
 
 static GladeXML *glade_xml = NULL;
@@ -93,17 +101,16 @@ pk_prefs_update_freq_combo_changed (GtkWidget *widget, gpointer data)
 
 	client = gconf_client_get_default ();
 	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
-	if (strcmp (value, PK_FREQ_HOURLY_TEXT) == 0) {
+	if (strcmp (value, PK_FREQ_HOURLY_TEXT) == 0)
 		freq = GPK_FREQ_ENUM_HOURLY;
-	} else if (strcmp (value, PK_FREQ_DAILY_TEXT) == 0) {
+	else if (strcmp (value, PK_FREQ_DAILY_TEXT) == 0)
 		freq = GPK_FREQ_ENUM_DAILY;
-	} else if (strcmp (value, PK_FREQ_WEEKLY_TEXT) == 0) {
+	else if (strcmp (value, PK_FREQ_WEEKLY_TEXT) == 0)
 		freq = GPK_FREQ_ENUM_WEEKLY;
-	} else if (strcmp (value, PK_FREQ_NEVER_TEXT) == 0) {
+	else if (strcmp (value, PK_FREQ_NEVER_TEXT) == 0)
 		freq = GPK_FREQ_ENUM_NEVER;
-	} else {
+	else
 		g_assert (FALSE);
-	}
 
 	action = gpk_freq_enum_to_text (freq);
 	egg_debug ("Changing %s to %s", GPK_CONF_FREQUENCY_GET_UPDATES, action);
@@ -125,15 +132,14 @@ pk_prefs_upgrade_freq_combo_changed (GtkWidget *widget, gpointer data)
 
 	client = gconf_client_get_default ();
 	value = gtk_combo_box_get_active_text (GTK_COMBO_BOX (widget));
-	if (strcmp (value, PK_FREQ_DAILY_TEXT) == 0) {
+	if (strcmp (value, PK_FREQ_DAILY_TEXT) == 0)
 		freq = GPK_FREQ_ENUM_DAILY;
-	} else if (strcmp (value, PK_FREQ_WEEKLY_TEXT) == 0) {
+	else if (strcmp (value, PK_FREQ_WEEKLY_TEXT) == 0)
 		freq = GPK_FREQ_ENUM_WEEKLY;
-	} else if (strcmp (value, PK_FREQ_NEVER_TEXT) == 0) {
+	else if (strcmp (value, PK_FREQ_NEVER_TEXT) == 0)
 		freq = GPK_FREQ_ENUM_NEVER;
-	} else {
+	else
 		g_assert (FALSE);
-	}
 
 	action = gpk_freq_enum_to_text (freq);
 	egg_debug ("Changing %s to %s", GPK_CONF_FREQUENCY_GET_UPGRADES, action);
@@ -330,6 +336,21 @@ gpk_prefs_activated_cb (EggUnique *egg_unique, gpointer data)
 }
 
 /**
+ * gpk_prefs_key_event_cb
+ **/
+static gboolean
+gpk_prefs_key_event_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+	if (event->keyval == GDK_Escape) {
+		/* user pressed escape key, close the window */
+		gtk_main_quit ();
+		return TRUE;
+	}
+	/* returns FALSE to propagate event further */
+	return FALSE;
+}
+
+/**
 * main:
 **/
 int
@@ -359,13 +380,13 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	if (! g_thread_supported ()) {
+	if (! g_thread_supported ())
 		g_thread_init (NULL);
-	}
 	dbus_g_thread_init ();
 	g_type_init ();
 
 	context = g_option_context_new (NULL);
+	/* TRANSLATORS: program name, an application to set per-user policy for updates */
 	g_option_context_set_summary(context, _("Software Update Preferences"));
 	g_option_context_add_main_entries (context, options, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
@@ -382,9 +403,8 @@ main (int argc, char *argv[])
 	/* are we already activated? */
 	egg_unique = egg_unique_new ();
 	ret = egg_unique_assign (egg_unique, "org.freedesktop.PackageKit.Prefs");
-	if (!ret) {
+	if (!ret)
 		goto unique_out;
-	}
 	g_signal_connect (egg_unique, "activated",
 			 G_CALLBACK (gpk_prefs_activated_cb), NULL);
 
@@ -395,6 +415,8 @@ main (int argc, char *argv[])
 
 	glade_xml = glade_xml_new (GPK_DATA "/gpk-prefs.glade", NULL, NULL);
 	main_window = glade_xml_get_widget (glade_xml, "window_prefs");
+	g_signal_connect (main_window, "key_press_event",
+			 G_CALLBACK (gpk_prefs_key_event_cb), NULL);
 
 	/* Hide window first so that the dialogue resizes itself without redrawing */
 	gtk_widget_hide (main_window);
diff --git a/src/gpk-repo.c b/src/gpk-repo.c
index e7f840c..c85ae1d 100644
--- a/src/gpk-repo.c
+++ b/src/gpk-repo.c
@@ -152,6 +152,7 @@ pk_treeview_add_columns (GtkTreeView *treeview)
 	renderer = gtk_cell_renderer_toggle_new ();
 	g_signal_connect (renderer, "toggled", G_CALLBACK (pk_misc_installed_toggled), model);
 
+	/* TRANSLATORS: column if the source is enabled */
 	column = gtk_tree_view_column_new_with_attributes (_("Enabled"), renderer,
 							 "active", REPO_COLUMN_ENABLED, NULL);
 	gtk_tree_view_append_column (treeview, column);
@@ -159,6 +160,7 @@ pk_treeview_add_columns (GtkTreeView *treeview)
 
 	/* column for text */
 	renderer = gtk_cell_renderer_text_new ();
+	/* TRANSLATORS: column for the source description */
 	column = gtk_tree_view_column_new_with_attributes (_("Software Source"), renderer,
 							 "markup", REPO_COLUMN_TEXT, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, REPO_COLUMN_TEXT);
@@ -232,6 +234,7 @@ gpk_repo_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *det
 {
 	GtkWidget *widget;
 	widget = glade_xml_get_widget (glade_xml, "window_repo");
+	/* TRANSLATORS: for one reason or another, we could not enable or disable a software source */
 	gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to change status"),
 				gpk_error_enum_to_localised_text (code), details);
 }
@@ -356,7 +359,7 @@ main (int argc, char *argv[])
 	egg_debug_init (verbose);
 	gtk_init (&argc, &argv);
 
-	/* are we running privileged */
+	/* TRANSLATORS: title to pass to to the user if there are not enough privs */
 	ret = gpk_check_privileged_user (_("Software source viewer"));
 	if (!ret) {
 		return 1;
diff --git a/src/gpk-service-pack.c b/src/gpk-service-pack.c
index 9ce9fe6..c85abc1 100644
--- a/src/gpk-service-pack.c
+++ b/src/gpk-service-pack.c
@@ -243,14 +243,18 @@ gpk_pack_resolve_package_id (const gchar *package)
 	/* display errors if not exactly one match */
 	if (len == 0) {
 		widget = glade_xml_get_widget (glade_xml, "window_pack");
+		/* TRANSLATORS: message details when there were no packages found of that name */
 		text = g_strdup_printf (_("No package '%s' found!"), package);
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Create error"), text, NULL);
+		/* TRANSLATORS: did not create pack file */
+		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to create"), text, NULL);
 		g_free (text);
 		goto out;
 	} else if (len > 1) {
 		widget = glade_xml_get_widget (glade_xml, "window_pack");
+		/* TRANSLATORS: more than one match for the package name */
 		text = g_strdup_printf (_("More than one possible package '%s' found!"), package);
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Create error"), text, NULL);
+		/* TRANSLATORS: did not create pack file */
+		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Failed to create"), text, NULL);
 		g_free (text);
 		goto out;
 	}
@@ -317,7 +321,7 @@ gpk_pack_copy_package_lists (const gchar *filename, GError **error)
 
 	ret = pk_client_get_packages (client, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), &error_local);
 	if (!ret) {
-		*error = g_error_new (0, 0, _("Could not get package list: %s"), error_local->message);
+		*error = g_error_new (0, 0, _("Could not get list of installed packages: %s"), error_local->message);
 		g_error_free (error_local);
 		goto out;
 	}
@@ -325,9 +329,10 @@ gpk_pack_copy_package_lists (const gchar *filename, GError **error)
 	/* get the deps */
 	list = pk_client_get_package_list (client);
 
-	/* write new file */
+	/* write new file : FIXME: return a GError */
 	ret = pk_obj_list_to_file (PK_OBJ_LIST(list), filename);
 	if (!ret) {
+		/* TRANSLATORS: we could not write to the destination directory for some reason */
 		*error = g_error_new (0, 0, _("Could not write package list"));
 		goto out;
 	}
@@ -372,6 +377,7 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
 		ret = gpk_pack_copy_package_lists (filename, &error);
 		if (!ret) {
 			widget = glade_xml_get_widget (glade_xml, "window_pack");
+			/* TRANSLATORS: Could not create package list */
 			gpk_error_dialog_modal (GTK_WINDOW (widget), _("Create error"), _("Cannot copy system package list"), error->message);
 			g_error_free (error);
 		}
@@ -390,6 +396,7 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
 		package = gtk_entry_get_text (GTK_ENTRY(widget));
 		if (egg_strzero (package)) {
 			widget = glade_xml_get_widget (glade_xml, "window_pack");
+			/* TRANSLATORS: Could not create package list */
 			gpk_error_dialog_modal (GTK_WINDOW (widget), _("Create error"), _("No package name selected"), NULL);
 			goto out;
 		}
@@ -404,6 +411,7 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
 	ret = pk_obj_list_from_file (PK_OBJ_LIST(list), exclude);
 	if (!ret) {
 		widget = glade_xml_get_widget (glade_xml, "window_pack");
+		/* TRANSLATORS: we could not read the file list for the destination computer */
 		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Create error"), _("Cannot read destination package list"), NULL);
 		goto out;
 	}
@@ -422,6 +430,7 @@ gpk_pack_button_create_cb (GtkWidget *widget2, gpointer data)
 		ret = pk_service_pack_create_for_package_ids (pack, package_ids, &error);
 	if (!ret) {
 		widget = glade_xml_get_widget (glade_xml, "window_pack");
+		/* TRANSLATORS: we could not create the pack file, generic error */
 		gpk_error_dialog_modal (GTK_WINDOW (widget), _("Create error"), _("Cannot create service pack"), error->message);
 		g_error_free (error);
 	}
@@ -528,12 +537,16 @@ main (int argc, char *argv[])
 		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
 		 _("Show extra debugging information"), NULL },
 		{ "option", 'o', 0, G_OPTION_ARG_STRING, &option,
-		 _("Preselect the option, allowable values are list, updates and package"), NULL },
+		 /* TRANSLATORS: the constants should not be translated */
+		 _("Set the option, allowable values are 'list', 'updates' and 'package'"), NULL },
 		{ "package", 'p', 0, G_OPTION_ARG_STRING, &package,
+		 /* TRANSLATORS: this refers to the GtkTextEntry in gpk-service-pack */
 		 _("Add the package name to the text entry box"), NULL },
 		{ "with-list", 'p', 0, G_OPTION_ARG_STRING, &with_list,
+		 /* TRANSLATORS: this is the destination computer package list */
 		 _("Set the remote package list filename"), NULL },
 		{ "output", 'p', 0, G_OPTION_ARG_STRING, &output,
+		 /* TRANSLATORS: this is the file output directory */
 		 _("Set the default output directory"), NULL },
 		{ NULL}
 	};
@@ -550,7 +563,8 @@ main (int argc, char *argv[])
 	g_type_init ();
 
 	context = g_option_context_new (NULL);
-	g_option_context_set_summary(context, _("Software Update Preferences"));
+	/* TRANSLATORS: program description, an application to create service packs */
+	g_option_context_set_summary(context, _("Service Pack Creator"));
 	g_option_context_add_main_entries (context, options, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
@@ -583,12 +597,14 @@ main (int argc, char *argv[])
 
 	widget = glade_xml_get_widget (glade_xml, "filechooserbutton_exclude");
 	filter = gtk_file_filter_new ();
+	/* TRANSLATORS: file search type, lists of packages */
 	gtk_file_filter_set_name (filter, _("Package list files"));
 	gtk_file_filter_add_pattern (filter, "*.package-list");
 	gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(widget), filter);
 
 	widget = glade_xml_get_widget (glade_xml, "filechooserbutton_directory");
 	filter = gtk_file_filter_new ();
+	/* TRANSLATORS: file search type, service pack destination file type */
 	gtk_file_filter_set_name (filter, _("Service pack files"));
 	gtk_file_filter_add_pattern (filter, "*.servicepack");
 	gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(widget), filter);
diff --git a/src/gpk-update-icon.c b/src/gpk-update-icon.c
index 5acc008..24ed5e7 100644
--- a/src/gpk-update-icon.c
+++ b/src/gpk-update-icon.c
@@ -145,6 +145,7 @@ main (int argc, char *argv[])
 	g_type_init ();
 	notify_init ("gpk-update-icon");
 
+	/* TRANSLATORS: program name, a session wide daemon to watch for updates and changing system state */
 	g_set_application_name (_("Update Applet"));
 	context = g_option_context_new (NULL);
 	g_option_context_set_summary (context, _("Update Applet"));
@@ -160,7 +161,7 @@ main (int argc, char *argv[])
 	egg_debug_init (verbose);
 	gtk_init (&argc, &argv);
 
-	/* are we running privileged */
+	/* TRANSLATORS: title to pass to to the user if there are not enough privs */
 	ret = gpk_check_privileged_user (_("Update applet"));
 	if (!ret)
 		return 1;
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index 6c7cfc8..c759b2f 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -241,7 +241,9 @@ gpk_update_viewer_apply_cb (PolKitGnomeAction *action, gpointer data)
 	/* we have no checkboxes selected */
 	if (!selected_any) {
 		widget = glade_xml_get_widget (glade_xml, "window_updates");
-		gpk_error_dialog_modal (GTK_WINDOW (widget), _("No updates selected"),
+		gpk_error_dialog_modal (GTK_WINDOW (widget),
+					/* TRANSLATORS: we clicked apply, but had no packages selected */
+					_("No updates selected"),
 					_("No updates are selected"), NULL);
 		return;
 	}
@@ -333,6 +335,7 @@ gpk_update_viewer_description_animation_start_really (void)
 	gpk_animated_icon_enable_animation (GPK_ANIMATED_ICON (widget), TRUE);
 	gtk_widget_show (widget);
 
+	/* TRANSLATORS: getting information about the update -- can take some time */
 	text_bold = g_strdup_printf ("%s", _("Getting Description..."));
 	widget = glade_xml_get_widget (glade_xml, "label_animation_description");
 	gtk_label_set_label (GTK_LABEL (widget), text_bold);
@@ -484,6 +487,7 @@ gpk_update_viewer_populate_preview (PkPackageList *list)
 
 	length = pk_package_list_get_size (list);
 	if (length == 0) {
+		/* TRANSLATORS: no updates available for the user */
 		gpk_update_viewer_add_preview_item ("dialog-information", _("There are no updates available"), TRUE);
 		widget = glade_xml_get_widget (glade_xml, "button_close3");
 		gtk_widget_grab_default (widget);
@@ -893,20 +897,20 @@ gpk_update_viewer_update_detail_cb (PkClient *client, const PkUpdateDetailObj *o
 		info = PK_INFO_ENUM_NORMAL;
 
 	info_text = gpk_info_enum_to_localised_text (info);
-	/* translators: this is the update type, e.g. security */
+	/* TRANSLATORS: this is the update type, e.g. security */
 	gpk_update_viewer_add_description_item (_("Type"), info_text, NULL);
 
 	/* state */
 	if (obj->state != PK_UPDATE_STATE_ENUM_UNKNOWN) {
 		info_text = gpk_update_state_enum_to_localised_text (obj->state);
-		/* translators: this is the stability status of the update */
+		/* TRANSLATORS: this is the stability status of the update */
 		gpk_update_viewer_add_description_item (_("State"), info_text, NULL);
 	}
 
 	/* issued */
 	if (obj->issued != NULL) {
 		line = pk_iso8601_from_date (obj->issued);
-		/* translators: this is when the update was issued */
+		/* TRANSLATORS: this is when the update was issued */
 		gpk_update_viewer_add_description_item (_("Issued"), line, NULL);
 		g_free (line);
 	}
@@ -914,20 +918,20 @@ gpk_update_viewer_update_detail_cb (PkClient *client, const PkUpdateDetailObj *o
 	/* updated */
 	if (obj->updated != NULL) {
 		line = pk_iso8601_from_date (obj->updated);
-		/* translators: this is when (if?) the update was updated */
+		/* TRANSLATORS: this is when (if?) the update was updated */
 		gpk_update_viewer_add_description_item (_("Updated"), line, NULL);
 		g_free (line);
 	}
 
 	package_pretty = gpk_package_id_name_version (obj->id);
-	/* translators: this is the package version */
+	/* TRANSLATORS: this is the package version */
 	gpk_update_viewer_add_description_item (_("New version"), package_pretty, NULL);
 	g_free (package_pretty);
 
 	/* split and add */
 	package_pretty = gpk_update_viewer_get_pretty_from_composite (obj->updates);
 	if (package_pretty != NULL) {
-		/* translators: this is a list of packages that are updated */
+		/* TRANSLATORS: this is a list of packages that are updated */
 		gpk_update_viewer_add_description_item (_("Updates"), package_pretty, NULL);
 	}
 	g_free (package_pretty);
@@ -935,39 +939,39 @@ gpk_update_viewer_update_detail_cb (PkClient *client, const PkUpdateDetailObj *o
 	/* split and add */
 	package_pretty = gpk_update_viewer_get_pretty_from_composite (obj->obsoletes);
 	if (package_pretty != NULL) {
-		/* translators: this is a list of packages that are obsoleted */
+		/* TRANSLATORS: this is a list of packages that are obsoleted */
 		gpk_update_viewer_add_description_item (_("Obsoletes"), package_pretty, NULL);
 	}
 	g_free (package_pretty);
 
-	/* translators: this is the repository the package has come from */
+	/* TRANSLATORS: this is the repository the package has come from */
 	gpk_update_viewer_add_description_item (_("Repository"), obj->id->data, NULL);
 
 	if (!egg_strzero (obj->update_text)) {
 		/* convert the bullets */
 		line = gpk_update_viewer_pretty_description (obj->update_text);
-		/* translators: this is the package description */
+		/* TRANSLATORS: this is the package description */
 		gpk_update_viewer_add_description_item (_("Description"), line, NULL);
 		g_free (line);
 	}
 
 	/* changelog */
 	if (!egg_strzero (obj->changelog)) {
-		/* translators: this is a list of CVE (security) URLs */
+		/* TRANSLATORS: this is a list of CVE (security) URLs */
 		gpk_update_viewer_add_description_item (_("Changes"), obj->changelog, NULL);
 	}
 
 	/* add all the links */
 	if (!egg_strzero (obj->vendor_url)) {
-		/* translators: this is a list of vendor URLs */
+		/* TRANSLATORS: this is a list of vendor URLs */
 		gpk_update_viewer_add_description_link_item (_("Vendor"), obj->vendor_url);
 	}
 	if (!egg_strzero (obj->bugzilla_url)) {
-		/* translators: this is a list of bugzilla URLs */
+		/* TRANSLATORS: this is a list of bugzilla URLs */
 		gpk_update_viewer_add_description_link_item (_("Bugzilla"), obj->bugzilla_url);
 	}
 	if (!egg_strzero (obj->cve_url)) {
-		/* translators: this is a list of CVE (security) URLs */
+		/* TRANSLATORS: this is a list of CVE (security) URLs */
 		gpk_update_viewer_add_description_link_item (_("CVE"), obj->cve_url);
 	}
 
@@ -975,7 +979,7 @@ gpk_update_viewer_update_detail_cb (PkClient *client, const PkUpdateDetailObj *o
 	if (obj->restart == PK_RESTART_ENUM_SESSION ||
 	 obj->restart == PK_RESTART_ENUM_SYSTEM) {
 		info_text = gpk_restart_enum_to_localised_text (obj->restart);
-		/* translators: this is a notice a restart might be required */
+		/* TRANSLATORS: this is a notice a restart might be required */
 		gpk_update_viewer_add_description_item (_("Notice"), info_text, NULL);
 	}
 }
@@ -1037,6 +1041,7 @@ gpk_update_viewer_treeview_add_columns (GtkTreeView *treeview)
 	/* image */
 	renderer = gtk_cell_renderer_pixbuf_new ();
 	g_object_set (renderer, "stock-size", GTK_ICON_SIZE_DIALOG, NULL);
+	/* TRANSLATORS: a column that has how serious the update is */
 	column = gtk_tree_view_column_new_with_attributes (_("Severity"), renderer,
 							 "icon-name", PACKAGES_COLUMN_ICON, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, PACKAGES_COLUMN_INFO);
@@ -1044,6 +1049,7 @@ gpk_update_viewer_treeview_add_columns (GtkTreeView *treeview)
 
 	/* column for text */
 	renderer = gtk_cell_renderer_text_new ();
+	/* TRANSLATORS: a column that has name of the package that will be updated */
 	column = gtk_tree_view_column_new_with_attributes (_("Software"), renderer,
 							 "markup", PACKAGES_COLUMN_TEXT, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, PACKAGES_COLUMN_TEXT);
@@ -1079,6 +1085,7 @@ gpk_update_viewer_treeview_add_columns_description (GtkTreeView *treeview)
 	/* column for uris */
 	renderer = gpk_cell_renderer_uri_new ();
 	g_signal_connect (renderer, "clicked", G_CALLBACK (gpk_update_viewer_treeview_renderer_clicked), NULL);
+	/* TRANSLATORS: The information about the update, not currently shown */
 	column = gtk_tree_view_column_new_with_attributes (_("Text"), renderer,
 							 "text", DESC_COLUMN_TEXT,
 							 "uri", DESC_COLUMN_URI, NULL);
@@ -1203,6 +1210,7 @@ static const gchar *
 pk_update_get_approx_time (guint time)
 {
 	if (time < 60)
+		/* TRANSLATORS: less than 60 seconds, a short time */
 		return _("Less than a minute ago");
 	else if (time < 60*60)
 		return _("Less than an hour ago");
@@ -1313,6 +1321,7 @@ gpk_update_viewer_check_blocked_packages (PkPackageList *list)
 	/* set the widget text */
 	if (exists) {
 		widget = glade_xml_get_widget (glade_xml, "label_update_title");
+		/* TRANSLATORS: some updates the user selected could not be installed */
 		title_bold = g_strdup_printf ("%s", _("Some updates were not installed"));
 		gtk_label_set_markup (GTK_LABEL (widget), title_bold);
 		g_free (title_bold);
@@ -1322,6 +1331,7 @@ gpk_update_viewer_check_blocked_packages (PkPackageList *list)
 		gtk_widget_show (widget);
 	} else {
 		widget = glade_xml_get_widget (glade_xml, "label_update_title");
+		/* TRANSLATORS: everything updates okay */
 		title_bold = g_strdup_printf ("%s", _("System update completed"));
 		gtk_label_set_markup (GTK_LABEL (widget), title_bold);
 		g_free (title_bold);
@@ -1445,12 +1455,15 @@ gpk_update_viewer_task_list_changed_cb (PkTaskList *tlist, gpointer data)
 	/* hide buttons if we are updating */
 	if (pk_task_list_contains_role (tlist, PK_ROLE_ENUM_UPDATE_SYSTEM) ||
 	 pk_task_list_contains_role (tlist, PK_ROLE_ENUM_UPDATE_PACKAGES)) {
+		/* TRANSLATORS: either this current user, or another user is already updating the system */
 		gpk_update_viewer_preview_set_animation (_("A system update is already in progress"));
 
 	} else if (pk_task_list_contains_role (tlist, PK_ROLE_ENUM_GET_UPDATES)) {
+		/* TRANSLATORS: we are getting the list of updates from the server */
 		gpk_update_viewer_preview_set_animation (_("Getting updates"));
 
 	} else if (pk_task_list_contains_role (tlist, PK_ROLE_ENUM_REFRESH_CACHE)) {
+		/* TRANSLATORS: we are refreshing the package lists and the update lists */
 		gpk_update_viewer_preview_set_animation (_("Refreshing package cache"));
 
 	} else {
@@ -1584,6 +1597,7 @@ gpk_update_viewer_detail_popup_menu_create (GtkWidget *treeview, GdkEventButton
 	gpk_update_viewer_get_checked_status (&all_checked, &none_checked);
 
 	if (!all_checked) {
+		/* TRANSLATORS: right click menu, select all the updates */
 		menuitem = gtk_menu_item_new_with_label (_("Select all"));
 		g_signal_connect (menuitem, "activate",
 				 G_CALLBACK (gpk_update_viewer_detail_popup_menu_select_all), treeview);
@@ -1591,12 +1605,14 @@ gpk_update_viewer_detail_popup_menu_create (GtkWidget *treeview, GdkEventButton
 	}
 
 	if (!none_checked) {
+		/* TRANSLATORS: right click menu, unselect all the updates */
 		menuitem = gtk_menu_item_new_with_label (_("Unselect all"));
 		g_signal_connect (menuitem, "activate",
 				 G_CALLBACK (gpk_update_viewer_detail_popup_menu_select_none), treeview);
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 	}
 
+	/* TRANSLATORS: right click option, ignore this package name, not currently used */
 	menuitem = gtk_menu_item_new_with_label (_("Ignore this package"));
 	gtk_widget_set_sensitive (GTK_WIDGET (menuitem), FALSE);
 	g_signal_connect (menuitem, "activate",
@@ -1727,7 +1743,9 @@ gpk_update_viewer_setup_policykit (void)
 	pk_action = polkit_action_new ();
 	polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.system-sources-refresh");
 	refresh_action = polkit_gnome_action_new_default ("refresh", pk_action,
+							 /* TRANSLATORS: button label, refresh the package lists */
 							 _("Refresh"),
+							 /* TRANSLATORS: button tooltip */
 							 _("Refreshing is not normally required but will retrieve the latest application and update lists"));
 	g_object_set (refresh_action, "auth-icon-name", NULL, NULL);
 	polkit_action_unref (pk_action);
@@ -1736,6 +1754,7 @@ gpk_update_viewer_setup_policykit (void)
 	pk_action = polkit_action_new ();
 	polkit_action_set_action_id (pk_action, "org.freedesktop.consolekit.system.restart");
 	restart_action = polkit_gnome_action_new_default ("restart-system", pk_action,
+							 /* TRANSLATORS: button label */
 							 _("_Restart computer now"), NULL);
 	g_object_set (restart_action,
 		 "no-icon-name", GTK_STOCK_REFRESH,
@@ -1751,7 +1770,9 @@ gpk_update_viewer_setup_policykit (void)
 	pk_action = polkit_action_new ();
 	polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.system-update");
 	update_packages_action = polkit_gnome_action_new_default ("update-package", pk_action,
+								 /* TRANSLATORS: button label, apply all pending updates the user has selected */
 								 _("_Apply Updates"),
+								 /* TRANSLATORS: button tooltip */
 								 _("Apply the selected updates"));
 	g_object_set (update_packages_action,
 		 "no-icon-name", GTK_STOCK_APPLY,
@@ -1765,7 +1786,9 @@ gpk_update_viewer_setup_policykit (void)
 	pk_action = polkit_action_new ();
 	polkit_action_set_action_id (pk_action, "org.freedesktop.packagekit.system-update");
 	update_system_action = polkit_gnome_action_new_default ("update-system", pk_action,
+								/* TRANSLATORS: button label, update all packages pending */
 								_("_Update System"),
+								/* TRANSLATORS: button tooltip */
 								_("Apply all updates"));
 	g_object_set (update_system_action,
 		 "no-icon-name", GTK_STOCK_APPLY,
@@ -1824,6 +1847,7 @@ main (int argc, char *argv[])
 	g_type_init ();
 
 	context = g_option_context_new (NULL);
+	/* TRANSLATORS: program name, a simple app to view pending updates */
 	g_option_context_set_summary (context, _("Software Update Viewer"));
 	g_option_context_add_main_entries (context, options, NULL);
 	g_option_context_parse (context, &argc, &argv, NULL);
@@ -1939,16 +1963,19 @@ main (int argc, char *argv[])
 	widget = glade_xml_get_widget (glade_xml, "button_review");
 	g_signal_connect (widget, "clicked",
 			 G_CALLBACK (gpk_update_viewer_review_cb), NULL);
+	/* TRANSLATORS: tooltip on the review button */
 	gtk_widget_set_tooltip_text(widget, _("Review the update list"));
 
 	widget = glade_xml_get_widget (glade_xml, "button_overview");
 	g_signal_connect (widget, "clicked",
 			 G_CALLBACK (gpk_update_viewer_overview_cb), NULL);
+	/* TRANSLATORS: tooltip on the back button (from the detailed view) */
 	gtk_widget_set_tooltip_text(widget, _("Back to overview"));
 
 	widget = glade_xml_get_widget (glade_xml, "button_overview2");
 	g_signal_connect (widget, "clicked",
 			 G_CALLBACK (pk_button_more_installs_cb), NULL);
+	/* TRANSLATORS: tooltip on the back button (from finished view) */
 	gtk_widget_set_tooltip_text (widget, _("Back to overview"));
 
 	widget = glade_xml_get_widget (glade_xml, "button_help");
diff --git a/src/gpk-watch.c b/src/gpk-watch.c
index 7f75d61..1d1bc16 100644
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@ -131,6 +131,7 @@ gpk_watch_refresh_tooltip (GpkWatch *watch)
 		}
 		/* don't fill the screen with a giant tooltip */
 		if (i > GPK_WATCH_MAXIMUM_TOOLTIP_LINES) {
+			/* TRANSLATORS: if the menu won't fit, inform the user there are a few more things waiting */
 			g_string_append_printf (status, _("(%i more tasks)"),
 						i - GPK_WATCH_MAXIMUM_TOOLTIP_LINES);
 			g_string_append_c (status, '\n');
@@ -276,7 +277,8 @@ gpk_watch_libnotify_cb (NotifyNotification *notification, gchar *action, gpointe
 		gconf_client_set_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_COMPLETED, FALSE, NULL);
 
 	} else if (egg_strequal (action, "show-error-details")) {
-		gpk_error_dialog (_("Error details"), _("Package Manager error details"), watch->priv->error_details);
+		/* TRANSLATORS: The detailed error if the user clicks "more info" */
+		gpk_error_dialog (_("Error details"), _("Package manager error details"), watch->priv->error_details);
 
 	} else {
 		egg_warning ("unknown action id: %s", action);
@@ -356,17 +358,20 @@ gpk_watch_finished_cb (PkTaskList *tlist, PkClient *client, PkExitEnum exit, gui
 	}
 
 	if (role == PK_ROLE_ENUM_REMOVE_PACKAGES)
+		/* TRANSLATORS: This is the message in the libnotify body */
 		message = g_strdup_printf (_("Package '%s' has been removed"), text);
 	else if (role == PK_ROLE_ENUM_INSTALL_PACKAGES)
+		/* TRANSLATORS: This is the message in the libnotify body */
 		message = g_strdup_printf (_("Package '%s' has been installed"), text);
 	else if (role == PK_ROLE_ENUM_UPDATE_SYSTEM)
-		message = g_strdup ("System has been updated");
+		/* TRANSLATORS: This is the message in the libnotify body */
+		message = g_strdup (_("System has been updated"));
 
 	/* nothing of interest */
 	if (message == NULL)
 		goto out;
 
-	/* do the bubble */
+	/* TRANSLATORS: title: an action has finished, and we are showing the libnotify bubble */
 	notification = notify_notification_new (_("Task completed"), message, "help-browser", NULL);
 	notify_notification_set_timeout (notification, 5000);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
@@ -438,6 +443,7 @@ gpk_watch_error_code_cb (PkTaskList *tlist, PkClient *client, PkErrorCodeEnum er
 	notify_notification_set_timeout (notification, 15000);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
 	notify_notification_add_action (notification, "show-error-details",
+					/* TRANSLATORS: This is a link in a libnotify bubble that shows the detailed error */
 					_("Show details"), gpk_watch_libnotify_cb, watch, NULL);
 
 	ret = notify_notification_show (notification, &error);
@@ -524,6 +530,7 @@ gpk_watch_about_dialog_url_cb (GtkAboutDialog *about, const char *address, gpoin
 	g_free (cmdline);
 
 	if (!ret) {
+		/* TRANSLATORS: We couldn't launch the tool, normally a packaging problem */
 		gpk_error_dialog (_("Internal error"), _("Failed to show url"), error->message);
 		g_error_free (error);
 	}
@@ -606,7 +613,7 @@ gpk_watch_popup_menu_cb (GtkStatusIcon *status_icon,
 	g_return_if_fail (GPK_IS_WATCH (watch));
 	egg_debug ("icon right clicked");
 
-	/* About */
+	/* TRANSLATORS: this is the right click menu item */
 	item = gtk_image_menu_item_new_with_mnemonic (_("_About"));
 	image = gtk_image_new_from_icon_name (GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -770,7 +777,7 @@ gpk_watch_activate_status_cb (GtkStatusIcon *status_icon,
 		widget = gtk_separator_menu_item_new ();
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), widget);
 
-		/* don't know if we want this */
+		/* TRANSLATORS: This is a right click menu item, and will refresh all the package lists */
 		widget = gtk_image_menu_item_new_with_mnemonic (_("_Refresh Software List"));
 		image = gtk_image_new_from_icon_name ("view-refresh", GTK_ICON_SIZE_MENU);
 		gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (widget), image);
@@ -821,7 +828,7 @@ gpk_watch_activate_status_restart_cb (GtkStatusIcon *status_icon, GpkWatch *watc
 	widget = gtk_action_create_menu_item (GTK_ACTION (watch->priv->restart_action));
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), widget);
 
-	/* hide this option */
+	/* TRANSLATORS: This hides the 'restart required' icon */
 	widget = gtk_image_menu_item_new_with_mnemonic (_("_Hide this icon"));
 	image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_MENU);
 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (widget), image);
@@ -1114,6 +1121,7 @@ gpk_watch_init (GpkWatch *watch)
 	polkit_action_set_action_id (pk_action, "org.freedesktop.consolekit.system.restart");
 
 	restart_action = polkit_gnome_action_new_default ("restart-system", pk_action,
+							 /* TRANSLATORS: This button restarts the computer after an update */
 							 _("_Restart computer"), NULL);
 	g_object_set (restart_action,
 		 "no-icon-name", "gnome-shutdown",

Places

File gnome-packagekit.0.3.9_to_git-2008_11_07.patch of Package gnome-packagekit (Revision 9cd7e89c346e2436bf8093384852f3a5)

Places