diff --git a/ChangeLog b/ChangeLog
index aa0ddf5caf520c2b377bd761a60a1c6c1dc2e1df..10818b7ba9be80e8f1b694e84e6254c53ee4125e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2005-11-15	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-standard-view.c: Use "b" as mnemonic for the "Select by
+	  Pattern" action to avoid clash with "Preferences".
+	* thunar/thunar-preferences.c: Add "default-folders-first" property,
+	  which determines whether folders should be sorted before other files.
+	  Add "default-view", which dictates the default view pane used for new
+	  windows, or "void" to use the view remembered in "last-view".
+	* thunar/thunar-standard-view.{c,h}: Connect the list models
+	  "folders-first" property to the "default-folders-first" preference.
+	* thunar/thunar-window.c(thunar_window_init): Check "default-view" first
+	  and if it does not contain a valid view class name, check "last-view".
+	* thunar/thunar-details-view.c(thunar_details_view_get_accessible),
+	  thunar/thunar-icon-view.c(thunar_icon_view_get_accessible): Set ATK
+	  role for our folder views to ATK_ROLE_DIRECTORY_PANE.
+	* thunar/Makefile.am, thunar/thunar-preferences-dialog.{c,h},
+	  thunar/thunar-window-ui.xml, thunar/thunar-window.c: Import class
+	  ThunarPreferencesDialog, which allows the user to customize the global
+	  preferences for Thunar. Add a "Preferences" menu item to the "Edit"
+	  menu of ThunarWindow's.
+	* thunar/thunar-preferences.c: Add "default-text-beside-icons" property,
+	  which tells whether the icon view should display the file names beside
+	  the file icons, rather than below the file icons.
+	* thunar/thunar-icon-view.c: Add a property "text-beside-icons", which
+	  tells whether the icon view will place the icon captions beside the
+	  icons rather than below. Synchronize the property with the global
+	  option "default-text-beside-icons".
+	* po/*.po: Merge new strings.
+
 2005-11-14	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-xfer.c: Return G_FILE_ERROR_INTR when the copy
diff --git a/po/de.po b/po/de.po
index 8efa0edb82a84b7000551178ef7380c834014e5e..d10016600e8d09cf4c6174fca6ecaa02d36bfe32 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.1.2svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 15:38+0100\n"
+"POT-Creation-Date: 2005-11-15 19:36+0100\n"
 "PO-Revision-Date: 2005-10-06 22:03+0900\n"
 "Last-Translator: Benedikt Meurer <benny@xfce.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:685
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:693
 #, c-format
 msgid ""
 "%s.\n"
@@ -55,7 +55,7 @@ msgstr ""
 #. ask the user whether to skip this file (used for cancellation only)
 #. ask the user whether to skip
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:705
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:713
 #, c-format
 msgid ""
 "%s.\n"
@@ -110,12 +110,12 @@ msgid "Unable to remove directory `%s': %s"
 msgstr ""
 
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:593
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:639
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:646
 #, c-format
 msgid "Unable to remove `%s': %s"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:831
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:839
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -199,53 +199,58 @@ msgstr ""
 msgid "Failed to open `%s' for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:345
+#: ../thunar-vfs/thunar-vfs-xfer.c:349
 #, c-format
 msgid "Failed to read data from `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:357
+#: ../thunar-vfs/thunar-vfs-xfer.c:365
 #, c-format
 msgid "Failed to write data to `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:371
+#: ../thunar-vfs/thunar-vfs-xfer.c:384
 #, c-format
 msgid "Failed to remove `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:415
+#. tell the caller that the job was cancelled
+#: ../thunar-vfs/thunar-vfs-xfer.c:389
+msgid "Operation cancelled"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-xfer.c:429
 #, c-format
 msgid "Failed to read link target from `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:423
+#: ../thunar-vfs/thunar-vfs-xfer.c:437
 #, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:431
+#: ../thunar-vfs/thunar-vfs-xfer.c:445
 #, c-format
 msgid "Failed to change mode of `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:465 ../thunar-vfs/thunar-vfs-xfer.c:525
+#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:494
+#: ../thunar-vfs/thunar-vfs-xfer.c:508
 #, c-format
 msgid "Failed to copy special file `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:536
+#: ../thunar-vfs/thunar-vfs-xfer.c:550
 #, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr ""
 
 #. setup application name
-#: ../thunar/main.c:47 ../thunar/thunar-window.c:347
+#: ../thunar/main.c:47 ../thunar/thunar-window.c:351
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -365,7 +370,7 @@ msgid "Shell Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-model.c:116 ../thunar/thunar-folder.c:134
-#: ../thunar/thunar-standard-view.c:357 ../thunar/thunar-statusbar.c:204
+#: ../thunar/thunar-standard-view.c:371 ../thunar/thunar-statusbar.c:204
 #: ../thunar/thunar-statusbar.c:746 ../thunar/thunar-view.c:82
 msgid "Loading"
 msgstr ""
@@ -440,13 +445,13 @@ msgid "Date modified"
 msgstr "Letzte Ã„nderung"
 
 #: ../thunar/thunar-details-view.c:221
-msgid "Details view"
-msgstr "Detailansicht"
-
-#: ../thunar/thunar-details-view.c:222
 msgid "Detailed directory listing"
 msgstr "Detailierte Verzeichnisansicht"
 
+#: ../thunar/thunar-details-view.c:222
+msgid "Details view"
+msgstr "Detailansicht"
+
 #: ../thunar/thunar-dialogs.c:74 ../thunar/thunar-dialogs.c:78
 #, c-format
 msgid "%s."
@@ -548,66 +553,70 @@ msgstr ""
 msgid "The icon size in pixels"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:111
+#: ../thunar/thunar-icon-view.c:124
 msgid "Arran_ge Items"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Sort By _Name"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Sort By _Size"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Type"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By Modification _Date"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "_Ascending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "Sort items in ascending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "_Descending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "Sort items in descending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:226
-msgid "Icon view"
+#: ../thunar/thunar-icon-view.c:181 ../thunar/thunar-icon-view.c:182
+msgid "Text beside icons"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:227
+#: ../thunar/thunar-icon-view.c:291
 msgid "Icon based directory listing"
 msgstr ""
 
+#: ../thunar/thunar-icon-view.c:292
+msgid "Icon view"
+msgstr ""
+
 #: ../thunar/thunar-launcher.c:134 ../thunar/thunar-launcher.c:135
 msgid "Action group"
 msgstr ""
@@ -698,12 +707,12 @@ msgid "Number of visible files"
 msgstr ""
 
 #: ../thunar/thunar-list-model.c:297 ../thunar/thunar-view.c:111
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:222
 msgid "Show hidden"
 msgstr ""
 
 #: ../thunar/thunar-list-model.c:298 ../thunar/thunar-view.c:112
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:223
 msgid "Whether to display hidden files"
 msgstr ""
 
@@ -763,7 +772,7 @@ msgstr ""
 msgid "_Location:"
 msgstr ""
 
-#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:205
+#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:209
 msgid "Current directory"
 msgstr ""
 
@@ -793,12 +802,12 @@ msgstr ""
 msgid "The icon size for the path entry"
 msgstr ""
 
-#: ../thunar/thunar-preferences.c:178
+#: ../thunar/thunar-preferences.c:223
 #, c-format
 msgid "Failed to create the Thunar configuration directory in %s"
 msgstr ""
 
-#: ../thunar/thunar-preferences.c:186
+#: ../thunar/thunar-preferences.c:231
 #, c-format
 msgid "Failed to open preferences database in %s: %s"
 msgstr ""
@@ -912,147 +921,147 @@ msgstr "%s (%u Byte)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:690
-#: ../thunar/thunar-standard-view.c:2135
+#: ../thunar/thunar-standard-view.c:2192
 #, c-format
 msgid "Failed to rename `%s'"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:245
+#: ../thunar/thunar-standard-view.c:256
 msgid "File Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:246
+#: ../thunar/thunar-standard-view.c:257
 msgid "Folder Context Menu"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 msgid "_Properties"
 msgstr "_Eigenschaften"
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 msgid "View the properties of the selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "_Copy Files"
 msgstr "_Datei"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 msgid "Copy the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "_Datei"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 msgid "Cut the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:251
+#: ../thunar/thunar-standard-view.c:262
 msgid "_Paste Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 msgid "_Delete Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 msgid "Delete the selected files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 msgid "Paste Files into Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 msgid "Paste files into the selected folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 msgid "Select _all Files"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 msgid "Select all files in this window"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:255
-msgid "Select by _Pattern"
+#: ../thunar/thunar-standard-view.c:266
+msgid "Select _by Pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 msgid "Select all files that match a certain pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:256 ../thunar/thunar-standard-view.c:2414
+#: ../thunar/thunar-standard-view.c:267 ../thunar/thunar-standard-view.c:2471
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:256
+#: ../thunar/thunar-standard-view.c:267
 msgid "Duplicate each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:257 ../thunar/thunar-standard-view.c:2420
+#: ../thunar/thunar-standard-view.c:268 ../thunar/thunar-standard-view.c:2477
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:257
+#: ../thunar/thunar-standard-view.c:268
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 msgid "_Rename"
 msgstr "_Umbennen"
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 msgid "Rename the selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:358 ../thunar/thunar-view.c:83
+#: ../thunar/thunar-standard-view.c:372 ../thunar/thunar-view.c:83
 msgid "Whether the view is currently being loaded"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:853
+#: ../thunar/thunar-standard-view.c:896
 msgid "Loading folder contents..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1305
+#: ../thunar/thunar-standard-view.c:1362
 msgid "New Folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1308
+#: ../thunar/thunar-standard-view.c:1365
 msgid "New Folder..."
 msgstr ""
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:1322
+#: ../thunar/thunar-standard-view.c:1379
 #, c-format
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1468
+#: ../thunar/thunar-standard-view.c:1525
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1474
+#: ../thunar/thunar-standard-view.c:1531
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1063,38 +1072,38 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1489
+#: ../thunar/thunar-standard-view.c:1546
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1561
+#: ../thunar/thunar-standard-view.c:1618
 msgid "Select by Pattern"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1576
+#: ../thunar/thunar-standard-view.c:1633
 msgid "Pattern:"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:2087
+#: ../thunar/thunar-standard-view.c:2144
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Detailierte Verzeichnisansicht"
 
-#: ../thunar/thunar-standard-view.c:2387
+#: ../thunar/thunar-standard-view.c:2444
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Datei"
 msgstr[1] "_Datei"
 
-#: ../thunar/thunar-standard-view.c:2393
+#: ../thunar/thunar-standard-view.c:2450
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "_Datei"
 msgstr[1] "_Datei"
 
-#: ../thunar/thunar-standard-view.c:2402
+#: ../thunar/thunar-standard-view.c:2459
 msgid "_Delete File"
 msgid_plural "_Delete Files"
 msgstr[0] ""
@@ -1144,7 +1153,7 @@ msgstr ""
 msgid "Text to be displayed in the statusbar associated with this view"
 msgstr ""
 
-#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:233
+#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:237
 msgid "UI manager"
 msgstr ""
 
@@ -1152,151 +1161,160 @@ msgstr ""
 msgid "UI manager of the surrounding window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:149
+#: ../thunar/thunar-window.c:152
 msgid "_File"
 msgstr "_Datei"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open New _Window"
 msgstr "_Neues Fenster Ã¶ffnen"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close _All Windows"
 msgstr ""
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close all Thunar windows"
 msgstr "Alle Thunar Fenster schlieÃŸen"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "_Close"
 msgstr "_SchlieÃŸen"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "Close this window"
 msgstr "Dieses Fenster schlieÃŸen"
 
-#: ../thunar/thunar-window.c:153
+#: ../thunar/thunar-window.c:156
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ../thunar/thunar-window.c:154
+#: ../thunar/thunar-window.c:157
+#, fuzzy
+msgid "_Preferences"
+msgstr "_Eigenschaften"
+
+#: ../thunar/thunar-window.c:157
+msgid "Edit Thunar Preferences"
+msgstr ""
+
+#: ../thunar/thunar-window.c:158
 msgid "_View"
 msgstr "_Anzeige"
 
-#: ../thunar/thunar-window.c:155
+#: ../thunar/thunar-window.c:159
 msgid "_Location Bar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:156
+#: ../thunar/thunar-window.c:160
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:157
+#: ../thunar/thunar-window.c:161
 msgid "_Go"
 msgstr "_Gehe"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open _Parent"
 msgstr ""
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open the parent folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 msgid "_Home"
 msgstr ""
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 msgid "Open the home folder"
 msgstr ""
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Open _Location..."
 msgstr ""
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Specify a location to open"
 msgstr ""
 
-#: ../thunar/thunar-window.c:161
+#: ../thunar/thunar-window.c:165
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "_About"
 msgstr "Ãœ_ber"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "Display information about Thunar"
 msgstr ""
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 msgid "Show _Hidden Files"
 msgstr ""
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:206
+#: ../thunar/thunar-window.c:210
 msgid "The directory currently displayed within this window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:238
 msgid "The UI manager used within this window"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:289
+#: ../thunar/thunar-window.c:293
 msgid "_Favourites"
 msgstr "Favouriten"
 
-#: ../thunar/thunar-window.c:295 ../thunar/thunar-window.c:316
+#: ../thunar/thunar-window.c:299 ../thunar/thunar-window.c:320
 msgid "_Hidden"
 msgstr ""
 
 #.
 #. * add the location bar options
 #.
-#: ../thunar/thunar-window.c:304
+#: ../thunar/thunar-window.c:308
 msgid "_Button Style"
 msgstr ""
 
-#: ../thunar/thunar-window.c:310
+#: ../thunar/thunar-window.c:314
 msgid "_Traditional Style"
 msgstr ""
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:325
+#: ../thunar/thunar-window.c:329
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:331
+#: ../thunar/thunar-window.c:335
 msgid "View as _Detailed List"
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:738
+#: ../thunar/thunar-window.c:766
 msgid "Failed to open home directory"
 msgstr ""
 
-#: ../thunar/thunar-window.c:815
+#: ../thunar/thunar-window.c:843
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:820
+#: ../thunar/thunar-window.c:848
 msgid "translator-credits"
 msgstr ""
 
diff --git a/po/el.po b/po/el.po
index db2b1094a37ad1a6365957f64cb4b08d9c678132..8b7d8464f69216dda069c7cf46626e2730471d0f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.1.2svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 15:38+0100\n"
+"POT-Creation-Date: 2005-11-15 19:36+0100\n"
 "PO-Revision-Date: 2005-10-06 22:03+0900\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -43,7 +43,7 @@ msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:685
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:693
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -62,7 +62,7 @@ msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
 #. ask the user whether to skip this file (used for cancellation only)
 #. ask the user whether to skip
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:705
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:713
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -120,12 +120,12 @@ msgid "Unable to remove directory `%s': %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï„Î¿Ï… ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… %s."
 
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:593
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:639
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:646
 #, fuzzy, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Î‘Î´ÏÎ½Î±Ï„Î· Î· Î±Ï†Î±Î¯ÏÎµÏƒÎ· Ï„Î¿Ï… %s."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:831
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:839
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -209,53 +209,58 @@ msgstr ""
 msgid "Failed to open `%s' for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:345
+#: ../thunar-vfs/thunar-vfs-xfer.c:349
 #, fuzzy, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:357
+#: ../thunar-vfs/thunar-vfs-xfer.c:365
 #, fuzzy, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:371
+#: ../thunar-vfs/thunar-vfs-xfer.c:384
 #, fuzzy, c-format
 msgid "Failed to remove `%s'"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:415
+#. tell the caller that the job was cancelled
+#: ../thunar-vfs/thunar-vfs-xfer.c:389
+msgid "Operation cancelled"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-xfer.c:429
 #, fuzzy, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î±Î½Î¬Î³Î½Ï‰ÏƒÎ·Ï‚ ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:423
+#: ../thunar-vfs/thunar-vfs-xfer.c:437
 #, fuzzy, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:431
+#: ../thunar-vfs/thunar-vfs-xfer.c:445
 #, fuzzy, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:465 ../thunar-vfs/thunar-vfs-xfer.c:525
+#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:494
+#: ../thunar-vfs/thunar-vfs-xfer.c:508
 #, fuzzy, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Î½Ï„Î¹Î³ÏÎ±Ï†Î®Ï‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï… %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:536
+#: ../thunar-vfs/thunar-vfs-xfer.c:550
 #, fuzzy, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Î”ÎµÎ½ ÎµÎ¯Î½Î±Î¹ Î´Ï…Î½Î±Ï„Î® Î· Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î± ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï %s."
 
 #. setup application name
-#: ../thunar/main.c:47 ../thunar/thunar-window.c:347
+#: ../thunar/main.c:47 ../thunar/thunar-window.c:351
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -378,7 +383,7 @@ msgid "Shell Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-model.c:116 ../thunar/thunar-folder.c:134
-#: ../thunar/thunar-standard-view.c:357 ../thunar/thunar-statusbar.c:204
+#: ../thunar/thunar-standard-view.c:371 ../thunar/thunar-statusbar.c:204
 #: ../thunar/thunar-statusbar.c:746 ../thunar/thunar-view.c:82
 msgid "Loading"
 msgstr "Î¦ÏŒÏÏ„Ï‰ÏƒÎ·"
@@ -455,13 +460,13 @@ msgid "Date modified"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚"
 
 #: ../thunar/thunar-details-view.c:221
-msgid "Details view"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏ€Ï„Î¿Î¼ÎµÏÎ¹ÏŽÎ½"
-
-#: ../thunar/thunar-details-view.c:222
 msgid "Detailed directory listing"
 msgstr "Î›ÎµÏ€Ï„Î¿Î¼ÎµÏÎ®Ï‚ Î±Ï€ÎµÎ¹ÎºÏŒÎ½Î¹ÏƒÎ· ÎºÎ±Ï„Î±Î»ÏŒÎ³Ï‰Î½"
 
+#: ../thunar/thunar-details-view.c:222
+msgid "Details view"
+msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î»ÎµÏ€Ï„Î¿Î¼ÎµÏÎ¹ÏŽÎ½"
+
 #: ../thunar/thunar-dialogs.c:74 ../thunar/thunar-dialogs.c:78
 #, c-format
 msgid "%s."
@@ -566,66 +571,70 @@ msgstr "ÎœÎÎ³ÎµÎ¸Î¿Ï‚ ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯Î¿Ï…"
 msgid "The icon size in pixels"
 msgstr "Î¤Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯Î¿Ï… ÏƒÎµ pixels"
 
-#: ../thunar/thunar-icon-view.c:111
+#: ../thunar/thunar-icon-view.c:124
 msgid "Arran_ge Items"
 msgstr "Î£Ï„Î¿Î¯_Ï‡Î¹ÏƒÎ· Î‘Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½"
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Sort By _Name"
 msgstr "Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· ÎºÎ±Ï„Î¬ ÎŒ_Î½Î¿Î¼Î±"
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Sort By _Size"
 msgstr "Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· ÎºÎ±Ï„Î¬ _ÎœÎÎ³ÎµÎ¸Î¿Ï‚"
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Type"
 msgstr "Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· Î»Î¯ÏƒÏ„Î±Ï‚ ÎºÎ±Ï„Î¬ _Î¤ÏÏ€Î¿"
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By Modification _Date"
 msgstr "Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· ÎºÎ±Ï„Î¬ Î§ÏÎ¿Î½Î¿Î»Î¿Î³Î¯Î± _Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚"
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "_Ascending"
 msgstr "_Î‘ÏÎ¾Î¿Ï…ÏƒÎ±"
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "Sort items in ascending order"
 msgstr "Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½ Î¼Îµ Î±ÏÎ¾Î¿Ï…ÏƒÎ± ÏƒÎµÎ¹ÏÎ¬"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "_Descending"
 msgstr "_Î¦Î¸Î¯Î½Î¿Ï…ÏƒÎ±"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "Sort items in descending order"
 msgstr "Î¤Î±Î¾Î¹Î½ÏŒÎ¼Î·ÏƒÎ· ÎºÎ±ÏÏ„ÎµÎ»ÏŽÎ½ Î¼Îµ Ï†Î¸Î¯Î½Î¿Ï…ÏƒÎ± ÏƒÎµÎ¹ÏÎ¬"
 
-#: ../thunar/thunar-icon-view.c:226
-msgid "Icon view"
-msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î•Î¹ÎºÎ¿Î½Î¹Î´Î¯Ï‰Î½"
+#: ../thunar/thunar-icon-view.c:181 ../thunar/thunar-icon-view.c:182
+msgid "Text beside icons"
+msgstr ""
 
-#: ../thunar/thunar-icon-view.c:227
+#: ../thunar/thunar-icon-view.c:291
 msgid "Icon based directory listing"
 msgstr ""
 
+#: ../thunar/thunar-icon-view.c:292
+msgid "Icon view"
+msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î•Î¹ÎºÎ¿Î½Î¹Î´Î¯Ï‰Î½"
+
 #: ../thunar/thunar-launcher.c:134 ../thunar/thunar-launcher.c:135
 msgid "Action group"
 msgstr "ÎŸÎ¼Î¬Î´Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±Ï‚"
@@ -718,12 +727,12 @@ msgid "Number of visible files"
 msgstr "Î‘ÏÎ¹Î¸Î¼ÏŒÏ‚ Î¿ÏÎ±Ï„ÏŽÎ½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½"
 
 #: ../thunar/thunar-list-model.c:297 ../thunar/thunar-view.c:111
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:222
 msgid "Show hidden"
 msgstr "Î ÏÎ¿Î²Î¿Î»Î® ÎºÏÏ…Ï†ÏŽÎ½"
 
 #: ../thunar/thunar-list-model.c:298 ../thunar/thunar-view.c:112
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:223
 msgid "Whether to display hidden files"
 msgstr "Î‘Î½ Î¸Î± Ï€ÏÎ¿Î²Î¬Î»Î»Î¿Î½Ï„Î±Î¹ Ï„Î± ÎºÏÏ…Ï†Î¬ Î±ÏÏ‡ÎµÎ¯Î±"
 
@@ -783,7 +792,7 @@ msgstr "Î†Î½Î¿Î¹Î³Î¼Î± Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î±Ï‚"
 msgid "_Location:"
 msgstr "_Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î±:"
 
-#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:205
+#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:209
 msgid "Current directory"
 msgstr "Î¤ÏÎÏ‡Î¿Î½ ÎºÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚"
 
@@ -814,12 +823,12 @@ msgstr "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï€Î¿Ï… ÎµÎ¼Ï†Î±Î½Î¯Î¶ÎµÏ„Î±Î¹ Ï„ÏŽÏÎ±"
 msgid "The icon size for the path entry"
 msgstr "ÎœÎÎ³ÎµÎ¸Î¿Ï‚ ÎµÎ¹ÎºÎ¿Î½Î¹Î´Î¯Î¿Ï… Î³Î¹Î± Ï„Î· Î´Î¹Î±Î´ÏÎ¿Î¼Î®"
 
-#: ../thunar/thunar-preferences.c:178
+#: ../thunar/thunar-preferences.c:223
 #, fuzzy, c-format
 msgid "Failed to create the Thunar configuration directory in %s"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±Ï‚ Ï„Î¿Ï… ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… %s."
 
-#: ../thunar/thunar-preferences.c:186
+#: ../thunar/thunar-preferences.c:231
 #, fuzzy, c-format
 msgid "Failed to open preferences database in %s: %s"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
@@ -934,155 +943,155 @@ msgstr "%s (%u Bytes)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:690
-#: ../thunar/thunar-standard-view.c:2135
+#: ../thunar/thunar-standard-view.c:2192
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Ï„Î¿Ï… %s."
 
-#: ../thunar/thunar-standard-view.c:245
+#: ../thunar/thunar-standard-view.c:256
 #, fuzzy
 msgid "File Context Menu"
 msgstr "X-Chat: ÎœÎµÎ½Î¿Ï Î§ÏÎ®ÏƒÏ„Î·"
 
-#: ../thunar/thunar-standard-view.c:246
+#: ../thunar/thunar-standard-view.c:257
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "X-Chat: ÎœÎµÎ½Î¿Ï Î§ÏÎ®ÏƒÏ„Î·"
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 msgid "_Properties"
 msgstr "_Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚"
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Î ÏÎ¿Î²Î¿Î»Î® Ï„Ï‰Î½ Î¹Î´Î¹Î¿Ï„Î®Ï„Ï‰Î½ Ï„Î¿Ï… ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿Ï… Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï…"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "_Copy Files"
 msgstr "_Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î® Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Ï„Ï‰Î½ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Ï‰Î½ Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Î‘Ï€Î¿ÎºÎ¿Ï€Î® _Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Ï„Ï‰Î½ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Ï‰Î½ Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:251
+#: ../thunar/thunar-standard-view.c:262
 #, fuzzy
 msgid "_Paste Files"
 msgstr "_Î•Ï€Î¹ÎºÏŒÎ»Î»Î·ÏƒÎ· Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Î•Ï€Î¹Î»ÎµÎ³Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î±"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Ï„Ï‰Î½ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Ï‰Î½ Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "_Î•Ï€Î¹ÎºÏŒÎ»Î»Î·ÏƒÎ· Î‘ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÏ„Î¿ Ï†Î¬ÎºÎµÎ»Î¿"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 msgid "Paste files into the selected folder"
 msgstr "Î•Ï€Î¹ÎºÏŒÎ»Î»Î·ÏƒÎ· Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÏ„Î¿Î½ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿ Ï†Î¬ÎºÎµÎ»Î¿"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÏŒ_Î»Ï‰Î½ Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 msgid "Select all files in this window"
 msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ Ï€Î±ÏÎ¬Î¸Ï…ÏÎ¿"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 #, fuzzy
-msgid "Select by _Pattern"
-msgstr "Î•Ï€Î¹Î»Î¿Î³Î® Î²Î¬ÏƒÎµÎ¹ _Î¼Î¿Ï„Î¯Î²Î¿Ï…"
+msgid "Select _by Pattern"
+msgstr "Î•Ï€Î¹Î»Î¿Î³Î® Î²Î¬ÏƒÎµÎ¹ Î¼Î¿Ï„Î¯Î²Î¿Ï…"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 msgid "Select all files that match a certain pattern"
 msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Ï€Î¿Ï… Ï„Î±Î¹ÏÎ¹Î¬Î¶Î¿Ï…Î½ ÏƒÎµ ÎÎ½Î± Î¼Î¿Ï„Î¯Î²Î¿"
 
-#: ../thunar/thunar-standard-view.c:256 ../thunar/thunar-standard-view.c:2414
+#: ../thunar/thunar-standard-view.c:267 ../thunar/thunar-standard-view.c:2471
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:256
+#: ../thunar/thunar-standard-view.c:267
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Î•ÎºÏ„ÎÎ»ÎµÏƒÎ· Ï„Ï‰Î½ ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Ï‰Î½ Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:257 ../thunar/thunar-standard-view.c:2420
+#: ../thunar/thunar-standard-view.c:268 ../thunar/thunar-standard-view.c:2477
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:257
+#: ../thunar/thunar-standard-view.c:268
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 msgid "_Rename"
 msgstr "_ÎœÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±"
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "ÎœÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î± ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î¿Ï… Î±Î½Ï„Î¹ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï…"
 
-#: ../thunar/thunar-standard-view.c:358 ../thunar/thunar-view.c:83
+#: ../thunar/thunar-standard-view.c:372 ../thunar/thunar-view.c:83
 msgid "Whether the view is currently being loaded"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:853
+#: ../thunar/thunar-standard-view.c:896
 msgid "Loading folder contents..."
 msgstr "Î¦ÏŒÏÏ„Ï‰Î¼Î± Ï€ÎµÏÎ¹ÎµÏ‡Î¿Î¼ÎÎ½Ï‰Î½ Ï†Î±ÎºÎÎ»Î¿Ï…..."
 
-#: ../thunar/thunar-standard-view.c:1305
+#: ../thunar/thunar-standard-view.c:1362
 #, fuzzy
 msgid "New Folder"
 msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚"
 
-#: ../thunar/thunar-standard-view.c:1308
+#: ../thunar/thunar-standard-view.c:1365
 #, fuzzy
 msgid "New Folder..."
 msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:1322
+#: ../thunar/thunar-standard-view.c:1379
 #, c-format
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1468
+#: ../thunar/thunar-standard-view.c:1525
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
@@ -1090,7 +1099,7 @@ msgid ""
 msgstr ""
 "Î•Î¯ÏƒÏ„Îµ Î²ÎÎ²Î±Î¹Î¿Ï‚/Î· ÏŒÏ„Î¹ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ ÏŒÎ»Î± Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± Î±Ï€ÏŒ Ï„Î± Î±Ï€Î¿ÏÏÎ¯Î¼Î¼Î±Ï„Î±;"
 
-#: ../thunar/thunar-standard-view.c:1474
+#: ../thunar/thunar-standard-view.c:1531
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1103,39 +1112,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Î•Î¯ÏƒÏ„Îµ Î²ÎÎ²Î±Î¹Î¿Ï‚/Î· ÏŒÏ„Î¹ Î¸ÎÎ»ÎµÏ„Îµ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÏ„Îµ ÏŒÎ»Î± Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± Î±Ï€ÏŒ Ï„Î± Î±Ï€Î¿ÏÏÎ¯Î¼Î¼Î±Ï„Î±;"
 
-#: ../thunar/thunar-standard-view.c:1489
+#: ../thunar/thunar-standard-view.c:1546
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1561
+#: ../thunar/thunar-standard-view.c:1618
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "Î•Ï€Î¹Î»Î¿Î³Î® Î²Î¬ÏƒÎµÎ¹ Î¼Î¿Ï„Î¯Î²Î¿Ï…"
 
-#: ../thunar/thunar-standard-view.c:1576
+#: ../thunar/thunar-standard-view.c:1633
 msgid "Pattern:"
 msgstr "ÎœÎ¿Ï„Î¯Î²Î¿:"
 
-#: ../thunar/thunar-standard-view.c:2087
+#: ../thunar/thunar-standard-view.c:2144
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±Ï„Î¿Ï‚ ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… %s."
 
-#: ../thunar/thunar-standard-view.c:2387
+#: ../thunar/thunar-standard-view.c:2444
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î® Î‘ÏÏ‡ÎµÎ¯Î¿Ï…"
 msgstr[1] "_Î‘Î½Ï„Î¹Î³ÏÎ±Ï†Î® Î‘ÏÏ‡ÎµÎ¯Î¿Ï…"
 
-#: ../thunar/thunar-standard-view.c:2393
+#: ../thunar/thunar-standard-view.c:2450
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Î‘Ï€Î¿ÎºÎ¿Ï€Î® _Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
 msgstr[1] "Î‘Ï€Î¿ÎºÎ¿Ï€Î® _Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: ../thunar/thunar-standard-view.c:2402
+#: ../thunar/thunar-standard-view.c:2459
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1187,7 +1196,7 @@ msgstr "Î¤Î¿ Ï€Î»Î¬Ï„Î¿Ï‚ Î±Î½Î±Î´Î¯Ï€Î»Ï‰ÏƒÎ·Ï‚"
 msgid "Text to be displayed in the statusbar associated with this view"
 msgstr ""
 
-#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:233
+#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:237
 msgid "UI manager"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ UI"
 
@@ -1196,156 +1205,165 @@ msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ UI"
 msgid "UI manager of the surrounding window"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÏƒÏ„Î¿ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® Ï€Î±ÏÎ±Î¸ÏÏÏ‰Î½: "
 
-#: ../thunar/thunar-window.c:149
+#: ../thunar/thunar-window.c:152
 msgid "_File"
 msgstr "_Î‘ÏÏ‡ÎµÎ¯Î¿"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open New _Window"
 msgstr "Î†Î½Î¿Î¹Î³Î¼Î± Î½ÎÎ¿Ï… _Ï€Î±ÏÎ±Î¸ÏÏÎ¿Ï…"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 "'Î‘Î½Î¿Î¹Î³Î¼Î± ÎµÎ½ÏŒÏ‚ Î¬Î»Î»Î¿Ï… Ï€Î±ÏÎ¬Î¸Ï…ÏÎ¿Ï… Ï„Î¿Ï… Thunar Î³Î¹Î± Ï„Î·Î½ Ï€ÏÎ¿Î²Î±Î»Î»ÏŒÎ¼ÎµÎ½Î· Ï„Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î±"
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close _All Windows"
 msgstr "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ _ÎŒÎ»Ï‰Î½ Ï„Ï‰Î½ Î Î±ÏÎ±Î¸ÏÏÏ‰Î½"
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close all Thunar windows"
 msgstr "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ Ï€Î±ÏÎ±Î¸ÏÏÏ‰Î½ Ï„Î¿Ï… Thunar"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "_Close"
 msgstr "_ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "Close this window"
 msgstr "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… Ï€Î±ÏÎ±Î¸ÏÏÎ¿Ï…"
 
-#: ../thunar/thunar-window.c:153
+#: ../thunar/thunar-window.c:156
 msgid "_Edit"
 msgstr "_Î•Ï€ÎµÎ¾ÎµÏÎ³Î±ÏƒÎ¯Î±"
 
-#: ../thunar/thunar-window.c:154
+#: ../thunar/thunar-window.c:157
+#, fuzzy
+msgid "_Preferences"
+msgstr "_Î™Î´Î¹ÏŒÏ„Î·Ï„ÎµÏ‚"
+
+#: ../thunar/thunar-window.c:157
+msgid "Edit Thunar Preferences"
+msgstr ""
+
+#: ../thunar/thunar-window.c:158
 msgid "_View"
 msgstr "_Î ÏÎ¿Î²Î¿Î»Î®"
 
-#: ../thunar/thunar-window.c:155
+#: ../thunar/thunar-window.c:159
 msgid "_Location Bar"
 msgstr "Î“ÏÎ±Î¼Î¼Î® _Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î±Ï‚"
 
-#: ../thunar/thunar-window.c:156
+#: ../thunar/thunar-window.c:160
 msgid "_Side Pane"
 msgstr "_Î Î»ÎµÏ…ÏÎ¹ÎºÏŒ Î¤Î±Î¼Ï€Î»ÏŒ"
 
-#: ../thunar/thunar-window.c:157
+#: ../thunar/thunar-window.c:161
 msgid "_Go"
 msgstr "_ÎœÎµÏ„Î¬Î²Î±ÏƒÎ·"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open _Parent"
 msgstr "Î†Î½Î¿Î¹Î³Î¼Î± _Î“Î¿Î½Î¹ÎºÎ¿Ï"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open the parent folder"
 msgstr "Î†Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… Î³Î¿Î½Î¹ÎºÎ¿Ï Ï†Î±ÎºÎÎ»Î¿Ï…"
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "_Home"
 msgstr "Î‘ÏÏ‡Î¹ÎºÏŒÏ‚ ÎšÎ±Ï„Î¬Î»Î¿Î³Î¿Ï‚"
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "Open the home folder"
 msgstr "Î†Î½Î¿Î¹Î³Î¼Î± Ï„Î¿Ï… Î³Î¿Î½Î¹ÎºÎ¿Ï Ï†Î±ÎºÎÎ»Î¿Ï…"
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Open _Location..."
 msgstr "Î†Î½Î¿Î¹Î³Î¼Î± _Î¤Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î±Ï‚..."
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Specify a location to open"
 msgstr "ÎšÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Îµ Î¼Î¹Î± Ï„Î¿Ï€Î¿Î¸ÎµÏƒÎ¯Î± Î³Î¹Î± Î¬Î½Î¿Î¹Î³Î¼Î±"
 
-#: ../thunar/thunar-window.c:161
+#: ../thunar/thunar-window.c:165
 msgid "_Help"
 msgstr "_Î’Î¿Î®Î¸ÎµÎ¹Î±"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "_About"
 msgstr "_Î ÎµÏÎ¯"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "Display information about Thunar"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· Ï€Î»Î·ÏÎ¿Ï†Î¿ÏÎ¹ÏŽÎ½ ÏƒÏ‡ÎµÏ„Î¹ÎºÎ¬ Î¼Îµ Ï„Î¿ Thunar"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Î•Î¼Ï†Î¬Î½Î¹ÏƒÎ· _ÎšÏÏ…Ï†ÏŽÎ½ Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 msgid "Toggles the display of hidden files in the current window"
 msgstr "Î•Î½Î±Î»Î»Î¬ÏƒÏƒÎµÎ¹ Ï„Î·Î½ ÎµÎ¼Ï†Î¬Î½Î¹ÏƒÎ· ÎºÏÏ…Ï†ÏŽÎ½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÏ„Î¿ Ï„ÏÎÏ‡Î¿Î½ Ï€Î±ÏÎ¬Î¸Ï…ÏÎ¿"
 
-#: ../thunar/thunar-window.c:206
+#: ../thunar/thunar-window.c:210
 msgid "The directory currently displayed within this window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:238
 msgid "The UI manager used within this window"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:289
+#: ../thunar/thunar-window.c:293
 msgid "_Favourites"
 msgstr "_Î‘Î³Î±Ï€Î·Î¼ÎÎ½Î±"
 
-#: ../thunar/thunar-window.c:295 ../thunar/thunar-window.c:316
+#: ../thunar/thunar-window.c:299 ../thunar/thunar-window.c:320
 msgid "_Hidden"
 msgstr "Îš_ÏÏ…Ï†ÏŒ"
 
 #.
 #. * add the location bar options
 #.
-#: ../thunar/thunar-window.c:304
+#: ../thunar/thunar-window.c:308
 msgid "_Button Style"
 msgstr "_Î£Ï„Ï…Î» ÎºÎ¿Ï…Î¼Ï€Î¹ÏŽÎ½"
 
-#: ../thunar/thunar-window.c:310
+#: ../thunar/thunar-window.c:314
 msgid "_Traditional Style"
 msgstr "_Î Î±ÏÎ±Î´Î¿ÏƒÎ¹Î±ÎºÏŒ Î£Ï„Ï…Î»"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:325
+#: ../thunar/thunar-window.c:329
 msgid "View as _Icons"
 msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î•_Î¹ÎºÎ¿Î½Î¹Î´Î¯Ï‰Î½"
 
-#: ../thunar/thunar-window.c:331
+#: ../thunar/thunar-window.c:335
 msgid "View as _Detailed List"
 msgstr "Î ÏÎ¿Î²Î¿Î»Î® Î›Î¯ÏƒÏ„Î±Ï‚"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:738
+#: ../thunar/thunar-window.c:766
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±Ï„Î¿Ï‚ ÎºÎ±Ï„Î±Î»ÏŒÎ³Î¿Ï… %s."
 
-#: ../thunar/thunar-window.c:815
+#: ../thunar/thunar-window.c:843
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:820
+#: ../thunar/thunar-window.c:848
 msgid "translator-credits"
 msgstr "Î£Ï„Î±ÏÏÎ¿Ï‚ Î“Î¹Î±Î½Î½Î¿ÏÏÎ·Ï‚ <stavrosg2002@freemail.gr>"
 
@@ -1381,6 +1399,10 @@ msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
 msgid "Thunar File Manager"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚ Î‘ÏÏ‡ÎµÎ¯Ï‰Î½ Thunar"
 
+#, fuzzy
+#~ msgid "Select by _Pattern"
+#~ msgstr "Î•Ï€Î¹Î»Î¿Î³Î® Î²Î¬ÏƒÎµÎ¹ _Î¼Î¿Ï„Î¯Î²Î¿Ï…"
+
 #~ msgid "Unable to open file %s."
 #~ msgstr "Î‘Î´ÏÎ½Î±Ï„Î¿ Ï„Î¿ Î¬Î½Î¿Î¹Î³Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï… %s."
 
diff --git a/po/es.po b/po/es.po
index 932079610eae01e8c8454c0f2302bc633e9b5ffe..66331a46acf7ef147ee4822101dd05ab489bd04c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.1.2svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 15:38+0100\n"
+"POT-Creation-Date: 2005-11-15 19:36+0100\n"
 "PO-Revision-Date: 2005-10-14 23:57+0900\n"
 "Last-Translator: Pablo HernÃ¡ndez-M. Saiz <homeless3d@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -40,7 +40,7 @@ msgstr "Imposible renombrar %s."
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:685
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:693
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -59,7 +59,7 @@ msgstr "Imposible renombrar %s."
 #. ask the user whether to skip this file (used for cancellation only)
 #. ask the user whether to skip
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:705
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:713
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -117,12 +117,12 @@ msgid "Unable to remove directory `%s': %s"
 msgstr "Imposible crear el directorio %s."
 
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:593
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:639
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:646
 #, fuzzy, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Imposible eliminar %s."
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:831
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:839
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -209,53 +209,58 @@ msgstr ""
 msgid "Failed to open `%s' for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:345
+#: ../thunar-vfs/thunar-vfs-xfer.c:349
 #, fuzzy, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:357
+#: ../thunar-vfs/thunar-vfs-xfer.c:365
 #, fuzzy, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:371
+#: ../thunar-vfs/thunar-vfs-xfer.c:384
 #, fuzzy, c-format
 msgid "Failed to remove `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:415
+#. tell the caller that the job was cancelled
+#: ../thunar-vfs/thunar-vfs-xfer.c:389
+msgid "Operation cancelled"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-xfer.c:429
 #, fuzzy, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Imposible seguir el enlace de %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:423
+#: ../thunar-vfs/thunar-vfs-xfer.c:437
 #, fuzzy, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Imposible crear el enlace de %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:431
+#: ../thunar-vfs/thunar-vfs-xfer.c:445
 #, fuzzy, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:465 ../thunar-vfs/thunar-vfs-xfer.c:525
+#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
 #, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:494
+#: ../thunar-vfs/thunar-vfs-xfer.c:508
 #, fuzzy, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Imposible copiar el archivo %s."
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:536
+#: ../thunar-vfs/thunar-vfs-xfer.c:550
 #, fuzzy, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Imposible crear el enlace de %s."
 
 #. setup application name
-#: ../thunar/main.c:47 ../thunar/thunar-window.c:347
+#: ../thunar/main.c:47 ../thunar/thunar-window.c:351
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -378,7 +383,7 @@ msgid "Shell Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-model.c:116 ../thunar/thunar-folder.c:134
-#: ../thunar/thunar-standard-view.c:357 ../thunar/thunar-statusbar.c:204
+#: ../thunar/thunar-standard-view.c:371 ../thunar/thunar-statusbar.c:204
 #: ../thunar/thunar-statusbar.c:746 ../thunar/thunar-view.c:82
 msgid "Loading"
 msgstr "Cargando"
@@ -453,13 +458,13 @@ msgid "Date modified"
 msgstr "Fecha de modificaciÃ³n"
 
 #: ../thunar/thunar-details-view.c:221
-msgid "Details view"
-msgstr "Vista detallada"
-
-#: ../thunar/thunar-details-view.c:222
 msgid "Detailed directory listing"
 msgstr "Listado detallado del directorio"
 
+#: ../thunar/thunar-details-view.c:222
+msgid "Details view"
+msgstr "Vista detallada"
+
 #: ../thunar/thunar-dialogs.c:74 ../thunar/thunar-dialogs.c:78
 #, c-format
 msgid "%s."
@@ -564,66 +569,70 @@ msgstr "TamaÃ±o de icono"
 msgid "The icon size in pixels"
 msgstr "TamaÃ±o del icono en pixels"
 
-#: ../thunar/thunar-icon-view.c:111
+#: ../thunar/thunar-icon-view.c:124
 msgid "Arran_ge Items"
 msgstr "Organizar los _elementos"
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Sort By _Name"
 msgstr "Por _nombre"
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Sort By _Size"
 msgstr "Por ta_maÃ±o"
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Type"
 msgstr "Por _tipo"
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By Modification _Date"
 msgstr "Por _fecha de modificaciÃ³n"
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "_Ascending"
 msgstr "_Ascendente"
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "Sort items in ascending order"
 msgstr "Ordenar elementos en orden ascendente"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "_Descending"
 msgstr "_Descendente"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "Sort items in descending order"
 msgstr "Ordenar elementos en orden descendente"
 
-#: ../thunar/thunar-icon-view.c:226
-msgid "Icon view"
-msgstr "Vista de iconos"
+#: ../thunar/thunar-icon-view.c:181 ../thunar/thunar-icon-view.c:182
+msgid "Text beside icons"
+msgstr ""
 
-#: ../thunar/thunar-icon-view.c:227
+#: ../thunar/thunar-icon-view.c:291
 msgid "Icon based directory listing"
 msgstr "listado de directorio con iconos"
 
+#: ../thunar/thunar-icon-view.c:292
+msgid "Icon view"
+msgstr "Vista de iconos"
+
 #: ../thunar/thunar-launcher.c:134 ../thunar/thunar-launcher.c:135
 msgid "Action group"
 msgstr ""
@@ -715,12 +724,12 @@ msgid "Number of visible files"
 msgstr "NÃºmero de archivos visibles"
 
 #: ../thunar/thunar-list-model.c:297 ../thunar/thunar-view.c:111
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:222
 msgid "Show hidden"
 msgstr "Mostrar ocultos"
 
 #: ../thunar/thunar-list-model.c:298 ../thunar/thunar-view.c:112
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:223
 msgid "Whether to display hidden files"
 msgstr ""
 
@@ -780,7 +789,7 @@ msgstr "Abrir direcciÃ³n..."
 msgid "_Location:"
 msgstr "_DirecciÃ³n"
 
-#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:205
+#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:209
 msgid "Current directory"
 msgstr "Directorio actual"
 
@@ -810,12 +819,12 @@ msgstr ""
 msgid "The icon size for the path entry"
 msgstr ""
 
-#: ../thunar/thunar-preferences.c:178
+#: ../thunar/thunar-preferences.c:223
 #, fuzzy, c-format
 msgid "Failed to create the Thunar configuration directory in %s"
 msgstr "Imposible crear el directorio %s."
 
-#: ../thunar/thunar-preferences.c:186
+#: ../thunar/thunar-preferences.c:231
 #, fuzzy, c-format
 msgid "Failed to open preferences database in %s: %s"
 msgstr "Imposible renombrar %s."
@@ -929,160 +938,160 @@ msgstr "%s (%u Bytes)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:690
-#: ../thunar/thunar-standard-view.c:2135
+#: ../thunar/thunar-standard-view.c:2192
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Imposible renombrar %s."
 
-#: ../thunar/thunar-standard-view.c:245
+#: ../thunar/thunar-standard-view.c:256
 msgid "File Context Menu"
 msgstr "MenÃº contextual de archivo"
 
-#: ../thunar/thunar-standard-view.c:246
+#: ../thunar/thunar-standard-view.c:257
 msgid "Folder Context Menu"
 msgstr "MenÃº contextual de carpeta"
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 msgid "_Properties"
 msgstr "_Propiedades"
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "Ver las propiedades del elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "_Copy Files"
 msgstr "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:251
+#: ../thunar/thunar-standard-view.c:262
 #, fuzzy
 msgid "_Paste Files"
 msgstr "_Pegar archivos"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Archivos seleccionados"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "Pegar archivos en la carpeta"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 msgid "Paste files into the selected folder"
 msgstr "Pegar archivos en la carpeta seleccionada"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Seleccionar _todos los archivos"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 msgid "Select all files in this window"
 msgstr "Seleccionar todos los archivos en esta ventana"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 #, fuzzy
-msgid "Select by _Pattern"
-msgstr "Seleccionar por _patrÃ³n"
+msgid "Select _by Pattern"
+msgstr "PatrÃ³n de selecciÃ³n"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 msgid "Select all files that match a certain pattern"
 msgstr "Selecciona todos los archivos que coinciden con un patrÃ³n"
 
-#: ../thunar/thunar-standard-view.c:256 ../thunar/thunar-standard-view.c:2414
+#: ../thunar/thunar-standard-view.c:267 ../thunar/thunar-standard-view.c:2471
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:256
+#: ../thunar/thunar-standard-view.c:267
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "Abrir el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:257 ../thunar/thunar-standard-view.c:2420
+#: ../thunar/thunar-standard-view.c:268 ../thunar/thunar-standard-view.c:2477
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:257
+#: ../thunar/thunar-standard-view.c:268
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 msgid "_Rename"
 msgstr "_Renombrar..."
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "Renombra el elemento seleccionado"
 
-#: ../thunar/thunar-standard-view.c:358 ../thunar/thunar-view.c:83
+#: ../thunar/thunar-standard-view.c:372 ../thunar/thunar-view.c:83
 msgid "Whether the view is currently being loaded"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:853
+#: ../thunar/thunar-standard-view.c:896
 msgid "Loading folder contents..."
 msgstr "Cargando el contenido de la carpeta..."
 
-#: ../thunar/thunar-standard-view.c:1305
+#: ../thunar/thunar-standard-view.c:1362
 #, fuzzy
 msgid "New Folder"
 msgstr "Carpeta"
 
-#: ../thunar/thunar-standard-view.c:1308
+#: ../thunar/thunar-standard-view.c:1365
 #, fuzzy
 msgid "New Folder..."
 msgstr "Carpeta"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:1322
+#: ../thunar/thunar-standard-view.c:1379
 #, c-format
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1468
+#: ../thunar/thunar-standard-view.c:1525
 #, 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:1474
+#: ../thunar/thunar-standard-view.c:1531
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1095,39 +1104,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Â¿Esta seguro de que desea borrar todos los elementos de la papelera?"
 
-#: ../thunar/thunar-standard-view.c:1489
+#: ../thunar/thunar-standard-view.c:1546
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1561
+#: ../thunar/thunar-standard-view.c:1618
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "PatrÃ³n de selecciÃ³n"
 
-#: ../thunar/thunar-standard-view.c:1576
+#: ../thunar/thunar-standard-view.c:1633
 msgid "Pattern:"
 msgstr "PatrÃ³n:"
 
-#: ../thunar/thunar-standard-view.c:2087
+#: ../thunar/thunar-standard-view.c:2144
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Imposible abrir el directorio %s."
 
-#: ../thunar/thunar-standard-view.c:2387
+#: ../thunar/thunar-standard-view.c:2444
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "_Copiar archivo"
 msgstr[1] "_Copiar archivos"
 
-#: ../thunar/thunar-standard-view.c:2393
+#: ../thunar/thunar-standard-view.c:2450
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "Cor_tar archivo"
 msgstr[1] "Cor_tar archivos"
 
-#: ../thunar/thunar-standard-view.c:2402
+#: ../thunar/thunar-standard-view.c:2459
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1178,7 +1187,7 @@ msgstr ""
 msgid "Text to be displayed in the statusbar associated with this view"
 msgstr ""
 
-#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:233
+#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:237
 msgid "UI manager"
 msgstr ""
 
@@ -1186,150 +1195,159 @@ msgstr ""
 msgid "UI manager of the surrounding window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:149
+#: ../thunar/thunar-window.c:152
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open New _Window"
 msgstr "Nueva _ventana"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open a new Thunar window for the displayed location"
 msgstr ""
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close _All Windows"
 msgstr "Cerrar _todas las ventanas"
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close all Thunar windows"
 msgstr "Cerrar todas las ventanas de Thunar"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
-#: ../thunar/thunar-window.c:153
+#: ../thunar/thunar-window.c:156
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../thunar/thunar-window.c:154
+#: ../thunar/thunar-window.c:157
+#, fuzzy
+msgid "_Preferences"
+msgstr "_Propiedades"
+
+#: ../thunar/thunar-window.c:157
+msgid "Edit Thunar Preferences"
+msgstr ""
+
+#: ../thunar/thunar-window.c:158
 msgid "_View"
 msgstr "_Ver"
 
-#: ../thunar/thunar-window.c:155
+#: ../thunar/thunar-window.c:159
 msgid "_Location Bar"
 msgstr "Barra de _direcciÃ³n"
 
-#: ../thunar/thunar-window.c:156
+#: ../thunar/thunar-window.c:160
 msgid "_Side Pane"
 msgstr "Panel _lateral"
 
-#: ../thunar/thunar-window.c:157
+#: ../thunar/thunar-window.c:161
 msgid "_Go"
 msgstr "_Ir a"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open _Parent"
 msgstr "Abrir _antecesor"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open the parent folder"
 msgstr "Abre la carpeta anterior"
 
 # msgstr "Sistema de archivos"
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "_Home"
 msgstr "Casa"
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "Open the home folder"
 msgstr "Abre la carpeta anterior"
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Open _Location..."
 msgstr "Abrir _direcciÃ³n..."
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Specify a location to open"
 msgstr "Especificar una direcciÃ³n para abrir"
 
-#: ../thunar/thunar-window.c:161
+#: ../thunar/thunar-window.c:165
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "_About"
 msgstr "_Acerca de"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "Display information about Thunar"
 msgstr "Muestra informaciÃ³n acerca de Thunar"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Mostrar los archivos _ocultos"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 msgid "Toggles the display of hidden files in the current window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:206
+#: ../thunar/thunar-window.c:210
 msgid "The directory currently displayed within this window"
 msgstr ""
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:238
 msgid "The UI manager used within this window"
 msgstr ""
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:289
+#: ../thunar/thunar-window.c:293
 msgid "_Favourites"
 msgstr "_Marcadores"
 
-#: ../thunar/thunar-window.c:295 ../thunar/thunar-window.c:316
+#: ../thunar/thunar-window.c:299 ../thunar/thunar-window.c:320
 msgid "_Hidden"
 msgstr "_Oculto/a"
 
 #.
 #. * add the location bar options
 #.
-#: ../thunar/thunar-window.c:304
+#: ../thunar/thunar-window.c:308
 msgid "_Button Style"
 msgstr "Estilo _botÃ³n"
 
-#: ../thunar/thunar-window.c:310
+#: ../thunar/thunar-window.c:314
 msgid "_Traditional Style"
 msgstr "Estilo _tradicional"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:325
+#: ../thunar/thunar-window.c:329
 msgid "View as _Icons"
 msgstr "Ver como _Iconos"
 
-#: ../thunar/thunar-window.c:331
+#: ../thunar/thunar-window.c:335
 msgid "View as _Detailed List"
 msgstr "Ver como _Lista"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:738
+#: ../thunar/thunar-window.c:766
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Imposible abrir el directorio %s."
 
-#: ../thunar/thunar-window.c:815
+#: ../thunar/thunar-window.c:843
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1337,7 +1355,7 @@ msgstr ""
 "Thunar es un gestor de archivos rÃ¡pido\n"
 "y fÃ¡cil de usar para el escritorio Xfce"
 
-#: ../thunar/thunar-window.c:820
+#: ../thunar/thunar-window.c:848
 msgid "translator-credits"
 msgstr ""
 
@@ -1369,6 +1387,10 @@ msgstr "Gestor de archivos"
 msgid "Thunar File Manager"
 msgstr "Gestor de archivos Thunar"
 
+#, fuzzy
+#~ msgid "Select by _Pattern"
+#~ msgstr "Seleccionar por _patrÃ³n"
+
 #~ msgid ""
 #~ "Unable to query information about\n"
 #~ "the file %s."
diff --git a/po/hu.po b/po/hu.po
index b117985ff3aee4be27bde7393ce7358e31fa184e..e96a35794d9ffee55b9d2845d33619e63628bb1f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.1.2svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 15:38+0100\n"
+"POT-Creation-Date: 2005-11-15 19:36+0100\n"
 "PO-Revision-Date: 2005-10-06 22:02+0900\n"
 "Last-Translator: SZERVÃC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -40,7 +40,7 @@ msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:685
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:693
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -59,7 +59,7 @@ msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 #. ask the user whether to skip this file (used for cancellation only)
 #. ask the user whether to skip
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:705
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:713
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -117,12 +117,12 @@ msgid "Unable to remove directory `%s': %s"
 msgstr "Nem hozhatÃ³ lÃ©tre ez a kÃ¶nyvtÃ¡r: %s"
 
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:593
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:639
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:646
 #, fuzzy, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:831
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:839
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -209,53 +209,58 @@ msgstr ""
 msgid "Failed to open `%s' for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:345
+#: ../thunar-vfs/thunar-vfs-xfer.c:349
 #, fuzzy, c-format
 msgid "Failed to read data from `%s'"
 msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:357
+#: ../thunar-vfs/thunar-vfs-xfer.c:365
 #, fuzzy, c-format
 msgid "Failed to write data to `%s'"
 msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:371
+#: ../thunar-vfs/thunar-vfs-xfer.c:384
 #, fuzzy, c-format
 msgid "Failed to remove `%s'"
 msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:415
+#. tell the caller that the job was cancelled
+#: ../thunar-vfs/thunar-vfs-xfer.c:389
+msgid "Operation cancelled"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-xfer.c:429
 #, fuzzy, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "Nem sikerÃ¼lt meghatÃ¡rozni a szÃ¼lÅ‘ URI-t ehhez: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:423
+#: ../thunar-vfs/thunar-vfs-xfer.c:437
 #, fuzzy, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "Nem hozhatÃ³ lÃ©tre e szimlink: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:431
+#: ../thunar-vfs/thunar-vfs-xfer.c:445
 #, fuzzy, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:465 ../thunar-vfs/thunar-vfs-xfer.c:525
+#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
 #, fuzzy, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "Nem sikerÃ¼lt meghatÃ¡rozni a szÃ¼lÅ‘ URI-t ehhez: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:494
+#: ../thunar-vfs/thunar-vfs-xfer.c:508
 #, fuzzy, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "Nem lehet mÃ¡solni a fÃ¡jlt: %s"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:536
+#: ../thunar-vfs/thunar-vfs-xfer.c:550
 #, fuzzy, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "Nem hozhatÃ³ lÃ©tre e szimlink: %s"
 
 #. setup application name
-#: ../thunar/main.c:47 ../thunar/thunar-window.c:347
+#: ../thunar/main.c:47 ../thunar/thunar-window.c:351
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -379,7 +384,7 @@ msgid "Shell Scripts"
 msgstr ""
 
 #: ../thunar/thunar-chooser-model.c:116 ../thunar/thunar-folder.c:134
-#: ../thunar/thunar-standard-view.c:357 ../thunar/thunar-statusbar.c:204
+#: ../thunar/thunar-standard-view.c:371 ../thunar/thunar-statusbar.c:204
 #: ../thunar/thunar-statusbar.c:746 ../thunar/thunar-view.c:82
 msgid "Loading"
 msgstr ""
@@ -456,13 +461,13 @@ msgid "Date modified"
 msgstr "MÃ³dosÃtÃ¡s ideje"
 
 #: ../thunar/thunar-details-view.c:221
-msgid "Details view"
-msgstr "RÃ©szletes nÃ©zet"
-
-#: ../thunar/thunar-details-view.c:222
 msgid "Detailed directory listing"
 msgstr "RÃ©szletes kÃ¶nyvtÃ¡rlista"
 
+#: ../thunar/thunar-details-view.c:222
+msgid "Details view"
+msgstr "RÃ©szletes nÃ©zet"
+
 #: ../thunar/thunar-dialogs.c:74 ../thunar/thunar-dialogs.c:78
 #, c-format
 msgid "%s."
@@ -567,66 +572,70 @@ msgstr "Ikon mÃ©ret"
 msgid "The icon size in pixels"
 msgstr "Ikon mÃ©ret pixelben"
 
-#: ../thunar/thunar-icon-view.c:111
+#: ../thunar/thunar-icon-view.c:124
 msgid "Arran_ge Items"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Sort By _Name"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Keep items sorted by their name in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Sort By _Size"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Keep items sorted by their size in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Type"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their type in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By Modification _Date"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their modification date in rows"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "_Ascending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "Sort items in ascending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "_Descending"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "Sort items in descending order"
 msgstr ""
 
-#: ../thunar/thunar-icon-view.c:226
-msgid "Icon view"
-msgstr "IkonnÃ©zet"
+#: ../thunar/thunar-icon-view.c:181 ../thunar/thunar-icon-view.c:182
+msgid "Text beside icons"
+msgstr ""
 
-#: ../thunar/thunar-icon-view.c:227
+#: ../thunar/thunar-icon-view.c:291
 msgid "Icon based directory listing"
 msgstr "Ikon alapÃº kÃ¶nyvtÃ¡r lista"
 
+#: ../thunar/thunar-icon-view.c:292
+msgid "Icon view"
+msgstr "IkonnÃ©zet"
+
 #: ../thunar/thunar-launcher.c:134 ../thunar/thunar-launcher.c:135
 msgid "Action group"
 msgstr ""
@@ -720,12 +729,12 @@ msgid "Number of visible files"
 msgstr "LÃ¡thatÃ³ fÃ¡jlok szÃ¡ma"
 
 #: ../thunar/thunar-list-model.c:297 ../thunar/thunar-view.c:111
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:222
 msgid "Show hidden"
 msgstr "Rejtettek mutatÃ¡sa"
 
 #: ../thunar/thunar-list-model.c:298 ../thunar/thunar-view.c:112
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:223
 msgid "Whether to display hidden files"
 msgstr "Mutassuk-e a rejtett fÃ¡jlokat"
 
@@ -785,7 +794,7 @@ msgstr "Hely megnyitÃ¡sa"
 msgid "_Location:"
 msgstr "_Hely:"
 
-#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:205
+#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:209
 msgid "Current directory"
 msgstr "Jelenlegi kÃ¶nyvtÃ¡r"
 
@@ -816,12 +825,12 @@ msgstr "A most megjelenÃtett fÃ¡jl"
 msgid "The icon size for the path entry"
 msgstr "Az Ã¶svÃ©nyelem ikonmÃ©rete"
 
-#: ../thunar/thunar-preferences.c:178
+#: ../thunar/thunar-preferences.c:223
 #, fuzzy, c-format
 msgid "Failed to create the Thunar configuration directory in %s"
 msgstr "Nem hozhatÃ³ lÃ©tre ez a kÃ¶nyvtÃ¡r: %s"
 
-#: ../thunar/thunar-preferences.c:186
+#: ../thunar/thunar-preferences.c:231
 #, fuzzy, c-format
 msgid "Failed to open preferences database in %s: %s"
 msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
@@ -935,162 +944,162 @@ msgstr "%s (%u bÃ¡jt)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:690
-#: ../thunar/thunar-standard-view.c:2135
+#: ../thunar/thunar-standard-view.c:2192
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "Nem tÃ¶rÃ¶lhetÅ‘: %s"
 
-#: ../thunar/thunar-standard-view.c:245
+#: ../thunar/thunar-standard-view.c:256
 #, fuzzy
 msgid "File Context Menu"
 msgstr "Helyi menÃ¼"
 
-#: ../thunar/thunar-standard-view.c:246
+#: ../thunar/thunar-standard-view.c:257
 #, fuzzy
 msgid "Folder Context Menu"
 msgstr "Helyi menÃ¼"
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 msgid "_Properties"
 msgstr "TulajdonsÃ¡gok"
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "A kijelÃ¶lt elem tulajdonsÃ¡gai"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "_Copy Files"
 msgstr "FÃ¡jlok mÃ¡solÃ¡sa"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "A kijelÃ¶lt elem tulajdonsÃ¡gai"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "FÃ¡jlok kivÃ¡gÃ¡sa"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "A kijelÃ¶lt elem tulajdonsÃ¡gai"
 
-#: ../thunar/thunar-standard-view.c:251
+#: ../thunar/thunar-standard-view.c:262
 #, fuzzy
 msgid "_Paste Files"
 msgstr "FÃ¡jlok beillesztÃ©se"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "_Delete Files"
 msgstr "Minden fÃ¡jl kivÃ¡lasztÃ¡sa"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "A kijelÃ¶lt elem tulajdonsÃ¡gai"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "FÃ¡jlok mappÃ¡ba illesztÃ©se"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 msgid "Paste files into the selected folder"
 msgstr "FÃ¡jlok beillesztÃ©se a kijelÃ¶lt mappÃ¡ba"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 #, fuzzy
 msgid "Select _all Files"
 msgstr "Minden fÃ¡jl kivÃ¡lasztÃ¡sa"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 msgid "Select all files in this window"
 msgstr "Minden fÃ¡jlt kivÃ¡laszt ebbÅ‘l az ablakbÃ³l"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 #, fuzzy
-msgid "Select by _Pattern"
+msgid "Select _by Pattern"
 msgstr "KijelÃ¶lÃ©s mintÃ¡val"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 msgid "Select all files that match a certain pattern"
 msgstr "Egy adott mintÃ¡ra illÅ‘ valamennyi fÃ¡jl kivÃ¡lasztÃ¡sa"
 
-#: ../thunar/thunar-standard-view.c:256 ../thunar/thunar-standard-view.c:2414
+#: ../thunar/thunar-standard-view.c:267 ../thunar/thunar-standard-view.c:2471
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:256
+#: ../thunar/thunar-standard-view.c:267
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "A kijelÃ¶lt elem tulajdonsÃ¡gai"
 
-#: ../thunar/thunar-standard-view.c:257 ../thunar/thunar-standard-view.c:2420
+#: ../thunar/thunar-standard-view.c:268 ../thunar/thunar-standard-view.c:2477
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:257
+#: ../thunar/thunar-standard-view.c:268
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 msgid "_Rename"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "A kijelÃ¶lt elem tulajdonsÃ¡gai"
 
-#: ../thunar/thunar-standard-view.c:358 ../thunar/thunar-view.c:83
+#: ../thunar/thunar-standard-view.c:372 ../thunar/thunar-view.c:83
 msgid "Whether the view is currently being loaded"
 msgstr "A nÃ©zet betÃ¶ltÃ©sÃ©t adja meg"
 
-#: ../thunar/thunar-standard-view.c:853
+#: ../thunar/thunar-standard-view.c:896
 msgid "Loading folder contents..."
 msgstr "Mappa beolvasÃ¡sa..."
 
-#: ../thunar/thunar-standard-view.c:1305
+#: ../thunar/thunar-standard-view.c:1362
 #, fuzzy
 msgid "New Folder"
 msgstr "Mappa"
 
-#: ../thunar/thunar-standard-view.c:1308
+#: ../thunar/thunar-standard-view.c:1365
 #, fuzzy
 msgid "New Folder..."
 msgstr "Mappa"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:1322
+#: ../thunar/thunar-standard-view.c:1379
 #, c-format
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1468
+#: ../thunar/thunar-standard-view.c:1525
 #, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1474
+#: ../thunar/thunar-standard-view.c:1531
 #, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1101,39 +1110,39 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:1489
+#: ../thunar/thunar-standard-view.c:1546
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1561
+#: ../thunar/thunar-standard-view.c:1618
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "KijelÃ¶lÃ©s mintÃ¡val"
 
-#: ../thunar/thunar-standard-view.c:1576
+#: ../thunar/thunar-standard-view.c:1633
 msgid "Pattern:"
 msgstr "Minta:"
 
-#: ../thunar/thunar-standard-view.c:2087
+#: ../thunar/thunar-standard-view.c:2144
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "Nem megnyithatÃ³ kÃ¶nyvtÃ¡r: %s"
 
-#: ../thunar/thunar-standard-view.c:2387
+#: ../thunar/thunar-standard-view.c:2444
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "FÃ¡jl mÃ¡solÃ¡s"
 msgstr[1] "FÃ¡jl mÃ¡solÃ¡s"
 
-#: ../thunar/thunar-standard-view.c:2393
+#: ../thunar/thunar-standard-view.c:2450
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "FÃ¡jl kivÃ¡gÃ¡s"
 msgstr[1] "FÃ¡jl kivÃ¡gÃ¡s"
 
-#: ../thunar/thunar-standard-view.c:2402
+#: ../thunar/thunar-standard-view.c:2459
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1185,7 +1194,7 @@ msgstr ""
 msgid "Text to be displayed in the statusbar associated with this view"
 msgstr "E nÃ©zet Ã¡llapotsorÃ¡nak szÃ¶vege"
 
-#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:233
+#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:237
 msgid "UI manager"
 msgstr "UI kezelÅ‘"
 
@@ -1193,155 +1202,164 @@ msgstr "UI kezelÅ‘"
 msgid "UI manager of the surrounding window"
 msgstr "Adot ablak felhasznÃ¡lÃ³i felÃ¼let kezelÅ‘je"
 
-#: ../thunar/thunar-window.c:149
+#: ../thunar/thunar-window.c:152
 msgid "_File"
 msgstr "_FÃ¡jl"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open New _Window"
 msgstr "Ãšj _Ablak"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open a new Thunar window for the displayed location"
 msgstr "Ãšj Thunar ablak az adott helyhez"
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close _All Windows"
 msgstr "_Minden ablak bezÃ¡rÃ¡sa"
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close all Thunar windows"
 msgstr "BezÃ¡r minden Thunar ablakot"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "_Close"
 msgstr "_BezÃ¡rÃ¡s"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "Close this window"
 msgstr "BezÃ¡rja ezt az ablakot"
 
-#: ../thunar/thunar-window.c:153
+#: ../thunar/thunar-window.c:156
 msgid "_Edit"
 msgstr "Sz_erkesztÃ©s"
 
-#: ../thunar/thunar-window.c:154
+#: ../thunar/thunar-window.c:157
+#, fuzzy
+msgid "_Preferences"
+msgstr "TulajdonsÃ¡gok"
+
+#: ../thunar/thunar-window.c:157
+msgid "Edit Thunar Preferences"
+msgstr ""
+
+#: ../thunar/thunar-window.c:158
 msgid "_View"
 msgstr "_NÃ©zet"
 
-#: ../thunar/thunar-window.c:155
+#: ../thunar/thunar-window.c:159
 msgid "_Location Bar"
 msgstr "_CÃmsor"
 
-#: ../thunar/thunar-window.c:156
+#: ../thunar/thunar-window.c:160
 msgid "_Side Pane"
 msgstr ""
 
-#: ../thunar/thunar-window.c:157
+#: ../thunar/thunar-window.c:161
 msgid "_Go"
 msgstr "_UgrÃ¡s"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open _Parent"
 msgstr "_SzÃ¼lÅ‘ megnyitÃ¡sa"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open the parent folder"
 msgstr "SzÃ¼lÅ‘mappa megnyitÃ¡sa"
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "_Home"
 msgstr "SajÃ¡t kÃ¶nyvtÃ¡r"
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "Open the home folder"
 msgstr "SzÃ¼lÅ‘mappa megnyitÃ¡sa"
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Open _Location..."
 msgstr "_Hely megnyitÃ¡sa..."
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Specify a location to open"
 msgstr "Adott hely megnyitÃ¡sa"
 
-#: ../thunar/thunar-window.c:161
+#: ../thunar/thunar-window.c:165
 msgid "_Help"
 msgstr "_SÃºgÃ³"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "_About"
 msgstr "_NÃ©vjegy"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "Display information about Thunar"
 msgstr "A Thunar adatainak megjelenÃtÃ©se"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "Rejtett fÃ¡jlok mutatÃ¡sa"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 msgid "Toggles the display of hidden files in the current window"
 msgstr "A rejtett fÃ¡jlok mutatÃ¡sÃ¡t vÃ¡ltja a jelen ablakban"
 
-#: ../thunar/thunar-window.c:206
+#: ../thunar/thunar-window.c:210
 msgid "The directory currently displayed within this window"
 msgstr "Ezen ablakban megjelenÃtett kÃ¶nyvtÃ¡r"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:238
 msgid "The UI manager used within this window"
 msgstr "Ezen ablakban hasznÃ¡lt UI kezelÅ‘"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:289
+#: ../thunar/thunar-window.c:293
 msgid "_Favourites"
 msgstr ""
 
-#: ../thunar/thunar-window.c:295 ../thunar/thunar-window.c:316
+#: ../thunar/thunar-window.c:299 ../thunar/thunar-window.c:320
 msgid "_Hidden"
 msgstr "_Rejtett"
 
 #.
 #. * add the location bar options
 #.
-#: ../thunar/thunar-window.c:304
+#: ../thunar/thunar-window.c:308
 msgid "_Button Style"
 msgstr "_Gomb stÃlus"
 
-#: ../thunar/thunar-window.c:310
+#: ../thunar/thunar-window.c:314
 msgid "_Traditional Style"
 msgstr "_HagyomÃ¡nyos stÃlus"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:325
+#: ../thunar/thunar-window.c:329
 msgid "View as _Icons"
 msgstr ""
 
-#: ../thunar/thunar-window.c:331
+#: ../thunar/thunar-window.c:335
 msgid "View as _Detailed List"
 msgstr ""
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:738
+#: ../thunar/thunar-window.c:766
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "Nem megnyithatÃ³ kÃ¶nyvtÃ¡r: %s"
 
-#: ../thunar/thunar-window.c:815
+#: ../thunar/thunar-window.c:843
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
 msgstr ""
 
-#: ../thunar/thunar-window.c:820
+#: ../thunar/thunar-window.c:848
 msgid "translator-credits"
 msgstr ""
 
@@ -1374,6 +1392,10 @@ msgstr "FÃ¡jlkezelÅ‘"
 msgid "Thunar File Manager"
 msgstr "FÃ¡jlkezelÅ‘"
 
+#, fuzzy
+#~ msgid "Select by _Pattern"
+#~ msgstr "KijelÃ¶lÃ©s mintÃ¡val"
+
 #~ msgid ""
 #~ "Unable to query information about\n"
 #~ "the file %s."
diff --git a/po/ja.po b/po/ja.po
index c02c79037ba64ad707dbdb7c579904d57b8b662d..951c310284193e1a1d946883d2696bd937a547ae 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Thunar 0.1.2svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 15:38+0100\n"
+"POT-Creation-Date: 2005-11-15 19:36+0100\n"
 "PO-Revision-Date: 2005-10-06 21:58+0900\n"
 "Last-Translator: Daichi Kawahata <daichi@xfce.org>\n"
 "Language-Team: Japanese <xfce-users-jp@ml.fdiary.net>\n"
@@ -42,7 +42,7 @@ msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
 #. ask the user whether we should remove the target first
 #. ask the user whether to overwrite
 #: ../thunar-vfs/thunar-vfs-link-job.c:176
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:685
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:693
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -61,7 +61,7 @@ msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
 #. ask the user whether to skip this file (used for cancellation only)
 #. ask the user whether to skip
 #: ../thunar-vfs/thunar-vfs-link-job.c:212
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:705
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:713
 #, fuzzy, c-format
 msgid ""
 "%s.\n"
@@ -119,12 +119,12 @@ msgid "Unable to remove directory `%s': %s"
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€ %s ã‚’ä½œæˆã§ãã¾ã›ã‚“ã€‚"
 
 #: ../thunar-vfs/thunar-vfs-transfer-job.c:593
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:639
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:646
 #, fuzzy, c-format
 msgid "Unable to remove `%s': %s"
 msgstr "%s ã‚’å‰Šé™¤ã§ãã¾ã›ã‚“ã€‚"
 
-#: ../thunar-vfs/thunar-vfs-transfer-job.c:831
+#: ../thunar-vfs/thunar-vfs-transfer-job.c:839
 msgid "Cannot transfer the root directory"
 msgstr ""
 
@@ -211,53 +211,58 @@ msgstr ""
 msgid "Failed to open `%s' for writing"
 msgstr ""
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:345
+#: ../thunar-vfs/thunar-vfs-xfer.c:349
 #, fuzzy, c-format
 msgid "Failed to read data from `%s'"
 msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:357
+#: ../thunar-vfs/thunar-vfs-xfer.c:365
 #, fuzzy, c-format
 msgid "Failed to write data to `%s'"
 msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:371
+#: ../thunar-vfs/thunar-vfs-xfer.c:384
 #, fuzzy, c-format
 msgid "Failed to remove `%s'"
 msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:415
+#. tell the caller that the job was cancelled
+#: ../thunar-vfs/thunar-vfs-xfer.c:389
+msgid "Operation cancelled"
+msgstr ""
+
+#: ../thunar-vfs/thunar-vfs-xfer.c:429
 #, fuzzy, c-format
 msgid "Failed to read link target from `%s'"
 msgstr "%s ã®ãƒªãƒ³ã‚¯å…ˆã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“ã€‚"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:423
+#: ../thunar-vfs/thunar-vfs-xfer.c:437
 #, fuzzy, c-format
 msgid "Failed to create symbolic link `%s'"
 msgstr "ãƒªãƒ³ã‚¯ %s ã‚’ä½œæˆã§ãã¾ã›ã‚“ã€‚"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:431
+#: ../thunar-vfs/thunar-vfs-xfer.c:445
 #, fuzzy, c-format
 msgid "Failed to change mode of `%s'"
 msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:465 ../thunar-vfs/thunar-vfs-xfer.c:525
+#: ../thunar-vfs/thunar-vfs-xfer.c:479 ../thunar-vfs/thunar-vfs-xfer.c:539
 #, fuzzy, c-format
 msgid "Failed to determine file info for `%s'"
 msgstr "'%s' ã®è¦ª URI ã‚’ç¢ºå®šã™ã‚‹ã®ã«å¤±æ•—ã—ã¾ã—ãŸ"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:494
+#: ../thunar-vfs/thunar-vfs-xfer.c:508
 #, fuzzy, c-format
 msgid "Failed to copy special file `%s'"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ« %s ã‚’ã‚³ãƒ”ãƒ¼ã§ãã¾ã›ã‚“ã€‚"
 
-#: ../thunar-vfs/thunar-vfs-xfer.c:536
+#: ../thunar-vfs/thunar-vfs-xfer.c:550
 #, fuzzy, c-format
 msgid "Failed to create symbolic `%s'"
 msgstr "ãƒªãƒ³ã‚¯ %s ã‚’ä½œæˆã§ãã¾ã›ã‚“ã€‚"
 
 #. setup application name
-#: ../thunar/main.c:47 ../thunar/thunar-window.c:347
+#: ../thunar/main.c:47 ../thunar/thunar-window.c:351
 msgid "Thunar"
 msgstr "Thunar"
 
@@ -376,7 +381,7 @@ msgid "Shell Scripts"
 msgstr "ã‚·ã‚§ãƒ«ã‚¹ã‚¯ãƒªãƒ—ãƒˆ"
 
 #: ../thunar/thunar-chooser-model.c:116 ../thunar/thunar-folder.c:134
-#: ../thunar/thunar-standard-view.c:357 ../thunar/thunar-statusbar.c:204
+#: ../thunar/thunar-standard-view.c:371 ../thunar/thunar-statusbar.c:204
 #: ../thunar/thunar-statusbar.c:746 ../thunar/thunar-view.c:82
 msgid "Loading"
 msgstr "èªã¿è¾¼ã¿"
@@ -451,13 +456,13 @@ msgid "Date modified"
 msgstr "å¤‰æ›´æ—¥"
 
 #: ../thunar/thunar-details-view.c:221
-msgid "Details view"
-msgstr "è©³ç´°è¡¨ç¤º"
-
-#: ../thunar/thunar-details-view.c:222
 msgid "Detailed directory listing"
 msgstr "è©³ç´°ãªãƒ•ã‚©ãƒ«ãƒ€å†…å®¹ã‚’ãƒªã‚¹ãƒˆè¡¨ç¤ºã—ã¾ã™"
 
+#: ../thunar/thunar-details-view.c:222
+msgid "Details view"
+msgstr "è©³ç´°è¡¨ç¤º"
+
 #: ../thunar/thunar-dialogs.c:74 ../thunar/thunar-dialogs.c:78
 #, c-format
 msgid "%s."
@@ -562,66 +567,70 @@ msgstr "ã‚¢ã‚¤ã‚³ãƒ³ã®ã‚µã‚¤ã‚º"
 msgid "The icon size in pixels"
 msgstr "ã‚¢ã‚¤ã‚³ãƒ³ã®ã‚µã‚¤ã‚ºã§ã™ (ãƒ”ã‚¯ã‚»ãƒ«å˜ä½)"
 
-#: ../thunar/thunar-icon-view.c:111
+#: ../thunar/thunar-icon-view.c:124
 msgid "Arran_ge Items"
 msgstr "ã‚¢ã‚¤ãƒ†ãƒ ã‚’æ•´é “(_G)"
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Sort By _Name"
 msgstr "åå‰ã§ä¸¦ã¹æ›¿ãˆ(_N)"
 
-#: ../thunar/thunar-icon-view.c:116
+#: ../thunar/thunar-icon-view.c:129
 msgid "Keep items sorted by their name in rows"
 msgstr "å„è¡Œã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’åå‰ã§ä¸¦ã¹æ›¿ãˆã¾ã™"
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Sort By _Size"
 msgstr "ã‚µã‚¤ã‚ºã§ä¸¦ã¹æ›¿ãˆ(_S)"
 
-#: ../thunar/thunar-icon-view.c:117
+#: ../thunar/thunar-icon-view.c:130
 msgid "Keep items sorted by their size in rows"
 msgstr "å„è¡Œã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’ã‚µã‚¤ã‚ºã§ä¸¦ã¹æ›¿ãˆã¾ã™"
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Sort By _Type"
 msgstr "ã‚¿ã‚¤ãƒ—ã§ä¸¦ã¹æ›¿ãˆ(_T)"
 
-#: ../thunar/thunar-icon-view.c:118
+#: ../thunar/thunar-icon-view.c:131
 msgid "Keep items sorted by their type in rows"
 msgstr "å„è¡Œã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’ã‚¿ã‚¤ãƒ—ã§ä¸¦ã¹æ›¿ãˆã¾ã™"
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Sort By Modification _Date"
 msgstr "å¤‰æ›´æ—¥ã§ä¸¦ã¹æ›¿ãˆ(_D)"
 
-#: ../thunar/thunar-icon-view.c:119
+#: ../thunar/thunar-icon-view.c:132
 msgid "Keep items sorted by their modification date in rows"
 msgstr "å„è¡Œã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’å¤‰æ›´æ—¥ã§ä¸¦ã¹æ›¿ãˆã¾ã™"
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "_Ascending"
 msgstr "æ˜‡é †(_A)"
 
-#: ../thunar/thunar-icon-view.c:124
+#: ../thunar/thunar-icon-view.c:137
 msgid "Sort items in ascending order"
 msgstr "ã‚¢ã‚¤ãƒ†ãƒ ã‚’æ˜‡é †ã§ä¸¦ã¹æ›¿ãˆã¾ã™"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "_Descending"
 msgstr "é™é †(_D)"
 
-#: ../thunar/thunar-icon-view.c:125
+#: ../thunar/thunar-icon-view.c:138
 msgid "Sort items in descending order"
 msgstr "ã‚¢ã‚¤ãƒ†ãƒ ã‚’é™é †ã§ä¸¦ã¹æ›¿ãˆã¾ã™"
 
-#: ../thunar/thunar-icon-view.c:226
-msgid "Icon view"
-msgstr "ã‚¢ã‚¤ã‚³ãƒ³è¡¨ç¤º"
+#: ../thunar/thunar-icon-view.c:181 ../thunar/thunar-icon-view.c:182
+msgid "Text beside icons"
+msgstr ""
 
-#: ../thunar/thunar-icon-view.c:227
+#: ../thunar/thunar-icon-view.c:291
 msgid "Icon based directory listing"
 msgstr "ã‚¢ã‚¤ã‚³ãƒ³ã‚’åŸºã«ãƒ•ã‚©ãƒ«ãƒ€ã‚’ãƒªã‚¹ãƒˆè¡¨ç¤ºã—ã¾ã™"
 
+#: ../thunar/thunar-icon-view.c:292
+msgid "Icon view"
+msgstr "ã‚¢ã‚¤ã‚³ãƒ³è¡¨ç¤º"
+
 #: ../thunar/thunar-launcher.c:134 ../thunar/thunar-launcher.c:135
 msgid "Action group"
 msgstr "ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚°ãƒ«ãƒ¼ãƒ—"
@@ -709,12 +718,12 @@ msgid "Number of visible files"
 msgstr "è¡¨ç¤ºã•ã‚Œã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®æ•°ã§ã™"
 
 #: ../thunar/thunar-list-model.c:297 ../thunar/thunar-view.c:111
-#: ../thunar/thunar-window.c:218
+#: ../thunar/thunar-window.c:222
 msgid "Show hidden"
 msgstr "éš ã—ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¡¨ç¤º"
 
 #: ../thunar/thunar-list-model.c:298 ../thunar/thunar-view.c:112
-#: ../thunar/thunar-window.c:219
+#: ../thunar/thunar-window.c:223
 msgid "Whether to display hidden files"
 msgstr "éš ã—ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¡¨ç¤ºã—ã¾ã™"
 
@@ -771,7 +780,7 @@ msgstr "å ´æ‰€ã‚’é–‹ãã¾ã™"
 msgid "_Location:"
 msgstr "å ´æ‰€(_L):"
 
-#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:205
+#: ../thunar/thunar-navigator.c:137 ../thunar/thunar-window.c:209
 msgid "Current directory"
 msgstr "ç¾åœ¨ã®ãƒ•ã‚©ãƒ«ãƒ€"
 
@@ -801,12 +810,12 @@ msgstr "ç¾åœ¨è¡¨ç¤ºã•ã‚Œã¦ã„ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã§ã™"
 msgid "The icon size for the path entry"
 msgstr "ãƒ‘ã‚¹ãƒ»ã‚¨ãƒ³ãƒˆãƒªãƒ¼ã®ã‚¢ã‚¤ã‚³ãƒ³ãƒ»ã‚µã‚¤ã‚ºã§ã™"
 
-#: ../thunar/thunar-preferences.c:178
+#: ../thunar/thunar-preferences.c:223
 #, fuzzy, c-format
 msgid "Failed to create the Thunar configuration directory in %s"
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€ %s ã‚’ä½œæˆã§ãã¾ã›ã‚“ã€‚"
 
-#: ../thunar/thunar-preferences.c:186
+#: ../thunar/thunar-preferences.c:231
 #, fuzzy, c-format
 msgid "Failed to open preferences database in %s: %s"
 msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
@@ -920,160 +929,160 @@ msgstr "%s (%u ãƒã‚¤ãƒˆ)"
 
 #. display an error message
 #: ../thunar/thunar-properties-dialog.c:690
-#: ../thunar/thunar-standard-view.c:2135
+#: ../thunar/thunar-standard-view.c:2192
 #, fuzzy, c-format
 msgid "Failed to rename `%s'"
 msgstr "%s ã®åå‰å¤‰æ›´ã«å¤±æ•—ã—ã¾ã—ãŸã€‚"
 
-#: ../thunar/thunar-standard-view.c:245
+#: ../thunar/thunar-standard-view.c:256
 msgid "File Context Menu"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ãƒ»ã‚³ãƒ³ãƒ†ã‚ã‚¹ãƒˆãƒ»ãƒ¡ãƒ‹ãƒ¥ãƒ¼"
 
-#: ../thunar/thunar-standard-view.c:246
+#: ../thunar/thunar-standard-view.c:257
 msgid "Folder Context Menu"
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€ãƒ»ã‚³ãƒ³ãƒ†ã‚ã‚¹ãƒˆãƒ»ãƒ¡ãƒ‹ãƒ¥ãƒ¼"
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create _Folder..."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:247
+#: ../thunar/thunar-standard-view.c:258
 msgid "Create an empty folder within the current folder"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 msgid "_Properties"
 msgstr "ãƒ—ãƒãƒ‘ãƒ†ã‚£(_P)"
 
-#: ../thunar/thunar-standard-view.c:248
+#: ../thunar/thunar-standard-view.c:259
 #, fuzzy
 msgid "View the properties of the selected file"
 msgstr "é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®ãƒ—ãƒãƒ‘ãƒ†ã‚£ã‚’è¡¨ç¤ºã—ã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "_Copy Files"
 msgstr "ã‚³ãƒ”ãƒ¼(_C)"
 
-#: ../thunar/thunar-standard-view.c:249
+#: ../thunar/thunar-standard-view.c:260
 #, fuzzy
 msgid "Copy the selected files"
 msgstr "é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’é–‹ãã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cu_t Files"
 msgstr "åˆ‡ã‚Šå–ã‚Š(_T)"
 
-#: ../thunar/thunar-standard-view.c:250
+#: ../thunar/thunar-standard-view.c:261
 #, fuzzy
 msgid "Cut the selected files"
 msgstr "é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’é–‹ãã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:251
+#: ../thunar/thunar-standard-view.c:262
 #, fuzzy
 msgid "_Paste Files"
 msgstr "è²¼ã‚Šä»˜ã‘(_P)"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "_Delete Files"
 msgstr "é¸æŠžã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«"
 
-#: ../thunar/thunar-standard-view.c:252
+#: ../thunar/thunar-standard-view.c:263
 #, fuzzy
 msgid "Delete the selected files"
 msgstr "é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’é–‹ãã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 #, fuzzy
 msgid "Paste Files into Folder"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ãƒ•ã‚©ãƒ«ãƒ€ã«è²¼ã‚Šä»˜ã‘"
 
-#: ../thunar/thunar-standard-view.c:253
+#: ../thunar/thunar-standard-view.c:264
 msgid "Paste files into the selected folder"
 msgstr "é¸æŠžã—ãŸãƒ•ã‚©ãƒ«ãƒ€ã«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è²¼ã‚Šä»˜ã‘ã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 #, fuzzy
 msgid "Select _all Files"
 msgstr "å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠž(_A)"
 
-#: ../thunar/thunar-standard-view.c:254
+#: ../thunar/thunar-standard-view.c:265
 msgid "Select all files in this window"
 msgstr "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã®å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 #, fuzzy
-msgid "Select by _Pattern"
-msgstr "ãƒ‘ã‚¿ãƒ¼ãƒ³ã§é¸æŠž(_P)"
+msgid "Select _by Pattern"
+msgstr "ãƒ‘ã‚¿ãƒ¼ãƒ³ã§é¸æŠž"
 
-#: ../thunar/thunar-standard-view.c:255
+#: ../thunar/thunar-standard-view.c:266
 msgid "Select all files that match a certain pattern"
 msgstr "ã‚ã‚‹ç‰¹å®šã®ãƒ‘ã‚¿ãƒ¼ãƒ³ã«ä¸€è‡´ã™ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é¸æŠžã—ã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:256 ../thunar/thunar-standard-view.c:2414
+#: ../thunar/thunar-standard-view.c:267 ../thunar/thunar-standard-view.c:2471
 msgid "Du_plicate File"
 msgid_plural "Du_plicate Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:256
+#: ../thunar/thunar-standard-view.c:267
 #, fuzzy
 msgid "Duplicate each selected file"
 msgstr "é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã‚’é–‹ãã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:257 ../thunar/thunar-standard-view.c:2420
+#: ../thunar/thunar-standard-view.c:268 ../thunar/thunar-standard-view.c:2477
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../thunar/thunar-standard-view.c:257
+#: ../thunar/thunar-standard-view.c:268
 msgid "Create a symbolic link for each selected file"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 msgid "_Rename"
 msgstr "åå‰å¤‰æ›´(_R)"
 
-#: ../thunar/thunar-standard-view.c:258
+#: ../thunar/thunar-standard-view.c:269
 #, fuzzy
 msgid "Rename the selected file"
 msgstr "é¸æŠžã—ãŸã‚¢ã‚¤ãƒ†ãƒ ã®åå‰ã‚’å¤‰æ›´ã—ã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:358 ../thunar/thunar-view.c:83
+#: ../thunar/thunar-standard-view.c:372 ../thunar/thunar-view.c:83
 msgid "Whether the view is currently being loaded"
 msgstr "è¡¨ç¤ºãƒšã‚¤ãƒ³ãŒç¾åœ¨èªã¿è¾¼ã¾ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã‚’è¡¨ã—ã¾ã™"
 
-#: ../thunar/thunar-standard-view.c:853
+#: ../thunar/thunar-standard-view.c:896
 msgid "Loading folder contents..."
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€ã®å†…å®¹ã‚’èªã¿è¾¼ã‚“ã§ã„ã¾ã™..."
 
-#: ../thunar/thunar-standard-view.c:1305
+#: ../thunar/thunar-standard-view.c:1362
 #, fuzzy
 msgid "New Folder"
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€"
 
-#: ../thunar/thunar-standard-view.c:1308
+#: ../thunar/thunar-standard-view.c:1365
 #, fuzzy
 msgid "New Folder..."
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€"
 
 #. display an error message
-#: ../thunar/thunar-standard-view.c:1322
+#: ../thunar/thunar-standard-view.c:1379
 #, c-format
 msgid "Cannot convert filename `%s' to the local encoding"
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1468
+#: ../thunar/thunar-standard-view.c:1525
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to\n"
 "permanently delete \"%s\"?"
 msgstr "ã‚´ãƒŸç®±ã«ã‚ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã—ã¦ã‚‚ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
 
-#: ../thunar/thunar-standard-view.c:1474
+#: ../thunar/thunar-standard-view.c:1531
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to permanently\n"
@@ -1083,37 +1092,37 @@ msgid_plural ""
 "delete the %u selected files?"
 msgstr[0] "ã‚´ãƒŸç®±ã«ã‚ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å‰Šé™¤ã—ã¦ã‚‚ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
 
-#: ../thunar/thunar-standard-view.c:1489
+#: ../thunar/thunar-standard-view.c:1546
 msgid "If you delete a file, it is permanently lost."
 msgstr ""
 
-#: ../thunar/thunar-standard-view.c:1561
+#: ../thunar/thunar-standard-view.c:1618
 #, fuzzy
 msgid "Select by Pattern"
 msgstr "ãƒ‘ã‚¿ãƒ¼ãƒ³ã§é¸æŠž"
 
-#: ../thunar/thunar-standard-view.c:1576
+#: ../thunar/thunar-standard-view.c:1633
 msgid "Pattern:"
 msgstr "ãƒ‘ã‚¿ãƒ¼ãƒ³:"
 
-#: ../thunar/thunar-standard-view.c:2087
+#: ../thunar/thunar-standard-view.c:2144
 #, fuzzy, c-format
 msgid "Failed to open directory `%s'"
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€ %s ã‚’é–‹ã‘ã¾ã›ã‚“ã€‚"
 
-#: ../thunar/thunar-standard-view.c:2387
+#: ../thunar/thunar-standard-view.c:2444
 #, fuzzy
 msgid "_Copy File"
 msgid_plural "_Copy Files"
 msgstr[0] "ã‚³ãƒ”ãƒ¼(_C)"
 
-#: ../thunar/thunar-standard-view.c:2393
+#: ../thunar/thunar-standard-view.c:2450
 #, fuzzy
 msgid "Cu_t File"
 msgid_plural "Cu_t Files"
 msgstr[0] "åˆ‡ã‚Šå–ã‚Š(_T)"
 
-#: ../thunar/thunar-standard-view.c:2402
+#: ../thunar/thunar-standard-view.c:2459
 #, fuzzy
 msgid "_Delete File"
 msgid_plural "_Delete Files"
@@ -1163,7 +1172,7 @@ msgstr "æŠ˜ã‚Šè¿”ã—å¹…ã§ã™"
 msgid "Text to be displayed in the statusbar associated with this view"
 msgstr "ã“ã®è¡¨ç¤ºã«é–¢é€£ä»˜ã‘ã‚‰ã‚ŒãŸã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ãƒãƒ¼ã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒ†ã‚ã‚¹ãƒˆã§ã™"
 
-#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:233
+#: ../thunar/thunar-view.c:125 ../thunar/thunar-window.c:237
 msgid "UI manager"
 msgstr "UI ãƒžãƒãƒ¼ã‚¸ãƒ£"
 
@@ -1171,149 +1180,158 @@ msgstr "UI ãƒžãƒãƒ¼ã‚¸ãƒ£"
 msgid "UI manager of the surrounding window"
 msgstr "ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’å›²ã† UI ãƒžãƒãƒ¼ã‚¸ãƒ£ã§ã™"
 
-#: ../thunar/thunar-window.c:149
+#: ../thunar/thunar-window.c:152
 msgid "_File"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«(_F)"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open New _Window"
 msgstr "æ–°ã—ã„ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‹ã(_W)"
 
-#: ../thunar/thunar-window.c:150
+#: ../thunar/thunar-window.c:153
 msgid "Open a new Thunar window for the displayed location"
 msgstr "è¡¨ç¤ºã•ã‚Œã¦ã„ã‚‹å ´æ‰€ã® Thunar ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’æ–°ã—ãé–‹ãã¾ã™"
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close _All Windows"
 msgstr "å…¨ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã‚‹(_A)"
 
-#: ../thunar/thunar-window.c:151
+#: ../thunar/thunar-window.c:154
 msgid "Close all Thunar windows"
 msgstr "Thunar ã®å…¨ã¦ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã™"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "_Close"
 msgstr "é–‰ã˜ã‚‹(_C)"
 
-#: ../thunar/thunar-window.c:152
+#: ../thunar/thunar-window.c:155
 msgid "Close this window"
 msgstr "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’é–‰ã˜ã¾ã™"
 
-#: ../thunar/thunar-window.c:153
+#: ../thunar/thunar-window.c:156
 msgid "_Edit"
 msgstr "ç·¨é›†(_E)"
 
-#: ../thunar/thunar-window.c:154
+#: ../thunar/thunar-window.c:157
+#, fuzzy
+msgid "_Preferences"
+msgstr "ãƒ—ãƒãƒ‘ãƒ†ã‚£(_P)"
+
+#: ../thunar/thunar-window.c:157
+msgid "Edit Thunar Preferences"
+msgstr ""
+
+#: ../thunar/thunar-window.c:158
 msgid "_View"
 msgstr "è¡¨ç¤º(_V)"
 
-#: ../thunar/thunar-window.c:155
+#: ../thunar/thunar-window.c:159
 msgid "_Location Bar"
 msgstr "å ´æ‰€ãƒãƒ¼(_L)"
 
-#: ../thunar/thunar-window.c:156
+#: ../thunar/thunar-window.c:160
 msgid "_Side Pane"
 msgstr "ã‚µã‚¤ãƒ‰ãƒšã‚¤ãƒ³(_S)"
 
-#: ../thunar/thunar-window.c:157
+#: ../thunar/thunar-window.c:161
 msgid "_Go"
 msgstr "ç§»å‹•(_G)"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open _Parent"
 msgstr "è¦ªãƒ•ã‚©ãƒ«ãƒ€ã‚’é–‹ã(_P)"
 
-#: ../thunar/thunar-window.c:158
+#: ../thunar/thunar-window.c:162
 msgid "Open the parent folder"
 msgstr "è¦ªãƒ•ã‚©ãƒ«ãƒ€ã‚’é–‹ãã¾ã™"
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "_Home"
 msgstr "ãƒ›ãƒ¼ãƒ "
 
-#: ../thunar/thunar-window.c:159
+#: ../thunar/thunar-window.c:163
 #, fuzzy
 msgid "Open the home folder"
 msgstr "è¦ªãƒ•ã‚©ãƒ«ãƒ€ã‚’é–‹ãã¾ã™"
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Open _Location..."
 msgstr "å ´æ‰€ã‚’é–‹ã(_L)..."
 
-#: ../thunar/thunar-window.c:160
+#: ../thunar/thunar-window.c:164
 msgid "Specify a location to open"
 msgstr "é–‹ãå ´æ‰€ã‚’æŒ‡å®šã—ã¾ã™"
 
-#: ../thunar/thunar-window.c:161
+#: ../thunar/thunar-window.c:165
 msgid "_Help"
 msgstr "ãƒ˜ãƒ«ãƒ—(_H)"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "_About"
 msgstr "ã“ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«ã¤ã„ã¦(_A)"
 
-#: ../thunar/thunar-window.c:163 ../thunar/thunar-window.c:165
+#: ../thunar/thunar-window.c:167 ../thunar/thunar-window.c:169
 msgid "Display information about Thunar"
 msgstr "Thunar ã«ã¤ã„ã¦ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 #, fuzzy
 msgid "Show _Hidden Files"
 msgstr "éš ã—ãƒ•ã‚¡ã‚¤ãƒ«ã‚’è¡¨ç¤º(_H)"
 
-#: ../thunar/thunar-window.c:171
+#: ../thunar/thunar-window.c:175
 msgid "Toggles the display of hidden files in the current window"
 msgstr "ç¾åœ¨ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã§éš ã—ãƒ•ã‚¡ã‚¤ãƒ«ã®è¡¨ç¤º/éžè¡¨ç¤ºã‚’åˆ‡ã‚Šæ›¿ãˆã¾ã™"
 
-#: ../thunar/thunar-window.c:206
+#: ../thunar/thunar-window.c:210
 msgid "The directory currently displayed within this window"
 msgstr "ç¾åœ¨ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦å†…ã«è¡¨ç¤ºã•ã‚Œã¦ã„ã‚‹ãƒ•ã‚©ãƒ«ãƒ€ã§ã™"
 
-#: ../thunar/thunar-window.c:234
+#: ../thunar/thunar-window.c:238
 msgid "The UI manager used within this window"
 msgstr "ã“ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦å†…ã§ä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹ UI ãƒžãƒãƒ¼ã‚¸ãƒ£ã§ã™"
 
 #.
 #. * add the side pane options
 #.
-#: ../thunar/thunar-window.c:289
+#: ../thunar/thunar-window.c:293
 msgid "_Favourites"
 msgstr "ãŠæ°—ã«å…¥ã‚Š(_F)"
 
-#: ../thunar/thunar-window.c:295 ../thunar/thunar-window.c:316
+#: ../thunar/thunar-window.c:299 ../thunar/thunar-window.c:320
 msgid "_Hidden"
 msgstr "éš ã™(_H)"
 
 #.
 #. * add the location bar options
 #.
-#: ../thunar/thunar-window.c:304
+#: ../thunar/thunar-window.c:308
 msgid "_Button Style"
 msgstr "ãƒœã‚¿ãƒ³å¼(_B)"
 
-#: ../thunar/thunar-window.c:310
+#: ../thunar/thunar-window.c:314
 msgid "_Traditional Style"
 msgstr "æ—§å¼(_T)"
 
 #.
 #. * add view options
 #.
-#: ../thunar/thunar-window.c:325
+#: ../thunar/thunar-window.c:329
 msgid "View as _Icons"
 msgstr "ã‚¢ã‚¤ã‚³ãƒ³è¡¨ç¤º(_I)"
 
-#: ../thunar/thunar-window.c:331
+#: ../thunar/thunar-window.c:335
 msgid "View as _Detailed List"
 msgstr "è©³ç´°ãƒªã‚¹ãƒˆè¡¨ç¤º(_D)"
 
 #. display an error to the user
-#: ../thunar/thunar-window.c:738
+#: ../thunar/thunar-window.c:766
 #, fuzzy
 msgid "Failed to open home directory"
 msgstr "ãƒ•ã‚©ãƒ«ãƒ€ %s ã‚’é–‹ã‘ã¾ã›ã‚“ã€‚"
 
-#: ../thunar/thunar-window.c:815
+#: ../thunar/thunar-window.c:843
 msgid ""
 "Thunar is a fast and easy to use file manager\n"
 "for the Xfce Desktop Environment."
@@ -1321,7 +1339,7 @@ msgstr ""
 "Thunar ã¯ Xfce ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ç’°å¢ƒå‘ã‘ã®\n"
 "ä½¿ã„ã‚„ã™ã„è»½å¿«ãªãƒ•ã‚¡ã‚¤ãƒ«ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã§ã™"
 
-#: ../thunar/thunar-window.c:820
+#: ../thunar/thunar-window.c:848
 msgid "translator-credits"
 msgstr "Daichi Kawahata <daichi@xfce.org>"
 
@@ -1353,6 +1371,10 @@ msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼"
 msgid "Thunar File Manager"
 msgstr "Thunar ãƒ•ã‚¡ã‚¤ãƒ«ãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼"
 
+#, fuzzy
+#~ msgid "Select by _Pattern"
+#~ msgstr "ãƒ‘ã‚¿ãƒ¼ãƒ³ã§é¸æŠž(_P)"
+
 #~ msgid "The application \"%s\" supports only local documents."
 #~ msgstr "ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ \"%s\" ã¯ãƒãƒ¼ã‚«ãƒ«æ–‡æ›¸ã®ã¿ã‚µãƒãƒ¼ãƒˆã—ã¾ã™ã€‚"
 
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 9d09ad8ade2160b80734136d72285d57c9698df9..e8dd6eb3c98d0565057d44b088725a21fd59e380 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -91,6 +91,8 @@ Thunar_SOURCES =							\
 	thunar-open-with-action.h					\
 	thunar-path-entry.c						\
 	thunar-path-entry.h						\
+	thunar-preferences-dialog.c					\
+	thunar-preferences-dialog.h					\
 	thunar-preferences.c						\
 	thunar-preferences.h						\
 	thunar-progress-dialog.c					\
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index f279eb61465cec579ed66f1ae1389e2fceea58f9..e3f02f0e49824eb2d6e5e1c1a07b83fda0ba54b7 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -213,13 +213,14 @@ thunar_details_view_get_accessible (GtkWidget *widget)
   AtkObject *object;
 
   /* query the atk object for the tree view class */
-  object = GTK_WIDGET_CLASS (thunar_details_view_parent_class)->get_accessible (widget);
+  object = (*GTK_WIDGET_CLASS (thunar_details_view_parent_class)->get_accessible) (widget);
 
   /* set custom Atk properties for the details view */
   if (G_LIKELY (object != NULL))
     {
-      atk_object_set_name (object, _("Details view"));
       atk_object_set_description (object, _("Detailed directory listing"));
+      atk_object_set_name (object, _("Details view"));
+      atk_object_set_role (object, ATK_ROLE_DIRECTORY_PANE);
     }
 
   return object;
diff --git a/thunar/thunar-icon-view.c b/thunar/thunar-icon-view.c
index 60d30c899acaf2eaf99513fe7fd8c83ac52eca16..488b31e62c4cffe7d13ce25118254e1a71379d38 100644
--- a/thunar/thunar-icon-view.c
+++ b/thunar/thunar-icon-view.c
@@ -33,8 +33,21 @@
 
 
 
+/* Property identifiers */
+enum
+{
+  PROP_0,
+  PROP_TEXT_BESIDE_ICONS,
+};
+
+
+
 static void         thunar_icon_view_class_init             (ThunarIconViewClass *klass);
 static void         thunar_icon_view_init                   (ThunarIconView      *icon_view);
+static void         thunar_icon_view_set_property           (GObject             *object,
+                                                             guint                prop_id,
+                                                             const GValue        *value,
+                                                             GParamSpec          *pspec);
 static AtkObject   *thunar_icon_view_get_accessible         (GtkWidget           *widget);
 static void         thunar_icon_view_connect_ui_manager     (ThunarStandardView  *standard_view,
                                                              GtkUIManager        *ui_manager);
@@ -136,6 +149,10 @@ thunar_icon_view_class_init (ThunarIconViewClass *klass)
 {
   ThunarStandardViewClass *thunarstandard_view_class;
   GtkWidgetClass          *gtkwidget_class;
+  GObjectClass            *gobject_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->set_property = thunar_icon_view_set_property;
 
   gtkwidget_class = GTK_WIDGET_CLASS (klass);
   gtkwidget_class->get_accessible = thunar_icon_view_get_accessible;
@@ -151,6 +168,20 @@ thunar_icon_view_class_init (ThunarIconViewClass *klass)
   thunarstandard_view_class->scroll_to_path = thunar_icon_view_scroll_to_path;
   thunarstandard_view_class->get_path_at_pos = thunar_icon_view_get_path_at_pos;
   thunarstandard_view_class->highlight_path = thunar_icon_view_highlight_path;
+
+  /**
+   * ThunarIconView::text-beside-icons:
+   *
+   * Write-only property to specify whether text should be
+   * display besides the icon rather than below.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_TEXT_BESIDE_ICONS,
+                                   g_param_spec_boolean ("text-beside-icons",
+                                                         _("Text beside icons"),
+                                                         _("Text beside icons"),
+                                                         FALSE,
+                                                         EXO_PARAM_WRITABLE));
 }
 
 
@@ -208,6 +239,40 @@ thunar_icon_view_init (ThunarIconView *icon_view)
   g_signal_connect (G_OBJECT (THUNAR_STANDARD_VIEW (icon_view)->model), "sort-column-changed",
                     G_CALLBACK (thunar_icon_view_sort_column_changed), icon_view);
   thunar_icon_view_sort_column_changed (GTK_TREE_SORTABLE (THUNAR_STANDARD_VIEW (icon_view)->model), icon_view);
+
+  /* synchronize the "text-beside-icons" property with the global preference */
+  exo_binding_new (G_OBJECT (THUNAR_STANDARD_VIEW (icon_view)->preferences), "default-text-beside-icons", G_OBJECT (icon_view), "text-beside-icons");
+}
+
+
+
+static void
+thunar_icon_view_set_property (GObject      *object,
+                               guint         prop_id,
+                               const GValue *value,
+                               GParamSpec   *pspec)
+{
+  ThunarStandardView *standard_view = THUNAR_STANDARD_VIEW (object);
+
+  switch (prop_id)
+    {
+    case PROP_TEXT_BESIDE_ICONS:
+      if (G_UNLIKELY (g_value_get_boolean (value)))
+        {
+          exo_icon_view_set_orientation (EXO_ICON_VIEW (GTK_BIN (standard_view)->child), GTK_ORIENTATION_HORIZONTAL);
+          g_object_set (G_OBJECT (standard_view->name_renderer), "yalign", 0.5f, NULL);
+        }
+      else
+        {
+          exo_icon_view_set_orientation (EXO_ICON_VIEW (GTK_BIN (standard_view)->child), GTK_ORIENTATION_VERTICAL);
+          g_object_set (G_OBJECT (standard_view->name_renderer), "yalign", 0.0f, NULL);
+        }
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
 }
 
 
@@ -218,13 +283,14 @@ thunar_icon_view_get_accessible (GtkWidget *widget)
   AtkObject *object;
 
   /* query the atk object for the icon view class */
-  object = GTK_WIDGET_CLASS (thunar_icon_view_parent_class)->get_accessible (widget);
+  object = (*GTK_WIDGET_CLASS (thunar_icon_view_parent_class)->get_accessible) (widget);
 
   /* set custom Atk properties for the icon view */
   if (G_LIKELY (object != NULL))
     {
-      atk_object_set_name (object, _("Icon view"));
       atk_object_set_description (object, _("Icon based directory listing"));
+      atk_object_set_name (object, _("Icon view"));
+      atk_object_set_role (object, ATK_ROLE_DIRECTORY_PANE);
     }
 
   return object;
diff --git a/thunar/thunar-preferences-dialog.c b/thunar/thunar-preferences-dialog.c
new file mode 100644
index 0000000000000000000000000000000000000000..3cde958f80574ab72f47d0b6b468f3391ea8aa6e
--- /dev/null
+++ b/thunar/thunar-preferences-dialog.c
@@ -0,0 +1,284 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <exo/exo.h>
+
+#include <thunar/thunar-details-view.h>
+#include <thunar/thunar-icon-view.h>
+#include <thunar/thunar-preferences-dialog.h>
+#include <thunar/thunar-preferences.h>
+
+
+
+static void thunar_preferences_dialog_class_init (ThunarPreferencesDialogClass *klass);
+static void thunar_preferences_dialog_init       (ThunarPreferencesDialog      *dialog);
+static void thunar_preferences_dialog_finalize   (GObject                      *object);
+static void thunar_preferences_dialog_response   (GtkDialog                    *dialog,
+                                                  gint                          response);
+
+
+
+struct _ThunarPreferencesDialogClass
+{
+  GtkDialogClass __parent__;
+};
+
+struct _ThunarPreferencesDialog
+{
+  GtkDialog __parent__;
+
+  ThunarPreferences *preferences;
+  GtkTooltips       *tooltips;
+};
+
+
+
+G_DEFINE_TYPE (ThunarPreferencesDialog, thunar_preferences_dialog, GTK_TYPE_DIALOG);
+
+
+
+static gboolean
+transform_view_string_to_index (const GValue *src_value,
+                                GValue       *dst_value,
+                                gpointer      user_data)
+{
+  GType type;
+
+  type = g_type_from_name (g_value_get_string (src_value));
+  if (type == THUNAR_TYPE_ICON_VIEW)
+    g_value_set_int (dst_value, 0);
+  else if (type == THUNAR_TYPE_DETAILS_VIEW)
+    g_value_set_int (dst_value, 1);
+  else
+    g_value_set_int (dst_value, 2);
+
+  return TRUE;
+}
+
+
+
+static gboolean
+transform_view_index_to_string (const GValue *src_value,
+                                GValue       *dst_value,
+                                gpointer      user_data)
+{
+  switch (g_value_get_int (src_value))
+    {
+    case 0:
+      g_value_set_static_string (dst_value, g_type_name (THUNAR_TYPE_ICON_VIEW));
+      break;
+
+    case 1:
+      g_value_set_static_string (dst_value, g_type_name (THUNAR_TYPE_DETAILS_VIEW));
+      break;
+
+    default:
+      g_value_set_static_string (dst_value, g_type_name (G_TYPE_NONE));
+      break;
+    }
+
+  return TRUE;
+}
+
+
+
+static void
+thunar_preferences_dialog_class_init (ThunarPreferencesDialogClass *klass)
+{
+  GtkDialogClass *gtkdialog_class;
+  GObjectClass   *gobject_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = thunar_preferences_dialog_finalize;
+
+  gtkdialog_class = GTK_DIALOG_CLASS (klass);
+  gtkdialog_class->response = thunar_preferences_dialog_response;
+}
+
+
+
+static void
+thunar_preferences_dialog_init (ThunarPreferencesDialog *dialog)
+{
+  AtkRelationSet *relations;
+  AtkRelation    *relation;
+  AtkObject      *object;
+  GtkWidget      *button;
+  GtkWidget      *combo;
+  GtkWidget      *frame;
+  GtkWidget      *label;
+  GtkWidget      *table;
+  GtkWidget      *vbox;
+
+  /* grab a reference on the preferences */
+  dialog->preferences = thunar_preferences_get ();
+
+  /* allocate new tooltips for this dialog */
+  dialog->tooltips = gtk_tooltips_new ();
+  g_object_ref (G_OBJECT (dialog->tooltips));
+  gtk_object_sink (GTK_OBJECT (dialog->tooltips));
+
+  /* configure the dialog properties */
+  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
+  gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
+  gtk_window_set_title (GTK_WINDOW (dialog), _("File Manager Preferences"));
+
+  /* add "Help" and "Close" buttons */
+  gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+                          GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+                          GTK_STOCK_HELP, GTK_RESPONSE_HELP,
+                          NULL);
+
+  vbox = g_object_new (GTK_TYPE_VBOX, "border-width", 12, "spacing", 12, NULL);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = g_object_new (GTK_TYPE_LABEL, "label", _("<b>Default View</b>"), "use-markup", TRUE, NULL);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (3, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  label = gtk_label_new_with_mnemonic (_("View _new folders using:"));
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (label);
+
+  combo = gtk_combo_box_new_text ();
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Icon View"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Detailed List View"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Last Active View"));
+  g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (g_object_notify), "active");
+  exo_mutual_binding_new_full (G_OBJECT (dialog->preferences), "default-view", G_OBJECT (combo), "active",
+                               transform_view_string_to_index, transform_view_index_to_string, NULL, NULL);
+  gtk_table_attach (GTK_TABLE (table), combo, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
+  gtk_widget_show (combo);
+
+  /* set Atk label relation for the combo */
+  object = gtk_widget_get_accessible (combo);
+  relations = atk_object_ref_relation_set (gtk_widget_get_accessible (label));
+  relation = atk_relation_new (&object, 1, ATK_RELATION_LABEL_FOR);
+  atk_relation_set_add (relations, relation);
+  g_object_unref (G_OBJECT (relation));
+
+  button = gtk_check_button_new_with_mnemonic (_("Sort _folders before files"));
+  exo_mutual_binding_new (G_OBJECT (dialog->preferences), "default-folders-first", G_OBJECT (button), "active");
+  gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to list folders before files when you sort a folder."), NULL);
+  gtk_table_attach (GTK_TABLE (table), button, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  button = gtk_check_button_new_with_mnemonic (_("Show hidden and _backup files"));
+  exo_mutual_binding_new (G_OBJECT (dialog->preferences), "default-show-hidden", G_OBJECT (button), "active");
+  gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to show hidden and backup files in new windows. "
+                                                    "The first character in a hidden filename is a period (.). The last "
+                                                    "character in a backup filename is a tilde (~)."), NULL);
+  gtk_table_attach (GTK_TABLE (table), button, 0, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  frame = g_object_new (GTK_TYPE_FRAME, "border-width", 0, "shadow-type", GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = g_object_new (GTK_TYPE_LABEL, "label", _("<b>Icon View</b>"), "use-markup", TRUE, NULL);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (1, 1, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  button = gtk_check_button_new_with_mnemonic (_("_Text beside icons"));
+  exo_mutual_binding_new (G_OBJECT (dialog->preferences), "default-text-beside-icons", G_OBJECT (button), "active");
+  gtk_tooltips_set_tip (dialog->tooltips, button, _("Select this option to place the icon captions for items "
+                                                    "beside the icon rather than below the icon."), NULL);
+  gtk_table_attach (GTK_TABLE (table), button, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+}
+
+
+
+static void
+thunar_preferences_dialog_finalize (GObject *object)
+{
+  ThunarPreferencesDialog *dialog = THUNAR_PREFERENCES_DIALOG (object);
+
+  /* release our reference on the preferences */
+  g_object_unref (G_OBJECT (dialog->preferences));
+
+  /* release our reference on the tooltips */
+  g_object_unref (G_OBJECT (dialog->tooltips));
+
+  (*G_OBJECT_CLASS (thunar_preferences_dialog_parent_class)->finalize) (object);
+}
+
+
+
+static void
+thunar_preferences_dialog_response (GtkDialog *dialog,
+                                    gint       response)
+{
+  if (G_UNLIKELY (response == GTK_RESPONSE_HELP))
+    {
+      // FIXME: Bring up the documentation browser
+    }
+  else
+    {
+      gtk_widget_destroy (GTK_WIDGET (dialog));
+    }
+}
+
+
+
+/**
+ * thunar_preferences_dialog_new:
+ * @parent : a #GtkWindow or %NULL.
+ *
+ * Allocates a new #ThunarPreferencesDialog widget.
+ *
+ * Return value: the newly allocated #ThunarPreferencesDialog.
+ **/
+GtkWidget*
+thunar_preferences_dialog_new (GtkWindow *parent)
+{
+  GtkWidget *dialog;
+
+  dialog = g_object_new (THUNAR_TYPE_PREFERENCES_DIALOG, NULL);
+  if (G_LIKELY (parent != NULL))
+    gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+
+  return dialog;
+}
+
diff --git a/thunar/thunar-preferences-dialog.h b/thunar/thunar-preferences-dialog.h
new file mode 100644
index 0000000000000000000000000000000000000000..5fb6e263f55ef6d599e45d158954315b6cdf1fc4
--- /dev/null
+++ b/thunar/thunar-preferences-dialog.h
@@ -0,0 +1,43 @@
+/* $Id$ */
+/*-
+ * Copyright (c) 2005 Benedikt Meurer <benny@xfce.org>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef __THUNAR_PREFERENCES_DIALOG_H__
+#define __THUNAR_PREFERENCES_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS;
+
+typedef struct _ThunarPreferencesDialogClass ThunarPreferencesDialogClass;
+typedef struct _ThunarPreferencesDialog      ThunarPreferencesDialog;
+
+#define THUNAR_TYPE_PREFERENCES_DIALOG            (thunar_preferences_dialog_get_type ())
+#define THUNAR_PREFERENCES_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_TYPE_PREFERENCES_DIALOG, ThunarPreferencesDialog))
+#define THUNAR_PREFERENCES_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_TYPE_PREFERENCES_DIALOG, ThunarPreferencesDialogClass))
+#define THUNAR_IS_PREFERENCES_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_TYPE_PREFERENCES_DIALOG))
+#define THUNAR_IS_PREFERENCES_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_TYPE_PREFERENCES_DIALOG))
+#define THUNAR_PREFERENCES_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_TYPE_PREFERENCES_DIALOG, ThunarPreferencesDialogClass))
+
+GType      thunar_preferences_dialog_get_type (void) G_GNUC_CONST;
+
+GtkWidget *thunar_preferences_dialog_new      (GtkWindow *parent) G_GNUC_MALLOC;
+
+G_END_DECLS;
+
+#endif /* !__THUNAR_PREFERENCES_DIALOG_H__ */
diff --git a/thunar/thunar-preferences.c b/thunar/thunar-preferences.c
index 0cd1b355ccf195434ed87bd7c13b34a42b34e068..9ab063d98b8219126d0d957c36b3cffcdcf2a537 100644
--- a/thunar/thunar-preferences.c
+++ b/thunar/thunar-preferences.c
@@ -50,7 +50,10 @@
 enum
 {
   PROP_0,
+  PROP_DEFAULT_FOLDERS_FIRST,
   PROP_DEFAULT_SHOW_HIDDEN,
+  PROP_DEFAULT_TEXT_BESIDE_ICONS,
+  PROP_DEFAULT_VIEW,
   PROP_LAST_LOCATION_BAR,
   PROP_LAST_SIDE_PANE,
   PROP_LAST_VIEW,
@@ -105,6 +108,19 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
   /* register additional transformation functions */
   thunar_g_initialize_transformations ();
 
+  /**
+   * ThunarPreferences::default-folders-first:
+   *
+   * Whether to sort folders before files.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_DEFAULT_FOLDERS_FIRST,
+                                   g_param_spec_boolean ("default-folders-first",
+                                                         "default-folders-first",
+                                                         "default-folders-first",
+                                                         TRUE,
+                                                         EXO_PARAM_READWRITE));
+
   /**
    * ThunarPreferences::default-show-hidden:
    *
@@ -118,6 +134,35 @@ thunar_preferences_class_init (ThunarPreferencesClass *klass)
                                                          FALSE,
                                                          EXO_PARAM_READWRITE));
 
+  /**
+   * ThunarPreferences::default-text-beside-icons:
+   *
+   * Whether the icon view should display the file names beside the
+   * file icons instead of below the file icons.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_DEFAULT_TEXT_BESIDE_ICONS,
+                                   g_param_spec_boolean ("default-text-beside-icons",
+                                                         "default-text-beside-icons",
+                                                         "default-text-beside-icons",
+                                                         FALSE,
+                                                         EXO_PARAM_READWRITE));
+
+  /**
+   * ThunarPreferences::default-view:
+   *
+   * The name of the widget class, which should be used for the
+   * view pane in new #ThunarWindow<!---->s or "void" to use the
+   * last selected view from the "last-view" preference.
+   **/
+  g_object_class_install_property (gobject_class,
+                                   PROP_DEFAULT_VIEW,
+                                   g_param_spec_string ("default-view",
+                                                        "default-view",
+                                                        "default-view",
+                                                        "void",
+                                                        EXO_PARAM_READWRITE));
+
   /**
    * ThunarPreferences::last-location-bar:
    *
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index cf8655b4b0c314b6d38d6dbfd7b57db2d020ddfc..6efcc53c59748c257b9188579f4d6a47cbfc302e 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -263,7 +263,7 @@ static const GtkActionEntry action_entries[] =
   { "delete", GTK_STOCK_DELETE, N_ ("_Delete Files"), NULL, N_ ("Delete the selected files"), G_CALLBACK (thunar_standard_view_action_delete), },
   { "paste-into-folder", GTK_STOCK_PASTE, N_ ("Paste Files into Folder"), NULL, N_ ("Paste files into the selected folder"), G_CALLBACK (thunar_standard_view_action_paste_into_folder), },
   { "select-all-files", NULL, N_ ("Select _all Files"), "<control>A", N_ ("Select all files in this window"), G_CALLBACK (thunar_standard_view_action_select_all_files), },
-  { "select-by-pattern", NULL, N_ ("Select by _Pattern"), "<control>S", N_ ("Select all files that match a certain pattern"), G_CALLBACK (thunar_standard_view_action_select_by_pattern), },
+  { "select-by-pattern", NULL, N_ ("Select _by Pattern"), "<control>S", N_ ("Select all files that match a certain pattern"), G_CALLBACK (thunar_standard_view_action_select_by_pattern), },
   { "duplicate", NULL, N_ ("Du_plicate File"), NULL, N_ ("Duplicate each selected file"), G_CALLBACK (thunar_standard_view_action_duplicate), },
   { "make-link", NULL, N_ ("Ma_ke Link"), NULL, N_ ("Create a symbolic link for each selected file"), G_CALLBACK (thunar_standard_view_action_make_link), },
   { "rename", NULL, N_ ("_Rename"), "F2", N_ ("Rename the selected file"), G_CALLBACK (thunar_standard_view_action_rename), },
@@ -434,6 +434,9 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
   standard_view->priv = THUNAR_STANDARD_VIEW_GET_PRIVATE (standard_view);
   standard_view->priv->drag_timer_id = -1;
 
+  /* grab a reference on the preferences */
+  standard_view->preferences = thunar_preferences_get ();
+
   /* grab a reference on the extension manager */
   standard_view->priv->extension_manager = thunar_extension_manager_get_default ();
 
@@ -469,6 +472,7 @@ thunar_standard_view_init (ThunarStandardView *standard_view)
   /* setup the list model */
   standard_view->model = thunar_list_model_new ();
   g_signal_connect (G_OBJECT (standard_view->model), "error", G_CALLBACK (thunar_standard_view_error), standard_view);
+  exo_binding_new (G_OBJECT (standard_view->preferences), "default-folders-first", G_OBJECT (standard_view->model), "folders-first");
 
   /* setup the icon renderer */
   standard_view->icon_renderer = thunar_icon_renderer_new ();
@@ -603,6 +607,9 @@ thunar_standard_view_finalize (GObject *object)
       standard_view->priv->new_files_closure = NULL;
     }
 
+  /* release our reference on the preferences */
+  g_object_unref (G_OBJECT (standard_view->preferences));
+
   /* disconnect from the list model */
   g_signal_handlers_disconnect_matched (G_OBJECT (standard_view->model), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, standard_view);
   g_object_unref (G_OBJECT (standard_view->model));
diff --git a/thunar/thunar-standard-view.h b/thunar/thunar-standard-view.h
index 93984563f9721303606517fa76d7592f0973c2ac..5fea5c32caf140cc9766f5e9636a201362f02085 100644
--- a/thunar/thunar-standard-view.h
+++ b/thunar/thunar-standard-view.h
@@ -23,6 +23,7 @@
 #include <thunar/thunar-clipboard-manager.h>
 #include <thunar/thunar-icon-factory.h>
 #include <thunar/thunar-list-model.h>
+#include <thunar/thunar-preferences.h>
 #include <thunar/thunar-view.h>
 
 G_BEGIN_DECLS;
@@ -100,7 +101,7 @@ struct _ThunarStandardView
 {
   GtkScrolledWindow __parent__;
 
-  ThunarStandardViewPrivate *priv;
+  ThunarPreferences         *preferences;
 
   ThunarClipboardManager    *clipboard;
   ThunarListModel           *model;
@@ -116,6 +117,8 @@ struct _ThunarStandardView
 
   ExoBinding                *loading_binding;
   gboolean                   loading;
+
+  ThunarStandardViewPrivate *priv;
 };
 
 GType thunar_standard_view_get_type           (void) G_GNUC_CONST;
diff --git a/thunar/thunar-window-ui.xml b/thunar/thunar-window-ui.xml
index e91a43b4fde29078046e8d5f57b66d409d413f54..dcc81bac7fe96b9627fdfc1ec3032033ebb43861 100644
--- a/thunar/thunar-window-ui.xml
+++ b/thunar/thunar-window-ui.xml
@@ -29,6 +29,8 @@
       <placeholder name="placeholder-edit-select-actions" />
       <separator />
       <placeholder name="placeholder-edit-alter-actions" />
+      <separator />
+      <menuitem action="preferences" name="preferences" />
     </menu>
 
     <menu action="view-menu" name="view-menu">
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 96109a86437ee498ccd7048aaeb6353b8c4bf4e5..f81f3f63143bf5bfdd6194b995c624b400defae6 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -32,6 +32,7 @@
 #include <thunar/thunar-location-buttons.h>
 #include <thunar/thunar-location-dialog.h>
 #include <thunar/thunar-location-entry.h>
+#include <thunar/thunar-preferences-dialog.h>
 #include <thunar/thunar-preferences.h>
 #include <thunar/thunar-statusbar.h>
 #include <thunar/thunar-window.h>
@@ -69,6 +70,8 @@ static void     thunar_window_action_close_all_windows    (GtkAction          *a
                                                            ThunarWindow       *window);
 static void     thunar_window_action_close                (GtkAction          *action,
                                                            ThunarWindow       *window);
+static void     thunar_window_action_preferences          (GtkAction          *action,
+                                                           ThunarWindow       *window);
 static void     thunar_window_action_location_bar_changed (GtkRadioAction     *action,
                                                            GtkRadioAction     *current,
                                                            ThunarWindow       *window);
@@ -151,6 +154,7 @@ static const GtkActionEntry action_entries[] =
   { "close-all-windows", NULL, N_ ("Close _All Windows"), "<control><shift>W", N_ ("Close all Thunar windows"), G_CALLBACK (thunar_window_action_close_all_windows), },
   { "close", GTK_STOCK_CLOSE, N_ ("_Close"), "<control>W", N_ ("Close this window"), G_CALLBACK (thunar_window_action_close), },
   { "edit-menu", NULL, N_ ("_Edit"), NULL, },
+  { "preferences", GTK_STOCK_PREFERENCES, N_ ("_Preferences"), NULL, N_ ("Edit Thunar Preferences"), G_CALLBACK (thunar_window_action_preferences), },
   { "view-menu", NULL, N_ ("_View"), NULL, },
   { "view-location-bar-menu", NULL, N_ ("_Location Bar"), NULL, },
   { "view-side-pane-menu", NULL, N_ ("_Side Pane"), NULL, },
@@ -402,11 +406,19 @@ thunar_window_init (ThunarWindow *window)
   g_signal_connect (G_OBJECT (action), "changed", G_CALLBACK (thunar_window_action_location_bar_changed), window);
   thunar_window_action_location_bar_changed (GTK_RADIO_ACTION (action), GTK_RADIO_ACTION (action), window);
 
-  /* determine the selected view */
-  g_object_get (G_OBJECT (window->preferences), "last-view", &type_name, NULL);
+  /* determine the default view */
+  g_object_get (G_OBJECT (window->preferences), "default-view", &type_name, NULL);
   type = g_type_from_name (type_name);
   g_free (type_name);
 
+  /* determine the last selected view if we don't have a valid default */
+  if (!g_type_is_a (type, THUNAR_TYPE_VIEW))
+    {
+      g_object_get (G_OBJECT (window->preferences), "last-view", &type_name, NULL);
+      type = g_type_from_name (type_name);
+      g_free (type_name);
+    }
+
   /* activate the selected view */
   action = gtk_action_group_get_action (window->action_group, "view-as-icons");
   exo_gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), g_type_is_a (type, THUNAR_TYPE_VIEW) ? type : THUNAR_TYPE_ICON_VIEW);
@@ -583,6 +595,22 @@ thunar_window_action_close (GtkAction    *action,
 
 
 
+static void
+thunar_window_action_preferences (GtkAction    *action,
+                                  ThunarWindow *window)
+{
+  GtkWidget *dialog;
+
+  g_return_if_fail (GTK_IS_ACTION (action));
+  g_return_if_fail (THUNAR_IS_WINDOW (window));
+
+  /* allocate and display a preferences dialog */
+  dialog = thunar_preferences_dialog_new (GTK_WINDOW (window));
+  gtk_widget_show (dialog);
+}
+
+
+
 static void
 thunar_window_action_location_bar_changed (GtkRadioAction *action,
                                            GtkRadioAction *current,