diff --git a/ChangeLog b/ChangeLog
index 712cce8eb06d6b67d8d75fb5484e15342b56c6ad..e4be77ba06cbdbc0c0f78d5414cedd5e755f7a9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-04	Benedikt Meurer <benny@xfce.org>
+
+	* === Released 0.5.0rc2 ===
+	* configure.in.in, NEWS: Bump version.
+	* configure.in.in, README: Depend on libexo 0.3.1.12rc2.
+	* docs/reference/thunarx/: Regenerate API docs.
+	* THANKS: Add missing translator credits.
+	* po/*.po: Update Project-Id-Version.
+	* tests/: Drop the FreeBSD fstab check, as the default volume manager
+	  backend for FreeBSD is HAL.
+
 2006-11-04	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-volume-hal.c(thunar_vfs_volume_hal_update):
@@ -234,7 +245,7 @@
 	* configure.in.in, NEWS: Bump version.
 	* configure.in.in, README: Depend on libexo 0.3.1.10rc1.
 	* THANKS: Add missing translator credits.
-	* po/*.po: Update Project-Id-Version.
+	* po/*.po, po-doc/*.po: Update Project-Id-Version.
 
 2006-09-02	Benedikt Meurer <benny@xfce.org>
 
diff --git a/NEWS b/NEWS
index 5374e405a882b881071144f161cc425e8ff4ff71..afb1acefd890b53c3a4e4d4f6673488e59b62e40 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,62 @@
+0.5.0rc1
+========
+- Add a "Trash" menu entry to the "Go" menu (#2486).
+- Add a drop-down menu to the toolbar-style location bar to enable quick
+  access to the shortcuts even if the classic file manager look'n'feel is
+  being used (#2024).
+- Add support for HAL on FreeBSD. Make HAL the preferred volume manager on
+  FreeBSD.
+- Adjust the preferences dialog to match the look of the other Xfce preferences
+  dialogs (#2379).
+- Allow to change the icon of .desktop files (#2150).
+- Allow Thunar extensions to add menu items to the Drag'n'Drop context menu.
+  This is for example used by the thunar-archive-plugin to add an "Extract
+  Here" action, which extracts a dragged archive file at the drop location.
+- Display the real mime type as tooltip for the "Kind" label in the properties
+  dialog (#2369).
+- Keep the modification time when copying files (#2244).
+- Make sure emblems don't get too large with SVG icon themes (#2466).
+- Make sure Thunar is restarted prior to xfdesktop, so the trash support in
+  xfdesktop works as expected even if D-Bus autoactivation is not setup
+  properly.
+- Place automake options into configure.in.in instead of Makefile.am and add
+  the tar-ustar option to fix building distributions on system where tar
+  defaults to the deprecated V7 format (#2304).
+- Place cursor on the first selected file after a new file or folder was
+  created (#2368).
+- Place focus on the main view after changing the current directory (#2367).
+- Properly clean up the path bar when a folder that is currently displayed
+  on the path bar is deleted.
+- Properly validate the Name of .desktop files (#2227).
+- Update the icon mime icon lookup to try icon names from Icon Naming Spec
+  first, and fallback to legacy GNOME icon names.
+- Use default dbus connection timeout (#2243).
+- Use exo-open for the default "Open Terminal Here" action (#2256).
+- Use the thumbnail database to load SVG icons from the icon theme, because
+  loading SVG is quite slow and takes a lot more memory than loading and
+  scaling PNG icons from the thumbnail database.
+- Fix usage of deprecated HAL policy functions (#2475).
+- Fix crash with newer GtkTreeView's if the "row-has-child-toggled" signal is
+  emitted even if the child state of a node did not change (#2372).
+- Fix several race conditions that were introduced over time and prevented the
+  "new-files" job handling from working properly with Gamin and automatic
+  folder reload (#2199).
+- Fix invalid calculation of free space on OpenBSD/amd64 (#2383).
+- Fix crash due to invalid handling of file names with printf(3)-style format
+  arguments (#2468).
+- Fix crash on systems with small per-thread stacks (#2269).
+- Fix installation on Win32 platforms (#2432).
+- Fix build with GLib 2.6.x (#2317).
+- Fix build with latest dbus-glib (#2263).
+- Updated translations: Pau Rul-lan Ferragut (ca), Michal Várady (cs), Benedikt
+			Meurer (de), Stavros Giannouris (el), Jarbas Araujo,
+			Antono Vasiljev and Sylvain Vedrenne (eo), Piarres
+			Beobide (eu), Jari Rhkonen (fi), Maximilian Schleiss
+			(fr), Piotr Maliński (pl), Adriano Winter Bess (pt_BR),
+			Andrey Fedoseev (ru), Hydonsingore Cia (zh_TW)
+- New translations: Sonam Pelden (dz)
+
+
 0.4.0rc1
 ========
 - An implementation of the XDG Trash Specification was imported and is now
diff --git a/README b/README
index fd73c764f48b7c1ea20ab387bc1eddbc05ea39cf..dc53d7894bce7d9ce357c8045fc7f598b61441ca 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ Thunar depends on the following packages:
 
  - perl 5.6 or above
  - GTK+ 2.6.0 or above
- - libexo 0.3.1.10rc1 or above
+ - libexo 0.3.1.12rc2 or above
  - intltool 0.30 or above
  - libpng12 1.2.0 or above
  - shared-mime-info 0.15 or above
diff --git a/THANKS b/THANKS
index 95b44b23f9deccf58841925ca052a7a866f3645a..d2a4378d75d35a7306203ae5c7500aaad7300c3c 100644
--- a/THANKS
+++ b/THANKS
@@ -34,6 +34,9 @@ These people have translated Thunar to foreign languages.
  Jannis Pohlmann <jannis@xfce.org>
   * de translations
 
+ Sonam Pelden <sonaa_peldn@yahoo.com>
+  * dz translations
+
  Stathis Kamperis <ekamperi@auth.gr>
   * el translations
 
diff --git a/configure.in.in b/configure.in.in
index cb756024c405d4db0c1e6747744b6bffea66b270..95f8125f0fe343c4cf2557dd6f4138deb42942c7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,13 +9,13 @@ dnl
 dnl ***************************
 dnl *** Version information ***
 dnl ***************************
-m4_define([thunar_verinfo], [4:0:2])
+m4_define([thunar_verinfo], [4:1:2])
 m4_define([thunar_version_api], [1])
 m4_define([thunar_version_major], [0])
-m4_define([thunar_version_minor], [4])
-m4_define([thunar_version_micro], [1])
+m4_define([thunar_version_minor], [5])
+m4_define([thunar_version_micro], [0])
 m4_define([thunar_version_build], [r@REVISION@])
-m4_define([thunar_version_tag], [svn])
+m4_define([thunar_version_tag], [rc2])
 m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_tag(), [svn], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
 
 dnl *******************************************
@@ -159,7 +159,7 @@ XDT_I18N([@LINGUAS@])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.11])
+XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.12])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
diff --git a/docs/reference/thunarx/tmpl/thunarx-renamer.sgml b/docs/reference/thunarx/tmpl/thunarx-renamer.sgml
index 05ff01464cccd3e8614747c95b533d4c5e11738e..d8a6f448a7e5aa02b75184afb17664021e6e48b2 100644
--- a/docs/reference/thunarx/tmpl/thunarx-renamer.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-renamer.sgml
@@ -76,7 +76,7 @@ The abstract base class for bulk renamers
 @process: 	see thunarx_renamer_process().
 @load:    	see thunarx_renamer_load().
 @save:    	see thunarx_renamer_save().
-@get_actions:	see thunarx_renamer_get_actions().
+@get_actions: 	see thunarx_renamer_get_actions().
 @changed: 	see thunarx_renamer_changed().
 
 <!-- ##### FUNCTION thunarx_renamer_get_help_url ##### -->
diff --git a/po-doc/ChangeLog b/po-doc/ChangeLog
index 65b948707ee2f7c820eda857263c296e46ed14c2..aa90e82294d316f93e9e2c6e1d4d2915446a4471 100644
--- a/po-doc/ChangeLog
+++ b/po-doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-04  Benedikt Meurer <benny@xfce.org>
+
+	* *.po: Update Project-Id-Version.
+
 2006-05-23  Daichi Kawahata <daichi@xfce.org>
 
 	* LINGUAS, zh_TW.po: Import initial Traditional Chinese translations
diff --git a/po-doc/es.po b/po-doc/es.po
index 5aaae2240e0c3863c999b9fbbdbd6f3150ae8565..a6072a6f0b5ac05026005e87aec1cd5571852308 100644
--- a/po-doc/es.po
+++ b/po-doc/es.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.2.3svn\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "POT-Creation-Date: 2006-04-17 14:02+0200\n"
 "PO-Revision-Date: 2006-04-16 16:53+0100\n"
 "Last-Translator: José M <josem88@gmail.com>\n"
diff --git a/po-doc/fr.po b/po-doc/fr.po
index 29d80ad3b821d2b10e3b70c51cdd4474abadfa0f..a9ee5d3dc9f626105258ea124515651ba42ac651 100644
--- a/po-doc/fr.po
+++ b/po-doc/fr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.2.5svn\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "POT-Creation-Date: 2006-04-16 09:55+0200\n"
 "PO-Revision-Date: 2006-04-16 09:54+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
diff --git a/po-doc/ja.po b/po-doc/ja.po
index 201b790a084512f83738a41afc258e669f3feeac..11c7c3e240373263fa8f10ff771992508679d2f1 100644
--- a/po-doc/ja.po
+++ b/po-doc/ja.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.2.3svn\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "POT-Creation-Date: 2006-04-16 09:27+0200\n"
 "PO-Revision-Date: 2006-03-25 13:10+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
diff --git a/po-doc/ru.po b/po-doc/ru.po
index a997bafce846fe633437af5ad93cda72162987de..886da3533a4f9f37538f406ed9c72324c26e7f90 100644
--- a/po-doc/ru.po
+++ b/po-doc/ru.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.3.1svn\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "POT-Creation-Date: 2006-05-05 01:15+0900\n"
 "PO-Revision-Date: 2006-04-26 14:53+0400\n"
 "Last-Translator: Maxim Zenin <webmechanics@gmail.com>\n"
diff --git a/po-doc/zh_TW.po b/po-doc/zh_TW.po
index a623b8c5dbead0a942dcd21f935840320decfa12..e48368a6359170ed30f4a81961b1a9dc1e529cd3 100644
--- a/po-doc/zh_TW.po
+++ b/po-doc/zh_TW.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.3.1svn\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-23 11:58%z\n"
 "PO-Revision-Date: 2006-05-23 07:16+0800\n"
diff --git a/po/ChangeLog b/po/ChangeLog
index 2aa8e7dc736afa15f78af57dd56db2098dba3e01..11eb9a3e2cf63dcb7996f2a7933080e4ca423e71 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,10 +1,14 @@
+2006-11-04  Benedikt Meurer <benny@xfce.org>
+
+	* *.po: Update Project-Id-Version.
+
 2006-11-04  Pau Rul-lan Ferragut <paurullan@bulma.net>
 
 	* ca.po: Updated Catalan translation
 
 2006-11-04  Piarres Beobide <pi@beobide.net>
 
-        * eu.po: Update basque translation.
+	* eu.po: Update basque translation.
 
 2006-11-03  Jari Rahkonen <jari.rahkonen@pp1.inet.fi>
 
diff --git a/po/Thunar.pot b/po/Thunar.pot
index fdf26bad5002267179ddc1b05471f6598c0f22ee..7d533ef99d0477d61f0b67ef1c637b3830f57300 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-11-03 17:14+0100\n"
+"POT-Creation-Date: 2006-11-04 15:18+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"
@@ -339,12 +339,14 @@ msgid "Unknown user \"%s\""
 msgstr ""
 
 #. something went wrong, for sure
+#. display an error dialog to inform the user
 #: ../thunar-vfs/thunar-vfs-volume-hal.c:339
+#: ../thunar/thunar-location-entry.c:643
 #, c-format
 msgid "Failed to determine the mount point for %s"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-volume-hal.c:913
+#: ../thunar-vfs/thunar-vfs-volume-hal.c:907
 #, c-format
 msgid "Failed to connect to the HAL daemon: %s"
 msgstr ""
@@ -535,7 +537,7 @@ msgstr ""
 
 #. append the "Empty Trash" menu action
 #. add the "Empty Trash" menu item
-#: ../thunar/thunar-application.c:1269 ../thunar/thunar-location-buttons.c:169
+#: ../thunar/thunar-application.c:1269 ../thunar/thunar-location-buttons.c:171
 #: ../thunar/thunar-shortcuts-view.c:849 ../thunar/thunar-tree-view.c:1072
 #: ../thunar/thunar-window.c:269 ../plugins/thunar-tpa/main.c:49
 msgid "_Empty Trash"
@@ -995,13 +997,13 @@ msgstr ""
 
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:137 ../thunar/thunar-launcher.c:783
-#: ../thunar/thunar-location-buttons.c:166
+#: ../thunar/thunar-location-buttons.c:168
 #: ../thunar/thunar-shortcuts-view.c:790 ../thunar/thunar-tree-view.c:1012
 msgid "_Open"
 msgstr ""
 
 #. append the "Open in New Window" menu action
-#: ../thunar/thunar-launcher.c:138 ../thunar/thunar-location-buttons.c:167
+#: ../thunar/thunar-launcher.c:138 ../thunar/thunar-location-buttons.c:169
 #: ../thunar/thunar-shortcuts-view.c:801 ../thunar/thunar-tree-view.c:1024
 msgid "Open in New Window"
 msgstr ""
@@ -1207,66 +1209,66 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-location-buttons.c:168
+#: ../thunar/thunar-location-buttons.c:170
 #: ../thunar/thunar-standard-view.c:323 ../thunar/thunar-tree-view.c:1088
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:169 ../thunar/thunar-window.c:269
+#: ../thunar/thunar-location-buttons.c:171 ../thunar/thunar-window.c:269
 msgid "Delete all files and folders in the Trash"
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:170
+#: ../thunar/thunar-location-buttons.c:172
 #: ../thunar/thunar-standard-view.c:329
 msgid "Paste Into Folder"
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:171
+#: ../thunar/thunar-location-buttons.c:173
 #: ../thunar/thunar-renamer-dialog.c:179 ../thunar/thunar-standard-view.c:324
 msgid "_Properties..."
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:272
+#: ../thunar/thunar-location-buttons.c:274
 msgid "Spacing"
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:273
+#: ../thunar/thunar-location-buttons.c:275
 msgid "The amount of space between the path buttons"
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:1250
+#: ../thunar/thunar-location-buttons.c:1271
 #, c-format
 msgid "Open \"%s\" in this window"
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:1256
+#: ../thunar/thunar-location-buttons.c:1277
 #, c-format
 msgid "Open \"%s\" in a new window"
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:1261
+#: ../thunar/thunar-location-buttons.c:1282
 #, c-format
 msgid "Create a new folder in \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:1273
+#: ../thunar/thunar-location-buttons.c:1294
 #, c-format
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:1279
+#: ../thunar/thunar-location-buttons.c:1300
 #, c-format
 msgid "View the properties of the folder \"%s\""
 msgstr ""
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-location-buttons.c:1319
+#: ../thunar/thunar-location-buttons.c:1340
 #: ../thunar/thunar-standard-view.c:1817 ../thunar/thunar-tree-view.c:1439
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-location-buttons.c:1319
+#: ../thunar/thunar-location-buttons.c:1340
 #: ../thunar/thunar-standard-view.c:1817 ../thunar/thunar-tree-view.c:1439
 msgid "Create New Folder"
 msgstr ""
@@ -1279,11 +1281,19 @@ msgstr ""
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-location-entry.c:401 ../thunar/thunar-window.c:1307
+#: ../thunar/thunar-location-entry.c:419 ../thunar/thunar-window.c:1307
 #, c-format
 msgid "Failed to launch \"%s\""
 msgstr ""
 
+#. display an error dialog to inform the user
+#: ../thunar/thunar-location-entry.c:632
+#: ../thunar/thunar-shortcuts-view.c:1328 ../thunar/thunar-tree-view.c:953
+#: ../thunar/thunar-tree-view.c:1598
+#, c-format
+msgid "Failed to mount \"%s\""
+msgstr ""
+
 #: ../thunar/thunar-path-entry.c:259
 msgid "Icon size"
 msgstr ""
@@ -1421,65 +1431,65 @@ msgid ""
 "folder afterwards."
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:219
+#: ../thunar/thunar-preferences-dialog.c:220
 msgid "File Manager Preferences"
 msgstr ""
 
 #.
 #. Views
 #.
-#: ../thunar/thunar-preferences-dialog.c:236
+#: ../thunar/thunar-preferences-dialog.c:237
 msgid "Views"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:246
+#: ../thunar/thunar-preferences-dialog.c:247
 msgid "Default View"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:258
+#: ../thunar/thunar-preferences-dialog.c:259
 msgid "View _new folders using:"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:263
-#: ../thunar/thunar-preferences-dialog.c:294
+#: ../thunar/thunar-preferences-dialog.c:264
+#: ../thunar/thunar-preferences-dialog.c:295
 msgid "Icon View"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:264
+#: ../thunar/thunar-preferences-dialog.c:265
 msgid "Detailed List View"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:265
+#: ../thunar/thunar-preferences-dialog.c:266
 msgid "Compact List View"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:266
+#: ../thunar/thunar-preferences-dialog.c:267
 msgid "Last Active View"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:277
+#: ../thunar/thunar-preferences-dialog.c:278
 msgid "Sort _folders before files"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:279
+#: ../thunar/thunar-preferences-dialog.c:280
 msgid "Select this option to list folders before files when you sort a folder."
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:283
+#: ../thunar/thunar-preferences-dialog.c:284
 msgid "_Show thumbnails"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:285
+#: ../thunar/thunar-preferences-dialog.c:286
 msgid ""
 "Select this option to display previewable files within a folder as "
 "automatically generated thumbnail icons."
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:306
+#: ../thunar/thunar-preferences-dialog.c:307
 msgid "_Text beside icons"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:308
+#: ../thunar/thunar-preferences-dialog.c:309
 msgid ""
 "Select this option to place the icon captions for items beside the icon "
 "rather than below the icon."
@@ -1488,76 +1498,76 @@ msgstr ""
 #.
 #. Side Pane
 #.
-#: ../thunar/thunar-preferences-dialog.c:317
+#: ../thunar/thunar-preferences-dialog.c:318
 msgid "Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:327
+#: ../thunar/thunar-preferences-dialog.c:328
 msgid "Shortcuts Pane"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:339
+#: ../thunar/thunar-preferences-dialog.c:340
 msgid "_Icon Size:"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:344
-#: ../thunar/thunar-preferences-dialog.c:389
-msgid "Very Small"
-msgstr ""
-
 #: ../thunar/thunar-preferences-dialog.c:345
 #: ../thunar/thunar-preferences-dialog.c:390
-msgid "Smaller"
+msgid "Very Small"
 msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:346
 #: ../thunar/thunar-preferences-dialog.c:391
-msgid "Small"
+msgid "Smaller"
 msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:347
 #: ../thunar/thunar-preferences-dialog.c:392
-msgid "Normal"
+msgid "Small"
 msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:348
 #: ../thunar/thunar-preferences-dialog.c:393
-msgid "Large"
+msgid "Normal"
 msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:349
 #: ../thunar/thunar-preferences-dialog.c:394
-msgid "Larger"
+msgid "Large"
 msgstr ""
 
 #: ../thunar/thunar-preferences-dialog.c:350
 #: ../thunar/thunar-preferences-dialog.c:395
+msgid "Larger"
+msgstr ""
+
+#: ../thunar/thunar-preferences-dialog.c:351
+#: ../thunar/thunar-preferences-dialog.c:396
 msgid "Very Large"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:361
+#: ../thunar/thunar-preferences-dialog.c:362
 msgid "Show Icon _Emblems"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:363
+#: ../thunar/thunar-preferences-dialog.c:364
 msgid ""
 "Select this option to display icon emblems in the shortcuts pane for all "
 "folders for which emblems have been defined in the folders properties dialog."
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:372
+#: ../thunar/thunar-preferences-dialog.c:373
 msgid "Tree Pane"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:384
+#: ../thunar/thunar-preferences-dialog.c:385
 msgid "Icon _Size:"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:406
+#: ../thunar/thunar-preferences-dialog.c:407
 msgid "Show Icon E_mblems"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:408
+#: ../thunar/thunar-preferences-dialog.c:409
 msgid ""
 "Select this option to display icon emblems in the tree pane for all folders "
 "for which emblems have been defined in the folders properties dialog."
@@ -1566,25 +1576,25 @@ msgstr ""
 #.
 #. Behavior
 #.
-#: ../thunar/thunar-preferences-dialog.c:417
+#: ../thunar/thunar-preferences-dialog.c:418
 msgid "Behavior"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:427
+#: ../thunar/thunar-preferences-dialog.c:428
 msgid "Navigation"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:439
+#: ../thunar/thunar-preferences-dialog.c:440
 msgid "_Single click to activate items"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:459
+#: ../thunar/thunar-preferences-dialog.c:460
 msgid ""
 "Specify the d_elay before an item gets selected\n"
 "when the mouse pointer is paused over it:"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:471
+#: ../thunar/thunar-preferences-dialog.c:472
 msgid ""
 "When single-click activation is enabled, pausing the mouse pointer over an "
 "item will automatically select that item after the chosen delay. You can "
@@ -1593,49 +1603,49 @@ msgid ""
 "to select the item without activating it."
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:489
+#: ../thunar/thunar-preferences-dialog.c:490
 msgid "Disabled"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:495
+#: ../thunar/thunar-preferences-dialog.c:496
 msgid "Medium"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:501
+#: ../thunar/thunar-preferences-dialog.c:502
 msgid "Long"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:507
+#: ../thunar/thunar-preferences-dialog.c:508
 msgid "_Double click to activate items"
 msgstr ""
 
 #.
 #. Advanced
 #.
-#: ../thunar/thunar-preferences-dialog.c:517
+#: ../thunar/thunar-preferences-dialog.c:518
 msgid "Advanced"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:527
+#: ../thunar/thunar-preferences-dialog.c:528
 msgid "Folder Permissions"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:539
+#: ../thunar/thunar-preferences-dialog.c:540
 msgid ""
 "When changing the permissions of a folder, you\n"
 "can also apply the changes to the contents of the\n"
 "folder. Select the default behavior below:"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:547
+#: ../thunar/thunar-preferences-dialog.c:548
 msgid "Ask everytime"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:548
+#: ../thunar/thunar-preferences-dialog.c:549
 msgid "Apply to Folder Only"
 msgstr ""
 
-#: ../thunar/thunar-preferences-dialog.c:549
+#: ../thunar/thunar-preferences-dialog.c:550
 msgid "Apply to Folder and Contents"
 msgstr ""
 
@@ -1946,13 +1956,6 @@ msgstr ""
 msgid "Failed to eject \"%s\""
 msgstr ""
 
-#. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1328 ../thunar/thunar-tree-view.c:953
-#: ../thunar/thunar-tree-view.c:1598
-#, c-format
-msgid "Failed to mount \"%s\""
-msgstr ""
-
 #. display an error dialog to inform the user
 #. display an error dialog
 #: ../thunar/thunar-shortcuts-view.c:1372 ../thunar/thunar-tree-view.c:1738
diff --git a/po/ca.po b/po/ca.po
index 3027b27d5961e9b1a465a2688c6c613bc22ab937..9658ffe9ddf5d3cdce270e5a52bc744b915294f6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,7 +6,7 @@
 # Carles Muñoz Gorriz <carlesmu@internautas.org>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-11-04 14:55+0100\n"
diff --git a/po/cs.po b/po/cs.po
index baa0cf58410d38da1e8c3e6e7aabbc4d81ff7cef..a07644d89dd19af0a6d8688b8e298bc70e04b7d3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-09-16 11:31+0100\n"
diff --git a/po/de.po b/po/de.po
index 33de2cf76b040c9b157255fa4496da53b9b960e3..2cb1d25a1a5cf618059c0ffdc841437648569d08 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.1svn\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-11-03 17:18+0100\n"
diff --git a/po/dz.po b/po/dz.po
index c71d3abbaf1d89b3c0e6537c346786c2eaa2a2e0..d6381b2c8ce71621b0ffef88622a453617ca281e 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar.po\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-09-10 01:36+0200\n"
 "PO-Revision-Date: 2006-10-24 16:21+0530\n"
diff --git a/po/el.po b/po/el.po
index 1d27b7eef35016f2a1560997445397022b0483b3..e2e2cee5444ec94d2810aaf163213cfffa530456 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-10-21 13:46+0200\n"
diff --git a/po/eo.po b/po/eo.po
index b4974c8c7ed934d5fbead5be709976439f88073c..0c421ab3ada0490ee78d505641d90f0c31b9d842 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-09-20 22:42+0200\n"
diff --git a/po/es.po b/po/es.po
index 9feaf21113665b9b3bc0290f972fd5c407451d2a..08cecf98dd9141fdcc65f3d64c886204891be597 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-05-04 14:12+0000\n"
diff --git a/po/et.po b/po/et.po
index fdf993f825c3ca5e465fa47a804ac23b5e3e1445..e845088e6473d56d32ec0d88d81aa4a85fdd8280 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-04-18 16:37+0300\n"
diff --git a/po/eu.po b/po/eu.po
index f954f00e565385ebd72d3a49fe5191b7af8a2c98..34ac2a216c68269be295eaffe9fb4b97338b454f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@
 # Piarres Beobide <pi@beobide.net>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-11-03 23:54+0100\n"
diff --git a/po/fi.po b/po/fi.po
index 9f3846b297f7a447e3cf4a3a97609a718ffb067b..b30d2f70dbc7749c96bd366295832e03f11ccfa8 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 23:39+0200\n"
 "PO-Revision-Date: 2006-11-03 23:42+0200\n"
diff --git a/po/fr.po b/po/fr.po
index 7ee86992049bc3594064d9c00b211d5dc25ed4e8..e8c542fc1371e01da5bcb2d653bfb19295492d78 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-10-29 11:09+0100\n"
diff --git a/po/gl.po b/po/gl.po
index 5337e1db52f4e4089407a8423d8790c4a5151921..d5ca0d4f8c95c39270ccaf4bb99d7c57d1dcca4f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-07-05 14:54+0000\n"
diff --git a/po/he.po b/po/he.po
index 23382494c8126f8b3ed775415f7adbeabe0e8076..099623a048c38caf197ee4d5c5f04e6e91c70159 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@
 # This file is distributed under the same license as the Thunar package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-05-05 22:28+0300\n"
diff --git a/po/hu.po b/po/hu.po
index 1c741909e9980399e76be9e8eab35a6f050017bb..b1a0969ef8baa37fe51d1213b882e0427b6592f0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-11-03 23:11+0100\n"
diff --git a/po/it.po b/po/it.po
index 4437ca816180578d4386a900529df1ba70865711..6d11d682e448d191d6915a4135ac3a65234b450a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-09-01 18:12+0100\n"
diff --git a/po/ja.po b/po/ja.po
index 77c7e8b22931d9161710a45f683a95da1e9e15b6..2d710b70e376ea4627c785438123676ab9cbffb3 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-06-13 04:11+0900\n"
diff --git a/po/ka.po b/po/ka.po
index 7db039e9318ba54e5bee796819812826edf687bf..6490368e74c8083db7c015d85c34d9e5d383c34c 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-08-24 23:37+0400\n"
diff --git a/po/lt.po b/po/lt.po
index 26ecd0b5c410a1c283c8b0a53daf9d1c7c408cc5..e61f3e5897917b770045b5d27161d6ae00b3b98c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-05-26 11:16+0300\n"
diff --git a/po/nl.po b/po/nl.po
index 4063a9a8a2784ef0c399c6010a1c79965f2644d7..f3a1de8d3d230f2ee01aa528d138f5e7ffd5baab 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-10-27 00:51+0100\n"
diff --git a/po/pl.po b/po/pl.po
index d349617d537fb4bfaffa45b5a63c926db53b218a..a5a42109bbeeb6e494bc4d82ba50149fc32fe38b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-08-30 13:40+0200\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 819355395d38ec4f7cd8ac3c6fa037e3b8f4f6d8..d54d704afc7d6d7c649f982b2ff01e37a3a816d6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-11-03 16:02-0200\n"
diff --git a/po/ro.po b/po/ro.po
index 52d99492839eeb5240fafd3cbd7e5980273c6226..d1fd78ed6f25fb21f62491d22b0b50e959cf5e1d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-06-05 00:42+0300\n"
diff --git a/po/ru.po b/po/ru.po
index 744680dae15246acabd5b990a5e47208cd1257d3..35472ab5a846f67bfaf52fb10c2c2af64630a4c6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-10-02 22:51+0200\n"
diff --git a/po/sv.po b/po/sv.po
index e2814f1d35d5bc2d1f428bfb68f4d89036f87739..4d8c7e78cab540623092e781e1c24e81ed15418d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-02-22 16:28+0100\n"
diff --git a/po/uk.po b/po/uk.po
index 77e255fd10063ecc275a0030990c17a27debdd1f..d46dee59a71326bb81639d46686b47878d37d3a5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-04-20 17:07+0300\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0854f838a2ae4313fec4bd1ba33b8cb4a86bba41..338dee75bf0983ca35e5327d41a3ecf5affe3840 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-05-03 15:08+0000\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 041465fcacdd2aa5529a9bdb5f60e77f0e5ab455..51294f89402e9ab8c99399c84db7b11741adfac1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.4.0rc1\n"
+"Project-Id-Version: Thunar 0.5.0rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-03 17:14+0100\n"
 "PO-Revision-Date: 2006-10-01 13:34+0800\n"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 65c932f531e55089d479a19021e99cb3eba22eb1..7594075414497254b7ab6b7dd373ed0da7db6942 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,16 +11,11 @@ INCLUDES =								\
 	$(EXO_CFLAGS)							\
 	$(GTHREAD_CFLAGS)
 
-TESTS_ENVIRONMENT =							\
-	PATH_FSTAB=$(srcdir)/data/test-thunar-vfs-volume-bsd.fstab
-
 TESTS =									\
-	test-thunar-vfs-path						\
-	test-thunar-vfs-volume-bsd
+	test-thunar-vfs-path
 
 check_PROGRAMS =							\
-	test-thunar-vfs-path						\
-	test-thunar-vfs-volume-bsd
+	test-thunar-vfs-path
 
 test_thunar_vfs_path_SOURCES =						\
 	test-thunar-vfs-path.c
@@ -32,16 +27,6 @@ test_thunar_vfs_path_LDADD =						\
 	$(GTHREAD_LIBS)							\
 	$(top_builddir)/thunar-vfs/libthunar-vfs-$(THUNAR_VERSION_API).la
 
-test_thunar_vfs_volume_bsd_SOURCES =					\
-	test-thunar-vfs-volume-bsd.c
-
-test_thunar_vfs_volume_bsd_DEPENDENCIES =				\
-	$(top_builddir)/thunar-vfs/libthunar-vfs-$(THUNAR_VERSION_API).la
-
-test_thunar_vfs_volume_bsd_LDADD =					\
-	$(GTHREAD_LIBS)							\
-	$(top_builddir)/thunar-vfs/libthunar-vfs-$(THUNAR_VERSION_API).la
-
 clean-local:
 	rm -f *.core core core.*
 
diff --git a/tests/test-thunar-vfs-volume-bsd.c b/tests/test-thunar-vfs-volume-bsd.c
deleted file mode 100644
index aecf5ac08990b13ff7283bacc41417454a7d4111..0000000000000000000000000000000000000000
--- a/tests/test-thunar-vfs-volume-bsd.c
+++ /dev/null
@@ -1,84 +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
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#include <thunar-vfs/thunar-vfs.h>
-
-
-
-int
-main (int argc, char **argv)
-{
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-  ThunarVfsVolumeManager *manager;
-  ThunarVfsVolume        *volume;
-  GList                  *volumes;
-
-  /* initialize GThread (required for Thunar-VFS initialization) */
-  if (!g_thread_supported ())
-    g_thread_init (NULL);
-
-  /* initialize Gtk+ (required for Thunar-VFS initialization) */
-  gtk_init (&argc, &argv);
-
-  /* initialize Thunar-VFS */
-  thunar_vfs_init ();
-
-  manager = thunar_vfs_volume_manager_get_default ();
-  g_assert (THUNAR_VFS_IS_VOLUME_MANAGER (manager));
-
-  volumes = thunar_vfs_volume_manager_get_volumes (manager);
-  g_assert (g_list_length (volumes) == 3);
-
-  volume = g_list_nth_data (volumes, 0);
-  g_assert (THUNAR_VFS_IS_VOLUME (volume));
-  g_assert (!thunar_vfs_volume_is_mounted (volume));
-  g_assert (thunar_vfs_volume_get_mount_point (volume) != NULL);
-
-  volume = g_list_nth_data (volumes, 1);
-  g_assert (THUNAR_VFS_IS_VOLUME (volume));
-  g_assert (!thunar_vfs_volume_is_mounted (volume));
-  g_assert (thunar_vfs_volume_get_mount_point (volume) != NULL);
-
-  volume = g_list_nth_data (volumes, 2);
-  g_assert (THUNAR_VFS_IS_VOLUME (volume));
-  g_assert (!thunar_vfs_volume_is_mounted (volume));
-  g_assert (thunar_vfs_volume_get_mount_point (volume) != NULL);
-
-  g_object_unref (G_OBJECT (manager));
-
-  /* shutdown Thunar-VFS */
-  thunar_vfs_shutdown ();
-
-  return EXIT_SUCCESS;
-#else
-  /* only BSD systems will pass this test */
-  return 77;
-#endif
-}
-
-
-