From 3dbb696937e1501413fee2c60ebc592f5bf2e9eb Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <benny@xfce.org>
Date: Sun, 5 Feb 2006 23:32:01 +0000
Subject: [PATCH] 2006-02-05	Benedikt Meurer <benny@xfce.org>

	* thunar/thunar-chooser-dialog.{c,h}: Add a new convenience function
	  thunar_show_chooser_dialog().
	* thunar/thunar-launcher.c(thunar_launcher_open_files),
	  thunar/thunar-file.c(thunar_file_launch): Use the new function
	  thunar_show_chooser_dialog() here.
	* thunar/thunar-gtk-extensions.{c,h}: Add a new convenience function
	  thunar_gtk_ui_manager_get_action_by_name(), which is unfortunately
	  missing from GtkUIManager.
	* thunar/thunar-details-view.c, thunar/thunar-icon-view.c: Use
	  thunar_gtk_ui_manager_get_action_by_name() to locate the launcher
	  actions in the UI manager.
	* thunar/thunar-file.{c,h}: Add a new convenience function
	  thunar_file_list_get_applications(), which can be used to determine
	  the set of applications that can be used to open a given set of
	  files.
	* thunar-uca/thunar-uca-chooser.c(thunar_uca_chooser_delete_clicked):
	  Save the model after removing a custom action.
	* thunar/thunar-launcher.{c,h}, thunar/thunar-chooser-dialog.{c,h},
	  thunar/thunar-launcher-ui.xml, thunar/Makefile.am,
	  thunar/thunar-standard-view-ui.xml, thunar/thunar-standard-view.c,
	  thunar/thunar-window-ui.xml, thunar/thunar-window.c: Replace the
	  previous ThunarLauncher class with a more advanced one, which has
	  access to the GtkUIManager. The new implementation also displays
	  which application will be used to open files, based on Jonathan
	  Blandfords suggestion for Nautilus. Bug #1428.
	* thunar-vfs/thunar-vfs-mime-action-private.h, thunar-vfs/Makefile.am,
	  thunar-vfs/thunar-vfs-mime-action.{c,h},thunar-vfs/thunar-vfs.symbols,
	  thunar-vfs/thunar-vfs-mime-handler-private.h, thunar-vfs/thunar-vfs.h,
	  thunar-vfs/thunar-vfs-mime-handler.{c,h},
	  thunar-vfs/thunar-vfs-mime-application.{c,h},
	  thunar-vfs/thunar-vfs-mime-database.c: Import ThunarVfsMimeAction
	  class to support desktop actions in Thunar. The abstract base class
	  ThunarVfsMimeHandler is used to avoid duplicating the existing code
	  for ThunarVfsMimeApplication in ThunarVfsMimeAction, and it will also
	  make it easier to handle both ThunarVfsMimeApplication's and
	  ThunarVfsMimeAction's in the user interface code. Bug #1374.
	* docs/reference/thunar-vfs/: Update the Thunar-VFS API docs.
	* thunar/thunar-chooser-button.c, thunar/thunar-chooser-dialog.c,
	  thunar/thunar-chooser-model.c, thunar/thunar-file.c,
	  thunar/thunar-launcher.c: Update to the new ThunarVfsMimeHandler and
	  ThunarVfsMimeApplication interface.
	* thunar/thunar-launcher.c: Display desktop actions in the file context
	  menu and the "File" menu, based on the newly added ThunarVfsMimeAction
	  class. Bug #1375.
	* po/POTFILES.in: Update the file list.
	* po/Thunar.pot, po/*.po: Merge new strings.
	* po/de.po: Update german translations.
	* configure.in.in, icons/: Change the Thunar icon to the new one
	  provided by Young Hahn <youngjin.hahn@gmail.com>. Any artists around
	  to make it look even better?




(Old svn revision: 19750)
---
 ChangeLog                                     |   53 +
 configure.in.in                               |    1 +
 .../reference/thunar-vfs/thunar-vfs-docs.sgml |    4 +
 .../thunar-vfs/thunar-vfs-sections.txt        |   59 +-
 docs/reference/thunar-vfs/thunar-vfs.types    |    2 +
 .../tmpl/thunar-vfs-mime-action.sgml          |   27 +
 .../tmpl/thunar-vfs-mime-application.sgml     |   82 +-
 .../tmpl/thunar-vfs-mime-handler.sgml         |  109 +
 icons/16x16/Makefile.am                       |   11 +-
 icons/16x16/Thunar.png                        |  Bin 0 -> 777 bytes
 icons/24x24/Thunar.png                        |  Bin 1951 -> 1300 bytes
 icons/48x48/Thunar.png                        |  Bin 5103 -> 3440 bytes
 icons/Makefile.am                             |    3 +-
 icons/scalable/Makefile.am                    |   10 +
 icons/scalable/Thunar.svg                     | 1949 +++++++++++++++++
 po/POTFILES.in                                |    3 +-
 po/Thunar.pot                                 |  426 ++--
 po/ca.po                                      |  454 ++--
 po/de.po                                      |  704 +++---
 po/el.po                                      |  456 ++--
 po/es.po                                      |  448 ++--
 po/fr.po                                      |  458 ++--
 po/hu.po                                      |  440 ++--
 po/it.po                                      |  455 ++--
 po/ja.po                                      |  450 ++--
 po/nl.po                                      |  456 ++--
 po/pl.po                                      |  453 ++--
 po/pt_BR.po                                   |  454 ++--
 po/ru.po                                      |  462 ++--
 thunar-uca/thunar-uca-chooser.c               |    8 +-
 thunar-vfs/Makefile.am                        |    6 +
 thunar-vfs/thunar-vfs-mime-action-private.h   |   50 +
 thunar-vfs/thunar-vfs-mime-action.c           |   92 +
 thunar-vfs/thunar-vfs-mime-action.h           |   46 +
 thunar-vfs/thunar-vfs-mime-application.c      |  485 ++--
 thunar-vfs/thunar-vfs-mime-application.h      |   92 +-
 thunar-vfs/thunar-vfs-mime-database.c         |   19 +-
 thunar-vfs/thunar-vfs-mime-handler-private.h  |   50 +
 thunar-vfs/thunar-vfs-mime-handler.c          |  562 +++++
 thunar-vfs/thunar-vfs-mime-handler.h          |   80 +
 thunar-vfs/thunar-vfs.h                       |    2 +
 thunar-vfs/thunar-vfs.symbols                 |   31 +-
 thunar/Makefile.am                            |    9 +-
 thunar/thunar-chooser-button.c                |   16 +-
 thunar/thunar-chooser-dialog.c                |   66 +-
 thunar/thunar-chooser-dialog.h                |   10 +-
 thunar/thunar-chooser-model.c                 |   22 +-
 thunar/thunar-details-view.c                  |    7 +-
 thunar/thunar-file.c                          |   93 +-
 thunar/thunar-file.h                          |    7 +-
 thunar/thunar-gtk-extensions.c                |   37 +-
 thunar/thunar-gtk-extensions.h                |    5 +-
 thunar/thunar-icon-view.c                     |    7 +-
 thunar/thunar-launcher-ui.xml                 |   44 +
 thunar/thunar-launcher.c                      | 1167 ++++++----
 thunar/thunar-launcher.h                      |   12 +-
 thunar/thunar-open-with-action.c              |  542 -----
 thunar/thunar-open-with-action.h              |   48 -
 thunar/thunar-standard-view-ui.xml            |   31 +-
 thunar/thunar-standard-view.c                 |   15 -
 thunar/thunar-window-ui.xml                   |   14 +-
 thunar/thunar-window.c                        |   11 +
 62 files changed, 8177 insertions(+), 3938 deletions(-)
 create mode 100644 docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-action.sgml
 create mode 100644 docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-handler.sgml
 create mode 100644 icons/16x16/Thunar.png
 create mode 100644 icons/scalable/Makefile.am
 create mode 100644 icons/scalable/Thunar.svg
 create mode 100644 thunar-vfs/thunar-vfs-mime-action-private.h
 create mode 100644 thunar-vfs/thunar-vfs-mime-action.c
 create mode 100644 thunar-vfs/thunar-vfs-mime-action.h
 create mode 100644 thunar-vfs/thunar-vfs-mime-handler-private.h
 create mode 100644 thunar-vfs/thunar-vfs-mime-handler.c
 create mode 100644 thunar-vfs/thunar-vfs-mime-handler.h
 create mode 100644 thunar/thunar-launcher-ui.xml
 delete mode 100644 thunar/thunar-open-with-action.c
 delete mode 100644 thunar/thunar-open-with-action.h

diff --git a/ChangeLog b/ChangeLog
index f040cf2f8..dc0c08939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,56 @@
+2006-02-05	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-chooser-dialog.{c,h}: Add a new convenience function
+	  thunar_show_chooser_dialog().
+	* thunar/thunar-launcher.c(thunar_launcher_open_files),
+	  thunar/thunar-file.c(thunar_file_launch): Use the new function
+	  thunar_show_chooser_dialog() here.
+	* thunar/thunar-gtk-extensions.{c,h}: Add a new convenience function
+	  thunar_gtk_ui_manager_get_action_by_name(), which is unfortunately
+	  missing from GtkUIManager.
+	* thunar/thunar-details-view.c, thunar/thunar-icon-view.c: Use
+	  thunar_gtk_ui_manager_get_action_by_name() to locate the launcher
+	  actions in the UI manager.
+	* thunar/thunar-file.{c,h}: Add a new convenience function
+	  thunar_file_list_get_applications(), which can be used to determine
+	  the set of applications that can be used to open a given set of
+	  files.
+	* thunar-uca/thunar-uca-chooser.c(thunar_uca_chooser_delete_clicked):
+	  Save the model after removing a custom action.
+	* thunar/thunar-launcher.{c,h}, thunar/thunar-chooser-dialog.{c,h},
+	  thunar/thunar-launcher-ui.xml, thunar/Makefile.am, 
+	  thunar/thunar-standard-view-ui.xml, thunar/thunar-standard-view.c,
+	  thunar/thunar-window-ui.xml, thunar/thunar-window.c: Replace the
+	  previous ThunarLauncher class with a more advanced one, which has
+	  access to the GtkUIManager. The new implementation also displays
+	  which application will be used to open files, based on Jonathan
+	  Blandfords suggestion for Nautilus. Bug #1428.
+	* thunar-vfs/thunar-vfs-mime-action-private.h, thunar-vfs/Makefile.am,
+	  thunar-vfs/thunar-vfs-mime-action.{c,h},thunar-vfs/thunar-vfs.symbols,
+	  thunar-vfs/thunar-vfs-mime-handler-private.h, thunar-vfs/thunar-vfs.h,
+	  thunar-vfs/thunar-vfs-mime-handler.{c,h},
+	  thunar-vfs/thunar-vfs-mime-application.{c,h},
+	  thunar-vfs/thunar-vfs-mime-database.c: Import ThunarVfsMimeAction
+	  class to support desktop actions in Thunar. The abstract base class
+	  ThunarVfsMimeHandler is used to avoid duplicating the existing code
+	  for ThunarVfsMimeApplication in ThunarVfsMimeAction, and it will also
+	  make it easier to handle both ThunarVfsMimeApplication's and
+	  ThunarVfsMimeAction's in the user interface code. Bug #1374.
+	* docs/reference/thunar-vfs/: Update the Thunar-VFS API docs.
+	* thunar/thunar-chooser-button.c, thunar/thunar-chooser-dialog.c,
+	  thunar/thunar-chooser-model.c, thunar/thunar-file.c,
+	  thunar/thunar-launcher.c: Update to the new ThunarVfsMimeHandler and
+	  ThunarVfsMimeApplication interface.
+	* thunar/thunar-launcher.c: Display desktop actions in the file context
+	  menu and the "File" menu, based on the newly added ThunarVfsMimeAction
+	  class. Bug #1375.
+	* po/POTFILES.in: Update the file list.
+	* po/Thunar.pot, po/*.po: Merge new strings.
+	* po/de.po: Update german translations.
+	* configure.in.in, icons/: Change the Thunar icon to the new one
+	  provided by Young Hahn <youngjin.hahn@gmail.com>. Any artists around
+	  to make it look even better?
+
 2006-02-04	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-permissions-chooser.c
diff --git a/configure.in.in b/configure.in.in
index 56849d184..a96e363a7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -378,6 +378,7 @@ icons/Makefile
 icons/16x16/Makefile
 icons/24x24/Makefile
 icons/48x48/Makefile
+icons/scalable/Makefile
 po/Makefile.in
 tdb/Makefile
 tdb/tdbconfig.h
diff --git a/docs/reference/thunar-vfs/thunar-vfs-docs.sgml b/docs/reference/thunar-vfs/thunar-vfs-docs.sgml
index 65d257558..1a197f1b1 100644
--- a/docs/reference/thunar-vfs/thunar-vfs-docs.sgml
+++ b/docs/reference/thunar-vfs/thunar-vfs-docs.sgml
@@ -6,8 +6,10 @@
 <!ENTITY thunar-vfs-init-shutdown SYSTEM "xml/thunar-vfs-init-shutdown.xml">
 <!ENTITY thunar-vfs-interactive-job SYSTEM "xml/thunar-vfs-interactive-job.xml">
 <!ENTITY thunar-vfs-job SYSTEM "xml/thunar-vfs-job.xml">
+<!ENTITY thunar-vfs-mime-action SYSTEM "xml/thunar-vfs-mime-action.xml">
 <!ENTITY thunar-vfs-mime-application SYSTEM "xml/thunar-vfs-mime-application.xml">
 <!ENTITY thunar-vfs-mime-database SYSTEM "xml/thunar-vfs-mime-database.xml">
+<!ENTITY thunar-vfs-mime-handler SYSTEM "xml/thunar-vfs-mime-handler.xml">
 <!ENTITY thunar-vfs-mime-info SYSTEM "xml/thunar-vfs-mime-info.xml">
 <!ENTITY thunar-vfs-monitor SYSTEM "xml/thunar-vfs-monitor.xml">
 <!ENTITY thunar-vfs-operations SYSTEM "xml/thunar-vfs-operations.xml">
@@ -81,7 +83,9 @@
     <title>MIME Types</title>
     &thunar-vfs-mime-info;
     &thunar-vfs-mime-database;
+    &thunar-vfs-mime-handler;
     &thunar-vfs-mime-application;
+    &thunar-vfs-mime-action;
   </part>
 
   <part id="users-and-groups-handling">
diff --git a/docs/reference/thunar-vfs/thunar-vfs-sections.txt b/docs/reference/thunar-vfs/thunar-vfs-sections.txt
index 8428342ad..4e6258ef9 100644
--- a/docs/reference/thunar-vfs/thunar-vfs-sections.txt
+++ b/docs/reference/thunar-vfs/thunar-vfs-sections.txt
@@ -100,33 +100,47 @@ thunar_vfs_job_get_type
 
 
 
+<SECTION>
+<FILE>thunar-vfs-mime-action</FILE>
+<TITLE>ThunarVfsMimeAction</TITLE>
+ThunarVfsMimeAction
+<SUBSECTION Standard>
+ThunarVfsMimeActionClass
+THUNAR_VFS_TYPE_MIME_ACTION
+THUNAR_VFS_MIME_ACTION
+THUNAR_VFS_MIME_ACTION_CLASS
+THUNAR_VFS_IS_MIME_ACTION
+THUNAR_VFS_IS_MIME_ACTION_CLASS
+THUNAR_VFS_MIME_ACTION_GET_CLASS
+<SUBSECTION Private>
+thunar_vfs_mime_action_get_type
+</SECTION>
+
+
 <SECTION>
 <FILE>thunar-vfs-mime-application</FILE>
 <TITLE>ThunarVfsMimeApplication</TITLE>
-ThunarVfsMimeApplicationFlags
 ThunarVfsMimeApplication
 thunar_vfs_mime_application_new_from_desktop_id
 thunar_vfs_mime_application_new_from_file
-thunar_vfs_mime_application_ref
-thunar_vfs_mime_application_unref
+thunar_vfs_mime_application_get_actions
 thunar_vfs_mime_application_get_command
 thunar_vfs_mime_application_get_desktop_id
 thunar_vfs_mime_application_get_flags
+thunar_vfs_mime_application_get_mime_types
 thunar_vfs_mime_application_get_name
-thunar_vfs_mime_application_exec
-thunar_vfs_mime_application_exec_with_env
-thunar_vfs_mime_application_lookup_icon_name
 thunar_vfs_mime_application_hash
 thunar_vfs_mime_application_equal
 <SUBSECTION Standard>
+ThunarVfsMimeActionClass
 THUNAR_VFS_TYPE_MIME_APPLICATION
-THUNAR_VFS_TYPE_VFS_MIME_APPLICATION_ERROR
-THUNAR_VFS_TYPE_VFS_MIME_APPLICATION_FLAGS
+THUNAR_VFS_MIME_APPLICATION
+THUNAR_VFS_MIME_APPLICATION_CLASS
+THUNAR_VFS_IS_MIME_APPLICATION
+THUNAR_VFS_IS_MIME_APPLICATION_CLASS
+THUNAR_VFS_MIME_APPLICATION_GET_CLASS
 <SUBSECTION Private>
 thunar_vfs_mime_application_get_type
-thunar_vfs_mime_application_error_quark
-thunar_vfs_mime_application_error_get_type
-thunar_vfs_mime_application_flags_get_type
 </SECTION>
 
 
@@ -157,6 +171,29 @@ thunar_vfs_mime_database_get_type
 </SECTION>
 
 
+<SECTION>
+<FILE>thunar-vfs-mime-handler</FILE>
+<TITLE>ThunarVfsMimeHandler</TITLE>
+ThunarVfsMimeHandler
+thunar_vfs_mime_handler_get_command
+thunar_vfs_mime_handler_get_flags
+thunar_vfs_mime_handler_get_name
+thunar_vfs_mime_handler_exec
+thunar_vfs_mime_handler_exec_with_env
+thunar_vfs_mime_handler_lookup_icon_name
+<SUBSECTION Standard>
+ThunarVfsMimeHandlerClass
+THUNAR_VFS_TYPE_MIME_HANDLER
+THUNAR_VFS_MIME_HANDLER
+THUNAR_VFS_MIME_HANDLER_CLASS
+THUNAR_VFS_IS_MIME_HANDLER
+THUNAR_VFS_IS_MIME_HANDLER_CLASS
+THUNAR_VFS_MIME_HANDLER_GET_CLASS
+<SUBSECTION Private>
+thunar_vfs_mime_handler_get_type
+</SECTION>
+
+
 <SECTION>
 <FILE>thunar-vfs-mime-info</FILE>
 <TITLE>ThunarVfsMimeInfo</TITLE>
diff --git a/docs/reference/thunar-vfs/thunar-vfs.types b/docs/reference/thunar-vfs/thunar-vfs.types
index 49b947477..cb9ae357c 100644
--- a/docs/reference/thunar-vfs/thunar-vfs.types
+++ b/docs/reference/thunar-vfs/thunar-vfs.types
@@ -4,8 +4,10 @@ thunar_vfs_group_get_type
 thunar_vfs_info_get_type
 thunar_vfs_interactive_job_get_type
 thunar_vfs_job_get_type
+thunar_vfs_mime_action_get_type
 thunar_vfs_mime_application_get_type
 thunar_vfs_mime_database_get_type
+thunar_vfs_mime_handler_get_type
 thunar_vfs_mime_info_get_type
 thunar_vfs_monitor_get_type
 thunar_vfs_path_get_type
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-action.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-action.sgml
new file mode 100644
index 000000000..cd104dda4
--- /dev/null
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-action.sgml
@@ -0,0 +1,27 @@
+<!-- ##### SECTION Title ##### -->
+ThunarVfsMimeAction
+
+<!-- ##### SECTION Short_Description ##### -->
+Registered desktop actions for #ThunarVfsMimeApplication<!---->s.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+  <link linkend="ThunarVfsMimeApplication">ThunarVfsMimeApplication</link>
+  and <link linked="ThunarVfsMimeHandler">ThunarVfsMimeHandler</link>
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT ThunarVfsMimeAction ##### -->
+<para>
+  The #ThunarVfsMimeAction-struct contains private data only, and should
+  be accessed using the functions below.
+</para>
+
+
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-application.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-application.sgml
index 214550457..e9a66add3 100644
--- a/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-application.sgml
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-application.sgml
@@ -11,22 +11,13 @@ Registered Applications for MIME types.
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
-
+  <link linkend="ThunarVfsMimeHandler">ThunarVfsMimeHandler</link>
+  and <link linkend="ThunarVfsMimeAction">ThunarVfsMimeAction</link>
 </para>
 
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### ENUM ThunarVfsMimeApplicationFlags ##### -->
-<para>
-
-</para>
-
-@THUNAR_VFS_MIME_APPLICATION_HIDDEN: 
-@THUNAR_VFS_MIME_APPLICATION_REQUIRES_TERMINAL: 
-@THUNAR_VFS_MIME_APPLICATION_SUPPORTS_STARTUP_NOTIFY: 
-@THUNAR_VFS_MIME_APPLICATION_SUPPORTS_MULTI: 
-
 <!-- ##### STRUCT ThunarVfsMimeApplication ##### -->
 <para>
   The #ThunarVfsMimeApplication struct contains private data only, and should
@@ -53,96 +44,57 @@ Registered Applications for MIME types.
 @Returns: 
 
 
-<!-- ##### FUNCTION thunar_vfs_mime_application_ref ##### -->
+<!-- ##### FUNCTION thunar_vfs_mime_application_get_actions ##### -->
 <para>
 
 </para>
 
-@application: 
+@mime_application: 
 @Returns: 
 
 
-<!-- ##### FUNCTION thunar_vfs_mime_application_unref ##### -->
-<para>
-
-</para>
-
-@application: 
-
-
-<!-- ##### FUNCTION thunar_vfs_mime_application_get_command ##### -->
+<!-- ##### MACRO thunar_vfs_mime_application_get_command ##### -->
 <para>
 
 </para>
 
-@application: 
+@mime_application: 
 @Returns: 
-
-
-<!-- ##### FUNCTION thunar_vfs_mime_application_get_desktop_id ##### -->
-<para>
-
-</para>
-
+<!-- # Unused Parameters # -->
 @application: 
-@Returns: 
 
 
-<!-- ##### FUNCTION thunar_vfs_mime_application_get_flags ##### -->
+<!-- ##### FUNCTION thunar_vfs_mime_application_get_desktop_id ##### -->
 <para>
 
 </para>
 
-@application: 
+@mime_application: 
 @Returns: 
-
-
-<!-- ##### FUNCTION thunar_vfs_mime_application_get_name ##### -->
-<para>
-
-</para>
-
+<!-- # Unused Parameters # -->
 @application: 
-@Returns: 
 
 
-<!-- ##### FUNCTION thunar_vfs_mime_application_exec ##### -->
+<!-- ##### MACRO thunar_vfs_mime_application_get_flags ##### -->
 <para>
 
 </para>
 
-@application: 
-@screen: 
-@path_list: 
-@error: 
+@mime_application: 
 @Returns: 
 <!-- # Unused Parameters # -->
-@uris: 
+@application: 
 
 
-<!-- ##### FUNCTION thunar_vfs_mime_application_exec_with_env ##### -->
+<!-- ##### MACRO thunar_vfs_mime_application_get_name ##### -->
 <para>
 
 </para>
 
-@application: 
-@screen: 
-@path_list: 
-@envp: 
-@error: 
+@mime_application: 
 @Returns: 
 <!-- # Unused Parameters # -->
-@uris: 
-
-
-<!-- ##### FUNCTION thunar_vfs_mime_application_lookup_icon_name ##### -->
-<para>
-
-</para>
-
 @application: 
-@icon_theme: 
-@Returns: 
 
 
 <!-- ##### FUNCTION thunar_vfs_mime_application_hash ##### -->
@@ -150,8 +102,10 @@ Registered Applications for MIME types.
 
 </para>
 
-@application: 
+@mime_application: 
 @Returns: 
+<!-- # Unused Parameters # -->
+@application: 
 
 
 <!-- ##### FUNCTION thunar_vfs_mime_application_equal ##### -->
diff --git a/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-handler.sgml b/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-handler.sgml
new file mode 100644
index 000000000..b5765567a
--- /dev/null
+++ b/docs/reference/thunar-vfs/tmpl/thunar-vfs-mime-handler.sgml
@@ -0,0 +1,109 @@
+<!-- ##### SECTION Title ##### -->
+ThunarVfsMimeHandler
+
+<!-- ##### SECTION Short_Description ##### -->
+Abstract base class for #ThunarVfsMimeApplication and #ThunarVfsMimeAction.
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+  <link linkend="ThunarVfsMimeApplication">ThunarVfsMimeApplication</link>
+  and <link linked="ThunarVfsMimeAction">ThunarVfsMimeAction</link>
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### STRUCT ThunarVfsMimeHandler ##### -->
+<para>
+  The #ThunarVfsMimeHandler-struct contains private data only, and should
+  be accessed using the functions below.
+</para>
+
+
+<!-- ##### ARG ThunarVfsMimeHandler:command ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG ThunarVfsMimeHandler:flags ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG ThunarVfsMimeHandler:icon ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG ThunarVfsMimeHandler:name ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION thunar_vfs_mime_handler_get_command ##### -->
+<para>
+
+</para>
+
+@mime_handler: 
+@Returns: 
+
+
+<!-- ##### FUNCTION thunar_vfs_mime_handler_get_flags ##### -->
+<para>
+
+</para>
+
+@mime_handler: 
+@Returns: 
+
+
+<!-- ##### FUNCTION thunar_vfs_mime_handler_get_name ##### -->
+<para>
+
+</para>
+
+@mime_handler: 
+@Returns: 
+
+
+<!-- ##### FUNCTION thunar_vfs_mime_handler_exec ##### -->
+<para>
+
+</para>
+
+@mime_handler: 
+@screen: 
+@path_list: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION thunar_vfs_mime_handler_exec_with_env ##### -->
+<para>
+
+</para>
+
+@mime_handler: 
+@screen: 
+@path_list: 
+@envp: 
+@error: 
+@Returns: 
+
+
+<!-- ##### FUNCTION thunar_vfs_mime_handler_lookup_icon_name ##### -->
+<para>
+
+</para>
+
+@mime_handler: 
+@icon_theme: 
+@Returns: 
+
+
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 9936dc010..7556b9406 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,12 +1,17 @@
 # $Id$
 
-iconsdir = $(datadir)/icons/hicolor/16x16/stock/generic
-icons_DATA =								\
+appsdir = $(datadir)/icons/hicolor/16x16/apps
+apps_DATA =								\
+	Thunar.png
+
+stockdir = $(datadir)/icons/hicolor/16x16/stock/generic
+stock_DATA =								\
 	stock_thunar-group.png						\
 	stock_thunar-templates.png					\
 	stock_thunar-user.png
 
 EXTRA_DIST =								\
-	$(icons_DATA)
+	$(apps_DATA)							\
+	$(stock_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/16x16/Thunar.png b/icons/16x16/Thunar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c711b5e14206a7145c07f5a7b8ab0d37bbc0094f
GIT binary patch
literal 777
zcmV+k1NQuhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Sn@L1LR5*>L
zlTAnzaTvy*|IW<LI=frzikg{U#cJzUrnRLYVP#-+2-3(7cJUB&s7oNyr3mU$;LVeC
ztAi0}A1BcWMC*{rf`qFsZMri%yED7)&h9!pv;QtB6$N6??d9eD@w~jxODLuIA6fp@
zczlTz?inyXR5wft-QBwZkY87LHFWq`X=UvLRZ*MA=5yVfq(~1Z!-{{}pZas~X}^WH
zu!467Fn-V5(a_#E`EgxvAM&)(iOJVSD72A}Mx$vp77NIcNS7#z+Ou0FWmTT0k%%OD
z!cz1GyG_*L?wwsPcAseP#N^vIq_nJzW34>wP6uzZ3w6BB=I`q8oO?LX`P^OTXk7Gv
zJ%49RT-<RmIy#alK5%d!!?4Ix6RMhkC`Awsi*UQ#sIWz7g*|SxHha0*sh4w??|*Iw
z02TlSZw_8)X=!B{hCwJ4f~WQfvRgWAJP+Q=;i9h`HT&&^VHi#c%wRbfp4fKI0zku2
z?`<ue5@b1w4N-*M;Xt0|q33ku3=>l`@6mUB3xU<|n4FKSEiX$??rsCFUh8FizEf?B
z3w~5pS0NUS!R2znFia#8o6xj0=A=!mu0*i(O@q}@;aG}o?wpQwI-NaD4UI)so~KjO
z9|+Ge2n1FDSfFVd6h%cm9*4#Yw4}TQ1%l1JxbWo)fENJ33I&3LSV)dgur<|{7`Wa~
zWm(2XI1E))k;!C`(o#sJl0=qe=(=tirXlPkF{Z>8g27<M%5&z~Go6qk63J$>gyUFZ
zwQ|HX4U*P0q9_VX(=<g<()2C;({D-iojzGq@2!7iw+lTSXLW#5YM2I+sU)Iu6v<SQ
zq_woBs_}QLD{I4)Qu(h@-WJdEE?w7)f0i<(G`_1}*o%GuJgh$A+m|R600000NkvXX
Hu0mjfpyFeC

literal 0
HcmV?d00001

diff --git a/icons/24x24/Thunar.png b/icons/24x24/Thunar.png
index de5f313124a3bbd3419cc5e56f7638b5e747350d..95d0225d7f73d7f689017619d4c9dfbb3e484454 100644
GIT binary patch
delta 1280
zcmV+b1^@b=50na!B!2{RLP=Bz2nYy#2xN!=000?uMObuGZ)S9NVRB^vcXxL#X>MzC
zV_|S*E^l&Yo9;Xs000E0Nkl<ZNQt$UTWnNS6o&sZGv~~lxnL=s0eS<Og3#84(n1Nr
zC<sPTynq@|h-iokQDaCnk?4yr#Ft89qVWX~ADW;cgcNDv#eWN+fM6Bug<hD`PTQH{
zT+U_Bx$Sed4-Ey{VhFM8aj&fP?X~`_y*9@f!*rTwTC?9PVBaQg(X;^$zhCx_5H5cE
zegVF_IX-`x6K9u|e;O?*eWOq6*ml1FZYq(R_f&jP5}UK*!T93pGiT5LainM7D~9d}
zrfY_BN^ZF0a({>PUrC#`dV&FQ#`>J1<tG8Y-@E9$RqM9A&@rHR|4fHb*SLnAI(>?}
zo{*5qWUX|1l$eH*1GxRyIy=9(J@(-4*oshO<{p2*-<Xh+(#Vbc`a1vzcNMLDbi?ay
zKS>cE3s>N&C!fZl!-tT~$#7g3L?h4*-N|RNt|UpEZhx2uu61_41pr^|EM8K(bY)9r
zW%+`(){{SX^$o3WYIChSG;km;Z0q*={3VrmeC;~4o;rz8C=9<SLRB>Y0CgNM9}vB<
zxn-_pkev<7m-`xvyFYnib#?QihZ`4M{P9@2t3UNxQ=4l66GR?}ZhN({_7T_?g>73%
zrPHXYs(*r_s9=nNQVPqmU>GJ!W)*t`p9iA+`;MAe)y9>NJs;IGeMpYnxYpEaCvN5(
z2W;NHdG1RaUtFD+70j=khw~RNpenuqp>PnEZNqOE5Cj3dAfTeW4BMYui@{&NM(vU{
zo=|jQ)KW*0OI|^8RQc`pOOMY%Y(~j0!SAO>kAEIRC>TapcQ<%J0CO3DF`YOL@NgU|
zE6R~*Z^5$qWhk1z3PyeqqgRjPQpdpc4oTg2J7BzmrAzDH92iXU^~>sz%jcoW3R+II
zVnsteJU%Zh%YtoFP)d={=iwm|7DtlE_5A`v8O6E3)9gxb_OqjxSZ+!H7`&-;3cS~g
zgnu*ul@!p}xE$1>Fq8raDL~f^n5K#L_P;PA;DMUDia8M%?fnFoM`spPGj;$I%mV;>
zKmKTcFc>UOjig|iHhTN}p{gn_T)c!#CW~Ay4_Q{AY8nVBz@!vCQU<3JrTFrUh#z`q
zK`bg0)0y;#69F7!3`dSM>;8Zk5Cj3oTYp;cPeulVgIKf#K0yGrDNNIZZWth>08Jy%
zR1K;sgL7TP<MR;=iWroV=Gn970+U+g_4;_mTm%AsI1WHG1<yXS0fu29o6RAWPD9RS
z;q`hD4)_uF^ROQXLEtOE3qBA+;JPjxm-;7G-~#~5vJmhF;7|w2!2!JY?rxOMEq?{2
z6a~EiRZ*d+3J4)kH5IC=j-4qAWJSIu;}pBg2LL@iJtNgMHM3<!<{Rqkz!<~O@DLp8
zz_d*0x(-qxAR2+DX}2J%3Q8#ez%)%epUY>b)S#iEA-JUap>JzyYBxn9VOtbM{*K8t
z4H&wCLZJXc2sENW)5e|-!!T?)FM0F5J$)yJhex(B#<WR*n^s*NUnm43TjTNg4uR*(
z9mnCvdh0OPah!s#driaOY@32Ql<Eb2C~;l-h7i)s80(tcpu6mYaVN(G0K@=90Tcm{
q0gM8;!5Gu;8hEdO|HG#JSMe`D4T?KEA0t`-0000<MNUMnLSTYvI!(j?

delta 1937
zcmV;C2X6S33ZD;<B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA
z00(qQO+^RQ2?h@}8--L>_5c6?9dt!lbVF}#ZDnqB07G(RVRU6=Aa`kWXdqN*WgtgM
zO;GP-C2jx!2Lnk&K~zY`jaF?;RM{DR?!9O3%-op)<_j1`27hPxMo?rNgcV$rL2R@t
zC}~x?UDjxt#%zC@{xD7a(U``VcKc&%!?rQTA{&!kX{D&(2cq586~FipL56{m9R_Cj
zny))^@16cIMcGZaeUkI%&3n%CzR!8`o<lV^H*=CC{p#@H!+hK2j?b0@-lZ#7t|agd
z>~=e2u~_snnSZQ;rs>Tbr(F{Y1v=vK_`ky8u&=ADOTd2tQ7V-wf*|awt*zbS4=kkK
zy4`yQz}$Zlnwpw28HV|VR-3lJs;b<yVMBS6PNzXI82zBX|Do&t{ck$-di^JEw|k<m
zuTT0e0poBuQY1<GSz}|PDcfeNa=BjVjK)+~QDGrdT7O!a#<J{h>+64f^w7bkRGnTY
z4~3QxjYg1~sz-UbLt9;4S;4Zp-5$^QOi4+}_`twGd=-J+ZdWr5v#Ydpqt#&0qqw+u
z;~H~jGefgKS8>`SMq^rOT55_s5{*I>1xS*F@o^V!-MR^%Zx$sb#V9Ju(XCr&Kj3zI
z{n^=;Cx1_$K7A|Mu3ftn$B!RBe){z3nOH2A_<u1xG@NK}Z%^F5eS0PL{Mo>COH0e9
zhK2@urGwGYQNe1pjtPR07#SHYwpwi}jYf_C1%uH5*Z4R>p%4lS3jqLngI?qHE}0e=
z=eqj)`y&9r0KnkjV8mjv48-HH#e4Vq3@=|!q<<_gFUkmED25>bC?paR7=~FP@XgF1
z5ST|e62{uBEX3n+h=PD<G?p|l@Z?LmTt4gZctE{d)!w~(IfKElH5Q9~vTt8Qj#43~
zh>Qgx1c`)%hYug3+~I(XW#RYx5s5^hR;$3u<SS<cgOT~JYyUVDjYh9uxNt!t?-GoS
zjekWmGBVO^*1|Q7jSbXyWwF_^(bLlnomLA_G^(qsU^bgq<wPUA_S*HUsSLwV0I-T6
zIXM{=MNt`Mqu}+<V8S(y$te%Q;ShM9had<bgupjD3qcUj);0#7=aG_}3{Y?CnV%0W
zOOhn>dc72Y)e;pI6%mKSv6W$%KO2okYky5m4V{~t3$0cMPN@V#7|_()EpE3P*KgcF
zWo0Gq-Ma^xrcqh(KK|Brq1)&C_QOyp^m^si>gwv)+}zw2wOaeTLkF8JAGUnJ<mKf-
zr_({HRD#F|7={5&(<`g@?p;9=f$iJ3Q7p@X<2Wce7CAXK+wAOeFcez+iUt6u(|<{4
zW@c_vtF@<2oH${v*|vocLVnPuQ&UrT^vyF;v#pkv$z&)iE5pc(7x4T2(CKtoSCqe<
zWmy9O0F%kICKikR`lFAI8nd!85C{a&-F;gc8yls0J`6$#L{WrBqk%%9K)~+@E0^Qw
zu@+=zng9Uda2T<89P{%F*tBUA0)LjJ9Eze+h|}q$IgWE?W#yGuR5<9fXU{H;j!r1@
z^9#xT#wO$!*Z=^3`t(yc>*}D_>%nmx<np)H^h{0R>jw{DFDt{<&QA3AKZ-6d^UnZq
z#A30id7j^Cx0lK<UHUvU{d$Hyb?P^)(WqY~$$<k0@O)qpIXOA2;-VlR0e?WHQo%Pn
zi<2i$A|8t=e*cHhB5rrUO=L2eCLWKk&Ca&b7cZX2>C<NvDiw!IZC?sseccxg1{b8v
z%sknK4aID2?N;V{<CqXkOiX|f0<~I=^XJdQ<?^_emi)aGMe&To;n0ercrYz3)l^ni
z#ugVB;oP}%;@n&y@!oq|<bT_@?@%NsYpCJjVe#6vYjJ}?M@%NuidUaJevJF~??V(t
ztY5z#J9qBH-Mf!o1%rVz9*^fWb?n%&3;-85ZroUN<j4`s`h1A;G1zQYNYb14gQjW3
z<8h3Pj3+uf|Bl?;Y--P*J*#HZyXfiZo4I)LFT1Cwr~8@o^mIX|(|_eDm8#8Kw^q}d
zq$GH~UbMBf#oOE4qg`EH;?U5LI5#)P6cpr9J9gAjUat@B?U!ISo1xWezen(LWK`*$
z@#V5Cxxo|^6eLnoQVKS2E_deV=aZW^Z=$ue)iXCY_qiYlmqbzQSy)&Ybh%vL_V)IQ
zBO?>);^I=arlty4uYY!;ySp0<!+;QiXf%o^PoCn7FD}#j_BB`s2cJJ6j~_oyn9b%P
zuh%=-(b19G)6+8q;DR6s|MdBMGc3zOp->QtqBJbanqIvc`qB9K@V>%=l7gT7biXPb
z4&&CFq80#9EUQs{{P8cz=;+iu02u`U&CSi6N~N*`u!y4Q=6`wq`Q+r}(w#eZR{buj
ztE=hs^mI<6(PS$Wiaj(<?=3H{EU2ogR2lRJ@Vo$pg2nKQp@r7g*1skai9fEm!Rd4|
z9LLcB#Ey;*>4(NdeSJNhl$6A2G@2ZxQn?#I1tDZD$0c#W;F6o?BR51*ygWZYKlX3%
Xn;E(p2;Fo5015yANkvXXu0mjfNb<We

diff --git a/icons/48x48/Thunar.png b/icons/48x48/Thunar.png
index 367a37353649573ac2b31c05ab8ba743e703b5e1..043a5922246fe00a9e1fe5a65338a594f5e50e25 100644
GIT binary patch
delta 3437
zcmV-z4U+QjC-54OB!2{RLP=Bz2nYy#2xN!=000?uMObuGZ)S9NVRB^vcXxL#X>MzC
zV_|S*E^l&Yo9;Xs000dFNkl<ZXo2mSYj9NOdB^|fx;I?_U5z9#x&a0xZUzJa8)8o!
zurarg)YPVS+F{0>UYuz^)lKXqZJj#p)agv^X8I*lT$fI0ZGVs5+Aze96YPYG0|o(-
zkOTrryIQSQdpVc)-VeK41V|v+bllANnR(`%-Pt|o|9hYJdEVzeM^j4Sx7qa1Tfk?v
zF91GoyQ2Vqyjcs}$?HwU?ij$gw`#kC607di^`>g(ow&&JJI$?>>-)8=EV~oen~r_v
z2z-BswaGGrKY!5-EB=FDs?41bH68m*0Dtv0ZLMkB2bM2xm?0&O-6>Jiu}?LHe)xnI
z(Pi-O!l9B~>sKu)yU^25M_vB*ofbD0n-;*!d$gIb!+&OL;isCK8)h~&HU|7`0_QHq
zQXUm={$Gil%%0n(ho=Pa<9(VXNch`kxOiV<)BG7VHGg%M9Vv%5+J{U!g}84ghh}bA
z`^Y0()-Wj=8DSAZNy?`*Mm(>_cm21zy1KeQtKh%hsV~+HbCYS>n=_6V;R1i6-L4mU
z=`pR!4un6fZ)mPw*xDAhiz=X?q5Ir%ym{8ds3=uST34##;v#)87DGCn!O&0~u~;0b
zR0`>I8h?b445KUxDgGNueW$y-J2h3&KlqwnVOaJzp&9#1OJ@{uE@s3NqkXPVH@xt+
z?7uC*%TGmqv8HX~+Bq!`>Y81I4}a5zBOjfEAGix&-n0q#-?s@}7d!Fp;X^pzegQ&A
zghL?&0yYRGNREu+%9X1iltL&a1!Gwy@N`d4*MF<G6uw&z+rjYbhG8vRxTvLcZe6uC
zJQP=l-~Z@L)+KE({*QD4;FbVC+8f$iS5x=Wy3J3P`c@5IKJY%~G_Sy5bP(IOZ$o3l
ze4IFW4EtYw6;dcv-c=38I0&Jjl!6cf$`}k?1EfG=co=<s{cs&e8J7K8cW1|*iSGM1
zyMJ`k4upQbYSp@Xn-(v#xSPUA{3;H<b!0H(kY#`Wu8fWS_LgNdU>fUdYHLe76GeD&
z|1Yrh>%Wg=Y7|?xY(Z1we0*}|6kdDn-%(pP7flQ1BNPfD7z`j73?LA&VFzqjrU}Y8
z(vA=4Hs;mOLw&>Dnx@oa%?lTFw6?ZJZhyS5VTBGZT(o5A{AKGcL0!1%7~Xj2gG4Gz
z9vv_Kwg8%@RdmJ!c>CB@JpG4%ijRMD67}=uVc~*BxZKx^cMiRS%E~HKRF;nuo)>SA
zbIXElSuji!KIIUai3JOrU|Uu*;p}+R^5qqU(f>x|h1s=pHZEVYDXbYmkW>`EI)8aK
zJDTyH`-emF_>CHG2{6RUYK|x8VejL6aiOaNeU~m{<Ncf9I9VJ&c>?jF1m-VnMkp98
zh`%O0C)%=1Se6CTGIMU4Pzs1AGpMbr!;F%Wg(jmPEog0>_uZYr-zh38*?0fO2aBzu
z*`V1d1ozR=Gw3?L_?L+^PFhBH?tj@icV=k)!f)++8a<bLF%*kobz2*3%f|VRcAWb7
zG*+)!g<voUP167XN-0PwA*F;60-Ot&rU}y&Fbxx?!C{yN0=5NR15)V>ib_i`qu6Yy
zMaQu~D55{S`KvQRl?wo=;3fNzPN(4#9)0CK=}!y56nNpuZ|)2C5B7s`ihthTUOe#S
z2jF@xy1FjH^<2!JeHREJ1>sy+Ik6^(VHhw?1BQ`z(}1q)sGD7lHLF*nsj&%Hx=x_|
z$jb=uB-&OiDsOIXM&zzm=(-6%(+}n*(S13pJR<&UQk@fhx$CiAElu@}Uyp=C7>Eu)
zN`ZiFBNPlH8XLs9^B1u4-hUOaZ3{vQm|Vax^CN5+&~+n!)S(*&bX|k4>!_+I!}p*6
zF2bQ8{^M_V!-;oeOIrix-rWGZtO0hU5>j#qnnn7`2?$2e-ZM0kcKI9A0?>u_y`4LD
zXx*23kw_%ae{}#YOBRDMhJnFB#9}dQdH5knDWPfFO|BQt_58UGU4H|1?c9lyl2Yvd
z-lM3Fcv$q%Mg+?jz@AYDNC71|B=eB${s7b+h2RudVp%~2PE7`IQxfmlvu9>aZOy|{
zDGbGj@#2dwp{uJCRn^sSJrDf@15i>z0pMIf3JIwsl#)<N<s1sY_3KL{6hzD777SeJ
zLA382?rEw+@x1#GoPRYBx^4ox0p<*2=#zu+M*1K)!KuzDV?w?C)8msbRyRd}3i?3n
zk`{d+8il3-^X{IDa3~DRu;Dscbar;3x~d8t9i2FS>|?B1b1#aDiXgavkfM;pQYt7V
zA@fiGkj-Y%b^4d6DxV3MK^RsT0HCCRGk6Ax&La@ahZGE%tbdEcCkBU8j(BD=@e@Ws
zgZj#nB`vsewI7T!?AY-rN=l2N8#)G~QN-hMR8&{t;K4T$3I*`qdmn&M3d$H5<KUb_
z2$6RQDRNL*CyS9}0*+7NdIU5xjP%u$80k2SD<8gs;S2AAQxAd@48}+C%3BxX8CO33
z)@gOizG<QyXnzey!bqi42m}IfvKf?>m4gzBfx#%!sWigjFg9#hhjZ=c(YmY!#3x{k
zfl-z_-UK4xI1UB}29ZcJboa%;SI$AI_b8;G5S&4B3LzNUdlLBR(IM{pe8anE)rDJ$
zpAf*Z%o4_Ep*&_X8B|qOA(PEwcsK#aabXw+D$2{Tet*N4Af<rk`{0~|F$Ovgf-wfp
zIk*sDT;eDHx*xh}A)?B0>`X6~HCGgb6W_<-lTjS+l{lZB!#Xc?-B$dB0ES^!IgSh8
zC+N7)iC8p>&6_tPoyj0RJPaWOT+ahAws5KZqQ$R+pyQ_%V=ycm1N~QVcYOm?<!bz_
z{e2ugbAJ}g8zLASA^4;>i@sC<#dXWUhA)L?HZ+tbr_gp60Cw-*Z7W0mxN%-X>CvM{
z;rTw!U+BQfWlJE0Kq{5OaAE{X3b?Kd#(2IhkPt!^AjU?XG6tION^>9#W-x^I_On>F
zv<2qe2jM$O9PaG_Q2`w9>%pw*TCkA>Lbioubbs)lG);R#DJ5<NP)K5>t8Z-Ix^3^X
z&;BJSqZl0-!P2Fz=pTrJGKS=68nM_AOv}dk^PTv&R}bLup(AizFXx^I&-3B?K75~m
z_ymN~T!PbFerUP@&9v~d_kNC($4{dB@*sNR3co(xi{e=oaGea?tb<JtY{H^@?s+U6
z4u3v%y9g8jbPZ45f8RzNK70sI{O(?C-Mj^icu-2gbzLM!l1L;HFiaD!>tfBCl_;H2
z3TI5b>%;T>YY-$4K`1C01EDZ<6D2dtk@YFAMu#z)@iC*U5}DK}s>^3#?Ygx{B!*Ep
zrw)|yKbZ0qDle~C?l=xO=QwrxW3;rkV1MPxm3Zb`&mfb@f=~+IC(r<tm6d@~ipr`=
zxULH&6@<){OnzNH@IrN>ESDFA()<dpLof!$DJp7fv0~{W01A$i1prV=5s5_Zoic!)
zZz)aFgkcyM80beh9D!lkNM|zW?Y#^G3Wla|<x(#wV}&+B({qk|8^O7NPkb;!Kz~R+
z3Y36S3P=gdvQS-Jjm8zNFf1K{3;4c|@w-E%RH4hA5`d;_;GAFUX`n$00nc$T5F3Ur
z1)l%Tv#6-3C`<?96F9DmR4R$YND_(RVZ`HcaLy5lR3jXYAQ-e^nidokL_RW<F#rmJ
zi##B~L|a=8(*U4^!6ziw2IQ*><A1r(GveW?y^o{5p&lAED0QuLQbs}iO8A7p_kDPt
z2gYbYC}R|ivE2Tc<klAe`Ta5lWw|Leq1|5pH2^LceBUcX0RW_ua2yx2tE<u4(t>Oz
zTliiI2`;YHe#RJt-~e*H4;Q)m&uC6Oq1ONi&3~pj(22Ec(~CeRlTn(cgMTqr*io6>
zgcKaRc5X)|o5_uSUf@`iZiJwW=8`r)&2ovG6Pv3>xhX?wE;5sv25`=xX_~H-nj}Qy
z0EUKQe{tZzYybGrSH6nTR1&V6YZ=zB{}Mu>U}5wXuHQD^xC)Q=+#+@jWDI~(3Lz$6
zp9mp1*M1)9bmqBRi3e_YE`QY4*0!g(wCG3Mw{4$QT3S-Lv0)g{wA|=J;U<8weBqpf
zvk9Ux9)i+I#W2Q@$z<`XkA9tTvd*6?rT+O=;%@=~fYqy4ml5LpaPHjt-&?wDDXOZf
zKpBCd8xTU|rjL@>CHwd&aL&Q_xJcvy#-`>(qNP+wCX?vC*n@%ofq(x5@JC9if!m3n
z5Ma#a&!1l}C4W>ZY_F=STG!m%q}SBcK**d}r6iP8&~!Z?ja>UIrOZ{Je1dY$3(=BN
z7Rsek3PZ6tdV4Ra_)z?qQtEX8uPb%?7J5nm<E^HqrkqLkh~#pcuIY;{%c=|ntRmCO
zJ$VZR0|*9#2n1{d0%p1Qd_E!YJP)4h!Eu~?f8@g_#34S3bI#8Jcmu$jN~!2{L{A%F
z!ar(S06@hJUYS4Y0EPg>^IkYtN=^8D=hND!2KfJCU%cr4yzL8s&)fbNcAI({<a7zz
P00000NkvXXu0mjf$4FwV

literal 5103
zcmWky1yoee7k>0gmjb%T0{#f;4(Se2>CUCQyIcub8WE%g38h2nUfg8~5s`*fq;o|;
zY5wm&@64NX?m2Jn+?nrv_q&ty?1?57`CW1V0I0OJ)C|B;`2QV33cgJV&l16b)InEM
z4Y>LL^R}nz6==ETt7RSl02B=W?*u@8Av0(s3)I$AC!4-SN+UszUkfG%O{{_HW`U|c
zUS3Y#fq<&NlYO9*BP_%%&=qFn>IBo&)_aC`{LdQz7!0-5l#N_*Jr)tZM#lL!MHgGW
zSM5ay<pt%78BE%*XhkyKX2jCR!4#g+bFUIvvARsNR8%I|w|)#Rs{4?C1rKp?FZ3(C
zOJ>4KEWyViOPn|``M?grL-3AP1){B`VzV3;Ty=r#{a4%)L%XO%KbA5RZTw+pr%++@
zq6mL-(Hn6KsI~5z$pTxIn?*<c?n#2ZxJ=QPQtPf@H-Py%nw`(2wlQ4pe!~N8YJEn-
zK<f$aIB~c9nbD)jkcfy2H8}j;A<e<fwDRlMudP&6R35Ug)gK-nlGRjKn|RMRuP2r*
zM+M4#UAAXVI6vsZ-wiO9<>keCw9H!}U~A8G@Fc#h00n%ku(<d8?DUDb0Q;JN_3XsG
z1Q7>jbVYG-@s=Wa!rI0L(qp#X+LamoYQ;Bn>R`F6XFv&9jQ;b=g}7js))4(Dcz@wG
zsgld$yY}|Eos;mEG3TQb;2{fq)(@IH%p6c}@oBOsH}_VeD)EFl0B}E*T>X9FQv{1U
zrd9bXivB{cB5Pr3iHZ@THL$S}<l^SGeF{0#mWK9TOq<#Uy+<P6XdI&06t4M&WU4ni
zJgxiAryJ1Dz<{xl(E|(q90QbaFUHSG63*{;rWewV@9iS?eoF2*FS|NW`iwX?{M`5L
zIpj&PT;$8mGgCdTsZ3vK=u%fmLvSiZmr7{cqQH4%uOoVH#Ed`3(#FP{o|wS7<z?;I
zlI3pt^}d1GB%H<V1Du3}Bs?G>!0PPcpljm5SK8!W!l5BRQe)y(crzxZ*qW1rBhDQq
zX)!N6v1>7pTYUBMHD4}A#6a0zrv3r$`SZW`0dXNAA;%`O<KEuhhEK%ipWI(}G&cG+
z)$cB1Fc|zoPefbP4g!tVxICZjyB1sd9P*~L2%e%&@GNaLRGGFL0b6=ky(7QAPBX?Q
zXoGxyO_!2FZ5QZBtgo&t4b|XbMDUL`F76Kx4=Xu4b9LL`#go6s9J2)XoOjVc*c-I6
zjC6UaBCR=AuA&w3!CmqxO$CA0|28)^biCUh_4aQbv4`QhNzBdjLLv`8Gf5G)6ZIDX
z2cnd#k|^OEVRT_aJ%p^f#_!PKQFv#Uh`1c3x;}04=eIoM2?+_lm#2P(@)39T_xHE9
zx0N-}i1ycG&UEuKNBRZ^`9a%R1|s6$r+FZQU#X;)XuaIs^Cglp3Jal4wYB^OtL>VU
zsP{|FPP!YvKI=LkFXM19!H+>4w9ug~En)y>{y>X9Q9ZdiBO?RolD9|yNKm1(>iizh
zshKv^M?p+@y8U-wSohn<PeQ$?ebOQI*Y{P1F`E-5Y}GY21$4xUa&jr48?!o-WEkYS
zvXTot<oclM+r5nDtsL^piQU~$egUhviumNl&?dI9Fd5&j<qW4VlRl{e_4Z}&)2lG)
z;M)7@>grp2dup~Zig$!;<h;D1qq%Sq_#WDcBPMIX*{>fAtBzR+06W3lQQr<L{j^nP
zjGr4Oovn?(Z<{N5+8Na*;M@Z7(IKaXO2>lVF_F>SS6lg3(SFXaot2S!Amr{Uy)eYw
z_0bWVHT<}Kh)BuQl<6eA2l+so69EGe5Gf%c@$KYHSKvw2W!($VhjjQcPmZ8DqP11h
z(b3V4D|vBG^5dse933@Hcf;;^;}3kgq?A;P8vy*gJUdF5+AaiPubj3Tn6}zYg;Ait
zO=8k8OSJt^@v8FAc2x<7kPyuk5mAN{%MrMBlNQwTh^J2@mmVS=a;LVTXKSyX);A)A
z*Tw2Sd`JS?g=4NSi6jg3B=R2L4ho7%{r>&(b7rpTFMeLZe#BmidGeH%x-ny%Dto&;
zFNBy->+$2lpnb$1C38Y17X%UD;GhEds#~l#SWL)1dUUe3w${jljDliL0Os{D1$O4W
z8O5_>W?Yy{A1#Eq{rPotN}|eFhuC^vVIF1vO7=TbfU^>9ocU|n-<yi4Ob`{z$b<w^
z#s)J2)mgeEwaTkoh+9QPrGurV2QTs~Pi*%!#EMjC*c6}we0;l4bacqIvjPV^B}48e
zG}#zW)9dhdc6NSUSh!0gnY=EFISiFEG_Z%n$H$vRUY%sDkNPnhGZxAQk&nAf{L)lh
zNML<*9s7(YZuUngQD@~i#DrEoFfcH3_$U&Ib!^tn5|?}JoZ(@-eX={7jKyNLxn6Bk
ztLwLlphct4Mt>}1(KqnSymSlvCcy;&1EuVH^DSiHe=|HXqGDlT0nO$goon~w{69{V
zV6oiyW1!9an164ypTtBH2;FR-v5BE^_t@C*g=;!37O;aSL_|d5oSdj9kV6KQrMCKc
z$D^}K7mAi+<01fP!@Q^}xi;OKJ0$zq+R7myKy|<Eo{WslOAU^>LyY3!?vb_r(AexS
z-FBXhFEn?Exuv|kJYyaa8s7NfVdevDwcCOmkTtPc5b$=S`SxO)k0u<>`K9Pl;`=h#
z!YmmOx|WH_EEf6K!zFM4z)t@Cn_yLPcYkP~LYKDs5(W|f@3V|R!H_u8H<S_%hrfCA
zrvLO*x-4^493JRN`6Z56nt{Il)H+I4VCSA-Osf`s8PZ=5U}a@!xyI)M;Smwr2oeg$
z;?0Qt;D~3<zV*pPJ+64^#NJ+oLLV=6{92t&Z;;IWxqwV17;QR5$t;C(;S<%eNuKkI
zi>HmFDjJ%a9oRW1Tc#nP-wW3*GwIw?$3VQInf+}qDd|>K{caim=<kcG;gK;le;smq
z1_t{~Xyd%vn~Kqo{SW+Sm%3NxMD~_C7{ItOCue8UQ5%$C>|_8W5e38||M(Y5``z#Q
zcX{n2H*te=Xo?gU6&3yK1hX9_bewN?GSQndxUHV2$@@tdtp+$={N2}js{0~BXW^17
zYs;Sipk|egtFITVwduM0TnWg_%kzzp+uE-qg7b$=RbKovHSPPf;3z6#YGOi-U+&5!
zpY04&(fUxo`(r9dK2c=jtSYfp)|62QF|~bZ!WeTjE(P+$8>82^oV5oT(iPKYjyC<y
zkKMAfv+c(7C0=FACzO?yeQ$0yFajr@ac)UvP~ig9TnPJL=jL{iD9^ojTL7~}p44(^
zgu!}<lwBp`x!%^$&=B!c-v4GR!dJIv_YYwrB6Jh-|DaH6G9(g7OP$C*D(X0oyge#)
z8L^6`QD7o2Z2&#=ENEk+{w=$NbXfh@S+7U{b6H+MmTUIe9@agi0WNUS_kt}eJIdFd
zT)TU}E+|MYE93Y+GeZcRhez1A*$Nhig_#2xE~0sIyu7@Fw}Fw-QIf7@g%aB4G}^3Q
zM{H-@2p)Hsid{6?-rYs*HuR<K?6~s}2mdThJjnAa!t85EGa{;az6Q$UR3qdBh0z-<
z3HG~qJh!3sO9pk3N#PWU&iY(^o%QhosW0y%b#*DeNJ??iQgYBjtR~|k=er*<(Azax
z*h?0aRzK9x)cA^<d_FT{5~sqRos;wHIa%vixXg1q+P~UJItcMEKvb-OsKRI?497nz
zD)cyrwP4(&wt5GZ(v%%@w%uo5*_m3+<0>6YX>4pv&VGv?5SAo0&shyqyqk)?U1-5n
ziTr`b6oufDmX?;x>%M>chFDmzko!9a7fzX5Kh@I7FNe~5clup%rgAGv1N~e;|IT!c
zOgd(DQrs(y|BkKzkJ+wSMiJeQ-&pPvN=**B0bxpVB|Fc-cE5SjYcj>tFCP=SD=SGK
zg&Yjc)LE`fU^@s?_(!K^Y+2{1Flj3<XcYQ$#tZZftWu(U`cgq!Yx{@SG&D3E-X5bz
z49vKr%?L4mcUJs2;Tyaa-e|KsfX962y5E$-;Sj^}q^mgSuh|hR>k%9*`Nu!%aIxJ&
z^xG5&3?t)Im)9M`TU$I}o|KP6*+<??Y7zi_r|CCJ5fP96934&0E+%U|pr1OK(LkH=
zv6nx(ldJ~;wEX>>)n|iZ#P15&rR0f<M)|FCX1**kaPRzw8{a@8AN87Kj@9yew(m<q
zKh&t2Yz)d|N*e2bU0O<sr(i03{~kg`MHRXd&-Bc~0$EiY{?KL%WRh3cn-y1K19rRj
zn#^js>67B(r)x|Dg1eSc%%d(T9o`*h-q`KHUt5_BFE!qYRv3l5jv9VTSk&DpbQ|G&
zn2}SQ_Vd|~LUR{=d-ky`#*hKb{Rn=WVU<z{B`0agMB?$sGwkzznF6e%N=%F*11TwK
zI|4yiQ0az^qYX&A@jq(X{8U7gB7#}49Bp`}zzq4hH=lg^>o`nYYBpU2t;BoVz>vZ#
zFVBWiaQww$R0l8~_FZ%v3FiFw)zyRGxq&hYk&|-=D&tRVZEelW%F4PT?fuwznjwxh
z)j-F|+*t+W-O_A-;4yF-Pth_tH}_KO!LPU3<mu5jk8GV1TbLU0`!tiw%hGp})Oaeg
zh0$+dkdIZHYrZ~0nrZjtT}Q0jzqPte)iur!$zYW9^r%3=oaD9GI#84yH)|Wi8Wa=+
zawQM1AUbbDc{ZK`;{im1MZ#uhJq>{{vARA4<9GQ0avJH~{bz*D{*#4(;?3Da1M|PD
z&6q0{2})Hmn1N2mYd(BdIaa%{%>8{s!~NUD&p#E`u$|#;?=zUzcQ5z$dY(xr6B7~a
zg`XIUOG<JmDzg1wCV6=9fppUdE+({7e(I8(8U7+J!?}3V5|quDs!SO)GsyI-DZfX5
zl|CfLg~DmX^;S*lyGKn7tYX8kN0pPwdIckeFNj`*-uPhr{_ag4c6Ji2s3zjFi({_C
z>?H|#Mn!dWbu)7d?)k(%92s2!GpLh{4lj^msDt@;uv|kF3)7~Dr|1KBCyvk{$N*q>
zbfougQ;FOy;B?<7n$u=iGD<-zQbEeVP#!|+<JbMCswdFlmw3eacGcl;6wSNxaz~Au
z65Vc3TsPf>Ld5rxBe|+-_wMwSu;NWoF)>ysX5AOs)(;AC7WiDFz3Sy(V`Ft~?6_}7
zWm|Sa{nG*hb1%tu`6M1bOLZi<sV`HPtncri%9K=81Ne!qjTh-2Cv$amD3TX1iZBrN
zsOY|!vW||tKPVJR>*-T&lbUJl(PfsH%a`_%nK}ml%j;43Dp>!1Fv{}|xMd3q3%;kn
z?Ynz?*l<f-OffQn5Ky^lT3X&iV=(NC`#-}Js7JQ5{YC}a`Z=`Uf2jMsf{KZs*hKvh
zgPj_<dpv#HcY_%7vr7N$z%u;h%S<T1FCdWm;J^Roc`Ify4o%1E$vH{a@#a&fSdWID
zgzD;t#4iTyjg3{I81>L%)3Qm|Ks!4nH*fEmzxW?M?rv@(l&GK3W@w4*=IK?ty&oMZ
z=|!W@4+St<_Q`dGN3+&=#az$vAN(NT+4dv)hhj)bTMx?5>J3?Jg>Ei=A}Vu;*|M_Q
z{fpRyr<C<%m!$a5&rG&MKY!W{d$+|X^Ii=Kr%doxjHfgO02a5{<q@!chbBrsB)x~5
zo4)(*&Q_ink#oT`Wx;Yn7&eKAmsi=rfddzF6BTJ>n+}SPIZw&q;EUST;b%Mu`G$QE
ze2E`Ee*E54{uW40EfGJIQ{(~qhle4$PoB)&Vy}il7N(_c1}TJu3&w-B89z^T*2mQE
zp0lK_3W}h`QNq$H5Hh7-VG4Px?P@A7Uu}k!z##F<%T-x6;b-NX0(HWrp3DCH!(aOI
zB|I8E=l!A5zp25>M&Hsh87yn~Ej~h6SXe-X9XIbd_<I=ADQKe>rAh>H9!SC<n*G+c
zs_arK2pTC2(cBCO*zw%{UjW$59l?XTQ!uv%E1V*hU|$IQmVwubL8;U4CX`Yj`n9t_
zmME;Q&VoULbv~#wswZL{t2e`<n_!T(z>tzZ-N%2lHEnFP2lwygaEkF!&?ub3W@^nD
zgdC=)r@`t34)DM!Q$*P5lipCFejXhiosqGH0?yb33MNwDyxT3OX7OD&*B3=ks*aqs
zvx<QXEOU##PLSTz0wu~d&*)k__TU+hxI&P^EdadQ0QxoG=||(b!wM_i%F1|}Q7gZZ
zWp5_@te%6*5k||Uh-iZK*<iDiZ4=H87MpBs9eU8Qi6+<rlprGdI(qTCQu(dk%fu}Y
zR$2_lPf^KzR~aII+1b~uMJtLJ!9`#^C571IPPu6a;k8WtB!E|SHFaQcu!eKQPsvYh
z#gVDc$?U)s?<QH$b0^v9ZpPw_kB*tO1(ZxwRu<Vb2?0eX&<_?OHO8@1+iJqJ{Vj?Y
z^CCLi+yHd|G{j-YE?MsKH>zyjGuSmhhX+~q+CYb=g3j1j6AiYSni_aO6e4>1f_cyg
zCRyMm68qWkIU^GjH{+c<9Acbs3lfvtBp8KjX%l1P6JB^Nof2!saa^U_mFd$BEq#4D
z{7E=T+G;!28N&>Pe&5~M*^-KEStAFh8s~!y{=zbMuqbiB9}~jz$DP3}X93APX=<_)
zzspMHnm?n#>qY1b?RNprL-yuM=`U|6KGfDSIyAj;6wRYAd{ULWc_xQ8dkFU|=0Pf?
zts1bvp%vogyXP?W@)D6?oN$T>N_YV=@Y60R=o5MD72BaCu15Nvhaz|n2WYE5QL9(6
GL;Me({<=f}

diff --git a/icons/Makefile.am b/icons/Makefile.am
index 18dcae1e2..c9a589c38 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -3,6 +3,7 @@
 SUBDIRS =								\
 	16x16								\
 	24x24								\
-	48x48
+	48x48								\
+	scalable
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
new file mode 100644
index 000000000..05004f6fc
--- /dev/null
+++ b/icons/scalable/Makefile.am
@@ -0,0 +1,10 @@
+# $Id$
+
+appsdir = $(datadir)/icons/hicolor/scalable/apps
+apps_DATA =								\
+	Thunar.svg
+
+EXTRA_DIST =								\
+	$(apps_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/icons/scalable/Thunar.svg b/icons/scalable/Thunar.svg
new file mode 100644
index 000000000..4d73a8611
--- /dev/null
+++ b/icons/scalable/Thunar.svg
@@ -0,0 +1,1949 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48.000000px"
+   height="48.000000px"
+   id="svg1314"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   sodipodi:docbase="/tmp"
+   sodipodi:docname="thunar.svg"
+   inkscape:export-filename="/tmp/thunar_48.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs1316">
+    <linearGradient
+       id="linearGradient4370"
+       inkscape:collect="always">
+      <stop
+         id="stop4372"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1.0000000" />
+      <stop
+         id="stop4374"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4364"
+       inkscape:collect="always">
+      <stop
+         id="stop4366"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1.0000000" />
+      <stop
+         id="stop4368"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1.0000000" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4352"
+       inkscape:collect="always">
+      <stop
+         id="stop4354"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1.0000000" />
+      <stop
+         id="stop4356"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1.0000000" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4346"
+       inkscape:collect="always">
+      <stop
+         id="stop4348"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1.0000000" />
+      <stop
+         id="stop4350"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1.0000000" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4334"
+       inkscape:collect="always">
+      <stop
+         id="stop4336"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1.0000000" />
+      <stop
+         id="stop4338"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:1.0000000" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4327">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1.0000000"
+         offset="0"
+         id="stop4329" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="1"
+         id="stop4331" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4321"
+       inkscape:collect="always">
+      <stop
+         id="stop4323"
+         offset="0"
+         style="stop-color:#fbfbfb;stop-opacity:1.0000000" />
+      <stop
+         id="stop4325"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0.0000000" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4313">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1.0000000"
+         offset="0"
+         id="stop4315" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0.0000000"
+         offset="1"
+         id="stop4317" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4291"
+       inkscape:collect="always">
+      <stop
+         id="stop4293"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1.0000000" />
+      <stop
+         id="stop4295"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1.0000000" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4285"
+       inkscape:collect="always">
+      <stop
+         id="stop4287"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1.0000000" />
+      <stop
+         id="stop4289"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1.0000000" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3309">
+      <stop
+         style="stop-color:#8f5902;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3311" />
+      <stop
+         style="stop-color:#3f2700;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3313" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3301">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3303" />
+      <stop
+         style="stop-color:#1d2122;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3305" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3293">
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3295" />
+      <stop
+         style="stop-color:#1d2122;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3297" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3285">
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3287" />
+      <stop
+         style="stop-color:#1d2122;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3289" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3213">
+      <stop
+         style="stop-color:#1f2020;stop-opacity:1;"
+         offset="0"
+         id="stop3215" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3217" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3205">
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3207" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3209" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3148">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3150" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3152" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3140">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3142" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3144" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3128">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3130" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0.0000000"
+         offset="1"
+         id="stop3132" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3063">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3065" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3067" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3047">
+      <stop
+         style="stop-color:#fbfbfb;stop-opacity:1.0000000"
+         offset="0"
+         id="stop3049" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop3051" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2836">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop2838" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop2840" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2811">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop2813" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop2815" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2801">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop2803" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2805" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2720">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1.0000000"
+         offset="0"
+         id="stop2722" />
+      <stop
+         style="stop-color:#060606;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2724" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2710">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop2712" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2714" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2700">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2702" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2704" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2670"
+       inkscape:collect="always">
+      <stop
+         id="stop2672"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
+      <stop
+         id="stop2674"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1.0000000" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2660">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1.0000000"
+         offset="0"
+         id="stop2662" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2664" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2645">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2647" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2649" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2600">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1.0000000"
+         offset="0"
+         id="stop2602" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2604" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2570">
+      <stop
+         style="stop-color:#898b86;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2572" />
+      <stop
+         id="stop2598"
+         offset="0.50000000"
+         style="stop-color:#5e625f;stop-opacity:1.0000000;" />
+      <stop
+         style="stop-color:#1d2122;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2574" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2536">
+      <stop
+         style="stop-color:#f4dbb3;stop-opacity:1;"
+         offset="0"
+         id="stop2538" />
+      <stop
+         style="stop-color:#f4dbb3;stop-opacity:0;"
+         offset="1"
+         id="stop2540" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2516">
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1.0000000"
+         offset="0"
+         id="stop2518" />
+      <stop
+         style="stop-color:#c17d11;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2520" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2508">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop2510" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2512" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2498">
+      <stop
+         style="stop-color:#555753;stop-opacity:1.0000000"
+         offset="0"
+         id="stop2500" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2502" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2488">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1.0000000"
+         offset="0"
+         id="stop2490" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1.0000000"
+         offset="1"
+         id="stop2492" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3140"
+       id="linearGradient3913"
+       gradientUnits="userSpaceOnUse"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3148"
+       id="linearGradient3915"
+       gradientUnits="userSpaceOnUse"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3063"
+       id="linearGradient3917"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(4.144551,0.750000)"
+       x1="29.824352"
+       y1="40.151402"
+       x2="22.636547"
+       y2="34.151402" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3047"
+       id="linearGradient3919"
+       gradientUnits="userSpaceOnUse"
+       x1="38.330265"
+       y1="41.020145"
+       x2="39.851955"
+       y2="44.202126" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3128"
+       id="radialGradient3921"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.312500,0.000000,25.43750)"
+       cx="24.000000"
+       cy="37.000000"
+       fx="24.000000"
+       fy="37.000000"
+       r="16.000000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2508"
+       id="linearGradient3978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.284770)"
+       x1="12.073041"
+       y1="36.172928"
+       x2="15.983243"
+       y2="29.540051" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2720"
+       id="linearGradient3980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.699309,-0.607131)"
+       x1="9.1500913"
+       y1="30.290050"
+       x2="23.950090"
+       y2="30.700176" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2600"
+       id="linearGradient3983"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.075201,0.000000,0.000000,1.075201,-2.642295,5.323943)"
+       x1="24.655788"
+       y1="28.917265"
+       x2="32.797878"
+       y2="36.090683" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2710"
+       id="linearGradient3985"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.075201,0.000000,0.000000,1.075201,-2.642295,5.323943)"
+       x1="24.655788"
+       y1="28.917265"
+       x2="32.620346"
+       y2="31.583088" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3301"
+       id="linearGradient3988"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
+       x1="23.428712"
+       y1="34.088126"
+       x2="38.556122"
+       y2="34.088126" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2700"
+       id="linearGradient3991"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.284770)"
+       x1="12.686795"
+       y1="28.186703"
+       x2="8.3465776"
+       y2="36.886799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
+       x1="13.241320"
+       y1="7.6370878"
+       x2="18.305454"
+       y2="12.233282" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4030"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
+       x1="17.547098"
+       y1="4.0808506"
+       x2="22.490458"
+       y2="7.7058506" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4032"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
+       x1="12.904699"
+       y1="8.9323502"
+       x2="20.240931"
+       y2="7.0761948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3285"
+       id="linearGradient4034"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
+       x1="14.434047"
+       y1="9.3562202"
+       x2="38.186804"
+       y2="16.692453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2488"
+       id="radialGradient4036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.267414,0.315515,-0.251438,1.010024,-4.402386,-1.475035)"
+       cx="16.791676"
+       cy="11.707835"
+       fx="16.791676"
+       fy="11.707835"
+       r="14.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2645"
+       id="linearGradient4038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.582070)"
+       x1="15.563757"
+       y1="7.9082789"
+       x2="25.160458"
+       y2="13.185163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4040"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3293"
+       id="linearGradient4042"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
+       x1="8.2106591"
+       y1="25.674127"
+       x2="35.615616"
+       y2="28.060614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4044"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2670"
+       id="radialGradient4046"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.370840,0.235504,-0.120034,-0.698704,37.75370,36.40946)"
+       cx="16.236513"
+       cy="19.748014"
+       fx="16.236513"
+       fy="19.748014"
+       r="15.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2660"
+       id="linearGradient4048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,0.582070)"
+       x1="12.292107"
+       y1="20.153751"
+       x2="17.634300"
+       y2="30.788061" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2498"
+       id="linearGradient4050"
+       gradientUnits="userSpaceOnUse"
+       x1="30.486519"
+       y1="20.619411"
+       x2="29.230413"
+       y2="13.193694" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3205"
+       id="linearGradient4052"
+       gradientUnits="userSpaceOnUse"
+       x1="27.280222"
+       y1="21.713293"
+       x2="26.293383"
+       y2="13.864183" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2836"
+       id="linearGradient4054"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
+       x1="26.779949"
+       y1="18.479218"
+       x2="29.489973"
+       y2="22.055546" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4056"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-0.309830)"
+       x1="33.104156"
+       y1="10.245938"
+       x2="38.245445"
+       y2="16.779818" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4058"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
+       x1="31.672344"
+       y1="10.160965"
+       x2="36.539341"
+       y2="19.535965" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-0.309830)"
+       x1="31.184426"
+       y1="12.113161"
+       x2="40.886247"
+       y2="12.113161" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2801"
+       id="linearGradient4062"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
+       x1="18.743164"
+       y1="8.7794323"
+       x2="22.803753"
+       y2="11.765332" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3213"
+       id="linearGradient4064"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.182708,0.000000,0.000000,1.182708,-7.256195,-0.599871)"
+       x1="20.493164"
+       y1="15.739577"
+       x2="14.725269"
+       y2="11.408548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2811"
+       id="linearGradient4066"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.189201,0.000000,0.000000,1.189201,-5.996611,-2.390932)"
+       x1="13.788582"
+       y1="10.905776"
+       x2="21.589458"
+       y2="23.456921" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4068"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4070"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2811"
+       id="linearGradient4075"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="13.788582"
+       y1="10.905776"
+       x2="21.589458"
+       y2="23.456921" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2801"
+       id="linearGradient4078"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="18.743164"
+       y1="8.7794323"
+       x2="22.803753"
+       y2="11.765332" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3213"
+       id="linearGradient4080"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="20.493164"
+       y1="15.739577"
+       x2="14.725269"
+       y2="11.408548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4083"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
+       x1="31.184426"
+       y1="12.113161"
+       x2="40.886247"
+       y2="12.113161" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4086"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
+       x1="33.104156"
+       y1="10.245938"
+       x2="38.245445"
+       y2="16.779818" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4088"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="31.672344"
+       y1="10.160965"
+       x2="36.539341"
+       y2="19.535965" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2836"
+       id="linearGradient4091"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="26.779949"
+       y1="18.479218"
+       x2="29.489973"
+       y2="22.055546" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2670"
+       id="radialGradient4095"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.439197,0.247247,-0.126019,-0.733545,37.73115,39.88453)"
+       cx="16.236513"
+       cy="19.748014"
+       fx="16.236513"
+       fy="19.748014"
+       r="15.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2660"
+       id="linearGradient4097"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
+       x1="12.292107"
+       y1="20.153751"
+       x2="17.634300"
+       y2="30.788061" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3293"
+       id="linearGradient4101"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="8.2106591"
+       y1="25.674127"
+       x2="35.615616"
+       y2="28.060614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2488"
+       id="radialGradient4105"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.330614,0.331248,-0.263976,1.060389,-6.527046,0.110923)"
+       cx="16.791676"
+       cy="11.707835"
+       fx="16.791676"
+       fy="11.707835"
+       r="14.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2645"
+       id="linearGradient4107"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
+       x1="15.563757"
+       y1="7.9082789"
+       x2="25.160458"
+       y2="13.185163" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3285"
+       id="linearGradient4110"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="14.434047"
+       y1="9.3562202"
+       x2="38.186804"
+       y2="16.692453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4113"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="12.904699"
+       y1="8.9323502"
+       x2="20.240931"
+       y2="7.0761948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4116"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="13.241320"
+       y1="7.6370878"
+       x2="18.305454"
+       y2="12.233282" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4118"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="17.547098"
+       y1="4.0808506"
+       x2="22.490458"
+       y2="7.7058506" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4138"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="13.241320"
+       y1="7.6370878"
+       x2="18.305454"
+       y2="12.233282" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4140"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="17.547098"
+       y1="4.0808506"
+       x2="22.490458"
+       y2="7.7058506" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4142"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="12.904699"
+       y1="8.9323502"
+       x2="20.240931"
+       y2="7.0761948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3285"
+       id="linearGradient4144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="14.434047"
+       y1="9.3562202"
+       x2="38.186804"
+       y2="16.692453" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2488"
+       id="radialGradient4146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.330614,0.331248,-0.263976,1.060389,-6.527046,0.110923)"
+       cx="16.791676"
+       cy="11.707835"
+       fx="16.791676"
+       fy="11.707835"
+       r="14.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2645"
+       id="linearGradient4148"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
+       x1="15.563757"
+       y1="7.9082789"
+       x2="25.160458"
+       y2="13.185163" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4150"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3293"
+       id="linearGradient4152"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="8.2106591"
+       y1="25.674127"
+       x2="35.615616"
+       y2="28.060614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4154"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2670"
+       id="radialGradient4156"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.439197,0.247247,-0.126019,-0.733545,37.73115,39.88453)"
+       cx="16.236513"
+       cy="19.748014"
+       fx="16.236513"
+       fy="19.748014"
+       r="15.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2660"
+       id="linearGradient4158"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,2.270606)"
+       x1="12.292107"
+       y1="20.153751"
+       x2="17.634300"
+       y2="30.788061" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4346"
+       id="linearGradient4160"
+       gradientUnits="userSpaceOnUse"
+       x1="30.486519"
+       y1="20.619411"
+       x2="29.230413"
+       y2="13.193694" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3205"
+       id="linearGradient4162"
+       gradientUnits="userSpaceOnUse"
+       x1="27.280222"
+       y1="21.713293"
+       x2="26.293383"
+       y2="13.864183" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2836"
+       id="linearGradient4164"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="26.779949"
+       y1="18.479218"
+       x2="29.489973"
+       y2="22.055546" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
+       x1="33.104156"
+       y1="10.245938"
+       x2="38.245445"
+       y2="16.779818" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4168"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="31.672344"
+       y1="10.160965"
+       x2="36.539341"
+       y2="19.535965" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,1.334231)"
+       x1="31.184426"
+       y1="12.113161"
+       x2="40.886247"
+       y2="12.113161" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2801"
+       id="linearGradient4172"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="18.743164"
+       y1="8.7794323"
+       x2="22.803753"
+       y2="11.765332" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3213"
+       id="linearGradient4174"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.241684,0.000000,0.000000,1.241684,-9.523160,1.029727)"
+       x1="20.493164"
+       y1="15.739577"
+       x2="14.725269"
+       y2="11.408548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2811"
+       id="linearGradient4176"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.248501,0.000000,0.000000,1.248501,-8.200767,-0.850645)"
+       x1="13.788582"
+       y1="10.905776"
+       x2="21.589458"
+       y2="23.456921" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4178"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2570"
+       id="radialGradient4180"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.763515,1.252381e-14,-1.119389e-14,0.677382,3.694341,6.715782)"
+       cx="15.621862"
+       cy="20.759830"
+       fx="15.621862"
+       fy="20.759830"
+       r="0.84002739" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4370"
+       id="linearGradient4191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
+       x1="13.788582"
+       y1="10.905776"
+       x2="21.589458"
+       y2="23.456921" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2801"
+       id="linearGradient4194"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
+       x1="18.743164"
+       y1="8.7794323"
+       x2="22.803753"
+       y2="11.765332" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3213"
+       id="linearGradient4196"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
+       x1="20.493164"
+       y1="15.739577"
+       x2="14.725269"
+       y2="11.408548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4199"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,0.109893)"
+       x1="33.223328"
+       y1="15.477352"
+       x2="45.881561"
+       y2="4.7731071" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4202"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,0.109893)"
+       x1="33.104156"
+       y1="10.245938"
+       x2="38.245445"
+       y2="16.779818" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4204"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
+       x1="31.672344"
+       y1="10.160965"
+       x2="36.539341"
+       y2="19.535965" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2836"
+       id="linearGradient4207"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
+       x1="26.779949"
+       y1="18.479218"
+       x2="29.489973"
+       y2="22.055546" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4327"
+       id="radialGradient4211"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.413431,0.242821,-0.123763,-0.720412,38.63788,37.97003)"
+       cx="16.236513"
+       cy="19.748014"
+       fx="16.236513"
+       fy="19.748014"
+       r="15.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4352"
+       id="linearGradient4213"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,1.029504)"
+       x1="12.292107"
+       y1="20.153751"
+       x2="17.634300"
+       y2="30.788061" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3293"
+       id="linearGradient4217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.219454,0.000000,0.000000,1.219454,-7.770440,-0.189159)"
+       x1="8.2106591"
+       y1="25.674127"
+       x2="35.615616"
+       y2="28.060614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4334"
+       id="radialGradient4221"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.306792,0.325318,-0.25925,1.041405,-4.827965,-1.091514)"
+       cx="16.123058"
+       cy="11.746952"
+       fx="16.123058"
+       fy="11.746952"
+       r="14.400000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4364"
+       id="linearGradient4223"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,1.029504)"
+       x1="15.563757"
+       y1="7.9082789"
+       x2="25.160458"
+       y2="13.185163" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3285"
+       id="linearGradient4226"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
+       x1="14.434047"
+       y1="9.3562202"
+       x2="38.186804"
+       y2="16.692453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2536"
+       id="linearGradient4229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
+       x1="12.904699"
+       y1="8.9323502"
+       x2="20.240931"
+       y2="7.0761948" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2516"
+       id="linearGradient4232"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,-2.035867)"
+       x1="13.241320"
+       y1="7.6370878"
+       x2="18.305454"
+       y2="12.233282" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3309"
+       id="linearGradient4234"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.219454,0,0,1.219454,-7.77044,-0.189159)"
+       x1="17.547098"
+       y1="4.0808506"
+       x2="22.490458"
+       y2="7.7058506" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2508"
+       id="linearGradient4238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.226149,0,0,1.226149,-6.471722,1.029504)"
+       x1="12.292107"
+       y1="20.153751"
+       x2="17.634300"
+       y2="30.788061" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3047"
+       id="linearGradient4242"
+       gradientUnits="userSpaceOnUse"
+       x1="38.330265"
+       y1="41.020145"
+       x2="39.851955"
+       y2="44.202126"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3063"
+       id="linearGradient4246"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-0.131319,-1.573498)"
+       x1="29.824352"
+       y1="40.151402"
+       x2="22.636547"
+       y2="34.151402" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3140"
+       id="linearGradient4249"
+       gradientUnits="userSpaceOnUse"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3148"
+       id="linearGradient4251"
+       gradientUnits="userSpaceOnUse"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3140"
+       id="linearGradient4260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3148"
+       id="linearGradient4262"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3063"
+       id="linearGradient4264"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-0.131319,-1.573498)"
+       x1="29.824352"
+       y1="40.151402"
+       x2="22.636547"
+       y2="34.151402" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3047"
+       id="linearGradient4266"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-2.369861)"
+       x1="38.330265"
+       y1="41.020145"
+       x2="39.851955"
+       y2="44.202126" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3128"
+       id="radialGradient4268"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.312500,0.000000,25.43750)"
+       cx="24.000000"
+       cy="37.000000"
+       fx="24.000000"
+       fy="37.000000"
+       r="16.000000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4321"
+       id="linearGradient4272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-0.869861)"
+       x1="38.330265"
+       y1="41.020145"
+       x2="39.851955"
+       y2="44.202126" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3063"
+       id="linearGradient4276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-0.131319,-7.349800e-2)"
+       x1="29.824352"
+       y1="40.151402"
+       x2="22.636547"
+       y2="34.151402" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4291"
+       id="linearGradient4279"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-0.869861)"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4285"
+       id="linearGradient4281"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.061818,0.000000,0.000000,1.061818,-4.532078,-0.869861)"
+       x1="10.243904"
+       y1="31.474367"
+       x2="36.256096"
+       y2="45.828430" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3128"
+       id="radialGradient4283"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.312500,0.000000,25.43750)"
+       cx="24.000000"
+       cy="37.000000"
+       fx="24.000000"
+       fy="37.000000"
+       r="16.000000" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4313"
+       id="linearGradient4319"
+       x1="34.763798"
+       y1="41.308498"
+       x2="37.783447"
+       y2="46.064751"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.140625"
+     inkscape:cx="25.25"
+     inkscape:cy="23.5"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     gridspacingx="2.0000000px"
+     gridspacingy="2.0000000px"
+     gridtolerance="1.0000000px"
+     inkscape:grid-points="true"
+     inkscape:window-width="1120"
+     inkscape:window-height="890"
+     inkscape:window-x="1363"
+     inkscape:window-y="69"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:guide-points="true"
+     guidetolerance="1.0000000px">
+    <sodipodi:guide
+       orientation="vertical"
+       position="39.244426"
+       id="guide4182" />
+    <sodipodi:guide
+       orientation="horizontal"
+       position="20.859650"
+       id="guide4184" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="3.7123106"
+       id="guide4186" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata1319">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Palette"
+     inkscape:groupmode="layer"
+     sodipodi:insensitive="true"
+     style="display:none">
+    <g
+       id="g1444"
+       transform="matrix(0.145447,0,0,0.145447,-36.80275,-2.762314)">
+      <path
+         id="rect139_1_"
+         d="M 164.5164,135.3145 L 176.6932,135.3145 C 179.6698,135.3145 182.0828,137.7295 182.0828,140.7071 L 182.0828,152.8829 C 182.0828,155.8604 179.6697,158.2735 176.6932,158.2735 L 164.5164,158.2735 C 161.5398,158.2735 159.1248,155.8604 159.1248,152.8829 L 159.1248,140.7071 C 159.1248,137.7295 161.5398,135.3145 164.5164,135.3145 z "
+         style="fill:#8ae234;fill-opacity:1" />
+      <path
+         id="rect145_1_"
+         d="M 194.1248,135.3145 L 206.2996,135.3145 C 209.2781,135.3145 211.6912,137.7295 211.6912,140.7071 L 211.6912,152.8829 C 211.6912,155.8604 209.2781,158.2735 206.2996,158.2735 L 194.1248,158.2735 C 191.1463,158.2735 188.7322,155.8604 188.7322,152.8829 L 188.7322,140.7071 C 188.7322,137.7295 191.1462,135.3145 194.1248,135.3145 z "
+         style="fill:#73d216;fill-opacity:1" />
+      <path
+         id="rect157_1_"
+         d="M 223.7312,135.3145 L 235.907,135.3145 C 238.8845,135.3145 241.2976,137.7295 241.2976,140.7071 L 241.2976,152.8829 C 241.2976,155.8604 238.8845,158.2735 235.907,158.2735 L 223.7312,158.2735 C 220.7537,158.2735 218.3396,155.8604 218.3396,152.8829 L 218.3396,140.7071 C 218.3396,137.7295 220.7537,135.3145 223.7312,135.3145 z "
+         style="fill:#4e9a06;fill-opacity:1" />
+      <path
+         id="rect140_1_"
+         d="M 164.5164,76.099602 L 176.6932,76.099602 C 179.6698,76.099602 182.0828,78.514602 182.0828,81.492202 L 182.0828,93.668002 C 182.0828,96.645502 179.6697,99.058602 176.6932,99.058602 L 164.5164,99.058602 C 161.5398,99.058602 159.1248,96.645502 159.1248,93.668002 L 159.1248,81.492202 C 159.1248,78.514702 161.5398,76.099602 164.5164,76.099602 z "
+         style="fill:#fcaf3e" />
+      <path
+         id="rect146_1_"
+         d="M 194.1248,76.099602 L 206.2996,76.099602 C 209.2781,76.099602 211.6912,78.514602 211.6912,81.492202 L 211.6912,93.668002 C 211.6912,96.645502 209.2781,99.058602 206.2996,99.058602 L 194.1248,99.058602 C 191.1463,99.058602 188.7322,96.645502 188.7322,93.668002 L 188.7322,81.492202 C 188.7322,78.514702 191.1462,76.099602 194.1248,76.099602 z "
+         style="fill:#f57900" />
+      <path
+         id="rect158_1_"
+         d="M 223.7312,76.099602 L 235.907,76.099602 C 238.8845,76.099602 241.2976,78.514602 241.2976,81.492202 L 241.2976,93.668002 C 241.2976,96.645502 238.8845,99.058602 235.907,99.058602 L 223.7312,99.058602 C 220.7537,99.058602 218.3396,96.645502 218.3396,93.668002 L 218.3396,81.492202 C 218.3396,78.514702 220.7537,76.099602 223.7312,76.099602 z "
+         style="fill:#ce5c00" />
+      <path
+         id="rect141_3_"
+         d="M 164.5164,164.9238 L 176.6932,164.9238 C 179.6698,164.9238 182.0828,167.3369 182.0828,170.3144 L 182.0828,182.4892 C 182.0828,185.4677 179.6697,187.8818 176.6932,187.8818 L 164.5164,187.8818 C 161.5398,187.8818 159.1248,185.4677 159.1248,182.4892 L 159.1248,170.3144 C 159.1248,167.3369 161.5398,164.9238 164.5164,164.9238 z "
+         style="fill:#729fcf" />
+      <path
+         id="rect147_3_"
+         d="M 194.1248,164.9238 L 206.2996,164.9238 C 209.2781,164.9238 211.6912,167.3369 211.6912,170.3144 L 211.6912,182.4892 C 211.6912,185.4677 209.2781,187.8818 206.2996,187.8818 L 194.1248,187.8818 C 191.1463,187.8818 188.7322,185.4677 188.7322,182.4892 L 188.7322,170.3144 C 188.7322,167.3369 191.1462,164.9238 194.1248,164.9238 z "
+         style="fill:#3465a4" />
+      <path
+         id="rect159_3_"
+         d="M 223.7312,164.9238 L 235.907,164.9238 C 238.8845,164.9238 241.2976,167.3369 241.2976,170.3144 L 241.2976,182.4892 C 241.2976,185.4677 238.8845,187.8818 235.907,187.8818 L 223.7312,187.8818 C 220.7537,187.8818 218.3396,185.4677 218.3396,182.4892 L 218.3396,170.3144 C 218.3396,167.3369 220.7537,164.9238 223.7312,164.9238 z "
+         style="fill:#204a87" />
+      <path
+         id="rect168_1_"
+         d="M 164.5164,268.9414 L 176.6932,268.9414 C 179.6698,268.9414 182.0828,271.3545 182.0828,274.333 L 182.0828,286.5098 C 182.0828,289.4864 179.6697,291.9014 176.6932,291.9014 L 164.5164,291.9014 C 161.5398,291.9014 159.1248,289.4864 159.1248,286.5098 L 159.1248,274.333 C 159.1248,271.3545 161.5398,268.9414 164.5164,268.9414 z "
+         style="fill:#eeeeec" />
+      <path
+         id="rect169_1_"
+         d="M 194.1248,268.9414 L 206.2996,268.9414 C 209.2781,268.9414 211.6912,271.3545 211.6912,274.333 L 211.6912,286.5098 C 211.6912,289.4864 209.2781,291.9014 206.2996,291.9014 L 194.1248,291.9014 C 191.1463,291.9014 188.7322,289.4864 188.7322,286.5098 L 188.7322,274.333 C 188.7322,271.3545 191.1462,268.9414 194.1248,268.9414 z "
+         style="fill:#d3d7cf" />
+      <path
+         id="rect181_1_"
+         d="M 223.7312,268.9414 L 235.907,268.9414 C 238.8845,268.9414 241.2976,271.3545 241.2976,274.333 L 241.2976,286.5098 C 241.2976,289.4864 238.8845,291.9014 235.907,291.9014 L 223.7312,291.9014 C 220.7537,291.9014 218.3396,289.4864 218.3396,286.5098 L 218.3396,274.333 C 218.3396,271.3545 220.7537,268.9414 223.7312,268.9414 z "
+         style="fill:#babdb6" />
+      <path
+         id="rect171_1_"
+         d="M 194.1248,298.5488 L 206.2996,298.5488 C 209.2781,298.5488 211.6912,300.9648 211.6912,303.9404 L 211.6912,316.1162 C 211.6912,319.0947 209.2781,321.5068 206.2996,321.5068 L 194.1248,321.5068 C 191.1463,321.5068 188.7322,319.0947 188.7322,316.1162 L 188.7322,303.9404 C 188.7322,300.9648 191.1462,298.5488 194.1248,298.5488 z "
+         style="fill:#555753" />
+      <path
+         id="rect183_1_"
+         d="M 223.7312,298.5488 L 235.907,298.5488 C 238.8845,298.5488 241.2976,300.9648 241.2976,303.9404 L 241.2976,316.1162 C 241.2976,319.0947 238.8845,321.5068 235.907,321.5068 L 223.7312,321.5068 C 220.7537,321.5068 218.3396,319.0947 218.3396,316.1162 L 218.3396,303.9404 C 218.3396,300.9648 220.7537,298.5488 223.7312,298.5488 z "
+         style="fill:#2e3436" />
+      <path
+         id="rect193_1_"
+         d="M 164.5164,298.5488 L 176.6932,298.5488 C 179.6698,298.5488 182.0828,300.9648 182.0828,303.9404 L 182.0828,316.1162 C 182.0828,319.0947 179.6697,321.5068 176.6932,321.5068 L 164.5164,321.5068 C 161.5398,321.5068 159.1248,319.0947 159.1248,316.1162 L 159.1248,303.9404 C 159.1248,300.9648 161.5398,298.5488 164.5164,298.5488 z "
+         style="fill:#888a85" />
+      <path
+         id="rect301_1_"
+         d="M 164.5164,46.493202 L 176.6932,46.493202 C 179.6698,46.493202 182.0828,48.906302 182.0828,51.883802 L 182.0828,64.059602 C 182.0828,67.037102 179.6697,69.451202 176.6932,69.451202 L 164.5164,69.451202 C 161.5398,69.451202 159.1248,67.037102 159.1248,64.059602 L 159.1248,51.883802 C 159.1248,48.906302 161.5398,46.493202 164.5164,46.493202 z "
+         style="fill:#fce94f" />
+      <path
+         id="rect302_1_"
+         d="M 194.1248,46.493202 L 206.2996,46.493202 C 209.2781,46.493202 211.6912,48.906302 211.6912,51.883802 L 211.6912,64.059602 C 211.6912,67.037102 209.2781,69.451202 206.2996,69.451202 L 194.1248,69.451202 C 191.1463,69.451202 188.7322,67.037102 188.7322,64.059602 L 188.7322,51.883802 C 188.7322,48.906302 191.1462,46.493202 194.1248,46.493202 z "
+         style="fill:#edd400" />
+      <path
+         id="rect303_1_"
+         d="M 223.7312,46.493202 L 235.907,46.493202 C 238.8845,46.493202 241.2976,48.906302 241.2976,51.883802 L 241.2976,64.059602 C 241.2976,67.037102 238.8845,69.451202 235.907,69.451202 L 223.7312,69.451202 C 220.7537,69.451202 218.3396,67.037102 218.3396,64.059602 L 218.3396,51.883802 C 218.3396,48.906302 220.7537,46.493202 223.7312,46.493202 z "
+         style="fill:#c4a000" />
+      <path
+         id="rect305_1_"
+         d="M 164.5164,105.708 L 176.6932,105.708 C 179.6698,105.708 182.0828,108.1211 182.0828,111.0996 L 182.0828,123.2744 C 182.0828,126.2519 179.6697,128.666 176.6932,128.666 L 164.5164,128.666 C 161.5398,128.666 159.1248,126.2519 159.1248,123.2744 L 159.1248,111.0996 C 159.1248,108.1211 161.5398,105.708 164.5164,105.708 z "
+         style="fill:#e9b96e" />
+      <path
+         id="rect306_1_"
+         d="M 194.1248,105.708 L 206.2996,105.708 C 209.2781,105.708 211.6912,108.1211 211.6912,111.0996 L 211.6912,123.2744 C 211.6912,126.2519 209.2781,128.666 206.2996,128.666 L 194.1248,128.666 C 191.1463,128.666 188.7322,126.2519 188.7322,123.2744 L 188.7322,111.0996 C 188.7322,108.1211 191.1462,105.708 194.1248,105.708 z "
+         style="fill:#c17d11" />
+      <path
+         id="rect307_1_"
+         d="M 223.7312,105.708 L 235.907,105.708 C 238.8845,105.708 241.2976,108.1211 241.2976,111.0996 L 241.2976,123.2744 C 241.2976,126.2519 238.8845,128.666 235.907,128.666 L 223.7312,128.666 C 220.7537,128.666 218.3396,126.2519 218.3396,123.2744 L 218.3396,111.0996 C 218.3396,108.1211 220.7537,105.708 223.7312,105.708 z "
+         style="fill:#8f5902" />
+      <path
+         id="rect141_2_"
+         d="M 164.5164,194.9238 L 176.6932,194.9238 C 179.6698,194.9238 182.0828,197.3369 182.0828,200.3144 L 182.0828,212.4892 C 182.0828,215.4677 179.6697,217.8818 176.6932,217.8818 L 164.5164,217.8818 C 161.5398,217.8818 159.1248,215.4677 159.1248,212.4892 L 159.1248,200.3144 C 159.1248,197.3369 161.5398,194.9238 164.5164,194.9238 z "
+         style="fill:#ad7fa8" />
+      <path
+         id="rect147_2_"
+         d="M 194.1248,194.9238 L 206.2996,194.9238 C 209.2781,194.9238 211.6912,197.3369 211.6912,200.3144 L 211.6912,212.4892 C 211.6912,215.4677 209.2781,217.8818 206.2996,217.8818 L 194.1248,217.8818 C 191.1463,217.8818 188.7322,215.4677 188.7322,212.4892 L 188.7322,200.3144 C 188.7322,197.3369 191.1462,194.9238 194.1248,194.9238 z "
+         style="fill:#75507b" />
+      <path
+         id="rect159_2_"
+         d="M 223.7312,194.9238 L 235.907,194.9238 C 238.8845,194.9238 241.2976,197.3369 241.2976,200.3144 L 241.2976,212.4892 C 241.2976,215.4677 238.8845,217.8818 235.907,217.8818 L 223.7312,217.8818 C 220.7537,217.8818 218.3396,215.4677 218.3396,212.4892 L 218.3396,200.3144 C 218.3396,197.3369 220.7537,194.9238 223.7312,194.9238 z "
+         style="fill:#5c3566" />
+      <text
+         id="text1529"
+         x="142.30692"
+         y="178.88181"
+         style="fill:#a7a7a7;fill-opacity:1">
+        <tspan
+           x="142.30692"
+           y="178.88181"
+           font-size="8"
+           id="tspan1531"
+           style="font-size:8px" />
+      </text>
+      <text
+         id="text1533"
+         x="106.27762"
+         y="60.861805"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="106.27762"
+           y="60.861805"
+           font-size="11"
+           id="tspan1535"
+           style="font-size:11px;font-family:Trebuchet MS">Butter</tspan>
+      </text>
+      <text
+         id="text1537"
+         x="106.36356"
+         y="90.468803"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="106.36356"
+           y="90.468803"
+           font-size="11"
+           id="tspan1539"
+           style="font-size:11px;font-family:Trebuchet MS">Orange</tspan>
+      </text>
+      <text
+         id="text1541"
+         x="91.517853"
+         y="120.07671"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="91.517853"
+           y="120.07671"
+           font-size="11"
+           id="tspan1543"
+           style="font-size:11px;font-family:Trebuchet MS">Chocolate</tspan>
+      </text>
+      <text
+         id="text1545"
+         x="85.85672"
+         y="149.68359"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="85.85672"
+           y="149.68359"
+           font-size="11"
+           id="tspan1547"
+           style="font-size:11px;font-family:Trebuchet MS">Chameleon</tspan>
+      </text>
+      <text
+         id="text1549"
+         x="99.187775"
+         y="179.29199"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="99.187775"
+           y="179.29199"
+           font-size="11"
+           id="tspan1551"
+           style="font-size:11px;font-family:Trebuchet MS">Sky Blue</tspan>
+      </text>
+      <text
+         id="text1553"
+         x="142.30692"
+         y="208.88181"
+         style="fill:#a7a7a7;fill-opacity:1">
+        <tspan
+           x="142.30692"
+           y="208.88181"
+           font-size="8"
+           id="tspan1555"
+           style="font-size:8px" />
+      </text>
+      <text
+         id="text1557"
+         x="117.35818"
+         y="209.29199"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="117.35818"
+           y="209.29199"
+           font-size="11"
+           id="tspan1559"
+           style="font-size:11px;font-family:Trebuchet MS">Plum</tspan>
+      </text>
+      <text
+         id="text1561"
+         x="84.438751"
+         y="238.89841"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="84.438751"
+           y="238.89841"
+           font-size="11"
+           id="tspan1563"
+           style="font-size:11px;font-family:Trebuchet MS">Scarlet Red</tspan>
+      </text>
+      <text
+         id="text1565"
+         x="87.838654"
+         y="283.3096"
+         style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a7a7a7;fill-opacity:1;font-family:Trebuchet MS"
+         sodipodi:linespacing="100%">
+        <tspan
+           x="87.838654"
+           y="283.3096"
+           font-size="11"
+           id="tspan1567"
+           style="font-size:11px;font-family:Trebuchet MS">Aluminium</tspan>
+      </text>
+      <path
+         id="rect170_1_"
+         d="M 164.5164,224.5293 L 176.6932,224.5293 C 179.6698,224.5293 182.0828,226.9443 182.0828,229.9219 L 182.0828,242.0977 C 182.0828,245.0743 179.6697,247.4903 176.6932,247.4903 L 164.5164,247.4903 C 161.5398,247.4903 159.1248,245.0743 159.1248,242.0977 L 159.1248,229.9219 C 159.1248,226.9443 161.5398,224.5293 164.5164,224.5293 z "
+         style="fill:#ef2929" />
+      <path
+         id="rect182_1_"
+         d="M 194.1248,224.5293 L 206.2996,224.5293 C 209.2781,224.5293 211.6912,226.9443 211.6912,229.9219 L 211.6912,242.0977 C 211.6912,245.0743 209.2781,247.4903 206.2996,247.4903 L 194.1248,247.4903 C 191.1463,247.4903 188.7322,245.0743 188.7322,242.0977 L 188.7322,229.9219 C 188.7322,226.9443 191.1462,224.5293 194.1248,224.5293 z "
+         style="fill:#cc0000" />
+      <path
+         id="rect344_1_"
+         d="M 223.3259,224.5293 L 235.5007,224.5293 C 238.4782,224.5293 240.8943,226.9443 240.8943,229.9219 L 240.8943,242.0977 C 240.8943,245.0743 238.4783,247.4903 235.5007,247.4903 L 223.3259,247.4903 C 220.3484,247.4903 217.9343,245.0743 217.9343,242.0977 L 217.9343,229.9219 C 217.9343,226.9443 220.3484,224.5293 223.3259,224.5293 z "
+         style="fill:#a40000" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Helm"
+     style="display:inline">
+    <g
+       id="g4004"
+       style="display:none">
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3991);stroke-width:2.3999958;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 5.6576651,30.657018 C 5.6576651,30.657018 22.306476,25.900215 22.306476,25.900215 C 22.306476,25.900215 16.955073,32.264681 16.955073,39.399886 C 16.955073,39.399886 14.151346,39.587854 10.414468,41.778287 C 10.414468,41.778287 10.414468,30.657018 5.6576651,30.657018 z "
+         id="path2718"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path2708"
+         d="M 21.872375,35.747494 C 21.872375,35.747494 36.925182,31.709416 36.925182,31.709416 C 36.925182,31.709416 32.62438,37.16188 32.62438,43.613082 C 32.62438,43.613082 30.473979,45.763483 26.173177,45.763483 C 26.173177,45.763483 26.173177,35.747494 21.872375,35.747494 z "
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3988);stroke-width:2.3999958;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         style="opacity:1;fill:url(#linearGradient3983);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3985);stroke-width:0.79999912;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 21.872375,35.747494 C 21.872375,35.747494 36.925182,31.709416 36.925182,31.709416 C 36.925182,31.709416 32.62438,36.881889 32.62438,43.333091 C 32.62438,43.333091 30.473979,45.483491 26.173177,45.483491 C 26.173177,45.483491 26.173177,35.747494 21.872375,35.747494 z "
+         id="path2294"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path2299"
+         d="M 5.6576651,30.657018 C 5.6576651,30.657018 22.306476,25.900215 22.306476,25.900215 C 22.306476,25.900215 16.955073,32.264681 16.955073,39.399886 C 16.955073,39.399886 13.601317,39.803589 10.414468,41.778287 C 10.414468,41.778287 10.414468,30.657018 5.6576651,30.657018 z "
+         style="opacity:1;fill:url(#linearGradient3978);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3980);stroke-width:0.7999987;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4389"
+       transform="translate(-0.448808,4.129032)">
+      <path
+         sodipodi:nodetypes="csscscc"
+         id="path2624"
+         d="M 10.412862,19.248805 C 10.412862,19.248805 7.1512025,14.098814 8.3528671,10.665486 C 9.5545314,7.2321586 13.846189,7.0604922 16.24952,5.0004956 C 18.652848,2.9404993 19.167849,1.9105008 19.167849,1.9105008 C 19.167849,1.9105008 18.13785,8.4338233 16.421185,9.8071544 C 14.704522,11.180485 16.421185,14.442147 16.421185,14.442147 L 10.412862,19.248805 z "
+         style="opacity:1;fill:url(#linearGradient4232);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4234);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="czscscc"
+         id="path2852"
+         d="M 9.3513545,12.276213 C 9.3513545,11.842705 9.4177997,10.553989 10.435127,9.4584059 C 11.452454,8.3628226 12.927802,8.3746338 14.336708,7.6159931 C 15.745613,6.8573524 17.046139,5.5568258 17.046139,5.5568258 C 17.046139,5.5568258 15.745613,8.0495023 14.011577,9.0248974 C 12.27754,10.000293 11.410521,11.842705 11.410521,11.842705 L 9.3513545,12.276213 z "
+         style="opacity:1;fill:url(#linearGradient4229);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cczc"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4226);stroke-width:2.39999676;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 6.2878854,27.046841 C 15.002654,32.8994 28.020809,32.915906 36.711694,27.008522 C 39.656036,17.932466 31.788892,8.8953618 20.526971,8.8953618 C 9.1465263,8.8953618 3.8052026,19.885875 6.2878854,27.046841 z "
+         id="path2641" />
+      <path
+         sodipodi:nodetypes="cczc"
+         id="path2264"
+         d="M 6.2878854,27.046841 C 15.002654,32.8994 28.020809,32.915906 36.711694,27.008522 C 39.656036,17.932466 31.107555,8.8953618 20.526971,8.8953618 C 9.2353337,8.8953618 3.8052026,19.885875 6.2878854,27.046841 z "
+         style="opacity:1;fill:url(#radialGradient4221);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4223);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4238);stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 4.9315713,24.988506 C 4.9315713,24.988506 6.7707928,29.893099 21.484574,29.893099 C 36.198355,29.893099 38.037578,24.988506 38.037578,24.988506 C 38.037578,24.988506 39.244426,25.882718 39.244426,27.120155 C 39.244426,27.120155 39.263726,32.345397 39.263726,32.345397 C 39.263726,32.345397 36.198355,37.24999 21.484574,37.24999 C 6.7707928,37.24999 3.7054225,32.345397 3.7054225,32.345397 C 3.7054225,32.345397 3.7123106,27.14035 3.7123106,27.14035 C 3.7123106,25.593554 4.9315713,24.988506 4.9315713,24.988506 z "
+         id="path4236"
+         sodipodi:nodetypes="czcscscsc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:url(#radialGradient4150);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path3337"
+         sodipodi:cx="15.820516"
+         sodipodi:cy="20.979118"
+         sodipodi:rx="0.84002739"
+         sodipodi:ry="0.77002507"
+         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
+         transform="matrix(1.495931,0,0,1.495931,-14.89071,-7.207778)" />
+      <path
+         transform="matrix(1.495931,0,0,1.495931,-14.12856,-12.69531)"
+         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
+         sodipodi:ry="0.77002507"
+         sodipodi:rx="0.84002739"
+         sodipodi:cy="20.979118"
+         sodipodi:cx="15.820516"
+         id="path3339"
+         style="opacity:1;fill:url(#radialGradient4154);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="czcscscsc"
+         id="path2271"
+         d="M 4.9315713,24.988506 C 4.9315713,24.988506 6.7707928,29.893099 21.484574,29.893099 C 36.198355,29.893099 38.037578,24.988506 38.037578,24.988506 C 38.037578,24.988506 39.244426,25.882718 39.244426,27.120155 C 39.244426,27.120155 39.263726,32.345397 39.263726,32.345397 C 39.263726,32.345397 36.198355,37.24999 21.484574,37.24999 C 6.7707928,37.24999 3.7054225,32.345397 3.7054225,32.345397 C 3.7054225,32.345397 3.7123106,27.14035 3.7123106,27.14035 C 3.7123106,25.593554 4.9315713,24.988506 4.9315713,24.988506 z "
+         style="opacity:1;fill:url(#radialGradient4211);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4213);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="matrix(1.093101,-0.292896,0.292896,1.093101,-6.218654,10.58132)"
+         d="M 34 17 A 4 5 0 1 1  26,17 A 4 5 0 1 1  34 17 z"
+         sodipodi:ry="5"
+         sodipodi:rx="4"
+         sodipodi:cy="17"
+         sodipodi:cx="30"
+         id="path2626"
+         style="opacity:1;fill:url(#linearGradient4160);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4162);stroke-width:0.5189293;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="ccsccc"
+         id="path2831"
+         d="M 29.623023,21.222634 C 28.593441,22.577351 27.590541,21.797393 27.590541,21.797393 C 28.475104,24.665098 30.689201,26.182235 33.033249,25.554148 C 34.106395,25.266597 34.901224,24.758385 35.447228,23.751569 L 35.485546,23.023541 L 29.623023,21.222634 z "
+         style="opacity:1;fill:url(#linearGradient4207);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="csscssss"
+         id="path2628"
+         d="M 30.100108,17.518382 C 31.131895,15.758277 34.219994,15.6834 35.805273,14.362334 C 37.990226,12.541536 38.051498,10.868058 39.924157,9.6282615 C 41.961066,8.2797255 46.843187,7.4433055 46.843187,7.4433055 C 46.843187,7.4433055 43.687138,9.7496487 42.351886,12.298764 C 41.016637,14.847878 41.75321,17.518384 39.568253,19.94611 C 37.592492,22.141399 34.285586,24.197637 32.770611,23.951864 C 29.071823,23.351811 29.068324,19.278485 30.100108,17.518382 z "
+         style="opacity:1;fill:url(#linearGradient4202);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4204);stroke-width:0.79999894;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="czzczzzz"
+         id="path2526"
+         d="M 31.679181,17.97931 C 32.574418,17.030401 35.093585,16.422001 36.463532,15.479212 C 37.83348,14.536425 38.720706,11.956413 40.132426,10.774594 C 41.565039,9.5752793 42.924313,9.4393424 42.924313,9.4393424 C 42.924313,9.4393424 41.913297,9.8428291 40.860744,11.260138 C 39.80819,12.67745 40.044439,14.98513 37.899342,17.192086 C 35.754247,19.399041 33.239502,20.515698 32.129172,20.485509 C 31.018843,20.455318 30.783944,18.928219 31.679181,17.97931 z "
+         style="opacity:1;fill:url(#linearGradient4199);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58725345;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="czczcc"
+         id="path2787"
+         d="M 8.9286277,32.901666 C 8.9286277,32.901666 7.4127364,10.037287 18.159512,7.9560372 C 28.885553,5.8788029 32.237595,12.284458 32.237595,12.284458 C 32.237595,12.284458 27.046509,7.2547492 19.96025,9.3804843 C 12.799145,11.528672 12.463056,28.197511 12.463056,28.197511 C 10.619177,29.119452 8.9286277,32.901666 8.9286277,32.901666 z "
+         style="opacity:1;fill:url(#linearGradient4194);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4196);stroke-width:0.59999919;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccscsz"
+         id="path2809"
+         d="M 9.5681082,29.724949 C 9.5681082,29.724949 11.410521,27.557404 11.410521,27.557404 C 11.410521,27.557404 11.729076,15.804241 15.439075,11.644545 C 19.015524,7.6345878 20.276605,8.2662566 20.276605,8.2662566 C 20.276605,8.2662566 14.807405,7.649992 11.844032,14.877267 C 10.429273,18.327671 9.5042981,25.416711 9.5681082,29.724949 z "
+         style="opacity:1;fill:url(#linearGradient4191);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:8;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         transform="matrix(1.495931,0,0,1.495931,-8.549852,-5.48321)"
+         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
+         sodipodi:ry="0.77002507"
+         sodipodi:rx="0.84002739"
+         sodipodi:cy="20.979118"
+         sodipodi:cx="15.820516"
+         id="path3325"
+         style="opacity:1;fill:url(#radialGradient4178);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="opacity:1;fill:url(#radialGradient4180);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.58700001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path3329"
+         sodipodi:cx="15.820516"
+         sodipodi:cy="20.979118"
+         sodipodi:rx="0.84002739"
+         sodipodi:ry="0.77002507"
+         d="M 16.660543 20.979118 A 0.84002739 0.77002507 0 1 1  14.980488,20.979118 A 0.84002739 0.77002507 0 1 1  16.660543 20.979118 z"
+         transform="matrix(1.495931,0,0,1.495931,-7.787695,-10.97075)" />
+    </g>
+  </g>
+</svg>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8fe61ce3c..51c6f8e05 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,9 +8,11 @@ thunar-vfs/thunar-vfs-interactive-job.c
 thunar-vfs/thunar-vfs-job.c
 thunar-vfs/thunar-vfs-link-job.c
 thunar-vfs/thunar-vfs-listdir-job.c
+thunar-vfs/thunar-vfs-mime-action.c
 thunar-vfs/thunar-vfs-mime-application.c
 thunar-vfs/thunar-vfs-mime-cache.c
 thunar-vfs/thunar-vfs-mime-database.c
+thunar-vfs/thunar-vfs-mime-handler.c
 thunar-vfs/thunar-vfs-mime-info.c
 thunar-vfs/thunar-vfs-mime-legacy.c
 thunar-vfs/thunar-vfs-mime-parser.c
@@ -58,7 +60,6 @@ thunar/thunar-location-dialog.c
 thunar/thunar-location-entry.c
 thunar/thunar-metafile.c
 thunar/thunar-navigator.c
-thunar/thunar-open-with-action.c
 thunar/thunar-path-entry.c
 thunar/thunar-permissions-chooser.c
 thunar/thunar-preferences-dialog.c
diff --git a/po/Thunar.pot b/po/Thunar.pot
index b72cd59e6..1fe2c2d65 100644
--- a/po/Thunar.pot
+++ b/po/Thunar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\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"
@@ -127,11 +127,44 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr ""
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+msgid "Command"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+msgid "Icon"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -150,7 +183,7 @@ msgstr ""
 msgid "URI too long to fit into buffer"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr ""
 
@@ -361,7 +394,7 @@ msgstr ""
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
 #, c-format
-msgid "Failed to set default application for `%s'"
+msgid "Failed to set default application for \"%s\""
 msgstr ""
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -380,8 +413,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr ""
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr ""
 
@@ -398,13 +430,13 @@ msgstr ""
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
 #, c-format
-msgid "Failed to add new application `%s'"
+msgid "Failed to add new application \"%s\""
 msgstr ""
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
 #, c-format
-msgid "Failed to execute `%s'"
+msgid "Failed to execute \"%s\""
 msgstr ""
 
 #. update the header label
@@ -461,7 +493,7 @@ msgstr ""
 msgid "There is nothing on the clipboard to paste"
 msgstr ""
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr ""
 
@@ -471,31 +503,27 @@ msgstr ""
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr ""
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr ""
 
@@ -519,8 +547,7 @@ msgid "_Link here"
 msgstr ""
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr ""
@@ -529,7 +556,7 @@ msgstr ""
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr ""
 
@@ -556,121 +583,198 @@ msgstr ""
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr ""
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+msgid "Open the selected files"
 msgstr ""
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:377
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+msgid "Open With Other _Application..."
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+msgid "Choose a program with which to open the selected file"
+msgstr ""
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, c-format
+msgid "Failed to execute file \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:591
 #, c-format
-msgid "Unable to open \"%s\"."
+msgid "Failed to open file \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:382
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
 #, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:490
+#: ../thunar/thunar-launcher.c:635
+#, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:639
 #, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:549
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:751
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr ""
 
+#: ../thunar/thunar-launcher.c:801
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] ""
+msgstr[1] ""
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, c-format
+msgid "_Open With \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:831
+msgid "_Open With Other Application..."
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:840
+msgid "_Open With Default Applications"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:894
+#, c-format
+msgid "Open With \"%s\""
+msgstr ""
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr ""
@@ -727,21 +831,11 @@ msgstr ""
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr ""
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr ""
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr ""
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr ""
@@ -1144,151 +1238,151 @@ msgstr ""
 msgid "Failed to unmount \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Properties..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "_Rename..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr ""
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr ""
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File..."
 msgstr ""
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr ""
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1299,48 +1393,48 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr ""
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, c-format
 msgid "Rename \"%s\""
 msgstr ""
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] ""
@@ -1356,226 +1450,226 @@ msgstr ""
 msgid "_Empty File"
 msgstr ""
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr ""
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr ""
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr ""
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr ""
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr ""
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "Reload the current folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr ""
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr ""
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "Go to the home folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "Go to the templates folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr ""
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr ""
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "St_atusbar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr ""
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 msgid "Failed to open parent folder"
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr ""
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1585,21 +1679,21 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 msgid "Failed to open templates folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 7a5d7c2fb..8d512cd74 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-01-29 15:14+0900\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -141,11 +141,46 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "No s'ha pogut suprimr `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "Impossible de carregar el programa des del fitxer %s"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+#, fuzzy
+msgid "Command"
+msgstr "_Ordre:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "_Icona:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Nom"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -164,7 +199,7 @@ msgstr "El camí és massa llarg per caber a la memòria intermèdia"
 msgid "URI too long to fit into buffer"
 msgstr "La URI és massa llarg per caber a la memòria intermèdia"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Mida"
 
@@ -379,8 +414,8 @@ msgstr "S'estan creant els directoris..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "No s'ha pogut establir l'aplicació per defecte per `%s'"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -401,8 +436,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "Altres Aplicacions..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Obre amb"
 
@@ -418,14 +452,14 @@ msgstr "_Navega"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "No s'ha pogut afegir una nova apliació `%s'"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "No s'ha pogut executar `%s'"
 
 #. update the header label
@@ -482,7 +516,7 @@ msgstr "Altres aplicacions:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "El portaretalls no té res per enganxar"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Introduïu el nom nou:"
 
@@ -492,31 +526,27 @@ msgstr "Introduïu el nom nou:"
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr "converteix"
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Nom"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Tipus"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Data modificada"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Llistat detallat de directoris"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Mostra detalls"
 
@@ -540,8 +570,7 @@ msgid "_Link here"
 msgstr "_Enllaça aquí"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "No s'ha pogut executar el fitxer `%s'"
@@ -550,7 +579,7 @@ msgstr "No s'ha pogut executar el fitxer `%s'"
 msgid "The root folder has no parent"
 msgstr "La carpeta arrel no té pare"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr "Sistema de fitxers"
 
@@ -579,133 +608,217 @@ msgstr ""
 "No s'ha pogut carregar l'icona de recanvi de `%s' (%s). Reviseu la vostra "
 "instal·lació"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "Or_ganitza els elements"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Ordena per _nom"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "Manté els elements ordenats en columnes segons el nom"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Ordena per mida"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 #, fuzzy
 msgid "Keep items sorted by their size in rows"
 msgstr "elements mida in files"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 #, fuzzy
 msgid "Sort By _Type"
 msgstr "Ordena Tipus"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 #, fuzzy
 msgid "Keep items sorted by their type in rows"
 msgstr "elements tipus in files"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 #, fuzzy
 msgid "Sort By Modification _Date"
 msgstr "Ordena Data"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 #, fuzzy
 msgid "Keep items sorted by their modification date in rows"
 msgstr "elements in files"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Ascendent"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 #, fuzzy
 msgid "Sort items in ascending order"
 msgstr "Ordena elements in"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_Descendent"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 #, fuzzy
 msgid "Sort items in descending order"
 msgstr "Ordena elements in"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 #, fuzzy
 msgid "Icon based directory listing"
 msgstr "Icona"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 #, fuzzy
 msgid "Icon view"
 msgstr "Icona"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Obre"
 
-#: ../thunar/thunar-launcher.c:219
+#: ../thunar/thunar-launcher.c:119
 #, fuzzy
-msgid "Open the selected items"
+msgid "Open the selected files"
 msgstr "Obre seleccionat elements"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Obre-ho en una nova finestra"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 #, fuzzy
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Obre seleccionat in nou finestres"
 
-#: ../thunar/thunar-launcher.c:377
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Altres Aplicació."
+
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "primer seleccionat fitxer"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
 #, fuzzy, c-format
-msgid "Unable to open \"%s\"."
-msgstr "obre."
+msgid "Failed to execute file \"%s\""
+msgstr "No s'ha pogut executar `%s'"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Ha fallat"
 
-#: ../thunar/thunar-launcher.c:382
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
 #, fuzzy, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "obre fitxer."
 msgstr[1] "obre fitxer."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 #, fuzzy
 msgid "Are you sure you want to open all folders?"
 msgstr "obre tot?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Açò obrirà %d finestra distinta."
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Obre en una finestra nova"
+msgstr[1] ""
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Obre en una finestra nova"
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Obre seleccionat in nou finestres"
+msgstr[1] "Obre seleccionat in nou finestres"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Obre seleccionat elements"
+msgstr[1] "Obre seleccionat elements"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Executa"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Retalla seleccionat"
+msgstr[1] "Retalla seleccionat"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Obre amb"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Suprimeix seleccionat"
+msgstr[1] "Suprimeix seleccionat"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "Altres Aplicacions..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Altres aplicacions:"
+
+#: ../thunar/thunar-launcher.c:841
+#, fuzzy
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] "seleccionat"
+msgstr[1] "seleccionat"
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Obre amb"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 #, fuzzy
 msgid "broken link"
@@ -764,22 +877,11 @@ msgstr "Obre la ubicació"
 msgid "_Location:"
 msgstr "_Ubicació:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Ha fallat"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, fuzzy, c-format
-msgid "%s (default)"
-msgstr "per defecte"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-#, fuzzy
-msgid "Other Application..."
-msgstr "Altres Aplicació."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Mida d'icona"
@@ -1228,180 +1330,180 @@ msgstr "Ha fallat"
 msgid "Failed to unmount \"%s\""
 msgstr "Ha fallat"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "File Context Menu"
 msgstr "Fitxer Context Menú"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "Carpeta Context Menú"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "Create _Folder..."
 msgstr "Crea Carpeta."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "Create an empty folder within the current folder"
 msgstr "Crea"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Visualització propietats de seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "_Copy Files"
 msgstr "Copia Fitxers"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Copia seleccionat"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Fitxers"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Retalla seleccionat"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Enganxa Fitxers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Suprimeix Fitxers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Suprimeix seleccionat"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Enganxa Fitxers Carpeta"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Paste files into the selected folder"
 msgstr "Enganxa seleccionat"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Selecciona tot Fitxers"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select all files in this window"
 msgstr "Selecciona tot in finestra"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Selecciona Patró."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona tot a"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 #, fuzzy
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Fitxer"
 msgstr[1] "Fitxer"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Duplicat seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 #, fuzzy
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crea un _enllaç"
 msgstr[1] "Crea un _enllaç"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 #, fuzzy
 msgid "Create a symbolic link for each selected file"
 msgstr "Crea a enllaç per seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Reanomena"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "Canvia el nom seleccionat fitxer"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 #, fuzzy
 msgid "Create _Document"
 msgstr "Crea Acció"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "S'estan carregant els continguts de la carpeta..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nou Carpeta."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder"
 msgstr "Nova carpeta"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder..."
 msgstr "Nou Carpeta."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "suprimeix?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1412,52 +1514,52 @@ msgid_plural ""
 msgstr[0] "seleccionat fitxer?"
 msgstr[1] "seleccionat fitxer?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 #, fuzzy
 msgid "If you delete a file, it is permanently lost."
 msgstr "Si suprimeix a fitxer és."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Selecciona Patró"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Patró:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "_Reanomena"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Ha fallat"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Ha fallat obre"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Copia Fitxer"
 msgstr[1] "Copia Fitxer"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Fitxer"
 msgstr[1] "Fitxer"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1475,248 +1577,248 @@ msgstr ""
 msgid "_Empty File"
 msgstr "Copia Fitxer"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Fitxers"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Obre una nova _finestra"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 #, fuzzy
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Obre a nou finestra per"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "Ta_nca totes les finestres"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 #, fuzzy
 msgid "Close all Thunar windows"
 msgstr "Tanca tot finestres"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Tanca"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Tanca aquesta finestra"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Edita"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr "Pr_efercències"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Edita preferències Thunar"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Visualitza"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Obre la carpeta pare"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Ubicació"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "Barres lateral_s"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Vés"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "Obre el _pare"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Obre la carpeta pare"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "_Home"
 msgstr "_Inici"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Obre inici"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Vés a la carpeta visitada posteriorment"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "Obre una _ubicació..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Indiqueu una ubicació a obrir"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_Quant a"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 #, fuzzy
 msgid "Display information about Thunar"
 msgstr "Pantalla quant a"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostra els fitxers _ocults"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 #, fuzzy
 msgid "Toggles the display of hidden files in the current window"
 msgstr "de in finestra"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "St_atusbar"
 msgstr "text"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 #, fuzzy
 msgid "_Shortcuts"
 msgstr "Dreceres"
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "Amagad_a"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Estil"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 #, fuzzy
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "amb"
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Estil"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 #, fuzzy
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Tradicional amb i"
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr "No mostris cap selector d'ubicació"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Visualitza com a _icones"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 #, fuzzy
 msgid "Display folder content in an icon view"
 msgstr "Pantalla in icona"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 #, fuzzy
 msgid "View as _Detailed List"
 msgstr "Visualització Llista"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 #, fuzzy
 msgid "Display folder content in a detailed list view"
 msgstr "Pantalla in a llista"
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Ha fallat obre pare"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Ha fallat obre inici"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1726,24 +1828,24 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 #, fuzzy
 msgid "Do _not display this message again"
 msgstr "no"
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Ha fallat obre pare"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 #, fuzzy
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr "és a i fitxer Escriptori."
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr ""
 "Softcatalà <tradgnome@softcatala.org>\n"
@@ -2077,6 +2179,14 @@ msgstr "Gestor de fitxers"
 msgid "Thunar File Manager"
 msgstr "Gestor de fitxers Thunar"
 
+#, fuzzy
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "obre."
+
+#, fuzzy
+#~ msgid "%s (default)"
+#~ msgstr "per defecte"
+
 #, fuzzy
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Mostra els fitxers ocults i de _còpia de seguretat"
diff --git a/po/de.po b/po/de.po
index ea86667af..815d6e4db 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
-"PO-Revision-Date: 2006-02-01 20:10+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
+"PO-Revision-Date: 2006-02-05 23:10+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -62,15 +62,20 @@ msgstr "Andere Anwendung..."
 msgid ""
 "The file `%s' already exists. Do you want to replace it with an empty file?"
 msgstr ""
+"Die Datei »%s« existiert bereits. Wollen Sie die Datei durch eine leere "
+"Datei ersetzen?"
 
 #. ask the user whether to skip this path
 #: ../thunar-vfs/thunar-vfs-creat-job.c:199
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to remove `%s'.\n"
 "\n"
 "Do you want to skip it?"
-msgstr "Konnte `%s' nicht löschen: %s"
+msgstr ""
+"Konnte »%s« nicht löschen.\n"
+"\n"
+"Wollen Sie diese überspringen?"
 
 #. ask the user whether to skip this path
 #: ../thunar-vfs/thunar-vfs-creat-job.c:216
@@ -80,6 +85,9 @@ msgid ""
 "\n"
 "Do you want to skip it?"
 msgstr ""
+"Konnte leere Datei »%s« nicht erstellen.\n"
+"\n"
+"Wollen Sie diese überspringen?"
 
 #. TRANSLATORS: `Exec' is a field name in a .desktop file. You should leave it as-is.
 #: ../thunar-vfs/thunar-vfs-info.c:374
@@ -123,13 +131,46 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-link-job.c:200
 #, c-format
 msgid "Failed to remove `%s': %s"
-msgstr ""
+msgstr "Konnte Datei »%s« nicht entfernen: %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr ""
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+msgid "Command"
+msgstr "Befehl"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+msgid "Icon"
+msgstr "Symbol"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Name"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -138,7 +179,7 @@ msgstr "%s Dokument"
 #: ../thunar-vfs/thunar-vfs-mkdir-job.c:165
 #, c-format
 msgid "Unable to create directory `%s': %s"
-msgstr "Konnte Verzeichnis `%s' nicht erstellen: %s"
+msgstr "Konnte Verzeichnis »%s« nicht erstellen: %s"
 
 #: ../thunar-vfs/thunar-vfs-path.c:657
 msgid "Path too long to fit into buffer"
@@ -148,7 +189,7 @@ msgstr ""
 msgid "URI too long to fit into buffer"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Größe"
 
@@ -164,13 +205,13 @@ msgstr "Verzeichnisse werden gelöscht..."
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:349
 #, c-format
 msgid "Unable to remove directory `%s': %s"
-msgstr "Konnte Verzeichnis `%s' nicht löschen: %s"
+msgstr "Konnte Verzeichnis »%s« nicht löschen: %s"
 
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:627
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:680
 #, c-format
 msgid "Unable to remove `%s': %s"
-msgstr "Konnte `%s' nicht löschen: %s"
+msgstr "Konnte Datei »%s« nicht löschen: %s"
 
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:873
 msgid "Cannot transfer the root directory"
@@ -179,7 +220,7 @@ msgstr "Das Wurzelverzeichnis kann nicht verschoben oder kopiert werden"
 #. tell the user that we're preparing the unlink job
 #: ../thunar-vfs/thunar-vfs-unlink-job.c:162
 msgid "Preparing..."
-msgstr ""
+msgstr "Vorbereiten..."
 
 #: ../thunar-vfs/thunar-vfs-unlink-job.c:235
 #, c-format
@@ -196,13 +237,12 @@ msgstr "Ungültiger Pfad"
 #: ../thunar-vfs/thunar-vfs-util.c:104
 #, c-format
 msgid "Unknown user `%s'"
-msgstr "Unbekannter Benutzer `%s'"
+msgstr "Unbekannter Benutzer »%s«"
 
 #. no useful information, *narf*
 #: ../thunar-vfs/thunar-vfs-volume-bsd.c:303
-#, fuzzy
 msgid "Unknown error"
-msgstr "Unbekannt"
+msgstr "Unbekannter Fehler"
 
 #: ../thunar-vfs/thunar-vfs-xfer.c:157
 #, c-format
@@ -254,7 +294,7 @@ msgstr[1] ""
 #: ../thunar-vfs/thunar-vfs-xfer.c:263
 #, c-format
 msgid "Failed to create directory `%s'"
-msgstr "Konnte Verzeichnis `%s' nicht erstellen"
+msgstr "Verzeichnis »%s« konnte nicht erstellt werden"
 
 #. TRANSLATORS: FIFO is an acronym for First In, First Out. You can replace the word with `pipe'.
 #: ../thunar-vfs/thunar-vfs-xfer.c:287
@@ -265,12 +305,12 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-xfer.c:319
 #, c-format
 msgid "Failed to open `%s' for reading"
-msgstr "Konnte `%s' nicht zum Lesen öffnen"
+msgstr "Die Datei »%s« konnte nicht zum Lesen geöffnet werden"
 
 #: ../thunar-vfs/thunar-vfs-xfer.c:331
 #, c-format
 msgid "Failed to open `%s' for writing"
-msgstr "Konnte `%s' nicht zum Schreiben öffnen"
+msgstr "Die Datei »%s« konnte nicht zum Schreiben geöffnet werden"
 
 #: ../thunar-vfs/thunar-vfs-xfer.c:350
 #, c-format
@@ -285,7 +325,7 @@ msgstr ""
 #: ../thunar-vfs/thunar-vfs-xfer.c:385
 #, c-format
 msgid "Failed to remove `%s'"
-msgstr "Konnte `%s' nicht löschen"
+msgstr "Die Datei »%s« konnte nicht gelöscht werden"
 
 #. tell the caller that the job was cancelled
 #: ../thunar-vfs/thunar-vfs-xfer.c:390
@@ -295,12 +335,12 @@ msgstr "Operation abgebrochen"
 #: ../thunar-vfs/thunar-vfs-xfer.c:430
 #, c-format
 msgid "Failed to read link target from `%s'"
-msgstr ""
+msgstr "Das Ziel der Verknüpfung »%s« konnte nicht bestimmt werden"
 
 #: ../thunar-vfs/thunar-vfs-xfer.c:438
 #, c-format
 msgid "Failed to create symbolic link `%s'"
-msgstr ""
+msgstr "Die Verknüpfung »%s« konnte nicht erstellt werden"
 
 #: ../thunar-vfs/thunar-vfs-xfer.c:446
 #, c-format
@@ -360,8 +400,8 @@ msgstr "Erstelle Verzeichnisse..."
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
 #, c-format
-msgid "Failed to set default application for `%s'"
-msgstr "Konnte Standardanwendung für `%s' nicht setzen"
+msgid "Failed to set default application for \"%s\""
+msgstr "Die Standardanwendung für »%s« konnte nicht gesetzt werden"
 
 #: ../thunar/thunar-chooser-button.c:367
 msgid "No application selected"
@@ -379,15 +419,14 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "_Andere Anwendung..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
-msgstr ""
+msgstr "Öffnen Mit"
 
 #. create the "Custom command" expand
 #: ../thunar/thunar-chooser-dialog.c:266
 msgid "Use a _custom command:"
-msgstr ""
+msgstr "Einen _benutzerdefinierten Befehl benutzen:"
 
 #. create the "Custom command" button
 #: ../thunar/thunar-chooser-dialog.c:284
@@ -396,21 +435,21 @@ msgstr "_Durchsuchen"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, fuzzy, c-format
-msgid "Failed to add new application `%s'"
-msgstr "Andere Anwendung..."
+#, c-format
+msgid "Failed to add new application \"%s\""
+msgstr "Die Anwendung »%s« konnte nicht hinzugefügt werden"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
 #, c-format
-msgid "Failed to execute `%s'"
-msgstr ""
+msgid "Failed to execute \"%s\""
+msgstr "Die Datei »%s« konnte nicht ausgeführt werden"
 
 #. update the header label
 #: ../thunar/thunar-chooser-dialog.c:613
 #, c-format
 msgid "Open <i>%s</i> and other files of type \"%s\" with:"
-msgstr ""
+msgstr "<i>%s</i> und andere Dateien vom Typ »%s« öffnen mit:"
 
 #: ../thunar/thunar-chooser-dialog.c:635 ../thunar-uca/thunar-uca-editor.c:491
 #, fuzzy
@@ -444,7 +483,7 @@ msgstr "Shell Skripte"
 
 #: ../thunar/thunar-chooser-model.c:334
 msgid "None available"
-msgstr ""
+msgstr "Keine verfügbar"
 
 #. append the "Recommended Applications:" category
 #: ../thunar/thunar-chooser-model.c:378
@@ -461,7 +500,7 @@ msgstr "Andere Anwendungen:"
 msgid "There is nothing on the clipboard to paste"
 msgstr ""
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Neuen Namen eingeben:"
 
@@ -470,32 +509,30 @@ msgstr "Neuen Namen eingeben:"
 #, c-format
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
-
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Name"
+"Der Dateiname »%s« kann nicht in den Dateisystem Zeichensatz umgewandelt "
+"werden"
 
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Typ"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Letzte Änderung"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Detailierte Verzeichnisansicht"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Detailansicht"
 
@@ -504,7 +541,7 @@ msgstr "Detailansicht"
 #: ../thunar-uca/thunar-uca-provider.c:329
 #, c-format
 msgid "%s."
-msgstr ""
+msgstr "%s."
 
 #: ../thunar/thunar-dnd.c:62
 msgid "_Copy here"
@@ -519,18 +556,16 @@ msgid "_Link here"
 msgstr "Hierher verknü_pfen"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
-msgstr ""
+msgstr "Die Datei »%s« konnte nicht ausgeführt werden"
 
 #: ../thunar/thunar-file.c:722
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1016
-#, fuzzy
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr "Dateisystem"
 
@@ -541,7 +576,7 @@ msgstr "Zurück"
 
 #: ../thunar/thunar-history.c:178
 msgid "Go to the previous visited folder"
-msgstr ""
+msgstr "Zum vorher besuchten Ort gehen"
 
 #. create the "forward" action
 #: ../thunar/thunar-history.c:183
@@ -550,167 +585,246 @@ msgstr "Vorwärts"
 
 #: ../thunar/thunar-history.c:183
 msgid "Go to the next visited folder"
-msgstr ""
+msgstr "Zum als nächstes besuchten Ort gehen"
 
 #: ../thunar/thunar-icon-factory.c:668
 #, c-format
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "An_ordnen"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Nach _Name sortieren"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
-msgstr ""
+msgstr "Symbole nach Name in Zeilen sortieren"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Nach _Größe sortieren"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
-msgstr ""
+msgstr "Symbole nach Größe in Zeilen sortieren"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Nach Dateit_typ sortieren"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
-msgstr ""
+msgstr "Symbole nach Typ in Zeilen sortieren"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Nach Än_derungsdatum sortieren"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
-msgstr ""
+msgstr "Symbole nach Änderungsdatum in Zeilen sortieren"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Absteigend"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
-msgstr ""
+msgstr "Symbole in absteigender Richtung sortieren"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "A_ufsteigend"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
-msgstr ""
+msgstr "Symbole in aufsteigender Richtung sortieren"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
-msgstr ""
+msgstr "Symbolansicht"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
-msgstr ""
+#: ../thunar/thunar-launcher.c:119
+msgid "Open the selected files"
+msgstr "Die ausgewählten Dateien öffnen"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "In neuem Fenster öffnen"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
+msgstr "Die ausgewählten Verzeichnisse in neuen Thunar Fenstern öffnen"
+
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+msgid "Open With Other _Application..."
+msgstr "Mit _anderer Anwendung öffnen..."
+
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
 msgstr ""
+"Eine andere Anwendung wählen, mit der die ausgewählte Datei geöffnet werden "
+"soll"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
+#: ../thunar/thunar-launcher.c:122
+msgid "Choose a program with which to open the selected file"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:382
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
 #, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to execute file \"%s\""
+msgstr "Konnte »%s« nicht umbenennen"
+
+#: ../thunar/thunar-launcher.c:591
+#, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Konnte »%s« nicht umbenennen"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
+msgstr[0] "%d Datei konnte nicht geöffnet werden"
+msgstr[1] "%d Dateien konnten nicht geöffnet werden"
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:490
+#: ../thunar/thunar-launcher.c:635
 #, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "%d neues Fenster öffnen"
+msgstr[1] "%d neue Fenster öffnen"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
+msgstr[0] "In %d neuem Fenster öffnen"
+msgstr[1] "In %d neuen Fenstern öffnen"
+
+#: ../thunar/thunar-launcher.c:734
+#, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:751
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Ausführen"
 
+#: ../thunar/thunar-launcher.c:801
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Die ausgewählte Datei ausführen"
+msgstr[1] "Die ausgewählten Dateien ausführen"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, c-format
+msgid "_Open With \"%s\""
+msgstr "Mit »%s« ö_ffnen"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "»%s« verwendem, um die ausgewählte Datei zu öffnen"
+msgstr[1] "»%s« verwenden, um die ausgewählten Dateien zu öffnen"
+
+#: ../thunar/thunar-launcher.c:831
+msgid "_Open With Other Application..."
+msgstr "Mit _anderer Anwendung öffnen..."
+
+#: ../thunar/thunar-launcher.c:840
+msgid "_Open With Default Applications"
+msgstr "Mit der Standardanwendung ö_ffnen"
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] "Die ausgewählte Datei mit der Standardanwendung öffnen"
+msgstr[1] "Die ausgewählten Dateien mit den Standardanwendungen öffnen"
+
+#: ../thunar/thunar-launcher.c:894
+#, c-format
+msgid "Open With \"%s\""
+msgstr "Mit »%s« öffnen"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
-msgstr ""
+msgstr "Verknüpfung (fehlerhaft)"
 
 #: ../thunar/thunar-list-model.c:1998
 #, c-format
 msgid "%d item, Free space: %s"
 msgid_plural "%d items, Free space: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Objekt, Freier Speicher: %s"
+msgstr[1] "%d Objekte, Freier Speicher: %s"
 
 #: ../thunar/thunar-list-model.c:2003
 #, c-format
 msgid "%d item"
 msgid_plural "%d items"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Objekt"
+msgstr[1] "%d Objekte"
 
 #: ../thunar/thunar-list-model.c:2019
 #, c-format
 msgid "\"%s\" broken link"
-msgstr ""
+msgstr "»%s« Verknüpfung (fehlerhaft)"
 
 #: ../thunar/thunar-list-model.c:2023
 #, c-format
 msgid "\"%s\" (%s) link to %s"
-msgstr ""
+msgstr "»%s« (%s) Verknüpfung mit %s"
 
 #: ../thunar/thunar-list-model.c:2028
 #, c-format
 msgid "\"%s\" (%s) %s"
-msgstr ""
+msgstr "»%s« (%s) %s"
 
 #: ../thunar/thunar-list-model.c:2045 ../thunar/thunar-list-model.c:2050
 #, c-format
 msgid "%d item selected"
 msgid_plural "%d items selected (%s)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d Objekt ausgewählt"
+msgstr[1] "%d Objekte ausgewählt (%s)"
 
 #: ../thunar/thunar-location-buttons.c:283
 msgid "Spacing"
@@ -722,26 +836,16 @@ msgstr ""
 
 #: ../thunar/thunar-location-dialog.c:102
 msgid "Open Location"
-msgstr ""
+msgstr "Ort öffnen"
 
 #: ../thunar/thunar-location-dialog.c:116
 msgid "_Location:"
-msgstr ""
-
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
-#, fuzzy, c-format
-msgid "Failed to launch `%s'"
-msgstr "Andere Anwendung..."
+msgstr "_Ort:"
 
-#: ../thunar/thunar-open-with-action.c:351
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, c-format
-msgid "%s (default)"
-msgstr "%s (Standard)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Andere Anwendung..."
+msgid "Failed to launch `%s'"
+msgstr "Konnte »%s« nicht ausführen"
 
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
@@ -848,7 +952,7 @@ msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:633
 msgid "Do _not ask me again"
-msgstr ""
+msgstr "In Zukunft _nicht mehr nachfragen"
 
 #: ../thunar/thunar-permissions-chooser.c:634
 msgid ""
@@ -876,11 +980,11 @@ msgstr ""
 
 #: ../thunar/thunar-permissions-chooser.c:1077
 msgid "Correct folder permissions automatically?"
-msgstr ""
+msgstr "Verzeichnisrechte automatisch korrigieren?"
 
 #: ../thunar/thunar-permissions-chooser.c:1079
 msgid "Correct folder permissions"
-msgstr ""
+msgstr "Verzeichnisrechte korrigieren"
 
 #: ../thunar/thunar-permissions-chooser.c:1081
 msgid ""
@@ -931,7 +1035,7 @@ msgstr ""
 #: ../thunar/thunar-preferences-dialog.c:230
 #: ../thunar/thunar-preferences-dialog.c:266
 msgid "Icon View"
-msgstr ""
+msgstr "Symbolansicht"
 
 #: ../thunar/thunar-preferences-dialog.c:231
 msgid "Detailed List View"
@@ -943,7 +1047,7 @@ msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:249
 msgid "Sort _folders before files"
-msgstr ""
+msgstr "_Ordner vor Dateien anzeigen"
 
 #: ../thunar/thunar-preferences-dialog.c:251
 msgid "Select this option to list folders before files when you sort a folder."
@@ -951,7 +1055,7 @@ msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:255
 msgid "_Show thumbnails"
-msgstr ""
+msgstr "_Miniatur-Vorschaubilder anzeigen"
 
 #: ../thunar/thunar-preferences-dialog.c:257
 msgid ""
@@ -961,7 +1065,7 @@ msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:278
 msgid "_Text beside icons"
-msgstr ""
+msgstr "_Text neben Symbolen"
 
 #: ../thunar/thunar-preferences-dialog.c:280
 msgid ""
@@ -1000,22 +1104,22 @@ msgstr "Niemals"
 #, c-format
 msgid "(%lu hour remaining)"
 msgid_plural "(%lu hours remaining)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%lu Stunde verbleibend)"
+msgstr[1] "(%lu Stunden verbleibend)"
 
 #: ../thunar/thunar-progress-dialog.c:462
 #, c-format
 msgid "(%lu minute remaining)"
 msgid_plural "(%lu minutes remaining)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%lu Minute verbleibend)"
+msgstr[1] "(%lu Minuten verbleibend)"
 
 #: ../thunar/thunar-progress-dialog.c:467
 #, c-format
 msgid "(%lu second remaining)"
 msgid_plural "(%lu seconds remaining)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%lu Sekunde verbleibend)"
+msgstr[1] "(%lu Sekunden verbleibend)"
 
 #: ../thunar/thunar-properties-dialog.c:214
 msgid "General"
@@ -1037,9 +1141,8 @@ msgid "Open With:"
 msgstr "Öffnen mit:"
 
 #: ../thunar/thunar-properties-dialog.c:284
-#, fuzzy
 msgid "Link Target:"
-msgstr "Hierher verknü_pfen"
+msgstr "Verknüpfungsziel:"
 
 #.
 #. Third box (modified, accessed)
@@ -1057,11 +1160,11 @@ msgstr "Zugegriffen:"
 #.
 #: ../thunar/thunar-properties-dialog.c:345
 msgid "Free Space:"
-msgstr ""
+msgstr "Freier Speicher:"
 
 #: ../thunar/thunar-properties-dialog.c:358
 msgid "Volume:"
-msgstr ""
+msgstr "Gerät:"
 
 #: ../thunar/thunar-properties-dialog.c:381
 msgid "Size:"
@@ -1075,15 +1178,15 @@ msgid "Emblems"
 msgstr "Embleme"
 
 #: ../thunar/thunar-properties-dialog.c:767
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%lld Bytes)"
-msgstr "%s (%u Byte)"
+msgstr "%s (%lld Byte)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:815
 #, c-format
 msgid "Failed to rename `%s'"
-msgstr "Konnte `%s' nicht umbenennen"
+msgstr "Die Datei »%s« konnte nicht umbenannt werden"
 
 #. append the "Mount Volume" menu action
 #: ../thunar/thunar-shortcuts-view.c:384
@@ -1134,9 +1237,9 @@ msgstr "Andere Anwendung..."
 
 #. display an error dialog to inform the user
 #: ../thunar/thunar-shortcuts-view.c:910
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to eject \"%s\""
-msgstr "Konnte `%s' nicht umbenennen"
+msgstr "Das Medium in »%s« konnte nicht ausgeworfen werden"
 
 #. display an error dialog to inform the user
 #: ../thunar/thunar-shortcuts-view.c:956
@@ -1150,154 +1253,151 @@ msgstr "Konnte `%s' nicht umbenennen"
 msgid "Failed to unmount \"%s\""
 msgstr "Konnte `%s' nicht umbenennen"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr "_Verzeichnis erstellen..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Properties..."
 msgstr "_Eigenschaften..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
-msgstr ""
+msgstr "Die Eigenschaften der ausgewählten Datei anzeigen/ändern"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "Dateien _kopieren"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
-msgstr ""
+msgstr "Ausgewählte Dateien kopieren"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "Dateien _ausschneiden"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
-msgstr ""
+msgstr "Ausgewählte Dateien ausschneiden"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "Dateien e_infügen"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "Dateien _löschen"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
-msgstr ""
+msgstr "Ausgewählte Dateien löschen"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "Alles au_swählen"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr "_Muster auswählen..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Datei _duplizieren"
+msgstr[1] "Dateien _duplizieren"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
-msgstr ""
+msgstr "Ausgewählte Dateien duplizieren"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "_Verknüpfung anlegen"
+msgstr[1] "_Verknüpfungen anlegen"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
-msgstr ""
+msgstr "Eine symbolische Verknüpfung für jede ausgewählte Datei anlegen"
 
-#: ../thunar/thunar-standard-view.c:289
-#, fuzzy
+#: ../thunar/thunar-standard-view.c:287
 msgid "_Rename..."
-msgstr "_Umbennen"
+msgstr "_Umbennen..."
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
-msgstr ""
+msgstr "Ausgewählte Dateien umbenennen"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
-#, fuzzy
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
-msgstr "Neue Aktion erstellen"
+msgstr "_Dokument anlegen"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
-msgstr ""
+msgstr "Verzeichnis wird geladen..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
-msgstr ""
+msgstr "Leere Datei"
 
-#: ../thunar/thunar-standard-view.c:1504
-#, fuzzy
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File..."
-msgstr "Neues Verzeichnis..."
+msgstr "Neue leere Datei..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
-msgstr ""
+msgstr "Neues Verzeichnis"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "Neues Verzeichnis..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
-msgstr ""
+msgstr "Dokument aus Vorlage »%s« anlegen"
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1308,54 +1408,52 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Muster auswählen"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Muster:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
-#, fuzzy, c-format
+#: ../thunar/thunar-standard-view.c:1986
+#, c-format
 msgid "Rename \"%s\""
-msgstr "_Umbennen"
+msgstr "»%s« umbennen"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
-#, fuzzy, c-format
+#: ../thunar/thunar-standard-view.c:2057
+#, c-format
 msgid "Failed to rename \"%s\""
-msgstr "Konnte `%s' nicht umbenennen"
+msgstr "Die Datei »%s« konnte nicht umbenannt werden"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
-msgstr "Konnte Verzeichnis `%s' nicht öffnen"
+msgstr "Das Verzeichnis »%s« konnte nicht geöffnet werden"
 
-#: ../thunar/thunar-standard-view.c:2896
-#, fuzzy
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
-msgstr[0] "_Datei"
-msgstr[1] "_Datei"
+msgstr[0] "Datei _kopieren"
+msgstr[1] "Dateien _kopieren"
 
-#: ../thunar/thunar-standard-view.c:2902
-#, fuzzy
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
-msgstr[0] "_Datei"
-msgstr[1] "_Datei"
+msgstr[0] "Datei _ausschneiden"
+msgstr[1] "Dateien _ausschneiden"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Datei _löschen"
+msgstr[1] "Dateien _löschen"
 
 #. tell the user that no templates were found
 #: ../thunar/thunar-templates-action.c:375
@@ -1367,228 +1465,226 @@ msgstr "Keine Vorlagen installiert"
 msgid "_Empty File"
 msgstr "_Leere Datei"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Datei"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "_Neues Fenster öffnen"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
-msgstr ""
+msgstr "Ein weiteres Fenster für diesen Ort öffnen"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "_Alle Fenster schließen"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Alle Thunar Fenster schließen"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Schließen"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr "_Einstellungen..."
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr "Thunars Einstellungen bearbeiten"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Anzeige"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr "_Neu laden"
 
-#: ../thunar/thunar-window.c:221
-#, fuzzy
+#: ../thunar/thunar-window.c:223
 msgid "Reload the current folder"
-msgstr "Detailierte Verzeichnisansicht"
+msgstr "Das aktuelle Verzeichnis neuladen"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
-msgstr ""
+msgstr "Ver_größern"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
-msgstr ""
+msgstr "Ver_kleinern"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
-msgstr ""
+msgstr "_Normale Größe"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
-msgstr "_Gehe"
+msgstr "_Gehe zu"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
-msgstr ""
+msgstr "_Eltern-Ordner öffnen"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
-msgstr ""
+msgstr "Den Eltern-Ordner öffnen"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
-msgstr ""
+msgstr "_Persönlicher Ordner"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "Go to the home folder"
-msgstr ""
+msgstr "Zum persönlichen Ordner gehen"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr "_Vorlagen"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "Go to the templates folder"
-msgstr ""
+msgstr "Zum Vorlagenordner gehen"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "_Ort öffnen..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
-msgstr ""
+msgstr "Einen Ort eingeben, der geöffnet werden soll"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "Ü_ber"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
-msgstr ""
+msgstr "Würdigungen für die Schöpfer von Thunar anzeigen"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "_Verborgene Dateien anzeigen"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Verborgene Dateien im momentan geöffneten Fenster anzeigen/verbergen"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "St_atusbar"
 msgstr "St_atusleiste"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
-msgstr ""
+msgstr "Die Sichtbarkeit der Statusleiste dieses Fensters ändern"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
-msgstr ""
+msgstr "_Verstecken"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "_Symbolansicht"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "_Detailansicht"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1266
-#, fuzzy
+#: ../thunar/thunar-window.c:1277
 msgid "Failed to open parent folder"
-msgstr "Detailierte Verzeichnisansicht"
+msgstr "Der Eltern-Ordner konnte nicht geöffnet werden"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
-msgstr ""
+msgstr "Der persönliche Ordner konnte nicht geöffnet werden"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr "Ãœber Vorlagen"
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1598,21 +1694,21 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr "Diese Meldung in Zukunft _nicht mehr anzeigen"
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 msgid "Failed to open templates folder"
 msgstr "Das Verzeichnis mit den Vorlagen konnte nicht geöffnet werden"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "Benedikt Meurer <benny@xfce.org>"
 
@@ -1679,9 +1775,8 @@ msgid "Create Action"
 msgstr "Neue Aktion erstellen"
 
 #: ../thunar-uca/thunar-uca-chooser.c:413
-#, fuzzy
 msgid "Failed to save actions to disk."
-msgstr "Andere Anwendung..."
+msgstr "Die benutzerdefinierten Aktionen konnte nicht gespeichert werden."
 
 #.
 #. Basic
@@ -1842,7 +1937,7 @@ msgstr "Bilddateien"
 #: ../thunar-uca/thunar-uca-model.c:770
 #, c-format
 msgid "Unknown element <%s>"
-msgstr ""
+msgstr "Unbekanntes Element <%s>"
 
 #: ../thunar-uca/thunar-uca-model.c:788
 msgid "End element handler called while in root context"
@@ -1851,7 +1946,7 @@ msgstr ""
 #: ../thunar-uca/thunar-uca-model.c:876
 #, c-format
 msgid "Unknown closing element <%s>"
-msgstr ""
+msgstr "Unbekanntes schließendes Element <%s>"
 
 #: ../thunar-uca/thunar-uca-model.c:1301
 msgid "Failed to determine save location for uca.xml"
@@ -1859,7 +1954,7 @@ msgstr ""
 
 #: ../thunar-uca/thunar-uca-model.c:1417
 msgid "Command not configured"
-msgstr ""
+msgstr "Befehl nicht angegeben"
 
 #: ../thunar-uca/thunar-uca-provider.c:155
 msgid "Configure c_ustom actions..."
@@ -1871,9 +1966,9 @@ msgid ""
 msgstr ""
 
 #: ../thunar-uca/thunar-uca-provider.c:328
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to launch action `%s'."
-msgstr "Andere Anwendung..."
+msgstr "Die Aktion »%s« konnte nicht ausgeführt werden."
 
 #: ../thunar-uca/uca.xml.in.h:1
 msgid "Example for a custom action"
@@ -1894,3 +1989,6 @@ msgstr "Dateimanager"
 #: ../Thunar.desktop.in.h:3
 msgid "Thunar File Manager"
 msgstr "Thunar Dateimanager"
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (Standard)"
diff --git a/po/el.po b/po/el.po
index 9a08f54bb..741aa9efd 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-02-05 00:53+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -141,11 +141,46 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Η διαγραφή του `%s' απέτυχε: %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "Η φόρτωση της εφαρμογής από το αρχείο %s απέτυχε"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+#, fuzzy
+msgid "Command"
+msgstr "_Εντολή:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "Εικονίδ_ιο:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Όνομα"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -164,7 +199,7 @@ msgstr "Η διαδρομή είναι υπερβολικά μεγάλη για
 msgid "URI too long to fit into buffer"
 msgstr "Το URI είναι υπερβολικά μεγάλο για να χωρέσει στην προσωρινή μνήμη"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -377,8 +412,8 @@ msgstr "Δημιουργία καταλόγων..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "Ο ορισμός της προκαθορισμένης εφαρμογής για το `%s' απέτυχε."
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -399,8 +434,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "_Άλλη Εφαρμογή..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Άνοιγμα Με"
 
@@ -416,14 +450,14 @@ msgstr "_Περιήγηση"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "Η προσθήκη της εφαρμογής `%s' απέτυχε."
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "Η εκτέλεση του `%s' απέτυχε"
 
 #. update the header label
@@ -480,7 +514,7 @@ msgstr "Άλλες Εφαρμογές:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Δεν υπάρχει τίποτα στο πρόχειρο για να επικολληθεί."
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Εισάγετε νέο όνομα:"
 
@@ -492,31 +526,27 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ονόματος αρχείου `%s' στην τοπική "
 "κωδικοποίηση"
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Όνομα"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Τύπος"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Ημερομηνία Τροποποίησης"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Λεπτομερής απεικόνιση καταλόγων"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Προβολή λεπτομεριών"
 
@@ -540,8 +570,7 @@ msgid "_Link here"
 msgstr "Δ_ημιουργία δεσμού εδώ"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του αρχείου `%s'"
@@ -550,7 +579,7 @@ msgstr "Δεν ήταν δυνατή η εκτέλεση του αρχείου `
 msgid "The root folder has no parent"
 msgstr "Ο ριζικός φάκελος δεν έχει γονεϊκό φάκελο"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr "Σύστημα Αρχείων"
 
@@ -577,121 +606,206 @@ msgstr "Μετάβαση στον επόμενο φάκελο που επισκ
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "Στοί_χιση Αντικειμένων"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Ταξινόμηση κατά Ό_νομα"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "Ταξινόμηση αντικειμένων σε γραμμές κατά όνομα"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Ταξινόμηση κατά _Μέγεθος"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr "Ταξινόμηση αντικειμένων σε γραμμές κατά μέγεθος"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Ταξινόμηση λίστας κατά _Τύπο"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr "Ταξινόμηση αντικειμένων σε γραμμές κατά τύπο"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Ταξινόμηση κατά Χρονολογία _Τροποποίησης"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr "Ταξινόμηση αντικειμένων σε γραμμές κατά ημερομηνία τροποποίησης"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Αύξουσα"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Ταξινόμηση αντικειμένων με αύξουσα σειρά"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_Φθίνουσα"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Ταξινόμηση καρτελών με φθίνουσα σειρά"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Εικονίδια"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Εκτέλεση των επιλεγμένων αντικειμένων"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Άνοιγμα σε Νέο Παράθυρο"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Άνοιγμα των επιλεγμένων καταλόγων σε νέα παράθυρα του Thunar"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Αδυναμία ανοίγματος του αρχείου \"%s\"."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Άλλη Εφαρμογή..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "η διαδρομή προς το πρώτο επιλεγμένο αρχείο"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Η εκτέλεση του `%s' απέτυχε"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Η μετονομασία του `%s' απέτυχε"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "Αδύνατο το άνοιγμα %d αρχείου."
 msgstr[1] "Αδύνατο το άνοιγμα %d αρχείων."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "Είσαστε βέβαιοι ότι θέλετε να ανοίξετε όλους τους φακέλους;"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Αυτό θα ανοίξει %d διαφορετικό παράθυρο."
 msgstr[1] "Αυτό θα ανοίξει %d διαφορετικά παράθυρα."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Άνοιγμα σε %d Νέο Παράθυρο"
+msgstr[1] "Άνοιγμα σε %d Νέα Παράθυρα"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Άνοιγμα σε %d Νέο Παράθυρο"
 msgstr[1] "Άνοιγμα σε %d Νέα Παράθυρα"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Άνοιγμα των επιλεγμένων καταλόγων σε νέα παράθυρα του Thunar"
+msgstr[1] "Άνοιγμα των επιλεγμένων καταλόγων σε νέα παράθυρα του Thunar"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Εκτέλεση των επιλεγμένων αντικειμένων"
+msgstr[1] "Εκτέλεση των επιλεγμένων αντικειμένων"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Εκτέλεση"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Αποκοπή των επιλεγμένων αρχείων"
+msgstr[1] "Αποκοπή των επιλεγμένων αρχείων"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Άνοιγμα Με"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Διαγραφή των επιλεγμένων αρχείων"
+msgstr[1] "Διαγραφή των επιλεγμένων αρχείων"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "Άλλη Εφαρμογή..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Άλλες Εφαρμογές:"
+
+#: ../thunar/thunar-launcher.c:841
+#, fuzzy
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] "τα επιλεγμένα αρχεία (χωρίς τις διαδρομές)"
+msgstr[1] "τα επιλεγμένα αρχεία (χωρίς τις διαδρομές)"
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Άνοιγμα Με"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr "σπασμένος δεσμός"
@@ -748,21 +862,11 @@ msgstr "Άνοιγμα Τοποθεσίας"
 msgid "_Location:"
 msgstr "_Τοποθεσία:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Η εκκίνηση του `%s' απέτυχε"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (προεπιλογή)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Άλλη Εφαρμογή..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Μέγεθος εικονιδίου"
@@ -1175,144 +1279,144 @@ msgstr "Η προσάρτηση του \"%s\" απέτυχε"
 msgid "Failed to unmount \"%s\""
 msgstr "Η αποσύνδεση του \"%s\" απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "Μενού Ενεργειών Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "Μενού Ενεργειών Φακέλων"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr "Δημιουργία _Φακέλου..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr "Δημιουργία ενός άδειου φακέλου μέσα στον τρέχον φάκελο"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Properties..."
 msgstr "_Ιδιότητες..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "Προβολή των ιδιοτήτων του επιλεγμένου αρχείου"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "_Αντιγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "Αντιγραφή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "Α_ποκοπή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "Αποκοπή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "_Επικόλληση Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "_Διαγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "Διαγραφή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "Επικόλληση Αρχείων σε Φάκελο"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Επικόλληση αρχείων στον επιλεγμένο φάκελο"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "Επιλογή ό_λων των Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Επιλογή όλων των αρχείων σε αυτό το παράθυρο"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr "Επιλογή _βάσει μοτίβου..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Επιλογή όλων των αρχείων που ταιριάζουν σε ένα μοτίβο"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Δημιουργία Αν_τιγράφου"
 msgstr[1] "Δημιουργία Αν_τιγράφων"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr "Δημιουργία αντιγράφου για κάθε επιλεγμένο αρχείο"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Δημιουργία _Δεσμού"
 msgstr[1] "Δημιουργία _Δεσμών"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "Δημιουργεί ένα συμβολικό δεσμό για κάθε επιλεγμένο αρχείο"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "_Rename..."
 msgstr "_Μετονομασία..."
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "Μετονομασία του επιλεγμένου αρχείου"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
 msgstr "Δημιουργία _Εγγράφου"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Φόρτωμα περιεχομένων φακέλου..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr "Νέο Κενό Αρχείο"
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File..."
 msgstr "Νέο Κενό Αρχείο..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr "Νέος Φάκελος"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "Νέος Φάκελος..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Δημιουργία εγγράφου από πρότυπο \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1321,7 +1425,7 @@ msgstr ""
 "Είστε σίγουρος/η ότι θέλετε να διαγράψετε\n"
 "οριστικά το \"%s\";"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1336,48 +1440,48 @@ msgstr[1] ""
 "Είστε σίγουρος/η ότι θέλετε να διαγράψετε\n"
 "οριστικά τα %u επιλεγμένα αρχεία;"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "Εάν διαγράψετε ένα αρχείο, χάνετε για πάντα."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Επιλογή βάσει Μοτίβου"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Μοτίβο:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Μετονομασία \"%s\""
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Η μετονομασία του \"%s\" απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Το άνοιγμα του καταλόγου `%s' απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Αντιγραφή Αρχείου"
 msgstr[1] "_Αντιγραφή Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Αποκοπή _Αρχείου"
 msgstr[1] "Αποκοπή _Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Διαγραφή Αρχείου"
@@ -1393,229 +1497,229 @@ msgstr "Δεν υπάρχουν εγκατεστημένα πρότυπα"
 msgid "_Empty File"
 msgstr "_Κενό Αρχείο"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Άνοιγμα νέου _παραθύρου"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 "'Ανοιγμα ενός άλλου παράθυρου του Thunar για την προβαλλόμενη τοποθεσία"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "Κλείσιμο _Όλων των Παραθύρων"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Κλείσιμο όλων των παραθύρων του Thunar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Κλείσιμο αυτού του παραθύρου"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr "_Προτιμήσεις..."
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr "Επεξεργασία Προτιμήσεων του Thunar"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr "Α_νανέωση"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "Reload the current folder"
 msgstr "Ανανέωση του τρέχοντος φακέλου"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr "Εργαλειοθήκη _Τοποθεσίας"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "_Πλευρικό Ταμπλό"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr "_Μεγέθυνση"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr "Εμφάνιση των περιεχομένων με περισσότερη λεπτομέρεια"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr "Σ_μίκρυνση"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr "Εμφάνιση των περιεχομένων με λιγότερη λεπτομέρεια"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr "_Κανονικό Μέγεθος"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr "Εμφάνιση των περιεχομένων στο κανονικό μέγεθος"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Μετάβαση"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "Άνοιγμα _Γονικού"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Άνοιγμα του γονικού φακέλου"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr "_Αρχή"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "Go to the home folder"
 msgstr "Μετάβαση στον αρχικό κατάλογο"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr "_Πρότυπα"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "Go to the templates folder"
 msgstr "Μετάβαση στο φάκελο προτύπων"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "Άνοιγμα _Τοποθεσίας..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Καθορίστε μια τοποθεσία για άνοιγμα"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_Περί"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Εμφάνιση πληροφοριών σχετικά με το Thunar"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "Εμφάνιση _Κρυφών Αρχείων"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Εναλλάσσει την εμφάνιση κρυφών αρχείων στο τρέχον παράθυρο"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "St_atusbar"
 msgstr "Γ_ραμμή Κατάστασης"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr "Αλλαγή της ορατότητας της μπάρας κατάστασης του παραθύρου αυτού"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr "_Συντομεύσεις"
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "Κ_ρυφό"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr "_Μπάρα Τοποθεσίας"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Σύγχρονη προσέγγιση με κουμπιά που αντιστοιχούν σε φακέλους"
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr "_Εργαλειοθήκη"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Παραδοσιακή προσέγγιση με μπάρα τοποθεσίας και κουμπιά περιήγησης"
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr "Χωρίς επιλογέα τοποθεσίας"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Ε_ικονίδια"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως εικονίδια"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "_Λεπτομέρειες"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr "Εμφάνιση περιεχομένων φακέλου ως λεπτομερή λίστα"
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 msgid "Failed to open parent folder"
 msgstr "Το άνοιγμα του γονικού φακέλου απέτυχε"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr "Αδυναμία ανοίγματος αρχικού καταλόγου"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr "Περί Προτύπων"
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 "Όλα τα αρχεία σε αυτόν τον κατάλογο θα εμφανιστούν στο μενού \"Δημιουργία "
 "Εγγράφου\"."
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1625,15 +1729,15 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr "_Να μην εμφανιστεί ξανά αυτό το μήνυμα"
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 msgid "Failed to open templates folder"
 msgstr "Το άνοιγμα του φακέλου προτύπων απέτυχε"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1641,7 +1745,7 @@ msgstr ""
 "Ο Thunar είναι ένας γρήγορος και εύκολος διαχειριστής αρχείων\n"
 "για το Περιβάλλον Εργασίας Xfce."
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>"
 
@@ -1928,5 +2032,11 @@ msgstr "Διαχειριστής Αρχείων"
 msgid "Thunar File Manager"
 msgstr "Διαχειριστής Αρχείων Thunar"
 
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Αδυναμία ανοίγματος του αρχείου \"%s\"."
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (προεπιλογή)"
+
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Εμφάνιση κρυφών αρχείων και _αντιγράφων ασφαλείας"
diff --git a/po/es.po b/po/es.po
index ef6c25d1e..a22a63718 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Pablo Hernández-M. Saiz <homeless3d@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -139,11 +139,45 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr ""
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+msgid "Command"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "_Dirección"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Nombre"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -162,7 +196,7 @@ msgstr ""
 msgid "URI too long to fit into buffer"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Tamaño"
 
@@ -381,7 +415,7 @@ msgstr "Directorio actual"
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
 #, fuzzy, c-format
-msgid "Failed to set default application for `%s'"
+msgid "Failed to set default application for \"%s\""
 msgstr "Imposible renombrar %s."
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -402,8 +436,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "Otra aplicación..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Abrir con"
 
@@ -421,13 +454,13 @@ msgstr "_Cerrar"
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
 #, fuzzy, c-format
-msgid "Failed to add new application `%s'"
+msgid "Failed to add new application \"%s\""
 msgstr "Imposible renombrar %s."
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
 #, fuzzy, c-format
-msgid "Failed to execute `%s'"
+msgid "Failed to execute \"%s\""
 msgstr "Imposible renombrar %s."
 
 #. update the header label
@@ -488,7 +521,7 @@ msgstr "Otra aplicación..."
 msgid "There is nothing on the clipboard to paste"
 msgstr "No hay nada en el portapapeles que pueda ser pegado"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr ""
 
@@ -498,31 +531,27 @@ msgstr ""
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Nombre"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Tipo"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Fecha de modificación"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Listado detallado del directorio"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Vista detallada"
 
@@ -547,8 +576,7 @@ msgid "_Link here"
 msgstr ""
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, fuzzy, c-format
 msgid "Unable to execute file `%s'"
 msgstr "No se puede ejecutar el archivo \"%s\"."
@@ -557,7 +585,7 @@ msgstr "No se puede ejecutar el archivo \"%s\"."
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 #, fuzzy
 msgid "File System"
 msgstr "Raíz"
@@ -585,122 +613,206 @@ msgstr ""
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "Organizar los _elementos"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Por _nombre"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Por ta_maño"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Por _tipo"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Por _fecha de modificación"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Ascendente"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Ordenar elementos en orden ascendente"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_Descendente"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Ordenar elementos en orden descendente"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr "listado de directorio con iconos"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Vista de iconos"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Abre el elemento en una ventana de Thunar nueva"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "No se puede abrir \"%s\"."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Otra aplicación..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "Ver las propiedades del elemento seleccionado"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Imposible renombrar %s."
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Imposible renombrar %s."
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "No se puede abrir %d archivo."
 msgstr[1] "No se puede abrir %d archivos."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "¿Seguro que quiere abrir todas las carpetas?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Esto abrirá %d ventana diferente."
 msgstr[1] "Esto abrirá %d ventanas diferentes."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Abrir en %d ventana nueva"
+msgstr[1] "Abrir en %d ventanas nuevas"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Abrir en %d ventana nueva"
 msgstr[1] "Abrir en %d ventanas nuevas"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Abre el elemento en una ventana de Thunar nueva"
+msgstr[1] "Abre el elemento en una ventana de Thunar nueva"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Abrir el elemento seleccionado"
+msgstr[1] "Abrir el elemento seleccionado"
+
+#: ../thunar/thunar-launcher.c:800
 #, fuzzy
 msgid "_Execute"
 msgstr "Ejecutar"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Abrir el elemento seleccionado"
+msgstr[1] "Abrir el elemento seleccionado"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Abrir con"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Abrir el elemento seleccionado"
+msgstr[1] "Abrir el elemento seleccionado"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "Otra aplicación..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Otra aplicación..."
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Abrir con"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr ""
@@ -757,21 +869,11 @@ msgstr "Abrir dirección..."
 msgid "_Location:"
 msgstr "_Dirección"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (Por defecto)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Otra aplicación..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Tamaño de icono"
@@ -1188,169 +1290,169 @@ msgstr "Imposible renombrar %s."
 msgid "Failed to unmount \"%s\""
 msgstr "Imposible renombrar %s."
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "Menú contextual de archivo"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "Menú contextual de carpeta"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Ver las propiedades del elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "_Copy Files"
 msgstr "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Paste Files"
 msgstr "_Pegar archivos"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Archivos seleccionados"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Pegar archivos en la carpeta"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Pegar archivos en la carpeta seleccionada"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Seleccionar _todos los archivos"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Seleccionar todos los archivos en esta ventana"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Patrón de selección"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona todos los archivos que coinciden con un patrón"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "Renombra el elemento seleccionado"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Cargando el contenido de la carpeta..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Carpeta"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder"
 msgstr "Carpeta"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder..."
 msgstr "Carpeta"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "¿Esta seguro de que desea borrar todos los elementos de la papelera?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1363,51 +1465,51 @@ msgstr[0] ""
 msgstr[1] ""
 "¿Esta seguro de que desea borrar todos los elementos de la papelera?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Patrón de selección"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Patrón:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "_Renombrar..."
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Imposible renombrar %s."
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Imposible abrir el directorio %s."
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copiar archivo"
 msgstr[1] "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Cor_tar archivo"
 msgstr[1] "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1425,240 +1527,240 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copiar archivo"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Nueva _ventana"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "Cerrar _todas las ventanas"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Cerrar todas las ventanas de Thunar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Gestor de archivos"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Ver"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Barra de _dirección"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "Panel _lateral"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Ir a"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "Abrir _antecesor"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Abre la carpeta anterior"
 
 # msgstr "Sistema de archivos"
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "_Home"
 msgstr "Casa"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "Abrir _dirección..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Especificar una dirección para abrir"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Muestra información acerca de Thunar"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostrar los archivos _ocultos"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Texto de la barra de estado"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "_Oculto/a"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Estilo _tradicional"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Estilo _tradicional"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Ver como _Iconos"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "Ver como _Lista"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Abre la carpeta anterior"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Imposible abrir el directorio %s."
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1668,16 +1770,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1685,7 +1787,7 @@ msgstr ""
 "Thunar es un gestor de archivos rápido\n"
 "y fácil de usar para el escritorio Xfce"
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr ""
 
@@ -1984,6 +2086,12 @@ msgstr "Gestor de archivos"
 msgid "Thunar File Manager"
 msgstr "Gestor de archivos Thunar"
 
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "No se puede abrir \"%s\"."
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (Por defecto)"
+
 #, fuzzy
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Mostrar los archivos _ocultos"
diff --git a/po/fr.po b/po/fr.po
index 792813abe..eff580a33 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-01-01 15:02+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -139,11 +139,46 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Échec à la suppression de `%s' : %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "Échec au chargement de l'application à partir du fichier %s"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+#, fuzzy
+msgid "Command"
+msgstr "_Commande :"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "_Icône :"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Nom"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -162,7 +197,7 @@ msgstr "Chemin trop long pour être stockée dans le cache"
 msgid "URI too long to fit into buffer"
 msgstr "URI trop longue pour être stockée dans le cache"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Taille"
 
@@ -378,8 +413,8 @@ msgstr "Création de répertoires..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "Échec à l'affectation de l'application par défaut de `%s'"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -400,8 +435,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "Autre application..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Ouvrir avec"
 
@@ -417,14 +451,14 @@ msgstr "_Explorer"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "Échec à l'ajout de la nouvelle application `%s'"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "Échec à l'exécution de `%s'"
 
 #. update the header label
@@ -481,7 +515,7 @@ msgstr "Autres applications :"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Il n'y a rien à coller dans le presse-papier"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Entrer le nouveau nom :"
 
@@ -491,31 +525,27 @@ msgstr "Entrer le nouveau nom :"
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr "Ne peut pas convertir le nom du fichier `%s' vers le codage local"
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Nom"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Permissions"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Type"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Date modifiée"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Liste détaillée des répertoires"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Vue détails"
 
@@ -539,8 +569,7 @@ msgid "_Link here"
 msgstr "_Lier ici"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Impossible d'exécuter le fichier `%s'"
@@ -549,7 +578,7 @@ msgstr "Impossible d'exécuter le fichier `%s'"
 msgid "The root folder has no parent"
 msgstr "Le dossier racine n'a pas de père"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 #, fuzzy
 msgid "File System"
 msgstr "Système de fichier"
@@ -577,122 +606,209 @@ msgstr "Aller vers le répertoire visité suivant"
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "Or_ganiser les éléments"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Trier par _nom"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "Place les éléments en lignes par ordre de nom"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Trier par t_aille"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr "Place les éléments en ligne par ordre de taille"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Trier par _type"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr "Place les éléments en ligne par ordre de type"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Trier par _date de modification"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr "Place les éléments en ligne par ordre de date de dernière modification"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Croissant"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Trier les éléments par ordre croissant"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_Décroissant"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Trier les éléments par ordre décroissant"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Vue d'icônes"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Ouvrir les éléments sélectionnés"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr ""
 "Ouvrir les répertoires sélectionnés dans une nouvelle fenêtre de Thunar"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Impossible d'ouvrir \"%s\"."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Autre application..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "le chemin vers le premier fichier sélectionné"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Échec à l'exécution de `%s'"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Échec au changement de nom de `%s'"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "Impossible d'ouvrir %d fichier."
 msgstr[1] "Impossible d'ouvrir %d fichiers."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "Êtes-vous certains de vouloir ouvrir tous les dossiers ?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Ceci ouvrira %d fenêtre distincte."
 msgstr[1] "Ceci ouvrira %d fenêtres distinctes."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Ouvrir dans %d nouvelle fenêtre"
+msgstr[1] "Ouvrir dans %d nouvelles fenêtres"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Ouvrir dans %d nouvelle fenêtre"
 msgstr[1] "Ouvrir dans %d nouvelles fenêtres"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] ""
+"Ouvrir les répertoires sélectionnés dans une nouvelle fenêtre de Thunar"
+msgstr[1] ""
+"Ouvrir les répertoires sélectionnés dans une nouvelle fenêtre de Thunar"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Ouvrir les éléments sélectionnés"
+msgstr[1] "Ouvrir les éléments sélectionnés"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Exécuter"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Coupe les fichiers sélectionnés"
+msgstr[1] "Coupe les fichiers sélectionnés"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Ouvrir avec"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Supprime les fichiers sélectionnés"
+msgstr[1] "Supprime les fichiers sélectionnés"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "Autre application..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Autres applications :"
+
+#: ../thunar/thunar-launcher.c:841
+#, fuzzy
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] "les noms des fichiers (sans les chemins)"
+msgstr[1] "les noms des fichiers (sans les chemins)"
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Ouvrir avec"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr "lien cassé"
@@ -749,21 +865,11 @@ msgstr "Aller à..."
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Échec au lancement de l'action `%s'."
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (défaut)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Autre application..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Taille d'icône"
@@ -1179,148 +1285,148 @@ msgstr "Échec au changement de nom de `%s'"
 msgid "Failed to unmount \"%s\""
 msgstr "Échec au changement de nom de `%s'"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "Menu contextuel de fichier"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "Menu contextuel de dossier"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr "Création d'un _dossier..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr "Crée un dossier vide dans le dossier courant"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propriétés"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "Affiche les propriétés du fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "_Copier les fichiers"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "Copie les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "Cou_per les fichiers"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "Coupe les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "Co_ller les fichiers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "_Supprimer les fichiers"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "Supprime les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "Colle les fichiers dans le dossier"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Colle les fichiers dans le dossier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "Sélectionner _tout les fichiers"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Sélectionner tous les fichiers dans cette fenêtre"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr "Sélectionner par _motif..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Sélectionner tous les fichiers qui correspondent à un certain motif"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_pliquer le fichier"
 msgstr[1] "Du_pliquer les fichiers"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr "Duplique chaque fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "C_réer un lien"
 msgstr[1] "C_réer des liens"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "Créer un lien symbolique pour chaque fichier sélectionné"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Renommer"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "Renommer le fichier sélectionné"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 #, fuzzy
 msgid "Create _Document"
 msgstr "Créer une action"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Chargement du contenu du dossier..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nouveau dossier..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "Nouveau dossier..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1329,7 +1435,7 @@ msgstr ""
 "Êtes-vous certain que vous voulez\n"
 "effacer \"%s\" définitivement ?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1344,48 +1450,48 @@ msgstr[1] ""
 "Êtes-vous certain de vouloir effacer de manière\n"
 "permanente les %u fichiers sélectionnés ?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "Si vous supprimez ce fichier, il sera définitivement perdu."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Sélectionner par motif"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Motif :"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "_Renommer"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Échec au changement de nom de `%s'"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Échec à l'ouverture du répertoire `%s'"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copier le fichier"
 msgstr[1] "_Copier les fichiers"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Co_uper le fichier"
 msgstr[1] "Co_uper les fichiers"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Supprimer le fichier"
@@ -1402,233 +1508,233 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copier le fichier"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Ouvrir une _nouvelle fenêtre"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Ouvre une nouvelle fenêtre de Thunar pour l'endroit affiché"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "Fermer _toutes les fenêtres"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Ferme toutes les fenêtres de Thunar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Fermer"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "Édit_er"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr "Préfér_ences..."
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr "Éditer les préférences de Thunar"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Voir"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Ouvrir le dossier père"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "_Panneau latéral"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Aller"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "Ouvrir le _père"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Ouvrir le dossier père"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr "_Répertoire personnel"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Ouvrir le répertoire personnel"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Aller vers le répertoire visité suivant"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "A_ller à..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Spécifier un chemin à ouvrir"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "À _propos"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Affiche des informations à propos de Thunar"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "Montrer les fichiers _cachés"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Montrer/cache les fichiers cachés dans la fenêtre courante"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Texte de la barre de statut"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr "_Raccourcis"
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "_Caché"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr "Style de la barre de _chemin"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Approche moderne avec les boutons qui correspondent aux dossiers"
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr "Style de la barre d'_outils"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 "Approche traditionnelle avec les la barre de chemin et les boutons de "
 "navigation"
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Voir en _icônes"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr "Affiche le contenu du dossier sous forme de vue d'icônes"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "Voir en liste _détaillée"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr "Affiche le contenu du dossier sous forme de liste détaillée"
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Ouvrir le dossier père"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr "Échec dans l'ouverture du répertoire personnel"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1638,16 +1744,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Ouvrir le dossier père"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1655,7 +1761,7 @@ msgstr ""
 "Thunar est un gestionnaire de fichier rapide et facile\n"
 "d'utilisation pour l'Environnement de Bureau Xfce."
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "crédits-traducteur"
 
@@ -1970,6 +2076,12 @@ msgstr "Gestionnaire de fichier"
 msgid "Thunar File Manager"
 msgstr "Gestionnaire de Fichier Thunar"
 
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Impossible d'ouvrir \"%s\"."
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (défaut)"
+
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Montrer les fichiers _cachés et de sauvegardes"
 
diff --git a/po/hu.po b/po/hu.po
index 152966ed1..6fa1a31a5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2005-10-06 22:02+0900\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -138,11 +138,45 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr ""
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+msgid "Command"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "_Hely:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Név"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -161,7 +195,7 @@ msgstr ""
 msgid "URI too long to fit into buffer"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Méret"
 
@@ -380,7 +414,7 @@ msgstr "Jelenlegi könyvtár"
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
 #, fuzzy, c-format
-msgid "Failed to set default application for `%s'"
+msgid "Failed to set default application for \"%s\""
 msgstr "Nem törölhető: %s"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -401,8 +435,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "_Hely megnyitása..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr ""
 
@@ -420,13 +453,13 @@ msgstr "_Bezárás"
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
 #, fuzzy, c-format
-msgid "Failed to add new application `%s'"
+msgid "Failed to add new application \"%s\""
 msgstr "Nem törölhető: %s"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
 #, fuzzy, c-format
-msgid "Failed to execute `%s'"
+msgid "Failed to execute \"%s\""
 msgstr "Nem törölhető: %s"
 
 #. update the header label
@@ -487,7 +520,7 @@ msgstr "_Hely megnyitása..."
 msgid "There is nothing on the clipboard to paste"
 msgstr "Nincs beillesztenivaló a vágólapon"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr ""
 
@@ -497,31 +530,27 @@ msgstr ""
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Név"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Jogok"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Típus"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Módosítás ideje"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Részletes könyvtárlista"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Részletes nézet"
 
@@ -546,8 +575,7 @@ msgid "_Link here"
 msgstr ""
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, fuzzy, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Nem lehet másolni a fájlt: %s"
@@ -556,7 +584,7 @@ msgstr "Nem lehet másolni a fájlt: %s"
 msgid "The root folder has no parent"
 msgstr ""
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 #, fuzzy
 msgid "File System"
 msgstr "Fájlrendszer"
@@ -584,123 +612,206 @@ msgstr ""
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr "Ikon alapú könyvtár lista"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Ikonnézet"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:219
+#: ../thunar/thunar-launcher.c:119
 #, fuzzy
-msgid "Open the selected items"
+msgid "Open the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 #, fuzzy
 msgid "Open in New Window"
 msgstr "Új _Ablak"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:377
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "_Hely megnyitása..."
+
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "A kijelölt elem tulajdonságai"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
 #, fuzzy, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Nem nyitható meg e fájl: %s"
+msgid "Failed to execute file \"%s\""
+msgstr "Nem törölhető: %s"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-launcher.c:382
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
 #, fuzzy, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "Nem nyitható meg e fájl: %s"
 msgstr[1] "Nem nyitható meg e fájl: %s"
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr ""
 
-#: ../thunar/thunar-launcher.c:490
+#: ../thunar/thunar-launcher.c:635
 #, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Új _Ablak"
+msgstr[1] "Új _Ablak"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, fuzzy, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Új _Ablak"
 msgstr[1] "Új _Ablak"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "A kijelölt elem tulajdonságai"
+msgstr[1] "A kijelölt elem tulajdonságai"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "A kijelölt elem tulajdonságai"
+msgstr[1] "A kijelölt elem tulajdonságai"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr ""
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "A kijelölt elem tulajdonságai"
+msgstr[1] "A kijelölt elem tulajdonságai"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, c-format
+msgid "_Open With \"%s\""
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "A kijelölt elem tulajdonságai"
+msgstr[1] "A kijelölt elem tulajdonságai"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "_Hely megnyitása..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "_Hely megnyitása..."
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:894
+#, c-format
+msgid "Open With \"%s\""
+msgstr ""
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr ""
@@ -757,22 +868,11 @@ msgstr "Hely megnyitása"
 msgid "_Location:"
 msgstr "_Hely:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr ""
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-#, fuzzy
-msgid "Other Application..."
-msgstr "_Hely megnyitása..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Ikon méret"
@@ -1186,170 +1286,170 @@ msgstr "Nem törölhető: %s"
 msgid "Failed to unmount \"%s\""
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 #, fuzzy
 msgid "File Context Menu"
 msgstr "Helyi menü"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "Helyi menü"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Properties..."
 msgstr "Tulajdonságok"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "_Copy Files"
 msgstr "Fájlok másolása"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Fájlok kivágása"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Fájlok beillesztése"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Minden fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Fájlok mappába illesztése"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Fájlok beillesztése a kijelölt mappába"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Minden fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Minden fájlt kiválaszt ebből az ablakból"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Kijelölés mintával"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Egy adott mintára illő valamennyi fájl kiválasztása"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "_Rename..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "A kijelölt elem tulajdonságai"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Mappa beolvasása..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Mappa"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder"
 msgstr "Mappa"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder..."
 msgstr "Mappa"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1360,51 +1460,51 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Kijelölés mintával"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Minta:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, c-format
 msgid "Rename \"%s\""
 msgstr ""
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Nem törölhető: %s"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Nem megnyitható könyvtár: %s"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Fájl másolás"
 msgstr[1] "Fájl másolás"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Fájl kivágás"
 msgstr[1] "Fájl kivágás"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1422,239 +1522,239 @@ msgstr ""
 msgid "_Empty File"
 msgstr "Fájl másolás"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Fájl"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Új _Ablak"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Új Thunar ablak az adott helyhez"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "_Minden ablak bezárása"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Bezár minden Thunar ablakot"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Bezárás"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Bezárja ezt az ablakot"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "Sz_erkesztés"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "Tulajdonságok"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Fájlkezelő"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "_Location Selector"
 msgstr "_Címsor"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Ugrás"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "_Szülő megnyitása"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "_Home"
 msgstr "Saját könyvtár"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "_Hely megnyitása..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Adott hely megnyitása"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_Névjegy"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "A Thunar adatainak megjelenítése"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Rejtett fájlok mutatása"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "A rejtett fájlok mutatását váltja a jelen ablakban"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Állapotsor szöveg"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "_Rejtett"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "_Hagyományos stílus"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "_Hagyományos stílus"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Szülőmappa megnyitása"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Nem megnyitható könyvtár: %s"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1664,22 +1764,22 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Szülőmappa megnyitása"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr ""
 
@@ -1981,6 +2081,10 @@ msgstr "Fájlkezelő"
 msgid "Thunar File Manager"
 msgstr "Fájlkezelő"
 
+#, fuzzy
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Nem nyitható meg e fájl: %s"
+
 #, fuzzy
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Rejtett fájlok mutatása"
diff --git a/po/it.po b/po/it.po
index 6938219e9..7f95bf969 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-01-21 10:58+0100\n"
 "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -142,11 +142,46 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Impossibile rimuovere `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "Impossibile caricare l'applicazione dal file %s"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+#, fuzzy
+msgid "Command"
+msgstr "_Comando:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "_Icona:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Nome"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -165,7 +200,7 @@ msgstr "Path troppo lunga per entrare nel buffer"
 msgid "URI too long to fit into buffer"
 msgstr "URI troppo lunga per entrare nel buffer"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Dimensione"
 
@@ -381,8 +416,8 @@ msgstr "Creazione directory in corso..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "Impossibile impostare l'applicazione di default per `%s'"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -402,8 +437,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "Altra applicazione..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Apri con"
 
@@ -420,14 +454,14 @@ msgstr "Sfoglia"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "Impossibile aggiungere una nuova applicazione `%s'"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "Impossibile eseguire `%s'"
 
 #. update the header label
@@ -484,7 +518,7 @@ msgstr "Altre applicazioni:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Nella clipboard non c'è niente da incollare"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Inserire il nuovo nome:"
 
@@ -494,31 +528,27 @@ msgstr "Inserire il nuovo nome:"
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Nome"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Permessi"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Tipo"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Data di modifica"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Lista dettagliata delle directory"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Vista dettagliata"
 
@@ -544,8 +574,7 @@ msgid "_Link here"
 msgstr "Collega qui"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Impossibile eseguire il file `%s'"
@@ -554,7 +583,7 @@ msgstr "Impossibile eseguire il file `%s'"
 msgid "The root folder has no parent"
 msgstr "La directory radice non ha padre"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr "Filesystem"
 
@@ -581,123 +610,207 @@ msgstr "Vai alla directory visitata successivamente"
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 #, fuzzy
 msgid "Arran_ge Items"
 msgstr "Disponi elementi"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Ordina per _nome"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "Tieni gli elementi ordinati per nome nelle colonne"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 #, fuzzy
 msgid "Sort By _Size"
 msgstr "Ordina per _dimensione"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr "Tieni gli elementi ordinati per dimensione nelle colonne"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Ordina per _tipo"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr "Tieni gli elementi ordinati per tipo nelle colonne"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Ordina per _data di modifica"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr "Tieni gli elementi ordinati per data di modifica nelle colonne"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Ascendente"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Ordina gli elementi in ordine ascendente"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_Discendente"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Ordina gli elementi in ordine discendente"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr "Elenco delle directory basato su icone"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Vista a icone"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Apri"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Apri gli elementi selezionati"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Apri in una nuova finestra"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Apri le directory selezionate in una nuova dinestra di Thunar"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Impossibile aprire \"%s\"."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Altra applicazione..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "la path del primo file selezionato"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Impossibile eseguire `%s'"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Impossibile rinominare `%s'"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "Impossibile aprire il file %d."
 msgstr[1] "Impossibile aprire i file %d."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "Sei sicuro di voler aprire tutte le directory?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Questo aprirà %d finestra separata."
 msgstr[1] "Questo aprirà %d finestre separate."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Apri in %d nuova finestra"
+msgstr[1] "Apri in %d nuove finestre"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Apri in %d nuova finestra"
 msgstr[1] "Apri in %d nuove finestre"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Apri le directory selezionate in una nuova dinestra di Thunar"
+msgstr[1] "Apri le directory selezionate in una nuova dinestra di Thunar"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Apri gli elementi selezionati"
+msgstr[1] "Apri gli elementi selezionati"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Esegui"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Taglia gli elementi selezionati"
+msgstr[1] "Taglia gli elementi selezionati"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Apri con"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Elimina gli elementi selezionati"
+msgstr[1] "Elimina gli elementi selezionati"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "Altra applicazione..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Altre applicazioni:"
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Apri con"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr "link rotto"
@@ -756,21 +869,11 @@ msgstr "Apri percorso"
 msgid "_Location:"
 msgstr "Percorso:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Impossibile lanciare `%s'"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (di default)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Altra applicazione..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Dimensione dell'icona"
@@ -1175,151 +1278,151 @@ msgstr "Impossibile rinominare `%s'"
 msgid "Failed to unmount \"%s\""
 msgstr "Impossibile rinominare `%s'"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 #, fuzzy
 msgid "Create _Folder..."
 msgstr "Crea directory..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr "Crea una directory vuota dentro la directory corrente"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "Mostra le proprietà dell'elemento selezionato"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "_Copia file"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "Copia gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "_Taglia file"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "Taglia gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 #, fuzzy
 msgid "_Paste Files"
 msgstr "Incolla file"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Elimina file"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "Elimina gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "Incolla file dentro la directory"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Incolla file dentro la directory selezionata"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "Selezion_a tutti"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Seleziona tutti i file in questa finestra"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr "Seleziona in _base ad un pattern..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Seleziona tutti i file che corrispondono a un certo pattern"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_plica file"
 msgstr[1] "Du_plica file"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr "Duplica ogni file selezionato"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 #, fuzzy
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crea link"
 msgstr[1] "Crea link"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "Crea un link simbolico per ognuno dei file selezionati"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Rinomina"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "Rinomina il file selezionato"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 #, fuzzy
 msgid "Create _Document"
 msgstr "Crea azione"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Caricamento dei contenuti della cartella in corso..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nuova directory..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr "Nuova directory"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "Nuova directory..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1328,7 +1431,7 @@ msgstr ""
 "Sei sicuro di voler eliminare\n"
 "permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1343,48 +1446,48 @@ msgstr[1] ""
 "Sei sicuro di voler eliminare\n"
 "permanentemente i %u file selezionati?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "Se si cancella un file, questo è perso per sempre."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Seleziona in base ad un pattern"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Pattern:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "_Rinomina"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Impossibile rinominare `%s'"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Impossibile aprire la directory %s."
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copia file"
 msgstr[1] "_Copia file"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Taglia file"
 msgstr[1] "_Taglia file"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1402,177 +1505,177 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copia file"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_File"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 #, fuzzy
 msgid "Open New _Window"
 msgstr "Apri nuova finestra"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Apri una nuova finestra di Thunar per il percorso mostrato"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 #, fuzzy
 msgid "Close _All Windows"
 msgstr "Chiudi tutte le finestre"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Chiudi tutte le finestre Thunar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 #, fuzzy
 msgid "_View"
 msgstr "Vista"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Apri la directory precedente"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Selettore di percorsi"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 #, fuzzy
 msgid "_Side Pane"
 msgstr "Pannello laterale"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 #, fuzzy
 msgid "_Go"
 msgstr "Vai"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 #, fuzzy
 msgid "Open _Parent"
 msgstr "Apri precedente"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Apri la directory precedente"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr "_Home"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Apri la directory home"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Vai alla directory visitata successivamente"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Open _Location..."
 msgstr "Apri percorso..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 #, fuzzy
 msgid "Specify a location to open"
 msgstr "Specificare un percorso da aprire"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_Informazioni su..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Mostra informazioni su Thunar"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostra file nascosti"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 "Dis/abilita la visualizzazione di file nascosti nella finestra corrente"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Testo della barra di stato"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 #, fuzzy
 msgid "_Hidden"
 msgstr "Nascondi"
@@ -1580,64 +1683,64 @@ msgstr "Nascondi"
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Vedi come _icone"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "Vedi come lista _dettagliata"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 msgid "Failed to open parent folder"
 msgstr "Impossibile aprire la directory superiore"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr "Impossibile aprire la directory home"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1647,16 +1750,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Impossibile aprire la directory superiore"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1664,7 +1767,7 @@ msgstr ""
 "Thunar è un file manager veloce e facile\n"
 "da usare per Xfce Desktop Environment."
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "Roberto Pariset <r.pariset@gmail.com>"
 
@@ -1947,5 +2050,11 @@ msgstr "File Manager"
 msgid "Thunar File Manager"
 msgstr "Thunar File Manager"
 
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Impossibile aprire \"%s\"."
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (di default)"
+
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Mostra file nascosti e di _backup"
diff --git a/po/ja.po b/po/ja.po
index c81f4aa62..66f8dd0e9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-02-04 11:49+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -148,11 +148,46 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "「%s」の削除に失敗しました: %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "ファイル %s からアプリケーションを読み込むのに失敗しました。"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+#, fuzzy
+msgid "Command"
+msgstr "コマンド(_C):"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "アイコン(_I):"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "名前"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -171,7 +206,7 @@ msgstr "バッファに格納するにはパスが長すぎます。"
 msgid "URI too long to fit into buffer"
 msgstr "バッファに格納するには URI が長すぎます。"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "サイズ"
 
@@ -383,8 +418,8 @@ msgstr "フォルダを作成しています..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "「%s」の標準アプリケーションをセットするのに失敗しました"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -405,8 +440,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "他のアプリケーション(_O)..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "アプリで開く"
 
@@ -422,14 +456,14 @@ msgstr "参照(_B)"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "新しいアプリケーション「%s」を追加するのに失敗しました。"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "「%s」の実行に失敗しました。"
 
 #. update the header label
@@ -487,7 +521,7 @@ msgstr "他のアプリケーション:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "クリップボードに貼り付けるものはありません。"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "新しい名前を入力して下さい:"
 
@@ -497,31 +531,27 @@ msgstr "新しい名前を入力して下さい:"
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr "ファイル名「%s」をあなたのエンコード方式に変換できません。"
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "名前"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "アクセス権"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "タイプ"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "変更日時"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "詳細なファイル情報と共にフォルダをリスト表示します。"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "詳細表示"
 
@@ -545,8 +575,7 @@ msgid "_Link here"
 msgstr "ここにリンク(_L)"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "ファイル「%s」を実行できません。"
@@ -555,7 +584,7 @@ msgstr "ファイル「%s」を実行できません。"
 msgid "The root folder has no parent"
 msgstr "ルートフォルダに上位のフォルダがありません。"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr "ファイルシステム"
 
@@ -584,118 +613,197 @@ msgstr ""
 "「%s」(%s) から代用アイコンを読み込むのに失敗しました。きちんとインストールさ"
 "れているか確認して下さい!"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "アイテムを整理(_G)"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "名前で並べ替え(_N)"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "アイテムを名前で並べ替えるようにします。"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "サイズで並べ替え(_S)"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr "アイテムをサイズで並べ替えるようにします。"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "タイプで並べ替え(_T)"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr "アイテムをタイプで並べ替えるようにします。"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "変更日で並べ替え(_D)"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr "アイテムを変更日で並べ替えるようにします。"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "昇順(_A)"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "アイテムを昇順 (a-Z あいうえおの順) で並べ替えます。"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "降順(_D)"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "アイテムを降順 (おえういあ Z-a の順) で並べ替えます。"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr "アイコンを基調にしてフォルダをリスト表示します。"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "アイコン表示"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "選択したアイテムを開きます。"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "新規ウィンドウで開く"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "選択したフォルダを新しい Thunar ウィンドウで開きます。"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "「%s」を開けません。"
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "他のアプリケーション..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "選択した最初のファイルへのパス"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "「%s」の実行に失敗しました。"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "「%s」の名前変更に失敗しました。"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "%d 個のファイルを開けません。"
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "全てのフォルダを開いてもよろしいですか?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "%d のウィンドウを別々に開きます。"
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "%d の新しいウィンドウで開きます。"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "%d の新しいウィンドウで開きます。"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "選択したフォルダを新しい Thunar ウィンドウで開きます。"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "選択したアイテムを開きます。"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "実行(_E)"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "選択したファイルを切り取ります。"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "アプリで開く"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "選択したファイルを削除します。"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "他のアプリケーション(_O)..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "他のアプリケーション:"
+
+#: ../thunar/thunar-launcher.c:841
+#, fuzzy
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] "選択した複数のファイル名 (複数のパスを含まない)"
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "アプリで開く"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr "壊れたリンク"
@@ -749,21 +857,11 @@ msgstr "開く位置を指定して下さい"
 msgid "_Location:"
 msgstr "フォルダの位置(_L):"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "「%s」の実行に失敗しました。"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (標準)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "他のアプリケーション..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "アイコンのサイズ"
@@ -1181,142 +1279,142 @@ msgstr "「%s」のマウントに失敗しました。"
 msgid "Failed to unmount \"%s\""
 msgstr "「%s」のマウント解除に失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "ファイルの右クリックメニュー"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "フォルダの右クリックメニュー"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr "フォルダを作成(_F)..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr "現在のフォルダに空のフォルダを作成します。"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "選択したファイルのプロパティを表示します。"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "コピー(_C)"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "選択したファイルをコピーします。"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "切り取り(_T)"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "選択したファイルを切り取ります。"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "貼り付け(_P)"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "削除(_D)"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "選択したファイルを削除します。"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "ファイルをフォルダに貼り付け"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "選択したフォルダにファイルを貼り付けます。"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "全てのファイルを選択(_A)"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "このウィンドウの全てのファイルを選択します。"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr "パターンで選択(_B)..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "ある特定のパターンに一致する全てのファイルを選択します。"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "コピーを作成(_P)"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr "選択したそれぞれのファイルのコピーを作成します。"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "リンクを作成(_K)"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "選択したそれぞれのファイルのリンクを作成します。"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "_Rename..."
 msgstr "名前変更(_R)..."
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "選択したファイルの名前を変更します。"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
 msgstr "文書を作成(_D)"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "フォルダの内容を読み込んでいます..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr "新規ファイル"
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File..."
 msgstr "新規ファイル..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr "新規フォルダ"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "新規フォルダ..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "テンプレート「%s」から文書を作成"
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1325,7 +1423,7 @@ msgstr ""
 "「%s」は永久に削除されます\n"
 "それでもよろしいですか?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1337,46 +1435,46 @@ msgstr[0] ""
 "選択したファイルは永久に削除されます\n"
 "それでもよろしいですか?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "削除されたファイルは永久に失われます。"
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "パターンで選択します"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "パターン:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, c-format
 msgid "Rename \"%s\""
 msgstr "「%s」の名前変更"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "「%s」の名前変更に失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "フォルダ「%s」を開くのに失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "コピー(_C)"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "切り取り(_T)"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "削除(_D)"
@@ -1391,228 +1489,228 @@ msgstr "テンプレートはインストールされていません"
 msgid "_Empty File"
 msgstr "空のファイル(_E)"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "新規ウィンドウを開く(_W)"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr "表示されている場所のウィンドウを新しく開きます。"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "全ウィンドウを閉じる(_A)"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Thunar の全てのウィンドウを閉じます。"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "このウィンドウを閉じます。"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr "環境設定(_P)..."
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr "Thunar の環境設定を変更します。"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr "再読込み(_R)"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "Reload the current folder"
 msgstr "現在のフォルダを再び読み込みます。"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr "位置セレクター(_L)"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "サイドペイン(_S)"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr "拡大(_I)"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr "アイコンおよびサムネイルを拡大表示します。"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr "アイコンおよびサムネイルを縮小表示します。"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr "普通のサイズ(_Z)"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr "アイコンおよびサムネイルを普通のサイズで表示します。"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "移動(_G)"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "上位フォルダを開く(_P)"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "上の階層にあるフォルダを開きます。"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr "ホーム(_H)"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "Go to the home folder"
 msgstr "ホームフォルダに移動します。"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr "テンプレート(_E)"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "Go to the templates folder"
 msgstr "テンプレートフォルダに移動します。"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "指定位置を開く(_L)..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "フォルダの位置を指定して開きます。"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "このプログラムについて(_A)"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Thunar についての情報を表示します。"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "隠しファイルを表示(_H)"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "現在のウィンドウで隠しファイルの表示/非表示を切り替えます。"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "St_atusbar"
 msgstr "ステータスバー(_A)"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr "ウィンドウのステータスバーを表示/隠します。"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr "ショートカット(_S)"
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "表示しない(_H)"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr "パスボタン方式(_T)"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "フォルダに対応するボタンを表示する今風の表示方式です。"
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr "ツールバー方式(_T)"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "位置バーおよびナビゲーションボタンを表示する旧来の表示方式です。"
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr "いずれの位置セレクターも表示しません。"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "アイコン表示(_I)"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr "フォルダの内容をアイコンで表示します。"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "リスト表示(_D)"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr "フォルダの内容を詳細なリストで表示します。"
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 msgid "Failed to open parent folder"
 msgstr "上位のフォルダを開くのに失敗しました。"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr "ホームフォルダを開くのに失敗しました。"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr "テンプレートについて"
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 "このフォルダにある全てのファイルは\n"
 "メニュー「文書を作成」に表示されます。"
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1628,15 +1726,15 @@ msgstr ""
 "その後で「文書を作成」メニューからこの項目を選択する事ができ、御覧になってい"
 "るフォルダに文書のコピーが作成されます。"
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr "このメッセージを再び表示しない(_N)"
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 msgid "Failed to open templates folder"
 msgstr "テンプレートフォルダを開くのに失敗しました。"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1644,7 +1742,7 @@ msgstr ""
 "Thunar は Xfce デスクトップ環境向けの\n"
 "使いやすい軽快なファイルマネージャーです。"
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "Daichi Kawahata <daichi@xfce.org>"
 
@@ -1956,3 +2054,9 @@ msgstr "ファイルマネージャー"
 #: ../Thunar.desktop.in.h:3
 msgid "Thunar File Manager"
 msgstr "Thunar ファイルマネージャー"
+
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "「%s」を開けません。"
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (標準)"
diff --git a/po/nl.po b/po/nl.po
index bf9f18785..a15d19d15 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-01-31 14:07+0100\n"
 "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -147,11 +147,46 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Het verwijderen van `%s' is mislukt: %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "Fout bij het laden van de applicatie van bestand %s"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+#, fuzzy
+msgid "Command"
+msgstr "_Commando:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "_Icoon:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Naam:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -170,7 +205,7 @@ msgstr "Pad te lang voor buffer"
 msgid "URI too long to fit into buffer"
 msgstr "URI te lang voor buffer"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Grootte"
 
@@ -387,8 +422,8 @@ msgstr "Mappen aan het maken..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "Fout bij het instellen van een standaard programma voor `%s'"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -409,8 +444,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "_Ander Programma..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Openen Met"
 
@@ -426,14 +460,14 @@ msgstr "_Bladeren"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "Fout bij het toevoegen van het nieuwe programma `%s'"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "Fout bij het uitvoeren van `%s'"
 
 #. update the header label
@@ -490,7 +524,7 @@ msgstr "Andere Programma's:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Er is niets op het klembord om te plakken"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Nieuwe naam invoeren:"
 
@@ -500,31 +534,27 @@ msgstr "Nieuwe naam invoeren:"
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr "Can bestandsnaam `%s' niet naar locale codering converteren"
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Naam:"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Toestemmingen"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Type"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Datum van laatste bewerking"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Gedetailleerde mappenweergave"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Gedetailleerde weergavemodus"
 
@@ -548,8 +578,7 @@ msgid "_Link here"
 msgstr "Hierheen een snelkoppeling maken"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Uitvoeren van bestand `%s' niet mogelijk"
@@ -558,7 +587,7 @@ msgstr "Uitvoeren van bestand `%s' niet mogelijk"
 msgid "The root folder has no parent"
 msgstr "Het hoofdmap heeft geen bovenliggende map"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr "Bestandssysteem"
 
@@ -587,121 +616,206 @@ msgstr ""
 "Het laden van het terugval-icoon van `%s' (%s) is mislukt. Kijk uw "
 "installatie na!"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "Items sor_teren"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Sorteren Op _Naam"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "Houd de items gesorteerd op naam in rijen"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Sorteren Op _Grootte"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr "Houd de items gesorteerd op grootte in rijen"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Sorteren Op _Type"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr "Houd de items gesorteerd op type in rijen"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Sorteren Op Berwerkings_datum"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr "Houd de items gesorteerd op bewerkingsdatum in rijen"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Oplopend"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Items soorteren in oplopende volgorde"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_Aflopend"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Items sorteren in aflopende volgorde"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr "Mapweergave gebaseerd op iconen"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Icoon weergavemodus"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Openen"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Geselecteerde items openen"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Openen in Nieuw Venster"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "De geselecteerde mappen in nieuwe Thunar-vensters openen"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Fout bij het openen van \"%s\"."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Ander Programma..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "pad naar het eerst geselecteerde bestand"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Fout bij het uitvoeren van `%s'"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Fout bij het wijzigen van de naam van `%s'"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "Fout bij het openen van het %dste bestand."
 msgstr[1] "Fout bij het openen van het %dste bestand."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "Weet u zeker dat u alle mappen wilt openen?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Dit zal in %d apart venster geopend worden."
 msgstr[1] "Dit zal in %d aparte vensters geopend worden."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Openen in %d nieuw venster"
+msgstr[1] "Openen in %d nieuwe vensters"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Openen in %d nieuw venster"
 msgstr[1] "Openen in %d nieuwe vensters"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "De geselecteerde mappen in nieuwe Thunar-vensters openen"
+msgstr[1] "De geselecteerde mappen in nieuwe Thunar-vensters openen"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Geselecteerde items openen"
+msgstr[1] "Geselecteerde items openen"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Uitvoeren"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "De geselecteerde bestanden knippen"
+msgstr[1] "De geselecteerde bestanden knippen"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Openen Met"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "De geselecteerde bestanden verwijderen"
+msgstr[1] "De geselecteerde bestanden verwijderen"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "_Ander Programma..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Andere Programma's:"
+
+#: ../thunar/thunar-launcher.c:841
+#, fuzzy
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] "geselecteerde bestandsnamen (zonder paden)"
+msgstr[1] "geselecteerde bestandsnamen (zonder paden)"
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Openen Met"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr "foute verwijzing"
@@ -758,21 +872,11 @@ msgstr "Locatie Openen"
 msgid "_Location:"
 msgstr "_Locatie"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr "Het openen van `%s' is mislukt"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (standaard)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Ander Programma..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Icoongrootte"
@@ -1190,145 +1294,145 @@ msgstr "Fout bij het wijzigen van de naam van `%s'"
 msgid "Failed to unmount \"%s\""
 msgstr "Fout bij het wijzigen van de naam van `%s'"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "Bestand Context Menu"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "Map Context Menu"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr "Maak _Map..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr "Maak een lege map in de huidige map"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Properties..."
 msgstr "_Eigenschappen"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "Bekijk de eigenschappen van het geselecteerde bestand"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "Bestanden _Kopiëren"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "Geselecteerde bestanden kopiëren"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "Bestanden Kn_ippen"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "De geselecteerde bestanden knippen"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "Bestanden _Plakken"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "Bestanden _Verwijderen"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "De geselecteerde bestanden verwijderen"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "Bestanden in Map Plakken"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Plak de bestanden in de geselecteerde map"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "_Alle Bestanden Selecteren"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Alle bestanden in dit venster selecteren"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr "_Op Patroon Selecteren"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Alle bestanden die aan een bepaald patroon voldoen selecteren"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Bestand Ver_dubbelen"
 msgstr[1] "Bestanden Ver_dubbelen"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr "Elk geselecteerde bestand verdubbelen"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Ma_ak Snelkoppeling"
 msgstr[1] "Ma_ak Snelkoppelingen"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "Maak een symbolische snelkoppeling voor elk geselecteerd bestand"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "Naam _Wijzigen"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "Naam van geselecteerd bestand wijzigen"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
 msgstr "Maak _Document"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Inhoud van de map aan het laden..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr "Nieuw Leeg Bestand"
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File..."
 msgstr "Nieuwe Leeg Bestand..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr "Nieuwe Map"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "Nieuwe Map..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Document van sjabloon \"%s\" maken"
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1337,7 +1441,7 @@ msgstr ""
 "Weet u zeker dat u\n"
 "\"%s\" voorgoed wilt verwijderen?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1352,48 +1456,48 @@ msgstr[1] ""
 "Weet u zeker dat u\n"
 "de geselecteerde bestanden voorgoed wilt verwijderen?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "Als u een bestand wist, is het voorgoed verloren."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Selecteren op Patroon"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Patroon:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "Naam _Wijzigen"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Fout bij het wijzigen van de naam van `%s'"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Fout bij het openen van de map `%s'"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "Bestand _Kopiëren"
 msgstr[1] "Bestanden _Kopiëren"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Bestand Kn_ippen"
 msgstr[1] "Bestanden Kn_ippen"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "Bestand _Verwijderen"
@@ -1409,228 +1513,228 @@ msgstr "Geen Sjablonen geïnstalleerd"
 msgid "_Empty File"
 msgstr "_Leeg Bestand"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Bestand"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Nieuw _Venster Openen"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Een nieuw Thunar-venster openen voor de weergegeven locatie"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "_Alle Vensters Sluiten"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Alle Thunar-vensters sluiten"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Sluiten"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Aanpassen"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr "Vo_orkeuren"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr "Voorkeuren van Thunar aanpassen"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Weergavemodus"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr "_Verversen"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "Reload the current folder"
 msgstr "Huidige map herladen"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr "_Locatie Selecteerder"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "_Zijpaneel"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr "_Inzoomen"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr "Inhoud gedetailleerder weergeven"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr "_Uitzoomen"
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr "Inhoud minder gedetailleerd weergeven"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr "Normale Gr_ootte"
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr "Inhoud op normale grootte weergeven"
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Gaan"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "_Bovenliggende Map Openen"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "De bovenliggende map openen"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr "_Persoonlijke Map"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "Go to the home folder"
 msgstr "Persoonlijke map openen"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr "S_jablonen"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "Go to the templates folder"
 msgstr "Ga naar de sjablonen map"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "_Locatie Openen..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Geef een locatie om te openen op"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Help"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_Over..."
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Geef informatie over Thunar weer"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "_Verborgen Bestanden Weergeven"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Schakelt het weergeven van verborgen bestanden aan/uit"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "St_atusbar"
 msgstr "St_atusbalk"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr "Zichtbaarheid van de statusbalk van dit venster veranderen"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr "_Sneltoetsen"
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "_Verborgen"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr "_Padbalk stijl"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Moderne benadering met knoppen die overeenkomen met mappen."
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr "_Werkbalk Stijl"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Traditionele benadering met locatiebalk en navigatieknoppen"
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr "Geen locatieselecteerder weergeven"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Bekijken als _Iconen"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr "Mapinhoud in icoon weergavemodus weergeven"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "Weergeven als _Gedetailleerde lijst"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr "Mapinhoud weergeven als gedetailleerde lijst"
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 msgid "Failed to open parent folder"
 msgstr "Fout bij het openen van de bovenliggende map"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr "Fout bij het openen van de persoonlijke map"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr "Over Sjablonen..."
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 "Alle bestanden in deze mappen zullen verschijnen in het \"Nieuw Document\" "
 "menu."
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 #, fuzzy
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
@@ -1647,16 +1751,16 @@ msgstr ""
 "U kunt het dan selecteren in het \"Nieuw Document\" menu, waarop een kopie "
 "van dit document wordt gemaakt naar de map die u op dat moment bekijkt."
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr "_Niet weer vragen"
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 msgid "Failed to open templates folder"
 msgstr "Fout bij het openen van de sjablonen map"
 
 # Desktop Environment in Dutch?
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 #, fuzzy
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
@@ -1665,7 +1769,7 @@ msgstr ""
 "Thunar is een snelle en gemakkelijke bestandsbeheerder\n"
 "voor de Xfce Bureaubladomgeving."
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "Vincent Tunru <imnotb@gmail.com>"
 
@@ -1988,6 +2092,12 @@ msgstr "Bestandsbeheerder"
 msgid "Thunar File Manager"
 msgstr "Thunar Bestandsbeheerder"
 
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Fout bij het openen van \"%s\"."
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (standaard)"
+
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Verborgen- en _backup bestanden laten zien"
 
diff --git a/po/pl.po b/po/pl.po
index 326f6f5b5..acfe2a25b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-01-13 14:21+0100\n"
 "Last-Translator: Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -139,11 +139,45 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Nie udało się usunąć pliku '%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "Nie udało się wczytać aplikacji z pliku %s"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+msgid "Command"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "Położenie:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -162,7 +196,7 @@ msgstr "Ścieżka jest zbyt długa"
 msgid "URI too long to fit into buffer"
 msgstr "Identyfikator URI jest zbyt długi"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -383,7 +417,7 @@ msgstr "Usuwam katalogi..."
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
 #, fuzzy, c-format
-msgid "Failed to set default application for `%s'"
+msgid "Failed to set default application for \"%s\""
 msgstr "Domyślna aplikacja dla pliku '%s' nie została wybrana."
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -404,8 +438,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "Inna aplikacja..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Otwórz z"
 
@@ -422,13 +455,13 @@ msgstr "_PrzeglÄ…daj"
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
 #, fuzzy, c-format
-msgid "Failed to add new application `%s'"
+msgid "Failed to add new application \"%s\""
 msgstr "Nie udało się dodać aplikacji %s."
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
 #, fuzzy, c-format
-msgid "Failed to execute `%s'"
+msgid "Failed to execute \"%s\""
 msgstr "Nie udało się uruchomić %s"
 
 #. update the header label
@@ -485,7 +518,7 @@ msgstr "Inne aplikacje:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "W schowku nie ma nic do wklejenia"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr ""
 
@@ -495,31 +528,27 @@ msgstr ""
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Nazwa"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Prawa dostępu"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Typ"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Ostatnia modyfikacja"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Pokazuj szczegóły elementów w katalogu"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Widok szczegółowy"
 
@@ -543,8 +572,7 @@ msgid "_Link here"
 msgstr "Utwórz _łacze"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, fuzzy, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Nie mogę wykonać pliku \"%s\"."
@@ -553,7 +581,7 @@ msgstr "Nie mogę wykonać pliku \"%s\"."
 msgid "The root folder has no parent"
 msgstr "Katalog główny nie ma katalogu nadrzędnego"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 #, fuzzy
 msgid "File System"
 msgstr "System plików"
@@ -581,114 +609,144 @@ msgstr "Przejdź do następnego katalogu"
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "Rozmieść elementy"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Sortuj według _nazwy"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "Utrzymuj elementy posortowane wierszami według nazwy"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Sortuj według _rozmiaru"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr "Utrzymuj elementy posortowane wierszami według rozmiaru"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Sortuj według _typu plików"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr "Utrzymuj elementy posortowane wierszami według typu plików"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Sortuj według _daty ostatniej modyfikacji"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 "Utrzymuj elementy posortowane wierszami według daty ostatniej modyfikacji"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "Ro_snÄ…co"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Sortuj elementy w porzÄ…dku rosnÄ…cym"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_MalejÄ…co"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Sortuj elementy w porzÄ…dku malejÄ…cym"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr "Pokazuj tylko ikony"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Widok ikon"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Otwórz zaznaczone elementy"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Otwórz w nowym oknie"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Otwórz wybrane katalogi w nowych oknach"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Nie mogę otworzyć \"%s\""
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Inna aplikacja..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "Wyświetl właściwości zaznaczonego elementu"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Nie udało się uruchomić %s"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Nie udało się zmienić nazwy %s."
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "Nie mogę otworzyć %d pliku."
 msgstr[1] "Nie mogę otworzyć %d plików."
 msgstr[2] "Nie mogę otworzyć %d plików."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "Czy na pewno chcesz otworzyć wszystkie katalogi?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Zostanie otwarte dodatkowe okno."
 msgstr[1] "ZostanÄ… otwarte %d dodatkowe okna."
 msgstr[2] "Zostanie otwartych %d dodatkowych okien."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Otwórz w nowym oknie"
+msgstr[1] "Otwórz w %d nowych oknach"
+msgstr[2] "Otwórz w %d nowych oknach"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
@@ -696,10 +754,69 @@ msgstr[0] "Otwórz w nowym oknie"
 msgstr[1] "Otwórz w %d nowych oknach"
 msgstr[2] "Otwórz w %d nowych oknach"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Otwórz wybrane katalogi w nowych oknach"
+msgstr[1] "Otwórz wybrane katalogi w nowych oknach"
+msgstr[2] "Otwórz wybrane katalogi w nowych oknach"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Otwórz zaznaczone elementy"
+msgstr[1] "Otwórz zaznaczone elementy"
+msgstr[2] "Otwórz zaznaczone elementy"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Uruchom"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Wytnij zaznaczone pliki"
+msgstr[1] "Wytnij zaznaczone pliki"
+msgstr[2] "Wytnij zaznaczone pliki"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Otwórz z"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Usuń zaznaczone pliki"
+msgstr[1] "Usuń zaznaczone pliki"
+msgstr[2] "Usuń zaznaczone pliki"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "Inna aplikacja..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Inne aplikacje:"
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Otwórz z"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr "nieprawidłowe łącze"
@@ -759,21 +876,11 @@ msgstr "Otwórz plik/katalog"
 msgid "_Location:"
 msgstr "Położenie:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Nie udało się usunąć '%s'"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (domyślna)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Inna aplikacja..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Rozmiar ikony"
@@ -1193,159 +1300,159 @@ msgstr "Nie udało się zmienić nazwy %s."
 msgid "Failed to unmount \"%s\""
 msgstr "Nie udało się zmienić nazwy %s."
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "Menu kontekstowe pliku"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "Menu kontekstowe katalogu"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Właściwości"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "Wyświetl właściwości zaznaczonego elementu"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "S_kopiuj pliki"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "Skopiuj zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "_Wytnij pliki"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "Wytnij zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "W_klej pliki"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "_Usuń pliki"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "Usuń zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "Wklej pliki do katalogu"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Wklej pliki do wybranego katalogu"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "Zaznacz wszystkie pliki"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Zaznacz wszystkie pliki w tym katalogu"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Zaznacz według wzorca"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Zaznacz wszystkie pliki pasujÄ…ce do wzorca"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Z_duplikuj plik"
 msgstr[1] "Z_duplikuj pliki"
 msgstr[2] "Z_duplikuj pliki"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr "Zduplikuj wszystkie zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Utwórz _łącze"
 msgstr[1] "Utwórz _łącza"
 msgstr[2] "Utwórz _łącza"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "Utwórz dowiązania do wszystkich zaznaczonych plików"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "Zmień _nazwę"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "Zmień nazwę zaznaczonego pliku"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Wczytuję zawartość katalogu..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Katalog"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder"
 msgstr "Katalog"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 #, fuzzy
 msgid "New Folder..."
 msgstr "Katalog"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "Czy na pewno chcesz trwale usunąć \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1357,50 +1464,50 @@ msgstr[0] "Czy na pewno chcesz trwale usunąć wybrany plik?"
 msgstr[1] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
 msgstr[2] "Czy na pewno chcesz trwale usunąć wybrane pliki?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "Jeśli usuniesz plik, nie będzie można go odzyskać."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Zaznacz według wzorca"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Wzorzec nazwy:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "Zmień _nazwę"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Nie udało się zmienić nazwy %s."
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Nie udało się otworzyć katalogu '%s': %s"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "S_kopiuj plik"
 msgstr[1] "S_kopiuj pliki"
 msgstr[2] "S_kopiuj pliki"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Wytnij plik"
 msgstr[1] "_Wytnij pliki"
 msgstr[2] "_Wytnij pliki"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Usuń plik"
@@ -1418,236 +1525,236 @@ msgstr ""
 msgid "_Empty File"
 msgstr "S_kopiuj plik"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Plik"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Otwórz nowe _okno"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Otwórz wyświetlaną zawartość w nowym oknie"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "Zamknij wszystkie okna"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Zamknij wszystkie okna menedżera plików Thunar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Zamknij to okno"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr ""
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Widok"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 #, fuzzy
 msgid "_Location Selector"
 msgstr "Pasek _położenia"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "Panel _boczny"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "P_rzejdź"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "W _górę"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "_Home"
 msgstr "Katalog domowy"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Przejdź do następnego katalogu"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "Otwórz plik/katalog..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Podaj położenie pliku/katalogu do otwarcia"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "O progr_amie"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Wyświetl informacje o programie Thunar"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "Pokaż _ukryte pliki"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Włącza/wyłącza pokazywanie ukrytych plików"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Tekst paska statusu"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "Niewidoczny"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 #, fuzzy
 msgid "_Pathbar Style"
 msgstr "Styl tradycyjny"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 #, fuzzy
 msgid "_Toolbar Style"
 msgstr "Styl tradycyjny"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Widok _ikon"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "Widok _szczegółowy"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Otwórz katalog nadrzędny"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Nie udało się otworzyć katalogu '%s': %s"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1657,16 +1764,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Otwórz katalog nadrzędny"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1674,7 +1781,7 @@ msgstr ""
 "Thunar to szybki i łatwy w użyciu menedżer plików\n"
 "dla środowiska Xfce Desktop Environment."
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "Tomasz Michał Łukaszewski <T.Lukaszewski@aster.pl>"
 
@@ -1976,6 +2083,12 @@ msgstr "Menedżer plików"
 msgid "Thunar File Manager"
 msgstr "Menedżer plików Thunar"
 
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Nie mogę otworzyć \"%s\""
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (domyślna)"
+
 #, fuzzy
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Pokaż _ukryte pliki"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 50d224153..70e59676b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2005-11-17 16:55+0900\n"
 "Last-Translator: Joao Pedrosa <joaopedrosa@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -139,11 +139,45 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Falha em remover `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr "Falha em carregar aplicação do arquivo %s"
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+msgid "Command"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "_Endereço:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Nome"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -162,7 +196,7 @@ msgstr "Caminho longo demais para caber no buffer"
 msgid "URI too long to fit into buffer"
 msgstr "URI longo demais para caber no buffer"
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Tamanho"
 
@@ -377,8 +411,8 @@ msgstr "Criando diretórios..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "Falha em configurar aplicação padrão para `%s'"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -399,8 +433,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "Outra Aplicação..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Abrir Com"
 
@@ -416,14 +449,14 @@ msgstr "_Navegar"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "Falha em adicionar nova aplicação `%s'"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "Falha em executar `%s'"
 
 #. update the header label
@@ -480,7 +513,7 @@ msgstr "Outras Aplicações:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Não há nada na área de transferência para colar"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Entre com o novo nome:"
 
@@ -490,31 +523,27 @@ msgstr "Entre com o novo nome:"
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr "Não pode converter nome de arquivo `%s' para a codificação local"
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Nome"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Permissões"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Tipo"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Data modificada"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr "Listagem de diretório detalhada"
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr "Visualização de detalhes"
 
@@ -538,8 +567,7 @@ msgid "_Link here"
 msgstr "_Ligue aqui"
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Incapaz de executar arquivo `%s'"
@@ -548,7 +576,7 @@ msgstr "Incapaz de executar arquivo `%s'"
 msgid "The root folder has no parent"
 msgstr "A pasta raiz não tem parente"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 #, fuzzy
 msgid "File System"
 msgstr "Sistema de Arquivos"
@@ -576,121 +604,205 @@ msgstr ""
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr "Or_ganizar itens"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Ordernar Por _Nome"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr "Manter itens organizados por seus nomes em linhas"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Ordenar Por T_amanho"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr "Manter itens ordenados por seus tamanhos em linhas"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Ordenar Por _Tipo"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr "Manter itens ordenados por seus tipos em linhas"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Ordenar Por _Data de Modificação"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr "Manter itens ordenados por suas datas de modificação em linhas"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "_Ascendente"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Ordenar itens em ordem ascendente"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "_Descendente"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Ordenar itens"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr "Listagem de diretório baseada em ícones"
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr "Visualização de ícone"
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Abrir os itens selecionados"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Abrir em Nova Janela"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Abrir os diretórios selecionados em novas janelas Thunar"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Incapaz de abrir \"%s\"."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Outra Aplicação..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "Visualizar as propriedades do arquivo selecionado"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Falha em executar `%s'"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Falha em renomear `%s'"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
 msgstr[0] "Incapaz de abrir %d arquivo."
 msgstr[1] "Incapaz de abrir %d arquivos."
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "Você tem certeza que deseja abrir todos as pastas?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Isto abrirá %d janela separada."
 msgstr[1] "Isto abrirá %d janelas separadas."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Abrir em %d Nova Janela"
+msgstr[1] "Abrir em %d Novas Janelas"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] "Abrir em %d Nova Janela"
 msgstr[1] "Abrir em %d Novas Janelas"
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Abrir os diretórios selecionados em novas janelas Thunar"
+msgstr[1] "Abrir os diretórios selecionados em novas janelas Thunar"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Abrir os itens selecionados"
+msgstr[1] "Abrir os itens selecionados"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr "_Executar"
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Recortar os arquivos selecionados"
+msgstr[1] "Recortar os arquivos selecionados"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Abrir Com"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Deletar os arquivos selecionados"
+msgstr[1] "Deletar os arquivos selecionados"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "Outra Aplicação..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Outras Aplicações:"
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Abrir Com"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr "ligação quebrada"
@@ -747,21 +859,11 @@ msgstr "Abrir Endereço"
 msgid "_Location:"
 msgstr "_Endereço:"
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, fuzzy, c-format
 msgid "Failed to launch `%s'"
 msgstr "Falha em lançar operação"
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr "%s (padrão)"
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Outra Aplicação..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr "Tamanho de ícone"
@@ -1180,149 +1282,149 @@ msgstr "Falha em renomear `%s'"
 msgid "Failed to unmount \"%s\""
 msgstr "Falha em renomear `%s'"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "Menu de Contexto de Arquivo"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "Menu de Contexto de Pasta"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr "Criar _Pasta..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr "Criar uma pasta vazia dentro da pasta atual"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 #, fuzzy
 msgid "_Properties..."
 msgstr "_Propriedades"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "Visualizar as propriedades do arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "_Copiar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "Copiar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "Recor_tar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "Recortar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "C_olar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "_Deletar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "Deletar os arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "Colar arquivos dentro da Pasta"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Colar arquivos dentro da pasta selecionada"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "Selecionar todos os _arquivos"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Selecionar todos os arquivos nesta janela"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 #, fuzzy
 msgid "Select _by Pattern..."
 msgstr "Selecionar por _Padrão"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Selecionar todos os arquivos que combinam com um certo padrão"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] "Du_plicar Arquivo"
 msgstr[1] "Du_plicar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr "Duplicar cada arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Fazer _Ligação"
 msgstr[1] "Fazer _Ligações"
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "Criar uma ligação simbólica para cada arquivo selecionado"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Renomear"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "Renomear o arquivo selecionado"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 #, fuzzy
 msgid "Create _Document"
 msgstr "Criar _Pasta..."
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr "Carregando conteúdos de pasta..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nova Pasta..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "Nova Pasta..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1331,7 +1433,7 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "deletar permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1346,48 +1448,48 @@ msgstr[1] ""
 "Você tem certeza que quer permanentemente\n"
 "deletar os %u arquivos selecionados?"
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "Se você deletar um arquivo, ele é permanentemente perdido."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Selecione por Padrão"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Padrão:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "_Renomear"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Falha em renomear `%s'"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Falha em abrir diretório `%s'"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copiar Arquivo"
 msgstr[1] "_Copiar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Recor_tar Arquivo"
 msgstr[1] "Recor_tar Arquivos"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Deletar Arquivo"
@@ -1404,233 +1506,233 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copiar Arquivo"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Abrir Nova _Janela"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Abrir uma nova janela Thunar para o endereço mostrado"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "Fechar Tod_as as Janelas"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Fechar todas as janelas Thunar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "Fe_char"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 #, fuzzy
 msgid "Pr_eferences..."
 msgstr "_Preferências"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 #, fuzzy
 msgid "Edit Thunars Preferences"
 msgstr "Editar Preferências do Thunar"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Visualização"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr "_Seletor de Endereço"
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "_Painel Lateral"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Ir"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "Abrir _Pai"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr "_Pasta Inicial"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Abrir a pasta inicial"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 msgid "T_emplates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr "Abrir _Endereço..."
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr "Especifique um endereço para abrir"
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Mostrar informação sobre o Thunar"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "Mostrar Arquivos Invisíveis"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Alterna a mostragem de arquivos invisíveis na janela atual"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 #, fuzzy
 msgid "St_atusbar"
 msgstr "Texto da barra de status"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 msgid "_Shortcuts"
 msgstr ""
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 msgid "_Hidden"
 msgstr "_Invisíveis"
 
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr "E_stilo da Barra de Caminho"
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr "Estilo moderno com botões que correspondem a pastas"
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr "Es_tilo Barra de Ferramentas"
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr "Estilo tradicional com barra de endereço e botões de navegação"
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr "Não mostre qualquer seletor de endereço"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr "Visualizar como Ícones"
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr "Mostrar conteúdo de pasta em uma visualização de ícone"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr "Visualizar como Lista _Detalhada"
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr "Mostrar conteúdo de pasta em uma visualização de lista detalhada"
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 #, fuzzy
 msgid "Failed to open parent folder"
 msgstr "Abrir a pasta pai"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr "Falha em abrir diretório inicial"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1640,16 +1742,16 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Abrir a pasta pai"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1657,7 +1759,7 @@ msgstr ""
 "Thunar é um gerenciador de arquivos fácil de usar e rápido\n"
 "para o Ambiente de Área de Trabalho Xfce."
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr "Créditos de tradutores"
 
@@ -1958,6 +2060,12 @@ msgstr "Gerenciador de Arquivos"
 msgid "Thunar File Manager"
 msgstr "Gerenciador de Arquivos Thunar"
 
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Incapaz de abrir \"%s\"."
+
+#~ msgid "%s (default)"
+#~ msgstr "%s (padrão)"
+
 #~ msgid "Show hidden and _backup files"
 #~ msgstr "Mostrar arquivos de _backup e invisíveis"
 
diff --git a/po/ru.po b/po/ru.po
index 0b03c96a5..d722abc69 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.1svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-04 02:49+0100\n"
+"POT-Creation-Date: 2006-02-06 00:32+0100\n"
 "PO-Revision-Date: 2006-01-29 17:47+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -140,11 +140,46 @@ msgstr ""
 msgid "Failed to remove `%s': %s"
 msgstr "Не удалось удалить `%s': %s"
 
-#: ../thunar-vfs/thunar-vfs-mime-database.c:1657
+#: ../thunar-vfs/thunar-vfs-mime-database.c:1656
 #, c-format
 msgid "Failed to load application from file %s"
 msgstr ""
 
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:134
+#, fuzzy
+msgid "Command"
+msgstr "_Команда:"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:135
+msgid "The command to run the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:147
+msgid "Flags"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:148
+msgid "The flags for the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:163
+#, fuzzy
+msgid "Icon"
+msgstr "Просмотр в виде значков"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:164
+msgid "The icon of the mime handler"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:176
+#: ../thunar/thunar-details-view.c:171
+msgid "Name"
+msgstr "Имя"
+
+#: ../thunar-vfs/thunar-vfs-mime-handler.c:177
+msgid "The name of the mime handler"
+msgstr ""
+
 #: ../thunar-vfs/thunar-vfs-mime-info.c:228
 #, c-format
 msgid "%s document"
@@ -163,7 +198,7 @@ msgstr ""
 msgid "URI too long to fit into buffer"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:189
+#: ../thunar-vfs/thunar-vfs-thumb.c:176 ../thunar/thunar-details-view.c:190
 msgid "Size"
 msgstr "Размер"
 
@@ -378,8 +413,8 @@ msgstr "Создание каталогов..."
 #. tell the user that it didn't work
 #. display an error to the user
 #: ../thunar/thunar-chooser-button.c:281 ../thunar/thunar-chooser-dialog.c:479
-#, c-format
-msgid "Failed to set default application for `%s'"
+#, fuzzy, c-format
+msgid "Failed to set default application for \"%s\""
 msgstr "Не удалось назначить приложение по умолчанию для `%s'"
 
 #: ../thunar/thunar-chooser-button.c:367
@@ -400,8 +435,7 @@ msgstr ""
 msgid "_Other Application..."
 msgstr "_Другое приложение..."
 
-#. the "Open with" action
-#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:227
+#: ../thunar/thunar-chooser-dialog.c:204 ../thunar/thunar-launcher.c:122
 msgid "Open With"
 msgstr "Открыть с помощью"
 
@@ -417,14 +451,14 @@ msgstr "_Обзор"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:457
-#, c-format
-msgid "Failed to add new application `%s'"
+#, fuzzy, c-format
+msgid "Failed to add new application \"%s\""
 msgstr "Не удалось добавить приложение `%s'"
 
 #. display an error to the user
 #: ../thunar/thunar-chooser-dialog.c:492
-#, c-format
-msgid "Failed to execute `%s'"
+#, fuzzy, c-format
+msgid "Failed to execute \"%s\""
 msgstr "Не удалось запустить `%s'"
 
 #. update the header label
@@ -481,7 +515,7 @@ msgstr "Другие приложения:"
 msgid "There is nothing on the clipboard to paste"
 msgstr "Буфер обмена пуст"
 
-#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2030
+#: ../thunar/thunar-create-dialog.c:177 ../thunar/thunar-standard-view.c:2015
 msgid "Enter the new name:"
 msgstr "Введите новое имя:"
 
@@ -491,31 +525,27 @@ msgstr "Введите новое имя:"
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:170
-msgid "Name"
-msgstr "Имя"
-
 #.
 #. Permissions chooser
 #.
-#: ../thunar/thunar-details-view.c:204
+#: ../thunar/thunar-details-view.c:205
 #: ../thunar/thunar-properties-dialog.c:416
 msgid "Permissions"
 msgstr "Права"
 
-#: ../thunar/thunar-details-view.c:219
+#: ../thunar/thunar-details-view.c:220
 msgid "Type"
 msgstr "Тип"
 
-#: ../thunar/thunar-details-view.c:231
+#: ../thunar/thunar-details-view.c:232
 msgid "Date modified"
 msgstr "Дата изменения"
 
-#: ../thunar/thunar-details-view.c:260
+#: ../thunar/thunar-details-view.c:261
 msgid "Detailed directory listing"
 msgstr ""
 
-#: ../thunar/thunar-details-view.c:261
+#: ../thunar/thunar-details-view.c:262
 msgid "Details view"
 msgstr ""
 
@@ -539,8 +569,7 @@ msgid "_Link here"
 msgstr ""
 
 #. display an error to the user
-#. display an error message to the user
-#: ../thunar/thunar-dnd.c:191 ../thunar/thunar-launcher.c:344
+#: ../thunar/thunar-dnd.c:191
 #, c-format
 msgid "Unable to execute file `%s'"
 msgstr "Не удалось запустить файл `%s'"
@@ -549,7 +578,7 @@ msgstr "Не удалось запустить файл `%s'"
 msgid "The root folder has no parent"
 msgstr "Корневой каталог не имеет родительского каталога"
 
-#: ../thunar/thunar-file.c:1016
+#: ../thunar/thunar-file.c:1011
 msgid "File System"
 msgstr "Файловая система"
 
@@ -576,122 +605,212 @@ msgstr ""
 msgid "Failed to load fallback icon from `%s' (%s). Check your installation!"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:126
 msgid "Arran_ge Items"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Name"
 msgstr "Сортировать по _имени"
 
-#: ../thunar/thunar-icon-view.c:130
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By _Size"
 msgstr "Сортировать по _размеру"
 
-#: ../thunar/thunar-icon-view.c:131
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Sort By _Type"
 msgstr "Сортировать по _типу"
 
-#: ../thunar/thunar-icon-view.c:132
+#: ../thunar/thunar-icon-view.c:133
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Sort By Modification _Date"
 msgstr "Сортировать по _дате"
 
-#: ../thunar/thunar-icon-view.c:133
+#: ../thunar/thunar-icon-view.c:134
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "_Ascending"
 msgstr "По _возрастанию"
 
-#: ../thunar/thunar-icon-view.c:138
+#: ../thunar/thunar-icon-view.c:139
 msgid "Sort items in ascending order"
 msgstr "Сортировать по возрастанию"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "_Descending"
 msgstr "По _убыванию"
 
-#: ../thunar/thunar-icon-view.c:139
+#: ../thunar/thunar-icon-view.c:140
 msgid "Sort items in descending order"
 msgstr "Сортировать по убыванию"
 
-#: ../thunar/thunar-icon-view.c:327
+#: ../thunar/thunar-icon-view.c:328
 msgid "Icon based directory listing"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:328
+#: ../thunar/thunar-icon-view.c:329
 msgid "Icon view"
 msgstr ""
 
-#. the "Open" action
 #. append the "Open" menu action
-#: ../thunar/thunar-launcher.c:219 ../thunar/thunar-launcher.c:551
-#: ../thunar/thunar-launcher.c:569 ../thunar/thunar-shortcuts-view.c:359
+#: ../thunar/thunar-launcher.c:119 ../thunar/thunar-launcher.c:749
+#: ../thunar/thunar-shortcuts-view.c:359
 msgid "_Open"
 msgstr "_Открыть"
 
-#: ../thunar/thunar-launcher.c:219
-msgid "Open the selected items"
+#: ../thunar/thunar-launcher.c:119
+#, fuzzy
+msgid "Open the selected files"
 msgstr "Открыть выбранные файлы"
 
-#. the "Open in New Window" action
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:223 ../thunar/thunar-shortcuts-view.c:370
+#: ../thunar/thunar-launcher.c:120 ../thunar/thunar-shortcuts-view.c:370
 msgid "Open in New Window"
 msgstr "Открыть в новом окне"
 
-#: ../thunar/thunar-launcher.c:223
+#: ../thunar/thunar-launcher.c:120
 msgid "Open the selected directories in new Thunar windows"
 msgstr "Открыть выбранные папки в новых окнах"
 
-#: ../thunar/thunar-launcher.c:377
-#, c-format
-msgid "Unable to open \"%s\"."
-msgstr "Не удалось открыть \"%s\"."
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#, fuzzy
+msgid "Open With Other _Application..."
+msgstr "Другое приложение..."
 
-#: ../thunar/thunar-launcher.c:382
-#, c-format
-msgid "Unable to open %d file."
-msgid_plural "Unable to open %d files."
-msgstr[0] ""
-msgstr[1] ""
+#: ../thunar/thunar-launcher.c:121 ../thunar/thunar-launcher.c:123
+#: ../thunar/thunar-launcher.c:832
+msgid "Choose another application with which to open the selected file"
+msgstr ""
+
+#: ../thunar/thunar-launcher.c:122
+#, fuzzy
+msgid "Choose a program with which to open the selected file"
+msgstr "Просмотреть свойства выбранного файла"
+
+#. display an error message to the user
+#: ../thunar/thunar-launcher.c:496
+#, fuzzy, c-format
+msgid "Failed to execute file \"%s\""
+msgstr "Не удалось запустить `%s'"
+
+#: ../thunar/thunar-launcher.c:591
+#, fuzzy, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Не удалось переименовать `%s'"
+
+#. we can just tell that n files failed to open
+#: ../thunar/thunar-launcher.c:597
+#, fuzzy, c-format
+msgid "Failed to open %d file"
+msgid_plural "Failed to open %d files"
+msgstr[0] "Не удалось открыть родительский каталог"
+msgstr[1] "Не удалось открыть родительский каталог"
+msgstr[2] "Не удалось открыть родительский каталог"
 
-#: ../thunar/thunar-launcher.c:488
+#: ../thunar/thunar-launcher.c:633
 msgid "Are you sure you want to open all folders?"
 msgstr "Вы уверены, что хотите открыть все каталоги?"
 
-#: ../thunar/thunar-launcher.c:490
-#, c-format
-msgid "This will open %d separate window."
-msgid_plural "This will open %d separate windows."
+#: ../thunar/thunar-launcher.c:635
+#, fuzzy, c-format
+msgid "This will open %d separate file manager window."
+msgid_plural "This will open %d separate file manager windows."
 msgstr[0] "Это откроет %d отдельное окно."
 msgstr[1] "Это откроет %d отдельных окна."
 msgstr[2] "Это откроет %d отдельных окон."
 
-#: ../thunar/thunar-launcher.c:549
+#: ../thunar/thunar-launcher.c:639
+#, fuzzy, c-format
+msgid "Open %d New Window"
+msgid_plural "Open %d New Windows"
+msgstr[0] "Открыть в новом окне"
+msgstr[1] "Открыть в новом окне"
+msgstr[2] "Открыть в новом окне"
+
+#. turn "Open" into "Open in n New Windows"
+#: ../thunar/thunar-launcher.c:733
 #, c-format
 msgid "Open in %d New Window"
 msgid_plural "Open in %d New Windows"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-launcher.c:567
+#: ../thunar/thunar-launcher.c:734
+#, fuzzy, c-format
+msgid "Open the selected directory in %d new window"
+msgid_plural "Open the selected directories in %d new windows"
+msgstr[0] "Открыть выбранные папки в новых окнах"
+msgstr[1] "Открыть выбранные папки в новых окнах"
+msgstr[2] "Открыть выбранные папки в новых окнах"
+
+#: ../thunar/thunar-launcher.c:751
+#, fuzzy
+msgid "Open the selected file"
+msgid_plural "Open the selected files"
+msgstr[0] "Открыть выбранные файлы"
+msgstr[1] "Открыть выбранные файлы"
+msgstr[2] "Открыть выбранные файлы"
+
+#: ../thunar/thunar-launcher.c:800
 msgid "_Execute"
 msgstr ""
 
+#: ../thunar/thunar-launcher.c:801
+#, fuzzy
+msgid "Execute the selected file"
+msgid_plural "Execute the selected files"
+msgstr[0] "Вырезать выбранные файлы"
+msgstr[1] "Вырезать выбранные файлы"
+msgstr[2] "Вырезать выбранные файлы"
+
+#. turn the "Open" action into "Open With DEFAULT"
+#: ../thunar/thunar-launcher.c:807
+#, fuzzy, c-format
+msgid "_Open With \"%s\""
+msgstr "Открыть с помощью"
+
+#: ../thunar/thunar-launcher.c:808 ../thunar/thunar-launcher.c:895
+#, fuzzy, c-format
+msgid "Use \"%s\" to open the selected file"
+msgid_plural "Use \"%s\" to open the selected files"
+msgstr[0] "Удалить выбранные файлы"
+msgstr[1] "Удалить выбранные файлы"
+msgstr[2] "Удалить выбранные файлы"
+
+#: ../thunar/thunar-launcher.c:831
+#, fuzzy
+msgid "_Open With Other Application..."
+msgstr "_Другое приложение..."
+
+#: ../thunar/thunar-launcher.c:840
+#, fuzzy
+msgid "_Open With Default Applications"
+msgstr "Другие приложения:"
+
+#: ../thunar/thunar-launcher.c:841
+msgid "Open the selected file with the default application"
+msgid_plural "Open the selected files with the default applications"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../thunar/thunar-launcher.c:894
+#, fuzzy, c-format
+msgid "Open With \"%s\""
+msgstr "Открыть с помощью"
+
 #: ../thunar/thunar-list-model.c:711 ../thunar/thunar-properties-dialog.c:674
 msgid "broken link"
 msgstr ""
@@ -748,21 +867,11 @@ msgstr ""
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1452
+#: ../thunar/thunar-location-entry.c:326 ../thunar/thunar-window.c:1463
 #, c-format
 msgid "Failed to launch `%s'"
 msgstr ""
 
-#: ../thunar/thunar-open-with-action.c:351
-#, c-format
-msgid "%s (default)"
-msgstr ""
-
-#. add our custom children
-#: ../thunar/thunar-open-with-action.c:402
-msgid "Other Application..."
-msgstr "Другое приложение..."
-
 #: ../thunar/thunar-path-entry.c:250
 msgid "Icon size"
 msgstr ""
@@ -1170,155 +1279,155 @@ msgstr "Не удалось переименовать `%s'"
 msgid "Failed to unmount \"%s\""
 msgstr "Не удалось переименовать `%s'"
 
-#: ../thunar/thunar-standard-view.c:276
+#: ../thunar/thunar-standard-view.c:274
 msgid "File Context Menu"
 msgstr "Контекстное меню файла"
 
-#: ../thunar/thunar-standard-view.c:277
+#: ../thunar/thunar-standard-view.c:275
 msgid "Folder Context Menu"
 msgstr "Контекстное меню папки"
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create _Folder..."
 msgstr "Создать _каталог..."
 
-#: ../thunar/thunar-standard-view.c:278
+#: ../thunar/thunar-standard-view.c:276
 msgid "Create an empty folder within the current folder"
 msgstr "Создать пустой каталог внутри текущего"
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "_Properties..."
 msgstr "_Свойства..."
 
-#: ../thunar/thunar-standard-view.c:279
+#: ../thunar/thunar-standard-view.c:277
 msgid "View the properties of the selected file"
 msgstr "Просмотреть свойства выбранного файла"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "_Copy Files"
 msgstr "_Копировать файлы"
 
-#: ../thunar/thunar-standard-view.c:280
+#: ../thunar/thunar-standard-view.c:278
 msgid "Copy the selected files"
 msgstr "Копировать выбранные файлы"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cu_t Files"
 msgstr "_Вырезать файлы"
 
-#: ../thunar/thunar-standard-view.c:281
+#: ../thunar/thunar-standard-view.c:279
 msgid "Cut the selected files"
 msgstr "Вырезать выбранные файлы"
 
-#: ../thunar/thunar-standard-view.c:282
+#: ../thunar/thunar-standard-view.c:280
 msgid "_Paste Files"
 msgstr "Вст_авить файлы"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "_Delete Files"
 msgstr "_Удалить файлы"
 
-#: ../thunar/thunar-standard-view.c:283
+#: ../thunar/thunar-standard-view.c:281
 msgid "Delete the selected files"
 msgstr "Удалить выбранные файлы"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste Files into Folder"
 msgstr "Вставить файлы в каталог"
 
-#: ../thunar/thunar-standard-view.c:284
+#: ../thunar/thunar-standard-view.c:282
 msgid "Paste files into the selected folder"
 msgstr "Вставить файлы в выбранный каталог"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select _all Files"
 msgstr "Выбрать вс_е файлы"
 
-#: ../thunar/thunar-standard-view.c:285
+#: ../thunar/thunar-standard-view.c:283
 msgid "Select all files in this window"
 msgstr "Выбрать все файлы в этом окне"
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select _by Pattern..."
 msgstr "Выбрать по _шаблону..."
 
-#: ../thunar/thunar-standard-view.c:286
+#: ../thunar/thunar-standard-view.c:284
 msgid "Select all files that match a certain pattern"
 msgstr "Выбрать все файлы, удовлетворяющие заданному шаблону"
 
-#: ../thunar/thunar-standard-view.c:287 ../thunar/thunar-standard-view.c:2923
+#: ../thunar/thunar-standard-view.c:285 ../thunar/thunar-standard-view.c:2908
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:287
+#: ../thunar/thunar-standard-view.c:285
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:288 ../thunar/thunar-standard-view.c:2929
+#: ../thunar/thunar-standard-view.c:286 ../thunar/thunar-standard-view.c:2914
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:288
+#: ../thunar/thunar-standard-view.c:286
 msgid "Create a symbolic link for each selected file"
 msgstr "Создать символическую ссылку для каждого выбранного файла"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Переименовать"
 
-#: ../thunar/thunar-standard-view.c:289
+#: ../thunar/thunar-standard-view.c:287
 msgid "Rename the selected file"
 msgstr "Переименовать выбранный файл"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:522
+#: ../thunar/thunar-standard-view.c:520
 #, fuzzy
 msgid "Create _Document"
 msgstr "Создать _документ"
 
-#: ../thunar/thunar-standard-view.c:1118
+#: ../thunar/thunar-standard-view.c:1103
 msgid "Loading folder contents..."
 msgstr ""
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File"
 msgstr "Новый файл"
 
-#: ../thunar/thunar-standard-view.c:1504
+#: ../thunar/thunar-standard-view.c:1489
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Создание пустого файла..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder"
 msgstr "Новый каталог"
 
-#: ../thunar/thunar-standard-view.c:1555
+#: ../thunar/thunar-standard-view.c:1540
 msgid "New Folder..."
 msgstr "Создание каталога..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1604
+#: ../thunar/thunar-standard-view.c:1589
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Создать документ по шаблону \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1755
+#: ../thunar/thunar-standard-view.c:1740
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1760
+#: ../thunar/thunar-standard-view.c:1745
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1329,50 +1438,50 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1782
+#: ../thunar/thunar-standard-view.c:1767
 msgid "If you delete a file, it is permanently lost."
 msgstr "Если вы удалите файл, он будет утрачен навсегда."
 
-#: ../thunar/thunar-standard-view.c:1847
+#: ../thunar/thunar-standard-view.c:1832
 msgid "Select by Pattern"
 msgstr "Выбрать по шаблону"
 
-#: ../thunar/thunar-standard-view.c:1862
+#: ../thunar/thunar-standard-view.c:1847
 msgid "Pattern:"
 msgstr "Шаблон:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2001
+#: ../thunar/thunar-standard-view.c:1986
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "_Переименовать"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:2072
+#: ../thunar/thunar-standard-view.c:2057
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Не удалось переименовать `%s'"
 
-#: ../thunar/thunar-standard-view.c:2646
+#: ../thunar/thunar-standard-view.c:2631
 #, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Не удалось открыть папку: '%s'"
 
-#: ../thunar/thunar-standard-view.c:2896
+#: ../thunar/thunar-standard-view.c:2881
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Копировать файл"
 msgstr[1] "_Копировать файлы"
 msgstr[2] "_Копировать файлы"
 
-#: ../thunar/thunar-standard-view.c:2902
+#: ../thunar/thunar-standard-view.c:2887
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Вырезать файл"
 msgstr[1] "_Вырезать файлы"
 msgstr[2] "_Вырезать файлы"
 
-#: ../thunar/thunar-standard-view.c:2911
+#: ../thunar/thunar-standard-view.c:2896
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] "_Удалить файл"
@@ -1390,169 +1499,169 @@ msgstr "Нет шаблонов"
 msgid "_Empty File"
 msgstr "Пустой _файл"
 
-#: ../thunar/thunar-window.c:214
+#: ../thunar/thunar-window.c:216
 msgid "_File"
 msgstr "_Файл"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 msgid "Open New _Window"
 msgstr "Открыть _новое окно"
 
-#: ../thunar/thunar-window.c:215
+#: ../thunar/thunar-window.c:217
 #, fuzzy
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Открыть новое окно Thunar для текущего адреса"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close _All Windows"
 msgstr "Закрыть вс_е окна"
 
-#: ../thunar/thunar-window.c:216
+#: ../thunar/thunar-window.c:218
 msgid "Close all Thunar windows"
 msgstr "Закрыть все окна Thunar"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "_Close"
 msgstr "_Закрыть"
 
-#: ../thunar/thunar-window.c:217
+#: ../thunar/thunar-window.c:219
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:220
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Pr_eferences..."
 msgstr "_Настройки..."
 
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:221
 msgid "Edit Thunars Preferences"
 msgstr "Редактировать настройки Thunar"
 
-#: ../thunar/thunar-window.c:220
+#: ../thunar/thunar-window.c:222
 msgid "_View"
 msgstr "_Вид"
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 msgid "_Reload"
 msgstr ""
 
-#: ../thunar/thunar-window.c:221
+#: ../thunar/thunar-window.c:223
 #, fuzzy
 msgid "Reload the current folder"
 msgstr "Открыть родительский каталог"
 
-#: ../thunar/thunar-window.c:222
+#: ../thunar/thunar-window.c:224
 msgid "_Location Selector"
 msgstr ""
 
-#: ../thunar/thunar-window.c:223
+#: ../thunar/thunar-window.c:225
 msgid "_Side Pane"
 msgstr "_Боковая панель"
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Zoom _In"
 msgstr ""
 
-#: ../thunar/thunar-window.c:224
+#: ../thunar/thunar-window.c:226
 msgid "Show the contents in more detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Zoom _Out"
 msgstr ""
 
-#: ../thunar/thunar-window.c:225
+#: ../thunar/thunar-window.c:227
 msgid "Show the contents in less detail"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Normal Si_ze"
 msgstr ""
 
-#: ../thunar/thunar-window.c:226
+#: ../thunar/thunar-window.c:228
 msgid "Show the contents at the normal size"
 msgstr ""
 
-#: ../thunar/thunar-window.c:227
+#: ../thunar/thunar-window.c:229
 msgid "_Go"
 msgstr "_Переход"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open _Parent"
 msgstr "_Родительский каталог"
 
-#: ../thunar/thunar-window.c:228
+#: ../thunar/thunar-window.c:230
 msgid "Open the parent folder"
 msgstr "Открыть родительский каталог"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 msgid "_Home"
 msgstr "_Домашний каталог"
 
-#: ../thunar/thunar-window.c:229
+#: ../thunar/thunar-window.c:231
 #, fuzzy
 msgid "Go to the home folder"
 msgstr "Открыть домашний каталог"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "T_emplates"
 msgstr "_Шаблоны"
 
-#: ../thunar/thunar-window.c:230
+#: ../thunar/thunar-window.c:232
 #, fuzzy
 msgid "Go to the templates folder"
 msgstr "Перейти в каталог шаблонов"
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Open _Location..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:231
+#: ../thunar/thunar-window.c:233
 msgid "Specify a location to open"
 msgstr ""
 
-#: ../thunar/thunar-window.c:232
+#: ../thunar/thunar-window.c:234
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "_About"
 msgstr "_О программе"
 
-#: ../thunar/thunar-window.c:233
+#: ../thunar/thunar-window.c:235
 msgid "Display information about Thunar"
 msgstr "Показать информацию о Thunar"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 msgid "Show _Hidden Files"
 msgstr "Показывать _скрытые файлы"
 
-#: ../thunar/thunar-window.c:238
+#: ../thunar/thunar-window.c:240
 #, fuzzy
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Показывать скрытые файлы"
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "St_atusbar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:239
+#: ../thunar/thunar-window.c:241
 msgid "Change the visibility of this window's statusbar"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:475
+#: ../thunar/thunar-window.c:477
 #, fuzzy
 msgid "_Shortcuts"
 msgstr "_Значки"
 
-#: ../thunar/thunar-window.c:481 ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:483 ../thunar/thunar-window.c:506
 #, fuzzy
 msgid "_Hidden"
 msgstr "_Скрыть"
@@ -1560,64 +1669,64 @@ msgstr "_Скрыть"
 #.
 #. * add the location selector options
 #.
-#: ../thunar/thunar-window.c:490
+#: ../thunar/thunar-window.c:492
 msgid "_Pathbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:491
+#: ../thunar/thunar-window.c:493
 msgid "Modern approach with buttons that correspond to folders"
 msgstr ""
 
-#: ../thunar/thunar-window.c:497
+#: ../thunar/thunar-window.c:499
 msgid "_Toolbar Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:498
+#: ../thunar/thunar-window.c:500
 msgid "Traditional approach with location bar and navigation buttons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:504
+#: ../thunar/thunar-window.c:506
 msgid "Don't display any location selector"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:513
+#: ../thunar/thunar-window.c:515
 msgid "Display folder content in an icon view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "View as _Detailed List"
 msgstr ""
 
-#: ../thunar/thunar-window.c:520
+#: ../thunar/thunar-window.c:522
 msgid "Display folder content in a detailed list view"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1266
+#: ../thunar/thunar-window.c:1277
 msgid "Failed to open parent folder"
 msgstr "Не удалось открыть родительский каталог"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:1292
+#: ../thunar/thunar-window.c:1303
 msgid "Failed to open home directory"
 msgstr "Не удалось открыть домашний каталог"
 
 #. display the "About Templates" dialog
-#: ../thunar/thunar-window.c:1354
+#: ../thunar/thunar-window.c:1365
 msgid "About Templates"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1375
+#: ../thunar/thunar-window.c:1386
 msgid "All files in this folder will appear in the \"Create Document\" menu."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1382
+#: ../thunar/thunar-window.c:1393
 msgid ""
 "If you frequently create certain kinds of documents, make a copy of one and "
 "put it in this folder. Thunar will add an entry for this document in the "
@@ -1627,22 +1736,22 @@ msgid ""
 "of the document will be created in the directory you are viewing."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1394
+#: ../thunar/thunar-window.c:1405
 msgid "Do _not display this message again"
 msgstr ""
 
-#: ../thunar/thunar-window.c:1407
+#: ../thunar/thunar-window.c:1418
 #, fuzzy
 msgid "Failed to open templates folder"
 msgstr "Не удалось открыть родительский каталог"
 
-#: ../thunar/thunar-window.c:1498
+#: ../thunar/thunar-window.c:1509
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:1503
+#: ../thunar/thunar-window.c:1514
 msgid "translator-credits"
 msgstr ""
 "Андрей Федосеев <andrey.fedoseev@gmail.com>\n"
@@ -1927,3 +2036,6 @@ msgstr "Файловый менеджер"
 #: ../Thunar.desktop.in.h:3
 msgid "Thunar File Manager"
 msgstr "Файловый менеджер Thunar"
+
+#~ msgid "Unable to open \"%s\"."
+#~ msgstr "Не удалось открыть \"%s\"."
diff --git a/thunar-uca/thunar-uca-chooser.c b/thunar-uca/thunar-uca-chooser.c
index 560010421..f66197a34 100644
--- a/thunar-uca/thunar-uca-chooser.c
+++ b/thunar-uca/thunar-uca-chooser.c
@@ -450,7 +450,13 @@ thunar_uca_chooser_delete_clicked (ThunarUcaChooser *uca_chooser)
   /* verify that we have an item selected and determine the iter for that item */
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uca_chooser->treeview));
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
-    thunar_uca_model_remove (THUNAR_UCA_MODEL (model), &iter);
+    {
+      /* remove the row from the model */
+      thunar_uca_model_remove (THUNAR_UCA_MODEL (model), &iter);
+
+      /* sync the model to persistent storage */
+      thunar_uca_chooser_save (uca_chooser, THUNAR_UCA_MODEL (model));
+    }
 }
 
 
diff --git a/thunar-vfs/Makefile.am b/thunar-vfs/Makefile.am
index f2ea15388..42b4d0cd5 100644
--- a/thunar-vfs/Makefile.am
+++ b/thunar-vfs/Makefile.am
@@ -17,8 +17,10 @@ libthunar_vfs_headers =							\
 	thunar-vfs-info.h						\
 	thunar-vfs-interactive-job.h					\
 	thunar-vfs-job.h						\
+	thunar-vfs-mime-action.h					\
 	thunar-vfs-mime-application.h					\
 	thunar-vfs-mime-database.h					\
+	thunar-vfs-mime-handler.h					\
 	thunar-vfs-mime-info.h						\
 	thunar-vfs-monitor.h						\
 	thunar-vfs-path.h						\
@@ -65,10 +67,14 @@ libthunar_vfs_1_la_SOURCES =						\
 	thunar-vfs-link-job.h						\
 	thunar-vfs-listdir-job.c					\
 	thunar-vfs-listdir-job.h					\
+	thunar-vfs-mime-action-private.h				\
+	thunar-vfs-mime-action.c					\
 	thunar-vfs-mime-application.c					\
 	thunar-vfs-mime-cache.c						\
 	thunar-vfs-mime-cache.h						\
 	thunar-vfs-mime-database.c					\
+	thunar-vfs-mime-handler-private.h				\
+	thunar-vfs-mime-handler.c					\
 	thunar-vfs-mime-info.c						\
 	thunar-vfs-mime-legacy.c					\
 	thunar-vfs-mime-legacy.h					\
diff --git a/thunar-vfs/thunar-vfs-mime-action-private.h b/thunar-vfs/thunar-vfs-mime-action-private.h
new file mode 100644
index 000000000..d0f71c0f0
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-mime-action-private.h
@@ -0,0 +1,50 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef __THUNAR_VFS_MIME_ACTION_PRIVATE_H__
+#define __THUNAR_VFS_MIME_ACTION_PRIVATE_H__
+
+#include <thunar-vfs/thunar-vfs-mime-action.h>
+#include <thunar-vfs/thunar-vfs-mime-handler-private.h>
+
+G_BEGIN_DECLS;
+
+struct _ThunarVfsMimeActionClass
+{
+  ThunarVfsMimeHandlerClass __parent__;
+};
+
+struct _ThunarVfsMimeAction
+{
+  ThunarVfsMimeHandler __parent__;
+};
+
+ThunarVfsMimeAction *_thunar_vfs_mime_action_new (const gchar              *command,
+                                                  const gchar              *name,
+                                                  const gchar              *icon,
+                                                  ThunarVfsMimeHandlerFlags flags) G_GNUC_INTERNAL G_GNUC_MALLOC;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_MIME_ACTION_PRIVATE_H__ */
diff --git a/thunar-vfs/thunar-vfs-mime-action.c b/thunar-vfs/thunar-vfs-mime-action.c
new file mode 100644
index 000000000..742b31961
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-mime-action.c
@@ -0,0 +1,92 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; 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 <thunar-vfs/thunar-vfs-mime-action-private.h>
+#include <thunar-vfs/thunar-vfs-mime-action.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+
+
+GType
+thunar_vfs_mime_action_get_type (void)
+{
+  static GType type = G_TYPE_INVALID;
+
+  if (G_UNLIKELY (type == G_TYPE_INVALID))
+    {
+      static const GTypeInfo info =
+      {
+        sizeof (ThunarVfsMimeActionClass),
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        sizeof (ThunarVfsMimeAction),
+        0,
+        NULL,
+        NULL,
+      };
+
+      type = g_type_register_static (THUNAR_VFS_TYPE_MIME_HANDLER, I_("ThunarVfsMimeAction"), &info, 0);
+    }
+
+  return type;
+}
+
+
+
+/**
+ * _thunar_vfs_mime_action_new:
+ * @command : the command for the mime action.
+ * @name    : the name for the mime action.
+ * @icon    : the icon for the mime action or %NULL.
+ * @flags   : the #ThunarVfsMimeHandlerFlags for the mime action.
+ *
+ * Allocates a new #ThunarVfsMimeAction with the given
+ * parameters.
+ *
+ * Return value: the newly allocated #ThunarVfsMimeAction.
+ **/
+ThunarVfsMimeAction*
+_thunar_vfs_mime_action_new (const gchar              *command,
+                             const gchar              *name,
+                             const gchar              *icon,
+                             ThunarVfsMimeHandlerFlags flags)
+{
+  g_return_val_if_fail (g_utf8_validate (name, -1, NULL), NULL);
+  g_return_val_if_fail (command != NULL, NULL);
+
+  return g_object_new (THUNAR_VFS_TYPE_MIME_ACTION,
+                       "command", command,
+                       "flags", flags,
+                       "icon", icon,
+                       "name", name,
+                       NULL);
+}
+
+
+
+#define __THUNAR_VFS_MIME_ACTION_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-mime-action.h b/thunar-vfs/thunar-vfs-mime-action.h
new file mode 100644
index 000000000..223f8ec7e
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-mime-action.h
@@ -0,0 +1,46 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef __THUNAR_VFS_MIME_ACTION_H__
+#define __THUNAR_VFS_MIME_ACTION_H__
+
+#include <thunar-vfs/thunar-vfs-mime-handler.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarVfsMimeActionClass ThunarVfsMimeActionClass;
+typedef struct _ThunarVfsMimeAction      ThunarVfsMimeAction;
+
+#define THUNAR_VFS_TYPE_MIME_ACTION             (thunar_vfs_mime_action_get_type ())
+#define THUNAR_VFS_MIME_ACTION(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_MIME_ACTION, ThunarVfsMimeAction))
+#define THUNAR_VFS_MIME_ACTION_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_MIME_ACTION, ThunarVfsMimeActionClass))
+#define THUNAR_VFS_IS_MIME_ACTION(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_MIME_ACTION))
+#define THUNAR_VFS_IS_MIME_ACTION_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_MIME_ACTION))
+#define THUNAR_VFS_MIME_ACTION_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_MIME_ACTION, ThunarVfsMimeActionClass))
+
+GType thunar_vfs_mime_action_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_MIME_ACTION_H__ */
diff --git a/thunar-vfs/thunar-vfs-mime-application.c b/thunar-vfs/thunar-vfs-mime-application.c
index 7df9d5764..e7463883f 100644
--- a/thunar-vfs/thunar-vfs-mime-application.c
+++ b/thunar-vfs/thunar-vfs-mime-application.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -29,37 +29,39 @@
 #include <string.h>
 #endif
 
-#include <exo/exo.h>
-
 #include <thunar-vfs/thunar-vfs-exec.h>
+#include <thunar-vfs/thunar-vfs-mime-action-private.h>
 #include <thunar-vfs/thunar-vfs-mime-application.h>
 #include <thunar-vfs/thunar-vfs-util.h>
 #include <thunar-vfs/thunar-vfs-alias.h>
 
 
 
-static gboolean thunar_vfs_mime_application_get_argv (const ThunarVfsMimeApplication *application,
-                                                      GList                          *path_list,
-                                                      gint                           *argc,
-                                                      gchar                        ***argv,
-                                                      GError                        **error);
+static void thunar_vfs_mime_application_class_init  (ThunarVfsMimeApplicationClass  *klass);
+static void thunar_vfs_mime_application_finalize    (GObject                        *object);
 
 
 
+struct _ThunarVfsMimeApplicationClass
+{
+  ThunarVfsMimeHandlerClass __parent__;
+};
+
 struct _ThunarVfsMimeApplication
 {
-  gint                          ref_count;
-  gchar                        *binary_name;
-  gchar                        *desktop_id;
-  gchar                        *exec;
-  gchar                        *icon;
-  gchar                        *name;
-  gchar                       **mime_types;
-  ThunarVfsMimeApplicationFlags flags;
+  ThunarVfsMimeHandler __parent__;
+
+  GList  *actions;
+  gchar  *desktop_id;
+  gchar **mime_types;
 };
 
 
 
+static GObjectClass *thunar_vfs_mime_application_parent_class;
+
+
+
 GType
 thunar_vfs_mime_application_get_type (void)
 {
@@ -67,9 +69,21 @@ thunar_vfs_mime_application_get_type (void)
 
   if (G_UNLIKELY (type == G_TYPE_INVALID))
     {
-      type = g_boxed_type_register_static (I_("ThunarVfsMimeApplication"),
-                                           (GBoxedCopyFunc) thunar_vfs_mime_application_ref,
-                                           (GBoxedFreeFunc) thunar_vfs_mime_application_unref);
+      static const GTypeInfo info =
+      {
+        sizeof (ThunarVfsMimeApplicationClass),
+        NULL,
+        NULL,
+        (GClassInitFunc) thunar_vfs_mime_application_class_init,
+        NULL,
+        NULL,
+        sizeof (ThunarVfsMimeApplication),
+        0,
+        NULL,
+        NULL,
+      };
+
+      type = g_type_register_static (THUNAR_VFS_TYPE_MIME_HANDLER, I_("ThunarVfsMimeApplication"), &info, 0);
     }
 
   return type;
@@ -77,16 +91,34 @@ thunar_vfs_mime_application_get_type (void)
 
 
 
-static gboolean
-thunar_vfs_mime_application_get_argv (const ThunarVfsMimeApplication *application,
-                                      GList                          *path_list,
-                                      gint                           *argc,
-                                      gchar                        ***argv,
-                                      GError                        **error)
+static void
+thunar_vfs_mime_application_class_init (ThunarVfsMimeApplicationClass *klass)
 {
-  return thunar_vfs_exec_parse (application->exec, path_list, application->icon, application->name, NULL,
-                                (application->flags & THUNAR_VFS_MIME_APPLICATION_REQUIRES_TERMINAL) != 0,
-                                argc, argv, error);
+  GObjectClass *gobject_class;
+
+  /* determine the parent type class */
+  thunar_vfs_mime_application_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = thunar_vfs_mime_application_finalize;
+}
+
+
+
+static void
+thunar_vfs_mime_application_finalize (GObject *object)
+{
+  ThunarVfsMimeApplication *mime_application = THUNAR_VFS_MIME_APPLICATION (object);
+
+  /* release the mime actions */
+  g_list_foreach (mime_application->actions, (GFunc) g_object_unref, NULL);
+  g_list_free (mime_application->actions);
+
+  /* release our attributes */
+  g_strfreev (mime_application->mime_types);
+  g_free (mime_application->desktop_id);
+
+  (*G_OBJECT_CLASS (thunar_vfs_mime_application_parent_class)->finalize) (object);
 }
 
 
@@ -99,7 +131,7 @@ thunar_vfs_mime_application_get_argv (const ThunarVfsMimeApplication *applicatio
  * referenced by @desktop_id. Returns %NULL if @desktop_id is not valid.
  *
  * The caller is responsible to free the returned instance using
- * thunar_vfs_mime_application_unref().
+ * g_object_unref() when no longer needed.
  *
  * Return value: the #ThunarVfsMimeApplication for @desktop_id or %NULL.
  **/
@@ -152,7 +184,7 @@ thunar_vfs_mime_application_new_from_desktop_id (const gchar *desktop_id)
  * described by @path and @desktop_id.
  *
  * The caller is responsible to free the returned instance using
- * thunar_vfs_mime_application_unref().
+ * g_object_unref() when no longer needed.
  *
  * You should really seldomly use this function and always
  * prefer thunar_vfs_mime_application_new_from_desktop_id().
@@ -164,15 +196,19 @@ ThunarVfsMimeApplication*
 thunar_vfs_mime_application_new_from_file (const gchar *path,
                                            const gchar *desktop_id)
 {
+  ThunarVfsMimeHandlerFlags flags = 0;
   ThunarVfsMimeApplication *application = NULL;
+  ThunarVfsMimeAction      *action;
   const gchar              *exec;
   const gchar              *icon;
   const gchar              *name;
   XfceRc                   *rc;
-  gchar                   **argv;
+  gchar                    *command;
+  gchar                   **actions;
+  gchar                    *group;
   gchar                   **ms;
   gchar                   **mt;
-  gint                      argc;
+  guint                     n;
 
   g_return_val_if_fail (g_path_is_absolute (path), NULL);
   g_return_val_if_fail (desktop_id != NULL && *desktop_id != '\0', NULL);
@@ -184,24 +220,34 @@ thunar_vfs_mime_application_new_from_file (const gchar *path,
 
   /* parse the file */
   xfce_rc_set_group (rc, "Desktop Entry");
-  exec = xfce_rc_read_entry (rc, "Exec", NULL);
   name = xfce_rc_read_entry (rc, "Name", NULL);
-  icon = xfce_rc_read_entry (rc, "Icon", NULL);
+  exec = xfce_rc_read_entry_untranslated (rc, "Exec", NULL);
+  icon = xfce_rc_read_entry_untranslated (rc, "Icon", NULL);
 
   /* generate the application object */
-  if (G_LIKELY (exec != NULL && name != NULL && g_shell_parse_argv (exec, &argc, &argv, NULL)))
+  if (G_LIKELY (exec != NULL && name != NULL && g_utf8_validate (name, -1, NULL)))
     {
-      application = g_new0 (ThunarVfsMimeApplication, 1);
-      application->ref_count = 1;
+      /* we assume %f if the application hasn't set anything else,
+       * as that's also what KDE and Gnome do in this case.
+       */
+      if (strstr (exec, "%f") == NULL && strstr (exec, "%F") == NULL && strstr (exec, "%u") == NULL && strstr (exec, "%U") == NULL)
+        command = g_strconcat (exec, " %f", NULL);
+      else
+        command = g_strdup (exec);
 
-      application->binary_name = g_path_get_basename (argv[0]);
-      application->desktop_id = g_strdup (desktop_id);
-      application->name = g_strdup (name);
-      application->icon = g_strdup (icon);
+      /* determine the flags for the application */
+      if (G_UNLIKELY (xfce_rc_read_bool_entry (rc, "Terminal", FALSE)))
+        flags |= THUNAR_VFS_MIME_HANDLER_REQUIRES_TERMINAL;
+      if (xfce_rc_read_bool_entry (rc, "Hidden", FALSE) || xfce_rc_read_bool_entry (rc, "NoDisplay", FALSE))
+        flags |= THUNAR_VFS_MIME_HANDLER_HIDDEN;
+      if (xfce_rc_read_bool_entry (rc, "StartupNotify", FALSE) || xfce_rc_read_bool_entry (rc, "X-KDE-StartupNotify", FALSE))
+        flags |= THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY;
+      if ((strstr (command, "%F") != NULL) || (strstr (command, "%U") != NULL))
+        flags |= THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI;
 
-      /* strip off known suffixes for image files if a themed icon is specified */
-      if (application->icon != NULL && !g_path_is_absolute (application->icon) && g_str_has_suffix (application->icon, ".png"))
-        application->icon[strlen (application->icon) - 4] = '\0';
+      /* allocate a new application instance */
+      application = g_object_new (THUNAR_VFS_TYPE_MIME_APPLICATION, "command", command, "flags", flags, "icon", icon, "name", name, NULL);
+      application->desktop_id = g_strdup (desktop_id);
 
       /* determine the list of mime types supported by the application */
       application->mime_types = xfce_rc_read_list_entry (rc, "MimeType", ";");
@@ -230,27 +276,51 @@ thunar_vfs_mime_application_new_from_file (const gchar *path,
             }
         }
 
-      /* we assume %f if the application hasn't set anything else,
-       * as that's also what KDE and Gnome do in this case.
-       */
-      if (strstr (exec, "%f") == NULL && strstr (exec, "%F") == NULL && strstr (exec, "%u") == NULL && strstr (exec, "%U") == NULL)
-        application->exec = g_strconcat (exec, " %f", NULL);
-      else
-        application->exec = g_strdup (exec);
-
-      if (G_UNLIKELY (xfce_rc_read_bool_entry (rc, "Terminal", FALSE)))
-        application->flags |= THUNAR_VFS_MIME_APPLICATION_REQUIRES_TERMINAL;
-
-      if (xfce_rc_read_bool_entry (rc, "Hidden", FALSE) || xfce_rc_read_bool_entry (rc, "NoDisplay", FALSE))
-        application->flags |= THUNAR_VFS_MIME_APPLICATION_HIDDEN;
-
-      if (xfce_rc_read_bool_entry (rc, "StartupNotify", FALSE) || xfce_rc_read_bool_entry (rc, "X-KDE-StartupNotify", FALSE))
-        application->flags |= THUNAR_VFS_MIME_APPLICATION_SUPPORTS_STARTUP_NOTIFY;
+      /* determine the list of desktop actions supported by the application */
+      actions = xfce_rc_read_list_entry (rc, "Actions", ";");
+      if (G_UNLIKELY (actions != NULL))
+        {
+          /* add ThunarVfsMimeAction's for all specified desktop actions */
+          for (n = 0; actions[n] != NULL; ++n)
+            {
+              /* determine the group name */
+              group = g_strconcat ("Desktop Action ", actions[n], NULL);
+              if (xfce_rc_has_group (rc, group))
+                {
+                  /* determine the attributes for the action */
+                  xfce_rc_set_group (rc, group);
+                  name = xfce_rc_read_entry (rc, "Name", NULL);
+                  exec = xfce_rc_read_entry_untranslated (rc, "Exec", NULL);
+                  icon = xfce_rc_read_entry_untranslated (rc, "Icon", NULL);
+
+                  /* check if the required attributes were given */
+                  if (exec != NULL && name != NULL && g_utf8_validate (name, -1, NULL))
+                    {
+                      /* check if the actions support multiple files */
+                      if ((strstr (exec, "%F") != NULL) || (strstr (exec, "%U") != NULL))
+                        flags |= THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI;
+                      else
+                        flags &= ~THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI;
+
+                      /* don't trust application maintainers! :-) */
+                      flags &= ~THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY;
+
+                      /* allocate and add the mime action instance */
+                      action = _thunar_vfs_mime_action_new (exec, name, (icon != NULL) ? icon : THUNAR_VFS_MIME_HANDLER (application)->icon, flags);
+                      application->actions = g_list_append (application->actions, action);
+                    }
+                }
+
+              /* release the group name */
+              g_free (group);
+            }
 
-      if ((strstr (application->exec, "%F") != NULL) || (strstr (application->exec, "%U") != NULL))
-        application->flags |= THUNAR_VFS_MIME_APPLICATION_SUPPORTS_MULTI;
+          /* cleanup */
+          g_strfreev (actions);
+        }
 
-      g_strfreev (argv);
+      /* cleanup */
+      g_free (command);
     }
 
   /* close the file */
@@ -262,291 +332,95 @@ thunar_vfs_mime_application_new_from_file (const gchar *path,
 
 
 /**
- * thunar_vfs_mime_application_ref:
- * @application : a #ThunarVfsMimeApplication.
- *
- * Increases the reference count on @application by one
- * and returns the reference to @application.
- *
- * Return value: a reference to @application.
+ * thunar_vfs_mime_application_get_actions:
+ * @mime_application : a #ThunarVfsMimeApplication.
+ *
+ * Returns the list of #ThunarVfsMimeAction<!---->s available
+ * for the @mime_application. The #ThunarVfsMimeAction<!---->s
+ * are an implementation of the desktop actions mentioned in
+ * the desktop entry specification.
+ *
+ * The caller is responsible to free the returned list using
+ * <informalexample><programlisting>
+ * g_list_foreach (list, (GFunc) g_object_unref, NULL);
+ * g_list_free (list);
+ * </programlisting></informalexample>
+ * when no longer needed.
+ *
+ * Return value: the list of #ThunarVfsMimeAction<!---->s
+ *               for the @mime_application.
  **/
-ThunarVfsMimeApplication*
-thunar_vfs_mime_application_ref (ThunarVfsMimeApplication *application)
+GList*
+thunar_vfs_mime_application_get_actions (ThunarVfsMimeApplication *mime_application)
 {
-  exo_atomic_inc (&application->ref_count);
-  return application;
-}
+  GList *mime_actions;
 
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_APPLICATION (mime_application), NULL);
 
+  /* take a deep copy of the mime actions list */
+  mime_actions = g_list_copy (mime_application->actions);
+  g_list_foreach (mime_actions, (GFunc) g_object_ref, NULL);
 
-/**
- * thunar_vfs_mime_application_unref:
- * @application : a #ThunarVfsMimeApplication.
- *
- * Decreases the reference count on @application and frees
- * the @application object once the reference count drops
- * to zero.
- **/
-void
-thunar_vfs_mime_application_unref (ThunarVfsMimeApplication *application)
-{
-  if (exo_atomic_dec (&application->ref_count))
-    {
-      /* free resources */
-      g_strfreev (application->mime_types);
-      g_free (application->binary_name);
-      g_free (application->desktop_id);
-      g_free (application->exec);
-      g_free (application->icon);
-      g_free (application->name);
-      g_free (application);
-    }
-}
-
-
-
-/**
- * thunar_vfs_mime_application_get_command:
- * @application : a #ThunarVfsMimeApplication.
- *
- * Returns the command line to run @application.
- *
- * Return value: the command to run @application.
- **/
-const gchar*
-thunar_vfs_mime_application_get_command (const ThunarVfsMimeApplication *application)
-{
-  return application->exec;
+  return mime_actions;
 }
 
 
 
 /**
  * thunar_vfs_mime_application_get_desktop_id:
- * @application : a #ThunarVfsMimeApplication.
+ * @mime_application : a #ThunarVfsMimeApplication.
  *
- * Returns the desktop-id of @application.
+ * Returns the desktop-id of @mime_application.
  *
- * Return value: the desktop-id of @application.
+ * Return value: the desktop-id of @mime_application.
  **/
 const gchar*
-thunar_vfs_mime_application_get_desktop_id (const ThunarVfsMimeApplication *application)
+thunar_vfs_mime_application_get_desktop_id (const ThunarVfsMimeApplication *mime_application)
 {
-  return application->desktop_id;
-}
-
-
-
-/**
- * thunar_vfs_mime_application_get_flags:
- * @application : a #ThunarVfsMimeApplication.
- *
- * Returns the flags for @application.
- *
- * Return value: the flags for @application.
- **/
-ThunarVfsMimeApplicationFlags
-thunar_vfs_mime_application_get_flags (const ThunarVfsMimeApplication *application)
-{
-  return application->flags;
-}
-
-
-
-/**
- * thunar_vfs_mime_application_get_name:
- * @application : a #ThunarVfsMimeApplication.
- *
- * Returns the generic name of @application.
- *
- * Return value: the generic name of @application.
- **/
-const gchar*
-thunar_vfs_mime_application_get_name (const ThunarVfsMimeApplication *application)
-{
-  return application->name;
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_APPLICATION (mime_application), NULL);
+  return mime_application->desktop_id;
 }
 
 
 
 /**
  * thunar_vfs_mime_application_get_mime_types:
- * @application : a #ThunarVfsMimeApplication.
+ * @mime_application : a #ThunarVfsMimeApplication.
  *
  * Returns the list of MIME-types supported by @application
- * or %NULL if the @application doesn't support any MIME-types
+ * or %NULL if the @mime_application doesn't support any MIME-types
  * at all.
  *
  * The returned %NULL-terminated string array is owned by
- * @application and must not be free by the caller.
+ * @mime_application and must not be free by the caller.
  *
- * Return value: the list of supported MIME-types for @application.
+ * Return value: the list of supported MIME-types for @mime_application.
  **/
 const gchar* const*
-thunar_vfs_mime_application_get_mime_types (const ThunarVfsMimeApplication *application)
-{
-  return (gconstpointer) application->mime_types;
-}
-
-
-
-/**
- * thunar_vfs_mime_application_exec:
- * @application : a #ThunarVfsMimeApplication.
- * @screen      : a #GdkScreen or %NULL to use the default screen.
- * @path_list   : a list of #ThunarVfsPath<!---->s to open.
- * @error       : return location for errors or %NULL.
- *
- * Wrapper to thunar_vfs_mime_application_exec_with_env(), which
- * simply passes a %NULL pointer for the environment variables.
- *
- * Return value: %TRUE if the execution succeed, else %FALSE.
- **/
-gboolean
-thunar_vfs_mime_application_exec (const ThunarVfsMimeApplication *application,
-                                  GdkScreen                      *screen,
-                                  GList                          *path_list,
-                                  GError                        **error)
-{
-  return thunar_vfs_mime_application_exec_with_env (application, screen, path_list, NULL, error);
-}
-
-
-
-/**
- * thunar_vfs_mime_application_exec_with_env:
- * @application : a #ThunarVfsMimeApplication.
- * @screen      : a #GdkScreen or %NULL to use the default screen.
- * @path_list   : a list of #ThunarVfsPath<!---->s to open.
- * @envp        : child's environment or %NULL to inherit parent's.
- * @error       : return location for errors or %NULL.
- *
- * Executes @application on @screen using the given @path_list. If
- * @path_list contains more than one #ThunarVfsPath and @application
- * doesn't support opening multiple documents at once, one
- * instance of @application will be spawned for every #ThunarVfsPath
- * given in @path_list.
- *
- * Return value: %TRUE if the execution succeed, else %FALSE.
- **/
-gboolean
-thunar_vfs_mime_application_exec_with_env (const ThunarVfsMimeApplication *application,
-                                           GdkScreen                      *screen,
-                                           GList                          *path_list,
-                                           gchar                         **envp,
-                                           GError                        **error)
+thunar_vfs_mime_application_get_mime_types (const ThunarVfsMimeApplication *mime_application)
 {
-  ThunarVfsPath *parent;
-  gboolean       result = TRUE;
-  GList          list;
-  GList         *lp;
-  gchar         *working_directory;
-  gchar        **argv;
-  gint           argc;
-
-  g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
-  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-  /* fallback to the default screen if no screen is given */
-  if (G_UNLIKELY (screen == NULL))
-    screen = gdk_screen_get_default ();
-
-  /* check whether the application can open multiple documents at once */
-  if (G_LIKELY ((application->flags & THUNAR_VFS_MIME_APPLICATION_SUPPORTS_MULTI) == 0))
-    {
-      for (lp = path_list; lp != NULL; lp = lp->next)
-        {
-          /* use a short list with only one entry */
-          list.data = lp->data;
-          list.next = NULL;
-          list.prev = NULL;
-
-          /* figure out the argument vector to run the application */
-          if (!thunar_vfs_mime_application_get_argv (application, &list, &argc, &argv, error))
-            return FALSE;
-
-          /* use the paths base directory as working directory for the application */
-          parent = thunar_vfs_path_get_parent (list.data);
-          working_directory = (parent != NULL) ? thunar_vfs_path_dup_string (parent) : NULL;
-
-          /* try to spawn the application */
-          result = thunar_vfs_exec_on_screen (screen, working_directory, argv, envp, G_SPAWN_SEARCH_PATH,
-                                              application->flags & THUNAR_VFS_MIME_APPLICATION_SUPPORTS_STARTUP_NOTIFY, error);
-
-          /* cleanup */
-          g_free (working_directory);
-          g_strfreev (argv);
-
-          /* check if we succeed */
-          if (G_UNLIKELY (!result))
-            break;
-        }
-    }
-  else
-    {
-      /* we can open all documents at once */
-      if (!thunar_vfs_mime_application_get_argv (application, path_list, &argc, &argv, error))
-        return FALSE;
-
-      /* use the first paths base directory as working directory for the application */
-      parent = (path_list != NULL) ? thunar_vfs_path_get_parent (path_list->data) : NULL;
-      working_directory = (parent != NULL) ? thunar_vfs_path_dup_string (parent) : NULL;
-
-      /* try to spawn the application */
-      result = thunar_vfs_exec_on_screen (screen, working_directory, argv, envp, G_SPAWN_SEARCH_PATH,
-                                          application->flags & THUNAR_VFS_MIME_APPLICATION_SUPPORTS_STARTUP_NOTIFY, error);
-
-      /* cleanup */
-      g_free (working_directory);
-      g_strfreev (argv);
-    }
-
-  return result;
-}
-
-
-
-/**
- * thunar_vfs_mime_application_lookup_icon_name:
- * @application : a #ThunarVfsMimeApplication.
- * @icon_theme  : a #GtkIconTheme.
- *
- * Looks up the icon name for @application in
- * @icon_theme. Returns %NULL if no suitable
- * icon is present in @icon_theme.
- *
- * Return value: the icon name for @application or
- *               %NULL.
- **/
-const gchar*
-thunar_vfs_mime_application_lookup_icon_name (const ThunarVfsMimeApplication *application,
-                                              GtkIconTheme                   *icon_theme)
-{
-  if (application->icon != NULL && (g_path_is_absolute (application->icon) || gtk_icon_theme_has_icon (icon_theme, application->icon)))
-    return application->icon;
-  else if (application->binary_name != NULL && gtk_icon_theme_has_icon (icon_theme, application->binary_name))
-    return application->binary_name;
-  else
-    return NULL;
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_APPLICATION (mime_application), NULL);
+  return (gconstpointer) mime_application->mime_types;
 }
 
 
 
 /**
  * thunar_vfs_mime_application_hash:
- * @application : a #ThunarVfsMimeApplication.
+ * @mime_application : a #ThunarVfsMimeApplication.
  *
- * Converts @application to a hash value. It can be passed
- * to g_hash_table_new() as the @hash_func parameter,
+ * Converts @mime_application to a hash value. It can be 
+ * passed to g_hash_table_new() as the @hash_func parameter,
  * when using #ThunarVfsMimeApplication<!---->s as keys
  * in a #GHashTable.
  *
  * Return value: a hash value corresponding to the key.
  **/
 guint
-thunar_vfs_mime_application_hash (gconstpointer application)
+thunar_vfs_mime_application_hash (gconstpointer mime_application)
 {
-  return g_str_hash (((const ThunarVfsMimeApplication *) application)->desktop_id);
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_APPLICATION (mime_application), 0);
+  return g_str_hash (THUNAR_VFS_MIME_APPLICATION (mime_application)->desktop_id);
 }
 
 
@@ -564,9 +438,8 @@ gboolean
 thunar_vfs_mime_application_equal (gconstpointer a,
                                    gconstpointer b)
 {
-  const ThunarVfsMimeApplication *a_application = a;
-  const ThunarVfsMimeApplication *b_application = b;
-  return (strcmp (a_application->desktop_id, b_application->desktop_id) == 0);
+  return exo_str_is_equal (THUNAR_VFS_MIME_APPLICATION (a)->desktop_id,
+                           THUNAR_VFS_MIME_APPLICATION (b)->desktop_id);
 }
 
 
diff --git a/thunar-vfs/thunar-vfs-mime-application.h b/thunar-vfs/thunar-vfs-mime-application.h
index b4186fbbe..eafbf26b4 100644
--- a/thunar-vfs/thunar-vfs-mime-application.h
+++ b/thunar-vfs/thunar-vfs-mime-application.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -18,36 +18,26 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#endif
+
 #ifndef __THUNAR_VFS_MIME_APPLICATION_H__
 #define __THUNAR_VFS_MIME_APPLICATION_H__
 
-#include <gdk/gdk.h>
-
-#include <thunar-vfs/thunar-vfs-path.h>
+#include <thunar-vfs/thunar-vfs-mime-handler.h>
 
 G_BEGIN_DECLS;
 
-/**
- * ThunarVfsMimeApplicationFlags:
- * @THUNAR_VFS_MIME_APPLICATION_HIDDEN                  : the application should not be displayed in the menu system.
- * @THUNAR_VFS_MIME_APPLICATION_REQUIRES_TERMINAL       : the application must be run in a terminal.
- * @THUNAR_VFS_MIME_APPLICATION_SUPPORTS_STARTUP_NOTIFY : the application supports startup notification.
- * @THUNAR_VFS_MIME_APPLICATION_SUPPORTS_MULTI          : the application supports opening multiple documents at once (%F or %U).
- *
- * Various flags associated with a #ThunarVfsMimeApplication.
- **/
-typedef enum /*< flags >*/
-{
-  THUNAR_VFS_MIME_APPLICATION_HIDDEN                  = (1 << 0L),
-  THUNAR_VFS_MIME_APPLICATION_REQUIRES_TERMINAL       = (1 << 1L),
-  THUNAR_VFS_MIME_APPLICATION_SUPPORTS_STARTUP_NOTIFY = (1 << 2L),
-  THUNAR_VFS_MIME_APPLICATION_SUPPORTS_MULTI          = (1 << 3L),
-} ThunarVfsMimeApplicationFlags;
-
+typedef struct _ThunarVfsMimeApplicationClass ThunarVfsMimeApplicationClass;
+typedef struct _ThunarVfsMimeApplication      ThunarVfsMimeApplication;
 
-typedef struct _ThunarVfsMimeApplication ThunarVfsMimeApplication;
-
-#define THUNAR_VFS_TYPE_MIME_APPLICATION (thunar_vfs_mime_application_get_type ())
+#define THUNAR_VFS_TYPE_MIME_APPLICATION            (thunar_vfs_mime_application_get_type ())
+#define THUNAR_VFS_MIME_APPLICATION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_MIME_APPLICATION, ThunarVfsMimeApplication))
+#define THUNAR_VFS_MIME_APPLICATION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_MIME_APPLICATION, ThunarVfsMimeApplicationClass))
+#define THUNAR_VFS_IS_MIME_APPLICATION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_MIME_APPLICATION))
+#define THUNAR_VFS_IS_MIME_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_MIME_APPLICATION))
+#define THUNAR_VFS_MIME_APPLICATION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_MIME_APPLICATION, ThunarVfsMimeApplicationClass))
 
 GType                         thunar_vfs_mime_application_get_type            (void) G_GNUC_CONST;
 
@@ -55,31 +45,43 @@ ThunarVfsMimeApplication     *thunar_vfs_mime_application_new_from_desktop_id (c
 ThunarVfsMimeApplication     *thunar_vfs_mime_application_new_from_file       (const gchar                    *path,
                                                                                const gchar                    *desktop_id) G_GNUC_MALLOC;
 
-ThunarVfsMimeApplication     *thunar_vfs_mime_application_ref                 (ThunarVfsMimeApplication       *application);
-void                          thunar_vfs_mime_application_unref               (ThunarVfsMimeApplication       *application);
+GList                        *thunar_vfs_mime_application_get_actions         (ThunarVfsMimeApplication       *mime_application) G_GNUC_MALLOC;
+const gchar                  *thunar_vfs_mime_application_get_desktop_id      (const ThunarVfsMimeApplication *mime_application);
+const gchar * const          *thunar_vfs_mime_application_get_mime_types      (const ThunarVfsMimeApplication *mime_application);
 
-const gchar                  *thunar_vfs_mime_application_get_command         (const ThunarVfsMimeApplication *application);
-const gchar                  *thunar_vfs_mime_application_get_desktop_id      (const ThunarVfsMimeApplication *application);
-ThunarVfsMimeApplicationFlags thunar_vfs_mime_application_get_flags           (const ThunarVfsMimeApplication *application);
-const gchar                  *thunar_vfs_mime_application_get_name            (const ThunarVfsMimeApplication *application);
-const gchar * const          *thunar_vfs_mime_application_get_mime_types      (const ThunarVfsMimeApplication *application);
+guint                         thunar_vfs_mime_application_hash                (gconstpointer                   mime_application);
+gboolean                      thunar_vfs_mime_application_equal               (gconstpointer                   a,
+                                                                               gconstpointer                   b);
 
-gboolean                      thunar_vfs_mime_application_exec                (const ThunarVfsMimeApplication *application,
-                                                                               GdkScreen                      *screen,
-                                                                               GList                          *path_list,
-                                                                               GError                        **error);
-gboolean                      thunar_vfs_mime_application_exec_with_env       (const ThunarVfsMimeApplication *application,
-                                                                               GdkScreen                      *screen,
-                                                                               GList                          *path_list,
-                                                                               gchar                         **envp,
-                                                                               GError                        **error);
+/**
+ * thunar_vfs_mime_application_get_command:
+ * @mime_application : a #ThunarVfsMimeApplication.
+ *
+ * Returns the command for @mime_application.
+ *
+ * Return value: the command for @mime_application.
+ **/
+#define thunar_vfs_mime_application_get_command(mime_application) (thunar_vfs_mime_handler_get_command (THUNAR_VFS_MIME_HANDLER ((mime_application))))
 
-const gchar                  *thunar_vfs_mime_application_lookup_icon_name    (const ThunarVfsMimeApplication *application,
-                                                                               GtkIconTheme                   *icon_theme);
+/**
+ * thunar_vfs_mime_application_get_flags:
+ * @mime_application : a #ThunarVfsMimeApplication.
+ *
+ * Returns the #ThunarVfsMimeHandlerFlags for @mime_handler.
+ *
+ * Return value: the flags for @mime_application.
+ **/
+#define thunar_vfs_mime_application_get_flags(mime_application) (thunar_vfs_mime_handler_get_flags (THUNAR_VFS_MIME_HANDLER ((mime_application))))
 
-guint                         thunar_vfs_mime_application_hash                (gconstpointer                   application);
-gboolean                      thunar_vfs_mime_application_equal               (gconstpointer                   a,
-                                                                               gconstpointer                   b);
+/**
+ * thunar_vfs_mime_application_get_name:
+ * @mime_application : a #ThunarVfsMimeApplication.
+ *
+ * Returns the name for @mime_application.
+ *
+ * Return value: the name for @mime_application.
+ **/
+#define thunar_vfs_mime_application_get_name(mime_application) (thunar_vfs_mime_handler_get_name (THUNAR_VFS_MIME_HANDLER ((mime_application))))
 
 G_END_DECLS;
 
diff --git a/thunar-vfs/thunar-vfs-mime-database.c b/thunar-vfs/thunar-vfs-mime-database.c
index bc4b3bac7..bf9555356 100644
--- a/thunar-vfs/thunar-vfs-mime-database.c
+++ b/thunar-vfs/thunar-vfs-mime-database.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -236,7 +236,7 @@ thunar_vfs_mime_database_init (ThunarVfsMimeDatabase *database)
   database->text_plain = thunar_vfs_mime_database_get_info_locked (database, "text/plain");
 
   /* allocate the applications cache */
-  database->applications = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, (GDestroyNotify) thunar_vfs_mime_application_unref);
+  database->applications = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_object_unref);
 
   /* initialize the MIME providers */
   thunar_vfs_mime_database_initialize_providers (database);
@@ -313,7 +313,7 @@ thunar_vfs_mime_database_get_application_locked (ThunarVfsMimeDatabase *database
 
   /* take an additional reference for the caller */
   if (G_LIKELY (application != NULL))
-    thunar_vfs_mime_application_ref (application);
+    g_object_ref (G_OBJECT (application));
 
   return application;
 }
@@ -1244,7 +1244,7 @@ thunar_vfs_mime_database_get_infos_for_info (ThunarVfsMimeDatabase *database,
  * The caller is responsible to free the returned list using
  * something like:
  * <informalexample><programlisting>
- * g_list_foreach (list, (GFunc) thunar_vfs_mime_application_unref, NULL);
+ * g_list_foreach (list, (GFunc) g_object_unref, NULL);
  * g_list_free (list);
  * </programlisting></informalexample>
  *
@@ -1302,7 +1302,7 @@ thunar_vfs_mime_database_get_applications (ThunarVfsMimeDatabase *database,
               if (G_LIKELY (p == NULL))
                 applications = g_list_append (applications, application);
               else
-                thunar_vfs_mime_application_unref (application);
+                g_object_unref (G_OBJECT (application));
             }
         }
     }
@@ -1337,7 +1337,7 @@ thunar_vfs_mime_database_get_applications (ThunarVfsMimeDatabase *database,
               if (G_LIKELY (p == NULL))
                 applications = g_list_append (applications, application);
               else
-                thunar_vfs_mime_application_unref (application);
+                g_object_unref (G_OBJECT (application));
             }
         }
     }
@@ -1362,7 +1362,7 @@ thunar_vfs_mime_database_get_applications (ThunarVfsMimeDatabase *database,
  * is set for @info.
  *
  * The caller is responsible to free the returned instance
- * using thunar_vfs_mime_application_unref().
+ * using g_object_unref() when no longer needed.
  *
  * Return value: the default #ThunarVfsMimeApplication for
  *               @info or %NULL.
@@ -1414,7 +1414,7 @@ thunar_vfs_mime_database_get_default_application (ThunarVfsMimeDatabase *databas
         {
           /* use the first available application */
           application = applications->data;
-          g_list_foreach (applications->next, (GFunc) thunar_vfs_mime_application_unref, NULL);
+          g_list_foreach (applications->next, (GFunc) g_object_unref, NULL);
           g_list_free (applications);
         }
     }
@@ -1584,8 +1584,7 @@ done:
  * open files of type @info.
  *
  * The caller is responsible to free the returned object
- * using thunar_vfs_mime_application_unref() when no longer
- * needed.
+ * using g_object_unref() when no longer needed.
  *
  * Return value: the newly created #ThunarVfsMimeApplication
  *               or %NULL on error.
diff --git a/thunar-vfs/thunar-vfs-mime-handler-private.h b/thunar-vfs/thunar-vfs-mime-handler-private.h
new file mode 100644
index 000000000..cabd9ec4e
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-mime-handler-private.h
@@ -0,0 +1,50 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef __THUNAR_VFS_MIME_HANDLER_PRIVATE_H__
+#define __THUNAR_VFS_MIME_HANDLER_PRIVATE_H__
+
+#include <thunar-vfs/thunar-vfs-mime-handler.h>
+
+G_BEGIN_DECLS;
+
+struct _ThunarVfsMimeHandlerClass
+{
+  GObjectClass __parent__;
+};
+
+struct _ThunarVfsMimeHandler
+{
+  GObject __parent__;
+
+  ThunarVfsMimeHandlerFlags flags;
+  gchar                    *binary_name;
+  gchar                    *command;
+  gchar                    *name;
+  gchar                    *icon;
+};
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_MIME_HANDLER_PRIVATE_H__ */
diff --git a/thunar-vfs/thunar-vfs-mime-handler.c b/thunar-vfs/thunar-vfs-mime-handler.c
new file mode 100644
index 000000000..85692ee4f
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-mime-handler.c
@@ -0,0 +1,562 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; 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_MEMORY_H
+#include <memory.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#include <thunar-vfs/thunar-vfs-enum-types.h>
+#include <thunar-vfs/thunar-vfs-exec.h>
+#include <thunar-vfs/thunar-vfs-mime-handler-private.h>
+#include <thunar-vfs/thunar-vfs-mime-handler.h>
+#include <thunar-vfs/thunar-vfs-path.h>
+#include <thunar-vfs/thunar-vfs-alias.h>
+
+
+
+/* Property identifiers */
+enum
+{
+  PROP_0,
+  PROP_COMMAND,
+  PROP_FLAGS,
+  PROP_ICON,
+  PROP_NAME,
+};
+
+
+
+static void         thunar_vfs_mime_handler_class_init    (ThunarVfsMimeHandlerClass  *klass);
+static void         thunar_vfs_mime_handler_finalize      (GObject                    *object);
+static void         thunar_vfs_mime_handler_get_property  (GObject                    *object,
+                                                           guint                       prop_id,
+                                                           GValue                     *value,
+                                                           GParamSpec                 *pspec);
+static void         thunar_vfs_mime_handler_set_property  (GObject                    *object,
+                                                           guint                       prop_id,
+                                                           const GValue               *value,
+                                                           GParamSpec                 *pspec);
+static gboolean     thunar_vfs_mime_handler_get_argv      (const ThunarVfsMimeHandler *mime_handler,
+                                                           GList                      *path_list,
+                                                           gint                       *argc,
+                                                           gchar                    ***argv,
+                                                           GError                    **error);
+static void         thunar_vfs_mime_handler_set_command   (ThunarVfsMimeHandler       *mime_handler,
+                                                           const gchar                *command);
+static void         thunar_vfs_mime_handler_set_flags     (ThunarVfsMimeHandler       *mime_handler,
+                                                           ThunarVfsMimeHandlerFlags   flags);
+static const gchar *thunar_vfs_mime_handler_get_icon      (const ThunarVfsMimeHandler *mime_handler);
+static void         thunar_vfs_mime_handler_set_icon      (ThunarVfsMimeHandler       *mime_handler,
+                                                           const gchar                *icon);
+static void         thunar_vfs_mime_handler_set_name      (ThunarVfsMimeHandler       *mime_handler,
+                                                           const gchar                *name);
+
+
+
+static GObjectClass *thunar_vfs_mime_handler_parent_class;
+
+
+
+GType
+thunar_vfs_mime_handler_get_type (void)
+{
+  static GType type = G_TYPE_INVALID;
+
+  if (G_UNLIKELY (type == G_TYPE_INVALID))
+    {
+      static const GTypeInfo info =
+      {
+        sizeof (ThunarVfsMimeHandlerClass),
+        NULL,
+        NULL,
+        (GClassInitFunc) thunar_vfs_mime_handler_class_init,
+        NULL,
+        NULL,
+        sizeof (ThunarVfsMimeHandler),
+        0,
+        NULL,
+        NULL,
+      };
+
+      type = g_type_register_static (G_TYPE_OBJECT, I_("ThunarVfsMimeHandler"), &info, G_TYPE_FLAG_ABSTRACT);
+    }
+
+  return type;
+}
+
+
+
+static void
+thunar_vfs_mime_handler_class_init (ThunarVfsMimeHandlerClass *klass)
+{
+  GObjectClass *gobject_class;
+
+  /* determine the parent type class */
+  thunar_vfs_mime_handler_parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = thunar_vfs_mime_handler_finalize;
+  gobject_class->get_property = thunar_vfs_mime_handler_get_property;
+  gobject_class->set_property = thunar_vfs_mime_handler_set_property;
+
+  /**
+   * ThunarVfsMimeHandler:command:
+   *
+   * The command line for this #ThunarVfsMimeHandler.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_COMMAND,
+                                   g_param_spec_string ("command",
+                                                        _("Command"),
+                                                        _("The command to run the mime handler"),
+                                                        NULL,
+                                                        EXO_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  /**
+   * ThunarVfsMimeHandler:flags:
+   *
+   * The #ThunarVfsMimeHandlerFlags for this #ThunarVfsMimeHandler.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_FLAGS,
+                                   g_param_spec_flags ("flags",
+                                                       _("Flags"),
+                                                       _("The flags for the mime handler"),
+                                                       THUNAR_VFS_TYPE_VFS_MIME_HANDLER_FLAGS,
+                                                       0,
+                                                       EXO_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  /**
+   * ThunarVfsMimeHandler:icon:
+   *
+   * The icon of this #ThunarVfsMimeHandler, which can be either
+   * %NULL in which case no icon is known, an absolute path to
+   * an icon file, or a named icon.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_ICON,
+                                   g_param_spec_string ("icon",
+                                                        _("Icon"),
+                                                        _("The icon of the mime handler"),
+                                                        NULL,
+                                                        EXO_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  /**
+   * ThunarVfsMimeHandler:name:
+   *
+   * The name of this #ThunarVfsMimeHandler.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_NAME,
+                                   g_param_spec_string ("name",
+                                                        _("Name"),
+                                                        _("The name of the mime handler"),
+                                                        NULL,
+                                                        EXO_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+}
+
+
+
+static void
+thunar_vfs_mime_handler_finalize (GObject *object)
+{
+  ThunarVfsMimeHandler *mime_handler = THUNAR_VFS_MIME_HANDLER (object);
+
+  /* release the attributes */
+  g_free (mime_handler->binary_name);
+  g_free (mime_handler->command);
+  g_free (mime_handler->name);
+  g_free (mime_handler->icon);
+
+  (*G_OBJECT_CLASS (thunar_vfs_mime_handler_parent_class)->finalize) (object);
+}
+
+
+
+static void
+thunar_vfs_mime_handler_get_property (GObject    *object,
+                                      guint       prop_id,
+                                      GValue     *value,
+                                      GParamSpec *pspec)
+{
+  ThunarVfsMimeHandler *mime_handler = THUNAR_VFS_MIME_HANDLER (object);
+
+  switch (prop_id)
+    {
+    case PROP_COMMAND:
+      g_value_set_string (value, thunar_vfs_mime_handler_get_command (mime_handler));
+      break;
+
+    case PROP_FLAGS:
+      g_value_set_flags (value, thunar_vfs_mime_handler_get_flags (mime_handler));
+      break;
+
+    case PROP_ICON:
+      g_value_set_string (value, thunar_vfs_mime_handler_get_icon (mime_handler));
+      break;
+
+    case PROP_NAME:
+      g_value_set_string (value, thunar_vfs_mime_handler_get_name (mime_handler));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+
+static void
+thunar_vfs_mime_handler_set_property (GObject      *object,
+                                      guint         prop_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec)
+{
+  ThunarVfsMimeHandler *mime_handler = THUNAR_VFS_MIME_HANDLER (object);
+
+  switch (prop_id)
+    {
+    case PROP_COMMAND:
+      thunar_vfs_mime_handler_set_command (mime_handler, g_value_get_string (value));
+      break;
+
+    case PROP_FLAGS:
+      thunar_vfs_mime_handler_set_flags (mime_handler, g_value_get_flags (value));
+      break;
+
+    case PROP_ICON:
+      thunar_vfs_mime_handler_set_icon (mime_handler, g_value_get_string (value));
+      break;
+
+    case PROP_NAME:
+      thunar_vfs_mime_handler_set_name (mime_handler, g_value_get_string (value));
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+
+static gboolean
+thunar_vfs_mime_handler_get_argv (const ThunarVfsMimeHandler *mime_handler,
+                                  GList                      *path_list,
+                                  gint                       *argc,
+                                  gchar                    ***argv,
+                                  GError                    **error)
+{
+  return thunar_vfs_exec_parse (mime_handler->command, path_list, mime_handler->icon, mime_handler->name, NULL,
+                                (mime_handler->flags & THUNAR_VFS_MIME_HANDLER_REQUIRES_TERMINAL) != 0,
+                                argc, argv, error);
+}
+
+
+
+static void
+thunar_vfs_mime_handler_set_command (ThunarVfsMimeHandler *mime_handler,
+                                     const gchar          *command)
+{
+  gchar **argv;
+  gint    argc;
+
+  /* release the previous command and binary name */
+  g_free (mime_handler->binary_name);
+  g_free (mime_handler->command);
+
+  /* determine the new binary name */
+  if (command != NULL && g_shell_parse_argv (command, &argc, &argv, NULL))
+    {
+      /* yep, we have a new binary name */
+      mime_handler->binary_name = g_path_get_basename (argv[0]);
+      g_strfreev (argv);
+    }
+  else
+    {
+      /* no binary name */
+      mime_handler->binary_name = NULL;
+    }
+
+  /* determine the new command */
+  mime_handler->command = g_strdup (command);
+}
+
+
+
+static void
+thunar_vfs_mime_handler_set_flags (ThunarVfsMimeHandler     *mime_handler,
+                                   ThunarVfsMimeHandlerFlags flags)
+{
+  mime_handler->flags = flags;
+}
+
+
+
+static const gchar*
+thunar_vfs_mime_handler_get_icon (const ThunarVfsMimeHandler *mime_handler)
+{
+  return mime_handler->icon;
+}
+
+
+
+static void
+thunar_vfs_mime_handler_set_icon (ThunarVfsMimeHandler *mime_handler,
+                                  const gchar          *icon)
+{
+  /* release the previous icon */
+  g_free (mime_handler->icon);
+
+  /* setup the new icon */
+  mime_handler->icon = g_strdup (icon);
+
+  /* strip off known suffixes for image files if a themed icon is specified */
+  if (mime_handler->icon != NULL && !g_path_is_absolute (mime_handler->icon) && g_str_has_suffix (mime_handler->icon, ".png"))
+    mime_handler->icon[strlen (mime_handler->icon) - 4] = '\0';
+}
+
+
+
+static void
+thunar_vfs_mime_handler_set_name (ThunarVfsMimeHandler *mime_handler,
+                                  const gchar          *name)
+{
+  g_free (mime_handler->name);
+  mime_handler->name = g_strdup (name);
+}
+
+
+
+/**
+ * thunar_vfs_mime_handler_get_command:
+ * @mime_handler : a #ThunarVfsMimeHandler.
+ *
+ * Returns the command associated with @mime_handler.
+ *
+ * Return value: the command associated with @mime_handler.
+ **/
+const gchar*
+thunar_vfs_mime_handler_get_command (const ThunarVfsMimeHandler *mime_handler)
+{
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_HANDLER (mime_handler), NULL);
+  return mime_handler->command;
+}
+
+
+
+/**
+ * thunar_vfs_mime_handler_get_flags:
+ * @mime_handler : a #ThunarVfsMimeHandler.
+ *
+ * Returns the #ThunarVfsMimeHandlerFlags for @mime_handler.
+ *
+ * Return value: the #ThunarVfsMimeHandlerFlags for @mime_handler.
+ **/
+ThunarVfsMimeHandlerFlags
+thunar_vfs_mime_handler_get_flags (const ThunarVfsMimeHandler *mime_handler)
+{
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_HANDLER (mime_handler), 0);
+  return mime_handler->flags;
+}
+
+
+
+/**
+ * thunar_vfs_mime_handler_get_name:
+ * @mime_handler : a #ThunarVfsMimeHandler.
+ *
+ * Returns the name of @mime_handler.
+ *
+ * Return value: the name of @mime_handler.
+ **/
+const gchar*
+thunar_vfs_mime_handler_get_name (const ThunarVfsMimeHandler *mime_handler)
+{
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_HANDLER (mime_handler), NULL);
+  return mime_handler->name;
+}
+
+
+
+/**
+ * thunar_vfs_mime_handler_exec:
+ * @mime_handler : a #ThunarVfsMimeHandler.
+ * @screen       : a #GdkScreen or %NULL to use the default screen.
+ * @path_list    : a list of #ThunarVfsPath<!---->s to open.
+ * @error        : return location for errors or %NULL.
+ *
+ * Wrapper to thunar_vfs_mime_handler_exec_with_env(), which
+ * simply passes a %NULL pointer for the environment variables.
+ *
+ * Return value: %TRUE if the execution succeed, else %FALSE.
+ **/
+gboolean
+thunar_vfs_mime_handler_exec (const ThunarVfsMimeHandler *mime_handler,
+                              GdkScreen                  *screen,
+                              GList                      *path_list,
+                              GError                    **error)
+{
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_HANDLER (mime_handler), FALSE);
+  g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  return thunar_vfs_mime_handler_exec_with_env (mime_handler, screen, path_list, NULL, error);
+}
+
+
+
+/**
+ * thunar_vfs_mime_handler_exec_with_env:
+ * @mime_handler : a #ThunarVfsMimeHandler.
+ * @screen       : a #GdkScreen or %NULL to use the default screen.
+ * @path_list    : a list of #ThunarVfsPath<!---->s to open.
+ * @envp         : child's environment or %NULL to inherit parent's.
+ * @error        : return location for errors or %NULL.
+ *
+ * Executes @mime_handler on @screen using the given @path_list. If
+ * @path_list contains more than one #ThunarVfsPath and @mime_handler
+ * doesn't support opening multiple documents at once, one
+ * instance of @mime_handler will be spawned for every #ThunarVfsPath
+ * given in @path_list.
+ *
+ * Return value: %TRUE if the execution succeed, else %FALSE.
+ **/
+gboolean
+thunar_vfs_mime_handler_exec_with_env (const ThunarVfsMimeHandler *mime_handler,
+                                       GdkScreen                  *screen,
+                                       GList                      *path_list,
+                                       gchar                     **envp,
+                                       GError                    **error)
+{
+  ThunarVfsPath *parent;
+  gboolean       result = TRUE;
+  GList          list;
+  GList         *lp;
+  gchar         *working_directory;
+  gchar        **argv;
+  gint           argc;
+
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_HANDLER (mime_handler), FALSE);
+  g_return_val_if_fail (screen == NULL || GDK_IS_SCREEN (screen), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* fallback to the default screen if no screen is given */
+  if (G_UNLIKELY (screen == NULL))
+    screen = gdk_screen_get_default ();
+
+  /* check whether the application can open multiple documents at once */
+  if (G_LIKELY ((mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI) == 0))
+    {
+      for (lp = path_list; lp != NULL; lp = lp->next)
+        {
+          /* use a short list with only one entry */
+          list.data = lp->data;
+          list.next = NULL;
+          list.prev = NULL;
+
+          /* figure out the argument vector to run the application */
+          if (!thunar_vfs_mime_handler_get_argv (mime_handler, &list, &argc, &argv, error))
+            return FALSE;
+
+          /* use the paths base directory as working directory for the application */
+          parent = thunar_vfs_path_get_parent (list.data);
+          working_directory = (parent != NULL) ? thunar_vfs_path_dup_string (parent) : NULL;
+
+          /* try to spawn the application */
+          result = thunar_vfs_exec_on_screen (screen, working_directory, argv, envp, G_SPAWN_SEARCH_PATH,
+                                              mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY, error);
+
+          /* cleanup */
+          g_free (working_directory);
+          g_strfreev (argv);
+
+          /* check if we succeed */
+          if (G_UNLIKELY (!result))
+            break;
+        }
+    }
+  else
+    {
+      /* we can open all documents at once */
+      if (!thunar_vfs_mime_handler_get_argv (mime_handler, path_list, &argc, &argv, error))
+        return FALSE;
+
+      /* use the first paths base directory as working directory for the application */
+      parent = (path_list != NULL) ? thunar_vfs_path_get_parent (path_list->data) : NULL;
+      working_directory = (parent != NULL) ? thunar_vfs_path_dup_string (parent) : NULL;
+
+      /* try to spawn the application */
+      result = thunar_vfs_exec_on_screen (screen, working_directory, argv, envp, G_SPAWN_SEARCH_PATH,
+                                          mime_handler->flags & THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY, error);
+
+      /* cleanup */
+      g_free (working_directory);
+      g_strfreev (argv);
+    }
+
+  return result;
+}
+
+
+
+/**
+ * thunar_vfs_mime_handler_lookup_icon_name:
+ * @mime_handler : a #ThunarVfsMimeHandler.
+ * @icon_theme   : a #GtkIconTheme.
+ *
+ * Looks up the icon name for @mime_handler in
+ * @icon_theme. Returns %NULL if no suitable
+ * icon is present in @icon_theme.
+ *
+ * The returned icon can be either a named icon in
+ * @icon_theme or an absolute path to an icon file,
+ * or %NULL.
+ *
+ * Return value: the icon name for @mime_handler or
+ *               %NULL.
+ **/
+const gchar*
+thunar_vfs_mime_handler_lookup_icon_name (const ThunarVfsMimeHandler *mime_handler,
+                                          GtkIconTheme               *icon_theme)
+{
+  g_return_val_if_fail (THUNAR_VFS_IS_MIME_HANDLER (mime_handler), NULL);
+  g_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
+
+  if (mime_handler->icon != NULL && (g_path_is_absolute (mime_handler->icon) || gtk_icon_theme_has_icon (icon_theme, mime_handler->icon)))
+    return mime_handler->icon;
+  else if (mime_handler->binary_name != NULL && gtk_icon_theme_has_icon (icon_theme, mime_handler->binary_name))
+    return mime_handler->binary_name;
+  else
+    return NULL;
+}
+
+
+
+#define __THUNAR_VFS_MIME_HANDLER_C__
+#include <thunar-vfs/thunar-vfs-aliasdef.c>
diff --git a/thunar-vfs/thunar-vfs-mime-handler.h b/thunar-vfs/thunar-vfs-mime-handler.h
new file mode 100644
index 000000000..1d549f704
--- /dev/null
+++ b/thunar-vfs/thunar-vfs-mime-handler.h
@@ -0,0 +1,80 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (THUNAR_VFS_INSIDE_THUNAR_VFS_H) && !defined (THUNAR_VFS_COMPILATION)
+#error "Only <thunar-vfs/thunar-vfs.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef __THUNAR_VFS_MIME_HANDLER_H__
+#define __THUNAR_VFS_MIME_HANDLER_H__
+
+#include <exo/exo.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarVfsMimeHandlerClass ThunarVfsMimeHandlerClass;
+typedef struct _ThunarVfsMimeHandler      ThunarVfsMimeHandler;
+
+#define THUNAR_VFS_TYPE_MIME_HANDLER            (thunar_vfs_mime_handler_get_type ())
+#define THUNAR_VFS_MIME_HANDLER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_VFS_TYPE_MIME_HANDLER, ThunarVfsMimeHandler))
+#define THUNAR_VFS_MIME_HANDLER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_VFS_TYPE_MIME_HANDLER, ThunarVfsMimeHandlerClass))
+#define THUNAR_VFS_IS_MIME_HANDLER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_VFS_TYPE_MIME_HANDLER))
+#define THUNAR_VFS_IS_MIME_HANDLER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_VFS_TYPE_MIME_HANDLER))
+#define THUNAR_VFS_MIME_HANDLER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_VFS_TYPE_MIME_HANDLER, ThunarVfsMimeHandlerClass))
+
+/**
+ * ThunarVfsMimeHandlerFlags:
+ * @THUNAR_VFS_MIME_HANDLER_HIDDEN                  : the handler should not be displayed in the menu system.
+ * @THUNAR_VFS_MIME_HANDLER_REQUIRES_TERMINAL       : the handler must be run in a terminal.
+ * @THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY : the handler supports startup notification.
+ * @THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI          : the handler supports opening multiple documents at once (%F or %U).
+ *
+ * Various flags associated with a #ThunarVfsMimeHandler.
+ **/
+typedef enum /*< flags >*/
+{
+  THUNAR_VFS_MIME_HANDLER_HIDDEN                  = (1 << 0L),
+  THUNAR_VFS_MIME_HANDLER_REQUIRES_TERMINAL       = (1 << 1L),
+  THUNAR_VFS_MIME_HANDLER_SUPPORTS_STARTUP_NOTIFY = (1 << 2L),
+  THUNAR_VFS_MIME_HANDLER_SUPPORTS_MULTI          = (1 << 3L),
+} ThunarVfsMimeHandlerFlags;
+
+GType                     thunar_vfs_mime_handler_get_type          (void) G_GNUC_CONST;
+
+const gchar              *thunar_vfs_mime_handler_get_command       (const ThunarVfsMimeHandler *mime_handler);
+ThunarVfsMimeHandlerFlags thunar_vfs_mime_handler_get_flags         (const ThunarVfsMimeHandler *mime_handler);
+const gchar              *thunar_vfs_mime_handler_get_name          (const ThunarVfsMimeHandler *mime_handler);
+
+gboolean                  thunar_vfs_mime_handler_exec              (const ThunarVfsMimeHandler *mime_handler,
+                                                                     GdkScreen                  *screen,
+                                                                     GList                      *path_list,
+                                                                     GError                    **error);
+gboolean                  thunar_vfs_mime_handler_exec_with_env     (const ThunarVfsMimeHandler *mime_handler,
+                                                                     GdkScreen                  *screen,
+                                                                     GList                      *path_list,
+                                                                     gchar                     **envp,
+                                                                     GError                    **error);
+
+const gchar              *thunar_vfs_mime_handler_lookup_icon_name  (const ThunarVfsMimeHandler *mime_handler,
+                                                                     GtkIconTheme               *icon_theme);
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_VFS_MIME_HANDLER_H__ */
diff --git a/thunar-vfs/thunar-vfs.h b/thunar-vfs/thunar-vfs.h
index 4f5d2b55c..41bc4ae14 100644
--- a/thunar-vfs/thunar-vfs.h
+++ b/thunar-vfs/thunar-vfs.h
@@ -27,8 +27,10 @@
 #include <thunar-vfs/thunar-vfs-info.h>
 #include <thunar-vfs/thunar-vfs-interactive-job.h>
 #include <thunar-vfs/thunar-vfs-job.h>
+#include <thunar-vfs/thunar-vfs-mime-action.h>
 #include <thunar-vfs/thunar-vfs-mime-application.h>
 #include <thunar-vfs/thunar-vfs-mime-database.h>
+#include <thunar-vfs/thunar-vfs-mime-handler.h>
 #include <thunar-vfs/thunar-vfs-mime-info.h>
 #include <thunar-vfs/thunar-vfs-monitor.h>
 #include <thunar-vfs/thunar-vfs-path.h>
diff --git a/thunar-vfs/thunar-vfs.symbols b/thunar-vfs/thunar-vfs.symbols
index 44184309c..70effd77b 100644
--- a/thunar-vfs/thunar-vfs.symbols
+++ b/thunar-vfs/thunar-vfs.symbols
@@ -99,7 +99,7 @@ thunar_vfs_file_flags_get_type G_GNUC_CONST
 thunar_vfs_file_mode_get_type G_GNUC_CONST
 thunar_vfs_file_type_get_type G_GNUC_CONST
 thunar_vfs_interactive_job_response_get_type G_GNUC_CONST
-thunar_vfs_mime_application_flags_get_type G_GNUC_CONST
+thunar_vfs_mime_handler_flags_get_type G_GNUC_CONST
 thunar_vfs_monitor_event_get_type G_GNUC_CONST
 thunar_vfs_thumb_size_get_type G_GNUC_CONST
 thunar_vfs_volume_kind_get_type G_GNUC_CONST
@@ -126,22 +126,22 @@ thunar_vfs_job_cancelled
 #endif
 #endif
 
+/* ThunarVfsMimeAction methods */
+#if IN_HEADER(__THUNAR_VFS_MIME_ACTION_H__)
+#if IN_SOURCE(__THUNAR_VFS_MIME_ACTION_C__)
+thunar_vfs_mime_action_get_type G_GNUC_CONST
+#endif
+#endif
+
 /* ThunarVfsMimeApplication methods */
 #if IN_HEADER(__THUNAR_VFS_MIME_APPLICATION_H__)
 #if IN_SOURCE(__THUNAR_VFS_MIME_APPLICATION_C__)
 thunar_vfs_mime_application_get_type G_GNUC_CONST
 thunar_vfs_mime_application_new_from_desktop_id G_GNUC_MALLOC
 thunar_vfs_mime_application_new_from_file G_GNUC_MALLOC
-thunar_vfs_mime_application_ref
-thunar_vfs_mime_application_unref
-thunar_vfs_mime_application_get_command
+thunar_vfs_mime_application_get_actions G_GNUC_MALLOC
 thunar_vfs_mime_application_get_desktop_id
-thunar_vfs_mime_application_get_flags
-thunar_vfs_mime_application_get_name
 thunar_vfs_mime_application_get_mime_types
-thunar_vfs_mime_application_exec
-thunar_vfs_mime_application_exec_with_env
-thunar_vfs_mime_application_lookup_icon_name
 thunar_vfs_mime_application_hash
 thunar_vfs_mime_application_equal
 #endif
@@ -164,6 +164,19 @@ thunar_vfs_mime_database_add_application
 #endif
 #endif
 
+/* ThunarVfsMimeHandler methods */
+#if IN_HEADER(__THUNAR_VFS_MIME_HANDLER_H__)
+#if IN_SOURCE(__THUNAR_VFS_MIME_HANDLER_C__)
+thunar_vfs_mime_handler_get_type G_GNUC_CONST
+thunar_vfs_mime_handler_get_command
+thunar_vfs_mime_handler_get_flags
+thunar_vfs_mime_handler_get_name
+thunar_vfs_mime_handler_exec
+thunar_vfs_mime_handler_exec_with_env
+thunar_vfs_mime_handler_lookup_icon_name
+#endif
+#endif
+
 /* ThunarVfsMimeInfo methods */
 #if IN_HEADER(__THUNAR_VFS_MIME_INFO_H__)
 #if IN_SOURCE(__THUNAR_VFS_MIME_INFO_C__)
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 2eac04a9f..e5c6f2cb9 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -69,6 +69,7 @@ Thunar_SOURCES =							\
 	thunar-icon-view-ui.h						\
 	thunar-launcher.c						\
 	thunar-launcher.h						\
+	thunar-launcher-ui.h						\
 	thunar-list-model.c						\
 	thunar-list-model.h						\
 	thunar-location-bar.c						\
@@ -83,8 +84,6 @@ Thunar_SOURCES =							\
 	thunar-metafile.h						\
 	thunar-navigator.c						\
 	thunar-navigator.h						\
-	thunar-open-with-action.c					\
-	thunar-open-with-action.h					\
 	thunar-pango-extensions.c					\
 	thunar-pango-extensions.h					\
 	thunar-path-entry.c						\
@@ -172,6 +171,7 @@ DISTCLEANFILES =							\
 	$(thunar_built_sources)						\
 	stamp-thunar-marshal.h						\
 	thunar-icon-view-ui.h						\
+	thunar-launcher-ui.h						\
 	thunar-standard-view-ui.h					\
 	thunar-thumbnail-frame.c					\
 	thunar-window-ui.h
@@ -179,6 +179,7 @@ DISTCLEANFILES =							\
 BUILT_SOURCES =								\
 	$(thunar_built_sources)						\
 	thunar-icon-view-ui.h						\
+	thunar-launcher-ui.h						\
 	thunar-standard-view-ui.h					\
 	thunar-thumbnail-frame.c					\
 	thunar-window-ui.h
@@ -189,6 +190,9 @@ thunar-thumbnail-frame.c: $(srcdir)/thunar-thumbnail-frame.png Makefile
 thunar-icon-view-ui.h: Makefile $(srcdir)/thunar-icon-view-ui.xml
 	exo-csource --static --name=thunar_icon_view_ui $(srcdir)/thunar-icon-view-ui.xml > thunar-icon-view-ui.h
 
+thunar-launcher-ui.h: Makefile $(srcdir)/thunar-launcher-ui.xml
+	exo-csource --static --name=thunar_launcher_ui $(srcdir)/thunar-launcher-ui.xml > thunar-launcher-ui.h
+
 thunar-standard-view-ui.h: Makefile $(srcdir)/thunar-standard-view-ui.xml
 	exo-csource --static --name=thunar_standard_view_ui $(srcdir)/thunar-standard-view-ui.xml > thunar-standard-view-ui.h
 
@@ -215,6 +219,7 @@ endif
 
 EXTRA_DIST =								\
 	thunar-icon-view-ui.xml						\
+	thunar-launcher-ui.xml						\
 	thunar-marshal.list						\
 	thunar-standard-view-ui.xml					\
 	thunar-thumbnail-frame.png					\
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index 2903e7ee5..7585f302d 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -278,7 +278,7 @@ thunar_chooser_button_activate (ThunarChooserButton *chooser_button,
   if (!thunar_vfs_mime_database_set_default_application (chooser_button->database, info, application, &error))
     {
       /* tell the user that it didn't work */
-      thunar_dialogs_show_error (GTK_WIDGET (chooser_button), error, _("Failed to set default application for `%s'"),
+      thunar_dialogs_show_error (GTK_WIDGET (chooser_button), error, _("Failed to set default application for \"%s\""),
                                  thunar_file_get_display_name (chooser_button->file));
       g_error_free (error);
     }
@@ -345,7 +345,7 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
       /* setup the image for the application */
       icon_factory = thunar_icon_factory_get_default ();
       icon_theme = thunar_icon_factory_get_icon_theme (icon_factory);
-      icon_name = thunar_vfs_mime_application_lookup_icon_name (application, icon_theme);
+      icon_name = thunar_vfs_mime_handler_lookup_icon_name (THUNAR_VFS_MIME_HANDLER (application), icon_theme);
       if (G_LIKELY (icon_name != NULL))
         icon = thunar_icon_factory_load_icon (icon_factory, icon_name, icon_size, NULL, FALSE);
       gtk_image_set_from_pixbuf (GTK_IMAGE (chooser_button->image), icon);
@@ -355,10 +355,10 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
 
       /* setup the label for the application */
       gtk_label_set_attributes (GTK_LABEL (chooser_button->label), NULL);
-      gtk_label_set_text (GTK_LABEL (chooser_button->label), thunar_vfs_mime_application_get_name (application));
+      gtk_label_set_text (GTK_LABEL (chooser_button->label), thunar_vfs_mime_handler_get_name (THUNAR_VFS_MIME_HANDLER (application)));
 
       /* cleanup */
-      thunar_vfs_mime_application_unref (application);
+      g_object_unref (G_OBJECT (application));
     }
   else
     {
@@ -466,7 +466,7 @@ thunar_chooser_button_pressed (ThunarChooserButton *chooser_button,
   if (G_LIKELY (lp != NULL))
     {
       applications = g_list_delete_link (applications, lp);
-      thunar_vfs_mime_application_unref (default_application);
+      g_object_unref (G_OBJECT (default_application));
     }
   applications = g_list_prepend (applications, default_application);
 
@@ -485,14 +485,14 @@ thunar_chooser_button_pressed (ThunarChooserButton *chooser_button,
   /* add the other possible applications */
   for (lp = applications; lp != NULL; lp = lp->next)
     {
-      item = gtk_image_menu_item_new_with_label (thunar_vfs_mime_application_get_name (lp->data));
-      g_object_set_data_full (G_OBJECT (item), I_("thunar-vfs-mime-application"), lp->data, (GDestroyNotify) thunar_vfs_mime_application_unref);
+      item = gtk_image_menu_item_new_with_label (thunar_vfs_mime_handler_get_name (lp->data));
+      g_object_set_data_full (G_OBJECT (item), I_("thunar-vfs-mime-application"), lp->data, g_object_unref);
       g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_chooser_button_activate), chooser_button);
       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
       gtk_widget_show (item);
 
       /* setup the icon for the application */
-      icon_name = thunar_vfs_mime_application_lookup_icon_name (lp->data, icon_theme);
+      icon_name = thunar_vfs_mime_handler_lookup_icon_name (lp->data, icon_theme);
       icon = thunar_icon_factory_load_icon (icon_factory, icon_name, icon_size, NULL, FALSE);
       image = gtk_image_new_from_pixbuf (icon);
       gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index 630864d25..850b07de4 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -454,7 +454,7 @@ thunar_chooser_dialog_response (GtkDialog *widget,
       if (G_UNLIKELY (application == NULL))
         {
           /* display an error to the user */
-          thunar_dialogs_show_error (GTK_WIDGET (dialog), error, _("Failed to add new application `%s'"), name);
+          thunar_dialogs_show_error (GTK_WIDGET (dialog), error, _("Failed to add new application \"%s\""), name);
 
           /* release the error */
           g_error_free (error);
@@ -476,7 +476,7 @@ thunar_chooser_dialog_response (GtkDialog *widget,
   if (G_UNLIKELY (!succeed))
     {
       /* display an error to the user */
-      thunar_dialogs_show_error (GTK_WIDGET (dialog), error, _("Failed to set default application for `%s'"),
+      thunar_dialogs_show_error (GTK_WIDGET (dialog), error, _("Failed to set default application for \"%s\""),
                                  thunar_file_get_display_name (dialog->file));
 
       /* release the error */
@@ -486,11 +486,11 @@ thunar_chooser_dialog_response (GtkDialog *widget,
     {
       /* open the file using the specified application */
       list.data = thunar_file_get_path (dialog->file); list.next = list.prev = NULL;
-      if (!thunar_vfs_mime_application_exec (application, gtk_widget_get_screen (GTK_WIDGET (dialog)), &list, &error))
+      if (!thunar_vfs_mime_handler_exec (THUNAR_VFS_MIME_HANDLER (application), gtk_widget_get_screen (GTK_WIDGET (dialog)), &list, &error))
         {
           /* display an error to the user */
-          thunar_dialogs_show_error (GTK_WIDGET (dialog), error, _("Failed to execute `%s'"),
-                                     thunar_vfs_mime_application_get_name (application));
+          thunar_dialogs_show_error (GTK_WIDGET (dialog), error, _("Failed to execute \"%s\""),
+                                     thunar_vfs_mime_handler_get_name (THUNAR_VFS_MIME_HANDLER (application)));
 
           /* release the error */
           g_error_free (error);
@@ -502,7 +502,7 @@ thunar_chooser_dialog_response (GtkDialog *widget,
     thunar_file_changed (dialog->file);
 
   /* cleanup */
-  thunar_vfs_mime_application_unref (application);
+  g_object_unref (G_OBJECT (application));
 cleanup:
   g_object_unref (G_OBJECT (mime_database));
 }
@@ -526,7 +526,7 @@ thunar_chooser_dialog_selection_func (GtkTreeSelection *selection,
       /* check if there's an application for the path */
       gtk_tree_model_get_iter (model, &iter, path);
       gtk_tree_model_get_value (model, &iter, THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, &value);
-      permitted = (g_value_get_boxed (&value) != NULL);
+      permitted = (g_value_get_object (&value) != NULL);
       g_value_unset (&value);
     }
 
@@ -560,7 +560,7 @@ thunar_chooser_dialog_update_accept (ThunarChooserDialog *dialog)
         {
           /* check if the selected row refers to a valid application */
           gtk_tree_model_get_value (model, &iter, THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, &value);
-          sensitive = (g_value_get_boxed (&value) != NULL);
+          sensitive = (g_value_get_object (&value) != NULL);
           g_value_unset (&value);
         }
     }
@@ -794,7 +794,7 @@ thunar_chooser_dialog_row_activated (GtkTreeView         *treeview,
   gtk_tree_model_get_value (model, &iter, THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, &value);
 
   /* check if the row refers to a valid application */
-  if (G_LIKELY (g_value_get_boxed (&value) != NULL))
+  if (G_LIKELY (g_value_get_object (&value) != NULL))
     {
       /* emit the accept dialog response */
       gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
@@ -818,33 +818,53 @@ thunar_chooser_dialog_row_activated (GtkTreeView         *treeview,
 
 /**
  * thunar_chooser_dialog_new:
- * @parent : transient parent of the dialog or %NULL.
- * @file   : the #ThunarFile for which an application should be chosen.
- * @open   : whether to also open the @file.
  *
- * Allocates a new #ThunarChooserDialog with the given parameters.
+ * Allocates a new #ThunarChooserDialog.
  *
  * Return value: the newly allocated #ThunarChooserDialog.
  **/
 GtkWidget*
-thunar_chooser_dialog_new (GtkWindow  *parent,
-                           ThunarFile *file,
-                           gboolean    open)
+thunar_chooser_dialog_new (void)
+{
+  return g_object_new (THUNAR_TYPE_CHOOSER_DIALOG, NULL);
+}
+
+
+
+/**
+ * thunar_show_chooser_dialog:
+ * @parent : transient parent of the dialog or %NULL.
+ * @file   : the #ThunarFile for which an application should be chosen.
+ * @open   : whether to also open the @file.
+ *
+ * Convenience function to display a #ThunarChooserDialog with the
+ * given parameters.
+ **/
+void
+thunar_show_chooser_dialog (GtkWidget  *parent,
+                            ThunarFile *file,
+                            gboolean    open)
 {
   GtkWidget *dialog;
+  GtkWidget *window;
+
+  g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
+  g_return_if_fail (THUNAR_IS_FILE (file));
 
-  g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL);
-  g_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
+  /* determine the toplevel window */
+  window = (parent != NULL) ? gtk_widget_get_toplevel (parent) : NULL;
 
+  /* display the chooser dialog */
   dialog = g_object_new (THUNAR_TYPE_CHOOSER_DIALOG,
+                         "destroy-with-parent", TRUE,
                          "file", file,
+                         "modal", TRUE,
                          "open", open,
                          NULL);
-
-  if (G_LIKELY (parent != NULL))
-    gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-
-  return dialog;
+  if (G_LIKELY (window != NULL))
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
+  g_signal_connect_after (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
+  gtk_widget_show (dialog);
 }
 
 
diff --git a/thunar/thunar-chooser-dialog.h b/thunar/thunar-chooser-dialog.h
index 540380878..1ffec8913 100644
--- a/thunar/thunar-chooser-dialog.h
+++ b/thunar/thunar-chooser-dialog.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>.
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>.
  *
  * 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
@@ -36,9 +36,7 @@ typedef struct _ThunarChooserDialog      ThunarChooserDialog;
 
 GType       thunar_chooser_dialog_get_type  (void) G_GNUC_CONST;
 
-GtkWidget  *thunar_chooser_dialog_new       (GtkWindow           *parent,
-                                             ThunarFile          *file,
-                                             gboolean             open) G_GNUC_MALLOC;
+GtkWidget  *thunar_chooser_dialog_new       (void) G_GNUC_MALLOC;
 
 ThunarFile *thunar_chooser_dialog_get_file  (ThunarChooserDialog *dialog);
 void        thunar_chooser_dialog_set_file  (ThunarChooserDialog *dialog,
@@ -48,6 +46,10 @@ gboolean    thunar_chooser_dialog_get_open  (ThunarChooserDialog *dialog);
 void        thunar_chooser_dialog_set_open  (ThunarChooserDialog *dialog,
                                              gboolean             open);
 
+void        thunar_show_chooser_dialog      (GtkWidget           *parent,
+                                             ThunarFile          *file,
+                                             gboolean             open);
+
 G_END_DECLS;
 
 #endif /* !__THUNAR_CHOOSER_DIALOG_H__ */
diff --git a/thunar/thunar-chooser-model.c b/thunar/thunar-chooser-model.c
index 5b3fe25d7..afd1b73e5 100644
--- a/thunar/thunar-chooser-model.c
+++ b/thunar/thunar-chooser-model.c
@@ -208,7 +208,7 @@ thunar_chooser_model_finalize (GObject *object)
       applications = g_thread_join (model->thread);
 
       /* ditch the returned application list */
-      g_list_foreach (applications, (GFunc) thunar_vfs_mime_application_unref, NULL);
+      g_list_foreach (applications, (GFunc) g_object_unref, NULL);
       g_list_free (applications);
     }
 
@@ -308,7 +308,7 @@ thunar_chooser_model_append (ThunarChooserModel *model,
       for (lp = applications; lp != NULL; lp = lp->next)
         {
           /* determine the icon name for the application */
-          icon_name = thunar_vfs_mime_application_lookup_icon_name (lp->data, icon_theme);
+          icon_name = thunar_vfs_mime_handler_lookup_icon_name (lp->data, icon_theme);
 
           /* try to load the themed icon for the program */
           icon = thunar_icon_factory_load_icon (icon_factory, icon_name, 24, NULL, FALSE);
@@ -316,7 +316,7 @@ thunar_chooser_model_append (ThunarChooserModel *model,
           /* append the tree row with the program data */
           gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &parent_iter);
           gtk_tree_store_set (GTK_TREE_STORE (model), &child_iter,
-                              THUNAR_CHOOSER_MODEL_COLUMN_NAME, thunar_vfs_mime_application_get_name (lp->data),
+                              THUNAR_CHOOSER_MODEL_COLUMN_NAME, thunar_vfs_mime_handler_get_name (lp->data),
                               THUNAR_CHOOSER_MODEL_COLUMN_ICON, icon,
                               THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, lp->data,
                               -1);
@@ -381,7 +381,7 @@ thunar_chooser_model_import (ThunarChooserModel *model,
   thunar_chooser_model_append (model, _("Other Applications:"), "gnome-applications", other);
 
   /* cleanup */
-  g_list_foreach (recommended, (GFunc) thunar_vfs_mime_application_unref, NULL);
+  g_list_foreach (recommended, (GFunc) g_object_unref, NULL);
   g_list_free (recommended);
   g_list_free (other);
 }
@@ -446,7 +446,7 @@ thunar_chooser_model_readdir (ThunarChooserModel *model,
                   if (thunar_vfs_mime_application_get_mime_types (application) != NULL)
                     applications = g_list_append (applications, application);
                   else
-                    thunar_vfs_mime_application_unref (application);
+                    g_object_unref (G_OBJECT (application));
                 }
             }
 
@@ -468,8 +468,8 @@ static gint
 compare_application_by_name (gconstpointer a,
                              gconstpointer b)
 {
-  return strcmp (thunar_vfs_mime_application_get_name (a),
-                 thunar_vfs_mime_application_get_name (b));
+  return strcmp (thunar_vfs_mime_handler_get_name (a),
+                 thunar_vfs_mime_handler_get_name (b));
 }
 
 
@@ -496,9 +496,9 @@ thunar_chooser_model_thread (gpointer user_data)
       for (lp = list; lp != NULL; lp = lp->next)
         {
           /* ignore hidden applications to be compatible with the Nautilus mess */
-          if ((thunar_vfs_mime_application_get_flags (lp->data) & THUNAR_VFS_MIME_APPLICATION_HIDDEN) != 0)
+          if ((thunar_vfs_mime_handler_get_flags (lp->data) & THUNAR_VFS_MIME_HANDLER_HIDDEN) != 0)
             {
-              thunar_vfs_mime_application_unref (lp->data);
+              g_object_unref (G_OBJECT (lp->data));
               continue;
             }
 
@@ -513,7 +513,7 @@ thunar_chooser_model_thread (gpointer user_data)
           /* no need to add if we have it already */
           if (G_UNLIKELY (p != NULL))
             {
-              thunar_vfs_mime_application_unref (lp->data);
+              g_object_unref (G_OBJECT (lp->data));
               continue;
             }
 
@@ -557,7 +557,7 @@ thunar_chooser_model_timer (gpointer user_data)
       g_object_notify (G_OBJECT (model), "loading");
 
       /* free the application list */
-      g_list_foreach (applications, (GFunc) thunar_vfs_mime_application_unref, NULL);
+      g_list_foreach (applications, (GFunc) g_object_unref, NULL);
       g_list_free (applications);
     }
   GDK_THREADS_LEAVE ();
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index 250103cd0..964cb701a 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -24,6 +24,7 @@
 #include <gdk/gdkkeysyms.h>
 
 #include <thunar/thunar-details-view.h>
+#include <thunar/thunar-gtk-extensions.h>
 #include <thunar/thunar-text-renderer.h>
 
 
@@ -468,8 +469,8 @@ thunar_details_view_button_press_event (GtkTreeView       *tree_view,
               if (G_LIKELY (file != NULL))
                 {
                   /* determine the action to perform depending on the type of the file */
-                  action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (details_view)->action_group,
-                                                        thunar_file_is_directory (file) ? "open-in-new-window" : "open");
+                  action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (details_view)->ui_manager,
+                      thunar_file_is_directory (file) ? "open-in-new-window" : "open");
       
                   /* emit the action */
                   if (G_LIKELY (action != NULL))
@@ -526,7 +527,7 @@ thunar_details_view_row_activated (GtkTreeView       *tree_view,
   gtk_tree_selection_select_path (selection, path);
 
   /* emit the "open" action */
-  action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (details_view)->action_group, "open");
+  action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (details_view)->ui_manager, "open");
   if (G_LIKELY (action != NULL))
     gtk_action_activate (action);
 }
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 10e5facfa..8403e8ccd 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -777,8 +777,6 @@ thunar_file_launch (ThunarFile *file,
   ThunarVfsMimeDatabase    *database;
   ThunarApplication        *application;
   GdkScreen                *screen;
-  GtkWidget                *window;
-  GtkWidget                *dialog;
   gboolean                  succeed;
   GList                     path_list;
 
@@ -810,10 +808,7 @@ thunar_file_launch (ThunarFile *file,
   /* if we don't have any default handler, just popup the application chooser */
   if (G_UNLIKELY (handler == NULL))
     {
-      window = (widget != NULL) ? gtk_widget_get_toplevel (widget) : NULL;
-      dialog = thunar_chooser_dialog_new ((GtkWindow *) window, file, TRUE);
-      gtk_dialog_run (GTK_DIALOG (dialog));
-      gtk_widget_destroy (dialog);
+      thunar_show_chooser_dialog (widget, file, TRUE);
       return TRUE;
     }
 
@@ -822,10 +817,10 @@ thunar_file_launch (ThunarFile *file,
   path_list.next = path_list.prev = NULL;
 
   /* otherwise try to execute the application */
-  succeed = thunar_vfs_mime_application_exec (handler, screen, &path_list, error);
+  succeed = thunar_vfs_mime_handler_exec (THUNAR_VFS_MIME_HANDLER (handler), screen, &path_list, error);
 
   /* release the handler reference */
-  thunar_vfs_mime_application_unref (handler);
+  g_object_unref (G_OBJECT (handler));
 
   return succeed;
 }
@@ -1839,6 +1834,88 @@ thunar_file_cache_lookup (const ThunarVfsPath *path)
 
 
 
+/**
+ * thunar_file_list_get_applications:
+ * @file_list : a #GList of #ThunarFile<!---->s.
+ *
+ * Returns the #GList of #ThunarVfsMimeApplication<!---->s
+ * that can be used to open all #ThunarFile<!---->s in the
+ * given @file_list.
+ *
+ * The caller is responsible to free the returned list using
+ * something like:
+ * <informalexample><programlisting>
+ * g_list_foreach (list, (GFunc) thunar_vfs_mime_application_unref, NULL);
+ * g_list_free (list);
+ * </programlisting></informalexample>
+ *
+ * Return value: the list of #ThunarVfsMimeApplication<!---->s that
+ *               can be used to open all items in the @file_list.
+ **/
+GList*
+thunar_file_list_get_applications (GList *file_list)
+{
+  ThunarVfsMimeDatabase *database;
+  GList                 *applications = NULL;
+  GList                 *list;
+  GList                 *next;
+  GList                 *ap;
+  GList                 *lp;
+
+  /* grab a reference on the mime database */
+  database = thunar_vfs_mime_database_get_default ();
+
+  /* determine the set of applications that can open all files */
+  for (lp = file_list; lp != NULL; lp = lp->next)
+    {
+      /* no need to check anything if this file has the same mime type as the previous file */
+      if (lp->prev != NULL && thunar_file_get_mime_info (lp->prev->data) == thunar_file_get_mime_info (lp->data))
+        continue;
+
+      /* determine the list of applications that can open this file */
+      list = thunar_vfs_mime_database_get_applications (database, thunar_file_get_mime_info (lp->data));
+      if (G_UNLIKELY (applications == NULL))
+        {
+          /* first file, so just use the applications list */
+          applications = list;
+        }
+      else
+        {
+          /* keep only the applications that are also present in list */
+          for (ap = applications; ap != NULL; ap = next)
+            {
+              /* grab a pointer on the next application */
+              next = ap->next;
+
+              /* check if the application is present in list */
+              if (g_list_find (list, ap->data) == NULL)
+                {
+                  /* drop our reference on the application */
+                  g_object_unref (G_OBJECT (ap->data));
+
+                  /* drop this application from the list */
+                  applications = g_list_delete_link (applications, ap);
+                }
+            }
+
+          /* release the list of applications for this file */
+          g_list_foreach (list, (GFunc) g_object_unref, NULL);
+          g_list_free (list);
+        }
+
+      /* check if the set is still not empty */
+      if (G_LIKELY (applications == NULL))
+        break;
+    }
+
+  /* release the mime database */
+  g_object_unref (G_OBJECT (database));
+
+  return applications;
+}
+
+
+
 /**
  * thunar_file_list_to_path_list:
  * @file_list : a #GList of #ThunarFile<!---->s.
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index af4bdd702..43648433f 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -221,9 +221,10 @@ static inline void                 thunar_file_set_thumb_state (ThunarFile
                                                                 ThunarFileThumbState thumb_state);
 
 
-GList               *thunar_file_list_to_path_list (GList *file_list);
-static inline GList *thunar_file_list_copy         (GList *file_list);
-static inline void   thunar_file_list_free         (GList *file_list);
+GList               *thunar_file_list_get_applications  (GList *file_list);
+GList               *thunar_file_list_to_path_list      (GList *file_list);
+static inline GList *thunar_file_list_copy              (GList *file_list);
+static inline void   thunar_file_list_free              (GList *file_list);
 
 
 /**
diff --git a/thunar/thunar-gtk-extensions.c b/thunar/thunar-gtk-extensions.c
index 654c325cb..bade4cecb 100644
--- a/thunar/thunar-gtk-extensions.c
+++ b/thunar/thunar-gtk-extensions.c
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * 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
@@ -84,3 +84,38 @@ thunar_gtk_action_group_set_action_sensitive (GtkActionGroup *action_group,
 }
 
 
+
+/**
+ * thunar_gtk_ui_manager_get_action_by_name:
+ * @ui_manager  : a #GtkUIManager.
+ * @action_name : the name of a #GtkAction in @ui_manager.
+ *
+ * Looks up the #GtkAction with the given @action_name in all
+ * #GtkActionGroup<!---->s associated with @ui_manager. Returns
+ * %NULL if no such #GtkAction exists in @ui_manager.
+ *
+ * Return value: the #GtkAction of the given @action_name in
+ *               @ui_manager or %NULL.
+ **/
+GtkAction*
+thunar_gtk_ui_manager_get_action_by_name (GtkUIManager *ui_manager,
+                                          const gchar  *action_name)
+{
+  GtkAction *action;
+  GList     *lp;
+
+  g_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
+  g_return_val_if_fail (action_name != NULL, NULL);
+
+  /* check all action groups associated with the ui manager */
+  for (lp = gtk_ui_manager_get_action_groups (ui_manager); lp != NULL; lp = lp->next)
+    {
+      action = gtk_action_group_get_action (lp->data, action_name);
+      if (G_LIKELY (action != NULL))
+        return action;
+    }
+
+  return NULL;
+}
+
+
diff --git a/thunar/thunar-gtk-extensions.h b/thunar/thunar-gtk-extensions.h
index baecbb918..48aa59a61 100644
--- a/thunar/thunar-gtk-extensions.h
+++ b/thunar/thunar-gtk-extensions.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * 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
@@ -30,6 +30,9 @@ void         thunar_gtk_action_group_set_action_sensitive (GtkActionGroup *actio
                                                            const gchar    *action_name,
                                                            gboolean        sensitive) G_GNUC_INTERNAL;
 
+GtkAction   *thunar_gtk_ui_manager_get_action_by_name     (GtkUIManager   *ui_manager,
+                                                           const gchar    *action_name) G_GNUC_INTERNAL;
+
 G_END_DECLS;
 
 #endif /* !__THUNAR_GTK_EXTENSIONS_H__ */
diff --git a/thunar/thunar-icon-view.c b/thunar/thunar-icon-view.c
index ba5ebd826..110923622 100644
--- a/thunar/thunar-icon-view.c
+++ b/thunar/thunar-icon-view.c
@@ -23,6 +23,7 @@
 
 #include <gdk/gdkkeysyms.h>
 
+#include <thunar/thunar-gtk-extensions.h>
 #include <thunar/thunar-icon-view.h>
 #include <thunar/thunar-icon-view-ui.h>
 
@@ -557,8 +558,8 @@ thunar_icon_view_button_press_event (ExoIconView    *view,
               if (G_LIKELY (file != NULL))
                 {
                   /* determine the action to perform depending on the type of the file */
-                  action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (icon_view)->action_group,
-                                                        thunar_file_is_directory (file) ? "open-in-new-window" : "open");
+                  action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (icon_view)->ui_manager,
+                      thunar_file_is_directory (file) ? "open-in-new-window" : "open");
       
                   /* emit the action */
                   if (G_LIKELY (action != NULL))
@@ -808,7 +809,7 @@ thunar_icon_view_item_activated (ExoIconView    *view,
   exo_icon_view_select_path (view, path);
 
   /* emit the "open" action */
-  action = gtk_action_group_get_action (THUNAR_STANDARD_VIEW (icon_view)->action_group, "open");
+  action = thunar_gtk_ui_manager_get_action_by_name (THUNAR_STANDARD_VIEW (icon_view)->ui_manager, "open");
   if (G_LIKELY (action != NULL))
     gtk_action_activate (action);
 }
diff --git a/thunar/thunar-launcher-ui.xml b/thunar/thunar-launcher-ui.xml
new file mode 100644
index 000000000..dd5081042
--- /dev/null
+++ b/thunar/thunar-launcher-ui.xml
@@ -0,0 +1,44 @@
+<ui>
+
+  <!--
+    $Id$
+
+    Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
+
+    Thunar launcher user interface description file. Do NOT
+    simply edit this file if you don't know how the whole system
+    works, because it's too easy to break something.
+  -->
+
+  <menubar name="main-menu">
+    <menu action="file-menu" name="file-menu">
+      <placeholder name="placeholder-launcher">
+        <menuitem action="open" name="open" />
+        <menuitem action="open-in-new-window" name="open-in-new-window" />
+        <placeholder name="placeholder-applications" />
+        <menuitem action="open-with-other" name="open-with-other" />
+        <menu action="open-with-menu" name="open-with-menu">
+          <placeholder name="placeholder-applications" />
+          <separator />
+          <menuitem action="open-with-other-in-menu" name="open-with-other-in-menu" />
+        </menu>
+        <placeholder name="placeholder-actions" />
+      </placeholder>
+    </menu>
+  </menubar>
+
+  <popup action="file-context-menu" name="file-context-menu">
+    <placeholder name="placeholder-launcher">
+      <menuitem action="open" name="open" />
+      <menuitem action="open-in-new-window" name="open-in-new-window" />
+      <placeholder name="placeholder-applications" />
+      <menuitem action="open-with-other" name="open-with-other" />
+      <menu action="open-with-menu" name="open-with-menu">
+        <placeholder name="placeholder-applications" />
+        <separator />
+        <menuitem action="open-with-other-in-menu" name="open-with-other-in-menu" />
+      </menu>
+      <placeholder name="placeholder-actions" />
+    </placeholder>
+  </popup>
+</ui>
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 52a899c14..2eddbfeaa 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -25,86 +25,106 @@
 #include <thunar/thunar-chooser-dialog.h>
 #include <thunar/thunar-dialogs.h>
 #include <thunar/thunar-launcher.h>
-#include <thunar/thunar-open-with-action.h>
+#include <thunar/thunar-launcher-ui.h>
 
 
 
+/* Property identifiers */
 enum
 {
   PROP_0,
-  PROP_ACTION_GROUP,
+  PROP_CURRENT_DIRECTORY,
   PROP_SELECTED_FILES,
+  PROP_UI_MANAGER,
   PROP_WIDGET,
 };
 
-enum
-{
-  OPEN_DIRECTORY,
-  LAST_SIGNAL,
-};
 
 
-
-static void thunar_launcher_class_init                (ThunarLauncherClass      *klass);
-static void thunar_launcher_init                      (ThunarLauncher           *launcher);
-static void thunar_launcher_dispose                   (GObject                  *object);
-static void thunar_launcher_finalize                  (GObject                  *object);
-static void thunar_launcher_get_property              (GObject                  *object,
-                                                       guint                     prop_id,
-                                                       GValue                   *value,
-                                                       GParamSpec               *pspec);
-static void thunar_launcher_set_property              (GObject                  *object,
-                                                       guint                     prop_id,
-                                                       const GValue             *value,
-                                                       GParamSpec               *pspec);
-static void thunar_launcher_execute_files             (ThunarLauncher           *launcher,
-                                                       GList                    *files);
-static void thunar_launcher_open_paths                (ThunarVfsMimeApplication *application,
-                                                       GList                    *path_list,
-                                                       ThunarLauncher           *launcher);
-static void thunar_launcher_open_files                (ThunarLauncher           *launcher,
-                                                       GList                    *files);
-static void thunar_launcher_open_new_windows          (ThunarLauncher           *launcher,
-                                                       GList                    *directories);
-static void thunar_launcher_update                    (ThunarLauncher           *launcher);
-static void thunar_launcher_action_open               (GtkAction                *action,
-                                                       ThunarLauncher           *launcher);
-static void thunar_launcher_action_open_with          (GtkAction                *action,
-                                                       ThunarLauncher           *launcher);
-static void thunar_launcher_action_open_application   (GtkAction                *action,
-                                                       ThunarVfsMimeApplication *application,
-                                                       GList                    *path_list,
-                                                       ThunarLauncher           *launcher);
-static void thunar_launcher_action_open_in_new_window (GtkAction                *action,
-                                                       ThunarLauncher           *launcher);
+static void          thunar_launcher_class_init                 (ThunarLauncherClass      *klass);
+static void          thunar_launcher_component_init             (ThunarComponentIface     *iface);
+static void          thunar_launcher_navigator_init             (ThunarNavigatorIface     *iface);
+static void          thunar_launcher_init                       (ThunarLauncher           *launcher);
+static void          thunar_launcher_dispose                    (GObject                  *object);
+static void          thunar_launcher_finalize                   (GObject                  *object);
+static void          thunar_launcher_get_property               (GObject                  *object,
+                                                                 guint                     prop_id,
+                                                                 GValue                   *value,
+                                                                 GParamSpec               *pspec);
+static void          thunar_launcher_set_property               (GObject                  *object,
+                                                                 guint                     prop_id,
+                                                                 const GValue             *value,
+                                                                 GParamSpec               *pspec);
+static ThunarFile   *thunar_launcher_get_current_directory      (ThunarNavigator          *navigator);
+static void          thunar_launcher_set_current_directory      (ThunarNavigator          *navigator,
+                                                                 ThunarFile               *current_directory);
+static GList        *thunar_launcher_get_selected_files         (ThunarComponent          *component);
+static void          thunar_launcher_set_selected_files         (ThunarComponent          *component,
+                                                                 GList                    *selected_files);
+static GtkUIManager *thunar_launcher_get_ui_manager             (ThunarComponent          *component);
+static void          thunar_launcher_set_ui_manager             (ThunarComponent          *component,
+                                                                 GtkUIManager             *ui_manager);
+static void          thunar_launcher_execute_files              (ThunarLauncher           *launcher,
+                                                                 GList                    *files);
+static void          thunar_launcher_open_files                 (ThunarLauncher           *launcher,
+                                                                 GList                    *files);
+static void          thunar_launcher_open_paths                 (ThunarVfsMimeHandler     *mime_handler,
+                                                                 GList                    *path_list,
+                                                                 ThunarLauncher           *launcher);
+static void          thunar_launcher_open_windows               (ThunarLauncher           *launcher,
+                                                                 GList                    *directories);
+static void          thunar_launcher_update                     (ThunarLauncher           *launcher);
+static void          thunar_launcher_action_open                (GtkAction                *action,
+                                                                 ThunarLauncher           *launcher);
+static void          thunar_launcher_action_open_with_other     (GtkAction                *action,
+                                                                 ThunarLauncher           *launcher);
+static void          thunar_launcher_action_open_in_new_window  (GtkAction                *action,
+                                                                 ThunarLauncher           *launcher);
+static void          thunar_launcher_widget_destroyed           (ThunarLauncher           *launcher,
+                                                                 GtkWidget                *widget);
 
 
 
 struct _ThunarLauncherClass
 {
   GObjectClass __parent__;
-
-  void (*open_directory) (ThunarLauncher *launcher,
-                          ThunarFile     *directory);
 };
 
 struct _ThunarLauncher
 {
   GObject __parent__;
 
-  GtkActionGroup *action_group;
+  ThunarFile     *current_directory;
   GList          *selected_files;
-  GtkWidget      *widget;
+
+  GtkIconFactory *icon_factory;
+  GtkActionGroup *action_group_addons;
+  GtkActionGroup *action_group;
+  GtkUIManager   *ui_manager;
+  guint           ui_merge_id;
+  guint           ui_addons_merge_id;
 
   GtkAction      *action_open;
+  GtkAction      *action_open_with_other;
   GtkAction      *action_open_in_new_window;
-  GtkAction      *action_open_with;
+  GtkAction      *action_open_with_other_in_menu;
+
+  GtkWidget      *widget;
 };
 
 
 
+static const GtkActionEntry action_entries[] =
+{
+  { "open", GTK_STOCK_OPEN, N_ ("_Open"), "<control>O", N_ ("Open the selected files"), G_CALLBACK (thunar_launcher_action_open), },
+  { "open-in-new-window", NULL, N_ ("Open in New Window"), "<control><shift>O", N_ ("Open the selected directories in new Thunar windows"), G_CALLBACK (thunar_launcher_action_open_in_new_window), },
+  { "open-with-other", NULL, N_ ("Open With Other _Application..."), NULL, N_ ("Choose another application with which to open the selected file"), G_CALLBACK (thunar_launcher_action_open_with_other), },
+  { "open-with-menu", NULL, N_ ("Open With"), NULL, N_ ("Choose a program with which to open the selected file"), NULL, },
+  { "open-with-other-in-menu", NULL, N_ ("Open With Other _Application..."), NULL, N_ ("Choose another application with which to open the selected file"), G_CALLBACK (thunar_launcher_action_open_with_other), },
+};
+
 static GObjectClass *thunar_launcher_parent_class;
-static guint         launcher_signals[LAST_SIGNAL];
+static GQuark        thunar_launcher_handler_quark;
 
 
 
@@ -129,7 +149,23 @@ thunar_launcher_get_type (void)
         NULL,
       };
 
+      static const GInterfaceInfo component_info =
+      {
+        (GInterfaceInitFunc) thunar_launcher_component_init,
+        NULL,
+        NULL,
+      };
+
+      static const GInterfaceInfo navigator_info =
+      {
+        (GInterfaceInitFunc) thunar_launcher_navigator_init,
+        NULL,
+        NULL,
+      };
+
       type = g_type_register_static (G_TYPE_OBJECT, I_("ThunarLauncher"), &info, 0);
+      g_type_add_interface_static (type, THUNAR_TYPE_NAVIGATOR, &navigator_info);
+      g_type_add_interface_static (type, THUNAR_TYPE_COMPONENT, &component_info);
     }
 
   return type;
@@ -142,47 +178,29 @@ thunar_launcher_class_init (ThunarLauncherClass *klass)
 {
   GObjectClass *gobject_class;
 
+  /* determine the "thunar-launcher-handler" quark */
+  thunar_launcher_handler_quark = g_quark_from_static_string ("thunar-launcher-handler");
+
   /* determine the parent type class */
   thunar_launcher_parent_class = g_type_class_peek_parent (klass);
-
+  
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->dispose = thunar_launcher_dispose;
   gobject_class->finalize = thunar_launcher_finalize;
   gobject_class->get_property = thunar_launcher_get_property;
   gobject_class->set_property = thunar_launcher_set_property;
 
-  /**
-   * ThunarLauncher:action-group:
-   *
-   * The #GtkActionGroup to which this launcher should
-   * add its #GtkActions.
-   **/
-  g_object_class_install_property (gobject_class,
-                                   PROP_ACTION_GROUP,
-                                   g_param_spec_object ("action-group",
-                                                        "action-group",
-                                                        "action-group",
-                                                        GTK_TYPE_ACTION_GROUP,
-                                                        EXO_PARAM_READWRITE));
+  /* Override ThunarNavigator's properties */
+  g_object_class_override_property (gobject_class, PROP_CURRENT_DIRECTORY, "current-directory");
 
-  /**
-   * ThunarLauncher:selected-files:
-   *
-   * The list of selected #ThunarFile<!---->s.
-   **/
-  g_object_class_install_property (gobject_class,
-                                   PROP_SELECTED_FILES,
-                                   g_param_spec_boxed ("selected-files",
-                                                       "selected-files",
-                                                       "selected-files",
-                                                       THUNARX_TYPE_FILE_INFO_LIST,
-                                                       EXO_PARAM_READWRITE));
+  /* Override ThunarComponent's properties */
+  g_object_class_override_property (gobject_class, PROP_SELECTED_FILES, "selected-files");
+  g_object_class_override_property (gobject_class, PROP_UI_MANAGER, "ui-manager");
 
   /**
    * ThunarLauncher:widget:
    *
-   * The #GtkWidget with which this launcher is
-   * associated.
+   * The #GtkWidget with which this launcher is associated.
    **/
   g_object_class_install_property (gobject_class,
                                    PROP_WIDGET,
@@ -191,23 +209,26 @@ thunar_launcher_class_init (ThunarLauncherClass *klass)
                                                         "widget",
                                                         GTK_TYPE_WIDGET,
                                                         EXO_PARAM_READWRITE));
+}
 
-  /**
-   * ThunarLauncher::open-directory:
-   * @launcher  : a #ThunarLauncher.
-   * @directory : a #ThunarFile referring to the new directory.
-   *
-   * Invoked whenever the user requests to open a new @directory
-   * based on the @launcher in the current window (if possible).
-   **/
-  launcher_signals[OPEN_DIRECTORY] =
-    g_signal_new (I_("open-directory"),
-                  G_TYPE_FROM_CLASS (gobject_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (ThunarLauncherClass, open_directory),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
-                  G_TYPE_NONE, 1, THUNAR_TYPE_FILE);
+
+
+static void
+thunar_launcher_component_init (ThunarComponentIface *iface)
+{
+  iface->get_selected_files = thunar_launcher_get_selected_files;
+  iface->set_selected_files = thunar_launcher_set_selected_files;
+  iface->get_ui_manager = thunar_launcher_get_ui_manager;
+  iface->set_ui_manager = thunar_launcher_set_ui_manager;
+}
+
+
+
+static void
+thunar_launcher_navigator_init (ThunarNavigatorIface *iface)
+{
+  iface->get_current_directory = thunar_launcher_get_current_directory;
+  iface->set_current_directory = thunar_launcher_set_current_directory;
 }
 
 
@@ -215,18 +236,20 @@ thunar_launcher_class_init (ThunarLauncherClass *klass)
 static void
 thunar_launcher_init (ThunarLauncher *launcher)
 {
-  /* the "Open" action */
-  launcher->action_open = gtk_action_new ("open", _("_Open"), _("Open the selected items"), GTK_STOCK_OPEN);
-  g_signal_connect (G_OBJECT (launcher->action_open), "activate", G_CALLBACK (thunar_launcher_action_open), launcher);
-
-  /* the "Open in New Window" action */
-  launcher->action_open_in_new_window = gtk_action_new ("open-in-new-window", _("Open in New Window"), _("Open the selected directories in new Thunar windows"), NULL);
-  g_signal_connect (G_OBJECT (launcher->action_open_in_new_window), "activate", G_CALLBACK (thunar_launcher_action_open_in_new_window), launcher);
-
-  /* the "Open with" action */
-  launcher->action_open_with = thunar_open_with_action_new ("open-with", _("Open With"));
-  g_signal_connect (G_OBJECT (launcher->action_open_with), "open-application", G_CALLBACK (thunar_launcher_action_open_application), launcher);
-  g_signal_connect (G_OBJECT (launcher->action_open_with), "activate", G_CALLBACK (thunar_launcher_action_open_with), launcher);
+  /* setup the action group for the launcher actions */
+  launcher->action_group = gtk_action_group_new ("thunar-launcher");
+  gtk_action_group_set_translation_domain (launcher->action_group, GETTEXT_PACKAGE);
+  gtk_action_group_add_actions (launcher->action_group, action_entries, G_N_ELEMENTS (action_entries), launcher);
+
+  /* determine references to our actions */
+  launcher->action_open = gtk_action_group_get_action (launcher->action_group, "open");
+  launcher->action_open_with_other = gtk_action_group_get_action (launcher->action_group, "open-with-other");
+  launcher->action_open_in_new_window = gtk_action_group_get_action (launcher->action_group, "open-in-new-window");
+  launcher->action_open_with_other_in_menu = gtk_action_group_get_action (launcher->action_group, "open-with-other-in-menu");
+
+  /* initialize and add our custom icon factory for the application/action icons */
+  launcher->icon_factory = gtk_icon_factory_new ();
+  gtk_icon_factory_add_default (launcher->icon_factory);
 }
 
 
@@ -236,9 +259,11 @@ thunar_launcher_dispose (GObject *object)
 {
   ThunarLauncher *launcher = THUNAR_LAUNCHER (object);
 
-  thunar_launcher_set_action_group (launcher, NULL);
-  thunar_launcher_set_selected_files (launcher, NULL);
-  thunar_launcher_set_widget (launcher, NULL);
+  /* reset our properties */
+  thunar_navigator_set_current_directory (THUNAR_NAVIGATOR (launcher), NULL);
+  thunar_component_set_selected_files (THUNAR_COMPONENT (launcher), NULL);
+  thunar_component_set_ui_manager (THUNAR_COMPONENT (launcher), NULL);
+  thunar_launcher_set_widget (THUNAR_LAUNCHER (launcher), NULL);
 
   (*G_OBJECT_CLASS (thunar_launcher_parent_class)->dispose) (object);
 }
@@ -250,10 +275,12 @@ thunar_launcher_finalize (GObject *object)
 {
   ThunarLauncher *launcher = THUNAR_LAUNCHER (object);
 
-  /* drop all actions */
-  g_object_unref (G_OBJECT (launcher->action_open));
-  g_object_unref (G_OBJECT (launcher->action_open_in_new_window));
-  g_object_unref (G_OBJECT (launcher->action_open_with));
+  /* drop our custom icon factory for the application/action icons */
+  gtk_icon_factory_remove_default (launcher->icon_factory);
+  g_object_unref (G_OBJECT (launcher->icon_factory));
+
+  /* release the reference on the action group */
+  g_object_unref (G_OBJECT (launcher->action_group));
 
   (*G_OBJECT_CLASS (thunar_launcher_parent_class)->finalize) (object);
 }
@@ -266,20 +293,22 @@ thunar_launcher_get_property (GObject    *object,
                               GValue     *value,
                               GParamSpec *pspec)
 {
-  ThunarLauncher *launcher = THUNAR_LAUNCHER (object);
-
   switch (prop_id)
     {
-    case PROP_ACTION_GROUP:
-      g_value_set_object (value, thunar_launcher_get_action_group (launcher));
+    case PROP_CURRENT_DIRECTORY:
+      g_value_set_object (value, thunar_navigator_get_current_directory (THUNAR_NAVIGATOR (object)));
       break;
 
     case PROP_SELECTED_FILES:
-      g_value_set_boxed (value, thunar_launcher_get_selected_files (launcher));
+      g_value_set_boxed (value, thunar_component_get_selected_files (THUNAR_COMPONENT (object)));
+      break;
+
+    case PROP_UI_MANAGER:
+      g_value_set_object (value, thunar_component_get_ui_manager (THUNAR_COMPONENT (object)));
       break;
 
     case PROP_WIDGET:
-      g_value_set_object (value, thunar_launcher_get_widget (launcher));
+      g_value_set_object (value, thunar_launcher_get_widget (THUNAR_LAUNCHER (object)));
       break;
 
     default:
@@ -296,20 +325,22 @@ thunar_launcher_set_property (GObject      *object,
                               const GValue *value,
                               GParamSpec   *pspec)
 {
-  ThunarLauncher *launcher = THUNAR_LAUNCHER (object);
-
   switch (prop_id)
     {
-    case PROP_ACTION_GROUP:
-      thunar_launcher_set_action_group (launcher, g_value_get_object (value));
+    case PROP_CURRENT_DIRECTORY:
+      thunar_navigator_set_current_directory (THUNAR_NAVIGATOR (object), g_value_get_object (value));
       break;
 
     case PROP_SELECTED_FILES:
-      thunar_launcher_set_selected_files (launcher, g_value_get_boxed (value));
+      thunar_component_set_selected_files (THUNAR_COMPONENT (object), g_value_get_boxed (value));
+      break;
+
+    case PROP_UI_MANAGER:
+      thunar_component_set_ui_manager (THUNAR_COMPONENT (object), g_value_get_object (value));
       break;
 
     case PROP_WIDGET:
-      thunar_launcher_set_widget (launcher, g_value_get_object (value));
+      thunar_launcher_set_widget (THUNAR_LAUNCHER (object), g_value_get_object (value));
       break;
 
     default:
@@ -320,73 +351,152 @@ thunar_launcher_set_property (GObject      *object,
 
 
 
+static ThunarFile*
+thunar_launcher_get_current_directory (ThunarNavigator *navigator)
+{
+  return THUNAR_LAUNCHER (navigator)->current_directory;
+}
+
+
+
 static void
-thunar_launcher_execute_files (ThunarLauncher *launcher,
-                               GList          *files)
+thunar_launcher_set_current_directory (ThunarNavigator *navigator,
+                                       ThunarFile      *current_directory)
 {
-  ThunarFile *file;
-  GdkScreen  *screen;
-  GError     *error = NULL;
-  GList      *lp;
+  ThunarLauncher *launcher = THUNAR_LAUNCHER (navigator);
 
-  /* determine the screen on which to run the file(s) */
-  screen = (launcher->widget != NULL)
-         ? gtk_widget_get_screen (launcher->widget)
-         : gdk_screen_get_default ();
+  /* disconnect from the previous directory */
+  if (G_LIKELY (launcher->current_directory != NULL))
+    g_object_unref (G_OBJECT (launcher->current_directory));
 
-  /* execute all selected files */
-  for (lp = files; lp != NULL; lp = lp->next)
+  /* activate the new directory */
+  launcher->current_directory = current_directory;
+
+  /* connect to the new directory */
+  if (G_LIKELY (current_directory != NULL))
+    g_object_ref (G_OBJECT (current_directory));
+
+  /* notify listeners */
+  g_object_notify (G_OBJECT (launcher), "current-directory");
+}
+
+
+
+static GList*
+thunar_launcher_get_selected_files (ThunarComponent *component)
+{
+  return THUNAR_LAUNCHER (component)->selected_files;
+}
+
+
+
+static void
+thunar_launcher_set_selected_files (ThunarComponent *component,
+                                    GList           *selected_files)
+{
+  ThunarLauncher *launcher = THUNAR_LAUNCHER (component);
+
+  /* disconnect from the previously selected files */
+  thunar_file_list_free (launcher->selected_files);
+
+  /* connect to the new selected files list */
+  launcher->selected_files = thunar_file_list_copy (selected_files);
+
+  /* update the launcher actions */
+  thunar_launcher_update (launcher);
+
+  /* notify listeners */
+  g_object_notify (G_OBJECT (launcher), "selected-files");
+}
+
+
+
+static GtkUIManager*
+thunar_launcher_get_ui_manager (ThunarComponent *component)
+{
+  return THUNAR_LAUNCHER (component)->ui_manager;
+}
+
+
+
+static void
+thunar_launcher_set_ui_manager (ThunarComponent *component,
+                                GtkUIManager    *ui_manager)
+{
+  ThunarLauncher *launcher = THUNAR_LAUNCHER (component);
+  GError         *error = NULL;
+
+  /* disconnect from the previous UI manager */
+  if (G_UNLIKELY (launcher->ui_manager != NULL))
     {
-      file = THUNAR_FILE (lp->data);
-      if (!thunar_file_execute (file, screen, NULL, &error))
+      /* drop our action group from the previous UI manager */
+      gtk_ui_manager_remove_action_group (launcher->ui_manager, launcher->action_group);
+
+      /* unmerge our addons ui controls from the previous UI manager */
+      if (G_LIKELY (launcher->ui_addons_merge_id > 0))
         {
-          /* display an error message to the user */
-          thunar_dialogs_show_error (launcher->widget, error, _("Unable to execute file `%s'"), thunar_file_get_display_name (file));
+          gtk_ui_manager_remove_ui (launcher->ui_manager, launcher->ui_addons_merge_id);
+          launcher->ui_addons_merge_id = 0;
+        }
+
+      /* unmerge our ui controls from the previous UI manager */
+      gtk_ui_manager_remove_ui (launcher->ui_manager, launcher->ui_merge_id);
+
+      /* drop the reference on the previous UI manager */
+      g_object_unref (G_OBJECT (launcher->ui_manager));
+    }
+
+  /* activate the new UI manager */
+  launcher->ui_manager = ui_manager;
 
-          /* release the error */
+  /* connect to the new UI manager */
+  if (G_LIKELY (ui_manager != NULL))
+    {
+      /* we keep a reference on the new manager */
+      g_object_ref (G_OBJECT (ui_manager));
+
+      /* add our action group to the new manager */
+      gtk_ui_manager_insert_action_group (ui_manager, launcher->action_group, -1);
+
+      /* merge our UI control items with the new manager */
+      launcher->ui_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, thunar_launcher_ui, thunar_launcher_ui_length, &error);
+      if (G_UNLIKELY (launcher->ui_merge_id == 0))
+        {
+          g_error ("Failed to merge ThunarLauncher menus: %s", error->message);
           g_error_free (error);
-          break;
         }
+
+      /* update the user interface */
+      thunar_launcher_update (launcher);
     }
+
+  /* notify listeners */
+  g_object_notify (G_OBJECT (launcher), "ui-manager");
 }
 
 
 
 static void
-thunar_launcher_open_paths (ThunarVfsMimeApplication *application,
-                            GList                    *path_list,
-                            ThunarLauncher           *launcher)
+thunar_launcher_execute_files (ThunarLauncher *launcher,
+                               GList          *files)
 {
   GdkScreen *screen;
   GError    *error = NULL;
-  gchar     *name;
-  gchar     *text;
-  guint      n;
+  GList     *lp;
 
-  /* determine the screen on which to launch the application */
+  /* determine the screen on which to run the file(s) */
   screen = (launcher->widget != NULL) ? gtk_widget_get_screen (launcher->widget) : NULL;
 
-  /* try to execute the application with the given URIs */
-  if (!thunar_vfs_mime_application_exec (application, screen, path_list, &error))
+  /* execute all selected files */
+  for (lp = files; lp != NULL; lp = lp->next)
     {
-      /* figure out the appropriate error message */
-      n = g_list_length (path_list);
-      if (G_LIKELY (n == 1))
+      if (!thunar_file_execute (lp->data, screen, NULL, &error))
         {
-          name = g_filename_display_name (thunar_vfs_path_get_name (path_list->data));
-          text = g_strdup_printf (_("Unable to open \"%s\"."), name);
-          g_free (name);
-        }
-      else
-        {
-          text = g_strdup_printf (ngettext ("Unable to open %d file.", "Unable to open %d files.", n), n);
+          /* display an error message to the user */
+          thunar_dialogs_show_error (launcher->widget, error, _("Failed to execute file \"%s\""), thunar_file_get_display_name (lp->data));
+          g_error_free (error);
+          break;
         }
-
-      /* display an error dialog */
-      thunar_dialogs_show_error (launcher->widget, error, text);
-
-      /* release the error */
-      g_error_free (error);
     }
 }
 
@@ -400,15 +510,13 @@ thunar_launcher_open_files (ThunarLauncher *launcher,
   ThunarVfsMimeDatabase    *database;
   ThunarVfsMimeInfo        *info;
   GHashTable               *applications;
-  GtkWidget                *window;
-  GtkWidget                *dialog;
   GList                    *path_list;
   GList                    *lp;
 
   /* allocate a hash table to associate applications to URIs */
   applications = g_hash_table_new_full (thunar_vfs_mime_application_hash,
                                         thunar_vfs_mime_application_equal,
-                                        (GDestroyNotify) thunar_vfs_mime_application_unref,
+                                        (GDestroyNotify) g_object_unref,
                                         (GDestroyNotify) thunar_vfs_path_list_free);
 
   /* take a reference on the mime database */
@@ -439,10 +547,8 @@ thunar_launcher_open_files (ThunarLauncher *launcher,
         }
       else
         {
-          window = (launcher->widget != NULL) ? gtk_widget_get_toplevel (launcher->widget) : NULL;
-          dialog = thunar_chooser_dialog_new ((GtkWindow *) window, lp->data, TRUE);
-          gtk_dialog_run (GTK_DIALOG (dialog));
-          gtk_widget_destroy (dialog);
+          /* display a chooser dialog for the file and stop */
+          thunar_show_chooser_dialog (launcher->widget, lp->data, TRUE);
           break;
         }
     }
@@ -460,54 +566,101 @@ thunar_launcher_open_files (ThunarLauncher *launcher,
 
 
 static void
-thunar_launcher_open_new_windows (ThunarLauncher *launcher,
-                                  GList          *directories)
+thunar_launcher_open_paths (ThunarVfsMimeHandler *mime_handler,
+                            GList                *path_list,
+                            ThunarLauncher       *launcher)
+{
+  GdkScreen *screen;
+  GError    *error = NULL;
+  gchar     *message;
+  gchar     *name;
+  guint      n;
+
+  /* determine the screen on which to launch the application */
+  screen = (launcher->widget != NULL) ? gtk_widget_get_screen (launcher->widget) : NULL;
+
+  /* try to execute the application with the given URIs */
+  if (!thunar_vfs_mime_handler_exec (mime_handler, screen, path_list, &error))
+    {
+      /* figure out the appropriate error message */
+      n = g_list_length (path_list);
+      if (G_LIKELY (n == 1))
+        {
+          /* we can give a precise error message here */
+          name = g_filename_display_name (thunar_vfs_path_get_name (path_list->data));
+          message = g_strdup_printf (_("Failed to open file \"%s\""), name);
+          g_free (name);
+        }
+      else
+        {
+          /* we can just tell that n files failed to open */
+          message = g_strdup_printf (ngettext ("Failed to open %d file", "Failed to open %d files", n), n);
+        }
+
+      /* display an error dialog to the user */
+      thunar_dialogs_show_error (launcher->widget, error, message);
+      g_error_free (error);
+      g_free (message);
+    }
+}
+
+
+
+static void
+thunar_launcher_open_windows (ThunarLauncher *launcher,
+                              GList          *directories)
 {
   ThunarApplication *application;
-  GtkWidget         *message;
+  GtkWidget         *dialog;
   GtkWidget         *window;
   GdkScreen         *screen;
+  gchar             *label;
   GList             *lp;
   gint               response = GTK_RESPONSE_YES;
   gint               n;
 
-  /* query the application object */
-  application = thunar_application_get ();
-
   /* ask the user if we would open more than one new window */
   n = g_list_length (directories);
   if (G_UNLIKELY (n > 1))
     {
       /* open a message dialog */
       window = (launcher->widget != NULL) ? gtk_widget_get_toplevel (launcher->widget) : NULL;
-      message = gtk_message_dialog_new ((GtkWindow *) window,
-                                        GTK_DIALOG_DESTROY_WITH_PARENT
-                                        | GTK_DIALOG_MODAL,
-                                        GTK_MESSAGE_QUESTION,
-                                        GTK_BUTTONS_YES_NO,
-                                        _("Are you sure you want to open all folders?"));
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message),
-                                                ngettext ("This will open %d separate window.",
-                                                          "This will open %d separate windows.",
+      dialog = gtk_message_dialog_new ((GtkWindow *) window,
+                                       GTK_DIALOG_DESTROY_WITH_PARENT
+                                       | GTK_DIALOG_MODAL,
+                                       GTK_MESSAGE_QUESTION,
+                                       GTK_BUTTONS_NONE,
+                                       _("Are you sure you want to open all folders?"));
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+                                                ngettext ("This will open %d separate file manager window.",
+                                                          "This will open %d separate file manager windows.",
                                                           n),
                                                 n);
-      response = gtk_dialog_run (GTK_DIALOG (message));
-      gtk_widget_destroy (message);
+      label = g_strdup_printf (ngettext ("Open %d New Window", "Open %d New Windows", n), n);
+      gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+      gtk_dialog_add_button (GTK_DIALOG (dialog), label, GTK_RESPONSE_YES);
+      gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
+      response = gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
+      g_free (label);
     }
 
   /* open n new windows if the user approved it */
   if (G_LIKELY (response == GTK_RESPONSE_YES))
     {
+      /* query the application object */
+      application = thunar_application_get ();
+
       /* determine the screen on which to open the new windows */
       screen = (launcher->widget != NULL) ? gtk_widget_get_screen (launcher->widget) : NULL;
 
       /* open all requested windows */
       for (lp = directories; lp != NULL; lp = lp->next)
         thunar_application_open_window (application, lp->data, screen);
-    }
 
-  /* release the application object */
-  g_object_unref (G_OBJECT (application));
+      /* release the application object */
+      g_object_unref (G_OBJECT (application));
+    }
 }
 
 
@@ -515,20 +668,43 @@ thunar_launcher_open_new_windows (ThunarLauncher *launcher,
 static void
 thunar_launcher_update (ThunarLauncher *launcher)
 {
-  GList *items;
-  GList *lp;
-  gchar  text[256];
-  gint   n_directories = 0;
-  gint   n_executables = 0;
-  gint   n_files = 0;
-  gint   n_items;
-
-  /* determine the number of selected items */
-  items = launcher->selected_files;
-  n_items = g_list_length (items);
-
-  /* determine the number of files/directories */
-  for (lp = items; lp != NULL; lp = lp->next)
+  GtkIconSource *icon_source;
+  GtkIconTheme  *icon_theme;
+  GtkIconSet    *icon_set;
+  const gchar   *icon_name;
+  const gchar   *context_menu_path;
+  const gchar   *file_menu_path;
+  GtkAction     *action;
+  gboolean       default_is_open_with_other = FALSE;
+  GList         *applications;
+  GList         *actions;
+  GList         *lp;
+  gchar         *tooltip;
+  gchar         *label;
+  gchar         *name;
+  gint           n_directories = 0;
+  gint           n_executables = 0;
+  gint           n_regulars = 0;
+  gint           n_selected_files = 0;
+  gint           n;
+
+  /* verify that we're connected to an UI manager */
+  if (G_UNLIKELY (launcher->ui_manager == NULL))
+    return;
+
+  /* drop the previous addons ui controls from the UI manager */
+  if (G_LIKELY (launcher->ui_addons_merge_id > 0))
+    {
+      gtk_ui_manager_remove_ui (launcher->ui_manager, launcher->ui_addons_merge_id);
+      gtk_ui_manager_ensure_update (launcher->ui_manager);
+      launcher->ui_addons_merge_id = 0;
+    }
+
+  /* reset the application set for the "Open" action */
+  g_object_set_qdata (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, NULL);
+
+  /* determine the number of files/directories/executables */
+  for (lp = launcher->selected_files; lp != NULL; lp = lp->next, ++n_selected_files)
     {
       if (thunar_file_is_directory (lp->data))
         {
@@ -538,48 +714,283 @@ thunar_launcher_update (ThunarLauncher *launcher)
         {
           if (thunar_file_is_executable (lp->data))
             ++n_executables;
-          ++n_files;
+          ++n_regulars;
         }
     }
 
-  if (G_UNLIKELY (n_directories == n_items))
+  /* update the user interface depending on the current selection */
+  if (G_LIKELY (n_selected_files == 0 || n_directories > 0))
     {
-      /* we turn the "Open" label into "Open in n New Windows" if we have only directories */
-      if (n_directories > 1)
-        g_snprintf (text, sizeof (text), ngettext ("Open in %d New Window", "Open in %d New Windows", n_directories), n_directories);
+      /** CASE 1: nothing selected or atleast one directory in the selection
+       **
+       ** - "Open" and "Open in n New Windows" actions
+       **/
+
+      /* the "Open" action is "Open in n New Windows" if we have two or more directories */
+      if (G_UNLIKELY (n_selected_files == n_directories && n_directories > 1))
+        {
+          /* turn "Open" into "Open in n New Windows" */
+          label = g_strdup_printf (ngettext ("Open in %d New Window", "Open in %d New Windows", n_directories), n_directories);
+          tooltip = g_strdup_printf (ngettext ("Open the selected directory in %d new window",
+                                               "Open the selected directories in %d new windows",
+                                               n_directories), n_directories);
+          g_object_set (G_OBJECT (launcher->action_open),
+                        "label", label,
+                        "sensitive", TRUE,
+                        "tooltip", tooltip,
+                        NULL);
+          g_free (tooltip);
+          g_free (label);
+        }
       else
-        g_strlcpy (text, _("_Open"), sizeof (text));
+        {
+          /* the "Open" action is sensitive if we have atleast one selected file */
+          g_object_set (G_OBJECT (launcher->action_open),
+                        "label", _("_Open"),
+                        "sensitive", (n_selected_files > 0),
+                        "tooltip", ngettext ("Open the selected file", "Open the selected files", n_selected_files),
+                        NULL);
+        }
 
+      /* the "Open in New Window" action is visible if we have exactly one directory */
       g_object_set (G_OBJECT (launcher->action_open_in_new_window),
-                    "sensitive", (n_directories > 0),
-                    "visible", (n_directories <= 1),
+                    "sensitive", (n_directories == 1),
+                    "visible", (n_directories == n_selected_files && n_selected_files <= 1),
                     NULL);
 
-      g_object_set (G_OBJECT (launcher->action_open),
-                    "label", text,
-                    "sensitive", (n_directories > 0),
-                    NULL);
+      /* hide the "Open With Other Application" actions */
+      gtk_action_set_visible (launcher->action_open_with_other, FALSE);
+      gtk_action_set_visible (launcher->action_open_with_other_in_menu, FALSE);
     }
   else
     {
-      /* we turn the "Open" label into "Execute" if we have only one executable file */
-      if (G_UNLIKELY (n_executables == 1 && n_items == 1))
-        g_object_set (G_OBJECT (launcher->action_open), "label", _("_Execute"), NULL);
+      /** CASE 2: one or more file in the selection
+       **
+       ** - "Execute" action if all selected files are executable
+       ** - No "Open in n New Windows" action
+       **/
+
+      /* drop all previous addon actions from the action group */
+      actions = gtk_action_group_list_actions (launcher->action_group);
+      for (lp = actions; lp != NULL; lp = lp->next)
+        if (g_str_has_prefix (gtk_action_get_name (lp->data), "thunar-launcher-addon-"))
+          gtk_action_group_remove_action (launcher->action_group, lp->data);
+      g_list_free (actions);
+
+      /* allocate a new merge id from the UI manager */
+      launcher->ui_addons_merge_id = gtk_ui_manager_new_merge_id (launcher->ui_manager);
+
+      /* make the "Open" action sensitive */
+      gtk_action_set_sensitive (launcher->action_open, TRUE);
+
+      /* hide the "Open in n New Windows" action */
+      gtk_action_set_visible (launcher->action_open_in_new_window, FALSE);
+
+      /* determine the set of applications that work for all selected files */
+      applications = thunar_file_list_get_applications (launcher->selected_files);
+
+      /* reset the desktop actions list */
+      actions = NULL;
+
+      /* check if we have only executable files in the selection */
+      if (G_UNLIKELY (n_executables == n_selected_files))
+        {
+          /* turn the "Open" action into "Execute" */
+          g_object_set (G_OBJECT (launcher->action_open),
+                        "label", _("_Execute"),
+                        "tooltip", ngettext ("Execute the selected file", "Execute the selected files", n_selected_files),
+                        NULL);
+        }
+      else if (G_LIKELY (applications != NULL))
+        {
+          /* turn the "Open" action into "Open With DEFAULT" */
+          label = g_strdup_printf (_("_Open With \"%s\""), thunar_vfs_mime_application_get_name (applications->data));
+          tooltip = g_strdup_printf (ngettext ("Use \"%s\" to open the selected file",
+                                               "Use \"%s\" to open the selected files",
+                                               n_selected_files), thunar_vfs_mime_application_get_name (applications->data));
+          g_object_set (G_OBJECT (launcher->action_open),
+                        "label", label,
+                        "tooltip", tooltip,
+                        NULL);
+          g_free (tooltip);
+          g_free (label);
+
+          /* remember the default application for the "Open" action */
+          g_object_set_qdata_full (G_OBJECT (launcher->action_open), thunar_launcher_handler_quark, applications->data, g_object_unref);
+
+          /* add the desktop actions for this application */
+          actions = g_list_concat (actions, thunar_vfs_mime_application_get_actions (applications->data));
+
+          /* drop the default application from the list */
+          applications = g_list_remove (applications, applications->data);
+        }
+      else if (G_UNLIKELY (n_selected_files == 1))
+        {
+          /* turn the "Open" action into "Open With Other Application" */
+          g_object_set (G_OBJECT (launcher->action_open),
+                        "label", _("_Open With Other Application..."),
+                        "tooltip", _("Choose another application with which to open the selected file"),
+                        NULL);
+          default_is_open_with_other = TRUE;
+        }
       else
-        g_object_set (G_OBJECT (launcher->action_open), "label", _("_Open"), NULL);
+        {
+          /* we can only show a generic "Open" action */
+          g_object_set (G_OBJECT (launcher->action_open),
+                        "label", _("_Open With Default Applications"),
+                        "tooltip", ngettext ("Open the selected file with the default application",
+                                             "Open the selected files with the default applications", n_selected_files),
+                        NULL);
+        }
 
-#if GTK_CHECK_VERSION(2,6,0)
-      gtk_action_set_sensitive (launcher->action_open, (n_items > 0));
-      gtk_action_set_visible (launcher->action_open_in_new_window, FALSE);
-#else
-      g_object_set (G_OBJECT (launcher->action_open), "sensitive", (n_items > 0), NULL);
-      g_object_set (G_OBJECT (launcher->action_open_in_new_window), "visible", FALSE, NULL);
-#endif
-    }
+      /* place the other applications in the "Open With" submenu if we have more than 3 other applications */
+      if (G_UNLIKELY (g_list_length (applications) > 3))
+        {
+          /* determine the base paths for the actions */
+          file_menu_path = "/main-menu/file-menu/placeholder-launcher/open-with-menu/placeholder-applications";
+          context_menu_path = "/file-context-menu/placeholder-launcher/open-with-menu/placeholder-applications";
+
+          /* show the "Open With Other Application" in the submenu and hide the toplevel one */
+          gtk_action_set_visible (launcher->action_open_with_other, FALSE);
+          gtk_action_set_visible (launcher->action_open_with_other_in_menu, (n_selected_files == 1));
+        }
+      else
+        {
+          /* determine the base paths for the actions */
+          file_menu_path = "/main-menu/file-menu/placeholder-launcher/placeholder-applications";
+          context_menu_path = "/file-context-menu/placeholder-launcher/placeholder-applications";
 
-  /* update the "Open With" action */
-  thunar_open_with_action_set_file (THUNAR_OPEN_WITH_ACTION (launcher->action_open_with),
-                                    (n_items == 1) ? THUNAR_FILE (items->data) : NULL);
+          /* add a separator if we have more than one additional application */
+          if (G_LIKELY (applications != NULL))
+            {
+              /* add separator after the DEFAULT/execute action */
+              gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                     file_menu_path, "separator", NULL,
+                                     GTK_UI_MANAGER_SEPARATOR, FALSE);
+              gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                     context_menu_path, "separator", NULL,
+                                     GTK_UI_MANAGER_SEPARATOR, FALSE);
+            }
+
+          /* show the toplevel "Open With Other Application" (if not already done by the "Open" action) */
+          gtk_action_set_visible (launcher->action_open_with_other, !default_is_open_with_other && (n_selected_files == 1));
+          gtk_action_set_visible (launcher->action_open_with_other_in_menu, FALSE);
+        }
+
+      /* determine a the default icon theme for application/action icon lookups */
+      icon_theme = gtk_icon_theme_get_default ();
+
+      /* add actions for all remaining applications */
+      if (G_LIKELY (applications != NULL))
+        {
+          /* process all applications and determine the desktop actions */
+          for (lp = applications, n = 0; lp != NULL; lp = lp->next, ++n)
+            {
+              /* determine the desktop actions for this application */
+              actions = g_list_concat (actions, thunar_vfs_mime_application_get_actions (lp->data));
+
+              /* generate a unique label, unique id and tooltip for the application's action */
+              name = g_strdup_printf ("thunar-launcher-addon-application%d", n);
+              label = g_strdup_printf (_("Open With \"%s\""), thunar_vfs_mime_application_get_name (lp->data));
+              tooltip = g_strdup_printf (ngettext ("Use \"%s\" to open the selected file",
+                                                   "Use \"%s\" to open the selected files",
+                                                   n_selected_files), thunar_vfs_mime_application_get_name (lp->data));
+
+              /* check if we have an icon for this application */
+              icon_name = thunar_vfs_mime_handler_lookup_icon_name (lp->data, icon_theme);
+              if (G_LIKELY (icon_name != NULL))
+                {
+                  /* allocate and initialize an icon set for the application */
+                  icon_set = gtk_icon_set_new ();
+                  icon_source = gtk_icon_source_new ();
+                  if (G_UNLIKELY (g_path_is_absolute (icon_name)))
+                    gtk_icon_source_set_filename (icon_source, icon_name);
+                  else
+                    gtk_icon_source_set_icon_name (icon_source, icon_name);
+                  gtk_icon_set_add_source (icon_set, icon_source);
+                  gtk_icon_factory_add (launcher->icon_factory, name, icon_set);
+                  gtk_icon_source_free (icon_source);
+                  gtk_icon_set_unref (icon_set);
+                }
+
+              /* allocate a new action for the application */
+              action = gtk_action_new (name, label, tooltip, (icon_name != NULL) ? name : NULL);
+              gtk_action_group_add_action (launcher->action_group, action);
+              g_object_set_qdata_full (G_OBJECT (action), thunar_launcher_handler_quark, lp->data, g_object_unref);
+              g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (thunar_launcher_action_open), launcher);
+              gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                     file_menu_path, name, name,
+                                     GTK_UI_MANAGER_MENUITEM, FALSE);
+              gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                     context_menu_path, name, name,
+                                     GTK_UI_MANAGER_MENUITEM, FALSE);
+              g_object_unref (G_OBJECT (action));
+
+              /* cleanup */
+              g_free (tooltip);
+              g_free (label);
+              g_free (name);
+            }
+
+          /* cleanup */
+          g_list_free (applications);
+        }
+
+      /* check if we have any desktop actions */
+      if (G_UNLIKELY (actions != NULL))
+        {
+          /* add separator before the desktop actions */
+          gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                 "/main-menu/file-menu/placeholder-launcher/placeholder-actions",
+                                 "separator", NULL, GTK_UI_MANAGER_SEPARATOR, FALSE);
+          gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                 "/file-context-menu/placeholder-launcher/placeholder-actions",
+                                 "separator", NULL, GTK_UI_MANAGER_SEPARATOR, FALSE);
+
+          /* process all actions and add them to the UI manager */
+          for (lp = actions, n = 0; lp != NULL; lp = lp->next, ++n)
+            {
+              /* generate a unique name for the mime action */
+              name = g_strdup_printf ("thunar-launcher-addon-action%d", n);
+
+              /* check if we have an icon for this action */
+              icon_name = thunar_vfs_mime_handler_lookup_icon_name (lp->data, icon_theme);
+              if (G_LIKELY (icon_name != NULL))
+                {
+                  /* allocate and initialize an icon set for the action */
+                  icon_set = gtk_icon_set_new ();
+                  icon_source = gtk_icon_source_new ();
+                  if (G_UNLIKELY (g_path_is_absolute (icon_name)))
+                    gtk_icon_source_set_filename (icon_source, icon_name);
+                  else
+                    gtk_icon_source_set_icon_name (icon_source, icon_name);
+                  gtk_icon_set_add_source (icon_set, icon_source);
+                  gtk_icon_factory_add (launcher->icon_factory, name, icon_set);
+                  gtk_icon_source_free (icon_source);
+                  gtk_icon_set_unref (icon_set);
+                }
+
+              /* allocate a new ui action for the mime action */
+              action = gtk_action_new (name, thunar_vfs_mime_handler_get_name (lp->data), NULL, (icon_name != NULL) ? name : NULL);
+              gtk_action_group_add_action (launcher->action_group, action);
+              g_object_set_qdata_full (G_OBJECT (action), thunar_launcher_handler_quark, lp->data, g_object_unref);
+              g_signal_connect (G_OBJECT (action), "activate", G_CALLBACK (thunar_launcher_action_open), launcher);
+              gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                     "/main-menu/file-menu/placeholder-launcher/placeholder-actions",
+                                     name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
+              gtk_ui_manager_add_ui (launcher->ui_manager, launcher->ui_addons_merge_id,
+                                     "/file-context-menu/placeholder-launcher/placeholder-actions",
+                                     name, name, GTK_UI_MANAGER_MENUITEM, FALSE);
+              g_object_unref (G_OBJECT (action));
+
+              /* cleanup */
+              g_free (name);
+            }
+
+          /* cleanup */
+          g_list_free (actions);
+        }
+    }
 }
 
 
@@ -588,84 +999,98 @@ static void
 thunar_launcher_action_open (GtkAction      *action,
                              ThunarLauncher *launcher)
 {
-  GList *directories = NULL;
-  GList *files = NULL;
-  GList *lp;
-  gint   n_selected_files;
+  ThunarVfsMimeHandler *mime_handler;
+  GdkScreen            *screen;
+  gboolean              executable = TRUE;
+  GList                *selected_paths;
+  GList                *directories = NULL;
+  GList                *files = NULL;
+  GList                *lp;
 
   g_return_if_fail (GTK_IS_ACTION (action));
   g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
 
-  /* separate files and directories */
-  n_selected_files = g_list_length (launcher->selected_files);
-  for (lp = launcher->selected_files; lp != NULL; lp = lp->next)
-    {
-      if (thunar_file_is_directory (lp->data))
-        directories = g_list_append (directories, g_object_ref (lp->data));
-      else
-        files = g_list_append (files, g_object_ref (lp->data));
-    }
+  /* determine the screen on which to open the new windows */
+  screen = (launcher->widget != NULL) ? gtk_widget_get_screen (launcher->widget) : NULL;
 
-  /* open the directories */
-  if (directories != NULL)
+  /* check if we have a mime handler associated with the action */
+  mime_handler = g_object_get_qdata (G_OBJECT (action), thunar_launcher_handler_quark);
+  if (G_LIKELY (mime_handler != NULL))
     {
-      /* open new windows if we have more than one selected item */
-      if (G_UNLIKELY (n_selected_files == 1))
-        g_signal_emit (G_OBJECT (launcher), launcher_signals[OPEN_DIRECTORY], 0, directories->data);
-      else
-        thunar_launcher_open_new_windows (launcher, directories);
-      thunar_file_list_free (directories);
+      /* try to open the selected files using the given application */
+      selected_paths = thunar_file_list_to_path_list (launcher->selected_files);
+      thunar_launcher_open_paths (mime_handler, selected_paths, launcher);
+      thunar_vfs_path_list_free (selected_paths);
     }
-
-  /* open the files */
-  if (files != NULL)
+  else if (g_list_length (launcher->selected_files) == 1 && thunar_file_is_directory (launcher->selected_files->data))
     {
-      if (g_list_length (files) == 1 && thunar_file_is_executable (files->data))
-        thunar_launcher_execute_files (launcher, files);
-      else
-        thunar_launcher_open_files (launcher, files);
-      thunar_file_list_free (files);
+      /* we want to open one directory, so just emit "change-directory" here */
+      thunar_navigator_change_directory (THUNAR_NAVIGATOR (launcher), launcher->selected_files->data);
     }
-}
-
-
+  else
+    {
+      /* separate files and directories in the selected files list */
+      for (lp = launcher->selected_files; lp != NULL; lp = lp->next)
+        {
+          if (thunar_file_is_directory (lp->data))
+            {
+              /* add to our directory list */
+              directories = g_list_append (directories, lp->data);
+            }
+          else
+            {
+              /* add to our file list */
+              files = g_list_append (files, lp->data);
 
-static void
-thunar_launcher_action_open_with (GtkAction      *action,
-                                  ThunarLauncher *launcher)
-{
-  ThunarFile *file;
-  GtkWidget  *dialog;
-  GtkWindow  *window;
+              /* check if the file is executable */
+              executable = (executable && thunar_file_is_executable (lp->data));
+            }
+        }
 
-  g_return_if_fail (GTK_IS_ACTION (action));
-  g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
+      /* check if we have any directories to process */
+      if (G_LIKELY (directories != NULL))
+        {
+          /* open new windows for all directories */
+          thunar_launcher_open_windows (launcher, directories);
+          g_list_free (directories);
+        }
 
-  /* determine the first selected file */
-  file = g_list_nth_data (launcher->selected_files, 0);
-  if (G_UNLIKELY (file == NULL))
-    return;
+      /* check if we have any files to process */
+      if (G_LIKELY (files != NULL))
+        {
+          /* if all files are executable, we just run them here */
+          if (G_UNLIKELY (executable))
+            {
+              /* try to execute all given files */
+              thunar_launcher_execute_files (launcher, files);
+            }
+          else
+            {
+              /* try to open all files using their default applications */
+              thunar_launcher_open_files (launcher, files);
+            }
 
-  window = (launcher->widget != NULL) ? (GtkWindow *) gtk_widget_get_toplevel (launcher->widget) : NULL;
-  dialog = thunar_chooser_dialog_new (window, file, TRUE);
-  gtk_dialog_run (GTK_DIALOG (dialog));
-  gtk_widget_destroy (dialog);
+          /* cleanup */
+          g_list_free (files);
+        }
+    }
 }
 
 
 
 static void
-thunar_launcher_action_open_application (GtkAction                *action,
-                                         ThunarVfsMimeApplication *application,
-                                         GList                    *path_list,
-                                         ThunarLauncher           *launcher)
+thunar_launcher_action_open_with_other (GtkAction      *action,
+                                        ThunarLauncher *launcher)
 {
   g_return_if_fail (GTK_IS_ACTION (action));
   g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
 
-  /* open the URIs (if any) using the given application */
-  if (G_LIKELY (path_list != NULL))
-    thunar_launcher_open_paths (application, path_list, launcher);
+  /* verify that we have atleast one selected file */
+  if (G_LIKELY (launcher->selected_files != NULL))
+    {
+      /* popup the chooser dialog for the first selected file */
+      thunar_show_chooser_dialog (launcher->widget, launcher->selected_files->data, TRUE);
+    }
 }
 
 
@@ -674,146 +1099,40 @@ static void
 thunar_launcher_action_open_in_new_window (GtkAction      *action,
                                            ThunarLauncher *launcher)
 {
-  GList *directories;
-
   g_return_if_fail (GTK_IS_ACTION (action));
   g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
 
-  /* take an additional reference on the launcher to make sure we don't get destroyed in the meantime */
-  g_object_ref (G_OBJECT (launcher));
-
-  /* open the directories */
-  directories = thunar_file_list_copy (launcher->selected_files);
-  thunar_launcher_open_new_windows (launcher, directories);
-  thunar_file_list_free (directories);
-
-  /* release the additional reference */
-  g_object_unref (G_OBJECT (launcher));
-}
-
-
-
-/**
- * thunar_launcher_new:
- *
- * Allocates a new #ThunarLauncher instance and
- * returns it.
- *
- * Return value: the newly allocated #ThunarLauncher instance.
- **/
-ThunarLauncher*
-thunar_launcher_new (void)
-{
-  return g_object_new (THUNAR_TYPE_LAUNCHER, NULL);
-}
-
-
-
-/**
- * thunar_launcher_get_action_group:
- * @launcher : a #ThunarLauncher.
- *
- * Returns the #GtkActionGroup for the @launcher.
- *
- * Return value: the #GtkActionGroup for @launcher.
- **/
-GtkActionGroup*
-thunar_launcher_get_action_group (const ThunarLauncher *launcher)
-{
-  g_return_val_if_fail (THUNAR_IS_LAUNCHER (launcher), NULL);
-  return launcher->action_group;
+  /* open the selected directories in new windows */
+  thunar_launcher_open_windows (launcher, launcher->selected_files);
 }
 
 
 
-/**
- * thunar_launcher_set_action_group:
- * @launcher     : a #ThunarLauncher.
- * @action_group : a #GtkActionGroup or %NULL.
- *
- * Disconnects @launcher from any previously set
- * #GtkActionGroup. If @action_group is a valid
- * #GtkActionGroup, then @launcher will connect
- * its actions ("open", "open-in-new-window" and
- * "open-with") to @action_group.
- **/
-void
-thunar_launcher_set_action_group (ThunarLauncher *launcher,
-                                  GtkActionGroup *action_group)
+static void
+thunar_launcher_widget_destroyed (ThunarLauncher *launcher,
+                                  GtkWidget      *widget)
 {
   g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
-  g_return_if_fail (action_group == NULL || GTK_IS_ACTION_GROUP (action_group));
-
-  /* disconnect from the previous action group */
-  if (G_UNLIKELY (launcher->action_group != NULL))
-    {
-      gtk_action_group_remove_action (launcher->action_group, launcher->action_open);
-      gtk_action_group_remove_action (launcher->action_group, launcher->action_open_in_new_window);
-      gtk_action_group_remove_action (launcher->action_group, launcher->action_open_with);
-      g_object_unref (G_OBJECT (launcher->action_group));
-    }
-
-  /* activate the new action group */
-  launcher->action_group = action_group;
-
-  /* connect to the new action group */
-  if (G_LIKELY (action_group != NULL))
-    {
-      g_object_ref (G_OBJECT (action_group));
-      gtk_action_group_add_action_with_accel (action_group, launcher->action_open, "<control>O");
-      gtk_action_group_add_action_with_accel (action_group, launcher->action_open_in_new_window, "<shift><control>O");
-      gtk_action_group_add_action (action_group, launcher->action_open_with);
-    }
+  g_return_if_fail (launcher->widget == widget);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
 
-  /* notify listeners */
-  g_object_notify (G_OBJECT (launcher), "action-group");
+  /* just reset the widget property for the launcher */
+  thunar_launcher_set_widget (launcher, NULL);
 }
 
 
 
 /**
- * thunar_launcher_get_selected_files:
- * @launcher : a #ThunarLauncher.
+ * thunar_launcher_new:
  *
- * Returns the selected files currently set for @launcher.
+ * Allocates a new #ThunarLauncher instance.
  *
- * Return value: the list of selected #ThunarFile<!---->s
- *               for @launcher.
+ * Return value: the newly allocated #ThunarLauncher.
  **/
-GList*
-thunar_launcher_get_selected_files (const ThunarLauncher *launcher)
-{
-  g_return_val_if_fail (THUNAR_IS_LAUNCHER (launcher), NULL);
-  return launcher->selected_files;
-}
-
-
-
-/**
- * thunar_launcher_set_selected_files:
- * @launcher       : a #ThunarLauncher.
- * @selected_files : a list of selected #ThunarFile<!---->s.
- *
- * Installs @selected_files for @launcher.
- **/
-void
-thunar_launcher_set_selected_files (ThunarLauncher *launcher,
-                                    GList          *selected_files)
+ThunarLauncher*
+thunar_launcher_new (void)
 {
-  g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
-
-  /* disconnect from the previously selected files */
-  if (G_LIKELY (launcher->selected_files != NULL))
-    thunar_file_list_free (launcher->selected_files);
-
-  /* activate the new selected files list */
-  launcher->selected_files = thunar_file_list_copy (selected_files);
-
-  /* update the user interface */
-  thunar_launcher_update (launcher);
-
-  /* notify interested parties */
-  g_object_notify (G_OBJECT (launcher), "selected-files");
+  return g_object_new (THUNAR_TYPE_LAUNCHER, NULL);
 }
 
 
@@ -822,10 +1141,9 @@ thunar_launcher_set_selected_files (ThunarLauncher *launcher,
  * thunar_launcher_get_widget:
  * @launcher : a #ThunarLauncher.
  *
- * Returns the #GtkWidget with which @launcher is associated
- * currently or %NULL.
+ * Returns the #GtkWidget currently associated with @launcher.
  *
- * Return value: the #GtkWidget associated with @launcher or %NULL.
+ * Return value: the widget associated with @launcher.
  **/
 GtkWidget*
 thunar_launcher_get_widget (const ThunarLauncher *launcher)
@@ -841,8 +1159,7 @@ thunar_launcher_get_widget (const ThunarLauncher *launcher)
  * @launcher : a #ThunarLauncher.
  * @widget   : a #GtkWidget or %NULL.
  *
- * Tells @launcher to use @widget to determine the screen on
- * which to launch applications and such.
+ * Associates @launcher with @widget.
  **/
 void
 thunar_launcher_set_widget (ThunarLauncher *launcher,
@@ -851,22 +1168,26 @@ thunar_launcher_set_widget (ThunarLauncher *launcher,
   g_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
   g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
 
-  /* verify that the widgets differ */
-  if (G_UNLIKELY (launcher->widget == widget))
-    return;
-
-  /* disconnect from the previously set widget */
+  /* disconnect from the previous widget */
   if (G_UNLIKELY (launcher->widget != NULL))
-    g_object_unref (G_OBJECT (launcher->widget));
+    {
+      g_signal_handlers_disconnect_by_func (G_OBJECT (launcher->widget), thunar_launcher_widget_destroyed, launcher);
+      g_object_unref (G_OBJECT (launcher->widget));
+    }
 
   /* activate the new widget */
   launcher->widget = widget;
 
   /* connect to the new widget */
   if (G_LIKELY (widget != NULL))
-    g_object_ref (G_OBJECT (widget));
-  
+    {
+      g_object_ref (G_OBJECT (widget));
+      g_signal_connect_swapped (G_OBJECT (widget), "destroy", G_CALLBACK (thunar_launcher_widget_destroyed), launcher);
+    }
+
   /* notify listeners */
   g_object_notify (G_OBJECT (launcher), "widget");
 }
 
+
+
diff --git a/thunar/thunar-launcher.h b/thunar/thunar-launcher.h
index 375826d7d..b7b888b22 100644
--- a/thunar/thunar-launcher.h
+++ b/thunar/thunar-launcher.h
@@ -1,6 +1,6 @@
 /* $Id$ */
 /*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
  *
  * 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
@@ -20,7 +20,7 @@
 #ifndef __THUNAR_LAUNCHER_H__
 #define __THUNAR_LAUNCHER_H__
 
-#include <thunar/thunar-file.h>
+#include <thunar/thunar-component.h>
 
 G_BEGIN_DECLS;
 
@@ -38,14 +38,6 @@ GType           thunar_launcher_get_type            (void) G_GNUC_CONST;
 
 ThunarLauncher *thunar_launcher_new                 (void) G_GNUC_MALLOC;
 
-GtkActionGroup *thunar_launcher_get_action_group    (const ThunarLauncher *launcher);
-void            thunar_launcher_set_action_group    (ThunarLauncher       *launcher,
-                                                     GtkActionGroup       *action_group);
-
-GList          *thunar_launcher_get_selected_files  (const ThunarLauncher *launcher);
-void            thunar_launcher_set_selected_files  (ThunarLauncher       *launcher,
-                                                     GList                *selected_files);
-
 GtkWidget      *thunar_launcher_get_widget          (const ThunarLauncher *launcher);
 void            thunar_launcher_set_widget          (ThunarLauncher       *launcher,
                                                      GtkWidget            *widget);
diff --git a/thunar/thunar-open-with-action.c b/thunar/thunar-open-with-action.c
deleted file mode 100644
index 1f28a6b5e..000000000
--- a/thunar/thunar-open-with-action.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org>
- *
- * 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 of the License, 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 <thunar/thunar-icon-factory.h>
-#include <thunar/thunar-marshal.h>
-#include <thunar/thunar-open-with-action.h>
-
-
-
-enum
-{
-  PROP_0,
-  PROP_FILE,
-};
-
-enum
-{
-  OPEN_APPLICATION,
-  LAST_SIGNAL,
-};
-
-
-
-static void       thunar_open_with_action_class_init        (ThunarOpenWithActionClass *klass);
-static void       thunar_open_with_action_init              (ThunarOpenWithAction      *open_with_action);
-static void       thunar_open_with_action_dispose           (GObject                   *object);
-static void       thunar_open_with_action_finalize          (GObject                   *object);
-static void       thunar_open_with_action_get_property      (GObject                   *object,
-                                                             guint                      prop_id,
-                                                             GValue                    *value,
-                                                             GParamSpec                *pspec);
-static void       thunar_open_with_action_set_property      (GObject                   *object,
-                                                             guint                      prop_id,
-                                                             const GValue              *value,
-                                                             GParamSpec                *pspec);
-static GtkWidget *thunar_open_with_action_create_menu_item  (GtkAction                 *action);
-static void       thunar_open_with_action_activated         (GtkWidget                 *item,
-                                                             ThunarOpenWithAction      *open_with_action);
-static void       thunar_open_with_action_menu_mapped       (GtkWidget                 *menu,
-                                                             ThunarOpenWithAction      *open_with_action);
-static void       thunar_open_with_action_file_destroy      (ThunarFile                *file,
-                                                             ThunarOpenWithAction      *open_with_action);
-
-
-
-struct _ThunarOpenWithActionClass
-{
-  GtkActionClass __parent__;
-
-  void (*open_application) (ThunarOpenWithAction     *action,
-                            ThunarVfsMimeApplication *application,
-                            GList                    *path_list);
-};
-
-struct _ThunarOpenWithAction
-{
-  GtkAction __parent__;
-
-  ThunarVfsMimeDatabase *mime_database;
-  ThunarFile            *file;
-};
-
-
-
-static GObjectClass *thunar_open_with_action_parent_class;
-static guint         open_with_action_signals[LAST_SIGNAL];
-
-
-
-GType
-thunar_open_with_action_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ThunarOpenWithActionClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) thunar_open_with_action_class_init,
-        NULL,
-        NULL,
-        sizeof (ThunarOpenWithAction),
-        0,
-        (GInstanceInitFunc) thunar_open_with_action_init,
-        NULL,
-      };
-
-      type = g_type_register_static (GTK_TYPE_ACTION, I_("ThunarOpenWithAction"), &info, 0);
-    }
-
-  return type;
-}
-
-
-
-static void
-thunar_open_with_action_class_init (ThunarOpenWithActionClass *klass)
-{
-  GtkActionClass *gtkaction_class;
-  GObjectClass   *gobject_class;
-
-  /* determine the parent type class */
-  thunar_open_with_action_parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->dispose = thunar_open_with_action_dispose;
-  gobject_class->finalize = thunar_open_with_action_finalize;
-  gobject_class->get_property = thunar_open_with_action_get_property;
-  gobject_class->set_property = thunar_open_with_action_set_property;
-
-  gtkaction_class = GTK_ACTION_CLASS (klass);
-  gtkaction_class->create_menu_item = thunar_open_with_action_create_menu_item;
-
-  /**
-   * ThunarOpenWithAction:file:
-   *
-   * The #ThunarFile for which to display the MIME application
-   * selector menu.
-   **/
-  g_object_class_install_property (gobject_class,
-                                   PROP_FILE,
-                                   g_param_spec_object ("file",
-                                                        "file",
-                                                        "file",
-                                                        THUNAR_TYPE_FILE,
-                                                        EXO_PARAM_READWRITE));
-
-  /**
-   * ThunarOpenWithAction::open-application:
-   * @open_with_action : a #ThunarOpenWithAction.
-   * @application      : a #ThunarVfsMimeApplication.
-   * @path_list        : a list of #ThunarVfsPath<!---->s.
-   *
-   * Emitted by @open_with_action whenever the user requests to
-   * open @path_list with @application.
-   **/
-  open_with_action_signals[OPEN_APPLICATION] =
-    g_signal_new (I_("open-application"),
-                  G_TYPE_FROM_CLASS (gobject_class),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (ThunarOpenWithActionClass, open_application),
-                  NULL, NULL, _thunar_marshal_VOID__BOXED_POINTER,
-                  G_TYPE_NONE, 2, THUNAR_VFS_TYPE_MIME_APPLICATION, G_TYPE_POINTER);
-}
-
-
-
-static void
-thunar_open_with_action_init (ThunarOpenWithAction *open_with_action)
-{
-  open_with_action->mime_database = thunar_vfs_mime_database_get_default ();
-}
-
-
-
-static void
-thunar_open_with_action_dispose (GObject *object)
-{
-  ThunarOpenWithAction *open_with_action = THUNAR_OPEN_WITH_ACTION (object);
-
-  thunar_open_with_action_set_file (open_with_action, NULL);
-
-  (*G_OBJECT_CLASS (thunar_open_with_action_parent_class)->dispose) (object);
-}
-
-
-
-static void
-thunar_open_with_action_finalize (GObject *object)
-{
-  ThunarOpenWithAction *open_with_action = THUNAR_OPEN_WITH_ACTION (object);
-
-  g_object_unref (G_OBJECT (open_with_action->mime_database));
-
-  (*G_OBJECT_CLASS (thunar_open_with_action_parent_class)->finalize) (object);
-}
-
-
-
-static void
-thunar_open_with_action_get_property (GObject    *object,
-                                      guint       prop_id,
-                                      GValue     *value,
-                                      GParamSpec *pspec)
-{
-  ThunarOpenWithAction *open_with_action = THUNAR_OPEN_WITH_ACTION (object);
-
-  switch (prop_id)
-    {
-    case PROP_FILE:
-      g_value_set_object (value, thunar_open_with_action_get_file (open_with_action));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-
-
-static void
-thunar_open_with_action_set_property (GObject      *object,
-                                      guint         prop_id,
-                                      const GValue *value,
-                                      GParamSpec   *pspec)
-{
-  ThunarOpenWithAction *open_with_action = THUNAR_OPEN_WITH_ACTION (object);
-
-  switch (prop_id)
-    {
-    case PROP_FILE:
-      thunar_open_with_action_set_file (open_with_action, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-
-
-static GtkWidget*
-thunar_open_with_action_create_menu_item (GtkAction *action)
-{
-  GtkWidget *item;
-  GtkWidget *menu;
-
-  g_return_val_if_fail (THUNAR_IS_OPEN_WITH_ACTION (action), NULL);
-
-  /* let GtkAction allocate the menu item */
-  item = (*GTK_ACTION_CLASS (thunar_open_with_action_parent_class)->create_menu_item) (action);
-
-  /* associate an empty submenu with the item (will be filled when mapped) */
-  menu = gtk_menu_new ();
-  g_signal_connect (G_OBJECT (menu), "map", G_CALLBACK (thunar_open_with_action_menu_mapped), action);
-  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
-
-  return item;
-}
-
-
-
-static void
-thunar_open_with_action_activated (GtkWidget            *item,
-                                   ThunarOpenWithAction *open_with_action)
-{
-  ThunarVfsMimeApplication *application;
-  ThunarFile               *file;
-  GList                     path_list;
-
-  g_return_if_fail (THUNAR_IS_OPEN_WITH_ACTION (open_with_action));
-  g_return_if_fail (GTK_IS_MENU_ITEM (item));
-
-  /* verify that the file is still alive */
-  file = open_with_action->file;
-  if (G_UNLIKELY (file == NULL))
-    return;
-
-  /* query the launch parameters for this application item */
-  application = g_object_get_data (G_OBJECT (item), I_("thunar-vfs-mime-application"));
-
-  /* generate a single item list */
-  path_list.data = thunar_file_get_path (file);
-  path_list.next = NULL;
-  path_list.prev = NULL;
-
-  /* emit the "open-application" signal */
-  g_signal_emit (G_OBJECT (open_with_action), open_with_action_signals[OPEN_APPLICATION], 0, application, &path_list);
-}
-
-
-
-static void
-thunar_open_with_action_menu_mapped (GtkWidget            *menu,
-                                     ThunarOpenWithAction *open_with_action)
-{
-  ThunarVfsMimeApplication *default_application;
-  ThunarVfsMimeInfo        *info;
-  ThunarIconFactory        *icon_factory;
-  GtkIconTheme             *icon_theme;
-  const gchar              *icon_name;
-  GdkPixbuf                *icon;
-  GtkWidget                *image;
-  GtkWidget                *item;
-  GList                    *applications;
-  GList                    *lp;
-  gchar                    *text;
-  gint                      icon_size;
-
-  g_return_if_fail (THUNAR_IS_OPEN_WITH_ACTION (open_with_action));
-  g_return_if_fail (GTK_IS_MENU_SHELL (menu));
-
-  /* check if we already added our children to the submenu (or we don't have a file) */
-  if (G_LIKELY (GTK_MENU_SHELL (menu)->children != NULL || open_with_action->file == NULL))
-    return;
-
-  /* determine the mime info for the file (may fail) */
-  info = thunar_file_get_mime_info (open_with_action->file);
-
-  /* determine the icon size for menus */
-  gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &icon_size, &icon_size);
-
-  /* determine the icon factory */
-  icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (menu));
-  icon_factory = thunar_icon_factory_get_for_icon_theme (icon_theme);
-
-  /* determine all applications that are claim to be able to handle the file */
-  applications = thunar_vfs_mime_database_get_applications (open_with_action->mime_database, info);
-
-  /* determine the default application (fallback to the first available application) */
-  default_application = thunar_vfs_mime_database_get_default_application (open_with_action->mime_database, info);
-  if (G_UNLIKELY (default_application == NULL && applications != NULL))
-    default_application = thunar_vfs_mime_application_ref (applications->data);
-
-  /* add a menu entry for the default application */
-  if (G_LIKELY (default_application != NULL))
-    {
-      /* drop the default application from the application list */
-      lp = g_list_find (applications, default_application);
-      if (G_LIKELY (lp != NULL))
-        {
-          applications = g_list_delete_link (applications, lp);
-          thunar_vfs_mime_application_unref (default_application);
-        }
-
-      text = g_strdup_printf (_("%s (default)"), thunar_vfs_mime_application_get_name (default_application));
-      item = gtk_image_menu_item_new_with_label (text);
-      g_object_set_data_full (G_OBJECT (item), I_("thunar-vfs-mime-application"), default_application, (GDestroyNotify) thunar_vfs_mime_application_unref);
-      g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (thunar_open_with_action_activated), open_with_action);
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-      gtk_widget_show (item);
-      g_free (text);
-
-      /* setup the icon for the application */
-      icon_name = thunar_vfs_mime_application_lookup_icon_name (default_application, icon_theme);
-      icon = thunar_icon_factory_load_icon (icon_factory, icon_name, icon_size, NULL, FALSE);
-      image = gtk_image_new_from_pixbuf (icon);
-      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-      gtk_widget_show (image);
-      if (G_LIKELY (icon != NULL))
-        g_object_unref (icon);
-
-      item = gtk_separator_menu_item_new ();
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-      gtk_widget_show (item);
-    }
-
-  /* add the other possible applications */
-  if (G_LIKELY (applications != NULL))
-    {
-      for (lp = applications; lp != NULL; lp = lp->next)
-        {
-          item = gtk_image_menu_item_new_with_label (thunar_vfs_mime_application_get_name (lp->data));
-          g_object_set_data_full (G_OBJECT (item), I_("thunar-vfs-mime-application"), lp->data, (GDestroyNotify) thunar_vfs_mime_application_unref);
-          g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (thunar_open_with_action_activated), open_with_action);
-          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-          gtk_widget_show (item);
-
-          /* setup the icon for the application */
-          icon_name = thunar_vfs_mime_application_lookup_icon_name (lp->data, icon_theme);
-          icon = thunar_icon_factory_load_icon (icon_factory, icon_name, icon_size, NULL, FALSE);
-          image = gtk_image_new_from_pixbuf (icon);
-          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-          gtk_widget_show (image);
-          if (G_LIKELY (icon != NULL))
-            g_object_unref (icon);
-        }
-
-      item = gtk_separator_menu_item_new ();
-      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-      gtk_widget_show (item);
-
-      g_list_free (applications);
-    }
-
-  /* add our custom children */
-  item = gtk_image_menu_item_new_with_label (_("Other Application..."));
-  g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (gtk_action_activate), open_with_action);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_show (item);
-
-  /* clean up */
-  g_object_unref (G_OBJECT (icon_factory));
-}
-
-
-
-static void
-thunar_open_with_action_file_destroy (ThunarFile           *file,
-                                      ThunarOpenWithAction *open_with_action)
-{
-  g_return_if_fail (THUNAR_IS_OPEN_WITH_ACTION (open_with_action));
-  g_return_if_fail (open_with_action->file == file);
-  g_return_if_fail (THUNAR_IS_FILE (file));
-
-  /* just unset the file here (will automatically hide the action) */
-  thunar_open_with_action_set_file (open_with_action, NULL);
-}
-
-
-
-/**
- * thunar_open_with_action_new:
- * @name  : the name of the #ThunarOpenWithAction.
- * @label : the label of the #ThunarOpenWithAction.
- *
- * Allocates a new #ThunarOpenWithAction instance
- * and returns it.
- *
- * Return value: the newly allocated #ThunarOpenWithAction
- *               instance.
- **/
-GtkAction*
-thunar_open_with_action_new (const gchar *name,
-                             const gchar *label)
-{
-  g_return_val_if_fail (name != NULL, NULL);
-
-  return g_object_new (THUNAR_TYPE_OPEN_WITH_ACTION,
-                       "hide-if-empty", FALSE,
-                       "label", label,
-                       "name", name,
-                       "visible", FALSE,
-                       NULL);
-}
-
-
-
-/**
- * thunar_open_with_action_get_file:
- * @open_with_action : a #ThunarOpenWithAction.
- *
- * Returns the #ThunarFile set for the @open_with_action,
- * which may be %NULL.
- *
- * Return value: the #ThunarFile for @open_with_action.
- **/
-ThunarFile*
-thunar_open_with_action_get_file (ThunarOpenWithAction *open_with_action)
-{
-  g_return_val_if_fail (THUNAR_IS_OPEN_WITH_ACTION (open_with_action), NULL);
-  return open_with_action->file;
-}
-
-
-
-/**
- * thunar_open_with_action_set_file:
- * @open_with_action : a #ThunarOpenWithAction.
- * @file             : a #ThunarFile or %NULL.
- *
- * Tells @open_with_action to display a selector menu
- * for @file.
- *
- * The @open_with_action will be visible if @file is
- * not %NULL, else it's invisible.
- **/
-void
-thunar_open_with_action_set_file (ThunarOpenWithAction *open_with_action,
-                                  ThunarFile           *file)
-{
-  GtkWidget *menu;
-  GSList    *lp;
-  GList     *children;
-
-  g_return_if_fail (THUNAR_IS_OPEN_WITH_ACTION (open_with_action));
-  g_return_if_fail (file == NULL || THUNAR_IS_FILE (file));
-
-  /* check that we have different files */
-  if (G_UNLIKELY (open_with_action->file == file))
-    return;
-
-  /* disconnect from the previous file */
-  if (G_LIKELY (open_with_action->file != NULL))
-    {
-      g_signal_handlers_disconnect_by_func (G_OBJECT (open_with_action->file), thunar_open_with_action_file_destroy, open_with_action);
-      g_object_unref (G_OBJECT (open_with_action->file));
-    }
-
-  /* activate the new file */
-  open_with_action->file = file;
-
-  /* connect to the new file */
-  if (G_LIKELY (file != NULL))
-    {
-      g_object_ref (G_OBJECT (file));
-      g_signal_connect (G_OBJECT (file), "destroy", G_CALLBACK (thunar_open_with_action_file_destroy), open_with_action);
-    }
-
-  /* clear menus for all menu proxies (will be rebuild on-demand) */
-  for (lp = gtk_action_get_proxies (GTK_ACTION (open_with_action)); lp != NULL; lp = lp->next)
-    if (G_LIKELY (GTK_IS_MENU_ITEM (lp->data)))
-      {
-        menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (lp->data));
-        if (G_LIKELY (menu != NULL))
-          {
-            children = gtk_container_get_children (GTK_CONTAINER (menu));
-            g_list_foreach (children, (GFunc) gtk_widget_destroy, NULL);
-            g_list_free (children);
-          }
-      }
-        
-
-  /* toggle the visibility of the action */
-#if GTK_CHECK_VERSION(2,6,0)
-  gtk_action_set_visible (GTK_ACTION (open_with_action), (file != NULL && !thunar_file_is_directory (file)));
-#else
-  g_object_set (G_OBJECT (open_with_action), "visible", (file != NULL && !thunar_file_is_directory (file)), NULL);
-#endif
-
-  /* notify listeners */
-  g_object_notify (G_OBJECT (open_with_action), "file");
-}
-
-
-
-
diff --git a/thunar/thunar-open-with-action.h b/thunar/thunar-open-with-action.h
deleted file mode 100644
index 25ee0feb8..000000000
--- a/thunar/thunar-open-with-action.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
- *
- * 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 of the License, 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
- */
-
-#ifndef __THUNAR_OPEN_WITH_ACTION_H__
-#define __THUNAR_OPEN_WITH_ACTION_H__
-
-#include <thunar/thunar-file.h>
-
-G_BEGIN_DECLS;
-
-typedef struct _ThunarOpenWithActionClass ThunarOpenWithActionClass;
-typedef struct _ThunarOpenWithAction      ThunarOpenWithAction;
-
-#define THUNAR_TYPE_OPEN_WITH_ACTION            (thunar_open_with_action_get_type ())
-#define THUNAR_OPEN_WITH_ACTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_TYPE_OPEN_WITH_ACTION, ThunarOpenWithAction))
-#define THUNAR_OPEN_WITH_ACTION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_TYPE_OPEN_WITH_ACTION, ThunarOpenWithActionClass))
-#define THUNAR_IS_OPEN_WITH_ACTION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_TYPE_OPEN_WITH_ACTION))
-#define THUNAR_IS_OPEN_WITH_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_TYPE_OPEN_WITH_ACTION))
-#define THUNAR_OPEN_WITH_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_TYPE_OPEN_WITH_ACTION, ThunarOpenWithActionClass))
-
-GType       thunar_open_with_action_get_type (void) G_GNUC_CONST;
-
-GtkAction  *thunar_open_with_action_new      (const gchar          *name,
-                                              const gchar          *label) G_GNUC_MALLOC;
-
-ThunarFile *thunar_open_with_action_get_file (ThunarOpenWithAction *open_with_action);
-void        thunar_open_with_action_set_file (ThunarOpenWithAction *open_with_action,
-                                              ThunarFile           *file);
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_OPEN_WITH_ACTION_H__ */
diff --git a/thunar/thunar-standard-view-ui.xml b/thunar/thunar-standard-view-ui.xml
index deea198e1..bbaa802b5 100644
--- a/thunar/thunar-standard-view-ui.xml
+++ b/thunar/thunar-standard-view-ui.xml
@@ -16,11 +16,6 @@
         <menuitem action="create-folder" name="create-folder" />
         <menuitem action="create-document" name="create-document" />
       </placeholder>
-      <placeholder name="placeholder-launcher-actions">
-        <menuitem action="open" name="open" />
-        <menuitem action="open-in-new-window" name="open-in-new-window" />
-        <menuitem action="open-with" name="open-with" />
-      </placeholder>
       <placeholder name="placeholder-file-properties">
         <menuitem action="properties" name="properties" />
       </placeholder>
@@ -46,20 +41,18 @@
   </menubar>
 
   <popup action="file-context-menu" name="file-context-menu">
-    <menuitem action="open" name="open" />
-    <menuitem action="open-in-new-window" name="open-in-new-window" />
-    <menuitem action="open-with" name="open-with" />
-    <separator />
-    <menuitem action="copy" name="copy" />
-    <menuitem action="cut" name="cut" />
-    <menuitem action="delete" name="delete" />
-    <menuitem action="paste-into-folder" name="paste-into-folder" />
-    <separator />
-    <menuitem action="rename" name="rename" />
-    <separator />
-    <placeholder name="placeholder-custom-actions" />
-    <separator />
-    <menuitem action="properties" name="properties" />
+    <placeholder name="placeholder-clipboard-actions">
+      <menuitem action="copy" name="copy" />
+      <menuitem action="cut" name="cut" />
+      <menuitem action="delete" name="delete" />
+      <menuitem action="paste-into-folder" name="paste-into-folder" />
+    </placeholder>
+    <placeholder name="placeholder-edit-actions">
+      <menuitem action="rename" name="rename" />
+    </placeholder>
+    <placeholder name="placeholder-file-actions">
+      <menuitem action="properties" name="properties" />
+    </placeholder>
   </popup>
 
   <popup action="folder-context-menu" name="folder-context-menu">
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index 345f938bd..1f2051484 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -35,7 +35,6 @@
 #include <thunar/thunar-dialogs.h>
 #include <thunar/thunar-dnd.h>
 #include <thunar/thunar-icon-renderer.h>
-#include <thunar/thunar-launcher.h>
 #include <thunar/thunar-marshal.h>
 #include <thunar/thunar-properties-dialog.h>
 #include <thunar/thunar-standard-view.h>
@@ -226,7 +225,6 @@ static void                 thunar_standard_view_drag_timer_destroy         (gpo
 
 struct _ThunarStandardViewPrivate
 {
-  ThunarLauncher         *launcher;
   GtkAction              *action_create_folder;
   GtkAction              *action_create_document;
   GtkAction              *action_properties;
@@ -548,13 +546,6 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
    * files in our model changes.
    */
   g_signal_connect_swapped (G_OBJECT (standard_view->model), "notify::num-files", G_CALLBACK (thunar_standard_view_update_statusbar_text), standard_view);
-
-  /* allocate the launcher support */
-  standard_view->priv->launcher = thunar_launcher_new ();
-  thunar_launcher_set_action_group (standard_view->priv->launcher, standard_view->action_group);
-  thunar_launcher_set_widget (standard_view->priv->launcher, GTK_WIDGET (standard_view));
-  exo_binding_new (G_OBJECT (standard_view), "selected-files", G_OBJECT (standard_view->priv->launcher), "selected-files");
-  g_signal_connect_swapped (G_OBJECT (standard_view->priv->launcher), "open-directory", G_CALLBACK (thunar_navigator_change_directory), standard_view);
 }
 
 
@@ -631,9 +622,6 @@ thunar_standard_view_dispose (GObject *object)
   /* reset the UI manager property */
   thunar_component_set_ui_manager (THUNAR_COMPONENT (standard_view), NULL);
 
-  /* disconnect the widget from the launcher support */
-  thunar_launcher_set_widget (standard_view->priv->launcher, NULL);
-
   (*G_OBJECT_CLASS (thunar_standard_view_parent_class)->dispose) (object);
 }
 
@@ -668,9 +656,6 @@ thunar_standard_view_finalize (GObject *object)
   /* release the reference on the action group */
   g_object_unref (G_OBJECT (standard_view->action_group));
 
-  /* release the reference on the launcher */
-  g_object_unref (G_OBJECT (standard_view->priv->launcher));
-
   /* drop any existing "new-files" closure */
   if (G_UNLIKELY (standard_view->priv->new_files_closure != NULL))
     {
diff --git a/thunar/thunar-window-ui.xml b/thunar/thunar-window-ui.xml
index b28705942..f796d8742 100644
--- a/thunar/thunar-window-ui.xml
+++ b/thunar/thunar-window-ui.xml
@@ -15,7 +15,7 @@
       <menuitem action="open-new-window" name="open-new-window" />
       <placeholder name="placeholder-create-actions" />
       <separator />
-      <placeholder name="placeholder-launcher-actions" />
+      <placeholder name="placeholder-launcher" />
       <separator />
       <placeholder name="placeholder-file-properties" />
       <separator />
@@ -75,6 +75,18 @@
     </menu>
   </menubar>
 
+  <popup action="file-context-menu" name="file-context-menu">
+    <placeholder name="placeholder-launcher" />
+    <separator />
+    <placeholder name="placeholder-clipboard-actions" />
+    <separator />
+    <placeholder name="placeholder-edit-actions" />
+    <separator />
+    <placeholder name="placeholder-custom-actions" />
+    <separator />
+    <placeholder name="placeholder-file-actions" />
+  </popup>
+
 </ui>
 
 <!-- vi: set ts=2 sw=2 et ai nocindent syntax=xml: -->
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 9167669ef..69b818c24 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -31,6 +31,7 @@
 #include <thunar/thunar-gtk-extensions.h>
 #include <thunar/thunar-history.h>
 #include <thunar/thunar-icon-view.h>
+#include <thunar/thunar-launcher.h>
 #include <thunar/thunar-location-buttons.h>
 #include <thunar/thunar-location-dialog.h>
 #include <thunar/thunar-location-entry.h>
@@ -194,6 +195,7 @@ struct _ThunarWindow
   GtkWidget              *location_bar;
 
   ThunarHistory          *history;
+  ThunarLauncher         *launcher;
 
   ThunarFile             *current_directory;
 
@@ -533,6 +535,13 @@ thunar_window_init (ThunarWindow *window)
   accel_group = gtk_ui_manager_get_accel_group (window->ui_manager);
   gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
 
+  /* setup the launcher support */
+  window->launcher = thunar_launcher_new ();
+  thunar_launcher_set_widget (window->launcher, GTK_WIDGET (window));
+  thunar_component_set_ui_manager (THUNAR_COMPONENT (window->launcher), window->ui_manager);
+  exo_binding_new (G_OBJECT (window), "current-directory", G_OBJECT (window->launcher), "current-directory");
+  g_signal_connect_swapped (G_OBJECT (window->launcher), "change-directory", G_CALLBACK (thunar_window_set_current_directory), window);
+
   /* determine the default window size from the preferences */
   g_object_get (G_OBJECT (window->preferences), "last-window-width", &width, "last-window-height", &height, NULL);
   gtk_window_set_default_size (GTK_WINDOW (window), width, height);
@@ -672,6 +681,7 @@ thunar_window_finalize (GObject *object)
 
   g_object_unref (G_OBJECT (window->action_group));
   g_object_unref (G_OBJECT (window->icon_factory));
+  g_object_unref (G_OBJECT (window->launcher));
   g_object_unref (G_OBJECT (window->history));
 
   /* release our reference on the provider factory */
@@ -1227,6 +1237,7 @@ thunar_window_action_view_changed (GtkRadioAction *action,
       exo_binding_new (G_OBJECT (window), "current-directory", G_OBJECT (window->view), "current-directory");
       exo_binding_new (G_OBJECT (window), "show-hidden", G_OBJECT (window->view), "show-hidden");
       exo_binding_new (G_OBJECT (window->view), "loading", G_OBJECT (window->throbber), "animated");
+      exo_binding_new (G_OBJECT (window->view), "selected-files", G_OBJECT (window->launcher), "selected-files");
       exo_mutual_binding_new (G_OBJECT (window->view), "zoom-level", G_OBJECT (window), "zoom-level");
       gtk_container_add (GTK_CONTAINER (window->view_container), window->view);
       gtk_widget_grab_focus (window->view);
-- 
GitLab