48 files changed, 5791 insertions, 2495 deletions

diff --git a/common/xfdesktop-common.c b/common/xfdesktop-common.c
index d3213cc8..c7d0b04f 100644
--- a/common/xfdesktop-common.c
+++ b/common/xfdesktop-common.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 
 #include <glib.h>
+#include <gdk/gdkx.h>
 #include <libxfce4util/libxfce4util.h>
 #include <libxfcegui4/dialogs.h>
 
@@ -185,3 +186,50 @@ xfce_desktop_get_menufile()
 
     return NULL;
 }
+
+gboolean
+xfdesktop_check_is_running(Window *xid)
+{
+    const gchar *display = g_getenv("DISPLAY");
+    gchar *p;
+    gint xscreen = -1;
+    gchar selection_name[100];
+    Atom selection_atom;
+    
+    if(display) {
+        if((p=g_strrstr(display, ".")))
+            xscreen = atoi(p);
+    }
+    if(xscreen == -1)
+        xscreen = 0;
+
+    g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen);
+    selection_atom = XInternAtom(GDK_DISPLAY(), selection_name, False);
+
+    if((*xid = XGetSelectionOwner(GDK_DISPLAY(), selection_atom)))
+        return TRUE;
+
+    return FALSE;
+}
+
+void
+xfdesktop_send_client_message(Window xid, const gchar *msg)
+{
+    GdkEventClient gev;
+    GtkWidget *win;
+    
+    win = gtk_invisible_new();
+    gtk_widget_realize(win);
+    
+    gev.type = GDK_CLIENT_EVENT;
+    gev.window = win->window;
+    gev.send_event = TRUE;
+    gev.message_type = gdk_atom_intern("STRING", FALSE);
+    gev.data_format = 8;
+    strcpy(gev.data.b, msg);
+    
+    gdk_event_send_client_message((GdkEvent *)&gev, (GdkNativeWindow)xid);
+    gdk_flush();
+    
+    gtk_widget_destroy(win);
+}
diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h
index 1952eed3..9217435e 100644
--- a/common/xfdesktop-common.h
+++ b/common/xfdesktop-common.h
@@ -27,12 +27,19 @@
 
 #include <glib.h>
 
+#include <X11/Xlib.h>
+
 #define BACKDROP_CHANNEL         "BACKDROP"
 #define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-stripes.png"
 #define LIST_TEXT                "# xfce backdrop list"
 #define XFDESKTOP_SELECTION_FMT  "XFDESKTOP_SELECTION_%d"
 #define XFDESKTOP_IMAGE_FILE_FMT "XFDESKTOP_IMAGE_FILE_%d"
 
+#define RELOAD_MESSAGE     "reload"
+#define MENU_MESSAGE       "menu"
+#define WINDOWLIST_MESSAGE "windowlist"
+#define QUIT_MESSAGE       "quit"
+
 G_BEGIN_DECLS
 
 typedef enum
@@ -55,6 +62,8 @@ gchar **get_list_from_file(const gchar *);
 gboolean is_backdrop_list(const gchar *path);
 gboolean xfdesktop_check_image_file(const gchar *filename);
 gchar *xfce_desktop_get_menufile();
+gboolean xfdesktop_check_is_running(Window *xid);
+void xfdesktop_send_client_message(Window xid, const gchar *msg);
 
 G_END_DECLS
 
diff --git a/modules/menu/desktop-menu-dentry.c b/modules/menu/desktop-menu-dentry.c
index e182968f..da9d5ec0 100644
--- a/modules/menu/desktop-menu-dentry.c
+++ b/modules/menu/desktop-menu-dentry.c
@@ -471,6 +471,7 @@ static gboolean
 menu_dentry_parse_dentry_file(XfceDesktopMenu *desktop_menu,
         const gchar *filename, MenuPathType pathtype) 
 {
+    gboolean ret = FALSE;
     XfceDesktopEntry *dentry;
     
     //TRACE("dummy");
@@ -478,13 +479,13 @@ menu_dentry_parse_dentry_file(XfceDesktopMenu *desktop_menu,
     dentry = xfce_desktop_entry_new(filename, dentry_keywords,
             G_N_ELEMENTS(dentry_keywords));
     if(dentry) {
-        gboolean ret = menu_dentry_parse_dentry(desktop_menu, dentry,
+        ret = menu_dentry_parse_dentry(desktop_menu, dentry,
                 pathtype, FALSE, NULL);
         g_object_unref(G_OBJECT(dentry));
         return ret;
     }
     
-    return FALSE;
+    return ret;
 }
 
 static gint
diff --git a/po/ar.po b/po/ar.po
index 594af1b5..e30d3b80 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-3-8 8:25+0300\n"
 "Last-Translator: saleh alhathal <hathalsal@hotmail.com>\n"
 "Language-Team: arabic\n"
@@ -336,48 +336,86 @@ msgstr "مخفي"
 msgid "/Other"
 msgstr "/أخرى"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 #, fuzzy
 msgid "Select Icon"
 msgstr "إختر أيقونة"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 #, fuzzy
 msgid "Select Menu File"
 msgstr "فتح ملف قائمة XFCE4"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 #, fuzzy
 msgid "All Files"
 msgstr "ملف"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "ملفات صور"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "ملفات صور"
 
-#: panel-plugin/desktop-menu-plugin.c:465
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
 #, fuzzy
-msgid "_Menu file:"
+msgid "Button"
+msgstr "_ذاتي"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "ملفات صور"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
 msgstr "فتح ملف قائمة XFCE4"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_تحرير"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "أيقونة :"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -429,8 +467,8 @@ msgid "Edit backdrop list"
 msgstr ""
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "سطح المكتب"
 
@@ -487,101 +525,123 @@ msgstr "_ذاتي"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "إعدادات الخلفية"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "خلفية"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "الوان"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "شكل:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "الوان"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "لون الخلفية :"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "إستخدم لون فقط :"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "صورة"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "صورة"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "_ملف"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr ""
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "خلفية"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -611,28 +671,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -680,6 +744,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "إعدادات الخلفية"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "إستخدم لون فقط :"
+
+#, fuzzy
+#~ msgid "_Menu file:"
+#~ msgstr "فتح ملف قائمة XFCE4"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "عنوان :"
 
diff --git a/po/az.po b/po/az.po
index 7fe9b65f..3a0d094b 100644
--- a/po/az.po
+++ b/po/az.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-08-25 22:52+0300\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -317,42 +317,83 @@ msgstr "Gizli"
 msgid "/Other"
 msgstr "/Digər"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce Menyusu"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Timsalı Seç"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Menyu Faylını Seç"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Bütün Fayllar"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Rəsm Faylları"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Menyu Faylları"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menyu faylı:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "xfce4-menueditor başladıla bilmədi: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Düymə timsalı:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Düymə timsalı:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Menyu Faylları"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Masa üstü menyusunu _düzəlt"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Menyu faylını aç"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menyu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Timsal:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Düymə timsalı:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Menyuda _timsalları göstər"
 
@@ -407,8 +448,8 @@ msgid "Edit backdrop list"
 msgstr "Arxa plan siyahısını dəyişdir"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Masa Üstü"
 
@@ -456,92 +497,116 @@ msgstr "Avtomatik"
 msgid "Adjust _Brightness:"
 msgstr "_Parlaqlığı Sazla:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Təkmilləşdirmələri nəzərə alma"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Masa Üstü Qurğuları"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Arxa Planlar"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Rəng"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Rəng Tərzi:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Tək Rəng"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Üfüqi Qradient"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Şaquli Qradient"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "_İlk Rəng:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "İ_kinci Rəng:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "_Təkcə rəng işlət"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Rəsm"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "_Rəsm Göstər"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Fayl:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Arxa plan _olmasın"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Arxa Plan"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Ekran %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Ekran %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menyu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "xfce4-menueditor başladıla bilmədi: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Pəncərə Siyahısı"
@@ -570,30 +635,34 @@ msgstr "_Proqram timsallarını göstər"
 msgid "_Edit desktop menu"
 msgstr "Masa üstü menyusunu _düzəlt"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Naməlum seçim: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Seçimlər:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Bütün qurğuları yenidən yüklə, rəsm siyahısını yenilə\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Menyunu göstər (siçanın hazırkı mövqeyində)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Pəncərə siyahısını göstər (siçanın hazırkı mövqeyində)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -640,6 +709,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Masa Üstü Qurğuları"
 
+#~ msgid "Set color _only"
+#~ msgstr "_Təkcə rəng işlət"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Arxa plan _olmasın"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menyu faylı:"
+
 #~ msgid "Title:"
 #~ msgstr "Etiket:"
 
diff --git a/po/be.po b/po/be.po
index 800cb73b..f5e38409 100644
--- a/po/be.po
+++ b/po/be.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-09-12 13:49+0300\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -316,42 +316,83 @@ msgstr "Схаваны"
 msgid "/Other"
 msgstr "/Іншае"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Мэню Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Вылучыце значку"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Вылучыце файл мэню"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Усе файлы"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Файлы з відарысамі"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Файлы мэню"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Файл _мэню:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Немагчыма запусьціць aunch xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Значка _кнопкі:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Значка _кнопкі:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Файлы мэню"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Рэдагаваць мэню стальца"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Адчыніць файл мэню"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Мэню"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Значка:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Значка _кнопкі:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Паказваць _значкі ў мэню"
 
@@ -406,8 +447,8 @@ msgid "Edit backdrop list"
 msgstr "Рэдагаваць сьпіс тла"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Сталец"
 
@@ -455,92 +496,116 @@ msgstr "Аўтаматычна"
 msgid "Adjust _Brightness:"
 msgstr "Наладка _зыркасьці:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ігнараваць зьмены"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Наладкі стальца"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Відарысы _тла"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Колер"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Стыль _колераў:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Суцэльны колер"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Гарызантальны градыент"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Вэртыкальны градыент"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "П_ершы колер:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "Др_угі колер:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Выкрыстоўваць т_олькі колер"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Вірадыс"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Паказаць _вірадыс"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Файл:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Не _выстаўляць тло"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Тло"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Экран %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Экран %d, манітор %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Мэню"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Немагчыма запусьціць aunch xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Сьпіс вокнаў"
@@ -569,28 +634,32 @@ msgstr "Паказваць значкі д_астасаваньняў"
 msgid "_Edit desktop menu"
 msgstr "_Рэдагаваць мэню стальца"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: невядомы выбар: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Выбары:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      Перачытаць усе наладкі, абнавіць сьпіс відарысаў\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Паказаць мэню (побач з мышой)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Паказаць сьпіс вокнаў (побач з мышой)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -637,6 +706,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Наладкі стальца"
 
+#~ msgid "Set color _only"
+#~ msgstr "Выкрыстоўваць т_олькі колер"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Не _выстаўляць тло"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Файл _мэню:"
+
 #~ msgid "Title:"
 #~ msgstr "Назва:"
 
diff --git a/po/bg.po b/po/bg.po
index 033a137f..8190a45a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-03-09 19:00+0200\n"
 "Last-Translator: Miroslav Yordanov <miordanov@i-space.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -322,44 +322,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "Файлове с картинки"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "Файлове с картинки"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Автоматичен"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Файлове с картинки"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -416,8 +452,8 @@ msgid "Edit backdrop list"
 msgstr "Редактира списъка с фонове"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Работно Място"
 
@@ -473,102 +509,123 @@ msgstr "Автоматичен"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Настройки на работните места"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "Списък с фонове"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Цвят"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "Стил:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "Цвят"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "Цвят на фона:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Използва само цвят: "
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Изображение"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "Изображение"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "Файл:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "Десктоп: фон"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "Списък с фонове"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -598,28 +655,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -667,6 +728,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "Настройки на работните места"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Използва само цвят: "
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Десктоп: фон"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "Файл:"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 5b03d4f1..7a561f49 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-04-06 19:28+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bangla INDIA <LL@li.org>\n"
@@ -177,7 +177,9 @@ msgstr "মেনু বন্ধ করার পূর্বে কি আপ�
 
 #: menueditor/menueditor.c:123
 msgid "You have modified the menu, do you want to save it before quitting ?"
-msgstr "আপনি মেনুর মধ্যে কিছু পরিবর্তন করেছেন, প্রস্থান করার পূর্বে কি আপনি এই পরিবর্তনগুলি সংরক্ষণ করতে ইচ্ছুক ?"
+msgstr ""
+"আপনি মেনুর মধ্যে কিছু পরিবর্তন করেছেন, প্রস্থান করার পূর্বে কি আপনি এই পরিবর্তনগুলি "
+"সংরক্ষণ করতে ইচ্ছুক ?"
 
 #: menueditor/menueditor.c:125
 msgid "Forget modifications"
@@ -316,42 +318,83 @@ msgstr "লুকোনো"
 msgid "/Other"
 msgstr "/অন্যান্য"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce মেনু"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "আইকন নির্বাচন করুন"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "মেনু ফাইল নির্বাচন করুন"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "সমস্ত ফাইল"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "ছবির ফাইল"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "মেনু ফাইল"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "মেনু ফাইল: (_M)"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "xfce4-menueditor আরম্ভ করা যায়নি: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "বাটন আইকন:(_B)"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "বাটন আইকন:(_B)"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "মেনু ফাইল"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "ডেস্কটপ মেনু সম্পাদন করুন (_E)"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "মেনু ফাইল খুলুন"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "মেনু (_M)"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "আইকন:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "বাটন আইকন:(_B)"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "মেনুর মধ্যে আইকন প্রদর্শন করা হবে (_i)"
 
@@ -365,7 +408,8 @@ msgid ""
 msgstr ""
 "%s ফাইল সংরক্ষণ করা যায়নি: %s\n"
 "\n"
-"অনুগ্রহ করে একটি পৃথক অবস্থান নির্বাচন করুন অথবা ডায়লগের মধ্যে বাতিল টিপে আপনার করা পরিবর্তনগুলি অগ্রাহ্য করুন"
+"অনুগ্রহ করে একটি পৃথক অবস্থান নির্বাচন করুন অথবা ডায়লগের মধ্যে বাতিল টিপে আপনার করা "
+"পরিবর্তনগুলি অগ্রাহ্য করুন"
 
 #: settings/backdrop-mgr.c:409
 msgid "Select backdrop image file"
@@ -405,8 +449,8 @@ msgid "Edit backdrop list"
 msgstr "পটভূমির তালিকা সম্পাদন করুন"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "ডেস্কটপ"
 
@@ -454,92 +498,116 @@ msgstr "অটো"
 msgid "Adjust _Brightness:"
 msgstr "উজ্জ্বলতা পরিবর্তন করুন: (_B)"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "পরিবর্তন অগ্রাহ্য করা হবে"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "ডেস্কটপ সংক্রান্ত বৈশিষ্ট্য"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "পটভূমি (_B)"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "রং"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "রং-র ধরন:(_C)"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "সুষম রং"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "অনুভুমিক ঢল"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "উলম্ব ঢল"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "প্রথম রং: (_r)"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "দ্বিতীয় রং: (_S)"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "শুধুমাত্র রং নির্বাচন করুন (_o)"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "ছবি"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "ছবি প্রদর্শন করুন (_I)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "ফাইল: (_F)"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "পটভূমি নির্ধারণ করা হবে না (_D)"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "পটভূমি (_B)"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "পর্দা %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "পর্দা %d, মনিটর %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "মেনু (_M)"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "xfce4-menueditor আরম্ভ করা যায়নি: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "উইন্ডোর তালিকা"
@@ -568,27 +636,33 @@ msgstr "অ্যাপ্লিকেশনের আইকন প্রদর�
 msgid "_Edit desktop menu"
 msgstr "ডেস্কটপ মেনু সম্পাদন করুন (_E)"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: অজানা অপশন: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "অপশনগুলি হল:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
-msgstr "    -reload      সমস্ত বৈশিষ্ট্য পুনরায় লোড করুন, ছবির তালিকা নতুন করে প্রদর্শন করুন\n"
+msgstr ""
+"    -reload      সমস্ত বৈশিষ্ট্য পুনরায় লোড করুন, ছবির তালিকা নতুন করে প্রদর্শন করুন\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        মেনু পপ-আপ করবে (মাউসের বর্তমান অবস্থানে)\n"
 
-#: src/main.c:304
-msgid "    -windowlist  Pop up the window list (at the current mouse position)\n"
+#: src/main.c:257
+msgid ""
+"    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  উইন্ডোর তালিকা পপ-আপ করবে (মাউসের বর্তমান অবস্থানে)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -633,3 +707,11 @@ msgstr "Xfce 4 ডেস্কটপ নিয়ন্ত্রক সংক্র
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 ডেস্কটপের বৈশিষ্ট্য"
 
+#~ msgid "_Menu file:"
+#~ msgstr "মেনু ফাইল: (_M)"
+
+#~ msgid "Set color _only"
+#~ msgstr "শুধুমাত্র রং নির্বাচন করুন (_o)"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "পটভূমি নির্ধারণ করা হবে না (_D)"
diff --git a/po/ca.po b/po/ca.po
index 1a9bb413..1e4733c0 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XFce 4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-03-29 22:59+0100\n"
 "Last-Translator: Carles Munoz Gorriz <carlesmu@internautas.org>\n"
 "Language-Team: ca <ca@li.org>\n"
@@ -320,44 +320,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "Fitxers d'imatge"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Automàtic"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Fitxers d'imatge"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -415,8 +451,8 @@ msgid "Edit backdrop list"
 msgstr "Edita la llista de rerefons"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr ""
 
@@ -472,102 +508,123 @@ msgstr "_Automàtic"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Ajustament dels espais de treball"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "Llista de rerefons"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Color"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "Estil:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "Color"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "Color de fons:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Fes servir tan sols el color:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Imatge"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "Imatge"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "Fitxer:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "No fixar el fons"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "Llista de rerefons"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -597,28 +654,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -666,6 +727,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "Ajustament dels espais de treball"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Fes servir tan sols el color:"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "No fixar el fons"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "Fitxer:"
 
diff --git a/po/cs.po b/po/cs.po
index 85c25970..e31f9967 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-10-29 18:12+0000\n"
 "Last-Translator: Alois Nespor <Alois.Nespor@seznam.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -318,42 +318,83 @@ msgstr "Skryto"
 msgid "/Other"
 msgstr "/Ostatní"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menu Xfce4"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Vybrat ikonu"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Vybrat souborové menu"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Všechny soubory"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Soubory s obrázky"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Souborové menu"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Souborové _menu:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Nelze spustit Xfce4 menu editor : %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Tlačítko ikony:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Tlačítko ikony:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Souborové menu"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Upravit menu plochy"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Otevřít souborové menu"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ikona:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Tlačítko ikony:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Zobrazit _ikony v menu"
 
@@ -407,8 +448,8 @@ msgid "Edit backdrop list"
 msgstr "Editovat seznam pozadí"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Plocha"
 
@@ -456,92 +497,116 @@ msgstr "Automaticky"
 msgid "Adjust _Brightness:"
 msgstr "Přizpůsobit _jas:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignorovat modifikace"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Nastavení plochy"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Pozadí"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Barva"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Barevný styl:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Plná (solidní) barva"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horizontálně stupňovat"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Vertikálně stupňovat"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "_První barva:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Druhá barva:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Natavit _pouze barvu"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Obrázek"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Ukázat _obrázek"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Soubor:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_Nenastavovat pozadí"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Pozadí"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Obraz %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Obraz %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Nelze spustit Xfce4 menu editor : %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Seznam oken"
@@ -570,30 +635,34 @@ msgstr "Zobrazit  ikony _aplikace"
 msgid "_Edit desktop menu"
 msgstr "_Upravit menu plochy"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Neznámá volba: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Možnosti jsou:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "   - reload      Nahrát znovu všechny nastavení, obnovit seznam obrázků\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    menu        Otevřít menu (na aktuální pozici kurzoru myši)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Otevřít seznam oken (na aktuální pozici kurzoru myši)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -640,6 +709,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Nastavení plochy"
 
+#~ msgid "Set color _only"
+#~ msgstr "Natavit _pouze barvu"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_Nenastavovat pozadí"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Souborové _menu:"
+
 #~ msgid "Title:"
 #~ msgstr "Titulek:"
 
diff --git a/po/de.po b/po/de.po
index b8096617..a4830ef6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-09-21 12:55+0200\n"
 "Last-Translator: Moritz Heiber <moe@xfce.org>\n"
 "Language-Team: NONE <none@none>\n"
@@ -314,42 +314,83 @@ msgstr "Versteckt"
 msgid "/Other"
 msgstr "/Andere"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce Menü"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Icon auswählen"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Menüdatei auswählen"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Bilddateien"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Menüdateien"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menüdatei:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Konnte xfce4-menueditor nicht starten: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Buttonicon:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Buttonicon:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Menüdateien"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Desktopmenü bearbeiten"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Xfce4-Menüdatei öffnen"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menü"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Icon:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Buttonicon:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Icons im Menü anzeigen"
 
@@ -404,8 +445,8 @@ msgid "Edit backdrop list"
 msgstr "Liste mit Hintergrundbildern bearbeiten"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Desktop"
 
@@ -453,92 +494,116 @@ msgstr "Automatisch"
 msgid "Adjust _Brightness:"
 msgstr "Helligkeit _einstellen:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Veränderungen ignorieren"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Hintergrundeinstellungen"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Hintergründe"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Farbe"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Farbenstil:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Eine Farbe"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horizontaler Verlauf"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Vertikaler Verlauf"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Erste _Farbe"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Zweite Farbe"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Nur Farbe _verwenden:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Bild"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Zeige _Bild"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Datei:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_Kein Hintergrundbild setzen"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "Hintergrund"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Bildschirm %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Bildschirm %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menü"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Konnte xfce4-menueditor nicht starten: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Fensterliste"
@@ -567,29 +632,33 @@ msgstr "_Zeige Programmicons"
 msgid "_Edit desktop menu"
 msgstr "_Desktopmenü bearbeiten"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Unbekannte Option %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Optionen sind:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "   -reload\tEinstellungen neu laden, Liste auffrischen\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "   -menu\t\tDas Menü (an der Zeigerposition) aufpoppen lassen\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Fensterliste (an der Zeigerposition) aufpoppen lassen\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -636,6 +705,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Hintergrundeinstellungen"
 
+#~ msgid "Set color _only"
+#~ msgstr "Nur Farbe _verwenden:"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_Kein Hintergrundbild setzen"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menüdatei:"
+
 #~ msgid "Title:"
 #~ msgstr "Titel:"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index b9627f6e..7b7886d2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-12-03 18:06+0200\n"
 "Last-Translator: Translate.org.za <info@translate.org.za>\n"
 "Language-Team: \n"
@@ -317,42 +317,83 @@ msgstr "Hidden"
 msgid "/Other"
 msgstr "/Other"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Select Icon"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Select Menu File"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "All Files"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Image Files"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Menu Files"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Unable to launch xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Button icon:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Button icon:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Menu Files"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Edit desktop menu"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Open menu file"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Icon:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Button icon:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Show _icons in menu"
 
@@ -407,8 +448,8 @@ msgid "Edit backdrop list"
 msgstr "Edit backdrop list"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Desktop"
 
@@ -456,92 +497,116 @@ msgstr "Auto"
 msgid "Adjust _Brightness:"
 msgstr "Adjust _Brightness:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignore modifications"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Desktop Settings"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Backdrops"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Colour"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Colour Style:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Solid Colour"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horizontal Gradient"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Vertical Gradient"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Fi_rst Colour:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Second Colour:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Set colour _only"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Image"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Show _Image"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_File:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_Don't set backdrop"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Backdrop"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Screen %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Screen %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Unable to launch xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Window List"
@@ -570,29 +635,33 @@ msgstr "Show _application icons"
 msgid "_Edit desktop menu"
 msgstr "_Edit desktop menu"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Unknown option: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Options are:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      Reload all settings, refresh image list\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Pop up the menu (at the current mouse position)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -639,6 +708,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Desktop Settings"
 
+#~ msgid "Set color _only"
+#~ msgstr "Set colour _only"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_Don't set backdrop"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menu file:"
+
 #~ msgid "Title:"
 #~ msgstr "Title:"
 
diff --git a/po/es.po b/po/es.po
index e5a81fbe..ca5173db 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-01-13 00:00+0100\n"
 "Last-Translator: edscott <edscott@xfce.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -316,42 +316,83 @@ msgstr "Oculto"
 msgid "/Other"
 msgstr "/Otro"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menú Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Seleccionar ícono"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Seleccionar archivo de menú"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Archivos de imágenes"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Archivos de menú"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Archivo de menu:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "No se puede ejecutar xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Ícono del botón"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Ícono del botón"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Archivos de menú"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Editar menú de escritorio"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Abrir un archivo de menú"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "Menú"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ícono:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Ícono del botón"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Mostrar íconos en el menú"
 
@@ -406,8 +447,8 @@ msgid "Edit backdrop list"
 msgstr "Editar lista de fondos"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Escritorio"
 
@@ -455,92 +496,116 @@ msgstr "Automático"
 msgid "Adjust _Brightness:"
 msgstr "Ajustar brillantez:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignorar modificaciones"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Configuración del Escritorio"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Fondos"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Color"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Estilo de color:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Color sólido"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Gradiente horizontal"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Gradiente vertical"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Primer color:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "Segundo color:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Usar color:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Imagen"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Mostrar imagen"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "Archivo:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "No cambiar el fondo"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "Fondo"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Pantalla %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Pantalla %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "Menú"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "No se puede ejecutar xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Lista de ventanas"
@@ -569,28 +634,32 @@ msgstr "Mostrar íconos de aplicaciones"
 msgid "_Edit desktop menu"
 msgstr "Editar menú de escritorio"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Opción desconocida: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Las opciones:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -recargar    Recargar configuración\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menú        Mostrar el menú\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Mostrar lista de ventanas\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -635,6 +704,15 @@ msgstr "Configuración para el escritorio Xfce4"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Configuración para el escritorio Xfce4"
 
+#~ msgid "Set color _only"
+#~ msgstr "Usar color:"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "No cambiar el fondo"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Archivo de menu:"
+
 #~ msgid "Title:"
 #~ msgstr "Título:"
 
diff --git a/po/es_MX.po b/po/es_MX.po
index e5a81fbe..ca5173db 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-01-13 00:00+0100\n"
 "Last-Translator: edscott <edscott@xfce.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -316,42 +316,83 @@ msgstr "Oculto"
 msgid "/Other"
 msgstr "/Otro"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menú Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Seleccionar ícono"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Seleccionar archivo de menú"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Archivos de imágenes"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Archivos de menú"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Archivo de menu:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "No se puede ejecutar xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Ícono del botón"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Ícono del botón"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Archivos de menú"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Editar menú de escritorio"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Abrir un archivo de menú"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "Menú"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ícono:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Ícono del botón"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Mostrar íconos en el menú"
 
@@ -406,8 +447,8 @@ msgid "Edit backdrop list"
 msgstr "Editar lista de fondos"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Escritorio"
 
@@ -455,92 +496,116 @@ msgstr "Automático"
 msgid "Adjust _Brightness:"
 msgstr "Ajustar brillantez:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignorar modificaciones"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Configuración del Escritorio"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Fondos"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Color"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Estilo de color:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Color sólido"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Gradiente horizontal"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Gradiente vertical"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Primer color:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "Segundo color:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Usar color:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Imagen"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Mostrar imagen"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "Archivo:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "No cambiar el fondo"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "Fondo"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Pantalla %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Pantalla %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "Menú"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "No se puede ejecutar xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Lista de ventanas"
@@ -569,28 +634,32 @@ msgstr "Mostrar íconos de aplicaciones"
 msgid "_Edit desktop menu"
 msgstr "Editar menú de escritorio"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Opción desconocida: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Las opciones:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -recargar    Recargar configuración\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menú        Mostrar el menú\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Mostrar lista de ventanas\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -635,6 +704,15 @@ msgstr "Configuración para el escritorio Xfce4"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Configuración para el escritorio Xfce4"
 
+#~ msgid "Set color _only"
+#~ msgstr "Usar color:"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "No cambiar el fondo"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Archivo de menu:"
+
 #~ msgid "Title:"
 #~ msgstr "Título:"
 
diff --git a/po/et.po b/po/et.po
index a26696bf..055efe56 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-12-09 01:41+0300\n"
 "Last-Translator: Mart Tõnso <mart.tonso@ttu.ee>\n"
 "Language-Team: \n"
@@ -315,42 +315,83 @@ msgstr "Varjatud"
 msgid "/Other"
 msgstr "/Muu"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce menüü"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Vali ikoon"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Vali menüüfail"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Kõik failid"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Pildi failid"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Menüüfailid"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menüüfail"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Ei õnnestu käivitada xfce4-menüüredaktorit: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Nupu ikoon:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Nupu ikoon:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Menüüfailid"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Muuda töölaua menüüd"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Ava menüü fail"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menüü"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ikoon:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Nupu ikoon:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Näita menüüs ikoone"
 
@@ -405,8 +446,8 @@ msgid "Edit backdrop list"
 msgstr "Muuda tausta nimistut"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Töölaud"
 
@@ -454,92 +495,116 @@ msgstr "Automaatne"
 msgid "Adjust _Brightness:"
 msgstr "Kohenda _heledust:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignoreeri muudatusi"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Töölaua seaded"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Taustad"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Värv"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Värvi stiil:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Ühtlane värv"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horisontaalne muutus"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Vertikaalne muutus"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Es_imene värv:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Teine värv:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Kasuta ainult värvi"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Pilt"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Näita _Pilti"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Fail:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Ära sea tausta"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Taust"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Ekraan %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Ekraan %d, Kuvar %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menüü"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Ei õnnestu käivitada xfce4-menüüredaktorit: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Akende nimekiri"
@@ -568,28 +633,32 @@ msgstr "Näita _programmide ikoone"
 msgid "_Edit desktop menu"
 msgstr "_Muuda töölaua menüüd"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: tundmatu valik: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Valikud on:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      Lae kõik seaded uuesti, uuenda piltide nimekirja\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Näita menüüd (hiire jooksvas asukohas)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Näita akende nimekirja (hiire jooksvas asukohas)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -634,6 +703,15 @@ msgstr "Xfce 4 töölaua tausta seaded"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 töölaua tausta seaded"
 
+#~ msgid "Set color _only"
+#~ msgstr "Kasuta ainult värvi"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Ära sea tausta"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menüüfail"
+
 #~ msgid "Title:"
 #~ msgstr "Pealkiri:"
 
diff --git a/po/eu.po b/po/eu.po
index 9abec58e..347655ed 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-09-13 21:56+0200\n"
 "Last-Translator: Piarres Beobide Egaña <pi@beobide.net>\n"
 "Language-Team: Euskara <librezale@librezale.org>\n"
@@ -319,42 +319,83 @@ msgstr "Ezkutatu"
 msgid "/Other"
 msgstr "/Besteak"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce Menua"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Ikonoa aukeratu"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Menu Fitxategia Aukeratu"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Fitxategi Guztiak"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Irudi Fitxategiak"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Irudi Fitxategia"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menu fitxategia:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Ezin da xfce4-menueditor abiarazi: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Botoi ikonoa:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Botoi ikonoa:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Irudi Fitxategia"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Editatu idazmahai menua"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Menu fitxategia ireki"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menua"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ikonoa:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Botoi ikonoa:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Erakutsi _ikonoak menuan"
 
@@ -409,8 +450,8 @@ msgid "Edit backdrop list"
 msgstr "Editatu atzekalde zerrenda"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Idazmahia"
 
@@ -458,92 +499,116 @@ msgstr "Automatikoa"
 msgid "Adjust _Brightness:"
 msgstr "_Distira Doitu:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Aldaketak alda batetara utzi"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Mahaigain birtualen ezarpenak"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Atzekaldeen zerrenda"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Kolorea"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Kolore Estiloa:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Kolore betea"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Gradiente Horizontala"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Gradiente Bertikala"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Lehen Kolo_rea:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Atzekaldeko kolorea:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "kolorea _bakarrik erabili :"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Irudia"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "_Irudia Bistarazi"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Fitxategia:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_Ez ezarri atzekaldea"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Atzekaldea"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "%d Pantaila"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "%d Pantaila, %d Monitorea"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menua"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Ezin da xfce4-menueditor abiarazi: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Leiho-zerrenda"
@@ -572,28 +637,32 @@ msgstr "Bistarazi _aplikazio ikonoak"
 msgid "_Edit desktop menu"
 msgstr "_Editatu idazmahai menua"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: aukera ezezaguna: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Aukerak:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      Ezarpen guztiak birkargatu, irudi zerrenda freskatu\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Menua bistarazi (saguaren kokalekuan)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Leiho zerrenda bistarazi (saguaren kokalekuan)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -640,6 +709,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Mahaigain birtualen ezarpenak"
 
+#~ msgid "Set color _only"
+#~ msgstr "kolorea _bakarrik erabili :"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_Ez ezarri atzekaldea"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menu fitxategia:"
+
 #~ msgid "Title:"
 #~ msgstr "Izenburua:"
 
diff --git a/po/fa.po b/po/fa.po
index 655e8a65..c1410f1a 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop-fa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-09-29 17:27+0330\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -321,42 +321,83 @@ msgstr "پنهان"
 msgid "/Other"
 msgstr "/دیگر"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "منوی Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "انتخاب شمایل"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "انتخاب پرونده منو"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "همه پرونده‌ها"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "پرونده‌های تصویر"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "پرونده‌های منو"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "پرونده _منو:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "نمیتوان ویرایشگر منوی Xfce4 را راه انداخت: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "شمایل _دکمه:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "شمایل _دکمه:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "پرونده‌های منو"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_ویرایش منوی رومیزی"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "باز کردن پرونده منو"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_منو"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "شمایل:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "شمایل _دکمه:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "نشان دادن _شمایل‌ها در منو"
 
@@ -411,8 +452,8 @@ msgid "Edit backdrop list"
 msgstr "ویرایش کردن لیست زمینه"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "رومیزی"
 
@@ -460,92 +501,116 @@ msgstr "خودکار"
 msgid "Adjust _Brightness:"
 msgstr "متناسب کردن رو_شنایی:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "نادیده گیری تغییرات"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "تنظیمات رومیزی"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_زمینه‌ها"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "رنگ"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "سبک _رنگ:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "رنگ یکدست"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "افت افقی"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "افت عمودی"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "رنگ او_ل:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "رنگ _دوم:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "گذاردن رنگ _فقط"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "تصویر"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "نشان دادن _تصویر"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_پرونده:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "زمینه _گذارده نشود"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_زمینه"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "صفحه %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "صفحه %d، نمایشگر %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_منو"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "نمیتوان ویرایشگر منوی Xfce4 را راه انداخت: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "لیست پنجره"
@@ -574,29 +639,33 @@ msgstr "نشان دادن شمایل‌های برنامه‌های _کاربر�
 msgid "_Edit desktop menu"
 msgstr "_ویرایش منوی رومیزی"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: گزینه ناشناخته: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "گزینه‌ها عبارتند از:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload     همه تنظیمات را بارگذاری مجدد کرده و لیست تصویر نوسازی میشود\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        ,باز کردن منو (در جای موشی کنونی)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  باز کردن لیست پنجره (در جای موشی کنونی )\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -643,6 +712,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "تنظیمات رومیزی"
 
+#~ msgid "Set color _only"
+#~ msgstr "گذاردن رنگ _فقط"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "زمینه _گذارده نشود"
+
+#~ msgid "_Menu file:"
+#~ msgstr "پرونده _منو:"
+
 #~ msgid "Title:"
 #~ msgstr "عنوان:"
 
diff --git a/po/fi.po b/po/fi.po
index 80f8b88b..ab36bd25 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-01-20 15:04+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
 "Language-Team: \n"
@@ -314,42 +314,83 @@ msgstr "Piilotettu"
 msgid "/Other"
 msgstr "/Muut"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce-valikko"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Valitse kuvake"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Valitse valikkotiedosto"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Valikkotiedostot"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Valikkotiedosto:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "xfce4-valikkoeditoria ei voitu käynnistää: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Painikkeen kuvake:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Painikkeen kuvake:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Valikkotiedostot"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Muokkaa työpöytävalikkoa"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Avaa valikkotiedosto"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Valikko"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Kuvake:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Painikkeen kuvake:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Näytä kuvake val_ikossa"
 
@@ -403,8 +444,8 @@ msgid "Edit backdrop list"
 msgstr "Muokkaa taustakuvalistaa"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Työpöytä"
 
@@ -452,92 +493,116 @@ msgstr "Automaattinen"
 msgid "Adjust _Brightness:"
 msgstr "Säädä ki_rkkaus:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Hylkää muutokset"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Työpöytien Asetukset"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Taustakuva"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Väri"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "V_ärien Tyyli:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Yksivärinen"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Vaakaväriliuku"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Pystyväriliuku"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "_Ensimmäinen väri:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Toinen väri"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Pelkkä väri:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Kuva"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Näytä _kuva"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "Tiedosto:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Älä aseta taustaa"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "Tausta"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Näyttö %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Näyttö %d, Monitori %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Valikko"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "xfce4-valikkoeditoria ei voitu käynnistää: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Ikkunalistaus"
@@ -566,29 +631,33 @@ msgstr "Näytä sovellusten kuvakkeet"
 msgid "_Edit desktop menu"
 msgstr "Muokkaa työpöytävalikkoa"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Tuntematon valinta: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Valinnat ovat:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload     Lataa kaikki asetukset uudelleen, päivittää kuvalistan\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Näyttää valikon (nykyisessä hiiren kohdassa)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Näyttää ikkunalistan (nykyisessä hiiden kohdassa)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -633,6 +702,15 @@ msgstr "Xfce 4 Työpöydän taustan asetukset"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 Työpöydän asetukset"
 
+#~ msgid "Set color _only"
+#~ msgstr "Pelkkä väri:"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Älä aseta taustaa"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Valikkotiedosto:"
+
 #~ msgid "Title:"
 #~ msgstr "Otsikko:"
 
diff --git a/po/fr.po b/po/fr.po
index d7dc403a..7a2aa073 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-08-06 23:17+0200\n"
 "Last-Translator: Jean-Franois Wauthy <pollux@castor.be>\n"
 "Language-Team: French <en@li.org>\n"
@@ -314,42 +314,83 @@ msgstr "Caché"
 msgid "/Other"
 msgstr "/Autre"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menu Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Sélection de l'icône"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Sélection du fichier de menu"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Tous les fichiers"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Fichiers images"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Fichiers menus"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Fichier de _menu :"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Impossible de lancer xfce4-menueditor : %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Icône de _bouton :"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Icône de _bouton :"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Fichiers menus"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Édition du menu de bureau"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Ouvrir le fichier de menu"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Icône :"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Icône de _bouton :"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Afficher les _icônes dans le menu"
 
@@ -404,8 +445,8 @@ msgid "Edit backdrop list"
 msgstr "Édition de la liste de fonds d'écran"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Bureau"
 
@@ -453,93 +494,117 @@ msgstr "Automatique"
 msgid "Adjust _Brightness:"
 msgstr "Ajuster la _brillance :"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignorer les modifications"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Paramètres de Bureau"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Fonds d'écran"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Couleur"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Style de _couleur :"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Couleur unie"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Dégradé horizontal"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Dégradé vertical"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "P_remière couleur :"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Seconde couleur :"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Utiliser _uniquement la couleur"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Image"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Afficher l'_image"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Fichier :"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Ne pas utiliser le fond d'écran"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Fonds d'écran"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Écran %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Écran %d, Moniteur %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Impossible de lancer xfce4-menueditor : %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Liste des fenêtres"
@@ -568,32 +633,36 @@ msgstr "Afficher les icônes des _applications"
 msgid "_Edit desktop menu"
 msgstr "Édition du menu de bureau"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Option inconnue : %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Les options sont :\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "····-reload······Recharger tous le paramètres,·rafraîchir la liste d'images\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 "····-menu········Affiche le menu·(à la position courante de la souris)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "····-windowlist··Affiche la liste des fenêtres·(à la·position courante de la "
 "souris)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -639,6 +708,15 @@ msgstr "Paramétrage du gestionnaire de bureau"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Paramètres du bureau de Xfce 4"
 
+#~ msgid "Set color _only"
+#~ msgstr "Utiliser _uniquement la couleur"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Ne pas utiliser le fond d'écran"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Fichier de _menu :"
+
 #~ msgid "Title:"
 #~ msgstr "Titre :"
 
diff --git a/po/gu.po b/po/gu.po
index 429309a1..6013c246 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-03-02 12:56+0530\n"
 "Last-Translator: Ankit Patel <ankit@redhat.com>\n"
 "Language-Team: Gujarati <gu@li.org>\n"
@@ -16,7 +16,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 
 #: menueditor/about_dialog.c:39
@@ -319,42 +320,83 @@ msgstr "છુપુ"
 msgid "/Other"
 msgstr "/અન્ય"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce મેનુ"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "ચિહ્ન પસંદ કરો"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "મેનુ ફાઈલ પસંદ કરો"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "બધી ફાઈલો"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "ઈમેજ ફાઈલો"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "મેનુ ફાઈલો"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "મેનુ ફાઈલ (_M):"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "xfce4-menueditor લોન્ચ કરવામાં નિષ્ફળ: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "બટન ચિહ્ન (_B):"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "બટન ચિહ્ન (_B):"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "મેનુ ફાઈલો"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "ડેસ્કટોપ મેનુમાં ફેરફાર કરો (_E)"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "મેનુ ફાઈલ ખોલો"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "મેનુ (_M)"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "ચિહ્ન:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "બટન ચિહ્ન (_B):"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "મેનુમાં ચિહ્નો બતાવો (_i)"
 
@@ -409,8 +451,8 @@ msgid "Edit backdrop list"
 msgstr "બેકડ્રોપ યાદીમાં ફેરફાર કરો"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "ડેસ્કટોપ"
 
@@ -458,92 +500,116 @@ msgstr "આપોઆપ"
 msgid "Adjust _Brightness:"
 msgstr "તેજસ્વીતા સમતોલ કરો (_B):"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "સુધારાઓ અવગણો"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "ડેસ્કટોપ સુયોજનો"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "બેકડ્રોપ (_B)"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "રંગ"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "રંગની શૈલી (_C):"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "ઘાટો રંગ"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "આડો ઢાળ"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "ઊભો ઢાળ"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "પ્રથમ રંગ (_r):"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "બીજો રંગ (_S):"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "માત્ર રંગ સુયોજિત કરો (_o)"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "ઈમેજ"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "ઈમેજ બતાવો (_I)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "ફાઈલ (_F):"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "બેકડ્રોપ સુયોજિત કરો નહિં (_D)"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "બેકડ્રોપ (_B)"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "સ્ક્રીન %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "સ્ક્રીન %d, મોનિટર %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "મેનુ (_M)"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "xfce4-menueditor લોન્ચ કરવામાં નિષ્ફળ: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "વિન્ડો યાદી"
@@ -572,27 +638,32 @@ msgstr "કાર્યક્રમ ચિહ્નો બતાવો (_a)"
 msgid "_Edit desktop menu"
 msgstr "ડેસ્કટોપ મેનુમાં ફેરફાર કરો (_E)"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: અજ્ઞાત વિકલ્પ: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "વિકલ્પો છે:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      બધા સુયોજનો ફરીથી લાવો, ઈમેજ યાદી ફરીથી તાજી કરો\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        મેનુને પોપઅપ કરે છે (માઉસની વર્તમાન જગ્યાએ)\n"
 
-#: src/main.c:304
-msgid "    -windowlist  Pop up the window list (at the current mouse position)\n"
+#: src/main.c:257
+msgid ""
+"    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -menu        વિન્ડો યાદીને પોપઅપ કરે છે (માઉસની વર્તમાન જગ્યાએ)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -637,3 +708,11 @@ msgstr "Xfce 4 ડેસ્કટોપ વ્યવસ્થાપક માટ
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 ડેસ્કટોપ સુયોજનો"
 
+#~ msgid "Set color _only"
+#~ msgstr "માત્ર રંગ સુયોજિત કરો (_o)"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "બેકડ્રોપ સુયોજિત કરો નહિં (_D)"
+
+#~ msgid "_Menu file:"
+#~ msgstr "મેનુ ફાઈલ (_M):"
diff --git a/po/he.po b/po/he.po
index 3c5dd5db..09a3cf75 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-12-31 16:54+0200\n"
 "Last-Translator: Yuval Tanny <tanai@int.gov.il>\n"
 "Language-Team: Hebrew Team <xfce2004@yahoo.com>\n"
@@ -317,42 +317,83 @@ msgstr "מוסתר"
 msgid "/Other"
 msgstr "/אחר"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "תפריט Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "בחר סמל"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "בחר קובץ תפריט"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "כל הקבצים"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "קבצי תמונה"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "קבצי תפריט"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "קבצי _תפריט:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "אין אפשרות להפעיל את עורך התפריטים של Xfce4: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "סמל ה_לחצן:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "סמל ה_לחצן:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "קבצי תפריט"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_ערוך תפריט שולחן עבודה"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "פתח קובץ תפריט"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_תפריט"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "סמל:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "סמל ה_לחצן:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "הראה _סמלים בתפריט"
 
@@ -406,8 +447,8 @@ msgid "Edit backdrop list"
 msgstr "ערוך רשימת טפטים"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "שולחן עבודה"
 
@@ -455,92 +496,116 @@ msgstr "אוטומטי"
 msgid "Adjust _Brightness:"
 msgstr "התאם _בהירות:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "התעלם משינויים"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "הגדרות שולחן עבודה"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_טפטים"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "צבע"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "סגנון _צבע:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "צבע אחיד"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "הדרגתי אופקי"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "הדרגתי אנכי"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "צבע _ראשון:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "צבע _שני:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "הגדר צבע _בלבד"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "תמונה"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "הראה _תמונה"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_קובץ:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_לא להגדיר רקע"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_רקע"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "מסך %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "מסך %d, צג %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_תפריט"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "אין אפשרות להפעיל את עורך התפריטים של Xfce4: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "רשימת חלונות"
@@ -569,28 +634,32 @@ msgstr "הצג סמלי _יישומים"
 msgid "_Edit desktop menu"
 msgstr "_ערוך תפריט שולחן עבודה"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s אפשרות לא ידועה: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "האפשרויות הם:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -טוען      טוען את כל ההגדרות, מרענן את רשימת החלונות\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -תפריט        מקפיץ תפריט (במיקום הסמן הנוכחי)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -רשימת חלונות  מקפיץ את רשימת החלונות (במיקום הסמן הנוכחי)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -636,6 +705,15 @@ msgstr "הגדרות שולחן העבודה של Xfce 4"
 msgid "Xfce 4 Desktop Settings"
 msgstr "הגדרות שולחן העבודה Xfce 4"
 
+#~ msgid "Set color _only"
+#~ msgstr "הגדר צבע _בלבד"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_לא להגדיר רקע"
+
+#~ msgid "_Menu file:"
+#~ msgstr "קבצי _תפריט:"
+
 #~ msgid "Title:"
 #~ msgstr "כותרת:"
 
diff --git a/po/hi.po b/po/hi.po
index 9f1d1cf8..94ea440b 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop.hi.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2003-11-01 18:21+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-group@lists.sourceforge.net>\n"
@@ -320,44 +320,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "चित्र फाइलें"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "चित्र फाइलें"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "स्वतः (_A)"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "चित्र फाइलें"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -414,8 +450,8 @@ msgid "Edit backdrop list"
 msgstr "बैकड्रॉप सूची संपादित करें"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "डेस्कटॉप"
 
@@ -471,14 +507,52 @@ msgstr "स्वतः (_A)"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "कार्यस्थान सेटिंग्स"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "बेकड्राप सूची"
@@ -488,11 +562,11 @@ msgstr "बेकड्राप सूची"
 # libgnomecanvas/gnome-canvas-text.c:430
 # libgnomecanvas/gnome-canvas-text.c:438
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "रंग"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "शैली :"
@@ -501,80 +575,63 @@ msgstr "शैली :"
 # libgnomecanvas/gnome-canvas-text.c:422
 # libgnomecanvas/gnome-canvas-text.c:430
 # libgnomecanvas/gnome-canvas-text.c:438
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "रंग"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "पृष्ठभूमि का रंग "
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "सिर्फ रंग उपयोग में:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "चित्र (इमेज)"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "चित्र (इमेज)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr " फाइल:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "पृष्ठ भूमि रंग चुनें"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "बेकड्राप सूची"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -604,28 +661,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -673,6 +734,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "कार्यस्थान सेटिंग्स"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "सिर्फ रंग उपयोग में:"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "पृष्ठ भूमि रंग चुनें"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr " फाइल:"
 
diff --git a/po/hu.po b/po/hu.po
index 1c7a7ea6..5de6c096 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2003-07-16 16:19+0200\n"
 "Last-Translator: Egmont Koblinger <egmont@uhulinux.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -324,44 +324,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "Képfájlok"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "Képfájlok"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Automatikusan"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Képfájlok"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -419,8 +455,8 @@ msgid "Edit backdrop list"
 msgstr "Háttérlista szerkesztése"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Munkaasztal"
 
@@ -476,102 +512,123 @@ msgstr "_Automatikusan"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Munkaterület beállításai"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "Háttérlista"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Szín"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "Megjelenítés:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "Szín"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "Háttérszín:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Csak szín használata:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Kép"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "Kép"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "Fájl:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "Háttérszín kiválasztása"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "Háttérlista"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -601,28 +658,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -670,6 +731,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "Munkaterület beállításai"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Csak szín használata:"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Háttérszín kiválasztása"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "Fájl:"
 
diff --git a/po/it.po b/po/it.po
index f8dcfc1f..dd51a130 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: XFce4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-03-11 13:56+0100\n"
 "Last-Translator: Luca Marrocco <buildup@libero.it>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -322,44 +322,85 @@ msgstr "Nascosto"
 msgid "/Other"
 msgstr "/Altro"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menu Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Seleziona un icona"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Seleziona un Menu File"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Tutti i file"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "File immagini"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "File immagini"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Impossibile lanciare xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "icona _Bottone:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "icona _Bottone:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "File immagini"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Edita menu desktop"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Apre un menu da file"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Edita"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Icona:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "icona _Bottone:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Visualizza le _icone nel menu"
 
@@ -416,8 +457,8 @@ msgid "Edit backdrop list"
 msgstr "Modifica la lista degli sfondi"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Desktop"
 
@@ -473,102 +514,124 @@ msgstr "_Auto"
 msgid "Adjust _Brightness:"
 msgstr "Aggiusta _Brightness:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignora le modifiche"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Impostazioni dello Spazio di lavoro"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "Lista di Sfondi"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Colore"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "Stile:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "Colore"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Gradiente orizzontale"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Gradiente verticale"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Colore primario:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "Colore di sfondo:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Tinta unita:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Immagine"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "Immagine"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "File:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "Desktop: sfondo"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "Lista di Sfondi"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Schermo %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Schermo %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Impossibile lanciare xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Lista finestre"
@@ -598,32 +661,36 @@ msgstr "Visualizza icone _applicazione"
 msgid "_Edit desktop menu"
 msgstr "_Edita menu desktop"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Opzione sconosciuta: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Le opzioni sono:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Rilegge tutte le impostazioni, aggiorna la lista delle "
 "immagini\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Pop uppa il menu (all'attuale posizione del mouse)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Pop uppa la lista delle finestre (all'attuale posizione del "
 "mouse)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -672,6 +739,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "Impostazioni dello Spazio di lavoro"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Tinta unita:"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Desktop: sfondo"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "File:"
 
diff --git a/po/ja.po b/po/ja.po
index 16117a30..8e0f27bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop 4.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-03-05 16:05+0900\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-03-06 20:08+0900\n"
 "Last-Translator: Daichi Kawahata <daichik@users.sourceforge.net>\n"
 "Language-Team: xfce-users-jp <xfce-users-jp@ml.fdiary.net>\n"
@@ -102,7 +102,7 @@ msgstr "アイテムを追加するには全ての項目に記入して下さい
 msgid "The 'Name' field is required."
 msgstr "'名前' の項目は必須です。"
 
-#: menueditor/add_dialog.c:331 menueditor/utils.c:318
+#: menueditor/add_dialog.c:331
 msgid "--- separator ---"
 msgstr "--- セパレータ ---"
 
@@ -150,11 +150,10 @@ msgid "The 'Source' field is required."
 msgstr "'ソース' 項目は必須です。"
 
 #: menueditor/add_menu_dialog.c:202 menueditor/add_menu_dialog.c:212
-#: menueditor/utils.c:372
 msgid "--- include ---"
 msgstr "--- 組込み ---"
 
-#: menueditor/add_menu_dialog.c:213 menueditor/utils.c:389
+#: menueditor/add_menu_dialog.c:213
 msgid "system"
 msgstr "システム"
 
@@ -192,7 +191,7 @@ msgstr "現在のメニューを閉じても構いませんか？"
 msgid "Do you want to save before closing the file?"
 msgstr "ファイルを閉じる前に保存しますか？"
 
-#: menueditor/menueditor.c:334 menueditor/utils.c:587
+#: menueditor/menueditor.c:334
 msgid "Select command"
 msgstr "コマンドを選択して下さい"
 
@@ -313,89 +312,81 @@ msgstr "コマンド"
 msgid "Hidden"
 msgstr "隠す"
 
-#: menueditor/utils.c:649
-msgid "Select icon"
-msgstr "アイコンを選択して下さい"
-
-#: menueditor/utils.c:654 panel-plugin/desktop-menu-plugin.c:510
-#: settings/backdrop-mgr.c:414 settings/backdrop-mgr.c:515
-#: settings/backdrop_settings.c:533
-msgid "All Files"
-msgstr "全てのファイル"
-
-#: menueditor/utils.c:658 panel-plugin/desktop-menu-plugin.c:516
-#: settings/backdrop-mgr.c:418 settings/backdrop_settings.c:537
-msgid "Image Files"
-msgstr "画像ファイル"
-
-#: menueditor/xfce-menueditor.desktop.in.h:1
-msgid "Graphical tool for editing the Xfce 4 menu"
-msgstr "Xfce 4 メニューを編集するグラフィカルツール"
-
-#: menueditor/xfce-menueditor.desktop.in.h:2
-msgid "Menu Editor"
-msgstr "メニューエディタ"
-
-#: menueditor/xfce-menueditor.desktop.in.h:3
-msgid "Xfce 4 Menu Editor"
-msgstr "Xfce 4 メニューエディタ"
-
 #: modules/menu/desktop-menuspec.c:62
 msgid "/Other"
 msgstr "/その他"
 
-#: panel-plugin/desktop-menu-plugin.c:279
-#: panel-plugin/desktop-menu-plugin.c:805
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce メニュー"
 
-#: panel-plugin/desktop-menu-plugin.c:493
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "アイコンを選択して下さい"
 
-#: panel-plugin/desktop-menu-plugin.c:495
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "メニューファイルを選択して下さい"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
+#: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
+msgid "All Files"
+msgstr "全てのファイル"
+
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
+#: settings/backdrop_settings.c:537
+msgid "Image Files"
+msgstr "画像ファイル"
+
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "メニューファイル"
 
-#: panel-plugin/desktop-menu-plugin.c:640 settings/menu_settings.c:132
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
 #, c-format
 msgid "Unable to launch xfce4-menueditor: %s"
 msgstr "xfce4-menueditor を実行できません: %s"
 
-#: panel-plugin/desktop-menu-plugin.c:663
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "ボタンアイコン(_B):"
+
+#: panel-plugin/desktop-menu-plugin.c:753
 msgid "Button _title:"
 msgstr "ボタンタイトル(_T):"
 
-#: panel-plugin/desktop-menu-plugin.c:676
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
 msgid "Menu File"
 msgstr "メニューファイル"
 
-#: panel-plugin/desktop-menu-plugin.c:688
+#: panel-plugin/desktop-menu-plugin.c:785
 msgid "Use default _desktop menu file"
 msgstr "既定のデスクトップメニューを使用(_D)"
 
-#: panel-plugin/desktop-menu-plugin.c:697
+#: panel-plugin/desktop-menu-plugin.c:794
 msgid "Use _custom menu file:"
 msgstr "カスタム・メニューファイルを使用(_C):"
 
-#: panel-plugin/desktop-menu-plugin.c:749
-#: panel-plugin/desktop-menu-plugin.c:751
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
 msgid "_Edit Menu"
 msgstr "メニューを編集(_E)"
 
-#: panel-plugin/desktop-menu-plugin.c:758
+#: panel-plugin/desktop-menu-plugin.c:855
 msgid "Icons"
 msgstr "アイコン"
 
-#: panel-plugin/desktop-menu-plugin.c:770
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "ボタンアイコン(_B):"
 
-#: panel-plugin/desktop-menu-plugin.c:794
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "メニューでアイコンを表示(_I):"
 
@@ -450,8 +441,8 @@ msgid "Edit backdrop list"
 msgstr "背景リスト編集"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "デスクトップ"
 
@@ -499,84 +490,113 @@ msgstr "自動"
 msgid "Adjust _Brightness:"
 msgstr "明度を調節する(_B):"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "変更を無視する"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "デスクトップ設定"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "背景(_B)"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "カラー"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "色スタイル(_C):"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "単色"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "水平グラデーション"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "垂直グラデーション"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "最初の色(_R):"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "二番目の色(_S):"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "単色のみを使用(_O)"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "画像"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "画像を表示する(_I)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "ファイル(_F):"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "背景を設定しない(_D)"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "背景(_B)"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "画面 %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "画面 %d, モニタ %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "メニュー(_M)"
 
@@ -608,36 +628,32 @@ msgstr "アプリケーションアイコンを表示(_A)"
 msgid "_Edit desktop menu"
 msgstr "デスクトップメニューを編集(_E)"
 
-#: settings/xfce-backdrop-settings.desktop.in.h:2
-msgid "Settings for the Xfce 4 Desktop Manager"
-msgstr "Xfce 4 デスクトップマネージャの設定"
-
-#: settings/xfce-backdrop-settings.desktop.in.h:3
-msgid "Xfce 4 Desktop Settings"
-msgstr "Xfce 4 デスクトップ設定"
-
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: 不明なオプション: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "オプションは:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      全ての設定を再読込みして、画像リストを更新\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        メニューをポップアップ (現在のマウス位置で)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  ウィンドウリストをポップアップ (現在のマウス位置で)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -661,3 +677,32 @@ msgstr "ワークスペース %d を削除する(_R)"
 #, c-format
 msgid "_Remove Workspace '%s'"
 msgstr "ワークスペース '%s' を削除する(_R)"
+
+#: menueditor/xfce-menueditor.desktop.in.h:1
+msgid "Graphical tool for editing the Xfce 4 menu"
+msgstr "Xfce 4 メニューを編集するグラフィカルツール"
+
+#: menueditor/xfce-menueditor.desktop.in.h:2
+msgid "Menu Editor"
+msgstr "メニューエディタ"
+
+#: menueditor/xfce-menueditor.desktop.in.h:3
+msgid "Xfce 4 Menu Editor"
+msgstr "Xfce 4 メニューエディタ"
+
+#: settings/xfce-backdrop-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Desktop Manager"
+msgstr "Xfce 4 デスクトップマネージャの設定"
+
+#: settings/xfce-backdrop-settings.desktop.in.h:3
+msgid "Xfce 4 Desktop Settings"
+msgstr "Xfce 4 デスクトップ設定"
+
+#~ msgid "Set color _only"
+#~ msgstr "単色のみを使用(_O)"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "背景を設定しない(_D)"
+
+#~ msgid "Select icon"
+#~ msgstr "アイコンを選択して下さい"
diff --git a/po/ko.po b/po/ko.po
index a70ac312..39a2361c 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-01-29 18:41+0900\n"
 "Last-Translator: ByungHyun Choi<byunghyunchoi@rtlinux.or.kr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -316,42 +316,83 @@ msgstr "숨김"
 msgid "/Other"
 msgstr "기타"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce 메뉴"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "아이콘 선택"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "메뉴 화일 선택"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "모든 화일"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "그림 화일"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "메뉴 화일"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "메뉴 화일(_M):"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Xfce4 메뉴 편집기 기동 실패: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "버튼 아이콘(_B):"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "버튼 아이콘(_B):"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "메뉴 화일"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "데스크탑 메뉴 편집(_E)"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "메뉴 화일 열기"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "메뉴(_M)"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "아이콘:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "버튼 아이콘(_B):"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "메뉴에 아이콘 보이기(_i)"
 
@@ -405,8 +446,8 @@ msgid "Edit backdrop list"
 msgstr "배경화면 목록을 수정합니다."
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "데스크탑"
 
@@ -454,92 +495,116 @@ msgstr "자동"
 msgid "Adjust _Brightness:"
 msgstr "밝기 조절(_B):"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "수정한 것 무시"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "작업공간 설정"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "배경화면(_B)"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "색상"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "표현 방식(_C):"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "단색"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "수평으로 색 변화"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "수직으로 색 변화"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "첫번째 색(_r):"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "두번째 색(_S):"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "색만 사용(_o)"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "그림"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "그림 보이기(_I)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "화일(_F):"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "배경색 선택"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "배경화면(_B)"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "화면 %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "화면 %d, 모니터 %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "메뉴(_M)"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Xfce4 메뉴 편집기 기동 실패: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "창 목록"
@@ -568,30 +633,34 @@ msgstr "프로그램 아이콘 보이기(_a)"
 msgid "_Edit desktop menu"
 msgstr "데스크탑 메뉴 편집(_E)"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: 모르는 옵션: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "옵션은 다음과 같니다:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      모든 설정을 새로 읽어 오고, 그림 목록을 새로 고칩니다.\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        메뉴를 보여줍니다(마우스의 현재 위치에 보여줍니다).\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  창 목록을 보여줍니다(마우스의 현재 위치에 보여줍니다).\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -635,3 +704,12 @@ msgstr "Xfce 4 데스크탑 관리 도구의 환경 설정"
 #: settings/xfce-backdrop-settings.desktop.in.h:3
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 데스크탑 설정"
+
+#~ msgid "Set color _only"
+#~ msgstr "색만 사용(_o)"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "배경색 선택"
+
+#~ msgid "_Menu file:"
+#~ msgstr "메뉴 화일(_M):"
diff --git a/po/lt.po b/po/lt.po
index a5a0b188..fc88683c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop 3.99.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-10-30 01:36+0300\n"
 "Last-Translator: Mantas <zaz@xxx.lt>\n"
 "Language-Team: Lithuania <zaz@xxx.lt>\n"
@@ -315,42 +315,83 @@ msgstr "Pasl�ptas"
 msgid "/Other"
 msgstr "/Kitas"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce Meniu"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Pasirinkti Ikon�"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Pasirinkti Meniu Fail�"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Visi Failai"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Paveiksl� Failai"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Meniu failai"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Meniu failas:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Ne�manoma paleisti xfce4-menueditor:�%s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Mygtuko ikona:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Mygtuko ikona:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Meniu failai"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Redaguoti darbastalio meniu"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Atidaryti meniu fail�"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Meniu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ikona:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Mygtuko ikona:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Rodyti ikonas meniu"
 
@@ -405,8 +446,8 @@ msgid "Edit backdrop list"
 msgstr "Redaguoti fon� s�ra��"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Darbastalis"
 
@@ -454,92 +495,116 @@ msgstr "_Automati�kai"
 msgid "Adjust _Brightness:"
 msgstr "Priderinti _Ry�kum�:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Atmesti modifikacijas"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Darbastalio nuostatos"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Fonai"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Spalva"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Spalv� Stilius:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Vienoda Spalva"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horizontaliai pereinanti"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Vertikaliai pereinanti"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Pi_rma Spalva:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Kita Spalva:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Naudoti tiktai _spalv�"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Paveikslas"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Rodyti _Paveiksl�"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Failas:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Nenustatyta fonas"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Fonas"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Ekranas %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Ekranas %d, Monitorius %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Meniu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Ne�manoma paleisti xfce4-menueditor:�%s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Lang� s�ra�as"
@@ -568,30 +633,34 @@ msgstr "Rodyti progr_amos ikonas"
 msgid "_Edit desktop menu"
 msgstr "_Redaguoti darbastalio meniu"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Ne�inoma parinktis: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Parinktys yra:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Perkrauti visus nustaytmus, atnaujinti paveiksl� s�ra��\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        I�skleid�iamas meniu (esamoje pel�s pozicijoje)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  I�skleid�iamas lang� s�ra�as (esamoje pel�s pozicijoje)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -638,6 +707,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Darbastalio nuostatos"
 
+#~ msgid "Set color _only"
+#~ msgstr "Naudoti tiktai _spalv�"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Nenustatyta fonas"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Meniu failas:"
+
 #~ msgid "Title:"
 #~ msgstr "Antra�t�:"
 
diff --git a/po/mr.po b/po/mr.po
index 75d748f4..3a159d13 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-04-20 20:40+0530\n"
 "Last-Translator: Pallavi Nikam <pallavi_edu@rediffmail.com>\n"
 "Language-Team: Marathi <LL@li.org>\n"
@@ -315,42 +315,83 @@ msgstr "लपलेले"
 msgid "/Other"
 msgstr "/बाकीचे"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce यादी"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "आयकॉन निवडा"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "यादिची फाईल निवडा"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "सर्व फाईल्स"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "प्रतिमा फाईल्सची "
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "यादी फाईल्स"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "यादी फाईल (_M):"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "xfce4-यादी संपादक लॉन्च करु शकत नाही: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "बटन आयकॉन (_B):"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "बटन आयकॉन (_B):"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "यादी फाईल्स"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "डेस्कटॉप यादी संपादन (_E)"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "यादी फाईल उघडा"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "यादी (_M)"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "आयकॉन:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "बटन आयकॉन (_B):"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "यादीमध्ये आयकॉनस दाखवा (_i)"
 
@@ -404,8 +445,8 @@ msgid "Edit backdrop list"
 msgstr "बॅकड्रॉप सूचीचे संपादन करा"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "डेस्कटॉप"
 
@@ -453,92 +494,116 @@ msgstr "स्वयं"
 msgid "Adjust _Brightness:"
 msgstr "प्रकाशिझोत सुव्यवस्थीत करा (_B):"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "बदल दुर्लक्षीत करा"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "डेस्कटॉप रचना"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "बॅकड्रॉपस (_B)"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "रंग"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "रंगांची शैली(_C):"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "भरीव रंग"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "आडवे मान"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "उभे मान"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "प्रथम रंग (_r):"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "द्वितीय(_S):"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "फक्त रंगाची सजावट(_o)"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "इमेज"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "इमेज दाखवा (_I)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "फाईल(_F):"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "बॅकड्रॉपची (_B)"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "बॅकड्रॉप (_B)"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr " पडदा %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "%d पडदा %d मॉनिटर"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "यादी (_M)"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "xfce4-यादी संपादक लॉन्च करु शकत नाही: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "विण्डो सूची"
@@ -567,28 +632,32 @@ msgstr "अॅप्लिकेशन आयकॉन दाखवा (_a)"
 msgid "_Edit desktop menu"
 msgstr "डेस्कटॉप यादी संपादन (_E)"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: अपरिची पर्याय:%s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "पर्याय:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "-रिलोड    सर्व रचना रिलोड करा, इमेजची सूची रिफ्रेश करा\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "      -यादी        यादी दाखवा (माउस सध्या ज्या जागेवेर आहे तिथे)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr " - विण्डोसूची    विण्डो ची सूची दाखवा (माउस सध्या ज्या जागेवेर आहे तिथे)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -632,3 +701,12 @@ msgstr "Xfce 4 डेस्कटॉप व्यवस्थापकाची
 #: settings/xfce-backdrop-settings.desktop.in.h:3
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 डेस्कटॉप रचना"
+
+#~ msgid "_Menu file:"
+#~ msgstr "यादी फाईल (_M):"
+
+#~ msgid "Set color _only"
+#~ msgstr "फक्त रंगाची सजावट(_o)"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "बॅकड्रॉपची (_B)"
diff --git a/po/ms.po b/po/ms.po
index 05126be6..89d81eaf 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Xfdesktop 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-02-07 23:28+0800\n"
 "Last-Translator: Harun Musa <mharun@gmx.net>\n"
 "Language-Team: Malay <translation-team-ms@list.sourceforge.net>\n"
@@ -320,44 +320,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "Fail imej"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "Fail imej"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Auto"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Fail imej"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -415,8 +451,8 @@ msgid "Edit backdrop list"
 msgstr "Edit senarai latarbelakang"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr ""
 
@@ -472,102 +508,123 @@ msgstr "_Auto"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Tetapan Ruangkerja"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "Senarai Latarbelakang"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Warna"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "Stail:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "Warna"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "Warna latarbelakang:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Hanya guna warna:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Imej"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "Imej"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "Fail:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "Jangan set latarbelakang"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "Senarai Latarbelakang"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -597,28 +654,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -666,6 +727,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "Tetapan Ruangkerja"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Hanya guna warna:"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Jangan set latarbelakang"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "Fail:"
 
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 31c4cca6..263dd80f 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-12-04 01:08+0100\n"
 "Last-Translator: Eskild Hustvedt <eskild@goldenfiles.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -315,42 +315,76 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+msgid "Button"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+msgid "Menu File"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -401,8 +435,8 @@ msgid "Edit backdrop list"
 msgstr ""
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr ""
 
@@ -450,92 +484,115 @@ msgstr ""
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr ""
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr ""
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr ""
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr ""
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr ""
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr ""
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr ""
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr ""
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr ""
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr ""
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr ""
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr ""
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -564,28 +621,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
diff --git a/po/nl.po b/po/nl.po
index ee4bb475..5a901605 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-08-25 09:20+0200\n"
 "Last-Translator: Jasper Huijsmans <jasper@xfce.org>\n"
 "Language-Team: Nederlands <nl@li.org>\n"
@@ -315,42 +315,83 @@ msgstr "Verborgen"
 msgid "/Other"
 msgstr "/Overig"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Pictogram Selecteren"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Menubestand Selecteren"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Alle Bestanden"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Plaatjes"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Menubestanden"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menubestand:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Kon xfce4-menueditor niet starten: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Pictogram:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Pictogram:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Menubestanden"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Bureaubladmenu be_werken"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Open menubestand"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_menu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Pictogram:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Pictogram:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Toon pictogrammen in menu"
 
@@ -404,8 +445,8 @@ msgid "Edit backdrop list"
 msgstr "Lijst van achtergronden aanpassen"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Bureaublad"
 
@@ -453,92 +494,116 @@ msgstr "Automatisch"
 msgid "Adjust _Brightness:"
 msgstr "Helderheid aanpassen:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Wijzigingen negeren"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Instellingen Bureaublad"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Achtergronden"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Kleur"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Kleur Stijl:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Vaste Kleur"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horizontake Gradiënt"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Verticale Gradiënt"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "_Eerste Kleur:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Tweede Kleur:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "_Alleen kleur gebruiken"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Plaatje"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Plaatje tonen"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Bestand:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Achtergrond _niet instellen"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "A_chtergrond"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Scherm %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Scherm %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_menu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Kon xfce4-menueditor niet starten: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Vensterlijst"
@@ -567,28 +632,32 @@ msgstr "P_rogrammapictogrammen tonen"
 msgid "_Edit desktop menu"
 msgstr "Bureaubladmenu be_werken"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Onbekende optie: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Mogelijk opties:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload\tInstellingen opnieuw laden, bestandenlijst verversen\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu\tBuereaubladmenu tonen (op huidige muispositie)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist\tVensterlijst tonen (op huidige muispositie)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -633,6 +702,15 @@ msgstr "Instellingen van het bureaublad"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Instellingen Xfce 4 Bureaublad"
 
+#~ msgid "Set color _only"
+#~ msgstr "_Alleen kleur gebruiken"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Achtergrond _niet instellen"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menubestand:"
+
 #~ msgid "Title:"
 #~ msgstr "Titel:"
 
diff --git a/po/pa.po b/po/pa.po
index 0f820653..6ecfbc83 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-09-20 14:43+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam@redhat.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -318,42 +318,83 @@ msgstr "ਲੁਕਵਾਂ"
 msgid "/Other"
 msgstr "/ਹੋਰ"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce ਮੇਨੂ"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "ਆਈਕਾਨ ਚੁਣੋ"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "ਮੇਨੂ ਫਾਇਲ ਚੁਣੋ"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "ਸਾਰੀਆਂ ਫਾਇਲਾਂ"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "ਮੇਨੂ ਫਾਇਲਾਂ"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_ਮੇਨੂ ਇਕਾਈ:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "xfce4- ਮੇਨੂ ਸੰਪਾਦਕ ਜਾਰੀ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_ਬਟਨ ਆਈਕਾਨ:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_ਬਟਨ ਆਈਕਾਨ:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "ਮੇਨੂ ਫਾਇਲਾਂ"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "ਵਿਹੜਾ ਮੇਨੂ _ਸੋਧ"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "ਮੇਨੂ ਫਾਇਲ ਖੋਲੋ"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_ਮੇਨੂ"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "ਆਈਕਾਨ:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_ਬਟਨ ਆਈਕਾਨ:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "ਮੇਨੂ ਵਿੱਚ _ਆਈਕਾਨ ਵੇਖਾਓ"
 
@@ -407,8 +448,8 @@ msgid "Edit backdrop list"
 msgstr "ਬੈਕਡਰੋਪ ਸੂਚੀ ਸੋਧ"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "ਵਿਹੜਾ"
 
@@ -456,92 +497,116 @@ msgstr "ਸਵੈ"
 msgid "Adjust _Brightness:"
 msgstr "_ਚਮਕੀਲਾਪਨ ਅਨੁਕੂਲਣ:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "ਤਬਦੀਲੀਆਂ ਅਣਡਿੱਠੀਆਂ"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "ਵਿਹੜਾ ਵਿਵਸਥਾ"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_ਬੈਕਡਰੋਪ"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "ਰੰਗ"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_ਰੰਗ ਸ਼ੈਲੀ:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "ਇੱਕ ਰੰਗ"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "ਖਿਤਿਜੀ ਢਲਵਾਂ"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "ਲੰਬਕਾਰੀ ਢਲਵਾਂ"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "_ਪਹਿਲਾਂ ਰੰਗ:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_ਦੂਜਾ ਰੰਗ:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "_ਸਿਰਫ ਰੰਗ ਨਿਰਧਾਰਿਤ ਕਰੋ"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "ਚਿੱਤਰ"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "_ਚਿੱਤਰ ਵੇਖਾਓ"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_ਫਾਇਲ:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "ਬੈਕਡਰੋਪ ਨਿਰਧਾਰਿਤ _ਨਾ ਕਰੋ"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_ਬੈਕਡਰੋਪ"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "ਪਰਦਾ %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "ਪਰਦਾ %d, ਮਾਨੀਟਰ %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_ਮੇਨੂ"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "xfce4- ਮੇਨੂ ਸੰਪਾਦਕ ਜਾਰੀ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "ਝਰੋਖਾ ਸੂਚੀ"
@@ -570,28 +635,32 @@ msgstr "_ਕਾਰਜ ਆਈਕਾਨ ਵੇਖਾਓ"
 msgid "_Edit desktop menu"
 msgstr "ਵਿਹੜਾ ਮੇਨੂ _ਸੋਧ"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: ਅਣਜਾਣ ਚੋਣ: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "ਚੋਣਾਂ ਹਨ:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      ਸਭ ਵਿਵਸਥਾ ਮੁੜ-ਲੋਡ, ਚਿੱਤਰ ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        ਮੇਨੂ ਖੁੱਲੇਗਾ (ਮਾਊਸ ਦੇ ਮੌਜੂਦਾ ਸਥਿਤੀ ਤੇ ਖੁੱਲੇਗਾ)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  ਝਰੋਖਾ ਸੂਚੀ ਖੁੱਲੇਗੀ (ਮਾਊਸ ਦੀ ਮੌਜੂਦਾ ਸਥਿਤੀ ਤੇ ਖੁੱਲੇਗੀ)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -638,6 +707,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "ਵਿਹੜਾ ਵਿਵਸਥਾ"
 
+#~ msgid "Set color _only"
+#~ msgstr "_ਸਿਰਫ ਰੰਗ ਨਿਰਧਾਰਿਤ ਕਰੋ"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "ਬੈਕਡਰੋਪ ਨਿਰਧਾਰਿਤ _ਨਾ ਕਰੋ"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_ਮੇਨੂ ਇਕਾਈ:"
+
 #~ msgid "Title:"
 #~ msgstr "ਸਿਰਲੇਖ:"
 
diff --git a/po/pl.po b/po/pl.po
index 0481dfab..b85ef76d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2003-12-27 14:22+0100\n"
 "Last-Translator: Paweł Pastuła <pastulap@poczta.onet.pl>\n"
 "Language-Team: POLISH <LL@li.org>\n"
@@ -319,44 +319,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "Pliki graficzne"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "Pliki graficzne"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Automatyczny"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Pliki graficzne"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -413,8 +449,8 @@ msgid "Edit backdrop list"
 msgstr "Edytuj listę z tłami"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Pulpit"
 
@@ -470,102 +506,123 @@ msgstr "_Automatyczny"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Ustawienia obszaru roboczego"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "Lista z tłami"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Kolor"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "Styl:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "Kolor"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "Kolor tła:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Użyj tylko koloru"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Obrazek"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "Obrazek"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "Plik:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "Nie ustawiaj tła"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "Lista z tłami"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -595,28 +652,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -664,6 +725,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "Ustawienia obszaru roboczego"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Użyj tylko koloru"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Nie ustawiaj tła"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "Plik:"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3aaa44e7..f7b8ebea 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-01-18 12:33-0200\n"
 "Last-Translator: Felix da Silva Costa <felix@online.eti.br>\n"
 "Language-Team: pt_BR <felix@online.eti.br>\n"
@@ -318,43 +318,84 @@ msgstr "Escondido"
 msgid "/Other"
 msgstr "/Outros"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menu Xfce4"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Selecionar ícone"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Escolher arquivo de menu"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Todos os arquivos"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Arquivo de imagens"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "Arquivo de imagens"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Arquivo de menu:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Impossível iniciar xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Ícone do botão:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Ícone do botão:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Arquivo de imagens"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Editar menu da área de trabalho"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Abrir arquivo de menu"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menu"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ícone:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Ícone do botão:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Mostrar _ícones no menu"
 
@@ -409,8 +450,8 @@ msgid "Edit backdrop list"
 msgstr "Editar lista de fundos"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Área de trabalho"
 
@@ -458,93 +499,116 @@ msgstr "Automático"
 msgid "Adjust _Brightness:"
 msgstr "Ajustar _Brilho:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignorar modificações"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Configurações da área de trabalho"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Imagens de fundo"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Cor"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Estilo de _cor:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Cor sólida"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Degradê horizontal"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Degradê vertical"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Primei_ra Cor:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Segunda Cor:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Usar s_omente cor"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Imagem"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Mostrar _Imagem"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "Arquivo:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Não configurar plano de fundo"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "Imagem de fundo"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Tela %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Tela %d, monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Impossível iniciar xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Lista de janelas"
@@ -573,29 +637,33 @@ msgstr "Mostar ícones de _aplicações"
 msgid "_Edit desktop menu"
 msgstr "_Editar menu da área de trabalho"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Opção desconhecida: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "As opções são:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Relê todas as configurações, atualizar lista de imagens\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Abrir o menu (na posição atual do mouse)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "   -windowlist  abrir a lista de janelas (na posição atual do mouse)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -640,6 +708,16 @@ msgstr "Configurações para o gerenciador de desktop Xfce 4"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Configurações do Desktop Xfce 4"
 
+#, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Usar s_omente cor"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Não configurar plano de fundo"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Arquivo de menu:"
+
 #~ msgid "Title:"
 #~ msgstr "Título:"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index eb87d9d1..c129b19d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-10-09 23:32+0100\n"
 "Last-Translator: Nuno Donato <nunodonato@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
@@ -315,42 +315,83 @@ msgstr "Escondido"
 msgid "/Other"
 msgstr "/Outro"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menu Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Seleccionar Ícone"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Seleccionar Ficheiro de Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Ficheiros de Imagem"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Ficheiros de Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Ficheiro do _menu:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Náo foi possível abrir o xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Ícone do _botão:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Ícone do _botão:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Ficheiros de Menu"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Editar menu do ambiente de trabalho"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Abrir ficheiro de menu"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ícone:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Ícone do _botão:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Mostrar _icones no menu"
 
@@ -405,8 +446,8 @@ msgid "Edit backdrop list"
 msgstr "Editar lista de fundos"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Ambiente de Trabalho"
 
@@ -454,92 +495,116 @@ msgstr "Automático"
 msgid "Adjust _Brightness:"
 msgstr "Ajustar brilho"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignorar modificações"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Definições das Areas de Trabalho"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Lista de Fundos"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Côr"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Estilo da _Côr:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Côr Sólida"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Gradiente Horizontal"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Gradiente Vertical"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "P_rimeira Côr:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "Últi_ma Côr:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Usar apenas côr:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Imagem"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Mostrar _Imagem"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Ficheiro"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Não _configurar um fundo"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Fundos"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Ecrã %s"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Ecrã %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Náo foi possível abrir o xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Lista de Janelas"
@@ -568,31 +633,35 @@ msgstr "Mostrar ícones das aplicações"
 msgid "_Edit desktop menu"
 msgstr "_Editar menu do ambiente de trabalho"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Opção desconhecida: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "As opções são:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -recarregar        Recarregar todas as definições, refrescar a lista de "
 "imagens\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    menu        Mostra o menu (na posição actual do rato)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -listajanelas  Mostra a lista das janelas (na posição actual do rato)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -639,6 +708,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Definições das Areas de Trabalho"
 
+#~ msgid "Set color _only"
+#~ msgstr "Usar apenas côr:"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Não _configurar um fundo"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Ficheiro do _menu:"
+
 #~ msgid "Title:"
 #~ msgstr "Título:"
 
diff --git a/po/ro.po b/po/ro.po
index 011d8157..b1ce34cb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop 4.2 rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-11-14 19:01+0200\n"
 "Last-Translator: Mişu Moldovan <dumol@go.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -316,42 +316,83 @@ msgstr "Ascuns"
 msgid "/Other"
 msgstr "/Altele"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Meniu Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Selectare iconiţă"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Selectare meniu fişier"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Toate fişierele"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Fişiere tip imagine"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Fişiere meniu"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Fişier _meniu:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Nu pot lansa xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Iconiţă _buton:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Iconiţă _buton:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Fişiere meniu"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Editare meniu desktop"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Deschide fişierul meniu"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Meniu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Iconiţă:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Iconiţă _buton:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Arată _iconiţele în meniu"
 
@@ -405,8 +446,8 @@ msgid "Edit backdrop list"
 msgstr "Editare listă fundaluri"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Desktop"
 
@@ -454,92 +495,116 @@ msgstr "Automat"
 msgid "Adjust _Brightness:"
 msgstr "Ajustare _luminozitate"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignoră modificările"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Setări desktop"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Fundaluri"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Culoare"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Stil c_uloare"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Culoare uniformă"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Gradient orizontal"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Gradient vertical"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Culoare _primară:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "Culoare _secundară:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "D_oar culoarea"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Imagine"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Arată _imaginea:"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "Fişi_er:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Nu seta fun_dalul"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Fundal"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Ecran %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Ecran %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Meniu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Nu pot lansa xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Listă ferestre"
@@ -568,32 +633,36 @@ msgstr "Arată ic_oniţele aplicaţiilor"
 msgid "_Edit desktop menu"
 msgstr "_Editare meniu desktop"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Opţiune necunoscută: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Opţiunile sunt:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Reîncarcă toate setările, reîmprospătează lista imaginilor\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 "    -menu        Deschide meniul (la poziţia curentă a cursorului de mouse)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Deschide lista ferestrelor (la poziţia curentă a "
 "cursorului)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -640,6 +709,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Setări desktop"
 
+#~ msgid "Set color _only"
+#~ msgstr "D_oar culoarea"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Nu seta fun_dalul"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Fişier _meniu:"
+
 #~ msgid "Title:"
 #~ msgstr "Titlu:"
 
diff --git a/po/ru.po b/po/ru.po
index 9850a1e2..8bf54f36 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-01-08 15:50+0500\n"
 "Last-Translator: Anthony Ivanoff <a-i@bk.ru>\n"
 "Language-Team: Russian\n"
@@ -320,42 +320,83 @@ msgstr "Скрыть"
 msgid "/Other"
 msgstr "/Другое"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Меню Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Выбор значка"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Выбор файла меню"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Все файлы"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Файлы изображений"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Файлы меню"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Файл меню:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Невомзожно запустить редактор меню xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Значок:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Значок:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Файлы меню"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Изменить меню рабочего стола"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Открыть файл меню"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "Меню"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Значок:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Значок:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Показывать значки в меню"
 
@@ -409,8 +450,8 @@ msgid "Edit backdrop list"
 msgstr "Изменить список фоновых изображений"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Рабочий стол"
 
@@ -458,92 +499,116 @@ msgstr "Автоматически"
 msgid "Adjust _Brightness:"
 msgstr "Яркость:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Игнорировать изменения"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Настройки рабочего стола"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Фоновые изображения"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Цвет"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Стиль заполнения цветом:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Однотонный"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Горизонтальный градиент"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Вертикальный градиент"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Первый цвет:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "Второй цвет:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Использовать только цвет"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Изображение"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Показывать изображение"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "Файл:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Не изменять фон рабочего стола"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "Фоновая картинка"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Экран %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Экран %d, монитор %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "Меню"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Невомзожно запустить редактор меню xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Список окон"
@@ -572,30 +637,34 @@ msgstr "Показать значки приложений"
 msgid "_Edit desktop menu"
 msgstr "Изменить меню рабочего стола"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: неизвестный параметр: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Параметры:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Перезагрузить все настройки, обновить список изображений\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Показать меню (в месте, где находится курсор мыши)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Показать список окон (в месте, где находится курсор мыши)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -640,6 +709,15 @@ msgstr "Настройки для программы управления раб
 msgid "Xfce 4 Desktop Settings"
 msgstr "Настройки рабочего стола Xfce 4"
 
+#~ msgid "Set color _only"
+#~ msgstr "Использовать только цвет"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Не изменять фон рабочего стола"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Файл меню:"
+
 #~ msgid "Title:"
 #~ msgstr "Заголовок:"
 
diff --git a/po/sk.po b/po/sk.po
index f12b3637..9ede3707 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-08-24 21:38+0200\n"
 "Last-Translator: Juraj Brosz <Juraj.Brosz@pobox.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -316,42 +316,83 @@ msgstr "Skryté"
 msgid "/Other"
 msgstr "/Iné"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Menu Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Vybrať ikonu"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Vybrať súborové menu"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Všetky súbory"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Obrázkové súbory"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Súborové menu"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Súborové _menu:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Nemôžem spustiť xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Ikona _tlačidla:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Ikona _tlačidla:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Súborové menu"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Upraviť menu plochy"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Otvoriť súborové menu"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menu"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Ikona:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Ikona _tlačidla:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Zobraziť _ikony v menu"
 
@@ -406,8 +447,8 @@ msgid "Edit backdrop list"
 msgstr "Editovať zoznam pozadí"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Plocha"
 
@@ -455,92 +496,116 @@ msgstr "Automaticky"
 msgid "Adjust _Brightness:"
 msgstr "Prispôsobiť _jas:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ignorovať modifikácie"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Nastavenia plochy"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Pozadia"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Farba"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Štýl _farby:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Plná farba"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Horizontálne stupňovať"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Vertikálne stupňovať"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "P_rvá farba:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Druhá farba:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Nastaviť _len farbu"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Obrázok"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Ukázať _obrázok"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Súbor:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_Nenastaviť pozadie"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Pozadie"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Obrazovka %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Obrazovka %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menu"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Nemôžem spustiť xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Zoznam okien"
@@ -569,30 +634,34 @@ msgstr "Zobraziť ikony aplikácii"
 msgid "_Edit desktop menu"
 msgstr "_Upraviť menu plochy"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Neznáma voľba: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Možnosti sú:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Nahrať znovu všetky nastavenie, obnoviť zoznam obrázkov\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Otvoriť menu (na aktuálnej pozícii kurzora myši)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Otvoriť zoznam okien (na aktuálnej pozícii kurzora myši)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -639,6 +708,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Nastavenia plochy"
 
+#~ msgid "Set color _only"
+#~ msgstr "Nastaviť _len farbu"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_Nenastaviť pozadie"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Súborové _menu:"
+
 #~ msgid "Title:"
 #~ msgstr "Titulok:"
 
diff --git a/po/sv.po b/po/sv.po
index 94bbcaad..4b99fcb1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -321,44 +321,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "Bildfiler"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "Bildfiler"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Automatisk"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Bildfiler"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -416,8 +452,8 @@ msgid "Edit backdrop list"
 msgstr "Redigera bakgrundslista"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Skrivbord"
 
@@ -473,102 +509,123 @@ msgstr "_Automatisk"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "Arbetsyteinställningar"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "Bakgrundslista"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Färg"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "Stil:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "Färg"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "Bakgrundsfärg:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "Använd endast färg:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Bild"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "Bild"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "File:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "Välj bakgrundsfärg"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "Bakgrundslista"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -598,28 +655,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -667,6 +728,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "Arbetsyteinställningar"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "Använd endast färg:"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Välj bakgrundsfärg"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "File:"
 
diff --git a/po/ta.po b/po/ta.po
index 4214fdd1..97297023 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tamil XFDesktop 4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2003-09-24 17:36-0500\n"
 "Last-Translator: Dinesh Nadarajah <n_dinesh@yahoo.com>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -320,44 +320,80 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 #, fuzzy
 msgid "Image Files"
 msgstr "ஓவியக் கோப்புகள்"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 #, fuzzy
 msgid "Menu Files"
 msgstr "ஓவியக் கோப்புகள்"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_தானாகவே"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "ஓவியக் கோப்புகள்"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -414,8 +450,8 @@ msgid "Edit backdrop list"
 msgstr "பின்னணி-ஓவியம் பட்டியல் தொகு"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "கனிமேசை"
 
@@ -471,102 +507,123 @@ msgstr "_தானாகவே"
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 #, fuzzy
 msgid "Desktop Settings"
 msgstr "வேலை þடங்கள் அமைப்புகள்"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 #, fuzzy
 msgid "_Backdrops"
 msgstr "பின்னணி-ஓவியம் பட்டியல்"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "வண்ணம்"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 #, fuzzy
 msgid "_Color Style:"
 msgstr "பாணி:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 #, fuzzy
 msgid "Solid Color"
 msgstr "வண்ணம்"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 #, fuzzy
 msgid "_Second Color:"
 msgstr "பின்னணி வண்ணம்: "
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-#, fuzzy
-msgid "Set color _only"
-msgstr "வண்ணம் மட்டும் பயன்படுத்தவும்:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "ஓவியம்"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 #, fuzzy
 msgid "Show _Image"
 msgstr "ஓவியம்"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 #, fuzzy
 msgid "_File:"
 msgstr "கோப்பு:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-#, fuzzy
-msgid "_Don't set backdrop"
-msgstr "பின்னணி வண்ணத்தை தெரிவுசெய்யவும்"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 #, fuzzy
 msgid "_Backdrop"
 msgstr "பின்னணி-ஓவியம் பட்டியல்"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -596,28 +653,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, fuzzy, c-format
 msgid "<b>Workspace %d</b>"
@@ -665,6 +726,14 @@ msgid "Xfce 4 Desktop Settings"
 msgstr "வேலை þடங்கள் அமைப்புகள்"
 
 #, fuzzy
+#~ msgid "Set color _only"
+#~ msgstr "வண்ணம் மட்டும் பயன்படுத்தவும்:"
+
+#, fuzzy
+#~ msgid "_Don't set backdrop"
+#~ msgstr "பின்னணி வண்ணத்தை தெரிவுசெய்யவும்"
+
+#, fuzzy
 #~ msgid "Title:"
 #~ msgstr "கோப்பு:"
 
diff --git a/po/tr.po b/po/tr.po
index 33eae083..380172d9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-10-18 21:16+0300\n"
 "Last-Translator: Erçin EKER <erc.caldera@gmx.net>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -316,42 +316,83 @@ msgstr "Gizli"
 msgid "/Other"
 msgstr "/Diğer"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce Menüsü"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Simge Seç"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Menü Dosyası Seç"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Menü Dosyaları"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "_Menü dosyası:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "xfce4-menueditor başlatılamıyor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Düğme simgesi:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Düğme simgesi:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Menü Dosyaları"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "Masaüstü menüsünü düzenle"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Menü dosyası aç"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Menü"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Simge:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Düğme simgesi:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Menüde _simge göster"
 
@@ -406,8 +447,8 @@ msgid "Edit backdrop list"
 msgstr "Arka plan listesi düzenle"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Masaüstü"
 
@@ -455,92 +496,116 @@ msgstr "Otomatik"
 msgid "Adjust _Brightness:"
 msgstr "_Parlaklığı Değiştir:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Değişiklikleri göz ardı et"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Masaüstü Ayarları"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Arka _Planlar"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Renk"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "_Renk Stili:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Sabit Renk"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Yatay Geçiş"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Dikey Geçiş"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "İ_lk Renk:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_İkinci Renk:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "_Sadece renk kullan:"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Görüntü"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "_Resim Göster"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Dosya:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "Arka planı ayarla_ma"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Arka Plan"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Ekran %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Ekran %d, Monitör %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Menü"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "xfce4-menueditor başlatılamıyor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Pencere Listesi"
@@ -569,28 +634,32 @@ msgstr "_Uygulama simgelerini göster"
 msgid "_Edit desktop menu"
 msgstr "Masaüstü menüsünü düzenle"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Bilinmeyen seçenek: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Seçenekler:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "     -reload     Tüm seçenkleri ve resim listelerini yeniden yükle\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Seçenek menüsünü aç (fare imleci konumunda)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Pencere listesi menüsünü aç (fare imleci konumunda)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -637,6 +706,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Masaüstü Ayarları"
 
+#~ msgid "Set color _only"
+#~ msgstr "_Sadece renk kullan:"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "Arka planı ayarla_ma"
+
+#~ msgid "_Menu file:"
+#~ msgstr "_Menü dosyası:"
+
 #~ msgid "Title:"
 #~ msgstr "Başlık:"
 
diff --git a/po/uk.po b/po/uk.po
index 79412654..98da0655 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2005-01-06 11:43+0200\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -315,42 +315,83 @@ msgstr "Сховати"
 msgid "/Other"
 msgstr "/Інше"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Меню Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Вибір значка"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Вибір файла меню"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Усі файли"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Файли зображень"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Файли меню"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Файл _меню:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Не вдається запустити редактор меню xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "_Значок:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "_Значок:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Файли меню"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Правка меню стільниці"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Відкрити файл меню"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "_Меню"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Значок:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "_Значок:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Показувати з_начки у меню"
 
@@ -404,8 +445,8 @@ msgid "Edit backdrop list"
 msgstr "Редагувати список зображень для тла"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Робоча стільниця"
 
@@ -453,92 +494,116 @@ msgstr "Автоматично"
 msgid "Adjust _Brightness:"
 msgstr "_Яскравість:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Ігнорувати зміни"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Параметри робочої стільниці"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "_Зображення для тла"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Колір"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Стиль заповнення _кольором:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Суцільний колір"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Горизонтальний градієнт"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Вертикальний градієнт"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "_Перший колір:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "_Другий колір:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "Використовувати _лише колір"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Зображення"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Показувати _зображення"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Файл:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_Не змінювати тло робочої стільниці"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Зображення для тла"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Екран %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Екран %d, монітор %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "_Меню"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Не вдається запустити редактор меню xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Перелік вікон"
@@ -567,31 +632,35 @@ msgstr "Показувати значки п_рограм"
 msgid "_Edit desktop menu"
 msgstr "_Правка меню стільниці"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Невідомий параметр: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Параметри:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 "    -reload      Перезавантажити усі параметри, оновити перелік зображень\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Показати меню (у місці, де знаходиться курсор миші)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 "    -windowlist  Показати перелік вікон (у місці, де знаходиться курсор "
 "миші)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -638,6 +707,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Параметри робочої стільниці"
 
+#~ msgid "Set color _only"
+#~ msgstr "Використовувати _лише колір"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_Не змінювати тло робочої стільниці"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Файл _меню:"
+
 #~ msgid "Title:"
 #~ msgstr "Заголовок:"
 
diff --git a/po/vi.po b/po/vi.po
index 126810b6..5a44bd6c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-09-08 15:40+9\n"
 "Last-Translator: Lâm Vĩnh Niên <nienvl@yahoo.ca>\n"
 "Language-Team: none <LL@li.org>\n"
@@ -315,42 +315,83 @@ msgstr "Ẩn"
 msgid "/Other"
 msgstr "/Khác"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Thực đơn Xfce"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "Chọn biểu tượng"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "Chọn tập tin thực đơn"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "Mọi tập tin"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "Các tập tin hình ảnh"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "Tập tin thực đơn"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "Tập tin thự_c đơn:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "Không thể gọi xfce4-menueditor: %s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "Biểu tượng _nút:"
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "Biểu tượng _nút:"
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "Tập tin thực đơn"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "_Biên tập thực đơn desktop"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "Mở tập tin thực đơn"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "Thự_c đơn"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "Biểu tượng:"
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "Biểu tượng _nút:"
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "Hiển thị _biểu tượng trong thực đơn"
 
@@ -404,8 +445,8 @@ msgid "Edit backdrop list"
 msgstr "Biên tập danh sách phông nền"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "Desktop"
 
@@ -453,92 +494,116 @@ msgstr "Tự động"
 msgid "Adjust _Brightness:"
 msgstr "Chỉnh độ _sáng:"
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "Bỏ qua các thay đổi"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "Các thiết lập desktop"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "Phô_ng nền"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "Màu sắc"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "Kiểu _màu:"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "Màu đặc"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "Độ lệch ngang"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "Độ lệch dọc"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "Màu thứ _nhất:"
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "Màu thứ _hai:"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "_Chỉ thiết lập màu"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "Hình ảnh"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "Hiển thị hì_nh ảnh"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "_Tập tin:"
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "_Đừng thiết lập phông nền"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "_Phông nền"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "Màn hình %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "Màn hình %d, Monitor %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "Thự_c đơn"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "Không thể gọi xfce4-menueditor: %s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "Danh sách cửa sổ"
@@ -567,28 +632,32 @@ msgstr "Hiển thị biểu tượng ứng _dụng"
 msgid "_Edit desktop menu"
 msgstr "_Biên tập thực đơn desktop"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s: Tuỳ chọn không rõ: %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "Tuỳ chọn là:\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload     Nạp lại mọi thiết lập, làm tươi danh sách hình ảnh\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        Bập thực đơn (ở vị trí con chuột hiện tại)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  Bật danh sách cửa sổ (ở vị trí con chuột hiện tại)\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -635,6 +704,15 @@ msgstr ""
 msgid "Xfce 4 Desktop Settings"
 msgstr "Các thiết lập desktop"
 
+#~ msgid "Set color _only"
+#~ msgstr "_Chỉ thiết lập màu"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "_Đừng thiết lập phông nền"
+
+#~ msgid "_Menu file:"
+#~ msgstr "Tập tin thự_c đơn:"
+
 #~ msgid "Title:"
 #~ msgstr "Tiêu đề:"
 
diff --git a/po/xfdesktop.pot b/po/xfdesktop.pot
index 4ffcc075..8db37f07 100644
--- a/po/xfdesktop.pot
+++ b/po/xfdesktop.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -316,42 +316,76 @@ msgstr ""
 msgid "/Other"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:740
+msgid "Button"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:753
+msgid "Button _title:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+msgid "Menu File"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:785
+msgid "Use default _desktop menu file"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:794
+msgid "Use _custom menu file:"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+msgid "_Edit Menu"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:855
+msgid "Icons"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr ""
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr ""
 
@@ -402,8 +436,8 @@ msgid "Edit backdrop list"
 msgstr ""
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr ""
 
@@ -451,92 +485,115 @@ msgstr ""
 msgid "Adjust _Brightness:"
 msgstr ""
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+msgid "Information"
+msgstr ""
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr ""
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr ""
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr ""
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr ""
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr ""
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr ""
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr ""
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr ""
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr ""
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr ""
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr ""
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr ""
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr ""
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr ""
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr ""
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr ""
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr ""
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr ""
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr ""
@@ -565,28 +622,32 @@ msgstr ""
 msgid "_Edit desktop menu"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr ""
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr ""
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr ""
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr ""
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr ""
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7cd17705..1ef4cc32 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-17 23:16+0200\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-09-28 01:05-0700\n"
 "Last-Translator: Yongtao Yang <yongtao.yang@telia.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,401 +16,387 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: menueditor/about_dialog.c:36
+#: menueditor/about_dialog.c:39
 msgid "A menu editor for Xfce4"
 msgstr "一个 Xfce 菜单编辑器"
 
 #. Credits
-#: menueditor/about_dialog.c:41
+#: menueditor/about_dialog.c:43
 msgid "Core developer"
 msgstr "核心开发者"
 
-#: menueditor/about_dialog.c:42 menueditor/about_dialog.c:43
-#: menueditor/about_dialog.c:44
+#: menueditor/about_dialog.c:44 menueditor/about_dialog.c:45
+#: menueditor/about_dialog.c:46
 msgid "Contributor"
 msgstr "其他作出贡献人员"
 
-#: menueditor/about_dialog.c:45
+#: menueditor/about_dialog.c:47
 msgid "Icon designer"
 msgstr "图标设计者"
 
-#: menueditor/add_dialog.c:132 menueditor/add_dialog.c:147
+#: menueditor/add_dialog.c:159 menueditor/add_dialog.c:169
 msgid "Add menu entry"
 msgstr "添加菜单条目"
 
 #. Type
-#: menueditor/add_dialog.c:153 menueditor/add_menu_dialog.c:98
-#: menueditor/edit_dialog.c:148
+#: menueditor/add_dialog.c:173 menueditor/add_menu_dialog.c:110
 msgid "Type:"
 msgstr "类型："
 
-#: menueditor/add_dialog.c:156
+#: menueditor/add_dialog.c:176
 msgid "Launcher"
 msgstr "启动器"
 
-#: menueditor/add_dialog.c:161
+#: menueditor/add_dialog.c:180
 msgid "Submenu"
 msgstr "子菜单"
 
-#: menueditor/add_dialog.c:166
+#: menueditor/add_dialog.c:184
 msgid "Separator"
 msgstr "隔离符"
 
-#: menueditor/add_dialog.c:171
+#: menueditor/add_dialog.c:188
 msgid "Title"
 msgstr "标题"
 
-#: menueditor/add_dialog.c:176
+#: menueditor/add_dialog.c:192
 msgid "Quit"
 msgstr "退出"
 
 #. Name
-#: menueditor/add_dialog.c:191 menueditor/edit_dialog.c:260
-#: menueditor/edit_dialog.c:310 menueditor/edit_dialog.c:348
+#: menueditor/add_dialog.c:206 menueditor/edit_dialog.c:158
+#: menueditor/edit_dialog.c:218
 msgid "Name:"
 msgstr "名称："
 
-#: menueditor/add_dialog.c:201 menueditor/edit_dialog.c:261
+#: menueditor/add_dialog.c:214 menueditor/edit_dialog.c:163
 msgid "Command:"
 msgstr "命令："
 
-#: menueditor/add_dialog.c:217 menueditor/edit_dialog.c:252
-#: menueditor/edit_dialog.c:315 menueditor/edit_dialog.c:353
-#: menueditor/edit_dialog.c:390
+#: menueditor/add_dialog.c:226 menueditor/edit_dialog.c:150
+#: menueditor/edit_dialog.c:210
 msgid "Icon:"
 msgstr "图标："
 
 #. Start Notify check button
-#: menueditor/add_dialog.c:233 menueditor/edit_dialog.c:272
+#. Startup notification
+#: menueditor/add_dialog.c:237 menueditor/edit_dialog.c:171
 msgid "Use startup _notification"
 msgstr "使用启动提示(_n)"
 
 #. Run in terminal check button
-#: menueditor/add_dialog.c:237 menueditor/edit_dialog.c:273
+#. Run in terminal
+#: menueditor/add_dialog.c:241 menueditor/edit_dialog.c:174
 msgid "Run in _terminal"
 msgstr "在终端中运行(_t)"
 
-#: menueditor/add_dialog.c:282 menueditor/edit_dialog.c:459
+#: menueditor/add_dialog.c:272
 msgid "The command doesn't exist !"
 msgstr "该命令不存在！"
 
-#: menueditor/add_dialog.c:288
+#: menueditor/add_dialog.c:278
 msgid "All fields must be filled to add an item."
 msgstr "必须填写所有字段才能添加条目。"
 
-#: menueditor/add_dialog.c:296
+#: menueditor/add_dialog.c:287
 msgid "The 'Name' field is required."
 msgstr "需要“名称”字段。"
 
-#: menueditor/add_dialog.c:350 menueditor/dnd.c:152
-#: menueditor/menueditor.c:346 menueditor/move.c:90 menueditor/move.c:248
+#: menueditor/add_dialog.c:331
 msgid "--- separator ---"
 msgstr "--- 隔离符 ---"
 
-#: menueditor/add_dialog.c:375 menueditor/edit_dialog.c:494
+#: menueditor/add_dialog.c:357
 msgid "quit"
 msgstr "退出"
 
-#: menueditor/add_menu_dialog.c:78 menueditor/add_menu_dialog.c:89
-#: menueditor/menueditor.c:805
+#: menueditor/add_menu_dialog.c:97 menueditor/add_menu_dialog.c:103
+#: menueditor/menueditor.c:831
 msgid "Add an external menu"
 msgstr "添加一个外部菜单"
 
-#: menueditor/add_menu_dialog.c:103 menueditor/edit_dialog.c:151
+#: menueditor/add_menu_dialog.c:115
 msgid "File"
 msgstr "文件"
 
-#: menueditor/add_menu_dialog.c:108 menueditor/edit_dialog.c:156
+#: menueditor/add_menu_dialog.c:119
 msgid "System"
 msgstr "系统"
 
-#: menueditor/add_menu_dialog.c:123 menueditor/edit_dialog.c:171
+#: menueditor/add_menu_dialog.c:133
 msgid "Source:"
 msgstr "源："
 
 #. Style
-#: menueditor/add_menu_dialog.c:136 menueditor/edit_dialog.c:184
+#: menueditor/add_menu_dialog.c:145
 msgid "Style:"
 msgstr "风格:"
 
-#: menueditor/add_menu_dialog.c:139 menueditor/edit_dialog.c:187
+#: menueditor/add_menu_dialog.c:148
 msgid "Simple"
 msgstr "简单"
 
-#: menueditor/add_menu_dialog.c:142 menueditor/edit_dialog.c:190
+#: menueditor/add_menu_dialog.c:150
 msgid "Multilevel"
 msgstr "多层次"
 
 #. Unique
-#: menueditor/add_menu_dialog.c:155 menueditor/edit_dialog.c:203
+#: menueditor/add_menu_dialog.c:162
 msgid "_Unique entries only"
 msgstr "只要唯一的条目"
 
-#: menueditor/add_menu_dialog.c:208
+#: menueditor/add_menu_dialog.c:198
 msgid "The 'Source' field is required."
 msgstr "字段“源”是必须的。"
 
-#: menueditor/add_menu_dialog.c:218 menueditor/add_menu_dialog.c:235
-#: menueditor/dnd.c:154 menueditor/edit_dialog.c:508
-#: menueditor/edit_dialog.c:521 menueditor/menueditor.c:394
-#: menueditor/move.c:120 menueditor/move.c:278
+#: menueditor/add_menu_dialog.c:202 menueditor/add_menu_dialog.c:212
 msgid "--- include ---"
 msgstr "--- 包含 ---"
 
-#: menueditor/add_menu_dialog.c:236 menueditor/dnd.c:159
-#: menueditor/edit_dialog.c:522 menueditor/menueditor.c:397
-#: menueditor/move.c:123 menueditor/move.c:281
+#: menueditor/add_menu_dialog.c:213
 msgid "system"
 msgstr "系统"
 
 #. Create dialog for editing
-#: menueditor/edit_dialog.c:100 menueditor/edit_dialog.c:113
+#: menueditor/edit_dialog.c:127 menueditor/edit_dialog.c:134
 msgid "Edit menu entry"
 msgstr "编辑菜单条目"
 
-#: menueditor/edit_dialog.c:131
+#: menueditor/edit_dialog.c:139
 msgid "Separators cannot be edited"
 msgstr "不能编辑隔离符"
 
-#. Name
-#: menueditor/edit_dialog.c:397 menueditor/new_dialog.c:104
-msgid "Title:"
-msgstr "标题:"
-
-#: menueditor/menueditor.c:148
-msgid "Select command"
-msgstr "选择命令"
-
-#: menueditor/menueditor.c:209
-msgid "Select icon"
-msgstr "选择图标"
-
-#: menueditor/menueditor.c:215 panel-plugin/desktop-menu-plugin.c:389
-#: settings/backdrop-mgr.c:414 settings/backdrop-mgr.c:515
-#: settings/backdrop_settings.c:533
-msgid "All Files"
-msgstr "全部文件"
-
-#: menueditor/menueditor.c:219 panel-plugin/desktop-menu-plugin.c:395
-#: settings/backdrop-mgr.c:418 settings/backdrop_settings.c:537
-msgid "Image Files"
-msgstr "图像文件"
+#: menueditor/menueditor.c:81
+#, c-format
+msgid "File %s doesn't exist !"
+msgstr "文件 %s 不存在！"
 
-#: menueditor/menueditor.c:272 menueditor/menueditor.c:679
+#: menueditor/menueditor.c:121 menueditor/menueditor.c:532
 msgid "Do you want to save before closing the menu ?"
 msgstr "您希望在关闭菜单前保存吗？"
 
-#: menueditor/menueditor.c:273
+#: menueditor/menueditor.c:123
 msgid "You have modified the menu, do you want to save it before quitting ?"
 msgstr "您修改了菜单，您要在退出前保存吗？"
 
-#: menueditor/menueditor.c:274
+#: menueditor/menueditor.c:125
 msgid "Forget modifications"
 msgstr "放弃修改"
 
-#: menueditor/menueditor.c:473 menueditor/menueditor.c:531
-#: menueditor/menueditor.c:677
+#: menueditor/menueditor.c:310
+msgid "Are you sure you want to close the current menu?"
+msgstr "您确定要关闭当前菜单吗？"
+
+#: menueditor/menueditor.c:325
+msgid "Do you want to save before closing the file?"
+msgstr "您希望在关闭文件之前保存吗？"
+
+#: menueditor/menueditor.c:334
+msgid "Select command"
+msgstr "选择命令"
+
+#: menueditor/menueditor.c:366 menueditor/menueditor.c:423
+#: menueditor/menueditor.c:530
 msgid "Question"
 msgstr "问题"
 
-#: menueditor/menueditor.c:475
-msgid "Do you want to save before opening the default menu ?"
-msgstr "您希望在打开默认菜单前保存吗？"
+#: menueditor/menueditor.c:368
+msgid "Do you want to save before opening an other menu ?"
+msgstr "您希望在打开另一个菜单前保存吗？"
 
-#: menueditor/menueditor.c:477 menueditor/menueditor.c:535
-#: menueditor/menueditor.c:681
+#: menueditor/menueditor.c:370 menueditor/menueditor.c:427
+#: menueditor/menueditor.c:534
 msgid "Ignore modifications"
 msgstr "忽略修改"
 
-#: menueditor/menueditor.c:533
-msgid "Do you want to save before opening an other menu ?"
-msgstr "您希望在打开另一个菜单前保存吗？"
-
-#: menueditor/menueditor.c:546
+#: menueditor/menueditor.c:381
 msgid "Open menu file"
 msgstr "打开菜单文件"
 
-#: menueditor/menueditor.c:580 menueditor/menueditor.c:591
-#, c-format
-msgid ""
-"Cannot write in %s : \n"
-"%s"
-msgstr ""
-"无法写入文件 %s：\n"
-"%s"
+#: menueditor/menueditor.c:425
+msgid "Do you want to save before opening the default menu ?"
+msgstr "您希望在打开默认菜单前保存吗？"
 
-#: menueditor/menueditor.c:622
+#: menueditor/menueditor.c:483
 msgid "Save as..."
 msgstr "另存为..."
 
-#: menueditor/menueditor.c:799
+#: menueditor/menueditor.c:638
+msgid "Do you want to move the item into the parent menu?"
+msgstr "您希望把该条目移到母菜单中吗？"
+
+#: menueditor/menueditor.c:684
+msgid "Do you want to move the item into the submenu?"
+msgstr "您希望把该条目移到子菜单中吗？"
+
+#: menueditor/menueditor.c:825
 msgid "Edit"
 msgstr "编辑"
 
 #. File menu
-#: menueditor/menueditor.c:1005
+#: menueditor/menueditor.c:849
 msgid "_File"
 msgstr "文件(_F)"
 
-#: menueditor/menueditor.c:1014
+#: menueditor/menueditor.c:858
 msgid "Open default menu"
 msgstr "打开默认菜单"
 
 #. Edit menu
-#: menueditor/menueditor.c:1028
+#: menueditor/menueditor.c:872
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: menueditor/menueditor.c:1034
+#: menueditor/menueditor.c:878
 msgid "Add an external menu..."
 msgstr "添加外部菜单..."
 
 #. Help menu
-#: menueditor/menueditor.c:1046
+#: menueditor/menueditor.c:890
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: menueditor/menueditor.c:1051
+#: menueditor/menueditor.c:894
 msgid "_About..."
 msgstr "关于(_A)..."
 
-#: menueditor/menueditor.c:1061
+#: menueditor/menueditor.c:906
 msgid "Create a new Xfce4 menu file"
 msgstr "创建一个新的 Xfce 菜单文件"
 
-#: menueditor/menueditor.c:1065
+#: menueditor/menueditor.c:911
 msgid "Open an Xfce4 menu file"
 msgstr "打开一个 Xfce4 菜单文件"
 
-#: menueditor/menueditor.c:1069
+#: menueditor/menueditor.c:916
 msgid "Save current menu"
 msgstr "保存当前菜单"
 
-#: menueditor/menueditor.c:1073
+#: menueditor/menueditor.c:921
 msgid "Close current menu"
 msgstr "关闭当前菜单"
 
-#: menueditor/menueditor.c:1078
+#: menueditor/menueditor.c:927
 msgid "Add an entry to the menu"
 msgstr "向菜单中增加一个条目"
 
-#: menueditor/menueditor.c:1082
+#: menueditor/menueditor.c:931
 msgid "Delete the current entry"
 msgstr "删除当前条目"
 
-#: menueditor/menueditor.c:1086
+#: menueditor/menueditor.c:937
 msgid "Move the current entry up"
 msgstr "上移当前条目"
 
-#: menueditor/menueditor.c:1090
+#: menueditor/menueditor.c:942
 msgid "Move the current entry down"
 msgstr "下移当前条目"
 
-#: menueditor/menueditor.c:1095
+#: menueditor/menueditor.c:948
 msgid "Collapse the tree"
 msgstr "折叠文件树"
 
-#: menueditor/menueditor.c:1099
+#: menueditor/menueditor.c:953
 msgid "Expand the tree"
 msgstr "展开文件树"
 
-#: menueditor/menueditor.c:1130
+#: menueditor/menueditor.c:981
 msgid "Name"
 msgstr "名称"
 
-#: menueditor/menueditor.c:1132
+#: menueditor/menueditor.c:984
 msgid "Command"
 msgstr "命令"
 
-#: menueditor/menueditor.c:1134
+#: menueditor/menueditor.c:985
 msgid "Hidden"
 msgstr "隐藏"
 
-#: menueditor/menueditor.c:1136
-msgid "Pointer"
-msgstr "指针"
-
-#: menueditor/menueditor.c:1260
-msgid "Corrupted file or incorrect file format !"
-msgstr "文件被损坏或者文件格式不正确！"
-
-#: menueditor/menueditor.c:1273
-msgid "No root element in file !"
-msgstr "文件中没有 root 成员！"
-
-#: menueditor/menueditor.c:1284
-msgid "Bad datafile format !"
-msgstr "非法数据文件格式！"
-
-#: menueditor/menueditor.c:1388
-#, c-format
-msgid "File %s doesn't exist !"
-msgstr "文件 %s 不存在！"
-
-#: menueditor/move.c:408
-msgid "Do you want to move the item into the parent menu?"
-msgstr "您希望把该条目移到母菜单中吗？"
-
-#: menueditor/move.c:512
-msgid "Do you want to move the item into the submenu?"
-msgstr "您希望把该条目移到子菜单中吗？"
-
-#: menueditor/new_dialog.c:60
-msgid "Are you sure you want to close the current menu?"
-msgstr "您确定要关闭当前菜单吗？"
-
-#: menueditor/new_dialog.c:76
-msgid "Do you want to save before closing the file?"
-msgstr "您希望在关闭文件之前保存吗？"
-
-#. get the filename and name for the new menu
-#: menueditor/new_dialog.c:86 menueditor/new_dialog.c:98
-msgid "New menu"
-msgstr "新菜单"
-
-#. Filename
-#: menueditor/new_dialog.c:111
-msgid "Filename:"
-msgstr "文件名:"
-
-#: menueditor/new_dialog.c:144
-msgid "All fields are required."
-msgstr "所有字段都是必须的。"
-
 #: modules/menu/desktop-menuspec.c:62
 msgid "/Other"
 msgstr "其它(/O)"
 
-#: panel-plugin/desktop-menu-plugin.c:204
-#: panel-plugin/desktop-menu-plugin.c:532
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce 菜单"
 
-#: panel-plugin/desktop-menu-plugin.c:372
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "选择图标"
 
-#: panel-plugin/desktop-menu-plugin.c:374
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "选择菜单文件"
 
-#: panel-plugin/desktop-menu-plugin.c:403
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
+#: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
+msgid "All Files"
+msgstr "全部文件"
+
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
+#: settings/backdrop_settings.c:537
+msgid "Image Files"
+msgstr "图像文件"
+
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "图像文件"
 
-#: panel-plugin/desktop-menu-plugin.c:462
-msgid "_Menu file:"
-msgstr "菜单文件(_M)"
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "无法启动 xfce4 菜单编辑器：%s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "按钮图标(_B)："
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "按钮图标(_B)："
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "图像文件"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "编辑桌面菜单(_E)"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "打开菜单文件"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "菜单(_M)"
+
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "图标："
 
-#: panel-plugin/desktop-menu-plugin.c:496
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "按钮图标(_B)："
 
-#: panel-plugin/desktop-menu-plugin.c:521
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "在菜单中显示图标(_i)"
 
-#: settings/backdrop-mgr.c:139 src/xfce-desktop.c:112
+#: settings/backdrop-mgr.c:139 src/xfce-desktop.c:114
 #, c-format
 msgid ""
 "Could not save file %s: %s\n"
@@ -460,8 +446,8 @@ msgid "Edit backdrop list"
 msgstr "编辑背景列表"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:670
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "桌面"
 
@@ -509,91 +495,116 @@ msgstr "自动"
 msgid "Adjust _Brightness:"
 msgstr "调整亮度(_B)："
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "忽略修改"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
+#: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "工作区设置"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "背景(_B)"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "颜色"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "颜色风格(_C):"
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "纯色"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "水平梯度"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "垂直梯度"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "第一颜色(_r)："
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "第二颜色(_S):"
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "仅设置颜色(_o)"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "图像"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "显示图像(_I)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "文件(_F)："
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "不设置背景(_D)"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "背景(_B)"
 
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "屏幕 %d"
 
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "屏幕 %d，显示器 %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "菜单(_M)"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "无法启动 xfce4 菜单编辑器：%s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "窗口列表"
@@ -622,52 +633,121 @@ msgstr "显示应用程序图标(_a)"
 msgid "_Edit desktop menu"
 msgstr "编辑桌面菜单(_E)"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s：未知选项： %s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "选项为：\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "  -relod    重新载入全部设置，刷新图像列表\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "  -menu    弹出菜单 (在鼠标当前位置)\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "  -windowlist    弹出窗口列表 (在鼠标当前位置)\n"
 
-#: src/windowlist.c:183
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
+#: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
 msgstr "<b>工作区 %d</b>"
 
-#: src/windowlist.c:188
+#: src/windowlist.c:201
 #, c-format
 msgid "<i>Workspace %d</i>"
 msgstr "<i>工作区 %d</i>"
 
-#: src/windowlist.c:244 src/windowlist.c:247
+#: src/windowlist.c:268 src/windowlist.c:271
 msgid "_Add Workspace"
 msgstr "添加工作区(_A)"
 
-#: src/windowlist.c:254
+#: src/windowlist.c:279
 #, c-format
 msgid "_Remove Workspace %d"
 msgstr "删除工作区(_R) %d"
 
-#: src/windowlist.c:256
+#: src/windowlist.c:282
 #, c-format
 msgid "_Remove Workspace '%s'"
 msgstr "删除工作区(_R) “%s”"
 
+#: menueditor/xfce-menueditor.desktop.in.h:1
+msgid "Graphical tool for editing the Xfce 4 menu"
+msgstr ""
+
+#: menueditor/xfce-menueditor.desktop.in.h:2
+msgid "Menu Editor"
+msgstr ""
+
+#: menueditor/xfce-menueditor.desktop.in.h:3
+#, fuzzy
+msgid "Xfce 4 Menu Editor"
+msgstr "Xfce 菜单"
+
+#: settings/xfce-backdrop-settings.desktop.in.h:2
+msgid "Settings for the Xfce 4 Desktop Manager"
+msgstr ""
+
+#: settings/xfce-backdrop-settings.desktop.in.h:3
+#, fuzzy
+msgid "Xfce 4 Desktop Settings"
+msgstr "工作区设置"
+
+#~ msgid "Set color _only"
+#~ msgstr "仅设置颜色(_o)"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "不设置背景(_D)"
+
+#~ msgid "Title:"
+#~ msgstr "标题:"
+
+#~ msgid "Select icon"
+#~ msgstr "选择图标"
+
+#~ msgid ""
+#~ "Cannot write in %s : \n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法写入文件 %s：\n"
+#~ "%s"
+
+#~ msgid "Pointer"
+#~ msgstr "指针"
+
+#~ msgid "Corrupted file or incorrect file format !"
+#~ msgstr "文件被损坏或者文件格式不正确！"
+
+#~ msgid "No root element in file !"
+#~ msgstr "文件中没有 root 成员！"
+
+#~ msgid "Bad datafile format !"
+#~ msgstr "非法数据文件格式！"
+
+#~ msgid "New menu"
+#~ msgstr "新菜单"
+
+#~ msgid "Filename:"
+#~ msgstr "文件名:"
+
+#~ msgid "All fields are required."
+#~ msgstr "所有字段都是必须的。"
+
+#~ msgid "_Menu file:"
+#~ msgstr "菜单文件(_M)"
+
 #~ msgid "Backdrop"
 #~ msgstr "背景"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 24da578e..bca7da58 100755
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfdesktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 22:00-0800\n"
+"POT-Creation-Date: 2005-06-01 19:50-0700\n"
 "PO-Revision-Date: 2004-12-06 22:58+0800\n"
 "Last-Translator: Hydonsingore Sie <hydonsingore@mail.educities.edu.tw>\n"
 "Language-Team:  <>\n"
@@ -323,42 +323,83 @@ msgstr "隱藏"
 msgid "/Other"
 msgstr "/其他"
 
-#: panel-plugin/desktop-menu-plugin.c:205
-#: panel-plugin/desktop-menu-plugin.c:535
+#: panel-plugin/desktop-menu-plugin.c:335
+#: panel-plugin/desktop-menu-plugin.c:904
 msgid "Xfce Menu"
 msgstr "Xfce 選單"
 
-#: panel-plugin/desktop-menu-plugin.c:373
+#: panel-plugin/desktop-menu-plugin.c:575
 msgid "Select Icon"
 msgstr "選擇圖示"
 
-#: panel-plugin/desktop-menu-plugin.c:375
+#: panel-plugin/desktop-menu-plugin.c:577
 msgid "Select Menu File"
 msgstr "選擇選單檔案"
 
-#: panel-plugin/desktop-menu-plugin.c:390 settings/backdrop-mgr.c:414
+#: panel-plugin/desktop-menu-plugin.c:592 settings/backdrop-mgr.c:414
 #: settings/backdrop-mgr.c:515 settings/backdrop_settings.c:533
 msgid "All Files"
 msgstr "所有檔案"
 
-#: panel-plugin/desktop-menu-plugin.c:396 settings/backdrop-mgr.c:418
+#: panel-plugin/desktop-menu-plugin.c:598 settings/backdrop-mgr.c:418
 #: settings/backdrop_settings.c:537
 msgid "Image Files"
 msgstr "影像檔案"
 
-#: panel-plugin/desktop-menu-plugin.c:404
+#: panel-plugin/desktop-menu-plugin.c:606
 msgid "Menu Files"
 msgstr "選單檔案"
 
-#: panel-plugin/desktop-menu-plugin.c:465
-msgid "_Menu file:"
-msgstr "選單檔案(_M)："
+#: panel-plugin/desktop-menu-plugin.c:722 settings/menu_settings.c:132
+#, c-format
+msgid "Unable to launch xfce4-menueditor: %s"
+msgstr "無法執行 xfce4-menueditor：%s"
+
+#: panel-plugin/desktop-menu-plugin.c:740
+#, fuzzy
+msgid "Button"
+msgstr "按鈕圖示(_B)："
+
+#: panel-plugin/desktop-menu-plugin.c:753
+#, fuzzy
+msgid "Button _title:"
+msgstr "按鈕圖示(_B)："
+
+#: panel-plugin/desktop-menu-plugin.c:766
+msgid "_Show title in button"
+msgstr ""
+
+#: panel-plugin/desktop-menu-plugin.c:773
+#, fuzzy
+msgid "Menu File"
+msgstr "選單檔案"
+
+#: panel-plugin/desktop-menu-plugin.c:785
+#, fuzzy
+msgid "Use default _desktop menu file"
+msgstr "修改桌面選單(_E)"
+
+#: panel-plugin/desktop-menu-plugin.c:794
+#, fuzzy
+msgid "Use _custom menu file:"
+msgstr "開啟選單檔案"
+
+#: panel-plugin/desktop-menu-plugin.c:846
+#: panel-plugin/desktop-menu-plugin.c:848
+#, fuzzy
+msgid "_Edit Menu"
+msgstr "選單(_M)"
 
-#: panel-plugin/desktop-menu-plugin.c:499
+#: panel-plugin/desktop-menu-plugin.c:855
+#, fuzzy
+msgid "Icons"
+msgstr "圖示："
+
+#: panel-plugin/desktop-menu-plugin.c:867
 msgid "_Button icon:"
 msgstr "按鈕圖示(_B)："
 
-#: panel-plugin/desktop-menu-plugin.c:524
+#: panel-plugin/desktop-menu-plugin.c:891
 msgid "Show _icons in menu"
 msgstr "在選單內顯示圖示(_I)"
 
@@ -415,8 +456,8 @@ msgid "Edit backdrop list"
 msgstr "編輯背景列表"
 
 #. the dialog
-#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:836
-#: src/xfce-desktop.c:676
+#: settings/backdrop_settings.c:132 settings/backdrop_settings.c:916
+#: src/xfce-desktop.c:677
 msgid "Desktop"
 msgstr "桌面"
 
@@ -465,94 +506,118 @@ msgstr "自動"
 msgid "Adjust _Brightness:"
 msgstr "調校亮度(_B)："
 
+#: settings/backdrop_settings.c:838
+#, c-format
+msgid "Xfce will be unable to manage your desktop (%s)."
+msgstr ""
+
+#: settings/backdrop_settings.c:839
+msgid "Unknown Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:843
+msgid "Error"
+msgstr ""
+
+#: settings/backdrop_settings.c:845
+msgid "Unable to start xfdesktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:863
+#, fuzzy
+msgid "Information"
+msgstr "忽略修改"
+
+#: settings/backdrop_settings.c:873
+msgid ""
+"To ensure that Xfce does not manage your desktop the next time you start "
+"Xfce, please be sure to save your session when logging out.  If you are not "
+"using the Xfce Session Manager (xfce4-session), you will need to manually "
+"edit your ~/.config/xfce4/xinitrc file.  Details are available in the "
+"documentation provided on http://xfce.org/."
+msgstr ""
+
+#: settings/backdrop_settings.c:881
+msgid "_Do not show this again"
+msgstr ""
+
 #. header
-#: settings/backdrop_settings.c:851
+#: settings/backdrop_settings.c:931
 #: settings/xfce-backdrop-settings.desktop.in.h:1
 msgid "Desktop Settings"
 msgstr "桌面設定"
 
-#: settings/backdrop_settings.c:880
+#: settings/backdrop_settings.c:936
+msgid "Allow _Xfce to manage the desktop"
+msgstr ""
+
+#: settings/backdrop_settings.c:972
 msgid "_Backdrops"
 msgstr "背景(_B)"
 
 #. color settings frame
-#: settings/backdrop_settings.c:906
+#: settings/backdrop_settings.c:998
 msgid "Color"
 msgstr "顏色"
 
-#: settings/backdrop_settings.c:920
+#: settings/backdrop_settings.c:1012
 msgid "_Color Style:"
 msgstr "填色方法(_C)："
 
-#: settings/backdrop_settings.c:929
+#: settings/backdrop_settings.c:1021
 msgid "Solid Color"
 msgstr "實色"
 
-#: settings/backdrop_settings.c:936
+#: settings/backdrop_settings.c:1028
 msgid "Horizontal Gradient"
 msgstr "水平漸層"
 
-#: settings/backdrop_settings.c:943
+#: settings/backdrop_settings.c:1035
 msgid "Vertical Gradient"
 msgstr "垂直漸層"
 
-#: settings/backdrop_settings.c:964
+#: settings/backdrop_settings.c:1056
 msgid "Fi_rst Color:"
 msgstr "第一色(_R)："
 
-#: settings/backdrop_settings.c:985
+#: settings/backdrop_settings.c:1077
 msgid "_Second Color:"
 msgstr "第二色(_S_："
 
-#. set color only checkbox
-#: settings/backdrop_settings.c:1006
-msgid "Set color _only"
-msgstr "僅使用顏色(_O)"
-
-#: settings/backdrop_settings.c:1021
+#: settings/backdrop_settings.c:1102
 msgid "Image"
 msgstr "影像"
 
-#: settings/backdrop_settings.c:1029
+#: settings/backdrop_settings.c:1110
 msgid "Show _Image"
 msgstr "顯示影像(_I)"
 
-#: settings/backdrop_settings.c:1051
+#: settings/backdrop_settings.c:1132
 msgid "_File:"
 msgstr "檔案(_F)："
 
-#. don't set backdrop checkbox
-#: settings/backdrop_settings.c:1088
-msgid "_Don't set backdrop"
-msgstr "不要設定背景(_D)"
-
 #. add the single backdrop settings page to the main notebook
-#: settings/backdrop_settings.c:1111
+#: settings/backdrop_settings.c:1180
 msgid "_Backdrop"
 msgstr "背景(_B)"
 
 # TODO check
-#: settings/backdrop_settings.c:1119 settings/backdrop_settings.c:1121
+#: settings/backdrop_settings.c:1188 settings/backdrop_settings.c:1190
 #, c-format
 msgid "Screen %d"
 msgstr "螢幕 %d"
 
 # TODO check
 #. and if we have multiple screens, each with multiple monitors
-#: settings/backdrop_settings.c:1126
+#: settings/backdrop_settings.c:1195
 #, c-format
 msgid "Screen %d, Monitor %d"
 msgstr "螢幕 %d，顯示器 %d"
 
-#: settings/backdrop_settings.c:1140
+#: settings/backdrop_settings.c:1209
 msgid "_Menu"
 msgstr "選單(_M)"
 
-#: settings/menu_settings.c:132
-#, c-format
-msgid "Unable to launch xfce4-menueditor: %s"
-msgstr "無法執行 xfce4-menueditor：%s"
-
 #: settings/menu_settings.c:153
 msgid "Window List"
 msgstr "視窗列表"
@@ -581,28 +646,32 @@ msgstr "顯示應用程式圖示(_A)"
 msgid "_Edit desktop menu"
 msgstr "修改桌面選單(_E)"
 
-#: src/main.c:300
+#: src/main.c:253
 #, c-format
 msgid "%s: Unknown option: %s\n"
 msgstr "%s：不明的選項：%s\n"
 
-#: src/main.c:301
+#: src/main.c:254
 msgid "Options are:\n"
 msgstr "選項如下：\n"
 
-#: src/main.c:302
+#: src/main.c:255
 msgid "    -reload      Reload all settings, refresh image list\n"
 msgstr "    -reload      刷新所有選項及圖像清單\n"
 
-#: src/main.c:303
+#: src/main.c:256
 msgid "    -menu        Pop up the menu (at the current mouse position)\n"
 msgstr "    -menu        (在目滑鼠游標的所在位置) 彈出選單\n"
 
-#: src/main.c:304
+#: src/main.c:257
 msgid ""
 "    -windowlist  Pop up the window list (at the current mouse position)\n"
 msgstr "    -windowlist  (在目前滑鼠游標的所在位置) 彈出視窗清單\n"
 
+#: src/main.c:258
+msgid "    -quit        Cause xfdesktop to quit\n"
+msgstr ""
+
 #: src/windowlist.c:193
 #, c-format
 msgid "<b>Workspace %d</b>"
@@ -649,6 +718,15 @@ msgstr "設定桌面管理程式"
 msgid "Xfce 4 Desktop Settings"
 msgstr "Xfce 4 桌面設定"
 
+#~ msgid "Set color _only"
+#~ msgstr "僅使用顏色(_O)"
+
+#~ msgid "_Don't set backdrop"
+#~ msgstr "不要設定背景(_D)"
+
+#~ msgid "_Menu file:"
+#~ msgstr "選單檔案(_M)："
+
 #~ msgid "Title:"
 #~ msgstr "標題："
 
diff --git a/settings/backdrop_settings.c b/settings/backdrop_settings.c
index 0a5f2586..4f5176f2 100644
--- a/settings/backdrop_settings.c
+++ b/settings/backdrop_settings.c
@@ -816,18 +816,98 @@ toggle_set_background(GtkToggleButton *tb, BackdropPanel *bp)
 }
 #endif
 
+static void
+manage_desktop_chk_toggled_cb(GtkToggleButton *tb, gpointer user_data)
+{
+    BackdropDialog *bd = user_data;
+    
+    if(gtk_toggle_button_get_active(tb)) {
+        GError *err = NULL;
+        
+        if(!xfce_exec(BINDIR "/xfdesktop", FALSE, FALSE, NULL)
+                && !xfce_exec("xfdesktop", FALSE, FALSE, &err))
+        {
+            gchar *secondary = NULL;
+            
+            g_signal_handlers_block_by_func(G_OBJECT(tb),
+                    G_CALLBACK(manage_desktop_chk_toggled_cb), user_data);
+            gtk_toggle_button_set_active(tb, FALSE);
+            g_signal_handlers_unblock_by_func(G_OBJECT(tb),
+                    G_CALLBACK(manage_desktop_chk_toggled_cb), user_data);
+            
+            secondary = g_strdup_printf(_("Xfce will be unable to manage your desktop (%s)."),
+                    err ? err->message : _("Unknown Error"));
+            if(err)
+                g_error_free(err);
+            
+            xfce_message_dialog(GTK_WINDOW(bd->dialog), _("Error"),
+                    GTK_STOCK_DIALOG_ERROR,
+                    _("Unable to start xfdesktop"), secondary,
+                    GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+            g_free(secondary);
+        } else
+            gtk_widget_set_sensitive(bd->top_notebook, TRUE);
+    } else {
+        Window xid;
+        McsSetting *setting;
+        
+        if(xfdesktop_check_is_running(&xid))
+            xfdesktop_send_client_message(xid, QUIT_MESSAGE);
+        gtk_widget_set_sensitive(bd->top_notebook, FALSE);
+        
+        setting = mcs_manager_setting_lookup(bd->plugin->manager,
+                "managedesktop-show-warning", BACKDROP_CHANNEL);
+        if(!setting || setting->data.v_int) {
+            GtkWidget *dlg, *lbl, *chk, *vbox, *hbox;
+            
+            dlg = gtk_dialog_new_with_buttons(_("Information"),
+                    GTK_WINDOW(bd->dialog),
+                    GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
+                    GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+            
+            vbox = gtk_vbox_new(FALSE, BORDER);
+            gtk_container_set_border_width(GTK_CONTAINER(vbox), BORDER);
+            gtk_widget_show(vbox);
+            gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), vbox, TRUE, TRUE, 0);
+            
+            lbl = gtk_label_new(_("To ensure that Xfce does not manage your desktop the next time you start Xfce, please be sure to save your session when logging out.  If you are not using the Xfce Session Manager (xfce4-session), you will need to manually edit your ~/.config/xfce4/xinitrc file.  Details are available in the documentation provided on http://xfce.org/."));
+            gtk_label_set_line_wrap(GTK_LABEL(lbl), TRUE);
+            gtk_misc_set_alignment(GTK_MISC(lbl), 0.0, 0.5);
+            gtk_widget_show(lbl);
+            gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 0);
+            
+            add_spacer(GTK_BOX(vbox));
+            
+            chk = gtk_check_button_new_with_mnemonic(_("_Do not show this again"));
+            gtk_widget_show(chk);
+            gtk_box_pack_start(GTK_BOX(vbox), chk, FALSE, FALSE, 0);
+            
+            gtk_dialog_run(GTK_DIALOG(dlg));
+            
+            if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(chk))) {
+                mcs_manager_set_int(bd->plugin->manager,
+                        "managedesktop-show-warning", BACKDROP_CHANNEL, 0);
+                backdrop_write_options(bd->plugin);
+            }
+            
+            gtk_widget_destroy(dlg);
+        }
+    }
+}
+
 /* the dialog */
 static BackdropDialog *
 create_backdrop_dialog (McsPlugin * mcs_plugin)
 {
     GtkWidget *mainvbox, *frame, *vbox, *hbox, *header, *label, *mi,
-            *menu, *button, *image;
+            *menu, *button, *image, *chk;
     GtkSizeGroup *sg;
     GdkColor color;
     BackdropDialog *bd;
     gint i, j, nscreens, nmonitors = 0;
     XfceKiosk *kiosk;
     gboolean allow_custom_backdrop = TRUE;
+    Window xid;
 
     bd = g_new0(BackdropDialog, 1);
     bd->plugin = mcs_plugin;
@@ -851,10 +931,22 @@ create_backdrop_dialog (McsPlugin * mcs_plugin)
     header = xfce_create_header (bd->plugin->icon, _("Desktop Settings"));
     gtk_box_pack_start (GTK_BOX (mainvbox), header, FALSE, TRUE, 0);
 
-    add_spacer (GTK_BOX (mainvbox));
+    add_spacer(GTK_BOX(mainvbox));
+    
+    chk = gtk_check_button_new_with_mnemonic(_("Allow _Xfce to manage the desktop"));
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk),
+            xfdesktop_check_is_running(&xid));
+    gtk_widget_show(chk);
+    gtk_box_pack_start(GTK_BOX(mainvbox), chk, FALSE, FALSE, 0);
+    g_signal_connect(G_OBJECT(chk), "toggled",
+            G_CALLBACK(manage_desktop_chk_toggled_cb), bd);
+    
+    add_spacer(GTK_BOX(mainvbox));
     
     /* main notebook */
     bd->top_notebook = gtk_notebook_new();
+    gtk_widget_set_sensitive(bd->top_notebook,
+            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(chk)));
     gtk_widget_show(bd->top_notebook);
     gtk_box_pack_start(GTK_BOX(mainvbox), bd->top_notebook, TRUE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (bd->top_notebook), 6);
@@ -1001,17 +1093,6 @@ create_backdrop_dialog (McsPlugin * mcs_plugin)
             if(bp->color_style == XFCE_BACKDROP_COLOR_SOLID)
                 gtk_widget_set_sensitive(hbox, FALSE);
             
-#if 0
-            /* set color only checkbox */
-            bp->color_only_chk = gtk_check_button_new_with_mnemonic(_("Set color _only"));
-            gtk_widget_show(bp->color_only_chk);
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bp->color_only_chk),
-                    bp->color_only);
-            gtk_box_pack_start(GTK_BOX(vbox), bp->color_only_chk, FALSE, FALSE, 0);
-            g_signal_connect(G_OBJECT(bp->color_only_chk), "toggled",
-                    G_CALLBACK(showimage_toggle), bp);
-#endif
-            
             g_object_unref(G_OBJECT(sg));
             
             /* image settings frame */
@@ -1083,18 +1164,6 @@ create_backdrop_dialog (McsPlugin * mcs_plugin)
             
             g_object_unref(G_OBJECT(sg));
             
-#if 0
-            /* don't set backdrop checkbox */
-            bp->set_backdrop_chk = gtk_check_button_new_with_mnemonic(_("_Don't set backdrop"));
-            gtk_widget_show(bp->set_backdrop_chk);
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bp->set_backdrop_chk),
-                    !bp->set_backdrop);
-            gtk_box_pack_start(GTK_BOX(page), bp->set_backdrop_chk, FALSE, FALSE, 0);
-            g_signal_connect(G_OBJECT(bp->set_backdrop_chk), "toggled",
-                    G_CALLBACK(toggle_set_background), bp);
-            toggle_set_background(GTK_TOGGLE_BUTTON(bp->set_backdrop_chk), bp);
-#endif
-            
             /* set sensitive state of image settings based on 'Show Image' */
             showimage_toggle(bp->show_image_chk, bp);
             
diff --git a/src/main.c b/src/main.c
index f911d42f..f21a7da7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -58,10 +58,6 @@
 #include "windowlist.h"
 #include "settings.h"
 
-#define RELOAD_MESSAGE     "reload"
-#define MENU_MESSAGE       "menu"
-#define WINDOWLIST_MESSAGE "windowlist"
-
 SessionClient *client_session = NULL;
 gboolean is_session_managed = FALSE;
 
@@ -174,28 +170,6 @@ button_cb(GtkWidget *w, GdkEventButton *evt, gpointer user_data)
     return TRUE;
 }
 
-static void
-send_client_message(Window xid, const gchar *msg)
-{
-    GdkEventClient gev;
-    GtkWidget *win;
-    
-    win = gtk_invisible_new();
-    gtk_widget_realize(win);
-    
-    gev.type = GDK_CLIENT_EVENT;
-    gev.window = win->window;
-    gev.send_event = TRUE;
-    gev.message_type = gdk_atom_intern("STRING", FALSE);
-    gev.data_format = 8;
-    strcpy(gev.data.b, msg);
-    
-    gdk_event_send_client_message((GdkEvent *)&gev, (GdkNativeWindow)xid);
-    gdk_flush();
-    
-    gtk_widget_destroy(win);
-}
-
 static gboolean 
 reload_idle_cb(gpointer data)
 {
@@ -217,38 +191,15 @@ client_message_received(GtkWidget *w, GdkEventClient *evt, gpointer user_data)
         } else if(!strcmp(WINDOWLIST_MESSAGE, evt->data.b)) {
             popup_windowlist(gtk_widget_get_screen(w), 0, GDK_CURRENT_TIME);
             return TRUE;
+        } else if(!strcmp(QUIT_MESSAGE, evt->data.b)) {
+            gtk_main_quit();
+            return TRUE;
         }
     }
 
     return FALSE;
 }
 
-static gboolean
-check_is_running(Window *xid)
-{
-    const gchar *display = g_getenv("DISPLAY");
-    gchar *p;
-    gint xscreen = -1;
-    gchar selection_name[100];
-    Atom selection_atom;
-    
-    if(display) {
-        if((p=g_strrstr(display, ".")))
-            xscreen = atoi(p);
-    }
-    if(xscreen == -1)
-        xscreen = 0;
-
-    g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen);
-    selection_atom = XInternAtom(GDK_DISPLAY(), selection_name, False);
-
-    if((*xid = XGetSelectionOwner(GDK_DISPLAY(), selection_atom)))
-        return TRUE;
-
-    return FALSE;
-}
-
-
 static void
 sighandler_cb(int sig)
 {
@@ -287,21 +238,24 @@ main(int argc, char **argv)
 
     gtk_init(&argc, &argv);
 
-    if(check_is_running(&xid)) {
+    if(xfdesktop_check_is_running(&xid)) {
         DBG("xfdesktop is running");
         
         if(argc <= 1 || strcmp("-reload", argv[1]) == 0)
-            send_client_message(xid, RELOAD_MESSAGE);
+            xfdesktop_send_client_message(xid, RELOAD_MESSAGE);
         else if(strcmp("-menu", argv[1]) == 0)
-            send_client_message(xid, MENU_MESSAGE);
+            xfdesktop_send_client_message(xid, MENU_MESSAGE);
         else if(strcmp("-windowlist", argv[1]) == 0)
-            send_client_message(xid, WINDOWLIST_MESSAGE);
+            xfdesktop_send_client_message(xid, WINDOWLIST_MESSAGE);
+        else if(strcmp("-quit", argv[1]) == 0)
+            xfdesktop_send_client_message(xid, QUIT_MESSAGE);
         else {
             g_printerr(_("%s: Unknown option: %s\n"), PACKAGE, argv[1]);
             g_printerr(_("Options are:\n"));
             g_printerr(_("    -reload      Reload all settings, refresh image list\n"));
             g_printerr(_("    -menu        Pop up the menu (at the current mouse position)\n"));
             g_printerr(_("    -windowlist  Pop up the window list (at the current mouse position)\n"));
+            g_printerr(_("    -quit        Cause xfdesktop to quit\n"));
             
             return 1;
         }
@@ -331,6 +285,8 @@ main(int argc, char **argv)
         gdk_window_lower(desktops[i]->window);
     }
     
+    signal(SIGPIPE, SIG_IGN);
+    
     client_session = client_session_new(argc, argv, NULL,
             SESSION_RESTART_IF_RUNNING, 35);
     client_session->die = session_die;