diff --git a/ChangeLog b/ChangeLog
index e1638199f34f0322a57e21005e278cda733e2bc1..85112206dfb52db2e80a89742f5874c706e108e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-04	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-tree-model.{c,h}, thunar/thunar-tree-view.c: Add
+	  removable volumes to the tree view. Bug #1636.
+	* po/Thunar.pot, po/*.po: Update translations.
+
 2006-04-03	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-standard-view.c(thunar_standard_view_class_init): Shift
diff --git a/po/ChangeLog b/po/ChangeLog
index f6e0b840327ea03cc13b4f4acc4e41858b06b537..49305099162dab5323fc78436f24eae0982168f5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-04  Benedikt Meurer <benny@xfce.org>
+
+	* Thunar.pot, *.po: Update translations.
+
 2006-04-02  Daichi Kawahata <daichi@xfce.org>
 
 	* fr.po: Updated French translations by Stephane Roy
diff --git a/po/Thunar.pot b/po/Thunar.pot
index 3ae7f30917feaa3d9fbcc6d21bfc3f42471339b7..afdc3afadbee46a20c4d8e19081f8a2d04223543 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-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\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"
@@ -644,7 +644,7 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr ""
 
@@ -844,7 +844,7 @@ msgstr ""
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr ""
 
@@ -854,7 +854,7 @@ msgstr ""
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr ""
 
@@ -1048,7 +1048,7 @@ msgid ""
 msgstr ""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr ""
 
@@ -1487,7 +1487,7 @@ msgstr ""
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr ""
@@ -1653,17 +1653,17 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr ""
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr ""
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr ""
 
@@ -1688,19 +1688,21 @@ msgid "Failed to add new shortcut"
 msgstr ""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr ""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr ""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr ""
@@ -1727,7 +1729,7 @@ msgid "Folder Context Menu"
 msgstr ""
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr ""
 
@@ -1736,12 +1738,12 @@ msgid "Create an empty folder within the current folder"
 msgstr ""
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr ""
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr ""
 
@@ -1787,7 +1789,7 @@ msgstr ""
 msgid "Du_plicate"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
@@ -1802,46 +1804,46 @@ msgid "Rename the selected file"
 msgstr ""
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr ""
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr ""
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr ""
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1852,58 +1854,58 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 msgid "_Select"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 msgid "_Pattern:"
 msgstr ""
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] ""
@@ -1927,12 +1929,12 @@ msgstr ""
 msgid "_Empty File"
 msgstr ""
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr ""
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr ""
 
diff --git a/po/ca.po b/po/ca.po
index 73971429415215ecd3ff0a77103e123206350b5b..2c39a06e30eb35d3c91ff4fc56f72a90b9078bce 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-27 13:15+0200\n"
 "Last-Translator: Pau Rul·lan Ferragut <paurullan@bulma.net>\n"
 "Language-Team: Catalan\n"
@@ -663,7 +663,7 @@ msgstr "Expandeix les columnes automàticament així com sigui necessari"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Introduïu el nom nou:"
 
@@ -873,7 +873,7 @@ msgstr "Icona"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Obre"
 
@@ -884,7 +884,7 @@ msgstr "Obre   seleccionat fitxers"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Obre-ho en una nova finestra"
 
@@ -1091,7 +1091,7 @@ msgid ""
 msgstr "Mou o còpia fitxers seleccionat per a Retalla o Copia"
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "_Enganxa a la carpeta"
@@ -1598,7 +1598,7 @@ msgstr "Distintius"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Fallit a  rename"
@@ -1794,18 +1794,18 @@ msgstr[0] "Afegeix   seleccionat carpeta a   "
 msgstr[1] "Afegeix   seleccionat carpeta a   "
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "_Munta el volum"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 #, fuzzy
 msgid "E_ject Volume"
 msgstr "E Volum"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Desm_unta el volum"
 
@@ -1833,19 +1833,21 @@ msgid "Failed to add new shortcut"
 msgstr "Fallit a  afegeix nou drecera"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, fuzzy, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Fallit a "
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, fuzzy, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Fallit a "
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, fuzzy, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Fallit a "
@@ -1874,7 +1876,7 @@ msgid "Folder Context Menu"
 msgstr "Carpeta Context Menú"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 #, fuzzy
 msgid "Create _Folder..."
 msgstr "Crea Carpeta."
@@ -1885,13 +1887,13 @@ msgid "Create an empty folder within the current folder"
 msgstr "Crea buit carpeta dins   carpeta"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "Re_talla"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "_Copia"
@@ -1950,7 +1952,7 @@ msgstr "Seleccioneu all fitxers a"
 msgid "Du_plicate"
 msgstr "Fitxer"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 #, fuzzy
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
@@ -1968,51 +1970,51 @@ msgid "Rename the selected file"
 msgstr "Reanomena   seleccionat fitxer"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 #, fuzzy
 msgid "Create _Document"
 msgstr "Crea un _document"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 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:1718
+#: ../thunar/thunar-standard-view.c:1720
 #, fuzzy
 msgid "New Empty File"
 msgstr "Nou Buit Fitxer"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Nou Buit Fitxer."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "New Folder"
 msgstr "Nova carpeta"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Crea una carpeta nova"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Crea un document a partir de la plantilla «%s»"
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "tu tu a  suprimeix?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -2023,66 +2025,66 @@ msgid_plural ""
 msgstr[0] "tu tu a    seleccionat fitxer?"
 msgstr[1] "tu tu a    seleccionat fitxer?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 #, fuzzy
 msgid "If you delete a file, it is permanently lost."
 msgstr "Si tu suprimeix a fitxer és."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Seleccioneu per Model"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "_Selecciona"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "_Patró:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "Reanomena"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Fallit a  obre"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 #, fuzzy
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "  seleccionat fitxer a  amb a Enganxa"
 msgstr[1] "  seleccionat fitxer a  amb a Enganxa"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 #, fuzzy
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] "  seleccionat fitxer a  amb a Enganxa"
 msgstr[1] "  seleccionat fitxer a  amb a Enganxa"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Suprimeix   seleccionat fitxer"
 msgstr[1] "Suprimeix   seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Duplica   seleccionat fitxer"
 msgstr[1] "Duplica   seleccionat fitxer"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2111,13 +2113,13 @@ msgstr "No Plantilles instal·lat"
 msgid "_Empty File"
 msgstr "Fitx_er buit"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "S'està carregant..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "P."
diff --git a/po/de.po b/po/de.po
index c279dc61f328d3432001ff43ba6ace9410e0e455..f4258c948f47db0ac342a3185c90867ecddfe638 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-26 14:35+0100\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -674,7 +674,7 @@ msgstr "Listenspalten automatisch ver_größern"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Neuen Namen eingeben:"
 
@@ -880,7 +880,7 @@ msgstr "Symbolansicht"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "Ö_ffnen"
 
@@ -890,7 +890,7 @@ msgstr "Die ausgewählten Dateien öffnen"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "In neuem Fenster öffnen"
 
@@ -1090,7 +1090,7 @@ msgstr ""
 "verschieben oder kopieren"
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "In Ordner e_infügen"
 
@@ -1560,7 +1560,7 @@ msgstr "Embleme"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Die Datei »%s« konnte nicht umbenannt werden"
@@ -1746,17 +1746,17 @@ msgstr[0] "Neues Lesezeichen für den ausgewählten Ordner erstellen"
 msgstr[1] "Neue Lesezeichen für die ausgewählten Ordner erstellen"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "Gerät _Einbinden"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Medium _Auswerfen"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Gerät _Auslösen"
 
@@ -1781,19 +1781,21 @@ msgid "Failed to add new shortcut"
 msgstr "Neues Lesezeichen konnte nicht hinzugefügt werden"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Das Medium in »%s« konnte nicht ausgeworfen werden"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Das Medium »%s« konnte nicht eingebunden werden"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Das Medium »%s« konnte nicht ausgelöst werden"
@@ -1820,7 +1822,7 @@ msgid "Folder Context Menu"
 msgstr "Ordnermenü"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "_Ordner erstellen..."
 
@@ -1829,12 +1831,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Eine leere Datei im aktuellen Ordner anlegen"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr "_Kopieren"
 
@@ -1884,7 +1886,7 @@ msgstr "Alle Dateien auswählen, die einem bestimmten Muster entsprechen"
 msgid "Du_plicate"
 msgstr "_Duplizieren"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "_Verknüpfung anlegen"
@@ -1899,39 +1901,39 @@ msgid "Rename the selected file"
 msgstr "Ausgewählte Dateien umbenennen"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "_Dokument anlegen"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "Ordnerinhalt wird geladen..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Leere Datei"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Neue leere Datei..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Neuer Ordner"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Neuen Ordner anlegen"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Dokument aus Vorlage »%s« anlegen"
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1940,7 +1942,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie »%s«\n"
 "dauerhaft löschen wollen?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1955,36 +1957,36 @@ msgstr[1] ""
 "Sollen diese %u ausgewählten Dateien wirklich\n"
 "dauerhaft gelöscht werden?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 "Wenn Sie eine Datei oder einen Ordner löschen, gehen die Daten dauerhaft "
 "verloren."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Muster auswählen"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 msgid "_Select"
 msgstr "Aus_wählen"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 msgid "_Pattern:"
 msgstr "_Muster:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "»%s« umbenennen"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Der Ordner »%s« konnte nicht geöffnet werden"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
@@ -1992,7 +1994,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Die ausgewählten Dateien beim nächsten »Einfügen« an neuen Ort verschieben"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
@@ -2000,19 +2002,19 @@ msgstr[0] ""
 msgstr[1] ""
 "Die ausgewählten Dateien beim nächsten »Einfügen« an neuen Ort kopieren"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Ausgewählte Datei dauerhaft löschen"
 msgstr[1] "Ausgewählte Dateien dauerhaft löschen"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Ausgewählte Datei duplizieren"
 msgstr[1] "Ausgewählte Dateien duplizieren"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "Eine symbolische Verknüpfung für die ausgewählte Datei anlegen"
@@ -2036,12 +2038,12 @@ msgstr "Keine Vorlagen installiert"
 msgid "_Empty File"
 msgstr "_Leere Datei"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr "Wird geladen..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr "_Eigenschaften..."
 
diff --git a/po/el.po b/po/el.po
index be496889559cc243dbcd6dcc25d3580f4a6c1c3d..890d0568f1a5ab97475cb6722a8fac10d49f1efe 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-26 02:12+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -665,7 +665,7 @@ msgstr "Αυτόματη _επέκταση στηλών"
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Εισάγετε νέο όνομα:"
 
@@ -867,7 +867,7 @@ msgstr "Εικονίδια"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
@@ -877,7 +877,7 @@ msgstr "Άνοιγμα των επιλεγμένων αρχείων"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Άνοιγμα σε Νέο Παράθυρο"
 
@@ -1074,7 +1074,7 @@ msgstr ""
 "Αποκοπή Αρχείων ή Αντιγραφή Αρχείων στο \"%s\""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "_Επικόλληση στο Φάκελο"
 
@@ -1535,7 +1535,7 @@ msgstr "Εμβλήματα"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Η μετονομασία του \"%s\" απέτυχε"
@@ -1707,17 +1707,17 @@ msgstr[0] "Προσθήκη του επιλεγμένου φακέλου στη
 msgstr[1] "Προσθήκη των επιλεγμένων φακέλων στη μπάρα συντομεύσεων"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "Προ_σάρτηση Τόμου"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Ε_ξαγωγή Τόμου"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Αποπρο_σάρτηση Τόμου"
 
@@ -1742,19 +1742,21 @@ msgid "Failed to add new shortcut"
 msgstr "Η προσθήκη νέας συντόμευσης απέτυχε"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Η εξαγωγή του \"%s\" απέτυχε"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Η προσάρτηση του \"%s\" απέτυχε"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Η αποσύνδεση του \"%s\" απέτυχε"
@@ -1781,7 +1783,7 @@ msgid "Folder Context Menu"
 msgstr "Μενού Ενεργειών Φακέλων"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Δημιουργία _Φακέλου..."
 
@@ -1790,12 +1792,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Δημιουργία ενός άδειου φακέλου μέσα στον τρέχον φάκελο"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr "_Αποκοπή"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr "Α_ντιγραφή"
 
@@ -1845,7 +1847,7 @@ msgstr "Επιλογή όλων των αρχείων που ταιριάζου
 msgid "Du_plicate"
 msgstr "Δημιουργία Αν_τιγράφου"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Δημιουργία _Δεσμού"
@@ -1860,39 +1862,39 @@ msgid "Rename the selected file"
 msgstr "Μετονομασία του επιλεγμένου αρχείου"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Δημιουργία _Εγγράφου"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "Φόρτωμα περιεχομένων φακέλου..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Νέο Κενό Αρχείο"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Νέο Κενό Αρχείο..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Νέος Φάκελος"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Δημιουργία εγγράφου από πρότυπο \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1901,7 +1903,7 @@ msgstr ""
 "Είστε σίγουρος/η ότι θέλετε να διαγράψετε\n"
 "οριστικά το \"%s\";"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1916,34 +1918,34 @@ msgstr[1] ""
 "Είστε σίγουρος/η ότι θέλετε να διαγράψετε\n"
 "οριστικά τα %u επιλεγμένα αρχεία;"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "Εάν διαγράψετε ένα αρχείο, χάνεται για πάντα."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Επιλογή βάσει Μοτίβου"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 msgid "_Select"
 msgstr "Επιλο_γή"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 msgid "_Pattern:"
 msgstr "_Μοτίβο:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Μετονομασία \"%s\""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Το άνοιγμα του καταλόγου \"%s\" απέτυχε"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
@@ -1953,7 +1955,7 @@ msgstr[1] ""
 "Προετοιμασία των επιλεγμένων αρχείων για μετακίνηση με μια εντολή "
 "Επικόλλησης Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
@@ -1963,19 +1965,19 @@ msgstr[1] ""
 "Προετοιμασία των επιλεγμένων αρχείων για αντιγραφή με μια  εντολή "
 "Επικόλλησης Αρχείων"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Οριστική διαγραφή του επιλεγμένου αρχείου"
 msgstr[1] "Οριστική διαγραφή των επιλεγμένων αρχείων"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Δημιουργία αντιγράφου για το επιλεγμένο αρχείο"
 msgstr[1] "Δημιουργία αντιγράφου για κάθε επιλεγμένο αρχείο"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "Δημιουργεί ένα συμβολικό δεσμό για το επιλεγμένο αρχείο"
@@ -1999,12 +2001,12 @@ msgstr "Δεν υπάρχουν εγκατεστημένα πρότυπα"
 msgid "_Empty File"
 msgstr "_Κενό Αρχείο"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr "Φόρτωση..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr "_Ιδιότητες..."
 
diff --git a/po/es.po b/po/es.po
index ed472c11840b70ab29ff7561ed39a7c9810879cc..272152914e76ef9afde9689f6deeeec0cc6a9151 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Miguel Angel Ruiz Manzano <debianized@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -681,7 +681,7 @@ msgstr "Automáticamente _expandir las columnas según se requiera"
 msgid "Unknown"
 msgstr ""
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Ingrese el nuevo nombre"
 
@@ -890,7 +890,7 @@ msgstr "Vista de iconos"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -901,7 +901,7 @@ msgstr "Abrir el elemento seleccionado"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Abrir en una ventana nueva"
 
@@ -1103,7 +1103,7 @@ msgid ""
 msgstr ""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "Pegar archivos en la carpeta"
@@ -1559,7 +1559,7 @@ msgstr ""
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Imposible renombrar %s."
@@ -1739,17 +1739,17 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr ""
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr ""
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr ""
 
@@ -1777,19 +1777,21 @@ msgid "Failed to add new shortcut"
 msgstr "No se puede añadir el marcador"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, fuzzy, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Imposible renombrar %s."
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, fuzzy, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Imposible renombrar %s."
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, fuzzy, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Imposible renombrar %s."
@@ -1816,7 +1818,7 @@ msgid "Folder Context Menu"
 msgstr "Menú contextual de carpeta"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Crear _Carpeta"
 
@@ -1825,13 +1827,13 @@ msgid "Create an empty folder within the current folder"
 msgstr ""
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "Cor_tar archivo"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "_Copiar archivo"
@@ -1883,7 +1885,7 @@ msgstr "Selecciona todos los archivos que coinciden con un patrón"
 msgid "Du_plicate"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
@@ -1900,49 +1902,49 @@ msgid "Rename the selected file"
 msgstr "Renombra el elemento seleccionado"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Crear _Documento"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 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:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Carpeta"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "New Folder"
 msgstr "Carpeta"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Carpeta"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, 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:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1955,63 +1957,63 @@ msgstr[0] ""
 msgstr[1] ""
 "¿Esta seguro de que desea borrar todos los elementos de la papelera?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Patrón de selección"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "Archivos seleccionados"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Patrón:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "_Renombrar..."
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Imposible abrir el directorio %s."
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Abrir el elemento seleccionado"
 msgstr[1] "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Abrir el elemento seleccionado"
 msgstr[1] "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2038,13 +2040,13 @@ msgstr ""
 msgid "_Empty File"
 msgstr "_Copiar archivo"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "Preparando..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "_Propiedades"
diff --git a/po/eu.po b/po/eu.po
index 63c76f41023f991b20009fdb1c9ab4918f1aa14f..a4bf76fb471ea726c698864387a5af4f203f0671 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-02-22 12:03+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -666,7 +666,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Izen berria idatzi:"
 
@@ -878,7 +878,7 @@ msgstr "Ikono Ikuspegia"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Ireki"
 
@@ -888,7 +888,7 @@ msgstr "Hautaturiko fitxategia ireki"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "LEiho BErri batetan Ireki"
 
@@ -1083,7 +1083,7 @@ msgid ""
 msgstr ""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "Fitxategiak Karpetan Itsasi"
@@ -1546,7 +1546,7 @@ msgstr "Ikurrak"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Huts \"%s\" berrizendatzerakoan"
@@ -1724,17 +1724,17 @@ msgstr[0] "Hautatutako karpeta alboko paneleko loturetara gehitu"
 msgstr[1] "Hautatutako karpetak alboko paneleko loturetara gehitu"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "Bolumena _Muntatu"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Bolumena A_tera"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Bolumena _Desmuntatu"
 
@@ -1759,19 +1759,21 @@ msgid "Failed to add new shortcut"
 msgstr "Huts lotura berria gehitzerakoan"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Huts \"%s\" atertzerakoan"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Huts \"%s\" muntatzerakoan"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Huts \"%s\" desmuntatzerakoan"
@@ -1799,7 +1801,7 @@ msgid "Folder Context Menu"
 msgstr "Karpeta Kontestu Menua"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "_Karpeta Sortu..."
 
@@ -1808,13 +1810,13 @@ msgid "Create an empty folder within the current folder"
 msgstr "Karpeta huts bat sortu uneko karpetaren barnean"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "Fixategia E_baki"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "Hona _kopiatu"
@@ -1865,7 +1867,7 @@ msgstr "Patroi zehatz bat betetzen duten fitxategiak hautatu"
 msgid "Du_plicate"
 msgstr "Fitxate_gia Bikoiztu"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Lotura E_gin"
@@ -1880,40 +1882,40 @@ msgid "Rename the selected file"
 msgstr "Hautatutako fitxategia berrizendatu"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "_Dokumentua Sortu"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "Karpeta edukiak kargatzen..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Fitxategi Huts Berria"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Fitxategi Huts Berria..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Karpeta Berria"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "Create New Folder"
 msgstr "_Karpeta Sortu..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "\"%s\" txantiloietik Dokumentua Sortu"
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1922,7 +1924,7 @@ msgstr ""
 "Guztiz ziur al zaude \"%s\" betirako ezabatu nahi\n"
 "duzula?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1937,63 +1939,63 @@ msgstr[1] ""
 "Guztiz ziur al zaude hautaturiko fitxategiak\n"
 "betirako ezabatu nahi dituzula?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "Fitxategi bat ezabatu ezkero betirako galduko da."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Patroiaz Hautatu"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "Fitxategia _Ezabatu"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Patroia:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "\"%s\" Berrizendatu"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Huts `%s' direktorioa irekitzerakoan"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 #, fuzzy
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "Aukeratutako fitxategia lehenetsiriko aplikazioak ireki"
 msgstr[1] "Aukeratutako fitxategiak lehenetsiriko aplikazioak ireki"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Hauatatutako fitxategiak ezabatu"
 msgstr[1] "Hauatatutako fitxategiak ezabatu"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Hautaturiko fitxategi bakoitza bikoiztu"
 msgstr[1] "Hautaturiko fitxategi bakoitza bikoiztu"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2020,13 +2022,13 @@ msgstr "Ez dago txantiloirik instalaturik"
 msgid "_Empty File"
 msgstr "Fitxategi _Hutsa"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "Prestatzen..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "_Propietateak..."
diff --git a/po/fi.po b/po/fi.po
index cfc5995838f928c23191d88b5a10d0887331ff54..f207eb84d75c4c366aa7eb4535cfe65e97967fb9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-12 19:03+0200\n"
 "Last-Translator: Jari Rahkonen <jari.rahkonen@pp1.inet.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Syötä uusi nimi:"
 
@@ -875,7 +875,7 @@ msgstr "Kuvakenäkymä"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Avaa"
 
@@ -885,7 +885,7 @@ msgstr "Avaa valitut tiedostot"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Avaa uudessa ikkunassa"
 
@@ -1080,7 +1080,7 @@ msgid ""
 msgstr "Siirrä tai kopioi leikkaa- tai kopioi-komennoilla valittuja tiedostoja"
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "Liitä tiedostot hakemistoon"
@@ -1548,7 +1548,7 @@ msgstr "Tunnuskuvat"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Tiedoston \"%s\" nimeäminen epäonnistui"
@@ -1726,17 +1726,17 @@ msgstr[0] "Lisää valittu hakemisto kirjanmerkkipaneeliin"
 msgstr[1] "Lisää valitut hakemistot kirjanmerkkipaneeliin"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "_Liitä taltio"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "P_oista levy"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "_Irrota taltio"
 
@@ -1761,19 +1761,21 @@ msgid "Failed to add new shortcut"
 msgstr "Kirjanmerkin lisääminen epäonnistui"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Kohteen \"%s\" poistaminen asemasta epäonnistui"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Kohteen \"%s\" liittäminen epäonnistui"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Kohteen \"%s\" irrottaminen epäonnistui"
@@ -1801,7 +1803,7 @@ msgid "Folder Context Menu"
 msgstr "Hakemiston kontekstivalikko"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Luo _hakemisto..."
 
@@ -1810,13 +1812,13 @@ msgid "Create an empty folder within the current folder"
 msgstr "Luo tyhjä hakemisto nykyiseen sijaintiin"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "L_eikkaa tiedosto"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "_Kopioi tähän"
@@ -1871,7 +1873,7 @@ msgstr "Valitse kaikki tiedostot, jotka sopivat tiettyyn hakukuvioon"
 msgid "Du_plicate"
 msgstr "Luo k_opio tiedostosta"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "_Luo linkki"
@@ -1886,39 +1888,39 @@ msgid "Rename the selected file"
 msgstr "Nimeä valittu tiedosto uudelleen"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Luo _asiakirja"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "Ladataan hakemiston sisältöä..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Luo tyhjä tiedosto"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Uusi tyhjä tiedosto..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Uusi hakemisto"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Luo uusi hakemisto"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Luo asiakirja mallin \"%s\" pohjalta"
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1927,7 +1929,7 @@ msgstr ""
 "Haluatko todella poistaa kohteen\n"
 "\"%s\" pysyvästi?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1942,63 +1944,63 @@ msgstr[1] ""
 "Haluatko todella poistaa valitut\n"
 "tiedostot pysyvästi?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "Tiedoston poistoa ei voi peruuttaa."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Valitse hakukuvion avulla"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "_Poista tiedosto"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Hakukuvio:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Nimeä \"%s\" uudelleen"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Hakemiston \"%s\" avaaminen epäonnistui"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 #, fuzzy
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "Avaa valittu tiedosto oletussovelluksessa"
 msgstr[1] "Avaa valitut tiedostot oletussovelluksissa"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Poista valitut tiedostot"
 msgstr[1] "Poista valitut tiedostot"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Luo kopiot valituista tiedostoista"
 msgstr[1] "Luo kopiot valituista tiedostoista"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2023,13 +2025,13 @@ msgstr "Ei asiakirjamalleja asennettuna"
 msgid "_Empty File"
 msgstr "T_yhjä tiedosto"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "Valmistellaan..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "_Ominaisuudet..."
diff --git a/po/fr.po b/po/fr.po
index 7b01a2ab3d98aabf122a8001884561b2add4427f..40f6cc64abc42fb62d5c2ac8ec9a3b7f7a7e523a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-04-02 14:05+0100\n"
 "Last-Translator: Stephane Roy <sroy@j2n.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -662,7 +662,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Entrer le nouveau nom :"
 
@@ -862,7 +862,7 @@ msgstr "Vue d'icônes"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -872,7 +872,7 @@ msgstr "Ouvrir les fichiers sélectionnés"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
@@ -1070,7 +1070,7 @@ msgstr ""
 "couper ou copier dans \"%s\""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "C_oller dans le dossier"
 
@@ -1534,7 +1534,7 @@ msgstr "Emblèmes"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Échec au changement de nom de \"%s\""
@@ -1703,17 +1703,17 @@ msgstr[1] ""
 "Ajouter les dossiers sélectionnés au panneau des raccourcis sur le côté"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "_Monter un volume"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "É_jecter un volume"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "_Démonter un volume"
 
@@ -1738,19 +1738,21 @@ msgid "Failed to add new shortcut"
 msgstr "Échec à l'ajout d'un nouveau raccourci"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Échec à l'éjection de \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Échec au montage de \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Échec au démontage de nom de \"%s\""
@@ -1777,7 +1779,7 @@ msgid "Folder Context Menu"
 msgstr "Menu contextuel de dossier"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Création d'un _dossier..."
 
@@ -1786,12 +1788,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Crée un dossier vide dans le dossier courant"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr "Co_uper"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr "_Copier"
 
@@ -1841,7 +1843,7 @@ msgstr "Sélectionner tous les fichiers qui correspondent à un certain motif"
 msgid "Du_plicate"
 msgstr "Du_pliquer"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "C_réer un lien"
@@ -1856,39 +1858,39 @@ msgid "Rename the selected file"
 msgstr "Renommer le fichier sélectionné"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Créer un _document"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 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:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Nouveau fichier vide"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Nouveau fichier vide..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Nouveau dossier"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Créer un nouveau dossier"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Créer un document avec le modèle \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1897,7 +1899,7 @@ msgstr ""
 "Êtes-vous certain que vous voulez\n"
 "effacer \"%s\" définitivement ?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1912,34 +1914,34 @@ msgstr[1] ""
 "Êtes-vous certain de vouloir effacer de manière\n"
 "permanente les %u fichiers sélectionnés ?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 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:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Sélectionner par motif"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 msgid "_Select"
 msgstr "_Sélectionner"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 msgid "_Pattern:"
 msgstr "_Motif :"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Renommer \"%s\""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Échec à l'ouverture du répertoire \"%s\""
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
@@ -1947,7 +1949,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Prépare les fichiers sélectionnés à être déplacé par la commande Coller"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
@@ -1955,19 +1957,19 @@ msgstr[0] ""
 msgstr[1] ""
 "Préparer les fichiers sélectionnés à être copiés par une commande Coller"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Supprime définitivement le fichier sélectionné"
 msgstr[1] "Supprime définitivement les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Duplique le fichier sélectionné"
 msgstr[1] "Duplique les fichiers sélectionnés"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "Créer un lien symbolique pour chaque fichier sélectionné"
@@ -1991,12 +1993,12 @@ msgstr "Aucun modèle installé"
 msgid "_Empty File"
 msgstr "_Fichier vide"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr "Chargement..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr "P_ropriétés..."
 
diff --git a/po/hu.po b/po/hu.po
index df2ab584735219139b890460df9ea3c2ef5a95aa..63eab2e207b48416a44804785a7edb287739a7f8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-26 10:26+0100\n"
 "Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -666,7 +666,7 @@ msgstr "Oszlopok nyújtása, ha szükséges"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Új fájlnév megadása:"
 
@@ -867,7 +867,7 @@ msgstr "Ikonnézet"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Megnyit"
 
@@ -877,7 +877,7 @@ msgstr "Kijelölt fájlok megnyitása"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Megnyitás új ablakban"
 
@@ -1060,7 +1060,7 @@ msgstr ""
 "másolása ide: \"%s\""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "Ma_ppába illesztés"
 
@@ -1515,7 +1515,7 @@ msgstr "Jelkép"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Nem átnevezhető: \"%s\""
@@ -1681,17 +1681,17 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
 msgstr[0] "Kijelölt mappák hozzáadása a könyvjelzők panelhoz"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "Kötet felcsatolása"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Lemez kiadása"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Kötet lecsatolása"
 
@@ -1716,19 +1716,21 @@ msgid "Failed to add new shortcut"
 msgstr "A könyvjelző hozzáadása sikertelen"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Nem lehet kiadni: \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Nem csatolható: \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Nem leválasztható: \"%s\""
@@ -1754,7 +1756,7 @@ msgid "Folder Context Menu"
 msgstr "Helyi mappa menü"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Mappa létrehozása..."
 
@@ -1763,12 +1765,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Üres mappa létrehozása e mappán belül"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr "Vágás"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr "Másolás"
 
@@ -1818,7 +1820,7 @@ msgstr "Egy adott mintára illő valamennyi fájl kiválasztása"
 msgid "Du_plicate"
 msgstr "Kettőzés"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Lánc _készítése"
@@ -1832,39 +1834,39 @@ msgid "Rename the selected file"
 msgstr "A kijelölt fájl átnevezése"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "_Dokumentum létrehozása"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 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:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Új üres fájl"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Új üres fájl..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Új mappa"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Új mappa létrehozása"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Dokumentum létrehozása e sablonból: \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1873,7 +1875,7 @@ msgstr ""
 "Biztos vagy benne, hogy végleg\n"
 "törölni akarod?: \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1883,57 +1885,57 @@ msgid_plural ""
 "delete the %u selected files?"
 msgstr[0] "Végleg törlöd a kijelölt %u fájlt?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "Ha törölsz egy fájlt, végleg elvész."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Kijelölés mintával"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "Törlése"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Minta:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "\"%s\" átnevezése"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Nem megnyitható könyvtár: \"%s\""
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
 "Előkészíti a kijelölt fájlt a Beillesztés paranccsal való mozgatáshoz"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] "Kijelölt fájlok előkészítése a Beillesztés parancshoz"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Kijelölt fájl végleges törlése"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Kijelölt fájl megkettőzése"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "Jelképes lánc készítése a kijelölt fájlokhoz"
@@ -1956,12 +1958,12 @@ msgstr "Nincsenek telepített sablonok"
 msgid "_Empty File"
 msgstr "Üres fájl"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr "Betöltés..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr "Tulajdonságok..."
 
diff --git a/po/it.po b/po/it.po
index d807d222eac71dfbb7699de70a404462d37a485f..6b80aea735aa177df97a3cf599f52e269307530b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-04 13:55+0100\n"
 "Last-Translator: Roberto Pariset <r.pariset@gmail.com>\n"
 "Language-Team: GUFI <traduzioni@gufi.org>\n"
@@ -669,7 +669,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Inserire il nuovo nome:"
 
@@ -883,7 +883,7 @@ msgstr "Visualizzazione a icone"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Apri"
 
@@ -893,7 +893,7 @@ msgstr "Apri i file selezionati"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Apri in una nuova finestra"
 
@@ -1089,7 +1089,7 @@ msgstr ""
 "Sposta o Copia i file selezionati precedentemente dal comando Taglia o Copia"
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "Incolla file dentro la directory"
@@ -1562,7 +1562,7 @@ msgstr "Emblemi"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Impossibile rinominare \"%s\""
@@ -1743,17 +1743,17 @@ msgstr[1] ""
 "Aggiungi le directory selezionata al pannello laterale delle scorciatoie"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "_Monta volume"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Rimuovi volume"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Smonta volume"
 
@@ -1778,19 +1778,21 @@ msgid "Failed to add new shortcut"
 msgstr "Impossibile aggiungere nuova scorciatoia"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Impossibile espellere \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Impossibile montare \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Impossibile smontare \"%s\""
@@ -1818,7 +1820,7 @@ msgid "Folder Context Menu"
 msgstr "Menu contestuale della directory"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Crea _directory..."
 
@@ -1827,13 +1829,13 @@ msgid "Create an empty folder within the current folder"
 msgstr "Crea una directory vuota dentro la directory corrente"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "_Taglia file"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "_Copia qui"
@@ -1889,7 +1891,7 @@ msgstr "Seleziona tutti i file che corrispondono a un certo pattern"
 msgid "Du_plicate"
 msgstr "Du_plica file"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Crea _link"
@@ -1904,39 +1906,39 @@ msgid "Rename the selected file"
 msgstr "Rinomina il file selezionato"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Crea d_ocumento"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 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:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Nuovo file vuoto"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Nuovo file vuoto..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Nuova directory"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Crea nuova directory"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Crea documento dal template \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1945,7 +1947,7 @@ msgstr ""
 "Sei sicuro di voler eliminare\n"
 "permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1960,63 +1962,63 @@ msgstr[1] ""
 "Sei sicuro di voler eliminare\n"
 "permanentemente i %u file selezionati?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 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:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Seleziona in base ad un pattern"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "_Elimina file"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Pattern:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Rinomina \"%s\""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Impossibile aprire la directory \"%s\"."
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 #, fuzzy
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "Apri il file selezionato con l'applicazione di default"
 msgstr[1] "Apri i file selezionati con l'applicazione di default"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Elimina gli elementi selezionati"
 msgstr[1] "Elimina gli elementi selezionati"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Duplica ogni file selezionato"
 msgstr[1] "Duplica ogni file selezionato"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2041,13 +2043,13 @@ msgstr "Nessun template installato"
 msgid "_Empty File"
 msgstr "File _vuoto"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "In preparazione..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "_Proprietà..."
diff --git a/po/ja.po b/po/ja.po
index 9cf82bf9a1f31e3ec9a28fc159d5cadfc3c4266d..d4a9fd5d2b894b46f2114a72059ddbfc3ad47f56 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-26 23:42+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -685,7 +685,7 @@ msgstr "必要に応じて表示欄を自動的に拡げる(_E)"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "新しい名前を入力してください:"
 
@@ -887,7 +887,7 @@ msgstr "アイコン表示"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -897,7 +897,7 @@ msgstr "選択したファイルを開きます。"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "新規ウィンドウで開く"
 
@@ -1082,7 +1082,7 @@ msgstr ""
 "または「コピー」します。"
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "フォルダに貼り付け(_P)"
 
@@ -1550,7 +1550,7 @@ msgstr "シンボル"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "「%s」の名前変更に失敗しました。"
@@ -1724,17 +1724,17 @@ msgid_plural "Add the selected folders to the shortcuts side pane"
 msgstr[0] "選択したフォルダを左のショートカットペインに追加します。"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "マウント(_M)"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "取り出し(_J)"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "マウント解除(_U)"
 
@@ -1759,19 +1759,21 @@ msgid "Failed to add new shortcut"
 msgstr "ショートカットの追加に失敗しました。"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "「%s」の取り出しに失敗しました。"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "「%s」のマウントに失敗しました。"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "「%s」のマウント解除に失敗しました。"
@@ -1797,7 +1799,7 @@ msgid "Folder Context Menu"
 msgstr "フォルダの右クリックメニュー"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "フォルダを作成(_F)..."
 
@@ -1806,12 +1808,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "現在のフォルダに空のフォルダを作成します。"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr "コピー(_C)"
 
@@ -1861,7 +1863,7 @@ msgstr "ある特定のパターンに一致する全てのファイルを選択
 msgid "Du_plicate"
 msgstr "コピーを作成(_P)"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "リンクを作成(_K)"
@@ -1875,39 +1877,39 @@ msgid "Rename the selected file"
 msgstr "選択したファイルの名前を変更します。"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "文書を作成(_D)"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "フォルダの内容を読み込んでいます..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "新規ファイル"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "新規ファイル..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "新規フォルダ"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "新規フォルダを作成します。"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "テンプレート「%s」から文書を作成"
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1916,7 +1918,7 @@ msgstr ""
 "「%s」は永久に削除されます\n"
 "それでもよろしいですか？"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1928,54 +1930,54 @@ msgstr[0] ""
 "選択したファイルは永久に削除されます\n"
 "それでもよろしいですか？"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "削除されたファイルは永久に失われます。"
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "パターンで選択します"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 msgid "_Select"
 msgstr "選択(_S)"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 msgid "_Pattern:"
 msgstr "パターン(_P):"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "「%s」の名前変更"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "フォルダ「%s」を開くのに失敗しました。"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "選択したファイルを移動します。"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] "選択したファイルをコピーします。"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "選択したファイルを削除します。"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "選択したファイルのコピーを作成します。"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "選択したファイルのリンクを作成します。"
@@ -1998,12 +2000,12 @@ msgstr "テンプレートはインストールされていません"
 msgid "_Empty File"
 msgstr "空のファイル(_E)"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr "読み込んでいます..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr "プロパティ(_R)..."
 
diff --git a/po/nl.po b/po/nl.po
index 139ad0902dde50950dedbc7352ce387fec7fb63c..f38bd40b6ff226afbd025369ba477b18bbbe0fdd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-25 18:02+0100\n"
 "Last-Translator: Vincent Tunru <imnotb@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -693,7 +693,7 @@ msgstr "Kolommen automatisch _uitklappen wanneer nodig"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Nieuwe naam invoeren:"
 
@@ -906,7 +906,7 @@ msgstr "Icoon weergavemodus"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Openen"
 
@@ -917,7 +917,7 @@ msgstr "Geselecteerde items openen"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Openen in Nieuw Venster"
 
@@ -1119,7 +1119,7 @@ msgid ""
 msgstr "Verplaats of kopiëer bestanden naar \"%s\""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "Bestanden in Map Plakken"
@@ -1595,7 +1595,7 @@ msgstr "Emblemen"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Fout bij het wijzigen van de naam van `%s'"
@@ -1790,17 +1790,17 @@ msgstr[1] ""
 "Voeg de geselecteerde mappen toe aan het zijpaneel met snelkoppelingen"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "Schijf _aansluiten"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Schijf u_itwerpen"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Schijf l_oskoppelen"
 
@@ -1825,19 +1825,21 @@ msgid "Failed to add new shortcut"
 msgstr "Fout bij het toevoegen van nieuwe snelkoppeling"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, fuzzy, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Fout bij het wijzigen van de naam van `%s'"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, fuzzy, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Fout bij het wijzigen van de naam van `%s'"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, fuzzy, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Fout bij het wijzigen van de naam van `%s'"
@@ -1865,7 +1867,7 @@ msgid "Folder Context Menu"
 msgstr "Map Context Menu"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Maak _Map..."
 
@@ -1874,13 +1876,13 @@ msgid "Create an empty folder within the current folder"
 msgstr "Maak een lege map in de huidige map"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "Bestand Kn_ippen"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "Hier _kopiëren"
@@ -1931,7 +1933,7 @@ msgstr "Alle bestanden die aan een bepaald patroon voldoen selecteren"
 msgid "Du_plicate"
 msgstr "Bestand Ver_dubbelen"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Ma_ak Snelkoppeling"
@@ -1947,40 +1949,40 @@ msgid "Rename the selected file"
 msgstr "Naam van geselecteerd bestand wijzigen"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Maak _Document"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 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:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Nieuw Leeg Bestand"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Nieuwe Leeg Bestand..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Nieuwe Map"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Maak _Map..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Document van sjabloon \"%s\" maken"
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1989,7 +1991,7 @@ msgstr ""
 "Weet u zeker dat u\n"
 "\"%s\" voorgoed wilt verwijderen?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -2004,63 +2006,63 @@ msgstr[1] ""
 "Weet u zeker dat u\n"
 "de geselecteerde bestanden voorgoed wilt verwijderen?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 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:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Selecteren op Patroon"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "Bestand _Verwijderen"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Patroon:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "Naam _Wijzigen"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Fout bij het openen van de map `%s'"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 #, fuzzy
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "geselecteerde bestandsnamen (zonder paden)"
 msgstr[1] "geselecteerde bestandsnamen (zonder paden)"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] "Bereidt het geselecteerde bestand voor om te plakken"
 msgstr[1] "Bereidt de geselecteerde bestanden voor om te plakken"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "De geselecteerde bestanden verwijderen"
 msgstr[1] "De geselecteerde bestanden verwijderen"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Elk geselecteerde bestand verdubbelen"
 msgstr[1] "Elk geselecteerde bestand verdubbelen"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2087,13 +2089,13 @@ msgstr "Geen Sjablonen geïnstalleerd"
 msgid "_Empty File"
 msgstr "_Leeg Bestand"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "Aan het voorbereiden..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "_Eigenschappen"
diff --git a/po/pl.po b/po/pl.po
index 980e871295fa588a9ab4ce255f1e64f6c65575ad..b72cbe830a01ae0a3048e2eed6d0eb726d74a230 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\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"
@@ -672,7 +672,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "data nieznana"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr ""
 
@@ -881,7 +881,7 @@ msgstr "Widok ikon"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -892,7 +892,7 @@ msgstr "Otwórz zaznaczone elementy"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Otwórz w nowym oknie"
 
@@ -1105,7 +1105,7 @@ msgid ""
 msgstr ""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "Wklej pliki do katalogu"
@@ -1563,7 +1563,7 @@ msgstr "Symbole"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, fuzzy, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Nie udało się zmienić nazwy %s."
@@ -1743,17 +1743,17 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr ""
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr ""
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr ""
 
@@ -1781,19 +1781,21 @@ msgid "Failed to add new shortcut"
 msgstr "Nie udało się dodać aplikacji %s."
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, fuzzy, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Nie udało się zmienić nazwy %s."
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, fuzzy, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Nie udało się zmienić nazwy %s."
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, fuzzy, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Nie udało się zmienić nazwy %s."
@@ -1821,7 +1823,7 @@ msgid "Folder Context Menu"
 msgstr "Menu kontekstowe katalogu"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr ""
 
@@ -1830,13 +1832,13 @@ msgid "Create an empty folder within the current folder"
 msgstr ""
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "_Wytnij plik"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "S_kopiuj"
@@ -1888,7 +1890,7 @@ msgstr "Zaznacz wszystkie pliki pasujÄ…ce do wzorca"
 msgid "Du_plicate"
 msgstr "Z_duplikuj plik"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Utwórz _łącze"
@@ -1905,49 +1907,49 @@ msgid "Rename the selected file"
 msgstr "Zmień nazwę zaznaczonego pliku"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 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:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 #, fuzzy
 msgid "New Empty File..."
 msgstr "Katalog"
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "New Folder"
 msgstr "Katalog"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Katalog"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, 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:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1959,48 +1961,48 @@ 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:1996
+#: ../thunar/thunar-standard-view.c:1998
 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:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Zaznacz według wzorca"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "_Usuń plik"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Wzorzec nazwy:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, fuzzy, c-format
 msgid "Rename \"%s\""
 msgstr "Zmień _nazwę"
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Nie udało się otworzyć katalogu '%s': %s"
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
@@ -2008,7 +2010,7 @@ msgstr[0] "Usuń zaznaczone pliki"
 msgstr[1] "Usuń zaznaczone pliki"
 msgstr[2] "Usuń zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
@@ -2016,7 +2018,7 @@ msgstr[0] "Zduplikuj wszystkie zaznaczone pliki"
 msgstr[1] "Zduplikuj wszystkie zaznaczone pliki"
 msgstr[2] "Zduplikuj wszystkie zaznaczone pliki"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2044,13 +2046,13 @@ msgstr ""
 msgid "_Empty File"
 msgstr "S_kopiuj plik"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "PrzygotowujÄ™..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "_Właściwości"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 73e6f4a0f5fd6e00f0b5dfd3a549b6307ff76a58..65910315f034330db4813d580ec357282e1ece5f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-31 21:46-0300\n"
 "Last-Translator: Adriano Winter Bess <awbess@gmail.com>\n"
 "Language-Team: os-cillation <info@os-cillation.com>\n"
@@ -671,7 +671,7 @@ msgstr "_Expandir automaticamente as colunas quando necessário"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Entre com o novo nome:"
 
@@ -872,7 +872,7 @@ msgstr "Visualização de ícone"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -882,7 +882,7 @@ msgstr "Abrir os arquivos selecionados"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Abrir em Nova Janela"
 
@@ -1078,7 +1078,7 @@ msgstr ""
 "Copiar para \"%s\""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "Colar dentro da _Pasta"
 
@@ -1544,7 +1544,7 @@ msgstr "Emblemas"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Falha em renomear \"%s\""
@@ -1727,17 +1727,17 @@ msgstr[0] "Adiciona a pasta selecionada ao painel lateral de atalhos"
 msgstr[1] "Adiciona as pastas selecionadas ao painel lateral de atalhos"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "_Montar Volume"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "E_jetar Volume"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "_Desmontar Volume"
 
@@ -1762,19 +1762,21 @@ msgid "Failed to add new shortcut"
 msgstr "Falha em adicionar novo favorito"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Falha  o ejetar \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Falha ao montar \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Falha em desmontar \"%s\""
@@ -1801,7 +1803,7 @@ msgid "Folder Context Menu"
 msgstr "Menu de Contexto de Pasta"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Criar _Pasta..."
 
@@ -1810,12 +1812,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Criar uma pasta vazia dentro da pasta atual"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr "Recor_tar"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr "_Copiar"
 
@@ -1865,7 +1867,7 @@ msgstr "Selecionar todos os arquivos que combinam com um certo padrão"
 msgid "Du_plicate"
 msgstr "Du_plicar"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Fazer _Ligação"
@@ -1880,39 +1882,39 @@ msgid "Rename the selected file"
 msgstr "Renomear o arquivo selecionado"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Criar _Documento"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "Carregando conteúdo da pasta..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Novo arquivo vazio"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Novo arquivo vazio..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Nova Pasta"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Criar Nova Pasta"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Criar Documento a partir do modelo \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1921,7 +1923,7 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "deletar permanentemente \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1936,34 +1938,34 @@ msgstr[1] ""
 "Você tem certeza que quer remover\n"
 "permanentemente os %u arquivos selecionados?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "Se você deletar um arquivo, ele é permanentemente perdido."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Selecione por Padrão"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 msgid "_Select"
 msgstr "_Selecionar"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 msgid "_Pattern:"
 msgstr "_Padrão:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Renomear \"%s\""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Falhou ao abrir diretório \"%s\""
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] ""
@@ -1971,7 +1973,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Preparar os arquivos selecionados para serem movidos com um comando Colar."
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
@@ -1979,19 +1981,19 @@ msgstr[0] ""
 msgstr[1] ""
 "Preparar os arquivos selecionados para serem copiados com um comando Colar"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Remover o arquivo selecionado permanentemente"
 msgstr[1] "Remover os arquivos selecionados permanentemente"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Duplicar o arquivo selecionado"
 msgstr[1] "Duplicar cada um dos arquivos selecionados"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "Criar uma ligação simbólica para o arquivo selecionado"
@@ -2015,12 +2017,12 @@ msgstr "Modelos não encontrados"
 msgid "_Empty File"
 msgstr "Arquivo _Vazio"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr "Carregando..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr "P_ropriedades..."
 
diff --git a/po/ru.po b/po/ru.po
index 4b70df980e290ee31088f2e998e58b563c091089..2d4aa5378caf97f11a15bf013ec9bddbf1ac7bdb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-25 15:15+0500\n"
 "Last-Translator: Andrey Fedoseev <andrey.fedoseev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -672,7 +672,7 @@ msgstr "Автоматически увеличивать ширину стол
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Введите имя:"
 
@@ -874,7 +874,7 @@ msgstr "Просмотр в виде значков"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -884,7 +884,7 @@ msgstr "Открыть выбранные файлы"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Открыть в новом окне"
 
@@ -1093,7 +1093,7 @@ msgstr ""
 "в \"%s\""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "Вставить файлы в папку"
 
@@ -1551,7 +1551,7 @@ msgstr "Эмблемы"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Не удалось переименовать \"%s\""
@@ -1735,17 +1735,17 @@ msgstr[1] "Добавить выбранные папки в закладки н
 msgstr[2] "Добавить выбранные папки в закладки на боковой панели"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "Смонтировать том"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Извлечь том"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "Отмонтировать том"
 
@@ -1770,19 +1770,21 @@ msgid "Failed to add new shortcut"
 msgstr "Не удалось добавить закладку"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Не удалось извлечь \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Не удалось смонтировать \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Не удалось отмонтировать \"%s\""
@@ -1810,7 +1812,7 @@ msgid "Folder Context Menu"
 msgstr "Контекстное меню папки"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Создать _папку..."
 
@@ -1819,12 +1821,12 @@ msgid "Create an empty folder within the current folder"
 msgstr "Создать пустую папку внутри текущей"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr "_Вырезать"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 msgid "_Copy"
 msgstr "_Копировать"
 
@@ -1873,7 +1875,7 @@ msgstr "Выбрать все файлы, удовлетворяющие зад
 msgid "Du_plicate"
 msgstr "Создать копию файла"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Создать _ссылку"
@@ -1889,46 +1891,46 @@ msgid "Rename the selected file"
 msgstr "Переименовать выбранный файл"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Создать _документ"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "Загрузка содержимого папки..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Новый файл"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Новый файл..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Новая папка"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr "Создать новую папку"
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Создать документ по шаблону \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "Вы уверены, что хотите навсегда удалить \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1944,64 +1946,64 @@ msgstr[1] ""
 "удалить %u выбранных файлов?"
 msgstr[2] ""
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "Если вы удалите файл, он будет утрачен навсегда."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Выбрать по шаблону"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "_Удалить"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Шаблон:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Переименовать \"%s\""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Не удалось открыть папку: \"%s\""
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "Подготовить выбранный файл для перемещения командой Вставить"
 msgstr[1] "Подготовить выбранные файлы для перемещения командой Вставить"
 msgstr[2] "Открыть выбранные файлы в приложении по умолчанию"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] "Подготовить выбранный файл для копирования командой Вставить"
 msgstr[1] "Подготовить выбранные файлы для копирования командой Вставить"
 msgstr[2] "Открыть выбранные файлы в приложении по умолчанию"
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Навсегда удалить выбранный файл"
 msgstr[1] "Навсегда удалить выбранные файлы"
 msgstr[2] "Удалить выбранные файлы"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Создать копию выбранного файла"
 msgstr[1] "Создать копию каждого выбранного файла"
 msgstr[2] "Создать копию каждого выбранного файла"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
 msgstr[0] "Создать символическую ссылку для выбранного файла"
@@ -2026,12 +2028,12 @@ msgstr "Не установлено ни одного шаблона"
 msgid "_Empty File"
 msgstr "Пустой _файл"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 msgid "P_roperties..."
 msgstr "_Свойства..."
 
diff --git a/po/sv.po b/po/sv.po
index a806eb5d06ec12b56265095895ba93638f69ac00..272eb0caea31d6fa0848158e30574b1eb0049394 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-02-22 16:28+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -664,7 +664,7 @@ msgstr ""
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "Ange det nya namnet:"
 
@@ -877,7 +877,7 @@ msgstr "Ikonvy"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -887,7 +887,7 @@ msgstr "Öppna de markerade filerna"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "Öppna i nytt fönster"
 
@@ -1082,7 +1082,7 @@ msgid ""
 msgstr ""
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 #, fuzzy
 msgid "_Paste Into Folder"
 msgstr "Klistra in filer i mapp"
@@ -1555,7 +1555,7 @@ msgstr "Emblem"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "Misslyckades att byta namn på \"%s\""
@@ -1733,17 +1733,17 @@ msgstr[0] "Lägg till markerad mapp till sidopanelen med genvägar"
 msgstr[1] "Lägg till markerade mappar till sidopanelen med genvägar"
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr "_Montera volym"
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr "Mata _ut volym"
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr "_Avmontera volym"
 
@@ -1768,19 +1768,21 @@ msgid "Failed to add new shortcut"
 msgstr "Misslyckades att lägga till ny genväg"
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr "Misslyckades att mata ut \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr "Misslyckades att montera \"%s\""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr "Misslyckades att avmontera \"%s\""
@@ -1808,7 +1810,7 @@ msgid "Folder Context Menu"
 msgstr "Mappkontextmeny"
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr "Skapa _mapp..."
 
@@ -1817,13 +1819,13 @@ msgid "Create an empty folder within the current folder"
 msgstr "Skapa en tom mapp i aktuell mapp"
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 #, fuzzy
 msgid "Cu_t"
 msgstr "Kli_pp ut fil"
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "_Kopiera hit"
@@ -1874,7 +1876,7 @@ msgstr "Markera alla filer som matchar ett specifikt mönster"
 msgid "Du_plicate"
 msgstr "Du_plicera fil"
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "S_kapa länk"
@@ -1889,40 +1891,40 @@ msgid "Rename the selected file"
 msgstr "Byt namn på markerad fil"
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr "Skapa _dokument"
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr "Läser in mappinnehåll..."
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr "Ny tom fil"
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr "Ny tom fil..."
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr "Ny mapp"
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 #, fuzzy
 msgid "Create New Folder"
 msgstr "Skapa _mapp..."
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Skapa dokument från mallen \"%s\""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1931,7 +1933,7 @@ msgstr ""
 "Är du säker att du vill\n"
 "permanent ta bort \"%s\"?"
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1946,63 +1948,63 @@ msgstr[1] ""
 "Är du säker att du vill permanent\n"
 "ta bort de markerade filerna?"
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr "Om du tar bort en fil är den permanent förlorad."
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr "Välj efter mönster"
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 #, fuzzy
 msgid "_Select"
 msgstr "_Ta bort fil"
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 #, fuzzy
 msgid "_Pattern:"
 msgstr "Mönster:"
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr "Byt namn på \"%s\""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\""
 msgstr "Misslyckades att öppna katalogen \"%s\""
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 #, fuzzy
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "Öppna den markerade filen med standardprogrammet"
 msgstr[1] "Öppna de markerade filerna med standardprogrammen"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "Ta bort de markerade filerna"
 msgstr[1] "Ta bort de markerade filerna"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "Duplicera varje markerad fil"
 msgstr[1] "Duplicera varje markerad fil"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -2029,13 +2031,13 @@ msgstr "Inga mallar installerade"
 msgid "_Empty File"
 msgstr "_Tom fil"
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "Förbereder..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "_Egenskaper..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9383e13e4e67f00046794c97db83065dcda6589d..47168ef4c05116b0c8a3932ab0d0b55409c5a2b9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.2.3svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-01 17:39+0900\n"
+"POT-Creation-Date: 2006-04-04 00:25+0200\n"
 "PO-Revision-Date: 2006-03-27 19:17+0800\n"
 "Last-Translator: Hydonsingore Cia <hydonsingore@mail.educities.edu.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -656,7 +656,7 @@ msgstr "依需求自動延展欄位(_E)"
 msgid "Unknown"
 msgstr "未知的"
 
-#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2239
+#: ../thunar/thunar-create-dialog.c:180 ../thunar/thunar-standard-view.c:2241
 msgid "Enter the new name:"
 msgstr "鍵入新名稱："
 
@@ -856,7 +856,7 @@ msgstr "圖示檢視"
 #. append the "Open" menu action
 #: ../thunar/thunar-launcher.c:120 ../thunar/thunar-launcher.c:756
 #: ../thunar/thunar-location-buttons.c:1267
-#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:898
+#: ../thunar/thunar-shortcuts-view.c:794 ../thunar/thunar-tree-view.c:957
 msgid "_Open"
 msgstr "é–‹å•Ÿ(_O)"
 
@@ -866,7 +866,7 @@ msgstr "開啟選擇的檔案"
 
 #. append the "Open in New Window" menu action
 #: ../thunar/thunar-launcher.c:121 ../thunar/thunar-location-buttons.c:1280
-#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:910
+#: ../thunar/thunar-shortcuts-view.c:805 ../thunar/thunar-tree-view.c:969
 msgid "Open in New Window"
 msgstr "在新視窗中開啟"
 
@@ -1047,7 +1047,7 @@ msgid ""
 msgstr "將之前以「剪下」或「複製」所選擇的檔案移動或複製到 \"%s\" 中。"
 
 #. append the "Paste Into Folder" menu action
-#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:958
+#: ../thunar/thunar-location-buttons.c:1295 ../thunar/thunar-tree-view.c:1065
 msgid "_Paste Into Folder"
 msgstr "把檔案貼到資料夾中(_P)"
 
@@ -1485,7 +1485,7 @@ msgstr ""
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:781
-#: ../thunar/thunar-standard-view.c:2281
+#: ../thunar/thunar-standard-view.c:2283
 #, c-format
 msgid "Failed to rename \"%s\""
 msgstr "無法重新命名 \"%s\""
@@ -1653,17 +1653,17 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. append the "Mount Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:819
+#: ../thunar/thunar-shortcuts-view.c:819 ../thunar/thunar-tree-view.c:983
 msgid "_Mount Volume"
 msgstr ""
 
 #. append the "Eject Volume" menu action
-#: ../thunar/thunar-shortcuts-view.c:829
+#: ../thunar/thunar-shortcuts-view.c:829 ../thunar/thunar-tree-view.c:993
 msgid "E_ject Volume"
 msgstr ""
 
 #. append the "Unmount Volume" menu item
-#: ../thunar/thunar-shortcuts-view.c:838
+#: ../thunar/thunar-shortcuts-view.c:838 ../thunar/thunar-tree-view.c:1002
 msgid "_Unmount Volume"
 msgstr ""
 
@@ -1688,19 +1688,21 @@ msgid "Failed to add new shortcut"
 msgstr ""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1262
+#: ../thunar/thunar-shortcuts-view.c:1262 ../thunar/thunar-tree-view.c:1426
 #, c-format
 msgid "Failed to eject \"%s\""
 msgstr ""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1308
+#: ../thunar/thunar-shortcuts-view.c:1308 ../thunar/thunar-tree-view.c:905
+#: ../thunar/thunar-tree-view.c:1462
 #, c-format
 msgid "Failed to mount \"%s\""
 msgstr ""
 
 #. display an error dialog to inform the user
-#: ../thunar/thunar-shortcuts-view.c:1352
+#. display an error dialog
+#: ../thunar/thunar-shortcuts-view.c:1352 ../thunar/thunar-tree-view.c:1602
 #, c-format
 msgid "Failed to unmount \"%s\""
 msgstr ""
@@ -1728,7 +1730,7 @@ msgid "Folder Context Menu"
 msgstr ""
 
 #. append the "Create Folder" menu action
-#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:922
+#: ../thunar/thunar-standard-view.c:307 ../thunar/thunar-tree-view.c:1016
 msgid "Create _Folder..."
 msgstr ""
 
@@ -1737,12 +1739,12 @@ msgid "Create an empty folder within the current folder"
 msgstr ""
 
 #. append the "Cut" menu action
-#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:934
+#: ../thunar/thunar-standard-view.c:309 ../thunar/thunar-tree-view.c:1036
 msgid "Cu_t"
 msgstr ""
 
 #. append the "Copy" menu action
-#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:946
+#: ../thunar/thunar-standard-view.c:310 ../thunar/thunar-tree-view.c:1048
 #, fuzzy
 msgid "_Copy"
 msgstr "複製到這裡(_C)"
@@ -1789,7 +1791,7 @@ msgstr ""
 msgid "Du_plicate"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3248
+#: ../thunar/thunar-standard-view.c:317 ../thunar/thunar-standard-view.c:3250
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
@@ -1804,46 +1806,46 @@ msgid "Rename the selected file"
 msgstr ""
 
 #. add the "Create Document" sub menu action
-#: ../thunar/thunar-standard-view.c:574
+#: ../thunar/thunar-standard-view.c:576
 msgid "Create _Document"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1222
+#: ../thunar/thunar-standard-view.c:1224
 msgid "Loading folder contents..."
 msgstr ""
 
 #. ask the user to enter a name for the new empty file
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1718
+#: ../thunar/thunar-standard-view.c:1720
 msgid "New Empty File..."
 msgstr ""
 
 #. ask the user to enter a name for the new folder
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1769 ../thunar/thunar-tree-view.c:1222
+#: ../thunar/thunar-standard-view.c:1771 ../thunar/thunar-tree-view.c:1348
 msgid "Create New Folder"
 msgstr ""
 
 #. generate a title for the create dialog
-#: ../thunar/thunar-standard-view.c:1818
+#: ../thunar/thunar-standard-view.c:1820
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1969
+#: ../thunar/thunar-standard-view.c:1971
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1974
+#: ../thunar/thunar-standard-view.c:1976
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1854,58 +1856,58 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1996
+#: ../thunar/thunar-standard-view.c:1998
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2061
+#: ../thunar/thunar-standard-view.c:2063
 msgid "Select by Pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2067
+#: ../thunar/thunar-standard-view.c:2069
 msgid "_Select"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2076
+#: ../thunar/thunar-standard-view.c:2078
 msgid "_Pattern:"
 msgstr ""
 
 #. create a new dialog window
-#: ../thunar/thunar-standard-view.c:2210
+#: ../thunar/thunar-standard-view.c:2212
 #, c-format
 msgid "Rename \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2882
+#: ../thunar/thunar-standard-view.c:2884
 #, c-format
 msgid "Failed to open directory \"%s\""
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:3208
+#: ../thunar/thunar-standard-view.c:3210
 #, fuzzy
 msgid "Prepare the selected file to be moved with a Paste command"
 msgid_plural "Prepare the selected files to be moved with a Paste command"
 msgstr[0] "以預設的應用程式開啟所選取的檔案"
 
-#: ../thunar/thunar-standard-view.c:3216
+#: ../thunar/thunar-standard-view.c:3218
 msgid "Prepare the selected file to be copied with a Paste command"
 msgid_plural "Prepare the selected files to be copied with a Paste command"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:3227
+#: ../thunar/thunar-standard-view.c:3229
 #, fuzzy
 msgid "Delete the selected file permanently"
 msgid_plural "Delete the selected files permanently"
 msgstr[0] "執行所選取的檔案"
 
-#: ../thunar/thunar-standard-view.c:3241
+#: ../thunar/thunar-standard-view.c:3243
 #, fuzzy
 msgid "Duplicate the selected file"
 msgid_plural "Duplicate each selected file"
 msgstr[0] "開啟所選取的檔案"
 
-#: ../thunar/thunar-standard-view.c:3250
+#: ../thunar/thunar-standard-view.c:3252
 #, fuzzy
 msgid "Create a symbolic link for the selected file"
 msgid_plural "Create a symbolic link for each selected file"
@@ -1929,13 +1931,13 @@ msgstr ""
 msgid "_Empty File"
 msgstr ""
 
-#: ../thunar/thunar-tree-model.c:550
+#: ../thunar/thunar-tree-model.c:600
 #, fuzzy
 msgid "Loading..."
 msgstr "準備中..."
 
 #. append the "Properties" menu action
-#: ../thunar/thunar-tree-view.c:975
+#: ../thunar/thunar-tree-view.c:1083
 #, fuzzy
 msgid "P_roperties..."
 msgstr "準備中..."
diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c
index 31a8ee759cdc7ccfd96d46d6cca750040a60ca2d..0636c453357cfcb0c0ac51bff5d425b8d6fb9684 100644
--- a/thunar/thunar-tree-model.c
+++ b/thunar/thunar-tree-model.c
@@ -55,85 +55,99 @@ typedef struct _ThunarTreeModelItem ThunarTreeModelItem;
 
 
 
-static void                 thunar_tree_model_class_init              (ThunarTreeModelClass *klass);
-static void                 thunar_tree_model_tree_model_init         (GtkTreeModelIface    *iface);
-static void                 thunar_tree_model_init                    (ThunarTreeModel      *model);
-static void                 thunar_tree_model_finalize                (GObject              *object);
-static void                 thunar_tree_model_get_property            (GObject              *object,
-                                                                       guint                 prop_id,
-                                                                       GValue               *value,
-                                                                       GParamSpec           *pspec);
-static void                 thunar_tree_model_set_property            (GObject              *object,
-                                                                       guint                 prop_id,
-                                                                       const GValue         *value,
-                                                                       GParamSpec           *pspec);
-static GtkTreeModelFlags    thunar_tree_model_get_flags               (GtkTreeModel         *tree_model);
-static gint                 thunar_tree_model_get_n_columns           (GtkTreeModel         *tree_model);
-static GType                thunar_tree_model_get_column_type         (GtkTreeModel         *tree_model,
-                                                                       gint                  column);
-static gboolean             thunar_tree_model_get_iter                (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter,
-                                                                       GtkTreePath          *path);
-static GtkTreePath         *thunar_tree_model_get_path                (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter);
-static void                 thunar_tree_model_get_value               (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter,
-                                                                       gint                  column,
-                                                                       GValue               *value);
-static gboolean             thunar_tree_model_iter_next               (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter);
-static gboolean             thunar_tree_model_iter_children           (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter,
-                                                                       GtkTreeIter          *parent);
-static gboolean             thunar_tree_model_iter_has_child          (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter);
-static gint                 thunar_tree_model_iter_n_children         (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter);
-static gboolean             thunar_tree_model_iter_nth_child          (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter,
-                                                                       GtkTreeIter          *parent,
-                                                                       gint                  n);
-static gboolean             thunar_tree_model_iter_parent             (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter,
-                                                                       GtkTreeIter          *child);
-static void                 thunar_tree_model_ref_node                (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter);
-static void                 thunar_tree_model_unref_node              (GtkTreeModel         *tree_model,
-                                                                       GtkTreeIter          *iter);
-static gint                 thunar_tree_model_cmp_array               (gconstpointer         a,
-                                                                       gconstpointer         b,
-                                                                       gpointer              user_data);
-static void                 thunar_tree_model_sort                    (ThunarTreeModel      *model,
-                                                                       GNode                *node);
-static void                 thunar_tree_model_file_changed            (ThunarFileMonitor    *file_monitor,
-                                                                       ThunarFile           *file,
-                                                                       ThunarTreeModel      *model);
-static ThunarTreeModelItem *thunar_tree_model_item_new                (ThunarTreeModel      *model,
-                                                                       ThunarFile           *file) G_GNUC_MALLOC;
-static void                 thunar_tree_model_item_free               (ThunarTreeModelItem  *item);
-static void                 thunar_tree_model_item_load_folder        (ThunarTreeModelItem  *item);
-static void                 thunar_tree_model_item_unload_folder      (ThunarTreeModelItem  *item);
-static void                 thunar_tree_model_item_files_added        (ThunarTreeModelItem  *item,
-                                                                       GList                *files,
-                                                                       ThunarFolder         *folder);
-static void                 thunar_tree_model_item_files_removed      (ThunarTreeModelItem  *item,
-                                                                       GList                *files,
-                                                                       ThunarFolder         *folder);
-static gboolean             thunar_tree_model_item_load_idle          (gpointer              user_data);
-static void                 thunar_tree_model_item_load_idle_destroy  (gpointer              user_data);
-static void                 thunar_tree_model_item_notify_loading     (ThunarTreeModelItem  *item,
-                                                                       GParamSpec           *pspec,
-                                                                       ThunarFolder         *folder);
-static void                 thunar_tree_model_node_drop_dummy         (GNode                *node,
-                                                                       ThunarTreeModel      *model);
-static gboolean             thunar_tree_model_node_traverse_changed   (GNode                *node,
-                                                                       gpointer              user_data);
-static gboolean             thunar_tree_model_node_traverse_remove    (GNode                *node,
-                                                                       gpointer              user_data);
-static gboolean             thunar_tree_model_node_traverse_sort      (GNode                *node,
-                                                                       gpointer              user_data);
-static gboolean             thunar_tree_model_node_traverse_free      (GNode                *node,
-                                                                       gpointer              user_data);
+static void                 thunar_tree_model_class_init              (ThunarTreeModelClass   *klass);
+static void                 thunar_tree_model_tree_model_init         (GtkTreeModelIface      *iface);
+static void                 thunar_tree_model_init                    (ThunarTreeModel        *model);
+static void                 thunar_tree_model_finalize                (GObject                *object);
+static void                 thunar_tree_model_get_property            (GObject                *object,
+                                                                       guint                   prop_id,
+                                                                       GValue                 *value,
+                                                                       GParamSpec             *pspec);
+static void                 thunar_tree_model_set_property            (GObject                *object,
+                                                                       guint                   prop_id,
+                                                                       const GValue           *value,
+                                                                       GParamSpec             *pspec);
+static GtkTreeModelFlags    thunar_tree_model_get_flags               (GtkTreeModel           *tree_model);
+static gint                 thunar_tree_model_get_n_columns           (GtkTreeModel           *tree_model);
+static GType                thunar_tree_model_get_column_type         (GtkTreeModel           *tree_model,
+                                                                       gint                    column);
+static gboolean             thunar_tree_model_get_iter                (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter,
+                                                                       GtkTreePath            *path);
+static GtkTreePath         *thunar_tree_model_get_path                (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter);
+static void                 thunar_tree_model_get_value               (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter,
+                                                                       gint                    column,
+                                                                       GValue                 *value);
+static gboolean             thunar_tree_model_iter_next               (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter);
+static gboolean             thunar_tree_model_iter_children           (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter,
+                                                                       GtkTreeIter            *parent);
+static gboolean             thunar_tree_model_iter_has_child          (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter);
+static gint                 thunar_tree_model_iter_n_children         (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter);
+static gboolean             thunar_tree_model_iter_nth_child          (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter,
+                                                                       GtkTreeIter            *parent,
+                                                                       gint                    n);
+static gboolean             thunar_tree_model_iter_parent             (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter,
+                                                                       GtkTreeIter            *child);
+static void                 thunar_tree_model_ref_node                (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter);
+static void                 thunar_tree_model_unref_node              (GtkTreeModel           *tree_model,
+                                                                       GtkTreeIter            *iter);
+static gint                 thunar_tree_model_cmp_array               (gconstpointer           a,
+                                                                       gconstpointer           b,
+                                                                       gpointer                user_data);
+static void                 thunar_tree_model_sort                    (ThunarTreeModel        *model,
+                                                                       GNode                  *node);
+static void                 thunar_tree_model_file_changed            (ThunarFileMonitor      *file_monitor,
+                                                                       ThunarFile             *file,
+                                                                       ThunarTreeModel        *model);
+static void                 thunar_tree_model_volume_changed          (ThunarVfsVolume        *volume,
+                                                                       ThunarTreeModel        *model);
+static void                 thunar_tree_model_volume_pre_unmount      (ThunarVfsVolumeManager *volume_manager,
+                                                                       ThunarVfsVolume        *volume,
+                                                                       ThunarTreeModel        *model);
+static void                 thunar_tree_model_volumes_added           (ThunarVfsVolumeManager *volume_manager,
+                                                                       GList                  *volumes,
+                                                                       ThunarTreeModel        *model);
+static void                 thunar_tree_model_volumes_removed         (ThunarVfsVolumeManager *volume_manager,
+                                                                       GList                  *volumes,
+                                                                       ThunarTreeModel        *model);
+static ThunarTreeModelItem *thunar_tree_model_item_new_with_file      (ThunarTreeModel        *model,
+                                                                       ThunarFile             *file) G_GNUC_MALLOC;
+static ThunarTreeModelItem *thunar_tree_model_item_new_with_volume    (ThunarTreeModel        *model,
+                                                                       ThunarVfsVolume        *volume) G_GNUC_MALLOC;
+static void                 thunar_tree_model_item_free               (ThunarTreeModelItem    *item);
+static void                 thunar_tree_model_item_reset              (ThunarTreeModelItem    *item);
+static void                 thunar_tree_model_item_load_folder        (ThunarTreeModelItem    *item);
+static void                 thunar_tree_model_item_unload_folder      (ThunarTreeModelItem    *item);
+static void                 thunar_tree_model_item_files_added        (ThunarTreeModelItem    *item,
+                                                                       GList                  *files,
+                                                                       ThunarFolder           *folder);
+static void                 thunar_tree_model_item_files_removed      (ThunarTreeModelItem    *item,
+                                                                       GList                  *files,
+                                                                       ThunarFolder           *folder);
+static gboolean             thunar_tree_model_item_load_idle          (gpointer                user_data);
+static void                 thunar_tree_model_item_load_idle_destroy  (gpointer                user_data);
+static void                 thunar_tree_model_item_notify_loading     (ThunarTreeModelItem    *item,
+                                                                       GParamSpec             *pspec,
+                                                                       ThunarFolder           *folder);
+static void                 thunar_tree_model_node_drop_dummy         (GNode                  *node,
+                                                                       ThunarTreeModel        *model);
+static gboolean             thunar_tree_model_node_traverse_changed   (GNode                  *node,
+                                                                       gpointer                user_data);
+static gboolean             thunar_tree_model_node_traverse_remove    (GNode                  *node,
+                                                                       gpointer                user_data);
+static gboolean             thunar_tree_model_node_traverse_sort      (GNode                  *node,
+                                                                       gpointer                user_data);
+static gboolean             thunar_tree_model_node_traverse_free      (GNode                  *node,
+                                                                       gpointer                user_data);
 
 
 
@@ -144,14 +158,18 @@ struct _ThunarTreeModelClass
 
 struct _ThunarTreeModel
 {
-  GObject __parent__;
+  GObject                 __parent__;
 
-  ThunarFileMonitor *file_monitor;
+  /* removable volumes */
+  ThunarVfsVolumeManager *volume_manager;
+  GList                  *hidden_volumes;
 
-  gboolean           sort_case_sensitive;
+  ThunarFileMonitor      *file_monitor;
 
-  GNode             *root;
-  guint              stamp;
+  gboolean                sort_case_sensitive;
+
+  GNode                  *root;
+  guint                   stamp;
 };
 
 struct _ThunarTreeModelItem
@@ -160,6 +178,7 @@ struct _ThunarTreeModelItem
   gint             load_idle_id;
   ThunarFile      *file;
   ThunarFolder    *folder;
+  ThunarVfsVolume *volume;
   ThunarTreeModel *model;
 };
 
@@ -269,6 +288,7 @@ thunar_tree_model_init (ThunarTreeModel *model)
   ThunarTreeModelItem *item;
   ThunarVfsPath       *path;
   ThunarFile          *file;
+  GList               *volumes;
   GNode               *node;
 
   /* initialize the model data */
@@ -282,13 +302,19 @@ thunar_tree_model_init (ThunarTreeModel *model)
   /* allocate the "virtual root node" */
   model->root = g_node_new (NULL);
 
+  /* connect to the volume manager */
+  model->volume_manager = thunar_vfs_volume_manager_get_default ();
+  g_signal_connect (G_OBJECT (model->volume_manager), "volumes-added", G_CALLBACK (thunar_tree_model_volumes_added), model);
+  g_signal_connect (G_OBJECT (model->volume_manager), "volumes-removed", G_CALLBACK (thunar_tree_model_volumes_removed), model);
+  g_signal_connect (G_OBJECT (model->volume_manager), "volume-pre-unmount", G_CALLBACK (thunar_tree_model_volume_pre_unmount), model);
+
   /* allocate the home node */
   path = thunar_vfs_path_get_for_home ();
   file = thunar_file_get_for_path (path, NULL);
   if (G_LIKELY (file != NULL))
     {
       /* add the home node */
-      item = thunar_tree_model_item_new (model, file);
+      item = thunar_tree_model_item_new_with_file (model, file);
       node = g_node_append_data (model->root, item);
       g_object_unref (G_OBJECT (file));
 
@@ -303,7 +329,7 @@ thunar_tree_model_init (ThunarTreeModel *model)
   if (G_LIKELY (file != NULL))
     {
       /* add the root node */
-      item = thunar_tree_model_item_new (model, file);
+      item = thunar_tree_model_item_new_with_file (model, file);
       node = g_node_append_data (model->root, item);
       g_object_unref (G_OBJECT (file));
 
@@ -311,6 +337,11 @@ thunar_tree_model_init (ThunarTreeModel *model)
       g_node_append_data (node, NULL);
     }
   thunar_vfs_path_unref (path);
+
+  /* setup the initial volumes */
+  volumes = thunar_vfs_volume_manager_get_volumes (model->volume_manager);
+  if (G_LIKELY (volumes != NULL))
+    thunar_tree_model_volumes_added (model->volume_manager, volumes, model);
 }
 
 
@@ -319,15 +350,28 @@ static void
 thunar_tree_model_finalize (GObject *object)
 {
   ThunarTreeModel *model = THUNAR_TREE_MODEL (object);
+  GList           *lp;
 
   /* disconnect from the file monitor */
   g_signal_handlers_disconnect_by_func (G_OBJECT (model->file_monitor), thunar_tree_model_file_changed, model);
   g_object_unref (G_OBJECT (model->file_monitor));
 
+  /* release all hidden volumes */
+  for (lp = model->hidden_volumes; lp != NULL; lp = lp->next)
+    {
+      g_signal_handlers_disconnect_by_func (G_OBJECT (lp->data), thunar_tree_model_volume_changed, model);
+      g_object_unref (G_OBJECT (lp->data));
+    }
+  g_list_free (model->hidden_volumes);
+
   /* release all resources allocated to the model */
   g_node_traverse (model->root, G_POST_ORDER, G_TRAVERSE_ALL, -1, thunar_tree_model_node_traverse_free, NULL);
   g_node_destroy (model->root);
 
+  /* disconnect from the volume manager */
+  g_signal_handlers_disconnect_matched (G_OBJECT (model->volume_manager), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, model);
+  g_object_unref (G_OBJECT (model->volume_manager));
+
   (*G_OBJECT_CLASS (thunar_tree_model_parent_class)->finalize) (object);
 }
 
@@ -407,10 +451,14 @@ thunar_tree_model_get_column_type (GtkTreeModel *tree_model,
 
     case THUNAR_TREE_MODEL_COLUMN_ATTR:
       return PANGO_TYPE_ATTR_LIST;
-    }
 
-  g_assert_not_reached ();
-  return G_TYPE_INVALID;
+    case THUNAR_TREE_MODEL_COLUMN_VOLUME:
+      return THUNAR_VFS_TYPE_VOLUME;
+
+    default:
+      g_assert_not_reached ();
+      return G_TYPE_INVALID;
+    }
 }
 
 
@@ -544,7 +592,9 @@ thunar_tree_model_get_value (GtkTreeModel *tree_model,
 
     case THUNAR_TREE_MODEL_COLUMN_NAME:
       g_value_init (value, G_TYPE_STRING);
-      if (G_LIKELY (item != NULL))
+      if (G_LIKELY (item != NULL && item->volume != NULL))
+        g_value_set_static_string (value, thunar_vfs_volume_get_name (item->volume));
+      else if (G_LIKELY (item != NULL && item->file != NULL))
         g_value_set_static_string (value, thunar_file_get_display_name (item->file));
       else
         g_value_set_static_string (value, _("Loading..."));
@@ -558,6 +608,11 @@ thunar_tree_model_get_value (GtkTreeModel *tree_model,
         g_value_set_boxed (value, thunar_pango_attr_list_italic ());
       break;
 
+    case THUNAR_TREE_MODEL_COLUMN_VOLUME:
+      g_value_init (value, THUNAR_VFS_TYPE_VOLUME);
+      g_value_set_object (value, (item != NULL) ? item->volume : NULL);
+      break;
+
     default:
       g_assert_not_reached ();
       break;
@@ -858,9 +913,261 @@ thunar_tree_model_file_changed (ThunarFileMonitor *file_monitor,
 
 
 
+static void
+thunar_tree_model_volume_changed (ThunarVfsVolume *volume,
+                                  ThunarTreeModel *model)
+{
+  ThunarTreeModelItem *item = NULL;
+  GtkTreePath         *path;
+  GtkTreeIter          iter;
+  GNode               *dummy;
+  GNode               *node;
+  GList                list;
+  GList               *lp;
+
+  g_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
+  g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+
+  /* check if the volume is on the hidden list */
+  lp = g_list_find (model->hidden_volumes, volume);
+  if (G_LIKELY (lp != NULL))
+    {
+      /* check if we need to display the volume now */
+      if (thunar_vfs_volume_is_present (volume) && thunar_vfs_volume_is_removable (volume))
+        {
+          /* remove the volume from the list of hidden volumes */
+          model->hidden_volumes = g_list_delete_link (model->hidden_volumes, lp);
+
+          /* allocate a new item for the volume */
+          item = thunar_tree_model_item_new_with_volume (model, volume);
+
+          /* insert before the last child of the root (the "File System" node) */
+          node = g_node_last_child (model->root);
+          node = g_node_insert_data_before (model->root, node, item);
+
+          /* determine the iterator for the new node */
+          iter.stamp = model->stamp;
+          iter.user_data = node;
+
+          /* tell the view about the new node */
+          path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+          gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
+          gtk_tree_path_free (path);
+
+          /* add the dummy node */
+          node = g_node_append_data (node, NULL);
+
+          /* determine the iterator for the dummy node */
+          iter.stamp = model->stamp;
+          iter.user_data = node;
+
+          /* tell the view about the dummy node */
+          path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+          gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
+          gtk_tree_path_free (path);
+
+          /* drop our reference on the volume */
+          g_object_unref (G_OBJECT (volume));
+        }
+    }
+  else
+    {
+      /* lookup the volume in the item list */
+      for (node = model->root->children; node != NULL; node = node->next)
+        {
+          item = THUNAR_TREE_MODEL_ITEM (node->data);
+          if (item->volume == volume)
+            break;
+        }
+
+      /* verify that we actually found the item */
+      g_assert (item != NULL);
+      g_assert (item->volume == volume);
+
+      /* check if we need to hide the volume now */
+      if (!thunar_vfs_volume_is_present (volume) || !thunar_vfs_volume_is_removable (volume))
+        {
+          /* need to ref here, because the volumes_removed() handler will drop the reference */
+          g_object_ref (G_OBJECT (volume));
+
+          /* fake a list with only the volume */
+          list.next = list.prev = NULL;
+          list.data = volume;
+
+          /* use "volumes-removed" handler to hide the volume */
+          thunar_tree_model_volumes_removed (model->volume_manager, &list, model);
+
+          /* need to reconnect to the volume as the item removable drops the handler */
+          g_signal_connect (G_OBJECT (volume), "changed", G_CALLBACK (thunar_tree_model_volume_changed), model);
+
+          /* move the volume to the hidden list */
+          model->hidden_volumes = g_list_prepend (model->hidden_volumes, volume);
+        }
+      else
+        {
+          /* check if the volume is mounted and we don't have a file yet */
+          if (thunar_vfs_volume_is_mounted (volume) && item->file == NULL)
+            {
+              /* try to determine the file for the mount point */
+              item->file = thunar_file_get_for_path (thunar_vfs_volume_get_mount_point (volume), NULL);
+            }
+          else if (!thunar_vfs_volume_is_mounted (volume) && item->file != NULL)
+            {
+              /* reset the item for the node */
+              thunar_tree_model_item_reset (item);
+
+              /* release all child nodes */
+              while (node->children != NULL)
+                g_node_traverse (node->children, G_POST_ORDER, G_TRAVERSE_ALL, -1, thunar_tree_model_node_traverse_remove, model);
+
+              /* append the dummy node */
+              dummy = g_node_append_data (node, NULL);
+
+              /* determine the iterator for the dummy node */
+              iter.stamp = model->stamp;
+              iter.user_data = dummy;
+
+              /* tell the view about the dummy node */
+              path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+              gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
+              gtk_tree_path_free (path);
+            }
+
+          /* generate an iterator for the item */
+          iter.stamp = model->stamp;
+          iter.user_data = node;
+
+          /* tell the view that the volume has changed in some way */
+          path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+          gtk_tree_model_row_changed (GTK_TREE_MODEL (model), path, &iter);
+          gtk_tree_path_free (path);
+        }
+    }
+}
+
+
+
+static void
+thunar_tree_model_volume_pre_unmount (ThunarVfsVolumeManager *volume_manager,
+                                      ThunarVfsVolume        *volume,
+                                      ThunarTreeModel        *model)
+{
+  GtkTreePath *path;
+  GtkTreeIter  iter;
+  GNode       *node;
+
+  g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+  g_return_if_fail (THUNAR_VFS_IS_VOLUME (volume));
+  g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+
+  /* lookup the node for the volume (if visible) */
+  for (node = model->root->children; node != NULL; node = node->next)
+    if (THUNAR_TREE_MODEL_ITEM (node->data)->volume == volume)
+      break;
+
+  /* check if we have a node */
+  if (G_UNLIKELY (node == NULL))
+    return;
+
+  /* reset the item for the node */
+  thunar_tree_model_item_reset (node->data);
+
+  /* remove all child nodes */
+  while (node->children != NULL)
+    g_node_traverse (node->children, G_POST_ORDER, G_TRAVERSE_ALL, -1, thunar_tree_model_node_traverse_remove, model);
+
+  /* add the dummy node */
+  node = g_node_append_data (node, NULL);
+
+  /* determine the iterator for the dummy node */
+  iter.stamp = model->stamp;
+  iter.user_data = node;
+
+  /* tell the view about the dummy node */
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter);
+  gtk_tree_model_row_inserted (GTK_TREE_MODEL (model), path, &iter);
+  gtk_tree_path_free (path);
+}
+
+
+
+static void
+thunar_tree_model_volumes_added (ThunarVfsVolumeManager *volume_manager,
+                                 GList                  *volumes,
+                                 ThunarTreeModel        *model)
+{
+  GList *lp;
+
+  g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+  g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+
+  /* process all newly added volumes */
+  for (lp = volumes; lp != NULL; lp = lp->next)
+    {
+      /* take a reference on the volume... */
+      g_object_ref (G_OBJECT (lp->data));
+
+      /* ...place the volume on the hidden list... */
+      model->hidden_volumes = g_list_prepend (model->hidden_volumes, lp->data);
+
+      /* ...connect the "changed" signal handler... */
+      g_signal_connect (G_OBJECT (lp->data), "changed", G_CALLBACK (thunar_tree_model_volume_changed), model);
+
+      /* ...and let the "changed" handler place the volume where appropriate */
+      thunar_tree_model_volume_changed (lp->data, model);
+    }
+}
+
+
+
+static void
+thunar_tree_model_volumes_removed (ThunarVfsVolumeManager *volume_manager,
+                                   GList                  *volumes,
+                                   ThunarTreeModel        *model)
+{
+  GNode *node;
+  GList *hp;
+  GList *lp;
+
+  g_return_if_fail (THUNAR_VFS_IS_VOLUME_MANAGER (volume_manager));
+  g_return_if_fail (THUNAR_IS_TREE_MODEL (model));
+
+  /* process all removed volumes */
+  for (lp = volumes; lp != NULL; lp = lp->next)
+    {
+      /* check if the volume is on the hidden list */
+      hp = g_list_find (model->hidden_volumes, lp->data);
+      if (G_LIKELY (hp != NULL))
+        {
+          /* disconnect the "changed" signal handler from the volume */
+          g_signal_handlers_disconnect_by_func (G_OBJECT (lp->data), thunar_tree_model_volume_changed, model);
+
+          /* drop the volume from the hidden list and drop our reference */
+          model->hidden_volumes = g_list_delete_link (model->hidden_volumes, hp);
+          g_object_unref (G_OBJECT (lp->data));
+        }
+      else
+        {
+          /* must be a visible volume then... */
+          for (node = model->root->children; node != NULL; node = node->next)
+            if (THUNAR_TREE_MODEL_ITEM (node->data)->volume == lp->data)
+              break;
+
+          /* something is broken if we don't have an item here */
+          g_assert (node != NULL);
+          g_assert (THUNAR_TREE_MODEL_ITEM (node->data)->volume == lp->data);
+
+          /* drop the node from the model */
+          g_node_traverse (node, G_POST_ORDER, G_TRAVERSE_ALL, -1, thunar_tree_model_node_traverse_remove, model);
+        }
+    }
+}
+
+
+
 static ThunarTreeModelItem*
-thunar_tree_model_item_new (ThunarTreeModel *model,
-                            ThunarFile      *file)
+thunar_tree_model_item_new_with_file (ThunarTreeModel *model,
+                                      ThunarFile      *file)
 {
   ThunarTreeModelItem *item;
 
@@ -873,10 +1180,53 @@ thunar_tree_model_item_new (ThunarTreeModel *model,
 
 
 
+static ThunarTreeModelItem*
+thunar_tree_model_item_new_with_volume (ThunarTreeModel *model,
+                                        ThunarVfsVolume *volume)
+{
+  ThunarTreeModelItem *item;
+  ThunarVfsPath       *path;
+
+  item = g_new0 (ThunarTreeModelItem, 1);
+  item->volume = g_object_ref (G_OBJECT (volume));
+  item->model = model;
+
+  /* check if the volume is mounted */
+  if (thunar_vfs_volume_is_mounted (volume))
+    {
+      /* try to determine the file for the mount point */
+      path = thunar_vfs_volume_get_mount_point (volume);
+      item->file = thunar_file_get_for_path (path, NULL);
+    }
+
+  return item;
+}
+
+
+
 static void
 thunar_tree_model_item_free (ThunarTreeModelItem *item)
 {
-  /* cancel any pending "load" idle source */
+  /* disconnect from the volume */
+  if (G_UNLIKELY (item->volume != NULL))
+    {
+      g_signal_handlers_disconnect_by_func (G_OBJECT (item->volume), thunar_tree_model_volume_changed, item->model);
+      g_object_unref (G_OBJECT (item->volume));
+    }
+
+  /* reset the remaining resources */
+  thunar_tree_model_item_reset (item);
+
+  /* release the item */
+  g_free (item);
+}
+
+
+
+static void
+thunar_tree_model_item_reset (ThunarTreeModelItem *item)
+{
+  /* cancel any pending load idle source */
   if (G_UNLIKELY (item->load_idle_id != 0))
     g_source_remove (item->load_idle_id);
 
@@ -885,14 +1235,15 @@ thunar_tree_model_item_free (ThunarTreeModelItem *item)
     {
       g_signal_handlers_disconnect_matched (G_OBJECT (item->folder), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, item);
       g_object_unref (G_OBJECT (item->folder));
+      item->folder = NULL;
     }
 
   /* disconnect from the file */
   if (G_LIKELY (item->file != NULL))
-    g_object_unref (G_OBJECT (item->file));
-
-  /* release the item */
-  g_free (item);
+    {
+      g_object_unref (G_OBJECT (item->file));
+      item->file = NULL;
+    }
 }
 
 
@@ -948,7 +1299,7 @@ thunar_tree_model_item_files_added (ThunarTreeModelItem *item,
         node = g_node_find (model->root, G_POST_ORDER, G_TRAVERSE_ALL, item);
 
       /* allocate a new item for the file */
-      child_item = thunar_tree_model_item_new (model, file);
+      child_item = thunar_tree_model_item_new_with_file (model, file);
 
       /* check if the node has only the dummy child */
       if (g_node_n_children (node) == 1 && g_node_first_child (node)->data == NULL)
@@ -1072,33 +1423,39 @@ thunar_tree_model_item_load_idle (gpointer user_data)
 {
   ThunarTreeModelItem *item = user_data;
   GList               *files;
-  GNode               *node;
 
   g_return_val_if_fail (item->folder == NULL, FALSE);
 
   GDK_THREADS_ENTER ();
 
-  /* open the folder for the item */
-  item->folder = thunar_folder_get_for_file (item->file);
-
-  /* connect signals */
-  g_signal_connect_swapped (G_OBJECT (item->folder), "files-added", G_CALLBACK (thunar_tree_model_item_files_added), item);
-  g_signal_connect_swapped (G_OBJECT (item->folder), "files-removed", G_CALLBACK (thunar_tree_model_item_files_removed), item);
-  g_signal_connect_swapped (G_OBJECT (item->folder), "notify::loading", G_CALLBACK (thunar_tree_model_item_notify_loading), item);
-
-  /* load the initial set of files (if any) */
-  files = thunar_folder_get_files (item->folder);
-  if (G_UNLIKELY (files != NULL))
-    thunar_tree_model_item_files_added (item, files, item->folder);
-
-  /* drop the dummy item if the folder is already loaded */
-  if (!thunar_folder_get_loading (item->folder))
+  /* check if we don't have a file yet and this is a mounted volume */
+  if (item->file == NULL && item->volume != NULL && thunar_vfs_volume_is_mounted (item->volume))
     {
-      /* lookup the node for the item... */
-      node = g_node_find (item->model->root, G_POST_ORDER, G_TRAVERSE_ALL, item);
+      /* try to determine the file for the mount point */
+      item->file = thunar_file_get_for_path (thunar_vfs_volume_get_mount_point (item->volume), NULL);
+    }
 
-      /* ...and drop the dummy for the node */
-      thunar_tree_model_node_drop_dummy (node, item->model);
+  /* verify that we have a file */
+  if (G_LIKELY (item->file != NULL))
+    {
+      /* open the folder for the item */
+      item->folder = thunar_folder_get_for_file (item->file);
+      if (G_LIKELY (item->folder != NULL))
+        {
+          /* connect signals */
+          g_signal_connect_swapped (G_OBJECT (item->folder), "files-added", G_CALLBACK (thunar_tree_model_item_files_added), item);
+          g_signal_connect_swapped (G_OBJECT (item->folder), "files-removed", G_CALLBACK (thunar_tree_model_item_files_removed), item);
+          g_signal_connect_swapped (G_OBJECT (item->folder), "notify::loading", G_CALLBACK (thunar_tree_model_item_notify_loading), item);
+
+          /* load the initial set of files (if any) */
+          files = thunar_folder_get_files (item->folder);
+          if (G_UNLIKELY (files != NULL))
+            thunar_tree_model_item_files_added (item, files, item->folder);
+
+          /* notify for "loading" if already loaded */
+          if (!thunar_folder_get_loading (item->folder))
+            g_object_notify (G_OBJECT (item->folder), "loading");
+        }
     }
 
   GDK_THREADS_LEAVE ();
diff --git a/thunar/thunar-tree-model.h b/thunar/thunar-tree-model.h
index 79c2392903fc3f029fbfec869d55c426832c4927..895c7263c10c6e4c27b59d251d62a8861417a908 100644
--- a/thunar/thunar-tree-model.h
+++ b/thunar/thunar-tree-model.h
@@ -36,9 +36,10 @@ typedef struct _ThunarTreeModel      ThunarTreeModel;
 
 /**
  * ThunarTreeModelColumn:
- * @THUNAR_TREE_MODEL_COLUMN_FILE : the index of the file column.
- * @THUNAR_TREE_MODEL_COLUMN_NAME : the index of the name column.
- * @THUNAR_TREE_MODEL_COLUMN_ATTR : the index of the #PangoAttrList column.
+ * @THUNAR_TREE_MODEL_COLUMN_FILE   : the index of the file column.
+ * @THUNAR_TREE_MODEL_COLUMN_NAME   : the index of the name column.
+ * @THUNAR_TREE_MODEL_COLUMN_ATTR   : the index of the #PangoAttrList column.
+ * @THUNAR_TREE_MODEL_COLUMN_VOLUME : the index of the #ThunarVfsVolume column.
  *
  * Columns exported by the #ThunarTreeModel using the
  * #GtkTreeModel interface.
@@ -48,6 +49,7 @@ typedef enum
   THUNAR_TREE_MODEL_COLUMN_FILE,
   THUNAR_TREE_MODEL_COLUMN_NAME,
   THUNAR_TREE_MODEL_COLUMN_ATTR,
+  THUNAR_TREE_MODEL_COLUMN_VOLUME,
   THUNAR_TREE_MODEL_N_COLUMNS,
 } ThunarTreeModelColumn;
 
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index 0497a1420d78d924a37938417fdb5b8722e254e4..c3110a586a319c3de50643de3ad2b8eb963cf4be 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -24,8 +24,9 @@
 #include <thunar/thunar-application.h>
 #include <thunar/thunar-clipboard-manager.h>
 #include <thunar/thunar-create-dialog.h>
+#include <thunar/thunar-dialogs.h>
 #include <thunar/thunar-dnd.h>
-#include <thunar/thunar-icon-renderer.h>
+#include <thunar/thunar-shortcuts-icon-renderer.h>
 #include <thunar/thunar-preferences.h>
 #include <thunar/thunar-properties-dialog.h>
 #include <thunar/thunar-tree-model.h>
@@ -54,91 +55,98 @@ enum
 
 
 
-static void           thunar_tree_view_class_init                 (ThunarTreeViewClass  *klass);
-static void           thunar_tree_view_navigator_init             (ThunarNavigatorIface *iface);
-static void           thunar_tree_view_init                       (ThunarTreeView       *view);
-static void           thunar_tree_view_finalize                   (GObject              *object);
-static void           thunar_tree_view_get_property               (GObject              *object,
-                                                                   guint                 prop_id,
-                                                                   GValue               *value,
-                                                                   GParamSpec           *pspec);
-static void           thunar_tree_view_set_property               (GObject              *object,
-                                                                   guint                 prop_id,
-                                                                   const GValue         *value,
-                                                                   GParamSpec           *pspec);
-static ThunarFile    *thunar_tree_view_get_current_directory      (ThunarNavigator      *navigator);
-static void           thunar_tree_view_set_current_directory      (ThunarNavigator      *navigator,
-                                                                   ThunarFile           *current_directory);
-static void           thunar_tree_view_realize                    (GtkWidget            *widget);
-static void           thunar_tree_view_unrealize                  (GtkWidget            *widget);
-static gboolean       thunar_tree_view_button_press_event         (GtkWidget            *widget,
-                                                                   GdkEventButton       *event);
-static gboolean       thunar_tree_view_button_release_event       (GtkWidget            *widget,
-                                                                   GdkEventButton       *event);
-static void           thunar_tree_view_drag_data_received         (GtkWidget            *widget,
-                                                                   GdkDragContext       *context,
-                                                                   gint                  x,
-                                                                   gint                  y,
-                                                                   GtkSelectionData     *selection_data,
-                                                                   guint                 info,
-                                                                   guint                 time);
-static gboolean       thunar_tree_view_drag_drop                  (GtkWidget            *widget,
-                                                                   GdkDragContext       *context,
-                                                                   gint                  x,
-                                                                   gint                  y,
-                                                                   guint                 time);
-static gboolean       thunar_tree_view_drag_motion                (GtkWidget            *widget,
-                                                                   GdkDragContext       *context,
-                                                                   gint                  x,
-                                                                   gint                  y,
-                                                                   guint                 time);
-static void           thunar_tree_view_drag_leave                 (GtkWidget            *widget,
-                                                                   GdkDragContext       *context,
-                                                                   guint                 time);
-static gboolean       thunar_tree_view_popup_menu                 (GtkWidget            *widget);
-static void           thunar_tree_view_row_activated              (GtkTreeView          *tree_view,
-                                                                   GtkTreePath          *path,
-                                                                   GtkTreeViewColumn    *column);
-static void           thunar_tree_view_context_menu               (ThunarTreeView       *view,
-                                                                   GdkEventButton       *event,
-                                                                   GtkTreeModel         *filter,
-                                                                   GtkTreeIter          *iter);
-static GdkDragAction  thunar_tree_view_get_dest_actions           (ThunarTreeView       *view,
-                                                                   GdkDragContext       *context,
-                                                                   gint                  x,
-                                                                   gint                  y,
-                                                                   guint                 time,
-                                                                   ThunarFile          **file_return);
-static gboolean       thunar_tree_view_find_closest_ancestor      (ThunarTreeView       *view,
-                                                                   GtkTreePath          *path,
-                                                                   GtkTreePath         **ancestor_return,
-                                                                   gboolean             *exact_return);
-static ThunarFile    *thunar_tree_view_get_selected_file          (ThunarTreeView       *view);
-static void           thunar_tree_view_action_copy                (ThunarTreeView       *view);
-static void           thunar_tree_view_action_create_folder       (ThunarTreeView       *view);
-static void           thunar_tree_view_action_cut                 (ThunarTreeView       *view);
-static void           thunar_tree_view_action_open                (ThunarTreeView       *view);
-static void           thunar_tree_view_action_open_in_new_window  (ThunarTreeView       *view);
-static void           thunar_tree_view_action_paste_into_folder   (ThunarTreeView       *view);
-static void           thunar_tree_view_action_properties          (ThunarTreeView       *view);
-static GClosure      *thunar_tree_view_new_files_closure          (ThunarTreeView       *view);
-static void           thunar_tree_view_new_files                  (ThunarVfsJob         *job,
-                                                                   GList                *path_list,
-                                                                   ThunarTreeView       *view);
-static gboolean       thunar_tree_view_filter_visible_func        (GtkTreeModel         *filter,
-                                                                   GtkTreeIter          *iter,
-                                                                   gpointer              user_data);
-static gboolean       thunar_tree_view_selection_func             (GtkTreeSelection     *selection,
-                                                                   GtkTreeModel         *model,
-                                                                   GtkTreePath          *path,
-                                                                   gboolean              path_currently_selected,
-                                                                   gpointer              user_data);
-static gboolean       thunar_tree_view_cursor_idle                (gpointer              user_data);
-static void           thunar_tree_view_cursor_idle_destroy        (gpointer              user_data);
-static gboolean       thunar_tree_view_drag_scroll_timer          (gpointer              user_data);
-static void           thunar_tree_view_drag_scroll_timer_destroy  (gpointer              user_data);
-static gboolean       thunar_tree_view_expand_timer               (gpointer              user_data);
-static void           thunar_tree_view_expand_timer_destroy       (gpointer              user_data);
+static void             thunar_tree_view_class_init                 (ThunarTreeViewClass  *klass);
+static void             thunar_tree_view_navigator_init             (ThunarNavigatorIface *iface);
+static void             thunar_tree_view_init                       (ThunarTreeView       *view);
+static void             thunar_tree_view_finalize                   (GObject              *object);
+static void             thunar_tree_view_get_property               (GObject              *object,
+                                                                     guint                 prop_id,
+                                                                     GValue               *value,
+                                                                     GParamSpec           *pspec);
+static void             thunar_tree_view_set_property               (GObject              *object,
+                                                                     guint                 prop_id,
+                                                                     const GValue         *value,
+                                                                     GParamSpec           *pspec);
+static ThunarFile      *thunar_tree_view_get_current_directory      (ThunarNavigator      *navigator);
+static void             thunar_tree_view_set_current_directory      (ThunarNavigator      *navigator,
+                                                                     ThunarFile           *current_directory);
+static void             thunar_tree_view_realize                    (GtkWidget            *widget);
+static void             thunar_tree_view_unrealize                  (GtkWidget            *widget);
+static gboolean         thunar_tree_view_button_press_event         (GtkWidget            *widget,
+                                                                     GdkEventButton       *event);
+static gboolean         thunar_tree_view_button_release_event       (GtkWidget            *widget,
+                                                                     GdkEventButton       *event);
+static void             thunar_tree_view_drag_data_received         (GtkWidget            *widget,
+                                                                     GdkDragContext       *context,
+                                                                     gint                  x,
+                                                                     gint                  y,
+                                                                     GtkSelectionData     *selection_data,
+                                                                     guint                 info,
+                                                                     guint                 time);
+static gboolean         thunar_tree_view_drag_drop                  (GtkWidget            *widget,
+                                                                     GdkDragContext       *context,
+                                                                     gint                  x,
+                                                                     gint                  y,
+                                                                     guint                 time);
+static gboolean         thunar_tree_view_drag_motion                (GtkWidget            *widget,
+                                                                     GdkDragContext       *context,
+                                                                     gint                  x,
+                                                                     gint                  y,
+                                                                     guint                 time);
+static void             thunar_tree_view_drag_leave                 (GtkWidget            *widget,
+                                                                     GdkDragContext       *context,
+                                                                     guint                 time);
+static gboolean         thunar_tree_view_popup_menu                 (GtkWidget            *widget);
+static void             thunar_tree_view_row_activated              (GtkTreeView          *tree_view,
+                                                                     GtkTreePath          *path,
+                                                                     GtkTreeViewColumn    *column);
+static gboolean         thunar_tree_view_test_expand_row            (GtkTreeView          *tree_view,
+                                                                     GtkTreeIter          *iter,
+                                                                     GtkTreePath          *path);
+static void             thunar_tree_view_context_menu               (ThunarTreeView       *view,
+                                                                     GdkEventButton       *event,
+                                                                     GtkTreeModel         *filter,
+                                                                     GtkTreeIter          *iter);
+static GdkDragAction    thunar_tree_view_get_dest_actions           (ThunarTreeView       *view,
+                                                                     GdkDragContext       *context,
+                                                                     gint                  x,
+                                                                     gint                  y,
+                                                                     guint                 time,
+                                                                     ThunarFile          **file_return);
+static gboolean         thunar_tree_view_find_closest_ancestor      (ThunarTreeView       *view,
+                                                                     GtkTreePath          *path,
+                                                                     GtkTreePath         **ancestor_return,
+                                                                     gboolean             *exact_return);
+static ThunarFile      *thunar_tree_view_get_selected_file          (ThunarTreeView       *view);
+static ThunarVfsVolume *thunar_tree_view_get_selected_volume        (ThunarTreeView       *view);
+static void             thunar_tree_view_action_copy                (ThunarTreeView       *view);
+static void             thunar_tree_view_action_create_folder       (ThunarTreeView       *view);
+static void             thunar_tree_view_action_cut                 (ThunarTreeView       *view);
+static void             thunar_tree_view_action_eject               (ThunarTreeView       *view);
+static gboolean         thunar_tree_view_action_mount               (ThunarTreeView       *view);
+static void             thunar_tree_view_action_open                (ThunarTreeView       *view);
+static void             thunar_tree_view_action_open_in_new_window  (ThunarTreeView       *view);
+static void             thunar_tree_view_action_paste_into_folder   (ThunarTreeView       *view);
+static void             thunar_tree_view_action_properties          (ThunarTreeView       *view);
+static void             thunar_tree_view_action_unmount             (ThunarTreeView       *view);
+static GClosure        *thunar_tree_view_new_files_closure          (ThunarTreeView       *view);
+static void             thunar_tree_view_new_files                  (ThunarVfsJob         *job,
+                                                                     GList                *path_list,
+                                                                     ThunarTreeView       *view);
+static gboolean         thunar_tree_view_filter_visible_func        (GtkTreeModel         *filter,
+                                                                     GtkTreeIter          *iter,
+                                                                     gpointer              user_data);
+static gboolean         thunar_tree_view_selection_func             (GtkTreeSelection     *selection,
+                                                                     GtkTreeModel         *model,
+                                                                     GtkTreePath          *path,
+                                                                     gboolean              path_currently_selected,
+                                                                     gpointer              user_data);
+static gboolean         thunar_tree_view_cursor_idle                (gpointer              user_data);
+static void             thunar_tree_view_cursor_idle_destroy        (gpointer              user_data);
+static gboolean         thunar_tree_view_drag_scroll_timer          (gpointer              user_data);
+static void             thunar_tree_view_drag_scroll_timer_destroy  (gpointer              user_data);
+static gboolean         thunar_tree_view_expand_timer               (gpointer              user_data);
+static void             thunar_tree_view_expand_timer_destroy       (gpointer              user_data);
 
 
 
@@ -270,6 +278,7 @@ thunar_tree_view_class_init (ThunarTreeViewClass *klass)
 
   gtktree_view_class = GTK_TREE_VIEW_CLASS (klass);
   gtktree_view_class->row_activated = thunar_tree_view_row_activated;
+  gtktree_view_class->test_expand_row = thunar_tree_view_test_expand_row;
 
   /* Override ThunarNavigator's properties */
   g_object_class_override_property (gobject_class, PROP_CURRENT_DIRECTORY, "current-directory");
@@ -348,10 +357,11 @@ thunar_tree_view_init (ThunarTreeView *view)
 #endif
 
   /* allocate the special icon renderer */
-  view->icon_renderer = thunar_icon_renderer_new ();
+  view->icon_renderer = thunar_shortcuts_icon_renderer_new ();
   gtk_tree_view_column_pack_start (column, view->icon_renderer, FALSE);
   gtk_tree_view_column_set_attributes (column, view->icon_renderer,
                                        "file", THUNAR_TREE_MODEL_COLUMN_FILE,
+                                       "volume", THUNAR_TREE_MODEL_COLUMN_VOLUME,
                                        NULL);
 
   /* sync the "emblems" property of the icon renderer with the "tree-icon-emblems" preference
@@ -862,28 +872,77 @@ thunar_tree_view_row_activated (GtkTreeView       *tree_view,
 
 
 
+static gboolean
+thunar_tree_view_test_expand_row (GtkTreeView *tree_view,
+                                  GtkTreeIter *iter,
+                                  GtkTreePath *path)
+{
+  ThunarVfsVolume *volume;
+  ThunarTreeView  *view = THUNAR_TREE_VIEW (tree_view);
+  GtkTreeModel    *filter;
+  GtkWidget       *window;
+  gboolean         expandable = TRUE;
+  GError          *error = NULL;
+
+  /* determine the volume for the iterator */
+  filter = gtk_tree_view_get_model (tree_view);
+  gtk_tree_model_get (filter, iter, THUNAR_TREE_MODEL_COLUMN_VOLUME, &volume, -1);
+
+  /* check if we have a volume */
+  if (G_UNLIKELY (volume != NULL))
+    {
+      /* check if we need to mount the volume first */
+      if (!thunar_vfs_volume_is_mounted (volume))
+        {
+          /* determine the toplevel window */
+          window = gtk_widget_get_toplevel (GTK_WIDGET (view));
+
+          /* try to mount the volume */
+          expandable = thunar_vfs_volume_mount (volume, window, &error);
+          if (G_UNLIKELY (!expandable))
+            {
+              /* display an error dialog to inform the user */
+              thunar_dialogs_show_error (window, error, _("Failed to mount \"%s\""), thunar_vfs_volume_get_name (volume));
+              g_error_free (error);
+            }
+        }
+
+      /* release the volume */
+      g_object_unref (G_OBJECT (volume));
+    }
+
+  /* cancel the cursor idle source if not expandable */
+  if (!expandable && view->cursor_idle_id >= 0)
+    g_source_remove (view->cursor_idle_id);
+
+  return !expandable;
+}
+
+
+
 static void
 thunar_tree_view_context_menu (ThunarTreeView *view,
                                GdkEventButton *event,
                                GtkTreeModel   *filter,
                                GtkTreeIter    *iter)
 {
-  ThunarFile *parent_file;
-  ThunarFile *file;
-  GtkWidget  *image;
-  GtkWidget  *menu;
-  GtkWidget  *item;
-  GMainLoop  *loop;
+  ThunarVfsVolume *volume;
+  ThunarFile      *parent_file;
+  ThunarFile      *file;
+  GtkWidget       *image;
+  GtkWidget       *menu;
+  GtkWidget       *item;
+  GMainLoop       *loop;
 
   /* verify that we're connected to the clipboard manager */
   if (G_UNLIKELY (view->clipboard == NULL))
     return;
 
-  /* determine the file for the given iter */
-  gtk_tree_model_get (filter, iter, THUNAR_TREE_MODEL_COLUMN_FILE, &file, -1);
-
-  /* determine the parent file (required to determine "Cut" sensitivity) */
-  parent_file = (file != NULL) ? thunar_file_get_parent (file, NULL) : NULL;
+  /* determine the file and volume for the given iter */
+  gtk_tree_model_get (filter, iter,
+                      THUNAR_TREE_MODEL_COLUMN_FILE, &file,
+                      THUNAR_TREE_MODEL_COLUMN_VOLUME, &volume,
+                      -1);
 
   /* prepare the internal loop */
   loop = g_main_loop_new (NULL, FALSE);
@@ -898,7 +957,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
   item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
   g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open), view);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_set_sensitive (item, (file != NULL));
+  gtk_widget_set_sensitive (item, (file != NULL || volume != NULL));
   gtk_widget_show (item);
 
   /* set the stock icon */
@@ -910,7 +969,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
   item = gtk_image_menu_item_new_with_mnemonic (_("Open in New Window"));
   g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_open_in_new_window), view);
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_set_sensitive (item, (file != NULL));
+  gtk_widget_set_sensitive (item, (file != NULL || volume != NULL));
   gtk_widget_show (item);
 
   /* append a separator item */
@@ -918,6 +977,41 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show (item);
 
+  if (G_UNLIKELY (volume != NULL))
+    {
+      /* append the "Mount Volume" menu action */
+      item = gtk_image_menu_item_new_with_mnemonic (_("_Mount Volume"));
+      gtk_widget_set_sensitive (item, !thunar_vfs_volume_is_mounted (volume));
+      g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_mount), view);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_show (item);
+
+      /* check if the volume is a disc */
+      if (thunar_vfs_volume_is_disc (volume))
+        {
+          /* append the "Eject Volume" menu action */
+          item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
+          g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_eject), view);
+          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_ejectable (volume));
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+          gtk_widget_show (item);
+        }
+      else
+        {
+          /* append the "Unmount Volume" menu item */
+          item = gtk_image_menu_item_new_with_mnemonic (_("_Unmount Volume"));
+          gtk_widget_set_sensitive (item, thunar_vfs_volume_is_mounted (volume));
+          g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_unmount), view);
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+          gtk_widget_show (item);
+        }
+
+      /* append a menu separator */
+      item = gtk_separator_menu_item_new ();
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_show (item);
+    }
+
   /* append the "Create Folder" menu action */
   item = gtk_image_menu_item_new_with_mnemonic (_("Create _Folder..."));
   g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view);
@@ -930,46 +1024,60 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
   gtk_widget_show (item);
 
-  /* append the "Cut" menu action */
-  item = gtk_image_menu_item_new_with_mnemonic (_("Cu_t"));
-  g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_cut), view);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_set_sensitive (item, (file != NULL && parent_file != NULL && thunar_file_is_writable (parent_file)));
-  gtk_widget_show (item);
-
-  /* set the stock icon */
-  image = gtk_image_new_from_stock (GTK_STOCK_CUT, GTK_ICON_SIZE_MENU);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-  gtk_widget_show (image);
-
-  /* append the "Copy" menu action */
-  item = gtk_image_menu_item_new_with_mnemonic (_("_Copy"));
-  g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_copy), view);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_set_sensitive (item, (file != NULL));
-  gtk_widget_show (item);
-
-  /* set the stock icon */
-  image = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-  gtk_widget_show (image);
-
-  /* append the "Paste Into Folder" menu action */
-  item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
-  g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_paste_into_folder), view);
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_set_sensitive (item, (file != NULL && thunar_clipboard_manager_get_can_paste (view->clipboard)));
-  gtk_widget_show (item);
-
-  /* set the stock icon */
-  image = gtk_image_new_from_stock (GTK_STOCK_PASTE, GTK_ICON_SIZE_MENU);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
-  gtk_widget_show (image);
+  if (G_LIKELY (file != NULL))
+    {
+      /* "Cut" and "Copy" don't make much sense for volumes */
+      if (G_LIKELY (volume == NULL))
+        {
+          /* determine the parent file (required to determine "Cut" sensitivity) */
+          parent_file = thunar_file_get_parent (file, NULL);
+
+          /* append the "Cut" menu action */
+          item = gtk_image_menu_item_new_with_mnemonic (_("Cu_t"));
+          g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_cut), view);
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+          gtk_widget_set_sensitive (item, (parent_file != NULL && thunar_file_is_writable (parent_file)));
+          gtk_widget_show (item);
+
+          /* set the stock icon */
+          image = gtk_image_new_from_stock (GTK_STOCK_CUT, GTK_ICON_SIZE_MENU);
+          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+          gtk_widget_show (image);
+
+          /* append the "Copy" menu action */
+          item = gtk_image_menu_item_new_with_mnemonic (_("_Copy"));
+          g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_copy), view);
+          gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+          gtk_widget_set_sensitive (item, (parent_file != NULL));
+          gtk_widget_show (item);
+
+          /* set the stock icon */
+          image = gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
+          gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+          gtk_widget_show (image);
+
+          /* cleanup */
+          if (G_LIKELY (parent_file != NULL))
+            g_object_unref (G_OBJECT (parent_file));
+        }
 
-  /* append a separator item */
-  item = gtk_separator_menu_item_new ();
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-  gtk_widget_show (item);
+      /* append the "Paste Into Folder" menu action */
+      item = gtk_image_menu_item_new_with_mnemonic (_("_Paste Into Folder"));
+      g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_paste_into_folder), view);
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_set_sensitive (item, (thunar_file_is_writable (file) && thunar_clipboard_manager_get_can_paste (view->clipboard)));
+      gtk_widget_show (item);
+
+      /* set the stock icon */
+      image = gtk_image_new_from_stock (GTK_STOCK_PASTE, GTK_ICON_SIZE_MENU);
+      gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+      gtk_widget_show (image);
+
+      /* append a separator item */
+      item = gtk_separator_menu_item_new ();
+      gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+      gtk_widget_show (item);
+    }
 
   /* append the "Properties" menu action */
   item = gtk_image_menu_item_new_with_mnemonic (_("P_roperties..."));
@@ -991,8 +1099,8 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
   gtk_grab_remove (menu);
 
   /* cleanup */
-  if (G_LIKELY (parent_file != NULL))
-    g_object_unref (G_OBJECT (parent_file));
+  if (G_UNLIKELY (volume != NULL))
+    g_object_unref (G_OBJECT (volume));
   if (G_LIKELY (file != NULL))
     g_object_unref (G_OBJECT (file));
   g_object_unref (G_OBJECT (menu));
@@ -1166,6 +1274,24 @@ thunar_tree_view_get_selected_file (ThunarTreeView *view)
 
 
 
+static ThunarVfsVolume*
+thunar_tree_view_get_selected_volume (ThunarTreeView *view)
+{
+  GtkTreeSelection *selection;
+  ThunarVfsVolume  *volume = NULL;
+  GtkTreeModel     *filter;
+  GtkTreeIter       iter;
+
+  /* determine file for the selected row */
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
+  if (gtk_tree_selection_get_selected (selection, &filter, &iter))
+    gtk_tree_model_get (filter, &iter, THUNAR_TREE_MODEL_COLUMN_VOLUME, &volume, -1);
+
+  return volume;
+}
+
+
+
 static void
 thunar_tree_view_action_copy (ThunarTreeView *view)
 {
@@ -1277,6 +1403,76 @@ thunar_tree_view_action_cut (ThunarTreeView *view)
 
 
 
+static void
+thunar_tree_view_action_eject (ThunarTreeView *view)
+{
+  ThunarVfsVolume *volume;
+  GtkWidget       *window;
+  GError          *error = NULL;
+
+  g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+
+  /* determine the selected volume */
+  volume = thunar_tree_view_get_selected_volume (view);
+  if (G_LIKELY (volume != NULL))
+    {
+      /* determine the toplevel window */
+      window = gtk_widget_get_toplevel (GTK_WIDGET (view));
+      
+      /* try to eject the volume */
+      if (!thunar_vfs_volume_eject (volume, window, &error))
+        {
+          /* display an error dialog to inform the user */
+          thunar_dialogs_show_error (window, error, _("Failed to eject \"%s\""), thunar_vfs_volume_get_name (volume));
+          g_error_free (error);
+        }
+
+      /* release the volume */
+      g_object_unref (G_OBJECT (volume));
+    }
+}
+
+
+
+static gboolean
+thunar_tree_view_action_mount (ThunarTreeView *view)
+{
+  ThunarVfsVolume *volume;
+  GtkWidget       *window;
+  gboolean         result = TRUE;
+  GError          *error = NULL;
+
+  g_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
+
+  /* determine the selected volume */
+  volume = thunar_tree_view_get_selected_volume (view);
+  if (G_UNLIKELY (volume != NULL))
+    {
+      /* check if the volume is not already mounted */
+      if (!thunar_vfs_volume_is_mounted (volume))
+        {
+          /* determine the toplevel window */
+          window = gtk_widget_get_toplevel (GTK_WIDGET (view));
+
+          /* try to mount the volume */
+          result = thunar_vfs_volume_mount (volume, window, &error);
+          if (G_UNLIKELY (!result))
+            {
+              /* display an error dialog to inform the user */
+              thunar_dialogs_show_error (window, error, _("Failed to mount \"%s\""), thunar_vfs_volume_get_name (volume));
+              g_error_free (error);
+            }
+        }
+
+      /* release the volume */
+      g_object_unref (G_OBJECT (volume));
+    }
+
+  return result;
+}
+
+
+
 static void
 thunar_tree_view_action_open (ThunarTreeView *view)
 {
@@ -1284,6 +1480,10 @@ thunar_tree_view_action_open (ThunarTreeView *view)
 
   g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
 
+  /* if its a volume, make sure its mounted */
+  if (!thunar_tree_view_action_mount (view))
+    return;
+
   /* determine the selected file */
   file = thunar_tree_view_get_selected_file (view);
   if (G_LIKELY (file != NULL))
@@ -1304,6 +1504,10 @@ thunar_tree_view_action_open_in_new_window (ThunarTreeView *view)
 
   g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
 
+  /* if its a volume, make sure its mounted */
+  if (!thunar_tree_view_action_mount (view))
+    return;
+
   /* determine the selected file */
   file = thunar_tree_view_get_selected_file (view);
   if (G_LIKELY (file != NULL))
@@ -1375,6 +1579,37 @@ thunar_tree_view_action_properties (ThunarTreeView *view)
 
 
 
+static void
+thunar_tree_view_action_unmount (ThunarTreeView *view)
+{
+  ThunarVfsVolume *volume;
+  GtkWidget       *window;
+  GError          *error = NULL;
+
+  g_return_if_fail (THUNAR_IS_TREE_VIEW (view));
+
+  /* determine the selected volume */
+  volume = thunar_tree_view_get_selected_volume (view);
+  if (G_LIKELY (volume != NULL))
+    {
+      /* determine the toplevel window */
+      window = gtk_widget_get_toplevel (GTK_WIDGET (view));
+
+      /* try to unmount the volume */
+      if (!thunar_vfs_volume_unmount (volume, window, &error))
+        {
+          /* display an error dialog */
+          thunar_dialogs_show_error (window, error, _("Failed to unmount \"%s\""), thunar_vfs_volume_get_name (volume));
+          g_error_free (error);
+        }
+
+      /* release the volume */
+      g_object_unref (G_OBJECT (volume));
+    }
+}
+
+
+
 static GClosure*
 thunar_tree_view_new_files_closure (ThunarTreeView *view)
 {
@@ -1455,9 +1690,10 @@ thunar_tree_view_selection_func (GtkTreeSelection *selection,
                                  gboolean          path_currently_selected,
                                  gpointer          user_data)
 {
-  GtkTreeIter iter;
-  ThunarFile *file;
-  gboolean    result = FALSE;
+  ThunarVfsVolume *volume;
+  GtkTreeIter      iter;
+  ThunarFile      *file;
+  gboolean         result = FALSE;
 
   /* every row may be unselected at any time */
   if (G_UNLIKELY (path_currently_selected))
@@ -1470,12 +1706,25 @@ thunar_tree_view_selection_func (GtkTreeSelection *selection,
       gtk_tree_model_get (filter, &iter, THUNAR_TREE_MODEL_COLUMN_FILE, &file, -1);
       if (G_LIKELY (file != NULL))
         {
-          /* only rows with files can be selected */
+          /* rows with files can be selected */
           result = TRUE;
 
           /* release file */
           g_object_unref (G_OBJECT (file));
         }
+      else
+        {
+          /* but maybe the row has a volume */
+          gtk_tree_model_get (filter, &iter, THUNAR_TREE_MODEL_COLUMN_VOLUME, &volume, -1);
+          if (G_LIKELY (volume != NULL))
+            {
+              /* rows with volumes can also be selected */
+              result = TRUE;
+
+              /* release volume */
+              g_object_unref (G_OBJECT (volume));
+            }
+        }
     }
 
   return result;