diff -u xfce4-session-4.4.2/debian/patches/series xfce4-session-4.4.2/debian/patches/series
--- xfce4-session-4.4.2/debian/patches/series
+++ xfce4-session-4.4.2/debian/patches/series
@@ -5,4 +5,6 @@
 04_xfce4-session-logout-manpage-typo.patch
 05_fix-resize-simple-splash-engine.patch
+06_fix-es-translation.patch
+07_fix-autostart-editor-crash.patch
 99_configure.patch
 xubuntu-default-config.patch
diff -u xfce4-session-4.4.2/debian/changelog xfce4-session-4.4.2/debian/changelog
--- xfce4-session-4.4.2/debian/changelog
+++ xfce4-session-4.4.2/debian/changelog
@@ -1,3 +1,14 @@
+xfce4-session (4.4.2-2ubuntu2) hardy; urgency=low
+
+  * debian/patches:
+    - 06_fix-es-translation.patch: fix two broken strings (LP: #214857)
+    - 07_fix-autostart-editor-crash.patch: fix a xfce4-autostart-editor crash
+      with desktop files containing a "Type" which is not "Application", thanks
+      Urs Fleisch for the patch (LP: #206867)
+    - series: refreshed.
+
+ -- Lionel Le Folgoc <mrpouit@ubuntu.com>  Mon, 14 Apr 2008 12:21:31 +0200
+
 xfce4-session (4.4.2-2ubuntu1) hardy; urgency=low
 
   * Merge from Debian unstable, remaining Ubuntu changes:
only in patch2:
unchanged:
--- xfce4-session-4.4.2.orig/debian/patches/06_fix-es-translation.patch
+++ xfce4-session-4.4.2/debian/patches/06_fix-es-translation.patch
@@ -0,0 +1,20 @@
+--- xfce4-session-4.4.2/po/es.po	2007-11-17 20:31:12.000000000 +0100
++++ xfce4-session-4.4.2/po/es.po.new	2008-04-14 12:17:09.000000000 +0200
+@@ -234,7 +234,7 @@
+ #. the button label in the xfce-mcs-manager dialog
+ #: ../settings/session/session.c:382
+ msgid "Button Label|Sessions and Startup"
+-msgstr "Etiqueta de botón | Sesiones e inicio"
++msgstr "Sesiones e inicio"
+ 
+ #: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
+ #: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
+@@ -286,7 +286,7 @@
+ #. the button label in the xfce-mcs-manager dialog
+ #: ../settings/splash/splash.c:584
+ msgid "Button Label|Splash Screen"
+-msgstr "Etiqueta de botón | Imagen de arranque"
++msgstr "Imagen de arranque"
+ 
+ #: ../xfce4-autostart-editor/xfae-dialog.c:99
+ msgid "Add application"
only in patch2:
unchanged:
--- xfce4-session-4.4.2.orig/debian/patches/07_fix-autostart-editor-crash.patch
+++ xfce4-session-4.4.2/debian/patches/07_fix-autostart-editor-crash.patch
@@ -0,0 +1,11 @@
+--- xfce4-session-4.4.2/xfce4-autostart-editor/xfae-model.c.orig	2007-11-17 20:31:05.000000000 +0100
++++ xfce4-session-4.4.2/xfce4-autostart-editor/xfae-model.c	2008-04-07 19:18:15.000000000 +0200
+@@ -490,7 +490,7 @@ xfae_item_new (const gchar *relpath)
+       xfce_rc_close (rc);
+ 
+       /* check if we should skip the item */
+-      if (G_UNLIKELY (skip))
++      if (G_UNLIKELY (skip) && item)
+         {
+           xfae_item_free (item);
+           item = NULL;