[PackageKit-commit] packagekit: Branch 'master' - 29 commits

Mon Jan 19 09:48:06 PST 2009

NEWS                                        |   43 +
 backends/dummy/pk-backend-dummy.c           |    5 
 configure.ac                                |   34 -
 contrib/browser-plugin/Makefile.am          |   43 +
 contrib/browser-plugin/sdk-new/npplat.h     |   64 ++
 contrib/browser-plugin/sdk-new/pluginbase.h |   96 +++
 contrib/browser-plugin/src/plugin.cpp       |    2 
 contrib/browser-plugin/src/plugin.h         |    2 
 docs/html/pk-download.html                  |    1 
 lib/packagekit-glib/egg-test.c              |    5 
 lib/packagekit-glib/pk-desktop.c            |    2 
 po/en_GB.po                                 |  651 +++++++++++++++++++++++++
 po/pl.po                                    |    9 
 po/sk.po                                    |  715 ++++++++--------------------
 policy/org.freedesktop.packagekit.policy.in |   11 
 src/pk-backend-spawn.c                      |   25 
 src/pk-backend.c                            |    4 
 src/pk-spawn.c                              |   60 ++
 src/pk-spawn.h                              |    1 
 src/pk-transaction-list.c                   |    2 
 src/pk-transaction.c                        |    1 
 21 files changed, 1202 insertions(+), 574 deletions(-)

New commits:
commit b85884502c35ef1b58221c5dd77aa8c0eb0d3226
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 17:47:16 2009 +0000

    Release version 0.4.2

diff --git a/NEWS b/NEWS
index 6adc342..54a80ea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,46 @@
+Version 0.4.2
+~~~~~~~~~~~~~
+Released: 2009-01-19
+
+Translations:
+ - Added British translation (Tim Waugh)
+ - Updated Slovak translation (Pavol Å imo)
+ - Updated Greek translation (Jennie Petoumenou)
+ - Updated Polish translation (Piotr DrÄ…g)
+
+New Features:
+ - Use the detail field as a package_id so we can propogate useful information
+   to clients (Richard Hughes)
+ - Add an entry to the config file to turn on time estimation, and enable it
+   by default (Richard Hughes)
+ - Remove the udev helper from PackageKit now the core functionality is in
+   udev itself (Richard Hughes)
+
+Bugfixes:
+ - If a script is still running and PkSpawn is asked to unload, be more careful
+   about disconnecting timers (Richard Hughes)
+ - Ensure we call the backend finalise method when the daemon times out (Richard Hughes)
+ - Ensure we send the correct network state with the new changed codepath (Richard Hughes)
+ - Don't leak directory on commit-failed error path (Richard Hughes)
+ - Set the setup signal after we've connected the backend to the transaction so
+   it is emitted for clients (Richard Hughes)
+ - Don't emit allow-cancel over and over if it is the same state as before (Richard Hughes)
+ - A *-testing repo is not a development repo, so should not be filtered by
+   default. Fixes rh#480135 (Richard Hughes)
+ - Remove the obsolete specific vendor_url for each PolicyKit authorisation
+   and rely on the packagekit homepage. Fixes novell#450349 (Richard Hughes)
+ - Only try to exit the spawned backend if it is running, which removes an error
+   warning if it is already closed (Richard Hughes)
+ - Clear the backend store in pk_backend_reset() as we can't guarantee the
+   ordering for cancelled jobs (Richard Hughes)
+ - Fix compile of the browser plugin with newer versions of xulrunner (Richard Hughes)
+
+Backends:
+ - dummy: Output a load of messages we can play with in GUI tools (Richard Hughes)
+ - yum: Get the yum lock before we start setting up comps (Richard Hughes)
+ - yum: Set the allow cancel flag when we are waiting for yum to release its lock (Richard Hughes)
+ - yum: Fixed a bug that prevents installing a local file that isn't in the repos (Trever Fischer)
+
 Version 0.4.1
 ~~~~~~~~~~~~~
 Released: 2009-01-08
diff --git a/configure.ac b/configure.ac
index f8a0cc7..3e6ce5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ DEVELOPMENT_RELEASE=yes
 # AGE		If libpackagekit can be linked into executables which can be
 # 		built with previous versions of this library. Don't use.
 LT_CURRENT=11
-LT_REVISION=1
+LT_REVISION=2
 LT_AGE=0
 AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
diff --git a/docs/html/pk-download.html b/docs/html/pk-download.html
index 8dd8a1d..0007cff 100644
--- a/docs/html/pk-download.html
+++ b/docs/html/pk-download.html
@@ -68,6 +68,7 @@ Releases are normally once every 1-2 weeks.
 </p>
 <table>
 <tr><td><b>Version</b></td><td>&nbsp;&nbsp;</td><td><b>Date</b></td></tr>
+<tr><td>0.4.2</td><td></td><td>2009-01-19</td></tr>
 <tr><td>0.4.1</td><td></td><td>2009-01-08</td></tr>
 <tr><td>0.4.0</td><td></td><td>2008-12-09</td></tr>
 </table>
commit 46872a0c0a1ee802e611b9d068ac66a188c7a496
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 17:17:50 2009 +0000

    dummy: output a load of messages we can play with in GUI tools

diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index a656254..1c53ed8 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -751,6 +751,11 @@ backend_update_system_timeout (gpointer data)
 				    "The Linux kernel (the core of the Linux operating system)");
 	}
 	if (_progress_percentage == 30 && !_updated_gtkhtml) {
+		pk_backend_message (backend, PK_MESSAGE_ENUM_NEWER_PACKAGE_EXISTS, "A newer package preupgrade is available in fedora-updates-testing");
+		pk_backend_message (backend, PK_MESSAGE_ENUM_CONFIG_FILES_CHANGED, "/etc/X11/xorg.conf has been auto-merged, please check before rebooting");
+		pk_backend_message (backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing metadata is invalid");
+		pk_backend_message (backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing-debuginfo metadata is invalid");
+		pk_backend_message (backend, PK_MESSAGE_ENUM_BROKEN_MIRROR, "fedora-updates-testing-source metadata is invalid");
 		pk_backend_package (backend, PK_INFO_ENUM_BLOCKED,
 				    "gtkhtml2;2.19.1-4.fc8;i386;fedora",
 				    "An HTML widget for GTK+ 2.0");
commit e0a7c17749c24a37f80bbcc1f2c39561e5ec13bc
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 17:17:17 2009 +0000

    trivial: tiny fix to fix the PkDesktop self test when using the dummy backend

diff --git a/lib/packagekit-glib/pk-desktop.c b/lib/packagekit-glib/pk-desktop.c
index b8108ed..324847b 100644
--- a/lib/packagekit-glib/pk-desktop.c
+++ b/lib/packagekit-glib/pk-desktop.c
@@ -365,7 +365,7 @@ pk_desktop_test (EggTest *test)
 	/************************************************************/
 	egg_test_title (test, "get files");
 	array = pk_desktop_get_files_for_package (desktop, "gnome-packagekit", NULL);
-	if (array->len > 5)
+	if (array->len >= 5)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "length=%i", array->len);
commit 7f6add445a2847337dabddbdc40005044cb35821
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 17:05:24 2009 +0000

    trivial: fix to last patch fixing compile on old xulrunner versions

diff --git a/contrib/browser-plugin/Makefile.am b/contrib/browser-plugin/Makefile.am
index 4f5a12d..9f3b570 100644
--- a/contrib/browser-plugin/Makefile.am
+++ b/contrib/browser-plugin/Makefile.am
@@ -11,7 +11,7 @@ packagekit_plugin_la_CPPFLAGS =			\
 if PK_XULRUNNER_PLUGIN_NEW
 packagekit_plugin_la_CPPFLAGS += -I$(srcdir)/sdk-new
 else
-packagekit_plugin_la_CPPFLAGS += -I$(srcdir)/sdk-new
+packagekit_plugin_la_CPPFLAGS += -I$(srcdir)/sdk
 endif
 
 packagekit_plugin_la_LIBADD =			\
commit fdcb193a602a1c843fdf3a3d18772fd717acd04c
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Mon Jan 19 16:59:54 2009 +0000

    bugfix: fix compile of the browser plugin with newer versions of xulrunner

diff --git a/contrib/browser-plugin/Makefile.am b/contrib/browser-plugin/Makefile.am
index 7141a56..4f5a12d 100644
--- a/contrib/browser-plugin/Makefile.am
+++ b/contrib/browser-plugin/Makefile.am
@@ -4,26 +4,39 @@ plugin_LTLIBRARIES = packagekit-plugin.la
 packagekit_plugin_la_LDFLAGS = -rpath $(plugindir) -module -avoid-version -no-undefined
 packagekit_plugin_la_CPPFLAGS =			\
 	$(PK_BROWSER_PLUGIN_CFLAGS)		\
-	$(WARNINGFLAGS_CPP)			\
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"	\
-	-I$(top_srcdir)/lib			\
-	-I$(srcdir)/sdk
+	-DXP_UNIX				\
+	-I$(top_srcdir)/lib
 
-packagekit_plugin_la_LIBADD =				\
-	$(PK_BROWSER_PLUGIN_LIBS)			\
+if PK_XULRUNNER_PLUGIN_NEW
+packagekit_plugin_la_CPPFLAGS += -I$(srcdir)/sdk-new
+else
+packagekit_plugin_la_CPPFLAGS += -I$(srcdir)/sdk-new
+endif
+
+packagekit_plugin_la_LIBADD =			\
+	$(PK_BROWSER_PLUGIN_LIBS)		\
 	$(top_builddir)/lib/packagekit-glib/libpackagekit-glib.la
 
-packagekit_plugin_la_SOURCES = 	\
-	sdk/np_entry.cpp	\
-	sdk/npn_gate.cpp	\
-	sdk/npp_gate.cpp	\
-	sdk/npplat.h		\
-	sdk/pluginbase.h	\
-				\
-	src/contents.cpp	\
-	src/contents.h		\
-	src/plugin.cpp		\
+packagekit_plugin_la_SOURCES =			\
+	src/contents.cpp			\
+	src/contents.h				\
+	src/plugin.cpp				\
 	src/plugin.h
 
+if PK_XULRUNNER_PLUGIN_NEW
+packagekit_plugin_la_SOURCES +=			\
+	sdk-new/npplat.h			\
+	sdk-new/pluginbase.h
+else
+packagekit_plugin_la_SOURCES +=			\
+	sdk/np_entry.cpp			\
+	sdk/npn_gate.cpp			\
+	sdk/npp_gate.cpp			\
+	sdk/npplat.h				\
+	sdk/pluginbase.h
+endif
+
 EXTRA_DIST =					\
 	tests/test.html
+
diff --git a/contrib/browser-plugin/sdk-new/npplat.h b/contrib/browser-plugin/sdk-new/npplat.h
new file mode 100644
index 0000000..d426a88
--- /dev/null
+++ b/contrib/browser-plugin/sdk-new/npplat.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef npplat_h_
+#define npplat_h_
+
+#include "npapi.h"
+#include "npfunctions.h"
+
+#ifdef XP_WIN
+#include "windows.h"
+#endif
+
+#ifdef XP_UNIX
+#include <stdio.h>
+#endif
+
+#ifdef XP_MAC
+#include <Carbon/Carbon.h>
+#endif
+
+#ifndef HIBYTE
+#define HIBYTE(i) (i >> 8)
+#endif
+
+#ifndef LOBYTE
+#define LOBYTE(i) (i & 0xff)
+#endif
+
+#endif // npplat_h_
diff --git a/contrib/browser-plugin/sdk-new/pluginbase.h b/contrib/browser-plugin/sdk-new/pluginbase.h
new file mode 100644
index 0000000..1168bca
--- /dev/null
+++ b/contrib/browser-plugin/sdk-new/pluginbase.h
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef pluginbase_h_
+#define pluginbase_h_
+
+#include "npplat.h"
+
+struct nsPluginCreateData
+{
+  NPP instance;
+  NPMIMEType type; 
+  uint16_t mode; 
+  int16_t argc; 
+  char** argn; 
+  char** argv; 
+  NPSavedData* saved;
+};
+
+class nsPluginInstanceBase
+{
+public:
+  // these three methods must be implemented in the derived
+  // class platform specific way
+  virtual NPBool init(NPWindow* aWindow) = 0;
+  virtual void shut() = 0;
+  virtual NPBool isInitialized() = 0;
+
+  // implement all or part of those methods in the derived 
+  // class as needed
+  virtual NPError SetWindow(NPWindow* pNPWindow)                    { return NPERR_NO_ERROR; }
+  virtual NPError NewStream(NPMIMEType type, NPStream* stream, 
+                            NPBool seekable, uint16_t* stype)       { return NPERR_NO_ERROR; }
+  virtual NPError DestroyStream(NPStream *stream, NPError reason)   { return NPERR_NO_ERROR; }
+  virtual void    StreamAsFile(NPStream* stream, const char* fname) { return; }
+  virtual int32_t WriteReady(NPStream *stream)                      { return 0x0fffffff; }
+  virtual int32_t Write(NPStream *stream, int32_t offset, 
+                        int32_t len, void *buffer)                  { return len; }
+  virtual void    Print(NPPrint* printInfo)                         { return; }
+  virtual uint16_t HandleEvent(void* event)                         { return 0; }
+  virtual void    URLNotify(const char* url, NPReason reason, 
+                            void* notifyData)                       { return; }
+  virtual NPError GetValue(NPPVariable variable, void *value)       { return NPERR_NO_ERROR; }
+  virtual NPError SetValue(NPNVariable variable, void *value)       { return NPERR_NO_ERROR; }
+};
+
+// functions that should be implemented for each specific plugin
+
+// creation and destruction of the object of the derived class
+nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct);
+void NS_DestroyPluginInstance(nsPluginInstanceBase * aPlugin);
+
+// global plugin initialization and shutdown
+NPError NS_PluginInitialize();
+void NS_PluginShutdown();
+
+#ifdef XP_UNIX
+// global to get plugins name & description 
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue);
+#endif
+
+#endif // pluginbase_h_
commit 792873f5d3944f7f1cdf2e42e6060d5f3186596e
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Mon Jan 19 16:55:08 2009 +0000

    trivial: add detection for newer xulrunners as this will need new sdk includes

diff --git a/configure.ac b/configure.ac
index 95480f7..f8a0cc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,6 +326,7 @@ if test x$enable_browser_plugin = xyes; then
 		LDFLAGS="$CPPFLAGS $PK_BROWSER_PLUGIN_LIBS"
 
 		AC_CHECK_FUNCS(gdk_app_launch_context_new)
+		AC_CHECK_HEADER(npfunctions.h, xulrunner_plugin_new=yes, xulrunner_plugin_new=no)
 
 		CPPFLAGS="$packagekit_save_CPPFLAGS"
 		LDFLAGS="$packagekit_save_LDFLAGS"
@@ -334,6 +335,7 @@ else
 	build_browser_plugin=no
 fi
 AM_CONDITIONAL(PK_BUILD_BROWSER_PLUGIN, test $build_browser_plugin = "yes")
+AM_CONDITIONAL(PK_XULRUNNER_PLUGIN_NEW, test $xulrunner_plugin_new = "yes")
 
 dnl ---------------------------------------------------------------------------
 dnl - Able to build gstreamer plugin
commit 383520061982a2e473fb6a4d4f6886c15e3c577f
Merge: 8385449... b1aee09...
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Mon Jan 19 16:00:51 2009 +0000

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit b1aee095fc0c16a99e1e307487e6132118d953f1
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 16:00:35 2009 +0000

    trivial: fix building the mozilla plugin on f11 now uint16 is not typedef'd

diff --git a/contrib/browser-plugin/src/plugin.cpp b/contrib/browser-plugin/src/plugin.cpp
index d842b94..565e8b3 100644
--- a/contrib/browser-plugin/src/plugin.cpp
+++ b/contrib/browser-plugin/src/plugin.cpp
@@ -250,7 +250,7 @@ PkpPluginInstance::refresh()
 	NPN_InvalidateRect(mInstance, &rect);
 }
 
-uint16
+uint16_t
 PkpPluginInstance::HandleEvent(void *event)
 {
 	XEvent *xev = (XEvent *)event;
diff --git a/contrib/browser-plugin/src/plugin.h b/contrib/browser-plugin/src/plugin.h
index ded4b69..28c64fd 100644
--- a/contrib/browser-plugin/src/plugin.h
+++ b/contrib/browser-plugin/src/plugin.h
@@ -54,7 +54,7 @@ public:
 	NPBool isInitialized() {return mInitialized;}
 	NPError GetValue(NPPVariable variable, void *value);
 	NPError SetWindow(NPWindow* aWindow);
-	uint16 HandleEvent(void *event);
+	uint16_t HandleEvent(void *event);
 
 	void refresh();
 
commit 8385449c94106abe25944514214f59c8fae17c74
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Mon Jan 19 15:50:43 2009 +0000

    trivial: remove unused third parameter from AM_CONDITIONAL

diff --git a/configure.ac b/configure.ac
index 15e171e..95480f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -403,19 +403,19 @@ AC_ARG_ENABLE(yum, AS_HELP_STRING([--enable-yum],[use the YUM backend]),enable_y
 AC_ARG_ENABLE(zypp, AS_HELP_STRING([--enable-zypp],[use the Zypp backend]),enable_zypp=$enableval,enable_zypp=no)
 
 # export to Makefile.am's
-AM_CONDITIONAL(BACKEND_TYPE_ALPM, [test x$enable_alpm = xyes], [using ALPM backend])
-AM_CONDITIONAL(BACKEND_TYPE_APT, [test x$enable_apt = xyes], [using APT backend])
-AM_CONDITIONAL(BACKEND_TYPE_BOX, [test x$enable_box = xyes], [using BOX backend])
-AM_CONDITIONAL(BACKEND_TYPE_CONARY, [test x$enable_conary = xyes], [using CONARY backend])
-AM_CONDITIONAL(BACKEND_TYPE_DUMMY, [test x$enable_dummy = xyes], [using dummy backend])
-AM_CONDITIONAL(BACKEND_TYPE_OPKG, [test x$enable_opkg = xyes], [using OPKG backend])
-AM_CONDITIONAL(BACKEND_TYPE_PISI, [test x$enable_pisi = xyes], [using PiSi backend])
-AM_CONDITIONAL(BACKEND_TYPE_POLDEK, [test x$enable_poldek = xyes], [using poldek backend])
-AM_CONDITIONAL(BACKEND_TYPE_RAZOR, [test x$enable_razor = xyes], [using Razor backend])
-AM_CONDITIONAL(BACKEND_TYPE_SMART, [test x$enable_smart = xyes], [using SMART backend])
-AM_CONDITIONAL(BACKEND_TYPE_URPMI, [test x$enable_urpmi = xyes], [using URPMI backend])
-AM_CONDITIONAL(BACKEND_TYPE_YUM, [test x$enable_yum = xyes], [using YUM backend])
-AM_CONDITIONAL(BACKEND_TYPE_ZYPP, [test x$enable_zypp = xyes], [using Zypp backend])
+AM_CONDITIONAL(BACKEND_TYPE_ALPM, [test x$enable_alpm = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_APT, [test x$enable_apt = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_BOX, [test x$enable_box = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_CONARY, [test x$enable_conary = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_DUMMY, [test x$enable_dummy = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_OPKG, [test x$enable_opkg = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_PISI, [test x$enable_pisi = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_POLDEK, [test x$enable_poldek = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_RAZOR, [test x$enable_razor = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_SMART, [test x$enable_smart = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_URPMI, [test x$enable_urpmi = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_YUM, [test x$enable_yum = xyes])
+AM_CONDITIONAL(BACKEND_TYPE_ZYPP, [test x$enable_zypp = xyes])
 
 if test x$enable_gcov = xyes; then
 	## so that config.h changes when you toggle gcov support
@@ -527,8 +527,8 @@ else
 	AC_MSG_ERROR([No valid security framework specified])
 fi
 
-AM_CONDITIONAL(SECURITY_TYPE_DUMMY, [test x$with_security_framework = xdummy], [using dummy security framework])
-AM_CONDITIONAL(SECURITY_TYPE_POLKIT, [test x$with_security_framework = xpolkit], [using PolicyKit security framework])
+AM_CONDITIONAL(SECURITY_TYPE_DUMMY, [test x$with_security_framework = xdummy])
+AM_CONDITIONAL(SECURITY_TYPE_POLKIT, [test x$with_security_framework = xpolkit])
 
 dnl ---------------------------------------------------------------------------
 dnl - Compile time default choice of backend
commit b613169a52a4a562a186e7af4a13b50b874de191
Merge: 85b496c... fe5b6d2...
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Mon Jan 19 15:27:54 2009 +0000

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit fe5b6d2364d7035232da69e0a5b602fe56757474
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:38:54 2009 +0000

    bugfix: clear the backend store in pk_backend_reset() rather than pk_backend_finished_delay() as we couldn't ensure the ordering for cancelled jobs

diff --git a/src/pk-backend.c b/src/pk-backend.c
index a4d6995..0a73a66 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -1447,9 +1447,6 @@ pk_backend_finished_delay (gpointer data)
 	if (backend->priv->exit == PK_EXIT_ENUM_UNKNOWN)
 		pk_backend_set_exit_code (backend, PK_EXIT_ENUM_SUCCESS);
 
-	/* clear all state */
-	pk_store_reset (backend->priv->store);
-
 	egg_debug ("emit finished %i", backend->priv->exit);
 	g_signal_emit (backend, signals [PK_BACKEND_FINISHED], 0, backend->priv->exit);
 	backend->priv->signal_finished = 0;
@@ -1873,6 +1870,7 @@ pk_backend_reset (PkBackend *backend)
 	backend->priv->last_remaining = 0;
 	backend->priv->last_percentage = PK_BACKEND_PERCENTAGE_DEFAULT;
 	backend->priv->last_subpercentage = PK_BACKEND_PERCENTAGE_INVALID;
+	pk_store_reset (backend->priv->store);
 	pk_time_reset (backend->priv->time);
 
 	return TRUE;
commit 7c227f3a4deafabd4284b72cb91a9e20c9bf555a
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:35:34 2009 +0000

    trivial: fix up the self tests now that RequireRestart requires a package id

diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 5bb58cd..a5dba92 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -955,18 +955,26 @@ pk_backend_test_spawn (EggTest *test)
 
 	/************************************************************/
 	egg_test_title (test, "test pk_backend_spawn_parse_stdout RequireRestart");
-	ret = pk_backend_spawn_parse_stdout (backend_spawn, "requirerestart\tsystem\tdetails about the restart");
+	ret = pk_backend_spawn_parse_stdout (backend_spawn, "requirerestart\tsystem\tgnome-power-manager;0.0.1;i386;data");
 	egg_test_assert (test, ret);
 
 	/************************************************************/
-	egg_test_title (test, "test pk_backend_spawn_parse_stdout RequireRestart");
-	ret = pk_backend_spawn_parse_stdout (backend_spawn, "requirerestart\tmooville\tdetails about the restart");
+	egg_test_title (test, "test pk_backend_spawn_parse_stdout RequireRestart invalid enum");
+	ret = pk_backend_spawn_parse_stdout (backend_spawn, "requirerestart\tmooville\tgnome-power-manager;0.0.1;i386;data");
 	if (!ret)
 		egg_test_success (test, NULL);
 	else
 		egg_test_failed (test, "did not detect incorrect enum");
 
 	/************************************************************/
+	egg_test_title (test, "test pk_backend_spawn_parse_stdout RequireRestart invalid PackageId");
+	ret = pk_backend_spawn_parse_stdout (backend_spawn, "requirerestart\tsystem\tdetails about the restart");
+	if (!ret)
+		egg_test_success (test, NULL);
+	else
+		egg_test_failed (test, "did not detect incorrect package id");
+
+	/************************************************************/
 	egg_test_title (test, "test pk_backend_spawn_parse_stdout AllowUpdate1");
 	ret = pk_backend_spawn_parse_stdout (backend_spawn, "allow-cancel\ttrue");
 	egg_test_assert (test, ret);
commit 19ac587cc7e2f250518ee8e58bfc40e96a73232a
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:26:51 2009 +0000

    bugfix: only try to exit the spawned backend if it is running, which removes an error warning if it is already closed

diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index afef89e..5bb58cd 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -677,9 +677,16 @@ pk_backend_spawn_kill (PkBackendSpawn *backend_spawn)
 static gboolean
 pk_backend_spawn_exit_timeout_cb (PkBackendSpawn *backend_spawn)
 {
+	gboolean ret;
+
 	g_return_val_if_fail (PK_IS_BACKEND_SPAWN (backend_spawn), FALSE);
-	egg_debug ("closing dispatcher as idle");
-	pk_spawn_exit (backend_spawn->priv->spawn);
+
+	/* only try to close if running */
+	ret = pk_spawn_is_running (backend_spawn->priv->spawn);
+	if (ret) {
+		egg_debug ("closing dispatcher as running and is idle");
+		pk_spawn_exit (backend_spawn->priv->spawn);
+	}
 	return FALSE;
 }
 
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 7b5aac7..9fb3934 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -279,6 +279,18 @@ pk_spawn_sigkill_cb (PkSpawn *spawn)
 }
 
 /**
+ * pk_spawn_is_running:
+ *
+ * Is this instance controlling a script?
+ *
+ **/
+gboolean
+pk_spawn_is_running (PkSpawn *spawn)
+{
+	return (spawn->priv->child_pid != -1);
+}
+
+/**
  * pk_spawn_kill:
  *
  * We send SIGQUIT and after a few ms SIGKILL
diff --git a/src/pk-spawn.h b/src/pk-spawn.h
index 3c181dd..98211f0 100644
--- a/src/pk-spawn.h
+++ b/src/pk-spawn.h
@@ -70,6 +70,7 @@ gboolean	 pk_spawn_argv				(PkSpawn	*spawn,
 							 gchar		**argv,
 							 gchar		**envp)
 							 G_GNUC_WARN_UNUSED_RESULT;
+gboolean	 pk_spawn_is_running			(PkSpawn	*spawn);
 gboolean	 pk_spawn_kill				(PkSpawn	*spawn);
 gboolean	 pk_spawn_exit				(PkSpawn	*spawn);
 
commit d45b6b01749878591ba3716457871f5f46dc3219
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:26:07 2009 +0000

    trivial: add some more debugging when setting store in PkTransaction

diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index b7d8c60..9531ee8 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -996,6 +996,7 @@ pk_transaction_set_running (PkTransaction *transaction)
 
 	/* set the role */
 	pk_backend_set_role (priv->backend, priv->role);
+	egg_debug ("setting role for %s to %s", priv->tid, pk_role_enum_to_text (priv->role));
 
 	/* connect up the signals */
 	transaction->priv->signal_allow_cancel =
commit 35d5455ec79a0f3ec795d54a3b22566c711ae4d7
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:12:28 2009 +0000

    trivial: improve a debugging string to be more clear

diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index 2abceef..8d61ef9 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -504,7 +504,7 @@ pk_transaction_list_get_array (PkTransactionList *tlist)
 		if (item->committed && !item->finished)
 			g_ptr_array_add (parray, g_strdup (item->tid));
 	}
-	egg_debug ("%i transactions in list, %i active", length, parray->len);
+	egg_debug ("%i transactions in list, %i committed but not finished", length, parray->len);
 	array = pk_ptr_array_to_strv (parray);
 	g_ptr_array_foreach (parray, (GFunc) g_free, NULL);
 	g_ptr_array_free (parray, TRUE);
commit d01ba0c4cbc8ccdb03e142335d2a48c00bf0c8f7
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:12:01 2009 +0000

    trivial: convert the error enum to text when we display the debugging output

diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 03231f7..7b5aac7 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -145,6 +145,27 @@ pk_spawn_emit_whole_lines (PkSpawn *spawn, GString *string)
 }
 
 /**
+ * pk_spawn_exit_type_enum_to_text:
+ **/
+static const gchar *
+pk_spawn_exit_type_enum_to_text (PkSpawnExitType type)
+{
+	if (type == PK_SPAWN_EXIT_TYPE_SUCCESS)
+		return "success";
+	if (type == PK_SPAWN_EXIT_TYPE_FAILED)
+		return "failed";
+	if (type == PK_SPAWN_EXIT_TYPE_DISPATCHER_CHANGED)
+		return "dispatcher-changed";
+	if (type == PK_SPAWN_EXIT_TYPE_DISPATCHER_EXIT)
+		return "dispatcher-exit";
+	if (type == PK_SPAWN_EXIT_TYPE_SIGQUIT)
+		return "sigquit";
+	if (type == PK_SPAWN_EXIT_TYPE_SIGKILL)
+		return "sigkill";
+	return "unknown";
+}
+
+/**
  * pk_spawn_check_child:
  **/
 static gboolean
@@ -220,7 +241,7 @@ pk_spawn_check_child (PkSpawn *spawn)
 		spawn->priv->exit = PK_SPAWN_EXIT_TYPE_DISPATCHER_EXIT;
 
 	/* don't emit if we just closed an invalid dispatcher */
-	egg_debug ("emitting exit %i", spawn->priv->exit);
+	egg_debug ("emitting exit %s", pk_spawn_exit_type_enum_to_text (spawn->priv->exit));
 	g_signal_emit (spawn, signals [PK_SPAWN_EXIT], 0, spawn->priv->exit);
 
 	return FALSE;
commit 863142c7a3278ff816e3e719d4c439ccdeeba14f
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:02:57 2009 +0000

    trivial: add some debugging when the exit fails

diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 6052c8d..03231f7 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -442,7 +442,9 @@ pk_spawn_argv (PkSpawn *spawn, gchar **argv, gchar **envp)
 		/* kill off existing instance */
 		egg_debug ("changing dispatcher (exit old instance)");
 		spawn->priv->is_changing_dispatcher = TRUE;
-		pk_spawn_exit (spawn);
+		ret = pk_spawn_exit (spawn);
+		if (!ret)
+			egg_warning ("failed to exit previous instance");
 		spawn->priv->is_changing_dispatcher = FALSE;
 	}
 
commit 10f35c1e9af3c89b60e6a0a3e847d350d86dad7e
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:02:19 2009 +0000

    trivial: only exit TRUE when pk_spawn_exit() does not timeout

diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 79768e2..6052c8d 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -374,7 +374,8 @@ pk_spawn_exit (PkSpawn *spawn)
 	} while (ret && count++ < 50);
 
 	/* the script exited okay */
-	ret = TRUE;
+	if (count < 50)
+		ret = TRUE;
 out:
 	spawn->priv->is_sending_exit = FALSE;
 	return ret;
commit bfc45004dfc9e265e4fcd943cf5b9b992f5bcf3f
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Jan 19 10:01:24 2009 +0000

    trivial: add some debugging when writing fails

diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 6e59a80..79768e2 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -328,7 +328,7 @@ pk_spawn_send_stdin (PkSpawn *spawn, const gchar *command)
 	/* write to the waiting process */
 	wrote = write (spawn->priv->stdin_fd, buffer, length);
 	if (wrote != length) {
-		egg_warning ("wrote %i/%i bytes on fd %i", wrote, length, spawn->priv->stdin_fd);
+		egg_warning ("wrote %i/%i bytes on fd %i (%s)", wrote, length, spawn->priv->stdin_fd, strerror (errno));
 		ret = FALSE;
 	}
 out:
commit c3bc22f00d696011713e125c427066ff242994e6
Merge: 4ff9aaf... 9f686a9...
Author: Richard Hughes <richard at hughsie.com>
Date:   Sun Jan 18 19:10:58 2009 +0000

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit 9f686a91c26ea4fb87d5e3004a0a38a21b0440d2
Author: Pavol Å imo <palo.simo at gmail.com>
Date:   Sat Jan 17 12:57:37 2009 +0000

    Updated Slovak translation
    
    Transmitted-via: Transifex (translate.fedoraproject.org)

diff --git a/po/sk.po b/po/sk.po
index 76e18a8..4213770 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,232 +11,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PackageKit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-15 16:57+0000\n"
-"PO-Revision-Date: 2008-11-20 20:31+0100\n"
+"POT-Creation-Date: 2008-11-24 01:31+0000\n"
+"PO-Revision-Date: 2009-01-17 13:53+0100\n"
 "Last-Translator: Pavol Å imo <palo.simo at gmail.com>\n"
 "Language-Team: Fedora Project <fedora-cs-list at redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. TRANSLATORS: this is an atomic transaction
-#: ../client/pk-console.c:230
-msgid "Transaction"
-msgstr ""
-
-#. TRANSLATORS: this is the time the transaction was started in system timezone
-#: ../client/pk-console.c:232
-msgid "System time"
-msgstr ""
-
-#. TRANSLATORS: this is if the transaction succeeded or not
-#: ../client/pk-console.c:234
-msgid "Succeeded"
-msgstr ""
-
-#. TRANSLATORS: if the repo is enabled
-#: ../client/pk-console.c:234 ../client/pk-console.c:377
-msgid "True"
-msgstr ""
-
-#: ../client/pk-console.c:234 ../client/pk-console.c:377
-msgid "False"
-msgstr ""
-
-#. TRANSLATORS: this is the transactions role, e.g. "update-system"
-#: ../client/pk-console.c:236
-msgid "Role"
-msgstr ""
-
-#. TRANSLATORS: this is The duration of the transaction
-#: ../client/pk-console.c:241
-msgid "Duration"
-msgstr ""
-
-#: ../client/pk-console.c:241
-msgid "(seconds)"
-msgstr ""
-
-#. TRANSLATORS: this is The command line used to do the action
-#: ../client/pk-console.c:245
-#, fuzzy
-msgid "Command line"
-msgstr "PrÃkaz neuspel"
-
-#. TRANSLATORS: this is the user ID of the user that started the action
-#: ../client/pk-console.c:247
-msgid "User ID"
-msgstr ""
-
-#. TRANSLATORS: this is the username, e.g. hughsie
-#: ../client/pk-console.c:254
-msgid "Username"
-msgstr ""
-
-#. TRANSLATORS: this is the users real name, e.g. "Richard Hughes"
-#: ../client/pk-console.c:258
-msgid "Real name"
-msgstr ""
-
-#: ../client/pk-console.c:266
-#, fuzzy
-msgid "Affected packages:"
-msgstr "AktualizovaÅ¥ balÃÄek"
-
-#: ../client/pk-console.c:268
-msgid "Affected packages: None"
-msgstr ""
-
-#. TRANSLATORS: this is the distro, e.g. Fedora 10
-#: ../client/pk-console.c:293
-msgid "Distribution"
-msgstr ""
-
-#. TRANSLATORS: this is type of update, stable or testing
-#: ../client/pk-console.c:295
-msgid "Type"
-msgstr ""
-
-#. TRANSLATORS: this is any summary text describing the upgrade
-#. TRANSLATORS: this is the summary of the group
-#: ../client/pk-console.c:297 ../client/pk-console.c:319
-msgid "Summary"
-msgstr ""
-
-#. TRANSLATORS: this is the group category name
-#: ../client/pk-console.c:309
-msgid "Category"
-msgstr ""
-
-#. TRANSLATORS: this is group identifier
-#: ../client/pk-console.c:311
-msgid "ID"
-msgstr ""
-
-#. TRANSLATORS: this is the parent group
-#: ../client/pk-console.c:314
-msgid "Parent"
-msgstr ""
-
-#: ../client/pk-console.c:316
-msgid "Name"
-msgstr ""
-
-#. TRANSLATORS: this is preferred icon for the group
-#: ../client/pk-console.c:322
-msgid "Icon"
-msgstr ""
+"Content-Transfer-Encoding: 8bit"
 
 #. TRANSLATORS: this is a header for the package that can be updated
-#: ../client/pk-console.c:337
+#: ../client/pk-console.c:287
 msgid "Details about the update:"
 msgstr "Podrobnosti o aktualizÃ¡cii:"
 
-#: ../client/pk-console.c:338
-#, fuzzy
-msgid "Package"
-msgstr "Zonam sÃºborov v balÃÄku"
-
-#: ../client/pk-console.c:340
-#, fuzzy
-msgid "Updates"
-msgstr "AktualizovaÅ¥ balÃÄek"
-
-#: ../client/pk-console.c:342
-msgid "Obsoletes"
-msgstr ""
-
-#: ../client/pk-console.c:344
-msgid "Vendor"
-msgstr ""
-
-#: ../client/pk-console.c:346
-msgid "Bugzilla"
-msgstr ""
-
-#: ../client/pk-console.c:348
-msgid "CVE"
-msgstr ""
-
-#: ../client/pk-console.c:350
-msgid "Restart"
-msgstr ""
-
-#: ../client/pk-console.c:352
-#, fuzzy
-msgid "Update text"
-msgstr "Podrobnosti o aktualizÃ¡cii"
-
-#: ../client/pk-console.c:354
-msgid "Changes"
-msgstr ""
-
-#: ../client/pk-console.c:356
-msgid "State"
-msgstr ""
-
-#: ../client/pk-console.c:359
-msgid "Issued"
-msgstr ""
-
-#: ../client/pk-console.c:362
-#, fuzzy
-msgid "Updated"
-msgstr "Podrobnosti o aktualizÃ¡cii"
-
-#: ../client/pk-console.c:448 ../client/pk-console.c:450
-msgid "Percentage"
-msgstr ""
-
-#: ../client/pk-console.c:450
-msgid "Unknown"
-msgstr ""
-
-#. TRANSLATORS: a package requires the system to be restarted
-#: ../client/pk-console.c:501
-#, fuzzy
-msgid "System restart required by:"
-msgstr "Je potrebnÃ½ reÅ¡tart systÃ©mu"
-
-#. TRANSLATORS: a package requires the session to be restarted
-#: ../client/pk-console.c:504
-#, fuzzy
-msgid "Session restart required:"
-msgstr "Je potrebnÃ½ reÅ¡tart systÃ©mu"
-
-#. TRANSLATORS: a package requires the application to be restarted
-#: ../client/pk-console.c:507
-#, fuzzy
-msgid "Application restart required by:"
-msgstr "Je potrebnÃ© aplikÃ¡ciu ukonÄiÅ¥ a znovu spustiÅ¥"
-
-#: ../client/pk-console.c:543
+#: ../client/pk-console.c:480
 msgid "Please restart the computer to complete the update."
 msgstr "Pre dokonÄenie aktualizÃ¡cie reÅ¡tartujte poÄÃtaÄ."
 
-#: ../client/pk-console.c:545
+#: ../client/pk-console.c:482
 msgid "Please logout and login to complete the update."
 msgstr "Pre dokonÄenie aktualizÃ¡cie sa odhlÃ¡ste a znovu prihlÃ¡ste."
 
-#: ../client/pk-console.c:547
+#: ../client/pk-console.c:484
 msgid "Please restart the application as it is being used."
 msgstr "ReÅ¡tartujte aplikÃ¡ciu, pretoÅ¾e sa momentÃ¡lne pouÅ¾Ãva."
 
 #. TRANSLATORS: The package is already installed on the system
-#: ../client/pk-console.c:659
-#, fuzzy, c-format
+#: ../client/pk-console.c:596
+#, c-format
 msgid "The package %s is already installed"
-msgstr "BalÃÄek '%s' uÅ¾ je nainÅ¡talovanÃ½"
+msgstr "BalÃÄek %s je uÅ¾ nainÅ¡talovanÃ½"
 
 #. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
-#: ../client/pk-console.c:667
-#, fuzzy, c-format
+#: ../client/pk-console.c:604
+#, c-format
 msgid "The package %s could not be installed: %s"
-msgstr "BalÃÄek '%s' nemÃ´Å¾e byÅ¥ nainÅ¡talovanÃ½: %s"
+msgstr "BalÃÄek %s nemÃ´Å¾e byÅ¥ nainÅ¡talovanÃ½: %s"
 
 #. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
-#: ../client/pk-console.c:692 ../client/pk-console.c:719
-#: ../client/pk-console.c:815 ../client/pk-console.c:932
+#: ../client/pk-console.c:629 ../client/pk-console.c:656
+#: ../client/pk-console.c:752 ../client/pk-console.c:869
 #: ../client/pk-tools-common.c:61 ../client/pk-tools-common.c:79
 #: ../client/pk-tools-common.c:86
 #, c-format
@@ -244,367 +58,362 @@ msgid "Internal error: %s"
 msgstr "VnÃºtornÃ¡ chyba: %s"
 
 #. TRANSLATORS: There was an error installing the packages. The detailed error follows
-#: ../client/pk-console.c:700 ../client/pk-console.c:1327
+#: ../client/pk-console.c:637 ../client/pk-console.c:1264
 #, c-format
 msgid "This tool could not install the packages: %s"
 msgstr "Nepodarilo sa nainÅ¡talovaÅ¥ balÃÄky: %s"
 
 #. TRANSLATORS: There was an error installing the files. The detailed error follows
-#: ../client/pk-console.c:727
+#: ../client/pk-console.c:664
 #, c-format
 msgid "This tool could not install the files: %s"
 msgstr "Nepodarilo sa nainÅ¡talovaÅ¥ sÃºbory: %s"
 
 #. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
-#: ../client/pk-console.c:783
-#, fuzzy, c-format
+#: ../client/pk-console.c:720
+#, c-format
 msgid "This tool could not remove %s: %s"
-msgstr "Nepodarilo sa odstrÃ¡niÅ¥ '%s': %s"
+msgstr "Nepodarilo sa odstrÃ¡niÅ¥ %s: %s"
 
 #. TRANSLATORS: There was an error removing the packages. The detailed error follows
-#: ../client/pk-console.c:806 ../client/pk-console.c:844
-#: ../client/pk-console.c:877
+#: ../client/pk-console.c:743 ../client/pk-console.c:781
+#: ../client/pk-console.c:814
 #, c-format
 msgid "This tool could not remove the packages: %s"
 msgstr "Nepodarilo sa odstrÃ¡niÅ¥ balÃÄky: %s"
 
 #. TRANSLATORS: When removing, we might have to remove other dependencies
-#: ../client/pk-console.c:856
+#: ../client/pk-console.c:793
 msgid "The following packages have to be removed:"
 msgstr "NasledujÃºce balÃÄky budÃº musieÅ¥ byÅ¥ odstrÃ¡nenÃ©:"
 
 #. TRANSLATORS: We are checking if it's okay to remove a list of packages
-#: ../client/pk-console.c:863
+#: ../client/pk-console.c:800
 msgid "Proceed removing additional packages?"
 msgstr "PokraÄovaÅ¥ a odstrÃ¡niÅ¥ doplnkovÃ© balÃÄky?"
 
 #. TRANSLATORS: We did not remove any packages
-#: ../client/pk-console.c:868
+#: ../client/pk-console.c:805
 msgid "The package removal was canceled!"
 msgstr "OdstrÃ¡nenie balÃÄkov bolo zruÅ¡enÃ©!"
 
 #. TRANSLATORS: The package name was not found in any software sources
-#: ../client/pk-console.c:909
-#, fuzzy, c-format
+#: ../client/pk-console.c:846
+#, c-format
 msgid "This tool could not download the package %s as it could not be found"
-msgstr "Nepodarilo sa zÃskaÅ¥ balÃÄek '%s', balÃÄek nebol nÃ¡jdenÃ½"
+msgstr "Nepodarilo sa zÃskaÅ¥ balÃÄek %s, balÃÄek nebol nÃ¡jdenÃ½"
 
 #. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
-#: ../client/pk-console.c:940
+#: ../client/pk-console.c:877
 #, c-format
 msgid "This tool could not download the packages: %s"
 msgstr "Nepodarilo sa zÃskaÅ¥ balÃÄky: %s"
 
 #. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:967 ../client/pk-console.c:976
-#, fuzzy, c-format
+#: ../client/pk-console.c:904 ../client/pk-console.c:913
+#, c-format
 msgid "This tool could not update %s: %s"
-msgstr "Nepodarilo sa aktualizovaÅ¥ '%s': %s"
+msgstr "Nepodarilo sa aktualizovaÅ¥ %s: %s"
 
 #. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:998 ../client/pk-console.c:1006
-#, fuzzy, c-format
+#: ../client/pk-console.c:935 ../client/pk-console.c:943
+#, c-format
 msgid "This tool could not get the requirements for %s: %s"
-msgstr "Nepodarilo sa zÃskaÅ¥ poÅ¾iadavky balÃÄka '%s': %s"
+msgstr "Nepodarilo sa zÃskaÅ¥ poÅ¾iadavky balÃÄka %s: %s"
 
 #. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
-#: ../client/pk-console.c:1028 ../client/pk-console.c:1036
-#, fuzzy, c-format
+#: ../client/pk-console.c:965 ../client/pk-console.c:973
+#, c-format
 msgid "This tool could not get the dependencies for %s: %s"
-msgstr "Nepodarilo sa zÃskaÅ¥ zÃ¡vislosti pre '%s': %s"
+msgstr "Nepodarilo sa zÃskaÅ¥ zÃ¡vislosti pre %s: %s"
 
 #. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
-#: ../client/pk-console.c:1058 ../client/pk-console.c:1066
-#, fuzzy, c-format
+#: ../client/pk-console.c:995 ../client/pk-console.c:1003
+#, c-format
 msgid "This tool could not get package details for %s: %s"
-msgstr "Nepodarilo sa zÃskaÅ¥ detaily o balÃÄku '%s': %s"
+msgstr "Nepodarilo sa zÃskaÅ¥ detaily o balÃÄku %s: %s"
 
 #. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
-#: ../client/pk-console.c:1088
-#, fuzzy, c-format
+#: ../client/pk-console.c:1025
+#, c-format
 msgid "This tool could not find the files for %s: %s"
-msgstr "Nepodarilo sa nÃ¡jsÅ¥ zoznam sÃºborov balÃÄka '%s': %s"
+msgstr "Nepodarilo sa nÃ¡jsÅ¥ zoznam sÃºborov balÃÄka %s: %s"
 
 #. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:1096
-#, fuzzy, c-format
+#: ../client/pk-console.c:1033
+#, c-format
 msgid "This tool could not get the file list for %s: %s"
-msgstr "Nepodarilo sa zÃskaÅ¥ zoznam sÃºborov balÃÄka '%s': %s"
+msgstr "Nepodarilo sa zÃskaÅ¥ zoznam sÃºborov balÃÄka %s: %s"
 
 #. TRANSLATORS: There was an error getting the list of packages. The filename follows
-#: ../client/pk-console.c:1118
+#: ../client/pk-console.c:1055
 #, c-format
 msgid "File already exists: %s"
 msgstr "SÃºbor uÅ¾ existuje: %s"
 
 #. TRANSLATORS: follows a list of packages to install
-#: ../client/pk-console.c:1123 ../client/pk-console.c:1179
-#: ../client/pk-console.c:1254
+#: ../client/pk-console.c:1060 ../client/pk-console.c:1116
+#: ../client/pk-console.c:1191
 msgid "Getting package list"
 msgstr "ZÃskavanie zoznamu balÃÄkov"
 
 #. TRANSLATORS: There was an error getting the list of packages. The detailed error follows
-#: ../client/pk-console.c:1129 ../client/pk-console.c:1185
-#: ../client/pk-console.c:1260
+#: ../client/pk-console.c:1066 ../client/pk-console.c:1122
+#: ../client/pk-console.c:1197
 #, c-format
 msgid "This tool could not get package list: %s"
 msgstr "Nepodarilo sa zÃskaÅ¥ zoznam balÃÄkov: %s"
 
 # XXX
 #. TRANSLATORS: There was an error saving the list
-#: ../client/pk-console.c:1140
-#, c-format
+#: ../client/pk-console.c:1077
 msgid "Failed to save to disk"
 msgstr "Nebolo moÅ¾nÃ© uloÅ¾iÅ¥ na disk"
 
 #. TRANSLATORS: There was an error getting the list. The filename follows
-#: ../client/pk-console.c:1174 ../client/pk-console.c:1249
+#: ../client/pk-console.c:1111 ../client/pk-console.c:1186
 #, c-format
 msgid "File does not exist: %s"
 msgstr "SÃºbor neexistuje: %s"
 
 #. TRANSLATORS: header to a list of packages newly added
-#: ../client/pk-console.c:1206
+#: ../client/pk-console.c:1143
 msgid "Packages to add"
 msgstr "BalÃÄky na pridanie"
 
 #. TRANSLATORS: header to a list of packages removed
-#: ../client/pk-console.c:1214
+#: ../client/pk-console.c:1151
 msgid "Packages to remove"
 msgstr "BalÃÄky na odobratie"
 
 #. TRANSLATORS: We didn't find any differences
-#: ../client/pk-console.c:1282
-#, c-format
+#: ../client/pk-console.c:1219
 msgid "No new packages need to be installed"
 msgstr "Å½iadne novÃ© balÃÄky nemusia byÅ¥ nainÅ¡talovanÃ©"
 
 #. TRANSLATORS: follows a list of packages to install
-#: ../client/pk-console.c:1288
+#: ../client/pk-console.c:1225
 msgid "To install"
 msgstr "NainÅ¡talovaÅ¥"
 
 #. TRANSLATORS: searching takes some time....
-#: ../client/pk-console.c:1299
+#: ../client/pk-console.c:1236
 msgid "Searching for package: "
 msgstr "VyhÄ¾adÃ¡vanie balÃÄka: "
 
 #. TRANSLATORS: package was not found -- this is the end of a string ended in ...
-#: ../client/pk-console.c:1303
+#: ../client/pk-console.c:1240
 msgid "not found."
 msgstr "nenÃ¡jdenÃ½."
 
 #. TRANSLATORS: We didn't find any packages to install
-#: ../client/pk-console.c:1314
-#, c-format
+#: ../client/pk-console.c:1251
 msgid "No packages can be found to install"
 msgstr "Neboli nÃ¡jdenÃ© Å¾iadne balÃÄky pre nainÅ¡talovanie"
 
 #. TRANSLATORS: installing new packages from package list
-#: ../client/pk-console.c:1320
+#: ../client/pk-console.c:1257
 msgid "Installing packages"
 msgstr "InÅ¡talovanie balÃÄkov"
 
 #. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
-#: ../client/pk-console.c:1356
-#, fuzzy, c-format
+#: ../client/pk-console.c:1293
+#, c-format
 msgid "This tool could not find the update details for %s: %s"
-msgstr "Nepodarilo sa nÃ¡jsÅ¥ detaily aktualizÃ¡cie pre '%s': %s"
+msgstr "Nepodarilo sa nÃ¡jsÅ¥ detaily aktualizÃ¡cie pre %s: %s"
 
 #. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
-#: ../client/pk-console.c:1364
-#, fuzzy, c-format
+#: ../client/pk-console.c:1301
+#, c-format
 msgid "This tool could not get the update details for %s: %s"
-msgstr "Nepodarilo sa zÃskaÅ¥ detaily aktualizÃ¡cie pre '%s': %s"
+msgstr "Nepodarilo sa zÃskaÅ¥ detaily aktualizÃ¡cie pre %s: %s"
 
 #. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
-#: ../client/pk-console.c:1410
+#: ../client/pk-console.c:1347
 msgid "Error:"
 msgstr "Chyba:"
 
 #. TRANSLATORS: This a list of details about the package
-#: ../client/pk-console.c:1424
+#: ../client/pk-console.c:1361
 msgid "Package description"
 msgstr "Popis balÃÄka"
 
 #. TRANSLATORS: This a list files contained in the package
-#: ../client/pk-console.c:1458
+#: ../client/pk-console.c:1394
 msgid "Package files"
 msgstr "Zonam sÃºborov v balÃÄku"
 
 #. TRANSLATORS: This where the package has no files
-#: ../client/pk-console.c:1466
+#: ../client/pk-console.c:1403
 msgid "No files"
 msgstr "Å½iadne sÃºbory"
 
 #. TRANSLATORS: This a request for a GPG key signature from the backend, which the client will prompt for later
-#: ../client/pk-console.c:1489
+#: ../client/pk-console.c:1426
 msgid "Repository signature required"
 msgstr "PoÅ¾adovanÃ½ podpis repozitÃ¡ra"
 
 #. TRANSLATORS: This a prompt asking the user to import the security key
-#: ../client/pk-console.c:1499
+#: ../client/pk-console.c:1436
 msgid "Do you accept this signature?"
 msgstr "Akceptujete tento podpis?"
 
 #. TRANSLATORS: This is where the user declined the security key
-#: ../client/pk-console.c:1503
+#: ../client/pk-console.c:1440
 msgid "The signature was not accepted."
 msgstr "Podpis nebol prijatÃ½."
 
 #. TRANSLATORS: This a request for a EULA
-#: ../client/pk-console.c:1537
+#: ../client/pk-console.c:1474
 msgid "End user license agreement required"
 msgstr "PoÅ¾adovanÃ½ je sÃºhlas s licenciou"
 
 #. TRANSLATORS: This a prompt asking the user to agree to the license
-#: ../client/pk-console.c:1544
+#: ../client/pk-console.c:1481
 msgid "Do you agree to this license?"
 msgstr "SÃºhlasÃte s touto licenciou?"
 
 #. TRANSLATORS: This is where the user declined the license
-#: ../client/pk-console.c:1548
+#: ../client/pk-console.c:1485
 msgid "The license was refused."
 msgstr "Licencia bola odmietnutÃ¡."
 
 #. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
-#: ../client/pk-console.c:1577
+#: ../client/pk-console.c:1514
 msgid "The daemon crashed mid-transaction!"
 msgstr "SluÅ¾ba na pozadÃ neoÄakÃ¡vne skonÄila poÄas transakcie!"
 
 #. TRANSLATORS: This is the header to the --help menu
-#: ../client/pk-console.c:1630
+#: ../client/pk-console.c:1567
 msgid "PackageKit Console Interface"
 msgstr "Konzola PackageKit"
 
-#: ../client/pk-console.c:1630
+#: ../client/pk-console.c:1567
 msgid "Subcommands:"
 msgstr "PodprÃkazy:"
 
-#: ../client/pk-console.c:1719 ../client/pk-generate-pack.c:184
-#: ../client/pk-monitor.c:115
-#: ../contrib/command-not-found/pk-command-not-found.c:510
-#: ../src/pk-main.c:192
+#: ../client/pk-console.c:1658 ../client/pk-generate-pack.c:184
+#: ../client/pk-monitor.c:115 ../src/pk-main.c:191
 msgid "Show extra debugging information"
 msgstr "ZobrazovaÅ¥ dodatoÄnÃ© ladiace informÃ¡cie"
 
-#: ../client/pk-console.c:1721 ../client/pk-monitor.c:117
+#: ../client/pk-console.c:1660 ../client/pk-monitor.c:117
 msgid "Show the program version and exit"
 msgstr "ZobraziÅ¥ verziu programu a skonÄiÅ¥"
 
-#: ../client/pk-console.c:1723
+#: ../client/pk-console.c:1662
 msgid "Set the filter, e.g. installed"
 msgstr "NastaviÅ¥ filter, naprÃklad \"nainÅ¡talovanÃ©\""
 
-#: ../client/pk-console.c:1725
+#: ../client/pk-console.c:1664
 msgid "Exit without waiting for actions to complete"
 msgstr "NeÄakaÅ¥ na dokonÄenie Ãºloh a skonÄiÅ¥"
 
 #. TRANSLATORS: This is when we could not connect to the system bus, and is fatal
-#: ../client/pk-console.c:1752
+#: ../client/pk-console.c:1691
 msgid "This tool could not connect to system DBUS."
 msgstr "Pokus o pripojenie k systÃ©movej zbernici DBUS neuspel."
 
 #. TRANSLATORS: The user specified an incorrect filter
-#: ../client/pk-console.c:1839
+#: ../client/pk-console.c:1776
 msgid "The filter specified was invalid"
 msgstr "ZadanÃ½ filter nebol platnÃ½"
 
-#: ../client/pk-console.c:1856
+#: ../client/pk-console.c:1793
 msgid "You need to specify a search type, e.g. name"
 msgstr "Je potrebnÃ© urÄiÅ¥ typ vyhÄ¾adÃ¡vania, naprÃklad nÃ¡zov"
 
-#: ../client/pk-console.c:1861 ../client/pk-console.c:1868
-#: ../client/pk-console.c:1875 ../client/pk-console.c:1882
-#: ../client/pk-console.c:1990 ../client/pk-console.c:2000
-#: ../client/pk-console.c:2007 ../client/pk-console.c:2014
+#: ../client/pk-console.c:1798 ../client/pk-console.c:1805
+#: ../client/pk-console.c:1812 ../client/pk-console.c:1819
+#: ../client/pk-console.c:1930 ../client/pk-console.c:1940
+#: ../client/pk-console.c:1947 ../client/pk-console.c:1954
 msgid "You need to specify a search term"
 msgstr "Je potrebnÃ© urÄiÅ¥ kÄ¾ÃºÄovÃ© slovÃ¡ na vyhÄ¾adÃ¡vanie"
 
-#: ../client/pk-console.c:1887
+#: ../client/pk-console.c:1824
 msgid "Invalid search type"
 msgstr "NeplatnÃ½ typ vyhÄ¾adÃ¡vania"
 
-#: ../client/pk-console.c:1892
+#: ../client/pk-console.c:1829
 msgid "You need to specify a package or file to install"
 msgstr "Je potrebnÃ© urÄiÅ¥ balÃÄek alebo sÃºbor na inÅ¡talÃ¡ciu"
 
-#: ../client/pk-console.c:1899
+#: ../client/pk-console.c:1836
 msgid "You need to specify a type, key_id and package_id"
 msgstr "Je potrebnÃ© urÄiÅ¥ typ, key_id a package_id"
 
-#: ../client/pk-console.c:1906
+#: ../client/pk-console.c:1843
 msgid "You need to specify a package to remove"
 msgstr "Je potrebnÃ© urÄit balÃÄek na odstrÃ¡nenie"
 
-#: ../client/pk-console.c:1912
+#: ../client/pk-console.c:1849
 msgid ""
 "You need to specify the destination directory and then the packages to "
 "download"
 msgstr "Je potrebnÃ© urÄiÅ¥ cieÄ¾ovÃ½ prieÄinok a nÃ¡sledne balÃÄky na stiahnutie"
 
-#: ../client/pk-console.c:1917
+#: ../client/pk-console.c:1854
 msgid "Directory not found"
 msgstr "PrieÄinok nenÃ¡jdenÃ½"
 
-#: ../client/pk-console.c:1923
+#: ../client/pk-console.c:1860
 msgid "You need to specify a licence identifier (eula-id)"
 msgstr "Je potrebnÃ© urÄiÅ¥ identifikÃ¡tor licencie (eula-id)"
 
-#: ../client/pk-console.c:1939
+#: ../client/pk-console.c:1876
 msgid "You need to specify a package name to resolve"
 msgstr "Je potrebnÃ© urÄiÅ¥ nÃ¡zov balÃÄka na vyhÄ¾adanie"
 
-#: ../client/pk-console.c:1946 ../client/pk-console.c:1953
+#: ../client/pk-console.c:1885 ../client/pk-console.c:1892
 msgid "You need to specify a repository name"
 msgstr "Je potrebnÃ© urÄiÅ¥ nÃ¡zov repozitÃ¡ra"
 
-#: ../client/pk-console.c:1960
+#: ../client/pk-console.c:1899
 msgid "You need to specify a repo name/parameter and value"
 msgstr "Je potrebnÃ© urÄiÅ¥ nÃ¡zov repozitÃ¡ra/parameter a hodnotu"
 
-#: ../client/pk-console.c:1972
+#: ../client/pk-console.c:1912
 msgid "You need to specify an action, e.g. 'update-system'"
 msgstr "Je potrebnÃ© urÄiÅ¥ akciu, naprÃklad 'update-system'"
 
-#: ../client/pk-console.c:1977
+#: ../client/pk-console.c:1917
 msgid "You need to specify a correct role"
 msgstr "Je potrebnÃ© urÄiÅ¥ sprÃ¡vnu rolu"
 
 # XXX
-#: ../client/pk-console.c:1982
+#: ../client/pk-console.c:1922
 msgid "Failed to get last time"
 msgstr "Nebolo moÅ¾nÃ© zÃskaÅ¥ Äas ostatnÃ©ho vykonania"
 
-#: ../client/pk-console.c:2021
+#: ../client/pk-console.c:1961
 msgid "You need to specify a package to find the details for"
 msgstr "Je potrebnÃ© urÄiÅ¥ balÃÄek, ktorÃ©ho detaily sa majÃº zÃskaÅ¥"
 
-#: ../client/pk-console.c:2028
+#: ../client/pk-console.c:1968
 msgid "You need to specify a package to find the files for"
 msgstr "Je potrebnÃ© urÄiÅ¥ balÃÄek, zoznam sÃºborov ktorÃ©ho sa mÃ¡ zÃskaÅ¥"
 
-#: ../client/pk-console.c:2035
+#: ../client/pk-console.c:1975
 msgid "You need to specify a list file to create"
 msgstr "Je potrebnÃ© urÄiÅ¥ sÃºbor zoznamu pre vytvorenie"
 
-#: ../client/pk-console.c:2043 ../client/pk-console.c:2051
+#: ../client/pk-console.c:1983 ../client/pk-console.c:1991
 msgid "You need to specify a list file to open"
 msgstr "Je potrebnÃ© urÄiÅ¥ sÃºbor zoznamu pre otvorenie"
 
 #. TRANSLATORS: The user tried to use an unsupported option on the command line
-#: ../client/pk-console.c:2104
+#: ../client/pk-console.c:2044
 #, c-format
 msgid "Option '%s' is not supported"
 msgstr "VoÄ¾ba '%s' nie je podporovanÃ¡"
 
 #. TRANSLATORS: User does not have permission to do this
-#: ../client/pk-console.c:2117
+#: ../client/pk-console.c:2057
 msgid "You don't have the necessary privileges for this operation"
 msgstr "Na vykonanie Ãºlohy nemÃ¡te dostatoÄnÃ© privilÃ©giÃ¡"
 
 #. TRANSLATORS: Generic failure of what they asked to do
-#: ../client/pk-console.c:2120
+#: ../client/pk-console.c:2060
 msgid "Command failed"
 msgstr "PrÃkaz neuspel"
 
@@ -705,7 +514,6 @@ msgstr "Monitor PackageKit"
 
 #. TRANSLATORS: The package was not found in any software sources
 #: ../client/pk-tools-common.c:114
-#, c-format
 msgid "The package could not be found"
 msgstr "BalÃÄek sa nepodarilo nÃ¡jsÅ¥"
 
@@ -719,139 +527,61 @@ msgstr "Zadaniu vyhovuje viac balÃÄkov:"
 msgid "Please choose the correct package: "
 msgstr "Zadajte prosÃm sprÃ¡vny balÃÄek: "
 
-#: ../client/pk-tools-common.c:157
+#: ../client/pk-tools-common.c:158
 #, c-format
 msgid "Please enter a number from 1 to %i: "
 msgstr "Zadajte prosÃm ÄÃslo od 1 do %i: "
 
-# XXX
-#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../contrib/command-not-found/pk-command-not-found.c:361
-#, fuzzy
-msgid "Failed to search for file"
-msgstr "Nebolo moÅ¾nÃ© uloÅ¾iÅ¥ na disk"
-
-# XXX
-#. TRANSLATORS: we failed to launch the executable, the error follows
-#: ../contrib/command-not-found/pk-command-not-found.c:485
-#, fuzzy
-msgid "Failed to launch:"
-msgstr "Nebolo moÅ¾nÃ© zÃskaÅ¥ Äas ostatnÃ©ho vykonania"
-
-#. TRANSLATORS: tool that gets called when the command is not found
-#: ../contrib/command-not-found/pk-command-not-found.c:526
-#, fuzzy
-msgid "PackageKit Command Not Found"
-msgstr "Monitor PackageKit"
-
-#. TRANSLATORS: the prefix of all the output telling the user why it's not executing
-#: ../contrib/command-not-found/pk-command-not-found.c:548
-#, fuzzy
-msgid "Command not found."
-msgstr "nenÃ¡jdenÃ½."
-
-#. TRANSLATORS: tell the user what we think the command is
-#: ../contrib/command-not-found/pk-command-not-found.c:555
-#, fuzzy
-msgid "Similar command is:"
-msgstr "PodprÃkazy:"
-
-#. TRANSLATORS: Ask the user if we should run the similar command
-#: ../contrib/command-not-found/pk-command-not-found.c:564
-msgid "Run similar command:"
-msgstr ""
-
-#. TRANSLATORS: show the user a list of commands that they could have meant
-#. TRANSLATORS: show the user a list of commands we could run
-#: ../contrib/command-not-found/pk-command-not-found.c:576
-#: ../contrib/command-not-found/pk-command-not-found.c:585
-#, fuzzy
-msgid "Similar commands are:"
-msgstr "PodprÃkazy:"
-
-#. TRANSLATORS: ask the user to choose a file to run
-#: ../contrib/command-not-found/pk-command-not-found.c:592
-msgid "Please choose a command to run"
-msgstr ""
-
-#. TRANSLATORS: tell the user what package provides the command
-#: ../contrib/command-not-found/pk-command-not-found.c:607
-msgid "The package providing this file is:"
-msgstr ""
-
-#. TRANSLATORS: as the user if we want to install a package to provide the command
-#: ../contrib/command-not-found/pk-command-not-found.c:612
-#, c-format
-msgid "Install package '%s' to provide command '%s'?"
-msgstr ""
-
-#. TRANSLATORS: Show the user a list of packages that provide this command
-#: ../contrib/command-not-found/pk-command-not-found.c:633
-msgid "Packages providing this file are:"
-msgstr ""
-
-#. TRANSLATORS: Show the user a list of packages that they can install to provide this command
-#: ../contrib/command-not-found/pk-command-not-found.c:642
-msgid "Suitable packages are:"
-msgstr ""
-
-#. get selection
-#. TRANSLATORS: ask the user to choose a file to install
-#: ../contrib/command-not-found/pk-command-not-found.c:650
-#, fuzzy
-msgid "Please choose a package to install"
-msgstr "Nebolo moÅ¾nÃ© nÃ¡jsÅ¥ balÃÄek na inÅ¡talovanie"
-
 #. TRANSLATORS: when we are getting data from the daemon
-#: ../contrib/browser-plugin/src/contents.cpp:298
+#: ../contrib/packagekit-plugin/src/contents.cpp:294
 msgid "Getting package information..."
 msgstr "ZÃskavanie informÃ¡ciÃ o balÃÄku..."
 
 #. TRANSLATORS: run an applicaiton
-#: ../contrib/browser-plugin/src/contents.cpp:304
+#: ../contrib/packagekit-plugin/src/contents.cpp:300
 #, c-format
 msgid "Run %s"
 msgstr "SpustiÅ¥ %s"
 
 #. TRANSLATORS: show the installed version of a package
-#: ../contrib/browser-plugin/src/contents.cpp:310
+#: ../contrib/packagekit-plugin/src/contents.cpp:306
 msgid "Installed version"
 msgstr "NainÅ¡talovanÃ¡ verzia"
 
 #. TRANSLATORS: run the application now
-#: ../contrib/browser-plugin/src/contents.cpp:318
+#: ../contrib/packagekit-plugin/src/contents.cpp:314
 #, c-format
 msgid "Run version %s now"
 msgstr "SpustiÅ¥ verziu %s teraz"
 
-#: ../contrib/browser-plugin/src/contents.cpp:324
+#: ../contrib/packagekit-plugin/src/contents.cpp:320
 msgid "Run now"
 msgstr "SpustiÅ¥ teraz"
 
 #. TRANSLATORS: update to a new version of the package
-#: ../contrib/browser-plugin/src/contents.cpp:330
+#: ../contrib/packagekit-plugin/src/contents.cpp:326
 #, c-format
 msgid "Update to version %s"
 msgstr "AktualizovaÅ¥ na verziu %s"
 
 #. TRANSLATORS: To install a package
-#: ../contrib/browser-plugin/src/contents.cpp:336
+#: ../contrib/packagekit-plugin/src/contents.cpp:332
 #, c-format
 msgid "Install %s now"
 msgstr "NainÅ¡talovaÅ¥ %s teraz"
 
 #. TRANSLATORS: the version of the package
-#: ../contrib/browser-plugin/src/contents.cpp:339
+#: ../contrib/packagekit-plugin/src/contents.cpp:335
 msgid "Version"
 msgstr "Verzia"
 
 #. TRANSLATORS: noting found, so can't install
-#: ../contrib/browser-plugin/src/contents.cpp:344
+#: ../contrib/packagekit-plugin/src/contents.cpp:340
 msgid "No packages found for your system"
 msgstr "Pre vÃ¡Å¡ systÃ©m neboli nÃ¡jdenÃ© Å¾iadne balÃÄky"
 
 #. TRANSLATORS: package is being installed
-#: ../contrib/browser-plugin/src/contents.cpp:349
+#: ../contrib/packagekit-plugin/src/contents.cpp:345
 msgid "Installing..."
 msgstr "InÅ¡talovanie..."
 
@@ -859,115 +589,13 @@ msgstr "InÅ¡talovanie..."
 msgid "PackageKit Catalog"
 msgstr "KatalÃ³g PackageKit"
 
-#: ../data/packagekit-package-list.xml.in.h:1
-msgid "PackageKit Package List"
-msgstr "Zoznam balÃÄkov PackageKit"
-
 #: ../data/packagekit-servicepack.xml.in.h:1
 msgid "PackageKit Service Pack"
 msgstr "ServisnÃ½ archÃv PackageKit"
 
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr "PrijaÅ¥ licenÄnÃ© podmienky"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr "Na prijatie licenÄnÃ½ch podmienok je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-#, fuzzy
-msgid ""
-"Authentication is required to cancel a task that was not started by yourself"
-msgstr "Na Ãºpravu zdrojov softvÃ©ru je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-msgid "Authentication is required to change software source parameters"
-msgstr "Na Ãºpravu zdrojov softvÃ©ru je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-#, fuzzy
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr "Na obnovenie zoznamu balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-#, fuzzy
-msgid "Authentication is required to install a signed package"
-msgstr "Na inÅ¡talÃ¡ciu balÃÄka je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-#, fuzzy
-msgid "Authentication is required to install an untrusted package"
-msgstr "Na inÅ¡talÃ¡ciu balÃÄka je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-#, fuzzy
-msgid "Authentication is required to refresh the system sources"
-msgstr "Na obnovenie zoznamu balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to remove packages"
-msgstr "Na odstrÃ¡nenie balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-msgid "Authentication is required to rollback a transaction"
-msgstr "Na navrÃ¡tenie transakcie je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-#, fuzzy
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr "Na odstrÃ¡nenie balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Authentication is required to update packages"
-msgstr "Na aktualizÃ¡ciu balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Cancel foreign task"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-msgid "Change software source parameters"
-msgstr "ZmeniÅ¥ parametre zdrojov softvÃ©ru"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-#, fuzzy
-msgid "Install signed package"
-msgstr "InÅ¡talovanie balÃÄkov"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-#, fuzzy
-msgid "Install untrusted local file"
-msgstr "InÅ¡talovaÅ¥ z lokÃ¡lneho sÃºboru"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Remove package"
-msgstr "OdstrÃ¡niÅ¥ balÃÄek"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Rollback to a previous transaction"
-msgstr "NavrÃ¡tiÅ¥ sa k stavu pred transakciou"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:21
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:22
-#, fuzzy
-msgid "Update packages"
-msgstr "AktualizovaÅ¥ balÃÄek"
+#: ../data/packagekit-package-list.xml.in.h:1
+msgid "PackageKit Package List"
+msgstr "Zoznam balÃÄkov PackageKit"
 
 #: ../src/pk-main.c:86
 msgid "Startup failed due to security policies on this machine."
@@ -989,40 +617,40 @@ msgstr ""
 "SÃºbor org.freedesktop.PackageKit.conf nie je nainÅ¡talovanÃ½ v systÃ©movom "
 "prieÄinku:"
 
-#: ../src/pk-main.c:188
+#: ../src/pk-main.c:187
 msgid "Packaging backend to use, e.g. dummy"
 msgstr "Rozhranie balÃÄkoveho systÃ©mu ktorÃ© sa mÃ¡ pouÅ¾iÅ¥, naprÃklad \"dummy\""
 
-#: ../src/pk-main.c:190
+#: ../src/pk-main.c:189
 msgid "Daemonize and detach from the terminal"
 msgstr "UvoÄ¾niÅ¥ terminÃ¡l a presunÃºÅ¥ sa na pozadie"
 
-#: ../src/pk-main.c:194
+#: ../src/pk-main.c:193
 msgid "Disable the idle timer"
 msgstr "VypnÃºÅ¥ poÄÃtadlo Äasu neÄinnosti"
 
-#: ../src/pk-main.c:196
+#: ../src/pk-main.c:195
 msgid "Show version and exit"
 msgstr "ZobraziÅ¥ verziu a skonÄiÅ¥"
 
-#: ../src/pk-main.c:198
+#: ../src/pk-main.c:197
 msgid "Exit after a small delay"
 msgstr "SkonÄiÅ¥ po krÃ¡tkej prestÃ¡vke"
 
 # XXX
-#: ../src/pk-main.c:200
+#: ../src/pk-main.c:199
 msgid "Exit after the engine has loaded"
 msgstr "SkonÄiÅ¥ po naÄÃtanÃ enginu"
 
-#: ../src/pk-main.c:214
+#: ../src/pk-main.c:213
 msgid "PackageKit service"
 msgstr "SluÅ¾ba PackageKit"
 
-#: ../src/pk-main.c:250
+#: ../src/pk-main.c:249
 msgid "Cannot connect to the system bus"
 msgstr "Pokus o pripojenie k systÃ©movej zbernici neuspel"
 
-#: ../src/pk-main.c:299
+#: ../src/pk-main.c:298
 #, c-format
 msgid "Error trying to start: %s\n"
 msgstr "Chyba pri pokuse o spustenie: %s\n"
@@ -1030,9 +658,68 @@ msgstr "Chyba pri pokuse o spustenie: %s\n"
 #~ msgid "This tool could not remove the packages: '%s'"
 #~ msgstr "Nepodarilo sa odstrÃ¡niÅ¥ balÃÄky: '%s'"
 
+#~ msgid "Accept EULA"
+#~ msgstr "PrijaÅ¥ licenÄnÃ© podmienky"
+
+#~ msgid "Authentication is required to accept a EULA"
+#~ msgstr "Na prijatie licenÄnÃ½ch podmienok je nutnÃ¡ autentifikÃ¡cia"
+
+#~ msgid "Authentication is required to change software source parameters"
+#~ msgstr "Na Ãºpravu zdrojov softvÃ©ru je nutnÃ¡ autentifikÃ¡cia"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to consider a key used for signing packages as "
+#~ "trusted"
+#~ msgstr "Na obnovenie zoznamu balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
+
+#, fuzzy
+#~ msgid "Authentication is required to install a signed package"
+#~ msgstr "Na inÅ¡talÃ¡ciu balÃÄka je nutnÃ¡ autentifikÃ¡cia"
+
+#, fuzzy
+#~ msgid "Authentication is required to install an untrusted package"
+#~ msgstr "Na inÅ¡talÃ¡ciu balÃÄka je nutnÃ¡ autentifikÃ¡cia"
+
+#, fuzzy
+#~ msgid "Authentication is required to refresh the system sources"
+#~ msgstr "Na obnovenie zoznamu balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
+
+#~ msgid "Authentication is required to remove packages"
+#~ msgstr "Na odstrÃ¡nenie balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
+
+#~ msgid "Authentication is required to rollback a transaction"
+#~ msgstr "Na navrÃ¡tenie transakcie je nutnÃ¡ autentifikÃ¡cia"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to set the network proxy used for downloading "
+#~ "packages"
+#~ msgstr "Na odstrÃ¡nenie balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
+
+#~ msgid "Authentication is required to update packages"
+#~ msgstr "Na aktualizÃ¡ciu balÃÄkov je nutnÃ¡ autentifikÃ¡cia"
+
+#~ msgid "Change software source parameters"
+#~ msgstr "ZmeniÅ¥ parametre zdrojov softvÃ©ru"
+
 #~ msgid "Install local file"
 #~ msgstr "InÅ¡talovaÅ¥ z lokÃ¡lneho sÃºboru"
 
+#, fuzzy
+#~ msgid "Install untrusted local file"
+#~ msgstr "InÅ¡talovaÅ¥ z lokÃ¡lneho sÃºboru"
+
+#~ msgid "Remove package"
+#~ msgstr "OdstrÃ¡niÅ¥ balÃÄek"
+
+#~ msgid "Rollback to a previous transaction"
+#~ msgstr "NavrÃ¡tiÅ¥ sa k stavu pred transakciou"
+
+#, fuzzy
+#~ msgid "Update packages"
+#~ msgstr "AktualizovaÅ¥ balÃÄek"
+
 #~ msgid "Okay to import key?"
 #~ msgstr "ImportovaÅ¥ kÄ¾ÃºÄ?"
 
@@ -1045,9 +732,21 @@ msgstr "Chyba pri pokuse o spustenie: %s\n"
 #~ msgid "Do you agree?"
 #~ msgstr "SÃºhlasÃte?"
 
+#~ msgid "Update detail"
+#~ msgstr "Podrobnosti o aktualizÃ¡cii"
+
+#~ msgid "A system restart is required"
+#~ msgstr "Je potrebnÃ½ reÅ¡tart systÃ©mu"
+
 #~ msgid "A logout and login is required"
 #~ msgstr "Je potrebnÃ© sa odhÃ¡siÅ¥ a znovu prihlÃ¡siÅ¥"
 
+#~ msgid "An application restart is required"
+#~ msgstr "Je potrebnÃ© aplikÃ¡ciu ukonÄiÅ¥ a znovu spustiÅ¥"
+
+#~ msgid "Could not find package to install"
+#~ msgstr "Nebolo moÅ¾nÃ© nÃ¡jsÅ¥ balÃÄek na inÅ¡talovanie"
+
 #~ msgid "Could not find package to remove"
 #~ msgstr "Nebolo moÅ¾nÃ© nÃ¡jsÅ¥ balÃÄek na odstrÃ¡nenie"
 
commit dd8a4d956a83f363d6440a58c52b0bf411a97ab4
Author: Piotr DrÄ…g <piotrdrag at gmail.com>
Date:   Fri Jan 16 19:47:21 2009 +0000

    Updated Polish translation
    
    Transmitted-via: Transifex (translate.fedoraproject.org)

diff --git a/po/pl.po b/po/pl.po
index 2ed565f..dc85e0f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-15 16:57+0000\n"
-"PO-Revision-Date: 2008-12-16 23:25+0100\n"
+"PO-Revision-Date: 2009-01-16 20:32+0100\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag at gmail.com>\n"
 "Language-Team: Polish <pl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -183,18 +183,17 @@ msgstr "Nieznane"
 #. TRANSLATORS: a package requires the system to be restarted
 #: ../client/pk-console.c:501
 msgid "System restart required by:"
-msgstr ""
+msgstr "Ponowne uruchomienie systemu jest wymagane przez:"
 
 #. TRANSLATORS: a package requires the session to be restarted
 #: ../client/pk-console.c:504
-#, fuzzy
 msgid "Session restart required:"
-msgstr "Wymagany jest podpis repozytorium"
+msgstr "Wymagane jest ponowne uruchomienie sesji:"
 
 #. TRANSLATORS: a package requires the application to be restarted
 #: ../client/pk-console.c:507
 msgid "Application restart required by:"
-msgstr ""
+msgstr "Ponowne uruchomienie programu jest wymagane przez:"
 
 #: ../client/pk-console.c:543
 msgid "Please restart the computer to complete the update."
commit 4ff9aaf736511a57f864679711e804e25744a693
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Jan 16 19:36:38 2009 +0000

    bugfix: remove the obsolete specific vendor_url for each metho and rely on the packagekit homepage. Fixes novell#450349

diff --git a/policy/org.freedesktop.packagekit.policy.in b/policy/org.freedesktop.packagekit.policy.in
index e805b87..b12b8ab 100644
--- a/policy/org.freedesktop.packagekit.policy.in
+++ b/policy/org.freedesktop.packagekit.policy.in
@@ -17,7 +17,6 @@
     <_description>Cancel foreign task</_description>
     <_message>Authentication is required to cancel a task that was not started by yourself</_message>
     <icon_name>pk-package-delete</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-cancel</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep_always</allow_active>
@@ -28,7 +27,6 @@
     <_description>Install signed package</_description>
     <_message>Authentication is required to install a signed package</_message>
     <icon_name>pk-package-add</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-install-package</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep_always</allow_active>
@@ -39,7 +37,6 @@
     <_description>Install untrusted local file</_description>
     <_message>Authentication is required to install an untrusted package</_message>
     <icon_name>pk-package-add</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-install-file</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin</allow_active>
@@ -50,7 +47,6 @@
     <_description>Trust a key used for signing packages</_description>
     <_message>Authentication is required to consider a key used for signing packages as trusted</_message>
     <icon_name>pk-package-add</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-install-signature</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin</allow_active>
@@ -61,7 +57,6 @@
     <_description>Accept EULA</_description>
     <_message>Authentication is required to accept a EULA</_message>
     <icon_name>pk-package-add</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-accept-eula</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>yes</allow_active>
@@ -72,7 +67,6 @@
     <_description>Remove package</_description>
     <_message>Authentication is required to remove packages</_message>
     <icon_name>pk-package-delete</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-remove</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep_always</allow_active>
@@ -83,7 +77,6 @@
     <_description>Update packages</_description>
     <_message>Authentication is required to update packages</_message>
     <icon_name>pk-package-update</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-update-system</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep_always</allow_active>
@@ -94,7 +87,6 @@
     <_description>Rollback to a previous transaction</_description>
     <_message>Authentication is required to rollback a transaction</_message>
     <icon_name>pk-rollback</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-rollback</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep_always</allow_active>
@@ -105,7 +97,6 @@
     <_description>Change software source parameters</_description>
     <_message>Authentication is required to change software source parameters</_message>
     <icon_name>pk-package-info</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-repo-enable</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>auth_admin_keep_always</allow_active>
@@ -116,7 +107,6 @@
     <_description>Refresh system sources</_description>
     <_message>Authentication is required to refresh the system sources</_message>
     <icon_name>pk-refresh-cache</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-refresh-cache</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>yes</allow_active>
@@ -127,7 +117,6 @@
     <_description>Set network proxy</_description>
     <_message>Authentication is required to set the network proxy used for downloading packages</_message>
     <icon_name>applications-internet</icon_name>
-    <vendor_url>http://www.packagekit.org/pk-reference.html#methods-set-proxy</vendor_url>
     <defaults>
       <allow_inactive>no</allow_inactive>
       <allow_active>yes</allow_active>
commit 67fcd1c4cc44402c05c859579451f969530bb9cd
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jan 16 12:31:11 2009 +0000

    Added British translation.
    
    Transmitted-via: Transifex (translate.fedoraproject.org)

diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 0000000..ddd0439
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,651 @@
+# English/GB translation of PackageKit.
+# Copyright (C) 2009 THE PackageKit'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PackageKit package.
+# Tim Waugh <twaugh at redhat.com>, 2009.
+# 
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PackageKit VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-11-28 01:31+0000\n"
+"PO-Revision-Date: 2009-01-16 12:28+0000\n"
+"Last-Translator: Tim Waugh <twaugh at redhat.com>\n"
+"Language-Team: English/GB <en at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+#. TRANSLATORS: this is a header for the package that can be updated
+#: ../client/pk-console.c:287
+msgid "Details about the update:"
+msgstr "Details about the update:"
+
+#: ../client/pk-console.c:480
+msgid "Please restart the computer to complete the update."
+msgstr "Please restart the computer to complete the update."
+
+#: ../client/pk-console.c:482
+msgid "Please logout and login to complete the update."
+msgstr "Please logout and login to complete the update."
+
+#: ../client/pk-console.c:484
+msgid "Please restart the application as it is being used."
+msgstr "Please restart the application as it is being used."
+
+#. TRANSLATORS: The package is already installed on the system
+#: ../client/pk-console.c:596
+#, c-format
+msgid "The package %s is already installed"
+msgstr "The package %s is already installed"
+
+#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
+#: ../client/pk-console.c:604
+#, c-format
+msgid "The package %s could not be installed: %s"
+msgstr "The package %s could not be installed: %s"
+
+#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
+#: ../client/pk-console.c:629 ../client/pk-console.c:656
+#: ../client/pk-console.c:752 ../client/pk-console.c:869
+#: ../client/pk-tools-common.c:61 ../client/pk-tools-common.c:79
+#: ../client/pk-tools-common.c:86
+#, c-format
+msgid "Internal error: %s"
+msgstr "Internal error: %s"
+
+#. TRANSLATORS: There was an error installing the packages. The detailed error follows
+#: ../client/pk-console.c:637 ../client/pk-console.c:1264
+#, c-format
+msgid "This tool could not install the packages: %s"
+msgstr "This tool could not install the packages: %s"
+
+#. TRANSLATORS: There was an error installing the files. The detailed error follows
+#: ../client/pk-console.c:664
+#, c-format
+msgid "This tool could not install the files: %s"
+msgstr "This tool could not install the files: %s"
+
+#. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
+#: ../client/pk-console.c:720
+#, c-format
+msgid "This tool could not remove %s: %s"
+msgstr "This tool could not remove %s: %s"
+
+#. TRANSLATORS: There was an error removing the packages. The detailed error follows
+#: ../client/pk-console.c:743 ../client/pk-console.c:781
+#: ../client/pk-console.c:814
+#, c-format
+msgid "This tool could not remove the packages: %s"
+msgstr "This tool could not remove the packages: %s"
+
+#. TRANSLATORS: When removing, we might have to remove other dependencies
+#: ../client/pk-console.c:793
+msgid "The following packages have to be removed:"
+msgstr "The following packages have to be removed:"
+
+#. TRANSLATORS: We are checking if it's okay to remove a list of packages
+#: ../client/pk-console.c:800
+msgid "Proceed removing additional packages?"
+msgstr "Proceed removing additional packages?"
+
+#. TRANSLATORS: We did not remove any packages
+#: ../client/pk-console.c:805
+msgid "The package removal was canceled!"
+msgstr "The package removal was cancelled!"
+
+#. TRANSLATORS: The package name was not found in any software sources
+#: ../client/pk-console.c:846
+#, c-format
+msgid "This tool could not download the package %s as it could not be found"
+msgstr "This tool could not download the package %s as it could not be found"
+
+#. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
+#: ../client/pk-console.c:877
+#, c-format
+msgid "This tool could not download the packages: %s"
+msgstr "This tool could not download the packages: %s"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:904 ../client/pk-console.c:913
+#, c-format
+msgid "This tool could not update %s: %s"
+msgstr "This tool could not update %s: %s"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:935 ../client/pk-console.c:943
+#, c-format
+msgid "This tool could not get the requirements for %s: %s"
+msgstr "This tool could not get the requirements for %s: %s"
+
+#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
+#: ../client/pk-console.c:965 ../client/pk-console.c:973
+#, c-format
+msgid "This tool could not get the dependencies for %s: %s"
+msgstr "This tool could not get the dependencies for %s: %s"
+
+#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
+#: ../client/pk-console.c:995 ../client/pk-console.c:1003
+#, c-format
+msgid "This tool could not get package details for %s: %s"
+msgstr "This tool could not get package details for %s: %s"
+
+#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
+#: ../client/pk-console.c:1025
+#, c-format
+msgid "This tool could not find the files for %s: %s"
+msgstr "This tool could not find the files for %s: %s"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:1033
+#, c-format
+msgid "This tool could not get the file list for %s: %s"
+msgstr "This tool could not get the file list for %s: %s"
+
+#. TRANSLATORS: There was an error getting the list of packages. The filename follows
+#: ../client/pk-console.c:1055
+#, c-format
+msgid "File already exists: %s"
+msgstr "File already exists: %s"
+
+#. TRANSLATORS: follows a list of packages to install
+#: ../client/pk-console.c:1060 ../client/pk-console.c:1116
+#: ../client/pk-console.c:1191
+msgid "Getting package list"
+msgstr "Getting package list"
+
+#. TRANSLATORS: There was an error getting the list of packages. The detailed error follows
+#: ../client/pk-console.c:1066 ../client/pk-console.c:1122
+#: ../client/pk-console.c:1197
+#, c-format
+msgid "This tool could not get package list: %s"
+msgstr "This tool could not get package list: %s"
+
+#. TRANSLATORS: There was an error saving the list
+#: ../client/pk-console.c:1077
+msgid "Failed to save to disk"
+msgstr "Failed to save to disk"
+
+#. TRANSLATORS: There was an error getting the list. The filename follows
+#: ../client/pk-console.c:1111 ../client/pk-console.c:1186
+#, c-format
+msgid "File does not exist: %s"
+msgstr "File does not exist: %s"
+
+#. TRANSLATORS: header to a list of packages newly added
+#: ../client/pk-console.c:1143
+msgid "Packages to add"
+msgstr "Packages to add"
+
+#. TRANSLATORS: header to a list of packages removed
+#: ../client/pk-console.c:1151
+msgid "Packages to remove"
+msgstr "Packages to remove"
+
+#. TRANSLATORS: We didn't find any differences
+#: ../client/pk-console.c:1219
+msgid "No new packages need to be installed"
+msgstr "No new packages need to be installed"
+
+#. TRANSLATORS: follows a list of packages to install
+#: ../client/pk-console.c:1225
+msgid "To install"
+msgstr "To install"
+
+#. TRANSLATORS: searching takes some time....
+#: ../client/pk-console.c:1236
+msgid "Searching for package: "
+msgstr "Searching for package: "
+
+#. TRANSLATORS: package was not found -- this is the end of a string ended in ...
+#: ../client/pk-console.c:1240
+msgid "not found."
+msgstr "not found."
+
+#. TRANSLATORS: We didn't find any packages to install
+#: ../client/pk-console.c:1251
+msgid "No packages can be found to install"
+msgstr "No packages can be found to install"
+
+#. TRANSLATORS: installing new packages from package list
+#: ../client/pk-console.c:1257
+msgid "Installing packages"
+msgstr "Installing packages"
+
+#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
+#: ../client/pk-console.c:1293
+#, c-format
+msgid "This tool could not find the update details for %s: %s"
+msgstr "This tool could not find the update details for %s: %s"
+
+#. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
+#: ../client/pk-console.c:1301
+#, c-format
+msgid "This tool could not get the update details for %s: %s"
+msgstr "This tool could not get the update details for %s: %s"
+
+#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
+#: ../client/pk-console.c:1347
+msgid "Error:"
+msgstr "Error:"
+
+#. TRANSLATORS: This a list of details about the package
+#: ../client/pk-console.c:1361
+msgid "Package description"
+msgstr "Package description"
+
+#. TRANSLATORS: This a list files contained in the package
+#: ../client/pk-console.c:1394
+msgid "Package files"
+msgstr "Package files"
+
+#. TRANSLATORS: This where the package has no files
+#: ../client/pk-console.c:1403
+msgid "No files"
+msgstr "No files"
+
+#. TRANSLATORS: This a request for a GPG key signature from the backend, which the client will prompt for later
+#: ../client/pk-console.c:1426
+msgid "Repository signature required"
+msgstr "Repository signature required"
+
+#. TRANSLATORS: This a prompt asking the user to import the security key
+#: ../client/pk-console.c:1436
+msgid "Do you accept this signature?"
+msgstr "Do you accept this signature?"
+
+#. TRANSLATORS: This is where the user declined the security key
+#: ../client/pk-console.c:1440
+msgid "The signature was not accepted."
+msgstr "The signature was not accepted."
+
+#. TRANSLATORS: This a request for a EULA
+#: ../client/pk-console.c:1474
+msgid "End user license agreement required"
+msgstr "End user licence agreement required"
+
+#. TRANSLATORS: This a prompt asking the user to agree to the license
+#: ../client/pk-console.c:1481
+msgid "Do you agree to this license?"
+msgstr "Do you agree to this licence?"
+
+#. TRANSLATORS: This is where the user declined the license
+#: ../client/pk-console.c:1485
+msgid "The license was refused."
+msgstr "The licence was refused."
+
+#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
+#: ../client/pk-console.c:1514
+msgid "The daemon crashed mid-transaction!"
+msgstr "The daemon crashed mid-transaction!"
+
+#. TRANSLATORS: This is the header to the --help menu
+#: ../client/pk-console.c:1567
+msgid "PackageKit Console Interface"
+msgstr "PackageKit Console Interface"
+
+#: ../client/pk-console.c:1567
+msgid "Subcommands:"
+msgstr "Subcommands:"
+
+#: ../client/pk-console.c:1658 ../client/pk-generate-pack.c:184
+#: ../client/pk-monitor.c:115 ../src/pk-main.c:191
+msgid "Show extra debugging information"
+msgstr "Show extra debugging information"
+
+#: ../client/pk-console.c:1660 ../client/pk-monitor.c:117
+msgid "Show the program version and exit"
+msgstr "Show the program version and exit"
+
+#: ../client/pk-console.c:1662
+msgid "Set the filter, e.g. installed"
+msgstr "Set the filter, e.g. installed"
+
+#: ../client/pk-console.c:1664
+msgid "Exit without waiting for actions to complete"
+msgstr "Exit without waiting for actions to complete"
+
+#. TRANSLATORS: This is when we could not connect to the system bus, and is fatal
+#: ../client/pk-console.c:1691
+msgid "This tool could not connect to system DBUS."
+msgstr "This tool could not connect to system DBUS."
+
+#. TRANSLATORS: The user specified an incorrect filter
+#: ../client/pk-console.c:1776
+msgid "The filter specified was invalid"
+msgstr "The filter specified was invalid"
+
+#: ../client/pk-console.c:1793
+msgid "You need to specify a search type, e.g. name"
+msgstr "You need to specify a search type, e.g. name"
+
+#: ../client/pk-console.c:1798 ../client/pk-console.c:1805
+#: ../client/pk-console.c:1812 ../client/pk-console.c:1819
+#: ../client/pk-console.c:1930 ../client/pk-console.c:1940
+#: ../client/pk-console.c:1947 ../client/pk-console.c:1954
+msgid "You need to specify a search term"
+msgstr "You need to specify a search term"
+
+#: ../client/pk-console.c:1824
+msgid "Invalid search type"
+msgstr "Invalid search type"
+
+#: ../client/pk-console.c:1829
+msgid "You need to specify a package or file to install"
+msgstr "You need to specify a package or file to install"
+
+#: ../client/pk-console.c:1836
+msgid "You need to specify a type, key_id and package_id"
+msgstr "You need to specify a type, key_id and package_id"
+
+#: ../client/pk-console.c:1843
+msgid "You need to specify a package to remove"
+msgstr "You need to specify a package to remove"
+
+#: ../client/pk-console.c:1849
+msgid ""
+"You need to specify the destination directory and then the packages to "
+"download"
+msgstr ""
+"You need to specify the destination directory and then the packages to "
+"download"
+
+#: ../client/pk-console.c:1854
+msgid "Directory not found"
+msgstr "Directory not found"
+
+#: ../client/pk-console.c:1860
+msgid "You need to specify a licence identifier (eula-id)"
+msgstr "You need to specify a licence identifier (eula-id)"
+
+#: ../client/pk-console.c:1876
+msgid "You need to specify a package name to resolve"
+msgstr "You need to specify a package name to resolve"
+
+#: ../client/pk-console.c:1885 ../client/pk-console.c:1892
+msgid "You need to specify a repository name"
+msgstr "You need to specify a repository name"
+
+#: ../client/pk-console.c:1899
+msgid "You need to specify a repo name/parameter and value"
+msgstr "You need to specify a repo name/parameter and value"
+
+#: ../client/pk-console.c:1912
+msgid "You need to specify an action, e.g. 'update-system'"
+msgstr "You need to specify an action, e.g. 'update-system'"
+
+#: ../client/pk-console.c:1917
+msgid "You need to specify a correct role"
+msgstr "You need to specify a correct role"
+
+#: ../client/pk-console.c:1922
+msgid "Failed to get last time"
+msgstr "Failed to get last time"
+
+#: ../client/pk-console.c:1961
+msgid "You need to specify a package to find the details for"
+msgstr "You need to specify a package to find the details for"
+
+#: ../client/pk-console.c:1968
+msgid "You need to specify a package to find the files for"
+msgstr "You need to specify a package to find the files for"
+
+#: ../client/pk-console.c:1975
+msgid "You need to specify a list file to create"
+msgstr "You need to specify a list file to create"
+
+#: ../client/pk-console.c:1983 ../client/pk-console.c:1991
+msgid "You need to specify a list file to open"
+msgstr "You need to specify a list file to open"
+
+#. TRANSLATORS: The user tried to use an unsupported option on the command line
+#: ../client/pk-console.c:2044
+#, c-format
+msgid "Option '%s' is not supported"
+msgstr "Option '%s' is not supported"
+
+#. TRANSLATORS: User does not have permission to do this
+#: ../client/pk-console.c:2057
+msgid "You don't have the necessary privileges for this operation"
+msgstr "You don't have the necessary privileges for this operation"
+
+#. TRANSLATORS: Generic failure of what they asked to do
+#: ../client/pk-console.c:2060
+msgid "Command failed"
+msgstr "Command failed"
+
+#. TRANSLATORS: This is the state of the transaction
+#: ../client/pk-generate-pack.c:100
+msgid "Downloading"
+msgstr "Downloading"
+
+#. TRANSLATORS: This is when the main packages are being downloaded
+#: ../client/pk-generate-pack.c:120
+msgid "Downloading packages"
+msgstr "Downloading packages"
+
+#. TRANSLATORS: This is when the dependency packages are being downloaded
+#: ../client/pk-generate-pack.c:125
+msgid "Downloading dependencies"
+msgstr "Downloading dependencies"
+
+#: ../client/pk-generate-pack.c:186
+msgid "Set the file name of dependencies to be excluded"
+msgstr "Set the file name of dependencies to be excluded"
+
+#: ../client/pk-generate-pack.c:188
+msgid "The output directory (the current directory is used if ommitted)"
+msgstr "The output directory (the current directory is used if omitted)"
+
+#: ../client/pk-generate-pack.c:190
+msgid "The package to be put into the service pack"
+msgstr "The package to be put into the service pack"
+
+#: ../client/pk-generate-pack.c:192
+msgid "Put all updates available in the service pack"
+msgstr "Put all updates available in the service pack"
+
+#. TRANSLATORS: This is when the user fails to supply the correct arguments
+#: ../client/pk-generate-pack.c:220
+msgid "Neither --package or --updates option selected."
+msgstr "Neither --package or --updates option selected."
+
+#. TRANSLATORS: This is when the user fails to supply just one argument
+#: ../client/pk-generate-pack.c:228
+msgid "Both options selected."
+msgstr "Both options selected."
+
+#. TRANSLATORS: This is when file already exists
+#: ../client/pk-generate-pack.c:261
+msgid "A pack with the same name already exists, do you want to overwrite it?"
+msgstr "A pack with the same name already exists, do you want to overwrite it?"
+
+#. TRANSLATORS: This is when the pack was not overwritten
+#: ../client/pk-generate-pack.c:264
+msgid "The pack was not overwritten."
+msgstr "The pack was not overwritten."
+
+#. TRANSLATORS: This is when the temporary directory cannot be created, the directory name follows
+#: ../client/pk-generate-pack.c:276
+msgid "Failed to create directory:"
+msgstr "Failed to create directory:"
+
+#. TRANSLATORS: This is when the list of packages from the remote computer cannot be opened
+#: ../client/pk-generate-pack.c:285
+msgid "Failed to open package list."
+msgstr "Failed to open package list."
+
+#. TRANSLATORS: The package name is being matched up to available packages
+#: ../client/pk-generate-pack.c:295
+msgid "Finding package name."
+msgstr "Finding package name."
+
+#. TRANSLATORS: This is when the package cannot be found in any software source. The detailed error follows
+#: ../client/pk-generate-pack.c:299
+#, c-format
+msgid "Failed to find package '%s': %s"
+msgstr "Failed to find package '%s': %s"
+
+#. TRANSLATORS: This is telling the user we are in the process of making the pack
+#: ../client/pk-generate-pack.c:315
+msgid "Creating service pack..."
+msgstr "Creating service pack..."
+
+#. TRANSLATORS: we succeeded in making the file
+#: ../client/pk-generate-pack.c:322
+#, c-format
+msgid "Service pack created '%s'"
+msgstr "Service pack created '%s'"
+
+#. TRANSLATORS: we failed to make te file
+#: ../client/pk-generate-pack.c:326
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "Failed to create '%s': %s"
+
+#: ../client/pk-monitor.c:132
+msgid "PackageKit Monitor"
+msgstr "PackageKit Monitor"
+
+#. TRANSLATORS: The package was not found in any software sources
+#: ../client/pk-tools-common.c:114
+msgid "The package could not be found"
+msgstr "The package could not be found"
+
+#. TRANSLATORS: more than one package could be found that matched, to follow is a list of possible packages
+#: ../client/pk-tools-common.c:125
+msgid "More than one package matches:"
+msgstr "More than one package matches:"
+
+#. TRANSLATORS: This finds out which package in the list to use
+#: ../client/pk-tools-common.c:132
+msgid "Please choose the correct package: "
+msgstr "Please choose the correct package: "
+
+#: ../client/pk-tools-common.c:158
+#, c-format
+msgid "Please enter a number from 1 to %i: "
+msgstr "Please enter a number from 1 to %i: "
+
+#. TRANSLATORS: when we are getting data from the daemon
+#: ../contrib/packagekit-plugin/src/contents.cpp:298
+msgid "Getting package information..."
+msgstr "Getting package information..."
+
+#. TRANSLATORS: run an applicaiton
+#: ../contrib/packagekit-plugin/src/contents.cpp:304
+#, c-format
+msgid "Run %s"
+msgstr "Run %s"
+
+#. TRANSLATORS: show the installed version of a package
+#: ../contrib/packagekit-plugin/src/contents.cpp:310
+msgid "Installed version"
+msgstr "Installed version"
+
+#. TRANSLATORS: run the application now
+#: ../contrib/packagekit-plugin/src/contents.cpp:318
+#, c-format
+msgid "Run version %s now"
+msgstr "Run version %s now"
+
+#: ../contrib/packagekit-plugin/src/contents.cpp:324
+msgid "Run now"
+msgstr "Run now"
+
+#. TRANSLATORS: update to a new version of the package
+#: ../contrib/packagekit-plugin/src/contents.cpp:330
+#, c-format
+msgid "Update to version %s"
+msgstr "Update to version %s"
+
+#. TRANSLATORS: To install a package
+#: ../contrib/packagekit-plugin/src/contents.cpp:336
+#, c-format
+msgid "Install %s now"
+msgstr "Install %s now"
+
+#. TRANSLATORS: the version of the package
+#: ../contrib/packagekit-plugin/src/contents.cpp:339
+msgid "Version"
+msgstr "Version"
+
+#. TRANSLATORS: noting found, so can't install
+#: ../contrib/packagekit-plugin/src/contents.cpp:344
+msgid "No packages found for your system"
+msgstr "No packages found for your system"
+
+#. TRANSLATORS: package is being installed
+#: ../contrib/packagekit-plugin/src/contents.cpp:349
+msgid "Installing..."
+msgstr "Installing..."
+
+#: ../data/packagekit-catalog.xml.in.h:1
+msgid "PackageKit Catalog"
+msgstr "PackageKit Catalog"
+
+#: ../data/packagekit-servicepack.xml.in.h:1
+msgid "PackageKit Service Pack"
+msgstr "PackageKit Service Pack"
+
+#: ../data/packagekit-package-list.xml.in.h:1
+msgid "PackageKit Package List"
+msgstr "PackageKit Package List"
+
+#: ../src/pk-main.c:86
+msgid "Startup failed due to security policies on this machine."
+msgstr "Startup failed due to security policies on this machine."
+
+#: ../src/pk-main.c:87
+msgid "This can happen for two reasons:"
+msgstr "This can happen for two reasons:"
+
+#: ../src/pk-main.c:88
+msgid "The correct user is not launching the executable (usually root)"
+msgstr "The correct user is not launching the executable (usually root)"
+
+#: ../src/pk-main.c:89
+msgid ""
+"The org.freedesktop.PackageKit.conf file is not installed in the system "
+"directory:"
+msgstr ""
+"The org.freedesktop.PackageKit.conf file is not installed in the system "
+"directory:"
+
+#: ../src/pk-main.c:187
+msgid "Packaging backend to use, e.g. dummy"
+msgstr "Packaging backend to use, e.g. dummy"
+
+#: ../src/pk-main.c:189
+msgid "Daemonize and detach from the terminal"
+msgstr "Daemonize and detach from the terminal"
+
+#: ../src/pk-main.c:193
+msgid "Disable the idle timer"
+msgstr "Disable the idle timer"
+
+#: ../src/pk-main.c:195
+msgid "Show version and exit"
+msgstr "Show version and exit"
+
+#: ../src/pk-main.c:197
+msgid "Exit after a small delay"
+msgstr "Exit after a small delay"
+
+#: ../src/pk-main.c:199
+msgid "Exit after the engine has loaded"
+msgstr "Exit after the engine has loaded"
+
+#: ../src/pk-main.c:213
+msgid "PackageKit service"
+msgstr "PackageKit service"
+
+#: ../src/pk-main.c:249
+msgid "Cannot connect to the system bus"
+msgstr "Cannot connect to the system bus"
+
+#: ../src/pk-main.c:298
+#, c-format
+msgid "Error trying to start: %s\n"
+msgstr "Error trying to start: %s\n"
+
commit 85b496c41521906bfa14591d0031b5cbf51a746a
Merge: bb6ecfc... 7ece139...
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Thu Jan 15 12:09:34 2009 +0000

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit bb6ecfce4357f2b9182a84be90f1e2be6704c012
Merge: 2743610... 96727db...
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Mon Jan 12 20:06:15 2009 +0000

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

commit 2743610e8861a926a18a1afdd053b13bb1f8a0a9
Merge: 2ddbe2c... 4b3e325...
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Mon Dec 15 16:52:50 2008 +0000

    Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit

diff --cc lib/packagekit-glib/egg-test.c
index 289144a,900b916..dd7e833
--- a/lib/packagekit-glib/egg-test.c
+++ b/lib/packagekit-glib/egg-test.c
@@@ -324,12 -324,14 +324,19 @@@ egg_test_get_data_file (const gchar *fi
  		return full;
  	g_free (full);
  
+ 	/* check to see if we are being run in the build root */
+ 	full = g_build_filename ("..", "..", "data", "tests", filename, NULL);
+ 	ret = g_file_test (full, G_FILE_TEST_EXISTS);
+ 	if (ret)
+ 		return full;
+ 	g_free (full);
+ 
  	/* check to see if we are being run in make check */
 +	full = g_build_filename ("..", "..", "data", "tests", filename, NULL);
 +	ret = g_file_test (full, G_FILE_TEST_EXISTS);
 +	if (ret)
 +		return full;
 +	g_free (full);
  	full = g_build_filename ("..", "..", "..", "data", "tests", filename, NULL);
  	ret = g_file_test (full, G_FILE_TEST_EXISTS);
  	if (ret)
commit 2ddbe2c7c309276836fc450d8b0b1698ea88e78e
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Tue Dec 9 18:00:00 2008 +0000

    bugfix: if a script is still running and PkSpawn is asked to unload, be more careful about disconnecting timers.
    
    I think this only affects the test suite, as the daemon shouldn't
    create, unref, create, unref PkSpawn objects.

diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 601ed7d..f9c79eb 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -269,6 +269,7 @@ pk_spawn_kill (PkSpawn *spawn)
 	gint retval;
 
 	g_return_val_if_fail (PK_IS_SPAWN (spawn), FALSE);
+	g_return_val_if_fail (spawn->priv->kill_id == 0, FALSE);
 
 	/* check if process has already gone */
 	if (spawn->priv->finished) {
@@ -567,16 +568,25 @@ pk_spawn_finalize (GObject *object)
 	g_return_if_fail (spawn->priv != NULL);
 
 	/* disconnect the poll in case we were cancelled before completion */
-	if (spawn->priv->poll_id != 0)
+	if (spawn->priv->poll_id != 0) {
 		g_source_remove (spawn->priv->poll_id);
+		spawn->priv->poll_id = 0;
+	}
 
 	/* disconnect the SIGKILL check */
-	if (spawn->priv->kill_id != 0)
+	if (spawn->priv->kill_id != 0) {
 		g_source_remove (spawn->priv->kill_id);
+		spawn->priv->kill_id = 0;
+	}
 
 	/* still running? */
-	if (spawn->priv->stdin_fd != -1)
+	if (spawn->priv->stdin_fd != -1) {
+		egg_warning ("killing as still running");
 		pk_spawn_kill (spawn);
+		/* just hope the script responded to SIGQUIT */
+		if (spawn->priv->kill_id != 0)
+			g_source_remove (spawn->priv->kill_id);
+	}
 
 	/* free the buffers */
 	g_string_free (spawn->priv->stdout_buf, TRUE);
commit f16bd549fb29b29375e0917e01c31c641211eea2
Author: Richard Hughes <hughsie at localhost.localdomain>
Date:   Tue Dec 9 17:54:51 2008 +0000

    trivial: search in more locations for the test files (fix make check on x64)

diff --git a/lib/packagekit-glib/egg-test.c b/lib/packagekit-glib/egg-test.c
index 09e69d6..289144a 100644
--- a/lib/packagekit-glib/egg-test.c
+++ b/lib/packagekit-glib/egg-test.c
@@ -325,6 +325,11 @@ egg_test_get_data_file (const gchar *filename)
 	g_free (full);
 
 	/* check to see if we are being run in make check */
+	full = g_build_filename ("..", "..", "data", "tests", filename, NULL);
+	ret = g_file_test (full, G_FILE_TEST_EXISTS);
+	if (ret)
+		return full;
+	g_free (full);
 	full = g_build_filename ("..", "..", "..", "data", "tests", filename, NULL);
 	ret = g_file_test (full, G_FILE_TEST_EXISTS);
 	if (ret)
