* (lots): Migrate xfce4-session to use xfconf. Combine session,

      splash, and autostart dialog into one glade-ified (mostly) dialog.

(Old svn revision: 28142)

104 files changed, 21401 insertions, 14305 deletions

diff --git a/ChangeLog b/ChangeLog
index 1017eab6..78be5645 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-11	Brian Tarricone <bjt23@cornell.edu>
+
+	* (lots): Migrate xfce4-session to use xfconf.  Combine session,
+	  splash, and autostart dialog into one glade-ified (mostly) dialog.
+
 2008-10-08	Brian Tarricone <bjt23@cornell.edu>
 
 	* xfce4-session-logout/{main.c,xfce4-session-logout.1}: Add
diff --git a/Makefile.am b/Makefile.am
index 528f5402..5de25e9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,13 +9,9 @@ SUBDIRS =								\
 	settings							\
 	xfce4-session							\
 	xfce4-session-logout						\
-	xfce4-autostart-editor						\
 	xfce4-tips							\
 	xfsm-shutdown-helper
 
-configdir = $(sysconfdir)/xdg/xfce4-session
-config_DATA = xfce4-session.rc
-
 EXTRA_DIST =								\
 	BUGS								\
 	ChangeLog.pre-xfce-devel					\
diff --git a/configure.in.in b/configure.in.in
index 6d76ca5d..be1d1aa5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -76,6 +76,8 @@ XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.5.90])
 XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.12])
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.5.90])
+XDT_CHECK_PACKAGE([LIBGLADE], [libglade-2.0], [2.0.0])
 
 dnl Check for gnome support
 XDT_CHECK_OPTIONAL_PACKAGE([GNOME], [gconf-2.0], [2.4.0], [gnome],
@@ -148,14 +150,11 @@ icons/72x72/Makefile
 icons/128x128/Makefile
 icons/scalable/Makefile
 libxfsm/Makefile
-libxfsm/xfce4-session-1.0.pc
+libxfsm/xfce4-session-2.0.pc
 po/Makefile.in
 settings/Makefile
-settings/session/Makefile
-settings/splash/Makefile
 xfce4-session/Makefile
 xfce4-session-logout/Makefile
-xfce4-autostart-editor/Makefile
 xfce4-tips/Makefile
 xfce4-tips/data/Makefile
 xfsm-shutdown-helper/Makefile
diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
index be53b936..200fc437 100644
--- a/engines/balou/Makefile.am
+++ b/engines/balou/Makefile.am
@@ -28,7 +28,7 @@ libbalou_la_LDFLAGS =							\
 	-module
 
 libbalou_la_LIBADD =							\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
 
 if HAVE_OS_CYGWIN
 libbalou_la_LIBADD +=							\
@@ -36,4 +36,4 @@ libbalou_la_LIBADD +=							\
 endif
 
 libbalou_la_DEPENDENCIES =						\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
diff --git a/engines/mice/Makefile.am b/engines/mice/Makefile.am
index 506195f5..845d650c 100644
--- a/engines/mice/Makefile.am
+++ b/engines/mice/Makefile.am
@@ -17,7 +17,7 @@ libmice_la_LDFLAGS =							\
 	-module
 
 libmice_la_LIBADD =							\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
 
 if HAVE_OS_CYGWIN
 libmice_la_LIBADD +=							\
@@ -25,7 +25,7 @@ libmice_la_LIBADD +=							\
 endif
 
 libmice_la_DEPENDENCIES =						\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
 
 noinst_PROGRAMS =							\
 	generate
diff --git a/engines/simple/Makefile.am b/engines/simple/Makefile.am
index c656b697..553760bc 100644
--- a/engines/simple/Makefile.am
+++ b/engines/simple/Makefile.am
@@ -18,7 +18,7 @@ libsimple_la_LDFLAGS =							\
 	-module
 
 libsimple_la_LIBADD =							\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
 
 if HAVE_OS_CYGWIN
 libsimple_la_LIBADD +=							\
@@ -26,7 +26,7 @@ libsimple_la_LIBADD +=							\
 endif
 
 libsimple_la_DEPENDENCIES =						\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
 	
 EXTRA_DIST =								\
 	fallback.h							\
diff --git a/libxfsm/Makefile.am b/libxfsm/Makefile.am
index 215b6bf8..1883cc5a 100644
--- a/libxfsm/Makefile.am
+++ b/libxfsm/Makefile.am
@@ -2,35 +2,37 @@ INCLUDES =								\
 	-I$(top_srcdir)
 
 # common library
-lib_LTLIBRARIES = libxfsm-4.2.la
+lib_LTLIBRARIES = libxfsm-4.6.la
 
-libxfsm_4_2_la_SOURCES =						\
+libxfsm_4_6_la_SOURCES =						\
 	xfsm-splash-rc.c						\
 	xfsm-splash-rc.h						\
 	xfsm-util.h							\
 	xfsm-util.c
 
-libxfsm_4_2_la_CFLAGS =							\
-	@LIBX11_CFLAGS@							\
-	@LIBXFCEGUI4_CFLAGS@
+libxfsm_4_6_la_CFLAGS =							\
+	$(LIBX11_CFLAGS)						\
+	$(LIBXFCEGUI4_CFLAGS)						\
+	$(XFCONF_CFLAGS)
 
-libxfsm_4_2_la_LDFLAGS =						\
+libxfsm_4_6_la_LDFLAGS =						\
 	-export-dynamic							\
-	-version-info 0:1:0
+	-version-info 0:0:0
 
 if HAVE_OS_CYGWIN
-libxfsm_4_2_la_LDFLAGS +=						\
+libxfsm_4_6_la_LDFLAGS +=						\
 	-no-undefined							\
-	@LIBX11_LDFLAGS@
+	$(LIBX11_LDFLAGS@
 
-libxfsm_4_2_la_LIBADD =							\
-	@LIBX11_LIBS@							\
-	@LIBXFCEGUI4_LIBS@
+libxfsm_4_6_la_LIBADD =							\
+	$(LIBX11_LIBS)							\
+	$(LIBXFCEGUI4_LIBS)						\
+	$(XFCONF_LIBS)
 endif
 
 
 libxfsmincludedir =							\
-	$(includedir)/xfce4/xfce4-session-4.2/libxfsm
+	$(includedir)/xfce4/xfce4-session-4.6/libxfsm
 
 libxfsminclude_HEADERS = 						\
 	xfsm-splash-engine.h						\
@@ -38,6 +40,6 @@ libxfsminclude_HEADERS = 						\
 
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xfce4-session-1.0.pc
+pkgconfig_DATA = xfce4-session-2.0.pc
 
 
diff --git a/libxfsm/xfce4-session-1.0.pc.in b/libxfsm/xfce4-session-2.0.pc.in
index 06cc2f0f..b0c546b6 100644
--- a/libxfsm/xfce4-session-1.0.pc.in
+++ b/libxfsm/xfce4-session-2.0.pc.in
@@ -7,5 +7,5 @@ Name: xfce4-session
 Description: Xfce 4 session manager
 Requires: libxfcegui4-1.0
 Version: @VERSION@
-Libs: -L${libdir} -lxfsm-4.2
-Cflags: -I${includedir}/xfce4/xfce4-session-4.2
+Libs: -L${libdir} -lxfsm-4.6
+Cflags: -I${includedir}/xfce4/xfce4-session-4.6
diff --git a/libxfsm/xfsm-util.c b/libxfsm/xfsm-util.c
index 88c563a7..49a78588 100644
--- a/libxfsm/xfsm-util.c
+++ b/libxfsm/xfsm-util.c
@@ -234,11 +234,9 @@ xfsm_window_grab_input (GtkWindow *window)
 }
 
 
-XfceRc*
-xfsm_open_config (gboolean readonly)
+XfconfChannel*
+xfsm_open_config (void)
 {
-  return xfce_rc_config_open (XFCE_RESOURCE_CONFIG,
-                              "xfce4-session/xfce4-session.rc",
-                              readonly);
+  return xfconf_channel_get ("xfce4-session");
 }
 
diff --git a/libxfsm/xfsm-util.h b/libxfsm/xfsm-util.h
index c38e1ec9..337f6f2a 100644
--- a/libxfsm/xfsm-util.h
+++ b/libxfsm/xfsm-util.h
@@ -22,6 +22,8 @@
 #ifndef __XFSM_UTIL_H__
 #define __XFSM_UTIL_H__
 
+#include <xfconf/xfconf.h>
+
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
@@ -49,7 +51,7 @@ void xfsm_window_add_border (GtkWindow *window);
 
 void xfsm_window_grab_input (GtkWindow *window);
 
-XfceRc *xfsm_open_config (gboolean readonly);
+XfconfChannel *xfsm_open_config (void);
 
 G_END_DECLS;
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 73908d16..e5d38051 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,12 +4,15 @@ engines/balou/balou-theme.c
 engines/balou/config.c
 engines/mice/mice.c
 engines/simple/simple.c
-settings/session/session.c
-settings/splash/splash.c
-xfce4-autostart-editor/main.c
-xfce4-autostart-editor/xfae-dialog.c
-xfce4-autostart-editor/xfae-model.c
-xfce4-autostart-editor/xfae-window.c
+settings/main.c
+settings/module.c
+settings/session-editor.c
+settings/splash-settings.c
+settings/startup-settings.c
+settings/xfae-dialog.c
+settings/xfae-model.c
+settings/xfae-window.c
+settings/xfce4-session-settings.glade
 xfce4-session/main.c
 xfce4-session/shutdown.c
 xfce4-session/xfsm-chooser.c
@@ -23,7 +26,5 @@ xfce4-session/xfsm-startup.c
 xfce4-tips/main.c
 
 # files added by intltool-prepare.
-settings/session/xfce-session-settings.desktop.in
-settings/splash/xfce-splash-settings.desktop.in
-xfce4-autostart-editor/xfce4-autostart-editor.desktop.in
+settings/xfce-session-settings.desktop.in
 xfce4-tips/xfce4-tips-autostart.desktop.in
diff --git a/po/am.po b/po/am.po
index a20d8040..873f893a 100755..100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-06 04:22+0900\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-01-06 18:40+0100\n"
 "Last-Translator: Tegegne Tefera <tefera@mekuria.com>\n"
 "Language-Team: Amharic <l10n-am@googlegroups.com>\n"
@@ -25,7 +25,9 @@ msgstr "ለመትከል የጭብጥ ፋይልን ምረጥ..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
 msgstr "የርችት ጭብጥን ከፋይል %s ላይ መትከል አልተቻለም። እባክዎ ፋይሉ የርችት ጭብጥ ማኅደር መኦኑን ያረጋግጡ"
 
 #: ../engines/balou/config.c:386
@@ -73,281 +75,357 @@ msgstr "አይጥ"
 msgid "Mice Splash Engine"
 msgstr "አይጥ የርጫታ ሞተር"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "ምስል ምረጥ"
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "ቀላልን አሰናዳ..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "የፊደል ቅርጽ"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "ቀለሞች"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "የኋላ ቀለምን"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "የጽሑፍ ቀለም፦"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "ምስል"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "የግል ምስልን ተጠቀም"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "ቀላል"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "ቀላል የርችት ሞተር"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "ክፍለጊዜ መራጭ"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "የሎግባ ማሳያ መራጭ"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "ከተሰየመ የክፍለጊዜ አስተዳዳሪው ወደ ሸፍሲ በሎገቡ ቁጥር እንዲመርጡ ይጠይቆታል።"
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "የሎግውጣ ስየማዎች"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "ሲሎግውጡ ክፍለጊዜውን በራስገዝ ያስቀምጡ"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "ሲሎግወጣ ይነሳ"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "ተማሚነት"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "ሲነሳ የኖም አገልግሎቶችን አስነሳ"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "መረጃ"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "ሲነሳ የኬዲ አገልግሎቶችን አስነሳ"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "ደህንነት"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "የሩቅ ፕሮግራሞችን አስተዳድር"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "ክፍለጊዜዎችና የመነሳት ስየማዎች"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "ክፍለጊዜና መነሳት"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "አጠቃላይ"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "በጥልቀት"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "አዝራር ስም|ክፍለጊዜ እና ማስነሳት"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "ምንም"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "የርችት ስክሪን ስየማዎች"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "አዘጋጅ"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "ለተመረጠው የርችት ስክሪን ማሰናጃን ይከፍታል።"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "ሙከራ"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "የተመረጠውን የርችት ስክሪን ቀድሞ ያሳያል።"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "መረጃ"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>መግለጫ፦</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>ዝርያ፦</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>ደራሲ፦</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>መረብቤት፦</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "አዝራር ስም|ርችት ስክሪን"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "ፕሮግራም ጨምር"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "ስም፦"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "መግለጫ፦"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "ትዕዛዝ:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "ትዕዛዝ ምረጥ"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "የ%sን ግኑኝነት መቁረጥ አልተቻለም ፦ %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "ፋይል  %sን መፍጠር አልተቻለም"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "ፋይል  %sን መጻፍ አልተቻለም"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "ፋይል  %sን ለመጻፍ መክፈት አልተቻለም"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "በራስገዝ የሚነሱ ፕሮግራሞች"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "ወደ ሸፍሲ ገበታ ሲሎገቡ ባለፈው ጊዜ በሎግወጡ ጊዜ ከነበሩት\n"
 " ፕሮግራሞች በተጨማሪ የሚቀጥሉት ፕሮግራሞች በራስ ገዝ\n"
 " ይነሳሉ፦"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>ደራሲ፦</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "ተማሚነት"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>መግለጫ፦</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>መረብቤት፦</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "መረጃ"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "የሎግውጣ ስየማዎች"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>መግለጫ፦</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "ክፍለጊዜ መራጭ"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>ዝርያ፦</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "በጥልቀት"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "ሲሎግውጡ ክፍለጊዜውን በራስገዝ ያስቀምጡ"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "አዘጋጅ"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "የተመረጠውን የርችት ስክሪን ቀድሞ ያሳያል።"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "ሲነሳ የኬዲ አገልግሎቶችን አስነሳ"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "ሲነሳ የኬዲ አገልግሎቶችን አስነሳ"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "የሩቅ ፕሮግራሞችን አስተዳድር"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "ለተመረጠው የርችት ስክሪን ማሰናጃን ይከፍታል።"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "የተመረጠውን የርችት ስክሪን ቀድሞ ያሳያል።"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "ክፍለጊዜና መነሳት"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "የሎግባ ማሳያ መራጭ"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "አጠቃላይ"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "ሲሎግወጣ ይነሳ"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "ከፍለጊዜን ጨርስ"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "ሙከራ"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "የገበታ ስየማዎች በመጫን ላይ"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "የDNS ስየማዎችን በማረጋገጥ ላይ"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "የክፍለጊዜ መረጃን በመጫን ላይ"
 
-#: ../xfce4-session/shutdown.c:307
-msgid "End Session"
-msgstr "ከፍለጊዜን ጨርስ"
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "የክፍለጊዜ ስምን ይምረጡ።"
 
-#: ../xfce4-session/shutdown.c:341
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "ሎግውጣ"
 
-#: ../xfce4-session/shutdown.c:364
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "እንደገና ጀምር"
 
-#: ../xfce4-session/shutdown.c:387
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "ዝጋ"
 
-#: ../xfce4-session/shutdown.c:395
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "ክፍለጊዜውን ለወደፊት ሎገባዎች አስቀምጥ _S"
 
-#: ../xfce4-session/shutdown.c:458
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "እብክዎ ማለፊያቃልን ያስገቡ፦"
 
-#: ../xfce4-session/shutdown.c:489
-msgid "<b>An error occured</b>"
+#: ../xfce4-session/shutdown.c:490
+#, fuzzy
+msgid "<b>An error occurred</b>"
 msgstr "<b>ስህተት ተከስቷል</b>"
 
-#: ../xfce4-session/shutdown.c:503
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -355,7 +433,9 @@ msgid "Last accessed: %s"
 msgstr "መጨረሻ የታየው፦ %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
 msgstr "እንደገና ማስነሳት የሚፈልጉት ክፍለጊዜን ይምረጡና ሁለቴ ይጫኑት።"
 
 #. "Logout" button
@@ -376,15 +456,21 @@ msgstr "አዲስ ክፍለጊዜ"
 msgid "Create a new session."
 msgstr "አዲስ ክፍለጊዜ ፍጠር።"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:245
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "የኖምን ቁልፍመያዣ አሰናጅን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:257
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "የኖምን ረዳት ቴክኖሎጂን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "የኬዲ አገልግሎቶችን በማስነሳት ላይ"
 
@@ -413,6 +499,31 @@ msgstr "ቢሆንም ይቀጥል?"
 msgid "Try again"
 msgstr "እንደገና ሞክር"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "ክፍለጊዜን ምረጥ"
@@ -425,88 +536,88 @@ msgstr "የክፍለጊዜ ስምን ይምረጡ።"
 msgid "Choose a name for the new session:"
 msgstr "ለአዲሱ ክፍለጊዜ ስምን ይምረ፦"
 
-#: ../xfce4-session/xfsm-startup.c:99
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "የድምጽ መቆጣጠሪያን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "ፓነል በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "የገበታ አስተዳዳሪን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "የስራ ማስጫን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "የመስኮት አስተዳዳሪ በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:111
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "የኖም ተርሚናል አሳይን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:115
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "የኬዲን የጽሁፍ አራሚ በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "የኬዲን የመለጠፊያ ቦርድ አስተዳዳሪ በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "የኬዲ ተርሚናል ማሳያን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "የኬዲ ዜና አንባቢን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "ኮንከረርን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "የኬዲ ተርሚናል ማሳያን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:129
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "ቢፕ ሜዲያ ማጫወቻን  በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "ጊምፕን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "ቪም  አራሚን ቤማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "የክፍለጊዜ አስተዳዳሪ ምስለኔን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "የሸ-ውይይት IRC ጠሪን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "የሸን የብዙሜዲያ ስርዓትን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "የሸ ተርሚናል ማሳያን በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s በማስነሳት ላይ"
 
-#: ../xfce4-session/xfsm-startup.c:268
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -531,62 +642,124 @@ msgstr ""
 "location.\n"
 "You should delete this directory now.\n"
 
-#: ../xfce4-session/xfsm-startup.c:407
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "በራስገዝ መነሳት ስራ ላይ..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:158
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "ምክሮች"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:202
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "አዋቂ"
 
-#: ../xfce4-tips/main.c:187
+#: ../xfce4-tips/main.c:190
 msgid "Display tips on _startup"
 msgstr "ምክሮችን ሲነሳ አሳይ_s"
 
-#: ../xfce4-tips/main.c:196
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "ምክሮች"
 
-#: ../xfce4-tips/main.c:213
+#: ../xfce4-tips/main.c:216
 msgid "Next"
 msgstr "የሚቀጥለው "
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "ክፍለጊዜዎችና የመነሳት ስየማዎች"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "ክፍለጊዜዎችና የመነሳት ስየማዎች"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "የሸፍሲ 4 ክፍለጊዜዎችና የመነሳት ስየማዎች"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "የሸፍሲ 4 የርችት ስየማዎች"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "በራስገዝ የሚነሱ ፕሮግራሞች"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "በራስ ገዝ የሚነሱ ፖሮግራሞች ዝርዝርን አርም።"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "የሸፍሲ 4 በራስገዝ የተነሱ ፕሮግራሞች"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "የሸፍሲ ምክሮች"
 
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr "ከተሰየመ የክፍለጊዜ አስተዳዳሪው ወደ ሸፍሲ በሎገቡ ቁጥር እንዲመርጡ ይጠይቆታል።"
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "ሲነሳ የኖም አገልግሎቶችን አስነሳ"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+
+#~ msgid "Security"
+#~ msgstr "ደህንነት"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "አዝራር ስም|ክፍለጊዜ እና ማስነሳት"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "የርችት ስክሪን ስየማዎች"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "አዝራር ስም|ርችት ስክሪን"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "በራስገዝ የሚነሱ ፕሮግራሞች"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "የሸፍሲ 4 የርችት ስየማዎች"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "በራስገዝ የሚነሱ ፕሮግራሞች"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "በራስ ገዝ የሚነሱ ፖሮግራሞች ዝርዝርን አርም።"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "የሸፍሲ 4 በራስገዝ የተነሱ ፕሮግራሞች"
diff --git a/po/ar.po b/po/ar.po
index 4e9cb463..e20175e3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-09-21 00:44+0200\n"
 "Last-Translator: Mohamed Magdy <mohamed.m.k@gmail.com>\n"
 "Language-Team: Arabic <en@li.org>\n"
@@ -78,307 +78,351 @@ msgstr "فأرة"
 msgid "Mice Splash Engine"
 msgstr "محرك الفأرة"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "إختار صورة..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "إعدادات بسيطة"
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "الخط"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "أﻷوان"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "لون الخلفية"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "لون الخط"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "صورة"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "استعمل صورة خاصة"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "بسيط"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "محرك بسيط"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "تحكم بالجلسة"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "أظهر الاختيار عند الدخول"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"أذا قمت بتفعيل هذا الخيار، سيقوم مدير الجلسة بدعوة اختيار الجلسة كل مرة تدخل "
-"فيها الجلسة."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "إعدادات الخروج"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "حفظ تلقائي للجلسة عند الخروج"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"هذا الخيار يجعل متحكم الجلسة يقوم بتسجيل الجلسة الحالية عندما تقوم بالخروج."
-"اذا لم تقم بتفعيل هذا الخيار سيتم سؤالك كل مرة تقوم فيهل يالخروج."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "سؤال عند الخروج"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "معلومة"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"هذا الخيار يلغي تأكيد الخروج.حفظ الجلسة أو عدم حفظها مرتبط بتفعيلك الحفظ "
-"التلقائي للجلسات عند الخروج."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "التوافق"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "اطلاق خدمة غنوم عند البداية"
-
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"قم بتفعيل اذا أردت استعمال برامج غنوم.سيتم جعل مدير الجلسة يقوم بتشغيل بعض "
-"خدمات غنوم الضرورية.يجب تفعيل هذا الخيار أيضا منأذا اردت استعمال تكنلوجيا "
-"غنوم لذو الاحتياجات الخاصة."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "اطلاق خدمة KDE عند البداية"
-
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"فعل هذا الخيار اذا اردت تشغيل تطبيقات KDE كجزء من مكتب اكسفس.سيقوم هذا "
-"الخيار بزيادة وقت بداية تشغيل سطح المكتب،لكن من جهة أخرى، سيقوم بتشغيل برامج "
-"KDE بسرعة أكبر.بعض برامج KDE لن تشتغل على الاطلاق ان لم تقوم بتفعيل هذا "
-"الخيار."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "الأمن"
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "تحكم البرامج الخارجية"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "اعدادات بدء جلسة"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"جعل مدير الجلسة يتحكم في الاجهزة البعيدة.لا تقوم بتفعيل هذا الخيار ان لم تكن "
-"متيقن من اختيارك."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "الجلسة والبداية"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "عام"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "متقدم"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "اسم الزر | الجلسة والبداية"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "لا شيء"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "اعدادات شاشة البداية"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "الإعدادات"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "فتح قائمة اعدادات ل شاشة البدئ المختارة"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "تجريب"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "أظهر شاشة بدء تلقائية"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "معلومة"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>:وصف</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>:اصدار</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "المؤلّف:"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>:الصفحة الشخصية</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "زر شاشة البدء"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "أضف تطبيق"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "الإسم:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "الوصف:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "الأمر:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "اختر أمر:"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "فشل في فك‌ربط %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "فشل في انشاء ملف %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "فشل في كتابة الملف ·%s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "فشل في فتح الملف %s من أجل الكتابة"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "البرامج التلقائية"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "هذه لائحة البرامج التي ستشغل بصفة تلقائية\n"
 "عندما تقوم بالدخول الى سطح المكتب اكسفس\n"
 "زيادة على البرامج التي سجلت عند آخر مرة\n"
 "قمت فيها بالدخول:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "المؤلّف:"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "التوافق"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>:وصف</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>:الصفحة الشخصية</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "معلومة"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "إعدادات الخروج"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>:وصف</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "تحكم بالجلسة"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>:اصدار</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "متقدم"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "حفظ تلقائي للجلسة عند الخروج"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "الإعدادات"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "أظهر شاشة بدء تلقائية"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "اطلاق خدمة KDE عند البداية"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "اطلاق خدمة KDE عند البداية"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "تحكم البرامج الخارجية"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "فتح قائمة اعدادات ل شاشة البدئ المختارة"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "أظهر شاشة بدء تلقائية"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "الجلسة والبداية"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "أظهر الاختيار عند الدخول"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "عام"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "سؤال عند الخروج"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "إنهاء الجلسة"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "تجريب"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "تحميل إعدادت سطح‌المكتب"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "التحقق من اعدادات DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "تحميل بيانات الجلسة"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "اختر إسم الجلسة"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "الخروج"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "إعادة التشغيل"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "غلق الجهاز"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_حفظ الجلسة ﻹستخدامات مستقبلية"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "أدخل كلمة السر:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>حدث خطأ</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -417,15 +461,21 @@ msgstr "جلسة جديدة"
 msgid "Create a new session."
 msgstr "انشاء جلسة جديدة."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "بداية خدمة المفاتيح غنوم "
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "بدء تكنلوجيا غنوم لذو الاحتياجات الخاصة"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "بدء خدمات KDE"
 
@@ -452,6 +502,31 @@ msgstr "استمرار رغم كل شيء"
 msgid "Try again"
 msgstr "حاول من جديد"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "إختر الجلسة"
@@ -464,88 +539,88 @@ msgstr "اختر إسم الجلسة"
 msgid "Choose a name for the new session:"
 msgstr "إختر اسم الجلسة الجديدة:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "بداية متحكم الصوت"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "بدء القائمة"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "بدء مدير سطح المكتب"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "بدء قائمة الأعمال"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "بدء مدير النوافذ"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "بدء شاشة طرفية غنوم"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "بدء محرر نصوص المتقدم KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "بدء مدير ال"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "بدء قارء البريد الالكتروني KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "بدء قارء الأخبار KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "بدء كونكيرور"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "بدء الشاشة الطرفية KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "بدء الميديا بلاير"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "بداية THE Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "بدء حرر النصوص VI"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "بدء بروكسي مدير الجلسة"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "بدء ·X-Chat·IRC"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "بدء نظام X·Multimedia"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "بدء الشاشة الطرفية X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "بدء %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -570,7 +645,7 @@ msgstr ""
 "الجديد.\n"
 "عليك حذف هذا الملف الآن.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "بدء تلقائي..."
 
@@ -594,37 +669,99 @@ msgstr "النصائح والارشادات"
 msgid "Next"
 msgstr "التالي"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "اعدادات بدء جلسة"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "إعدادات بدئ الجلسة"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "إعدادات·بدئ·الجلسة اكسفس"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "سمة شاشة البدء اكسفس"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "البرامج المشغلة تلقائيا"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "تعديل لائحة البرامج·المشغلة·تلقائيا"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "البرامج·المشغلة·تلقائيا اكسفس"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "نصائح اكسفس"
 
-#~ msgid "End Session"
-#~ msgstr "إنهاء الجلسة"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "أذا قمت بتفعيل هذا الخيار، سيقوم مدير الجلسة بدعوة اختيار الجلسة كل مرة "
+#~ "تدخل فيها الجلسة."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "هذا الخيار يجعل متحكم الجلسة يقوم بتسجيل الجلسة الحالية عندما تقوم "
+#~ "بالخروج.اذا لم تقم بتفعيل هذا الخيار سيتم سؤالك كل مرة تقوم فيهل يالخروج."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "هذا الخيار يلغي تأكيد الخروج.حفظ الجلسة أو عدم حفظها مرتبط بتفعيلك الحفظ "
+#~ "التلقائي للجلسات عند الخروج."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "اطلاق خدمة غنوم عند البداية"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "قم بتفعيل اذا أردت استعمال برامج غنوم.سيتم جعل مدير الجلسة يقوم بتشغيل "
+#~ "بعض خدمات غنوم الضرورية.يجب تفعيل هذا الخيار أيضا منأذا اردت استعمال "
+#~ "تكنلوجيا غنوم لذو الاحتياجات الخاصة."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "فعل هذا الخيار اذا اردت تشغيل تطبيقات KDE كجزء من مكتب اكسفس.سيقوم هذا "
+#~ "الخيار بزيادة وقت بداية تشغيل سطح المكتب،لكن من جهة أخرى، سيقوم بتشغيل "
+#~ "برامج KDE بسرعة أكبر.بعض برامج KDE لن تشتغل على الاطلاق ان لم تقوم بتفعيل "
+#~ "هذا الخيار."
+
+#~ msgid "Security"
+#~ msgstr "الأمن"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "جعل مدير الجلسة يتحكم في الاجهزة البعيدة.لا تقوم بتفعيل هذا الخيار ان لم "
+#~ "تكن متيقن من اختيارك."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "اسم الزر | الجلسة والبداية"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "اعدادات شاشة البداية"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "زر شاشة البدء"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "البرامج التلقائية"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "سمة شاشة البدء اكسفس"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "البرامج المشغلة تلقائيا"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "تعديل لائحة البرامج·المشغلة·تلقائيا"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "البرامج·المشغلة·تلقائيا اكسفس"
diff --git a/po/az.po b/po/az.po
index d34d692b..aa6e34b2 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:29+0900\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -79,310 +79,349 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Rəsm seç..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Sadə Örtüyü Quraşdır..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Yazı Növü"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Rənglər"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Arxa plan rəngi:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Mətn rəngi:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Rəsm"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Xüsusi rəsm işlət"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "İclas seçicisi"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Girişdə displey seçicisi"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Mə'lumat"
+
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Əgər seçilidirsə, icras idarəçisi sizdən hər Xfce-yə girişinizdə iclas "
-"seçmənizi istəyəcəkdir."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Çıxış qurğuları"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Çıxışda iclası avtomatik olaraq qeyd et"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "İclaslar və Başlanğıc"
+
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Bu qurğu iclasınızı sonlandırdığınızda onu avtomatik olaraq qeyd edəcəkdir. "
-"Əgər bu seçimi seçməzsəniz, hər çıxışda iclası qeyd etmək istəyib "
-"istəmədiyiniz  soruşulacaqdır."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Çıxışı təsdiqlə"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
-"BU seçim, çıxışda təsdiq sualını qeyri-fəallaşdırar. İclasın qeyd edilib "
-"edilməyəcəyi isə avtomatik iclas qeyd qurğularınızdan asılıdır."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Uyğunluq"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Başlanğıcda Gnome xidmətlərini başlat"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
+msgstr "Heç biri"
+
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
-"Bəzi Gnome programlarını işlədəcəksəniz, bu qurğuyla iclas idarəçisi hər "
-"açılışda bəzi Gnome xidmətlərini başladacaqdır. Məsələn, yetişmə qabiliyyəti "
-"və yardımçı texnologiyaları xidmətləri kimi."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Başlanğıcda Gnome xidmətlərini başlat"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Bəzi KDE programlarını işlədəcəksəniz, bu qurğuyla iclas idarəçisi hər "
-"açılışda bəzi KDE xidmətlərini başladacaqdır. Başlama sürəsi azala bilər, "
-"amma KDE proqramları sürətli başlayacaqdır. Bəzi KDE proqramları isə bu "
-"qurğusuz heç işləməyəcəkdir."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Təhlükəsizlik"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Uzaq proqramları idarə et"
+#: ../settings/xfae-dialog.c:130
+#, fuzzy
+msgid "Description:"
+msgstr "<b>İzahat:</b>"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
 msgstr ""
-"İclas idarəçisinə uzaq qovşaqlarda işləyən proqramları idarə etmə imkanı "
-"ver. Nə etdiyinizi bilmirsinizsə bunu fəallaşdırmayın."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "İclaslar və Başlanğıc"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Ümumi"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Ətraflı"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "İclaslar və Başlanğıc"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
-msgstr "Heç biri"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Açılış Rəsmi Qurğuları"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Quraşdır"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Müəllif:</b>"
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Seçili açılış rəsmi üçün quraşdırma panelini açar"
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Uyğunluq"
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Sınaq"
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>İzahat:</b>"
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Seçili açılış rəsmini nümayiş edər."
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Ana Səhifə:</b>"
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
 msgstr "Mə'lumat"
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Çıxış qurğuları"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
 msgstr "<b>İzahat:</b>"
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "İclas seçicisi"
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr "<b>Buraxılış:</b>"
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Müəllif:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Ətraflı"
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Ana Səhifə:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Çıxışda iclası avtomatik olaraq qeyd et"
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:12
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "Açılış Rəsmi"
+msgid "Con_figure"
+msgstr "Quraşdır"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Seçili açılış rəsmini nümayiş edər."
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfce4-session-settings.glade.h:15
 #, fuzzy
-msgid "Description:"
-msgstr "<b>İzahat:</b>"
+msgid "Launch GN_OME services on startup"
+msgstr "Başlanğıcda Gnome xidmətlərini başlat"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Başlanğıcda Gnome xidmətlərini başlat"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Uzaq proqramları idarə et"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Seçili açılış rəsmi üçün quraşdırma panelini açar"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Seçili açılış rəsmini nümayiş edər."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "İclaslar və Başlanğıc"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Girişdə displey seçicisi"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Ümumi"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Çıxışı təsdiqlə"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Yeni iclas"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Sınaq"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-#, fuzzy
-msgid "Autostarted applications"
-msgstr "Uzaq proqramları idarə et"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Masa üstü qurğuları yüklənir"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS qurğuları doğrulanır"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "İclas məlumatı yüklənir"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "İclas adını seç"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "Çıxış"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "Növbəti girişlər üçün iclası _qeyd et"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Xahiş edirik, şifrənizi bildirin:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Xəta baş verdi</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +460,21 @@ msgstr "Yeni iclas"
 msgid "Create a new session."
 msgstr "Yeni iclas yarat."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Gnome Keyring Demonu Başladılır"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Gnome Yardımçı Texnologiyaları Başladılır"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE xidmətləri başladılır"
 
@@ -458,6 +503,31 @@ msgstr "Yenə də davam et"
 msgid "Try again"
 msgstr "Yenidən sına"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "İclası seç"
@@ -470,88 +540,88 @@ msgstr "İclas adını seç"
 msgid "Choose a name for the new session:"
 msgstr "Yeni iclas üçün ad seç:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Səs İdarəçisi Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Panel Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Masa Üstü İdarəçisi Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Vəzifə Çubuğu Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Pəncərə İdarəçisi Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Gnome Terminal Emulyatoru Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE Mütəxəssis Mətn Editoru (KATE) Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE Ara Yaddaş İdarəçisi Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE Poçt Oxuyucusu Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE Xəbərlər Oxuyucusu Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE Terminal Emulyatoru Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Beep Media Çalğıcısı Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "The Gimp Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI Təkmilləşdirilmiş Editor Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "İclas İdarə Vəkili Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat IRC Proqramı Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "X Multimedia Sistemi Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X Terminal Emulyatoru Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s Başladılır"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -566,7 +636,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Avtomatik Başlatma Fəaliyyətdədir..."
 
@@ -590,43 +660,102 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "İclaslar və Başlanğıc"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "İclaslar və Başlanğıc"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "İclaslar və Başlanğıc"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Açılış Rəsmi Qurğuları"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr ""
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Əgər seçilidirsə, icras idarəçisi sizdən hər Xfce-yə girişinizdə iclas "
+#~ "seçmənizi istəyəcəkdir."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Bu qurğu iclasınızı sonlandırdığınızda onu avtomatik olaraq qeyd "
+#~ "edəcəkdir. Əgər bu seçimi seçməzsəniz, hər çıxışda iclası qeyd etmək "
+#~ "istəyib istəmədiyiniz  soruşulacaqdır."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "BU seçim, çıxışda təsdiq sualını qeyri-fəallaşdırar. İclasın qeyd edilib "
+#~ "edilməyəcəyi isə avtomatik iclas qeyd qurğularınızdan asılıdır."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Başlanğıcda Gnome xidmətlərini başlat"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Bəzi Gnome programlarını işlədəcəksəniz, bu qurğuyla iclas idarəçisi hər "
+#~ "açılışda bəzi Gnome xidmətlərini başladacaqdır. Məsələn, yetişmə "
+#~ "qabiliyyəti və yardımçı texnologiyaları xidmətləri kimi."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Bəzi KDE programlarını işlədəcəksəniz, bu qurğuyla iclas idarəçisi hər "
+#~ "açılışda bəzi KDE xidmətlərini başladacaqdır. Başlama sürəsi azala bilər, "
+#~ "amma KDE proqramları sürətli başlayacaqdır. Bəzi KDE proqramları isə bu "
+#~ "qurğusuz heç işləməyəcəkdir."
+
+#~ msgid "Security"
+#~ msgstr "Təhlükəsizlik"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "İclas idarəçisinə uzaq qovşaqlarda işləyən proqramları idarə etmə imkanı "
+#~ "ver. Nə etdiyinizi bilmirsinizsə bunu fəallaşdırmayın."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
 #, fuzzy
-msgid "Autostarted Applications"
-msgstr "Uzaq proqramları idarə et"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "İclaslar və Başlanğıc"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Açılış Rəsmi Qurğuları"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Açılış Rəsmi"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr ""
+#, fuzzy
+#~ msgid "Autostarted applications"
+#~ msgstr "Uzaq proqramları idarə et"
+
+#, fuzzy
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Açılış Rəsmi Qurğuları"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "Yeni iclas"
+#~ msgid "Autostarted Applications"
+#~ msgstr "Uzaq proqramları idarə et"
diff --git a/po/be.po b/po/be.po
index 2c0d8f22..6d2f9a4e 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.3.90.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-09-10 11:29+0300\n"
 "Last-Translator: Alexander Nyakhaychyk <nyakhaychyk@gmail.com>\n"
 "Language-Team: Belarusian <xfce-i18n@xfce.org>\n"
@@ -78,312 +78,351 @@ msgstr "Мыша"
 msgid "Mice Splash Engine"
 msgstr "Рухавік Мыша"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Абраць відарыс..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Наладзіць простую тэму..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Шрыфт"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Колеры"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Колер тла:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Колер тэкста:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Відарыс"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Выкарыстоўваць адмысловы відарыс"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Просты"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Просты рухавік"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Абіральнік сэансаў"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Адлюстроўваць абіральнік на ўваходзе"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Калі ўключыць, тад кіраўнік сэансаў будзе прапаноўваць вам выбраць "
-"сэанскожны раз, калі вы ўваходзіце ў Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Наладкі выхаду"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Аўтаматычна захоўваць сэанс пад час выхаду"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Гэты выбар кажа кіраўніку сэансаў, што неабходна захоўваць бягучысэанс "
-"аўтаматычна, калі вы выходзіце. Калі вы не вылучыце гэты выбар,кіраўнік "
-"сэансаў будзе прапаноўваць пад час выхаду захаваць сэанс."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Прапанова пад час выхаду"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Зьвесткі"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Гэты выбар выключае дыялёг пацьверджаньня выхаду. Ці будзе гэтысэанс "
-"захаваны, залежыць ад таго, ці задзейнічалі вы аўтаматычнаезахаваньне "
-"сэанска."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Сумяшчальнасьць"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Запускаць паслугі GNOME пад час запуску"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Уключыце гэтую магчымасьць, калі вы выкарытоўваеце GNOME дастасаваньні.Яна "
-"кажа кіраўніку сэансаў, каб ён запусьціў паслугі GNOME для вас. Так самавам "
-"патрэбна ўключыць гэтую магчымасьць, каб карыстацца Тэхналёгіясудзеяньня "
-"(для людзей з абмежаванымі магчымасьцямі), якая ідзе разам з GNOME."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Запускаць паслугі KDE пад час запуску"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Уключыце гэтую магчымасьць, калі вы жадаеце выконваць дастасаваньні KDE "
-"якчастку сэанса Xfce. Яна значна павялічыць час запуску Xfce, але з іншага "
-"боку,KDE дастасаваньні будуць запускацца значна шпарчэй. Некаторвыя KDE "
-"дастасаваньніўвогуле ня змогуць працаваць, покуль вы ня ўключыце гэтую "
-"магчымасьць."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Бясьпека"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Кіраваньне аддаленымі дастасаваньнямі"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Настаўленьні сэанса і запуску"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Дазволіць кіраўніку сэансаў кіраваць аддаленымі дастасаваньнямі, які "
-"працуюць нааддаленых вузлах. Не ўключайце гэтую магчымасьць, калі вы ня "
-"ведаеце, што янаробіць."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Сэансы й запуск"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Галоўныя"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Дадатковыя"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Сэансы й запуск"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Няма"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Наладка застаўкі"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Наладка"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Адчыняе панэлю наладкі для вылучане экраннае застаўкі."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Праверыць"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Дэманструе вылучаную застаўку."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Зьвесткі"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Апісаньне:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Вэрсыя:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Аўтар:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Старонка праэкта:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Застаўка на ўваход"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Дадаць дастасаваньне"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Апісаньне:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Загад:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Вылучыце загад"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Немагчыма выдаліць %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Немагчыма стварыць файл %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Немагчыма прачытаць файл %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Немагчыма адчыніць %s для запісу"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Дастасаваньні аўтазапуску"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Ніжэй знаходзіцца сьпіс дастасаваньняў, якія будуць\n"
 "запускацца аўтаматычна, калі вы ўваходзіце ў Xfce\n"
 "(яны будуць запускацца ў дадатак да тых дастасаваньняў,\n"
 "што засталіся зь мінулага сэансу):"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Аўтар:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Сумяшчальнасьць"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Апісаньне:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Старонка праэкта:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Зьвесткі"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Наладкі выхаду"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Апісаньне:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Абіральнік сэансаў"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Вэрсыя:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Дадатковыя"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Аўтаматычна захоўваць сэанс пад час выхаду"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Наладка"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Дэманструе вылучаную застаўку."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Запускаць паслугі KDE пад час запуску"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Запускаць паслугі KDE пад час запуску"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Кіраваньне аддаленымі дастасаваньнямі"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Адчыняе панэлю наладкі для вылучане экраннае застаўкі."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Дэманструе вылучаную застаўку."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Сэансы й запуск"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Адлюстроўваць абіральнік на ўваходзе"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Галоўныя"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Прапанова пад час выхаду"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Завяршыць сэанс"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Праверыць"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Загружаюцца наладкі стальца"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Праверка наладак DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Загружаюцца даньні сэанса"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Абярыце назву сэанса"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Выйсьці"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Перазапуск"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Выключыць"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "За_хаваць сэанс для будучых уваходаў"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Калі ласка, увядзіце пароль:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Узьнікла памылка</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -422,15 +461,21 @@ msgstr "Новы сэанс"
 msgid "Create a new session."
 msgstr "Стварыць новы сэанс."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Запуск паслужніка ключоў GNOME"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Запус Тэхналёгіі судзеяньня GNOME"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Запуск паслуг KDE"
 
@@ -459,6 +504,31 @@ msgstr "Працягваць у любым разе"
 msgid "Try again"
 msgstr "Паспрабаваць зноў"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Абярыце сэанс"
@@ -471,88 +541,88 @@ msgstr "Абярыце назву сэанса"
 msgid "Choose a name for the new session:"
 msgstr "Абярыце назву для новага сэанса:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Запуск Кантроля гучнасьці"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Запуск Панэлі"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Запуск Кіраўніка стальца"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Запуск Панэлі задач"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Запуск Кіраўніка вокнаў"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Запуск эмулятара тэрміналаў GNOME"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Запуск Пашыранага тэкставага рэдактара KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Запуск Буфэра абмену KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Запуск паштовага кліента KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Запуск кліента навін KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Запуск Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Запуск эмулятара тэрміналаў KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Запуск Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Запуск \"The Gimp\""
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Запуск Палепшанага VI"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Запуск паўнамоцнага паслужніка кіраваньня сэансамі"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Запуск IRC кліента X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Запуск Мультымэдыйнае сыстэмы X"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Запуск эмулятара тэрміналаў X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Запуск %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -576,7 +646,7 @@ msgstr ""
 "ў старой дырэкторыі аўтазапуску былі пасьпяхова перанесены ў новую.\n"
 "Вы мусіце выдаліць старую дырэкторыю.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Выконваецца аўтазапуск..."
 
@@ -600,37 +670,108 @@ msgstr "Каштоўныя парады"
 msgid "Next"
 msgstr "Далей"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Настаўленьні сэанса і запуску"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Настаўленьні сэансаў і запуску"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Настаўленьні сэансаў і запуску Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Настаўленьні застаўкі Xfce"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr "xfce4-tips"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Дастасаваньні аўтазапуску"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Калі ўключыць, тад кіраўнік сэансаў будзе прапаноўваць вам выбраць "
+#~ "сэанскожны раз, калі вы ўваходзіце ў Xfce."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Рэдагаваньне сьпісу дастасаваньняў аўтазапуску"
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Гэты выбар кажа кіраўніку сэансаў, што неабходна захоўваць бягучысэанс "
+#~ "аўтаматычна, калі вы выходзіце. Калі вы не вылучыце гэты выбар,кіраўнік "
+#~ "сэансаў будзе прапаноўваць пад час выхаду захаваць сэанс."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Аўтазапуск дастасаваньняў у Xfce 4"
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Гэты выбар выключае дыялёг пацьверджаньня выхаду. Ці будзе гэтысэанс "
+#~ "захаваны, залежыць ад таго, ці задзейнічалі вы аўтаматычнаезахаваньне "
+#~ "сэанска."
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr "xfce4-tips"
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Запускаць паслугі GNOME пад час запуску"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Уключыце гэтую магчымасьць, калі вы выкарытоўваеце GNOME дастасаваньні."
+#~ "Яна кажа кіраўніку сэансаў, каб ён запусьціў паслугі GNOME для вас. Так "
+#~ "самавам патрэбна ўключыць гэтую магчымасьць, каб карыстацца "
+#~ "Тэхналёгіясудзеяньня (для людзей з абмежаванымі магчымасьцямі), якая ідзе "
+#~ "разам з GNOME."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Уключыце гэтую магчымасьць, калі вы жадаеце выконваць дастасаваньні KDE "
+#~ "якчастку сэанса Xfce. Яна значна павялічыць час запуску Xfce, але з "
+#~ "іншага боку,KDE дастасаваньні будуць запускацца значна шпарчэй. "
+#~ "Некаторвыя KDE дастасаваньніўвогуле ня змогуць працаваць, покуль вы ня "
+#~ "ўключыце гэтую магчымасьць."
+
+#~ msgid "Security"
+#~ msgstr "Бясьпека"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Дазволіць кіраўніку сэансаў кіраваць аддаленымі дастасаваньнямі, які "
+#~ "працуюць нааддаленых вузлах. Не ўключайце гэтую магчымасьць, калі вы ня "
+#~ "ведаеце, што янаробіць."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Сэансы й запуск"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Наладка застаўкі"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Застаўка на ўваход"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Дастасаваньні аўтазапуску"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Настаўленьні застаўкі Xfce"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Дастасаваньні аўтазапуску"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Рэдагаваньне сьпісу дастасаваньняў аўтазапуску"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Аўтазапуск дастасаваньняў у Xfce 4"
 
 #~ msgid "Show hibernate button"
 #~ msgstr "Паказваць кнопку сну"
@@ -663,9 +804,6 @@ msgstr "xfce4-tips"
 #~ msgid "Hibernate"
 #~ msgstr "Усыпіць"
 
-#~ msgid "End Session"
-#~ msgstr "Завяршыць сэанс"
-
 #~ msgid "What do you want to do next?"
 #~ msgstr "Што вы жадаеце рабіць далей?"
 
diff --git a/po/bn_IN.po b/po/bn_IN.po
index a1c37514..2d9180e7 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:30+0900\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bangla INDIA <LL@li.org>\n"
@@ -79,312 +79,349 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "ছবি নির্বাচন করুন..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Simple কনফিগার করুন..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "ফন্ট"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "রং"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "পটভূমির রং:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "হরফের রং:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "ছবি"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "স্বনির্বাচিত চিত্র ব্যবহার করুন"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "সেশান নির্বাচক"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "লগ-ইনের সময় নির্বাচক প্রদর্শন করুন"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "তথ্য"
+
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"মান নির্ধারিত থাকলে, প্রতিবার Xfce-তে লগ-ইন করার সময় সেশান পরিচালক আপনাকে একটি "
-"সেশান নির্বাচন করতে অনুরোধ করবে।"
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "লগ-আউট সংক্রান্ত বৈশিষ্ট্যাবলী"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "লগ-আউট করার সময় স্বয়ংক্রিয়ভাবে সেশান সংরক্ষণ করা হবে"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "সেশান এবং প্রারম্ভ সংক্রান্ত বৈশিষ্ট্যাবলী"
+
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"এই অপশনের সাহায্যে সেশান পরিচালককে লগ-আউটের সময় স্বয়ংক্রিয়ভাবে বর্তমান সেশান "
-"সংরক্ষণ করার নির্দেশ দেওয়া হয়। এই অপশনটি নির্ধারিত না থাকলে, প্রতিবার লগ-আউট "
-"করার সময় বর্তমান সেশান সংরক্ষণ করা হবে কিনা তা আপনাকে জিজ্ঞাসা করা হবে।"
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "লগ-আউটের সময় জিজ্ঞাসা করা হবে"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
-"এই অপশনের সাহায্যে লগ-আউট নিশ্চায়নের ডায়লগটি নিষ্ক্রিয় করা হয়। সেশানটি সংরক্ষিত "
-"হবে কিনা তা নির্ভর করে আপনি লগ-আউটের সময় স্বয়ংক্রিয়ভাবে সেশান সংরক্ষণের নির্দেশ "
-"দিয়েছেন কিনা।"
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "সামঞ্জস্য"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "আরম্ভের সময় Gnome পরিসেবা চালু করা হবে"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"আপনি যদি Gnome অ্যাপ্লিকেশন ব্যবহার করতে ইচ্ছুক থাকেন তাহলে এটি সক্রিয় করুন। এর ফলে "
-"সেশান পরিচালককে আপনার জন্য কয়েকটি মৌলিক Gnome  পরিসেবা আরম্ভ করার নির্দেশ দেওয়া "
-"হবে। Gnome-র সাথে উপলব্ধ Assistive Technology-গুলি ব্যবহার করতে ইচ্ছুক থাকলেও এটি "
-"সক্রিয় করা আবশ্যক।"
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "আরম্ভের সময় KDE পরিসেবা চালু করুন"
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
+msgstr "শূণ্য"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"আপনি যদি Xfce ডেস্কটপের অংশ হিসাবে KDE অ্যাপ্লিকেশন নির্বাহ করতে ইচ্ছুক থাকেন "
-"তাহলে এই অপশনটি সক্রিয় করুন। এটি প্রারম্ভে প্রয়োজনীয় সময় উল্লেখযোগ্যভাবে বৃদ্ধি করলেও "
-"KDE অ্যাপ্লিকেশন অধিক দ্রুত আরম্ভ হবে। এই অপশনটি সক্রিয় না করা হলে বেশ কয়েকটি KDE "
-"অ্যাপ্লিকেশন কাজ করতে সক্ষম হবে না।"
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "নিরাপত্তা"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "দূরবর্তী অ্যাপ্লিকেশন নিয়ন্ত্রণ করুন"
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
+msgstr ""
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
-"সেশান পরিচালককে, দূরবর্তী হোস্টে চলমান অ্যাপ্লিকেশন পরিচালনার অনুমতি প্রদান করুন। "
-"সম্পূর্ণরূপে নিশ্চিত না হয়ে এই অপশনটি সক্রিয় করবেন না।"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "সেশান এবং প্রারম্ভ"
+#: ../settings/xfae-dialog.c:130
+#, fuzzy
+msgid "Description:"
+msgstr "<b>বিবরণ:</b>"
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "সাধারণ"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "উন্নত"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "সেশান এবং প্রারম্ভ"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
-msgstr "শূণ্য"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "স্প্ল্যাশ স্ক্রিন সংক্রান্ত বৈশিষ্ট্যাবলী"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "কনফিগার করুন"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "নির্বাচিত স্প্ল্যাশ স্ক্রিনের জন্য কনফিগারেশনের প্যানেল খুলে দেয়।"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "পরীক্ষা"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>লেখক:</b>"
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "নির্বাচিত স্প্ল্যাশ স্ক্রিনটি পরীক্ষামূলকভাবে প্রদর্শন করে।"
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "সামঞ্জস্য"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>বিবরণ:</b>"
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>হোম-পেজ:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
 msgstr "তথ্য"
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "লগ-আউট সংক্রান্ত বৈশিষ্ট্যাবলী"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
 msgstr "<b>বিবরণ:</b>"
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "সেশান নির্বাচক"
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr "<b>সংস্করণ:</b>"
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>লেখক:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "উন্নত"
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>হোম-পেজ:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "লগ-আউট করার সময় স্বয়ংক্রিয়ভাবে সেশান সংরক্ষণ করা হবে"
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:12
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "স্প্যাশ স্ক্রিন"
+msgid "Con_figure"
+msgstr "কনফিগার করুন"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "নির্বাচিত স্প্ল্যাশ স্ক্রিনটি পরীক্ষামূলকভাবে প্রদর্শন করে।"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfce4-session-settings.glade.h:15
 #, fuzzy
-msgid "Description:"
-msgstr "<b>বিবরণ:</b>"
+msgid "Launch GN_OME services on startup"
+msgstr "আরম্ভের সময় KDE পরিসেবা চালু করুন"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "আরম্ভের সময় KDE পরিসেবা চালু করুন"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "দূরবর্তী অ্যাপ্লিকেশন নিয়ন্ত্রণ করুন"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "নির্বাচিত স্প্ল্যাশ স্ক্রিনের জন্য কনফিগারেশনের প্যানেল খুলে দেয়।"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "নির্বাচিত স্প্ল্যাশ স্ক্রিনটি পরীক্ষামূলকভাবে প্রদর্শন করে।"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "সেশান এবং প্রারম্ভ"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "লগ-ইনের সময় নির্বাচক প্রদর্শন করুন"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "সাধারণ"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "লগ-আউটের সময় জিজ্ঞাসা করা হবে"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "নতুন সেশান"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "পরীক্ষা"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-#, fuzzy
-msgid "Autostarted applications"
-msgstr "দূরবর্তী অ্যাপ্লিকেশন নিয়ন্ত্রণ করুন"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "ডেস্কটপের বৈশিষ্ট্যাবলী লোড করা হচ্ছে"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS-র বৈশিষ্ট্যাবলী পরীক্ষা করা হচ্ছে"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "সেশানের তথ্য লোড করা হচ্ছে"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "সেশানের নাম নির্বাচন করুন"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "লগ-আউট"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "ভবিষ্যতের লগ-ইনের জন্য সেশান সংরক্ষণ করুন (_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "অনুগ্রহ করে আপনার পাসওয়ার্ড লিখুন:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>একটি ত্রুটি উত্‍পন্ন হয়েছে</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -423,15 +460,21 @@ msgstr "নতুন সেশান"
 msgid "Create a new session."
 msgstr "নতুন সেশান আরম্ভ করুন।"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Gnome Keyring Daemon আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Gnome Assistive Technologies আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE পরিসেবা আরম্ভ করা হচ্ছে"
 
@@ -460,6 +503,31 @@ msgstr "অগ্রাহ্য করে এড়িয়ে চলুন"
 msgid "Try again"
 msgstr "পুনরায় প্রচেষ্টা করুন"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "সেশান নির্বাচন করুন"
@@ -472,88 +540,88 @@ msgstr "সেশানের নাম নির্বাচন করুন"
 msgid "Choose a name for the new session:"
 msgstr "নতুন সেশানের একটি নাম নির্বাচন করুন:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "আওয়াজ নিয়ন্ত্রক আরম্ভ করুন"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "প্যানেল আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "ডেস্কটপ পরিচালক আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "টাস্কবার আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "উইন্ডো পরিচালক আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Gnome Terminal Emulator আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE Advanced Text Editor আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE Clipboard Manager আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE Mail Reader আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE News Reader আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE Terminal Emulator আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Beep Media Player আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "The Gimp আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI Improved Editor আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Session Management Proxy আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat IRC Client আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "X Multimedia System আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X Terminal Emulator আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s আরম্ভ করা হচ্ছে"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -568,7 +636,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "অটোস্টার্ট চলছে..."
 
@@ -592,39 +660,100 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "সেশান এবং প্রারম্ভ সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "সেশান এবং প্রারম্ভ সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 সেশান এবং প্রারম্ভ সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 স্প্ল্যাশ স্ক্রিন সংক্রান্ত সংক্রান্ত বৈশিষ্ট্যাবলী"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr ""
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "মান নির্ধারিত থাকলে, প্রতিবার Xfce-তে লগ-ইন করার সময় সেশান পরিচালক আপনাকে "
+#~ "একটি সেশান নির্বাচন করতে অনুরোধ করবে।"
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "এই অপশনের সাহায্যে সেশান পরিচালককে লগ-আউটের সময় স্বয়ংক্রিয়ভাবে বর্তমান সেশান "
+#~ "সংরক্ষণ করার নির্দেশ দেওয়া হয়। এই অপশনটি নির্ধারিত না থাকলে, প্রতিবার লগ-আউট "
+#~ "করার সময় বর্তমান সেশান সংরক্ষণ করা হবে কিনা তা আপনাকে জিজ্ঞাসা করা হবে।"
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "এই অপশনের সাহায্যে লগ-আউট নিশ্চায়নের ডায়লগটি নিষ্ক্রিয় করা হয়। সেশানটি "
+#~ "সংরক্ষিত হবে কিনা তা নির্ভর করে আপনি লগ-আউটের সময় স্বয়ংক্রিয়ভাবে সেশান "
+#~ "সংরক্ষণের নির্দেশ দিয়েছেন কিনা।"
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "আরম্ভের সময় Gnome পরিসেবা চালু করা হবে"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "আপনি যদি Gnome অ্যাপ্লিকেশন ব্যবহার করতে ইচ্ছুক থাকেন তাহলে এটি সক্রিয় করুন। এর "
+#~ "ফলে সেশান পরিচালককে আপনার জন্য কয়েকটি মৌলিক Gnome  পরিসেবা আরম্ভ করার "
+#~ "নির্দেশ দেওয়া হবে। Gnome-র সাথে উপলব্ধ Assistive Technology-গুলি ব্যবহার করতে "
+#~ "ইচ্ছুক থাকলেও এটি সক্রিয় করা আবশ্যক।"
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "আপনি যদি Xfce ডেস্কটপের অংশ হিসাবে KDE অ্যাপ্লিকেশন নির্বাহ করতে ইচ্ছুক থাকেন "
+#~ "তাহলে এই অপশনটি সক্রিয় করুন। এটি প্রারম্ভে প্রয়োজনীয় সময় উল্লেখযোগ্যভাবে বৃদ্ধি "
+#~ "করলেও KDE অ্যাপ্লিকেশন অধিক দ্রুত আরম্ভ হবে। এই অপশনটি সক্রিয় না করা হলে বেশ "
+#~ "কয়েকটি KDE অ্যাপ্লিকেশন কাজ করতে সক্ষম হবে না।"
+
+#~ msgid "Security"
+#~ msgstr "নিরাপত্তা"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "সেশান পরিচালককে, দূরবর্তী হোস্টে চলমান অ্যাপ্লিকেশন পরিচালনার অনুমতি প্রদান করুন। "
+#~ "সম্পূর্ণরূপে নিশ্চিত না হয়ে এই অপশনটি সক্রিয় করবেন না।"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
 #, fuzzy
-msgid "Autostarted Applications"
-msgstr "দূরবর্তী অ্যাপ্লিকেশন নিয়ন্ত্রণ করুন"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "সেশান এবং প্রারম্ভ"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
+#~ msgid "Splash Screen Settings"
+#~ msgstr "স্প্ল্যাশ স্ক্রিন সংক্রান্ত বৈশিষ্ট্যাবলী"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "স্প্যাশ স্ক্রিন"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr ""
+#, fuzzy
+#~ msgid "Autostarted applications"
+#~ msgstr "দূরবর্তী অ্যাপ্লিকেশন নিয়ন্ত্রণ করুন"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 স্প্ল্যাশ স্ক্রিন সংক্রান্ত সংক্রান্ত বৈশিষ্ট্যাবলী"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "নতুন সেশান"
+#~ msgid "Autostarted Applications"
+#~ msgstr "দূরবর্তী অ্যাপ্লিকেশন নিয়ন্ত্রণ করুন"
diff --git a/po/ca.po b/po/ca.po
index c5155d8a..d839135f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-03-15 18:27+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
 "Language-Team: catalan <xfce-i18n@xfce.org>\n"
@@ -81,310 +81,350 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Motor per la pantalla de presentació Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Seleccioneu la imatge"
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configureu simple"
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Tipus de lletra"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Colors"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Color de fons:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Color del text:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Imatge"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Utilitza imatge personalitzada"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Motor per la pantalla de presentació Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Trieu sessió"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Mostra per escollir en entrar"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Si és seleccionat, el gestor de sessió vos demanarà que trieu una sessió "
-"cada cop que entreu a Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Paràmetres de sortida"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Desa automàticament la sessió en sortir"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Aquesta opció indica al gestor de sessions que desi automàticament la sessió "
-"actual quan tanqueu la sessió. Si no seleccionau aquest paràmetre se vos "
-"demanarà si voleu guardar la sessió cada cop que vulgueu sortir."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Demana en sortir"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informació"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Aquesta opció desactiva el diàleg de confirmació del fi de sessió. La sessió "
-"serà desada o no depenent si heu activat desar-la automàticament."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilitat"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Llança els serveis Gnome durant l'engegada"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Activeu això si teniu pensat usar aplicacions Gnome. Això indicarà al gestor "
-"de sessions que arranqui alguns serveis vitals de Gnome. És recomanable que "
-"activeu això si teniu intenció d'usar les Tecnologies d'Assistència que "
-"formen part de Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Llança els serveis de KDE durant l'engegada"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Activeu això si teniu intenció d'executar aplicacions KDE durant la sessió "
-"d'Xfce. Això allargarà notablement la durada de l'engegada però després les "
-"aplicacions KDE arrancaran més aviat. Algunes aplicacions KDE poden no "
-"funcionar si no s'activa aquesta opció."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Seguretat"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Gestiona les aplicacions remotes"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Paràmetres de sessió i d'engegada"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Permet al gestor de sessions encarregar-se de les aplicacions executades "
-"remotament. Habiliteu aquesta opció sols si sabeu el que feu."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessions i engegada"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "General"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avançat"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessions i engegada"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Cap"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Paràmetres de la pantalla de presentació"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configura"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Obri el plafó de configuració per escollir la pantalla de presentació."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Prova"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Previsualitza la pantalla de presentació"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informació"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Descripció:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versió:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Pàgina principal:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr ""
-"Pantalla de \n"
-"presentació"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Afegeix una aplicació"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Ordre:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Seleccioneu una ordre"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Impossible desenllaçar %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Impossible crear el fitxer %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Impossible escriure al fitxer %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Impossible obrir %s per escriure"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Apliacions engegades automàticament"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Avall teniu el llistat d'aplicacions que s'engegaran\n"
 "automàticament en entrar a l'escriptori Xfce, a més\n"
 "a més de les que es desaren el darrer cop que sortireu:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilitat"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descripció:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Pàgina principal:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informació"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Paràmetres de sortida"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Descripció:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Trieu sessió"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versió:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avançat"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Desa automàticament la sessió en sortir"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configura"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Previsualitza la pantalla de presentació"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Llança els serveis de KDE durant l'engegada"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Llança els serveis de KDE durant l'engegada"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Gestiona les aplicacions remotes"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Obri el plafó de configuració per escollir la pantalla de presentació."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Previsualitza la pantalla de presentació"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessions i engegada"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Mostra per escollir en entrar"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "General"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Demana en sortir"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Acaba la sessió"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Prova"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "S'estan carregant els paràmetres dels escriptoris"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "S'està verificant els paràmetres de DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "S'està carregant les dades de la sessió"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Seleccioneu un nom de sessió"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Surt"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Reinicia"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Atura"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Desa la sessió per entrades futures"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Si us plau, introduïu la contrasenya:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Hi ha hagut un error</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -423,15 +463,21 @@ msgstr "Sessió nova"
 msgid "Create a new session."
 msgstr "Crea una sessió nova."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "S'està iniciant el dimoni d'Anell de Claus de Gnome"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "S'estan iniciant les Tecnologies d'Assistència Gnome"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "S'estan iniciant els serveis KDE"
 
@@ -460,6 +506,31 @@ msgstr "Continua igualment"
 msgid "Try again"
 msgstr "Torneu-ho a provar"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Seleccioneu una sessió"
@@ -472,88 +543,88 @@ msgstr "Seleccioneu un nom de sessió"
 msgid "Choose a name for the new session:"
 msgstr "Seleccioneu un nom nou per la sessió:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "S'està iniciant el controlador de volum"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "S'està iniciant el plafó"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "S'està iniciant el gestor d'escriptori"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "S'està iniciant la barra de tasques"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "S'està iniciat el gestor de finestres"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "S'està iniciant el Terminal Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "S'està iniciant l'Editor de Text Avançat KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "S'està iniciant el Gestor Porta-retalls KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "S'està iniciant el Lector de Correu KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "S'està iniciant Lector de Grups de discussió KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "S'està iniciant Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "S'està iniciant el Terminal KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "S'està iniciant el reproductor d'avisos sonors"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "S'està iniciant el Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "S'està iniciant l'editor Vim"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "S'està iniciant el servidor intermediari del gestor de sessió"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "S'està iniciant el client IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "S'està iniciant el sistema multimèdia de les X"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "S'està iniciant l'emulador del terminal de les X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "S'està iniciant %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -579,7 +650,7 @@ msgstr ""
 "\n"
 "És aconsellable esborrar l'antic directori ara mateix.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "S'està realitzant l'engegada automàtica"
 
@@ -603,37 +674,103 @@ msgstr "Consells i suggeriments"
 msgid "Next"
 msgstr "Següent"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Paràmetres de sessió i d'engegada"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Paràmetres de sessions i d'engegada"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Paràmetres Xfce4 de sessió i d'engegada"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Paràmetres Xfce4 de la pantalla de presentació"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aplicacions engegades automàticament"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Edita el llistat d'aplicacions engegades automàticament"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Aplicacions engegades automàticament d'Xfce4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "Consells d'Xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "Acaba la sessió"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Si és seleccionat, el gestor de sessió vos demanarà que trieu una sessió "
+#~ "cada cop que entreu a Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Aquesta opció indica al gestor de sessions que desi automàticament la "
+#~ "sessió actual quan tanqueu la sessió. Si no seleccionau aquest paràmetre "
+#~ "se vos demanarà si voleu guardar la sessió cada cop que vulgueu sortir."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Aquesta opció desactiva el diàleg de confirmació del fi de sessió. La "
+#~ "sessió serà desada o no depenent si heu activat desar-la automàticament."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Llança els serveis Gnome durant l'engegada"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Activeu això si teniu pensat usar aplicacions Gnome. Això indicarà al "
+#~ "gestor de sessions que arranqui alguns serveis vitals de Gnome. És "
+#~ "recomanable que activeu això si teniu intenció d'usar les Tecnologies "
+#~ "d'Assistència que formen part de Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Activeu això si teniu intenció d'executar aplicacions KDE durant la "
+#~ "sessió d'Xfce. Això allargarà notablement la durada de l'engegada però "
+#~ "després les aplicacions KDE arrancaran més aviat. Algunes aplicacions KDE "
+#~ "poden no funcionar si no s'activa aquesta opció."
+
+#~ msgid "Security"
+#~ msgstr "Seguretat"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Permet al gestor de sessions encarregar-se de les aplicacions executades "
+#~ "remotament. Habiliteu aquesta opció sols si sabeu el que feu."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessions i engegada"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Paràmetres de la pantalla de presentació"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr ""
+#~ "Pantalla de \n"
+#~ "presentació"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Apliacions engegades automàticament"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Paràmetres Xfce4 de la pantalla de presentació"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aplicacions engegades automàticament"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Edita el llistat d'aplicacions engegades automàticament"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Aplicacions engegades automàticament d'Xfce4"
diff --git a/po/cs.po b/po/cs.po
index 45a4bf66..23d77a34 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-10-05 16:44+0100\n"
 "Last-Translator: Michal Várady <miko.vaji@gmail.com>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -27,8 +27,12 @@ msgstr "Zvolte soubor s motivem k nainstalování"
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Nelze nainstalovat motiv spouštěcí obrazovky ze souboru %s. Zkontrolujte, zda je soubor platným archivem motivu."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Nelze nainstalovat motiv spouštěcí obrazovky ze souboru %s. Zkontrolujte, "
+"zda je soubor platným archivem motivu."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -75,278 +79,357 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Spouštěcí obrazovka Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Zvolit obrázek..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigurovat..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Font"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Barvy"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Barva pozadí:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Barva textu:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Použít vlastní obrázek"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Jednoduchá"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Jednoduchá spouštěcí obrazovka"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Výběr sezení"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Zobrazit výběr při přihlašování"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "Vyberete-li tuto možnost, budete požádáni o volbu sezení při každém přihlášení do Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Nastavení odhlášení"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automaticky uložit sezení při odhlášení"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "Při odhlášení správce sezení automaticky uloží právě spuštěné sezení. Nevyberete-li tuto volbu, budete při každém odhlášení dotázáni, zda chcete uložit aktuální sezení."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Dotazovat se při odhlášení"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "Tato volba vypíná potvrzovací dialog při odhlášení. Zda bude sezení uloženo nebo ne, závisí na povoleném nebo zakázaném automatickém ukládání sezení při odhlášení."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompatibilita"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Spustit při startu služby Gnome"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Chcete-li spouštět aplikace Gnome jako součást sezení prostředí Xfce, povolte tuto volbu. Tato volba umožní správci sezení spustit některé důležité služby prostředí Gnome. Tuto volbu byste měli zapnout, chcete-li používat technologie usnadnění Gnome."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informace"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Spustit při startu služby KDE"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Chcete-li spouštět aplikace KDE jako součást sezení prostředí Xfce, povolte tuto volbu. Tato volba sice může znatelně prodloužit celkový čas spouštění, aplikace KDE však budou startovat rychleji. Některé aplikace KDE nemusejí bez zapnutí této volby správně pracovat."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Bezpečnost"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Spravovat vzdálené aplikace"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Nastavení spouštění a sezení"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Povolit správci sezení ovládání aplikací běžících na vzdálených strojích. Nepovolujte tuto volbu, nejste-li si jisti, k čemu slouží."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sezení a spouštění"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Hlavní"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Vylepšení"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sezení a spouštění"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Žádná"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Nastavení spouštěcí obrazovky"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigurovat"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Otevře konfigurační panel vybrané spouštěcí obrazovky."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Vyzkoušet"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Náhled vybrané spouštěcí obrazovky."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informace"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Popis:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Verze:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Domovská stránka:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Spouštěcí obrazovka"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Přidat aplikaci"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Název:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Vyberte příkaz"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Nepodařilo se odstranit symbolický odkaz %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Nepodařilo se vytvořit soubor %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Nepodařilo se zapsat do souboru %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Nepodařilo se otevřít soubor %s pro zápis"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Automaticky spouštěné aplikace"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Níže najdete seznam aplikací, které budou spuštěny\n"
 "automaticky po přihlášení do prostředí Xfce, včetně\n"
 "aplikací, které byly uloženy při Vašem posledním\n"
 "odhlášení."
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompatibilita"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Popis:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Domovská stránka:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informace"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Nastavení odhlášení"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Popis:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Výběr sezení"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Verze:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Vylepšení"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automaticky uložit sezení při odhlášení"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfigurovat"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Náhled vybrané spouštěcí obrazovky."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Spustit při startu služby KDE"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Spustit při startu služby KDE"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Spravovat vzdálené aplikace"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Otevře konfigurační panel vybrané spouštěcí obrazovky."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Náhled vybrané spouštěcí obrazovky."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sezení a spouštění"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Zobrazit výběr při přihlašování"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Hlavní"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Dotazovat se při odhlášení"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Ukončit sezení"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Vyzkoušet"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Načítá se nastavení pracovního prostředí"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Ověřuje se nastavení serverů DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Načítají se data sezení"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Zvolte název sezení"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Odhlášení "
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Restartovat"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Vypnout"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Uložit sezení pro další přihlášení"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Zadejte Vaše heslo:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Došlo k chybě</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Zadané heslo je neplatné nebo správce zakázal možnost vypnutí počítače z tohoto uživatelského účtu."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Zadané heslo je neplatné nebo správce zakázal možnost vypnutí počítače z "
+"tohoto uživatelského účtu."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -354,8 +437,12 @@ msgid "Last accessed: %s"
 msgstr "Poslední přístup: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Vyberte sezení které chcete obnovit. Klikněte dvojitě na název pro obnovení sezení."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Vyberte sezení které chcete obnovit. Klikněte dvojitě na název pro obnovení "
+"sezení."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -375,15 +462,21 @@ msgstr "Nové sezení"
 msgid "Create a new session."
 msgstr "Vytvořit nové sezení."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Spouští se se démon Gnome Keyring"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Spouští se Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Spouštějí se služby KDE"
 
@@ -412,6 +505,31 @@ msgstr "Přesto pokračovat"
 msgid "Try again"
 msgstr "Zkusit znovu"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Zvolte sezení"
@@ -424,88 +542,88 @@ msgstr "Zvolte název sezení"
 msgid "Choose a name for the new session:"
 msgstr "Zvolte název pro nové sezení:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Spouští se ovladač hlasitosti"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Spouští se panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Spouští se správce plochy"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Spouští se panel úloh"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Spouští se správce oken"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Spouští se Emulátor terminálu pro prostředí Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Spouští se Rozšířený textový editor pro KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Spouští se Správce schránky pro KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Spouští se aplikace pro čtení pošty pro KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Spouští se aplikace pro čtení příspěvků v diskuzních skupinách pro KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Spouští se Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Spouští se Emulátor terminálu pro KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Spouští se přehrávač Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Spouští se Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Spouští se editor VIM"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Spouští se správce sezení proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Spouští se IRC klient X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Spouští se přehrávač XMMS"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Spouští se emulátor terminálu xterm"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Spouští se %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -529,17 +647,15 @@ msgstr ""
 " autostart byly úspěšně převedeny do nového umístění.\n"
 "Tento adresář byste nyní měli smazat.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Probíhá automatické spouštění..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Tipy a triky"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Citáty"
 
@@ -547,8 +663,7 @@ msgstr "Citáty"
 msgid "Display tips on _startup"
 msgstr "Zobrazovat tipy při _spuštění"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Tipy a triky"
 
@@ -556,38 +671,102 @@ msgstr "Tipy a triky"
 msgid "Next"
 msgstr "Další"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Nastavení spouštění a sezení"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Nastavení spouštění a sezení"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Nastavení spouštění a sezení Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Nastavení spouštěcí obrazovky Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Automaticky spouštěné aplikace"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Upravit seznam automaticky spouštěných aplikací"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Automaticky spouštěné aplikace Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Ukončit sezení"
-
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Vyberete-li tuto možnost, budete požádáni o volbu sezení při každém "
+#~ "přihlášení do Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Při odhlášení správce sezení automaticky uloží právě spuštěné sezení. "
+#~ "Nevyberete-li tuto volbu, budete při každém odhlášení dotázáni, zda "
+#~ "chcete uložit aktuální sezení."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Tato volba vypíná potvrzovací dialog při odhlášení. Zda bude sezení "
+#~ "uloženo nebo ne, závisí na povoleném nebo zakázaném automatickém ukládání "
+#~ "sezení při odhlášení."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Spustit při startu služby Gnome"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Chcete-li spouštět aplikace Gnome jako součást sezení prostředí Xfce, "
+#~ "povolte tuto volbu. Tato volba umožní správci sezení spustit některé "
+#~ "důležité služby prostředí Gnome. Tuto volbu byste měli zapnout, chcete-li "
+#~ "používat technologie usnadnění Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Chcete-li spouštět aplikace KDE jako součást sezení prostředí Xfce, "
+#~ "povolte tuto volbu. Tato volba sice může znatelně prodloužit celkový čas "
+#~ "spouštění, aplikace KDE však budou startovat rychleji. Některé aplikace "
+#~ "KDE nemusejí bez zapnutí této volby správně pracovat."
+
+#~ msgid "Security"
+#~ msgstr "Bezpečnost"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Povolit správci sezení ovládání aplikací běžících na vzdálených strojích. "
+#~ "Nepovolujte tuto volbu, nejste-li si jisti, k čemu slouží."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sezení a spouštění"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Nastavení spouštěcí obrazovky"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Spouštěcí obrazovka"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Automaticky spouštěné aplikace"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Nastavení spouštěcí obrazovky Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Automaticky spouštěné aplikace"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Upravit seznam automaticky spouštěných aplikací"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Automaticky spouštěné aplikace Xfce 4"
diff --git a/po/da.po b/po/da.po
index 0473da2a..0aea5a9a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-05-19 16:35+0100\n"
 "Last-Translator: Ole Guldberg <olegb@omgwtf.dk>\n"
 "Language-Team: Danish\n"
@@ -26,8 +26,12 @@ msgstr "Vælg temafil der skal installeres"
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Kunne ikke installere opstartskærmbillede tema fra fil %s, check om filen er et rigtigt opstartskærmbillede tema arkiv."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Kunne ikke installere opstartskærmbillede tema fra fil %s, check om filen er "
+"et rigtigt opstartskærmbillede tema arkiv."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -74,278 +78,357 @@ msgstr "Mus"
 msgid "Mice Splash Engine"
 msgstr "Mice opstartskærmbillede motor"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Vælg billede..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigurer simpel..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Skrifttype"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Farver"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Baggrundsfarve:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Tekstfarve:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Billede"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Brug brugerdefineret billede"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simpel"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Simple opstartskærmbillede motor"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sessionvælger"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Vis vælger ved logind"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "Hvis aktiveret, vil sessionsbehandleren spørge hvilken session der skal benyttes hvergang der logges ind i Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Logud indstillinger"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Gem automatisk sessionen ved logud"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "Denne indstilling instruerer sessionshåndteringen om at gemme den aktuelle session automatisk når du logger ud. Hvis du ikke vælger denne indstilling vil du blive spurgt om du vil gemme den aktuelle session ved logud."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Spørg ved logud"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "Denne indstilling deaktiverer logud bekræftigelsesdialogen. On sessionen skal gemmes eller ej kommer an på om du har aktiveret automatisk gemning af sessioner ved logud."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompabilitet"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Start Gnome services ved opstart"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Aktiver denne indstilling hvis du vil bruge Gnome programmer. Dette vil instruere sessionsbehandlingen om at starte vigtige Gnome services for dig. Du skal også aktivere dette hvis du vil bruge hjælpeteknologier der komme med Gnome."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Information"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Start KDE services ved opstart"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Aktiver denne indstilling hvis du vil bruge KDE programmer med dit Xfcemiljø. Dette vil forøge opstartstiden, men KDE programme vil start hurtigere. Nogle KDE programmer vil måske ikke virke hvis du ikke aktivere denne indstilling."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Sikkerhed"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Håndter fjernprogrammer"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Session og opstartsindstillinger"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Tillader sessionshåndteringen at styre programmer der afvikles på fjernsystemer. Aktiver ikke denne indstilling hvis du ikke ved hvad du gør."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessioner og opstart"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Generalt"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Advanceret"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Knapetikette|Sessioner og opstart"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Ingen"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Opstartsskærmbillede indstillinger"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigurer"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Åben konfigurationspanelet for det valgte opstartsskærmsbillede."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Test"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstrere det valgte opstartsskærmbillede"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Information"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Beskrivelse:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Version:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Forfatter:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Hjemmeside:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Knapetikette|Opstartsskærmbillede"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Tilføj program"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Kommando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Vælg kommando:"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Kunne ikke aflænke %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Kunne ikke oprette fil %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Kunne ikke skrive til fil %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Kunne ikke åbne %s for at skrive til"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Autostartede programmer"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Herunder er en liste af programmer der vil blive startet\n"
 "automatisk når du logger ind på dit Xfce skrivebord,\n"
 "dette gælder udover de programmer der blev gemt da du\n"
 "loggede ud sidst."
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Forfatter:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompabilitet"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Beskrivelse:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Hjemmeside:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Information"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Logud indstillinger"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Beskrivelse:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sessionvælger"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Version:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Advanceret"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Gem automatisk sessionen ved logud"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfigurer"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstrere det valgte opstartsskærmbillede"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Start KDE services ved opstart"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Start KDE services ved opstart"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Håndter fjernprogrammer"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Åben konfigurationspanelet for det valgte opstartsskærmsbillede."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstrere det valgte opstartsskærmbillede"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessioner og opstart"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Vis vælger ved logind"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Generalt"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Spørg ved logud"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Ny session"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Henter skrivebordsindstillinger"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Afprøver DNS indstillinger"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Henter sessionsdata"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Vælg sessionsnavn"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Logud"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Genstart"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Nedlukning"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Gem sessioner til fremtidige logind"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Indtast dit kodeord:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>En fejl skete</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Enten er dit kodeord forkert, ellers har systemadministratoren ikke givet tilladelse til at lukke computeren ned med din brugerkonto."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Enten er dit kodeord forkert, ellers har systemadministratoren ikke givet "
+"tilladelse til at lukke computeren ned med din brugerkonto."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -353,8 +436,12 @@ msgid "Last accessed: %s"
 msgstr "Sidst tilgået: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Vælg den session du vil genskabe. Du kan dobbeltklikke sessionsnavnet for at genskabe sessionen."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Vælg den session du vil genskabe. Du kan dobbeltklikke sessionsnavnet for at "
+"genskabe sessionen."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -374,15 +461,21 @@ msgstr "Ny session"
 msgid "Create a new session."
 msgstr "Opret en ny session."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Start Gnome nøgleringsserver"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Starter Gnome hjælpeteknologier."
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Starter KDE services"
 
@@ -411,6 +504,31 @@ msgstr "Forsæt alligevel"
 msgid "Try again"
 msgstr "Prøv igen"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Vælg session"
@@ -423,88 +541,88 @@ msgstr "Vælg sessionsnavn"
 msgid "Choose a name for the new session:"
 msgstr "Vælg et navn til den nye session"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Starter lydvolumenkontrollen"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Starter panelet"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Starter skrivebordshåndteringen"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Starter opgavelinje"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Starter vindueshåndteringen"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Starter Gnome terminalemuleringen"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Starter KDE advanceret tekst editor"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Starter KDE upklipshåndtering"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Starter KDE emaillæser"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Starter KDE nyhedslæser"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Starter konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Starter KDE terminalemuleringen"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Start beep medieafspilleren"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Starter Gimp'en"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Starter Vi improved editoren"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Starter sessionshåndteringsproxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Starter X-chat IRC klienten"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Starter X multimediasystemet"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Starter X terminal emuleringen"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Starter %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -519,25 +637,22 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 "Beliggenheden og formatet af autostartmappen har ændret sig.\n"
-"Den nye beliggenhed er\\n"
-" %s\n"
+"Den nye beliggenhed er\\n %s\n"
 "\n"
 "der kan du placere .desktop filer, der beskriver programer som skal\n"
 "startes når du logger ind på Xfce skrivebordet. Filerne i din gamle\n"
 "autostartmappe er blevet konverteret til den nye beliggenhed.\n"
 "Du burde slette den gamle mappe nu.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Kører autostart..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Tips og tricks"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Forudsigelse"
 
@@ -545,8 +660,7 @@ msgstr "Forudsigelse"
 msgid "Display tips on _startup"
 msgstr "Vis tips ved _opstart"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Tips og tricks"
 
@@ -554,35 +668,104 @@ msgstr "Tips og tricks"
 msgid "Next"
 msgstr "Næste"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Session og opstartsindstillinger"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Sessioner og opstartsindstillinger"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 sessioner og opstartsindstillinger"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 opstartsskærmindstillinger"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Autostartede programmer"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Rediger listen af autostartede programmer"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 autostartede programmer"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Hvis aktiveret, vil sessionsbehandleren spørge hvilken session der skal "
+#~ "benyttes hvergang der logges ind i Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Denne indstilling instruerer sessionshåndteringen om at gemme den "
+#~ "aktuelle session automatisk når du logger ud. Hvis du ikke vælger denne "
+#~ "indstilling vil du blive spurgt om du vil gemme den aktuelle session ved "
+#~ "logud."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Denne indstilling deaktiverer logud bekræftigelsesdialogen. On sessionen "
+#~ "skal gemmes eller ej kommer an på om du har aktiveret automatisk gemning "
+#~ "af sessioner ved logud."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Start Gnome services ved opstart"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Aktiver denne indstilling hvis du vil bruge Gnome programmer. Dette vil "
+#~ "instruere sessionsbehandlingen om at starte vigtige Gnome services for "
+#~ "dig. Du skal også aktivere dette hvis du vil bruge hjælpeteknologier der "
+#~ "komme med Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Aktiver denne indstilling hvis du vil bruge KDE programmer med dit "
+#~ "Xfcemiljø. Dette vil forøge opstartstiden, men KDE programme vil start "
+#~ "hurtigere. Nogle KDE programmer vil måske ikke virke hvis du ikke "
+#~ "aktivere denne indstilling."
+
+#~ msgid "Security"
+#~ msgstr "Sikkerhed"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Tillader sessionshåndteringen at styre programmer der afvikles på "
+#~ "fjernsystemer. Aktiver ikke denne indstilling hvis du ikke ved hvad du "
+#~ "gør."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Knapetikette|Sessioner og opstart"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Opstartsskærmbillede indstillinger"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Knapetikette|Opstartsskærmbillede"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Autostartede programmer"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 opstartsskærmindstillinger"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Autostartede programmer"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Rediger listen af autostartede programmer"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 autostartede programmer"
diff --git a/po/de.po b/po/de.po
index 1dd1fb05..650162be 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-07-20 16:49+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -80,308 +80,351 @@ msgstr "Mäuse"
 msgid "Mice Splash Engine"
 msgstr "Startbildschirm »Mäuse«"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Bild auswählen..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfiguriere einfaches Thema..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Farben"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Hintergrundfarbe:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Textfarbe:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Bild"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Eigenes Bild verwenden"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Einfach"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Einfacher Startbildschirm"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sitzungsübersicht"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Sitzungsauswahl beim Starten anzeigen"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Der Sitzungsmanager wird Sie bei jedem Login eine Sitzung auswählen lassen,"
-"falls Sie diese Option ankreuzen."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Logout-Einstellungen"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Sitzung automatisch beim Beenden speichern"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Wenn Sie diese Option auswählen, werden Ihre Sitzungen automatisch "
-"gespeichert. Ansonsten wird Sie der Manager bei jedem Logout fragen, ob Sie "
-"die Sitzung speichern wollen."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Vor dem Abmelden nachfragen"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Information"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Diese Option schaltet den Logoutdialog ab. Ob die Sitzung gespeichert wird "
-"oder nicht, hängt davon ab, ob Sie das automatische Speichern beim Logout "
-"aktiviert haben oder nicht."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompatibilität"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Laufzeitumgebung für Gnome beim Starten laden"
-
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"Wählen Sie dies aus, wenn Sie Gnome Programme verwenden. Der Sitzungsmanager "
-"wird dann einige wichtige Laufzeitprogramme für Gnome für Sie starten."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Laufzeitumgebung für KDE beim Starten laden"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Wählen Sie dies aus, wenn Sie KDE-Programme verwenden. Der Sitzungsmanager "
-"wird dann einige wichtige KDE-Laufzeitprogramme für Sie starten. Dadurch "
-"wird der Start des Systems um einiges verlangsamt. Allerdings starten dann "
-"alle auf KDE basierenden Programme schneller."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Sicherheit"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Anwendungen auf entfernten Rechnern verwalten"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Sitzungs- und Starteinstellungen"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Erlaubt dem Sitzungsmanager, Programme auf entfernten Rechnern zu verwalten. "
-"Aktivieren Sie diese Option nur, wenn Sie wissen, was Sie tun."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sitzungs- und Starteinstellungen"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Allgemeine Einstellungen"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sitzungs- und Starteinstellungen"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Keiner"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Einstellungen für den Startbildschirm"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigurieren"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Öffnet das Konfigurationsfenster für den ausgewählten Startbildschirm."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Testen"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Zeigt eine Vorschau des ausgewählten Startbildschirms."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Information"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Beschreibung:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Version:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Webseite:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Startbildschirm"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Anwendung hinzufügen"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Name:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Befehl:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Wählen Sie einen Befehl aus"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Konnte »%s« nicht löschen: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Konnte Datei »%s« nicht erstellen"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Konnte Datei »%s« nicht schreiben"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Konnte »%s« nicht zum Lesen öffnen"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Automatisch gestartete Anwendungen"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Unten ist eine Liste der Anwendungen, die automatisch\n"
 "gestartet werden, wenn Sie sich an Ihrer Xfce-Arbeitsumgebung\n"
 "anmelden, zusätzlich zu den beim Abmelden gespeicherten\n"
 "Anwendungen:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompatibilität"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Beschreibung:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Webseite:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Information"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Logout-Einstellungen"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Beschreibung:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sitzungsübersicht"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Version:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Fortgeschritten"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Sitzung automatisch beim Beenden speichern"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfigurieren"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Zeigt eine Vorschau des ausgewählten Startbildschirms."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Laufzeitumgebung für KDE beim Starten laden"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Laufzeitumgebung für KDE beim Starten laden"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Anwendungen auf entfernten Rechnern verwalten"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Öffnet das Konfigurationsfenster für den ausgewählten Startbildschirm."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Zeigt eine Vorschau des ausgewählten Startbildschirms."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sitzungs- und Starteinstellungen"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Sitzungsauswahl beim Starten anzeigen"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Allgemeine Einstellungen"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Vor dem Abmelden nachfragen"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Sitzung beenden"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Testen"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Lade Arbeitsoberflächeneinstellungen"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS-Einstellungen werden geprüft"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Lade Sitzungsdaten"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Sitzungsname wählen"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Abmelden"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Neu starten"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Herunterfahren"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Speichere Sitzung für weitere Logins"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Bitte geben Sie Ihr Passwort ein:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Es ist ein Fehler aufgetreten</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +464,21 @@ msgstr "Neue Sitzung"
 msgid "Create a new session."
 msgstr "Eine neue Sitzung erstellen."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Gnome Keyring Daemon wird gestartet"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Starte Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Laufzeitumgebung für KDE wird gestartet"
 
@@ -458,6 +507,31 @@ msgstr "Trotzdem fortfahren"
 msgid "Try again"
 msgstr "Nochmal versuchen"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Sitzung wählen"
@@ -470,88 +544,88 @@ msgstr "Sitzungsname wählen"
 msgid "Choose a name for the new session:"
 msgstr "Wählen Sie einen Namen für die neue Sitzung:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Lautstärkeregler wird gestartet"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Starte den Sitzungsmanager"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Starte die Arbeitsoberfläche"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Starte die Taskbar"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Starte den Fenstermanager"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Starte den Gnome Terminal-Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Starte den KDE Advanced Text Editor"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Starte den KDE Clipboard-Manager"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Starte das KDE Mail-Programm"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Starte den KDE News Reader"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Starte den Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Starte den KDE Terminal-Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Starte den Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Starte Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Starte den VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Starte den Session Management Proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Start den X-Chat IRC Client"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Starte das X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Starte den X Terminal-Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Starte %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -575,7 +649,7 @@ msgstr ""
 "Dateien im alten Autostart-Verzeichnis wurden erfolgreich zum neuen Ort\n"
 "übertragen. Sie sollten dieses Verzeichnis jetzt löschen.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Führe Autostart aus..."
 
@@ -599,37 +673,101 @@ msgstr "Tipps beim Starten anzeigen"
 msgid "Next"
 msgstr "Nächster"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Sitzungs- und Starteinstellungen"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Sitzungen und Starteinstellungen"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce4-Sitzungs- und Starteinstellungen"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce4-Startbildschirm"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Automatisch gestartete Anwendungen"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Ändern Sie die Liste der automatisch gestarteten Anwendungen"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Von Xfce 4 automatisch gestartete Anwendungen"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "Xfce4-Tipps"
 
-#~ msgid "End Session"
-#~ msgstr "Sitzung beenden"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Der Sitzungsmanager wird Sie bei jedem Login eine Sitzung auswählen "
+#~ "lassen,falls Sie diese Option ankreuzen."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Wenn Sie diese Option auswählen, werden Ihre Sitzungen automatisch "
+#~ "gespeichert. Ansonsten wird Sie der Manager bei jedem Logout fragen, ob "
+#~ "Sie die Sitzung speichern wollen."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Diese Option schaltet den Logoutdialog ab. Ob die Sitzung gespeichert "
+#~ "wird oder nicht, hängt davon ab, ob Sie das automatische Speichern beim "
+#~ "Logout aktiviert haben oder nicht."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Laufzeitumgebung für Gnome beim Starten laden"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Wählen Sie dies aus, wenn Sie Gnome Programme verwenden. Der "
+#~ "Sitzungsmanager wird dann einige wichtige Laufzeitprogramme für Gnome für "
+#~ "Sie starten."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Wählen Sie dies aus, wenn Sie KDE-Programme verwenden. Der "
+#~ "Sitzungsmanager wird dann einige wichtige KDE-Laufzeitprogramme für Sie "
+#~ "starten. Dadurch wird der Start des Systems um einiges verlangsamt. "
+#~ "Allerdings starten dann alle auf KDE basierenden Programme schneller."
+
+#~ msgid "Security"
+#~ msgstr "Sicherheit"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Erlaubt dem Sitzungsmanager, Programme auf entfernten Rechnern zu "
+#~ "verwalten. Aktivieren Sie diese Option nur, wenn Sie wissen, was Sie tun."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sitzungs- und Starteinstellungen"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Einstellungen für den Startbildschirm"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Startbildschirm"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Automatisch gestartete Anwendungen"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce4-Startbildschirm"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Automatisch gestartete Anwendungen"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Ändern Sie die Liste der automatisch gestarteten Anwendungen"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Von Xfce 4 automatisch gestartete Anwendungen"
diff --git a/po/dz.po b/po/dz.po
index 846c04db..a92f62be 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-10-24 20:36+0530\n"
 "Last-Translator: sonam rinchen <somindruk@druknet.bt>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -81,265 +81,150 @@ msgstr "མའུསི་ཚུ།"
 msgid "Mice Splash Engine"
 msgstr "མའུསི་སིཔེལེཤ་མ་འཕྲུལ།"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "གཟུགས་བརྙན་གདམས་་་་་"
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "རིམ་སྒྲིག་འཇམ་སམ་་་་"
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "ཡིག་གཟུགས།"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "ཚོས་གཞི་ཚུ།"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "རྒྱབ་གཞིའི་ཚོས་གཞི་:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "ཚིག་ཡིག་ཚོས་གཞི་:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "གཟུགས་བརྙན།"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "སྲོལ་སྒྲིག་གཟུགས་བརྙན་ལག་ལེན་འཐབ།"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "འཇམ་སམ།"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "འཇམ་སམ་སིཔེལེཤ་མ་འཕྲུལ།"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "ལཱ་ཡུན་འདེམས་བྱེད།"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "ནང་བསྐྱོད་གུ་འདེམས་བྱེད་བཀྲམ་སྟོན་འབད།"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"གཞི་སྒྲིག་འབད་བ་ཅིན་ ལཱ་ཡུན་འཛིན་སྐྱོང་པ་གིས་ ཁྱོད་ཨ་རྟག་རང་ཨེགསི་ཨེཕི་སི་ཨི་ལུ་ནང་བསྐྱོད་འབད་བའི་སྐབས་ "
-"ལཱ་ཡུན་གདམ་ཁ་བརྐྱབ་ཟེར་འདྲི་འོང་།"
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "ཕྱིར་བསྐྱོད་སྒྲིག་སྟངས་ཚུ།"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "ཕྱིར་བསྐྱོད་ཀྱི་སྐབས་ ལཱ་ཡུན་འདི་རང་བཞིན་གྱིས་སྲུང་འོང་།"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"གདམ་ཁ་འདི་གིས་ ཁྱོད་ཕྱིར་བསྐྱོད་འབདཝ་ད་ ད་ལྟོའི་ལཱ་ཡུན་འདི་རང་བཞིན་གྱིས་སྲུང་ནིའི་དོན་ལུ་ ལཱ་ཡུན་འཛིན་"
-"སྐྱོང་པ་ལུ་བསླབ་སྟོན་འབདཝ་ཨིན། ཁྱོད་ཀྱིས་གདམ་ཁ་འདི་སེལ་འཐུ་མ་འབད་བ་ཅིན་ ཕྱིར་བསྐྱོད་རེ་ལུ་ད་ལྟོའི་ལཱ་ཡུན་"
-"སྲུང་བཞག་འབད་ནི་ཨིན་ན་ ཁྱོད་ལུ་ནུས་པ་སྤེལ་འོང་།"
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "ཕྱིར་བསྐྱོད་གུ་ནུས་པ་སྤེལ་འོང་།"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "བརྡ་དོན།"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"གདམ་ཁ་འདི་གིས་ཕྱིར་བསྐྱོད་ངེས་དཔྱད་ཌའི་ལོག་ལྕོགས་ཅན་བཟོཝ་ཨིན། ལཱ་ཡུན་འདི་སྲུང་ཡོདཔ་ཨིན་ན་མེན་ན་ ཁྱོད་"
-"ཀྱིས་ཕྱིར་བསྐྱོད་གུ་ ལཱ་ཡུན་གྱི་རང་བཞིན་སྲུང་བཞག་ལྕོགས་ཅན་བཟོ་ཡོདཔ་ཨིན་ན་མེན་ན་ལུ་རག་ལསཔ་ཨིན།"
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "མཐུན་འགྱུར།"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "འགོ་བཙུགས་ཀྱི་ཚེ་ ཇི་ནོམ་ཞབས་ཏོག་གསར་བཙུགས་འབད།"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"ཁྱོད་ཀྱིས་ཇི་ནོམ་གློག་རིམ་ཚུ་ལག་ལེན་འཐབ་ནིའི་འཆར་གཞི་སྒྲིག་པ་ཅིན་ འདི་ལྕོགས་ཅན་བཟོ། འདི་གིས་ ཁྱོད་ཀྱི་དོན་"
-"ལུ་ཁག་ཆེ་བའི་ཇི་ནོམ་ཞབས་ཏོག་ལ་ལོ་ཅིག་འགོ་བཙུགས་ནི་ལུ་ལཱ་ཡུན་འཛིན་སྐྱོང་པ་ལུ་བསླབ་སྟོན་འབད་འོང་། དེ་"
-"གིས་མ་ཚད་པར་ཁྱོད་ཀྱིས་ ཇི་ནོམ་དང་སྐྱེལ་འདྲེན་འབད་མི་ཕན་ཐབས་ཅན་གྱི་འཕྲུལ་རིག་ཚུ་ལག་ལེན་འཐབ་ནི་ཨིན་པ་"
-"ཅིན་ འདི་ཡང་ལྕོོགས་ཅན་བཟོ་དགོ"
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "འགོ་བཙུགས་ཀྱི་ཚེ་ཀེ་ཌི་ཨི་ཞབས་ཏོག་ཚུ་གསར་བཙུགས་འབད།"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"ཁྱོད་ཀྱིས་ ཀེ་ཌི་ཨི་གློག་རིམ་ཚུ་ཁྱོད་རའི་ཨེགསི་ཨེཕི་སི་ཨི་ཌེཀསི་ཊོཔ་ལཱ་ཡུན་གྱི་ཡན་ལག་སྦེ་གཡོག་བཀོལ་ནིའི་འཆར་"
-"གཞི་ཡོད་པ་ཅིན་ གདམ་ཁ་འདི་ལྕོགས་ཅན་བཟོ། འདི་གིས་འགོ་བཙུགས་དུས་ཚོད་འདི་ཡར་འཕར་འོང་ དེ་འབདཝ་ད་"
-"གཅིག་ལས་འབད་བ་ཅིན་ ཀེ་ཌི་ཨི་གློག་རིམ་ཚུ་གིས་མགྱོགས་དྲགས་སྦེ་འགོ་བཙུགས་འོང་། ཀེ་ཌི་ཨི་གློག་རིམ་ལ་ལོ་ཅིག་"
-"གིས་ གདམ་ཁ་འདི་ལྕོགས་ཅན་མ་བཟོ་བ་ཅིན་ལཱ་མི་འབད།"
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "སྲུང་སྐྱོབ།"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "ཐག་རིང་གློག་རིམ་ཚུ་འཛིན་སྐྱོང་འཐབ།"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "ལཱ་ཡུན་དང་འགོ་བཙུགས་སྒྲིག་སྟངས་ཚུ།"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"ཐག་རིང་ཧོསཊི་གུ་གཡོག་བཀོལ་བའི་བསྒང་གི་གློག་རིམ་ཚུ་ལཱ་ཡུན་འཛིན་སྐྱོང་པ་ལུ་འཛིན་སྐྱོང་འཐབ་བཅུག ཁྱོད་ར་གིས་"
-"ཁྱོད་ར་ག་ཅི་འབད་དོ་ག་མ་ཤེས་ཚུན་ གདམ་ཁ་འདི་ལྕོགས་ཅན་བཟོ་ནི་མི་འོང་།"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "ལཱ་ཡུན་དང་འགོ་བཙུགས།"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "ཡོངས་ཁྱབ།"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "མཐོ་རིམ།"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "ཨེབ་རྟ་ཁ་ཡིག་༡| ལཱ་ཡུན་དང་འགོ་བཙུགས།"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "ཅི་མེད།"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "གསལ་གཞི་སྒྲིག་སྟངས་ཚུ་སིཔེལེཤ་འབད།"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "རིམ་སྒྲིག"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་སི་པེལེཤ་གསལ་གཞིའི་དོན་ལུ་ རིམ་སྒྲིག་པེ་ནཱལ་ཁ་ཕྱེཝ་ཨིན།"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "བརྟག་ཞིབ།"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་སི་པེལེཤ་གསལ་གཞི་འགྲེམས་སྟོན་འབདཝ་ཨིན།"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "བརྡ་དོན།"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>འགྲེལ་བཤད་:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>ཐོན་རིམ་:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>རྩོམ་པ་པོ་:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>ཁྱིམ་ཤོག་ལེབ་:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "ཨེབ་རྟ་ཁ་ཡིག་༡|སི་པེལེཤ་གསལ་གཞི།"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "གློག་རིམ་ཁ་སྐོང་རྐྱབས།"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "མིང་:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "འགྲེལ་བཤད་:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "བརྡ་བཀོད་:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "བརྡ་བཀོད་སེལ་འཐུ་འབད།"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr " %sའབྲེལ་མཐུད་འབད་བཤོལ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ་:%s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "ཡིག་སྣོད་%sགསར་བསྐྲུན་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "ཡིག་སྣོད་%sབྲིས་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "འབྲི་ནིའི་དོན་ལུ་%sཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "རང་བཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུ།"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "དེ་གི་ཧེ་མ་ཁྱོད་ཀྱིས་ཕྱིར་བསྐྱོད་འབད་ཡོད་པའི་བསྒང་\n"
 "སྲུང་ཡོད་པའི་གློག་རིམ་ལུ་ཁ་སྐོང་བརྐྱབ་ནི་ལུ་\n"
@@ -347,45 +232,202 @@ msgstr ""
 "ནི་\n"
 "ཨིན་པའི་གློག་རིམ་ཐོ་ཡིག་ཚུ་ཨིན་:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>རྩོམ་པ་པོ་:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "མཐུན་འགྱུར།"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>འགྲེལ་བཤད་:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>ཁྱིམ་ཤོག་ལེབ་:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "བརྡ་དོན།"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "ཕྱིར་བསྐྱོད་སྒྲིག་སྟངས་ཚུ།"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>འགྲེལ་བཤད་:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "ལཱ་ཡུན་འདེམས་བྱེད།"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>ཐོན་རིམ་:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "མཐོ་རིམ།"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "ཕྱིར་བསྐྱོད་ཀྱི་སྐབས་ ལཱ་ཡུན་འདི་རང་བཞིན་གྱིས་སྲུང་འོང་།"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "རིམ་སྒྲིག"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་སི་པེལེཤ་གསལ་གཞི་འགྲེམས་སྟོན་འབདཝ་ཨིན།"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "འགོ་བཙུགས་ཀྱི་ཚེ་ཀེ་ཌི་ཨི་ཞབས་ཏོག་ཚུ་གསར་བཙུགས་འབད།"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "འགོ་བཙུགས་ཀྱི་ཚེ་ཀེ་ཌི་ཨི་ཞབས་ཏོག་ཚུ་གསར་བཙུགས་འབད།"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "ཐག་རིང་གློག་རིམ་ཚུ་འཛིན་སྐྱོང་འཐབ།"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་སི་པེལེཤ་གསལ་གཞིའི་དོན་ལུ་ རིམ་སྒྲིག་པེ་ནཱལ་ཁ་ཕྱེཝ་ཨིན།"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "སེལ་འཐུ་འབད་ཡོད་པའི་སི་པེལེཤ་གསལ་གཞི་འགྲེམས་སྟོན་འབདཝ་ཨིན།"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "ལཱ་ཡུན་དང་འགོ་བཙུགས།"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "ནང་བསྐྱོད་གུ་འདེམས་བྱེད་བཀྲམ་སྟོན་འབད།"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "ཡོངས་ཁྱབ།"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "ཕྱིར་བསྐྱོད་གུ་ནུས་པ་སྤེལ་འོང་།"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "ལཱ་ཡུན་མཇུག་བསྡུ།"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "བརྟག་ཞིབ།"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "ཌེཀསི་ཊོཔ་སྒྲིག་སྟངས་ཚུ་མངོན་གསལ་འབད་དོ།"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "ཌི་ཨེན་ཨེསི་སྒྲིག་སྟངས་ཚུ་བདེན་སྦྱོར་འབད་དོ།"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "ལཱ་ཡུན་གནད་སྡུད་མངོན་གསལ་འབད་དོ།"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "ལཱ་ཡུན་མིང་གདམས།"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "ཕྱིར་བསྐྱོད།"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "ལོག་འགོ་བཙུགས།"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "སྒོ་བསྡམ།"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "མ་འོངས་ནང་བསྐྱོད་ཀྱི་དོན་ལུ་ ལཱ་ཡུན་སྲུངས།(_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "ཁྱོད་རའི་ཆོག་ཡིག་བཙུགས་གནང་:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>འཛོལ་བ་བྱུང་ཡི་</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -424,15 +466,21 @@ msgstr "ལཱ་ཡུན་གསརཔ།"
 msgid "Create a new session."
 msgstr "ལཱ་ཡུན་གསརཔ་ཅིག་གསར་བསྐྲུན་འབད།"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "ཇི་ནོམ་ལྡེ་འཁོར་ཌེ་མཱོན་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "ཇི་ནོམ་ཕན་ཐབས་ཅན་གྱི་འཕྲུལ་རིག་ཚུ།"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "ཀེ་ཌི་ཨི་ཞབས་ཏོག་ཚུ་འགོ་བཙུགས་དོ།"
 
@@ -461,6 +509,31 @@ msgstr "ག་དེ་འབད་རུང་འཕྲོ་མཐུད།"
 msgid "Try again"
 msgstr "ལོག་འབད་རྩོལ་བསྐྱེད།"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "ལཱ་ཡུན་གདམས།"
@@ -473,88 +546,88 @@ msgstr "ལཱ་ཡུན་མིང་གདམས།"
 msgid "Choose a name for the new session:"
 msgstr "ལཱ་ཡུན་གསརཔ་གི་དོན་ལས་མིང་གཅིག་གདམས་:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "སྐད་ཤུགས་ཚད་འཛིན་པ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "པེ་ནཱལ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "ཌེཀསི་ཊོཔ་འཛིན་སྐྱོང་པ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "ལས་ཀ་ཕྲ་རིང་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "སྒོ་སྒྲིག་འཛིན་སྐྱོང་པ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "ཇི་ནོམ་ཊར་མི་ནཱལ་ནུས་འཕྲུལ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "ཀེ་ཌི་ཨི་མཐོ་རིམ་ཚིག་ཡིག་ཞུན་དགཔ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "ཀེ་ཌི་ཨི་འཛིན་པང་འཛིན་སྐྱོང་པ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "ཀེ་ཌི་ཨི་ཡིག་འཕྲིན་ལྷག་བྱེད་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "ཀེ་ཌི་ཨི་གནས་ཚུལ་ལྷག་བྱེད་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "ཀོང་ཀུས་རར་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "ཀེ་ཌི་ཨི་ཊར་མི་ནཱལ་ནུས་འཕྲུལ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "བརྡ་སྐད་བརྡ་ལམ་རྩེད་མི་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "ཇིམཔ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "ཝི་ཨའི་ ལེགས་བཟོས་ཞུན་དགཔ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "ལཱ་ཡུན་འཛིན་སྐྱོང་པོརོག་སི་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "ཨེགསི་ཅེཊི་ ཨའི་ཨར་སི་ཞབས་ཏོག་སྤྱོད་མི་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "ཨེགསི་ སྣ་མང་བརྡ་ལམ་རིམ་ལུགས་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "ཨེགསི་ ཊར་མི་ནཱལ་ནུས་འཕྲུལ་འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s འགོ་བཙུགས་དོ།"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -579,7 +652,7 @@ msgstr ""
 "གནས་ཁོངས་གསརཔ་ལུ་མཐར་འཁྱོལ་སྦེ་གཞི་སྤོ་ནུག\n"
 "ཁྱོད་ཀྱིས་སྣོད་ཐོ་འདི་ད་ལྟོ་ར་ཆ་མེད་གཏང་དགོ\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "རང་ཞིན་འགོ་བཙུགས་ཀྱི་ལས་འགན་གྲུབ་དོ་..."
 
@@ -603,40 +676,104 @@ msgstr "སླབ་བྱ་དང་འཁྲུལ་ཐབས།"
 msgid "Next"
 msgstr "ཤུལ་མམ།"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "ལཱ་ཡུན་དང་འགོ་བཙུགས་སྒྲིག་སྟངས་ཚུ།"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "ལཱ་ཡུན་ཚུ་དང་འགོ་བཙུགས་སྒྲིག་སྟངས་ཚུ།"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "ཨེགསི་ཨེཕ་སི་ཨི་ ༤ལཱ་ཡུན་དང་འགོ་བཙུགས་སྒྲིག་སྟངས་ཚུ།"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "ཨེགསི་ཨེཕ་སི་ཨི་ ༤སི་པེལེཤ་གསལ་གཞི་སྒྲིག་སྟངས་ཚུ།"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr "ཨེགསི་ཨེཕ་སི་ཨི་༤-སླབ་བྱ།"
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "གཞི་སྒྲིག་འབད་བ་ཅིན་ ལཱ་ཡུན་འཛིན་སྐྱོང་པ་གིས་ ཁྱོད་ཨ་རྟག་རང་ཨེགསི་ཨེཕི་སི་ཨི་ལུ་ནང་བསྐྱོད་འབད་བའི་"
+#~ "སྐབས་ ལཱ་ཡུན་གདམ་ཁ་བརྐྱབ་ཟེར་འདྲི་འོང་།"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "རང་ཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུ།"
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "གདམ་ཁ་འདི་གིས་ ཁྱོད་ཕྱིར་བསྐྱོད་འབདཝ་ད་ ད་ལྟོའི་ལཱ་ཡུན་འདི་རང་བཞིན་གྱིས་སྲུང་ནིའི་དོན་ལུ་ ལཱ་ཡུན་"
+#~ "འཛིན་སྐྱོང་པ་ལུ་བསླབ་སྟོན་འབདཝ་ཨིན། ཁྱོད་ཀྱིས་གདམ་ཁ་འདི་སེལ་འཐུ་མ་འབད་བ་ཅིན་ ཕྱིར་བསྐྱོད་རེ་ལུ་ད་"
+#~ "ལྟོའི་ལཱ་ཡུན་སྲུང་བཞག་འབད་ནི་ཨིན་ན་ ཁྱོད་ལུ་ནུས་པ་སྤེལ་འོང་།"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "རང་ཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུའི་ཐོ་ཡིག་ཞུན་དག་འབད།"
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "གདམ་ཁ་འདི་གིས་ཕྱིར་བསྐྱོད་ངེས་དཔྱད་ཌའི་ལོག་ལྕོགས་ཅན་བཟོཝ་ཨིན། ལཱ་ཡུན་འདི་སྲུང་ཡོདཔ་ཨིན་ན་མེན་ན་ "
+#~ "ཁྱོད་ཀྱིས་ཕྱིར་བསྐྱོད་གུ་ ལཱ་ཡུན་གྱི་རང་བཞིན་སྲུང་བཞག་ལྕོགས་ཅན་བཟོ་ཡོདཔ་ཨིན་ན་མེན་ན་ལུ་རག་ལསཔ་ཨིན།"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "ཨེགསི་ཨེཕ་སི་ཨི་ ༤རང་ཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུ།"
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "འགོ་བཙུགས་ཀྱི་ཚེ་ ཇི་ནོམ་ཞབས་ཏོག་གསར་བཙུགས་འབད།"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr "ཨེགསི་ཨེཕ་སི་ཨི་༤-སླབ་བྱ།"
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "ཁྱོད་ཀྱིས་ཇི་ནོམ་གློག་རིམ་ཚུ་ལག་ལེན་འཐབ་ནིའི་འཆར་གཞི་སྒྲིག་པ་ཅིན་ འདི་ལྕོགས་ཅན་བཟོ། འདི་གིས་ ཁྱོད་ཀྱི་"
+#~ "དོན་ལུ་ཁག་ཆེ་བའི་ཇི་ནོམ་ཞབས་ཏོག་ལ་ལོ་ཅིག་འགོ་བཙུགས་ནི་ལུ་ལཱ་ཡུན་འཛིན་སྐྱོང་པ་ལུ་བསླབ་སྟོན་འབད་འོང་"
+#~ "། དེ་གིས་མ་ཚད་པར་ཁྱོད་ཀྱིས་ ཇི་ནོམ་དང་སྐྱེལ་འདྲེན་འབད་མི་ཕན་ཐབས་ཅན་གྱི་འཕྲུལ་རིག་ཚུ་ལག་ལེན་འཐབ་"
+#~ "ནི་ཨིན་པ་ཅིན་ འདི་ཡང་ལྕོོགས་ཅན་བཟོ་དགོ"
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "ཁྱོད་ཀྱིས་ ཀེ་ཌི་ཨི་གློག་རིམ་ཚུ་ཁྱོད་རའི་ཨེགསི་ཨེཕི་སི་ཨི་ཌེཀསི་ཊོཔ་ལཱ་ཡུན་གྱི་ཡན་ལག་སྦེ་གཡོག་བཀོལ་ནིའི་"
+#~ "འཆར་གཞི་ཡོད་པ་ཅིན་ གདམ་ཁ་འདི་ལྕོགས་ཅན་བཟོ། འདི་གིས་འགོ་བཙུགས་དུས་ཚོད་འདི་ཡར་འཕར་འོང་ དེ་"
+#~ "འབདཝ་ད་གཅིག་ལས་འབད་བ་ཅིན་ ཀེ་ཌི་ཨི་གློག་རིམ་ཚུ་གིས་མགྱོགས་དྲགས་སྦེ་འགོ་བཙུགས་འོང་། ཀེ་ཌི་ཨི་གློག་"
+#~ "རིམ་ལ་ལོ་ཅིག་གིས་ གདམ་ཁ་འདི་ལྕོགས་ཅན་མ་བཟོ་བ་ཅིན་ལཱ་མི་འབད།"
+
+#~ msgid "Security"
+#~ msgstr "སྲུང་སྐྱོབ།"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "ཐག་རིང་ཧོསཊི་གུ་གཡོག་བཀོལ་བའི་བསྒང་གི་གློག་རིམ་ཚུ་ལཱ་ཡུན་འཛིན་སྐྱོང་པ་ལུ་འཛིན་སྐྱོང་འཐབ་བཅུག ཁྱོད་ར་"
+#~ "གིས་ཁྱོད་ར་ག་ཅི་འབད་དོ་ག་མ་ཤེས་ཚུན་ གདམ་ཁ་འདི་ལྕོགས་ཅན་བཟོ་ནི་མི་འོང་།"
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "ཨེབ་རྟ་ཁ་ཡིག་༡| ལཱ་ཡུན་དང་འགོ་བཙུགས།"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "གསལ་གཞི་སྒྲིག་སྟངས་ཚུ་སིཔེལེཤ་འབད།"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "ཨེབ་རྟ་ཁ་ཡིག་༡|སི་པེལེཤ་གསལ་གཞི།"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "རང་བཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུ།"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "ཨེགསི་ཨེཕ་སི་ཨི་ ༤སི་པེལེཤ་གསལ་གཞི་སྒྲིག་སྟངས་ཚུ།"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "རང་ཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུ།"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "རང་ཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུའི་ཐོ་ཡིག་ཞུན་དག་འབད།"
 
-#~ msgid "End Session"
-#~ msgstr "ལཱ་ཡུན་མཇུག་བསྡུ།"
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "ཨེགསི་ཨེཕ་སི་ཨི་ ༤རང་ཞིན་གྱིས་འགོ་བཙུགས་ཡོད་པའི་གློག་རིམ་ཚུ།"
 
 #~ msgid "Show hibernate button"
 #~ msgstr "ཧའི་བར་ནེཊི་ཨེབ་རྟ་སྟོན།"
diff --git a/po/el.po b/po/el.po
index 458071a3..f7d74779 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-02-06 15:24+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -79,314 +79,352 @@ msgstr "Ποντίκια"
 msgid "Mice Splash Engine"
 msgstr "Οθόνη εκκίνησης με ποντίκια"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Επιλογή εικόνας..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Ρύθμιση απλού..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Γραμματοσειρά"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Χρώμα παρασκηνίου:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Χρώμα κειμένου:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Εικόνα"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Προσαρμοσμένη εικόνα"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Απλό"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Απλή οθόνη εκκίνησης"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Επιλογέας συνεδρίας"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Εμφάνιση επιλογέα κατά την είσοδο"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Εάν επιλεχθεί, ο διαχειριστής συνεδρίας θα σας δίνει να επιλέξετε μια "
-"συνεδρία κάθε φορά που θα συνδέεστε στο Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Ρυθμίσεις αποσύνδεσης"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Αυτόματη αποθήκευση της συνεδρίας κατά την έξοδο"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Η επιλογή αυτή ορίζει στον διαχειριστή συνεδρίας να αποθηκεύει την τρέχουσα "
-"συνεδρία αυτόματα κατά την έξοδο. Εάν δεν την ενεργοποιήσετε θα σας γίνεται "
-"ερώτηση εάν θέλετε να αποθηκεύσετε την τρέχουσα συνεδρία σε κάθε σας έξοδο."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Ερώτηση για αποσύνδεση"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Πληροφορίες"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Αυτή η επιλογή απενεργοποιεί τον διάλογο επιβεβαίωσης της αποσύνδεσης. Η "
-"αποθήκευση ή μη της τρέχουσας συνεδρίας θα εξαρτάται από το κατά πόσον έχετε "
-"ενεργοποιήσει την αυτόματη αποθήκευση της συνεδρίας ή όχι."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Συμβατότητα"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Έναρξη των υπηρεσιών του Gnome κατά την εκκίνηση"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Επιλέξτε το εάν σκοπεύετε να χρησιμοποιήσετε εφαρμογές του Gnome. Έτσι ο "
-"διαχειριστής συνεδριών θα ξεκινάει ορισμένες ζωτικές υπηρεσίες του Gnome για "
-"εσάς. Θα πρέπει επίσης να το ενεργοποιήσετε εάν θέλετε να χρησιμοποιήσετε "
-"τις Βοηθητικές Τεχνολογίες που έρχονται μαζί με το Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Έναρξη των υπηρεσιών του KDE κατά την εκκίνηση"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Επιλέξτε το εάν σκοπεύετε να χρησιμοποιήσετε εφαρμογές του KDE με το "
-"Περιβάλλον Xfce. Η επιλογή αυτή θα αυξήσει τον χρόνο εκκίνησης, αλλά από την "
-"άλλη, οι εφαρμογές του KDE θα ξεκινούν γρηγορότερα. Μερικές εφαρμογές του "
-"KDE δεν θα λειτουργήσουν εάν δεν ενεργοποιήσετε αυτή την επιλογή."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Ασφάλεια"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Διαχείριση απομακρυσμένων εφαρμογών"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Συνεδρίες και Εκκίνηση"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Επιτρέπει στον διαχειριστή συνεδρίας να διαχειρίζεται εφαρμογές που "
-"εκτελούνται σε απομακρυσμένους υπολογιστές. Μην ενεργοποιήσετε αυτή την "
-"επιλογή εκτός εάν ξέρετε τι κάνετε."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Συνεδρίες και Εκκίνηση"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Γενικά"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Για προχωρημένους"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
 msgstr ""
-"Συνεδρίες και\n"
-"εκκίνηση"
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Κανένα"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Οθόνη εκκίνησης"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Ρύθμιση"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Ανοίγει το ταμπλό ρυθμίσεων για την επιλεγμένη οθόνη υποδοχής."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Επιδεικνύει την επιλεγμένη οθόνη εισόδου."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Πληροφορίες"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Περιγραφή:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b> Έκδοση:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Δημιουργός:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Αρχική σελίδα:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Οθόνη εκκίνησης"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Προσθήκη εφαρμογής"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Περιγραφή:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Εντολή:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Επιλογή εντολής"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Αδύνατη η απομάκρυνση του αρχείου %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Αδύνατη η δημιουργία του αρχείου %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Αδύνατη η εγγραφή του αρχείου %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Αδυναμία ανοίγματος του '%s' για εγγραφή"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Εφαρμογές αυτόματης εκκίνησης"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Βλέπετε τη λίστα των εφαρμογών που θα ξεκινήσουν\n"
 "αυτόματα όταν συνδεθείτε στο Xfce. Στην λίστα\n"
 "περιλαμβάνονται και οι εφαρμογές που αποθηκεύτηκαν\n"
 "την τελευταία φορά που αποσυνδεθήκατε:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Δημιουργός:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Συμβατότητα"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Περιγραφή:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Αρχική σελίδα:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Πληροφορίες"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Ρυθμίσεις αποσύνδεσης"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Περιγραφή:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Επιλογέας συνεδρίας"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b> Έκδοση:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Για προχωρημένους"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Αυτόματη αποθήκευση της συνεδρίας κατά την έξοδο"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Ρύθμιση"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Επιδεικνύει την επιλεγμένη οθόνη εισόδου."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Έναρξη των υπηρεσιών του KDE κατά την εκκίνηση"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Έναρξη των υπηρεσιών του KDE κατά την εκκίνηση"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Διαχείριση απομακρυσμένων εφαρμογών"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Ανοίγει το ταμπλό ρυθμίσεων για την επιλεγμένη οθόνη υποδοχής."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Επιδεικνύει την επιλεγμένη οθόνη εισόδου."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Συνεδρίες και Εκκίνηση"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Εμφάνιση επιλογέα κατά την είσοδο"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Γενικά"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Ερώτηση για αποσύνδεση"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Τέλος συνεδρίας"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Δοκιμή"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Φορτώνονται οι ρυθμίσεις της επιφάνειας εργασίας"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Επαλήθευση ρυθμίσεων DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Φόρτωση δεδομένων συνεδρίας"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Επιλέξτε όνομα για τη συνεδρία"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Αποσύνδεση"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Επανεκκίνηση"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Τερματισμός"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "Αποθήκευ_ση της συνεδρίας"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Παρακαλώ εισάγετε τον κωδικό σας:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Προέκυψε σφάλμα</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -425,15 +463,21 @@ msgstr "Nέα συνεδρία"
 msgid "Create a new session."
 msgstr "Δημιουργία νέας συνεδρίας"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Εκκινείται ο δαίμονας GNOME Keyring."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Ξεκινούν οι Τεχνολογίες υποβοήθησης του GNOME "
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Εκκίνηση των υπηρεσιών του KDE"
 
@@ -462,6 +506,31 @@ msgstr "Συνέχεια έτσι κι αλλιώς"
 msgid "Try again"
 msgstr "Προσπάθεια ξανά"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Επιλέξτε συνεδρία"
@@ -474,88 +543,88 @@ msgstr "Επιλέξτε όνομα για τη συνεδρία"
 msgid "Choose a name for the new session:"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Εκκινείται ο Ρυθμιστής της έντασης ήχου"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Εκκινείται το Ταμπλό"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Εκκινείται ο Διαχειριστής επιφάνειας εργασίας"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Εκκινείται η Μπάρα εργασιών"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Εκκινείται ο Διαχειριστής παραθύρων"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Εκκινείται το Τερματικό του Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Εκκινείται o Προχωρημένος επεξεργαστής κειμένου του KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Εφαρμογίδιο διαχείρισης προχείρου του KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Εκκινείται ο Αναγνώστης ηλεκ. αλληλογραφίας του KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Εκκινείται ο Αναγνώστης ειδήσεων του KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Εκκινείται ο Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Εκκινείται το Τερματικό του KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Εκκινείται Αναπαραγωγέας μέσων Beep"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Εκκινείται το Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Εκκινείται ο Επεξεργαστής κειμένου VI Improved"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Εκκίνηση του μεσολαβητή διαχείρισης συνεδρίας"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Εκκινείται το X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Εκκινείται το XMMS"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Εκκινείται το Τερματικό Xterm"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Εκκινείται %s "
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -580,7 +649,7 @@ msgstr ""
 "νέα θέση.\n"
 "Τώρα μπορείτε να σβήσετε αυτό τον κατάλογο.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Αυτόματη εκκίνηση..."
 
@@ -604,37 +673,106 @@ msgstr "Συμβουλές και κολπάκια"
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Συνεδρίες και Εκκίνηση"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Συνεδρίες και Εκκίνηση"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Ρυθμίσεις Συνεδρίας και Εκκίνησης Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Ρυθμίσεις οθόνης εκκίνησης Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Αυτόματη εκκίνηση εφαρμογών "
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Επεξεργασία λίστας των εφαρμογών που ξεκινούν αυτόματα"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4: Αυτόματη εκκίνηση εφαρμογών"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "συμβουλές xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "Τέλος συνεδρίας"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Εάν επιλεχθεί, ο διαχειριστής συνεδρίας θα σας δίνει να επιλέξετε μια "
+#~ "συνεδρία κάθε φορά που θα συνδέεστε στο Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Η επιλογή αυτή ορίζει στον διαχειριστή συνεδρίας να αποθηκεύει την "
+#~ "τρέχουσα συνεδρία αυτόματα κατά την έξοδο. Εάν δεν την ενεργοποιήσετε θα "
+#~ "σας γίνεται ερώτηση εάν θέλετε να αποθηκεύσετε την τρέχουσα συνεδρία σε "
+#~ "κάθε σας έξοδο."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Αυτή η επιλογή απενεργοποιεί τον διάλογο επιβεβαίωσης της αποσύνδεσης. Η "
+#~ "αποθήκευση ή μη της τρέχουσας συνεδρίας θα εξαρτάται από το κατά πόσον "
+#~ "έχετε ενεργοποιήσει την αυτόματη αποθήκευση της συνεδρίας ή όχι."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Έναρξη των υπηρεσιών του Gnome κατά την εκκίνηση"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Επιλέξτε το εάν σκοπεύετε να χρησιμοποιήσετε εφαρμογές του Gnome. Έτσι ο "
+#~ "διαχειριστής συνεδριών θα ξεκινάει ορισμένες ζωτικές υπηρεσίες του Gnome "
+#~ "για εσάς. Θα πρέπει επίσης να το ενεργοποιήσετε εάν θέλετε να "
+#~ "χρησιμοποιήσετε τις Βοηθητικές Τεχνολογίες που έρχονται μαζί με το Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Επιλέξτε το εάν σκοπεύετε να χρησιμοποιήσετε εφαρμογές του KDE με το "
+#~ "Περιβάλλον Xfce. Η επιλογή αυτή θα αυξήσει τον χρόνο εκκίνησης, αλλά από "
+#~ "την άλλη, οι εφαρμογές του KDE θα ξεκινούν γρηγορότερα. Μερικές εφαρμογές "
+#~ "του KDE δεν θα λειτουργήσουν εάν δεν ενεργοποιήσετε αυτή την επιλογή."
+
+#~ msgid "Security"
+#~ msgstr "Ασφάλεια"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Επιτρέπει στον διαχειριστή συνεδρίας να διαχειρίζεται εφαρμογές που "
+#~ "εκτελούνται σε απομακρυσμένους υπολογιστές. Μην ενεργοποιήσετε αυτή την "
+#~ "επιλογή εκτός εάν ξέρετε τι κάνετε."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr ""
+#~ "Συνεδρίες και\n"
+#~ "εκκίνηση"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Οθόνη εκκίνησης"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Οθόνη εκκίνησης"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Εφαρμογές αυτόματης εκκίνησης"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Ρυθμίσεις οθόνης εκκίνησης Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Αυτόματη εκκίνηση εφαρμογών "
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Επεξεργασία λίστας των εφαρμογών που ξεκινούν αυτόματα"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4: Αυτόματη εκκίνηση εφαρμογών"
diff --git a/po/en_GB.po b/po/en_GB.po
index 5b1e1fe5..106075d1 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-05-10 12:26+1000\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English/GB\n"
@@ -28,8 +28,12 @@ msgstr "Choose theme file to install..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -76,278 +80,357 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice Splash Engine"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Choose image..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configure Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Font"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Colours"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Background colour:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Text colour:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Image"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Use custom image"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Simple Splash Engine"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Session chooser"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Display chooser on login"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Logout settings"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automatically save session on logout"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Prompt on logout"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "This option disables the logout confirmation dialogue. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibility"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Launch Gnome services on startup"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Information"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Launch KDE services on startup"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Security"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Manage remote applications"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Session and Startup Settings"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessions and Startup"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "General"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Advanced"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessions and Startup"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "None"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Splash Screen Settings"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configure"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Opens the configuration panel for the selected splash screen."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Test"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstrates the selected splash screen."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Information"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Description:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Version:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Author:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Homepage:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Splash Screen"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Add application"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Name:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Description:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Command:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Select a command"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Failed to unlink %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Failed to create file %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Failed to write file %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Failed to open %s for writing"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Autostarted applications"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Below is the list of applications that will be started\n"
 "automatically when you login to your Xfce desktop,\n"
 "in addition to the applications that were saved when\n"
 "you logged out last time:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Author:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibility"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Description:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Homepage:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Information"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Logout settings"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Description:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Session chooser"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Version:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Advanced"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automatically save session on logout"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configure"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstrates the selected splash screen."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Launch KDE services on startup"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Launch KDE services on startup"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Manage remote applications"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Opens the configuration panel for the selected splash screen."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstrates the selected splash screen."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessions and Startup"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Display chooser on login"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "General"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Prompt on logout"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "End Session"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Loading desktop settings"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Verifying DNS settings"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Loading session data"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Choose session name"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Log Out"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Restart"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Shut Down"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Save session for future logins"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Please enter your password:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>An error occurred</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -355,8 +438,12 @@ msgid "Last accessed: %s"
 msgstr "Last accessed: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Choose the session you want to restore. You can simply double-click the session name to restore it."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -376,15 +463,21 @@ msgstr "New session"
 msgid "Create a new session."
 msgstr "Create a new session."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Starting The Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Starting Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Starting KDE services"
 
@@ -413,6 +506,31 @@ msgstr "Continue anyway"
 msgid "Try again"
 msgstr "Try again"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Choose session"
@@ -425,88 +543,88 @@ msgstr "Choose session name"
 msgid "Choose a name for the new session:"
 msgstr "Choose a name for the new session:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Starting the Volume Controller"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Starting the Panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Starting the Desktop Manager"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Starting the Taskbar"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Starting the Window Manager"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Starting the Gnome Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Starting the KDE Advanced Text Editor"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Starting the KDE Clipboard Manager"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Starting the KDE Mail Reader"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Starting the KDE News Reader"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Starting Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Starting the KDE Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Starting the Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Starting The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Starting the VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Starting the Session Management Proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Starting the X-Chat IRC Client"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Starting the X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Starting the X Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Starting %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -531,17 +649,15 @@ msgstr ""
 "location.\n"
 "You should delete this directory now.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Performing Autostart..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Tips and Tricks"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Fortunes"
 
@@ -549,8 +665,7 @@ msgstr "Fortunes"
 msgid "Display tips on _startup"
 msgstr "Display tips on _startup"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Tips and tricks"
 
@@ -558,38 +673,102 @@ msgstr "Tips and tricks"
 msgid "Next"
 msgstr "Next"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Session and Startup Settings"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Sessions and Startup Settings"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 Sessions and Startup Settings"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 Splash Screen Settings"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Autostarted Applications"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Edit the list of autostarted applications"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Autostarted Applications"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "End Session"
-
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "This option disables the logout confirmation dialogue. Whether the "
+#~ "session will be saved or not depends on whether you enabled the automatic "
+#~ "saving of sessions on logout or not."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Launch Gnome services on startup"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+
+#~ msgid "Security"
+#~ msgstr "Security"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessions and Startup"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Splash Screen Settings"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Splash Screen"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Autostarted applications"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 Splash Screen Settings"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Autostarted Applications"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Edit the list of autostarted applications"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Autostarted Applications"
diff --git a/po/eo.po b/po/eo.po
index a89b832d..84dd2e9b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-09-08 22:06+0200\n"
 "Last-Translator: Sylvain Vedrenne <gnu_sylvain@xfce.org>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
@@ -78,311 +78,352 @@ msgstr "Musoj"
 msgid "Mice Splash Engine"
 msgstr "La Ekaperanta Lanĉetoso 'Musoj'"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Elektu bildon..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Agordu la Simplan etoson..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Tiparo"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Koloroj"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Fona koloro:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Teksta koloro:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Bildo"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Uzu laŭmendan bildon"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simpla"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "'Simpla' Ekaperanta Lanĉetoso"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Elektilo de Seanco"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Montru la elektilon dum la ensaluto"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Se aktivigita, la seancadministrilo demandos al vi elektu seancon ĉiufoje "
-"kiam vi ensalutas en Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Elsalutaj parametroj"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Aŭtomate konservu la seancon ĉe elsaluto"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Ĉi tiu opcio signifas ke la seancadministrilo konservas la kurantan seancon "
-"aŭtomate kiam vi elsalutas. Se vi ne elektas tiun opcion, vi estos demandita "
-"ĉu vi volas konservi la kurantan seancon ĉe ĉiu elsaluto."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Demandu ĉe la elsaluto"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informigo"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Ĉi tiu opcio malaktivigas la elsalutan konfirmdialogon. La seanco estos "
-"konservita kondiĉe ke vi antaŭe aktivigis la aŭtomatan konservigon de seanco "
-"ĉe la elsaluto."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kongrueco"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Lanĉu Gnomajn servojn dum la komenco"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Elektu ĉi tion se vi intencas uzi Gnomajn programojn. Ĉi-tio faros ke la "
-"administrilo de seanco lanĉos gravegajn Gnomajn servojn por vi. Vi devus "
-"ankaŭ elekti tion se vi volas uzi la Asistantajn Teknologiojn kiuj kunestas "
-"Gnomon."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Lanĉi KDE servojn dum la komenco"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Elektu tiun opcion se vi intencas uzi KDE programojn kiel partoj de via Xfce "
-"seanco. Ĉi tio rimarkinde plilongigos la komencdaŭron de la seanco, sed "
-"aliflanke KDE programoj komenciĝos pli rapide. Kelkaj KDE programoj eble eĉ "
-"ne funkcios se vi ne elektas ĉi tiun opcion."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Sekurigo"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Administru forajn aplikaĵojn"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Seancaj kaj Startigaj Parametroj"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Permesas ke la seancadministrilo administras aplikaĵojn ĉe foraj gastigaj "
-"komputiloj. Se vi elektas ĉi tiun opcion, ne faru tion hazarde."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Seancoj kaj Komenco"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Ĝeneralaĵoj"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Evoluaĵoj"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Butona etikedo|Seancoj kaj Komenco"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Nenia"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Ekaperantekranaj Parametroj"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfiguru"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Malfermas la konfigurilan panelon pri la elektita ekaperantekrano."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Testu"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstras la elektitan ekaperantekranon."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informigo"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Priskribo:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Eldono:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Aŭtoro:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Hejmpaĝo:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Butona etikedo|Ekaperantekrano"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Aldonu aplikaĵon"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nomo:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Komando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Elektu komandon"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Malsukcesis malligi %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Malsukcesis krei la dosieron %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Malsukcesis surdiskigi la dosieron %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Malsukcesis malfermi %s por skribadi"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aŭtolanĉindaj aplikaĵoj"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Malsupre estas la listo de la aplikaĵoj kiuj estos startigitaj\n"
 "aŭtomate kiam vi ensalutos en vian Xfce labortablon,\n"
 "aldonitaj al la aplikaĵoj kiuj jam estis konservitaj kiam\n"
 "vi ensalutis je la antaŭa fojo:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Aŭtoro:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kongrueco"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Priskribo:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Hejmpaĝo:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informigo"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Elsalutaj parametroj"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Priskribo:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Elektilo de Seanco"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Eldono:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Evoluaĵoj"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Aŭtomate konservu la seancon ĉe elsaluto"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfiguru"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstras la elektitan ekaperantekranon."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Lanĉi KDE servojn dum la komenco"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Lanĉi KDE servojn dum la komenco"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Administru forajn aplikaĵojn"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Malfermas la konfigurilan panelon pri la elektita ekaperantekrano."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstras la elektitan ekaperantekranon."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Seancoj kaj Komenco"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Montru la elektilon dum la ensaluto"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Ĝeneralaĵoj"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Demandu ĉe la elsaluto"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Finu la Seancon"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Testu"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Ŝargante labortablajn parametrojn"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Kontrolante DNS parametrojn"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Ŝargante seancajn datumojn"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Elektu seancnomon"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Adiaŭu"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Restartigu"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Malŝaltu"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Konservu tiun seancon por estontaj ensalutoj"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Bonvolu enskribi vian pasvorton:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Eraro okazis</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +462,21 @@ msgstr "Novan seancon"
 msgid "Create a new session."
 msgstr "Kreu novan seancon."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Lanĉante la Gnoman Ŝlosilaran Demonon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Lanĉante la Gnomajn Asistantajn Teknologiojn"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Lanĉante KDE servojn"
 
@@ -458,6 +505,31 @@ msgstr "Daŭrigu malgraŭe"
 msgid "Try again"
 msgstr "Provu denove"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Elektu seancon"
@@ -470,88 +542,88 @@ msgstr "Elektu seancnomon"
 msgid "Choose a name for the new session:"
 msgstr "Elektu nomon por la nova seanco"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Lanĉante la Kontrolilon de Sono"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Lanĉante la Panelon"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Lanĉante la Administrilon de Labortablo"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Lanĉante la Taskostrion"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Lanĉante la Fenestradministrilon"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Lanĉante la Gnoman Imitilon de Terminalo"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Lanĉante la KDE Evoluan Redaktilon de Teksto"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Lanĉante la KDE Administrilon de Poŝo"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Lanĉante la KDE Retpoŝtolegilon"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Lanĉante la KDE Novaĵlegilon"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Lanĉante Konkerilon"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Lanĉante la KDE Imitilon de Terminalo"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Lanĉante la Bipan Legilon de Mediumo"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Lanĉante la Gimpon"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Lanĉante la VI Plibonigitan Redaktilon"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Lanĉante la Seancadministrilan Prokuron"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Lanĉante la X-Chat IRC Klienton"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Lanĉante la Ksan Plurmediuman Sistemon"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Lanĉante la Ksan Imitilon de Terminalo"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Lanĉante %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -575,7 +647,7 @@ msgstr ""
 "via malnova aŭtolanĉa dosierujo sukcese estis movigitaj al la nova loko.\n"
 "Vi devus viŝi la malnovan dosierujon nun.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Plenumante la Aŭtolanĉon..."
 
@@ -599,37 +671,102 @@ msgstr "Arkanoj"
 msgid "Next"
 msgstr "Sekvanta"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Seancaj kaj Startigaj Parametroj"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Seancoj kaj Startigaj Parametroj"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 Seancoj kaj Startigaj Parametroj"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 Ekaperantektranaj Parametroj"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aŭtolanĉindaj aplikaĵoj"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Modifu la liston de aŭtolanĉindaj aplikaĵoj"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Aŭtolanĉindaj Aplikaĵoj"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips (Xfce 4 arkanoj)"
 
-#~ msgid "End Session"
-#~ msgstr "Finu la Seancon"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Se aktivigita, la seancadministrilo demandos al vi elektu seancon ĉiufoje "
+#~ "kiam vi ensalutas en Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Ĉi tiu opcio signifas ke la seancadministrilo konservas la kurantan "
+#~ "seancon aŭtomate kiam vi elsalutas. Se vi ne elektas tiun opcion, vi "
+#~ "estos demandita ĉu vi volas konservi la kurantan seancon ĉe ĉiu elsaluto."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Ĉi tiu opcio malaktivigas la elsalutan konfirmdialogon. La seanco estos "
+#~ "konservita kondiĉe ke vi antaŭe aktivigis la aŭtomatan konservigon de "
+#~ "seanco ĉe la elsaluto."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Lanĉu Gnomajn servojn dum la komenco"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Elektu ĉi tion se vi intencas uzi Gnomajn programojn. Ĉi-tio faros ke la "
+#~ "administrilo de seanco lanĉos gravegajn Gnomajn servojn por vi. Vi devus "
+#~ "ankaŭ elekti tion se vi volas uzi la Asistantajn Teknologiojn kiuj "
+#~ "kunestas Gnomon."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Elektu tiun opcion se vi intencas uzi KDE programojn kiel partoj de via "
+#~ "Xfce seanco. Ĉi tio rimarkinde plilongigos la komencdaŭron de la seanco, "
+#~ "sed aliflanke KDE programoj komenciĝos pli rapide. Kelkaj KDE programoj "
+#~ "eble eĉ ne funkcios se vi ne elektas ĉi tiun opcion."
+
+#~ msgid "Security"
+#~ msgstr "Sekurigo"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Permesas ke la seancadministrilo administras aplikaĵojn ĉe foraj gastigaj "
+#~ "komputiloj. Se vi elektas ĉi tiun opcion, ne faru tion hazarde."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Butona etikedo|Seancoj kaj Komenco"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Ekaperantekranaj Parametroj"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Butona etikedo|Ekaperantekrano"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aŭtolanĉindaj aplikaĵoj"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 Ekaperantektranaj Parametroj"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aŭtolanĉindaj aplikaĵoj"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Modifu la liston de aŭtolanĉindaj aplikaĵoj"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Aŭtolanĉindaj Aplikaĵoj"
diff --git a/po/es.po b/po/es.po
index a7086853..a4233b99 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 08:56+0300\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-09-30 01:06+0100\n"
 "Last-Translator: Abel Martín <abel.martin.ruiz@gmail.com>\n"
 "Language-Team: Spanish <xfce-i18n@xfce.org>\n"
@@ -26,7 +26,9 @@ msgstr "Escoja el archivo de tema a instalar..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
 msgstr ""
 "No se pudo leer el fichero %s, verifique que el fichero es un archivo de\n"
 "tema de pantalla de inicio válido."
@@ -34,7 +36,8 @@ msgstr ""
 #: ../engines/balou/config.c:386
 #, c-format
 msgid "Unable to remove splash theme \"%s\" from directory %s."
-msgstr "No se puede eliminar el tema de pantalla de inicio \"%s\" del directorio %s."
+msgstr ""
+"No se puede eliminar el tema de pantalla de inicio \"%s\" del directorio %s."
 
 #: ../engines/balou/config.c:471
 msgid "Choose theme filename..."
@@ -76,295 +79,353 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Motor de Pantalla de Inicio Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Escoger imagen..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configurar Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Tipo de letra"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Colores"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Color de fondo:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Color de texto:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Imagen"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Use una imagen personalizada"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Motor de Pantalla de Inicio Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Seleccionador de sesión"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Desplegar seleccionador de sesión al inicio"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Si se define, el gestor de sesión le solicitará elegir una sesión cada\n"
-"vez que entre en Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Configuración de fin de sesión"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Guardar sesión automáticamente al salir"
 
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Esta opción indica al gestor de sesión que guarde la sesión activa de\n"
-"manera automática cuando salga. Si no desea esta opción, entonces se le\n"
-"preguntará cada vez que salga si desea guardar la sesión."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Preguntar al salir"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Información"
 
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Esta opción deshabilita el diálogo de confirmación da finalización. Si\n"
-"la sesión se guarda o no, dependerá de la configuración definida para\n"
-"el guardado automático de sesión."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilidad"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Arrancar servicios de GNOME al inicio"
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"Seleccione esta opcion si utiliza aplicaciones del escritorio\n"
-"GNOME. Esto indicará al gestor de sesión que inicie algunos servicios\n"
-"vitales de GNOME. También debe habilitar esta opción si utiliza las\n"
-"tecnologías de asistencia que provee GNOME."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Arrancar servicios KDE al inicio"
-
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"Seleccione esta opción si utiliza aplicaciones del escritorio KDE en\n"
-"su sesión de Xfce. Esto incrementará notablemente el tiempo de\n"
-"arranque, pero por otro lado, las aplicaciones de KDE se iniciarán más\n"
-"rápido. Es posible que algunas aplicaciones de KDE no funcionen si no\n"
-"habilita esta opción."
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Seguridad"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Gestionar aplicaciones remotas"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Configuración de Sesiones e Inicio"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Seleccione esta opción para administrar aplicaciones que se ejecutan\n"
-"en máquinas remotas. No la habilite si no sabe de que se trata."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesiones e Inicio"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "General"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avanzado"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sesiones e Inicio"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Ninguno"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Configuración de Pantalla de Inicio"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Abre el panel de configuración para la pantalla de inicio"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Probar"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Muestra la pantalla de inicio elegida"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Información"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Descripción:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versión:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Sitio web:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Pantalla de Inicio"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Añadir aplicación"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Elija un comando"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "No se pudo desenlazar %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "No se pudo crear el fichero %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "No se pudo escribir en fichero %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "No se pudo abrir %s para escritura"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aplicaciones para autoarranque"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "La siguiente es una lista de aplicaciones que iniciarán\n"
 "automáticamente cuando ingrese al escritorio Xfce, adicionalmente a\n"
 "las aplicaciones que han sido guardadas en su última sesión."
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilidad"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descripción:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Sitio web:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Información"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Configuración de fin de sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Descripción:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Seleccionador de sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versión:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avanzado"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Guardar sesión automáticamente al salir"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configurar"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Muestra la pantalla de inicio elegida"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Arrancar servicios KDE al inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Arrancar servicios KDE al inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Gestionar aplicaciones remotas"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Abre el panel de configuración para la pantalla de inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Muestra la pantalla de inicio elegida"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesiones e Inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Desplegar seleccionador de sesión al inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "General"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Preguntar al salir"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Finalizar sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Probar"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Cargando configuración de escritorio"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Verificando configuracion de DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Cargando información de sesión"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Escoger nombre de sesión"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Salir"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Apagar"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Guardar sesión para sesiones futuras"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Por favor introduzca su contraseña:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Ha ocurrido un error</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
 msgstr ""
 "Bien la clave introducida es inválida o el administrador del sistema ha\n"
 "deshabilitado la capacidad de apagar el equipo con su cuenta de\n"
@@ -376,7 +437,9 @@ msgid "Last accessed: %s"
 msgstr "Último acceso: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
 msgstr ""
 "Elija la sesión a restaurar. Puede hacerlo con doble click en el\n"
 "nombre de sesión."
@@ -388,7 +451,8 @@ msgstr "Salir"
 
 #: ../xfce4-session/xfsm-chooser.c:241
 msgid "Cancel the login attempt and return to the login screen."
-msgstr "Cancela el intento de acceso al inicio y vuelve a la pantalla de acceso."
+msgstr ""
+"Cancela el intento de acceso al inicio y vuelve a la pantalla de acceso."
 
 #. "New" button
 #: ../xfce4-session/xfsm-chooser.c:249
@@ -399,15 +463,21 @@ msgstr "Nueva sesión"
 msgid "Create a new session."
 msgstr "Crear una nueva sesión"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Iniciando Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Iniciando Tecnologías de Accesibilidad de Gnome"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Iniciando servicios KDE"
 
@@ -436,6 +506,31 @@ msgstr "¿Continuar de todos modos?"
 msgid "Try again"
 msgstr "¿Intentar nuevamente?"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Escoger sesión"
@@ -448,88 +543,88 @@ msgstr "Escoger nombre de sesión"
 msgid "Choose a name for the new session:"
 msgstr "Escoger un nombre para la sesión"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Iniciando el Controlador de Volumen"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Iniciando el Panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Iniciando Gestor de Escritorio"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Iniciando la Barra de Tareas"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Iniciando el Gestor de Ventanas"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Iniciando Emulador de Terminal de Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Iniciando Editor Avanzado de Texto de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Iniciando Gestor de Portapapeles de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Iniciando Lector de Correos de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Iniciando Lector de Noticias KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Iniciando Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Iniciando Emulador de Terminal de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Iniciando Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Iniciando Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Iniciando VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Comenzando el Proxy de Gestión de Sesiones"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Iniciando Cliente de IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Iniciando X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Iniciando Emulador de Terminal de X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -550,20 +645,19 @@ msgstr ""
 "\n"
 "en la que puede colocar los archivos .desktop que describen las\n"
 "aplicaciones a iniciar cuando comience su sesión de Xfce. Se han migrado\n"
-"con éxito los ficheros del directorio de autoarranque antiguo a la nueva ubicación.\n"
+"con éxito los ficheros del directorio de autoarranque antiguo a la nueva "
+"ubicación.\n"
 "Ahora debe eliminar este directorio.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Realizando Autoarranque..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Consejos y Trucos"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Fortunes"
 
@@ -571,8 +665,7 @@ msgstr "Fortunes"
 msgid "Display tips on _startup"
 msgstr "Mostrar con_sejos al inicio"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Consejos y trucos"
 
@@ -580,38 +673,103 @@ msgstr "Consejos y trucos"
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Configuración de Sesiones e Inicio"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Configuración de Sesiones e Inicio"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Configuración de Sesiones e Inicio de Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Configuración de Pantalla de Inicio de Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aplicaciones para Autoarranque"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Editar la lista de aplicaciones para autoarranque"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Aplicaciones para autoarranque de Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "consejos de xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "Finalizar sesión"
-
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Si se define, el gestor de sesión le solicitará elegir una sesión cada\n"
+#~ "vez que entre en Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Esta opción indica al gestor de sesión que guarde la sesión activa de\n"
+#~ "manera automática cuando salga. Si no desea esta opción, entonces se le\n"
+#~ "preguntará cada vez que salga si desea guardar la sesión."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Esta opción deshabilita el diálogo de confirmación da finalización. Si\n"
+#~ "la sesión se guarda o no, dependerá de la configuración definida para\n"
+#~ "el guardado automático de sesión."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Arrancar servicios de GNOME al inicio"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Seleccione esta opcion si utiliza aplicaciones del escritorio\n"
+#~ "GNOME. Esto indicará al gestor de sesión que inicie algunos servicios\n"
+#~ "vitales de GNOME. También debe habilitar esta opción si utiliza las\n"
+#~ "tecnologías de asistencia que provee GNOME."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Seleccione esta opción si utiliza aplicaciones del escritorio KDE en\n"
+#~ "su sesión de Xfce. Esto incrementará notablemente el tiempo de\n"
+#~ "arranque, pero por otro lado, las aplicaciones de KDE se iniciarán más\n"
+#~ "rápido. Es posible que algunas aplicaciones de KDE no funcionen si no\n"
+#~ "habilita esta opción."
+
+#~ msgid "Security"
+#~ msgstr "Seguridad"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Seleccione esta opción para administrar aplicaciones que se ejecutan\n"
+#~ "en máquinas remotas. No la habilite si no sabe de que se trata."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sesiones e Inicio"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Configuración de Pantalla de Inicio"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Pantalla de Inicio"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aplicaciones para autoarranque"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Configuración de Pantalla de Inicio de Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aplicaciones para Autoarranque"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Editar la lista de aplicaciones para autoarranque"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Aplicaciones para autoarranque de Xfce 4"
diff --git a/po/es_MX.po b/po/es_MX.po
index d31b3c6a..5414800e 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-08-18 01:29+0900\n"
 "Last-Translator: Edscott Wilson Garcia <edscott@xfce.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -76,304 +76,349 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Escoger imagen..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configurar..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Fuente"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Colores"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Color de fondo:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Color de texto:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Imagen"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Use imagen personalizada"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Seleccionador de sesión"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Desplegar seleccionador de sesión al inicio"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Información"
+
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Puesto, el gerente de sesión le preguntará para escoger una sesión cada vez "
-"que ingrese a Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Configuración al salir de sesión"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Guardar sesión automáticamente al salir"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Sesiones e inicio"
+
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Esta opción le instruye al gerente de sesión que guarde la sesión activa de "
-"manera automática cuando usted salga. Si no desea esta opción entonces se le "
-"preguntará si desea guardar la sesión cada vez que salga."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Preguntar al salir"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
-"Esta opción deshabilita el diálogo de confirmación a la salida. Si la sesión "
-"se guarda o no, dependerá de la configuración de guardado automático de "
-"sesión."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilidad"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Lanzar servicios Gnome al inicio"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr "Seleccione esta opcion si utiliza aplicaciones del escritorio Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Ejecutar servicios KDE al inicio"
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
+msgstr "Ninguno"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr "Seleccione esta opción si utiliza aplicaciones del escritorio KDE."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Seguridad"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Administrar aplicaciones remotas"
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
+msgstr ""
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
-"Seleccione esta opción para administrar aplicaciones remotas (únicamente "
-"para expertos)"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesiones e inicio"
+#: ../settings/xfae-dialog.c:130
+#, fuzzy
+msgid "Description:"
+msgstr "<b>Descripción:</b>"
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "General"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avanzado"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "Sesiones e inicio"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
-msgstr "Ninguno"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Configuración de pantalla de inicio"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configurar"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Abre el panel de configuración para la pantalla de inicio"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Probar"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demuestra la imagen de arranque"
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilidad"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descripción:</b>"
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Página WWW:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
 msgstr "Información"
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Configuración al salir de sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
 msgstr "<b>Descripción:</b>"
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Seleccionador de sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr "<b>Versión:</b"
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avanzado"
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Página WWW:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Guardar sesión automáticamente al salir"
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:12
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "Imagen de arranque"
+msgid "Con_figure"
+msgstr "Configurar"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demuestra la imagen de arranque"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfce4-session-settings.glade.h:15
 #, fuzzy
-msgid "Description:"
-msgstr "<b>Descripción:</b>"
+msgid "Launch GN_OME services on startup"
+msgstr "Ejecutar servicios KDE al inicio"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Ejecutar servicios KDE al inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Administrar aplicaciones remotas"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Abre el panel de configuración para la pantalla de inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demuestra la imagen de arranque"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesiones e inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Desplegar seleccionador de sesión al inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "General"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Preguntar al salir"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Nueva sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Probar"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-#, fuzzy
-msgid "Autostarted applications"
-msgstr "Administrar aplicaciones remotas"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Cargando configuración de escritorio"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Verificando configuracion DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Cargando información de sesión"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Escoger nombre de sesión"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "Salir"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Guardar sesión para sesiones futuras"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Por favor proporcione su contraseña:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Ha ocurrido un error</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -408,15 +453,21 @@ msgstr "Nueva sesión"
 msgid "Create a new session."
 msgstr "Crear una nueva sesión"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Comenzando el Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Comenzando el Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Comenzando servicios KDE"
 
@@ -444,6 +495,31 @@ msgstr "¿Continuar de todos modos"
 msgid "Try again"
 msgstr "¿Intentar de nuevo"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Escoger sesión"
@@ -456,88 +532,88 @@ msgstr "Escoger nombre de sesión"
 msgid "Choose a name for the new session:"
 msgstr "Escoger un nombre para la sesión"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Comenzando el controlador de volumen"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Comenzando el panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Comenzando gerente de escritorio"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Comenzando la barra de tareas"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Comenzando el gestor de ventanas"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Comenzando el Gnome Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Comenzando el KDE Advanced Text Edito"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Comenzando el KDE Clipboard Manager"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Comenzando el KDE Mail Reader"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Comenzando el KDE News Reader"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Comenzando Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Comenzando KDE Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Comenzando el Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Comenzando The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Comenzando VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Comenzando el Session Management Proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Comenzando el X-Chat IRC Client"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Comenzando el X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Comenzando el X Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Comenzando %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -552,7 +628,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Haciendo el autoarranque..."
 
@@ -576,43 +652,97 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "Sesiones e inicio"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "Sesiones e inicio"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Sesiones e inicio"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Configuración de pantalla de inicio"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr ""
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Puesto, el gerente de sesión le preguntará para escoger una sesión cada "
+#~ "vez que ingrese a Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Esta opción le instruye al gerente de sesión que guarde la sesión activa "
+#~ "de manera automática cuando usted salga. Si no desea esta opción entonces "
+#~ "se le preguntará si desea guardar la sesión cada vez que salga."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Esta opción deshabilita el diálogo de confirmación a la salida. Si la "
+#~ "sesión se guarda o no, dependerá de la configuración de guardado "
+#~ "automático de sesión."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Lanzar servicios Gnome al inicio"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Seleccione esta opcion si utiliza aplicaciones del escritorio Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr "Seleccione esta opción si utiliza aplicaciones del escritorio KDE."
+
+#~ msgid "Security"
+#~ msgstr "Seguridad"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Seleccione esta opción para administrar aplicaciones remotas (únicamente "
+#~ "para expertos)"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
 #, fuzzy
-msgid "Autostarted Applications"
-msgstr "Administrar aplicaciones remotas"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sesiones e inicio"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Configuración de pantalla de inicio"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Imagen de arranque"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr ""
+#, fuzzy
+#~ msgid "Autostarted applications"
+#~ msgstr "Administrar aplicaciones remotas"
+
+#, fuzzy
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Configuración de pantalla de inicio"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "Nueva sesión"
+#~ msgid "Autostarted Applications"
+#~ msgstr "Administrar aplicaciones remotas"
diff --git a/po/et.po b/po/et.po
index 0581998d..c5a11b36 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-02-28 15:45+0200\n"
 "Last-Translator: Mart Tõnso <mart.tonso@ttu.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -78,310 +78,352 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice Splash Mootor"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Vali pilt..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Seadista Lihtsat..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Fondid"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Värvid"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Tausta värv:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Teksti värv:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Pilt"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Kasuta oma pilti"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Lihtne"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Lihtne Splash Mootor"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sessiooni valija"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Näita sisselogimisel valijat"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
-msgstr "Kui jah, siis pead sa igal sisselogimisel kasutatava sessiooni valima."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Väljalogimise seaded"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Salvesta sessioon väljalogimisel automaatselt"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"See valik lubab sessioonihalduril automaatselt väljalogimisel sessiooni "
-"salvestada. Kui sa seda ei soovi, siis küsitakse igal väljalogimiselkas "
-"sessioon salvestada või mitte."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Küsi väljumisel."
-
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"See valik jätab ära väljalogimise kinnitamise dialoogi.Kas sessioon "
-"salvestatakse või mitte sõltub sellest, kas sa lubasid sessiooni automaatse "
-"salvestamise või mitte."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompatiiblus"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Info"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Käivita sisselogimisel Gnome teenused"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"Aktiiveeri see valik, kui sa kavatsed kasutada Gnome programme.Siis käivitab "
-"sessioonihaldur mõned olulised Gnome teenused. Sa peaksid selle valima ka "
-"siis, kui tahad kasutada ka Gnomega kaasas olevaid Abistamisasju."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Käivida sisselogimisel KDE teenused"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Aktiveeri see valik, kui sa kavatsed Xfce sessiooni jooksul kasutadaKDE "
-"rakendusi. See suurendab küll Xfce käivitamisele kuluvat aega, aga "
-"samaskiirendab KDE rakenduste käivitumist. Mõned KDE programmid ei pruugi "
-"üldseilma selle valikuta töötada."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Turvalisus"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Halda kaugrakendusi"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Sessiooni ja käivitumise seaded"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Lubab sessioonihalduril hallata rakendusi, mis jooksevad teistes arvutites. "
-"Ära aktiveeri seda valikut, kui sa ei tea, mida sa teed."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessioonid ja käivitumine."
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Üldine"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Edasijõudnud"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessioonid ja käivitumine."
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Tühi"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Stardipildi seaded"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Eelistused"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Avad seadetepaneeli valitud stardipildile"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Proovi"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstreerib valitud stardipilti"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Info"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Kirjeldus:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versioon:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Koduleht:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-#, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "Stardipilt"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Lisa rakendus"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Käsklus:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Vali käsklus"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Ei õnnestunud lõhkuda sided %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Ei õnnestunud luua faili %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Ei õnnestunud kirjutada faili %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Ei õnnestunud avada faili %s kirjutamiseks"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Autokäivitatavad rakendused"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Allpool on nimistu rakendustest mis käivitatakse\n"
 "automaatselt kui te stardite oma Xfce töölaua.\n"
 "Need käivitatakse lisaks nendele rakendustele, mis\n"
 "salvestati väljalogimisel viimasel korral:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompatiiblus"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Kirjeldus:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Koduleht:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Info"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Väljalogimise seaded"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Kirjeldus:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sessiooni valija"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versioon:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Edasijõudnud"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Salvesta sessioon väljalogimisel automaatselt"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Eelistused"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstreerib valitud stardipilti"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Käivida sisselogimisel KDE teenused"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Käivida sisselogimisel KDE teenused"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Halda kaugrakendusi"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Avad seadetepaneeli valitud stardipildile"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstreerib valitud stardipilti"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessioonid ja käivitumine."
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Näita sisselogimisel valijat"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Üldine"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Küsi väljumisel."
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Sessiooni lõpp"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Proovi"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Laen töölaua seadeid"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Kontrollin DNS-i seadeid"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Laen sessiooni andmeid"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Vali sessiooni nimi"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Logi välja"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Restart"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Seiska"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Salvesta sessioon tuleviku tarbeks"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Palun sisesta oma parool:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Viga on toimunud</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -420,15 +462,21 @@ msgstr "Uus sessioon"
 msgid "Create a new session."
 msgstr "Loo uus sessioon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Käivitan Gnome-i Võtmekimbu deemoni"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Käivitan Gnome-i Abistavad Tehnoloogiad"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Käivitan KDE teenused"
 
@@ -457,6 +505,31 @@ msgstr "Jätka ikkagi"
 msgid "Try again"
 msgstr "Proovi uuesti"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Vali sessioon"
@@ -469,88 +542,88 @@ msgstr "Vali sessiooni nimi"
 msgid "Choose a name for the new session:"
 msgstr "Vali uuele sessioonile nimi:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Käivitan Helitugevuse juhtija"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Käivitan Paneeli"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Käivitan Töölaua halduri"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Käivitan Tööriba"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Käivitan Aknahalduri"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Käivitan Gnome-i Terminaliemulaatori"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Käivitan KDE tekstiredaktori (KATE)"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Käivitan KDE kleepelaua halduri"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Käivitan KDE postiprogrammi"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Käivitan KDE uudistelugeja"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Käivitan Konquerori"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Käivitan KDE Terminaliemulaatori"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Käivitan Beep Meediamängija"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Käivitan Gimp-i"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Käivitan VI Täiustatud Redaktori"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Käivitan Sessioonihalduri vahendaja (proxy)"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Käivitan X-Chat IRC kliendi"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Käivitan X Multimeedia Süsteemi"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Käivitan X Terminaliemulaatori"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Käivitan %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -575,7 +648,7 @@ msgstr ""
 "asukohta.\n"
 "Te peaksite nüüd selle vana kataloogi kustutama.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Teen Autostarti..."
 
@@ -600,37 +673,103 @@ msgstr "Näpunäited ja trikid"
 msgid "Next"
 msgstr "Edasi"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Sessiooni ja käivitumise seaded"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Sessiooni ja käivitumise seaded"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 sessiooni ja käivitumise seaded"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 käivituspildi seaded"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr "xfce4 näpunäited"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Autokäivitatud rakendused"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Kui jah, siis pead sa igal sisselogimisel kasutatava sessiooni valima."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "See valik lubab sessioonihalduril automaatselt väljalogimisel sessiooni "
+#~ "salvestada. Kui sa seda ei soovi, siis küsitakse igal väljalogimiselkas "
+#~ "sessioon salvestada või mitte."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "See valik jätab ära väljalogimise kinnitamise dialoogi.Kas sessioon "
+#~ "salvestatakse või mitte sõltub sellest, kas sa lubasid sessiooni "
+#~ "automaatse salvestamise või mitte."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Käivita sisselogimisel Gnome teenused"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Aktiiveeri see valik, kui sa kavatsed kasutada Gnome programme.Siis "
+#~ "käivitab sessioonihaldur mõned olulised Gnome teenused. Sa peaksid selle "
+#~ "valima ka siis, kui tahad kasutada ka Gnomega kaasas olevaid "
+#~ "Abistamisasju."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Aktiveeri see valik, kui sa kavatsed Xfce sessiooni jooksul kasutadaKDE "
+#~ "rakendusi. See suurendab küll Xfce käivitamisele kuluvat aega, aga "
+#~ "samaskiirendab KDE rakenduste käivitumist. Mõned KDE programmid ei pruugi "
+#~ "üldseilma selle valikuta töötada."
+
+#~ msgid "Security"
+#~ msgstr "Turvalisus"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Lubab sessioonihalduril hallata rakendusi, mis jooksevad teistes "
+#~ "arvutites. Ära aktiveeri seda valikut, kui sa ei tea, mida sa teed."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Muuda autostarditud rakenduste nimekirja"
+#, fuzzy
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessioonid ja käivitumine."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 autostarditud rakendused"
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Stardipildi seaded"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr "xfce4 näpunäited"
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Stardipilt"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Autokäivitatavad rakendused"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 käivituspildi seaded"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Autokäivitatud rakendused"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Muuda autostarditud rakenduste nimekirja"
 
-#~ msgid "End Session"
-#~ msgstr "Sessiooni lõpp"
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 autostarditud rakendused"
diff --git a/po/eu.po b/po/eu.po
index 518274ce..cedd6096 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-12-07 11:12+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
@@ -80,309 +80,350 @@ msgstr "Sagua"
 msgid "Mice Splash Engine"
 msgstr "Sagu Abiarazte Errobota"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Irudia aukeratu..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigurazio Simplea..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Letra-tipoa"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Koloreak"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Atzeko planoko kolorea:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Testu kolorea:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Irudia"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Irudi pertsonalizatua erabili"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Sinplea"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Abiarazte Errobot Sinplea"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Saio aukeratzailea"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Aukeratzailea erakutsi saioa hasterakoan"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Ezarririk badago, kudeatzaileak Xfce abiarazten duzun bakoitzen saio bat "
-"aukeratzea eskatuko dizu."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Irteera Ezarpenak"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automatikoki gorde saioa irteterakoan"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Aukera honek saio kudeatzaileari saio bat uzten den bakoitzean automatikoki "
-"gorde araziko du. Aukera hau ez baduzu gaiturik saioa uzten dezun bakoitzean "
-"gorde nahi duzun galdetuko zaizu"
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Galdetu irteterakoan"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Argibideak"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Aukera honek irteera berrespen elkarrizketa ezgaitzen du. Saioa gordeko den "
-"edo ez zuk gordetze automatikoa gaiturik dezun ala ez arabera egingo da."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Bateragarritasuna"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Gnome zerbitzuak abiarazi abiarazterakoan"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Gaitu aukera hau XFCE saioan GNOME-rako garaturiko aplikazioak erabiltzen "
-"badituzu.  Honek abiaraztean beharrezko Gnome zerbitzu batzu abiaraziko "
-"ditu. Gnomek erabiltzen duen laguntza teknologia erabili nahi baduzu ere hau "
-"gaitu egin beharko duzu."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "KDE zerbitzuak abiarazi abiarazterakoan"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Gaitu aukera hau XFCE saioan KDE-rako garaturiko aplikazioak erabiltzen "
-"badituzu. Honek ziurrenik sistema abiarazte denbora handiagotuko du baina "
-"KDE aplikazioa azkarrago abiaraziko dira. KDE aplikazio batzuk ezin dira "
-"abiarazi aukera hau gaitu gabe."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Segurtasuna"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Urruneko aplikazioa kudeatu"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Saio eta Abiarazte Ezarpenak"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Gaitu saio kudeatzailea urruneko hostalarietan abiarazirik dauden "
-"aplikazioak kudeatzeko. Ez baduzu zer egiten ari zaren ulertzen ez gaitu "
-"aukera hau."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Saio eta Abiaraztea"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Orokorra"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Aurreratua"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Saio eta Abiaraztea"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Abiarazpen Pantaila Ezarpenak"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfiguratu"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Aukeratutako abiarazpen pantailarentzat konfigurazio panela ireki."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Proba"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Aukeratutako abiarazpen pantaila bistarazten du."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Argibideak"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Azalpena:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Bertsioa:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Egilea:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Etxegunea:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Abiarazpen pantaila"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Aplikazio gehitu"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Komandoa:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Hautatu komando bat"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Ezinda %s lotura ezabatu: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Ezin da %s fitxategia sortu"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Ezin da %s fitxategia idatzi"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Ezin da %s fitxategia idazketarako ireki"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Autoabiarazitako aplikazioak"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Behean azken saioan gorde ziren aplikazioez gain Xfce\n"
 "idazmahaiean saioa abiaraztean automatikoki abiarazi\n"
 "daitezkeen aplikazio zerrenda dago:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Egilea:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Bateragarritasuna"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Azalpena:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Etxegunea:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Argibideak"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Irteera Ezarpenak"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Azalpena:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Saio aukeratzailea"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Bertsioa:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Aurreratua"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automatikoki gorde saioa irteterakoan"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfiguratu"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Aukeratutako abiarazpen pantaila bistarazten du."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "KDE zerbitzuak abiarazi abiarazterakoan"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "KDE zerbitzuak abiarazi abiarazterakoan"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Urruneko aplikazioa kudeatu"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Aukeratutako abiarazpen pantailarentzat konfigurazio panela ireki."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Aukeratutako abiarazpen pantaila bistarazten du."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Saio eta Abiaraztea"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Aukeratzailea erakutsi saioa hasterakoan"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Orokorra"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Galdetu irteterakoan"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Saio berria"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Proba"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Idazmahai ezarpenak kargatzen"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS ezarpenak egiaztatzen"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Saio sdatuak kargatzen"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Saio izena aukeratu"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Irten"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Berrabiarazi"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Itzali"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Gorde saioa hurrengo abiarazterako"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Mesedez idatzi zure pasahitza:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Errore bat gertatu da</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +462,21 @@ msgstr "Saio berria"
 msgid "Create a new session."
 msgstr "Saio berria sortu."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "\"Gnome Keyring Daemon\" abiarazten"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "\"Gnome Assistive Technologies\" abiarazten"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE zerbitzuak abiarazten"
 
@@ -458,6 +505,31 @@ msgstr "Jarraitu halaere"
 msgid "Try again"
 msgstr "Saiatu berriz"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Saioa aukeratu"
@@ -470,88 +542,88 @@ msgstr "Saio izena aukeratu"
 msgid "Choose a name for the new session:"
 msgstr "Aukeratu saio berrirako izen bat:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Bolumen Kontrola abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Panela abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Saio kudeatzailea abiarazten..."
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Tresnabarra abiarazten..."
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Leiho kudeatzailea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Gnome Terminal Emuladorea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE Testu Editore Aurreratua abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE arbel kudeatzailea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE Posta kudeatzailea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE berri-talde kudeatzailea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE Terminal emuadorea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Beep Medio erreproduzigailua abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Gimp abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI Editorea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Saio kudeatzaile proxi-a abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat IRC Bezeroa abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "X Multimedia Sistema abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X Terminal Emuladorea abiarazten"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s abiarazten..."
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -576,7 +648,7 @@ msgstr ""
 "berrira.\n"
 "Direktorio hau ezabatu egin beharko zenuke.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Autoabiarazten..."
 
@@ -600,35 +672,103 @@ msgstr "Gomedio eta Laguntza"
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Saio eta Abiarazte Ezarpenak"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Saio eta Abiarazte Ezarpenak"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 Saio eta Abiarazte Ezarpenak"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 Abiarazpen Pantaila Ezarpenak"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Autoabiaraziriko aplikazioak"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Autoabiaraziriko aplikazio zerrenda editatu"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Autoabiaraziriko aplikazioak"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-gomendioak"
 
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Ezarririk badago, kudeatzaileak Xfce abiarazten duzun bakoitzen saio bat "
+#~ "aukeratzea eskatuko dizu."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Aukera honek saio kudeatzaileari saio bat uzten den bakoitzean "
+#~ "automatikoki gorde araziko du. Aukera hau ez baduzu gaiturik saioa uzten "
+#~ "dezun bakoitzean gorde nahi duzun galdetuko zaizu"
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Aukera honek irteera berrespen elkarrizketa ezgaitzen du. Saioa gordeko "
+#~ "den edo ez zuk gordetze automatikoa gaiturik dezun ala ez arabera egingo "
+#~ "da."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Gnome zerbitzuak abiarazi abiarazterakoan"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Gaitu aukera hau XFCE saioan GNOME-rako garaturiko aplikazioak erabiltzen "
+#~ "badituzu.  Honek abiaraztean beharrezko Gnome zerbitzu batzu abiaraziko "
+#~ "ditu. Gnomek erabiltzen duen laguntza teknologia erabili nahi baduzu ere "
+#~ "hau gaitu egin beharko duzu."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Gaitu aukera hau XFCE saioan KDE-rako garaturiko aplikazioak erabiltzen "
+#~ "badituzu. Honek ziurrenik sistema abiarazte denbora handiagotuko du baina "
+#~ "KDE aplikazioa azkarrago abiaraziko dira. KDE aplikazio batzuk ezin dira "
+#~ "abiarazi aukera hau gaitu gabe."
+
+#~ msgid "Security"
+#~ msgstr "Segurtasuna"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Gaitu saio kudeatzailea urruneko hostalarietan abiarazirik dauden "
+#~ "aplikazioak kudeatzeko. Ez baduzu zer egiten ari zaren ulertzen ez gaitu "
+#~ "aukera hau."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Saio eta Abiaraztea"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Abiarazpen Pantaila Ezarpenak"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Abiarazpen pantaila"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Autoabiarazitako aplikazioak"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 Abiarazpen Pantaila Ezarpenak"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Autoabiaraziriko aplikazioak"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Autoabiaraziriko aplikazio zerrenda editatu"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Autoabiaraziriko aplikazioak"
diff --git a/po/fa.po b/po/fa.po
index fdc66c3e..823dfefb 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:35+0900\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian <translation-team-fa@lists.sourceforge.net>\n"
@@ -79,314 +79,349 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "گزینش تصویر..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "پیکربندی ساده..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "قلم"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "رنگها"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "رنگ پس‌زمینه:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "رنگ متن:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "تصویر"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "استفاده از تصویر اختصاصی"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "گزیننده‌ی نشست"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "گزیننده‌ی نمایش در ثبت‌ورود"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "اطلاعات"
+
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"اگر گذارده شده، مدیر نشست از شما برای گزیدن یک نشست در هر بار که به Xfce "
-"ثبت‌ورود میکنید پرسش خواهد کرد."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "تنظیمات ثبت‌خروج"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "ذخیره کردن خودکار نشست هنگام ثبت‌خروج"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "نشست‌ها و شروع"
+
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"این گزینه به مدیر نشست دستور میدهد تا نشست کنونی را بطور خودکار هنگام "
-"ثبت‌خروجتان ذخیره کند. اگر این گزینه را انتخاب نکنید در هر ثبت‌خروج از شما "
-"برای ذخیره‌ی نشست کنونی پرسش خواهد گردید."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "اعلان در ثبت‌خروج"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
-"این گزینه گفتگوی تصدیق ثبت‌خروج را از کار می‌اندازد. آیا نشست ذخیره خواهد شد "
-"یا نه بستگی دارد که شما ذخیره‌ی خودکار نشست را در ثبت‌خروج بکار انداخته باشید "
-"یا که نه. "
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "همخوانی"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "راه‌اندازی سرویس‌های گنوم در شروع"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"اگر خیال دارید از برنامه‌های کاربردی گنوم استفاده کنید این را بکار اندازید. "
-"این به مدیر نشست دستور خواهد داد تا بعضی از سرویس‌های حیاتی گنوم را برایتان "
-"راه بیاندازد. اگر میخواهید از تکنیکهای دستیارانه که همراه گنوم می‌آید استفاده "
-"کنید نیز باید این را بکار اندازید."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "راه‌اندازی سرویس‌های کدئی در شروع"
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
+msgstr "هیچکدام"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"اگر خیال دارید برنامه‌های کاربردی کدئی را مانند بخشی از نشست رومیزی Xfce اجرا "
-"کنید این گزینه را بکار اندازید. این به مقدار قابل توجهی زمان راه‌اندازی را "
-"افزایش میدهد، ولی از طرف دیگر، برنامه‌های کاربردی کدئی سریعتر راه خواهند "
-"افتاد. بعضی از برنامه‌های کاربردی کدئی ممکن است اصلا کار نکنند اگر این گزینه "
-"را بکار نیاندازید."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "امنیت"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "سازماندهی برنامه‌های از راه دور"
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
+msgstr ""
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
-"به مدیر نشست اجازه میدهد تا برنامه‌های در حال اجرای بر روی میزبان های از راه "
-"دور را سازماندهی کند. این گزینه را بکار نیاندازید مگر آنکه بدانید که چکار "
-"دارید میکنید."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "نشست‌ها و شروع"
+#: ../settings/xfae-dialog.c:130
+#, fuzzy
+msgid "Description:"
+msgstr "<b>توضیح:</b>"
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "عمومی"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "پیشرفته"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "نشست‌ها و شروع"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
-msgstr "هیچکدام"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "تنظیمات تصویر آغازی صفحه"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "پیکربندی"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "تابلوی پیکربندی را برای تصویر آغازی صفحه‌ی انتخاب شده باز میکند."
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "آزمایش"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>نویسنده:</b>"
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "تصویر آغازی انتخاب شده را امتحان میکند."
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "همخوانی"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>توضیح:</b>"
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>صفحه‌آغازه:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
 msgstr "اطلاعات"
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "تنظیمات ثبت‌خروج"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
 msgstr "<b>توضیح:</b>"
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "گزیننده‌ی نشست"
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr "<b>نسخه:</b>"
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>نویسنده:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "پیشرفته"
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>صفحه‌آغازه:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "ذخیره کردن خودکار نشست هنگام ثبت‌خروج"
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:12
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "تصویر آغازی"
+msgid "Con_figure"
+msgstr "پیکربندی"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "تصویر آغازی انتخاب شده را امتحان میکند."
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfce4-session-settings.glade.h:15
 #, fuzzy
-msgid "Description:"
-msgstr "<b>توضیح:</b>"
+msgid "Launch GN_OME services on startup"
+msgstr "راه‌اندازی سرویس‌های کدئی در شروع"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "راه‌اندازی سرویس‌های کدئی در شروع"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "سازماندهی برنامه‌های از راه دور"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "تابلوی پیکربندی را برای تصویر آغازی صفحه‌ی انتخاب شده باز میکند."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "تصویر آغازی انتخاب شده را امتحان میکند."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "نشست‌ها و شروع"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "گزیننده‌ی نمایش در ثبت‌ورود"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "عمومی"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "اعلان در ثبت‌خروج"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "نشست جدید"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "آزمایش"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-#, fuzzy
-msgid "Autostarted applications"
-msgstr "سازماندهی برنامه‌های از راه دور"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "بارگزاری تنظیمات رومیزی"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "تأیید تنظیمات DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "بارگزاری داده‌ی نشست"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "گزینش نام نشست"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "ثبت‌خروج"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "ذخیره کردن نشست برای ثبت‌های‌ورود آینده"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "لطفا گذرواژه‌تان را وارد کنید:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>خطائی رخ داد</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -425,15 +460,21 @@ msgstr "نشست جدید"
 msgid "Create a new session."
 msgstr "ایجاد کردن نشستی جدید"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "راه‌انداختن شبح دسته‌کلید گنوم"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "راه‌اندازی تکنیکهای دستیارانه گنوم"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "راه‌اندازی سرویس‌های کدئی"
 
@@ -462,6 +503,31 @@ msgstr "ادامه دادن"
 msgid "Try again"
 msgstr "تلاش مجدد"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "گزینش نشست"
@@ -474,88 +540,88 @@ msgstr "گزینش نام نشست"
 msgid "Choose a name for the new session:"
 msgstr "گزینش نامی برای نشست جدید:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "راه‌اندازی کنترل کننده حجم"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "راه‌اندازی تابلو"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "راه‌اندازی مدیر رومیزی"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "راه‌اندازی میله‌ابزار"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "راه‌اندازی مدیر پنجره"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "راه اندازی شبیه‌ساز پایانه گنوم"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "راه‌اندازی ویرایشگر متن پیشرفته کدئی"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "راه‌اندازی مدیر تخته‌برش کدئی"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "راه‌اندازی پست‌خوان کدئی"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "راه‌اندازی اخبارخوان کدئی"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "راه‌اندازی کانکرر"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "راه‌اندازی شبیه‌ساز پایانه کدئی"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "راه‌اندازی پخشگر رسانه‌ی بیپ"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "راه‌اندازی گیمپ"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "راه‌اندازی ویرایشگر بهینه شده VI"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "راه‌اندازی پراکسی مدیریت نشست"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "راه‌اندازی کارگیر IRC-XChat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "راه‌اندازی سیستم چندرسانه‌ای X"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "راه‌اندازی شبیه‌ساز پایانه X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "راه‌اندازی %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -570,7 +636,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "اجرای شروع خودکار..."
 
@@ -594,43 +660,106 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "نشست‌ها و شروع"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "نشست‌ها و شروع"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "نشست‌ها و شروع"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "تنظیمات تصویر آغازی صفحه"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr ""
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "اگر گذارده شده، مدیر نشست از شما برای گزیدن یک نشست در هر بار که به Xfce "
+#~ "ثبت‌ورود میکنید پرسش خواهد کرد."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "این گزینه به مدیر نشست دستور میدهد تا نشست کنونی را بطور خودکار هنگام "
+#~ "ثبت‌خروجتان ذخیره کند. اگر این گزینه را انتخاب نکنید در هر ثبت‌خروج از شما "
+#~ "برای ذخیره‌ی نشست کنونی پرسش خواهد گردید."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "این گزینه گفتگوی تصدیق ثبت‌خروج را از کار می‌اندازد. آیا نشست ذخیره خواهد "
+#~ "شد یا نه بستگی دارد که شما ذخیره‌ی خودکار نشست را در ثبت‌خروج بکار انداخته "
+#~ "باشید یا که نه. "
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "راه‌اندازی سرویس‌های گنوم در شروع"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "اگر خیال دارید از برنامه‌های کاربردی گنوم استفاده کنید این را بکار "
+#~ "اندازید. این به مدیر نشست دستور خواهد داد تا بعضی از سرویس‌های حیاتی گنوم "
+#~ "را برایتان راه بیاندازد. اگر میخواهید از تکنیکهای دستیارانه که همراه گنوم "
+#~ "می‌آید استفاده کنید نیز باید این را بکار اندازید."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "اگر خیال دارید برنامه‌های کاربردی کدئی را مانند بخشی از نشست رومیزی Xfce "
+#~ "اجرا کنید این گزینه را بکار اندازید. این به مقدار قابل توجهی زمان "
+#~ "راه‌اندازی را افزایش میدهد، ولی از طرف دیگر، برنامه‌های کاربردی کدئی سریعتر "
+#~ "راه خواهند افتاد. بعضی از برنامه‌های کاربردی کدئی ممکن است اصلا کار نکنند "
+#~ "اگر این گزینه را بکار نیاندازید."
+
+#~ msgid "Security"
+#~ msgstr "امنیت"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "به مدیر نشست اجازه میدهد تا برنامه‌های در حال اجرای بر روی میزبان های از "
+#~ "راه دور را سازماندهی کند. این گزینه را بکار نیاندازید مگر آنکه بدانید که "
+#~ "چکار دارید میکنید."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
 #, fuzzy
-msgid "Autostarted Applications"
-msgstr "سازماندهی برنامه‌های از راه دور"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "نشست‌ها و شروع"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
+#~ msgid "Splash Screen Settings"
+#~ msgstr "تنظیمات تصویر آغازی صفحه"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "تصویر آغازی"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr ""
+#, fuzzy
+#~ msgid "Autostarted applications"
+#~ msgstr "سازماندهی برنامه‌های از راه دور"
+
+#, fuzzy
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "تنظیمات تصویر آغازی صفحه"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "نشست جدید"
+#~ msgid "Autostarted Applications"
+#~ msgstr "سازماندهی برنامه‌های از راه دور"
diff --git a/po/fi.po b/po/fi.po
index 3e65f690..a660a68d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-06 12:38+0300\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-09-06 12:39+0300\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -78,311 +78,353 @@ msgstr "Hiiret"
 msgid "Mice Splash Engine"
 msgstr "Hiiret-käynnistyskuvateema"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Valitse kuva..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Simplen asetukset..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Kirjasin"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Värit"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Taustaväri:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Tekstin väri:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Kuva"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Käytä omaa kuvaa"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Yksinkertainen"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Yksinkertainen käynnistyskuvateema"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Istunnon valitsin"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Näytä valitsin sisäänkirjauksen yhteydessä"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Tämän ollessa valittuna istunnonhallinta pyytää valitsemaan istunnon aina "
-"kirjautuessasi Xfce:hen."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Uloskirjautumisen asetukset"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Tallenna istunto automaattisesti lopetettaessa"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Tämä ollessa valittuna istuntosi tallennetaan automaattisesti aina "
-"kirjautuessasi ulos. Muussa tapauksessa sinulta kysytään jokaisen "
-"uloskirjautumisen yhteydessä, haluatko tallentaa nykyisen istunnon."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Näytä uloskirjausdialogi"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Tietoja"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Tämä valinta poistaa uloskirjausdialogin käytöstä. Istunto tallennetaan "
-"tässä tapauksessa vain, jos olet ottanut käyttöön istunnon automaattisen "
-"tallentamisen uloskirjautumisen yhteydessä."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Yhteensopivuus"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Alusta Gnome-palvelut käynnistettäessä"
-
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"Valitse tämä, jos aiot käyttää Gnome-sovelluksia. Istunnonhallinta "
-"käynnistää tällöin tarvittavia Gnomen perusosia valmiiksi. Valitse tämä "
-"myös, jos aiot käyttää Gnomen mukana toimitettavia Apuvälineteknologioita."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Alusta KDE-palvelut käynnistettäessä"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Valitse tämä, jos aiot käyttää KDE-sovelluksia osana Xfce-"
-"työpöytäistuntoasi. Tämä kasvattaa käynnistysaikaa huomattavasti, mutta "
-"toisaalta KDE:n sovellukset käynnistyvät nopeammin. Saattaa olla, etteivät "
-"jotkin KDE-sovellukset toimi ollenkaan ilman tätä asetusta."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Turvallisuus"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Hallitse etäsovelluksia"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Istunto- ja käynnistysasetukset"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Salli istunnonhallinnan hallita myös etäkoneilla suoritettavia sovelluksia. "
-"Älä valitse tätä, jos et varmasti tiedä, mitä olet tekemässä."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Istunnot ja käynnistys"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Yleiset"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Lisäasetukset"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Istunnot ja käynnistys"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Käynnistyskuva-asetukset"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Säädä"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Avaa valitun käynnistykuvan asetuspaneeli."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Kokeile"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Antaa näytteen valitun käynnistyskuvan toiminnasta."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Tietoja"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Kuvaus:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versio:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Tekijä:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Kotisivu:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Käynnistyskuva"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Lisää sovellus"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Komento:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Valitse komento"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Kohteen %s irroitus epäonnistui: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Tiedostoa %s ei voitu luoda"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Tiedostoon %s ei voitu kirjoittaa"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Tiedostoa %s ei voitu avata kirjoitettavaksi"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Sovellusten automaattikäynnistys"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Alla on lista sovelluksista, jotka käynnistetään\n"
 "automaattisesti kirjautuessasi Xfce-työpöydällesi\n"
 "sekä sovelluksista, jotka tallennettiin edellisen\n"
 "uloskirjautumisen yhteydessä:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Tekijä:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Yhteensopivuus"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Kuvaus:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Kotisivu:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Tietoja"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Uloskirjautumisen asetukset"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Kuvaus:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Istunnon valitsin"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versio:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Lisäasetukset"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Tallenna istunto automaattisesti lopetettaessa"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Säädä"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Antaa näytteen valitun käynnistyskuvan toiminnasta."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Alusta KDE-palvelut käynnistettäessä"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Alusta KDE-palvelut käynnistettäessä"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Hallitse etäsovelluksia"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Avaa valitun käynnistykuvan asetuspaneeli."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Antaa näytteen valitun käynnistyskuvan toiminnasta."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Istunnot ja käynnistys"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Näytä valitsin sisäänkirjauksen yhteydessä"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Yleiset"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Näytä uloskirjausdialogi"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Lopeta istunto"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Kokeile"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Ladataan näytön asetuksia"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Varmistetaan DNS-asetukset"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Ladataan istunnon tietoja"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Valitse istunnon nimi"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Kirjaudu ulos"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 "Käynnistä\n"
 "uudelleen"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Sammuta"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Tallenna istunto"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Anna salasanasi:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Virhe</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +463,21 @@ msgstr "Uusi istunto"
 msgid "Create a new session."
 msgstr "Luo uusi istunto."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Käynnistetään Gnomen avainrengaspalvelu"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Käynnistetään Gnomen apuvälineteknologiat"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Käynnistetään KDE-palvelut"
 
@@ -458,6 +506,31 @@ msgstr "Jatka kuitenkin"
 msgid "Try again"
 msgstr "Yritä uudelleen"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Valitse istunto"
@@ -470,88 +543,88 @@ msgstr "Valitse istunnon nimi"
 msgid "Choose a name for the new session:"
 msgstr "Valise nimi uudelle istunnolle:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Käynnistetään äänenvoimakkuuden säädin"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Käynnistetään paneeli"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Käynnistetään työpöydänhallinta"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Käynnistetään tehtäväpalkki"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Käynnistetään ikkunoidenhallinta"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Käynnistetään Gnomen pääteohjelma"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Käynnistetään KDE:n edistynyt tekstieditori (Kate)"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Käynnistetään KDE:n leikepöydänhallinta"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Käynnistetään KDE:n sähköpostiohjelma"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Käynnistetään KDE:n uutisryhmäohjelma"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Käynnistetään Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Käynnistetään KDE:n pääteohjelma"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Käynnistetään Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Käynnistetään Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Käynnistetään VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Käynnistetään istunnonhallinnan välipalvelin"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Käynnistetään X-Chat IRC-asiakasohjelma"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Käynnistetään X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Käynnistetään X Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Käynnistetään %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -575,7 +648,7 @@ msgstr ""
 "on onnistuneesti haettu uuteen sijaintiin.\n"
 "Vanha hakemisto pitäisi nyt poistaa.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Suoritetaan automaattinen käynnistys..."
 
@@ -599,37 +672,101 @@ msgstr "Vinkkejä ja kikkoja"
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Istunto- ja käynnistysasetukset"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Istuntojen ja käynnistyksen asetukset"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 istuntojen ja käynnistyksen asetukset"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 käynnistyskuva-asetukset"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Sovellusten automaattikäynnistys"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Muokkaa automaattikäynnistyslistaa"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 sovellusten automaattikäynnistys"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-vinkit"
 
-#~ msgid "End Session"
-#~ msgstr "Lopeta istunto"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Tämän ollessa valittuna istunnonhallinta pyytää valitsemaan istunnon aina "
+#~ "kirjautuessasi Xfce:hen."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Tämä ollessa valittuna istuntosi tallennetaan automaattisesti aina "
+#~ "kirjautuessasi ulos. Muussa tapauksessa sinulta kysytään jokaisen "
+#~ "uloskirjautumisen yhteydessä, haluatko tallentaa nykyisen istunnon."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Tämä valinta poistaa uloskirjausdialogin käytöstä. Istunto tallennetaan "
+#~ "tässä tapauksessa vain, jos olet ottanut käyttöön istunnon automaattisen "
+#~ "tallentamisen uloskirjautumisen yhteydessä."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Alusta Gnome-palvelut käynnistettäessä"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Valitse tämä, jos aiot käyttää Gnome-sovelluksia. Istunnonhallinta "
+#~ "käynnistää tällöin tarvittavia Gnomen perusosia valmiiksi. Valitse tämä "
+#~ "myös, jos aiot käyttää Gnomen mukana toimitettavia Apuvälineteknologioita."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Valitse tämä, jos aiot käyttää KDE-sovelluksia osana Xfce-"
+#~ "työpöytäistuntoasi. Tämä kasvattaa käynnistysaikaa huomattavasti, mutta "
+#~ "toisaalta KDE:n sovellukset käynnistyvät nopeammin. Saattaa olla, "
+#~ "etteivät jotkin KDE-sovellukset toimi ollenkaan ilman tätä asetusta."
+
+#~ msgid "Security"
+#~ msgstr "Turvallisuus"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Salli istunnonhallinnan hallita myös etäkoneilla suoritettavia "
+#~ "sovelluksia. Älä valitse tätä, jos et varmasti tiedä, mitä olet tekemässä."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Istunnot ja käynnistys"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Käynnistyskuva-asetukset"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Käynnistyskuva"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Sovellusten automaattikäynnistys"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 käynnistyskuva-asetukset"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Sovellusten automaattikäynnistys"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Muokkaa automaattikäynnistyslistaa"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 sovellusten automaattikäynnistys"
diff --git a/po/fr.po b/po/fr.po
index c6fc4e24..c4a703e9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-10-31 18:57+0100\n"
 "Last-Translator: Mike Massonnet <mmassonnet@gmail.com>\n"
 "Language-Team: French <xfce-i18n@xfce.org>\n"
@@ -26,13 +26,19 @@ msgstr "Choisir le fichier de thème à installer..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Impossible d'installer le thème d'écran de démarrage du fichier %s, veuillez vérifier que le fichier est une archive de thème d'écran de démarrage valide"
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Impossible d'installer le thème d'écran de démarrage du fichier %s, veuillez "
+"vérifier que le fichier est une archive de thème d'écran de démarrage valide"
 
 #: ../engines/balou/config.c:386
 #, c-format
 msgid "Unable to remove splash theme \"%s\" from directory %s."
-msgstr "Impossible de supprimer le thème d'écran de démarrage \"%s\" du répertoire %s."
+msgstr ""
+"Impossible de supprimer le thème d'écran de démarrage \"%s\" du répertoire %"
+"s."
 
 #: ../engines/balou/config.c:471
 msgid "Choose theme filename..."
@@ -74,280 +80,361 @@ msgstr "Souris"
 msgid "Mice Splash Engine"
 msgstr "Moteur d'écran de démarrage souris"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Choisir l'image..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configurer Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Police"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Couleurs"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Couleur d'arrière plan:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Couleur de texte:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Image"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Utiliser une image personnalisée"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Moteur d'écran de démarrage simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sélection de session"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Afficher la sélection de session à chaque connexion"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "Si coché, le gestionnaire de session proposera de choisir une session à chaque fois que vous vous connecterez à Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Paramètres de déconnexion"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Enregistrer automatiquement la session lors de la fermeture"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "Cette option indique au gestionnaire de session de sauvegarder automatiquement la session courante lors de la déconnexion. Si cette option n'est pas activée, la sauvegarde de la session courante sera demandée à chaque déconnexion."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Demander à la déconnexion"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "Cette option désactive la boîte de confirmation de déconnexion. La sauvegarde de la session est déterminée par l'activation de l'option de sauvegarde automatique de session."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilité"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Charger les services Gnome au démarrage"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Activer cette option pour l'utilisation d'application Gnome. Le gestionnaire de session démarrera automatiquement des services vitaux pour Gnome. Cette option devra également être activée pour utiliser les outils d'assistance (Assistive Technologies) qui sont livrés avec Gnome."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Information"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Charger les services KDE au démarrage"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Activer cette option pour utiliser des applications KDE dans le bureau Xfce. Cela va rallonger notablement le temps de connexion, mais d'un autre coté, les application KDE se chargeront plus rapidement. Certaines applications KDE ne fontionnent pas du tout si cette option n'est pas activée."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Sécurité"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Gérer les applications distantes"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Paramètres de session et de démarrage"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Autoriser le gestionnaire de session à gérer les applications qui fonctionnent sur des systèmes distants. N'activez pas cette option à moins de savoir ce que vous faites."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessions et Démarrage"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Général"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avancé"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessions et démarrage"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Aucun"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Paramétrage de l'écran de démarrage"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configurer"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Afficher le panneau de configuration pour l'écran de démarrage sélectionné."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Tester"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Démonstration de l'écran de démarrage sélectionné."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Information"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Description :</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Version :</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Auteur :</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Site web :</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Écran de démarrage"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Ajouter application"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Description:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Commande:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Sélectionner une commande"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Échec à la supression du lien %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Échec à la création du fichier %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Échec à l'écriture du fichier %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Échec à l'ouverture pour écriture de %s"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Applications démarrées automatiquement"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Ci-dessous se trouve la liste des applications\n"
 "démarrées automatiquement lors de votre prochaine\n"
 "connexion au bureau Xfce, en plus de celles sauvegardées\n"
 "lors de votre dernière déconnexion:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Auteur :</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilité"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Description :</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Site web :</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Information"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Paramètres de déconnexion"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Description :</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sélection de session"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Version :</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avancé"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Enregistrer automatiquement la session lors de la fermeture"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configurer"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Démonstration de l'écran de démarrage sélectionné."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Charger les services KDE au démarrage"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Charger les services KDE au démarrage"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Gérer les applications distantes"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr ""
+"Afficher le panneau de configuration pour l'écran de démarrage sélectionné."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Démonstration de l'écran de démarrage sélectionné."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessions et Démarrage"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Afficher la sélection de session à chaque connexion"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Général"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Demander à la déconnexion"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Terminer la session"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Tester"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Chargement des paramètres du bureau"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Vérification des paramètres DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Chargement des données de la session"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Choisir le nom de la session"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Déconnexion"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Redémarrer"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Éteindre"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr ""
 "_Enregistrer la session pour les\n"
 "prochaines connexions"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Entrer votre mot de passe s'il vous plaît :"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Une erreur s'est produite</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Soit le mot de passe que vous avez entré est invalide, soit l'administrateur du système n'autorise pas l'arrêt de cet ordinateur avec votre compte utilisateur."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Soit le mot de passe que vous avez entré est invalide, soit l'administrateur "
+"du système n'autorise pas l'arrêt de cet ordinateur avec votre compte "
+"utilisateur."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -355,8 +442,12 @@ msgid "Last accessed: %s"
 msgstr "Dernièrement accédé le: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Choisir la session à restaurer. Vous pouvez simplement double-cliquer sur le nom de la session pour la restaurer."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Choisir la session à restaurer. Vous pouvez simplement double-cliquer sur le "
+"nom de la session pour la restaurer."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -376,15 +467,21 @@ msgstr "Nouvelle session"
 msgid "Create a new session."
 msgstr "Créer une nouvelle session."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Démarrage de Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Démarrage des outils d'assistance Gnome (Assistive Technologies)"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Démarrage des services KDE"
 
@@ -413,6 +510,31 @@ msgstr "Continuer quand même"
 msgid "Try again"
 msgstr "Réessayer"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Choisir une session"
@@ -425,88 +547,88 @@ msgstr "Choisir le nom de la session"
 msgid "Choose a name for the new session:"
 msgstr "Choisir un nom pour la nouvelle session:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Démarrage du contrôleur de volume"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Démarrage du Panneau"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Démarrage du gestionnaire de bureau"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Démarrage de la barre de tâches"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Démarrage du gestionnaire de fenêtres"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Démarrage de l'émulateur de terminal Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Démarrage de l'éditeur de texte avancé de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Démarrage du gestionnaire de presse-papier de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Démarrage du client messagerie de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Démarrage du client de nouvelles de KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Démarrage de Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Démarrage de l'émulateur de terminal KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Démarrage de Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Démarrage de The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Démarrage de VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Démarrage du Proxy Gestionnaire de Session"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Démarrage du client IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Démarrage de X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Démarrage du Terminal X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Démarrage de %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -527,20 +649,19 @@ msgstr ""
 "\n"
 "où vous pouvez placer les fichiers .desktop qui décrivent les applications\n"
 "à démarrer lors de votre connexion au bureau Xfce. Les fichiers de votre\n"
-"ancien répertoire d'auto-démarrage ont été migrés avec succès vers lenouvel emplacement.\n"
+"ancien répertoire d'auto-démarrage ont été migrés avec succès vers lenouvel "
+"emplacement.\n"
 "Vous devriez supprimer cet ancien répertoire maintenant.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Démarrage automatique..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Trucs et astuces"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Message du jour"
 
@@ -548,8 +669,7 @@ msgstr "Message du jour"
 msgid "Display tips on _startup"
 msgstr "Afficher les astuces au _démarrage"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Trucs et astuces"
 
@@ -557,38 +677,105 @@ msgstr "Trucs et astuces"
 msgid "Next"
 msgstr "Suivant"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Paramètres de session et de démarrage"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Paramètres de sessions et de démarrage"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 Gestionnaire de session"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 Paramètres de l'écran de démarrage"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Applications démarrées automatiquement"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Éditer la liste d'applications démarrées automatiquement"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Applications démarrées automatiquement"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "astuces-xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "Terminer la session"
-
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Si coché, le gestionnaire de session proposera de choisir une session à "
+#~ "chaque fois que vous vous connecterez à Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Cette option indique au gestionnaire de session de sauvegarder "
+#~ "automatiquement la session courante lors de la déconnexion. Si cette "
+#~ "option n'est pas activée, la sauvegarde de la session courante sera "
+#~ "demandée à chaque déconnexion."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Cette option désactive la boîte de confirmation de déconnexion. La "
+#~ "sauvegarde de la session est déterminée par l'activation de l'option de "
+#~ "sauvegarde automatique de session."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Charger les services Gnome au démarrage"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Activer cette option pour l'utilisation d'application Gnome. Le "
+#~ "gestionnaire de session démarrera automatiquement des services vitaux "
+#~ "pour Gnome. Cette option devra également être activée pour utiliser les "
+#~ "outils d'assistance (Assistive Technologies) qui sont livrés avec Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Activer cette option pour utiliser des applications KDE dans le bureau "
+#~ "Xfce. Cela va rallonger notablement le temps de connexion, mais d'un "
+#~ "autre coté, les application KDE se chargeront plus rapidement. Certaines "
+#~ "applications KDE ne fontionnent pas du tout si cette option n'est pas "
+#~ "activée."
+
+#~ msgid "Security"
+#~ msgstr "Sécurité"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Autoriser le gestionnaire de session à gérer les applications qui "
+#~ "fonctionnent sur des systèmes distants. N'activez pas cette option à "
+#~ "moins de savoir ce que vous faites."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessions et démarrage"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Paramétrage de l'écran de démarrage"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Écran de démarrage"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Applications démarrées automatiquement"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 Paramètres de l'écran de démarrage"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Applications démarrées automatiquement"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Éditer la liste d'applications démarrées automatiquement"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Applications démarrées automatiquement"
diff --git a/po/gl.po b/po/gl.po
index e4e343ff..88b49018 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-07-25 19:00+0000\n"
 "Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -35,8 +35,8 @@ msgid ""
 "Unable to install splash theme from file %s, please check that the file is a "
 "valid splash theme archive."
 msgstr ""
-"Non é posíbel instala-lo tema de arrinque dende o ficheiro «%s», verifique "
-"se o ficheiro é un arquivo válido dun tema de arrinque."
+"Non é posíbel instala-lo tema de arrinque dende o ficheiro «%s», verifique se "
+"o ficheiro é un arquivo válido dun tema de arrinque."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -83,314 +83,354 @@ msgstr "Ratos"
 msgid "Mice Splash Engine"
 msgstr "Motor de arrinque Ratos"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Escoller imaxe..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configurar Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Tipo de letra"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Cores"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Cor de fondo:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Cor do texto:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Usar imaxe personalizada"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Motor de arrinque Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Selector de sesión"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Amosar selector de sesión ó inicio"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Se se seleciona, o xestor de sesión pediralle que escolla unha sesión sempre "
-"que entre no Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Axustes do remate de sesión"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Gardar sesión automaticamente ó saír"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Esta opción indica ó xestor de sesión que garde a sesión actual de xeito "
-"automático cando saia. Se non selecciona esta opción daquela preguntaráselle "
-"sempre que saia se desexa garda-la sesión."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Preguntar ó saír"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Información"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Esta opción inhabilita o diálogo de confirmación da saída. A sesión será ou "
-"non gardada dependendo de se habilitou ou non o gardado automático de sesión "
-"na saída."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilidade"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Executa-los servizos do Gnome no arrinque"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Habilite isto se está a pensar usar aplicacións do escritorio Gnome. Isto "
-"indicará ó xestor de sesión que inicie algúns servizos vitais do Gnome. "
-"Tamén debe habilitar esta opción se pretende usa-las tecnoloxías de "
-"asistencia que veñen co Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Executa-los servizos do KDE no arrinque"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Habilite isto se está a pensar usar aplicacións do escritorio KDE na súa "
-"sesión de Xfce. Isto incrementará notabelmente o tempo de arrinque, mais "
-"pola outra banda, as aplicacións do KDE iniciaranse máis axiña. Pode que "
-"algunhas aplicacións do KDE non funcionen se non habilita esta opción."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Seguranza"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Xestionar aplicacións remotas"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Axustes de sesión e inicio"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Permite, ó xestor de sesión, xestionar aplicacións que se executan en "
-"máquinas remotas. Non habilite esta opción se non está certo do que está a "
-"facer."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesións e arrinque"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Xeral"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avanzado"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Texto do botón|Sesións e arrinque"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Ningún"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Axustes da pantalla de inicio"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Abre o panel de configuración para a pantalla de inicio seleccionada."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Probar"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Fai unha demostración da pantalla de inicio seleccionada."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Información"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Descrición:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versión:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Páxina web:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Texto do botón|Pantalla de inicio"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Engadir aplicación"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Instrución:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Seleccione unha instrución"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Non se puido eliminar «%s»: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Non se puido crea-lo ficheiro «%s»"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Non se puido escribir no ficheiro «%s»"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Non se puido abrir «%s» para escritura"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aplicacións con arrinque automático"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Embaixo está a listaxe de aplicacións que se iniciarán\n"
 "automaticamente cando inicie sesión no escritorio Xfce,\n"
 "ademais das aplicacións que foron gardadas cando\n"
 "rematou a súa última sesión:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilidade"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descrición:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Páxina web:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Información"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Axustes do remate de sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Descrición:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Selector de sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versión:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avanzado"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Gardar sesión automaticamente ó saír"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configurar"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Fai unha demostración da pantalla de inicio seleccionada."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Executa-los servizos do KDE no arrinque"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Executa-los servizos do KDE no arrinque"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Xestionar aplicacións remotas"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Abre o panel de configuración para a pantalla de inicio seleccionada."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Fai unha demostración da pantalla de inicio seleccionada."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesións e arrinque"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Amosar selector de sesión ó inicio"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Xeral"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Preguntar ó saír"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Finalizar sesión"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Probar"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Cargando os axustes de escritorio"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Verificando os axustes do DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Cargando os datos da sesión"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Escolle-lo nome da sesión"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "Salir"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 #, fuzzy
 msgid "Shut Down"
 msgstr "Apagar"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "Garda-la _sesión para sesións futuras"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Por favor, introduza o seu contrasinal:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Aconteceu un erro</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -429,15 +469,21 @@ msgstr "Nova sesión"
 msgid "Create a new session."
 msgstr "Crear unha nova sesión."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Iniciando o «daemon» de claves do Gnome"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Iniciando as tecnoloxías de asistencia do Gnome"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Iniciando os servizos do KDE"
 
@@ -466,6 +512,31 @@ msgstr "Continuar de tódolos xeitos"
 msgid "Try again"
 msgstr "Tentalo de novo"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Escolle-la sesión"
@@ -478,88 +549,88 @@ msgstr "Escolle-lo nome da sesión"
 msgid "Choose a name for the new session:"
 msgstr "Escoller un nome para a nova sesión:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Iniciando o controlador de volume"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Iniciando el panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Iniciando o xestor de escritorio"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Iniciando a barra de tarefas"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Iniciando o xestor de xanelas"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Iniciando o emulador de terminal do Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Iniciando o editor de texto avanzado do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Iniciando o xestor de portapapeis do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Iniciando o lector de correo do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Iniciando o lector de novas do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Iniciando o Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Iniciando o emulador de terminal do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Iniciando o reprodutor de medios Beep"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Iniciando o Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Iniciando o editor millorado VI"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Iniciando o proxy xestor de sesións"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Iniciando o cliente do IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Iniciando o sistema multimedios X"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Iniciando o emulador de terminal do X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -584,7 +655,7 @@ msgstr ""
 "autoarrinque antigo á nova localización.\n"
 "Agora débeo eliminar.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Realizando autoarrinque..."
 
@@ -608,37 +679,106 @@ msgstr "Consellos e trucos"
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Axustes de sesión e inicio"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Axustes de sesións e inicio"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Axustes de sesións e inicio do Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Axustes da pantalla de inicio do Xfce 4"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr "Consellos do xfce4"
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Se se seleciona, o xestor de sesión pediralle que escolla unha sesión "
+#~ "sempre que entre no Xfce."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aplicacións con arrinque automático"
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Esta opción indica ó xestor de sesión que garde a sesión actual de xeito "
+#~ "automático cando saia. Se non selecciona esta opción daquela "
+#~ "preguntaráselle sempre que saia se desexa garda-la sesión."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Esta opción inhabilita o diálogo de confirmación da saída. A sesión será "
+#~ "ou non gardada dependendo de se habilitou ou non o gardado automático de "
+#~ "sesión na saída."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Edita-la listaxe de aplicacións con arrinque automático"
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Executa-los servizos do Gnome no arrinque"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Aplicacións con arrinque automático do Xfce 4"
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Habilite isto se está a pensar usar aplicacións do escritorio Gnome. Isto "
+#~ "indicará ó xestor de sesión que inicie algúns servizos vitais do Gnome. "
+#~ "Tamén debe habilitar esta opción se pretende usa-las tecnoloxías de "
+#~ "asistencia que veñen co Gnome."
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr "Consellos do xfce4"
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Habilite isto se está a pensar usar aplicacións do escritorio KDE na súa "
+#~ "sesión de Xfce. Isto incrementará notabelmente o tempo de arrinque, mais "
+#~ "pola outra banda, as aplicacións do KDE iniciaranse máis axiña. Pode que "
+#~ "algunhas aplicacións do KDE non funcionen se non habilita esta opción."
+
+#~ msgid "Security"
+#~ msgstr "Seguranza"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Permite, ó xestor de sesión, xestionar aplicacións que se executan en "
+#~ "máquinas remotas. Non habilite esta opción se non está certo do que está "
+#~ "a facer."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Texto do botón|Sesións e arrinque"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Axustes da pantalla de inicio"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Texto do botón|Pantalla de inicio"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aplicacións con arrinque automático"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Axustes da pantalla de inicio do Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aplicacións con arrinque automático"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Edita-la listaxe de aplicacións con arrinque automático"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Aplicacións con arrinque automático do Xfce 4"
 
 #~ msgid "Show hibernate button"
 #~ msgstr "Amosar botón de hibernar"
@@ -670,6 +810,3 @@ msgstr "Consellos do xfce4"
 
 #~ msgid "Hibernate"
 #~ msgstr "Hibernar"
-
-#~ msgid "End Session"
-#~ msgstr "Finalizar sesión"
diff --git a/po/gu.po b/po/gu.po
index 2e926782..c93ef571 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:38+0900\n"
 "Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
@@ -80,311 +80,353 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "ઈમેજ પસંદ કરો..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "સાદુ રુપરેખાંકિત કરો..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "ફોન્ટ"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "રંગો"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "પાશ્વ ભાગનો રંગ:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "લખાણનો રંગ:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "ઈમેજ"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "કસ્ટમ ઈમેજ વાપરો"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "સત્ર પસંદ કરનાર"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "પ્રવેશ પર પસંદ કરનાર ડિસ્પ્લે કરો"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"જો સુયોજિત હોય, તો સત્ર વ્યવસ્થાપક તમને દર વખતે જ્યારે તમે Xfce માં પ્રવેશો ત્યારે સત્ર પસંદ "
-"કરવા માટે પૂછે છે."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "બહાર નીકળવાના સુયોજનો"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "જ્યારે બહાર નીકળો આપોઆપ સત્ર સંગ્રહો"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"આ વિકલ્પ સત્ર વ્યવસ્થાપકને જ્યારે તમે બહાર નીકળી જાવ ત્યારે વર્તમાન સત્ર આપોઆપ સંગ્રહવા "
-"માટે સૂચન કરે છે. જો તમે આ વિકલ્પ પસંદ કરો નહિં તો તમને પૂછવામાં આવશે કે શું તમે દરેક "
-"પ્રવેશમાંથી દૂર થવા પર શું વર્તમાન સત્ર સંગ્રહવા માંગો છો કે નહિં."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "બહાર નીકળો ત્યારે પૂછો"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "જાણકારી"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"આ વિકલ્પ બહાર નીકળતી વખતનો ખાતરી સંવાદ નિષ્ક્રિય કરે છે. શું સત્ર સંગ્રહાશે અથવા બહાર "
-"નીકળવા પર શું સત્રો આપોઆપ સંગ્રહાવા પર આધાર રાખશે કે નહિં."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "સુસંગતતા"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "શરુઆતમાં જીનોમ સેવાઓ લોન્ચ કરો"
-
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"જો તમે જીનોમ કાર્યક્રમો વાપરવાની યોજના ઘડી રહ્યા હોય તો આને સક્રિય કરો. આ સત્ર "
-"વ્યવસ્થાપકને તમારા માટે વિશાળ જીનોમ સેવાઓ શરૂ કરવા માટે સૂચન કરશે. જો તમે સહાયક "
-"ટેક્નોલોજીઓ કે જીનોમ સાથે આવે છે તેને પણ વાપરવા માંગો તો તમારે આને સક્રિય કરવું જોઈએ."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "શરુઆતમા KDE સેવાઓ લોન્ચ કરો"
-
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"જો તમે KDE કાર્યક્રમોને તમારા Xfce ડેસ્કટોપ સત્રના ભાગ તરીકે ચલાવવા માંગો તો આ વિકલ્પ "
-"સક્રિય કરો. આ કદાચ તમારો શરૂઆતનો સમયમાં વધારો કરશે, પરંતુ બીજી બાજુએ, KDE કાર્યક્રમો "
-"ઝડપી શરૂ થશે. અમુક KDE કાર્યક્રમો કામ કરશે નહિં જો તમે આ વિકલ્પ સક્રિય કરશો નહિં."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "સુરક્ષા"
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "દૂરના કાર્યક્રમોની વ્યવસ્થા કરો"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "સત્રો અને શરુઆત સુયોજનો"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"સત્ર વ્યવસ્થાપકને દૂરસ્થ યજમાનો પર ચાલતા કાર્યક્રમોની વ્યવસ્થા કરવાની પરવાનગી આપો. જ્યાં "
-"સુધી તમે જાણતા નહિં હોય કે તમે શું કરી રહ્યા છો ત્યાં સુધી આ વિકલ્પ સક્રિય કરો નહિં."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "સત્રો અને શરુઆત"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "સામાન્ય"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "ઉન્નત"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "સત્રો અને શરુઆત"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "કંઈ નહિં"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "ઝબૂકતી સ્ક્રીનના સુયોજનો"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "રુપરેખાંકિત કરો"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "પસંદ કરેલ ઝબૂકતી સ્ક્રીન માટે રુપરેખાંકન પેનલ ખોલે છે."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "ચકાસણી"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "પસંદ કરેલ ઝબૂક સ્ક્રીન વર્ણવે છે."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "જાણકારી"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>વર્ણન:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>આવૃત્તિ:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>લેખક:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>ઘર પાનું:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-#, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "ઝબૂક સ્ક્રીન"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "કાર્યક્રમ ઉમેરો"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "નામ:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "વર્ણન:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "આદેશ:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "આદેશ પસંદ કરો"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "%s ની કડી દૂર કરવામાં અસમર્થ: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "ફાઈલ %s બનાવવામાં નિષ્ફળ"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "ફાઈલ %s લખવામાં નિષ્ફળ"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "%s ને લખવા માટે ખોલવામાં નિષ્ફળ"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "કાર્યક્રમો આપોઆપ શરૂ કરેલ"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "નીચે કાર્યક્રમોની યાદી છે કે જે આપોઆપ શરૂ થશે\n"
 "જ્યારે તમે તમારા Xfce ડેસ્કટોપમાં પ્રવેશ કરો,\n"
 "કાર્યક્રમો સાથે વધુમાં કે જેઓ સંગ્રહાયેલ છે જ્યારે તમે\n"
 "છેલ્લા સમયે પ્રવેશ બહાર નીકળેલ હશો"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>લેખક:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "સુસંગતતા"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>વર્ણન:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>ઘર પાનું:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "જાણકારી"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "બહાર નીકળવાના સુયોજનો"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>વર્ણન:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "સત્ર પસંદ કરનાર"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>આવૃત્તિ:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "ઉન્નત"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "જ્યારે બહાર નીકળો આપોઆપ સત્ર સંગ્રહો"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "રુપરેખાંકિત કરો"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "પસંદ કરેલ ઝબૂક સ્ક્રીન વર્ણવે છે."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "શરુઆતમા KDE સેવાઓ લોન્ચ કરો"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "શરુઆતમા KDE સેવાઓ લોન્ચ કરો"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "દૂરના કાર્યક્રમોની વ્યવસ્થા કરો"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "પસંદ કરેલ ઝબૂકતી સ્ક્રીન માટે રુપરેખાંકન પેનલ ખોલે છે."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "પસંદ કરેલ ઝબૂક સ્ક્રીન વર્ણવે છે."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "સત્રો અને શરુઆત"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "પ્રવેશ પર પસંદ કરનાર ડિસ્પ્લે કરો"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "સામાન્ય"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "બહાર નીકળો ત્યારે પૂછો"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "નવું સત્ર"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "ચકાસણી"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "ડેસ્કટોપ સુયોજનો લાવી રહ્યા છીએ"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS સુયોજનો ચકાસી રહ્યા છીએ"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "સત્ર માહિતી લાવી રહ્યા છીએ"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "સત્ર નામ પસંદ કરો"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "બહાર નીકળો"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "ભવિષ્યમાં પ્રવેશો માટે સત્ર સંગ્રહો (_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "મહેરબાની કરીને તમારો પાસવર્ડ દાખલ કરો:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>ભૂલ ઉદ્દભવી હતી</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -423,15 +465,21 @@ msgstr "નવું સત્ર"
 msgid "Create a new session."
 msgstr "નવું સત્ર બનાવો."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "જીનોમ કીરીંગ ડીમન શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "જીનોમ મદદગાર ટેક્નોલોજીઓ શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE સેવાઓ શરુ કરી રહ્યા છીએ"
 
@@ -460,6 +508,31 @@ msgstr "કોઈપણ રીતે ચાલુ રાખો"
 msgid "Try again"
 msgstr "ફરીથી પ્રયત્ન કરો"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "સત્ર પસંદ કરો"
@@ -472,88 +545,88 @@ msgstr "સત્ર નામ પસંદ કરો"
 msgid "Choose a name for the new session:"
 msgstr "નવા સત્ર માટે નામ પસંદ કરો:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "અવાજ નિયંત્રક શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "પેનલ શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "ડેસ્કટોપ વ્યવસ્થાપક શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "સ્થિતિદર્શક પટ્ટી શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "વિન્ડો વ્યવસ્થાપક શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "જીનોમ ટર્મિનલ ઈમ્યુલેટર શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE ઉન્નત લખાણ સંપાદક શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE ક્લિપબોર્ડ વ્યવસ્થાપક શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE મેઈલ વાંચનાર શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE સમાચાર વાંચનાર શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE ટર્મિનલ ઈમ્યુલેટર શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Beep મિડીયા પ્લેયર શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Gimp શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI Improved સંપાદક શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "સત્ર વ્યવસ્થાપક પ્રોક્સી શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat IRC Client શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "X મલ્ટીમિડીયા સિસ્ટમ શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X ટર્મિનલ ઈમ્યુલેટર શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s શરુ કરી રહ્યા છીએ"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -578,7 +651,7 @@ msgstr ""
 "થઈ ગયેલ છે.\n"
 "આ ડિરેક્ટરી તમારે હમણાં કાઢી નાંખવી જોઈએ.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "આપોઆપ શરુ કરી રહ્યા છીએ..."
 
@@ -603,38 +676,102 @@ msgstr "મદદો અને તરકીબો"
 msgid "Next"
 msgstr "આગળ"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "સત્રો અને શરુઆત સુયોજનો"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "સત્રો અને શરુઆત સુયોજનો"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 સત્રો અને શરૂઆત સુયોજનો"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 ઝબૂક સ્ક્રીન સુયોજનો"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "આપોઆપશરૂ થયેલ કાર્યક્રમો"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "આપોઆપ શરૂ થયેલ કાર્યક્રમોની યાદીમાં ફેરફાર કરો"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 આપોઆપશરૂ થયેલ કાર્યક્રમો"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "જો સુયોજિત હોય, તો સત્ર વ્યવસ્થાપક તમને દર વખતે જ્યારે તમે Xfce માં પ્રવેશો ત્યારે સત્ર "
+#~ "પસંદ કરવા માટે પૂછે છે."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "આ વિકલ્પ સત્ર વ્યવસ્થાપકને જ્યારે તમે બહાર નીકળી જાવ ત્યારે વર્તમાન સત્ર આપોઆપ સંગ્રહવા "
+#~ "માટે સૂચન કરે છે. જો તમે આ વિકલ્પ પસંદ કરો નહિં તો તમને પૂછવામાં આવશે કે શું તમે દરેક "
+#~ "પ્રવેશમાંથી દૂર થવા પર શું વર્તમાન સત્ર સંગ્રહવા માંગો છો કે નહિં."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "આ વિકલ્પ બહાર નીકળતી વખતનો ખાતરી સંવાદ નિષ્ક્રિય કરે છે. શું સત્ર સંગ્રહાશે અથવા બહાર "
+#~ "નીકળવા પર શું સત્રો આપોઆપ સંગ્રહાવા પર આધાર રાખશે કે નહિં."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "શરુઆતમાં જીનોમ સેવાઓ લોન્ચ કરો"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "જો તમે જીનોમ કાર્યક્રમો વાપરવાની યોજના ઘડી રહ્યા હોય તો આને સક્રિય કરો. આ સત્ર "
+#~ "વ્યવસ્થાપકને તમારા માટે વિશાળ જીનોમ સેવાઓ શરૂ કરવા માટે સૂચન કરશે. જો તમે સહાયક "
+#~ "ટેક્નોલોજીઓ કે જીનોમ સાથે આવે છે તેને પણ વાપરવા માંગો તો તમારે આને સક્રિય કરવું જોઈએ."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "જો તમે KDE કાર્યક્રમોને તમારા Xfce ડેસ્કટોપ સત્રના ભાગ તરીકે ચલાવવા માંગો તો આ "
+#~ "વિકલ્પ સક્રિય કરો. આ કદાચ તમારો શરૂઆતનો સમયમાં વધારો કરશે, પરંતુ બીજી બાજુએ, KDE "
+#~ "કાર્યક્રમો ઝડપી શરૂ થશે. અમુક KDE કાર્યક્રમો કામ કરશે નહિં જો તમે આ વિકલ્પ સક્રિય "
+#~ "કરશો નહિં."
+
+#~ msgid "Security"
+#~ msgstr "સુરક્ષા"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "સત્ર વ્યવસ્થાપકને દૂરસ્થ યજમાનો પર ચાલતા કાર્યક્રમોની વ્યવસ્થા કરવાની પરવાનગી આપો. "
+#~ "જ્યાં સુધી તમે જાણતા નહિં હોય કે તમે શું કરી રહ્યા છો ત્યાં સુધી આ વિકલ્પ સક્રિય કરો નહિં."
+
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "નવું સત્ર"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "સત્રો અને શરુઆત"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "ઝબૂકતી સ્ક્રીનના સુયોજનો"
+
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "ઝબૂક સ્ક્રીન"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "કાર્યક્રમો આપોઆપ શરૂ કરેલ"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 ઝબૂક સ્ક્રીન સુયોજનો"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "આપોઆપશરૂ થયેલ કાર્યક્રમો"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "આપોઆપ શરૂ થયેલ કાર્યક્રમોની યાદીમાં ફેરફાર કરો"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 આપોઆપશરૂ થયેલ કાર્યક્રમો"
diff --git a/po/he.po b/po/he.po
index 78018918..c450ae48 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-05-05 22:33+0300\n"
 "Last-Translator: Yuval Tanny <tanai@int.gov.il>\n"
 "Language-Team: Hebrew\n"
@@ -81,305 +81,351 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "מנוע הנפשה Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "בחר תמונה..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "הגדר פשוט..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "גופן"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "צבעים"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "צבע רקע:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "צבע טקסט:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "תמונה"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "השתמש בתמונה מותאמת אישית"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "מנוע הנפשה Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "בוחר ההפעלה"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "הצג בחירה בכל התחברות"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
-msgstr "אם מסומן, מנהל ההפעלה ישאל אותך לבחור הפעלה בכל פעם שתתחבר לXfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "הגדרות התנתקות"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "שמור הפעלה באופן אוטומטי בהתנתקות"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"בחירה זו מגדירה למנהל ההפעלה לשמור את ההפעלה באופן אוטומטי בזמן התנתקות. אם "
-"בחירה זו לא מסומנת מנהל ההפעלה ישאל אותך אם ברצונך לשמור את ההפעלה הנוכחית "
-"בכל התנתקות."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "הקפץ בהתנתקות"
-
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"אפשרות זו מבטלת את השאלה אם לשמור או לא לשמור את מצב ההפעלה עת התנתקות. "
-"קביעה זו תהיה תלויה אם אפשרת את שמירת ההפעלה האוטומטית או לא."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "תאימות"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "הפעל אוטומטית את שרותי ה GNOME"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "מידע"
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"יש לאפשר בחירה זו אם בכוונתך להשתמש ביישומי GNOME. אם בחירה זו מסומנת, מנהל "
-"ההפעלה יפעיל מספר שרותים של GNOME בשבילך. יש גם צורך לאפשר את בחירה זו במקרה "
-"שברצונך להשתמש בטכנולוגיות הסייוע שמגיעות עם GNOME."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "הפעל אוטומטית את שרותי ה KDE"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"יש לאפשר בחירה זו אם בכוונתך להשתמש ביישומי KDE. אם בחירה זו מסומנת זמן "
-"ההפעלה יתארך באופן משמעותי, אבל מצד שני, יישומי KDE יעלו מהר יותר. חלק "
-"מיישומי KDE לא יעבדו בכלל אם אפשרות זו לא מסומנת."
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "אבטחה"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "נהל ישום מרחוק"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "הגדרת הפעלה"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"בחירה זו מאפשרת למנהל ההפעלה לנהל יישומים הרצים על שרתים רחוקים. אין לאפשר "
-"בחירה זו אם לא מבינים אותה."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "הפעלות והפעלה אוטומטית"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "כללי"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "מתקדם"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "הפעלות והפעלה אוטומטית"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "כלום"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "הגדרות מסך פתיחה"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "הגדר"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "יש לפתוח את הלוח ההגדרות בשביל לבחור מסך פתיחה."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "בדיקה"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "הדמייה של מסך הפתיחה הנבחר."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "מידע"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>פירוט:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>גרסה:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>מחבר:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>דף בית:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "מסך פתיחה"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "הוספת יישום"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "שם:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "תיאור:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "פקודה:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "בחירת פקודה"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "כשל בהסרת קישור %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "כשל ביצירת קובץ %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "כשל בכתיבת קובץ %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "כשל בפתיחת %s לכתיבה"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "יישומים המופעלים אוטומטית"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "להלן רשימת היישומים אשר יופעלו באופן אוטומטי בעת כניסה לשולחן העבודה של "
 "Xfce\n"
 "בנוסף ליישומים שנשמרו בעת היציאה האחרונה שלך:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>מחבר:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "תאימות"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>פירוט:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>דף בית:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "מידע"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "הגדרות התנתקות"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>פירוט:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "בוחר ההפעלה"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>גרסה:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "מתקדם"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "שמור הפעלה באופן אוטומטי בהתנתקות"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "הגדר"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "הדמייה של מסך הפתיחה הנבחר."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "הפעל אוטומטית את שרותי ה KDE"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "הפעל אוטומטית את שרותי ה KDE"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "נהל ישום מרחוק"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "יש לפתוח את הלוח ההגדרות בשביל לבחור מסך פתיחה."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "הדמייה של מסך הפתיחה הנבחר."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "הפעלות והפעלה אוטומטית"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "הצג בחירה בכל התחברות"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "כללי"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "הקפץ בהתנתקות"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "סיום הפעלה"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "בדיקה"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "טען הגדרות שולחן עבודה"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "מאמת הגדרות DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "טוען מידע להפעלה"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "בחר שם הפעלה"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "יציאה"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "איתחול"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "כיבוי"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_שמור הפעלה להתחברויות עתידיות"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "יש להקליד את סיסמתך:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>התרחשה תקלה</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -418,15 +464,21 @@ msgstr "הפעלה חדשה"
 msgid "Create a new session."
 msgstr "צור הפעלה חדשה."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "מפעיל את מנהל הסודות של GNOME"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "מפעיל את GNOME Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "מפעיל את שרותי KDE"
 
@@ -455,6 +507,31 @@ msgstr "המשך בכל זאת"
 msgid "Try again"
 msgstr "נסה שוב"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "בחר הפעלה"
@@ -467,88 +544,88 @@ msgstr "בחר שם הפעלה"
 msgid "Choose a name for the new session:"
 msgstr "בחר שם להפעלה החדשה:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "מפעיל את מנהל השמע"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "מפעיל את הלוח"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "מפעל את מנהל שולחן העבודה"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "מפעיל את שורת המשימות"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "מפעיל את מנהל החלונות"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "מפעיל את GNOME Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "מפעיל את עורך הטקסט המתקדם של KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "מפעיל את מנהל העריכה של KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "מפעיל את קורא הדואר של KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "מפעיל את קורא החדשות של KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "מפעיל את Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "מפעיל את מדמה מסופים של KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "מפעיל את Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "מפעיל את Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "מפעיל את  VI"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "מפעיל את Session Management Proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "מפעיל את X-Chat לקוח ה IRC"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "מפעיל את מערכת המולטימדיה של מערכת ה X"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "מפעיל את מדמה מסופים של X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "מפעיל את %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -572,7 +649,7 @@ msgstr ""
 "הוסבו באופן מוצלח אל המיקום החדש.\n"
 "עליך למחוק ספריה זו כעת.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "מבצע הפעלה אוטומטית..."
 
@@ -596,37 +673,97 @@ msgstr "טיפים וטריקים"
 msgid "Next"
 msgstr "הבא"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "הגדרת הפעלה"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "הגדרות הפעלות ואיתחול"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "הגדרת הפעלה Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "הגדרות מסך פתיחה Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "יישומים המותחלים אוטומטית"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "ערוך את רשימת היישומים המותחלים אוטומטית"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "היישומים המותחלים אוטומטית של Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "טיפים של Xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "סיום הפעלה"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr "אם מסומן, מנהל ההפעלה ישאל אותך לבחור הפעלה בכל פעם שתתחבר לXfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "בחירה זו מגדירה למנהל ההפעלה לשמור את ההפעלה באופן אוטומטי בזמן התנתקות. "
+#~ "אם בחירה זו לא מסומנת מנהל ההפעלה ישאל אותך אם ברצונך לשמור את ההפעלה "
+#~ "הנוכחית בכל התנתקות."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "אפשרות זו מבטלת את השאלה אם לשמור או לא לשמור את מצב ההפעלה עת התנתקות. "
+#~ "קביעה זו תהיה תלויה אם אפשרת את שמירת ההפעלה האוטומטית או לא."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "הפעל אוטומטית את שרותי ה GNOME"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "יש לאפשר בחירה זו אם בכוונתך להשתמש ביישומי GNOME. אם בחירה זו מסומנת, "
+#~ "מנהל ההפעלה יפעיל מספר שרותים של GNOME בשבילך. יש גם צורך לאפשר את בחירה "
+#~ "זו במקרה שברצונך להשתמש בטכנולוגיות הסייוע שמגיעות עם GNOME."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "יש לאפשר בחירה זו אם בכוונתך להשתמש ביישומי KDE. אם בחירה זו מסומנת זמן "
+#~ "ההפעלה יתארך באופן משמעותי, אבל מצד שני, יישומי KDE יעלו מהר יותר. חלק "
+#~ "מיישומי KDE לא יעבדו בכלל אם אפשרות זו לא מסומנת."
+
+#~ msgid "Security"
+#~ msgstr "אבטחה"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "בחירה זו מאפשרת למנהל ההפעלה לנהל יישומים הרצים על שרתים רחוקים. אין "
+#~ "לאפשר בחירה זו אם לא מבינים אותה."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "הפעלות והפעלה אוטומטית"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "הגדרות מסך פתיחה"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "מסך פתיחה"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "יישומים המופעלים אוטומטית"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "הגדרות מסך פתיחה Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "יישומים המותחלים אוטומטית"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "ערוך את רשימת היישומים המותחלים אוטומטית"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "היישומים המותחלים אוטומטית של Xfce 4"
diff --git a/po/hi.po b/po/hi.po
index 933e0c6e..6722a634 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:39+0900\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-group@lists.sourceforge.net>\n"
@@ -77,302 +77,347 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr ""
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 #, fuzzy
 msgid "Configure Simple..."
 msgstr "लॉगआउट पुष्टि"
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr ""
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr ""
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr ""
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr ""
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
+
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
+
+#: ../settings/main.c:44
 #, fuzzy
-msgid "Session chooser"
-msgstr "सत्र नियंत्रण"
+msgid "Version information"
+msgstr "इंटरएक्टिंग"
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
+
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
 
-#: ../settings/session/session.c:154
+# libgnomeui/gnome-client.c:945
+#: ../settings/main.c:84
 #, fuzzy
-msgid "Logout settings"
-msgstr "सत्र से लागआउट करें"
+msgid "Session Settings"
+msgstr "सत्र प्रबंधन"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "लागआउट पर सत्र स्वतः संचित करें"
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:100
+msgid "Internal Error"
 msgstr ""
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
 msgstr ""
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
 msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
 msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/xfae-dialog.c:130
+msgid "Description:"
 msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
 msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
+
+#: ../settings/xfae-model.c:558
+#, fuzzy, c-format
+msgid "Failed to unlink %s: %s"
+msgstr "क्लाएंट: %s का क्लोन बनाने में असफल"
+
+#: ../settings/xfae-model.c:646
+#, fuzzy, c-format
+msgid "Failed to create file %s"
+msgstr "एमसीएस MCS क्लाएंट बनाने में असफल"
+
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
+
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
 msgstr ""
 
-#: ../settings/session/session.c:273
+#: ../settings/xfae-window.c:102
 msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 
-# libgnomeui/gnome-client.c:945
-#: ../settings/session/session.c:333
+#: ../settings/xfce4-session-settings.glade.h:1
 #, fuzzy
-msgid "Sessions and Startup"
-msgstr "सत्र प्रबंधन"
+msgid "<b>Author:</b>"
+msgstr "लेखक:"
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "सामान्य"
+#: ../settings/xfce4-session-settings.glade.h:2
+msgid "<b>Compatibility</b>"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
 msgstr ""
 
-# libgnomeui/gnome-client.c:945
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:5
 #, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "सत्र प्रबंधन"
+msgid "<b>Information</b>"
+msgstr "इंटरएक्टिंग"
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "सत्र से लागआउट करें"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "लेखक:"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "सत्र नियंत्रण"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
+#: ../settings/xfce4-session-settings.glade.h:10
+msgid "Ad_vanced"
 msgstr ""
 
-#: ../settings/splash/splash.c:457
+#: ../settings/xfce4-session-settings.glade.h:11
 #, fuzzy
-msgid "Configure"
-msgstr "लॉगआउट पुष्टि"
+msgid "Automatically save session on _logout"
+msgstr "लागआउट पर सत्र स्वतः संचित करें"
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "लॉगआउट पुष्टि"
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../settings/splash/splash.c:476
+#: ../settings/xfce4-session-settings.glade.h:14
 #, fuzzy
 msgid "Demonstrates the selected splash screen."
 msgstr "डिफॉल्ट स्पलेश स्क्रीन "
 
-#: ../settings/splash/splash.c:493
-#, fuzzy
-msgid "Information"
-msgstr "इंटरएक्टिंग"
+#: ../settings/xfce4-session-settings.glade.h:15
+msgid "Launch GN_OME services on startup"
+msgstr ""
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:16
+msgid "Launch _KDE services on startup"
 msgstr ""
 
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
+#: ../settings/xfce4-session-settings.glade.h:17
+msgid "Manage _remote applications"
 msgstr ""
 
-#: ../settings/splash/splash.c:532
-#, fuzzy
-msgid "<b>Author:</b>"
-msgstr "लेखक:"
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr ""
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "स्पलेश स्क्रीन थीम"
+msgid "Remove the selected application from the session."
+msgstr "डिफॉल्ट स्पलेश स्क्रीन "
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+# libgnomeui/gnome-client.c:945
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+#, fuzzy
+msgid "Sessions and Startup"
+msgstr "सत्र प्रबंधन"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
-msgid "Description:"
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:25
+msgid "_Display chooser on login"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "सामान्य"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+msgid "_Prompt on logout"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, fuzzy, c-format
-msgid "Failed to unlink %s: %s"
-msgstr "क्लाएंट: %s का क्लोन बनाने में असफल"
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "सत्र छोड़ें"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, fuzzy, c-format
-msgid "Failed to create file %s"
-msgstr "एमसीएस MCS क्लाएंट बनाने में असफल"
+#: ../settings/xfce4-session-settings.glade.h:29
+msgid "_Test"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 #, fuzzy
 msgid "Loading desktop settings"
 msgstr "सत्र से लागआउट करें"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr ""
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 #, fuzzy
 msgid "Loading session data"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/shutdown.c:334
+# libgnomeui/gnome-client.c:945
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "सत्र प्रबंधन"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "भविष्य के लॉगिन हेतु सत्र संचित करें (_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -409,15 +454,21 @@ msgstr "सत्र छोड़ें"
 msgid "Create a new session."
 msgstr "सत्र संचित करें"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 #, fuzzy
 msgid "Starting KDE services"
 msgstr "%s चालू कर रहे..."
@@ -444,6 +495,31 @@ msgstr ""
 msgid "Try again"
 msgstr ""
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 #, fuzzy
 msgid "Choose session"
@@ -458,98 +534,98 @@ msgstr ""
 msgid "Choose a name for the new session:"
 msgstr "सत्र संचित करें"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 #, fuzzy
 msgid "Starting the Panel"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 #, fuzzy
 msgid "Starting the Desktop Manager"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 #, fuzzy
 msgid "Starting the Taskbar"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 #, fuzzy
 msgid "Starting the Window Manager"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 #, fuzzy
 msgid "Starting the KDE Clipboard Manager"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 #, fuzzy
 msgid "Starting the KDE Mail Reader"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 #, fuzzy
 msgid "Starting the KDE News Reader"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 #, fuzzy
 msgid "Starting the Konqueror"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 #, fuzzy
 msgid "Starting the KDE Terminal Emulator"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 #, fuzzy
 msgid "Starting the Session Management Proxy"
 msgstr "सत्र प्रबंधक चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, fuzzy, c-format
 msgid "Starting %s"
 msgstr "%s चालू कर रहे..."
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -564,7 +640,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 #, fuzzy
 msgid "Performing Autostart..."
 msgstr "स्वतः चालू कर रहे..."
@@ -590,44 +666,36 @@ msgid "Next"
 msgstr ""
 
 # libgnomeui/gnome-client.c:945
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "सत्र प्रबंधन"
 
 # libgnomeui/gnome-client.c:945
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "सत्र प्रबंधन"
 
 # libgnomeui/gnome-client.c:945
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "सत्र प्रबंधन"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "स्पलेश स्क्रीन थीम"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr ""
 
+# libgnomeui/gnome-client.c:945
+#, fuzzy
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "सत्र प्रबंधन"
+
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "स्पलेश स्क्रीन थीम"
+
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "सत्र छोड़ें"
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "स्पलेश स्क्रीन थीम"
diff --git a/po/hu.po b/po/hu.po
index f77f9c8e..361fa89c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-07-21 23:49+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: hu\n"
@@ -22,8 +22,12 @@ msgstr "Válassz telepítendő témafájlt..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Sikertelen nyitókép-téma telepítés innen: %s, ellenőrizd, a fájl valódi nyitókép-téma archívum voltát."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Sikertelen nyitókép-téma telepítés innen: %s, ellenőrizd, a fájl valódi "
+"nyitókép-téma archívum voltát."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -70,278 +74,357 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice nyitókép motor"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Válassz képet..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Egyszerű téma beállítása..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Betűk"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Színek"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Háttér szín:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Szöveg szín:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Kép"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Egyéni kép használata"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Egyszerű"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Egyszerű téma motor"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Folyamat választó"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Választó megjelenítése a bejelentkezéskor"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "Ha beállítod, a folyamatkezelő minden Xfce bejelentkezésnél lehetőséget ad egy folyamat választására."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Kijelentkezés beállításai"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Folyamat mentése kijelentkezéskor"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "E lehetőség arra utasítja a Folyamatkezelőt, hogy automatikusan mentse a folyamatot kijelentkezésnél. Ha nem használod, de a kijelentkezés megerősítését igen, akkor minden kijelentkezésnél van lehetőséged a döntésre."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Kijelentkezés megerősítése"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "Ezzel állíthatod be, hogy legyen-e kijelentkezés-megerősítés. Ha kikapcsolod, a folyamat mentése azon fog múlni, előtte milyen állapotban hagytad a mentési beállítást."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompatibilitás"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "GNOME szolgáltatások futtatása indításkor"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Akkor állítsd be, ha GNOME alkalmazások futtatását tervezed. Ennek hatására a folyamatkezelő néhány alapvető GNOME szolgáltatást indít el. Akkor is állítsd be, ha a GNOME kisegítő lehetőségek használatát tervezed."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Információ"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "KDE szolgáltatások futtatása indításkor"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Akkor állítsd be, ha az Xfce Munkakörnyezeted munkafolyamatának részeként KDE alkalmazások futtatását tervezed. Ez jelentősen meg fogja növelni az indulást, viszont a KDE alkalmazások gyorsabban indulnak. Egyes KDE alkalmazások teljesen képtelenek működni e nélkül."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Biztonság"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Távoli alkalmazások kezelése"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Folyamat is indulás beállítások"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Távoli gépeken való alkalmazás-futtatás engedélyezése a folyamatkezelőnek. Ne használd ezt, míg nem vagy képben."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Munkafolyamatok és indulás"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Általános"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Haladó"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Munkafolyamatok is indulás"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Nincs"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Nyitókép beállítások"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Beállítás"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "A kijelölt nyitókép beállításainak megnyitása"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Próba"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "A kijelölt nyitókép bemutatása"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Információ"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Leírás:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Verzió:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Szerző:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Honlap:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Nyitókép"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Alkalmazás hozzáadása"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Név:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Leírás:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Parancs:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Válassz parancsot"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "%s leválasztása sikertelen: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "%s fájl létrehozása sikertelen"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "%s fájl írása sikertelen"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "%s megnyitása írásra sikertelen"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Azonnali alkalmazások"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Alább azon alkalmazások listája, melyek automatikusan\n"
 "indulnak az Xfce munkakörnyezetbe való bejelentkezéskor\n"
 "és azon alkalmazások, melyek elmentésre kerültek\n"
 "az utolsó kijelentkezéskor:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Szerző:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompatibilitás"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Leírás:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Honlap:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Információ"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Kijelentkezés beállításai"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Leírás:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Folyamat választó"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Verzió:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Haladó"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Folyamat mentése kijelentkezéskor"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Beállítás"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "A kijelölt nyitókép bemutatása"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "KDE szolgáltatások futtatása indításkor"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "KDE szolgáltatások futtatása indításkor"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Távoli alkalmazások kezelése"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "A kijelölt nyitókép beállításainak megnyitása"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "A kijelölt nyitókép bemutatása"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Munkafolyamatok és indulás"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Választó megjelenítése a bejelentkezéskor"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Általános"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Kijelentkezés megerősítése"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Folyamat vége"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Próba"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Asztali beállítások betöltése"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS beállítások ellenőrzése"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Folyamat adatok betöltése"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Válassz folyamat nevet"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Kijelentkezés"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Úraindítás"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Leállítás"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "Folyamat menté_se a későbbi bejelentkezésekhez"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Add meg a jelszavad:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Hiba történt</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Hibás jelszó, vagy a rendszergazda nem engedélyezte a gép kikapcsolását az általad használt hozzáféréssel."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Hibás jelszó, vagy a rendszergazda nem engedélyezte a gép kikapcsolását az "
+"általad használt hozzáféréssel."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -349,8 +432,11 @@ msgid "Last accessed: %s"
 msgstr "Utolsó megnyitás: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Válaszd ki a visszaállítandó folyamatot. Egyszerűen kattints duplán a nevére."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Válaszd ki a visszaállítandó folyamatot. Egyszerűen kattints duplán a nevére."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -370,15 +456,21 @@ msgstr "Új folyamat"
 msgid "Create a new session."
 msgstr "Új folyamat létrehozása"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "GNOME kulcstartó démon indítása"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "GNOME kisegítő lehetőségek indítása"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE szolgáltatások indítása"
 
@@ -407,6 +499,31 @@ msgstr "Folytatás mindenképp"
 msgid "Try again"
 msgstr "Próbáld újra"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Válassz folyamatot"
@@ -419,88 +536,88 @@ msgstr "Válassz folyamat nevet"
 msgid "Choose a name for the new session:"
 msgstr "Válassz nevet az új folyamathoz:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "A Hangerő-szabályozó indítása"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "A Panel indítása"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Az Asztalkezelő indítása"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "A Feladatsáv indítása"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Az Ablakkezelő indítása"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "GNOME terminál emulátor indítása"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE haladó szövegszerkesztő indítása"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE vágólapkezelő indítása"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE levélolvasó indítása"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE hírolvasó indítása"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror indítása"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE terminál emulátor indítása"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "A BMP Médialejátszó indítása"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "A GIMP indítása"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VIM indítása"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Folyamat kezelő proxy indítása"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat indítása"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "XMMS indítása"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X Terminál Emulátor indítása"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s indítása"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -519,22 +636,21 @@ msgstr ""
 "\n"
 "  %s\n"
 "\n"
-"ahova a .desktop fájlok rakhatók, melyek leírják az indítandó alkalmazásokat\n"
+"ahova a .desktop fájlok rakhatók, melyek leírják az indítandó "
+"alkalmazásokat\n"
 "az Xfce munkakörnyezetbe való bejelentkezéskor. A régi autostart\n"
 "könyvtár fájljai sikeresen az új helyre költöztek.\n"
 "Töröld e régi könyvtárat most.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Azonnali alkalmazások indítása..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Tippek és trükkök"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Szerencsesütik"
 
@@ -542,8 +658,7 @@ msgstr "Szerencsesütik"
 msgid "Display tips on _startup"
 msgstr "Tippek mutatá_sa induláskor"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Tippek és trükkök"
 
@@ -551,38 +666,102 @@ msgstr "Tippek és trükkök"
 msgid "Next"
 msgstr "Következő"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Folyamat is indulás beállítások"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Folyamatok és indulás beállításai"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 folyamat és indulás beállítások"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 nyitókép beállítások"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Azonnali alkalmazások"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Azonnali alkalmazások listájának vége"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Azonnali Alkalmazások"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce-tippek"
 
-#~ msgid "End Session"
-#~ msgstr "Folyamat vége"
-
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Ha beállítod, a folyamatkezelő minden Xfce bejelentkezésnél lehetőséget "
+#~ "ad egy folyamat választására."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "E lehetőség arra utasítja a Folyamatkezelőt, hogy automatikusan mentse a "
+#~ "folyamatot kijelentkezésnél. Ha nem használod, de a kijelentkezés "
+#~ "megerősítését igen, akkor minden kijelentkezésnél van lehetőséged a "
+#~ "döntésre."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Ezzel állíthatod be, hogy legyen-e kijelentkezés-megerősítés. Ha "
+#~ "kikapcsolod, a folyamat mentése azon fog múlni, előtte milyen állapotban "
+#~ "hagytad a mentési beállítást."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "GNOME szolgáltatások futtatása indításkor"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Akkor állítsd be, ha GNOME alkalmazások futtatását tervezed. Ennek "
+#~ "hatására a folyamatkezelő néhány alapvető GNOME szolgáltatást indít el. "
+#~ "Akkor is állítsd be, ha a GNOME kisegítő lehetőségek használatát tervezed."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Akkor állítsd be, ha az Xfce Munkakörnyezeted munkafolyamatának részeként "
+#~ "KDE alkalmazások futtatását tervezed. Ez jelentősen meg fogja növelni az "
+#~ "indulást, viszont a KDE alkalmazások gyorsabban indulnak. Egyes KDE "
+#~ "alkalmazások teljesen képtelenek működni e nélkül."
+
+#~ msgid "Security"
+#~ msgstr "Biztonság"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Távoli gépeken való alkalmazás-futtatás engedélyezése a "
+#~ "folyamatkezelőnek. Ne használd ezt, míg nem vagy képben."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Munkafolyamatok is indulás"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Nyitókép beállítások"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Nyitókép"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Azonnali alkalmazások"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 nyitókép beállítások"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Azonnali alkalmazások"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Azonnali alkalmazások listájának vége"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Azonnali Alkalmazások"
diff --git a/po/id.po b/po/id.po
index 76740749..d5a373bf 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-05-31 13:12+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
@@ -25,8 +25,12 @@ msgstr "Pilih berkas tema untuk diinstal..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Tak dapat menginstal tema splash dari berkas %s, silakan cek apakah berkas tersebut merupakan arsip tema splash yang sah."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Tak dapat menginstal tema splash dari berkas %s, silakan cek apakah berkas "
+"tersebut merupakan arsip tema splash yang sah."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -73,278 +77,357 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mesin Splash Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Pilih gambar..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigurasi Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Fonta"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Warna"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Warna latar belakang:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Warna teks:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Gambar"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Gunakan gambar suai"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Mesin Splash Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Pemilih sesi"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Tampilkan pemilih di log masuk"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "Jika diatur, manajer sesi akan meminta anda untuk memilih sebuah sesi tiap kali anda log masuk ke Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Pengaturan log keluar"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Otomatis menyimpan sesi di log keluar"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "Opsi ini memerintahkan manajer sesi untuk secara otomatis menyimpan sesi saat ini ketika anda log keluar. Jika anda tidak memilih opsi ini, anda akan ditanya apakah ingin menyimpan sesi saat ini setiap kali log keluar."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Siap ketik di log keluar"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "Opsi ini menonaktifkan dialog konfirmasi log keluar. Apakah sesi akan disimpan atau tidak tergantung pada apakah anda mengaktifkan penyimpanan sesi otomatis pada log keluar atau tidak."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompatibilitas"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Jalankan layanan Gnome pada hidupkan"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Aktifkan ini jika anda ingin menggunakan aplikasi Gnome. Ini akan memerintahkan manajer sesi untuk memulai beberapa layanan vital Gnome untuk anda. Anda juga harus mengaktifkan ini jika anda ingin menggunakan Teknologi Bantuan yang hadir bersama Gnome."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informasi"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Jalankan layanan KDE pada hidupkan"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Aktifkan opsi ini jika anda ingin menjalankan aplikasi KDE sebagai bagian dari sesi Destop Xfce anda. Ini akan meningkatkan waktu hidupkan, tapi di sisi lain, aplikasi KDE akan dihidupkan lebih cepat. Beberapa aplikasi KDE mungkin tidak akan bekerja sama sekali jika anda tidak mengaktifkan opsi ini."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Keamanan"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Atur aplikasi jarak jauh"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Pengaturan Sesi dan Hidupkan"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Izinkan manajer sesi untuk mengatur aplikasi yang berjalan di host jarak jauh. Jangan mengaktifkan opsi jika kecuali anda tahu apa yang anda lakukan."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesi dan Hidupkan"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Umum"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Tingkat lanjut"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sesi dan Hidupkan"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Tak ada"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Pengaturan Layar Splash"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigurasi"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Buka panel konfigurasi untuk layar splash terpilih."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Tes"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstrasikan layar splash terpilih."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informasi"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Deskripsi:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versi:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Penulis:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Laman:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Layar Splash"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Tambah aplikasi"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Deskripsi:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Perintah:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Pilih perintah"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Gagal melepas tautan %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Gagal membuat berkas %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Gagal menulis berkas %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Gagal membuka %s untuk penulisan"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aplikasi otomatis berjalan"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Di bawah ini adalah senarai aplikasi yang otomatis\n"
 "berjalan ketika anda log masuk ke destop Xfce anda,\n"
 "sebagai tambahan terhadap aplikasi yang anda simpan\n"
 "ketika terakhir kali anda log keluar:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Penulis:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompatibilitas"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Deskripsi:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Laman:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informasi"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Pengaturan log keluar"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Deskripsi:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Pemilih sesi"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versi:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Tingkat lanjut"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Otomatis menyimpan sesi di log keluar"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfigurasi"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstrasikan layar splash terpilih."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Jalankan layanan KDE pada hidupkan"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Jalankan layanan KDE pada hidupkan"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Atur aplikasi jarak jauh"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Buka panel konfigurasi untuk layar splash terpilih."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstrasikan layar splash terpilih."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesi dan Hidupkan"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Tampilkan pemilih di log masuk"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Umum"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Siap ketik di log keluar"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Sesi baru"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Tes"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Memuat pengaturan destop"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Memeriksa pengaturan DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Memuat data sesi"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Pilih nama sesi"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Log Keluar"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Start Ulang"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Matikan"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Simpan sesi untuk log masuk yang akan datang"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Silakan masukkan sandi lewat:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Galat terjadi</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Apakah sandi lewat yang anda masukkan salah, atau administrator sistem tidak mengizinkan untuk mematikan komputer ini dengan akun pengguna anda."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Apakah sandi lewat yang anda masukkan salah, atau administrator sistem tidak "
+"mengizinkan untuk mematikan komputer ini dengan akun pengguna anda."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -352,8 +435,12 @@ msgid "Last accessed: %s"
 msgstr "Terakhir kali diakses: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Pilih sesi yang ingin anda kembalikan. Anda dapat klik ganda nama sesi untuk mengembalikannya."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Pilih sesi yang ingin anda kembalikan. Anda dapat klik ganda nama sesi untuk "
+"mengembalikannya."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -373,15 +460,21 @@ msgstr "Sesi baru"
 msgid "Create a new session."
 msgstr "Buat sebuah sesi baru."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Memulai Jurik Keyring Gnome"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Memulai Teknologi Bantuan Gnome"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Memulai layanan KDE"
 
@@ -410,6 +503,31 @@ msgstr "Tetap lanjutkan"
 msgid "Try again"
 msgstr "Coba lagi"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Pilih Sesi"
@@ -422,88 +540,88 @@ msgstr "Pilih nama sesi"
 msgid "Choose a name for the new session:"
 msgstr "Pilih nama untuk sesi baru:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Memulai Pengendali Volume"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Memulai Panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Memulai Manajer Destop"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Memulai Batang Tugas"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Memulai Manajer Jendela"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Memulai Emulator Terminal Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Memulai Penyunting Teks Tingkat Lanjut KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Memulai Manajer Papan Klip KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Memulai Pembaca Surat KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Memulai Pembaca Berita KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Memulai Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Memulai Emulator Terminal KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Memulai Pemutar Media Beep"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Memulai Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Memulai Penyunting VI Improved"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Memulai Sesi Manajemen Proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Memulai Klien IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Memulai Sistem Multimedia X"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Memulai Emulator Terminal X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Memulai %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -524,20 +642,19 @@ msgstr ""
 "\n"
 "dimana anda dapat menaruh berkas .desktop ke, yang menjelaskan\n"
 "kepada aplikasi untuk mulai ketika anda log masuk ke destop Xfce.\n"
-"Berkas di direktori start otomatis anda telah sukses dimigrasikan kelokasi baru.\n"
+"Berkas di direktori start otomatis anda telah sukses dimigrasikan kelokasi "
+"baru.\n"
 "Anda dapat menghapus direktori ini sekarang.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Melakukan Start Otomatis..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Tips dan Trik"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Keberuntungan"
 
@@ -545,8 +662,7 @@ msgstr "Keberuntungan"
 msgid "Display tips on _startup"
 msgstr "Tampilkan tips pada hidupkan (_s)"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Tips dan trik"
 
@@ -554,35 +670,104 @@ msgstr "Tips dan trik"
 msgid "Next"
 msgstr "Selanjutnya"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Pengaturan Sesi dan Hidupkan"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Pengaturan Sesi dan Hidupkan"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Pengaturan Sesi dan Hidupkan Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Pengaturan Layar Splash Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aplikasi Otomatis Berjalan"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Sunting senarai aplikasi otomatis berjalan"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Aplikasi Otomatis Berjalan Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Jika diatur, manajer sesi akan meminta anda untuk memilih sebuah sesi "
+#~ "tiap kali anda log masuk ke Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Opsi ini memerintahkan manajer sesi untuk secara otomatis menyimpan sesi "
+#~ "saat ini ketika anda log keluar. Jika anda tidak memilih opsi ini, anda "
+#~ "akan ditanya apakah ingin menyimpan sesi saat ini setiap kali log keluar."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Opsi ini menonaktifkan dialog konfirmasi log keluar. Apakah sesi akan "
+#~ "disimpan atau tidak tergantung pada apakah anda mengaktifkan penyimpanan "
+#~ "sesi otomatis pada log keluar atau tidak."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Jalankan layanan Gnome pada hidupkan"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Aktifkan ini jika anda ingin menggunakan aplikasi Gnome. Ini akan "
+#~ "memerintahkan manajer sesi untuk memulai beberapa layanan vital Gnome "
+#~ "untuk anda. Anda juga harus mengaktifkan ini jika anda ingin menggunakan "
+#~ "Teknologi Bantuan yang hadir bersama Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Aktifkan opsi ini jika anda ingin menjalankan aplikasi KDE sebagai bagian "
+#~ "dari sesi Destop Xfce anda. Ini akan meningkatkan waktu hidupkan, tapi di "
+#~ "sisi lain, aplikasi KDE akan dihidupkan lebih cepat. Beberapa aplikasi "
+#~ "KDE mungkin tidak akan bekerja sama sekali jika anda tidak mengaktifkan "
+#~ "opsi ini."
+
+#~ msgid "Security"
+#~ msgstr "Keamanan"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Izinkan manajer sesi untuk mengatur aplikasi yang berjalan di host jarak "
+#~ "jauh. Jangan mengaktifkan opsi jika kecuali anda tahu apa yang anda "
+#~ "lakukan."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sesi dan Hidupkan"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Pengaturan Layar Splash"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Layar Splash"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aplikasi otomatis berjalan"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Pengaturan Layar Splash Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aplikasi Otomatis Berjalan"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Sunting senarai aplikasi otomatis berjalan"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Aplikasi Otomatis Berjalan Xfce 4"
diff --git a/po/it.po b/po/it.po
index 732f2323..9275899f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-20 14:25+0100\n"
 "Last-Translator: Alex Dupre <ale@FreeBSD.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -76,310 +76,347 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Scegli un immagine..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr ""
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Carattere"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Colori"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Colore di sfondo:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Colore testo:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Immagine"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Usa immagine personalizzata"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 #, fuzzy
 msgid "Simple"
 msgstr "Semplice"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Display scelto al login"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:150
+#: ../settings/main.c:44
 #, fuzzy
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
-msgstr ""
-"Se attivato, il gestore della sessione vi chiedera' di scegliere una "
-"sessione tuttele volte che vi loggate dentro a Xfce."
+msgid "Version information"
+msgstr "Informazioni"
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Salva automaticamente la sessione all'uscita"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Chiede all'uscita"
-
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"Questa opzione disabilita il dialogo di conferma all'uscita. Che la sessione "
-"venga salvata o no dipende se avete abilitato o no il salvataggio automatico "
-"della sessione all'uscita"
 
-#: ../settings/session/session.c:215
+#: ../settings/main.c:84
 #, fuzzy
-msgid "Compatibility"
-msgstr "Compatibilita'"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Lancia i servizi di Gnome all'avvio"
-
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Abilitate questo se utilizzerete le applicazioni di Gnome. Queso istruira il "
-"gestore della session di avviare al vostro posto alcuni servizi vitali per "
-"Gnome. Dovete attivare questo se volete utilizzare la Assistive Tecnologies "
-"distribuita con Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Lancia i servizi di KDE all'avvio"
-
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Abilitare questa opzione se utilizzerete le applicazioni di KDE, all'interno "
-"della sessione desktop di Xfce. Questo incrementara' in modo visibile il "
-"tempo di avvio, ma le applicazioni KDE verranno avviate piu' velocemente. "
-"Alcune applicazioni di KDE potrebbero non lavoare del tutto se non attivate "
-"questa opzione."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Sicurezza"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Gestisce le applicazioni remote"
+msgid "Session Settings"
+msgstr "Impostazioni Splash Screen"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Abilita il gestore della sessione a gestire le applicazione avviate su host "
-"remoti. Non abilitate questa opzione se non sapete esattamente quello che "
-"state facendo."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessioni e Avvio"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Generale"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avanzato"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessioni e Avvio"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Nessuno"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Impostazioni Splash Screen"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configura"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Apre il pannello di configurazione per selezionare lo splash screen"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Test"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Dimostrazione dello splash screen selezionato."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informazioni"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Descrizione:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versione:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autore:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Homepage:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Aggiungi applicazione"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Seleziona un comando"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Errore nella rimozione di %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Errore nella creazione del file %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Errore nella scrittura sul file %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Errore nell'apertura in scrittura di %s"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autore:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilita'"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descrizione:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Homepage:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informazioni"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+msgid "<b>Logout Settings</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Descrizione:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "<b>Versione:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versione:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avanzato"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Salva automaticamente la sessione all'uscita"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configura"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Dimostrazione dello splash screen selezionato."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Lancia i servizi di KDE all'avvio"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Lancia i servizi di KDE all'avvio"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Gestisce le applicazioni remote"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Apre il pannello di configurazione per selezionare lo splash screen"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Dimostrazione dello splash screen selezionato."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessioni e Avvio"
+
+#: ../settings/xfce4-session-settings.glade.h:24
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Display scelto al login"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Generale"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Chiede all'uscita"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Nuova sessione"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Caricamento delle impostazioni del desktop"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Verifica le impostazioni DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Caricamento dei dati di sessione"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Scegli il nome della sessione"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Salva la sessione per i prossimi login"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Perfavore inserire la password:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Errore</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -419,15 +456,21 @@ msgstr "Nuova sessione"
 msgid "Create a new session."
 msgstr "Crea una nuova sessione."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Avvio del Demone Keyring di Gnome"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Avvio dei servizi KDE"
 
@@ -456,6 +499,31 @@ msgstr "Continua comunque"
 msgid "Try again"
 msgstr "Prova ancora"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Scegli una sessione"
@@ -468,88 +536,88 @@ msgstr "Scegli il nome della sessione"
 msgid "Choose a name for the new session:"
 msgstr "Scegli un nome per la nuova sessione:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Avvio del Controllo Volume.."
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Avvio del Pannello"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Avvio del Gestore del Desktop"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Avvio della Barra dei Processi"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Avvio del Gestore di Finestre"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Avvio dell'Emulatore del Terminale di Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Avvio dell'Editor di Testo Avanzato di KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Avvio del Gestore degli Appunti di KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Avvio del Lettore della Posta di KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Avvio del Lettore delle News di KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Avvio di Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Avvio dell'Emulatore del Terminale di KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Avvio di The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Avvio del Client IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Avvio del Sistema Multimediale di X"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Avvio dell'Emulatore di Terminale di X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, fuzzy, c-format
 msgid "Starting %s"
 msgstr "Avvio di %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -564,7 +632,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 #, fuzzy
 msgid "Performing Autostart..."
 msgstr "Esecuzione automatica..."
@@ -590,38 +658,76 @@ msgstr "Trucchi e suggerimenti"
 msgid "Next"
 msgstr "Prossimo"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Impostazioni delle Sessioni e dell'Avvio di Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "Nuova sessione"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Se attivato, il gestore della sessione vi chiedera' di scegliere una "
+#~ "sessione tuttele volte che vi loggate dentro a Xfce."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Questa opzione disabilita il dialogo di conferma all'uscita. Che la "
+#~ "sessione venga salvata o no dipende se avete abilitato o no il "
+#~ "salvataggio automatico della sessione all'uscita"
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Lancia i servizi di Gnome all'avvio"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Abilitate questo se utilizzerete le applicazioni di Gnome. Queso istruira "
+#~ "il gestore della session di avviare al vostro posto alcuni servizi vitali "
+#~ "per Gnome. Dovete attivare questo se volete utilizzare la Assistive "
+#~ "Tecnologies distribuita con Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Abilitare questa opzione se utilizzerete le applicazioni di KDE, "
+#~ "all'interno della sessione desktop di Xfce. Questo incrementara' in modo "
+#~ "visibile il tempo di avvio, ma le applicazioni KDE verranno avviate piu' "
+#~ "velocemente. Alcune applicazioni di KDE potrebbero non lavoare del tutto "
+#~ "se non attivate questa opzione."
+
+#~ msgid "Security"
+#~ msgstr "Sicurezza"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Abilita il gestore della sessione a gestire le applicazione avviate su "
+#~ "host remoti. Non abilitate questa opzione se non sapete esattamente "
+#~ "quello che state facendo."
+
+#, fuzzy
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessioni e Avvio"
diff --git a/po/ja.po b/po/ja.po
index 2deb9aca..9f0bd06d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-05-17 18:48+0900\n"
 "Last-Translator: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -33,8 +33,12 @@ msgstr "インストールするテーマを選択してください..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "ファイル %s から起動画面のテーマをインストールできません、正しいアーカイブか確認して下さい。"
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"ファイル %s から起動画面のテーマをインストールできません、正しいアーカイブか"
+"確認して下さい。"
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -81,279 +85,357 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice 起動画面エンジン"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "画像を選択してください..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "シンプルの設定..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "フォント"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "配色"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "背景の色:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "文字の色:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "画像"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "指定画像を使用する"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "シンプル"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "シンプルな起動画面エンジン"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "セッションの選択"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "ログイン時にセッションを選択する"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "有効にすると、Xfce へのログイン毎にセッションを選択します。"
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "ログアウトの設定"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "ログアウト時に自動的にセッションを保存する"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "このオプションを有効にすると、あなたのログアウト時に現在のセッションが自動的に保存されます。無効にする場合は、現在のセッションを保存するかどうかを毎回聞かれるようになります。"
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "ログアウト時に確認する"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "このオプションでログアウトの確認ダイアログを無効にします。セッションを保存するかどうかは「ログアウト時に自動的にセッションを保存する」を有効にしているかどうかで決まります。"
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "互換性"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "起動時に GNOME サービスを実行する"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "GNOME アプリケーションを使用するつもりなら有効にしてください。これにより、セッションマネージャーが、必要な GNOME サービスのいくつかを開始するようになります。GNOME と共に提供される障碍者支援技術を使用したい場合にも有効にしてください。"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "情報"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "起動時に KDE サービスを実行する"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Xfce デスクトップのセッションの一部として KDE アプリケーションを実行するつもりなら、このオプションを有効にしてください。Xfce の起動にかなり時間を要しますが、一方でセッション中は KDE アプリケーションをより速く起動させます。一部の KDE アプリケーションはこのオプションを有効にしない限り全く動作しません。"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "セキュリティ"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "遠隔アプリケーションの管理"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "セッションと起動に関する設定を行います"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "セッションマネージャに遠隔ホストで動作しているアプリケーションを管理することを許可します。何をしているか分からないなら、このオプションを有効にしないでください。"
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "セッションと起動"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "一般"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "上級者"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "セッションと起動"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "無し"
 
-# FIXME: Q_ (../settings/splash/splash.c: ../settings/splash/splash.c)
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "起動画面"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "設定"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "選択した起動画面の設定パネルを開きます。"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "テスト"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "選択した起動画面を実演します。"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "情報"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>説明:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>バージョン:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>著作者:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>ホームページ:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "起動画面"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "アプリケーションを追加してください"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "名前:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "説明:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "コマンド:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "コマンドを選択してください"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "%s のリンク解除に失敗しました: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "ファイル %s の作成に失敗しました"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "ファイル %s の書き込みに失敗しました"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "読み込むために %s を開くのに失敗しました"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "自動的に開始するアプリケーション"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "以下は Xfce デスクトップにログインする時に自動的に開始\n"
 "されるアプリケーションのリストです。最後にログアウトした\n"
 "時に保存されたアプリケーションも加わります:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>著作者:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "互換性"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>説明:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>ホームページ:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "情報"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "ログアウトの設定"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>説明:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "セッションの選択"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>バージョン:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "上級者"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "ログアウト時に自動的にセッションを保存する"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "設定"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "選択した起動画面を実演します。"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "起動時に KDE サービスを実行する"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "起動時に KDE サービスを実行する"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "遠隔アプリケーションの管理"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "選択した起動画面の設定パネルを開きます。"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "選択した起動画面を実演します。"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "セッションと起動"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "ログイン時にセッションを選択する"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "一般"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "ログアウト時に確認する"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "セッションの終了"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "テスト"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "デスクトップの設定を読み込んでいます"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS の設定を検証しています"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "セッションデータを読み込んでいます"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "セッション名を選択して下さい"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "再起動"
 
 # NOTE: changed for the actual behavior
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "電源を切る"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "次回のログインのためセッションを保存(_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "あなたのパスワードを入力してください:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>エラーが発生しました</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "あなたの入力したパスワードが無効であるか、システム管理者があなたのユーザアカウントでのコンピュータのシャットダウンを許可していません。"
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"あなたの入力したパスワードが無効であるか、システム管理者があなたのユーザアカ"
+"ウントでのコンピュータのシャットダウンを許可していません。"
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -361,8 +443,12 @@ msgid "Last accessed: %s"
 msgstr "最終アクセス日時: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "復元したいセッションを選択してください。セッション名を単にダブルクリックします。"
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"復元したいセッションを選択してください。セッション名を単にダブルクリックしま"
+"す。"
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -382,15 +468,21 @@ msgstr "新規セッション"
 msgid "Create a new session."
 msgstr "新規セッションを作成します。"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "GNOME 鍵輪デーモンを起動しています"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "GNOME 障碍者支援プログラムを起動しています"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE サービスを開始しています"
 
@@ -419,6 +511,31 @@ msgstr "いずれにせよ続行する"
 msgid "Try again"
 msgstr "再び試す"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "セッションを選択してください"
@@ -431,88 +548,88 @@ msgstr "セッション名を選択して下さい"
 msgid "Choose a name for the new session:"
 msgstr "新規セッション名を選択してください:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "音量コントローラーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "パネルを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "デスクトップマネージャーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "タスクバーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "ウィンドウマネージャーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "GNOME ターミナルエミュレーターを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE テキストエディターを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE クリップボードマネージャーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE メールリーダーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE ニュースリーダーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror を起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE ターミナルエミュレーターを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Beep メディアプレーヤーを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "GIMP を起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Vim エディターを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "セッション管理プロキシを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "IRC クライアント X-Chat を起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "XMMS を起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X ターミナルエミュレーターを起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s を起動しています"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -537,18 +654,16 @@ msgstr ""
 "移行されています。\n"
 "このフォルダは削除する方がよいでしょう。\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "自動開始アプリケーションを実行しています..."
 
 # FIXME: should be revised
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "チップとトリック"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "運勢"
 
@@ -556,8 +671,7 @@ msgstr "運勢"
 msgid "Display tips on _startup"
 msgstr "起動時にチップを表示(_S)"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "チップとトリック"
 
@@ -565,38 +679,103 @@ msgstr "チップとトリック"
 msgid "Next"
 msgstr "次へ"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "セッションと起動に関する設定を行います"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "セッションと起動"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 セッションと起動の設定"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 起動画面の設定"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr "Xfce チップ"
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr "有効にすると、Xfce へのログイン毎にセッションを選択します。"
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "このオプションを有効にすると、あなたのログアウト時に現在のセッションが自動"
+#~ "的に保存されます。無効にする場合は、現在のセッションを保存するかどうかを毎"
+#~ "回聞かれるようになります。"
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "このオプションでログアウトの確認ダイアログを無効にします。セッションを保存"
+#~ "するかどうかは「ログアウト時に自動的にセッションを保存する」を有効にしてい"
+#~ "るかどうかで決まります。"
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "起動時に GNOME サービスを実行する"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "GNOME アプリケーションを使用するつもりなら有効にしてください。これにより、"
+#~ "セッションマネージャーが、必要な GNOME サービスのいくつかを開始するように"
+#~ "なります。GNOME と共に提供される障碍者支援技術を使用したい場合にも有効にし"
+#~ "てください。"
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Xfce デスクトップのセッションの一部として KDE アプリケーションを実行するつ"
+#~ "もりなら、このオプションを有効にしてください。Xfce の起動にかなり時間を要"
+#~ "しますが、一方でセッション中は KDE アプリケーションをより速く起動させま"
+#~ "す。一部の KDE アプリケーションはこのオプションを有効にしない限り全く動作"
+#~ "しません。"
+
+#~ msgid "Security"
+#~ msgstr "セキュリティ"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "セッションマネージャに遠隔ホストで動作しているアプリケーションを管理するこ"
+#~ "とを許可します。何をしているか分からないなら、このオプションを有効にしない"
+#~ "でください。"
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "セッションと起動"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "自動開始アプリケーション"
+# FIXME: Q_ (../settings/splash/splash.c: ../settings/splash/splash.c)
+#~ msgid "Splash Screen Settings"
+#~ msgstr "起動画面"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "自動的に開始するアプリケーションのリストを編集します"
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "起動画面"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 自動起動アプリケーション"
+#~ msgid "Autostarted applications"
+#~ msgstr "自動的に開始するアプリケーション"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr "Xfce チップ"
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 起動画面の設定"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "自動開始アプリケーション"
 
-#~ msgid "End Session"
-#~ msgstr "セッションの終了"
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "自動的に開始するアプリケーションのリストを編集します"
 
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 自動起動アプリケーション"
diff --git a/po/ka.po b/po/ka.po
index 15a3e86f..edce1700 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-08-24 23:42+0400\n"
 "Last-Translator: Dimitri Gogelia <delphi.knight@gmail.com>\n"
 "Language-Team: Georgian <delphi.knight@gmail.com>\n"
@@ -72,288 +72,326 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr ""
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr ""
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr ""
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr ""
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr ""
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr ""
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+msgid "Version information"
 msgstr ""
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
+#: ../settings/main.c:84
+msgid "Session Settings"
 msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
+#: ../settings/main.c:100
+msgid "Internal Error"
 msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
 msgstr ""
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
 msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
 msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
+msgstr "სახელი:"
+
+#: ../settings/xfae-dialog.c:130
+msgid "Description:"
 msgstr ""
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
+msgstr "ბრძანება:"
+
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
 msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
 msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
 msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
 msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
+#: ../settings/xfce4-session-settings.glade.h:2
+msgid "<b>Compatibility</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
+#: ../settings/xfce4-session-settings.glade.h:5
+msgid "<b>Information</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:6
+msgid "<b>Logout Settings</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:7
+msgid "<b>Security</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+msgid "<b>Session Chooser</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+msgid "Ad_vanced"
 msgstr ""
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+msgid "Automatically save session on _logout"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
+#: ../settings/xfce4-session-settings.glade.h:12
+msgid "Con_figure"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr "სახელი:"
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
-msgid "Description:"
+#: ../settings/xfce4-session-settings.glade.h:15
+msgid "Launch GN_OME services on startup"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
-msgstr "ბრძანება:"
+#: ../settings/xfce4-session-settings.glade.h:16
+msgid "Launch _KDE services on startup"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:17
+msgid "Manage _remote applications"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:21
+msgid "Remove the selected application from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfce4-session-settings.glade.h:24
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+msgid "_Display chooser on login"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:26
+msgid "_General"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:27
+msgid "_Prompt on logout"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:28
+msgid "_Session"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:29
+msgid "_Test"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr ""
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr ""
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+msgid "Xfce Session Manager"
+msgstr ""
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "ხელახალი ჩატვირთვა"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -388,15 +426,21 @@ msgstr ""
 msgid "Create a new session."
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr ""
 
@@ -421,6 +465,31 @@ msgstr ""
 msgid "Try again"
 msgstr ""
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr ""
@@ -433,88 +502,88 @@ msgstr ""
 msgid "Choose a name for the new session:"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -529,7 +598,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr ""
 
@@ -553,34 +622,18 @@ msgstr ""
 msgid "Next"
 msgstr "შემდეგი"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr ""
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 9eb1c8bb..49bb5c15 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-09-24 12:07+0900\n"
 "Last-Translator: ByungHyun Choi <byunghyun.choi@debianusers.org>\n"
 "Language-Team: xfce4-users-kr-i18n <xfce4-users-kr-i18n@lists.sourceforge."
@@ -78,302 +78,349 @@ msgstr "쥐돌이"
 msgid "Mice Splash Engine"
 msgstr "쥐돌이 시작화면 엔진"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "그림 선택"
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "심플 테마 설정"
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "글꼴"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "색상"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "배경화면 색:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "글자 색:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "그림"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "사용자 지정 그림"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "단순"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "단순한 시작화면 엔진"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "세션 선택"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "로그인 할때 세션 선택"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
-msgstr "설정하면, Xfce에 로그인 할 때마다 세션을 선택하게 됩니다."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "로그아웃 설정"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "로그아웃 할 때 세션을 자동으로 저장"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"로그아웃할 때 현재 세션을 자동으로 저장하게 됩니다. 설정하지 않으면 로그아웃"
-"할 때 마다 현재 세션을 저장할 것인지 물어보게 됩니다."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "로그아웃할 때 마다 확인함"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"로그아웃 확인을 하지 않습니다. 세션 자동 저장 기능을 어떻게 설정했느냐에 따"
-"라 세션을 자동 저장하거나 그냥 버리게 됩니다."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "호환성"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "정보"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "기동시 그놈 서비스를 시작합니다."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"그놈 관련 응용프로그램을 사용하려면 선택하십시오. 세션 관리자에서 그놈 서비스"
-"를 시작하도록 설정됩니다. 그놈에서 제공하는 보조기능을 사용할 수도 있습니다."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "기동시 KDE 서비스를 시작합니다."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"KDE 관련 응용프로그램을 Xfce 데스크탑 세션의 일부로 사용하려면 선택하십시오. "
-"Xfce 기동시간은 상당히 느려지지만, KDE 관련 응용 프로그램은 기동속도가 빨라집"
-"니다. 이 옵션을 설정하지 않으면 일부 KDE 응용 프로그램이 동작하지 않을 수도 "
-"있습니다."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "보안"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "원격 프로그램 관리"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "세션 및 기동 설정"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"원격 호스트에서 실행 중인 프로그램을 세션 관리자에서 통제하도록 설정합니다. "
-"잘 모르면 선택하지 않는 것이 좋습니다."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "세션 및 기동"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "일반"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "고급"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "세션 및 기동"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "없음"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "시작 화면 설정"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "설정"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "선택한 시작 화면에 대한 설정 패널을 구동합니다."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "시험"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "선택한 시작화면을 보여 줍니다."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "정보"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>설명:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>버전:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>만든 이:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>홈페이지:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "시작화면 테마"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "프로그램 추가"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "이름:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "설명:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "명령:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "명령 선택"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "%s에 대한 %s의 링크를 못 끊었습니다."
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "화일 %s를(을) 생성하지 못 했습니다."
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "화일 %s를 기록하지 못 했습니다."
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "%s를(을) 기록하기위해 열지 못 했습니다."
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "자동시작 프로그램"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "다음은 Xfcee 데스트탑에 로그인할 때 자동으로 시작하는 프로그램의 리스트이며, "
 "마지막으로 로그아웃할 때 저장되는 프로그램의 리스트입니다."
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>만든 이:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "호환성"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>설명:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>홈페이지:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "정보"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "로그아웃 설정"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>설명:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "세션 선택"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>버전:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "고급"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "로그아웃 할 때 세션을 자동으로 저장"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "설정"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "선택한 시작화면을 보여 줍니다."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "기동시 KDE 서비스를 시작합니다."
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "기동시 KDE 서비스를 시작합니다."
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "원격 프로그램 관리"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "선택한 시작 화면에 대한 설정 패널을 구동합니다."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "선택한 시작화면을 보여 줍니다."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "세션 및 기동"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "로그인 할때 세션 선택"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "일반"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "로그아웃할 때 마다 확인함"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "세션 종료"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "시험"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "데스크탑 설정을 가져오고 있습니다."
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS 설정을 확인하고 있습니다."
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "세션 데이터를 가져오고 있습니다."
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "세션 이름을 선택하십시오."
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "로그아웃"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "다시 시작"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "시스템 종료"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "다음 로그인에 대비하여 세션 저장(_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "비밀번호를 입력하시지요:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>오류가 발생했습니다.</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -411,15 +458,21 @@ msgstr "새로운 세션"
 msgid "Create a new session."
 msgstr "새로운 세션 만들기"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "그놈 keyring 데몬을 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "그놈 보조 지원 기술을 시작합니다."
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE 서비스를 시작합니다."
 
@@ -447,6 +500,31 @@ msgstr "계속 진행합니다."
 msgid "Try again"
 msgstr "다시 시도합니다."
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "세션 선택"
@@ -459,88 +537,88 @@ msgstr "세션 이름을 선택하십시오."
 msgid "Choose a name for the new session:"
 msgstr "새로운 세션의 이름을 선택:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "볼륨 제어기를 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "패널을 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "데스크탑 관리자를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "태스크바를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "창 관리자를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "그놈 터미널 에뮬레이터를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE 고급 텍스트 편집기를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE 클립보드 관리자를 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE 편지 읽기를 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE 뉴스 읽기를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "컹커러를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE 터미널 에뮬레이터를 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "삑 미디어 재생기를 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "김프를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VIM을 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "세션 관리 프락시를 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat IRC 클라이언트를 기동시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "X 멀티미디어 시스템을 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X 터미널 에뮬레이터를 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s를(을) 기동 시키고 있습니다."
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -564,7 +642,7 @@ msgstr ""
 "디렉토리로 자동적으로 복사되었기 때문에 이 디렉토리는 이제 삭제하셔도\n"
 "됩니다.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "자동실행을 수행 중입니다."
 
@@ -588,37 +666,97 @@ msgstr "비법 전수"
 msgid "Next"
 msgstr "다음"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "세션 및 기동 설정"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "세션 및 기동 설정"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 세션 및 기동 설정"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 시작화면 설정"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "자동시작  프로그램"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "자동 시작 프로그램 리스트 수정"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 자동시작 프로그램"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-비법"
 
-#~ msgid "End Session"
-#~ msgstr "세션 종료"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr "설정하면, Xfce에 로그인 할 때마다 세션을 선택하게 됩니다."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "로그아웃할 때 현재 세션을 자동으로 저장하게 됩니다. 설정하지 않으면 로그아"
+#~ "웃할 때 마다 현재 세션을 저장할 것인지 물어보게 됩니다."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "로그아웃 확인을 하지 않습니다. 세션 자동 저장 기능을 어떻게 설정했느냐에 "
+#~ "따라 세션을 자동 저장하거나 그냥 버리게 됩니다."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "기동시 그놈 서비스를 시작합니다."
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "그놈 관련 응용프로그램을 사용하려면 선택하십시오. 세션 관리자에서 그놈 서"
+#~ "비스를 시작하도록 설정됩니다. 그놈에서 제공하는 보조기능을 사용할 수도 있"
+#~ "습니다."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "KDE 관련 응용프로그램을 Xfce 데스크탑 세션의 일부로 사용하려면 선택하십시"
+#~ "오. Xfce 기동시간은 상당히 느려지지만, KDE 관련 응용 프로그램은 기동속도"
+#~ "가 빨라집니다. 이 옵션을 설정하지 않으면 일부 KDE 응용 프로그램이 동작하"
+#~ "지 않을 수도 있습니다."
+
+#~ msgid "Security"
+#~ msgstr "보안"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "원격 호스트에서 실행 중인 프로그램을 세션 관리자에서 통제하도록 설정합니"
+#~ "다. 잘 모르면 선택하지 않는 것이 좋습니다."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "세션 및 기동"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "시작 화면 설정"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "시작화면 테마"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "자동시작 프로그램"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 시작화면 설정"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "자동시작  프로그램"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "자동 시작 프로그램 리스트 수정"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 자동시작 프로그램"
diff --git a/po/lt.po b/po/lt.po
index bb70aa24..2d6c3014 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:40+0900\n"
 "Last-Translator: Mantas Zapolskas <mantaz@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -78,313 +78,350 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Pasirinkite paveikslą..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigūruoti Paprastą..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Šriftas"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Spalvos"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Fono spalva:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Teksto spalva:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Paveikslas"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Naudoti kitokį paveikslą"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sesijų pasirinkimas"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Rodyti pasirinkimą prisijungiant"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informacija"
+
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Jeigu nustatytas, tai sesijų valdyklė paprašys Jūsų pasirinkti sesiją "
-"kiekvieną kartą prisijungiant prie Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Atsijungimo nuostatos"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automatiškai išsaugoti sesiją atsijungiant"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Sesijos ir įkeltis"
+
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Ši parinktis nurodo sesijų valdyklei išsaugoti dabartinę sesiją automatiškai "
-"išsiregistruojant. Jei nepasirinksite šios parinkties, Jūs būsite paklaustas "
-"ar norite išsaugoti dabartinę sesiją kiekvieno išsiregistravimo metu."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Užsiminti atsijungiant"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
-"Ši parinktis išjungia išsijungimo patvirtinimo dialogo langą. Sesija bus "
-"išsaugota ar ne, priklauso nuo to ar Jūs įjungėte automatinį sesijos "
-"išsaugojimą išsiregistruojant."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Suderinamumas"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Peleisti Gnome servisus įkelties metu"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Įjunkite šią, jei planuojate naudoti Gnome programas. Tai nurodys sesijų "
-"valdyklei paleisti keletą esminių Gnome tarnybų. Turėtumėte įjungti, jei "
-"norėsite naudoti \"Assistive·Technologies\", kurios pateikiamos kartu su "
-"Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Paleisti KDE servisus įkelties metu"
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
+msgstr "Nieko"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Įjunkite šią parinktį jei planuojate leisti KDE programas kaip Xfce aplinkos "
-"dalį.Tai itin padidins paleidimo laiką, kita vertus, KDE programos bus "
-"paleidžiamos greičiau. Kai kurios KDE programos gali visiškai neveikti jeigu "
-"neįjungsite šios parinkties."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Saugumas"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Valdyti nutolusias programas"
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
+msgstr ""
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
-"Leisti sesijų valdyklei valdyti programas, veikiančias nutolusiuose "
-"kompiuteriuose. Neįjunkite šios galimybės, nebent žinote, ką darote."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesijos ir įkeltis"
+#: ../settings/xfae-dialog.c:130
+#, fuzzy
+msgid "Description:"
+msgstr "<b>Aprašymas</b>"
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Įprastas"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Išplėstas"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "Sesijos ir įkeltis"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
-msgstr "Nieko"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Demonstracinio Ekrano Nustatymai"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigūruoti"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Atveria konfigūravimo langą pasirinktam demonstaciniam ekranui."
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Testas"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autorius:</b>"
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Parodo pasirinktą demonstracinį ekraną"
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Suderinamumas"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Aprašymas</b>"
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Svetainė:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
 msgstr "Informacija"
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Atsijungimo nuostatos"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
 msgstr "<b>Aprašymas</b>"
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sesijų pasirinkimas"
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr "<b>Versija:</b>"
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autorius:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Išplėstas"
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Svetainė:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automatiškai išsaugoti sesiją atsijungiant"
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:12
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "Demostracinis ekranas"
+msgid "Con_figure"
+msgstr "Konfigūruoti"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Parodo pasirinktą demonstracinį ekraną"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfce4-session-settings.glade.h:15
 #, fuzzy
-msgid "Description:"
-msgstr "<b>Aprašymas</b>"
+msgid "Launch GN_OME services on startup"
+msgstr "Paleisti KDE servisus įkelties metu"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Paleisti KDE servisus įkelties metu"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Valdyti nutolusias programas"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Atveria konfigūravimo langą pasirinktam demonstaciniam ekranui."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Parodo pasirinktą demonstracinį ekraną"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesijos ir įkeltis"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Rodyti pasirinkimą prisijungiant"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Įprastas"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Užsiminti atsijungiant"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Nauja sesija"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Testas"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-#, fuzzy
-msgid "Autostarted applications"
-msgstr "Valdyti nutolusias programas"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Paleidžiamos darbastalio nuostatos"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Tikrinami DNS nustatymai"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Pakraunami sesijos duomenys"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Pasirinkite sesijos vardą"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "Atsijungti"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 #, fuzzy
 msgid "Restart"
 msgstr "Atkurti"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Saugoti sesiją ateinantiems prisijungimams"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Įveskite savo slaptažodį:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Įvyko klaida</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -423,15 +460,21 @@ msgstr "Nauja sesija"
 msgid "Create a new session."
 msgstr "Sukurti naują sesiją."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Paleidžiamas Gnome rakto žiedų demonas"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Paleidžiamos Gnome pagalbos technologijos"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Peleidžiami KDE servisai"
 
@@ -456,6 +499,31 @@ msgstr "Tęsti bet kuriuo atveju"
 msgid "Try again"
 msgstr "Bandykite dar"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Pasirinkti sesiją"
@@ -468,88 +536,88 @@ msgstr "Pasirinkite sesijos vardą"
 msgid "Choose a name for the new session:"
 msgstr "Pasirinkite naujos sesijos naują vardą:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Paleidžiamas Garso valdiklis"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Paleidžiamas skydelis"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Paleidžiama darbalaukio tvarkyklė"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Paleidžiama užduočių juosta"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Paleidžiama langų tvarkyklė"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Paleidžiamas Gnome terminalo emuliatorius"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Paleidžiamas KDE tekstinis redaktorius"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Paleidžiama KDE iškarpinės tvarkyklė"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Paleidžiama KDE pašto programa"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Paleidžiama KDE naujienų skaityklė"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Paleidžiama Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Paleidžiamas KDE terminalo emuliatorius"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Paleidžiama Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Paleidžiama Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Paleidžiamas VI Improved tekstinis redaktorius"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Paleidžiamas sesijos valdymas"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Paleidžiamas X-Chat IRC klientas"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Paleidžiama XMMS grotuvas"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Paleidžiamas X terminalo emuliatorius"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Peleidžiama %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -564,7 +632,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Vykdomas autopaleidimas..."
 
@@ -588,43 +656,105 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "Sesijos ir įkeltis"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "Sesijos ir įkeltis"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Sesijos ir įkeltis"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Demonstracinio Ekrano Nustatymai"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr ""
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Jeigu nustatytas, tai sesijų valdyklė paprašys Jūsų pasirinkti sesiją "
+#~ "kiekvieną kartą prisijungiant prie Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Ši parinktis nurodo sesijų valdyklei išsaugoti dabartinę sesiją "
+#~ "automatiškai išsiregistruojant. Jei nepasirinksite šios parinkties, Jūs "
+#~ "būsite paklaustas ar norite išsaugoti dabartinę sesiją kiekvieno "
+#~ "išsiregistravimo metu."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Ši parinktis išjungia išsijungimo patvirtinimo dialogo langą. Sesija bus "
+#~ "išsaugota ar ne, priklauso nuo to ar Jūs įjungėte automatinį sesijos "
+#~ "išsaugojimą išsiregistruojant."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Peleisti Gnome servisus įkelties metu"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Įjunkite šią, jei planuojate naudoti Gnome programas. Tai nurodys sesijų "
+#~ "valdyklei paleisti keletą esminių Gnome tarnybų. Turėtumėte įjungti, jei "
+#~ "norėsite naudoti \"Assistive·Technologies\", kurios pateikiamos kartu su "
+#~ "Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Įjunkite šią parinktį jei planuojate leisti KDE programas kaip Xfce "
+#~ "aplinkos dalį.Tai itin padidins paleidimo laiką, kita vertus, KDE "
+#~ "programos bus paleidžiamos greičiau. Kai kurios KDE programos gali "
+#~ "visiškai neveikti jeigu neįjungsite šios parinkties."
+
+#~ msgid "Security"
+#~ msgstr "Saugumas"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Leisti sesijų valdyklei valdyti programas, veikiančias nutolusiuose "
+#~ "kompiuteriuose. Neįjunkite šios galimybės, nebent žinote, ką darote."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
 #, fuzzy
-msgid "Autostarted Applications"
-msgstr "Valdyti nutolusias programas"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sesijos ir įkeltis"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Demonstracinio Ekrano Nustatymai"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Demostracinis ekranas"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr ""
+#, fuzzy
+#~ msgid "Autostarted applications"
+#~ msgstr "Valdyti nutolusias programas"
+
+#, fuzzy
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Demonstracinio Ekrano Nustatymai"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "Nauja sesija"
+#~ msgid "Autostarted Applications"
+#~ msgstr "Valdyti nutolusias programas"
diff --git a/po/lv.po b/po/lv.po
index 2795ae4a..f3eea955 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-04-06 21:02+0300\n"
 "Last-Translator: Rihards Prieditis <RPrieditis@gmail.com>\n"
 "Language-Team: Latvian <RPrieditis@gmail.com>\n"
@@ -17,7 +17,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #: ../engines/balou/balou-theme.c:110
 msgid "No description given"
@@ -29,8 +30,12 @@ msgstr "Norādiet instalējamo tēmas failu..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Nevarēja uzinstalēt uzplaiksnījuma ekrāna tēmu no faila %s, lūdzu pārbaudiet, ka šīs fails ir derīgs tēmas arhīvs."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Nevarēja uzinstalēt uzplaiksnījuma ekrāna tēmu no faila %s, lūdzu "
+"pārbaudiet, ka šīs fails ir derīgs tēmas arhīvs."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -77,278 +82,357 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice uzplaiksnījuma ekrāna dzinējs"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Norādiet attēlu..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigurēt Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Fonts"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Krāsas"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Fona krāsa:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Teksta krāsa:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Attēls"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Izmantot citu attēlu"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Simple uzplaiksnījuma ekrāna dzinējs"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sesijas izvēlētājs"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Attēlot izvēlētāju uz pieteikšanos"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "Ja uzstādīts, sesiju pārvaldnieks, jautās izvēlēties sesiju katru reizi, kad Jūs piesakaties Xfce vidē."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Atteikšanās uzstādījumi"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automātiski saglabāt sesiju uz atteikšanos"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "Šī opcija nosaka sesijas pārvaldniekam saglabāt esošo sesiju automātiski, kad veicat atteikšanos. Ja neatzīmēsiet šo opciju, pie katras atteikšanās tiks jautāts par esošās sesijas saglabāšanu."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Jautāt uz atteikšanos"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "Šī opcija atspējo atteikšanās apstiprinājuma dialogu. Sesija tiks automātiski saglabāta, ja automātiskā sesijas saglabāšana pie atteikšanās ir iespējota."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Saderība"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Sāknējot palaist Gnome pakalpojumus"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Iespējojiet, ja vēlaties izmantot Gnome lietotnes. Sesiju pārvaldnieks palaidīs svarīgākos Gnome pakalpojumus. Jums šī opcija ir jāiespējo, ja vēlaties izmantot Gnome Assistive Technologie."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informācija"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Sāknējot palaist KDE pakalpojumus"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Iespējojiet, ja vēlaties izmantot KDE lietotnes. Šī opcija manāmi paildzinās ielādes laiku, bet no otras puses, KDE lietotnes palaidīsies ātrāk. Dažas KDE lietotnes var nestrādāt, ja šī opcija ir atspējota."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Drošība"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Pārvaldīt attālinātās lietotnes"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Sesija un sāknēšanas uzstādījumi"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Atļaut sesiju pārvaldniekam pārvaldīt skrejošās aplikācijas uz attālinātiem resursdatoriem. Neiespējojiet šo opciju, ja nezināt ko darāt."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesijas un sāknēšana"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Vispārēji"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Paplašināti"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sesijas un sāknēšana"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Nekas"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Uzplaiksnījuma ekrāna uzstādījumi"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigurēt"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Atver konfigurācijas logu, norādītajam uzplaiksnījuma ekrānam."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Tests"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstrēt izvēlēto uzplaiksnījuma ekrānu."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informācija"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Apraksts:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versija:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autors:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Mājas lapa:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Uzplaiksnījuma ekrāns"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Pievienot lietotni"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nosaukums:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Apraksts:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Komanda:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Norādiet komandu"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Neizdevās atvienot %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Neizdevās izveidot failu %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Neizdevās ierakstīt failā %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Neizdevās atvērt %s rakstīšanai"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Automātiski startētās lietotnes"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Apakšā ir saraksts ar lietotnēm, kuras tiks palaistas\n"
 "automātiski, kad jūs pieteiksieties Xfce videi,\n"
 "kā arī papildus lietotnes , kuras tika saglabātas\n"
 "kad Jūs atteicāties pēdējo reizi:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autors:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Saderība"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Apraksts:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Mājas lapa:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informācija"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Atteikšanās uzstādījumi"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Apraksts:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sesijas izvēlētājs"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versija:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Paplašināti"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automātiski saglabāt sesiju uz atteikšanos"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfigurēt"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstrēt izvēlēto uzplaiksnījuma ekrānu."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Sāknējot palaist KDE pakalpojumus"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Sāknējot palaist KDE pakalpojumus"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Pārvaldīt attālinātās lietotnes"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Atver konfigurācijas logu, norādītajam uzplaiksnījuma ekrānam."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstrēt izvēlēto uzplaiksnījuma ekrānu."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesijas un sāknēšana"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Attēlot izvēlētāju uz pieteikšanos"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Vispārēji"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Jautāt uz atteikšanos"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Jauna sesija"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Tests"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Ielādē darbavirsmas uzstādījumus"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Pārbauda DNS uzstādījumus"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Ielādē sesijas datus"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Norādiet sesijas vārdu"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Atteikties"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Restartēt"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Izslēgt"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Saglabāt sesiju nākamajai pieteikšanai"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Lūdzu ievadiet paroli:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Notika kļūda</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Iespējams, ka parole, kuru jūs ievadijāt ir nederīga, vai arī sistēmas administrators ir liedzis Jūsu lietotāja kontam veikt datora izslēgšanu."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Iespējams, ka parole, kuru jūs ievadijāt ir nederīga, vai arī sistēmas "
+"administrators ir liedzis Jūsu lietotāja kontam veikt datora izslēgšanu."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -356,8 +440,12 @@ msgid "Last accessed: %s"
 msgstr "Pēdējo reizi piekļūts: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Norādiet sesiju, kuru vēlaties atjaunot. Jūs arī varat veikt dubultklikšķi uz sesijas nosaukuma, lai to atjaunotu."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Norādiet sesiju, kuru vēlaties atjaunot. Jūs arī varat veikt dubultklikšķi "
+"uz sesijas nosaukuma, lai to atjaunotu."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -377,15 +465,21 @@ msgstr "Jauna sesija"
 msgid "Create a new session."
 msgstr "Izveidot jaunu sesiju"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Sāknēju The Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Sāknēju Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Sāknēju KDE pakalpojumus"
 
@@ -414,6 +508,31 @@ msgstr "Tomēr turpināt"
 msgid "Try again"
 msgstr "Mēģināt atkārtoti"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Norādiet sesiju"
@@ -426,88 +545,88 @@ msgstr "Norādiet sesijas vārdu"
 msgid "Choose a name for the new session:"
 msgstr "Norādiet jaunās sesijas vārdu:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Sāknēju skaļuma kontrolieri"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Sāknēju paneli"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Sāknēju darbavirsmas pārvaldnieku"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Sāknēju darbajoslu"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Sāknēju logu pārvaldnieku"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Sāknēju Gnome termināla emulatoru"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Sāknēju KDE Advanced Text Editor"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Sāknēju KDE starpliktuves pārvaldnieku"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Sāknēju KDE pasta lasītāju"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Sāknēju KDE ziņu lasītāju"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Sāknēju Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Sāknēju KDE termināla emulatoru"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Sāknēju Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Sāknēju The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Sāknēju VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Sāknēju sesijas pārvaldības starpnieku"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Sāknēju X-Chat IRC klientu"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Sāknēju X multimēdijas sistēmu"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Sāknēju X termināla emulatoru"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Sāknēju %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -521,7 +640,8 @@ msgid ""
 "location.\n"
 "You should delete this directory now.\n"
 msgstr ""
-"Atrašanās vieta un formāts automātiskai startēšanas direktorijai ir mainījies.\n"
+"Atrašanās vieta un formāts automātiskai startēšanas direktorijai ir "
+"mainījies.\n"
 "Jaunā vieta ir\n"
 "\n"
 "  %s\n"
@@ -532,17 +652,15 @@ msgstr ""
 "vietā.\n"
 "Jums vajadzētu šo direktoriju tagad izdzēst.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Veicu automātisko sāknēšanu..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Padomi un triki"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Veiksmes"
 
@@ -550,8 +668,7 @@ msgstr "Veiksmes"
 msgid "Display tips on _startup"
 msgstr "Rādīt padomus _sāknējot"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Padomi un triki"
 
@@ -559,35 +676,100 @@ msgstr "Padomi un triki"
 msgid "Next"
 msgstr "Nākamais"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Sesija un sāknēšanas uzstādījumi"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Sesijas un sāknēšanas uzstādījumi"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 sesijas un sāknēšanas uzstādījumi"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 uzplaiksnījuma ekrāna uzstādījumi"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Automātiski startējamās lietotnes"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Rediģē automātiski startējamo lietotņu sarakstu"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 automātiski startētās lietotnes"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Ja uzstādīts, sesiju pārvaldnieks, jautās izvēlēties sesiju katru reizi, "
+#~ "kad Jūs piesakaties Xfce vidē."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Šī opcija nosaka sesijas pārvaldniekam saglabāt esošo sesiju automātiski, "
+#~ "kad veicat atteikšanos. Ja neatzīmēsiet šo opciju, pie katras atteikšanās "
+#~ "tiks jautāts par esošās sesijas saglabāšanu."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Šī opcija atspējo atteikšanās apstiprinājuma dialogu. Sesija tiks "
+#~ "automātiski saglabāta, ja automātiskā sesijas saglabāšana pie atteikšanās "
+#~ "ir iespējota."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Sāknējot palaist Gnome pakalpojumus"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Iespējojiet, ja vēlaties izmantot Gnome lietotnes. Sesiju pārvaldnieks "
+#~ "palaidīs svarīgākos Gnome pakalpojumus. Jums šī opcija ir jāiespējo, ja "
+#~ "vēlaties izmantot Gnome Assistive Technologie."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Iespējojiet, ja vēlaties izmantot KDE lietotnes. Šī opcija manāmi "
+#~ "paildzinās ielādes laiku, bet no otras puses, KDE lietotnes palaidīsies "
+#~ "ātrāk. Dažas KDE lietotnes var nestrādāt, ja šī opcija ir atspējota."
+
+#~ msgid "Security"
+#~ msgstr "Drošība"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Atļaut sesiju pārvaldniekam pārvaldīt skrejošās aplikācijas uz "
+#~ "attālinātiem resursdatoriem. Neiespējojiet šo opciju, ja nezināt ko darāt."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sesijas un sāknēšana"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Uzplaiksnījuma ekrāna uzstādījumi"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Uzplaiksnījuma ekrāns"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Automātiski startētās lietotnes"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 uzplaiksnījuma ekrāna uzstādījumi"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Automātiski startējamās lietotnes"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Rediģē automātiski startējamo lietotņu sarakstu"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 automātiski startētās lietotnes"
diff --git a/po/mk.po b/po/mk.po
index 80e71c5f..5412115d 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Josip Dzolonga <jdzolonga@gmail.com> 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-12-24 01:15+0100\n"
 "Last-Translator: Josip Dzolonga <jdzolonga@gmail.com>\n"
 "Language-Team: Macedonian <LL@li.org>\n"
@@ -77,312 +77,352 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice сплеш енџин"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Избери слика..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Конфигурирај Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Фонт"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Бои"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Боја на позадина:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Боја на текст:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Слика"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Користи прилагодена слика"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Simple сплеш енџин"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Избирач на сесија"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Избирач на приказ на најава"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Ако е наместено, менаџерот на сесии ќе те праша да избереш сесија при секое "
-"најавување на Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Постаувања на одјава"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Автоматски зачувај сесија при одјава"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Оваа опција му дава инструкција на менаџерот на сесии автоматски да ја "
-"зачува тековна сесија при одјава. Ако не ја избериш оваа опција ќе бидеш "
-"прашан дали сакаш да ја зачуваш тековната сесија на секоја одјава."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Прашај на одјава"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Информација"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Оваа опција го оневозможува дијалогот за одобрување на одјава. Дали оваа "
-"сесија ќе биде зачувана или не зависи дали си го овозможил автоматското "
-"зачувување на сесии на одјавa."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Компатибилност"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Стартувај ги Gnome сервисите при подигнување на системот"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Овозможи го ова ако планираш да користиш Gnome апликации. Ова ќе му прати "
-"инструкција на менаџерот на сесии да подигни некои витални Gnome сервиси за "
-"тебе. Треба да го овозможите ова ако сакате да ги користите помошните "
-"технологии кои се доставуваат со Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Стартувај KDЕ сервиси на подигнување"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Овозможи го ова ако планираш да користиш KDE апликации како дел од Вашата "
-"Xfce десктоп сесија. Ова значително ќе го зголеми времето на подигнување, но "
-"KDE апликациите ќе се стартуваат побрзо. Некои KDE апликации може воопшто да "
-"не работат ако оваа опција не е овозможена."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Безбедност"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Менаџирај апликации со далечински пристап"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Поставки на сесија и подигнување"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Дозволи му на менаџерот на сесија да управува со апликациите кои се "
-"извршуваат на далечински сервери. Не ја овозможувај оваа опција доколку не "
-"си сигурен што правиш"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Сесии и подигнување"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Општо"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Напредно"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Наслов на копче|Сесии и подигнување"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Ништо"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Поставување на сплеш екран"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Конфигурирај"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Го отвара конфигурациониот панел за селектираниот сплеш екран."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Тест"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Го демонстрира селектираниот сплеш екран"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Информација"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Опис:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Верзија</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Автор:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Веб страна:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Наслов на копче|Сплеш екран"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Додај апликација"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Име:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Команда:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Избери команда"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Не успеав да ја поништам врската %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Не успеав да ја креирам датотеката %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Не успеав да ја запишам датотеката %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Не успев да ја отворам %s за пишување"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Подолу се наоѓа листата на апликации кои автоматски ќе бидат\n"
 "стартувани кога ќе се најавите на вашиот Xfce десктоп,\n"
 "заедно со апликациите кои беа зачувани кога се одјавивте\n"
 "последниот пат:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Автор:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Компатибилност"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Опис:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Веб страна:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Информација"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Постаувања на одјава"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Опис:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Избирач на сесија"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Верзија</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Напредно"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Автоматски зачувај сесија при одјава"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Конфигурирај"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Го демонстрира селектираниот сплеш екран"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Стартувај KDЕ сервиси на подигнување"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Стартувај KDЕ сервиси на подигнување"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Менаџирај апликации со далечински пристап"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Го отвара конфигурациониот панел за селектираниот сплеш екран."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Го демонстрира селектираниот сплеш екран"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Сесии и подигнување"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Избирач на приказ на најава"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Општо"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Прашај на одјава"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Заврши сесија"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Тест"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Вчитување на поставки на десктопот"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Проверка на DNS поставките"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Вчитување на податоци на сесија"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Избери име на сесија"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Одјава"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Рестартирај"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Исклучи"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "Зачувај ја тековната _сесија за идни најавувања"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Внесете ја Вашата лозинка:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Се случи грешка</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +461,21 @@ msgstr "Нова сесија"
 msgid "Create a new session."
 msgstr "Креирај нова сесија"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Се стартува Gnome Keyring демонот"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Се стартуваат Gnome помошните технологии"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Се стартуваат KDE сервисите"
 
@@ -458,6 +504,31 @@ msgstr "Продолжи во секој случај"
 msgid "Try again"
 msgstr "Пробај повторно"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Избери сесија"
@@ -470,88 +541,88 @@ msgstr "Избери име на сесија"
 msgid "Choose a name for the new session:"
 msgstr "Избери име за новата сесија:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Се стартува контролерот на звук"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Се стартува панелот"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Се стартува десктоп менаџерот"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Се стартува лентата со прозорци"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Се стартува менаџерот на прозорци"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Се стартува емулаторот на терминал за Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Се стартува напредниот текст уредувач за KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Се стартува менаџерот на табла со исечоци за KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Се стартува читачот на пошта за KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Се стартува читачот на вести за KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Се стартува Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Се стартува емулаторот на терминал за KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Се стартува Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Се стартува The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Се стартува VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Се стартува проксито за менаџирање на сесии"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Се стартува X-Chat IRC Client"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Се стартува X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Се стартува емулаторот на терминал за X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Се стартува %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -579,7 +650,7 @@ msgstr ""
 "локација.\n"
 "Би требало да го избришете овој директориум.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Извршувам Autostart..."
 
@@ -603,37 +674,100 @@ msgstr "Трикови и совети"
 msgid "Next"
 msgstr "Следно"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Поставки на сесија и подигнување"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Поставки на сесии и подигнување"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Поставки на сесии и подигнување за Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Поставки на сплеш екран за Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aвтоматски стартувани апликации"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Уреди ја листата на апликации кои автоматски се стартуваат"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Апликации кои автоматски се статуваат на Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Заврши сесија"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Ако е наместено, менаџерот на сесии ќе те праша да избереш сесија при "
+#~ "секое најавување на Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Оваа опција му дава инструкција на менаџерот на сесии автоматски да ја "
+#~ "зачува тековна сесија при одјава. Ако не ја избериш оваа опција ќе бидеш "
+#~ "прашан дали сакаш да ја зачуваш тековната сесија на секоја одјава."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Оваа опција го оневозможува дијалогот за одобрување на одјава. Дали оваа "
+#~ "сесија ќе биде зачувана или не зависи дали си го овозможил автоматското "
+#~ "зачувување на сесии на одјавa."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Стартувај ги Gnome сервисите при подигнување на системот"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Овозможи го ова ако планираш да користиш Gnome апликации. Ова ќе му прати "
+#~ "инструкција на менаџерот на сесии да подигни некои витални Gnome сервиси "
+#~ "за тебе. Треба да го овозможите ова ако сакате да ги користите помошните "
+#~ "технологии кои се доставуваат со Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Овозможи го ова ако планираш да користиш KDE апликации како дел од Вашата "
+#~ "Xfce десктоп сесија. Ова значително ќе го зголеми времето на подигнување, "
+#~ "но KDE апликациите ќе се стартуваат побрзо. Некои KDE апликации може "
+#~ "воопшто да не работат ако оваа опција не е овозможена."
+
+#~ msgid "Security"
+#~ msgstr "Безбедност"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Дозволи му на менаџерот на сесија да управува со апликациите кои се "
+#~ "извршуваат на далечински сервери. Не ја овозможувај оваа опција доколку "
+#~ "не си сигурен што правиш"
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Наслов на копче|Сесии и подигнување"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Поставување на сплеш екран"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Наслов на копче|Сплеш екран"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Поставки на сплеш екран за Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aвтоматски стартувани апликации"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Уреди ја листата на апликации кои автоматски се стартуваат"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Апликации кои автоматски се статуваат на Xfce 4"
diff --git a/po/mr.po b/po/mr.po
index 457c0334..a09e2e47 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:40+0900\n"
 "Last-Translator: Pallavi Nikam <pallavi_edu@rediffmail.com>\n"
 "Language-Team: Marathi <LL@li.org>\n"
@@ -79,311 +79,349 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "प्रतिमा निवडा..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "साधे कॉनफिग्युर..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "फॉन्टं"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "रंग"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "पाश्वभूमीचा रंग:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "मुख्य भागाचा रंग:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "प्रतिमा"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "अनुरुप प्रतिमा वापरा"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "सत्र निवडणारा"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "लॉगइनवर निवडणारा दाखवा"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "माहिती"
+
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"नीट झाल्यास, प्रत्येकवेळी Xfce मध्ये लॉगइन करताना सत्र व्यवस्थापक तुम्हाला सत्र निवडण्यास "
-"सांगेल."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "लॉगआऊट रचना"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "लॉगआऊटवर सत्र आपोआप रक्षण करा"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "सत्र आणि प्रारंभीच्या रचना"
+
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"हा पर्याय तुम्ही लॉगआऊट झाल्यानंतर चालू सत्र आपोआप रक्षण करण्याची सूचना सत्र व्यवस्थापकास "
-"देतो. तुम्ही हा पर्याय न निवडल्यास तुम्हाला अनुबोधन केले जाते की प्रत्येकवेळी लॉगआऊट करताना "
-"तुम्हाला चालू सत्र रक्षण करावयाचे आहे का."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "लॉगआऊटवर अनुबोधन"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
-"हा पर्याय लॉगआऊटची पुष्टी करणारा संवाद अदृश्य करतो. सत्राचे रक्षण होणे किंवा न होणे हे "
-"तुम्ही लॉगआऊटवर सत्रांचे अपोआप रक्षण करणारा पर्याय कार्यरत केला आहे किंवा नाही यावर "
-"अवलंबून असते."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "सुसंगतपणा"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "प्रारंभवर जिनॉम सुविधा घाला"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
+msgstr "काहीही नाही"
+
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
-"जीनॉम ऍप्लिकेशनस सुरु करण्याची योजना असल्यास हे कार्यरत करा. हे तुमच्या सत्र व्यवस्थापकास "
-"तुमच्यासाठी काही महत्वाच्या जीनॉम सेवा सुरु करण्याची सुचना देइल. तुम्हास जीनॉम बरोबर "
-"येणारी साहाय्यक तंत्रज्ञाने वापरावयाची असल्यास तुम्हीहि हे कार्यरत करु शकता."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "प्रारंभावर KDE सेवा सुरु करा"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"एक Xfce चा भाग समजून KDE ऍप्लिकेशनस सुरु करण्याची योजना असल्यास  हा पर्याय कार्यरत "
-"करा. हि क्रिया प्रारंभ करण्याची वेळ लक्षात येण्याजोगी वाढवेल. पण दुसरीकडील बाजूस KDE "
-"ऍप्लिकेशनस लवकर सुरु होतील. हा पर्याय कार्यरत न केल्यास काही KDE ऍप्लिकेशनस संपुर्णतह काम "
-"करणार नाहीत."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "रक्षा"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "मुळ ऍप्लिकेशनस व्यवस्थीत करा"
+#: ../settings/xfae-dialog.c:130
+#, fuzzy
+msgid "Description:"
+msgstr "<b>वर्णन:</b>"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
 msgstr ""
-"सत्र व्यवस्थापकास रिमोट होस्टवर सुरु असलेले ऍप्लिकेशनस व्यवस्थीत करण्यास परवानगी देतो. जर "
-"तुम्ही काय करत असाल हे माहित नसेल तर हा पर्याय कार्यरत करु नका."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "सत्र आणि प्रारंभ"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "सामान्य"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "आधुनिक"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "सत्र आणि प्रारंभ"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
-msgstr "काहीही नाही"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "पडद्याच्या रचना स्प्लॅश करा"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "कॉनफिग्युर"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>लेखक:</b>"
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "निवडलेल्या स्प्लॅश पडद्यासाठि कॉनफिग्युरेशन पॅनेल उघडा."
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "सुसंगतपणा"
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "परिक्षा"
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>वर्णन:</b>"
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "निवडलेला स्प्लॅश पडदा दाखवा."
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>होम पेज:</b>"
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
 msgstr "माहिती"
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "लॉगआऊट रचना"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
 msgstr "<b>वर्णन:</b>"
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "सत्र निवडणारा"
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr "<b>आवृत्ती:</b>"
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>लेखक:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "आधुनिक"
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>होम पेज:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "लॉगआऊटवर सत्र आपोआप रक्षण करा"
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:12
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "स्प्लॅश पडदा"
+msgid "Con_figure"
+msgstr "कॉनफिग्युर"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "निवडलेला स्प्लॅश पडदा दाखवा."
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfce4-session-settings.glade.h:15
 #, fuzzy
-msgid "Description:"
-msgstr "<b>वर्णन:</b>"
+msgid "Launch GN_OME services on startup"
+msgstr "प्रारंभावर KDE सेवा सुरु करा"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "प्रारंभावर KDE सेवा सुरु करा"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "मुळ ऍप्लिकेशनस व्यवस्थीत करा"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "निवडलेल्या स्प्लॅश पडद्यासाठि कॉनफिग्युरेशन पॅनेल उघडा."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "निवडलेला स्प्लॅश पडदा दाखवा."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "सत्र आणि प्रारंभ"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "लॉगइनवर निवडणारा दाखवा"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "सामान्य"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "लॉगआऊटवर अनुबोधन"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "नवीन सत्र"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "परिक्षा"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-#, fuzzy
-msgid "Autostarted applications"
-msgstr "मुळ ऍप्लिकेशनस व्यवस्थीत करा"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "डेस्कटॉपच्या रचना लोड होत आहेत"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS रचना तपासा"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "सत्र माहिती लोड होत आहे"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "सत्राचे नाव निवडा"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "लॉगआउट"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "भविष्यात लॉगइन करण्याकरिता सत्राचे रक्षण करा (_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "कृपया तुमचा पासवर्ड लिहा:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b> चूक झालेली आहे</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -420,15 +458,21 @@ msgstr "नवीन सत्र"
 msgid "Create a new session."
 msgstr "नवीन सत्र तयार करा."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "जीनॉम केरिंग डेइमन सुरु आहे"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "जीनॉम असिसटीव साहाय्यक तंत्रज्ञाने सुरु आहे"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE सेवा सुरु आहे"
 
@@ -456,6 +500,31 @@ msgstr "काहीही झाले तरी सुरु करा"
 msgid "Try again"
 msgstr "पुन:प्रयत्न"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "सत्र निवडा"
@@ -468,88 +537,88 @@ msgstr "सत्राचे नाव निवडा"
 msgid "Choose a name for the new session:"
 msgstr "नविन सत्राचे नाव निवडा:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "आवाज नियंत्रक सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "पॅनेल सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "डेस्कटॉप व्यवस्थापक सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "कार्य दांडा सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "खिडकी व्यवस्थापक सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "जिनॉम टर्मिनल एम्यलेटर सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr " KDE आधुनिक मुख्य संपादक सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "क्लिप बोर्ड व्यवस्थापक सुरु आहे "
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "पत्र वाचका सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "बातमी वाचक सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "कॉनकेरर सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE टर्मिनल एम्यलेटर सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "बीप मेडिया प्लेअर सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "गीम्प सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI सुधारित संपादक सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "सत्र व्यवस्थापन प्रतिनिधी सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "एक्स - चॅट IRC पक्षकार सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "एक्स मल्टिमेडिया  प्रणाली सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "एक्स टर्मिनल एम्यलेटर सुरु आहे"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "सुरु आहे %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -564,7 +633,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr " पुन:सुरुवात कार्यरत आहे..."
 
@@ -588,39 +657,100 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "सत्र आणि प्रारंभीच्या रचना"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "सत्रे आणि प्रारंभीच्या रचना"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 सत्रे आणि प्रारंभीच्या रचना"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr " Xfce 4 स्पॅश पडद्याची रचना"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr ""
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "नीट झाल्यास, प्रत्येकवेळी Xfce मध्ये लॉगइन करताना सत्र व्यवस्थापक तुम्हाला सत्र "
+#~ "निवडण्यास सांगेल."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "हा पर्याय तुम्ही लॉगआऊट झाल्यानंतर चालू सत्र आपोआप रक्षण करण्याची सूचना सत्र "
+#~ "व्यवस्थापकास देतो. तुम्ही हा पर्याय न निवडल्यास तुम्हाला अनुबोधन केले जाते की प्रत्येकवेळी "
+#~ "लॉगआऊट करताना तुम्हाला चालू सत्र रक्षण करावयाचे आहे का."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "हा पर्याय लॉगआऊटची पुष्टी करणारा संवाद अदृश्य करतो. सत्राचे रक्षण होणे किंवा न होणे हे "
+#~ "तुम्ही लॉगआऊटवर सत्रांचे अपोआप रक्षण करणारा पर्याय कार्यरत केला आहे किंवा नाही यावर "
+#~ "अवलंबून असते."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "प्रारंभवर जिनॉम सुविधा घाला"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "जीनॉम ऍप्लिकेशनस सुरु करण्याची योजना असल्यास हे कार्यरत करा. हे तुमच्या सत्र "
+#~ "व्यवस्थापकास तुमच्यासाठी काही महत्वाच्या जीनॉम सेवा सुरु करण्याची सुचना देइल. तुम्हास "
+#~ "जीनॉम बरोबर येणारी साहाय्यक तंत्रज्ञाने वापरावयाची असल्यास तुम्हीहि हे कार्यरत करु "
+#~ "शकता."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "एक Xfce चा भाग समजून KDE ऍप्लिकेशनस सुरु करण्याची योजना असल्यास  हा पर्याय कार्यरत "
+#~ "करा. हि क्रिया प्रारंभ करण्याची वेळ लक्षात येण्याजोगी वाढवेल. पण दुसरीकडील बाजूस KDE "
+#~ "ऍप्लिकेशनस लवकर सुरु होतील. हा पर्याय कार्यरत न केल्यास काही KDE ऍप्लिकेशनस संपुर्णतह "
+#~ "काम करणार नाहीत."
+
+#~ msgid "Security"
+#~ msgstr "रक्षा"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "सत्र व्यवस्थापकास रिमोट होस्टवर सुरु असलेले ऍप्लिकेशनस व्यवस्थीत करण्यास परवानगी देतो. "
+#~ "जर तुम्ही काय करत असाल हे माहित नसेल तर हा पर्याय कार्यरत करु नका."
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
 #, fuzzy
-msgid "Autostarted Applications"
-msgstr "मुळ ऍप्लिकेशनस व्यवस्थीत करा"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "सत्र आणि प्रारंभ"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
+#~ msgid "Splash Screen Settings"
+#~ msgstr "पडद्याच्या रचना स्प्लॅश करा"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "स्प्लॅश पडदा"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr ""
+#, fuzzy
+#~ msgid "Autostarted applications"
+#~ msgstr "मुळ ऍप्लिकेशनस व्यवस्थीत करा"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr " Xfce 4 स्पॅश पडद्याची रचना"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "नवीन सत्र"
+#~ msgid "Autostarted Applications"
+#~ msgstr "मुळ ऍप्लिकेशनस व्यवस्थीत करा"
diff --git a/po/ms.po b/po/ms.po
index 75f8db35..df3664ce 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:41+0900\n"
 "Last-Translator: Harun Musa <mharun@gmx.net>\n"
 "Language-Team: Malay <translation-team-ms@list.sourceforge.net>\n"
@@ -77,300 +77,344 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr ""
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 #, fuzzy
 msgid "Configure Simple..."
 msgstr "Kepastian logout"
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr ""
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr ""
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr ""
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr ""
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
+
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
+
+#: ../settings/main.c:44
 #, fuzzy
-msgid "Session chooser"
-msgstr "Sessi kawalan"
+msgid "Version information"
+msgstr "Berinteraksi"
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
-#: ../settings/session/session.c:154
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
+
+#: ../settings/main.c:84
 #, fuzzy
-msgid "Logout settings"
-msgstr "Logout sessi"
+msgid "Session Settings"
+msgstr "Pengurusan sessi"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Secara automatik simpan sessi ketika logout"
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:100
+msgid "Internal Error"
 msgstr ""
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
 msgstr ""
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
 msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
 msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/xfae-dialog.c:130
+msgid "Description:"
 msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
 msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
 msgstr ""
 
-#: ../settings/session/session.c:273
+#: ../settings/xfae-model.c:558
+#, fuzzy, c-format
+msgid "Failed to unlink %s: %s"
+msgstr "Tak boleh untuk klon klien: %s"
+
+#: ../settings/xfae-model.c:646
+#, fuzzy, c-format
+msgid "Failed to create file %s"
+msgstr "Tidak boleh cipta klien MCS"
+
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
+
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
+
+#: ../settings/xfae-window.c:102
 msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 
-#: ../settings/session/session.c:333
+#: ../settings/xfce4-session-settings.glade.h:1
 #, fuzzy
-msgid "Sessions and Startup"
-msgstr "Pengurusan sessi"
+msgid "<b>Author:</b>"
+msgstr "Pengarang:"
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Umum"
+#: ../settings/xfce4-session-settings.glade.h:2
+msgid "<b>Compatibility</b>"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
+#: ../settings/xfce4-session-settings.glade.h:5
 #, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "Pengurusan sessi"
+msgid "<b>Information</b>"
+msgstr "Berinteraksi"
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Logout sessi"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "Pengarang:"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sessi kawalan"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
+#: ../settings/xfce4-session-settings.glade.h:10
+msgid "Ad_vanced"
 msgstr ""
 
-#: ../settings/splash/splash.c:457
+#: ../settings/xfce4-session-settings.glade.h:11
 #, fuzzy
-msgid "Configure"
-msgstr "Kepastian logout"
+msgid "Automatically save session on _logout"
+msgstr "Secara automatik simpan sessi ketika logout"
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Kepastian logout"
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../settings/splash/splash.c:476
+#: ../settings/xfce4-session-settings.glade.h:14
 #, fuzzy
 msgid "Demonstrates the selected splash screen."
 msgstr "Skrin splash default"
 
-#: ../settings/splash/splash.c:493
-#, fuzzy
-msgid "Information"
-msgstr "Berinteraksi"
+#: ../settings/xfce4-session-settings.glade.h:15
+msgid "Launch GN_OME services on startup"
+msgstr ""
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:16
+msgid "Launch _KDE services on startup"
 msgstr ""
 
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
+#: ../settings/xfce4-session-settings.glade.h:17
+msgid "Manage _remote applications"
 msgstr ""
 
-#: ../settings/splash/splash.c:532
-#, fuzzy
-msgid "<b>Author:</b>"
-msgstr "Pengarang:"
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr ""
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "Tema skrin splash"
+msgid "Remove the selected application from the session."
+msgstr "Skrin splash default"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+#, fuzzy
+msgid "Sessions and Startup"
+msgstr "Pengurusan sessi"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
-msgid "Description:"
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:25
+msgid "_Display chooser on login"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Umum"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+msgid "_Prompt on logout"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, fuzzy, c-format
-msgid "Failed to unlink %s: %s"
-msgstr "Tak boleh untuk klon klien: %s"
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Keluar sessi"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, fuzzy, c-format
-msgid "Failed to create file %s"
-msgstr "Tidak boleh cipta klien MCS"
+#: ../settings/xfce4-session-settings.glade.h:29
+msgid "_Test"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 #, fuzzy
 msgid "Loading desktop settings"
 msgstr "Logout sessi"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr ""
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 #, fuzzy
 msgid "Loading session data"
 msgstr "Memulakan pengurus sessi..."
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Pengurusan sessi"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Simpan sessi untuk login hadapan"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -407,15 +451,21 @@ msgstr "Keluar sessi"
 msgid "Create a new session."
 msgstr "Simpan sessi"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 #, fuzzy
 msgid "Starting KDE services"
 msgstr "Memulakan %s..."
@@ -442,6 +492,31 @@ msgstr ""
 msgid "Try again"
 msgstr ""
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 #, fuzzy
 msgid "Choose session"
@@ -456,98 +531,98 @@ msgstr ""
 msgid "Choose a name for the new session:"
 msgstr "Simpan sessi"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 #, fuzzy
 msgid "Starting the Panel"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 #, fuzzy
 msgid "Starting the Desktop Manager"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 #, fuzzy
 msgid "Starting the Taskbar"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 #, fuzzy
 msgid "Starting the Window Manager"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 #, fuzzy
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 #, fuzzy
 msgid "Starting the KDE Mail Reader"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 #, fuzzy
 msgid "Starting the KDE News Reader"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 #, fuzzy
 msgid "Starting the Konqueror"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 #, fuzzy
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 #, fuzzy
 msgid "Starting the Session Management Proxy"
 msgstr "Memulakan pengurus sessi.."
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, fuzzy, c-format
 msgid "Starting %s"
 msgstr "Memulakan %s..."
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -562,7 +637,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 #, fuzzy
 msgid "Performing Autostart..."
 msgstr "Laku Automula..."
@@ -587,42 +662,33 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "Pengurusan sessi"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "Pengurusan sessi"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Pengurusan sessi"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Tema skrin splash"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr ""
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "Keluar sessi"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Pengurusan sessi"
+
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Tema skrin splash"
+
+#, fuzzy
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Tema skrin splash"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 984929b8..d78acdf0 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-08-18 01:33+0900\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.uio.no>\n"
@@ -35,6 +35,7 @@ msgstr ""
 "gyldig velkomstbildearkiv."
 
 #: ../engines/balou/config.c:386
+#, c-format
 msgid "Unable to remove splash theme \"%s\" from directory %s."
 msgstr "Ikke i stand til å installere oppstarts tema fra mappen %s: %s"
 
@@ -78,308 +79,351 @@ msgstr "Mus"
 msgid "Mice Splash Engine"
 msgstr "Mus velkomstbilde motor"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Velg bilde ..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Enkelt oppsett ..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Skrift"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Farger"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Bakgrunnsfarge:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Tekstfarge:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Bilde"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Bruk selvvalgt bilde"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Enkel"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Enkel velkomstbilde motor"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Innlogging"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Vis øktvelger ved innlogging"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Hvis satt vil øktbehandleren be deg velge en økt hver gang du logger inn i "
-"Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Utlogging"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automatisk lagre økten ved utlogging"
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Dette valger instruerer sesjonshåndteren til å lagre den aktuelle sesjonen "
-"automatisk når du logger ut. Hvis du ikke markerer dette valget her vil du "
-"bli spurt om du vil lagre den aktuelle sesjonen ved hver utlogging."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Bekreft ved utlogging"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informasjon"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Dette alternativet instruerer øktbehandleren å lagre nåværende økt "
-"automatisk når du logger ut. Hvis du ikke velger dette alternativet vil du "
-"bli spurt om du ønsker å lagre økten hver gang du logger ut."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Samspill"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Start Gnome tjenester ved oppstart"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Aktiver denne hvis du  bruker Gnome programmer. Valget vil instruere "
-"øktbehandleren til å starte vitale Gnome tjenester for deg. Du burde også "
-"aktivere denne hvis du ønsker å bruke hjelpemiddelteknologiene som følger "
-"med Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Start KDE tjenester ved oppstart"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Aktiver denne hvis du bruker KDE programmer som del av Xfce "
-"skrivebordsmiljø-økten. Dette vil merkbart øke Xfce sin oppstarttid, men "
-"KDE programmer vil starte raskere. Enkelte KDE programmer vil ikke fungere "
-"dersom dette valget ikke er aktivert."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Sikkerhet"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Håndtere eksterne programmer"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Innstillinger for Økter og Oppstart"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Tillate øktbehandleren å håndtere programmer som kjører på eksterne "
-"tjenere. Ikke aktiver dette med mindre du vet helt sikkert hva du gjør."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Økter og oppstart"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Generelt"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avansert"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Økt administrering"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Økter og oppstart"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Innstillinger for Velkomstbilde"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Innstillinger"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Åpner oppsettbilde for det valgte velkomstbilde."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Prøv"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstrerer det valgte velkomstbildet"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informasjon"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Beskrivelse:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versjon:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Forfatter:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Hjemmeside:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Velkomstbilde"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Legg til program"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Kommando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Velg en kommando"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
+#, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Klarte ikke å kople fra %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
+#, c-format
 msgid "Failed to create file %s"
 msgstr "Klarte ikke å opprette filen %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Klarte ikke å skrive filen %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Klarte ikke å åpne %s for skriving"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Automatisk startede programmer"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Dette er en liste over programmer som vil bli startet\n"
 "automatisk når du logger inn i Xfce skrivebordsmiljøet.\n"
 "Programmene som ble lagret i økten sist du logget ut vil \n"
 "også bli startet:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Forfatter:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Samspill"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Beskrivelse:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Hjemmeside:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informasjon"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Utlogging"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Beskrivelse:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Innlogging"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versjon:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avansert"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automatisk lagre økten ved utlogging"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Innstillinger"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstrerer det valgte velkomstbildet"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Start KDE tjenester ved oppstart"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Start KDE tjenester ved oppstart"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Håndtere eksterne programmer"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Åpner oppsettbilde for det valgte velkomstbilde."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstrerer det valgte velkomstbildet"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Økter og oppstart"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Vis øktvelger ved innlogging"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Generelt"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Bekreft ved utlogging"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Ny økt"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Prøv"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Laster inn skrivebordsinnstillinger"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Kontrollerer DNS innstillinger"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Laster inn øktdata"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Velg øktnavn"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Logg ut"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Starte på nytt"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Avslutt"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Lagre økt for fremtidige innlogginger"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Skriv inn passordet ditt:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>En feil oppsto</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -397,8 +441,8 @@ msgid ""
 "Choose the session you want to restore. You can simply double-click the "
 "session name to restore it."
 msgstr ""
-"Velg økten du ønsker å gjenopprette. Du kan dobbeltklikke øktnavnet for "
-"å gjenopprette økten."
+"Velg økten du ønsker å gjenopprette. Du kan dobbeltklikke øktnavnet for å "
+"gjenopprette økten."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -418,15 +462,21 @@ msgstr "Ny økt"
 msgid "Create a new session."
 msgstr "Lag ny økt"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Starter Gnome nøkkelring prosess"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Starter Gnome hjelpemiddelteknologier"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Starter KDE tjenester"
 
@@ -455,6 +505,31 @@ msgstr "Fortsett allikevel"
 msgid "Try again"
 msgstr "Prøv på nytt"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Velg økt"
@@ -467,87 +542,88 @@ msgstr "Velg øktnavn"
 msgid "Choose a name for the new session:"
 msgstr "Velg et navn for den nye økten"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Starter volumkontroll"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Starter panelet"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Starter skrivebordsbehandling"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Starter oppgavelinjen"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Starter vindusbehandler"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Starter Gnome terminalemulering"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Starter KDE avansert tekstbehandler"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Starter KDE utklippstavle"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Starter KDE epostleser"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Starter KDE news-leser"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Starter KDE Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Starter KDE terminalemulator"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Starter Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Starter The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Starter VI Improved tekstbehandler"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Starter øktbehandler mellomtjener"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Starter X-Chat irc klient"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Starter X multimedia system"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Starter X terminalemulator"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
+#, c-format
 msgid "Starting %s"
 msgstr "Starter %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -571,7 +647,7 @@ msgstr ""
 "autostart mappe har blitt vellykket flyttet til ny plassering.\n"
 "Du burde slette denne katalogen nå.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Kjører autostart..."
 
@@ -595,34 +671,103 @@ msgstr "Tips og triks"
 msgid "Next"
 msgstr "Neste"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Innstillinger for Økter og Oppstart"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Økt administrering"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Innstillinger for Økt og Oppstart"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 velkomstbilde innstillinger"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Innstillinger for Autostartede programmer"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Rediger listen over automatisk startede programmer"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 automastisk startede programmer"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Hvis satt vil øktbehandleren be deg velge en økt hver gang du logger inn "
+#~ "i Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Dette valger instruerer sesjonshåndteren til å lagre den aktuelle "
+#~ "sesjonen automatisk når du logger ut. Hvis du ikke markerer dette valget "
+#~ "her vil du bli spurt om du vil lagre den aktuelle sesjonen ved hver "
+#~ "utlogging."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Dette alternativet instruerer øktbehandleren å lagre nåværende økt "
+#~ "automatisk når du logger ut. Hvis du ikke velger dette alternativet vil "
+#~ "du bli spurt om du ønsker å lagre økten hver gang du logger ut."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Start Gnome tjenester ved oppstart"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Aktiver denne hvis du  bruker Gnome programmer. Valget vil instruere "
+#~ "øktbehandleren til å starte vitale Gnome tjenester for deg. Du burde også "
+#~ "aktivere denne hvis du ønsker å bruke hjelpemiddelteknologiene som følger "
+#~ "med Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Aktiver denne hvis du bruker KDE programmer som del av Xfce "
+#~ "skrivebordsmiljø-økten. Dette vil merkbart øke Xfce sin oppstarttid, men "
+#~ "KDE programmer vil starte raskere. Enkelte KDE programmer vil ikke "
+#~ "fungere dersom dette valget ikke er aktivert."
+
+#~ msgid "Security"
+#~ msgstr "Sikkerhet"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Tillate øktbehandleren å håndtere programmer som kjører på eksterne "
+#~ "tjenere. Ikke aktiver dette med mindre du vet helt sikkert hva du gjør."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Økt administrering"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Innstillinger for Velkomstbilde"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Velkomstbilde"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Automatisk startede programmer"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 velkomstbilde innstillinger"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Innstillinger for Autostartede programmer"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Rediger listen over automatisk startede programmer"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 automastisk startede programmer"
diff --git a/po/nl.po b/po/nl.po
index d57acd69..ec0d3b55 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-11-03 11:50+0100\n"
 "Last-Translator: Stephan Arts <stephan@xfce.org>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -75,305 +75,352 @@ msgstr "Muizen"
 msgid "Mice Splash Engine"
 msgstr "Muizen Beginscherm"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Plaatje kiezen..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Simple configureren..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Lettertype"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Kleuren"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Achtergrond:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Text:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Plaatje"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Ander plaatje"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simpel"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Simpel Beginscherm"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sessie Keuzemenu"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Toon keuzemenu bij inloggen"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Indien geselecteerd zal sessiebeheerder een keuzemenu tonen elke keer dat u "
-"inlogt."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Instellingen uitloggen"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automatisch sessie bewaren bij uitloggen"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Indien geselecteerd zal de sessiebeheerder automatisch de huidige sessie "
-"opslaan."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Vraag om bevestiging bij uitloggen"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informatie"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Indien uitgeschaeld zal de sessiebeheerder niet om bevestiging vragen bij "
-"uitloggen."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibiliteit"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "GNOME services starten bij inloggen"
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"Start enkele GNOME services die het gebruik van GNOME programma's zullen "
-"versnellen. Ook nodig voor GNOME's toegankelijkheidsopties."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "KDE services starten bij inloggen"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"Start enkele KDE services die het gebruik van KDE programma's zullen "
-"versnellen. Voor sommige programma's kan het zelfs noodzakelijk zijn."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Beveiliging"
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Beheer remote programma's "
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Instellingen voor sessiebeheer en opstarten"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Laat de sessiebeheerder programma's beheren die op een server draaien. Dit "
-"is meestal geen goed idee."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessiebeheer"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Algemeen"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Geavanceerd"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessiebeheer"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Geen"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Instellingen Beginscherm"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Instellingen"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Configuratiedialoog voor gekozen beginscherm."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Test"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Toont gekozen beginscherm"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informatie"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Beschrijving:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versie:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Auteur:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Webpagina:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Beginscherm"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Programma toevoegen"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Commando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Selecteer een commando"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Kan koppeling naar %s niet verwijderen: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Maken van bestand %s is mislukt"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Schrijven naar bestand %s is mislukt"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Het openen van %s om te schrijven is mislukt"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Automatisch opstarten"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Hieronder staat de lijst met programma's die automatisch\n"
 "worden gestart wanneer je in-logt in Xfce,\n"
 "hierbij worden ook de programma's toegevoegd die worden\n"
 "onthouden wanneer je de laatste keer uitlogd:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Auteur:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibiliteit"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Beschrijving:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Webpagina:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informatie"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Instellingen uitloggen"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Beschrijving:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sessie Keuzemenu"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versie:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Geavanceerd"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automatisch sessie bewaren bij uitloggen"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Instellingen"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Toont gekozen beginscherm"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "KDE services starten bij inloggen"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "KDE services starten bij inloggen"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Beheer remote programma's "
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Configuratiedialoog voor gekozen beginscherm."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Toont gekozen beginscherm"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessiebeheer"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Toon keuzemenu bij inloggen"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Algemeen"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Vraag om bevestiging bij uitloggen"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Sessie beeindigen"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Bezig met laden instellingen bureaublad"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Bezig met verifiëren instellingen DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Bezig met laden sesiegegevens"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Geef sessienaam"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Uitloggen"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Herstarten"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Afsluiten"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "Sessie _bewaren"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Wachtwoord:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Er is een fout opgetreden</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -408,15 +455,21 @@ msgstr "Nieuwe sessie"
 msgid "Create a new session."
 msgstr "Nieuwe sessie aanmaken."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Bezig met starten GNOME Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Bezig met starten GNOME Toegankelijkheidsopties"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Bezig met starten KDE services"
 
@@ -444,6 +497,31 @@ msgstr "Doorgaan"
 msgid "Try again"
 msgstr "Nogmaals proberen"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Kies sessie"
@@ -456,88 +534,88 @@ msgstr "Geef sessienaam"
 msgid "Choose a name for the new session:"
 msgstr "Naam voor nieuwe sessie:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Bezig met starten Volumeregelaar"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Bezig met starten Panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Bezig met starten Bureaublad-beheerder"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Bezig met starten Taakbalk"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Bezig met starten Window Manager"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Bezig met starten GNOME Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Bezig met starten KDE Advanced Text Editor"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Bezig met starten KDE Klembordbeheerder"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Bezig met starten KDE Mail Reader"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Bezig met starten KDE News Reader"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Bezig met starten Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Bezig met starten KDE Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Bezig met starten Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Bezig met starten The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Bezig met starten VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Bezig met starten Proxy Sessiebeheerder"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Bezig met starten X-Chat IRC Client"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Bezig met starten X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Starting the X Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Bezig met starten %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -561,7 +639,7 @@ msgstr ""
 "je oude map zijn succesvol gemigreerd naar de nieuwe locatie.\n"
 "Je zou de oude map eigenlijk moeten verwijderen.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Bezig met uitvoeren Autostart..."
 
@@ -585,37 +663,96 @@ msgstr "Tips en Truuks"
 msgid "Next"
 msgstr "Volgende"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Instellingen voor sessiebeheer en opstarten"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Instellingen Sessiebeheer"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Instellingen Xfce 4 Sessiebeheer"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Instellingen Xfce 4 Beginscherm"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Automatisch opstarten"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Lijst van opstartende applicaties aanpassen"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Automatisch opstarten"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Sessie beeindigen"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Indien geselecteerd zal sessiebeheerder een keuzemenu tonen elke keer dat "
+#~ "u inlogt."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Indien geselecteerd zal de sessiebeheerder automatisch de huidige sessie "
+#~ "opslaan."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Indien uitgeschaeld zal de sessiebeheerder niet om bevestiging vragen bij "
+#~ "uitloggen."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "GNOME services starten bij inloggen"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Start enkele GNOME services die het gebruik van GNOME programma's zullen "
+#~ "versnellen. Ook nodig voor GNOME's toegankelijkheidsopties."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Start enkele KDE services die het gebruik van KDE programma's zullen "
+#~ "versnellen. Voor sommige programma's kan het zelfs noodzakelijk zijn."
+
+#~ msgid "Security"
+#~ msgstr "Beveiliging"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Laat de sessiebeheerder programma's beheren die op een server draaien. "
+#~ "Dit is meestal geen goed idee."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessiebeheer"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Instellingen Beginscherm"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Beginscherm"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Automatisch opstarten"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Instellingen Xfce 4 Beginscherm"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Automatisch opstarten"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Lijst van opstartende applicaties aanpassen"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Automatisch opstarten"
diff --git a/po/pa.po b/po/pa.po
index 52913935..16881b5d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:42+0900\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -81,309 +81,349 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "ਚਿਤਰ ਚੁਣੋ..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "ਸਧਾਰਨ ਸੰਰਚਨਾ..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "ਫੌਂਟ"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "ਰੰਗ"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "ਪਿੱਠਭੂਮੀ ਰੰਗ"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "ਪਾਠ ਰੰਗ"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "ਚਿਤਰ"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "ਕਸਟਮ ਚਿਤਰ ਵਰਤੋ"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "ਅਜਲਾਸ ਚੋਣਕਾਰ"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "ਲਾਗਆਨ ਤੇ ਦਰਿਸ਼ ਚੁਣੋ"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"ਜੇਕਰ ਨਿਰਧਾਰਿਤ ਕੀਤਾ, ਅਜਲਾਸ ਪ੍ਰਬੰਧਕ ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਐਕਸਫਸੀ ਲਾਗਆਨ ਕਰਨ ਸਮੇਂ ਅਜਲਾਸ ਚੁਣ ਲਈ "
-"ਕਹੇਗਾ।"
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "ਲਾੱਗਆਉਟ ਵਿਵਸਥਾ"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "ਜਾਣਕਾਰੀ"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "ਲਾੱਗਆਉਟ ਕਰਨ ਸਮੇਂ ਅਜਲਾਸ ਸਵੈ-ਚਾਲਿਤ ਹੀ ਸੰਭਾਲੋ"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"ਇਹ ਚੋਣ ਅਜਲਾਸ ਮੈਨੇਜਰ ਨੂੰ ਤੁਹਾਡੇ ਬਾਹਰੀ ਦਰ ਉਪਰੰਤ ਮੌਜੂਦ ਅਜਲਾਸ ਦੀ ਸਵੈ-ਸੰਭਾਲ ਕਰਨ ਦੇਵੇਗੀ|ਜੇ ਤੁਸੀਂ ਇਹ "
-"ਚੋਣ ਨਹੀਂ ਚੁਣਦੇ ਤਾਂ ਤੁਹਾਨੂੰ ਹਰੇਕ ਬਾਹਰੀ ਦਰ ਉਪਰੰਤ ਪੁੱਛਿਆ ਜਾਵੇਗਾ ਕਿ ਕੀ ਤੁਸੀਂ ਮੌਜੂਦਾ ਅਜਲਾਸ ਸੰਭਾਲਣਾ "
-"ਚਾਹੁਂਦੇ ਹੋ|"
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "ਬਾਹਰ ਜਾਣ ਤੇ ਪੁੱਛੋ"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
+
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"ਇਹ ਚੋਣ ਬਾਹਰੀ ਦਰ ਚੇਤਾਵਨੀ ਡਾਇਲਾਗ ਨੂੰ ਅਯੋਗ ਕਰੇਗੀ| ਭਾਂਵੇ ਅਜਲਾਸ ਸੰਭਾਲਿਆ ਜਾਂ ਨਹੀਂ ਨਿਰਭਰ ਕਰਦਾ "
-"ਕਿ ਤੁਸੀਂ ਬਾਹਰੀ ਦਰ ਉਪਰੰਤ ਅਜਲਾਸ ਦੀ ਸਵੈ-ਸੰਭਾਲ ਨੂੰ ਯੋਗ ਕੀਤਾ ਕਿ ਨਹੀਂ|"
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "ਅਨੁਕੂਲਤਾ"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮੇਂ ਗਨੋਮ ਸੇਵਾਵਾਂ ਸ਼ੁਰੂ ਕਰੋ"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
 msgstr ""
-"ਜੇ ਤੁਸੀ ਗਨੋਮ ਕਾਰਜਾਂ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਇਸ ਚੋਣ ਨੂੰ ਯੋਗ ਕਰੋ| ਇਹ ਅਜਲਾਸ ਮੈਨੇਜਰ ਨੂੰ ਤੁਹਾਡੇ ਲਈ ਕੁਝ "
-"ਜਰੂਰੀ ਗਨੋਮ ਸੇਵਾਵਾਂ ਚਲਾਉਣ ਦੇ ਯੋਗ ਕਰੇਗਾ| ਤੁਹਾਨੂੰ ਇਹ ਯੋਗ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ ਜੇ ਤੁਸੀ ਸਹਾਇਕ ਤਕਨੀਕਾਂ "
-"ਵਰਤਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ ਜੋ ਕਿ ਗਨੋਮ ਨਾਲ ਜੁੜੀਆਂ ਹਨ|"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮੇਂ ਕੇ ਡੀ ਈ ਸੇਵਾਵਾਂ ਸ਼ੁਰੂ ਕਰੋ"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
-"ਇਸ ਚੋਣ ਨੂੰ ਯੋਗ ਕਰੋ ਜੇ ਤੁਸੀ ਕੇ ਡੀ ਈ ਕਾਰਜਾਂ ਨੂੰ ਤੁਹਾਡੇ ਐਕਸਫੇਸ ਵਿਹੜਾ ਅਜਲਾਸ ਦੇ ਭਾਗ ਵਜੋਂ ਚਲਾਉਣਾ "
-"ਚਾਹੁੰਦੇ ਹੋ|ਇਹ ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਵਧਾਏਗਾ,ਪਰ ਦੂਜੇ ਪਾਸੇ ਕੇ ਡੀ ਈ ਕਾਰਜਾ ਤੇਜੀ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਗੇ| ਕੁਝ ਕੇ ਡੀ ਈ "
-"ਕਾਰਜ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋਣਗੇ ਜੇ ਤੁਸੀਂ ਇਸ ਚੋਣ ਨੂੰ ਯੋਗ ਨਹੀਂ ਕਰਦੇ|"
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "ਸੁਰੱਖਿਆ"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "ਦੂਰਵਰਤੀ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰੋ"
+#: ../settings/xfae-dialog.c:130
+#, fuzzy
+msgid "Description:"
+msgstr "<b>ਵਰਣਨ:</b>"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
 msgstr ""
-"ਅਜਲਾਸ ਮੈਨੇਜਰ ਨੂੰ ਦੂਰਵਰਤੀ ਮੇਜ਼ਬਾਨ ਉੱਪਰ ਚੱਲ ਰਹੇ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤਦਿਓ| ਇਸ ਚੋਣ ਨੂੰ "
-"ਯੋਗ ਨਾ ਕਰੋ ਜਦ ਤੱਕ ਤੁਸੀਂ ਜਾਣਦੇ ਨਹੀਂ ਕਿ ਤੁਸੀਂ ਕੀ ਕਰ ਰਹੇ ਹੋ|"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "ਆਮ"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-#, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
-msgstr "ਕੋਈ ਨਹੀਂ"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "ਝਲਕਾਰਾ ਪਰਦਾ ਵਿਵਸਥਾਵਾਂ"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
+msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "ਸੰਰਚਨਾ"
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>ਲੇਖਕ:</b>"
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "ਚੁਣੇ ਝਲਕਾਰਾ ਪਰਦੇ ਲਈ ਸੰਰਚਨਾ ਪੈਨਲ ਖੋਲਦਾ ਹੈ"
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "ਅਨੁਕੂਲਤਾ"
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "ਜਾਂਚ"
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>ਵਰਣਨ:</b>"
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "ਚੁਣੇ ਝਲਕਾਰਾ ਪਰਦੇ ਨੂੰ ਵਿਖਾਉਦਾ ਹੈ|"
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>ਮੁੱਖ-ਪੰਨਾ:</b>"
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
 msgstr "ਜਾਣਕਾਰੀ"
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "ਲਾੱਗਆਉਟ ਵਿਵਸਥਾ"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
 msgstr "<b>ਵਰਣਨ:</b>"
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "ਅਜਲਾਸ ਚੋਣਕਾਰ"
+
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr "<b>ਵਰਜ਼ਨ:</b>"
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>ਲੇਖਕ:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "ਤਕਨੀਕੀ"
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>ਮੁੱਖ-ਪੰਨਾ:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "ਲਾੱਗਆਉਟ ਕਰਨ ਸਮੇਂ ਅਜਲਾਸ ਸਵੈ-ਚਾਲਿਤ ਹੀ ਸੰਭਾਲੋ"
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:12
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "ਝਲਕਾਰਾ ਪਰਦਾ"
+msgid "Con_figure"
+msgstr "ਸੰਰਚਨਾ"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "ਚੁਣੇ ਝਲਕਾਰਾ ਪਰਦੇ ਨੂੰ ਵਿਖਾਉਦਾ ਹੈ|"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfce4-session-settings.glade.h:15
 #, fuzzy
-msgid "Description:"
-msgstr "<b>ਵਰਣਨ:</b>"
+msgid "Launch GN_OME services on startup"
+msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮੇਂ ਕੇ ਡੀ ਈ ਸੇਵਾਵਾਂ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮੇਂ ਕੇ ਡੀ ਈ ਸੇਵਾਵਾਂ ਸ਼ੁਰੂ ਕਰੋ"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "ਦੂਰਵਰਤੀ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰੋ"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "ਚੁਣੇ ਝਲਕਾਰਾ ਪਰਦੇ ਲਈ ਸੰਰਚਨਾ ਪੈਨਲ ਖੋਲਦਾ ਹੈ"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "ਚੁਣੇ ਝਲਕਾਰਾ ਪਰਦੇ ਨੂੰ ਵਿਖਾਉਦਾ ਹੈ|"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "ਲਾਗਆਨ ਤੇ ਦਰਿਸ਼ ਚੁਣੋ"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "ਆਮ"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "ਬਾਹਰ ਜਾਣ ਤੇ ਪੁੱਛੋ"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "ਨਵਾਂ ਅਜਲਾਸ"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "ਜਾਂਚ"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-#, fuzzy
-msgid "Autostarted applications"
-msgstr "ਦੂਰਵਰਤੀ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰੋ"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "ਵਿਹੜਾ ਵਿਵਸਥਾਵਾਂ ਲੋਡ ਕਰ ਰਿਹਾ "
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS ਵਿਵਸਥਾਵਾਂ ਦੀ ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "ਅਜਲਾਸ ਡਾਟਾ ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "ਅਜਲਾਸ ਨਾਂ ਚੁਣੋ"
+
+#: ../xfce4-session/shutdown.c:338
 #, fuzzy
 msgid "Log Out"
 msgstr "ਬਾਹਰੀ ਦਰ"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "ਬਾਅਦ ਵਿੱਚ ਲਾਗਆਨ ਕਰਨ ਲਈ ਅਜਲਾਸ ਸੰਭਾਲੋ"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਗੁਪਤ ਕੋਡ ਭਰੋ"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>ਇੱਕ ਗਲਤੀ ਵਾਪਰੀ ਹੈ</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -422,15 +462,21 @@ msgstr "ਨਵਾਂ ਅਜਲਾਸ"
 msgid "Create a new session."
 msgstr "ਨਵਾਂ ਅਜਲਾਸ ਬਣਾਓ|"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "ਗਨੋਮ ਕੀਰਿੰਗ ਡੈਮਨ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "ਗਨੋਮ ਸਹਾਇਕ ਤਕਨੀਕ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "ਕੇ ਡੀ ਈ ਸੇਵਾਵਾਂ ਸ਼ੁਰੂ ਹੋ ਰਹੀਆਂ ਹਨ"
 
@@ -459,6 +505,31 @@ msgstr "ਕਿਸੇ ਵੀ ਤਰਾਂ ਜਾਰੀ"
 msgid "Try again"
 msgstr "ਫਿਰ ਕੋਸ਼ਿਸ਼"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "ਅਜਲਾਸ ਚੁਣੋ"
@@ -471,88 +542,88 @@ msgstr "ਅਜਲਾਸ ਨਾਂ ਚੁਣੋ"
 msgid "Choose a name for the new session:"
 msgstr "ਨਵੇਂ ਅਜਲਾਸ ਲਈ ਨਾਂ ਚੁਣੋ"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "ਆਵਾਜ਼ ਕੰਟਰੋਲ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "ਪੈਨਲ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "ਵਿਹੜਾ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "ਸੰਦ-ਪੱਟੀ ਸ਼ੁਰੂ ਹੋ ਰਹੀ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "ਝਰੋਖਾ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "ਗਨੋਮ ਟਰਮੀਨਲ ਮੁਕਾਬਲਾ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "ਕੇ ਡੀ ਈ ਤਕਨੀਕੀ ਪਾਠ ਸੋਧਕ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "ਕੇ ਡੀ ਈ ਕਲਿੱਪ ਬੋਰਡ ਮੈਨੇਜਰ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "ਕੇ ਡੀ ਈ ਪੱਤਰ ਪਾੜ੍ਹਾ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "ਕੇ ਡੀ ਈ ਖਬਰ ਪਾੜ੍ਹਾ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "ਕੌਨਕੁਇਰਰ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "ਕੇ ਡੀ ਈ ਟਰਮੀਨਲ ਮੁਕਾਬਲਾ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "ਚੁੱਪ ਮੀਡੀਆ ਪਲੇਅਰ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "ਜੈਂਪ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI ਸੋਧਿਆ ਸੋਧਕ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "ਅਜਲਾਸ ਪ੍ਰਬੰਧ ਪਰਾਕਸੀ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "ਐਕਸ-ਚੈਟ IRC ਕਲਾਂਈਟ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "ਐਕਸ ਮਲਟੀਮੀਡੀਆ ਸਿਸਟਮ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "ਐਕਸ ਟਰਮੀਨਲ ਮੁਕਾਬਲਾ ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s ਸ਼ੁਰੂ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -567,7 +638,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "ਸਵੈ-ਚਾਲਕ ਚਲਾ ਰਿਹਾ ਹੈ..."
 
@@ -591,43 +662,101 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "ਝਲਕਾਰਾ ਪਰਦਾ ਵਿਵਸਥਾਵਾਂ"
+#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
+msgid "xfce4-tips"
+msgstr ""
+
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "ਜੇਕਰ ਨਿਰਧਾਰਿਤ ਕੀਤਾ, ਅਜਲਾਸ ਪ੍ਰਬੰਧਕ ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਐਕਸਫਸੀ ਲਾਗਆਨ ਕਰਨ ਸਮੇਂ ਅਜਲਾਸ ਚੁਣ "
+#~ "ਲਈ ਕਹੇਗਾ।"
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "ਇਹ ਚੋਣ ਅਜਲਾਸ ਮੈਨੇਜਰ ਨੂੰ ਤੁਹਾਡੇ ਬਾਹਰੀ ਦਰ ਉਪਰੰਤ ਮੌਜੂਦ ਅਜਲਾਸ ਦੀ ਸਵੈ-ਸੰਭਾਲ ਕਰਨ ਦੇਵੇਗੀ|ਜੇ ਤੁਸੀਂ "
+#~ "ਇਹ ਚੋਣ ਨਹੀਂ ਚੁਣਦੇ ਤਾਂ ਤੁਹਾਨੂੰ ਹਰੇਕ ਬਾਹਰੀ ਦਰ ਉਪਰੰਤ ਪੁੱਛਿਆ ਜਾਵੇਗਾ ਕਿ ਕੀ ਤੁਸੀਂ ਮੌਜੂਦਾ ਅਜਲਾਸ "
+#~ "ਸੰਭਾਲਣਾ ਚਾਹੁਂਦੇ ਹੋ|"
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "ਇਹ ਚੋਣ ਬਾਹਰੀ ਦਰ ਚੇਤਾਵਨੀ ਡਾਇਲਾਗ ਨੂੰ ਅਯੋਗ ਕਰੇਗੀ| ਭਾਂਵੇ ਅਜਲਾਸ ਸੰਭਾਲਿਆ ਜਾਂ ਨਹੀਂ ਨਿਰਭਰ "
+#~ "ਕਰਦਾ ਕਿ ਤੁਸੀਂ ਬਾਹਰੀ ਦਰ ਉਪਰੰਤ ਅਜਲਾਸ ਦੀ ਸਵੈ-ਸੰਭਾਲ ਨੂੰ ਯੋਗ ਕੀਤਾ ਕਿ ਨਹੀਂ|"
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "ਸ਼ੁਰੂਆਤੀ ਸਮੇਂ ਗਨੋਮ ਸੇਵਾਵਾਂ ਸ਼ੁਰੂ ਕਰੋ"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "ਜੇ ਤੁਸੀ ਗਨੋਮ ਕਾਰਜਾਂ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਇਸ ਚੋਣ ਨੂੰ ਯੋਗ ਕਰੋ| ਇਹ ਅਜਲਾਸ ਮੈਨੇਜਰ ਨੂੰ ਤੁਹਾਡੇ ਲਈ ਕੁਝ "
+#~ "ਜਰੂਰੀ ਗਨੋਮ ਸੇਵਾਵਾਂ ਚਲਾਉਣ ਦੇ ਯੋਗ ਕਰੇਗਾ| ਤੁਹਾਨੂੰ ਇਹ ਯੋਗ ਕਰਨੀ ਚਾਹੀਦੀ ਹੈ ਜੇ ਤੁਸੀ ਸਹਾਇਕ "
+#~ "ਤਕਨੀਕਾਂ ਵਰਤਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ ਜੋ ਕਿ ਗਨੋਮ ਨਾਲ ਜੁੜੀਆਂ ਹਨ|"
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "ਇਸ ਚੋਣ ਨੂੰ ਯੋਗ ਕਰੋ ਜੇ ਤੁਸੀ ਕੇ ਡੀ ਈ ਕਾਰਜਾਂ ਨੂੰ ਤੁਹਾਡੇ ਐਕਸਫੇਸ ਵਿਹੜਾ ਅਜਲਾਸ ਦੇ ਭਾਗ ਵਜੋਂ ਚਲਾਉਣਾ "
+#~ "ਚਾਹੁੰਦੇ ਹੋ|ਇਹ ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ ਵਧਾਏਗਾ,ਪਰ ਦੂਜੇ ਪਾਸੇ ਕੇ ਡੀ ਈ ਕਾਰਜਾ ਤੇਜੀ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਗੇ| ਕੁਝ ਕੇ ਡੀ "
+#~ "ਈ ਕਾਰਜ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋਣਗੇ ਜੇ ਤੁਸੀਂ ਇਸ ਚੋਣ ਨੂੰ ਯੋਗ ਨਹੀਂ ਕਰਦੇ|"
+
+#~ msgid "Security"
+#~ msgstr "ਸੁਰੱਖਿਆ"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "ਅਜਲਾਸ ਮੈਨੇਜਰ ਨੂੰ ਦੂਰਵਰਤੀ ਮੇਜ਼ਬਾਨ ਉੱਪਰ ਚੱਲ ਰਹੇ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤਦਿਓ| ਇਸ ਚੋਣ "
+#~ "ਨੂੰ ਯੋਗ ਨਾ ਕਰੋ ਜਦ ਤੱਕ ਤੁਸੀਂ ਜਾਣਦੇ ਨਹੀਂ ਕਿ ਤੁਸੀਂ ਕੀ ਕਰ ਰਹੇ ਹੋ|"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
 #, fuzzy
-msgid "Autostarted Applications"
-msgstr "ਦੂਰਵਰਤੀ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰੋ"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "ਅਜਲਾਸ ਅਤੇ ਸ਼ੁਰੂਆਤੀ"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
+#~ msgid "Splash Screen Settings"
+#~ msgstr "ਝਲਕਾਰਾ ਪਰਦਾ ਵਿਵਸਥਾਵਾਂ"
 
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "ਝਲਕਾਰਾ ਪਰਦਾ"
 
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
-msgid "xfce4-tips"
-msgstr ""
+#, fuzzy
+#~ msgid "Autostarted applications"
+#~ msgstr "ਦੂਰਵਰਤੀ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰੋ"
+
+#, fuzzy
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "ਝਲਕਾਰਾ ਪਰਦਾ ਵਿਵਸਥਾਵਾਂ"
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "ਨਵਾਂ ਅਜਲਾਸ"
+#~ msgid "Autostarted Applications"
+#~ msgstr "ਦੂਰਵਰਤੀ ਕਾਰਜਾਂ ਦਾ ਪ੍ਰਬੰਧ ਕਰੋ"
diff --git a/po/pl.po b/po/pl.po
index bc390ba6..5516eb3a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-05-07 19:50+0200\n"
 "Last-Translator: Szymon Kałasz <szymon_maestro@gazeta.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -80,307 +80,350 @@ msgstr "Mysz"
 msgid "Mice Splash Engine"
 msgstr "Silnik Splash Myszy"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Wybierz obrazek..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Ustawienia Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Czcionka"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Kolory"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Kolor tła:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Kolor tekstu:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Obraz"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Użyj własnej grafiki"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Proste"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Prosty Splash"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Wybór sesji"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Pozwól na wybór sesji przy logowaniu"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Włączenie powoduje pytanie o sesję która ma być uruchomiona przy każdym "
-"logowaniu do Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Ustawienia wylogowania"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automatycznie zapisz sesję przy wylogowaniu"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Po włączeniu sesja będzie automatycznie zapisywana przy każdym wylogowaniu. "
-"Jeśli opcja nie jest włączona, przy wylogowaniu można wybrać, czy sesja ma "
-"być zapisana, czy też nie."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Pytaj przy wylogowaniu"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informacje"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Wyłączenie opcji powoduje, że Xfce nie będzie pytać o potwierdzenie "
-"wylogowaniu. Sesja będzie zapisywana jedynie, jeżeli włączone jest "
-"automatyczne zapisywanie sesji."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Zgodność"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Uruchom usługi Gnome przy starcie"
-
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"Włącz tą opcję jeżeli chcesz używać aplikacji Gnome. Wraz ze startem XFCE "
-"uruchomione zostaną kluczowe procesy Gnome usprawniające uruchamianie i "
-"działanie aplikacji Gnome."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Uruchom usługi KDE przy starcie"
-
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"Włącz tą opcję jeżeli chcesz używać aplikacji KDE. Zwiększy to czas "
-"uruchamiania XFCE lecz aplikacje KDE będą uruchamiały się znacznie szybciej "
-"a dla działania niektórych opcja ta jest wręcz wymagana."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Bezpieczeństwo"
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Zarządzaj zdalnymi aplikacjami"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Sesje i uruchamianie"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Pozwól menadżerowi sesji zarządzać aplikacjami uruchomionymi na zdalnych "
-"masztbach. Nie włączaj tej opcji, chyba że dobrze wiesz, co robisz."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesje i uruchamianie"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Ogólne"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Zaawansowane"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sesje i Uruchamianie"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Brak"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Ustawienia ekranu powitalnego"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Ustawienia"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Otwiera panel konfiguracji dla wybranego ekranu powitalnego."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Test"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Pokazuje wybrany ekran powitalny."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informacje"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Opis:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Wersja:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Strona domowa:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Ekran Powitalny"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Dodaj aplikację"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "<b>Opis:</b>"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Polecenie:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Wybierz polecenie"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Nie udało się usunąć %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Nie udało się stworzyć pliku %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Nie można pisać do pliku %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Nie udało się otworzyć pliku %s do odczytu"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aplikacje automatycznie uruchamiane"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Poniżej znajduje się lista aplikacji jakie uruchamiane\n"
 "będą przy starcie XFCE4 nie licząc aplikacji działających przy ostatnim "
 "zamknięciu XFCE4"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Zgodność"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Opis:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Strona domowa:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informacje"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Ustawienia wylogowania"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Opis:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Wybór sesji"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Wersja:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Zaawansowane"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automatycznie zapisz sesję przy wylogowaniu"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Ustawienia"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Pokazuje wybrany ekran powitalny."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Uruchom usługi KDE przy starcie"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Uruchom usługi KDE przy starcie"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Zarządzaj zdalnymi aplikacjami"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Otwiera panel konfiguracji dla wybranego ekranu powitalnego."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Pokazuje wybrany ekran powitalny."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesje i uruchamianie"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Pozwól na wybór sesji przy logowaniu"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Ogólne"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Pytaj przy wylogowaniu"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Nowa sesja"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Ładowanie ustawień biurka"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Sprawdzanie ustawień DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Ładowanie danych sesji"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Wybierz nazwę sesji"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Wyloguj"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Restart"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Wyłącz"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Zapisz sesję dla przyszłych logowań"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Wprowadź Twoje hasło:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Wystąpił błąd</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -419,15 +462,21 @@ msgstr "Nowa sesja"
 msgid "Create a new session."
 msgstr "Tworzy nową sesję"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Uruchamiam Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Uruchamiam Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Uruchamianie usługi KDE"
 
@@ -456,6 +505,31 @@ msgstr "Kontynuuj mimo to"
 msgid "Try again"
 msgstr "Spróbuj ponownie"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Wybierz sesję"
@@ -468,88 +542,88 @@ msgstr "Wybierz nazwę sesji"
 msgid "Choose a name for the new session:"
 msgstr "Wybierz nazwę dla nowej sesji"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Uruchamianie regulacji głośności"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Uruchamianie panelu"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Uruchamianie menedżera biurka"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Uruchamianie paska zadań"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Uruchamianie menadżera okien"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Uruchamianie Terminala Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Uruchamianie edytora tekstu Kate"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Uruchamianie menadżera schowka KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Uruchamianie czytnika poczty KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Uruchamianie czytnika News KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Uruchamianie Konquerora"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Uruchamianie Terminala KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Uruchamianie Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Uruchamianie The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Uruchamianie edytora VIM"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Uruchamianie proxy menadżera sesji"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Uruchamianie klienta X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Uruchamianie odtwarzacza XMMS"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Uruchamianie X Terminala"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Uruchamianie %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -572,7 +646,7 @@ msgstr ""
 "do uruchomienia przy starcie XFCE4\n"
 "Powinieneś usunąć stary katalog\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Przeprowadzam autostart..."
 
@@ -596,37 +670,100 @@ msgstr "Sztuczki i kruczki"
 msgid "Next"
 msgstr "Następny"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Sesje i uruchamianie"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Sesje i uruchamianie"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Sesje i uruchamianie"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Ustawienia ekranu powitalnego"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Automatycznie uruchamiane aplikacje"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Edytuj listę aplikacji"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Automatycznie Uruchamiane Aplikacje"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-porady"
 
-#~ msgid "End Session"
-#~ msgstr "Nowa sesja"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Włączenie powoduje pytanie o sesję która ma być uruchomiona przy każdym "
+#~ "logowaniu do Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Po włączeniu sesja będzie automatycznie zapisywana przy każdym "
+#~ "wylogowaniu. Jeśli opcja nie jest włączona, przy wylogowaniu można "
+#~ "wybrać, czy sesja ma być zapisana, czy też nie."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Wyłączenie opcji powoduje, że Xfce nie będzie pytać o potwierdzenie "
+#~ "wylogowaniu. Sesja będzie zapisywana jedynie, jeżeli włączone jest "
+#~ "automatyczne zapisywanie sesji."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Uruchom usługi Gnome przy starcie"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Włącz tą opcję jeżeli chcesz używać aplikacji Gnome. Wraz ze startem XFCE "
+#~ "uruchomione zostaną kluczowe procesy Gnome usprawniające uruchamianie i "
+#~ "działanie aplikacji Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Włącz tą opcję jeżeli chcesz używać aplikacji KDE. Zwiększy to czas "
+#~ "uruchamiania XFCE lecz aplikacje KDE będą uruchamiały się znacznie "
+#~ "szybciej a dla działania niektórych opcja ta jest wręcz wymagana."
+
+#~ msgid "Security"
+#~ msgstr "Bezpieczeństwo"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Pozwól menadżerowi sesji zarządzać aplikacjami uruchomionymi na zdalnych "
+#~ "masztbach. Nie włączaj tej opcji, chyba że dobrze wiesz, co robisz."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sesje i Uruchamianie"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Ustawienia ekranu powitalnego"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Ekran Powitalny"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aplikacje automatycznie uruchamiane"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Ustawienia ekranu powitalnego"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Automatycznie uruchamiane aplikacje"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Edytuj listę aplikacji"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Automatycznie Uruchamiane Aplikacje"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e0441b9b..316296a3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-04-10 23:19-0300\n"
 "Last-Translator: Fábio Nogueira <deb-user-ba@ubuntu.com>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -79,311 +79,351 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Tema de Apresentação Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Escolher imagem..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configurar Simples..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Fonte"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Cores"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Cor de fundo:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Cor do texto:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Imagem"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Usar imagem personalizada"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simples"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Tema de Apresentação Simples"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Seletor de sessão"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Mostrar seletor na entrada"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Se ativado, o gerenciador de sessão irá pedir que você escolha uma sessão "
-"toda vez que você entrar no Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Configurações de saída"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Salvar sessão automaticamente ao sair"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Esta opção instrui o gerenciador de sessões a salvar a sessão atual "
-"automaticamente quando você sair. Se você não selecionar essa opção você "
-"será questionado cada vez que sair se deseja salvar a sessão atual."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Confirmar na saída"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informações"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Esta opção desabilita o diálogo de confirmação de saída. Se a sessão será "
-"salva ou não depende de você ter habilitado ou não o salvamento automático "
-"de sessões na saída."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilidade"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Carregar os serviços do Gnome ao iniciar"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Habilite essa opção se você planeja usar aplicativos Gnome. Isto instruirá o "
-"gerenciador de sessões a iniciar alguns serviços vitais do Gnome para você. "
-"Você também deve habilitar esta opção se deseja usar as Tecnologias "
-"Assistivas que vêm com o Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Carregar os serviços KDE ao iniciar"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Habilite essa opção se você planeja executar aplicativos KDE como parte da "
-"sua sessão Xfce. Isto aumentará notavelmente o tempo de inicialização, por "
-"outro lado os aplicativos KDE irão iniciar mais rapidamente. Alguns "
-"aplicativos KDE podem até não funcionar se você não ativar essa opção."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Segurança"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Gerenciar aplicativos remotos"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Configurações de Sessão e Inicialização"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Permite que o gerenciador de sessões gerencie aplicativos que executam em "
-"máquinas remotas. Não habilite esta opção sem ter certeza do que está "
-"fazendo."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Inicialização e Sessões"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Geral"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avançado"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Inicialização e Sessões"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Nenhum"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Preferências de Tela de Abertura"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Abrir o painel de configuração para a tela de abertura selecionada."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Testar"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstra a tela de abertura selecionada."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informações"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Descrição:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versão:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Página:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Tela de Abertura"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Adicionar aplicação"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Selecione um comando"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Falhou ao desassociar %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Falhou ao criar o arquivo %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Falhou ao escrever o arquivo %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Falhou ao abrir o arquivo %s para escrita"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aplicações iniciadas automaticamente"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Abaixo está a lista de aplicações que serão iniciadas\n"
 "automaticamente quando você entrar no ambiente de\n"
 "trabalho Xfce, além das aplicações que foram salvas\n"
 "quando você saiu pela última vez:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilidade"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descrição:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Página:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informações"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Configurações de saída"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Descrição:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Seletor de sessão"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versão:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avançado"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Salvar sessão automaticamente ao sair"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configurar"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstra a tela de abertura selecionada."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Carregar os serviços KDE ao iniciar"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Carregar os serviços KDE ao iniciar"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Gerenciar aplicativos remotos"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Abrir o painel de configuração para a tela de abertura selecionada."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstra a tela de abertura selecionada."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Inicialização e Sessões"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Mostrar seletor na entrada"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Geral"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Confirmar na saída"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Terminar Sessão"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Testar"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Carregando as configurações da área de trabalho"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Verificando configurações de DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Carregando os dados da sessão"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Escolha o nome da sessão"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Sair"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Desligar"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Salvar sessão para próximas entradas"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Por favor digite sua senha:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Um erro ocorreu</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -422,15 +462,21 @@ msgstr "Nova sessão"
 msgid "Create a new session."
 msgstr "Criar uma nova sessão."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Iniciando o Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Iniciando Tecnologias Assistivas do Gnome"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Iniciando os serviços KDE"
 
@@ -459,6 +505,31 @@ msgstr "Continue assim mesmo"
 msgid "Try again"
 msgstr "Tente novamente"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Escolha a sessão"
@@ -471,88 +542,88 @@ msgstr "Escolha o nome da sessão"
 msgid "Choose a name for the new session:"
 msgstr "Escolha um nome para a nova sessão:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Iniciando o Controlador de Volume"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Iniciando o Painel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Iniciando o Gerenciador da Área de Trabalho"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Iniciando a Barra de Tarefas"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Iniciando o Gerenciador de Janelas"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Iniciando o Emulador de Terminal do Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Iniciando o Editor de Texto Avançado do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Iniciando o Gerenciador de Área de Transferência do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Iniciando o Leitor de E-mail do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Iniciando o Leitor de Notícias do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Iniciando o Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Iniciando o Emulador de Terminal do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Iniciando o Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Iniciando o Gimp "
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Iniciando o VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Iniciando o Proxy do Gerenciador de Sessões"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Iniciando o Cliente IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Iniciando o X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Iniciando o Emulador de Terminal do X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -577,7 +648,7 @@ msgstr ""
 "migrados com sucesso para a nova localização.\n"
 "Você deve apagar este diretório agora.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Executando inicialização automática..."
 
@@ -601,37 +672,103 @@ msgstr "Dicas e truques"
 msgid "Next"
 msgstr "Próximo"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Configurações de Sessão e Inicialização"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Configurações de Sessões e Inicialização"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Configuração de Sessões e Inicialização do Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Configurações de Tela de Abertura do Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aplicações Iniciadas Automaticamente"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Editar a lista de aplicações iniciadas automaticamente"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Aplicações Iniciadas Automaticamente do Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Terminar Sessão"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Se ativado, o gerenciador de sessão irá pedir que você escolha uma sessão "
+#~ "toda vez que você entrar no Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Esta opção instrui o gerenciador de sessões a salvar a sessão atual "
+#~ "automaticamente quando você sair. Se você não selecionar essa opção você "
+#~ "será questionado cada vez que sair se deseja salvar a sessão atual."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Esta opção desabilita o diálogo de confirmação de saída. Se a sessão será "
+#~ "salva ou não depende de você ter habilitado ou não o salvamento "
+#~ "automático de sessões na saída."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Carregar os serviços do Gnome ao iniciar"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Habilite essa opção se você planeja usar aplicativos Gnome. Isto "
+#~ "instruirá o gerenciador de sessões a iniciar alguns serviços vitais do "
+#~ "Gnome para você. Você também deve habilitar esta opção se deseja usar as "
+#~ "Tecnologias Assistivas que vêm com o Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Habilite essa opção se você planeja executar aplicativos KDE como parte "
+#~ "da sua sessão Xfce. Isto aumentará notavelmente o tempo de inicialização, "
+#~ "por outro lado os aplicativos KDE irão iniciar mais rapidamente. Alguns "
+#~ "aplicativos KDE podem até não funcionar se você não ativar essa opção."
+
+#~ msgid "Security"
+#~ msgstr "Segurança"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Permite que o gerenciador de sessões gerencie aplicativos que executam em "
+#~ "máquinas remotas. Não habilite esta opção sem ter certeza do que está "
+#~ "fazendo."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Inicialização e Sessões"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Preferências de Tela de Abertura"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Tela de Abertura"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aplicações iniciadas automaticamente"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Configurações de Tela de Abertura do Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aplicações Iniciadas Automaticamente"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Editar a lista de aplicações iniciadas automaticamente"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Aplicações Iniciadas Automaticamente do Xfce 4"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 025e511b..25352bd0 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-02-26 12:34+0100\n"
 "Last-Translator: Nuno Miguel <nunis@netcabo.pt>\n"
 "Language-Team: \n"
@@ -26,8 +26,12 @@ msgstr "Escolha o ficheiro do tema para instalar..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "Impossível instalar o tema de arranque do ficheiro %s, por favor verifique se o ficheiro é um de tema arranque válido."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"Impossível instalar o tema de arranque do ficheiro %s, por favor verifique "
+"se o ficheiro é um de tema arranque válido."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -74,277 +78,356 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Motor de Arranque Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Escolher imagem..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configurar Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Fonte"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Cores"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Cor de fundo:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Cor do texto:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Imagem"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Usar imagem personalizada"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Motor Splash Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Escolha de de sessão"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Mostrar escolha de sessão no login"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "Se seleccionado, o gestor de sessões irá dar-lhe à escolha uma sessão sempre que entrar no Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Definições da saída"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Gravar sessão automaticamente ao sair"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "Esta opção faz com que o gestor de sessões grave a sessão actual automaticamente quando termina a sessão. Se não seleccionar esta opção irá ser questionado se quer ou não gravar a sessão cada vez que sair."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Confirmar a saida"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "Esta opção desactiva o diálogo de confirmação de saída. A sessão será ou não gravada dependendo se activou ou não a gravação automática da sessão na saída."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilidade"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Lançar serviços do Gnome no arranque"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "Active isto se está a pensar usar aplicações do Gnome. Isto irá indicar ao gestor de sessões para iniciar alguns serviços vitais do Gnome. Também deverá activar isto se pretende usar as Tecnologias de Acessibilidade que vêm com o Gnome."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informação"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Lançar serviços do KDE no arranque"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "Active isto se está a pensar usar aplicações do KDE. Isto irá aumentar significativamente a duração do arranque, mas por outro lado, as aplicações do KDE serão iniciadas mais depressa. Algumas aplicações do KDE poderão mesmo não funcionar se esta opção não estiver activa."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Segurança"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Gerir aplicações remotas"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Definições de Sessão e Arranque"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "Permitir ao gestor de sessões gerir aplicações a correr em computadores remotos. Não active esta opção a não ser que tenha a certeza do que está a fazer."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessões e Arranque"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Geral"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avançado"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessões e Arranque"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Nenhum"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Definições do Ecrã de Arranque"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configurar"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Abre o painel de configuração para o ecrã de arranque seleccionado."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Testar"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Faz uma demonstração do ecrã de arranque seleccionado."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informação"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Descrição:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versão:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Página:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Ecrã de arranque"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Adicionar aplicação"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Comando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Seleccione um comando"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Falhou ao soltar %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Incapaz de criar ficheiro %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Falhou a escrita no ficheiro %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Falhou ao abrir %s para escrita"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aplicações de arranque"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Lista das aplicações que serão iniciadas automaticamente\n"
 "quando iniciar sessão no Xfce, em adição às aplicações que\n"
 "foram guardadas quando terminou a sessão da última vez:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilidade"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descrição:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Página:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informação"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Definições da saída"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Descrição:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Escolha de de sessão"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versão:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avançado"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Gravar sessão automaticamente ao sair"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configurar"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Faz uma demonstração do ecrã de arranque seleccionado."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Lançar serviços do KDE no arranque"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Lançar serviços do KDE no arranque"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Gerir aplicações remotas"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Abre o painel de configuração para o ecrã de arranque seleccionado."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Faz uma demonstração do ecrã de arranque seleccionado."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessões e Arranque"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Mostrar escolha de sessão no login"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Geral"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Confirmar a saida"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Fim de sessão"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Testar"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "A carregar as definições do ambiente de trabalho"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "A verificar as definições do DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "A carregar os dados da sessão"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Escolha o nome da sessão"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Sair"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Desligar"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Gravar sessão para logins futuros"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Por favor insira a sua password:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Ocorreu um erro</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "Ou a password que inseriu é inválida, ou o administrador do sistema não permite desligar o computador através da sua conta de utilizador."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"Ou a password que inseriu é inválida, ou o administrador do sistema não "
+"permite desligar o computador através da sua conta de utilizador."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -352,8 +435,12 @@ msgid "Last accessed: %s"
 msgstr "Último acesso: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "Escolha a sessão que quer recuperar. Pode simplesmente fazer duplo-clique no nome da sessão para a recuperar."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"Escolha a sessão que quer recuperar. Pode simplesmente fazer duplo-clique no "
+"nome da sessão para a recuperar."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -373,15 +460,21 @@ msgstr "Nova sessão"
 msgid "Create a new session."
 msgstr "Criar nova sessão."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "A iniciar o Daemon Chaveiro do Gnome"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "A iniciar as Tecnologias de Acessibilidade do Gnome"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "A iniciar os serviços do KDE"
 
@@ -410,6 +503,31 @@ msgstr "Continuar na mesma"
 msgid "Try again"
 msgstr "Tentar novamente"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Escolha a sessão"
@@ -422,88 +540,88 @@ msgstr "Escolha o nome da sessão"
 msgid "Choose a name for the new session:"
 msgstr "Escolha um nome para a nova sessão"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "A iniciar o Controlador de Volume"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "A iniciar o Painel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "A iniciar o Gestor do Ambiente de Trabalho"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "A iniciar a Barra de Tarefas"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "A iniciar o Gestor de Janelas"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "A iniciar o Emulador de Terminal do Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "A iniciar o Editor de Texto Avançado do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "A iniciar o Gestor da Área de Transferência do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "A iniciar o Leitor de Mail do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "A iniciar o Leitor de News do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "A iniciar o Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "A iniciar o Emulador de Terminal do KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "A iniciar o Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "A iniciar The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "A iniciar o VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Iniciando Gestor de Sessão Proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "A iniciar o Cliente de IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "A iniciar o X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "A iniciar o Emulador de Terminal do X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Iniciando %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -528,17 +646,15 @@ msgstr ""
 "localização.\n"
 "Pode apagar esta pasta.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Executando Autostart..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "Dicas e truques"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Fortunas"
 
@@ -546,8 +662,7 @@ msgstr "Fortunas"
 msgid "Display tips on _startup"
 msgstr "Mostrar dicas ao _iniciar"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "Dicas e truques"
 
@@ -555,38 +670,103 @@ msgstr "Dicas e truques"
 msgid "Next"
 msgstr "Próximo"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Definições de Sessão e Arranque"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Definições de Sessões e Arranque"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Definições de Sessões e Arranque Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Definições do Ecrã de Arranque Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aplicações de arranque"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Editar a lista de aplicações auto-carregadas"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Aplicações auto-carregadas do Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "dicas-xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "Fim de sessão"
-
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Se seleccionado, o gestor de sessões irá dar-lhe à escolha uma sessão "
+#~ "sempre que entrar no Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Esta opção faz com que o gestor de sessões grave a sessão actual "
+#~ "automaticamente quando termina a sessão. Se não seleccionar esta opção "
+#~ "irá ser questionado se quer ou não gravar a sessão cada vez que sair."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Esta opção desactiva o diálogo de confirmação de saída. A sessão será ou "
+#~ "não gravada dependendo se activou ou não a gravação automática da sessão "
+#~ "na saída."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Lançar serviços do Gnome no arranque"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Active isto se está a pensar usar aplicações do Gnome. Isto irá indicar "
+#~ "ao gestor de sessões para iniciar alguns serviços vitais do Gnome. Também "
+#~ "deverá activar isto se pretende usar as Tecnologias de Acessibilidade que "
+#~ "vêm com o Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Active isto se está a pensar usar aplicações do KDE. Isto irá aumentar "
+#~ "significativamente a duração do arranque, mas por outro lado, as "
+#~ "aplicações do KDE serão iniciadas mais depressa. Algumas aplicações do "
+#~ "KDE poderão mesmo não funcionar se esta opção não estiver activa."
+
+#~ msgid "Security"
+#~ msgstr "Segurança"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Permitir ao gestor de sessões gerir aplicações a correr em computadores "
+#~ "remotos. Não active esta opção a não ser que tenha a certeza do que está "
+#~ "a fazer."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessões e Arranque"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Definições do Ecrã de Arranque"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Ecrã de arranque"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aplicações de arranque"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Definições do Ecrã de Arranque Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aplicações de arranque"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Editar a lista de aplicações auto-carregadas"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Aplicações auto-carregadas do Xfce 4"
diff --git a/po/ro.po b/po/ro.po
index fa1b27e3..961e9aa4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-01-20 21:34+0200\n"
 "Last-Translator: Mişu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -79,313 +79,352 @@ msgstr "Şoricel"
 msgid "Mice Splash Engine"
 msgstr "Motorul „Şoricel”"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Selectaţi o imagine..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Configurare Simplu..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Font"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Culori"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Culoare fundal:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Culoare text:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Imagine"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Imagine personalizată"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simplu"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Motorul „Simplu”"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Alegere sesiuni"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Cere la pornire alegerea unei sesiuni"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Dacă selectaţi această opţiune, administratorul de sesiuni vă va oferi "
-"posibilitatea de a alege sesiunea dorită la fiecare pornire Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Setări deautentificare"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Salvează automat sesiunea la ieşire"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Această opţiune va impune administratorului de sesiuni salvarea sesiunii "
-"curente la fiecare deautentificare. Dacă nu selectaţi această opţiune, "
-"administratorul de sesiuni vă va întreba la fiecare ieşire dacă doriţi să "
-"salvaţi sesiunea curentă."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Întreabă-mă la ieşire"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informaţii"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Această opţiune activează dialogul de confirmare a ieşirii din sesiune. "
-"Astfel, veţi avea posibilitatea să activaţi sau să dezactivaţi salvarea "
-"sesiunii curente la deautentificare."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Compatibilitate"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Lansează serviciile GNOME la pornire"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Activaţi această opţiune dacă doriţi să oferiţi aplicaţiilor GNOME un mediu "
-"cât mai apropiat de cel nativ. Administratorul de sesiune va porni unele "
-"servicii esenţiale GNOME la autentificare. Această opţiune trebuie activată "
-"şi în cazul în care doriţi să utilizaţi setările de accesibilitate GNOME."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Lansează serviciile KDE la pornire"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Activaţi această opţiune dacă doriţi să oferiţi aplicaţiilor KDE un mediu "
-"cât mai apropiat de cel nativ. Aceasta va mări sensibil timpul de pornire, "
-"dar apoi aplicaţiile KDE vor porni mai rapid. Unele aplicaţii KDE nu vor "
-"funcţiona decât dacă activaţi această opţiune."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Securitate"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Administrează aplicaţii la distanţă"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Preferinţe sesiuni şi pornire"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Permite administratorului de sesiuni să administreze aplicaţii la distanţă "
-"pornite pe alte calculatoare. Nu activaţi această opţiune decât dacă "
-"cunoaşteţi implicaţiile sale."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesiuni şi pornire"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Generale"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avansate"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sesiuni şi pornire"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Niciuna"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Setări imagine de pornire"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Configurare"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Deschide panoul de configurare pentru imaginea de pornire selectată."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Testare"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Simulează pornirea cu tema selectată"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informaţii"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Descriere:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Versiune:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Adresă:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Imagine de pornire"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Adăugare aplicaţie"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Nume:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Descriere:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Comandă:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Selectaţi o comandă..."
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Nu s-a putut desface legătura %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Nu s-a putut crea fişierul %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Nu s-a putut scrie fişierul %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Nu s-a putut deschide %s la scriere"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Aplicaţii pornite automat"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Aceasta este lista aplicaţiilor ce vor fi pornite\n"
 "automat când vă veţi autentifica în Xfce pe lângă\n"
 "aplicaţiile salvate la ultima deautentificare\n"
 "din Xfce:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Compatibilitate"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Descriere:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Adresă:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informaţii"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Setări deautentificare"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Descriere:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Alegere sesiuni"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Versiune:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avansate"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Salvează automat sesiunea la ieşire"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Configurare"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Simulează pornirea cu tema selectată"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Lansează serviciile KDE la pornire"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Lansează serviciile KDE la pornire"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Administrează aplicaţii la distanţă"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Deschide panoul de configurare pentru imaginea de pornire selectată."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Simulează pornirea cu tema selectată"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesiuni şi pornire"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Cere la pornire alegerea unei sesiuni"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Generale"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Întreabă-mă la ieşire"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Terminare Sesiune"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Testare"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Se încarcă setările desktopului"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Se verifică setările DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Se încarcă datele sesiunii"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Alegeţi numele sesiunii"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Ieşire"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Repornire"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Oprire"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Salvează sesiunea"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Introduceţi parola:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>A intervenit o eroare</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -424,15 +463,21 @@ msgstr "Sesiune nouă"
 msgid "Create a new session."
 msgstr "Creează o nouă sesiune."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Se porneşte daemonul GNOME Keyring"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Se pornesc facilităţile de accesibilitate GNOME"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Se pornesc serviciile KDE"
 
@@ -461,6 +506,31 @@ msgstr "Continuă oricum"
 msgid "Try again"
 msgstr "Reîncearcă"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Alegeţi o sesiune"
@@ -473,88 +543,88 @@ msgstr "Alegeţi numele sesiunii"
 msgid "Choose a name for the new session:"
 msgstr "Alegeţi un nume pentru noua sesiune:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Se iniţializează controlul de volum"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Se iniţializează panoul"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Se iniţializează administratorul desktopului"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Se iniţializează bara aplicaţiilor"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Se iniţializează administratorul de ferestre"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Se porneşte terminalul GNOME"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Se porneşte editorul de text KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Se porneşte administratorul clipboard-ului KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Se porneşte clientul de mail KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Se porneşte clientul de news KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Se porneşte Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Se porneşte terminalul KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Se porneşte Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Se porneşte GIMP"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Se porneşte editorul VIM"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Se porneşte proxy-ul administratorului de sesiuni"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Se porneşte clientul IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Se porneşte XMMS"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Se porneşte terminalul X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Se porneşte %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -578,7 +648,7 @@ msgstr ""
 "director au fost migrate cu succes în noua locaţie.\n"
 "Puteţi şterge acest director acum.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Se lansează aplicaţiile de pornit automat..."
 
@@ -602,37 +672,105 @@ msgstr "Sugestii şi ponturi"
 msgid "Next"
 msgstr "Alta"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Preferinţe sesiuni şi pornire"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Preferinţe sesiuni şi pornire"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Preferinţe sesiuni şi pornire Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Setări imagine de pornire Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Aplicaţii pornite automat"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Editaţi lista aplicaţiilor pornite automat"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Aplicaţii Xfce 4 pornite automat"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Terminare Sesiune"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Dacă selectaţi această opţiune, administratorul de sesiuni vă va oferi "
+#~ "posibilitatea de a alege sesiunea dorită la fiecare pornire Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Această opţiune va impune administratorului de sesiuni salvarea sesiunii "
+#~ "curente la fiecare deautentificare. Dacă nu selectaţi această opţiune, "
+#~ "administratorul de sesiuni vă va întreba la fiecare ieşire dacă doriţi să "
+#~ "salvaţi sesiunea curentă."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Această opţiune activează dialogul de confirmare a ieşirii din sesiune. "
+#~ "Astfel, veţi avea posibilitatea să activaţi sau să dezactivaţi salvarea "
+#~ "sesiunii curente la deautentificare."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Lansează serviciile GNOME la pornire"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Activaţi această opţiune dacă doriţi să oferiţi aplicaţiilor GNOME un "
+#~ "mediu cât mai apropiat de cel nativ. Administratorul de sesiune va porni "
+#~ "unele servicii esenţiale GNOME la autentificare. Această opţiune trebuie "
+#~ "activată şi în cazul în care doriţi să utilizaţi setările de "
+#~ "accesibilitate GNOME."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Activaţi această opţiune dacă doriţi să oferiţi aplicaţiilor KDE un mediu "
+#~ "cât mai apropiat de cel nativ. Aceasta va mări sensibil timpul de "
+#~ "pornire, dar apoi aplicaţiile KDE vor porni mai rapid. Unele aplicaţii "
+#~ "KDE nu vor funcţiona decât dacă activaţi această opţiune."
+
+#~ msgid "Security"
+#~ msgstr "Securitate"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Permite administratorului de sesiuni să administreze aplicaţii la "
+#~ "distanţă pornite pe alte calculatoare. Nu activaţi această opţiune decât "
+#~ "dacă cunoaşteţi implicaţiile sale."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sesiuni şi pornire"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Setări imagine de pornire"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Imagine de pornire"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Aplicaţii pornite automat"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Setări imagine de pornire Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Aplicaţii pornite automat"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Editaţi lista aplicaţiilor pornite automat"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Aplicaţii Xfce 4 pornite automat"
diff --git a/po/ru.po b/po/ru.po
index 1e3ea813..0c3d9827 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-05-08 13:48+0600\n"
 "Last-Translator: Sergey Fedoseev <fedoseev.sergey@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -81,311 +81,352 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Заставка Mice"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Выбор изображения..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Настройка Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Цвета"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Цвет фона:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Цвет текста:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Изображение"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Использовать другое изображение"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Заставка Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Выбора сеанса"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Показывать диалог выбора при входе в систему"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Если параметр включен, диспетчер сеансов будет показывать диалог выбора "
-"сеанса при каждом входе в Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Параметры выхода"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Автоматически сохранять сеанс при выходе"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Если этот параметр включен, при каждом выходе из системы текущий сеанс будет "
-"автоматически сохраняться. Если этот параметр отключен, при каждом выходе из "
-"системы вы сможете выбрать, нужно ли сохранять сеанс."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Запрос при выходе"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Сведения"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Этот параметр отключает диалог подтверждения выхода из системы. В "
-"зависимости от того, включили вы автоматическое сохранение сеансов или нет, "
-"при этом будет сохраняться текущий сеанс."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Совместимость"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Запускать службы GNOME при входе в систему"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Включите этот параметр, если планируете использовать приложения среды GNOME. "
-"Тогда диспетчер сеансов будет автоматически запускать основные службы GNOME. "
-"Также включите этот параметр для использования вспомогательных технологий из "
-"комплекта GNOME."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Запускать службы KDE при входе в систему"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Включите этот параметр, если вы планируете запускать приложения среды KDE. "
-"Это заметно увеличит время загрузки Xfce, но с другой стороны, приложения "
-"KDE будут запускаться быстрее. Некоторые приложения KDE могут не работать, "
-"если вы не включите этот параметр."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Безопасность"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Управлять удалёнными приложениями"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Сеансы и запуск"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Позволяет диспетчеру сеансов управлять приложениями, запущенными на "
-"удалённых компьютерах. Если вы не уверены, не включайте этот параметр."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Сеансы и запуск"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Общие"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Дополнительные"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Сеансы и запуск"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Нет"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Заставка"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Настроить"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Открывает диалог настройки выбранной заставки."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Проверить"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Показывает выбранную заставку."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Сведения"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Описание:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Версия:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Автор:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Домашняя страница:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Заставка"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Добавление приложения"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Команда:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Выбор команды"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Не удалось создать файл %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Не удалось записать в файл %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Не удалось открыть файл %s для записи"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Приложения, запускаемые автоматически"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Ниже расположен список приложений, которые будут\n"
 "запущены автоматически в начале сеанса, в дополнение к\n"
 "приложениям, которые были сохранены во время последнего\n"
 "завершения сеанса:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Автор:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Совместимость"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Описание:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Домашняя страница:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Сведения"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Параметры выхода"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Описание:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Выбора сеанса"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Версия:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Дополнительные"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Автоматически сохранять сеанс при выходе"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Настроить"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Показывает выбранную заставку."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Запускать службы KDE при входе в систему"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Запускать службы KDE при входе в систему"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Управлять удалёнными приложениями"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Открывает диалог настройки выбранной заставки."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Показывает выбранную заставку."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Сеансы и запуск"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Показывать диалог выбора при входе в систему"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Общие"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Запрос при выходе"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Завершить сеанс"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Проверить"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Загрузка параметров рабочего стола"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Проверка настроек DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Загрузка сведений о сеансе"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Выберите имя сеанса"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Выйти"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Перезагрузить"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Выключить"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Сохранить сеанс"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Введите пароль:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Произошла ошибка</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -424,15 +465,21 @@ msgstr "Новый сеанс"
 msgid "Create a new session."
 msgstr "Создать новый сеанс."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Запуск демона GNOME Keyring"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Запуск вспомогательных технологий GNOME"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Запуск служб KDE"
 
@@ -461,6 +508,31 @@ msgstr "Продолжить"
 msgid "Try again"
 msgstr "Повторить попытку"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Выберите сеанс"
@@ -473,88 +545,88 @@ msgstr "Выберите имя сеанса"
 msgid "Choose a name for the new session:"
 msgstr "Выберите имя нового сеанса:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Запуск регулятора громкости"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Запуск панели Xfce"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Запуск диспетчера рабочего стола"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Запуск панели задач"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Запуск оконного менеджера"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Запуск эмулятора терминала GNOME"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Запуск расширенного текстового редактора KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Запуск буфера обмена KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Запуск программы чтения почты для KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Запуск программы чтения новостей для KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Запуск Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Запуск эмулятора терминала KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Запуск музыкального проигрывателя Beep"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Запуск GIMP"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Запуск текстового редактора Vi"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Запуск прокси для управления сеансами"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Запуск IRC-клиента X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Запуск проигрывателя XMMS"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Запуск эмулятора терминала Xterm"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Запуск %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -579,7 +651,7 @@ msgstr ""
 "\n"
 "Теперь вы должны удалить старый каталог.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Автозапуск программ..."
 
@@ -603,37 +675,102 @@ msgstr "Полезные советы"
 msgid "Next"
 msgstr "Следующий"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Сеансы и запуск"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Сеансы и запуск"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Настройки сеансов и запуска Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Настройки заставки Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Автозапуск"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Редактировать список автоматически запускаемых приложений"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Приложения, запускаемые при старте Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "подсказки xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "Завершить сеанс"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Если параметр включен, диспетчер сеансов будет показывать диалог выбора "
+#~ "сеанса при каждом входе в Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Если этот параметр включен, при каждом выходе из системы текущий сеанс "
+#~ "будет автоматически сохраняться. Если этот параметр отключен, при каждом "
+#~ "выходе из системы вы сможете выбрать, нужно ли сохранять сеанс."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Этот параметр отключает диалог подтверждения выхода из системы. В "
+#~ "зависимости от того, включили вы автоматическое сохранение сеансов или "
+#~ "нет, при этом будет сохраняться текущий сеанс."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Запускать службы GNOME при входе в систему"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Включите этот параметр, если планируете использовать приложения среды "
+#~ "GNOME. Тогда диспетчер сеансов будет автоматически запускать основные "
+#~ "службы GNOME. Также включите этот параметр для использования "
+#~ "вспомогательных технологий из комплекта GNOME."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Включите этот параметр, если вы планируете запускать приложения среды "
+#~ "KDE. Это заметно увеличит время загрузки Xfce, но с другой стороны, "
+#~ "приложения KDE будут запускаться быстрее. Некоторые приложения KDE могут "
+#~ "не работать, если вы не включите этот параметр."
+
+#~ msgid "Security"
+#~ msgstr "Безопасность"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Позволяет диспетчеру сеансов управлять приложениями, запущенными на "
+#~ "удалённых компьютерах. Если вы не уверены, не включайте этот параметр."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Сеансы и запуск"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Заставка"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Заставка"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Приложения, запускаемые автоматически"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Настройки заставки Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Автозапуск"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Редактировать список автоматически запускаемых приложений"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Приложения, запускаемые при старте Xfce 4"
diff --git a/po/si.po b/po/si.po
index 3585ad95..0b347079 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-02-10 19:02+0530\n"
 "Last-Translator: Rashan Anushka <rashan.uoc@gmail.com>\n"
 "Language-Team: Sinhala <si@li.org>\n"
@@ -78,306 +78,351 @@ msgstr "මයිස්"
 msgid "Mice Splash Engine"
 msgstr "මයිස් මතුකර දැක්වීමේ එන්ජිම"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "අනුරුව තෝරන්න..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "සරල වින්‍යාස කරන්න..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "අකුර"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "වර්ණ"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "පසුතල වර්ණය:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "පෙළ වර්ණය:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "අනුරුව"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "අභිරුචි අනුරුවක් භාවිතා කරන්න"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "සරල"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "සරල මතුකර දැක්වීමේ එන්ජිම"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "සැසි තෝරනය"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "ලොගින් වීමේදී සංදර්ශක තෝරනය"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"සිටුවම් කර ඇති විටදී, සැසි කළමණාකරු  විසින් සෑම ලොගින් අවස්ථාවකදීම ඔබගෙන් සැසියක් තේරීමට ඉල්ලනු "
-"ඇත."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "ලොගවුට් සිටුවම්"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "ලොගවුට් වීමේදී ස්වයංක්‍රීයවම සැසිය සුරකින්න"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"මෙම විකල්පය මඟින් ඔබ ලොගවුට් වීමේදී ස්වයංක්‍රීයවම පවතින සැසිය සුරැකීමට සැසි කළමණාකරුට උපදෙස් "
-"දේ. ඔබ මෙම තෝරානැති විටදී සෑම ලොගවුට් වීමකදීම පවතින සැසිය සුරකින්නේදැයි ඔබගෙන් අසනු ඇත."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "ලොගවුට් වීමේදී ප්‍රේරකය"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "තොරතුරුුතර"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"මෙම විකල්පය මගින් ලොගවුට්වීම ස්ථීර කිරීමේ සංවාද කොටුව අක්‍රීය කරයි. පවතින සැසිය සුරැකීම ඔබ විසින් "
-"ස්වයංක්‍රීය සැසි සුරැකීම සිටුවම් කර ඇති ආකාරය අනුව තීරණය වේ."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "ගැළපුම"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "ආරම්භ කිරීමේදී GNOMEෝම් සේවාවන් පුරන්නම"
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"ඔබ ග්නෝම් යෙදුම් භාවිතා කිරීමට සිතන්නේනම් මෙය සක්‍රීය කරන්න. මෙමගින් ඇතැම් වැදගත් ග්නෝම් සේවාවන් "
-"ආරම්භ කිරීමට සැසි කළමණාකරුට උපදෙස් දෙනු ඇත. එමෙන්ම ඔබ ග්නෝම් සමඟ ඇති සහායක තාක්ෂණයන් "
-"භාවිතා කරන්නේනම්ද මෙය සක්‍රීය කළ යුතුය."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "ආරම්භ කිරීමේදී KDE සේවාවන් පුරන්නම"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"ඔබගේ Xfce සැසියේදී KDE යෙදුම් භාවිතා කිරීමට සිතන්නේනම් මෙම විකල්පය සක්‍රීය කරන්න. මෙයින් ආරම්භක "
-"කාලය සැලකිය යුතු ලෙස වැඩි වුවත් KDE යෙදුම් සාපේක්ෂව කෙටි වේලාවකින් ඇරඹෙනු ඇත. මෙය අක්‍රීය කර "
-"ඇති විටදී ඇතැම් KDE යෙදුම් සහමුලින්ම ක්‍රියාවිරහිත වන්නට පුළුවන."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "ආරක්ෂණය"
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "දුරස්ථ යෙදුම් කළමණාකරනය"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "සැසිය හා ආරම්භක සිටුවම්"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"දුරස්ථ සත්කාරකයන්හි ක්‍රියාත්මක වන යෙදුම් කළමණාකරනයට සැසි කළමණාකරුට ඉඩදේ. ඔබ කරන්නේ කුමක්දැයි "
-"දන්නා විටදී විනා මෙය සක්‍රීය කිරීමෙන් වලකින්න."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "සැසි හා ආරම්භ කිරීම"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "පොදු"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "උසස්"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "බොත්තම් ලේබලය|සැසි හා ආරම්භ කිරීම"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "නොමැත"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "මතුකර දැක්වීමේ තිරයේ සිටුවම්"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "වින්‍යාස කරන්න"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "තේරූ මතුකර දැක්වීමේ තිරය සඳහා වින්‍යාසය පුවරුව විවෘත කරයි."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "පරික්ෂා කරන්න"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "තේරූ මතුකර දැක්වීමේ තිරය ආර්ශනය කරයි."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "තොරතුරුුතර"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>විස්තරය:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>අනුවාදය:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>කතෘ:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>මුල් පිටුව:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "බොත්තම් ලේබලය|මතුකර දැක්වීමේ තිරය"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "යෙදුමක් එක් කරන්න"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "නාමය:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "විස්තරය:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "විධානය:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "විධානයක් තෝරන්න"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "%s විසන්ධි කිරීම අසමත් විය: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "%s ගොනුව සෑදීම අසමත් විය"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "%s ගොනුව ලිවීම අසමත් විය"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "ලිවීම සඳහා %s ගොනුව විවෘත කිරීමීම අසමත් විය"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "ස්වයංක්‍රීයව ඇරඹුනු යෙදුම්"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "පහත දැක්වෙන්නේ ඔබගේ Xfce වැඩතලයට ලොගින් වන විට,\n"
 "අවසන් වරට ඔබ ලොගවුට් වීමේදී සුරැකිනු ලැබූ යෙදුම් වලට අමතරව\n"
 "ස්වයංක්‍රීයවම ආරම්භ වන යෙදුම්යය:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>කතෘ:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "ගැළපුම"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>විස්තරය:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>මුල් පිටුව:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "තොරතුරුුතර"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "ලොගවුට් සිටුවම්"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>විස්තරය:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "සැසි තෝරනය"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>අනුවාදය:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "උසස්"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "ලොගවුට් වීමේදී ස්වයංක්‍රීයවම සැසිය සුරකින්න"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "වින්‍යාස කරන්න"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "තේරූ මතුකර දැක්වීමේ තිරය ආර්ශනය කරයි."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "ආරම්භ කිරීමේදී KDE සේවාවන් පුරන්නම"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "ආරම්භ කිරීමේදී KDE සේවාවන් පුරන්නම"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "දුරස්ථ යෙදුම් කළමණාකරනය"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "තේරූ මතුකර දැක්වීමේ තිරය සඳහා වින්‍යාසය පුවරුව විවෘත කරයි."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "තේරූ මතුකර දැක්වීමේ තිරය ආර්ශනය කරයි."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "සැසි හා ආරම්භ කිරීම"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "ලොගින් වීමේදී සංදර්ශක තෝරනය"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "පොදු"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "ලොගවුට් වීමේදී ප්‍රේරකය"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "සැසිය අහවර කරන්න"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "පරික්ෂා කරන්න"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "වැඩතල සිටුවම් ප්‍රවේශනය වේ"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS සිටුවම් සත්‍යායනය කෙරේ"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "සැසි දත්ත ප්‍රවේශනයවේ"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "සැසි නාමය තෝරන්න"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "ලොග්වුට් වන්න"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "යළි අරඹන්න"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "වසා දමන්න"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "ඉදිරි ලොගින්වීම් සඳහා සැසිය සුරකින්න(_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "කරුණාකර ඔබගේ මුර පදය ඇතුල් කරන්න:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>දොසක් ඇතිවිය</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -414,15 +459,21 @@ msgstr "නව සැසියක්"
 msgid "Create a new session."
 msgstr "නව සැසියක් සාදන්න."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Gnome Keyring Daemon ආරම්භවේ"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Gnome සහායක තාක්ෂනයන් ආරම්භ කෙරේ"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE සේවාවන් ආරම්භ කෙරේ"
 
@@ -451,6 +502,31 @@ msgstr "කෙසේ හෝ පවත්වාගෙන යන්න"
 msgid "Try again"
 msgstr "නැවත උත්සහ කරන්න"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "සැසිය තෝරන්න"
@@ -463,88 +539,88 @@ msgstr "සැසි නාමය තෝරන්න"
 msgid "Choose a name for the new session:"
 msgstr "නව සැසිය සඳහා නමක් තෝරන්න:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "ශබ්ද පාලකය ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "පුවරුව ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "වැඩතල කළමණාකරු ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "කාර්ය තීරුව ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "කවුළු කළමණාකරු ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Gnome Terminal Emulator ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE උසස් පෙළ සැකසුම ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE පසුරු පුවරු කළමණාකරු ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE තැපැල් ලියවනය ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE පුවත් කියවනය ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE Terminal Emulator ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "බීප් මාධ්‍ය ධාවකය ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "ගිම්ප් ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI වැඩිදියුණු කරන ලද සකසනය ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "සැසි කළමණාකරන නියුතුව ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat IRC සේවාලාභියා ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "X බහු මාධ්‍ය පද්ධතිය ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X Terminal Emulator ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s ආරම්භ වේ"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -568,7 +644,7 @@ msgstr ""
 " ඩිරෙක්ටරියේ වූ ගොනු සාර්ථකව නව ස්ථානයට මාරු කරන ලදි\n"
 "ඔබ මෙම ඩිරෙක්ටරිය දැන් මකා දැමිය යුතුය.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "ස්වයංක්‍රීය ඇරඹුම ක්‍රියාත්මක කෙරේ..."
 
@@ -592,37 +668,98 @@ msgstr "ඉඟි හා උපායන්"
 msgid "Next"
 msgstr "ඊලඟ"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "සැසිය හා ආරම්භක සිටුවම්"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "සැසි හා ආරම්භක සිටුවම්"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 සැසි හා ආරම්භක සිටුවම්"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 මතුකර දැක්වීමේ තිර සිටුවම්"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "ස්වයංක්‍රීයව ඇරඹුනු යෙදුම්"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "ස්වයංක්‍රීයවම ඇරඹුනු යෙදුම් ලැයිස්තුව සකසන්න"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 ස්වයංක්‍රීයවම ඇරඹුනු යෙදුම්"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-ඉඟි"
 
-#~ msgid "End Session"
-#~ msgstr "සැසිය අහවර කරන්න"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "සිටුවම් කර ඇති විටදී, සැසි කළමණාකරු  විසින් සෑම ලොගින් අවස්ථාවකදීම ඔබගෙන් සැසියක් තේරීමට "
+#~ "ඉල්ලනු ඇත."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "මෙම විකල්පය මඟින් ඔබ ලොගවුට් වීමේදී ස්වයංක්‍රීයවම පවතින සැසිය සුරැකීමට සැසි කළමණාකරුට උපදෙස් "
+#~ "දේ. ඔබ මෙම තෝරානැති විටදී සෑම ලොගවුට් වීමකදීම පවතින සැසිය සුරකින්නේදැයි ඔබගෙන් අසනු ඇත."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "මෙම විකල්පය මගින් ලොගවුට්වීම ස්ථීර කිරීමේ සංවාද කොටුව අක්‍රීය කරයි. පවතින සැසිය සුරැකීම ඔබ "
+#~ "විසින් ස්වයංක්‍රීය සැසි සුරැකීම සිටුවම් කර ඇති ආකාරය අනුව තීරණය වේ."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "ආරම්භ කිරීමේදී GNOMEෝම් සේවාවන් පුරන්නම"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "ඔබ ග්නෝම් යෙදුම් භාවිතා කිරීමට සිතන්නේනම් මෙය සක්‍රීය කරන්න. මෙමගින් ඇතැම් වැදගත් ග්නෝම් "
+#~ "සේවාවන් ආරම්භ කිරීමට සැසි කළමණාකරුට උපදෙස් දෙනු ඇත. එමෙන්ම ඔබ ග්නෝම් සමඟ ඇති සහායක "
+#~ "තාක්ෂණයන් භාවිතා කරන්නේනම්ද මෙය සක්‍රීය කළ යුතුය."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "ඔබගේ Xfce සැසියේදී KDE යෙදුම් භාවිතා කිරීමට සිතන්නේනම් මෙම විකල්පය සක්‍රීය කරන්න. මෙයින් "
+#~ "ආරම්භක කාලය සැලකිය යුතු ලෙස වැඩි වුවත් KDE යෙදුම් සාපේක්ෂව කෙටි වේලාවකින් ඇරඹෙනු ඇත. "
+#~ "මෙය අක්‍රීය කර ඇති විටදී ඇතැම් KDE යෙදුම් සහමුලින්ම ක්‍රියාවිරහිත වන්නට පුළුවන."
+
+#~ msgid "Security"
+#~ msgstr "ආරක්ෂණය"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "දුරස්ථ සත්කාරකයන්හි ක්‍රියාත්මක වන යෙදුම් කළමණාකරනයට සැසි කළමණාකරුට ඉඩදේ. ඔබ කරන්නේ "
+#~ "කුමක්දැයි දන්නා විටදී විනා මෙය සක්‍රීය කිරීමෙන් වලකින්න."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "බොත්තම් ලේබලය|සැසි හා ආරම්භ කිරීම"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "මතුකර දැක්වීමේ තිරයේ සිටුවම්"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "බොත්තම් ලේබලය|මතුකර දැක්වීමේ තිරය"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "ස්වයංක්‍රීයව ඇරඹුනු යෙදුම්"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 මතුකර දැක්වීමේ තිර සිටුවම්"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "ස්වයංක්‍රීයව ඇරඹුනු යෙදුම්"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "ස්වයංක්‍රීයවම ඇරඹුනු යෙදුම් ලැයිස්තුව සකසන්න"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 ස්වයංක්‍රීයවම ඇරඹුනු යෙදුම්"
diff --git a/po/sk.po b/po/sk.po
index 127a9494..f7d64741 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-07-03 23:42+0200\n"
 "Last-Translator: Stefan Miklosovic <miklosovic@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -79,310 +79,351 @@ msgstr "Téma Myš"
 msgid "Mice Splash Engine"
 msgstr "Téma myš"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Vyberte si obrázok..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigurácia jednoduchej..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Písmo"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Farby"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Farba pozadia:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Farba textu:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Obrázok"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Použiť vlastný obrázok"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Jednoduchá téma"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Jednoduchá téma"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Výber sedenia"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Zobraziť výber sedenia pri prihlásení"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Toto nastavenie umožní správcovi sedenia opýtať na zvolenie uloženého "
-"sedenia pri každom prihlásení do Xfce."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Nastavenia pre odhlásenie"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Automaticky uložiť sedenie pri odhlásení"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Toto nastavenie umožní správcovi sedenia uložiť automaticky sedenie pri "
-"odhlásení. Ak nezvolíte toto nastavenie, budete pri odhlasovaní vyzvaný, či "
-"chcete uložiť sedenie."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Opýtať sa pri odhlásení"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Informácia"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Toto nastavenie zruší výzvu pri odhlasovaní. Či bude alebo nebude sedenie "
-"uložené potom závisí od toho, či je alebo nie je zvolené Automatické "
-"ukladanie sedenia pri odhlásení."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompatibilita"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Pri štarte spustiť služby Gnome"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Povoľte toto nastavenie, ak plánujete používať Gnome aplikácie. Toto "
-"nastavenie dá príkaz správcovi sedenia spúšťať niektoré nevyhnutné Gnome "
-"služby. Povoľte toto nastavenie taktiež, ak chcete používať podporu "
-"pomocných technológií  z Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Pri štarte spustiť služby KDE"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Povoľte toto nastavenie, ak plánujete používať KDE aplikácie ako súčasť Xfce "
-"sedenia. Toto môže predĺžiť štart Xfce, ale na druhej strane zrýchliť "
-"spúštanie KDE aplikácií. Niektoré KDE aplikácie nemusia správne pracovať ak "
-"nie je povolené toto nastavenie."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Bezpečnosť"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Správa vzdialených aplikácií"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Sedenia a spúšťanie"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Povolí správcovi sedenia riadiť aplikácie bežiace na vzdialených počítačoch. "
-"Nepovoľujte toto nastavenie pokiaľ neviete čo robíte."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sedenia a spúšťanie"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Základné"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Rozšírené"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sedenia a spúšťanie"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Žiadne"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Nastavenie úvodnej obrazovky"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigurácia"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Otvorí nastavenie pre zvolenú úvodnú obrazovku"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Test"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Ukážka zvolenej úvodnej obrazovky"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Informácia"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Popis:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Verzia:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Domovská stránka:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Úvodná obrazovka"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Pridať aplikáciu"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Názov:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Príkaz:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Vyberte príkaz"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Nemôžem odstrániť odkaz %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Nemôžem vytvoriť súbor %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Nemôžem zapisovať do súboru %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Nemôžem otvoriť súbor %s pre zápis"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Automaticky spúšťané aplikácie"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Zoznam obsahuje aplikácie, ktoré budú automaticky \n"
 "spustené po prihlásení do Xfce spolu s aplikáciami,\n"
 "ktoré boli uložené správcom sedenia pri poslednom\n"
 "odhlásení:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompatibilita"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Popis:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Domovská stránka:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Informácia"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Nastavenia pre odhlásenie"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Popis:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Výber sedenia"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Verzia:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Rozšírené"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Automaticky uložiť sedenie pri odhlásení"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfigurácia"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Ukážka zvolenej úvodnej obrazovky"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Pri štarte spustiť služby KDE"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Pri štarte spustiť služby KDE"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Správa vzdialených aplikácií"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Otvorí nastavenie pre zvolenú úvodnú obrazovku"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Ukážka zvolenej úvodnej obrazovky"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sedenia a spúšťanie"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Zobraziť výber sedenia pri prihlásení"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Základné"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Opýtať sa pri odhlásení"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Ukončiť sedenie"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Načítavám nastavenia plochy"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Overujem nastavenia DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Načítavám údaje sedenia"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Vyberte si názov sedenia"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Odhlásiť"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Reštartovať"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Vypnúť"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Uložiť sedenie pre budúce prihlásenie"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Prosím zadajte svoje heslo:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Nastala chyba</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +462,21 @@ msgstr "Nové sedenie"
 msgid "Create a new session."
 msgstr "Vytvoriť nové sedenie"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Spúšta The Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Spúšťam Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Spúšťam služby KDE"
 
@@ -458,6 +505,31 @@ msgstr "Pokračovať v každom prípade"
 msgid "Try again"
 msgstr "Skúsiť znovu"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Vyberte si sedenie"
@@ -470,88 +542,88 @@ msgstr "Vyberte si názov sedenia"
 msgid "Choose a name for the new session:"
 msgstr "Zvoľte si názov nového sedenia:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Spúšťam Ovládač hlasitosti"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Spúšťam Panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Spúšťam Správcu plochy"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Spúšťam Panel úloh"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Spúšťam Správcu okien"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Spúšťam Gnome Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Spúšťam KDE Advanced Text Editor"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Spúšťam KDE Clipboard Manager"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Spúšťam KDE Mail Reader"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Spúšťam KDE News Reader"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Spúšťam Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Spúšťam KDE Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Spúšťam Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Spúšťam Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Spúšťam VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Spúšťam Session Management Proxy"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Spúšťam X-Chat IRC Client"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Spúšťam X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Spúšťam X Terminal Emulator"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Spúšťam %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -576,7 +648,7 @@ msgstr ""
 "do nového umiestnenia.\n"
 "Starý adresár teraz môžete vymazať.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Vykonávam Autoštart..."
 
@@ -600,37 +672,102 @@ msgstr "Tipy a triky"
 msgid "Next"
 msgstr "Ďalší"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Sedenia a spúšťanie"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Sedenia a spúšťanie"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Sedenia a spúšťanie"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 Nastavenie úvodnej obrazovky"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Automaticky spúšťané aplikácie"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Upraviť zoznam automaticky spúšťaných aplikácií"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Automaticky spúšťané aplikácie"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tipy"
 
-#~ msgid "End Session"
-#~ msgstr "Ukončiť sedenie"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Toto nastavenie umožní správcovi sedenia opýtať na zvolenie uloženého "
+#~ "sedenia pri každom prihlásení do Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Toto nastavenie umožní správcovi sedenia uložiť automaticky sedenie pri "
+#~ "odhlásení. Ak nezvolíte toto nastavenie, budete pri odhlasovaní vyzvaný, "
+#~ "či chcete uložiť sedenie."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Toto nastavenie zruší výzvu pri odhlasovaní. Či bude alebo nebude sedenie "
+#~ "uložené potom závisí od toho, či je alebo nie je zvolené Automatické "
+#~ "ukladanie sedenia pri odhlásení."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Pri štarte spustiť služby Gnome"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Povoľte toto nastavenie, ak plánujete používať Gnome aplikácie. Toto "
+#~ "nastavenie dá príkaz správcovi sedenia spúšťať niektoré nevyhnutné Gnome "
+#~ "služby. Povoľte toto nastavenie taktiež, ak chcete používať podporu "
+#~ "pomocných technológií  z Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Povoľte toto nastavenie, ak plánujete používať KDE aplikácie ako súčasť "
+#~ "Xfce sedenia. Toto môže predĺžiť štart Xfce, ale na druhej strane "
+#~ "zrýchliť spúštanie KDE aplikácií. Niektoré KDE aplikácie nemusia správne "
+#~ "pracovať ak nie je povolené toto nastavenie."
+
+#~ msgid "Security"
+#~ msgstr "Bezpečnosť"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Povolí správcovi sedenia riadiť aplikácie bežiace na vzdialených "
+#~ "počítačoch. Nepovoľujte toto nastavenie pokiaľ neviete čo robíte."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sedenia a spúšťanie"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Nastavenie úvodnej obrazovky"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Úvodná obrazovka"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Automaticky spúšťané aplikácie"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 Nastavenie úvodnej obrazovky"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Automaticky spúšťané aplikácie"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Upraviť zoznam automaticky spúšťaných aplikácií"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Automaticky spúšťané aplikácie"
diff --git a/po/sq.po b/po/sq.po
index ad4dd416..4cee7dc6 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-01-21 22:00+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <translation-team-sq@lists.sourceforge.net>\n"
@@ -77,311 +77,352 @@ msgstr "Minj"
 msgid "Mice Splash Engine"
 msgstr "Mekanizëm Sigle Minj"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Zgjidhni pamje..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Formëso Thjeshtas..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Gërma"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Ngjyra"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Ngjyrë sfondi:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Ngjyrë teksti:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Pamje"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Përdor pamje vetjake"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "E thjeshtë"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Mekanizëm Sigle e Thjeshtë"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Zgjedhës sesioni"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Shfaq zgjedhës gjatë hyrjesh"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Nëse caktohet, përgjegjësi i sesioneve do t'ju kërkojë të zgjidhni një "
-"sesion sa herë që hyni në Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Rregullime daljeje"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Ruaj automatikisht sesionin në dalje"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Kjo mundësi udhëzon përgjegjësin e sesioneve të ruajë sesionin e çastit "
-"automatikisht kur dilni. Nëse nuk përzgjidhni këtë mundësi do të pyeteni në "
-"çdo dalje nëse doni të ruhet sesioni i çastit."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Prompt gjatë daljesh"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Të dhëna"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Kjo mundësi çaktivizon dialogun e ripohimit të daljes. nëse do të ruhet apo "
-"jo sesioni varet nga fakti i aktivizimit ose jo të ruajtjes automatike të "
-"sesioneve."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Përputhshmëri"
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Nis shërbimet Gnome gjatë fillimit"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Aktivizojeni nëse keni në plan të përdorni zbatime Gnome. Kjo do të udhëzojë "
-"përgjegjësin e sesionit të nisë për ju disa shërbime jetikë të Gnome-s. Do "
-"të duhej ta aktivizonit gjithashtu nëse doni të zbatohen Teknologji Asistive "
-"që ofron Gnome-ja"
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Nis shërbimet KDE gjatë fillimit"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Aktivizojeni këtë mundësi nëse keni në plan të xhironi zbatime KDE si pjesë "
-"të sesionit tuaj Xfce Desktop. Kjo do të rrisë dukshëm kohën e nisjes, por "
-"nga ana tjetër, zbatimet KDE do të nisen më shpejt. Disa zbatime KDE mund "
-"edhe të mos punojnë fare nëse nuk e aktivizoni këtë mundësi."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Siguri"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Administro zbatime të largët"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Rregullime Sesioni dhe Nisjeje"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Lejoni përgjegjësin e sesionit të administrojë zbatime që xhirojnë në strehë "
-"të largëta. Mos e aktivizoni po nuk ditët se çfarë po bëni"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sesione dhe Nisje"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Të përgjithshme"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Të mëtejshme"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Etiketë Butoni|Sesione dhe Nisje"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Asnjë"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Rregullime Sigle"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Formëso"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Hap panel formësimi për siglën e përzgjedhur."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Provo"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Shfaq siglën e përzgjedhur."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Të dhëna"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b> Përshkrim:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b> Version:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b> Autor:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b> Faqe Hyrëse:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Etiketë Butoni|Sigël"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Shto Zbatim"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Emër:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Përshkrim:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Urdhër:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Përzgjidhni një urdhër"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Dështova në çlidhjen e %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Dështova në krijimin e kartelës %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Dështova në shkrimin e kartelës %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Dështova të hap %s për shkrim"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Zbatime të vetënisur"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Më poshtë keni listën e zbatimeve që do të nisen\n"
 "vetvetiu kur hyni te desktopi juaj Xfce, si shtesë\n"
 "e zbatimeve që qenë ruajtur kur dolët që këtej herën\n"
 "e fundit:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b> Autor:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Përputhshmëri"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b> Përshkrim:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b> Faqe Hyrëse:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Të dhëna"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Rregullime daljeje"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b> Përshkrim:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Zgjedhës sesioni"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b> Version:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Të mëtejshme"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Ruaj automatikisht sesionin në dalje"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Formëso"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Shfaq siglën e përzgjedhur."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Nis shërbimet KDE gjatë fillimit"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Nis shërbimet KDE gjatë fillimit"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Administro zbatime të largët"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Hap panel formësimi për siglën e përzgjedhur."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Shfaq siglën e përzgjedhur."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sesione dhe Nisje"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Shfaq zgjedhës gjatë hyrjesh"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Të përgjithshme"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Prompt gjatë daljesh"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Përfundo Sesion"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Provo"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Po ngarkoj rregullime desktopi"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Po verifikoj rregullime DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Po ngarkoj të dhëna sesioni"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Zgjidhni emër sesioni"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Dilni"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Rinis"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Fik"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "Ruaj sesionin për hyrje të ardhshme"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Ju lutem jepni fjalëkalimin tuaj:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Pati një gabim</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -420,15 +461,21 @@ msgstr "Sesion i ri"
 msgid "Create a new session."
 msgstr "Krijo sesion të ri."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Po nis Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Po nis Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Po nis shërbime KDE"
 
@@ -457,6 +504,31 @@ msgstr "Vazhdo sidoqoftë"
 msgid "Try again"
 msgstr "Riprovoni"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Zgjidhni sesion"
@@ -469,88 +541,88 @@ msgstr "Zgjidhni emër sesioni"
 msgid "Choose a name for the new session:"
 msgstr "Zgjidhni një emër për sesionin e ri:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Po nis Kontrollor Volumi"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Po nis Panelin"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Po nis Përgjegjësin e Desktopit"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Po nis Shtyllën e Punëve"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Po nis Përgjegjësin e Dritareve"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Po nis Emuluesin e Terminalit Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Po nis Përpunuesin e Përparuar të Teksteve KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Po nis Përgjegjësin KDE për të Papastrën"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Po nis Lexuesin KDE të Postës"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Po nis Lexuesin KDE të Lajmeve"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Po nis Konqueror-in"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Po nis Emuluesin e Terminalit KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Po nis Luajtës Mediash Beep"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Po nis Gimp-in"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Po nis Përpunuesin VI të Përmirësuar"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Po nis Ndërmjetësin e Administrimit të Sesioneve"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Po nis Klientin IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Po nis Sistemin X për Multimedia"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Po nis Emuluesin e Terminalit X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Po nis %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -575,7 +647,7 @@ msgstr ""
 "vendi i ri.\n"
 "Do të duhej ta fshinit tani këtë drejtori.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Po kryej Vetënisje..."
 
@@ -600,37 +672,103 @@ msgstr "Ndihmëza dhe rrengje"
 msgid "Next"
 msgstr "Pasues"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Rregullime Sesioni dhe Nisjeje"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Rregullime Sesionesh dhe Nisjeje"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Rregullime Sesionesh dhe Nisjeje të Xfce 4-s"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Rregullime Ekrani Sigle të Xfce 4-s"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Zbatime që Vetënisen"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Përpunoni listën e zbatimeve që vetënisen"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Zbatime Xfce 4 Vetënisëse"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "ndihmëza xfce4"
 
-#~ msgid "End Session"
-#~ msgstr "Përfundo Sesion"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Nëse caktohet, përgjegjësi i sesioneve do t'ju kërkojë të zgjidhni një "
+#~ "sesion sa herë që hyni në Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Kjo mundësi udhëzon përgjegjësin e sesioneve të ruajë sesionin e çastit "
+#~ "automatikisht kur dilni. Nëse nuk përzgjidhni këtë mundësi do të pyeteni "
+#~ "në çdo dalje nëse doni të ruhet sesioni i çastit."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Kjo mundësi çaktivizon dialogun e ripohimit të daljes. nëse do të ruhet "
+#~ "apo jo sesioni varet nga fakti i aktivizimit ose jo të ruajtjes "
+#~ "automatike të sesioneve."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Nis shërbimet Gnome gjatë fillimit"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Aktivizojeni nëse keni në plan të përdorni zbatime Gnome. Kjo do të "
+#~ "udhëzojë përgjegjësin e sesionit të nisë për ju disa shërbime jetikë të "
+#~ "Gnome-s. Do të duhej ta aktivizonit gjithashtu nëse doni të zbatohen "
+#~ "Teknologji Asistive që ofron Gnome-ja"
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Aktivizojeni këtë mundësi nëse keni në plan të xhironi zbatime KDE si "
+#~ "pjesë të sesionit tuaj Xfce Desktop. Kjo do të rrisë dukshëm kohën e "
+#~ "nisjes, por nga ana tjetër, zbatimet KDE do të nisen më shpejt. Disa "
+#~ "zbatime KDE mund edhe të mos punojnë fare nëse nuk e aktivizoni këtë "
+#~ "mundësi."
+
+#~ msgid "Security"
+#~ msgstr "Siguri"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Lejoni përgjegjësin e sesionit të administrojë zbatime që xhirojnë në "
+#~ "strehë të largëta. Mos e aktivizoni po nuk ditët se çfarë po bëni"
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Etiketë Butoni|Sesione dhe Nisje"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Rregullime Sigle"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Etiketë Butoni|Sigël"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Zbatime të vetënisur"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Rregullime Ekrani Sigle të Xfce 4-s"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Zbatime që Vetënisen"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Përpunoni listën e zbatimeve që vetënisen"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Zbatime Xfce 4 Vetënisëse"
diff --git a/po/sv.po b/po/sv.po
index e5e564c9..adcf7995 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:45+0900\n"
 "Last-Translator: Alexander Toresson <alexander.toresson@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -78,311 +78,351 @@ msgstr "Möss"
 msgid "Mice Splash Engine"
 msgstr "Splashmotorn Balou"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Välj bild..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Konfigurera Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Färger"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Bakgrundsfärg:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Textfärg:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Bild"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Använd annan bild"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Splashmoton Simple"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Sessionskontroll"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Visa sessionsväljare vid inloggning"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Om du aktiverar den här inställningen kommer sessionsväljaren att väljas "
-"varje gång du loggar in i Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Utloggningsinställningar"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Spara session automatiskt vid utloggning"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Den här inställningen instruerar sessionshanteraren att spara sessionen "
-"automatisk när du loggar ut. Om du inte väljer den här inställningen kommer "
-"du att förfrågas om huruvida du vill spara sessionen vid varje utloggning."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Kräv bekräftelse vid utloggning"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Information"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Den här inställningen aktiverar dialogen för bekräftelse av utloggning "
-"Huruvida sessionen kommer att sparas eller inte då den här inställningen "
-"inte är vald beror på om du har aktiverat automatiskt sparande av sessionen "
-"eller inte."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Kompatibilitet"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Starta Gnome-tjänster vid start"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Välj den här inställningen om du använder Gnome-applikationer. Det kommer "
-"att instruera sessionshanteraren att starta några viktiga Gnome-tjänster för "
-"dig. Du ska också aktivera den här inställningen om du vill använda "
-"hjälpmedelsteknologierna i Gnome."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Starta KDE-tjänster vid start"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Välj den här inställningen om du planerar att köra KDE-applikationer i Xfce. "
-"Det här kommer att göra att Xfce startar betydligt långsammare, men KDE-"
-"applikationer kommer att starta snabbare. Det är möjligt att vissa KDE-"
-"applikationer inte startar om du inte väljer den här inställningen."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Säkerhet"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Hantera fjärrapplikationer"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Inställningar för Sessioner och Uppstart"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Tillåt sessionshanteraren att hantera applikationer som inte körs på den "
-"lokala datorn. Välj inte den här inställningen om du inte vet vad du gör."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Sessioner och uppstart"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Allmänt"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Avancerat"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Sessioner och uppstart"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Ingen"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Inställningar för Startbilden"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Konfigurera"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Öppnar konfigurationspanelen för det valda startbildstemat"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Test"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Demonstrerar det valda startbildstemat"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Information"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Beskrivning:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Version:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Författare:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Hemsida:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Splashbild"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Lägg till program"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Kommando:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Välj kommando"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Kunde inte avlänka %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Kunde inte skapa filen %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Kunde inte skriva till filen %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Kunde inte öppna %s för skrivning"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Autostartade applikationer"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Nedan finns en lista på program som kommer att startas\n"
 "automatiskt då du logger in i Xfce, utöver de som sparades\n"
 "i din session förra gången du loggade ut:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Författare:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Kompatibilitet"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Beskrivning:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Hemsida:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Information"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Utloggningsinställningar"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Beskrivning:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Sessionskontroll"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Version:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Avancerat"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Spara session automatiskt vid utloggning"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Konfigurera"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Demonstrerar det valda startbildstemat"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Starta KDE-tjänster vid start"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Starta KDE-tjänster vid start"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Hantera fjärrapplikationer"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Öppnar konfigurationspanelen för det valda startbildstemat"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Demonstrerar det valda startbildstemat"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Sessioner och uppstart"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Visa sessionsväljare vid inloggning"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Allmänt"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Kräv bekräftelse vid utloggning"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Avsluta session"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Test"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Läser in skrivbordsinställningar"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Verifierar DNS-inställningar"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Läser in sessionsdata"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Välj sessionsnamn"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Logga ut"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Starta om"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Stäng av"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Spara session för framtida inloggningar"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Var god skriv in ditt lösenord:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Ett fel uppstod</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -421,15 +461,21 @@ msgstr "Ny session"
 msgid "Create a new session."
 msgstr "Skapa en ny session."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Startar Gnome-nyckelrings-daemonen"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Startar Gnomes Hjälpmedelsteknologier"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Startar KDE-tjänsterna"
 
@@ -459,6 +505,31 @@ msgstr "Fortsätt ändå"
 msgid "Try again"
 msgstr "Försök ändå"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Välj session"
@@ -471,88 +542,88 @@ msgstr "Välj sessionsnamn"
 msgid "Choose a name for the new session:"
 msgstr "Välj ett namn på den här nya sessionen:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Startar volymkontrollen"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Startar panelen"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Startar skrivbordshanteraren"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Startar aktivitetsfältet"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Startar fönsterhanteraren"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Startar Gnomes terminalemulator"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Startar KATE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Startar KDEs urklippshanterare"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Startar KDEs mejlklient"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Startar KDEs nyhetsklient"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Startar Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Startar Konsole"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Startar Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Startar The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Startar VIM"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Startar sessionshanterarproxyn"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Startar IRC-klienten X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Startar XMMS"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Startar xterm"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Startar %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -576,7 +647,7 @@ msgstr ""
 "autostartkatalog har migrerats till den nya platsen.Du kan ta bort den gamla "
 "autostartkatalog nu.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Autostartar..."
 
@@ -600,37 +671,104 @@ msgstr "Tips och trick"
 msgid "Next"
 msgstr "Nästa"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Inställningar för Sessioner och Uppstart"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Inställningar för Sessioner och Uppstart"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 Inställningar för Sessioner och Uppstart"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 Inställningar för Startbilden"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Autostartade Applikationer"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Redigera listan av autostartade applikationer"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Autostartade Applikationer"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Avsluta session"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Om du aktiverar den här inställningen kommer sessionsväljaren att väljas "
+#~ "varje gång du loggar in i Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Den här inställningen instruerar sessionshanteraren att spara sessionen "
+#~ "automatisk när du loggar ut. Om du inte väljer den här inställningen "
+#~ "kommer du att förfrågas om huruvida du vill spara sessionen vid varje "
+#~ "utloggning."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Den här inställningen aktiverar dialogen för bekräftelse av utloggning "
+#~ "Huruvida sessionen kommer att sparas eller inte då den här inställningen "
+#~ "inte är vald beror på om du har aktiverat automatiskt sparande av "
+#~ "sessionen eller inte."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Starta Gnome-tjänster vid start"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Välj den här inställningen om du använder Gnome-applikationer. Det kommer "
+#~ "att instruera sessionshanteraren att starta några viktiga Gnome-tjänster "
+#~ "för dig. Du ska också aktivera den här inställningen om du vill använda "
+#~ "hjälpmedelsteknologierna i Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Välj den här inställningen om du planerar att köra KDE-applikationer i "
+#~ "Xfce. Det här kommer att göra att Xfce startar betydligt långsammare, men "
+#~ "KDE-applikationer kommer att starta snabbare. Det är möjligt att vissa "
+#~ "KDE-applikationer inte startar om du inte väljer den här inställningen."
+
+#~ msgid "Security"
+#~ msgstr "Säkerhet"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Tillåt sessionshanteraren att hantera applikationer som inte körs på den "
+#~ "lokala datorn. Välj inte den här inställningen om du inte vet vad du gör."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Sessioner och uppstart"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Inställningar för Startbilden"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Splashbild"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Autostartade applikationer"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 Inställningar för Startbilden"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Autostartade Applikationer"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Redigera listan av autostartade applikationer"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Autostartade Applikationer"
diff --git a/po/ta.po b/po/ta.po
index 06c08f98..854b52f4 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2005-10-08 20:46+0900\n"
 "Last-Translator: Dinesh Nadarajah <dinesh_list@sbcglobal.net>\n"
 "Language-Team: Tamil <tamillinux-user@lists.sourceforge.net>\n"
@@ -77,300 +77,344 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr ""
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 #, fuzzy
 msgid "Configure Simple..."
 msgstr "கணிப்பொறியிலிருந்து வெளிச்செல்வதை உறுதிசெய்ய வேண்டும்"
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr ""
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr ""
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr ""
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr ""
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
+
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
+
+#: ../settings/main.c:44
 #, fuzzy
-msgid "Session chooser"
-msgstr "அமர்வு கட்டுப்பாடு"
+msgid "Version information"
+msgstr "ஊடாடுகிறது"
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
-#: ../settings/session/session.c:154
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
+
+#: ../settings/main.c:84
 #, fuzzy
-msgid "Logout settings"
-msgstr "அமர்விலிருந்து விலகு"
+msgid "Session Settings"
+msgstr "அமர்வு மேலாண்மை"
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "வெளிச்செல்லும்போது அமர்வு நிலையை சேமிக்கவும்"
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:100
+msgid "Internal Error"
 msgstr ""
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
 msgstr ""
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
 msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
 msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/xfae-dialog.c:130
+msgid "Description:"
 msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
 msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
 msgstr ""
 
-#: ../settings/session/session.c:273
+#: ../settings/xfae-model.c:558
+#, fuzzy, c-format
+msgid "Failed to unlink %s: %s"
+msgstr "சேவைப்பயனர் நகல்செய்ய முடியவில்லை: %s"
+
+#: ../settings/xfae-model.c:646
+#, fuzzy, c-format
+msgid "Failed to create file %s"
+msgstr "MCS சேவைப்பயனர் படைக்க முடியவில்லை"
+
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
+msgstr ""
+
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
+msgstr ""
+
+#: ../settings/xfae-window.c:102
 msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 
-#: ../settings/session/session.c:333
+#: ../settings/xfce4-session-settings.glade.h:1
 #, fuzzy
-msgid "Sessions and Startup"
-msgstr "அமர்வு மேலாண்மை"
+msgid "<b>Author:</b>"
+msgstr "எழுதியவர்:"
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "¦À¡ÐšɨÅ"
+#: ../settings/xfce4-session-settings.glade.h:2
+msgid "<b>Compatibility</b>"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
+#: ../settings/xfce4-session-settings.glade.h:5
 #, fuzzy
-msgid "Button Label|Sessions and Startup"
-msgstr "அமர்வு மேலாண்மை"
+msgid "<b>Information</b>"
+msgstr "ஊடாடுகிறது"
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "அமர்விலிருந்து விலகு"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "எழுதியவர்:"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "அமர்வு கட்டுப்பாடு"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
+#: ../settings/xfce4-session-settings.glade.h:10
+msgid "Ad_vanced"
 msgstr ""
 
-#: ../settings/splash/splash.c:457
+#: ../settings/xfce4-session-settings.glade.h:11
 #, fuzzy
-msgid "Configure"
-msgstr "கணிப்பொறியிலிருந்து வெளிச்செல்வதை உறுதிசெய்ய வேண்டும்"
+msgid "Automatically save session on _logout"
+msgstr "வெளிச்செல்லும்போது அமர்வு நிலையை சேமிக்கவும்"
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "கணிப்பொறியிலிருந்து வெளிச்செல்வதை உறுதிசெய்ய வேண்டும்"
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../settings/splash/splash.c:476
+#: ../settings/xfce4-session-settings.glade.h:14
 #, fuzzy
 msgid "Demonstrates the selected splash screen."
 msgstr "கொடாநிலை திரை தொடக்கம் ஓவியம்"
 
-#: ../settings/splash/splash.c:493
-#, fuzzy
-msgid "Information"
-msgstr "ஊடாடுகிறது"
+#: ../settings/xfce4-session-settings.glade.h:15
+msgid "Launch GN_OME services on startup"
+msgstr ""
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:16
+msgid "Launch _KDE services on startup"
 msgstr ""
 
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
+#: ../settings/xfce4-session-settings.glade.h:17
+msgid "Manage _remote applications"
 msgstr ""
 
-#: ../settings/splash/splash.c:532
-#, fuzzy
-msgid "<b>Author:</b>"
-msgstr "எழுதியவர்:"
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr ""
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
 #, fuzzy
-msgid "Button Label|Splash Screen"
-msgstr "திரை-தொடக்கம் ஓவிய தோற்றம்"
+msgid "Remove the selected application from the session."
+msgstr "கொடாநிலை திரை தொடக்கம் ஓவியம்"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
-msgstr ""
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+#, fuzzy
+msgid "Sessions and Startup"
+msgstr "அமர்வு மேலாண்மை"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
-msgid "Description:"
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:25
+msgid "_Display chooser on login"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "¦À¡ÐšɨÅ"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+msgid "_Prompt on logout"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, fuzzy, c-format
-msgid "Failed to unlink %s: %s"
-msgstr "சேவைப்பயனர் நகல்செய்ய முடியவில்லை: %s"
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "அமர்விலிருந்து வெளிச்செல்"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, fuzzy, c-format
-msgid "Failed to create file %s"
-msgstr "MCS சேவைப்பயனர் படைக்க முடியவில்லை"
+#: ../settings/xfce4-session-settings.glade.h:29
+msgid "_Test"
+msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
-msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../xfce4-session/main.c:145
 #, fuzzy
 msgid "Loading desktop settings"
 msgstr "அமர்விலிருந்து விலகு"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr ""
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 #, fuzzy
 msgid "Loading session data"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகின்றது..."
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "அமர்வு மேலாண்மை"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_எதிர்கால உள்நுழைவுக்கு அமர்வை சேமிக்கவும்"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -407,15 +451,21 @@ msgstr "அமர்விலிருந்து வெளிச்செல�
 msgid "Create a new session."
 msgstr "அமர்வு சேமிக்கவும்"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 #, fuzzy
 msgid "Starting KDE services"
 msgstr "%s தொடங்கப்படுகின்றது..."
@@ -442,6 +492,31 @@ msgstr ""
 msgid "Try again"
 msgstr ""
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 #, fuzzy
 msgid "Choose session"
@@ -456,98 +531,98 @@ msgstr ""
 msgid "Choose a name for the new session:"
 msgstr "அமர்வு சேமிக்கவும்"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 #, fuzzy
 msgid "Starting the Panel"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 #, fuzzy
 msgid "Starting the Desktop Manager"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 #, fuzzy
 msgid "Starting the Taskbar"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 #, fuzzy
 msgid "Starting the Window Manager"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 #, fuzzy
 msgid "Starting the KDE Clipboard Manager"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 #, fuzzy
 msgid "Starting the KDE Mail Reader"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 #, fuzzy
 msgid "Starting the KDE News Reader"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 #, fuzzy
 msgid "Starting the Konqueror"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 #, fuzzy
 msgid "Starting the KDE Terminal Emulator"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 #, fuzzy
 msgid "Starting the Session Management Proxy"
 msgstr "அமர்வு மேலாளர் தொடங்கப்படுகிறது..."
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, fuzzy, c-format
 msgid "Starting %s"
 msgstr "%s தொடங்கப்படுகின்றது..."
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -562,7 +637,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 #, fuzzy
 msgid "Performing Autostart..."
 msgstr "தானே தொடங்கப்படுகின்றது..."
@@ -587,42 +662,33 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 #, fuzzy
 msgid "Session and Startup Settings"
 msgstr "அமர்வு மேலாண்மை"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 #, fuzzy
 msgid "Sessions and Startup Settings"
 msgstr "அமர்வு மேலாண்மை"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 #, fuzzy
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "அமர்வு மேலாண்மை"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-#, fuzzy
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "திரை-தொடக்கம் ஓவிய தோற்றம்"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr ""
 
 #, fuzzy
-#~ msgid "End Session"
-#~ msgstr "அமர்விலிருந்து வெளிச்செல்"
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "அமர்வு மேலாண்மை"
+
+#, fuzzy
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "திரை-தொடக்கம் ஓவிய தோற்றம்"
+
+#, fuzzy
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "திரை-தொடக்கம் ஓவிய தோற்றம்"
diff --git a/po/tr.po b/po/tr.po
index 406e1eff..3101c0c8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-03-05 18:00+0200\n"
 "Last-Translator: Türker GÜLÜM <turker.gulum@linux.org.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -78,309 +78,351 @@ msgstr "Mice teması"
 msgid "Mice Splash Engine"
 msgstr "Mice Açılış Motoru"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Resim seç..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Basit'i Yapılandır..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Yazı Tipi"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Renkler"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Arka plan rengi:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Yazı rengi:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Resim"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Kişisel resim kullan"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple Teması"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Basit Başlangıç Ekranı Motoru"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Oturum seçici"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Girişte seçiciyi göster"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Ayarlandığında, Xfce'ye her girişinizde size seçmeniz için oturumlar "
-"gösterilecek."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Çıkış ayarları"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Çıkışta oturumu otomatik kaydet"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Bu seçenek oturum yöneticisinin çıkışta, mevcut oturumu otomatik olarak "
-"kaydetmesini sağlar. Eğer bu seçeneği seçmezseniz her çıkışta oturum "
-"kaydedilip edilmeyeceği size sorulur."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Çıkışta sor"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Bilgi"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Bu seçenek çıkış için onaylamayı kaldırır. Oturumun çıkışta kayıt edilmesi "
-"otomatik oturum kaydetmeyi seçip seçmediğinize bağlı olacaktır."
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Uyumluluk"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Başlangıçta Gnome hizmetlerini çalıştır"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Bu seçeneği Gnome uygulamaları kullanacaksanız etkinleştirin. Bu seçenek "
-"oturum yöneticisinin bazı önemli Gnome hizmetlerini çalıştırmasını sağlar. "
-"Bu seçeneği sadece Gnome ile birlikte gelen bazı Yardımcı Teknolojileri "
-"kullanmak istiyorsanız etkinleştirin."
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Başlangıçta KDE hizmetlerini çalıştır"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"KDE uygulamalarını Xfce Masaüstü Ortamı altında çalıştırmak istiyorsanız bu "
-"seçeneği etkinleştirin. Bu açılış sürecini uzatacaktır, diğer yandan KDE "
-"uygulamaları daha hızlı açılacaktır. Bazı KDE uygulamaları bu seçeneği "
-"etkinleştirmediğiniz sürece çalışmayabilir."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "Güvenlik"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Uzaktaki uygulamaları yönet"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Oturumlar ve Başlangıç Ayarları"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Oturum yöneticisinin uzak sistemlerde çalışan uygulamarı yönetmesine izin "
-"ver. Ne yaptığınızı bilmiyorsanız bu seçeneği etkinleştirmeyin."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Oturumlar ve Başlangıç"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Genel"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Gelişmiş"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Oturumlar ve Başlangıç"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Hiçbiri"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Açılış Ekranı Ayarları"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Yapılandır"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Seçilmiş açılış ekranı için yapılandırma penceresini açar."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Dene"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Seçilmiş olan açılış ekranını gösterir."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Bilgi"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Açıklama:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Sürüm:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Yazar:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Anasayfa:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Açılış ekranı"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Uygulama ekle"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "İsim:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Komut:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Bir komut seç"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Bağ oluşturulamadı: %s %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "%s dosyası oluşturulamadı"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "%s dosyasına yazma hatası"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "%s dosyasında yazmaya uygun açılamıyor"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Açılışta çalıştırılan uygulamalar"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Son çıkış yaptığınızda kayıt ettiğiniz uygulamalara ek olarak\n"
 "aşağıdaki listede bulunan uygulamalar Xfce masaüstüne\n"
 "giriş yaptığınızda otomatik olarak çalışacaktır:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Yazar:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Uyumluluk"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Açıklama:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Anasayfa:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Bilgi"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Çıkış ayarları"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Açıklama:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Oturum seçici"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Sürüm:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Gelişmiş"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Çıkışta oturumu otomatik kaydet"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Yapılandır"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Seçilmiş olan açılış ekranını gösterir."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Başlangıçta KDE hizmetlerini çalıştır"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Başlangıçta KDE hizmetlerini çalıştır"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Uzaktaki uygulamaları yönet"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Seçilmiş açılış ekranı için yapılandırma penceresini açar."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Seçilmiş olan açılış ekranını gösterir."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Oturumlar ve Başlangıç"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Girişte seçiciyi göster"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Genel"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Çıkışta sor"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Oturumu Sonlandır"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Dene"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Masaüstü ayarları yükleniyor"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS Ayarları Doğrulanıyor"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Oturum bilgisi yükleniyor"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Oturum ismi seç"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Çıkış"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Yeniden Başla"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Kapat"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Sonraki girişler için oturumu kaydet"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Lütfen parolanızı girin:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Bir hata oluştu</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -419,15 +461,21 @@ msgstr "Yeni oturum"
 msgid "Create a new session."
 msgstr "Yeni bir oturum oluştur."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Gnome Keyring Hizmeti Başlatılıyor"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Gnome Yardımcı Teknolojileri Başlatılıyor"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "KDE hizmetleri başlatılıyor"
 
@@ -456,6 +504,31 @@ msgstr "Yinede devam et"
 msgid "Try again"
 msgstr "Tekrar dene"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Oturum seç"
@@ -468,88 +541,88 @@ msgstr "Oturum ismi seç"
 msgid "Choose a name for the new session:"
 msgstr "Yeni oturum için isim seç:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Ses Denetleyici Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Panel başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Masaüstü Yöneticisi Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Görev Çubuğu Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Pencere Yöneticisi Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Gnome Terminal Emülatörü Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "KDE Gelişmiş Metin Düzenleyicisi Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "KDE Pano Yöneticisi Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "KDE Posta Okuyucu Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "KDE Haber Okuyucu Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Konqueror Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "KDE Terminal Emülatörü Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Beep Ortam Yürütücüsü Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Gimp Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI Improved Düzenleyicisi Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Oturum Yönetim Vekili Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "X-Chat IRC İstemcisi Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "X Multimedia System Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "X Terminal Emülatörü Başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s başlatılıyor"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -572,7 +645,7 @@ msgstr ""
 "taşınmıştır.\n"
 "Bu dizini artık silebilirsiniz.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Oto-Başlat Çalışıyor..."
 
@@ -596,37 +669,101 @@ msgstr "İpuçları ve İncelikler"
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Oturumlar ve Başlangıç Ayarları"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Oturumlar ve Başlangıç Ayarları"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 Oturumlar ve Başlangıç Ayarları"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 Açılış Ekranı Ayarları"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Açılışta Çalıştırılan Uygulamalar"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Açılışta çalışacak uygulamaların listesini düzenle"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 Açılışta Çalışacak Uygulamalar"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Oturumu Sonlandır"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Ayarlandığında, Xfce'ye her girişinizde size seçmeniz için oturumlar "
+#~ "gösterilecek."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Bu seçenek oturum yöneticisinin çıkışta, mevcut oturumu otomatik olarak "
+#~ "kaydetmesini sağlar. Eğer bu seçeneği seçmezseniz her çıkışta oturum "
+#~ "kaydedilip edilmeyeceği size sorulur."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Bu seçenek çıkış için onaylamayı kaldırır. Oturumun çıkışta kayıt "
+#~ "edilmesi otomatik oturum kaydetmeyi seçip seçmediğinize bağlı olacaktır."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Başlangıçta Gnome hizmetlerini çalıştır"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Bu seçeneği Gnome uygulamaları kullanacaksanız etkinleştirin. Bu seçenek "
+#~ "oturum yöneticisinin bazı önemli Gnome hizmetlerini çalıştırmasını "
+#~ "sağlar. Bu seçeneği sadece Gnome ile birlikte gelen bazı Yardımcı "
+#~ "Teknolojileri kullanmak istiyorsanız etkinleştirin."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "KDE uygulamalarını Xfce Masaüstü Ortamı altında çalıştırmak istiyorsanız "
+#~ "bu seçeneği etkinleştirin. Bu açılış sürecini uzatacaktır, diğer yandan "
+#~ "KDE uygulamaları daha hızlı açılacaktır. Bazı KDE uygulamaları bu "
+#~ "seçeneği etkinleştirmediğiniz sürece çalışmayabilir."
+
+#~ msgid "Security"
+#~ msgstr "Güvenlik"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Oturum yöneticisinin uzak sistemlerde çalışan uygulamarı yönetmesine izin "
+#~ "ver. Ne yaptığınızı bilmiyorsanız bu seçeneği etkinleştirmeyin."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Oturumlar ve Başlangıç"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Açılış Ekranı Ayarları"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Açılış ekranı"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Açılışta çalıştırılan uygulamalar"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 Açılış Ekranı Ayarları"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Açılışta Çalıştırılan Uygulamalar"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Açılışta çalışacak uygulamaların listesini düzenle"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 Açılışta Çalışacak Uygulamalar"
diff --git a/po/uk.po b/po/uk.po
index 8a59204e..898fa332 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-09 12:53+0000\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2008-07-01 22:22+0300\n"
 "Last-Translator: Dmitry Nikitin <luckas_fb@mail.ru>\n"
 "Language-Team: Ukrainian <xfce4-dev@xfce.org>\n"
@@ -119,261 +119,311 @@ msgstr "Проста"
 msgid "Simple Splash Engine"
 msgstr "Заставка \"Проста\""
 
-#: ../settings/session/session.c:135
-msgid "Session chooser"
-msgstr "Програма вибору сеансу"
-
-#: ../settings/session/session.c:140
-msgid "Display chooser on login"
-msgstr "Показувати вікно вибору при вході у систему"
-
-#: ../settings/session/session.c:148
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Якщо встановлено, менеджер сеансів буде відображати вікно вибору сеансу при "
-"кожному вході у Xfce."
 
-#: ../settings/session/session.c:152
-msgid "Logout settings"
-msgstr "Параметри виходу"
-
-#: ../settings/session/session.c:158
-msgid "Automatically save session on logout"
-msgstr "Автоматично зберігати сеанс при виході"
-
-#: ../settings/session/session.c:164
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Якщо цей параметри увімкнений, при кожному виході з системи сеанс буде "
-"автоматично зберігатись. Якщо цей параметр вимкнений, при кожному виході з "
-"сеансу ви зможете вибрати, чи слід зберігати сеанс."
 
-#: ../settings/session/session.c:171
-msgid "Prompt on logout"
-msgstr "Запит при виході"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Інформація"
 
-#: ../settings/session/session.c:177
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Цей параметр вимикає діалогове вікно підтвердження виходу з сеансу. Сеанс "
-"буде зберігатись в залежності від того, чи увімкнено автоматичне збереження "
-"сеансів."
 
-#: ../settings/session/session.c:213
-msgid "Compatibility"
-msgstr "Сумісність"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:222
-msgid "Launch Gnome services on startup"
-msgstr "Запускати служби Gnome при вході у сеанс"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:228
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
-msgstr ""
-"Увімкніть цей параметр, якщо плануєте використовувати програми середовища "
-"Gnome. Тоді менеджер сеансів буде автоматично запускати основні служби "
-"Gnome. Також слід увімкнути цей параметр для використання допоміжних "
-"технологій середовища Gnome."
-
-#: ../settings/session/session.c:235
-msgid "Launch KDE services on startup"
-msgstr "Запускати служби KDE при вході у сеанс"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Сеанси та запуск"
 
-#: ../settings/session/session.c:241
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Увімкніть цей параметр, якщо плануєте використовувати програми середовища "
-"KDE. ТЦе значно збільшить час запускання Xfce, але програми KDE будуть "
-"запускатись швидше. Деякі програми KDE не зможуть працювати, якщо ви не "
-"увімкнете цей параметр."
-
-#: ../settings/session/session.c:254
-msgid "Security"
-msgstr "Безпека"
-
-#: ../settings/session/session.c:259
-msgid "Manage remote applications"
-msgstr "Керувати віддаленими програмами"
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:271
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:100
+msgid "Internal Error"
 msgstr ""
-"Дозволяє менеджеру сеансів керувати програмами, що запущені на віддалених "
-"комп'ютерах. Якщо ви не впевнені, у тому що ви робите, не вмикайте цей "
-"параметр."
 
-#: ../settings/session/session.c:307
-msgid "Sessions and Startup"
-msgstr "Сеанси та запуск"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:321
-msgid "General"
-msgstr "Загальні"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#: ../settings/session/session.c:327
-msgid "Advanced"
-msgstr "Додаткові"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:307 ../settings/splash/splash.c:310
-#: ../settings/splash/splash.c:313 ../settings/splash/splash.c:316
-#: ../settings/splash/splash.c:384
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Немає"
 
-#: ../settings/splash/splash.c:407
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Параметри заставки"
-
-#: ../settings/splash/splash.c:455
-msgid "Configure"
-msgstr "Налаштувати"
-
-#: ../settings/splash/splash.c:463
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Відкриває діалогове вікно вибраної заставки."
-
-#: ../settings/splash/splash.c:467
-msgid "Test"
-msgstr "Перевірити"
-
-#: ../settings/splash/splash.c:474
-msgid "Demonstrates the selected splash screen."
-msgstr "Перевіряє вибрану заставку."
-
-#: ../settings/splash/splash.c:491
-msgid "Information"
-msgstr "Інформація"
-
-#: ../settings/splash/splash.c:502
-msgid "<b>Description:</b>"
-msgstr "<b>Опис:</b>"
-
-#: ../settings/splash/splash.c:516
-msgid "<b>Version:</b>"
-msgstr "<b>Версія:</b>"
-
-#: ../settings/splash/splash.c:530
-msgid "<b>Author:</b>"
-msgstr "<b>Автор:</b>"
-
-#: ../settings/splash/splash.c:544
-msgid "<b>Homepage:</b>"
-msgstr "<b>Домашня сторінка:</b>"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Додати програму"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Назва:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Команда:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Виберіть команду"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Не вдається видалити %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Не вдається створити файл %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Не вдається записати файл %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Не вдається відкрити файл %s для запису"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Автозапуск"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Нижче розташований список програм, які будуть\n"
 "запущені автоматично на початку сеансу, додатково до\n"
 "програм, які були збережені під час останнього\n"
 "завершення сеансу:"
 
-#: ../xfce4-session/main.c:139
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Автор:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Сумісність"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Опис:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Домашня сторінка:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Інформація"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Параметри виходу"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Опис:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Програма вибору сеансу"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Версія:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Додаткові"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Автоматично зберігати сеанс при виході"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Налаштувати"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Перевіряє вибрану заставку."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Запускати служби KDE при вході у сеанс"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Запускати служби KDE при вході у сеанс"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Керувати віддаленими програмами"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Відкриває діалогове вікно вибраної заставки."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Перевіряє вибрану заставку."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Сеанси та запуск"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Показувати вікно вибору при вході у систему"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Загальні"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Запит при виході"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Новий сеанс"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Перевірити"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Завантаження параметрів робочого столу"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:199
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Перевірка параметрів DNS"
 
-#: ../xfce4-session/main.c:202
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Завантаження відомостей про сеанс"
 
-#: ../xfce4-session/shutdown.c:336
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Виберіть назву сеансу"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Вийти"
 
-#: ../xfce4-session/shutdown.c:361
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Перезавантажити"
 
-#: ../xfce4-session/shutdown.c:386
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Вимкнути"
 
-#: ../xfce4-session/shutdown.c:394
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "З_берегти сеанс"
 
-#: ../xfce4-session/shutdown.c:457
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Введіть пароль:"
 
-#: ../xfce4-session/shutdown.c:488
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>Сталася помилка  </b>"
 
-#: ../xfce4-session/shutdown.c:502
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -412,15 +462,21 @@ msgstr "Новий сеанс"
 msgid "Create a new session."
 msgstr "Створити новий сеанс."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Запуск служби Gnome Keyring"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Запуск допоміжних технологій Gnome"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Запуск служб KDE"
 
@@ -449,6 +505,31 @@ msgstr "Продовжити"
 msgid "Try again"
 msgstr "Повторити спробу"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Виберіть сеанс"
@@ -461,88 +542,88 @@ msgstr "Виберіть назву сеансу"
 msgid "Choose a name for the new session:"
 msgstr "Виберіть назву нового сеансу:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Запуск регулятора гучності"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Запуск панелі"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Запуск менеджера робочого столу"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Запуск панелі задач"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Запуск віконного менеджера"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Запуск емулятора термінала Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Запуск розширеного текстового редактора KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Запуск буфера обміну KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Запуск програми читання пошти для KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Запуск програми читання новин для KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Запуск Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Запуск емулятора термінала KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Запуск музичного програвача Bmp"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Запуск Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Запуск текстового редактора VI"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Запуск проксі для керування сеансами"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Запуск IRC-клієнта X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Запуск програвача XMMS"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Запуск емулятора термінала xterm"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Запуск %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -567,7 +648,7 @@ msgstr ""
 "\n"
 "Тепер ви маєте видалити старий каталог.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Автозавантаження програм..."
 
@@ -591,36 +672,97 @@ msgstr "Корисні поради"
 msgid "Next"
 msgstr "Далі"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Сеанси та запуск"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Сеанси та запуск"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Параметри сеансів та запуску Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Параметри заставки Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Автозапуск"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Редагувати список програм, що запускаються автоматично"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Програми, що запускаються при старті Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "підказки xfce4"
 
-
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Якщо встановлено, менеджер сеансів буде відображати вікно вибору сеансу "
+#~ "при кожному вході у Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Якщо цей параметри увімкнений, при кожному виході з системи сеанс буде "
+#~ "автоматично зберігатись. Якщо цей параметр вимкнений, при кожному виході "
+#~ "з сеансу ви зможете вибрати, чи слід зберігати сеанс."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Цей параметр вимикає діалогове вікно підтвердження виходу з сеансу. Сеанс "
+#~ "буде зберігатись в залежності від того, чи увімкнено автоматичне "
+#~ "збереження сеансів."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Запускати служби Gnome при вході у сеанс"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Увімкніть цей параметр, якщо плануєте використовувати програми середовища "
+#~ "Gnome. Тоді менеджер сеансів буде автоматично запускати основні служби "
+#~ "Gnome. Також слід увімкнути цей параметр для використання допоміжних "
+#~ "технологій середовища Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Увімкніть цей параметр, якщо плануєте використовувати програми середовища "
+#~ "KDE. ТЦе значно збільшить час запускання Xfce, але програми KDE будуть "
+#~ "запускатись швидше. Деякі програми KDE не зможуть працювати, якщо ви не "
+#~ "увімкнете цей параметр."
+
+#~ msgid "Security"
+#~ msgstr "Безпека"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Дозволяє менеджеру сеансів керувати програмами, що запущені на віддалених "
+#~ "комп'ютерах. Якщо ви не впевнені, у тому що ви робите, не вмикайте цей "
+#~ "параметр."
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Параметри заставки"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Автозапуск"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Параметри заставки Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Автозапуск"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Редагувати список програм, що запускаються автоматично"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Програми, що запускаються при старті Xfce 4"
diff --git a/po/ur.po b/po/ur.po
index 70f8fb51..ea11ef8b 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-10-28 19:49+0200\n"
 "Last-Translator: Muhammad Ali Makki <makki.ma@gmai.com>\n"
 "Language-Team: Urdu <makki.ma@gmai.com>\n"
@@ -28,8 +28,12 @@ msgstr "تنصیب کے لیے تھیم فائل منتخب کریں..."
 
 #: ../engines/balou/config.c:333
 #, c-format
-msgid "Unable to install splash theme from file %s, please check that the file is a valid splash theme archive."
-msgstr "فائل %s سے سپلیش تھیم نصب نہیں ہوسکتی، برائے مہربانی چیک کریں کہ یہ فائل موزوں سپلیش تھیم محفوظہ ہے."
+msgid ""
+"Unable to install splash theme from file %s, please check that the file is a "
+"valid splash theme archive."
+msgstr ""
+"فائل %s سے سپلیش تھیم نصب نہیں ہوسکتی، برائے مہربانی چیک کریں کہ یہ فائل "
+"موزوں سپلیش تھیم محفوظہ ہے."
 
 #: ../engines/balou/config.c:386
 #, c-format
@@ -76,278 +80,357 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice سپلیش انجن"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "تصویر منتخب کریں..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "سادہ وضع کریں..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "فونٹ"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "رنگ"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "پس منظر رنگ:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "متن رنگ:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "تصویر"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "صوابدیدی تصویر استعمال کریں"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "سادہ"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "سادہ سپلیش انجن"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "نشست منتخب کار"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "لاگ ان پر منتخب کار ظاہر کریں"
-
-#: ../settings/session/session.c:150
-msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce."
-msgstr "اگر منتخب کیا گیا تو نشست منیجر ہر بار ایکسفس میں لاگ ان ہونے پر نشست کا پوچھے گا."
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "لاگ آؤٹ ترتیبات"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "لاگ آؤٹ ہونے پر نشست خودکار محفوظ کریں"
-
-#: ../settings/session/session.c:166
-msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout."
-msgstr "یہ آپشن نشست منیجر کو ہدایت دیتا ہے کہ وہ آپ کے لاگ آؤٹ ہونے پر نشست کو خودکار طور پر محفوظ کرلے. اگر آپ اسے منتخب نہیں کرتے تو ہر بار لاگ آؤٹ ہونے پر آپ سے نشست کی محفوظگی کے بارے میں پوچھا جائے گا."
-
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "لاگ آؤٹ ہونے پر پوچھیں"
-
-#: ../settings/session/session.c:179
-msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not."
-msgstr "یہ آپشن لاگ آؤٹ تصدیقی ڈائیلاگ کو معطل کردے گا. نشست کی محفوظگی کا انحصار آپ کی ترتیبات پر ہے."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "موافقت"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
+msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "سٹارٹ اپ میں گنوم کی خدمات چلائیں"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
+msgstr ""
 
-#: ../settings/session/session.c:230
-msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome."
-msgstr "اگر آپ گنوم کے اطلاقیے استعمال کرنے چاہتے ہیں تو اسے فعال کردیں. یہ نشست منیجر کو آگاہ کردے گا کہ وہ آپ کے لیے گنوم کی بنیادی خدمات چلادے. گنوم کی معاون ٹیکنالوچیز کے استعمال کے لیے بھی اسے فعال رکھیں."
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "معلومات"
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "سٹارٹ اپ میں کیڈی کی خدمات چلائیں"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option."
-msgstr "اگر آپ اپنے ایکسفس نشست میں کیڈی کے اطلاقیے استعمال کرنا چاہتے ہیں تو اسے فعال کردیں، یہ نہ صرف سٹارٹ اپ کو تیز کرے گا بلکہ کیڈی کے اطلاقیے بھی تیزی سے چلنے لگیں گے، اگر آپ اسے فعال نہیں کریں گے تو ہوسکتا ہے کہ کیڈی کے بعض اطلاقیے چلنے سے ہی انکار کردیں اور موج ہوجائے."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
+msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "سیکورٹی"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "بعید اطلاقیوں کی ادارت کریں"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "نشست اور سٹارٹ اپ ترتیبات"
 
-#: ../settings/session/session.c:273
-msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing."
-msgstr "نشست منیجر کو یہ صلاحیت دیتا ہے کہ وہ بعید ہوسٹ میں چلنے والے اطلاقیوں کی ادرات کرسکے. اگر آپ کو نہیں معلوم کہ آپ کیا کرنے جارہے ہیں تو اسے فعال مت کریں."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
+msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "نشست اور سٹارٹ اپ"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "عام"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "اعلی"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "نشست اور ابتدائیہ"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309
-#: ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315
-#: ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "کچھ نہیں"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "سپلیش سکرین کی ترتیبات"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "وضع کریں"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "منتخب کردہ سپلیش سکرین کی وضع قطع پینل کھولیں."
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "تجربہ کریں"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "منتخب کردہ سپلیش سکرین کا مظاہرہ دیکھیں."
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "معلومات"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>تفصیل:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>ورژن</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>مالک:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>ہوم پیج:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "سپلیش سکرین"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "اطلاقیہ شامل کریں"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "نام:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "تفصیل:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "کمانڈ:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "کمانڈ منتخب کریں"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "غیر مربوط کرنے میں ناکامی %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "فائل %s بنانے میں ناکامی"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "فائل %s لکھنے میں ناکامی"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "لکھنے کے لیے %s کو کھولنے میں ناکامی"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "خودکار چلنے والے اطلاقیے"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "ذیل میں ان اطلاقیوں کی فہرست ہے جو آپ کے\n"
 "ایکسفس میں لاگ ان ہوتے ہی خودکار طور پر چل\n"
 "جائیں گے اس میں وہ اطلاقیے بھی شامل ہیں جو\n"
 "آخری بار لاگ آؤٹ کے وقت آپ نے محفوظ کیے تھے:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>مالک:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "موافقت"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>تفصیل:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>ہوم پیج:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "معلومات"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "لاگ آؤٹ ترتیبات"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>تفصیل:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "نشست منتخب کار"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>ورژن</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "اعلی"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "لاگ آؤٹ ہونے پر نشست خودکار محفوظ کریں"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "وضع کریں"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "منتخب کردہ سپلیش سکرین کا مظاہرہ دیکھیں."
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "سٹارٹ اپ میں کیڈی کی خدمات چلائیں"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "سٹارٹ اپ میں کیڈی کی خدمات چلائیں"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "بعید اطلاقیوں کی ادارت کریں"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "منتخب کردہ سپلیش سکرین کی وضع قطع پینل کھولیں."
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "منتخب کردہ سپلیش سکرین کا مظاہرہ دیکھیں."
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "نشست اور سٹارٹ اپ"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "لاگ ان پر منتخب کار ظاہر کریں"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "عام"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "لاگ آؤٹ ہونے پر پوچھیں"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "نئی نشست"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "تجربہ کریں"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "ڈیسک ٹاپ کی ترتیبات لوڈ کی جارہی ہیں"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "DNS ترتیبات کی تصدیق جاری ہے"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "نشست ڈیٹا لوڈ کیا جارہا ہے"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "نشست کا نام"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "لاگ آؤٹ"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "پھر چلائیں"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "بند کریں"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "دوبارہ لاگ ان کے لیے ن_شست محفوظ کریں"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "اپنا پاس ورڈ لکھیں:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr "<b>کوئی غلطی ہوئی ہے</b>"
 
-#: ../xfce4-session/shutdown.c:496
-msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account."
-msgstr "ممکن ہے کہ آپ نے جو پاس ورڈ فراہم کیا ہے وہ غلط ہو، یا نظام کے مدیر نے آپ کے اکاؤنٹ سے نظام کو بند کرنے پر پابندی عائد کر رکھی ہو."
+#: ../xfce4-session/shutdown.c:504
+msgid ""
+"Either the password you entered is invalid, or the system administrator "
+"disallows shutting down this computer with your user account."
+msgstr ""
+"ممکن ہے کہ آپ نے جو پاس ورڈ فراہم کیا ہے وہ غلط ہو، یا نظام کے مدیر نے آپ کے "
+"اکاؤنٹ سے نظام کو بند کرنے پر پابندی عائد کر رکھی ہو."
 
 #: ../xfce4-session/xfsm-chooser.c:120
 #, c-format
@@ -355,8 +438,11 @@ msgid "Last accessed: %s"
 msgstr "آخری رسائی: %s"
 
 #: ../xfce4-session/xfsm-chooser.c:213
-msgid "Choose the session you want to restore. You can simply double-click the session name to restore it."
-msgstr "ری سٹور کرنے کے لیے نشست منتخب کریں، اس کے لیے نشست کے نام پر دہرا کلک کریں."
+msgid ""
+"Choose the session you want to restore. You can simply double-click the "
+"session name to restore it."
+msgstr ""
+"ری سٹور کرنے کے لیے نشست منتخب کریں، اس کے لیے نشست کے نام پر دہرا کلک کریں."
 
 #. "Logout" button
 #: ../xfce4-session/xfsm-chooser.c:239
@@ -376,15 +462,21 @@ msgstr "نئی نشست"
 msgid "Create a new session."
 msgstr "نئی نشست بنائیں."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "گنوم کا Keyring Daemon چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "گنوم کی معاون ٹیکنالوجیز چلائی جارہی ہیں"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "کیڈی کی خدمات چلائی جارہی ہیں"
 
@@ -413,6 +505,31 @@ msgstr "ہر حال میں آگے بڑھیں"
 msgid "Try again"
 msgstr "دوبارہ کوشش"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "نشست منتخب کریں"
@@ -425,88 +542,88 @@ msgstr "نشست کا نام"
 msgid "Choose a name for the new session:"
 msgstr "نئی نشست کا نام منتخب کریں:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "والیم کنٹرولر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "پینل چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "ڈیسک ٹاپ منیجر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "ٹاسک بار چلائی جارہی ہے"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "ونڈوز منیجر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "گنوم کا ٹرمنل ایمولیٹر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "کیڈی کا اعلی متن مدون چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "کیڈی کا کلپ بورڈ منیجر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "کیڈی کا میل ریڈر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "کیڈی کا نیوز ریڈر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "کنکرر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "کیڈی کا ٹرمنل ایمولیٹر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "بیپ میڈیا پلیئر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "گمپ چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "VI Improved مدون چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "نشست ادارت پراکسی چلائی جارہی ہے"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "ایکس چیٹ IRC کلائنٹ چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "ایکس ملٹی میڈیا نظام چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "ایکس ٹرمنل ایمولیٹر چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "%s کو چلایا جارہا ہے"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -531,17 +648,15 @@ msgstr ""
 "کردی گئیں ہیں.\n"
 "آپ کو چاہیے کہ یہ ڈائریکٹری فوراً حذف کردیں.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "خودکار چلایا جارہا ہے..."
 
-#: ../xfce4-tips/main.c:47
-#: ../xfce4-tips/main.c:161
+#: ../xfce4-tips/main.c:47 ../xfce4-tips/main.c:161
 msgid "Tips and Tricks"
 msgstr "ٹِپ اور ٹِرکس"
 
-#: ../xfce4-tips/main.c:48
-#: ../xfce4-tips/main.c:205
+#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:205
 msgid "Fortunes"
 msgstr "Fortunes"
 
@@ -549,8 +664,7 @@ msgstr "Fortunes"
 msgid "Display tips on _startup"
 msgstr "چلانے پر ٹِپ د_کھائیں"
 
-#: ../xfce4-tips/main.c:199
-#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
+#: ../xfce4-tips/main.c:199 ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1
 msgid "Tips and tricks"
 msgstr "ٹِپ اور ٹِرکس"
 
@@ -558,35 +672,101 @@ msgstr "ٹِپ اور ٹِرکس"
 msgid "Next"
 msgstr "اگلا"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "نشست اور سٹارٹ اپ ترتیبات"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "نشست اور سٹارٹ اپ ترتیبات"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "ایکسفس 4 نشست اور سٹارٹ اپ ترتیبات"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "ایکسفس 4 سپلیش سکرین ترتیبات"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "خودکار چلنے والے اطلاقیے"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "خودکار چلنے والے اطلاقیوں کی فہرست مدون کریں"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "ایکسفس 4 خودکار چلنے والے اطلاقیے"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "ایکسفس4-ٹِپس"
 
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "اگر منتخب کیا گیا تو نشست منیجر ہر بار ایکسفس میں لاگ ان ہونے پر نشست کا "
+#~ "پوچھے گا."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "یہ آپشن نشست منیجر کو ہدایت دیتا ہے کہ وہ آپ کے لاگ آؤٹ ہونے پر نشست کو "
+#~ "خودکار طور پر محفوظ کرلے. اگر آپ اسے منتخب نہیں کرتے تو ہر بار لاگ آؤٹ "
+#~ "ہونے پر آپ سے نشست کی محفوظگی کے بارے میں پوچھا جائے گا."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "یہ آپشن لاگ آؤٹ تصدیقی ڈائیلاگ کو معطل کردے گا. نشست کی محفوظگی کا انحصار "
+#~ "آپ کی ترتیبات پر ہے."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "سٹارٹ اپ میں گنوم کی خدمات چلائیں"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "اگر آپ گنوم کے اطلاقیے استعمال کرنے چاہتے ہیں تو اسے فعال کردیں. یہ نشست "
+#~ "منیجر کو آگاہ کردے گا کہ وہ آپ کے لیے گنوم کی بنیادی خدمات چلادے. گنوم کی "
+#~ "معاون ٹیکنالوچیز کے استعمال کے لیے بھی اسے فعال رکھیں."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "اگر آپ اپنے ایکسفس نشست میں کیڈی کے اطلاقیے استعمال کرنا چاہتے ہیں تو اسے "
+#~ "فعال کردیں، یہ نہ صرف سٹارٹ اپ کو تیز کرے گا بلکہ کیڈی کے اطلاقیے بھی "
+#~ "تیزی سے چلنے لگیں گے، اگر آپ اسے فعال نہیں کریں گے تو ہوسکتا ہے کہ کیڈی "
+#~ "کے بعض اطلاقیے چلنے سے ہی انکار کردیں اور موج ہوجائے."
+
+#~ msgid "Security"
+#~ msgstr "سیکورٹی"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "نشست منیجر کو یہ صلاحیت دیتا ہے کہ وہ بعید ہوسٹ میں چلنے والے اطلاقیوں کی "
+#~ "ادرات کرسکے. اگر آپ کو نہیں معلوم کہ آپ کیا کرنے جارہے ہیں تو اسے فعال مت "
+#~ "کریں."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "نشست اور ابتدائیہ"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "سپلیش سکرین کی ترتیبات"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "سپلیش سکرین"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "خودکار چلنے والے اطلاقیے"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "ایکسفس 4 سپلیش سکرین ترتیبات"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "خودکار چلنے والے اطلاقیے"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "خودکار چلنے والے اطلاقیوں کی فہرست مدون کریں"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "ایکسفس 4 خودکار چلنے والے اطلاقیے"
diff --git a/po/vi.po b/po/vi.po
index 9977c685..3869462c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-09-05 02:09+0400\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi82@gmail.com>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -81,310 +81,352 @@ msgstr "Chú chuột"
 msgid "Mice Splash Engine"
 msgstr "Hình ảnh khởi động Chú chuột"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "Chọn hình ảnh..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "Cấu hình Đơn giản..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "Phông"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "Màu sắc"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "Màu nền:"
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "Màu chữ:"
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "Hình ảnh"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "Dùng hình ảnh riêng"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Đơn giản"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Khởi động đơn giản"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "Trình chọn phiên"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "Hiển thị trình chọn khi đăng nhập"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"Nếu được thiết lập, trình quản lí phiên làm việc sẽ yêu cầu bạn chọn phiên  "
-"làm việc mỗi khi đăng nhập vào Xfce."
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "Các thiết lập đăng xuất"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "Tự động lưu phiên làm việc khi đăng xuất"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"Tuỳ chọn này hướng dẫn trình quản lí phiên tự động lưu phiên hiện tại khi "
-"bạn đăng xuất. Nếu bạn không chọn tuỳ chọn này bạn sẽ được nhắc có lưu phiên "
-"hiện tại ở mỗi lần đăng xuất."
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "Nhắc khi đăng xuất"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "Thông tin"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"Tuỳ chọn này bất hoạt hộp thoại xác nhận đăng xuất. Phiên làm việc có được "
-"lưu hay không tuỳ thuộc vào bạn có bật chức năng tự động lưu phiên làm việc "
-"khi đăng xuất hay không."
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "Tương thích"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "Gọi các dịch vụ Gnome khi khởi động"
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"Bật tính năng này nếu bạn định dùng các ứng dụng Gnome. Nó sẽ hướng dẫn "
-"trình quản lí phiên khởi động một số dịch vụ Gnome cần thiết. Bạn cũng nên "
-"bật tính năng này nếu bạn muốn dùng Assistive Technologies đi kèm với Gnome."
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "Gọi các dịch vụ KDE khi khởi dộng"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
-msgstr ""
-"Bật tuỳ chọn này nếu bạn định chạy các ứng dụng KDE trong phiên desktop "
-"Xfce. Nó sẽ làm kéo dài thời gian khởi dộng, nhưng bù lại, các ứng dụng KDE "
-"sẽ khởi dộng nhanh hơn.Một số ứng dụng KDE có thể không hoạt động nếu bạn "
-"không bật tuỳ chọn này."
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "An ninh"
-
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "Quản lí các ứng dụng từ xa"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "Thiết lập buổi làm việc và khởi động"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"Cho phép trình quản lí phiên quản lí các ứng dụng chạy trên các host ở xa. "
-"Đừng bật tuỳ chọn này trừ khi bạn hiểu rõ điều bạn đang làm."
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "Phiên và Khởi động"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "Tổng quát"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "Cao cấp"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "Phiên và Khởi động"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "Không"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "Các thiết lập màn hình splash"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "Cấu hình"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "Mở panel cấu hình cho màn hình splash được chọn"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "Thử"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "Biểu thị màn hình splash được chọn"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "Thông tin"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>Miêu tả:</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>Phiên bản:</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>Tác giả:</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>Trang nhà:</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "Màn hình khởi động splash"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "Thêm ứng dụng"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "Tên:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "Mô tả:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "Câu lệnh:"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "Chọn một câu lệnh"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "Không bỏ được liên kết %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "Không tạo được tập tin %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Không ghi được tập tin %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "Không mở được %s để ghi"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "Các ứng dụng chạy khi khởi động"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "Dưới đây là danh sách những ứng dụng sẽ tự động\n"
 "chạy khi người dùng đăng nhập vào Xfce, không kể\n"
 "đến những ứng dụng người dùng đã ghi nhớ khi\n"
 "thoát ra lần cuối:"
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>Tác giả:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "Tương thích"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>Miêu tả:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>Trang nhà:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "Thông tin"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "Các thiết lập đăng xuất"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>Miêu tả:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "Trình chọn phiên"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>Phiên bản:</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "Cao cấp"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "Tự động lưu phiên làm việc khi đăng xuất"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "Cấu hình"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "Biểu thị màn hình splash được chọn"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "Gọi các dịch vụ KDE khi khởi dộng"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "Gọi các dịch vụ KDE khi khởi dộng"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "Quản lí các ứng dụng từ xa"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "Mở panel cấu hình cho màn hình splash được chọn"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "Biểu thị màn hình splash được chọn"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "Phiên và Khởi động"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "Hiển thị trình chọn khi đăng nhập"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "Tổng quát"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "Nhắc khi đăng xuất"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "Kết thúc buổi làm việc"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "Thử"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "Tải các thiết lập desktop"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "Xác nhậ các thiết lập DNS"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "Tải các dữ liệu phiên"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "Chọn tên phiên"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "Thoát ra"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "Khởi động lại"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "Tắt máy"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "_Lưu phiên cho lần đăng nhập sau"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "Vui lòng nhập lại mật khẩu:"
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>Xảy ra lỗi</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -423,15 +465,21 @@ msgstr "Phiên mới"
 msgid "Create a new session."
 msgstr "Tạo phiên mới."
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "Khởi dộng Gnome Keyring Daemon"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "Khởi dộng Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "Khởi động các dịch vụ KDE"
 
@@ -460,6 +508,31 @@ msgstr "Dù sao thì vẫn tiếp tục"
 msgid "Try again"
 msgstr "Thử lại"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "Đóng phiên"
@@ -472,88 +545,88 @@ msgstr "Chọn tên phiên"
 msgid "Choose a name for the new session:"
 msgstr "Chọn tên cho phiên mới:"
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "Khởi động Bàn điều khiển âm lượng"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "Khởi dộng Panel"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "Khởi động Trình quản lí desktop"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "Khởi động Thanh tác vụ"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "Khởi động Trình quản lí cửa sổ"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "Khởi động Trình giả lập trạm cuối Gnome"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "Khởi động Trình soạn thảo văn bản cao cấp KDE"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "Khởi động Trình quản lí clipboard KDE"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "Khởi động Trình đọc thư KDE"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "Khởi động Trình đọc tin KDE"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "Khởi động Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "Khởi động Trình giả lập trạm cuối KDE"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "Khởi động Beep Media Player"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "Khởi động Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "Khỏi động VI Improved Editor"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "Khởi động Proxy quản lí phiên"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "Khởi động Trạm khách IRC X-Chat"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "Khởi động X Multimedia System"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "Khởi động Trình giả lập trạm cuối X"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "Khởi động %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -577,7 +650,7 @@ msgstr ""
 "autostart cũ được nhập thành công tới vị trí mới.\n"
 "Có thể xóa thư mục cũ này.\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "Thực hiện Autostart..."
 
@@ -601,37 +674,102 @@ msgstr "Thủ thuật và mách nước"
 msgid "Next"
 msgstr "Tiếp theo"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "Thiết lập buổi làm việc và khởi động"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "Thiết lập buổi làm việc và khởi động"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Thiết lập buổi làm việc và khởi động Xfce 4"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Thiết lập màn hình khởi động Xfce 4"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "Các ứng dụng chạy khi khởi động"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "Sửa danh sách các ứng dụng chạy khi khởi động"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Các ứng dụng chạy khi khởi động của Xfce 4"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-tips"
 
-#~ msgid "End Session"
-#~ msgstr "Kết thúc buổi làm việc"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "Nếu được thiết lập, trình quản lí phiên làm việc sẽ yêu cầu bạn chọn "
+#~ "phiên  làm việc mỗi khi đăng nhập vào Xfce."
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "Tuỳ chọn này hướng dẫn trình quản lí phiên tự động lưu phiên hiện tại khi "
+#~ "bạn đăng xuất. Nếu bạn không chọn tuỳ chọn này bạn sẽ được nhắc có lưu "
+#~ "phiên hiện tại ở mỗi lần đăng xuất."
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "Tuỳ chọn này bất hoạt hộp thoại xác nhận đăng xuất. Phiên làm việc có "
+#~ "được lưu hay không tuỳ thuộc vào bạn có bật chức năng tự động lưu phiên "
+#~ "làm việc khi đăng xuất hay không."
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "Gọi các dịch vụ Gnome khi khởi động"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "Bật tính năng này nếu bạn định dùng các ứng dụng Gnome. Nó sẽ hướng dẫn "
+#~ "trình quản lí phiên khởi động một số dịch vụ Gnome cần thiết. Bạn cũng "
+#~ "nên bật tính năng này nếu bạn muốn dùng Assistive Technologies đi kèm với "
+#~ "Gnome."
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "Bật tuỳ chọn này nếu bạn định chạy các ứng dụng KDE trong phiên desktop "
+#~ "Xfce. Nó sẽ làm kéo dài thời gian khởi dộng, nhưng bù lại, các ứng dụng "
+#~ "KDE sẽ khởi dộng nhanh hơn.Một số ứng dụng KDE có thể không hoạt động nếu "
+#~ "bạn không bật tuỳ chọn này."
+
+#~ msgid "Security"
+#~ msgstr "An ninh"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "Cho phép trình quản lí phiên quản lí các ứng dụng chạy trên các host ở "
+#~ "xa. Đừng bật tuỳ chọn này trừ khi bạn hiểu rõ điều bạn đang làm."
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "Phiên và Khởi động"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "Các thiết lập màn hình splash"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "Màn hình khởi động splash"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "Các ứng dụng chạy khi khởi động"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Thiết lập màn hình khởi động Xfce 4"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "Các ứng dụng chạy khi khởi động"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "Sửa danh sách các ứng dụng chạy khi khởi động"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Các ứng dụng chạy khi khởi động của Xfce 4"
diff --git a/po/xfce4-session.pot b/po/xfce4-session.pot
index a406a93d..e39c38ae 100644
--- a/po/xfce4-session.pot
+++ b/po/xfce4-session.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-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"
@@ -76,288 +76,326 @@ msgstr ""
 msgid "Mice Splash Engine"
 msgstr ""
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr ""
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr ""
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr ""
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr ""
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr ""
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr ""
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr ""
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr ""
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr ""
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
 
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
 
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:44
+msgid "Version information"
 msgstr ""
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
 
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
 
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
+#: ../settings/main.c:84
+msgid "Session Settings"
 msgstr ""
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
+#: ../settings/main.c:100
+msgid "Internal Error"
 msgstr ""
 
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
 msgstr ""
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
 msgstr ""
 
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
 msgstr ""
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
+msgid "None"
 msgstr ""
 
-#: ../settings/session/session.c:256
-msgid "Security"
+#: ../settings/xfae-dialog.c:99
+msgid "Add application"
 msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
+#: ../settings/xfae-dialog.c:113
+msgid "Name:"
 msgstr ""
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/xfae-dialog.c:130
+msgid "Description:"
 msgstr ""
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
+#: ../settings/xfae-dialog.c:145
+msgid "Command:"
 msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
+#: ../settings/xfae-dialog.c:205
+msgid "Select a command"
 msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
+#: ../settings/xfae-model.c:558
+#, c-format
+msgid "Failed to unlink %s: %s"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
+#: ../settings/xfae-model.c:646
+#, c-format
+msgid "Failed to create file %s"
 msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
-msgid "None"
+#: ../settings/xfae-model.c:668
+#, c-format
+msgid "Failed to write file %s"
 msgstr ""
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
+#: ../settings/xfae-model.c:767
+#, c-format
+msgid "Failed to open %s for writing"
 msgstr ""
 
-#: ../settings/splash/splash.c:457
-msgid "Configure"
+#: ../settings/xfae-window.c:102
+msgid ""
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:469
-msgid "Test"
+#: ../settings/xfce4-session-settings.glade.h:2
+msgid "<b>Compatibility</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:493
-msgid "Information"
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
+#: ../settings/xfce4-session-settings.glade.h:5
+msgid "<b>Information</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:6
+msgid "<b>Logout Settings</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:7
+msgid "<b>Security</b>"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:8
+msgid "<b>Session Chooser</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:518
+#: ../settings/xfce4-session-settings.glade.h:9
 msgid "<b>Version:</b>"
 msgstr ""
 
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
+#: ../settings/xfce4-session-settings.glade.h:10
+msgid "Ad_vanced"
 msgstr ""
 
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
+#: ../settings/xfce4-session-settings.glade.h:11
+msgid "Automatically save session on _logout"
 msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
+#: ../settings/xfce4-session-settings.glade.h:12
+msgid "Con_figure"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
-msgid "Add application"
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
-msgid "Name:"
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
-msgid "Description:"
+#: ../settings/xfce4-session-settings.glade.h:15
+msgid "Launch GN_OME services on startup"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
-msgid "Command:"
+#: ../settings/xfce4-session-settings.glade.h:16
+msgid "Launch _KDE services on startup"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
-msgid "Select a command"
+#: ../settings/xfce4-session-settings.glade.h:17
+msgid "Manage _remote applications"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
-#, c-format
-msgid "Failed to unlink %s: %s"
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
-#, c-format
-msgid "Failed to create file %s"
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
-#, c-format
-msgid "Failed to write file %s"
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
-#, c-format
-msgid "Failed to open %s for writing"
+#: ../settings/xfce4-session-settings.glade.h:21
+msgid "Remove the selected application from the session."
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
 msgstr ""
 
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:24
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+msgid "_Display chooser on login"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:26
+msgid "_General"
 msgstr ""
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:27
+msgid "_Prompt on logout"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:28
+msgid "_Session"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:29
+msgid "_Test"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr ""
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr ""
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+msgid "Xfce Session Manager"
+msgstr ""
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 msgid "<b>An error occurred</b>"
 msgstr ""
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -392,15 +430,21 @@ msgstr ""
 msgid "Create a new session."
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr ""
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr ""
 
@@ -425,6 +469,31 @@ msgstr ""
 msgid "Try again"
 msgstr ""
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr ""
@@ -437,88 +506,88 @@ msgstr ""
 msgid "Choose a name for the new session:"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -533,7 +602,7 @@ msgid ""
 "You should delete this directory now.\n"
 msgstr ""
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr ""
 
@@ -557,34 +626,18 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr ""
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr ""
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr ""
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr ""
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1162730e..4f90d494 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2007-02-03 04:12+0800\n"
 "Last-Translator: wuli <wuli@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -78,305 +78,352 @@ msgstr "老鼠主题"
 msgid "Mice Splash Engine"
 msgstr "老鼠主题启动引擎"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "选择图像..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "设置 简单主题..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "字体"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "颜色"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "背景颜色："
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "字体颜色："
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "图像"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "使用自选图像"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "简单主题"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "简单主题启动引擎"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "会话选择"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "在登录时显示选择器"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
-msgstr "如果选择该项，会话管理器将会在每次登录 Xfce 时要求您选择会话。"
-
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "注销设置"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "注销时自动保存会话"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"该选项指示会话管理器在您退出时自动保存当前会话。如果您不选择该选项，在每次退"
-"出时您将被询问是否保存当前会话。"
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "注销时提示"
-
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"该选项将将禁止退出确认对话框。是否保存对话取决于您是否启动了退出时自动保存会"
-"话。"
 
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "兼容性"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "启动时启动 Gnome 服务"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "信息"
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"如果您计划使用 Gnome 应用程序请启用该项。这将使会话管理器为您启动若干重要的 "
-"Gnome 服务。如果您希望使用 Gnome 所带的 Assistive Technologies ，您也需要启动"
-"该项。"
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "启动时启动 KDE 服务"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"如果您计划使用 KDE 应用程序作为您的 Xfce 桌面会话的一部分，请启用该项。这将显"
-"著加场馆程序启动时间，但是另一方面，KDE 程序将会启动得较快。如果您不启用该选"
-"项，某些 KDE 程序将无法运行。"
 
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "安全"
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
+msgstr ""
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "管理远程应用"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "会话和启动管理"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"允许会话管理器管理运行于远程主机的程序。如果您不理解该项的含义请不要启用该"
-"项。"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "会话管理"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "通用"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "高级"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "会话管理及启动"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "无"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "启动闪屏设置"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "设置"
-
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "为所选定的启动闪屏打开设置面板。"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "测试"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "演示选定的启动闪屏"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "信息"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>描述：</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>版本：</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>作者：</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>主页：</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "启动闪屏"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "添加程序"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "名称："
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "描述"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "命令："
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "选择一条命令"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "移除链结失败%s:%s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "创建文件失败 %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "写入文件失败%s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "打开要写的%s失败"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "自启动程序"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "以下是将要启动的程序列表\n"
 "当你登入Xfce桌面是自动运行，\n"
 "并会读入当你上次注销后的配置\n"
 "文件："
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>作者：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "兼容性"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>描述：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>主页：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "信息"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "注销设置"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>描述：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "会话选择"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>版本：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "高级"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "注销时自动保存会话"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "设置"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "演示选定的启动闪屏"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "启动时启动 KDE 服务"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "启动时启动 KDE 服务"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "管理远程应用"
+
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "为所选定的启动闪屏打开设置面板。"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "演示选定的启动闪屏"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "会话管理"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "在登录时显示选择器"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "通用"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "注销时提示"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "结束会话"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "测试"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "正在加载桌面设置"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "正在确认 DNS 设置"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "正在读取会话数据"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "选择回话名称"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "注销"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "重启"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "关机"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "为以后的登陆保存会话(_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "请输入您的密码："
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>出现错误</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -411,15 +458,21 @@ msgstr "新会话"
 msgid "Create a new session."
 msgstr "创建一个新的会话。"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "正在启动 Gnome Keyring 守护进程"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "正在启动 Gnome Assistive Technologies"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "正在启动 KDE 服务"
 
@@ -448,6 +501,31 @@ msgstr "仍然继续"
 msgid "Try again"
 msgstr "重试"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "选择会话"
@@ -460,88 +538,88 @@ msgstr "选择回话名称"
 msgid "Choose a name for the new session:"
 msgstr "为新的会话选择名称："
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "启动音量控制器"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "正在启动面板"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "正在启动桌面管理器"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "正在启动任务条"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "正在启动窗口管理器"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "正在启动Gnome终端仿真程序"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "正在启动KDE高级文本编辑器"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "正在启动KDE剪贴板管理器"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "正在启动KDE邮件阅读程序"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "正在启动KDE新闻阅读程序"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "正在启动Konqueror"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "正在启动KDE终端仿真程序"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "正在启动 Beep 媒体播放器"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "正在启动 The Gimp"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "正在启动 VIM 编辑器"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "正在启动会话管理代理"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "正在启动 X-Chat IRC 客户程序"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "正在启动 X 多媒体系统"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "正在启动 X 终端仿真器"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "正在启动 %s"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -566,7 +644,7 @@ msgstr ""
 "地方。\n"
 "你可以删除这个文件夹了。\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "正在执行自动启动..."
 
@@ -590,37 +668,96 @@ msgstr "小提示与技巧"
 msgid "Next"
 msgstr "下一条"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "会话和启动管理"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "会话和启动管理"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce4 会话和启动管理"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce4 启动画面设置"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "自启动程序"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "编辑自启动程序的列表"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce4 自启动程序"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "Xfce4-小提示"
 
-#~ msgid "End Session"
-#~ msgstr "结束会话"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr "如果选择该项，会话管理器将会在每次登录 Xfce 时要求您选择会话。"
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "该选项指示会话管理器在您退出时自动保存当前会话。如果您不选择该选项，在每次"
+#~ "退出时您将被询问是否保存当前会话。"
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "该选项将将禁止退出确认对话框。是否保存对话取决于您是否启动了退出时自动保存"
+#~ "会话。"
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "启动时启动 Gnome 服务"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "如果您计划使用 Gnome 应用程序请启用该项。这将使会话管理器为您启动若干重要"
+#~ "的 Gnome 服务。如果您希望使用 Gnome 所带的 Assistive Technologies ，您也需"
+#~ "要启动该项。"
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "如果您计划使用 KDE 应用程序作为您的 Xfce 桌面会话的一部分，请启用该项。这"
+#~ "将显著加场馆程序启动时间，但是另一方面，KDE 程序将会启动得较快。如果您不启"
+#~ "用该选项，某些 KDE 程序将无法运行。"
+
+#~ msgid "Security"
+#~ msgstr "安全"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "允许会话管理器管理运行于远程主机的程序。如果您不理解该项的含义请不要启用该"
+#~ "项。"
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "会话管理及启动"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "启动闪屏设置"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "启动闪屏"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "自启动程序"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce4 启动画面设置"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "自启动程序"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "编辑自启动程序的列表"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce4 自启动程序"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5de1f8ee..84a34ed0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-session 4.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-20 16:58+0200\n"
+"POT-Creation-Date: 2008-10-11 03:33-0700\n"
 "PO-Revision-Date: 2006-06-12 21:53+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore@educities.edu.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -79,306 +79,351 @@ msgstr "Mice"
 msgid "Mice Splash Engine"
 msgstr "Mice Splash 引擎"
 
-#: ../engines/simple/simple.c:319
+#: ../engines/simple/simple.c:320
 msgid "Choose image..."
 msgstr "選擇圖像..."
 
-#: ../engines/simple/simple.c:364
+#: ../engines/simple/simple.c:365
 msgid "Configure Simple..."
 msgstr "設定 Simple..."
 
-#: ../engines/simple/simple.c:375
+#: ../engines/simple/simple.c:376
 msgid "Font"
 msgstr "字型"
 
-#: ../engines/simple/simple.c:384
+#: ../engines/simple/simple.c:385
 msgid "Colors"
 msgstr "顏色"
 
-#: ../engines/simple/simple.c:392
+#: ../engines/simple/simple.c:393
 msgid "Background color:"
 msgstr "背景顏色："
 
-#: ../engines/simple/simple.c:404
+#: ../engines/simple/simple.c:405
 msgid "Text color:"
 msgstr "文字顏色："
 
-#: ../engines/simple/simple.c:416
+#: ../engines/simple/simple.c:417
 msgid "Image"
 msgstr "圖像"
 
-#: ../engines/simple/simple.c:424
+#: ../engines/simple/simple.c:425
 msgid "Use custom image"
 msgstr "使用自訂圖像"
 
-#: ../engines/simple/simple.c:509
+#: ../engines/simple/simple.c:510
 msgid "Simple"
 msgstr "Simple"
 
-#: ../engines/simple/simple.c:510
+#: ../engines/simple/simple.c:511
 msgid "Simple Splash Engine"
 msgstr "Simple Splash 引擎"
 
-#: ../settings/session/session.c:137
-msgid "Session chooser"
-msgstr "工作階段選擇器"
-
-#: ../settings/session/session.c:142
-msgid "Display chooser on login"
-msgstr "登入時顯示選擇器"
-
-#: ../settings/session/session.c:150
-msgid ""
-"If set, the session manager will ask you to choose a session every time you "
-"log in to Xfce."
+#: ../settings/main.c:43
+msgid "Settings manager socket"
 msgstr ""
-"設定這個選項後，每當您登入 Xfce 時，工作階段選擇器都會要求您選擇一個工作階"
-"段。"
 
-#: ../settings/session/session.c:154
-msgid "Logout settings"
-msgstr "登出設定"
-
-#: ../settings/session/session.c:160
-msgid "Automatically save session on logout"
-msgstr "登出時自動儲存工作階段"
-
-#: ../settings/session/session.c:166
-msgid ""
-"This option instructs the session manager to save the current session "
-"automatically when you log out. If you don't select this option you'll be "
-"prompted whether you want to save the current session on each logout."
+#: ../settings/main.c:43
+msgid "SOCKET ID"
 msgstr ""
-"這個選項令工作階段管理程式在您登出時自動儲存工作階段。如果您不選擇這樣做，每"
-"當您登出時，您都會被問及要不要儲存工作階段。"
 
-#: ../settings/session/session.c:173
-msgid "Prompt on logout"
-msgstr "登出時先問清楚"
+#: ../settings/main.c:44
+#, fuzzy
+msgid "Version information"
+msgstr "資訊"
 
-#: ../settings/session/session.c:179
-msgid ""
-"This option disables the logout confirmation dialog. Whether the session "
-"will be saved or not depends on whether you enabled the automatic saving of "
-"sessions on logout or not."
+#: ../settings/main.c:64
+#, c-format
+msgid "Type '%s --help' for usage."
 msgstr ""
-"這個選項決定是否在登出時先問清楚是否登出。至於工作階段是否會被儲存，則視乎您"
-"有否選擇「登出時自動儲存工作階段」。"
-
-#: ../settings/session/session.c:215
-msgid "Compatibility"
-msgstr "相容性"
-
-#: ../settings/session/session.c:224
-msgid "Launch Gnome services on startup"
-msgstr "啟動時同時啟動 Gnome 服務"
 
-#: ../settings/session/session.c:230
-msgid ""
-"Enable this if you plan to use Gnome applications. This will instruct the "
-"session manager to start some vital Gnome services for you. You should also "
-"enable this if you want to use the Assistive Technologies that ship with "
-"Gnome."
+#: ../settings/main.c:76
+msgid "The Xfce development team. All rights reserved."
 msgstr ""
-"如果您打算使用 Gnome 的應用程式，就應使用這個選項。這令工作階段管理程式為您啟"
-"動一些重要的 Gnome 服務；此外，假如您希望使用 Gnome 的 Assistive "
-"Technologies 的話，也應使用這個選項。"
-
-#: ../settings/session/session.c:237
-msgid "Launch KDE services on startup"
-msgstr "啟動時同時啟動 KDE 服務"
 
-#: ../settings/session/session.c:243
-msgid ""
-"Enable this option if you plan to run KDE applications as part of your Xfce "
-"Desktop session. This will notably increase the startup time, but on the "
-"other hand, KDE applications will startup faster. Some KDE applications may "
-"not work at all if you don't enable this option."
+#: ../settings/main.c:77
+#, c-format
+msgid "Please report bugs to <%s>."
 msgstr ""
-"如果您打算在 Xfce 的桌面工作階段內使用 KDE 的應用程式，就應使用這個選項。這會"
-"明顯的拖長 Xfce 的啟動時間，卻可加快 KDE 應用程式的啟動。除非你使用這個選項，"
-"某些 KDE 的應用程式可能會完全不能運作。"
-
-#: ../settings/session/session.c:256
-msgid "Security"
-msgstr "保安"
 
-#: ../settings/session/session.c:261
-msgid "Manage remote applications"
-msgstr "管理遠端應用程式"
+#: ../settings/main.c:84
+#, fuzzy
+msgid "Session Settings"
+msgstr "設定與工作階段及啟動相關的各種選項"
 
-#: ../settings/session/session.c:273
-msgid ""
-"Allow the session manager to manage applications running on remote hosts. Do "
-"not enable this option unless you know what you are doing."
+#: ../settings/main.c:86 ../xfce4-session/main.c:277
+msgid "Unable to contact settings server"
 msgstr ""
-"容許工作階段管理程式管理在遠端主機執行的應用程式。除非您明瞭這是做什麼的，切"
-"勿使用這個選項。"
 
-#: ../settings/session/session.c:333
-msgid "Sessions and Startup"
-msgstr "工作階段及啟動"
+#: ../settings/main.c:100
+msgid "Internal Error"
+msgstr ""
 
-#: ../settings/session/session.c:352
-msgid "General"
-msgstr "一般"
+#: ../settings/main.c:101
+msgid "Unable to create user interface from embedded definition data"
+msgstr ""
 
-#: ../settings/session/session.c:358
-msgid "Advanced"
-msgstr "進階"
+#: ../settings/main.c:102
+msgid "This is likely a problem with your Xfce installation"
+msgstr ""
 
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/session/session.c:382
-msgid "Button Label|Sessions and Startup"
-msgstr "工作階段及啟動"
+#: ../settings/main.c:115
+msgid "_Application Autostart"
+msgstr ""
 
-#: ../settings/splash/splash.c:309 ../settings/splash/splash.c:312
-#: ../settings/splash/splash.c:315 ../settings/splash/splash.c:318
-#: ../settings/splash/splash.c:386
+#: ../settings/splash-settings.c:288 ../settings/splash-settings.c:291
+#: ../settings/splash-settings.c:294 ../settings/splash-settings.c:297
+#: ../settings/splash-settings.c:354
 msgid "None"
 msgstr "無"
 
-#: ../settings/splash/splash.c:409
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:1
-msgid "Splash Screen Settings"
-msgstr "起動畫面設定"
-
-#: ../settings/splash/splash.c:457
-msgid "Configure"
-msgstr "設定"
-
-# NOTE 這裡所講的「panel」其實係一個視窗，並非一個面板
-#: ../settings/splash/splash.c:465
-msgid "Opens the configuration panel for the selected splash screen."
-msgstr "給選取的起動畫面開啟設定視窗。"
-
-#: ../settings/splash/splash.c:469
-msgid "Test"
-msgstr "測試"
-
-#: ../settings/splash/splash.c:476
-msgid "Demonstrates the selected splash screen."
-msgstr "示範一下選取的起動畫面。"
-
-#: ../settings/splash/splash.c:493
-msgid "Information"
-msgstr "資訊"
-
-#: ../settings/splash/splash.c:504
-msgid "<b>Description:</b>"
-msgstr "<b>說明：</b>"
-
-#: ../settings/splash/splash.c:518
-msgid "<b>Version:</b>"
-msgstr "<b>版本：</b>"
-
-#: ../settings/splash/splash.c:532
-msgid "<b>Author:</b>"
-msgstr "<b>作者：</b>"
-
-#: ../settings/splash/splash.c:546
-msgid "<b>Homepage:</b>"
-msgstr "<b>網頁：</b>"
-
-#. the button label in the xfce-mcs-manager dialog
-#: ../settings/splash/splash.c:584
-msgid "Button Label|Splash Screen"
-msgstr "啟動畫面"
-
-#: ../xfce4-autostart-editor/xfae-dialog.c:99
+#: ../settings/xfae-dialog.c:99
 msgid "Add application"
 msgstr "新增應用程式"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:113
+#: ../settings/xfae-dialog.c:113
 msgid "Name:"
 msgstr "名稱："
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:130
+#: ../settings/xfae-dialog.c:130
 msgid "Description:"
 msgstr "敘述："
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:145
+#: ../settings/xfae-dialog.c:145
 msgid "Command:"
 msgstr "指令"
 
-#: ../xfce4-autostart-editor/xfae-dialog.c:205
+#: ../settings/xfae-dialog.c:205
 msgid "Select a command"
 msgstr "選擇一個指令"
 
-#: ../xfce4-autostart-editor/xfae-model.c:558
+#: ../settings/xfae-model.c:558
 #, c-format
 msgid "Failed to unlink %s: %s"
 msgstr "無法去連結 %s: %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:646
+#: ../settings/xfae-model.c:646
 #, c-format
 msgid "Failed to create file %s"
 msgstr "無法建立檔案 %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:668
+#: ../settings/xfae-model.c:668
 #, c-format
 msgid "Failed to write file %s"
 msgstr "無法寫入檔案 %s"
 
-#: ../xfce4-autostart-editor/xfae-model.c:767
+#: ../settings/xfae-model.c:767
 #, c-format
 msgid "Failed to open %s for writing"
 msgstr "無法開啟 %s 以便寫入"
 
-#: ../xfce4-autostart-editor/xfae-window.c:89
-#: ../xfce4-autostart-editor/xfae-window.c:106
-msgid "Autostarted applications"
-msgstr "自動開啟的應用程式"
-
-#: ../xfce4-autostart-editor/xfae-window.c:124
+#: ../settings/xfae-window.c:102
+#, fuzzy
 msgid ""
-"Below is the list of applications that will be started\n"
-"automatically when you login to your Xfce desktop,\n"
-"in addition to the applications that were saved when\n"
-"you logged out last time:"
+"Below is the list of applications that will be started automatically when "
+"you login to your Xfce desktop, in addition to the applications that were "
+"saved when you logged out last time:"
 msgstr ""
 "以下是當您登入 Xfce 桌面時，會自動啟動的應用程式清單\n"
 "(除了您上次登出時儲存的應用程式之外)："
 
-#: ../xfce4-session/main.c:140
+#: ../settings/xfce4-session-settings.glade.h:1
+msgid "<b>Author:</b>"
+msgstr "<b>作者：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:2
+#, fuzzy
+msgid "<b>Compatibility</b>"
+msgstr "相容性"
+
+#: ../settings/xfce4-session-settings.glade.h:3
+msgid "<b>Description:</b>"
+msgstr "<b>說明：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:4
+msgid "<b>Homepage:</b>"
+msgstr "<b>網頁：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:5
+#, fuzzy
+msgid "<b>Information</b>"
+msgstr "資訊"
+
+#: ../settings/xfce4-session-settings.glade.h:6
+#, fuzzy
+msgid "<b>Logout Settings</b>"
+msgstr "登出設定"
+
+#: ../settings/xfce4-session-settings.glade.h:7
+#, fuzzy
+msgid "<b>Security</b>"
+msgstr "<b>說明：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:8
+#, fuzzy
+msgid "<b>Session Chooser</b>"
+msgstr "工作階段選擇器"
+
+#: ../settings/xfce4-session-settings.glade.h:9
+msgid "<b>Version:</b>"
+msgstr "<b>版本：</b>"
+
+#: ../settings/xfce4-session-settings.glade.h:10
+#, fuzzy
+msgid "Ad_vanced"
+msgstr "進階"
+
+#: ../settings/xfce4-session-settings.glade.h:11
+#, fuzzy
+msgid "Automatically save session on _logout"
+msgstr "登出時自動儲存工作階段"
+
+#: ../settings/xfce4-session-settings.glade.h:12
+#, fuzzy
+msgid "Con_figure"
+msgstr "設定"
+
+#: ../settings/xfce4-session-settings.glade.h:13
+msgid "Customize desktop startup and splash screen"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:14
+msgid "Demonstrates the selected splash screen."
+msgstr "示範一下選取的起動畫面。"
+
+#: ../settings/xfce4-session-settings.glade.h:15
+#, fuzzy
+msgid "Launch GN_OME services on startup"
+msgstr "啟動時同時啟動 KDE 服務"
+
+#: ../settings/xfce4-session-settings.glade.h:16
+#, fuzzy
+msgid "Launch _KDE services on startup"
+msgstr "啟動時同時啟動 KDE 服務"
+
+#: ../settings/xfce4-session-settings.glade.h:17
+#, fuzzy
+msgid "Manage _remote applications"
+msgstr "管理遠端應用程式"
+
+# NOTE 這裡所講的「panel」其實係一個視窗，並非一個面板
+#: ../settings/xfce4-session-settings.glade.h:18
+msgid "Opens the configuration panel for the selected splash screen."
+msgstr "給選取的起動畫面開啟設定視窗。"
+
+#: ../settings/xfce4-session-settings.glade.h:19
+msgid "Quit Program"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:20
+msgid "Quit the program, and remove it from the session."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:21
+#, fuzzy
+msgid "Remove the selected application from the session."
+msgstr "示範一下選取的起動畫面。"
+
+#: ../settings/xfce4-session-settings.glade.h:22
+msgid "S_plash"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:23
+#: ../settings/xfce-session-settings.desktop.in.h:2
+msgid "Sessions and Startup"
+msgstr "工作階段及啟動"
+
+#: ../settings/xfce4-session-settings.glade.h:24
+msgid ""
+"These applications are a part of the currently-running session, and can be "
+"saved when you log out."
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:25
+#, fuzzy
+msgid "_Display chooser on login"
+msgstr "登入時顯示選擇器"
+
+#: ../settings/xfce4-session-settings.glade.h:26
+#, fuzzy
+msgid "_General"
+msgstr "一般"
+
+#: ../settings/xfce4-session-settings.glade.h:27
+#, fuzzy
+msgid "_Prompt on logout"
+msgstr "登出時先問清楚"
+
+#: ../settings/xfce4-session-settings.glade.h:28
+#, fuzzy
+msgid "_Session"
+msgstr "結束工作階段"
+
+#: ../settings/xfce4-session-settings.glade.h:29
+#, fuzzy
+msgid "_Test"
+msgstr "測試"
+
+#: ../settings/xfce4-session-settings.glade.h:30
+msgid "gtk-close"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:31
+msgid "gtk-help"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:32
+msgid "gtk-remove"
+msgstr ""
+
+#: ../settings/xfce4-session-settings.glade.h:33
+msgid "label"
+msgstr ""
+
+#: ../xfce4-session/main.c:145
 msgid "Loading desktop settings"
 msgstr "載入桌面設定中"
 
 #. verify that the DNS settings are ok
-#: ../xfce4-session/main.c:200
+#: ../xfce4-session/main.c:206
 msgid "Verifying DNS settings"
 msgstr "核實 DNS 設定中"
 
-#: ../xfce4-session/main.c:203
+#: ../xfce4-session/main.c:209
 msgid "Loading session data"
 msgstr "載入工作階段資料中"
 
-#: ../xfce4-session/shutdown.c:334
+#: ../xfce4-session/main.c:275
+#, fuzzy
+msgid "Xfce Session Manager"
+msgstr "選擇工作階段名稱"
+
+#: ../xfce4-session/shutdown.c:338
 msgid "Log Out"
 msgstr "登出"
 
-#: ../xfce4-session/shutdown.c:357
+#: ../xfce4-session/shutdown.c:363
 msgid "Restart"
 msgstr "重新啟動"
 
-#: ../xfce4-session/shutdown.c:380
+#: ../xfce4-session/shutdown.c:388
 msgid "Shut Down"
 msgstr "關機"
 
-#: ../xfce4-session/shutdown.c:388
+#: ../xfce4-session/shutdown.c:396
 msgid "_Save session for future logins"
 msgstr "為往後的登入儲存工作階段(_S)"
 
-#: ../xfce4-session/shutdown.c:451
+#: ../xfce4-session/shutdown.c:459
 msgid "Please enter your password:"
 msgstr "請輸入密碼："
 
-#: ../xfce4-session/shutdown.c:482
+#: ../xfce4-session/shutdown.c:490
 #, fuzzy
 msgid "<b>An error occurred</b>"
 msgstr "<b>發生錯誤</b>"
 
-#: ../xfce4-session/shutdown.c:496
+#: ../xfce4-session/shutdown.c:504
 msgid ""
 "Either the password you entered is invalid, or the system administrator "
 "disallows shutting down this computer with your user account."
@@ -414,15 +459,21 @@ msgstr "新增工作階段"
 msgid "Create a new session."
 msgstr "建立一個新的工作階段。"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:244
+#: ../xfce4-session/xfsm-client.c:757 ../xfce4-session/xfsm-client.c:817
+#: ../xfce4-session/xfsm-client.c:925
+#, c-format
+msgid "The client doesn't have any properties set yet"
+msgstr ""
+
+#: ../xfce4-session/xfsm-compat-gnome.c:301
 msgid "Starting The Gnome Keyring Daemon"
 msgstr "啟動 Gnome Keyring Daemon 中"
 
-#: ../xfce4-session/xfsm-compat-gnome.c:256
+#: ../xfce4-session/xfsm-compat-gnome.c:313
 msgid "Starting Gnome Assistive Technologies"
 msgstr "啟動 Gnome Assistive Technologies 中"
 
-#: ../xfce4-session/xfsm-compat-kde.c:118
+#: ../xfce4-session/xfsm-compat-kde.c:124
 msgid "Starting KDE services"
 msgstr "啟動 KDE 服務中..."
 
@@ -451,6 +502,31 @@ msgstr "暫且繼續"
 msgid "Try again"
 msgstr "重試"
 
+#: ../xfce4-session/xfsm-manager.c:1281
+#, c-format
+msgid "Can only terminate clients when in the idle state"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1745
+#, c-format
+msgid "Session manager must be in idle state when requesting a checkpoint"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1786
+#, c-format
+msgid "Session manager must be in idle state when requesting a shutdown"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1793
+#, c-format
+msgid "Suspend and hibernate are not supported"
+msgstr ""
+
+#: ../xfce4-session/xfsm-manager.c:1800
+#, c-format
+msgid "Invalid shutdown type \"%u\""
+msgstr ""
+
 #: ../xfce4-session/xfsm-splash-screen.c:178
 msgid "Choose session"
 msgstr "選擇工作階段"
@@ -463,88 +539,88 @@ msgstr "選擇工作階段名稱"
 msgid "Choose a name for the new session:"
 msgstr "請為工作階段改個名："
 
-#: ../xfce4-session/xfsm-startup.c:101
+#: ../xfce4-session/xfsm-startup.c:123
 msgid "Starting the Volume Controller"
 msgstr "啟動音量控制器中"
 
-#: ../xfce4-session/xfsm-startup.c:103
+#: ../xfce4-session/xfsm-startup.c:125
 msgid "Starting the Panel"
 msgstr "啟動面板中"
 
-#: ../xfce4-session/xfsm-startup.c:105
+#: ../xfce4-session/xfsm-startup.c:127
 msgid "Starting the Desktop Manager"
 msgstr "啟動桌面管理程式中"
 
-#: ../xfce4-session/xfsm-startup.c:107
+#: ../xfce4-session/xfsm-startup.c:129
 msgid "Starting the Taskbar"
 msgstr "啟動工作列中"
 
-#: ../xfce4-session/xfsm-startup.c:109
+#: ../xfce4-session/xfsm-startup.c:131
 msgid "Starting the Window Manager"
 msgstr "啟動視窗管理程式中"
 
-#: ../xfce4-session/xfsm-startup.c:113
+#: ../xfce4-session/xfsm-startup.c:135
 msgid "Starting the Gnome Terminal Emulator"
 msgstr "啟動 Gnome 終端機中"
 
-#: ../xfce4-session/xfsm-startup.c:117
+#: ../xfce4-session/xfsm-startup.c:139
 msgid "Starting the KDE Advanced Text Editor"
 msgstr "啟動 KDE 進階文字編輯器中"
 
-#: ../xfce4-session/xfsm-startup.c:119
+#: ../xfce4-session/xfsm-startup.c:141
 msgid "Starting the KDE Clipboard Manager"
 msgstr "啟動 KDE 剪貼簿管理程式中"
 
-#: ../xfce4-session/xfsm-startup.c:121
+#: ../xfce4-session/xfsm-startup.c:143
 msgid "Starting the KDE Mail Reader"
 msgstr "啟動 KDE 郵件閱讀器中"
 
-#: ../xfce4-session/xfsm-startup.c:123
+#: ../xfce4-session/xfsm-startup.c:145
 msgid "Starting the KDE News Reader"
 msgstr "啟動 KDE 新聞閱讀器中"
 
-#: ../xfce4-session/xfsm-startup.c:125
+#: ../xfce4-session/xfsm-startup.c:147
 msgid "Starting the Konqueror"
 msgstr "啟動 Konqueror 中"
 
-#: ../xfce4-session/xfsm-startup.c:127
+#: ../xfce4-session/xfsm-startup.c:149
 msgid "Starting the KDE Terminal Emulator"
 msgstr "啟動 KDE 終端機中"
 
-#: ../xfce4-session/xfsm-startup.c:131
+#: ../xfce4-session/xfsm-startup.c:153
 msgid "Starting the Beep Media Player"
 msgstr "啟動 Beep Media Player 中"
 
-#: ../xfce4-session/xfsm-startup.c:133
+#: ../xfce4-session/xfsm-startup.c:155
 msgid "Starting The Gimp"
 msgstr "啟動 Gimp 中"
 
-#: ../xfce4-session/xfsm-startup.c:135
+#: ../xfce4-session/xfsm-startup.c:157
 msgid "Starting the VI Improved Editor"
 msgstr "啟動 VI Improved 文字編輯器中"
 
-#: ../xfce4-session/xfsm-startup.c:137
+#: ../xfce4-session/xfsm-startup.c:159
 msgid "Starting the Session Management Proxy"
 msgstr "啟動工作階段管理代理程式中"
 
-#: ../xfce4-session/xfsm-startup.c:139
+#: ../xfce4-session/xfsm-startup.c:161
 msgid "Starting the X-Chat IRC Client"
 msgstr "啟動 X-Chat 中"
 
-#: ../xfce4-session/xfsm-startup.c:141
+#: ../xfce4-session/xfsm-startup.c:163
 msgid "Starting the X Multimedia System"
 msgstr "啟動 X Multimedia System 中"
 
-#: ../xfce4-session/xfsm-startup.c:143
+#: ../xfce4-session/xfsm-startup.c:165
 msgid "Starting the X Terminal Emulator"
 msgstr "啟動 X 終端機中"
 
-#: ../xfce4-session/xfsm-startup.c:145
+#: ../xfce4-session/xfsm-startup.c:167
 #, c-format
 msgid "Starting %s"
 msgstr "啟動 %s 中"
 
-#: ../xfce4-session/xfsm-startup.c:270
+#: ../xfce4-session/xfsm-startup.c:292
 #, c-format
 msgid ""
 "The location and the format of the autostart directory has changed.\n"
@@ -567,7 +643,7 @@ msgstr ""
 "式。您位於先前自動啟動目錄的檔案已經成功地遷移到新的位置。\n"
 "您應該現在就刪除本目錄。\n"
 
-#: ../xfce4-session/xfsm-startup.c:409
+#: ../xfce4-session/xfsm-startup.c:431
 msgid "Performing Autostart..."
 msgstr "執行自動啟動中..."
 
@@ -591,37 +667,98 @@ msgstr "秘訣與撇步"
 msgid "Next"
 msgstr "下一個"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:1
+#: ../settings/xfce-session-settings.desktop.in.h:1
 msgid "Session and Startup Settings"
 msgstr "設定與工作階段及啟動相關的各種選項"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:2
+#: ../settings/xfce-session-settings.desktop.in.h:3
 msgid "Sessions and Startup Settings"
 msgstr "工作階段及啟動設定"
 
-#: ../settings/session/xfce-session-settings.desktop.in.h:3
+#: ../settings/xfce-session-settings.desktop.in.h:4
 msgid "Xfce 4 Sessions and Startup Settings"
 msgstr "Xfce 4 工作階段及啟動設定"
 
-#: ../settings/splash/xfce-splash-settings.desktop.in.h:2
-msgid "Xfce 4 Splash Screen Settings"
-msgstr "Xfce 4 啟動畫面設定"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:1
-msgid "Autostarted Applications"
-msgstr "自動啟動的應用程式"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:2
-msgid "Edit the list of autostarted applications"
-msgstr "編輯自動啟動的應用程式清單"
-
-#: ../xfce4-autostart-editor/xfce4-autostart-editor.desktop.in.h:3
-msgid "Xfce 4 Autostarted Applications"
-msgstr "Xfce 4 自動啟動應用程式"
-
 #: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2
 msgid "xfce4-tips"
 msgstr "xfce4-秘訣"
 
-#~ msgid "End Session"
-#~ msgstr "結束工作階段"
+#~ msgid ""
+#~ "If set, the session manager will ask you to choose a session every time "
+#~ "you log in to Xfce."
+#~ msgstr ""
+#~ "設定這個選項後，每當您登入 Xfce 時，工作階段選擇器都會要求您選擇一個工作階"
+#~ "段。"
+
+#~ msgid ""
+#~ "This option instructs the session manager to save the current session "
+#~ "automatically when you log out. If you don't select this option you'll be "
+#~ "prompted whether you want to save the current session on each logout."
+#~ msgstr ""
+#~ "這個選項令工作階段管理程式在您登出時自動儲存工作階段。如果您不選擇這樣做，"
+#~ "每當您登出時，您都會被問及要不要儲存工作階段。"
+
+#~ msgid ""
+#~ "This option disables the logout confirmation dialog. Whether the session "
+#~ "will be saved or not depends on whether you enabled the automatic saving "
+#~ "of sessions on logout or not."
+#~ msgstr ""
+#~ "這個選項決定是否在登出時先問清楚是否登出。至於工作階段是否會被儲存，則視乎"
+#~ "您有否選擇「登出時自動儲存工作階段」。"
+
+#~ msgid "Launch Gnome services on startup"
+#~ msgstr "啟動時同時啟動 Gnome 服務"
+
+#~ msgid ""
+#~ "Enable this if you plan to use Gnome applications. This will instruct the "
+#~ "session manager to start some vital Gnome services for you. You should "
+#~ "also enable this if you want to use the Assistive Technologies that ship "
+#~ "with Gnome."
+#~ msgstr ""
+#~ "如果您打算使用 Gnome 的應用程式，就應使用這個選項。這令工作階段管理程式為"
+#~ "您啟動一些重要的 Gnome 服務；此外，假如您希望使用 Gnome 的 Assistive "
+#~ "Technologies 的話，也應使用這個選項。"
+
+#~ msgid ""
+#~ "Enable this option if you plan to run KDE applications as part of your "
+#~ "Xfce Desktop session. This will notably increase the startup time, but on "
+#~ "the other hand, KDE applications will startup faster. Some KDE "
+#~ "applications may not work at all if you don't enable this option."
+#~ msgstr ""
+#~ "如果您打算在 Xfce 的桌面工作階段內使用 KDE 的應用程式，就應使用這個選項。"
+#~ "這會明顯的拖長 Xfce 的啟動時間，卻可加快 KDE 應用程式的啟動。除非你使用這"
+#~ "個選項，某些 KDE 的應用程式可能會完全不能運作。"
+
+#~ msgid "Security"
+#~ msgstr "保安"
+
+#~ msgid ""
+#~ "Allow the session manager to manage applications running on remote hosts. "
+#~ "Do not enable this option unless you know what you are doing."
+#~ msgstr ""
+#~ "容許工作階段管理程式管理在遠端主機執行的應用程式。除非您明瞭這是做什麼的，"
+#~ "切勿使用這個選項。"
+
+#~ msgid "Button Label|Sessions and Startup"
+#~ msgstr "工作階段及啟動"
+
+#~ msgid "Splash Screen Settings"
+#~ msgstr "起動畫面設定"
+
+#~ msgid "Button Label|Splash Screen"
+#~ msgstr "啟動畫面"
+
+#~ msgid "Autostarted applications"
+#~ msgstr "自動開啟的應用程式"
+
+#~ msgid "Xfce 4 Splash Screen Settings"
+#~ msgstr "Xfce 4 啟動畫面設定"
+
+#~ msgid "Autostarted Applications"
+#~ msgstr "自動啟動的應用程式"
+
+#~ msgid "Edit the list of autostarted applications"
+#~ msgstr "編輯自動啟動的應用程式清單"
+
+#~ msgid "Xfce 4 Autostarted Applications"
+#~ msgstr "Xfce 4 自動啟動應用程式"
diff --git a/settings/Makefile.am b/settings/Makefile.am
index a8653267..2d144a5a 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -1,4 +1,73 @@
-SUBDIRS =								\
-	session		\
-	splash
+bin_PROGRAMS = xfce4-session-settings
 
+xfce4_session_settings_SOURCES = \
+	main.c \
+	module.c \
+	module.h \
+	nopreview.h \
+	session-editor.c \
+	splash-settings.c  \
+	startup-settings.c \
+	xfae-dialog.c \
+	xfae-dialog.h \
+	xfae-model.c \
+	xfae-model.h \
+	xfae-window.c \
+	xfae-window.h \
+	xfce4-session-settings-common.h \
+	xfce4-session-settings_glade.h
+
+xfce4_session_settings_CFLAGS = \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DMODULESDIR=\"$(libdir)/xfce4/splash/engines\" \
+	-DG_LOG_DOMAIN=\"xfce4-session-settings\" \
+	-I$(top_srcdir) \
+	$(LIBXFCE4UTIL_CFLAGS) \
+	$(LIBXFCEGUI4_CFLAGS) \
+	$(LIBGLADE_CFLAGS) \
+	$(XFCONF_CFLAGS) \
+	$(DBUS_GLIB_CFLAGS)
+
+xfce4_session_settings_LDADD = \
+	$(top_builddir)/libxfsm/libxfsm-4.6.la \
+	$(LIBXFCE4UTIL_CFLAGS) \
+	$(LIBXFCEGUI4_LIBS) \
+	$(LIBGLADE_LIBS) \
+	$(XFCONF_LIBS) \
+	$(DBUS_GLIB_LIBS)
+
+xfce4_session_settings_DEPENDENCIES = \
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
+
+settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
+settings_DATA = xfce4-session.xml
+
+desktopdir = $(datadir)/applications
+desktop_in_files = xfce-session-settings.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
+
+
+if MAINTAINER_MODE
+
+BUILT_SOURCES = \
+	nopreview.h \
+	xfce4-session-settings_glade.h
+
+nopreview.h: $(srcdir)/nopreview.png
+	gdk-pixbuf-csource --struct --name=nopreview $< > $@
+
+xfce4-session-settings_glade.h: xfce4-session-settings.glade
+	exo-csource --static --strip-comments --strip-content --name=xfce4_session_settings_glade $< >$@
+
+endif
+
+
+EXTRA_DIST = \
+	$(desktop_in_files) \
+	nopreview.png \
+	xfce4-session-settings.glade
+
+DISTCLEANFILES = \
+	$(desktop_DATA)
diff --git a/settings/main.c b/settings/main.c
new file mode 100644
index 00000000..0174ae93
--- /dev/null
+++ b/settings/main.c
@@ -0,0 +1,146 @@
+/*
+ *  Copyright (c) 2008 Brian Tarricone <bjt23@cornell.edu>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License ONLY.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include <xfconf/xfconf.h>
+
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+
+#include <libxfce4util/libxfce4util.h>
+#include <libxfcegui4/libxfcegui4.h>
+
+#include "xfae-window.h"
+#include "xfce4-session-settings-common.h"
+#include "xfce4-session-settings_glade.h"
+
+
+static GdkNativeWindow opt_socket_id = 0;
+static gboolean opt_version = FALSE;
+static GOptionEntry option_entries[] =
+{
+    { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &opt_socket_id, N_("Settings manager socket"), N_("SOCKET ID") },
+    { "version", 'v', 0, G_OPTION_ARG_NONE, &opt_version, N_("Version information"), NULL },
+    { NULL }
+};
+
+
+int
+main(int argc,
+     char **argv)
+{
+    GladeXML *gxml;
+    GtkWidget *notebook, *xfae_page, *lbl;
+    GError *error = NULL;
+
+    xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
+    if(!gtk_init_with_args (&argc, &argv, "", option_entries,
+                            GETTEXT_PACKAGE, &error))
+    {
+        if(G_LIKELY(error)) {
+            g_print("%s: %s.\n", G_LOG_DOMAIN, error->message);
+            g_print(_("Type '%s --help' for usage."), G_LOG_DOMAIN);
+            g_print("\n");
+            g_error_free (error);
+        } else
+            g_error("Unable to open display.");
+
+        return EXIT_FAILURE;
+    }
+
+    if(G_UNLIKELY(opt_version)) {
+        g_print("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
+        g_print("%s\n", "Copyright (c) 2004-2008");
+        g_print("\t%s\n\n", _("The Xfce development team. All rights reserved."));
+        g_print(_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
+        g_print("\n");
+
+        return EXIT_SUCCESS;
+    }
+
+    if(G_UNLIKELY(!xfconf_init(&error))) {
+        xfce_message_dialog(NULL, _("Session Settings"),
+                            GTK_STOCK_DIALOG_ERROR,
+                            _("Unable to contact settings server"),
+                            error->message,
+                            GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT,
+                            NULL);
+        g_error_free(error);
+        return EXIT_FAILURE;
+    }
+
+    gtk_window_set_default_icon_name("xfce4-session");
+
+    gxml = glade_xml_new_from_buffer(xfce4_session_settings_glade,
+                                     xfce4_session_settings_glade_length,
+                                     NULL, NULL);
+    if(!gxml) {
+        xfce_message_dialog(NULL, _("Internal Error"), GTK_STOCK_DIALOG_ERROR,
+                            _("Unable to create user interface from embedded definition data"),
+                            _("This is likely a problem with your Xfce installation"),
+                            GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+        return EXIT_FAILURE;
+    }
+
+    startup_settings_init(gxml);
+    splash_settings_init(gxml);
+    session_editor_init(gxml);
+
+    /* FIXME: someday, glade-ify this, maybe. */
+    xfae_page = xfae_window_new();
+    gtk_widget_show(xfae_page);
+    notebook = glade_xml_get_widget(gxml, "plug-child");
+    lbl = gtk_label_new_with_mnemonic(_("_Application Autostart"));
+    gtk_widget_show(lbl);
+    gtk_notebook_insert_page(GTK_NOTEBOOK(notebook), xfae_page, lbl, 2);
+
+    if(G_UNLIKELY(opt_socket_id == 0)) {
+        GtkWidget *dialog = glade_xml_get_widget(gxml, "xfce4_session_settings_dialog");
+        g_object_unref(gxml);
+
+        while(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_HELP) {
+            /* FIXME: load help */
+        }
+
+        gtk_widget_destroy (dialog);
+    } else {
+        GtkWidget *plug, *plug_child;
+
+        plug = gtk_plug_new(opt_socket_id);
+        gtk_widget_show(plug);
+        g_signal_connect(plug, "delete-event",
+                         G_CALLBACK(gtk_main_quit), NULL);
+
+        plug_child = glade_xml_get_widget(gxml, "plug-child");
+        gtk_widget_reparent(plug_child, plug);
+        gtk_widget_show(plug_child);
+        
+        g_object_unref(gxml);
+
+        gtk_main();
+    }
+
+    return EXIT_SUCCESS;
+}
diff --git a/settings/splash/module.c b/settings/module.c
index 5165e1d6..e10b396a 100644
--- a/settings/splash/module.c
+++ b/settings/module.c
@@ -37,7 +37,7 @@
 #include <libxfsm/xfsm-splash-engine.h>
 #include <libxfsm/xfsm-splash-rc.h>
 
-#include <settings/splash/module.h>
+#include "module.h"
 
 
 struct _Module
diff --git a/settings/splash/module.h b/settings/module.h
index 4e020ddc..4e020ddc 100644
--- a/settings/splash/module.h
+++ b/settings/module.h
diff --git a/settings/splash/nopreview.png b/settings/nopreview.png
index 100d61b2..100d61b2 100644
--- a/settings/splash/nopreview.png
+++ b/settings/nopreview.png
diff --git a/settings/session-editor.c b/settings/session-editor.c
new file mode 100644
index 00000000..1dde24ca
--- /dev/null
+++ b/settings/session-editor.c
@@ -0,0 +1,28 @@
+/*
+ *  Copyright (c) 2008 Brian Tarricone <bjt23@cornell.edu>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License ONLY.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glade/glade.h>
+
+void
+session_editor_init(GladeXML *gxml)
+{
+    /* FIXME: implementme! */
+}
diff --git a/settings/session/.cvsignore b/settings/session/.cvsignore
deleted file mode 100644
index 4dbabe43..00000000
--- a/settings/session/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-session_settings.la
-session_settings_la-session.lo
-xfce-session-settings.desktop
diff --git a/settings/session/Makefile.am b/settings/session/Makefile.am
deleted file mode 100644
index 80f4f4b4..00000000
--- a/settings/session/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-bin_PROGRAMS = xfce4-session-settings
-	
-
-xfce4_session_settings_SOURCES =					\
-	session.c
-
-xfce4_session_settings_CFLAGS =						\
-	-I$(top_srcdir)							\
-	$(LIBXFCEGUI4_CFLAGS)						\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	-DLOCALEDIR=\"$(localedir)\"					\
-	-DG_LOG_DOMAIN=\"xfce4-session-settings\"
-
-xfce4_session_settings_LDADD =						\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la				\
-	$(LIBXFCEGUI4_LIBS)						\
-	$(LIBXFCE4UTIL_LIBS)						\
-	$(DBUS_LIBS)	
-
-
-desktopdir = $(datadir)/applications
-desktop_in_files = xfce-session-settings.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST =								\
-	$(desktop_in_files)
-
-DISTCLEANFILES =							\
-	$(desktop_DATA)
-
diff --git a/settings/session/session.c b/settings/session/session.c
deleted file mode 100644
index d2d54580..00000000
--- a/settings/session/session.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2003-2006 Benedikt Meurer <benny@xfce.org>
- * Copyright (c) 2008 Jannis Pohlmann <jannis@xfce.org>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *                                                                              
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *                                                                              
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef XFCE_DISABLE_DEPRECATED
-#undef XFCE_DISABLE_DEPRECATED
-#endif
-
-#include <libxfce4util/libxfce4util.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-
-#define BORDER 6
-
-
-/*
-   Global variables
- */
-static GtkWidget    *dialog = NULL;
-static GtkWidget    *general_chooser;
-static GtkWidget    *general_autosave;
-static GtkWidget    *general_prompt;
-static GtkWidget    *advanced_kde;
-static GtkWidget    *advanced_gnome;
-static GtkWidget    *advanced_remote;
-static GtkTooltips  *tooltips;
-static gboolean      kiosk_can_chooser;
-static gboolean      kiosk_can_logout;
-static gboolean      kiosk_can_compat;
-static gboolean      kiosk_can_security;
-
-
-/*
-   Command line options
- */
-static gboolean      opt_socket_id;
-static GOptionEntry  entries[] =
-{
-  { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &opt_socket_id, N_("Settings manager socket"), N_("SOCKET ID") },
-  { NULL }
-};
-
-
-/*
-   Config
- */
-static XfceRc*
-config_open (gboolean readonly)
-{
-  return xfce_rc_config_open (XFCE_RESOURCE_CONFIG,
-                              "xfce4-session/xfce4-session.rc",
-                              readonly);
-}
-
-
-void
-config_store (void)
-{
-  XfceRc *rc;
-  
-  g_return_if_fail (dialog != NULL);
-  
-  rc = config_open (FALSE);
-
-  xfce_rc_set_group (rc, "General");
-  if (G_LIKELY (kiosk_can_logout))
-    {
-      xfce_rc_write_bool_entry (rc, "AutoSave", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_autosave)));
-      xfce_rc_write_bool_entry (rc, "PromptOnLogout", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_prompt)));
-    }
-  if (G_LIKELY (kiosk_can_security))
-    {
-      xfce_rc_write_bool_entry (rc, "DisableTcp", !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (advanced_remote)));
-    }
-
-  if (G_LIKELY (kiosk_can_compat))
-    {
-      xfce_rc_set_group (rc, "Compatibility");
-      xfce_rc_write_bool_entry (rc, "LaunchGnome", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (advanced_gnome)));
-      xfce_rc_write_bool_entry (rc, "LaunchKDE", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (advanced_kde)));
-    }
-
-  if (G_LIKELY (kiosk_can_chooser))
-    {
-      xfce_rc_set_group (rc, "Chooser");
-      xfce_rc_write_bool_entry (rc, "AlwaysDisplay", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_chooser)));
-    }
-
-  xfce_rc_close (rc);
-}
-
-
-
-/*
-   General tab
- */
-static GtkWidget*
-general_create (XfceRc *rc)
-{
-  GtkWidget *frame;
-  GtkWidget *page;
-  GtkWidget *vbox;
-  gboolean   autosave;
-  gboolean   prompt;
-  gboolean   chooser;
-
-  xfce_rc_set_group (rc, "General");
-  autosave = xfce_rc_read_bool_entry (rc, "AutoSave", FALSE);
-  prompt = xfce_rc_read_bool_entry (rc, "PromptOnLogout", TRUE);
-  xfce_rc_set_group (rc, "Chooser");
-  chooser = xfce_rc_read_bool_entry (rc, "AlwaysDisplay", FALSE);
-
-  page = gtk_vbox_new (FALSE, BORDER);
-  gtk_container_set_border_width (GTK_CONTAINER (page), BORDER);
-
-  frame = xfce_framebox_new (_("Session chooser"), TRUE);
-  gtk_box_pack_start (GTK_BOX (page), frame, FALSE, TRUE, 0);
-  vbox = gtk_vbox_new (FALSE, 0);
-  xfce_framebox_add (XFCE_FRAMEBOX (frame), vbox);
-
-  general_chooser = gtk_check_button_new_with_label (_("Display chooser "
-                                                       "on login"));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (general_chooser), chooser);
-  g_signal_connect (G_OBJECT (general_chooser), "toggled",
-                    G_CALLBACK (config_store), NULL);
-  gtk_widget_set_sensitive (general_chooser, kiosk_can_chooser);
-  gtk_box_pack_start (GTK_BOX (vbox), general_chooser, FALSE, TRUE, 0);
-  gtk_tooltips_set_tip (tooltips, general_chooser,
-                        _("If set, the session manager will ask you to choose "
-                          "a session every time you log in to Xfce."),
-                        NULL);
-
-  frame = xfce_framebox_new (_("Logout settings"), TRUE);
-  gtk_box_pack_start (GTK_BOX (page), frame, FALSE, TRUE, 0);
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_sensitive (vbox, kiosk_can_logout);
-  xfce_framebox_add (XFCE_FRAMEBOX (frame), vbox);
-
-  general_autosave = gtk_check_button_new_with_label (_("Automatically save session on logout"));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (general_autosave), autosave);
-  g_signal_connect (G_OBJECT (general_autosave), "toggled",
-                    G_CALLBACK (config_store), NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), general_autosave, FALSE, TRUE, 0);
-  gtk_tooltips_set_tip (tooltips, general_autosave,
-                        _("This option instructs the session manager to "
-                          "save the current session automatically when "
-                          "you log out. If you don't select this option "
-                          "you'll be prompted whether you want to save "
-                          "the current session on each logout."),
-                        NULL);
-
-  general_prompt = gtk_check_button_new_with_label (_("Prompt on logout"));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (general_prompt), prompt);
-  g_signal_connect (G_OBJECT (general_prompt), "toggled",
-                    G_CALLBACK (config_store), NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), general_prompt, FALSE, TRUE, 0);
-  gtk_tooltips_set_tip (tooltips, general_prompt,
-                        _("This option disables the logout confirmation "
-                          "dialog. Whether the session will be saved or not "
-                          "depends on whether you enabled the automatic "
-                          "saving of sessions on logout or not."),
-                        NULL);
-
-  return page;
-}
-
-
-
-/*
-   Advanced
- */
-static GtkWidget*
-advanced_create (XfceRc *rc)
-{
-  GtkWidget *frame;
-  GtkWidget *image;
-  GtkWidget *page;
-  GtkWidget *hbox;
-  GtkWidget *vbox;
-  GdkPixbuf *icon;
-  gboolean gnome;
-  gboolean kde;
-  gboolean remote;
-
-  xfce_rc_set_group (rc, "Compatibility");
-  gnome = xfce_rc_read_bool_entry (rc, "LaunchGnome", FALSE);
-  kde = xfce_rc_read_bool_entry (rc, "LaunchKDE", FALSE);
-  xfce_rc_set_group (rc, "General");
-  remote = !xfce_rc_read_bool_entry (rc, "DisableTcp", TRUE);
-
-  page = gtk_vbox_new (FALSE, BORDER);
-  gtk_container_set_border_width (GTK_CONTAINER (page), BORDER);
-
-  frame = xfce_framebox_new (_("Compatibility"), TRUE);
-  gtk_box_pack_start (GTK_BOX (page), frame, FALSE, TRUE, 0);
-  hbox = gtk_hbox_new (FALSE, 0);
-  xfce_framebox_add (XFCE_FRAMEBOX (frame), hbox);
-
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_widget_set_sensitive (vbox, kiosk_can_compat);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
-
-  advanced_gnome = gtk_check_button_new_with_label (_("Launch Gnome services on startup"));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_gnome), gnome);
-  g_signal_connect (G_OBJECT (advanced_gnome), "toggled",
-                    G_CALLBACK (config_store), NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), advanced_gnome, FALSE, TRUE, 0);
-  gtk_tooltips_set_tip (tooltips, advanced_gnome,
-                        _("Enable this if you plan to use Gnome applications. "
-                          "This will instruct the session manager to start "
-                          "some vital Gnome services for you. You should "
-                          "also enable this if you want to use the Assistive "
-                          "Technologies that ship with Gnome."),
-                        NULL);
-
-  advanced_kde = gtk_check_button_new_with_label (_("Launch KDE services on startup"));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_kde), kde);
-  g_signal_connect (G_OBJECT (advanced_kde), "toggled",
-                    G_CALLBACK (config_store), NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), advanced_kde, FALSE, TRUE, 0);
-  gtk_tooltips_set_tip (tooltips, advanced_kde,
-                        _("Enable this option if you plan to run KDE "
-                          "applications as part of your Xfce Desktop session. "
-                          "This will notably increase the startup time, but "
-                          "on the other hand, KDE applications will startup "
-                          "faster. Some KDE applications may not work at all "
-                          "if you don't enable this option."),
-                        NULL);
-
-  icon = xfce_themed_icon_load ("xfsm-gnome-kde-logo", 64);
-  image = gtk_image_new_from_pixbuf (icon);
-  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
-  g_object_unref (icon);
-
-  frame = xfce_framebox_new (_("Security"), TRUE);
-  gtk_box_pack_start (GTK_BOX (page), frame, FALSE, TRUE, 0);
-  vbox = gtk_vbox_new (FALSE, 0);
-  xfce_framebox_add (XFCE_FRAMEBOX (frame), vbox);
-
-  advanced_remote = gtk_check_button_new_with_label (_("Manage remote applications"));
-#ifdef HAVE__ICETRANSNOLISTEN
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_remote), remote);
-  gtk_widget_set_sensitive (advanced_remote, kiosk_can_security);
-#else
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (advanced_remote), TRUE);
-  gtk_widget_set_sensitive (advanced_remote, FALSE);
-#endif
-  g_signal_connect (G_OBJECT (advanced_remote), "toggled",
-                    G_CALLBACK (config_store), NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), advanced_remote, FALSE, TRUE, 0);
-  gtk_tooltips_set_tip (tooltips, advanced_remote,
-                        _("Allow the session manager to manage applications "
-                          "running on remote hosts. Do not enable this "
-                          "option unless you know what you are doing."),
-                        NULL);
-
-  return page;
-}
-
-
-
-static GtkWidget * 
-settings_dialog_new(GtkWidget **plug_child)
-{
-  GtkWidget *notebook;
-  GtkWidget *label;
-  GtkWidget *page;
-  GtkWidget *dbox;
-  XfceKiosk *kiosk;
-  XfceRc    *rc;
-
-  if (dialog != NULL)
-    {
-      gtk_window_present (GTK_WINDOW (dialog));
-      return dialog;
-    }
-
-  kiosk = xfce_kiosk_new ("xfce4-session");
-  kiosk_can_chooser = xfce_kiosk_query (kiosk, "Chooser") || xfce_kiosk_query (kiosk, "CustomizeChooser");
-  kiosk_can_logout = xfce_kiosk_query (kiosk, "Logout") || xfce_kiosk_query (kiosk, "CustomizeLogout");
-  kiosk_can_compat = xfce_kiosk_query (kiosk, "Compatibility") || xfce_kiosk_query (kiosk, "CustomizeCompatibility");
-  kiosk_can_security = xfce_kiosk_query (kiosk, "Security") || xfce_kiosk_query (kiosk, "CustomizeSecurity");
-  xfce_kiosk_free (kiosk);
-  tooltips = gtk_tooltips_new ();
-
-  rc = config_open (TRUE);
-
-  dialog = xfce_titled_dialog_new_with_buttons (_("Sessions and Startup"),
-                                                NULL,
-                                                GTK_DIALOG_NO_SEPARATOR,
-                                                GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
-                                                NULL);
-  gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-session");
-
-  dbox = GTK_DIALOG (dialog)->vbox;
-
-  notebook = gtk_notebook_new ();
-  gtk_box_pack_start (GTK_BOX (dbox), notebook, TRUE, TRUE, 0);
-  gtk_widget_show (notebook);
-  gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
-
-  *plug_child = notebook;
-
-  label = gtk_label_new (_("General"));
-  page = general_create (rc);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
-  gtk_widget_show_all (page);
-  gtk_widget_show (label);
-
-  label = gtk_label_new (_("Advanced"));
-  page = advanced_create (rc);
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
-  gtk_widget_show_all (page);
-  gtk_widget_show (label);
-
-  xfce_gtk_window_center_on_monitor_with_pointer (GTK_WINDOW (dialog));
-
-  xfce_rc_close (rc);
-
-  return dialog;
-}
-
-int
-main(int argc, char **argv)
-{
-  GtkWidget *plug;
-  GtkWidget *plug_child = NULL;
-  GError    *error = NULL;
-
-  #ifdef ENABLE_NLS
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
-  #endif
-
-  if (G_UNLIKELY (!gtk_init_with_args (&argc, &argv, "", entries, PACKAGE, &error)))
-    {
-      if (G_LIKELY (error != NULL))
-        {
-          g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
-          g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
-          g_print ("\n");
-
-          g_error_free (error);
-        }
-      
-      return EXIT_FAILURE;
-    }
-
-  dialog = settings_dialog_new(&plug_child);
-
-  if (G_UNLIKELY (opt_socket_id == 0))
-    {
-      gtk_dialog_run (GTK_DIALOG (dialog));
-      gtk_widget_destroy (dialog);
-    }
-  else
-    {
-      /* Create plug widget */
-      plug = gtk_plug_new (opt_socket_id);
-      gtk_widget_show (plug);
-
-      /* Reparent the plug child widget */
-      gtk_widget_reparent (plug_child, plug);
-      gtk_widget_show (plug_child);
-
-      /* Enter main loop */
-      gtk_main ();
-    }
-
-  return 0;
-}
diff --git a/settings/splash/splash.c b/settings/splash-settings.c
index d4bcb3ba..de5e4be6 100644
--- a/settings/splash/splash.c
+++ b/settings/splash-settings.c
@@ -38,18 +38,24 @@
 #undef XFCE_DISABLE_DEPRECATED
 #endif
 
+#include <xfconf/xfconf.h>
+
 #include <gdk-pixbuf/gdk-pixdata.h>
 #include <gmodule.h>
 #include <gtk/gtk.h>
 
+#include <glade/glade.h>
+
 #include <libxfcegui4/libxfcegui4.h>
 
 #include <libxfsm/xfsm-util.h>
 #include <libxfsm/xfsm-splash-engine.h>
 
-#include <settings/splash/module.h>
-#include <settings/splash/nopreview.h>
+#include "module.h"
+#include "nopreview.h"
+#include "xfce4-session-settings-common.h"
 
+#define SPLASH_ENGINE_PROP  "/splash/Engine"
 
 /*
    Prototypes
@@ -88,18 +94,6 @@ static GtkWidget   *splash_author0;
 static GtkWidget   *splash_author1;
 static GtkWidget   *splash_www0;
 static GtkWidget   *splash_www1;
-static GtkTooltips *tooltips = NULL;
-
-
-/*
-   Command line options
- */
-static gboolean     opt_socket_id;
-static GOptionEntry entries[] =
-{
-  { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &opt_socket_id, N_("Settings manager socket"), N_("SOCKET ID") },
-  { NULL }
-};
 
 
 /*
@@ -161,30 +155,6 @@ splash_unload_modules (void)
 }
 
 
-/*
-   Dialog
- */
-static gboolean
-splash_response (void)
-{
-  if (G_LIKELY (splash_dialog != NULL))
-    {
-      gtk_widget_destroy (splash_dialog);
-      splash_dialog = NULL;
-    }
-
-  if (G_LIKELY (tooltips != NULL))
-    {
-      gtk_object_destroy (GTK_OBJECT (tooltips));
-      tooltips = NULL;
-    }
-
-  splash_unload_modules ();
-
-  return TRUE;
-}
-
-
 static void
 splash_configure (void)
 {
@@ -226,22 +196,17 @@ splash_test (void)
 static void
 splash_selection_changed (GtkTreeSelection *selection)
 {
-  GtkTreeModel *model;
-  GtkTreeIter   iter;
-  const gchar  *str;
-  GdkPixbuf    *preview;
-  Module       *module;
-  XfceRc       *rc;
+  XfconfChannel *channel;
+  GtkTreeModel  *model;
+  GtkTreeIter    iter;
+  const gchar   *str;
+  GdkPixbuf     *preview;
+  Module        *module;
 
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     {
       gtk_tree_model_get (model, &iter, COLUMN_MODULE, &module, -1);
 
-      rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG,
-                                "xfce4-session/xfce4-session.rc",
-                                FALSE);
-      xfce_rc_set_group (rc, "Splash Screen");
-
       if (module != NULL)
         {
           str = module_descr (module);
@@ -306,8 +271,9 @@ splash_selection_changed (GtkTreeSelection *selection)
           gtk_image_set_from_pixbuf (GTK_IMAGE (splash_image), preview);
           g_object_unref (G_OBJECT (preview));
 
-          xfce_rc_write_entry (rc, "Engine", module_engine (module));
-          xfce_rc_flush (rc);
+          
+          channel = xfconf_channel_get (SETTINGS_CHANNEL);
+          xfconf_channel_set_string (channel, SPLASH_ENGINE_PROP, module_engine (module));
 
           gtk_widget_set_sensitive (splash_button_cfg, kiosk_can_splash
                                  && module_can_configure (module));
@@ -334,10 +300,9 @@ splash_selection_changed (GtkTreeSelection *selection)
           gtk_widget_set_sensitive (splash_button_cfg, FALSE);
           gtk_widget_set_sensitive (splash_button_test, FALSE);
 
-          xfce_rc_write_entry (rc, "Engine", "");
+          channel = xfconf_channel_get (SETTINGS_CHANNEL);
+          xfconf_channel_set_string (channel, SPLASH_ENGINE_PROP, "");
         }
-
-      xfce_rc_close (rc);
     }
 
   /* centering must be delayed! */
@@ -350,34 +315,27 @@ splash_selection_changed (GtkTreeSelection *selection)
 
 
 static void
-settings_dialog_new (GtkWidget **plug_child)
+splash_dialog_destroy (GtkWidget *widget,
+                       gpointer user_data)
 {
+  splash_unload_modules ();
+}
+
+
+void
+splash_settings_init (GladeXML *gxml)
+{
+  XfconfChannel     *channel;
   GtkTreeSelection  *selection;
   GtkTreeViewColumn *column;
   GtkCellRenderer   *renderer;
   GtkListStore      *store;
-  const gchar       *engine;
+  gchar             *engine;
   GtkTreePath       *path;
   GtkTreeIter        iter;
-  GtkWidget         *hbox;
-  GtkWidget         *vbox;
-  GtkWidget         *swin;
-  GtkWidget         *frame;
-  GtkWidget         *table;
   XfceKiosk         *kiosk;
-  XfceRc            *rc;
   GList             *lp;
 
-  if (G_UNLIKELY (splash_dialog != NULL))
-    {
-      gtk_window_present (GTK_WINDOW (splash_dialog));
-      return;
-    }
-
-  xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
-  tooltips = gtk_tooltips_new ();
-
   /* load splash modules */
   splash_load_modules ();
 
@@ -387,11 +345,8 @@ settings_dialog_new (GtkWidget **plug_child)
   xfce_kiosk_free (kiosk);
 
   /* load config */
-  rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG,
-                            "xfce4-session/xfce4-session.rc",
-                            TRUE);
-  xfce_rc_set_group (rc, "Splash Screen");
-  engine = xfce_rc_read_entry (rc, "Engine", "");
+  channel = xfconf_channel_get (SETTINGS_CHANNEL);
+  engine = xfconf_channel_get_string (channel, SPLASH_ENGINE_PROP, "");
 
   store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER);
   gtk_list_store_append (store, &iter);
@@ -416,50 +371,19 @@ settings_dialog_new (GtkWidget **plug_child)
         }
     }
 
-  xfce_rc_close (rc);
+  g_free (engine);
 
   splash_centered = FALSE;
-  splash_dialog = xfce_titled_dialog_new_with_buttons (_("Splash Screen Settings"),
-                                                       NULL,
-                                                       GTK_DIALOG_NO_SEPARATOR,
-                                                       GTK_STOCK_CLOSE,
-                                                       GTK_RESPONSE_CLOSE,
-                                                       NULL);
-  gtk_window_set_icon_name (GTK_WINDOW (splash_dialog), "xfce4-splash");
-
-  g_signal_connect (G_OBJECT (splash_dialog), "response",
-                    G_CALLBACK (splash_response), NULL);
-  g_signal_connect (G_OBJECT (splash_dialog), "delete-event",
-                    G_CALLBACK (splash_response), NULL);
-
-  hbox = gtk_hbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (splash_dialog)->vbox), hbox,
-                      TRUE, TRUE, 0);
-  gtk_widget_show (hbox);
-
-  *plug_child = hbox;
-
-  vbox = gtk_vbox_new (FALSE, 6);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-  gtk_widget_show (vbox);
-
-  swin = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin), 
-                                  GTK_POLICY_NEVER,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
-                                       GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), swin, TRUE, TRUE, 0);
-  gtk_widget_show (swin);
-  
-  splash_treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (splash_treeview), FALSE);
-  gtk_container_add (GTK_CONTAINER (swin), splash_treeview);
-  gtk_widget_set_sensitive (splash_treeview, kiosk_can_splash);
-  gtk_widget_show (splash_treeview);
+
+  splash_treeview = glade_xml_get_widget (gxml, "treeview_splash");
+  gtk_tree_view_set_model (GTK_TREE_VIEW (splash_treeview), GTK_TREE_MODEL (store));
   g_object_unref (G_OBJECT (store));
 
+  /* FIXME: this won't work right when we embed */
+  splash_dialog = gtk_widget_get_toplevel (splash_treeview);
+  g_signal_connect (G_OBJECT (splash_dialog), "destroy",
+                    G_CALLBACK (splash_dialog_destroy), NULL);
+
   /* add tree view column */
   column = gtk_tree_view_column_new ();
   renderer = gtk_cell_renderer_text_new ();
@@ -469,108 +393,24 @@ settings_dialog_new (GtkWidget **plug_child)
                                        NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (splash_treeview), column);
 
-  splash_button_cfg = xfsm_imgbtn_new (_("Configure"), GTK_STOCK_PREFERENCES,
-                                       NULL);
-  gtk_widget_set_sensitive (splash_button_cfg, FALSE);
+  splash_button_cfg = glade_xml_get_widget (gxml, "btn_splash_configure");
   g_signal_connect (G_OBJECT (splash_button_cfg), "clicked",
                     splash_configure, NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), splash_button_cfg, FALSE, FALSE, 0);
-  gtk_widget_show (splash_button_cfg);
-  gtk_tooltips_set_tip (tooltips, splash_button_cfg,
-                        _("Opens the configuration panel for the selected "
-                          "splash screen."),
-                        NULL);
-
-  splash_button_test = xfsm_imgbtn_new (_("Test"), GTK_STOCK_EXECUTE, NULL);
-  gtk_widget_set_sensitive (splash_button_test, FALSE);
+
+  splash_button_test = glade_xml_get_widget (gxml, "btn_splash_test");
   g_signal_connect (G_OBJECT (splash_button_test), "clicked",
                     splash_test, NULL);
-  gtk_box_pack_start (GTK_BOX (vbox), splash_button_test, FALSE, FALSE, 0);
-  gtk_widget_show (splash_button_test);
-  gtk_tooltips_set_tip (tooltips, splash_button_test,
-                        _("Demonstrates the selected splash screen."),
-                        NULL);
-
-  vbox = gtk_vbox_new (FALSE, 6);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
-  gtk_widget_show (vbox);
-
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-  gtk_widget_show (frame);
-
-  splash_image = gtk_image_new ();
-  gtk_container_add (GTK_CONTAINER (frame), splash_image);
-  gtk_widget_show (splash_image);
-
-  frame = gtk_frame_new (_("Information"));
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
-  gtk_widget_show (frame);
-
-  table = gtk_table_new (4, 2, FALSE);
-  gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-  gtk_container_set_border_width (GTK_CONTAINER (table), 6);
-  gtk_container_add (GTK_CONTAINER (frame), table);
-  gtk_widget_show (table);
-
-  splash_descr0 = gtk_label_new (_("<b>Description:</b>"));
-  gtk_label_set_use_markup (GTK_LABEL (splash_descr0), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_descr0), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_descr0,
-                    0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_descr0);
-
-  splash_descr1 = gtk_label_new ("");
-  gtk_label_set_selectable (GTK_LABEL (splash_descr1), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_descr1), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_descr1,
-                    1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_descr1);
-
-  splash_version0 = gtk_label_new (_("<b>Version:</b>"));
-  gtk_label_set_use_markup (GTK_LABEL (splash_version0), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_version0), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_version0,
-                    0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_version0);
-
-  splash_version1 = gtk_label_new ("");
-  gtk_label_set_selectable (GTK_LABEL (splash_version1), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_version1), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_version1,
-                    1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_version1);
-
-  splash_author0 = gtk_label_new (_("<b>Author:</b>"));
-  gtk_label_set_use_markup (GTK_LABEL (splash_author0), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_author0), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_author0,
-                    0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_author0);
-
-  splash_author1 = gtk_label_new ("");
-  gtk_label_set_selectable (GTK_LABEL (splash_author1), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_author1), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_author1,
-                    1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_author1);
-
-  splash_www0 = gtk_label_new (_("<b>Homepage:</b>"));
-  gtk_label_set_use_markup (GTK_LABEL (splash_www0), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_www0), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_www0,
-                    0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_www0);
-
-  splash_www1 = gtk_label_new ("");
-  gtk_label_set_selectable (GTK_LABEL (splash_www1), TRUE);
-  gtk_misc_set_alignment (GTK_MISC (splash_www1), 0, 0);
-  gtk_table_attach (GTK_TABLE (table), splash_www1,
-                    1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
-  gtk_widget_show (splash_www1);
+
+  splash_image = glade_xml_get_widget (gxml, "img_splash_preview");
+
+  splash_descr0 = glade_xml_get_widget (gxml, "lbl_splash_desc0");
+  splash_version0 = glade_xml_get_widget (gxml, "lbl_splash_version0");
+  splash_author0 = glade_xml_get_widget (gxml, "lbl_splash_author0");
+  splash_www0 = glade_xml_get_widget (gxml, "lbl_splash_homepage0");
+  splash_descr1 = glade_xml_get_widget (gxml, "lbl_splash_desc1");
+  splash_version1 = glade_xml_get_widget (gxml, "lbl_splash_version1");
+  splash_author1 = glade_xml_get_widget (gxml, "lbl_splash_author1");
+  splash_www1 = glade_xml_get_widget (gxml, "lbl_splash_homepage1");
 
   /* handle selection */
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (splash_treeview));
@@ -582,55 +422,3 @@ settings_dialog_new (GtkWidget **plug_child)
                                 TRUE, 0.5, 0.0);
   gtk_tree_path_free (path);
 }
-
-int
-main(int argc, char **argv)
-{
-  GtkWidget *plug;
-  GtkWidget *plug_child = NULL;
-  GError    *error = NULL;
-
-  #ifdef ENABLE_NLS
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
-  #endif
-
-  if (G_UNLIKELY (!gtk_init_with_args (&argc, &argv, "", entries, PACKAGE, &error)))
-    {
-      if (G_LIKELY (error != NULL))
-        {
-          g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
-          g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
-          g_print ("\n");
-
-          g_error_free (error);
-        }
-      
-      return EXIT_FAILURE;
-    }
-
-  settings_dialog_new (&plug_child);
-
-  if (G_UNLIKELY (opt_socket_id == 0))
-    {
-      gtk_dialog_run (GTK_DIALOG (splash_dialog));
-    }
-  else
-    {
-      /* Create plug widget */
-      plug = gtk_plug_new (opt_socket_id);
-      gtk_widget_show (plug);
-
-      /* Reparent the plug child widget */
-      gtk_widget_reparent (plug_child, plug);
-      gtk_widget_show (plug_child);
-
-      splash_unload_modules ();
-
-      /* Enter main loop */
-      gtk_main ();
-    }
-
-  return 0;
-}
diff --git a/settings/splash/.cvsignore b/settings/splash/.cvsignore
deleted file mode 100644
index 809f5665..00000000
--- a/settings/splash/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-splash_settings.la
-splash_settings_la-module.lo
-splash_settings_la-splash.lo
-xfce-splash-settings.desktop
diff --git a/settings/splash/Makefile.am b/settings/splash/Makefile.am
deleted file mode 100644
index 21cb804b..00000000
--- a/settings/splash/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-bin_PROGRAMS = xfce4-splash-settings
-	
-
-xfce4_splash_settings_SOURCES =						\
-	module.c							\
-	module.h							\
-	nopreview.h							\
-	splash.c
-
-xfce4_splash_settings_CFLAGS =						\
-	-I$(top_srcdir)							\
-	$(LIBXFCEGUI4_CFLAGS)						\
-	$(LIBXFCE4UTIL_CFLAGS)						\
-	-DMODULESDIR=\"$(libdir)/xfce4/splash/engines\"			\
-	-DLOCALEDIR=\"$(localedir)\"					\
-	-DG_LOG_DOMAIN=\"xfce4-splash-settings\"
-
-xfce4_splash_settings_LDADD =						\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la \
-	$(LIBXFCEGUI4_LIBS)						\
-	$(LIBXFCE4UTIL_LIBS)						\
-	$(DBUS_LIBS)	
-
-xfce4_splash_settings_DEPENDENCIES =					\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
-
-nopreview.h: $(srcdir)/nopreview.png
-	gdk-pixbuf-csource --struct --name=nopreview			\
-		$(srcdir)/nopreview.png > nopreview.h
-
-desktopdir = $(datadir)/applications
-desktop_in_files = xfce-splash-settings.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST =								\
-	nopreview.h							\
-	nopreview.png							\
-	$(desktop_in_files)
-
-DISTCLEANFILES =							\
-	$(desktop_DATA)
-
diff --git a/settings/splash/nopreview.h b/settings/splash/nopreview.h
deleted file mode 100644
index 5cbceee0..00000000
--- a/settings/splash/nopreview.h
+++ /dev/null
@@ -1,675 +0,0 @@
-/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
-
-static const GdkPixdata nopreview = {
-  0x47646b50, /* Pixbuf magic: 'GdkP' */
-  24 + 20181, /* header length + pixel_data length */
-  0x2010002, /* pixdata_type */
-  1280, /* rowstride */
-  320, /* width */
-  240, /* height */
-  /* pixel_data: */
-  (guchar *)"\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\251\0\0\0\0"
-  "\206\0\0\0\1\216\0\0\0\0\204\0\0\0\1\210\0\0\0\0\204\0\0\0\1\373\0\0"
-  "\0\0\216\0\0\0\1\377\0\0\0\0\220\0\0\0\0\215\0\0\0\1\210\0\0\0\0\226"
-  "\0\0\0\1\366\0\0\0\0\203\0\0\0\1\213\0\0\0\2\205\0\0\0\1\275\0\0\0\0"
-  "\210\0\0\0\1\305\0\0\0\0\204\0\0\0\1\203\0\0\0\2\204\0\0\0\3\202\0\0"
-  "\0\2\203\0\0\0\1\206\0\0\0\0\203\0\0\0\1\207\0\0\0\2\204\0\0\0\1\207"
-  "\0\0\0\2\203\0\0\0\1\364\0\0\0\0\202\0\0\0\1\2\0\0\0\2\0\0\0\3\202\0"
-  "\0\0\4\203\0\0\0\5\205\0\0\0\4\202\0\0\0\3\202\0\0\0\2\203\0\0\0\1\273"
-  "\0\0\0\0\203\0\0\0\1\204\0\0\0\2\203\0\0\0\1\303\0\0\0\0\202\0\0\0\1"
-  "\202\0\0\0\2\2\0\0\0\3\0\0\0\4\202\0\0\0\377\1\0\0\0\5\203\0\0\0\6\4"
-  "\0\0\0\5\0\0\0\4\0\0\0\3\0\0\0\2\202\0\0\0\1\204\0\0\0\0\202\0\0\0\1"
-  "\202\0\0\0\377\202\0\0\0\4\202\0\0\0\5\202\0\0\0\4\1\0\0\0\3\203\0\0"
-  "\0\2\202\0\0\0\377\202\0\0\0\4\202\0\0\0\5\202\0\0\0\4\202\0\0\0\2\202"
-  "\0\0\0\1\362\0\0\0\0\202\0\0\0\1\203\0\0\0\377\2\0\0\0^\0\0\0\10\203"
-  "\0\0\0\11\1\0\0\0\10\202\0\0\0\377\204\0\0\0\6\4\0\0\0\5\0\0\0\4\0\0"
-  "\0\3\0\0\0\2\206\0\0\0\1\217\0\0\0\0\205\0\0\0\1\207\0\0\0\0\206\0\0"
-  "\0\1\202\0\0\0\0\205\0\0\0\1\213\0\0\0\0\203\0\0\0\1\202\0\0\0\377\1"
-  "\0\0\0\3\204\0\0\0\4\1\0\0\0\3\202\0\0\0\2\206\0\0\0\1\236\0\0\0\0\206"
-  "\0\0\0\1\221\0\0\0\0\210\0\0\0\1\202\0\0\0\377\4\0\0\0\3\0\0\0\4\0\0"
-  "\0\5\0\0\0\6\202\0\0\0\377\1\0\0\0\10\203\0\0\0\11\4\0\0\0\7\0\0\0\6"
-  "\0\0\0\5\0\0\0\4\202\0\0\0\2\205\0\0\0\1\1\0\0\0\2\202\0\0\0\377\2\0"
-  "\0\0\6\0\0\0\7\202\0\0\0\10\202\0\0\0\7\1\0\0\0\6\203\0\0\0\4\202\0\0"
-  "\0\377\2\0\0\0\6\0\0\0\7\202\0\0\0\10\5\0\0\0\7\0\0\0\6\0\0\0\5\0\0\0"
-  "\3\0\0\0\2\205\0\0\0\1\355\0\0\0\0\202\0\0\0\1\1\0\0\0\2\202\0\0\0\377"
-  "\2\0\0\0\365\0\0\0\325\204\0\0\0\16\1\0\0\0\15\202\0\0\0\377\202\0\0"
-  "\0\12\202\0\0\0\11\5\0\0\0\10\0\0\0\7\0\0\0\5\0\0\0\4\0\0\0\3\203\0\0"
-  "\0\2\205\0\0\0\1\210\0\0\0\0\252\0\0\0\1\1\0\0\0\2\202\0\0\0\377\1\0"
-  "\0\0\5\204\0\0\0\6\3\0\0\0\5\0\0\0\4\0\0\0\3\204\0\0\0\2\226\0\0\0\1"
-  "\207\0\0\0\0\236\0\0\0\1\204\0\0\0\2\202\0\0\0\377\4\0\0\0\5\0\0\0\6"
-  "\0\0\0\7\0\0\0\11\202\0\0\0\377\1\0\0\0\14\203\0\0\0\15\6\0\0\0\14\0"
-  "\0\0\11\0\0\0\7\0\0\0\6\0\0\0\4\0\0\0\3\204\0\0\0\2\2\0\0\0\3\0\0\0\4"
-  "\202\0\0\0\377\2\0\0\0\11\0\0\0\13\203\0\0\0\14\3\0\0\0\12\0\0\0\11\0"
-  "\0\0\7\202\0\0\0\6\202\0\0\0\377\2\0\0\0\11\0\0\0\13\202\0\0\0\14\6\0"
-  "\0\0\13\0\0\0\11\0\0\0\7\0\0\0\6\0\0\0\4\0\0\0\3\202\0\0\0\2\206\0\0"
-  "\0\1\351\0\0\0\0\3\0\0\0\1\0\0\0\2\0\0\0\4\202\0\0\0\377\3\0\0\0\224"
-  "\0\0\0\377\0\0\0\\\202\0\0\0\25\2\0\0\0\24\0\0\0\23\202\0\0\0\377\202"
-  "\0\0\0\17\7\0\0\0\16\0\0\0\15\0\0\0\14\0\0\0\12\0\0\0\10\0\0\0\7\0\0"
-  "\0\6\204\0\0\0\4\1\0\0\0\3\203\0\0\0\2\203\0\0\0\1\203\0\0\0\0\203\0"
-  "\0\0\1\202\0\0\0\2\202\0\0\0\3\203\0\0\0\4\202\0\0\0\3\204\0\0\0\2\213"
-  "\0\0\0\3\204\0\0\0\4\202\0\0\0\3\212\0\0\0\2\6\0\0\0\3\0\0\0\4\0\0\0"
-  "\5\0\0\0\6\0\0\0\7\0\0\0\10\202\0\0\0\11\4\0\0\0\10\0\0\0\7\0\0\0\6\0"
-  "\0\0\5\206\0\0\0\4\202\0\0\0\3\220\0\0\0\2\205\0\0\0\1\202\0\0\0\0\203"
-  "\0\0\0\1\202\0\0\0\2\202\0\0\0\3\202\0\0\0\4\202\0\0\0\3\221\0\0\0\2"
-  "\202\0\0\0\3\206\0\0\0\4\6\0\0\0\5\0\0\0\6\0\0\0\7\0\0\0\11\0\0\0\12"
-  "\0\0\0\14\202\0\0\0\377\1\0\0\0\21\203\0\0\0\22\7\0\0\0\20\0\0\0\15\0"
-  "\0\0\13\0\0\0\11\0\0\0\7\0\0\0\6\0\0\0\5\203\0\0\0\4\2\0\0\0\5\0\0\0"
-  "\6\202\0\0\0\377\10\0\0\0\15\0\0\0\20\0\0\0\21\0\0\0\22\0\0\0\21\0\0"
-  "\0\17\0\0\0\15\0\0\0\12\202\0\0\0\11\202\0\0\0\377\2\0\0\0\15\0\0\0\17"
-  "\202\0\0\0\21\6\0\0\0\17\0\0\0\15\0\0\0\12\0\0\0\10\0\0\0\6\0\0\0\5\203"
-  "\0\0\0\4\202\0\0\0\3\202\0\0\0\2\203\0\0\0\1\346\0\0\0\0\202\0\0\0\1"
-  "\2\0\0\0\2\0\0\0\5\202\0\0\0\377\7\0\0\0)\0\0\0\371\0\0\0\317\0\0\0\34"
-  "\0\0\0\35\0\0\0\34\0\0\0\32\202\0\0\0\377\202\0\0\0\25\7\0\0\0\24\0\0"
-  "\0\22\0\0\0\21\0\0\0\16\0\0\0\14\0\0\0\12\0\0\0\11\203\0\0\0\7\202\0"
-  "\0\0\6\3\0\0\0\5\0\0\0\4\0\0\0\3\202\0\0\0\2\205\0\0\0\1\5\0\0\0\2\0"
-  "\0\0\3\0\0\0\4\0\0\0\5\0\0\0\6\204\0\0\0\7\203\0\0\0\6\202\0\0\0\5\204"
-  "\0\0\0\6\1\0\0\0\7\207\0\0\0\6\204\0\0\0\7\203\0\0\0\6\1\0\0\0\5\210"
-  "\0\0\0\4\5\0\0\0\5\0\0\0\6\0\0\0\7\0\0\0\11\0\0\0\12\203\0\0\0\14\4\0"
-  "\0\0\13\0\0\0\12\0\0\0\11\0\0\0\10\206\0\0\0\7\203\0\0\0\6\202\0\0\0"
-  "\5\215\0\0\0\4\1\0\0\0\3\202\0\0\0\2\205\0\0\0\1\202\0\0\0\2\202\0\0"
-  "\0\4\202\0\0\0\6\202\0\0\0\7\203\0\0\0\6\1\0\0\0\5\216\0\0\0\4\1\0\0"
-  "\0\5\202\0\0\0\6\206\0\0\0\7\6\0\0\0\10\0\0\0\11\0\0\0\12\0\0\0\14\0"
-  "\0\0\17\0\0\0\21\202\0\0\0\377\1\0\0\0\26\203\0\0\0\27\6\0\0\0\25\0\0"
-  "\0\22\0\0\0\17\0\0\0\14\0\0\0\12\0\0\0\11\202\0\0\0\10\4\0\0\0\7\0\0"
-  "\0\10\0\0\0\11\0\0\0\12\202\0\0\0\377\10\0\0\0\22\0\0\0\25\0\0\0\27\0"
-  "\0\0\30\0\0\0\27\0\0\0\24\0\0\0\22\0\0\0\17\202\0\0\0\15\202\0\0\0\377"
-  "\2\0\0\0\22\0\0\0\24\202\0\0\0\25\6\0\0\0\24\0\0\0\21\0\0\0\16\0\0\0"
-  "\14\0\0\0\12\0\0\0\11\203\0\0\0\7\202\0\0\0\6\2\0\0\0\5\0\0\0\4\202\0"
-  "\0\0\2\202\0\0\0\1\345\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\3\0\0\0\6\202"
-  "\0\0\0\377\7\0\0\0\25\0\0\0\243\0\0\0\377\0\0\0_\0\0\0%\0\0\0$\0\0\0"
-  "\"\202\0\0\0\377\7\0\0\0\34\0\0\0\33\0\0\0\32\0\0\0\30\0\0\0\26\0\0\0"
-  "n\0\0\0\314\202\0\0\0\365\2\0\0\0\313\0\0\0h\202\0\0\0\13\7\0\0\0\12"
-  "\0\0\0\11\0\0\0\7\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\2\202\0\0\0\1\1\0\0\0"
-  "\2\202\0\0\0\377\10\0\0\0\33\0\0\0\225\0\0\0\350\0\0\0\367\0\0\0\302"
-  "\0\0\0""7\0\0\0\14\0\0\0\13\202\0\0\0\12\202\0\0\0\377\5\0\0\0\13\0\0"
-  "\0j\0\0\0\320\0\0\0\371\0\0\0\364\202\0\0\0\13\10\0\0\0\12\0\0\0I\0\0"
-  "\0\266\0\0\0\355\0\0\0\372\0\0\0\341\0\0\0\230\0\0\0\37\202\0\0\0\14"
-  "\5\0\0\0\13\0\0\0\322\0\0\0\377\0\0\0T\0\0\0\10\203\0\0\0\7\6\0\0\0N"
-  "\0\0\0\377\0\0\0\320\0\0\0\7\0\0\0\10\0\0\0\11\202\0\0\0\377\2\0\0\0"
-  "\16\0\0\0\17\202\0\0\0\20\10\0\0\0\17\0\0\0L\0\0\0\267\0\0\0\355\0\0"
-  "\0\372\0\0\0\341\0\0\0\230\0\0\0\37\202\0\0\0\14\4\0\0\0\13\0\0\0\341"
-  "\0\0\0\377\0\0\0-\203\0\0\0\10\3\0\0\0\324\0\0\0\355\0\0\0\13\202\0\0"
-  "\0\10\3\0\0\0.\0\0\0\377\0\0\0\341\202\0\0\0\7\202\0\0\0\6\202\0\0\0"
-  "\4\202\0\0\0\2\202\0\0\0\1\7\0\0\0\256\0\0\0\327\0\0\0\363\0\0\0\374"
-  "\0\0\0\357\0\0\0\303\0\0\0\\\203\0\0\0\13\4\0\0\0\12\0\0\0\322\0\0\0"
-  "\377\0\0\0S\204\0\0\0\7\4\0\0\0N\0\0\0\377\0\0\0\320\0\0\0\6\202\0\0"
-  "\0\7\7\0\0\0\257\0\0\0\330\0\0\0\363\0\0\0\374\0\0\0\360\0\0\0\303\0"
-  "\0\0\\\203\0\0\0\14\202\0\0\0\13\202\0\0\0\377\4\0\0\0\16\0\0\0\21\0"
-  "\0\0\22\0\0\0\25\202\0\0\0\377\1\0\0\0\33\202\0\0\0\35\10\0\0\0\34\0"
-  "\0\0\265\0\0\0\333\0\0\0\364\0\0\0\374\0\0\0\360\0\0\0\304\0\0\0]\203"
-  "\0\0\0\14\2\0\0\0\15\0\0\0\16\202\0\0\0\377\12\0\0\0*\0\0\0\241\0\0\0"
-  "\353\0\0\0\367\0\0\0\305\0\0\0A\0\0\0\30\0\0\0\25\0\0\0\23\0\0\0\22\202"
-  "\0\0\0\377\2\0\0\0\27\0\0\0\32\202\0\0\0\33\20\0\0\0\31\0\0\0R\0\0\0"
-  "\271\0\0\0\355\0\0\0\372\0\0\0\342\0\0\0\230\0\0\0\37\0\0\0\14\0\0\0"
-  "\13\0\0\0\12\0\0\0\11\0\0\0\7\0\0\0\5\0\0\0\4\0\0\0\2\202\0\0\0\1\344"
-  "\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\7\202\0\0\0\377\7\0\0\0\31\0"
-  "\0\0=\0\0\0\374\0\0\0\312\0\0\0,\0\0\0+\0\0\0*\202\0\0\0\377\5\0\0\0"
-  "#\0\0\0\"\0\0\0\40\0\0\0\37\0\0\0\246\206\0\0\0\377\11\0\0\0\241\0\0"
-  "\0\21\0\0\0\17\0\0\0\16\0\0\0\14\0\0\0\11\0\0\0\7\0\0\0\5\0\0\0\4\202"
-  "\0\0\0\2\1\0\0\0\3\202\0\0\0\377\1\0\0\0\347\204\0\0\0\377\5\0\0\0\353"
-  "\0\0\0&\0\0\0\22\0\0\0\21\0\0\0\17\202\0\0\0\377\1\0\0\0\302\204\0\0"
-  "\0\377\202\0\0\0\21\1\0\0\0\200\206\0\0\0\377\10\0\0\0\336\0\0\0\"\0"
-  "\0\0\22\0\0\0\21\0\0\0y\0\0\0\377\0\0\0\250\0\0\0\15\202\0\0\0\14\7\0"
-  "\0\0\13\0\0\0\240\0\0\0\377\0\0\0u\0\0\0\13\0\0\0\14\0\0\0\15\202\0\0"
-  "\0\377\1\0\0\0\22\203\0\0\0\24\1\0\0\0\202\206\0\0\0\377\7\0\0\0\336"
-  "\0\0\0!\0\0\0\22\0\0\0\21\0\0\0\247\0\0\0\377\0\0\0`\202\0\0\0\15\1\0"
-  "\0\0-\202\0\0\0\377\1\0\0\0H\202\0\0\0\15\13\0\0\0^\0\0\0\377\0\0\0\246"
-  "\0\0\0\14\0\0\0\13\0\0\0\12\0\0\0\11\0\0\0\7\0\0\0\6\0\0\0\4\0\0\0\3"
-  "\202\0\0\0\2\207\0\0\0\377\10\0\0\0l\0\0\0\22\0\0\0\21\0\0\0\20\0\0\0"
-  "x\0\0\0\377\0\0\0\247\0\0\0\14\202\0\0\0\13\4\0\0\0\12\0\0\0\240\0\0"
-  "\0\377\0\0\0u\203\0\0\0\12\207\0\0\0\377\1\0\0\0m\202\0\0\0\22\202\0"
-  "\0\0\21\202\0\0\0\377\4\0\0\0\22\0\0\0\25\0\0\0\27\0\0\0\31\202\0\0\0"
-  "\377\4\0\0\0\40\0\0\0!\0\0\0\"\0\0\0!\207\0\0\0\377\1\0\0\0n\203\0\0"
-  "\0\23\1\0\0\0\24\202\0\0\0\377\1\0\0\0\351\204\0\0\0\377\5\0\0\0\355"
-  "\0\0\0""1\0\0\0\34\0\0\0\31\0\0\0\30\202\0\0\0\377\2\0\0\0\34\0\0\0\37"
-  "\202\0\0\0\40\1\0\0\0\207\206\0\0\0\377\12\0\0\0\336\0\0\0!\0\0\0\21"
-  "\0\0\0\20\0\0\0\15\0\0\0\13\0\0\0\10\0\0\0\6\0\0\0\4\0\0\0\2\202\0\0"
-  "\0\1\343\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\11\202\0\0\0\377\7\0"
-  "\0\0\35\0\0\0%\0\0\0\262\0\0\0\377\0\0\0a\0\0\0""2\0\0\0""0\202\0\0\0"
-  "\377\24\0\0\0*\0\0\0(\0\0\0'\0\0\0j\0\0\0\377\0\0\0\364\0\0\0n\0\0\0"
-  "&\0\0\0$\0\0\0m\0\0\0\364\0\0\0\377\0\0\0`\0\0\0\26\0\0\0\24\0\0\0\21"
-  "\0\0\0\16\0\0\0\12\0\0\0\10\0\0\0\6\203\0\0\0\4\202\0\0\0\377\12\0\0"
-  "\0\302\0\0\0J\0\0\0\32\0\0\0=\0\0\0\331\0\0\0\377\0\0\0\222\0\0\0\31"
-  "\0\0\0\30\0\0\0\27\202\0\0\0\377\4\0\0\0\351\0\0\0v\0\0\0+\0\0\0\27\202"
-  "\0\0\0\30\26\0\0\0N\0\0\0\376\0\0\0\341\0\0\0^\0\0\0$\0\0\0\35\0\0\0"
-  "B\0\0\0\300\0\0\0\377\0\0\0\225\0\0\0\33\0\0\0\31\0\0\0*\0\0\0\372\0"
-  "\0\0\362\0\0\0\31\0\0\0\22\0\0\0\21\0\0\0\24\0\0\0\354\0\0\0\372\0\0"
-  "\0#\202\0\0\0\21\1\0\0\0\22\202\0\0\0\377\25\0\0\0\27\0\0\0\30\0\0\0"
-  "\31\0\0\0P\0\0\0\376\0\0\0\341\0\0\0^\0\0\0$\0\0\0\35\0\0\0B\0\0\0\300"
-  "\0\0\0\377\0\0\0\225\0\0\0\32\0\0\0\31\0\0\0p\0\0\0\377\0\0\0\223\0\0"
-  "\0\24\0\0\0\23\0\0\0{\202\0\0\0\367\1\0\0\0\226\202\0\0\0\24\12\0\0\0"
-  "\214\0\0\0\377\0\0\0n\0\0\0\22\0\0\0\21\0\0\0\17\0\0\0\15\0\0\0\12\0"
-  "\0\0\10\0\0\0\6\203\0\0\0\4\25\0\0\0\5\0\0\0\7\0\0\0\12\0\0\0\17\0\0"
-  "\0,\0\0\0\234\0\0\0\377\0\0\0\332\0\0\0\32\0\0\0\31\0\0\0\27\0\0\0(\0"
-  "\0\0\372\0\0\0\362\0\0\0\30\0\0\0\21\0\0\0\20\0\0\0\23\0\0\0\354\0\0"
-  "\0\372\0\0\0\"\202\0\0\0\17\202\0\0\0\20\202\0\0\0\21\11\0\0\0\24\0\0"
-  "\0/\0\0\0\236\0\0\0\377\0\0\0\332\0\0\0\32\0\0\0\31\0\0\0\30\0\0\0\27"
-  "\202\0\0\0\377\4\0\0\0\27\0\0\0\31\0\0\0\33\0\0\0\35\202\0\0\0\377\6"
-  "\0\0\0#\0\0\0%\0\0\0&\0\0\0%\0\0\0\"\0\0\0\37\202\0\0\0\34\4\0\0\0""3"
-  "\0\0\0\236\0\0\0\377\0\0\0\332\204\0\0\0\32\202\0\0\0\377\12\0\0\0\307"
-  "\0\0\0]\0\0\0""1\0\0\0N\0\0\0\333\0\0\0\377\0\0\0\227\0\0\0#\0\0\0\40"
-  "\0\0\0\36\202\0\0\0\377\27\0\0\0\"\0\0\0#\0\0\0%\0\0\0Y\0\0\0\376\0\0"
-  "\0\342\0\0\0c\0\0\0(\0\0\0\37\0\0\0C\0\0\0\300\0\0\0\377\0\0\0\225\0"
-  "\0\0\31\0\0\0\27\0\0\0\24\0\0\0\20\0\0\0\14\0\0\0\11\0\0\0\6\0\0\0\4"
-  "\0\0\0\2\0\0\0\1\343\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\5\0\0\0\11\202\0"
-  "\0\0\377\7\0\0\0\37\0\0\0'\0\0\0P\0\0\0\376\0\0\0\305\0\0\0""7\0\0\0"
-  "5\202\0\0\0\377\7\0\0\0/\0\0\0.\0\0\0-\0\0\0\304\0\0\0\377\0\0\0|\0\0"
-  "\0\"\203\0\0\0\40\15\0\0\0|\0\0\0\377\0\0\0\300\0\0\0\35\0\0\0\33\0\0"
-  "\0\27\0\0\0\23\0\0\0\17\0\0\0\13\0\0\0\10\0\0\0\6\0\0\0\5\0\0\0\6\202"
-  "\0\0\0\377\12\0\0\0\22\0\0\0\25\0\0\0\32\0\0\0\35\0\0\0a\0\0\0\377\0"
-  "\0\0\325\0\0\0!\0\0\0\40\0\0\0\36\202\0\0\0\377\3\0\0\0-\0\0\0\35\0\0"
-  "\0\36\203\0\0\0\37\26\0\0\0\267\0\0\0\377\0\0\0F\0\0\0\37\0\0\0\40\0"
-  "\0\0!\0\0\0#\0\0\0""9\0\0\0\377\0\0\0\334\0\0\0$\0\0\0\"\0\0\0\40\0\0"
-  "\0\271\0\0\0\377\0\0\0_\0\0\0\30\0\0\0\27\0\0\0S\0\0\0\377\0\0\0\265"
-  "\0\0\0\26\202\0\0\0\27\1\0\0\0\30\202\0\0\0\377\25\0\0\0\34\0\0\0\35"
-  "\0\0\0\36\0\0\0\267\0\0\0\377\0\0\0E\0\0\0\35\0\0\0\37\0\0\0\40\0\0\0"
-  "\"\0\0\0""8\0\0\0\377\0\0\0\334\0\0\0$\0\0\0\"\0\0\0>\0\0\0\377\0\0\0"
-  "\302\0\0\0\33\0\0\0\32\0\0\0\306\202\0\0\0\271\1\0\0\0\341\202\0\0\0"
-  "\34\13\0\0\0\271\0\0\0\377\0\0\0""9\0\0\0\31\0\0\0\27\0\0\0\25\0\0\0"
-  "\22\0\0\0\17\0\0\0\13\0\0\0\10\0\0\0\6\202\0\0\0\5\10\0\0\0\6\0\0\0\11"
-  "\0\0\0\15\0\0\0\22\0\0\0\27\0\0\0$\0\0\0\377\0\0\0\373\202\0\0\0\"\12"
-  "\0\0\0\40\0\0\0\35\0\0\0\270\0\0\0\377\0\0\0]\0\0\0\27\0\0\0\26\0\0\0"
-  "R\0\0\0\377\0\0\0\265\206\0\0\0\25\6\0\0\0\27\0\0\0\30\0\0\0\33\0\0\0"
-  "'\0\0\0\377\0\0\0\373\202\0\0\0\"\2\0\0\0\40\0\0\0\37\202\0\0\0\377\4"
-  "\0\0\0\35\0\0\0\36\0\0\0\40\0\0\0\"\202\0\0\0\377\7\0\0\0'\0\0\0)\0\0"
-  "\0*\0\0\0(\0\0\0&\0\0\0#\0\0\0!\202\0\0\0\37\3\0\0\0)\0\0\0\377\0\0\0"
-  "\373\202\0\0\0#\202\0\0\0\"\202\0\0\0\377\12\0\0\0)\0\0\0,\0\0\0/\0\0"
-  "\0""2\0\0\0m\0\0\0\377\0\0\0\327\0\0\0*\0\0\0'\0\0\0%\202\0\0\0\377\7"
-  "\0\0\0'\0\0\0(\0\0\0*\0\0\0\273\0\0\0\377\0\0\0L\0\0\0$\203\0\0\0#\14"
-  "\0\0\0""9\0\0\0\377\0\0\0\334\0\0\0\"\0\0\0\37\0\0\0\33\0\0\0\26\0\0"
-  "\0\21\0\0\0\14\0\0\0\10\0\0\0\5\0\0\0\3\202\0\0\0\1\342\0\0\0\0\4\0\0"
-  "\0\1\0\0\0\2\0\0\0\6\0\0\0\12\202\0\0\0\377\7\0\0\0\40\0\0\0)\0\0\0""1"
-  "\0\0\0\276\0\0\0\377\0\0\0a\0\0\0""9\202\0\0\0\377\7\0\0\0""5\0\0\0""3"
-  "\0\0\0""2\0\0\0\360\0\0\0\377\0\0\0=\0\0\0(\203\0\0\0'\15\0\0\0;\0\0"
-  "\0\377\0\0\0\356\0\0\0$\0\0\0!\0\0\0\35\0\0\0\30\0\0\0\23\0\0\0\16\0"
-  "\0\0\12\0\0\0\10\0\0\0\7\0\0\0\10\202\0\0\0\377\12\0\0\0\25\0\0\0\32"
-  "\0\0\0\40\0\0\0$\0\0\0""6\0\0\0\377\0\0\0\364\0\0\0)\0\0\0'\0\0\0&\202"
-  "\0\0\0\377\7\0\0\0#\0\0\0$\0\0\0%\0\0\0&\0\0\0'\0\0\0&\0\0\0\353\210"
-  "\0\0\0\377\14\0\0\0\370\0\0\0-\0\0\0+\0\0\0(\0\0\0i\0\0\0\377\0\0\0\256"
-  "\0\0\0\37\0\0\0\36\0\0\0\240\0\0\0\377\0\0\0b\204\0\0\0\35\202\0\0\0"
-  "\377\4\0\0\0\40\0\0\0\"\0\0\0#\0\0\0\353\210\0\0\0\377\11\0\0\0\370\0"
-  "\0\0-\0\0\0+\0\0\0)\0\0\0\345\0\0\0\360\0\0\0\"\0\0\0""1\0\0\0\374\202"
-  "\0\0\0u\16\0\0\0\377\0\0\0I\0\0\0$\0\0\0\342\0\0\0\350\0\0\0\"\0\0\0"
-  "\40\0\0\0\36\0\0\0\33\0\0\0\27\0\0\0\22\0\0\0\16\0\0\0\12\0\0\0\7\202"
-  "\0\0\0\6\6\0\0\0\27\0\0\0r\0\0\0\257\0\0\0\322\0\0\0\351\0\0\0\370\202"
-  "\0\0\0\377\14\0\0\0+\0\0\0*\0\0\0(\0\0\0%\0\0\0g\0\0\0\377\0\0\0\255"
-  "\0\0\0\35\0\0\0\34\0\0\0\240\0\0\0\377\0\0\0a\203\0\0\0\34\7\0\0\0\33"
-  "\0\0\0)\0\0\0{\0\0\0\262\0\0\0\324\0\0\0\351\0\0\0\370\202\0\0\0\377"
-  "\202\0\0\0+\2\0\0\0)\0\0\0'\202\0\0\0\377\4\0\0\0\"\0\0\0#\0\0\0$\0\0"
-  "\0%\202\0\0\0\377\12\0\0\0*\0\0\0+\0\0\0,\0\0\0+\0\0\0""6\0\0\0\202\0"
-  "\0\0\265\0\0\0\325\0\0\0\352\0\0\0\370\202\0\0\0\377\1\0\0\0,\202\0\0"
-  "\0+\1\0\0\0*\202\0\0\0\377\12\0\0\0-\0\0\0""0\0\0\0""3\0\0\0""6\0\0\0"
-  "C\0\0\0\377\0\0\0\364\0\0\0""0\0\0\0-\0\0\0+\202\0\0\0\377\4\0\0\0+\0"
-  "\0\0-\0\0\0.\0\0\0\354\210\0\0\0\377\14\0\0\0\370\0\0\0+\0\0\0(\0\0\0"
-  "\"\0\0\0\34\0\0\0\26\0\0\0\20\0\0\0\12\0\0\0\7\0\0\0\4\0\0\0\2\0\0\0"
-  "\1\342\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\6\0\0\0\12\202\0\0\0\377\7\0\0"
-  "\0\40\0\0\0*\0\0\0""1\0\0\0^\0\0\0\377\0\0\0\300\0\0\0;\202\0\0\0\377"
-  "\202\0\0\0""8\25\0\0\0""6\0\0\0\375\0\0\0\377\0\0\0""2\0\0\0.\0\0\0-"
-  "\0\0\0,\0\0\0-\0\0\0""0\0\0\0\377\0\0\0\374\0\0\0*\0\0\0'\0\0\0#\0\0"
-  "\0\35\0\0\0\27\0\0\0\22\0\0\0\15\0\0\0\12\0\0\0\11\0\0\0\12\202\0\0\0"
-  "\377\12\0\0\0\30\0\0\0\37\0\0\0%\0\0\0*\0\0\0""0\0\0\0\377\0\0\0\374"
-  "\0\0\0/\0\0\0.\0\0\0-\202\0\0\0\377\202\0\0\0+\5\0\0\0,\0\0\0-\0\0\0"
-  ",\0\0\0+\0\0\0\374\211\0\0\0\377\2\0\0\0""6\0\0\0""3\202\0\0\0""0\7\0"
-  "\0\0\355\0\0\0\362\0\0\0*\0\0\0&\0\0\0\351\0\0\0\353\0\0\0&\204\0\0\0"
-  "#\202\0\0\0\377\4\0\0\0%\0\0\0&\0\0\0'\0\0\0\374\211\0\0\0\377\33\0\0"
-  "\0""6\0\0\0""4\0\0\0""1\0\0\0\263\0\0\0\377\0\0\0E\0\0\0v\0\0\0\374\0"
-  "\0\0""9\0\0\0:\0\0\0\375\0\0\0\222\0\0\0""6\0\0\0\376\0\0\0\264\0\0\0"
-  "*\0\0\0(\0\0\0%\0\0\0\40\0\0\0\34\0\0\0\26\0\0\0\21\0\0\0\14\0\0\0\11"
-  "\0\0\0\7\0\0\0""4\0\0\0\352\207\0\0\0\377\202\0\0\0""3\1\0\0\0""0\202"
-  "\0\0\0-\7\0\0\0\355\0\0\0\362\0\0\0'\0\0\0#\0\0\0\350\0\0\0\353\0\0\0"
-  "&\203\0\0\0\"\2\0\0\0I\0\0\0\354\207\0\0\0\377\4\0\0\0""4\0\0\0""3\0"
-  "\0\0""1\0\0\0.\202\0\0\0\377\202\0\0\0'\2\0\0\0(\0\0\0)\202\0\0\0\377"
-  "\1\0\0\0-\202\0\0\0.\2\0\0\0S\0\0\0\355\207\0\0\0\377\202\0\0\0""4\2"
-  "\0\0\0""2\0\0\0""0\202\0\0\0\377\12\0\0\0""1\0\0\0""4\0\0\0""7\0\0\0"
-  "9\0\0\0<\0\0\0\377\0\0\0\374\0\0\0""5\0\0\0""2\0\0\0""0\202\0\0\0\377"
-  "\4\0\0\0""0\0\0\0""1\0\0\0""2\0\0\0\374\211\0\0\0\377\13\0\0\0""4\0\0"
-  "\0""0\0\0\0*\0\0\0\"\0\0\0\33\0\0\0\24\0\0\0\15\0\0\0\11\0\0\0\5\0\0"
-  "\0\2\0\0\0\1\342\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\6\0\0\0\12\202\0\0\0"
-  "\377\7\0\0\0\40\0\0\0)\0\0\0""1\0\0\0""6\0\0\0\307\0\0\0\376\0\0\0[\202"
-  "\0\0\0\377\1\0\0\0<\202\0\0\0;\4\0\0\0\361\0\0\0\377\0\0\0G\0\0\0""2"
-  "\203\0\0\0""1\15\0\0\0D\0\0\0\377\0\0\0\357\0\0\0.\0\0\0+\0\0\0'\0\0"
-  "\0!\0\0\0\33\0\0\0\25\0\0\0\17\0\0\0\14\0\0\0\12\0\0\0\13\202\0\0\0\377"
-  "\12\0\0\0\34\0\0\0#\0\0\0*\0\0\0.\0\0\0E\0\0\0\377\0\0\0\356\0\0\0""4"
-  "\0\0\0""3\0\0\0""2\202\0\0\0\377\202\0\0\0""0\202\0\0\0""1\30\0\0\0""0"
-  "\0\0\0.\0\0\0\357\0\0\0\377\0\0\0:\0\0\0""0\0\0\0""4\0\0\0""8\0\0\0<"
-  "\0\0\0>\0\0\0@\0\0\0\77\0\0\0=\0\0\0:\0\0\0""6\0\0\0""2\0\0\0\244\0\0"
-  "\0\377\0\0\0i\0\0\0Z\0\0\0\377\0\0\0\240\0\0\0*\0\0\0)\202\0\0\0(\1\0"
-  "\0\0'\202\0\0\0\377\13\0\0\0(\0\0\0*\0\0\0+\0\0\0\357\0\0\0\377\0\0\0"
-  "<\0\0\0""2\0\0\0""5\0\0\0""8\0\0\0;\0\0\0>\202\0\0\0\77\40\0\0\0=\0\0"
-  "\0;\0\0\0""7\0\0\0\202\0\0\0\377\0\0\0r\0\0\0\271\0\0\0\313\0\0\0""0"
-  "\0\0\0""1\0\0\0\314\0\0\0\325\0\0\0`\0\0\0\377\0\0\0\205\0\0\0""1\0\0"
-  "\0.\0\0\0*\0\0\0%\0\0\0\37\0\0\0\30\0\0\0\22\0\0\0\15\0\0\0\12\0\0\0"
-  "\10\0\0\0\311\0\0\0\377\0\0\0\310\0\0\0e\0\0\0B\0\0\0""7\0\0\0""2\202"
-  "\0\0\0\377\202\0\0\0:\12\0\0\0""7\0\0\0""3\0\0\0.\0\0\0\243\0\0\0\377"
-  "\0\0\0g\0\0\0X\0\0\0\377\0\0\0\237\0\0\0)\202\0\0\0(\10\0\0\0'\0\0\0"
-  "\317\0\0\0\377\0\0\0\315\0\0\0o\0\0\0K\0\0\0=\0\0\0""7\202\0\0\0\377"
-  "\4\0\0\0;\0\0\0:\0\0\0""8\0\0\0""5\202\0\0\0\377\1\0\0\0,\202\0\0\0+"
-  "\1\0\0\0,\202\0\0\0\377\1\0\0\0.\202\0\0\0""0\7\0\0\0\321\0\0\0\377\0"
-  "\0\0\316\0\0\0s\0\0\0O\0\0\0@\0\0\0""8\202\0\0\0\377\202\0\0\0;\2\0\0"
-  "\0""9\0\0\0""6\202\0\0\0\377\12\0\0\0""4\0\0\0""6\0\0\0""9\0\0\0;\0\0"
-  "\0M\0\0\0\377\0\0\0\357\0\0\0""8\0\0\0""6\0\0\0""5\202\0\0\0\377\27\0"
-  "\0\0""3\0\0\0""4\0\0\0""5\0\0\0\360\0\0\0\377\0\0\0A\0\0\0""5\0\0\0""7"
-  "\0\0\0:\0\0\0=\0\0\0>\0\0\0\77\0\0\0>\0\0\0;\0\0\0""6\0\0\0/\0\0\0'\0"
-  "\0\0\37\0\0\0\27\0\0\0\17\0\0\0\12\0\0\0\6\0\0\0\3\202\0\0\0\1\341\0"
-  "\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\6\0\0\0\12\202\0\0\0\377\7\0\0\0\37\0"
-  "\0\0(\0\0\0/\0\0\0""5\0\0\0f\0\0\0\377\0\0\0\270\202\0\0\0\377\203\0"
-  "\0\0>\5\0\0\0\311\0\0\0\377\0\0\0\214\0\0\0""6\0\0\0""5\202\0\0\0""4"
-  "\13\0\0\0\210\0\0\0\377\0\0\0\306\0\0\0""0\0\0\0.\0\0\0*\0\0\0$\0\0\0"
-  "\36\0\0\0\27\0\0\0\21\0\0\0\15\202\0\0\0\14\202\0\0\0\377\12\0\0\0\35"
-  "\0\0\0%\0\0\0,\0\0\0""2\0\0\0\205\0\0\0\377\0\0\0\305\0\0\0""7\0\0\0"
-  "6\0\0\0""5\202\0\0\0\377\2\0\0\0""3\0\0\0""4\202\0\0\0""3\26\0\0\0""1"
-  "\0\0\0/\0\0\0\304\0\0\0\377\0\0\0\212\0\0\0""3\0\0\0""8\0\0\0=\0\0\0"
-  "@\0\0\0C\0\0\0D\0\0\0C\0\0\0A\0\0\0>\0\0\0:\0\0\0""5\0\0\0X\0\0\0\377"
-  "\0\0\0\262\0\0\0\241\0\0\0\377\0\0\0S\202\0\0\0.\3\0\0\0-\0\0\0,\0\0"
-  "\0*\202\0\0\0\377\13\0\0\0*\0\0\0,\0\0\0.\0\0\0\305\0\0\0\377\0\0\0\214"
-  "\0\0\0""6\0\0\0:\0\0\0>\0\0\0A\0\0\0C\202\0\0\0D\40\0\0\0A\0\0\0\77\0"
-  "\0\0;\0\0\0S\0\0\0\377\0\0\0\242\0\0\0\365\0\0\0\215\0\0\0""5\0\0\0""6"
-  "\0\0\0\215\0\0\0\376\0\0\0\236\0\0\0\377\0\0\0V\0\0\0""6\0\0\0""3\0\0"
-  "\0.\0\0\0(\0\0\0\"\0\0\0\32\0\0\0\24\0\0\0\16\0\0\0\12\0\0\0\11\0\0\0"
-  "\372\0\0\0\377\0\0\0!\0\0\0\32\0\0\0\"\0\0\0*\0\0\0""2\202\0\0\0\377"
-  "\14\0\0\0@\0\0\0\77\0\0\0=\0\0\0""8\0\0\0""3\0\0\0U\0\0\0\377\0\0\0\261"
-  "\0\0\0\240\0\0\0\377\0\0\0R\0\0\0.\202\0\0\0-\10\0\0\0+\0\0\0\373\0\0"
-  "\0\377\0\0\0""5\0\0\0)\0\0\0-\0\0\0""1\0\0\0""6\202\0\0\0\377\202\0\0"
-  "\0@\2\0\0\0>\0\0\0:\202\0\0\0\377\1\0\0\0""0\203\0\0\0.\202\0\0\0\377"
-  "\202\0\0\0""0\10\0\0\0""1\0\0\0\373\0\0\0\377\0\0\0<\0\0\0/\0\0\0""1"
-  "\0\0\0""4\0\0\0""8\202\0\0\0\377\4\0\0\0A\0\0\0@\0\0\0>\0\0\0;\202\0"
-  "\0\0\377\12\0\0\0""6\0\0\0""8\0\0\0:\0\0\0;\0\0\0\205\0\0\0\377\0\0\0"
-  "\310\0\0\0:\0\0\0""8\0\0\0""7\202\0\0\0\377\203\0\0\0""6\24\0\0\0\306"
-  "\0\0\0\377\0\0\0\217\0\0\0:\0\0\0<\0\0\0\77\0\0\0A\0\0\0C\0\0\0D\0\0"
-  "\0C\0\0\0\77\0\0\0:\0\0\0""3\0\0\0*\0\0\0!\0\0\0\30\0\0\0\21\0\0\0\12"
-  "\0\0\0\6\0\0\0\3\202\0\0\0\1\341\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0\0\6\0"
-  "\0\0\11\202\0\0\0\377\7\0\0\0\37\0\0\0'\0\0\0-\0\0\0""2\0\0\0""6\0\0"
-  "\0\316\0\0\0\375\202\0\0\0\377\1\0\0\0>\202\0\0\0@\4\0\0\0~\0\0\0\377"
-  "\0\0\0\367\0\0\0\202\202\0\0\0@\16\0\0\0\177\0\0\0\365\0\0\0\377\0\0"
-  "\0u\0\0\0""2\0\0\0""0\0\0\0+\0\0\0&\0\0\0\37\0\0\0\30\0\0\0\22\0\0\0"
-  "\16\0\0\0\14\0\0\0\15\202\0\0\0\377\1\0\0\0i\202\0\0\0""4\4\0\0\0r\0"
-  "\0\0\362\0\0\0\377\0\0\0z\202\0\0\0""8\1\0\0\0""7\202\0\0\0\377\202\0"
-  "\0\0""5\35\0\0\0""4\0\0\0""3\0\0\0""0\0\0\0.\0\0\0h\0\0\0\377\0\0\0\375"
-  "\0\0\0\241\0\0\0Y\0\0\0C\0\0\0J\0\0\0d\0\0\0\222\0\0\0\330\0\0\0C\0\0"
-  "\0\77\0\0\0;\0\0\0""6\0\0\0""2\0\0\0\331\0\0\0\363\0\0\0\346\0\0\0\326"
-  "\0\0\0""1\0\0\0""2\0\0\0""1\0\0\0""0\0\0\0.\0\0\0,\202\0\0\0\377-\0\0"
-  "\0+\0\0\0-\0\0\0/\0\0\0l\0\0\0\377\0\0\0\375\0\0\0\245\0\0\0]\0\0\0E"
-  "\0\0\0K\0\0\0d\0\0\0\223\0\0\0\331\0\0\0C\0\0\0@\0\0\0=\0\0\0""9\0\0"
-  "\0\351\0\0\0\361\0\0\0\377\0\0\0N\0\0\0""7\0\0\0""9\0\0\0Q\0\0\0\377"
-  "\0\0\0\363\0\0\0\355\0\0\0;\0\0\0""9\0\0\0""6\0\0\0""1\0\0\0*\0\0\0#"
-  "\0\0\0\33\0\0\0\24\0\0\0\16\0\0\0\12\0\0\0\11\0\0\0\350\0\0\0\377\0\0"
-  "\0v\0\0\0%\0\0\0,\0\0\0\\\0\0\0\264\202\0\0\0\377\202\0\0\0C\11\0\0\0"
-  "\77\0\0\0;\0\0\0""5\0\0\0""0\0\0\0\330\0\0\0\363\0\0\0\345\0\0\0\325"
-  "\0\0\0""0\202\0\0\0""1\11\0\0\0""0\0\0\0.\0\0\0\353\0\0\0\377\0\0\0\203"
-  "\0\0\0""3\0\0\0""6\0\0\0a\0\0\0\266\202\0\0\0\377\4\0\0\0D\0\0\0C\0\0"
-  "\0A\0\0\0=\202\0\0\0\377\2\0\0\0""2\0\0\0""1\202\0\0\0""0\202\0\0\0\377"
-  "\6\0\0\0""0\0\0\0""1\0\0\0""2\0\0\0\354\0\0\0\377\0\0\0\207\202\0\0\0"
-  ":\2\0\0\0c\0\0\0\266\202\0\0\0\377\202\0\0\0D\2\0\0\0A\0\0\0>\202\0\0"
-  "\0\377\12\0\0\0|\0\0\0E\0\0\0\77\0\0\0u\0\0\0\360\0\0\0\377\0\0\0~\0"
-  "\0\0:\0\0\0""9\0\0\0""8\202\0\0\0\377\1\0\0\0""6\202\0\0\0""7\26\0\0"
-  "\0p\0\0\0\377\0\0\0\375\0\0\0\245\0\0\0^\0\0\0E\0\0\0L\0\0\0d\0\0\0\222"
-  "\0\0\0\330\0\0\0A\0\0\0;\0\0\0""4\0\0\0+\0\0\0\"\0\0\0\31\0\0\0\21\0"
-  "\0\0\13\0\0\0\7\0\0\0\4\0\0\0\2\0\0\0\1\341\0\0\0\0\4\0\0\0\1\0\0\0\2"
-  "\0\0\0\5\0\0\0\11\202\0\0\0\377\6\0\0\0\35\0\0\0$\0\0\0+\0\0\0/\0\0\0"
-  "2\0\0\0l\203\0\0\0\377\1\0\0\0>\202\0\0\0@\2\0\0\0>\0\0\0\266\206\0\0"
-  "\0\377\12\0\0\0\262\0\0\0""3\0\0\0""2\0\0\0""0\0\0\0,\0\0\0'\0\0\0\40"
-  "\0\0\0\31\0\0\0\23\0\0\0\17\202\0\0\0\15\207\0\0\0\377\3\0\0\0\300\0"
-  "\0\0:\0\0\0""9\202\0\0\0""8\202\0\0\0\377\202\0\0\0""5\7\0\0\0""3\0\0"
-  "\0""1\0\0\0.\0\0\0+\0\0\0*\0\0\0\222\0\0\0\376\207\0\0\0\377\6\0\0\0"
-  "B\0\0\0>\0\0\0:\0\0\0""5\0\0\0""1\0\0\0\212\202\0\0\0\377\2\0\0\0\210"
-  "\0\0\0""2\202\0\0\0""3\3\0\0\0""1\0\0\0.\0\0\0,\202\0\0\0\377\6\0\0\0"
-  "*\0\0\0,\0\0\0/\0\0\0""2\0\0\0\227\0\0\0\376\207\0\0\0\377\27\0\0\0C"
-  "\0\0\0@\0\0\0;\0\0\0""8\0\0\0\267\0\0\0\377\0\0\0\332\0\0\0""5\0\0\0"
-  "8\0\0\0:\0\0\0;\0\0\0\331\0\0\0\377\0\0\0\276\0\0\0;\0\0\0:\0\0\0""6"
-  "\0\0\0""1\0\0\0*\0\0\0#\0\0\0\33\0\0\0\24\0\0\0\16\202\0\0\0\12\1\0\0"
-  "\0\205\205\0\0\0\377\1\0\0\0\354\202\0\0\0\377\7\0\0\0E\0\0\0D\0\0\0"
-  "@\0\0\0;\0\0\0""5\0\0\0""0\0\0\0\211\202\0\0\0\377\2\0\0\0\207\0\0\0"
-  "2\202\0\0\0""3\3\0\0\0""1\0\0\0/\0\0\0\226\205\0\0\0\377\1\0\0\0\355"
-  "\202\0\0\0\377\4\0\0\0F\0\0\0E\0\0\0B\0\0\0>\202\0\0\0\377\2\0\0\0""3"
-  "\0\0\0""2\202\0\0\0""0\202\0\0\0\377\4\0\0\0""0\0\0\0""1\0\0\0""2\0\0"
-  "\0\230\205\0\0\0\377\1\0\0\0\355\202\0\0\0\377\4\0\0\0F\0\0\0E\0\0\0"
-  "C\0\0\0@\207\0\0\0\377\3\0\0\0\303\0\0\0;\0\0\0:\202\0\0\0""8\202\0\0"
-  "\0\377\202\0\0\0""6\4\0\0\0""7\0\0\0""8\0\0\0\231\0\0\0\376\207\0\0\0"
-  "\377\14\0\0\0A\0\0\0;\0\0\0""4\0\0\0+\0\0\0\"\0\0\0\31\0\0\0\21\0\0\0"
-  "\13\0\0\0\7\0\0\0\4\0\0\0\2\0\0\0\1\341\0\0\0\0\4\0\0\0\1\0\0\0\2\0\0"
-  "\0\5\0\0\0\11\202\0\0\0\377\7\0\0\0\34\0\0\0\"\0\0\0(\0\0\0,\0\0\0.\0"
-  "\0\0""0\0\0\0\324\202\0\0\0\377\1\0\0\0<\203\0\0\0>\3\0\0\0<\0\0\0\207"
-  "\0\0\0\326\202\0\0\0\367\16\0\0\0\325\0\0\0\203\0\0\0""5\0\0\0""3\0\0"
-  "\0""2\0\0\0""0\0\0\0+\0\0\0&\0\0\0\40\0\0\0\30\0\0\0\22\0\0\0\16\0\0"
-  "\0\14\0\0\0\15\202\0\0\0\377\12\0\0\0\223\0\0\0\343\0\0\0\374\0\0\0\347"
-  "\0\0\0\233\0\0\0>\0\0\0:\0\0\0""9\0\0\0""8\0\0\0""7\202\0\0\0\377\13"
-  "\0\0\0""3\0\0\0""2\0\0\0""1\0\0\0.\0\0\0+\0\0\0(\0\0\0&\0\0\0'\0\0\0"
-  "Y\0\0\0\264\0\0\0\346\202\0\0\0\372\22\0\0\0\341\0\0\0\262\0\0\0o\0\0"
-  "\0@\0\0\0;\0\0\0""6\0\0\0""2\0\0\0.\0\0\0<\0\0\0\373\0\0\0\372\0\0\0"
-  ">\0\0\0""2\0\0\0""3\0\0\0""2\0\0\0""0\0\0\0-\0\0\0*\202\0\0\0\377\10"
-  "\0\0\0(\0\0\0*\0\0\0-\0\0\0""0\0\0\0""3\0\0\0c\0\0\0\270\0\0\0\347\202"
-  "\0\0\0\372\32\0\0\0\342\0\0\0\263\0\0\0p\0\0\0@\0\0\0=\0\0\0""9\0\0\0"
-  "5\0\0\0\202\0\0\0\377\0\0\0\231\0\0\0""3\0\0\0""6\0\0\0""8\0\0\0:\0\0"
-  "\0\232\0\0\0\377\0\0\0\215\0\0\0:\0\0\0""8\0\0\0""5\0\0\0""0\0\0\0)\0"
-  "\0\0!\0\0\0\31\0\0\0\22\0\0\0\15\202\0\0\0\12\7\0\0\0\16\0\0\0\204\0"
-  "\0\0\347\0\0\0\374\0\0\0\344\0\0\0\244\0\0\0I\202\0\0\0\377\13\0\0\0"
-  "D\0\0\0C\0\0\0@\0\0\0:\0\0\0""4\0\0\0.\0\0\0<\0\0\0\373\0\0\0\372\0\0"
-  "\0=\0\0\0""0\202\0\0\0""2\11\0\0\0""1\0\0\0.\0\0\0-\0\0\0\221\0\0\0\350"
-  "\0\0\0\375\0\0\0\345\0\0\0\246\0\0\0K\202\0\0\0\377\202\0\0\0E\2\0\0"
-  "\0A\0\0\0>\202\0\0\0\377\1\0\0\0""2\202\0\0\0""0\1\0\0\0/\202\0\0\0\377"
-  "\1\0\0\0/\202\0\0\0""0\7\0\0\0""3\0\0\0\224\0\0\0\351\0\0\0\375\0\0\0"
-  "\346\0\0\0\250\0\0\0L\202\0\0\0\377\15\0\0\0F\0\0\0E\0\0\0B\0\0\0>\0"
-  "\0\0\377\0\0\0\366\0\0\0\225\0\0\0\341\0\0\0\373\0\0\0\352\0\0\0\237"
-  "\0\0\0\77\0\0\0""9\202\0\0\0""8\1\0\0\0""6\202\0\0\0\377\204\0\0\0""5"
-  "\4\0\0\0""6\0\0\0d\0\0\0\270\0\0\0\347\202\0\0\0\372\15\0\0\0\342\0\0"
-  "\0\263\0\0\0o\0\0\0>\0\0\0""9\0\0\0""2\0\0\0*\0\0\0\40\0\0\0\30\0\0\0"
-  "\21\0\0\0\12\0\0\0\6\0\0\0\3\202\0\0\0\1\341\0\0\0\0\27\0\0\0\1\0\0\0"
-  "\2\0\0\0\4\0\0\0\10\0\0\0\15\0\0\0\23\0\0\0\31\0\0\0\37\0\0\0$\0\0\0"
-  "(\0\0\0*\0\0\0+\0\0\0.\0\0\0""0\0\0\0""4\0\0\0""8\0\0\0:\0\0\0;\0\0\0"
-  ":\0\0\0""8\0\0\0""6\0\0\0""5\0\0\0""4\204\0\0\0""3\13\0\0\0""2\0\0\0"
-  "1\0\0\0.\0\0\0*\0\0\0$\0\0\0\36\0\0\0\27\0\0\0\21\0\0\0\15\0\0\0\14\0"
-  "\0\0\15\202\0\0\0\377\5\0\0\0!\0\0\0*\0\0\0""1\0\0\0""6\0\0\0""9\202"
-  "\0\0\0:\13\0\0\0""8\0\0\0""6\0\0\0""5\0\0\0""3\0\0\0""2\0\0\0""0\0\0"
-  "\0.\0\0\0-\0\0\0*\0\0\0'\0\0\0#\202\0\0\0\"\15\0\0\0%\0\0\0*\0\0\0""0"
-  "\0\0\0""6\0\0\0;\0\0\0>\0\0\0\77\0\0\0>\0\0\0;\0\0\0""8\0\0\0""3\0\0"
-  "\0.\0\0\0*\202\0\0\0(\3\0\0\0*\0\0\0,\0\0\0.\202\0\0\0""0\17\0\0\0.\0"
-  "\0\0*\0\0\0'\0\0\0%\0\0\0$\0\0\0%\0\0\0'\0\0\0*\0\0\0-\0\0\0""0\0\0\0"
-  "2\0\0\0""5\0\0\0""8\0\0\0<\0\0\0>\202\0\0\0@\13\0\0\0\77\0\0\0<\0\0\0"
-  "9\0\0\0""5\0\0\0""1\0\0\0.\0\0\0-\0\0\0.\0\0\0""0\0\0\0""2\0\0\0""5\202"
-  "\0\0\0""6\202\0\0\0""7\11\0\0\0""6\0\0\0""5\0\0\0""2\0\0\0-\0\0\0&\0"
-  "\0\0\37\0\0\0\27\0\0\0\21\0\0\0\14\202\0\0\0\11\10\0\0\0\14\0\0\0\21"
-  "\0\0\0\30\0\0\0\40\0\0\0(\0\0\0""1\0\0\0""8\0\0\0=\202\0\0\0A\12\0\0"
-  "\0@\0\0\0=\0\0\0""7\0\0\0""1\0\0\0+\0\0\0(\0\0\0'\0\0\0(\0\0\0+\0\0\0"
-  ".\202\0\0\0""0\3\0\0\0.\0\0\0,\0\0\0)\202\0\0\0(\16\0\0\0+\0\0\0""0\0"
-  "\0\0""5\0\0\0:\0\0\0>\0\0\0A\0\0\0C\0\0\0A\0\0\0\77\0\0\0;\0\0\0""6\0"
-  "\0\0""3\0\0\0""0\0\0\0.\202\0\0\0-\203\0\0\0,\1\0\0\0-\202\0\0\0.\22"
-  "\0\0\0/\0\0\0""1\0\0\0""3\0\0\0""6\0\0\0:\0\0\0=\0\0\0@\0\0\0B\0\0\0"
-  "C\0\0\0B\0\0\0@\0\0\0<\0\0\0""8\0\0\0""5\0\0\0""4\0\0\0""5\0\0\0""6\0"
-  "\0\0""7\202\0\0\0""8\6\0\0\0""7\0\0\0""6\0\0\0""5\0\0\0""4\0\0\0""3\0"
-  "\0\0""2\203\0\0\0""1\202\0\0\0""2\5\0\0\0""4\0\0\0""6\0\0\0""9\0\0\0"
-  "<\0\0\0>\202\0\0\0@\13\0\0\0>\0\0\0;\0\0\0""5\0\0\0.\0\0\0'\0\0\0\37"
-  "\0\0\0\27\0\0\0\17\0\0\0\12\0\0\0\6\0\0\0\3\202\0\0\0\1\341\0\0\0\0\25"
-  "\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\7\0\0\0\14\0\0\0\21\0\0\0\27\0\0\0\34"
-  "\0\0\0\40\0\0\0#\0\0\0%\0\0\0&\0\0\0(\0\0\0+\0\0\0.\0\0\0""2\0\0\0""5"
-  "\0\0\0""6\0\0\0""5\0\0\0""3\0\0\0""2\207\0\0\0""0\12\0\0\0.\0\0\0+\0"
-  "\0\0'\0\0\0\"\0\0\0\33\0\0\0\25\0\0\0\20\0\0\0\14\0\0\0\13\0\0\0\15\202"
-  "\0\0\0\377\22\0\0\0!\0\0\0*\0\0\0""1\0\0\0""6\0\0\0""9\0\0\0:\0\0\0""8"
-  "\0\0\0""6\0\0\0""3\0\0\0""1\0\0\0/\0\0\0-\0\0\0+\0\0\0*\0\0\0(\0\0\0"
-  "%\0\0\0\"\0\0\0\37\202\0\0\0\35\15\0\0\0\40\0\0\0$\0\0\0*\0\0\0""0\0"
-  "\0\0""5\0\0\0""8\0\0\0""9\0\0\0""8\0\0\0""6\0\0\0""2\0\0\0.\0\0\0)\0"
-  "\0\0%\202\0\0\0#\3\0\0\0%\0\0\0'\0\0\0*\202\0\0\0+\3\0\0\0)\0\0\0&\0"
-  "\0\0#\203\0\0\0\40\11\0\0\0#\0\0\0%\0\0\0(\0\0\0*\0\0\0-\0\0\0/\0\0\0"
-  "2\0\0\0""5\0\0\0""8\202\0\0\0:\14\0\0\0""9\0\0\0""6\0\0\0""3\0\0\0""0"
-  "\0\0\0,\0\0\0*\0\0\0(\0\0\0)\0\0\0+\0\0\0-\0\0\0/\0\0\0""0\203\0\0\0"
-  "1\11\0\0\0""0\0\0\0/\0\0\0,\0\0\0(\0\0\0\"\0\0\0\33\0\0\0\24\0\0\0\17"
-  "\0\0\0\12\202\0\0\0\11\24\0\0\0\13\0\0\0\20\0\0\0\27\0\0\0\37\0\0\0'"
-  "\0\0\0.\0\0\0""5\0\0\0:\0\0\0<\0\0\0=\0\0\0;\0\0\0""7\0\0\0""2\0\0\0"
-  ",\0\0\0'\0\0\0$\0\0\0#\0\0\0$\0\0\0'\0\0\0*\202\0\0\0+\24\0\0\0*\0\0"
-  "\0(\0\0\0%\0\0\0$\0\0\0%\0\0\0(\0\0\0-\0\0\0""2\0\0\0""6\0\0\0;\0\0\0"
-  "=\0\0\0>\0\0\0=\0\0\0:\0\0\0""6\0\0\0""2\0\0\0.\0\0\0,\0\0\0*\0\0\0)"
-  "\204\0\0\0(\12\0\0\0)\0\0\0*\0\0\0+\0\0\0,\0\0\0-\0\0\0""0\0\0\0""2\0"
-  "\0\0""6\0\0\0:\0\0\0<\202\0\0\0>\11\0\0\0=\0\0\0;\0\0\0""7\0\0\0""4\0"
-  "\0\0""2\0\0\0""0\0\0\0""1\0\0\0""2\0\0\0""4\203\0\0\0""5\5\0\0\0""3\0"
-  "\0\0""2\0\0\0""0\0\0\0.\0\0\0-\203\0\0\0,\202\0\0\0-\5\0\0\0.\0\0\0""0"
-  "\0\0\0""3\0\0\0""6\0\0\0""8\202\0\0\0:\13\0\0\0""8\0\0\0""5\0\0\0""0"
-  "\0\0\0*\0\0\0#\0\0\0\34\0\0\0\24\0\0\0\16\0\0\0\11\0\0\0\5\0\0\0\2\202"
-  "\0\0\0\1\341\0\0\0\0\21\0\0\0\1\0\0\0\2\0\0\0\4\0\0\0\6\0\0\0\12\0\0"
-  "\0\17\0\0\0\24\0\0\0\30\0\0\0\34\0\0\0\36\0\0\0\37\0\0\0\40\0\0\0\"\0"
-  "\0\0$\0\0\0'\0\0\0+\0\0\0-\202\0\0\0.\2\0\0\0-\0\0\0+\202\0\0\0*\202"
-  "\0\0\0+\202\0\0\0,\10\0\0\0+\0\0\0*\0\0\0'\0\0\0#\0\0\0\35\0\0\0\27\0"
-  "\0\0\22\0\0\0\15\202\0\0\0\12\1\0\0\0\14\202\0\0\0\377\4\0\0\0\40\0\0"
-  "\0)\0\0\0""0\0\0\0""5\202\0\0\0""7\14\0\0\0""5\0\0\0""3\0\0\0/\0\0\0"
-  ",\0\0\0*\0\0\0'\0\0\0%\0\0\0#\0\0\0\"\0\0\0\37\0\0\0\35\0\0\0\32\202"
-  "\0\0\0\30\6\0\0\0\32\0\0\0\36\0\0\0#\0\0\0(\0\0\0-\0\0\0""0\202\0\0\0"
-  "2\5\0\0\0""0\0\0\0,\0\0\0(\0\0\0#\0\0\0\40\202\0\0\0\36\3\0\0\0\37\0"
-  "\0\0\"\0\0\0$\202\0\0\0%\27\0\0\0#\0\0\0\40\0\0\0\35\0\0\0\34\0\0\0\33"
-  "\0\0\0\34\0\0\0\36\0\0\0\40\0\0\0\"\0\0\0$\0\0\0&\0\0\0(\0\0\0+\0\0\0"
-  ".\0\0\0""0\0\0\0""2\0\0\0""3\0\0\0""2\0\0\0""0\0\0\0-\0\0\0*\0\0\0'\0"
-  "\0\0$\202\0\0\0#\4\0\0\0%\0\0\0'\0\0\0(\0\0\0)\203\0\0\0*\11\0\0\0)\0"
-  "\0\0(\0\0\0%\0\0\0\"\0\0\0\35\0\0\0\27\0\0\0\21\0\0\0\14\0\0\0\11\202"
-  "\0\0\0\7\10\0\0\0\12\0\0\0\16\0\0\0\24\0\0\0\34\0\0\0#\0\0\0*\0\0\0/"
-  "\0\0\0""3\202\0\0\0""6\26\0\0\0""4\0\0\0""0\0\0\0+\0\0\0'\0\0\0\"\0\0"
-  "\0\37\0\0\0\35\0\0\0\37\0\0\0!\0\0\0$\0\0\0%\0\0\0&\0\0\0$\0\0\0\"\0"
-  "\0\0\40\0\0\0\37\0\0\0\40\0\0\0#\0\0\0'\0\0\0,\0\0\0""0\0\0\0""4\203"
-  "\0\0\0""6\7\0\0\0""3\0\0\0""0\0\0\0,\0\0\0(\0\0\0'\0\0\0%\0\0\0$\205"
-  "\0\0\0#\202\0\0\0%\7\0\0\0'\0\0\0(\0\0\0*\0\0\0-\0\0\0""0\0\0\0""3\0"
-  "\0\0""6\202\0\0\0""7\4\0\0\0""6\0\0\0""3\0\0\0""0\0\0\0-\203\0\0\0+\2"
-  "\0\0\0-\0\0\0.\203\0\0\0""0\5\0\0\0.\0\0\0-\0\0\0+\0\0\0(\0\0\0'\204"
-  "\0\0\0&\202\0\0\0'\22\0\0\0)\0\0\0+\0\0\0.\0\0\0""0\0\0\0""2\0\0\0""3"
-  "\0\0\0""2\0\0\0/\0\0\0+\0\0\0%\0\0\0\37\0\0\0\30\0\0\0\22\0\0\0\14\0"
-  "\0\0\10\0\0\0\4\0\0\0\2\0\0\0\1\342\0\0\0\0\202\0\0\0\1\17\0\0\0\3\0"
-  "\0\0\5\0\0\0\10\0\0\0\14\0\0\0\20\0\0\0\24\0\0\0\27\0\0\0\30\0\0\0\31"
-  "\0\0\0\32\0\0\0\33\0\0\0\35\0\0\0\40\0\0\0#\0\0\0%\202\0\0\0&\1\0\0\0"
-  "%\203\0\0\0#\14\0\0\0$\0\0\0%\0\0\0&\0\0\0'\0\0\0&\0\0\0$\0\0\0\"\0\0"
-  "\0\35\0\0\0\30\0\0\0\24\0\0\0\17\0\0\0\13\202\0\0\0\11\1\0\0\0\14\202"
-  "\0\0\0\377\22\0\0\0\37\0\0\0'\0\0\0.\0\0\0""2\0\0\0""4\0\0\0""3\0\0\0"
-  "1\0\0\0-\0\0\0*\0\0\0&\0\0\0#\0\0\0\40\0\0\0\37\0\0\0\35\0\0\0\34\0\0"
-  "\0\31\0\0\0\27\0\0\0\25\202\0\0\0\23\6\0\0\0\24\0\0\0\30\0\0\0\34\0\0"
-  "\0!\0\0\0%\0\0\0(\202\0\0\0*\5\0\0\0(\0\0\0%\0\0\0\"\0\0\0\36\0\0\0\32"
-  "\202\0\0\0\30\3\0\0\0\31\0\0\0\33\0\0\0\35\202\0\0\0\37\17\0\0\0\35\0"
-  "\0\0\32\0\0\0\30\0\0\0\26\0\0\0\25\0\0\0\26\0\0\0\30\0\0\0\32\0\0\0\34"
-  "\0\0\0\35\0\0\0\37\0\0\0\40\0\0\0#\0\0\0%\0\0\0(\203\0\0\0*\5\0\0\0("
-  "\0\0\0&\0\0\0#\0\0\0\40\0\0\0\36\202\0\0\0\35\3\0\0\0\36\0\0\0\37\0\0"
-  "\0\40\205\0\0\0!\10\0\0\0\40\0\0\0\37\0\0\0\34\0\0\0\27\0\0\0\22\0\0"
-  "\0\15\0\0\0\12\0\0\0\7\202\0\0\0\6\17\0\0\0\10\0\0\0\14\0\0\0\21\0\0"
-  "\0\27\0\0\0\35\0\0\0#\0\0\0(\0\0\0,\0\0\0-\0\0\0.\0\0\0,\0\0\0)\0\0\0"
-  "$\0\0\0\40\0\0\0\34\203\0\0\0\30\2\0\0\0\33\0\0\0\35\202\0\0\0\37\12"
-  "\0\0\0\35\0\0\0\34\0\0\0\32\0\0\0\31\0\0\0\32\0\0\0\35\0\0\0!\0\0\0%"
-  "\0\0\0)\0\0\0,\202\0\0\0.\10\0\0\0-\0\0\0+\0\0\0(\0\0\0%\0\0\0\"\0\0"
-  "\0\40\0\0\0\37\0\0\0\36\205\0\0\0\35\202\0\0\0\37\7\0\0\0\40\0\0\0\""
-  "\0\0\0#\0\0\0&\0\0\0)\0\0\0+\0\0\0-\202\0\0\0.\11\0\0\0-\0\0\0+\0\0\0"
-  "(\0\0\0&\0\0\0%\0\0\0$\0\0\0%\0\0\0'\0\0\0(\203\0\0\0*\5\0\0\0(\0\0\0"
-  "&\0\0\0$\0\0\0\"\0\0\0\40\205\0\0\0\37\5\0\0\0\40\0\0\0!\0\0\0#\0\0\0"
-  "%\0\0\0(\203\0\0\0*\13\0\0\0(\0\0\0$\0\0\0\40\0\0\0\32\0\0\0\25\0\0\0"
-  "\17\0\0\0\12\0\0\0\7\0\0\0\4\0\0\0\2\0\0\0\1\342\0\0\0\0\202\0\0\0\1"
-  "\11\0\0\0\2\0\0\0\4\0\0\0\6\0\0\0\11\0\0\0\14\0\0\0\17\0\0\0\21\0\0\0"
-  "\22\0\0\0\23\202\0\0\0\24\4\0\0\0\26\0\0\0\30\0\0\0\32\0\0\0\34\202\0"
-  "\0\0\35\202\0\0\0\34\1\0\0\0\33\202\0\0\0\34\1\0\0\0\36\203\0\0\0\37"
-  "\7\0\0\0\35\0\0\0\33\0\0\0\27\0\0\0\23\0\0\0\17\0\0\0\13\0\0\0\11\202"
-  "\0\0\0\7\25\0\0\0\12\0\0\0\17\0\0\0\25\0\0\0\35\0\0\0$\0\0\0*\0\0\0."
-  "\0\0\0/\0\0\0.\0\0\0+\0\0\0'\0\0\0#\0\0\0\37\0\0\0\34\0\0\0\31\0\0\0"
-  "\30\0\0\0\26\0\0\0\25\0\0\0\24\0\0\0\22\0\0\0\17\202\0\0\0\16\27\0\0"
-  "\0\17\0\0\0\22\0\0\0\25\0\0\0\31\0\0\0\35\0\0\0\40\0\0\0!\0\0\0\"\0\0"
-  "\0\40\0\0\0\36\0\0\0\33\0\0\0\30\0\0\0\25\0\0\0\23\0\0\0\22\0\0\0\24"
-  "\0\0\0\25\0\0\0\27\0\0\0\30\0\0\0\27\0\0\0\26\0\0\0\24\0\0\0\22\203\0"
-  "\0\0\21\3\0\0\0\22\0\0\0\24\0\0\0\25\202\0\0\0\27\5\0\0\0\31\0\0\0\33"
-  "\0\0\0\35\0\0\0\37\0\0\0!\202\0\0\0\"\4\0\0\0\40\0\0\0\37\0\0\0\34\0"
-  "\0\0\32\202\0\0\0\27\2\0\0\0\26\0\0\0\27\202\0\0\0\30\205\0\0\0\31\10"
-  "\0\0\0\30\0\0\0\27\0\0\0\25\0\0\0\22\0\0\0\16\0\0\0\12\0\0\0\7\0\0\0"
-  "\5\202\0\0\0\4\10\0\0\0\6\0\0\0\11\0\0\0\15\0\0\0\22\0\0\0\27\0\0\0\34"
-  "\0\0\0\40\0\0\0#\202\0\0\0$\11\0\0\0#\0\0\0\40\0\0\0\35\0\0\0\31\0\0"
-  "\0\25\0\0\0\23\0\0\0\22\0\0\0\23\0\0\0\25\202\0\0\0\27\3\0\0\0\30\0\0"
-  "\0\27\0\0\0\25\203\0\0\0\24\5\0\0\0\27\0\0\0\32\0\0\0\35\0\0\0!\0\0\0"
-  "#\202\0\0\0%\7\0\0\0$\0\0\0\"\0\0\0\40\0\0\0\35\0\0\0\33\0\0\0\31\0\0"
-  "\0\30\206\0\0\0\27\202\0\0\0\30\7\0\0\0\31\0\0\0\32\0\0\0\34\0\0\0\36"
-  "\0\0\0\40\0\0\0#\0\0\0$\202\0\0\0%\4\0\0\0$\0\0\0\"\0\0\0\40\0\0\0\36"
-  "\202\0\0\0\35\3\0\0\0\36\0\0\0\37\0\0\0!\203\0\0\0\"\5\0\0\0\40\0\0\0"
-  "\37\0\0\0\35\0\0\0\32\0\0\0\31\202\0\0\0\30\202\0\0\0\27\202\0\0\0\30"
-  "\5\0\0\0\31\0\0\0\33\0\0\0\35\0\0\0\37\0\0\0!\202\0\0\0\"\11\0\0\0\40"
-  "\0\0\0\35\0\0\0\32\0\0\0\25\0\0\0\21\0\0\0\14\0\0\0\10\0\0\0\5\0\0\0"
-  "\3\202\0\0\0\1\343\0\0\0\0\202\0\0\0\1\6\0\0\0\3\0\0\0\4\0\0\0\7\0\0"
-  "\0\11\0\0\0\13\0\0\0\14\202\0\0\0\15\1\0\0\0\16\202\0\0\0\17\3\0\0\0"
-  "\21\0\0\0\23\0\0\0\24\202\0\0\0\25\204\0\0\0\24\13\0\0\0\25\0\0\0\26"
-  "\0\0\0\27\0\0\0\30\0\0\0\27\0\0\0\26\0\0\0\24\0\0\0\21\0\0\0\16\0\0\0"
-  "\13\0\0\0\10\203\0\0\0\6\6\0\0\0\11\0\0\0\15\0\0\0\23\0\0\0\31\0\0\0"
-  "\40\0\0\0%\202\0\0\0(\15\0\0\0'\0\0\0#\0\0\0\37\0\0\0\34\0\0\0\30\0\0"
-  "\0\25\0\0\0\22\0\0\0\21\0\0\0\20\0\0\0\17\0\0\0\16\0\0\0\15\0\0\0\13"
-  "\202\0\0\0\12\22\0\0\0\13\0\0\0\15\0\0\0\17\0\0\0\22\0\0\0\25\0\0\0\27"
-  "\0\0\0\30\0\0\0\31\0\0\0\30\0\0\0\27\0\0\0\24\0\0\0\22\0\0\0\17\0\0\0"
-  "\16\0\0\0\15\0\0\0\16\0\0\0\17\0\0\0\20\202\0\0\0\21\3\0\0\0\20\0\0\0"
-  "\17\0\0\0\15\203\0\0\0\14\12\0\0\0\15\0\0\0\16\0\0\0\17\0\0\0\20\0\0"
-  "\0\21\0\0\0\22\0\0\0\23\0\0\0\25\0\0\0\27\0\0\0\30\202\0\0\0\31\4\0\0"
-  "\0\30\0\0\0\27\0\0\0\25\0\0\0\23\202\0\0\0\21\1\0\0\0\20\202\0\0\0\21"
-  "\206\0\0\0\22\202\0\0\0\21\6\0\0\0\17\0\0\0\14\0\0\0\12\0\0\0\7\0\0\0"
-  "\5\0\0\0\4\202\0\0\0\3\10\0\0\0\4\0\0\0\7\0\0\0\12\0\0\0\15\0\0\0\22"
-  "\0\0\0\25\0\0\0\30\0\0\0\32\202\0\0\0\33\5\0\0\0\32\0\0\0\30\0\0\0\25"
-  "\0\0\0\22\0\0\0\17\203\0\0\0\15\2\0\0\0\17\0\0\0\20\203\0\0\0\21\1\0"
-  "\0\0\17\202\0\0\0\16\6\0\0\0\17\0\0\0\21\0\0\0\23\0\0\0\26\0\0\0\30\0"
-  "\0\0\32\202\0\0\0\34\5\0\0\0\33\0\0\0\31\0\0\0\27\0\0\0\25\0\0\0\24\202"
-  "\0\0\0\22\207\0\0\0\21\202\0\0\0\22\6\0\0\0\24\0\0\0\25\0\0\0\27\0\0"
-  "\0\30\0\0\0\32\0\0\0\33\202\0\0\0\34\4\0\0\0\33\0\0\0\32\0\0\0\30\0\0"
-  "\0\27\202\0\0\0\25\3\0\0\0\26\0\0\0\27\0\0\0\31\203\0\0\0\32\5\0\0\0"
-  "\30\0\0\0\27\0\0\0\25\0\0\0\24\0\0\0\22\206\0\0\0\21\5\0\0\0\22\0\0\0"
-  "\23\0\0\0\25\0\0\0\27\0\0\0\30\202\0\0\0\31\11\0\0\0\30\0\0\0\26\0\0"
-  "\0\24\0\0\0\20\0\0\0\14\0\0\0\11\0\0\0\6\0\0\0\4\0\0\0\2\202\0\0\0\1"
-  "\343\0\0\0\0\202\0\0\0\1\5\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\7\204"
-  "\0\0\0\11\202\0\0\0\12\1\0\0\0\14\202\0\0\0\15\202\0\0\0\16\204\0\0\0"
-  "\15\202\0\0\0\17\203\0\0\0\21\6\0\0\0\17\0\0\0\16\0\0\0\14\0\0\0\11\0"
-  "\0\0\7\0\0\0\6\202\0\0\0\4\7\0\0\0\5\0\0\0\7\0\0\0\13\0\0\0\20\0\0\0"
-  "\25\0\0\0\33\0\0\0\37\202\0\0\0!\12\0\0\0\37\0\0\0\34\0\0\0\30\0\0\0"
-  "\24\0\0\0\21\0\0\0\17\0\0\0\15\0\0\0\14\0\0\0\13\0\0\0\12\202\0\0\0\11"
-  "\204\0\0\0\7\15\0\0\0\11\0\0\0\12\0\0\0\14\0\0\0\17\0\0\0\20\0\0\0\21"
-  "\0\0\0\22\0\0\0\21\0\0\0\20\0\0\0\16\0\0\0\14\0\0\0\13\0\0\0\12\202\0"
-  "\0\0\11\1\0\0\0\12\203\0\0\0\13\202\0\0\0\12\1\0\0\0\11\203\0\0\0\10"
-  "\1\0\0\0\11\203\0\0\0\12\6\0\0\0\13\0\0\0\14\0\0\0\15\0\0\0\16\0\0\0"
-  "\17\0\0\0\21\202\0\0\0\22\202\0\0\0\21\3\0\0\0\17\0\0\0\15\0\0\0\14\203"
-  "\0\0\0\13\210\0\0\0\14\6\0\0\0\13\0\0\0\12\0\0\0\10\0\0\0\7\0\0\0\5\0"
-  "\0\0\3\203\0\0\0\2\10\0\0\0\3\0\0\0\5\0\0\0\7\0\0\0\11\0\0\0\14\0\0\0"
-  "\17\0\0\0\21\0\0\0\22\202\0\0\0\23\5\0\0\0\22\0\0\0\21\0\0\0\17\0\0\0"
-  "\14\0\0\0\12\203\0\0\0\11\202\0\0\0\12\203\0\0\0\13\1\0\0\0\12\202\0"
-  "\0\0\11\6\0\0\0\12\0\0\0\13\0\0\0\15\0\0\0\17\0\0\0\21\0\0\0\22\202\0"
-  "\0\0\23\5\0\0\0\22\0\0\0\21\0\0\0\20\0\0\0\17\0\0\0\15\204\0\0\0\14\203"
-  "\0\0\0\13\203\0\0\0\14\202\0\0\0\15\7\0\0\0\16\0\0\0\17\0\0\0\21\0\0"
-  "\0\22\0\0\0\23\0\0\0\24\0\0\0\23\202\0\0\0\22\1\0\0\0\21\204\0\0\0\17"
-  "\202\0\0\0\21\203\0\0\0\22\4\0\0\0\21\0\0\0\20\0\0\0\17\0\0\0\15\203"
-  "\0\0\0\14\203\0\0\0\13\202\0\0\0\14\4\0\0\0\15\0\0\0\16\0\0\0\17\0\0"
-  "\0\21\202\0\0\0\22\10\0\0\0\21\0\0\0\20\0\0\0\15\0\0\0\14\0\0\0\11\0"
-  "\0\0\6\0\0\0\4\0\0\0\2\202\0\0\0\1\345\0\0\0\0\202\0\0\0\1\202\0\0\0"
-  "\2\2\0\0\0\4\0\0\0\5\206\0\0\0\6\2\0\0\0\7\0\0\0\10\205\0\0\0\11\1\0"
-  "\0\0\10\202\0\0\0\11\202\0\0\0\12\1\0\0\0\13\202\0\0\0\12\5\0\0\0\11"
-  "\0\0\0\7\0\0\0\6\0\0\0\4\0\0\0\3\202\0\0\0\2\7\0\0\0\4\0\0\0\6\0\0\0"
-  "\11\0\0\0\15\0\0\0\21\0\0\0\25\0\0\0\30\202\0\0\0\32\7\0\0\0\30\0\0\0"
-  "\25\0\0\0\22\0\0\0\16\0\0\0\14\0\0\0\12\0\0\0\10\202\0\0\0\7\202\0\0"
-  "\0\6\1\0\0\0\5\204\0\0\0\4\14\0\0\0\5\0\0\0\6\0\0\0\7\0\0\0\11\0\0\0"
-  "\12\0\0\0\13\0\0\0\14\0\0\0\13\0\0\0\12\0\0\0\11\0\0\0\10\0\0\0\7\204"
-  "\0\0\0\6\204\0\0\0\7\1\0\0\0\6\204\0\0\0\5\203\0\0\0\6\203\0\0\0\7\2"
-  "\0\0\0\10\0\0\0\11\202\0\0\0\12\202\0\0\0\14\1\0\0\0\13\202\0\0\0\12"
-  "\2\0\0\0\11\0\0\0\10\214\0\0\0\7\5\0\0\0\6\0\0\0\5\0\0\0\4\0\0\0\3\0"
-  "\0\0\2\203\0\0\0\1\7\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\7\0\0\0\11"
-  "\0\0\0\12\204\0\0\0\14\4\0\0\0\12\0\0\0\11\0\0\0\10\0\0\0\7\204\0\0\0"
-  "\6\204\0\0\0\7\204\0\0\0\6\4\0\0\0\7\0\0\0\10\0\0\0\12\0\0\0\13\204\0"
-  "\0\0\14\2\0\0\0\13\0\0\0\12\202\0\0\0\11\1\0\0\0\10\211\0\0\0\7\1\0\0"
-  "\0\10\202\0\0\0\11\202\0\0\0\12\205\0\0\0\14\1\0\0\0\13\202\0\0\0\12"
-  "\202\0\0\0\11\202\0\0\0\12\1\0\0\0\13\203\0\0\0\14\2\0\0\0\13\0\0\0\12"
-  "\202\0\0\0\11\210\0\0\0\7\2\0\0\0\10\0\0\0\11\202\0\0\0\12\10\0\0\0\13"
-  "\0\0\0\14\0\0\0\13\0\0\0\12\0\0\0\11\0\0\0\7\0\0\0\6\0\0\0\4\202\0\0"
-  "\0\2\1\0\0\0\1\347\0\0\0\0\203\0\0\0\1\202\0\0\0\2\205\0\0\0\3\203\0"
-  "\0\0\4\210\0\0\0\5\205\0\0\0\6\3\0\0\0\5\0\0\0\4\0\0\0\3\202\0\0\0\2"
-  "\1\0\0\0\1\202\0\0\0\2\17\0\0\0\4\0\0\0\7\0\0\0\12\0\0\0\15\0\0\0\21"
-  "\0\0\0\22\0\0\0\24\0\0\0\23\0\0\0\21\0\0\0\17\0\0\0\14\0\0\0\11\0\0\0"
-  "\7\0\0\0\6\0\0\0\5\203\0\0\0\4\202\0\0\0\3\205\0\0\0\2\202\0\0\0\4\2"
-  "\0\0\0\5\0\0\0\6\203\0\0\0\7\202\0\0\0\6\1\0\0\0\5\202\0\0\0\4\202\0"
-  "\0\0\3\205\0\0\0\4\202\0\0\0\3\202\0\0\0\2\203\0\0\0\3\205\0\0\0\4\1"
-  "\0\0\0\5\202\0\0\0\6\203\0\0\0\7\202\0\0\0\6\1\0\0\0\5\215\0\0\0\4\1"
-  "\0\0\0\3\202\0\0\0\2\207\0\0\0\1\3\0\0\0\2\0\0\0\3\0\0\0\4\202\0\0\0"
-  "\6\204\0\0\0\7\202\0\0\0\6\202\0\0\0\4\204\0\0\0\3\205\0\0\0\4\202\0"
-  "\0\0\3\202\0\0\0\4\1\0\0\0\5\202\0\0\0\6\205\0\0\0\7\202\0\0\0\6\1\0"
-  "\0\0\5\213\0\0\0\4\202\0\0\0\5\202\0\0\0\6\206\0\0\0\7\206\0\0\0\6\205"
-  "\0\0\0\7\202\0\0\0\6\1\0\0\0\5\211\0\0\0\4\1\0\0\0\5\202\0\0\0\6\203"
-  "\0\0\0\7\202\0\0\0\6\3\0\0\0\4\0\0\0\3\0\0\0\2\203\0\0\0\1\350\0\0\0"
-  "\0\210\0\0\0\1\214\0\0\0\2\205\0\0\0\3\203\0\0\0\2\204\0\0\0\1\6\0\0"
-  "\0\2\0\0\0\3\0\0\0\5\0\0\0\7\0\0\0\11\0\0\0\14\203\0\0\0\15\6\0\0\0\14"
-  "\0\0\0\12\0\0\0\7\0\0\0\6\0\0\0\4\0\0\0\3\204\0\0\0\2\207\0\0\0\1\203"
-  "\0\0\0\2\1\0\0\0\3\203\0\0\0\4\202\0\0\0\3\212\0\0\0\2\206\0\0\0\1\207"
-  "\0\0\0\2\202\0\0\0\3\203\0\0\0\4\202\0\0\0\3\217\0\0\0\2\204\0\0\0\1"
-  "\203\0\0\0\0\203\0\0\0\1\203\0\0\0\2\1\0\0\0\3\204\0\0\0\4\1\0\0\0\3"
-  "\203\0\0\0\2\203\0\0\0\1\206\0\0\0\2\202\0\0\0\1\203\0\0\0\2\202\0\0"
-  "\0\3\204\0\0\0\4\202\0\0\0\3\217\0\0\0\2\202\0\0\0\3\205\0\0\0\4\207"
-  "\0\0\0\3\205\0\0\0\4\202\0\0\0\3\213\0\0\0\2\202\0\0\0\3\203\0\0\0\4"
-  "\202\0\0\0\3\202\0\0\0\2\203\0\0\0\1\354\0\0\0\0\232\0\0\0\1\202\0\0"
-  "\0\0\202\0\0\0\1\5\0\0\0\2\0\0\0\3\0\0\0\5\0\0\0\6\0\0\0\7\202\0\0\0"
-  "\11\6\0\0\0\10\0\0\0\7\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\2\210\0\0\0\1\203"
-  "\0\0\0\0\270\0\0\0\1\211\0\0\0\0\236\0\0\0\1\1\0\0\0\2\226\0\0\0\1\202"
-  "\0\0\0\2\211\0\0\0\1\203\0\0\0\2\230\0\0\0\1\377\0\0\0\0\1\0\0\0\0\204"
-  "\0\0\0\1\207\0\0\0\0\202\0\0\0\1\4\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\5\202"
-  "\0\0\0\6\3\0\0\0\5\0\0\0\4\0\0\0\3\202\0\0\0\2\202\0\0\0\1\216\0\0\0"
-  "\0\206\0\0\0\1\230\0\0\0\0\206\0\0\0\1\235\0\0\0\0\204\0\0\0\1\223\0"
-  "\0\0\0\206\0\0\0\1\222\0\0\0\0\206\0\0\0\1\205\0\0\0\0\206\0\0\0\1\216"
-  "\0\0\0\0\206\0\0\0\1\377\0\0\0\0\220\0\0\0\0\203\0\0\0\1\206\0\0\0\2"
-  "\203\0\0\0\1\377\0\0\0\0\377\0\0\0\0\267\0\0\0\0\212\0\0\0\1\377\0\0"
-  "\0\0\377\0\0\0\0\273\0\0\0\0\204\0\0\0\1\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0"
-  "\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377"
-  "\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0"
-  "\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\377\0\0\0\0\233\0\0"
-  "\0\0",
-};
-
-
diff --git a/settings/splash/xfce-splash-settings.desktop.in b/settings/splash/xfce-splash-settings.desktop.in
deleted file mode 100644
index b633da7c..00000000
--- a/settings/splash/xfce-splash-settings.desktop.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Xfce 4 Splash Screen Settings
-_Comment=Splash Screen Settings
-Exec=xfce4-splash-settings
-Icon=xfce4-splash
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-OnlyShowIn=XFCE;
-_GenericName=Splash Screen Settings
-_X-XfceSettingsName=Splash Screen
-X-XfcePluggable=true
diff --git a/settings/startup-settings.c b/settings/startup-settings.c
new file mode 100644
index 00000000..a7ae89d0
--- /dev/null
+++ b/settings/startup-settings.c
@@ -0,0 +1,64 @@
+/*
+ *  Copyright (c) 2008 Brian Tarricone <bjt23@cornell.edu>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License ONLY.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <xfconf/xfconf.h>
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+
+#include "xfce4-session-settings-common.h"
+
+#define DISP_CHOOSER_PROP   "/chooser/AlwaysDisplay"
+
+#define AUTO_SAVE_PROP      "/general/AutoSave"
+#define LOGOUT_PROMPT_PROP  "/general/PromptOnLogout"
+
+#define GNOME_SUPPORT_PROP  "/compat/LaunchGNOME"
+#define KDE_SUPPORT_PROP    "/compat/LaunchKDE"
+
+#define ENABLE_TCP_PROP     "/security/EnableTcp"
+
+void
+startup_settings_init(GladeXML *gxml)
+{
+    XfconfChannel *channel = xfconf_channel_get(SETTINGS_CHANNEL);
+
+    xfconf_g_property_bind(channel, DISP_CHOOSER_PROP, G_TYPE_BOOLEAN,
+                           glade_xml_get_widget(gxml, "chk_display_chooser"),
+                           "active");
+
+    xfconf_g_property_bind(channel, AUTO_SAVE_PROP, G_TYPE_BOOLEAN,
+                           glade_xml_get_widget(gxml, "chk_session_autosave"),
+                           "active");
+    xfconf_g_property_bind(channel, LOGOUT_PROMPT_PROP, G_TYPE_BOOLEAN,
+                           glade_xml_get_widget(gxml, "chk_logout_prompt"),
+                           "active");
+
+    xfconf_g_property_bind(channel, GNOME_SUPPORT_PROP, G_TYPE_BOOLEAN,
+                           glade_xml_get_widget(gxml, "chk_compat_gnome"),
+                           "active");
+    xfconf_g_property_bind(channel, KDE_SUPPORT_PROP, G_TYPE_BOOLEAN,
+                           glade_xml_get_widget(gxml, "chk_compat_kde"),
+                           "active");
+
+    xfconf_g_property_bind(channel, ENABLE_TCP_PROP, G_TYPE_BOOLEAN,
+                           glade_xml_get_widget(gxml, "chk_enable_tcp"),
+                           "active");
+}
diff --git a/xfce4-autostart-editor/xfae-dialog.c b/settings/xfae-dialog.c
index b0ad8eb6..688a8c7c 100644
--- a/xfce4-autostart-editor/xfae-dialog.c
+++ b/settings/xfae-dialog.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #endif
 
-#include <xfce4-autostart-editor/xfae-dialog.h>
+#include "xfae-dialog.h"
 
 
 
diff --git a/xfce4-autostart-editor/xfae-dialog.h b/settings/xfae-dialog.h
index 77c996ee..77c996ee 100644
--- a/xfce4-autostart-editor/xfae-dialog.h
+++ b/settings/xfae-dialog.h
diff --git a/xfce4-autostart-editor/xfae-model.c b/settings/xfae-model.c
index b3a6b981..8fd4486c 100644
--- a/xfce4-autostart-editor/xfae-model.c
+++ b/settings/xfae-model.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #endif
 
-#include <xfce4-autostart-editor/xfae-model.h>
+#include "xfae-model.h"
 
 
 
diff --git a/xfce4-autostart-editor/xfae-model.h b/settings/xfae-model.h
index e4a88b9f..e4a88b9f 100644
--- a/xfce4-autostart-editor/xfae-model.h
+++ b/settings/xfae-model.h
diff --git a/xfce4-autostart-editor/xfae-window.c b/settings/xfae-window.c
index 3b9cf698..127b8ac5 100644
--- a/xfce4-autostart-editor/xfae-window.c
+++ b/settings/xfae-window.c
@@ -24,9 +24,9 @@
 #include <config.h>
 #endif
 
-#include <xfce4-autostart-editor/xfae-dialog.h>
-#include <xfce4-autostart-editor/xfae-model.h>
-#include <xfce4-autostart-editor/xfae-window.h>
+#include "xfae-dialog.h"
+#include "xfae-model.h"
+#include "xfae-window.h"
 
 
 
@@ -46,22 +46,21 @@ static void     xfae_window_selection_changed   (GtkTreeSelection *selection,
 
 struct _XfaeWindowClass
 {
-  GtkWindowClass __parent__;
+  GtkVBoxClass __parent__;
 };
 
 struct _XfaeWindow
 {
-  GtkWindow         __parent__;
+  GtkVBox           __parent__;
 
   GtkTreeSelection *selection;
 
   GtkWidget        *treeview;
-  GtkWidget        *ibox;
 };
 
 
 
-G_DEFINE_TYPE (XfaeWindow, xfae_window, GTK_TYPE_WINDOW);
+G_DEFINE_TYPE (XfaeWindow, xfae_window, GTK_TYPE_VBOX);
 
 
 
@@ -79,49 +78,24 @@ xfae_window_init (XfaeWindow *window)
   GtkCellRenderer   *renderer;
   GtkTreeModel      *model;
   GtkWidget         *vbox;
-  GtkWidget         *title_box;
-  GtkWidget         *heading;
-  GtkWidget         *separator;
-  GtkWidget         *content_vbox;
+  GtkWidget         *hbox;
+  GtkWidget         *img;
   GtkWidget         *label;
   GtkWidget         *swin;
   GtkWidget         *bbox;
   GtkWidget         *button;
 
-  gtk_window_set_default_size (GTK_WINDOW (window), -1, 350);
-  gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
-  gtk_window_set_title (GTK_WINDOW (window), _("Autostarted applications"));
+  vbox = GTK_WIDGET(window);
+  gtk_box_set_spacing (GTK_BOX (vbox), 6);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
-  vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
-  gtk_container_add (GTK_CONTAINER (window), vbox);
-  gtk_widget_show (vbox);
+  hbox = gtk_hbox_new (FALSE, 12);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+  gtk_widget_show (hbox);
 
-  title_box = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), title_box, FALSE, TRUE, 0);
-  gtk_widget_show (title_box);
-
-  heading = xfce_heading_new ();
-  xfce_heading_set_icon_name (XFCE_HEADING (heading), "xfce4-autostart-editor");
-  xfce_heading_set_title (XFCE_HEADING (heading), 
-                          gtk_window_get_title (GTK_WINDOW (window)));
-  xfce_heading_set_subtitle (XFCE_HEADING (heading), 
-                             _("Edit the list of autostarted applications"));
-  gtk_box_pack_start (GTK_BOX (title_box), heading, FALSE, TRUE, 0);
-  gtk_widget_show (heading);
-
-  separator = gtk_hseparator_new ();
-  gtk_box_pack_start (GTK_BOX (title_box), separator, FALSE, TRUE, 0);
-  gtk_widget_show (separator);
-
-  content_vbox = gtk_vbox_new (FALSE, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (content_vbox), 6);
-  gtk_container_add (GTK_CONTAINER (vbox), content_vbox);
-  gtk_widget_show (content_vbox);
-
-  window->ibox = gtk_vbox_new (FALSE, 6);
-  gtk_container_add (GTK_CONTAINER (content_vbox), window->ibox);
-  gtk_widget_show (window->ibox);
+  img = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
+  gtk_box_pack_start (GTK_BOX (hbox), img, FALSE, FALSE, 0);
+  gtk_widget_show (img);
 
   label = g_object_new (GTK_TYPE_LABEL,
                         "justify", GTK_JUSTIFY_FILL,
@@ -132,7 +106,7 @@ xfae_window_init (XfaeWindow *window)
                         "xalign", 0.0f,
                         NULL);
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  gtk_box_pack_start (GTK_BOX (window->ibox), label, FALSE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
   gtk_widget_show (label);
 
   swin = g_object_new (GTK_TYPE_SCROLLED_WINDOW,
@@ -142,7 +116,7 @@ xfae_window_init (XfaeWindow *window)
                        "vscrollbar-policy", GTK_POLICY_AUTOMATIC,
                        "hscrollbar-policy", GTK_POLICY_NEVER,
                        NULL);
-  gtk_box_pack_start (GTK_BOX (window->ibox), swin, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), swin, TRUE, TRUE, 0);
   gtk_widget_show (swin);
 
   window->treeview = g_object_new (GTK_TYPE_TREE_VIEW,
@@ -192,8 +166,8 @@ xfae_window_init (XfaeWindow *window)
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_append_column (GTK_TREE_VIEW (window->treeview), column);
 
-  bbox = gtk_hbutton_box_new ();
-  gtk_box_pack_start (GTK_BOX (content_vbox), bbox, FALSE, TRUE, 0);
+  bbox = gtk_hbox_new (FALSE, 6);
+  gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, TRUE, 0);
   gtk_widget_show (bbox);
 
   button = gtk_button_new_from_stock (GTK_STOCK_ADD);
@@ -210,12 +184,6 @@ xfae_window_init (XfaeWindow *window)
   xfae_window_selection_changed (window->selection, button);
   gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
-
-  button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
-  g_signal_connect_swapped (G_OBJECT (button), "clicked",
-                            G_CALLBACK (gtk_widget_destroy), window);
-  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
-  gtk_widget_show (button);
 }
 
 
@@ -396,6 +364,7 @@ xfae_window_new (void)
 
 
 
+#if 0
 /**
  * xfae_window_create_plug_child:
  *
@@ -445,3 +414,4 @@ xfae_window_create_plug_child (XfaeWindow *window)
 
   return vbox;
 }
+#endif
diff --git a/xfce4-autostart-editor/xfae-window.h b/settings/xfae-window.h
index 0b77abee..3c586ccd 100644
--- a/xfce4-autostart-editor/xfae-window.h
+++ b/settings/xfae-window.h
@@ -23,7 +23,7 @@
 #ifndef __XFAE_WINDOW_H__
 #define __XFAE_WINDOW_H__
 
-#include <xfce4-autostart-editor/xfae-model.h>
+#include "xfae-model.h"
 
 G_BEGIN_DECLS;
 
@@ -40,7 +40,9 @@ typedef struct _XfaeWindow      XfaeWindow;
 GType      xfae_window_get_type          (void) G_GNUC_CONST;
 
 GtkWidget *xfae_window_new               (void) G_GNUC_MALLOC;
+#if 0
 GtkWidget *xfae_window_create_plug_child (XfaeWindow *window);
+#endif
 
 G_END_DECLS;
 
diff --git a/settings/session/xfce-session-settings.desktop.in b/settings/xfce-session-settings.desktop.in
index 004c9722..004c9722 100644
--- a/settings/session/xfce-session-settings.desktop.in
+++ b/settings/xfce-session-settings.desktop.in
diff --git a/settings/xfce4-session-settings-common.h b/settings/xfce4-session-settings-common.h
new file mode 100644
index 00000000..76a53071
--- /dev/null
+++ b/settings/xfce4-session-settings-common.h
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2008 Brian Tarricone <bjt23@cornell.edu>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License ONLY.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __XFCE4_SESSION_SETTINGS_COMMON_H__
+#define __XFCE4_SESSION_SETTINGS_COMMON_H__
+
+#include <glade/glade.h>
+
+#define  SETTINGS_CHANNEL  "xfce4-session"
+
+void startup_settings_init(GladeXML *gxml);
+void splash_settings_init(GladeXML *gxml);
+void session_editor_init(GladeXML *gxml);
+
+#endif
diff --git a/settings/xfce4-session-settings.glade b/settings/xfce4-session-settings.glade
new file mode 100644
index 00000000..5f594e19
--- /dev/null
+++ b/settings/xfce4-session-settings.glade
@@ -0,0 +1,734 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--Generated with glade3 3.4.5 on Sat Oct 11 03:33:46 2008 -->
+<glade-interface>
+  <requires lib="xfce4"/>
+  <widget class="XfceTitledDialog" id="xfce4_session_settings_dialog">
+    <property name="title" translatable="yes">Sessions and Startup</property>
+    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="icon_name">xfce4-session</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <property name="subtitle" translatable="yes">Customize desktop startup and splash screen</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <widget class="GtkNotebook" id="plug-child">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="border_width">6</property>
+            <child>
+              <widget class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <child>
+                  <widget class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="chk_display_chooser">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Display chooser on login</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Session Chooser&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame2">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment3">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkVBox" id="vbox2">
+                            <property name="visible">True</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <widget class="GtkCheckButton" id="chk_session_autosave">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">Automatically save session on _logout</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkCheckButton" id="chk_logout_prompt">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="label" translatable="yes">_Prompt on logout</property>
+                                <property name="use_underline">True</property>
+                                <property name="response_id">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Logout Settings&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_General</property>
+                <property name="use_underline">True</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkHBox" id="hbox2">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">12</property>
+                <child>
+                  <widget class="GtkVBox" id="vbox6">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                        <child>
+                          <widget class="GtkTreeView" id="treeview_splash">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="headers_visible">False</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="btn_splash_configure">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip" translatable="yes">Opens the configuration panel for the selected splash screen.</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox3">
+                            <property name="visible">True</property>
+                            <property name="spacing">4</property>
+                            <child>
+                              <widget class="GtkImage" id="image2">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="stock">gtk-preferences</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label11">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Con_figure</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">btn_splash_configure</property>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="btn_splash_test">
+                        <property name="visible">True</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip" translatable="yes">Demonstrates the selected splash screen.</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox4">
+                            <property name="visible">True</property>
+                            <property name="spacing">4</property>
+                            <child>
+                              <widget class="GtkImage" id="image3">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="stock">gtk-execute</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label12">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">_Test</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">btn_splash_test</property>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox7">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkImage" id="img_splash_preview">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-missing-image</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="frame5">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment6">
+                            <property name="visible">True</property>
+                            <property name="bottom_padding">4</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkTable" id="table1">
+                                <property name="visible">True</property>
+                                <property name="n_rows">4</property>
+                                <property name="n_columns">2</property>
+                                <property name="column_spacing">12</property>
+                                <property name="row_spacing">2</property>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_homepage1">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">label</property>
+                                    <property name="selectable">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_author1">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">label</property>
+                                    <property name="selectable">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_version1">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">label</property>
+                                    <property name="selectable">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_desc1">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">label</property>
+                                    <property name="selectable">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_homepage0">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Homepage:&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_author0">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Author:&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_version0">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Version:&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="lbl_splash_desc0">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Description:&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="x_options">GTK_FILL</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label13">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Information&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">S_plash</property>
+                <property name="use_underline">True</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox8">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkHBox" id="hbox10">
+                    <property name="visible">True</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <widget class="GtkImage" id="image10">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-dialog-info</property>
+                        <property name="icon_size">6</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label21">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">These applications are a part of the currently-running session, and can be saved when you log out.</property>
+                        <property name="justify">GTK_JUSTIFY_FILL</property>
+                        <property name="wrap">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkScrolledWindow" id="scrolledwindow4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+                    <child>
+                      <widget class="GtkTreeView" id="treeview4">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox7">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkButton" id="button8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip" translatable="yes">Remove the selected application from the session.</property>
+                        <property name="label" translatable="yes">gtk-remove</property>
+                        <property name="use_stock">True</property>
+                        <property name="response_id">0</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="button9">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip" translatable="yes">Quit the program, and remove it from the session.</property>
+                        <property name="response_id">0</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox6">
+                            <property name="visible">True</property>
+                            <property name="spacing">4</property>
+                            <child>
+                              <widget class="GtkImage" id="image5">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="stock">gtk-quit</property>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label23">
+                                <property name="visible">True</property>
+                                <property name="xalign">0</property>
+                                <property name="label" translatable="yes">Quit Program</property>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="label" translatable="yes">_Session</property>
+                <property name="use_underline">True</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox3">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkFrame" id="frame3">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment4">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox4">
+                                <property name="visible">True</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="chk_compat_gnome">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Launch GN_OME services on startup</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="chk_compat_kde">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Launch _KDE services on startup</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkImage" id="image1">
+                                <property name="visible">True</property>
+                                <property name="yalign">0</property>
+                                <property name="pixel_size">64</property>
+                                <property name="icon_name">xfsm-gnome-kde-logo</property>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Compatibility&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkFrame" id="frame4">
+                    <property name="visible">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">GTK_SHADOW_NONE</property>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment5">
+                        <property name="visible">True</property>
+                        <property name="top_padding">6</property>
+                        <property name="bottom_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="chk_enable_tcp">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Manage _remote applications</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label9">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Security&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="type">label_item</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Ad_vanced</property>
+                <property name="use_underline">True</property>
+              </widget>
+              <packing>
+                <property name="type">tab</property>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+            <child>
+              <widget class="GtkButton" id="button1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-help</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="button2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="label" translatable="yes">gtk-close</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
diff --git a/settings/xfce4-session.xml b/settings/xfce4-session.xml
new file mode 100644
index 00000000..ae8b7d09
--- /dev/null
+++ b/settings/xfce4-session.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-session" version="1.0">
+  <property name="general" type="empty">
+    <property name="FailsafeSessionName" type="string" value="Failsafe"/>
+  </property>
+  <property name="sessions" type="empty">
+    <property name="Failsafe" type="empty">
+      <property name="IsFailsafe" type="bool" value="true"/>
+      <property name="Count" type="int" value="4"/>
+      <property name="Client0_Command" type="array">
+        <value type="string" value="xfwm4"/>
+      </property>
+      <property name="Client0_PerScreen" type="bool" value="false"/>
+      <property name="Client1_Command" type="array">
+        <value type="string" value="xfce4-panel"/>
+      </property>
+      <property name="Client1_PerScreen" type="bool" value="false"/>
+      <property name="Client2_Command" type="array">
+        <value type="string" value="Thunar"/>
+        <value type="string" value="--daemon"/>
+      </property>
+      <property name="Client2_PerScreen" type="bool" value="false"/>
+      <property name="Client3_Command" type="array">
+        <value type="string" value="xfdesktop"/>
+      </property>
+      <property name="Client3_PerScreen" type="bool" value="false"/>
+    </property>
+  </property>
+</channel>
diff --git a/xfce4-autostart-editor/Makefile.am b/xfce4-autostart-editor/Makefile.am
deleted file mode 100644
index db0e5949..00000000
--- a/xfce4-autostart-editor/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	-DG_LOG_DOMAIN=\"xfce4-autostart-editor\"			\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-
-bin_PROGRAMS =								\
-	xfce4-autostart-editor
-
-xfce4_autostart_editor_SOURCES =					\
-	main.c								\
-	xfae-dialog.c							\
-	xfae-dialog.h							\
-	xfae-model.c							\
-	xfae-model.h							\
-	xfae-window.c							\
-	xfae-window.h
-
-xfce4_autostart_editor_CFLAGS =						\
-	@LIBXFCEGUI4_CFLAGS@
-
-xfce4_autostart_editor_LDADD =						\
-	@LIBXFCEGUI4_LIBS@
-
-desktopdir = $(datadir)/applications
-desktop_in_files = xfce4-autostart-editor.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST =								\
-	$(desktop_in_files)
-
-DISTCLEANFILES =							\
-	$(desktop_DATA)
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/xfce4-autostart-editor/main.c b/xfce4-autostart-editor/main.c
deleted file mode 100644
index 34f7a02e..00000000
--- a/xfce4-autostart-editor/main.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2007 Benedikt Meurer <benny@xfce.org>
- * Coprright (c) 2008 Jannis Pohlmann <jannis@xfce.org>
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *                                                                              
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *                                                                              
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#include <xfce4-autostart-editor/xfae-window.h>
-
-
-
-static GdkNativeWindow opt_socket_id = 0;
-static GOptionEntry    entries[] = 
-{
-  { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &opt_socket_id, N_("Settings manager socket"), N_("SOCKET ID") },
-  { NULL }
-};
-
-
-
-int
-main (int argc, char **argv)
-{
-  GtkWidget *window;
-  GtkWidget *plug;
-  GtkWidget *plug_child;
-  GError    *error = NULL;
-
-  xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
-
-  if (G_UNLIKELY (!gtk_init_with_args (&argc, &argv, "", entries, PACKAGE, &error)))
-    {
-      if (G_LIKELY (error != NULL))
-        {
-          g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
-          g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
-          g_print ("\n");
-
-          g_error_free (error);
-        }
-
-      return EXIT_FAILURE;
-    }
-
-  gtk_window_set_default_icon_name ("xfce4-autostart-editor");
-
-  window = xfae_window_new ();
-
-  if (opt_socket_id == 0)
-    {
-      g_signal_connect (G_OBJECT (window), "destroy",
-                        G_CALLBACK (gtk_main_quit), NULL);
-      gtk_widget_show (window);
-    }
-  else
-    {
-      /* Create plug widget */
-      plug = gtk_plug_new (opt_socket_id);
-      gtk_widget_show (plug);
-
-      /* Embed plug child widget */
-      plug_child = xfae_window_create_plug_child (XFAE_WINDOW (window));
-      gtk_widget_reparent (plug_child, plug);
-      gtk_widget_show (plug_child);
-    }
-
-  gtk_main ();
-
-  return EXIT_SUCCESS;
-}
-
-
diff --git a/xfce4-autostart-editor/xfce4-autostart-editor.desktop.in b/xfce4-autostart-editor/xfce4-autostart-editor.desktop.in
deleted file mode 100644
index a19e2352..00000000
--- a/xfce4-autostart-editor/xfce4-autostart-editor.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Xfce 4 Autostarted Applications
-_Comment=Edit the list of autostarted applications
-Exec=xfce4-autostart-editor
-Icon=xfce4-autostart-editor
-Terminal=false
-Type=Application
-Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
-OnlyShowIn=XFCE;
-_GenericName=Autostarted Applications
-X-XfcePluggable=true
diff --git a/xfce4-session.rc b/xfce4-session.rc
deleted file mode 100644
index f0a6d68a..00000000
--- a/xfce4-session.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id$
-#
-# Default xfce4-session configuration file.
-#
-# Copyright (c) 2003-2006 Benedikt Meurer <benny@xfce.org>
-# All rights reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-#
-
-
-[General]
-SessionName=Default
-SessionName[de]=Standard
-SessionName[ja]=標準
-
-# Disable management of remote clients by default. The user
-# has to explicitly enable this for security reasons.
-DisableTcp=True
-
-
-# This the default session launched by xfce4-session if the
-# user hasn't saved any session yet or creates a new session.
-[Failsafe Session]
-Count=4
-Client0_Command=xfwm4
-Client0_PerScreen=False
-Client1_Command=xfce4-panel
-Client1_PerScreen=False
-Client2_Command=Thunar,--daemon
-Client2_PerScreen=False
-Client3_Command=xfdesktop
-Client3_PerScreen=False
-
-
-# Default splash screen selection.
-[Splash Screen]
-Engine=mice
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index de5ddbe1..e4110d3d 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -59,6 +59,7 @@ xfce4_session_CFLAGS =							\
 	$(DBUS_CFLAGS)							\
 	$(DBUS_GLIB_CFLAGS)						\
 	$(LIBWNCK_CFLAGS)						\
+	$(XFCONF_CFLAGS)						\
 	-DDBUS_API_SUBJECT_TO_CHANGE					\
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE					\
 	-DLIBDIR=\"$(libdir)\"						\
@@ -67,7 +68,7 @@ xfce4_session_CFLAGS =							\
 	-DXFSM_SHUTDOWN_HELPER=\"$(libexecdir)/xfsm-shutdown-helper\"
 
 xfce4_session_LDADD =							\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la				\
+	$(top_builddir)/libxfsm/libxfsm-4.6.la				\
 	$(LIBSM_LDFLAGS)						\
 	$(LIBSM_LIBS)							\
 	$(LIBX11_LDFLAGS)						\
@@ -76,11 +77,12 @@ xfce4_session_LDADD =							\
 	$(DBUS_LIBS)							\
 	$(DBUS_GLIB_LIBS)						\
 	$(LIBWNCK_LIBS)							\
+	$(XFCONF_LIBS)							\
 	$(GNOME_LIBS)							\
 	$(GNOME_KEYRING_LIBS)
 
 xfce4_session_DEPENDENCIES =						\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.6.la
 
 
 chooser-icon.h: $(srcdir)/chooser-icon.png
diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index f5d01ff1..a2f5cbf2 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -49,10 +49,13 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include <xfconf/xfconf.h>
+
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include <libxfce4util/libxfce4util.h>
+#include <libxfcegui4/libxfcegui4.h>
 
 #include <libxfsm/xfsm-util.h>
 
@@ -129,23 +132,21 @@ usage (int exit_code)
 
 
 static void
-init_display (XfsmManager *manager,
-              GdkDisplay  *dpy,
-              XfceRc      *rc,
-              gboolean     disable_tcp)
+init_display (XfsmManager   *manager,
+              GdkDisplay    *dpy,
+              XfconfChannel *channel,
+              gboolean       disable_tcp)
 {
   const gchar *engine;
 
-  xfce_rc_set_group (rc, "Splash Screen");
-  engine = xfce_rc_read_entry (rc, "Engine", NULL);
+  engine = xfconf_channel_get_string (channel, "/splash/Engine", "mice");
 
   splash_screen = xfsm_splash_screen_new (dpy, engine);  
   xfsm_splash_screen_next (splash_screen, _("Loading desktop settings"));
 
   gdk_flush ();
 
-  xfce_rc_set_group (rc, "General");
-  sm_init (rc, disable_tcp, manager);
+  sm_init (channel, disable_tcp, manager);
 
   /* start xfsettingsd */
   if ( !g_spawn_command_line_async ("xfsettingsd", NULL))
@@ -166,7 +167,7 @@ initialize (XfsmManager *manager,
 {
   gboolean disable_tcp = FALSE;
   GdkDisplay *dpy;
-  XfceRc *rc;
+  XfconfChannel *channel;
   
   for (++argv; --argc > 0; ++argv)
     {
@@ -196,10 +197,10 @@ initialize (XfsmManager *manager,
 
   setup_environment ();
 
-  rc = xfsm_open_config (TRUE);
+  channel = xfsm_open_config ();
 
   dpy = gdk_display_get_default ();
-  init_display (manager, dpy, rc, disable_tcp);
+  init_display (manager, dpy, channel, disable_tcp);
 
   /* verify that the DNS settings are ok */
   xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
@@ -207,19 +208,8 @@ initialize (XfsmManager *manager,
 
   xfsm_splash_screen_next (splash_screen, _("Loading session data"));
 
-  xfce_rc_set_group (rc, "General");
-  xfsm_startup_init (rc);
-  xfsm_manager_load (manager, rc);
-
-  /* cleanup obsolete entries */
-  xfce_rc_set_group (rc, "General");
-  if (xfce_rc_has_entry (rc, "ConfirmLogout"))
-    xfce_rc_delete_entry (rc, "ConfirmLogout", FALSE);
-  if (xfce_rc_has_entry (rc, "AlwaysDisplayChooser"))
-    xfce_rc_delete_entry (rc, "AlwaysDisplayChooser", FALSE);
-  xfce_rc_delete_group (rc, "Splash Theme", FALSE);
-
-  xfce_rc_close (rc);
+  xfsm_startup_init (channel);
+  xfsm_manager_load (manager, channel);
 }
 
 
@@ -272,6 +262,7 @@ main (int argc, char **argv)
 {
   XfsmManager     *manager;
   XfsmShutdownType shutdown_type;
+  GError          *error = NULL;
 
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
   
@@ -280,6 +271,16 @@ main (int argc, char **argv)
 
   gtk_init (&argc, &argv);
 
+  if (G_UNLIKELY (!xfconf_init (&error))) {
+    xfce_message_dialog (NULL, _("Xfce Session Manager"),
+                         GTK_STOCK_DIALOG_ERROR,
+                         _("Unable to contact settings server"),
+                         error->message,
+                         GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT,
+                         NULL);
+    g_error_free (error);
+  }
+
   /* fake a client id for the manager, so the legacy management does not
    * recognize us to be a session client.
    */
diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index 07725513..59b9908b 100644
--- a/xfce4-session/shutdown.c
+++ b/xfce4-session/shutdown.c
@@ -170,7 +170,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
   gint result;
   XfceKiosk *kiosk;
   gboolean kiosk_can_shutdown;
-  XfceRc *rc;
+  XfconfChannel *channel;
 #ifdef SESSION_SCREENSHOTS
   GdkRectangle screenshot_area;
   GdkWindow *root;
@@ -194,17 +194,15 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
   xfce_kiosk_free (kiosk);
 
   /* load configuration */
-  rc = xfsm_open_config (FALSE);
-  xfce_rc_set_group (rc, "General");
-  saveonexit = xfce_rc_read_bool_entry (rc, "SaveOnExit", TRUE);
-  autosave = xfce_rc_read_bool_entry (rc, "AutoSave", FALSE);
-  prompt = xfce_rc_read_bool_entry (rc, "PromptOnLogout", TRUE);
+  channel = xfsm_open_config ();
+  channel = xfconf_channel_get ("xfce4-session");
+  saveonexit = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE);
+  autosave = xfconf_channel_get_bool (channel, "/general/AutoSave", FALSE);
+  prompt = xfconf_channel_get_bool (channel, "/general/PromptOnLogout", TRUE);
 
   /* if PromptOnLogout is off, saving depends on AutoSave */
   if (!prompt)
     {
-      xfce_rc_close (rc);
-
       *shutdownType = XFSM_SHUTDOWN_LOGOUT;
       *saveSession = autosave;
 
@@ -552,9 +550,8 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
    */
   if (result == GTK_RESPONSE_OK)
     {
-      xfce_rc_set_group (rc, "General");
-      xfce_rc_write_entry (rc, "SessionName", sessionName);
-      xfce_rc_write_bool_entry (rc, "SaveOnExit", *saveSession);
+      xfconf_channel_set_string (channel, "/general/SessionName", sessionName);
+      xfconf_channel_set_bool (channel, "/general/SaveOnExit", *saveSession);
     }
   else
     {
@@ -572,8 +569,6 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
     }
 #endif
 
-  xfce_rc_close (rc);
-
   return (result == GTK_RESPONSE_OK);
 }
 
diff --git a/xfce4-session/sm-layer.c b/xfce4-session/sm-layer.c
index 3e909496..6677739b 100644
--- a/xfce4-session/sm-layer.c
+++ b/xfce4-session/sm-layer.c
@@ -98,14 +98,14 @@ static IceListenObj *listen_objs;
 
 
 void
-sm_init (XfceRc      *rc,
-         gboolean     disable_tcp,
-         XfsmManager *manager)
+sm_init (XfconfChannel *channel,
+         gboolean       disable_tcp,
+         XfsmManager   *manager)
 {
   char *network_idlist;
   char  error[2048];
 
-  if (disable_tcp || xfce_rc_read_bool_entry (rc, "DisableTcp", FALSE))
+  if (disable_tcp || !xfconf_channel_get_bool (channel, "/security/EnableTcp", TRUE))
     {
 #ifdef HAVE__ICETRANSNOLISTEN
       extern void _IceTransNoListen (char *protocol);
diff --git a/xfce4-session/sm-layer.h b/xfce4-session/sm-layer.h
index acfa8e8b..5769b9e7 100644
--- a/xfce4-session/sm-layer.h
+++ b/xfce4-session/sm-layer.h
@@ -22,12 +22,13 @@
 #ifndef __SM_LAYER_H__
 #define __SM_LAYER_H__
 
+#include <xfconf/xfconf.h>
 #include <libxfce4util/libxfce4util.h>
 
 #include "xfsm-manager.h"
 
-void sm_init (XfceRc      *rc,
-              gboolean     disable_tcp,
-              XfsmManager *manager);
+void sm_init (XfconfChannel *channel,
+              gboolean       disable_tcp,
+              XfsmManager   *manager);
 
 #endif /* !__SM_LAYER_H__ */
diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c
index 3ba56226..c03dd806 100644
--- a/xfce4-session/xfsm-manager.c
+++ b/xfce4-session/xfsm-manager.c
@@ -165,8 +165,8 @@ static void       xfsm_manager_start_client_save_timeout (XfsmManager *manager,
 static void       xfsm_manager_cancel_client_save_timeout (XfsmManager *manager,
                                                            XfsmClient  *client);
 static gboolean   xfsm_manager_save_timeout (gpointer user_data);
-static void       xfsm_manager_load_settings (XfsmManager *manager,
-                                              XfceRc      *rc);
+static void       xfsm_manager_load_settings (XfsmManager   *manager,
+                                              XfconfChannel *channel);
 static gboolean   xfsm_manager_load_session (XfsmManager *manager);
 static void       xfsm_manager_dbus_class_init (XfsmManagerClass *klass);
 static void       xfsm_manager_dbus_init (XfsmManager *manager);
@@ -495,42 +495,56 @@ xfsm_manager_load_session (XfsmManager *manager)
 
 
 static gboolean
-xfsm_manager_load_failsafe (XfsmManager *manager,
-                            XfceRc      *rc)
+xfsm_manager_load_failsafe (XfsmManager   *manager,
+                            XfconfChannel *channel)
 {
   FailsafeClient *fclient;
-  const gchar    *old_group;
+  gchar          *failsafe_name;
   GdkDisplay     *display;
+  gchar           propbuf[4096];
   gchar         **command;
   gchar           command_entry[256];
   gchar           screen_entry[256];
   gint            count;
   gint            i;
   gint            n_screen;
-  
-  if (!xfce_rc_has_group (rc, "Failsafe Session"))
+
+  failsafe_name = xfconf_channel_get_string (channel, "/general/FailsafeSessionName", NULL);
+  if (G_UNLIKELY (!failsafe_name))
     return FALSE;
 
+  g_snprintf (propbuf, sizeof (propbuf), "/sessions/%s/IsFailsafe",
+              failsafe_name);
+  if (!xfconf_channel_get_bool (channel, propbuf, FALSE))
+    {
+      g_free (failsafe_name);
+      return FALSE;
+    }
+
   display = gdk_display_get_default ();
-  old_group = xfce_rc_get_group (rc);
-  xfce_rc_set_group (rc, "Failsafe Session");
-  
-  count = xfce_rc_read_int_entry (rc, "Count", 0);
+
+  g_snprintf (propbuf, sizeof (propbuf), "/sessions/%s/Count", failsafe_name);
+  count = xfconf_channel_get_int (channel, propbuf, 0);
 
   for (i = 0; i < count; ++i)
     {
-      g_snprintf (command_entry, 256, "Client%d_Command", i);
-      command = xfce_rc_read_list_entry (rc, command_entry, NULL);
+      g_snprintf (command_entry, sizeof (command_entry),
+                  "/sessions/%s/Client%d_Command", failsafe_name, i);
+      command = xfconf_channel_get_string_list (channel, command_entry);
       if (G_UNLIKELY (command == NULL))
         continue;
 
-      g_snprintf (screen_entry, 256, "Client%d_PerScreen", i);
-      if (xfce_rc_read_bool_entry (rc, screen_entry, FALSE))
+      g_snprintf (screen_entry, sizeof (screen_entry),
+                  "/sessions/%s/Client%d_PerScreen", failsafe_name, i);
+      if (xfconf_channel_get_bool (channel, screen_entry, FALSE))
         {
           for (n_screen = 0; n_screen < gdk_display_get_n_screens (display); ++n_screen)
             {
               fclient = g_new0 (FailsafeClient, 1);
-              fclient->command = xfce_rc_read_list_entry (rc, command_entry, NULL);
+              if (n_screen == 0)
+                fclient->command = command;
+              else
+                fclient->command = g_strdupv (command);
               fclient->screen = gdk_display_get_screen (display, n_screen);
               g_queue_push_tail (manager->failsafe_clients, fclient);
             }
@@ -544,27 +558,26 @@ xfsm_manager_load_failsafe (XfsmManager *manager,
         }
     }
 
-  xfce_rc_set_group (rc, old_group);
-
   return g_queue_peek_head (manager->failsafe_clients) != NULL;
 }
 
 
 static void
-xfsm_manager_load_settings (XfsmManager *manager,
-                            XfceRc      *rc)
+xfsm_manager_load_settings (XfsmManager   *manager,
+                            XfconfChannel *channel)
 {
-  gboolean     session_loaded = FALSE;
-  const gchar *name;
+  gboolean session_loaded = FALSE;
   
-  name = xfce_rc_read_entry (rc, "SessionName", NULL);
-  if (name != NULL && *name != '\0')
-    manager->session_name = g_strdup (name);
-  else
-    manager->session_name = g_strdup (DEFAULT_SESSION_NAME);
+  manager->session_name = xfconf_channel_get_string (channel,
+                                                     "/general/SessionName",
+                                                     DEFAULT_SESSION_NAME);
+  if (G_UNLIKELY (manager->session_name[0] == '\0'))
+    {
+      g_free (manager->session_name);
+      manager->session_name = g_strdup (DEFAULT_SESSION_NAME);
+    }
 
-  xfce_rc_set_group (rc, "Chooser");
-  manager->session_chooser = xfce_rc_read_bool_entry (rc, "AlwaysDisplay", FALSE);
+  manager->session_chooser = xfconf_channel_get_bool (channel, "/chooser/AlwaysDisplay", FALSE);
 
   session_loaded = xfsm_manager_load_session (manager);
 
@@ -575,13 +588,12 @@ xfsm_manager_load_settings (XfsmManager *manager,
     }
   else
     {
-      if (!xfsm_manager_load_failsafe (manager, rc))
+      if (!xfsm_manager_load_failsafe (manager, channel))
         {
           fprintf (stderr, "xfce4-session: Unable to load failsafe session, exiting. Please check\n"
                            "               the value of the environment variable XDG_CONFIG_DIRS\n"
                            "               and make sure that it includes the following path:\n\n"
                            "                " SYSCONFDIR "/xdg\n\n");
-          xfce_rc_close (rc);
           exit (EXIT_FAILURE);
         }
       manager->failsafe_mode = TRUE;
@@ -590,8 +602,8 @@ xfsm_manager_load_settings (XfsmManager *manager,
 
 
 void
-xfsm_manager_load (XfsmManager *manager,
-                   XfceRc *rc)
+xfsm_manager_load (XfsmManager   *manager,
+                   XfconfChannel *channel)
 {
   gchar *display_name;
   gchar *resource_name;
@@ -599,11 +611,9 @@ xfsm_manager_load (XfsmManager *manager,
   gchar *s;
 #endif
 
-  xfce_rc_set_group (rc, "Compatibility");
-  manager->compat_gnome = xfce_rc_read_bool_entry (rc, "LaunchGnome", FALSE);
-  manager->compat_kde = xfce_rc_read_bool_entry (rc, "LaunchKDE", FALSE);
+  manager->compat_gnome = xfconf_channel_get_bool (channel, "/compat/LaunchGNOME", FALSE);
+  manager->compat_kde = xfconf_channel_get_bool (channel, "/compat/LaunchKDE", FALSE);
 
-  xfce_rc_set_group (rc, "General");
   display_name  = xfce_gdk_display_get_fullname (gdk_display_get_default ());
 
 #ifdef HAVE_OS_CYGWIN
@@ -619,7 +629,7 @@ xfsm_manager_load (XfsmManager *manager,
   g_free (resource_name);
   g_free (display_name);
 
-  xfsm_manager_load_settings (manager, rc);
+  xfsm_manager_load_settings (manager, channel);
 }
 
 
diff --git a/xfce4-session/xfsm-manager.h b/xfce4-session/xfsm-manager.h
index 117e0f14..c41edc57 100644
--- a/xfce4-session/xfsm-manager.h
+++ b/xfce4-session/xfsm-manager.h
@@ -25,13 +25,14 @@
 
 #include <glib-object.h>
 
-G_BEGIN_DECLS
-
+#include <xfconf/xfconf.h>
 #include <libxfce4util/libxfce4util.h>
 
-#include <xfce4-session/xfsm-client.h>
+#include "xfsm-client.h"
 #include "shutdown.h"
 
+G_BEGIN_DECLS
+
 #define XFSM_TYPE_MANAGER     (xfsm_manager_get_type())
 #define XFSM_MANAGER(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), XFSM_TYPE_MANAGER, XfsmManager))
 #define XFSM_IS_MANAGER(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), XFSM_TYPE_MANAGER))
@@ -70,8 +71,8 @@ GType xfsm_manager_get_type (void) G_GNUC_CONST;
 
 XfsmManager *xfsm_manager_new (void);
 
-void xfsm_manager_load (XfsmManager *manager,
-                        XfceRc      *rc);
+void xfsm_manager_load (XfsmManager   *manager,
+                        XfconfChannel *channel);
 
 gboolean xfsm_manager_restart (XfsmManager *manager);
 
diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c
index a449fe2d..f2200d1e 100644
--- a/xfce4-session/xfsm-startup.c
+++ b/xfce4-session/xfsm-startup.c
@@ -91,7 +91,7 @@ static void xfsm_startup_handle_failed_client        (XfsmProperties *properties
                                                       XfsmManager    *manager);
 
 void
-xfsm_startup_init (XfceRc *rc)
+xfsm_startup_init (XfconfChannel *channel)
 {
   /* nothing to be done here, currently */
 }
diff --git a/xfce4-session/xfsm-startup.h b/xfce4-session/xfsm-startup.h
index 3593b495..48c54d05 100644
--- a/xfce4-session/xfsm-startup.h
+++ b/xfce4-session/xfsm-startup.h
@@ -23,9 +23,10 @@
 #ifndef __XFSM_STARTUP_H__
 #define __XFSM_STARTUP_H__
 
+#include <xfconf/xfconf.h>
 #include <libxfce4util/libxfce4util.h>
 
-void xfsm_startup_init (XfceRc *rc);
+void xfsm_startup_init (XfconfChannel *channel);
 void xfsm_startup_foreign (XfsmManager *manager);
 void xfsm_startup_begin (XfsmManager *manager);
 void xfsm_startup_session_continue (XfsmManager *manager);