[nautilus] Updated British English translation



commit 4f579bcdf37b188853ec1076954680bc91e175f6
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Tue Aug 31 16:14:30 2010 +0100

    Updated British English translation

 po/en_GB.po | 2619 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1390 insertions(+), 1229 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index a1c1022..dc5a11c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,21 +3,21 @@
 # This file is distributed under the same license as the nautilus package.
 # Abigail Brady <morwen evilmagic org>, Bastien Nocera <hadess hadess net>, 2003.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004
-# Bruce Cowan <bcowan fastmail co uk>, 2009, 2010.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010.`
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-24 16:53+0000\n"
-"PO-Revision-Date: 2010-02-24 16:55+0100\n"
-"Last-Translator: Bruce Cowan <bcowan fastmail co uk>\n"
+"POT-Creation-Date: 2010-08-31 16:14+0100\n"
+"PO-Revision-Date: 2010-08-31 16:20+0100\n"
+"Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Generator: Virtaal 0.6.1\n"
 
 #: ../cut-n-paste-code/libegg/eggdesktopfile.c:165
 #, c-format
@@ -187,8 +187,8 @@ msgid "Envy"
 msgstr "Envy"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:928
-#: ../src/nautilus-property-browser.c:1819
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:933
+#: ../src/nautilus-property-browser.c:1829
 msgid "Erase"
 msgstr "Erase"
 
@@ -388,11 +388,11 @@ msgstr "The buttons shown in the alert dialogue"
 msgid "Show more _details"
 msgstr "Show more _details"
 
-#: ../eel/eel-canvas.c:1227 ../eel/eel-canvas.c:1228
+#: ../eel/eel-canvas.c:1228 ../eel/eel-canvas.c:1229
 msgid "X"
 msgstr "X"
 
-#: ../eel/eel-canvas.c:1234 ../eel/eel-canvas.c:1235
+#: ../eel/eel-canvas.c:1235 ../eel/eel-canvas.c:1236
 msgid "Y"
 msgstr "Y"
 
@@ -444,11 +444,11 @@ msgid ""
 msgstr ""
 "The position of the opposite end of the selection from the cursor in chars."
 
-#: ../eel/eel-editable-label.c:3178
+#: ../eel/eel-editable-label.c:3201
 msgid "Select All"
 msgstr "Select All"
 
-#: ../eel/eel-editable-label.c:3189
+#: ../eel/eel-editable-label.c:3212
 msgid "Input Methods"
 msgstr "Input Methods"
 
@@ -494,8 +494,16 @@ msgstr ""
 "\", \"owner\", \"group\", \"permissions\", \"octal_permissions\" and "
 "\"mime_type\"."
 
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
+msgid ""
+"A string containing the saved geometry and coordinates string for navigation "
+"windows."
+msgstr ""
+"A string containing the saved geometry and coordinates string for navigation "
+"windows."
+
 #. TRANSLATORS: don't translate the zoom levels between quotes
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 #, no-c-format
 msgid ""
 "A string specifying how parts of overlong file names should be replaced by "
@@ -528,15 +536,15 @@ msgstr ""
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "All columns have same width"
 msgstr "All columns have same width"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid "Always use the location entry, instead of the pathbar"
 msgstr "Always use the location entry, instead of the pathbar"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid ""
 "An integer specifying how parts of overlong file names should be replaced by "
 "ellipses on the desktop. If the number is larger than 0, the file name will "
@@ -548,22 +556,22 @@ msgstr ""
 "not exceed the given number of lines. If the number is 0 or smaller, no "
 "limit is imposed on the number of displayed lines."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid ""
 "Color for the default folder background. Only used if background_set is true."
 msgstr ""
 "Colour for the default folder background. Only used if background_set is "
 "true."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
 msgid "Computer icon visible on desktop"
 msgstr "Computer icon visible on desktop"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Criteria for search bar searching"
 msgstr "Criteria for search bar searching"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid ""
 "Criteria when matching files searched for in the search bar. If set to "
 "\"search_by_text\", then Nautilus will Search for files by file name only. "
@@ -575,111 +583,111 @@ msgstr ""
 "If set to \"search_by_text_and_properties\", then Nautilus will search for "
 "files by file name and file properties."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
 msgid "Current Nautilus theme (deprecated)"
 msgstr "Current Nautilus theme (deprecated)"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Custom Background"
 msgstr "Custom Background"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Custom Side Pane Background Set"
 msgstr "Custom Side Pane Background Set"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Date Format"
 msgstr "Date Format"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Default Background Color"
 msgstr "Default Background Colour"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Default Background Filename"
 msgstr "Default Background Filename"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
 msgid "Default Side Pane Background Color"
 msgstr "Default Side Pane Background Colour"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
 msgid "Default Side Pane Background Filename"
 msgstr "Default Side Pane Background Filename"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
 msgid "Default Thumbnail Icon Size"
 msgstr "Default Thumbnail Icon Size"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Default column order in the list view"
 msgstr "Default column order in the list view"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid "Default column order in the list view."
 msgstr "Default column order in the list view."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid "Default compact view zoom level"
 msgstr "Default compact view zoom level"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Default folder viewer"
 msgstr "Default folder viewer"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Default icon zoom level"
 msgstr "Default icon zoom level"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid "Default list of columns visible in the list view"
 msgstr "Default list of columns visible in the list view"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid "Default list of columns visible in the list view."
 msgstr "Default list of columns visible in the list view."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid "Default list zoom level"
 msgstr "Default list zoom level"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid "Default sort order"
 msgstr "Default sort order"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "Default zoom level used by the compact view."
 msgstr "Default zoom level used by the compact view."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid "Default zoom level used by the icon view."
 msgstr "Default zoom level used by the icon view."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid "Default zoom level used by the list view."
 msgstr "Default zoom level used by the list view."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid "Desktop computer icon name"
 msgstr "Desktop computer icon name"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid "Desktop font"
 msgstr "Desktop font"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "Desktop home icon name"
 msgstr "Desktop home icon name"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid "Desktop trash icon name"
 msgstr "Desktop wastebasket icon name"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
 msgstr "Enables the classic Nautilus behaviour, where all windows are browsers"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
@@ -687,7 +695,7 @@ msgstr ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
@@ -695,7 +703,7 @@ msgstr ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "Folders over this size will be truncated to around this size. The purpose of "
 "this is to avoid unintentionally blowing the heap and killing Nautilus on "
@@ -707,7 +715,7 @@ msgstr ""
 "massive folders. A negative value denotes no limit. The limit is approximate "
 "due to the reading of folders chunk-wise."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
 "For users with mice that have \"Forward\" and \"Back\" buttons, this key "
 "will determine if any action is taken inside of Nautilus when either is "
@@ -717,7 +725,7 @@ msgstr ""
 "will determine if any action is taken inside of Nautilus when either is "
 "pressed."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
 "For users with mice that have buttons for \"Forward\" and \"Back\", this key "
 "will set which button activates the \"Back\" command in a browser window. "
@@ -727,7 +735,7 @@ msgstr ""
 "will set which button activates the \"Back\" command in a browser window. "
 "Possible values range between 6 and 14."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
 "For users with mice that have buttons for \"Forward\" and \"Back\", this key "
 "will set which button activates the \"Forward\" command in a browser window. "
@@ -737,11 +745,11 @@ msgstr ""
 "will set which button activates the \"Forward\" command in a browser window. "
 "Possible values range between 6 and 14."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid "Home icon visible on desktop"
 msgstr "Home icon visible on desktop"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid ""
 "If set to \"after_current_tab\", then new tabs are inserted after the "
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
@@ -751,7 +759,7 @@ msgstr ""
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
 "tab list."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
@@ -759,10 +767,6 @@ msgstr ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
-msgid "If set to true, newly opened windows will have the extra pane visible."
-msgstr "If set to true, newly opened windows will have the extra pane visible."
-
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
@@ -1125,42 +1129,38 @@ msgid "Show advanced permissions in the file property dialog"
 msgstr "Show advanced permissions in the file property dialogue"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:107
-msgid "Show extra pane in new windows"
-msgstr "Show extra pane in new windows"
-
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
 msgid "Show folders first in windows"
 msgstr "Show folders first in windows"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:108
 msgid "Show location bar in new windows"
 msgstr "Show location bar in new windows"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:109
 msgid "Show mounted volumes on the desktop"
 msgstr "Show mounted volumes on the desktop"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:111
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:110
 msgid "Show side pane in new windows"
 msgstr "Show side pane in new windows"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:112
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:111
 msgid "Show status bar in new windows"
 msgstr "Show status bar in new windows"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:112
 msgid "Show the package installer for unknown mime types"
 msgstr "Show the package installer for unknown MIME types"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:113
 msgid "Show toolbar in new windows"
 msgstr "Show toolbar in new windows"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:115
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:114
 msgid "Side pane view"
 msgstr "Side pane view"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:116
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:115
 msgid ""
 "Speed tradeoff for when to preview a sound file when mousing over a files "
 "icon. If set to \"always\" then always plays the sound, even if the file is "
@@ -1172,7 +1172,7 @@ msgstr ""
 "on a remote server. If set to \"local_only\" then only plays previews on "
 "local file systems. If set to \"never\" then it never previews sound."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:116
 msgid ""
 "Speed tradeoff for when to show a preview of text file contents in the "
 "file's icon. If set to \"always\" then always show previews, even if the "
@@ -1186,7 +1186,7 @@ msgstr ""
 "previews for local file systems. If set to \"never\" then never bother to "
 "read preview data."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:117
 msgid ""
 "Speed tradeoff for when to show an image file as a thumbnail. If set to "
 "\"always\" then always thumbnail, even if the folder is on a remote server. "
@@ -1200,7 +1200,7 @@ msgstr ""
 "If set to \"never\" then never bother to thumbnail images, just use a "
 "generic icon."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:119
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:118
 msgid ""
 "Speed tradeoff for when to show the number of items in a folder. If set to "
 "\"always\" then always show item counts, even if the folder is on a remote "
@@ -1212,15 +1212,15 @@ msgstr ""
 "server. If set to \"local_only\" then only show counts for local file "
 "systems. If set to \"never\" then never bother to compute item counts."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:120
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:119
 msgid "Text Ellipsis Limit"
 msgstr "Text Ellipsis Limit"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:121
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:120
 msgid "The default size of an icon for a thumbnail in the icon view."
 msgstr "The default size of an icon for a thumbnail in the icon view."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:121
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
@@ -1228,7 +1228,7 @@ msgstr ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\", \"modification_date\", and \"emblems\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:123
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:122
 msgid ""
 "The default sort-order for the items in the list view. Possible values are "
 "\"name\", \"size\", \"type\", and \"modification_date\"."
@@ -1236,15 +1236,15 @@ msgstr ""
 "The default sort-order for the items in the list view. Possible values are "
 "\"name\", \"size\", \"type\", and \"modification_date\"."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:124
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:123
 msgid "The default width of the side pane in new windows."
 msgstr "The default width of the side pane in new windows."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:125
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:124
 msgid "The font description used for the icons on the desktop."
 msgstr "The font description used for the icons on the desktop."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:126
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:125
 msgid ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
@@ -1252,6 +1252,10 @@ msgstr ""
 "The format of file dates. Possible values are \"locale\", \"iso\", and "
 "\"informal\"."
 
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:126
+msgid "The geometry string for a navigation window."
+msgstr "The geometry string for a navigation window."
+
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
 msgid "The side pane view to show in newly opened windows."
 msgstr "The side pane view to show in newly opened windows."
@@ -1359,36 +1363,44 @@ msgid "Whether a custom default side pane background has been set."
 msgstr "Whether a custom default side pane background has been set."
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:146
+msgid "Whether the navigation window should be maximized by default."
+msgstr "Whether the navigation window should be maximised by default."
+
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:147
+msgid "Whether the navigation window should be maximized."
+msgstr "Whether the navigation window should be maximised."
+
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:148
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
 msgstr ""
 "Whether to ask for confirmation when deleting files, or emptying the "
 "Wastebasket"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:147
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:149
 msgid "Whether to automatically mount media"
 msgstr "Whether to automatically mount media"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:148
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:150
 msgid "Whether to automatically open a folder for automounted media"
 msgstr "Whether to automatically open a folder for automounted media"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:149
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:151
 msgid "Whether to enable immediate deletion"
 msgstr "Whether to enable immediate deletion"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:150
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:152
 msgid "Whether to preview sounds when mousing over an icon"
 msgstr "Whether to preview sounds when mousing over an icon"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:151
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:153
 msgid "Whether to show backup files"
 msgstr "Whether to show backup files"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:152
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:154
 msgid "Whether to show hidden files"
 msgstr "Whether to show hidden files"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:153
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:155
 msgid ""
 "Whether to show the user a package installer dialog in case an unknown mime "
 "type is opened, in order to search for an application to handle it."
@@ -1396,90 +1408,90 @@ msgstr ""
 "Whether to show the user a package installer dialogue in case an unknown "
 "MIME type is opened, in order to search for an application to handle it."
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:154
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:156
 msgid "Width of the side pane"
 msgstr "Width of the side pane"
 
-#: ../libnautilus-private/nautilus-autorun.c:488
+#: ../libnautilus-private/nautilus-autorun.c:489
 msgid "No applications found"
 msgstr "No applications found"
 
-#: ../libnautilus-private/nautilus-autorun.c:504
+#: ../libnautilus-private/nautilus-autorun.c:505
 msgid "Ask what to do"
 msgstr "Ask what to do"
 
-#: ../libnautilus-private/nautilus-autorun.c:520
+#: ../libnautilus-private/nautilus-autorun.c:521
 msgid "Do Nothing"
 msgstr "Do Nothing"
 
-#: ../libnautilus-private/nautilus-autorun.c:535
+#: ../libnautilus-private/nautilus-autorun.c:536
 #: ../data/nautilus-folder-handler.desktop.in.in.h:1
 msgid "Open Folder"
 msgstr "Open Folder"
 
-#: ../libnautilus-private/nautilus-autorun.c:567
+#: ../libnautilus-private/nautilus-autorun.c:568
 #: ../src/nautilus-x-content-bar.c:122
 #, c-format
 msgid "Open %s"
 msgstr "Open %s"
 
-#: ../libnautilus-private/nautilus-autorun.c:606
+#: ../libnautilus-private/nautilus-autorun.c:607
 msgid "Open with other Application..."
 msgstr "Open with Other Applicationâ?¦"
 
-#: ../libnautilus-private/nautilus-autorun.c:940
+#: ../libnautilus-private/nautilus-autorun.c:950
 msgid "You have just inserted an Audio CD."
 msgstr "You have just inserted an Audio CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:942
+#: ../libnautilus-private/nautilus-autorun.c:952
 msgid "You have just inserted an Audio DVD."
 msgstr "You have just inserted an Audio DVD."
 
-#: ../libnautilus-private/nautilus-autorun.c:944
+#: ../libnautilus-private/nautilus-autorun.c:954
 msgid "You have just inserted a Video DVD."
 msgstr "You have just inserted a Video DVD."
 
-#: ../libnautilus-private/nautilus-autorun.c:946
+#: ../libnautilus-private/nautilus-autorun.c:956
 msgid "You have just inserted a Video CD."
 msgstr "You have just inserted a Video CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:948
+#: ../libnautilus-private/nautilus-autorun.c:958
 msgid "You have just inserted a Super Video CD."
 msgstr "You have just inserted a Super Video CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:950
+#: ../libnautilus-private/nautilus-autorun.c:960
 msgid "You have just inserted a blank CD."
 msgstr "You have just inserted a blank CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:952
+#: ../libnautilus-private/nautilus-autorun.c:962
 msgid "You have just inserted a blank DVD."
 msgstr "You have just inserted a blank DVD."
 
-#: ../libnautilus-private/nautilus-autorun.c:954
+#: ../libnautilus-private/nautilus-autorun.c:964
 msgid "You have just inserted a blank Blu-Ray disc."
 msgstr "You have just inserted a blank Blu-Ray disc."
 
-#: ../libnautilus-private/nautilus-autorun.c:956
+#: ../libnautilus-private/nautilus-autorun.c:966
 msgid "You have just inserted a blank HD DVD."
 msgstr "You have just inserted a blank HD DVD."
 
-#: ../libnautilus-private/nautilus-autorun.c:958
+#: ../libnautilus-private/nautilus-autorun.c:968
 msgid "You have just inserted a Photo CD."
 msgstr "You have just inserted a Photo CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:960
+#: ../libnautilus-private/nautilus-autorun.c:970
 msgid "You have just inserted a Picture CD."
 msgstr "You have just inserted a Picture CD."
 
-#: ../libnautilus-private/nautilus-autorun.c:962
+#: ../libnautilus-private/nautilus-autorun.c:972
 msgid "You have just inserted a medium with digital photos."
 msgstr "You have just inserted a medium with digital photos."
 
-#: ../libnautilus-private/nautilus-autorun.c:964
+#: ../libnautilus-private/nautilus-autorun.c:974
 msgid "You have just inserted a digital audio player."
 msgstr "You have just inserted a digital audio player."
 
-#: ../libnautilus-private/nautilus-autorun.c:966
+#: ../libnautilus-private/nautilus-autorun.c:976
 msgid ""
 "You have just inserted a medium with software intended to be automatically "
 "started."
@@ -1488,15 +1500,15 @@ msgstr ""
 "started."
 
 #. fallback to generic greeting
-#: ../libnautilus-private/nautilus-autorun.c:969
+#: ../libnautilus-private/nautilus-autorun.c:979
 msgid "You have just inserted a medium."
 msgstr "You have just inserted a medium."
 
-#: ../libnautilus-private/nautilus-autorun.c:971
+#: ../libnautilus-private/nautilus-autorun.c:981
 msgid "Choose what application to launch."
 msgstr "Choose what application to launch."
 
-#: ../libnautilus-private/nautilus-autorun.c:980
+#: ../libnautilus-private/nautilus-autorun.c:990
 #, c-format
 msgid ""
 "Select how to open \"%s\" and whether to perform this action in the future "
@@ -1505,31 +1517,31 @@ msgstr ""
 "Select how to open \"%s\" and whether to perform this action in the future "
 "for other media of type \"%s\"."
 
-#: ../libnautilus-private/nautilus-autorun.c:1002
+#: ../libnautilus-private/nautilus-autorun.c:1017
 msgid "_Always perform this action"
 msgstr "_Always perform this action"
 
 #. name, stock id
 #. label, accelerator
 #. add the "Eject" menu item
-#: ../libnautilus-private/nautilus-autorun.c:1018
-#: ../src/file-manager/fm-directory-view.c:7290
-#: ../src/file-manager/fm-directory-view.c:7318
-#: ../src/file-manager/fm-directory-view.c:7399
-#: ../src/file-manager/fm-tree-view.c:1318
-#: ../src/nautilus-places-sidebar.c:2222
+#: ../libnautilus-private/nautilus-autorun.c:1033
+#: ../src/file-manager/fm-directory-view.c:7216
+#: ../src/file-manager/fm-directory-view.c:7244
+#: ../src/file-manager/fm-directory-view.c:7325
+#: ../src/file-manager/fm-tree-view.c:1278
+#: ../src/nautilus-places-sidebar.c:2280
 msgid "_Eject"
 msgstr "_Eject"
 
 #. name, stock id
 #. label, accelerator
 #. add the "Unmount" menu item
-#: ../libnautilus-private/nautilus-autorun.c:1029
-#: ../src/file-manager/fm-directory-view.c:7286
-#: ../src/file-manager/fm-directory-view.c:7314
-#: ../src/file-manager/fm-directory-view.c:7395
-#: ../src/file-manager/fm-tree-view.c:1309
-#: ../src/nautilus-places-sidebar.c:2215
+#: ../libnautilus-private/nautilus-autorun.c:1044
+#: ../src/file-manager/fm-directory-view.c:7212
+#: ../src/file-manager/fm-directory-view.c:7240
+#: ../src/file-manager/fm-directory-view.c:7321
+#: ../src/file-manager/fm-tree-view.c:1269
+#: ../src/nautilus-places-sidebar.c:2273
 msgid "_Unmount"
 msgstr "_Unmount"
 
@@ -1557,7 +1569,7 @@ msgstr "Paste the text stored on the clipboard"
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-clipboard.c:448
-#: ../src/file-manager/fm-directory-view.c:7228
+#: ../src/file-manager/fm-directory-view.c:7154
 msgid "Select _All"
 msgstr "Select _All"
 
@@ -1566,21 +1578,21 @@ msgstr "Select _All"
 msgid "Select all the text in a text field"
 msgstr "Select all the text in a text field"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:323
+#: ../libnautilus-private/nautilus-column-chooser.c:368
 msgid "Move _Up"
 msgstr "Move _Up"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:333
+#: ../libnautilus-private/nautilus-column-chooser.c:378
 msgid "Move Dow_n"
 msgstr "Move Dow_n"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:346
+#: ../libnautilus-private/nautilus-column-chooser.c:391
 msgid "Use De_fault"
 msgstr "Use De_fault"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:273
-#: ../src/file-manager/fm-list-view.c:1514
+#: ../src/file-manager/fm-list-view.c:1577
 msgid "Name"
 msgstr "Name"
 
@@ -1605,7 +1617,7 @@ msgid "The type of the file."
 msgstr "The type of the file."
 
 #: ../libnautilus-private/nautilus-column-utilities.c:65
-#: ../src/nautilus-image-properties-page.c:270
+#: ../src/nautilus-image-properties-page.c:275
 msgid "Date Modified"
 msgstr "Date Modified"
 
@@ -1638,7 +1650,7 @@ msgid "The group of the file."
 msgstr "The group of the file."
 
 #: ../libnautilus-private/nautilus-column-utilities.c:97
-#: ../src/file-manager/fm-properties-window.c:4789
+#: ../src/file-manager/fm-properties-window.c:4812
 msgid "Permissions"
 msgstr "Permissions"
 
@@ -1673,14 +1685,31 @@ msgstr "The SELinux security context of the file."
 #. TODO: Change after string freeze over
 #: ../libnautilus-private/nautilus-column-utilities.c:127
 #: ../libnautilus-private/nautilus-column-utilities.c:129
-#: ../src/nautilus-image-properties-page.c:346
+#: ../src/nautilus-image-properties-page.c:351
 #: ../src/nautilus-query-editor.c:117
 msgid "Location"
 msgstr "Location"
 
+#: ../libnautilus-private/nautilus-column-utilities.c:170
+msgid "Trashed On"
+msgstr "Moved to wastebasket on"
+
+#: ../libnautilus-private/nautilus-column-utilities.c:171
+msgid "Date when file was moved to the Trash"
+msgstr "Date when file was moved to the Wastebasket"
+
+#: ../libnautilus-private/nautilus-column-utilities.c:177
+msgid "Original Location"
+msgstr "Original Location"
+
+#: ../libnautilus-private/nautilus-column-utilities.c:178
+msgid "Original location of file before moved to the Trash"
+msgstr "Original location of file before moved to the Wastebasket"
+
 #: ../libnautilus-private/nautilus-customization-data.c:405
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:519
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:428
-#: ../src/nautilus-property-browser.c:1863
+#: ../src/nautilus-property-browser.c:1873
 msgid "Reset"
 msgstr "Reset"
 
@@ -1779,65 +1808,173 @@ msgstr "Sorry, unable to save custom emblem."
 msgid "Sorry, unable to save custom emblem name."
 msgstr "Sorry, unable to save custom emblem name."
 
-#: ../libnautilus-private/nautilus-file-operations.c:186
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:82
+msgid "An older"
+msgstr "An older"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:85
+msgid "A newer"
+msgstr "A newer"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:87
+msgid "Another"
+msgstr "Another"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:159
+#, c-format
+msgid "Merge folder \"%s\"?"
+msgstr "Merge folder \"%s\"?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:166
+#, c-format
+msgid ""
+"%s folder with the same name already exists in \"%s\".\n"
+"Merging will ask for confirmation before replacing any files in the folder "
+"that conflict with the files being copied."
+msgstr ""
+"%s folder with the same name already exists in \"%s\".\n"
+"Merging will ask for confirmation before replacing any files in the folder "
+"that conflict with the files being copied."
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:174
+#, c-format
+msgid "Replace folder \"%s\"?"
+msgstr "Replace folder \"%s\"?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:176
+#, c-format
+msgid ""
+"A folder with the same name already exists in \"%s\".\n"
+"Replacing it will remove all files in the folder."
+msgstr ""
+"A folder with the same name already exists in \"%s\".\n"
+"Replacing it will remove all files in the folder."
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:182
+#, c-format
+msgid "Replace file \"%s\"?"
+msgstr "Replace file \"%s\"?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:188
+#, c-format
+msgid ""
+"%s file with the same name already exists in \"%s\".\n"
+"Replacing it will overwrite its content."
+msgstr ""
+"%s file with the same name already exists in \"%s\".\n"
+"Replacing it will overwrite its content."
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:252
+msgid "Original file"
+msgstr "Original file"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:253
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:284
+#: ../src/file-manager/fm-properties-window.c:3311
+msgid "Size:"
+msgstr "Size:"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:256
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:287
+#: ../src/file-manager/fm-properties-window.c:3293
+msgid "Type:"
+msgstr "Type:"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:259
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:290
+msgid "Last modified:"
+msgstr "Last modified:"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:283
+msgid "Replace with"
+msgstr "Replace with"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:312
+msgid "Merge"
+msgstr "Merge"
+
+#. Setup the expander for the rename action
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:505
+msgid "_Select a new name for the destination"
+msgstr "_Select a new name for the destination"
+
+#. Setup the checkbox to apply the action to all files
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:531
+msgid "Apply this action to all files"
+msgstr "Apply this action to all files"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:542
+#: ../libnautilus-private/nautilus-file-operations.c:187
 msgid "_Skip"
 msgstr "_Skip"
 
-#: ../libnautilus-private/nautilus-file-operations.c:187
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:547
+msgid "Re_name"
+msgstr "Re_name"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:553
+msgid "Replace"
+msgstr "Replace"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:626
+msgid "File conflict"
+msgstr "File conflict"
+
+#: ../libnautilus-private/nautilus-file-operations.c:188
 msgid "S_kip All"
 msgstr "S_kip All"
 
-#: ../libnautilus-private/nautilus-file-operations.c:188
+#: ../libnautilus-private/nautilus-file-operations.c:189
 msgid "_Retry"
 msgstr "_Retry"
 
-#: ../libnautilus-private/nautilus-file-operations.c:189
+#: ../libnautilus-private/nautilus-file-operations.c:190
 msgid "Delete _All"
 msgstr "Delete _All"
 
-#: ../libnautilus-private/nautilus-file-operations.c:190
+#: ../libnautilus-private/nautilus-file-operations.c:191
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../libnautilus-private/nautilus-file-operations.c:191
+#: ../libnautilus-private/nautilus-file-operations.c:192
 msgid "Replace _All"
 msgstr "Replace _All"
 
-#: ../libnautilus-private/nautilus-file-operations.c:192
+#: ../libnautilus-private/nautilus-file-operations.c:193
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../libnautilus-private/nautilus-file-operations.c:193
+#: ../libnautilus-private/nautilus-file-operations.c:194
 msgid "Merge _All"
 msgstr "Merge _All"
 
-#: ../libnautilus-private/nautilus-file-operations.c:194
+#: ../libnautilus-private/nautilus-file-operations.c:195
 msgid "Copy _Anyway"
 msgstr "Copy _Anyway"
 
-#: ../libnautilus-private/nautilus-file-operations.c:279
+#: ../libnautilus-private/nautilus-file-operations.c:280
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] "%'d second"
 msgstr[1] "%'d seconds"
 
-#: ../libnautilus-private/nautilus-file-operations.c:284
-#: ../libnautilus-private/nautilus-file-operations.c:295
+#: ../libnautilus-private/nautilus-file-operations.c:285
+#: ../libnautilus-private/nautilus-file-operations.c:296
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d minute"
 msgstr[1] "%'d minutes"
 
-#: ../libnautilus-private/nautilus-file-operations.c:294
+#: ../libnautilus-private/nautilus-file-operations.c:295
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d hour"
 msgstr[1] "%'d hours"
 
-#: ../libnautilus-private/nautilus-file-operations.c:302
+#: ../libnautilus-private/nautilus-file-operations.c:303
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
@@ -1849,15 +1986,15 @@ msgstr[1] "approximately %'d hours"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:378
-#: ../libnautilus-private/nautilus-file.c:6198
-#: ../src/file-manager/fm-directory-view.c:10444
+#: ../libnautilus-private/nautilus-file-operations.c:379
+#: ../libnautilus-private/nautilus-file.c:6365
+#: ../src/file-manager/fm-directory-view.c:10336
 #, c-format
 msgid "Link to %s"
 msgstr "Link to %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:382
+#: ../libnautilus-private/nautilus-file-operations.c:383
 #, c-format
 msgid "Another link to %s"
 msgstr "Another link to %s"
@@ -1866,25 +2003,25 @@ msgstr "Another link to %s"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:398
+#: ../libnautilus-private/nautilus-file-operations.c:399
 #, c-format
 msgid "%'dst link to %s"
 msgstr "%'dst link to %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:402
+#: ../libnautilus-private/nautilus-file-operations.c:403
 #, c-format
 msgid "%'dnd link to %s"
 msgstr "%'dnd link to %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:406
+#: ../libnautilus-private/nautilus-file-operations.c:407
 #, c-format
 msgid "%'drd link to %s"
 msgstr "%'drd link to %s"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:410
+#: ../libnautilus-private/nautilus-file-operations.c:411
 #, c-format
 msgid "%'dth link to %s"
 msgstr "%'dth link to %s"
@@ -1894,12 +2031,12 @@ msgstr "%'dth link to %s"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:449
+#: ../libnautilus-private/nautilus-file-operations.c:450
 msgid " (copy)"
 msgstr " (copy)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:451
+#: ../libnautilus-private/nautilus-file-operations.c:452
 msgid " (another copy)"
 msgstr " (another copy)"
 
@@ -1907,36 +2044,36 @@ msgstr " (another copy)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:454
-#: ../libnautilus-private/nautilus-file-operations.c:456
-#: ../libnautilus-private/nautilus-file-operations.c:458
-#: ../libnautilus-private/nautilus-file-operations.c:468
+#: ../libnautilus-private/nautilus-file-operations.c:455
+#: ../libnautilus-private/nautilus-file-operations.c:457
+#: ../libnautilus-private/nautilus-file-operations.c:459
+#: ../libnautilus-private/nautilus-file-operations.c:469
 msgid "th copy)"
 msgstr "th copy)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:461
+#: ../libnautilus-private/nautilus-file-operations.c:462
 msgid "st copy)"
 msgstr "st copy)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:463
+#: ../libnautilus-private/nautilus-file-operations.c:464
 msgid "nd copy)"
 msgstr "nd copy)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:465
+#: ../libnautilus-private/nautilus-file-operations.c:466
 msgid "rd copy)"
 msgstr "rd copy)"
 
 #. localizers: appended to first file copy
-#: ../libnautilus-private/nautilus-file-operations.c:482
+#: ../libnautilus-private/nautilus-file-operations.c:483
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (copy)%s"
 
 #. localizers: appended to second file copy
-#: ../libnautilus-private/nautilus-file-operations.c:484
+#: ../libnautilus-private/nautilus-file-operations.c:485
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (another copy)%s"
@@ -1945,10 +2082,10 @@ msgstr "%s (another copy)%s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libnautilus-private/nautilus-file-operations.c:487
-#: ../libnautilus-private/nautilus-file-operations.c:489
-#: ../libnautilus-private/nautilus-file-operations.c:491
-#: ../libnautilus-private/nautilus-file-operations.c:505
+#: ../libnautilus-private/nautilus-file-operations.c:488
+#: ../libnautilus-private/nautilus-file-operations.c:490
+#: ../libnautilus-private/nautilus-file-operations.c:492
+#: ../libnautilus-private/nautilus-file-operations.c:506
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr "%s (%'dth copy)%s"
@@ -1958,40 +2095,40 @@ msgstr "%s (%'dth copy)%s"
 #. * strings look like "%s (copy %'d)%s".
 #.
 #. localizers: appended to x1st file copy
-#: ../libnautilus-private/nautilus-file-operations.c:499
+#: ../libnautilus-private/nautilus-file-operations.c:500
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr "%s (%'dst copy)%s"
 
 #. localizers: appended to x2nd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:501
+#: ../libnautilus-private/nautilus-file-operations.c:502
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr "%s (%'dnd copy)%s"
 
 #. localizers: appended to x3rd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:503
+#: ../libnautilus-private/nautilus-file-operations.c:504
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr "%s (%'drd copy)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:603
+#: ../libnautilus-private/nautilus-file-operations.c:604
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:611
+#: ../libnautilus-private/nautilus-file-operations.c:612
 #, c-format
 msgid " (%'d"
 msgstr " (%'d"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1298
+#: ../libnautilus-private/nautilus-file-operations.c:1299
 msgid "Are you sure you want to permanently delete \"%B\" from the trash?"
 msgstr ""
 "Are you sure you want to permanently delete \"%B\" from the wastebasket?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1301
+#: ../libnautilus-private/nautilus-file-operations.c:1302
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -2006,35 +2143,31 @@ msgstr[1] ""
 "Are you sure you want to permanently delete the %'d selected items from the "
 "wastebasket?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1311
-#: ../libnautilus-private/nautilus-file-operations.c:1379
+#: ../libnautilus-private/nautilus-file-operations.c:1312
+#: ../libnautilus-private/nautilus-file-operations.c:1378
 msgid "If you delete an item, it will be permanently lost."
 msgstr "If you delete an item, it will be permanently lost."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1331
-msgid "Empty all of the items from the trash?"
-msgstr "Empty all of the items from the wastebasket?"
+#: ../libnautilus-private/nautilus-file-operations.c:1332
+msgid "Empty all items from Trash?"
+msgstr "Empty all items from Wastebasket?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1335
-msgid ""
-"If you choose to empty the trash, all items in it will be permanently lost. "
-"Please note that you can also delete them separately."
-msgstr ""
-"If you choose to empty the wastebasket, all items in it will be permanently "
-"lost. Please note that you can also delete them separately."
+#: ../libnautilus-private/nautilus-file-operations.c:1336
+msgid "All items in the Trash will be permanently deleted."
+msgstr "All items in the Wastebasket will be permanently deleted."
 
 #. Empty Trash menu item
-#: ../libnautilus-private/nautilus-file-operations.c:1340
-#: ../libnautilus-private/nautilus-file-operations.c:2183
-#: ../src/nautilus-places-sidebar.c:2259 ../src/nautilus-trash-bar.c:125
+#: ../libnautilus-private/nautilus-file-operations.c:1339
+#: ../libnautilus-private/nautilus-file-operations.c:2191
+#: ../src/nautilus-places-sidebar.c:2317 ../src/nautilus-trash-bar.c:190
 msgid "Empty _Trash"
 msgstr "Empty _Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1367
+#: ../libnautilus-private/nautilus-file-operations.c:1366
 msgid "Are you sure you want to permanently delete \"%B\"?"
 msgstr "Are you sure you want to permanently delete \"%B\"?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1370
+#: ../libnautilus-private/nautilus-file-operations.c:1369
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -2042,35 +2175,35 @@ msgid_plural ""
 msgstr[0] "Are you sure you want to permanently delete the %'d selected item?"
 msgstr[1] "Are you sure you want to permanently delete the %'d selected items?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1413
+#: ../libnautilus-private/nautilus-file-operations.c:1412
 #, c-format
 msgid "%'d file left to delete"
 msgid_plural "%'d files left to delete"
 msgstr[0] "%'d file left to delete"
 msgstr[1] "%'d files left to delete"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1419
+#: ../libnautilus-private/nautilus-file-operations.c:1418
 msgid "Deleting files"
 msgstr "Deleting files"
 
 #. To translators: %T will expand to a time like "2 minutes".
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1433
+#: ../libnautilus-private/nautilus-file-operations.c:1432
 msgid "%T left"
 msgid_plural "%T left"
 msgstr[0] "%T left"
 msgstr[1] "%T left"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1500
-#: ../libnautilus-private/nautilus-file-operations.c:1534
-#: ../libnautilus-private/nautilus-file-operations.c:1573
-#: ../libnautilus-private/nautilus-file-operations.c:1650
-#: ../libnautilus-private/nautilus-file-operations.c:2410
+#: ../libnautilus-private/nautilus-file-operations.c:1499
+#: ../libnautilus-private/nautilus-file-operations.c:1533
+#: ../libnautilus-private/nautilus-file-operations.c:1572
+#: ../libnautilus-private/nautilus-file-operations.c:1649
+#: ../libnautilus-private/nautilus-file-operations.c:2436
 msgid "Error while deleting."
 msgstr "Error while deleting."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1504
+#: ../libnautilus-private/nautilus-file-operations.c:1503
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
@@ -2078,20 +2211,20 @@ msgstr ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1507
-#: ../libnautilus-private/nautilus-file-operations.c:2469
-#: ../libnautilus-private/nautilus-file-operations.c:3435
+#: ../libnautilus-private/nautilus-file-operations.c:1506
+#: ../libnautilus-private/nautilus-file-operations.c:2495
+#: ../libnautilus-private/nautilus-file-operations.c:3461
 msgid ""
 "There was an error getting information about the files in the folder \"%B\"."
 msgstr ""
 "There was an error getting information about the files in the folder \"%B\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1516
-#: ../libnautilus-private/nautilus-file-operations.c:3444
+#: ../libnautilus-private/nautilus-file-operations.c:1515
+#: ../libnautilus-private/nautilus-file-operations.c:3470
 msgid "_Skip files"
 msgstr "_Skip files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1537
+#: ../libnautilus-private/nautilus-file-operations.c:1536
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
@@ -2099,61 +2232,61 @@ msgstr ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1540
-#: ../libnautilus-private/nautilus-file-operations.c:2508
-#: ../libnautilus-private/nautilus-file-operations.c:3480
+#: ../libnautilus-private/nautilus-file-operations.c:1539
+#: ../libnautilus-private/nautilus-file-operations.c:2534
+#: ../libnautilus-private/nautilus-file-operations.c:3506
 msgid "There was an error reading the folder \"%B\"."
 msgstr "There was an error reading the folder \"%B\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1574
+#: ../libnautilus-private/nautilus-file-operations.c:1573
 msgid "Could not remove the folder %B."
 msgstr "Could not remove the folder %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1651
+#: ../libnautilus-private/nautilus-file-operations.c:1650
 msgid "There was an error deleting %B."
 msgstr "There was an error deleting %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1731
+#: ../libnautilus-private/nautilus-file-operations.c:1730
 msgid "Moving files to trash"
 msgstr "Moving files to the wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1733
+#: ../libnautilus-private/nautilus-file-operations.c:1732
 #, c-format
 msgid "%'d file left to trash"
 msgid_plural "%'d files left to trash"
 msgstr[0] "%'d file left to move to the wastebasket"
 msgstr[1] "%'d files left to move to the wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1783
+#: ../libnautilus-private/nautilus-file-operations.c:1782
 msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr ""
 "Cannot move file to the wastebasket, do you want to delete immediately?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1784
+#: ../libnautilus-private/nautilus-file-operations.c:1783
 msgid "The file \"%B\" cannot be moved to the trash."
 msgstr "The file \"%B\" cannot be moved to the wastebasket."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1959
+#: ../libnautilus-private/nautilus-file-operations.c:1958
 msgid "Trashing Files"
 msgstr "Moving Files to Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1961
+#: ../libnautilus-private/nautilus-file-operations.c:1960
 msgid "Deleting Files"
 msgstr "Deleting Files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2023
+#: ../libnautilus-private/nautilus-file-operations.c:2024
 msgid "Unable to eject %V"
 msgstr "Unable to eject %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2025
+#: ../libnautilus-private/nautilus-file-operations.c:2026
 msgid "Unable to unmount %V"
 msgstr "Unable to unmount %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2173
+#: ../libnautilus-private/nautilus-file-operations.c:2181
 msgid "Do you want to empty the trash before you unmount?"
 msgstr "Do you want to empty the wastebasket before you unmount?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2175
+#: ../libnautilus-private/nautilus-file-operations.c:2183
 msgid ""
 "In order to regain the free space on this volume the trash must be emptied. "
 "All trashed items on the volume will be permanently lost."
@@ -2161,61 +2294,61 @@ msgstr ""
 "In order to regain the free space on this volume the wastebasket must be "
 "emptied. All deleted items on the volume will be permanently lost."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2181
+#: ../libnautilus-private/nautilus-file-operations.c:2189
 msgid "Do _not Empty Trash"
 msgstr "Do _not Empty Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2280
+#: ../libnautilus-private/nautilus-file-operations.c:2305
 #, c-format
 msgid "Unable to mount %s"
 msgstr "Unable to mount %s"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2357
+#: ../libnautilus-private/nautilus-file-operations.c:2383
 #, c-format
 msgid "Preparing to copy %'d file (%S)"
 msgid_plural "Preparing to copy %'d files (%S)"
 msgstr[0] "Preparing to copy %'d file (%S)"
 msgstr[1] "Preparing to copy %'d files (%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2363
+#: ../libnautilus-private/nautilus-file-operations.c:2389
 #, c-format
 msgid "Preparing to move %'d file (%S)"
 msgid_plural "Preparing to move %'d files (%S)"
 msgstr[0] "Preparing to move %'d file (%S)"
 msgstr[1] "Preparing to move %'d files (%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2369
+#: ../libnautilus-private/nautilus-file-operations.c:2395
 #, c-format
 msgid "Preparing to delete %'d file (%S)"
 msgid_plural "Preparing to delete %'d files (%S)"
 msgstr[0] "Preparing to delete %'d file (%S)"
 msgstr[1] "Preparing to delete %'d files (%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2375
+#: ../libnautilus-private/nautilus-file-operations.c:2401
 #, c-format
 msgid "Preparing to trash %'d file"
 msgid_plural "Preparing to trash %'d files"
 msgstr[0] "Preparing to move %'d file to the wastebasket"
 msgstr[1] "Preparing to move %'d files to the wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2406
-#: ../libnautilus-private/nautilus-file-operations.c:3301
-#: ../libnautilus-private/nautilus-file-operations.c:3427
-#: ../libnautilus-private/nautilus-file-operations.c:3472
+#: ../libnautilus-private/nautilus-file-operations.c:2432
+#: ../libnautilus-private/nautilus-file-operations.c:3327
+#: ../libnautilus-private/nautilus-file-operations.c:3453
+#: ../libnautilus-private/nautilus-file-operations.c:3498
 msgid "Error while copying."
 msgstr "Error while copying."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2408
-#: ../libnautilus-private/nautilus-file-operations.c:3425
-#: ../libnautilus-private/nautilus-file-operations.c:3470
+#: ../libnautilus-private/nautilus-file-operations.c:2434
+#: ../libnautilus-private/nautilus-file-operations.c:3451
+#: ../libnautilus-private/nautilus-file-operations.c:3496
 msgid "Error while moving."
 msgstr "Error while moving."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2412
+#: ../libnautilus-private/nautilus-file-operations.c:2438
 msgid "Error while moving files to trash."
 msgstr "Error while moving files to the wastebasket."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2466
+#: ../libnautilus-private/nautilus-file-operations.c:2492
 msgid ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
@@ -2223,7 +2356,7 @@ msgstr ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2505
+#: ../libnautilus-private/nautilus-file-operations.c:2531
 msgid ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
@@ -2231,7 +2364,7 @@ msgstr ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2582
+#: ../libnautilus-private/nautilus-file-operations.c:2608
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
@@ -2239,30 +2372,30 @@ msgstr ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2585
+#: ../libnautilus-private/nautilus-file-operations.c:2611
 msgid "There was an error getting information about \"%B\"."
 msgstr "There was an error getting information about \"%B\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2685
-#: ../libnautilus-private/nautilus-file-operations.c:2727
-#: ../libnautilus-private/nautilus-file-operations.c:2760
-#: ../libnautilus-private/nautilus-file-operations.c:2790
+#: ../libnautilus-private/nautilus-file-operations.c:2711
+#: ../libnautilus-private/nautilus-file-operations.c:2753
+#: ../libnautilus-private/nautilus-file-operations.c:2786
+#: ../libnautilus-private/nautilus-file-operations.c:2816
 msgid "Error while copying to \"%B\"."
 msgstr "Error while copying to \"%B\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2689
+#: ../libnautilus-private/nautilus-file-operations.c:2715
 msgid "You do not have permissions to access the destination folder."
 msgstr "You do not have permissions to access the destination folder."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2691
+#: ../libnautilus-private/nautilus-file-operations.c:2717
 msgid "There was an error getting information about the destination."
 msgstr "There was an error getting information about the destination."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2728
+#: ../libnautilus-private/nautilus-file-operations.c:2754
 msgid "The destination is not a folder."
 msgstr "The destination is not a folder."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2761
+#: ../libnautilus-private/nautilus-file-operations.c:2787
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
@@ -2270,58 +2403,58 @@ msgstr ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2763
+#: ../libnautilus-private/nautilus-file-operations.c:2789
 #, c-format
 msgid "There is %S available, but %S is required."
 msgstr "There is %S available, but %S is required."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2791
+#: ../libnautilus-private/nautilus-file-operations.c:2817
 msgid "The destination is read-only."
 msgstr "The destination is read-only."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2850
+#: ../libnautilus-private/nautilus-file-operations.c:2876
 msgid "Moving \"%B\" to \"%B\""
 msgstr "Moving \"%B\" to \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:2851
+#: ../libnautilus-private/nautilus-file-operations.c:2877
 msgid "Copying \"%B\" to \"%B\""
 msgstr "Copying \"%B\" to \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:2856
+#: ../libnautilus-private/nautilus-file-operations.c:2882
 msgid "Duplicating \"%B\""
 msgstr "Duplicating \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:2864
+#: ../libnautilus-private/nautilus-file-operations.c:2890
 msgid "Moving %'d file (in \"%B\") to \"%B\""
 msgid_plural "Moving %'d files (in \"%B\") to \"%B\""
 msgstr[0] "Moving %'d file (in \"%B\") to \"%B\""
 msgstr[1] "Moving %'d files (in \"%B\") to \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:2868
+#: ../libnautilus-private/nautilus-file-operations.c:2894
 msgid "Copying %'d file (in \"%B\") to \"%B\""
 msgid_plural "Copying %'d files (in \"%B\") to \"%B\""
 msgstr[0] "Copying %'d file (in \"%B\") to \"%B\""
 msgstr[1] "Copying %'d files (in \"%B\") to \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:2876
+#: ../libnautilus-private/nautilus-file-operations.c:2902
 msgid "Duplicating %'d file (in \"%B\")"
 msgid_plural "Duplicating %'d files (in \"%B\")"
 msgstr[0] "Duplicating %'d file (in \"%B\")"
 msgstr[1] "Duplicating %'d files (in \"%B\")"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2886
+#: ../libnautilus-private/nautilus-file-operations.c:2912
 msgid "Moving %'d file to \"%B\""
 msgid_plural "Moving %'d files to \"%B\""
 msgstr[0] "Moving %'d file to \"%B\""
 msgstr[1] "Moving %'d files to \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:2890
+#: ../libnautilus-private/nautilus-file-operations.c:2916
 msgid "Copying %'d file to \"%B\""
 msgid_plural "Copying %'d files to \"%B\""
 msgstr[0] "Copying %'d file to \"%B\""
 msgstr[1] "Copying %'d files to \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:2896
+#: ../libnautilus-private/nautilus-file-operations.c:2922
 #, c-format
 msgid "Duplicating %'d file"
 msgid_plural "Duplicating %'d files"
@@ -2329,7 +2462,7 @@ msgstr[0] "Duplicating %'d file"
 msgstr[1] "Duplicating %'d files"
 
 #. To translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb of 4 MB"
-#: ../libnautilus-private/nautilus-file-operations.c:2916
+#: ../libnautilus-private/nautilus-file-operations.c:2942
 #, c-format
 msgid "%S of %S"
 msgstr "%S of %S"
@@ -2339,13 +2472,13 @@ msgstr "%S of %S"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:2927
+#: ../libnautilus-private/nautilus-file-operations.c:2953
 msgid "%S of %S â?? %T left (%S/sec)"
 msgid_plural "%S of %S â?? %T left (%S/sec)"
 msgstr[0] "%S of %S â?? %T left (%S/sec)"
 msgstr[1] "%S of %S â?? %T left (%S/sec)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3305
+#: ../libnautilus-private/nautilus-file-operations.c:3331
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
@@ -2353,11 +2486,11 @@ msgstr ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3308
+#: ../libnautilus-private/nautilus-file-operations.c:3334
 msgid "There was an error creating the folder \"%B\"."
 msgstr "There was an error creating the folder \"%B\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3432
+#: ../libnautilus-private/nautilus-file-operations.c:3458
 msgid ""
 "Files in the folder \"%B\" cannot be copied because you do not have "
 "permissions to see them."
@@ -2365,7 +2498,7 @@ msgstr ""
 "Files in the folder \"%B\" cannot be copied because you do not have "
 "permissions to see them."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3477
+#: ../libnautilus-private/nautilus-file-operations.c:3503
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "read it."
@@ -2373,263 +2506,215 @@ msgstr ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "read it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3522
-#: ../libnautilus-private/nautilus-file-operations.c:4132
-#: ../libnautilus-private/nautilus-file-operations.c:4710
+#: ../libnautilus-private/nautilus-file-operations.c:3548
+#: ../libnautilus-private/nautilus-file-operations.c:4232
+#: ../libnautilus-private/nautilus-file-operations.c:4794
 msgid "Error while moving \"%B\"."
 msgstr "Error while moving \"%B\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3523
+#: ../libnautilus-private/nautilus-file-operations.c:3549
 msgid "Could not remove the source folder."
 msgstr "Could not remove the source folder."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3608
-#: ../libnautilus-private/nautilus-file-operations.c:3649
-#: ../libnautilus-private/nautilus-file-operations.c:4134
-#: ../libnautilus-private/nautilus-file-operations.c:4205
+#: ../libnautilus-private/nautilus-file-operations.c:3634
+#: ../libnautilus-private/nautilus-file-operations.c:3675
+#: ../libnautilus-private/nautilus-file-operations.c:4234
+#: ../libnautilus-private/nautilus-file-operations.c:4305
 msgid "Error while copying \"%B\"."
 msgstr "Error while copying \"%B\"."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3609
+#: ../libnautilus-private/nautilus-file-operations.c:3635
 #, c-format
 msgid "Could not remove files from the already existing folder %F."
 msgstr "Could not remove files from the already-existing folder %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3650
+#: ../libnautilus-private/nautilus-file-operations.c:3676
 #, c-format
 msgid "Could not remove the already existing file %F."
 msgstr "Could not remove the already-existing file %F."
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:3865
-#: ../libnautilus-private/nautilus-file-operations.c:4537
+#: ../libnautilus-private/nautilus-file-operations.c:3992
+#: ../libnautilus-private/nautilus-file-operations.c:4638
 msgid "You cannot move a folder into itself."
 msgstr "You cannot move a folder into itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3866
-#: ../libnautilus-private/nautilus-file-operations.c:4538
+#: ../libnautilus-private/nautilus-file-operations.c:3993
+#: ../libnautilus-private/nautilus-file-operations.c:4639
 msgid "You cannot copy a folder into itself."
 msgstr "You cannot copy a folder into itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3867
-#: ../libnautilus-private/nautilus-file-operations.c:4539
+#: ../libnautilus-private/nautilus-file-operations.c:3994
+#: ../libnautilus-private/nautilus-file-operations.c:4640
 msgid "The destination folder is inside the source folder."
 msgstr "The destination folder is inside the source folder."
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:3898
+#: ../libnautilus-private/nautilus-file-operations.c:4025
 msgid "You cannot move a file over itself."
 msgstr "You cannot move a file over itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3899
+#: ../libnautilus-private/nautilus-file-operations.c:4026
 msgid "You cannot copy a file over itself."
 msgstr "You cannot copy a file over itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3900
+#: ../libnautilus-private/nautilus-file-operations.c:4027
 msgid "The source file would be overwritten by the destination."
 msgstr "The source file would be overwritten by the destination."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4030
-#: ../libnautilus-private/nautilus-file-operations.c:4619
-msgid ""
-"A folder named \"%B\" already exists.  Do you want to merge the source "
-"folder?"
-msgstr ""
-"A folder named \"%B\" already exists.  Do you want to merge the source "
-"folder?"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4032
-msgid ""
-"The source folder already exists in \"%B\".  Merging will ask for "
-"confirmation before replacing any files in the folder that conflict with the "
-"files being copied."
-msgstr ""
-"The source folder already exists in \"%B\".  Merging will ask for "
-"confirmation before replacing any files in the folder that conflict with the "
-"files being copied."
-
-#: ../libnautilus-private/nautilus-file-operations.c:4037
-#: ../libnautilus-private/nautilus-file-operations.c:4626
-msgid "A folder named \"%B\" already exists.  Do you want to replace it?"
-msgstr "A folder named \"%B\" already exists.  Do you want to replace it?"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4039
-#: ../libnautilus-private/nautilus-file-operations.c:4628
-#, c-format
-msgid ""
-"The folder already exists in \"%F\".  Replacing it will remove all files in "
-"the folder."
-msgstr ""
-"The folder already exists in \"%F\".  Replacing it will remove all files in "
-"the folder."
-
-#: ../libnautilus-private/nautilus-file-operations.c:4044
-#: ../libnautilus-private/nautilus-file-operations.c:4633
-msgid "A file named \"%B\" already exists.  Do you want to replace it?"
-msgstr "A file named \"%B\" already exists.  Do you want to replace it?"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4046
-#: ../libnautilus-private/nautilus-file-operations.c:4635
-#, c-format
-msgid ""
-"The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr ""
-"The file already exists in \"%F\".  Replacing it will overwrite its content."
-
-#: ../libnautilus-private/nautilus-file-operations.c:4136
+#: ../libnautilus-private/nautilus-file-operations.c:4236
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
 msgstr "Could not remove the already-existing file with the same name in %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4206
+#: ../libnautilus-private/nautilus-file-operations.c:4306
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr "There was an error copying the file into %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4430
+#: ../libnautilus-private/nautilus-file-operations.c:4530
 msgid "Copying Files"
 msgstr "Copying Files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4447
+#: ../libnautilus-private/nautilus-file-operations.c:4547
 msgid "Preparing to Move to \"%B\""
 msgstr "Preparing to Move to \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:4451
+#: ../libnautilus-private/nautilus-file-operations.c:4551
 #, c-format
 msgid "Preparing to move %'d file"
 msgid_plural "Preparing to move %'d files"
 msgstr[0] "Preparing to move %'d file"
 msgstr[1] "Preparing to move %'d files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4621
-msgid ""
-"The source folder already exists in \"%B\".  Merging will ask for "
-"confirmation before replacing any files in the folder that conflict with the "
-"files being moved."
-msgstr ""
-"The source folder already exists in \"%B\".  Merging will ask for "
-"confirmation before replacing any files in the folder that conflict with the "
-"files being moved."
-
-#: ../libnautilus-private/nautilus-file-operations.c:4711
+#: ../libnautilus-private/nautilus-file-operations.c:4795
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr "There was an error moving the file into %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4971
+#: ../libnautilus-private/nautilus-file-operations.c:5055
 msgid "Moving Files"
 msgstr "Moving Files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4988
+#: ../libnautilus-private/nautilus-file-operations.c:5072
 msgid "Creating links in \"%B\""
 msgstr "Creating links in \"%B\""
 
-#: ../libnautilus-private/nautilus-file-operations.c:4992
+#: ../libnautilus-private/nautilus-file-operations.c:5076
 #, c-format
 msgid "Making link to %'d file"
 msgid_plural "Making links to %'d files"
 msgstr[0] "Making link to %'d file"
 msgstr[1] "Making links to %'d files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5121
+#: ../libnautilus-private/nautilus-file-operations.c:5205
 msgid "Error while creating link to %B."
 msgstr "Error while creating link to %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5123
+#: ../libnautilus-private/nautilus-file-operations.c:5207
 msgid "Symbolic links only supported for local files"
 msgstr "Symbolic links only supported for local files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5126
+#: ../libnautilus-private/nautilus-file-operations.c:5210
 msgid "The target doesn't support symbolic links."
 msgstr "The target doesn't support symbolic links."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5129
+#: ../libnautilus-private/nautilus-file-operations.c:5213
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr "There was an error creating the symlink in %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5423
+#: ../libnautilus-private/nautilus-file-operations.c:5507
 msgid "Setting permissions"
 msgstr "Setting permissions"
 
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:5673
+#: ../libnautilus-private/nautilus-file-operations.c:5757
 msgid "untitled folder"
 msgstr "untitled folder"
 
 #. localizers: the initial name of a new empty file
-#: ../libnautilus-private/nautilus-file-operations.c:5681
+#: ../libnautilus-private/nautilus-file-operations.c:5765
 msgid "new file"
 msgstr "new file"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5831
+#: ../libnautilus-private/nautilus-file-operations.c:5915
 msgid "Error while creating directory %B."
 msgstr "Error while creating directory %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5833
+#: ../libnautilus-private/nautilus-file-operations.c:5917
 msgid "Error while creating file %B."
 msgstr "Error while creating file %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5835
+#: ../libnautilus-private/nautilus-file-operations.c:5919
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr "There was an error creating the directory in %F."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6093
+#: ../libnautilus-private/nautilus-file-operations.c:6177
 msgid "Emptying Trash"
 msgstr "Emptying Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6140
-#: ../libnautilus-private/nautilus-file-operations.c:6181
-#: ../libnautilus-private/nautilus-file-operations.c:6216
-#: ../libnautilus-private/nautilus-file-operations.c:6251
+#: ../libnautilus-private/nautilus-file-operations.c:6224
+#: ../libnautilus-private/nautilus-file-operations.c:6265
+#: ../libnautilus-private/nautilus-file-operations.c:6300
+#: ../libnautilus-private/nautilus-file-operations.c:6335
 msgid "Unable to mark launcher trusted (executable)"
 msgstr "Unable to mark launcher as trusted (executable)"
 
-#: ../libnautilus-private/nautilus-file.c:1211
-#: ../libnautilus-private/nautilus-vfs-file.c:381
+#: ../libnautilus-private/nautilus-file-utilities.c:1260
+#, c-format
+msgid "Could not determine original location of \"%s\" "
+msgstr "Could not determine original location of \"%s\" "
+
+#: ../libnautilus-private/nautilus-file-utilities.c:1264
+msgid "The item cannot be restored from trash"
+msgstr "The item cannot be restored from the wastebasket"
+
+#: ../libnautilus-private/nautilus-file.c:1214
+#: ../libnautilus-private/nautilus-vfs-file.c:390
 msgid "This file cannot be mounted"
 msgstr "This file cannot be mounted"
 
-#: ../libnautilus-private/nautilus-file.c:1236
+#: ../libnautilus-private/nautilus-file.c:1259
 msgid "This file cannot be unmounted"
 msgstr "This file cannot be unmounted"
 
-#: ../libnautilus-private/nautilus-file.c:1263
+#: ../libnautilus-private/nautilus-file.c:1293
 msgid "This file cannot be ejected"
 msgstr "This file cannot be ejected"
 
-#: ../libnautilus-private/nautilus-file.c:1290
-#: ../libnautilus-private/nautilus-vfs-file.c:559
+#: ../libnautilus-private/nautilus-file.c:1326
+#: ../libnautilus-private/nautilus-vfs-file.c:568
 msgid "This file cannot be started"
 msgstr "This file cannot be started"
 
-#: ../libnautilus-private/nautilus-file.c:1342
-#: ../libnautilus-private/nautilus-file.c:1373
+#: ../libnautilus-private/nautilus-file.c:1378
+#: ../libnautilus-private/nautilus-file.c:1409
 msgid "This file cannot be stopped"
 msgstr "This file cannot be stopped"
 
-#: ../libnautilus-private/nautilus-file.c:1773
+#: ../libnautilus-private/nautilus-file.c:1810
 #, c-format
 msgid "Slashes are not allowed in filenames"
 msgstr "Slashes are not allowed in filenames"
 
-#: ../libnautilus-private/nautilus-file.c:1791
+#: ../libnautilus-private/nautilus-file.c:1828
 #, c-format
 msgid "File not found"
 msgstr "File not found"
 
-#: ../libnautilus-private/nautilus-file.c:1819
+#: ../libnautilus-private/nautilus-file.c:1856
 #, c-format
 msgid "Toplevel files cannot be renamed"
 msgstr "Top-level files cannot be renamed"
 
-#: ../libnautilus-private/nautilus-file.c:1842
+#: ../libnautilus-private/nautilus-file.c:1879
 #, c-format
 msgid "Unable to rename desktop icon"
 msgstr "Unable to rename desktop icon"
 
-#: ../libnautilus-private/nautilus-file.c:1879
+#: ../libnautilus-private/nautilus-file.c:1908
 #, c-format
 msgid "Unable to rename desktop file"
 msgstr "Unable to rename desktop file"
@@ -2649,65 +2734,65 @@ msgstr "Unable to rename desktop file"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: ../libnautilus-private/nautilus-file.c:4319
+#: ../libnautilus-private/nautilus-file.c:4446
 msgid "today at 00:00:00 PM"
 msgstr "today at 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4320
+#: ../libnautilus-private/nautilus-file.c:4447
 #: ../src/nautilus-file-management-properties.c:472
 msgid "today at %-I:%M:%S %p"
 msgstr "today at %-H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4322
+#: ../libnautilus-private/nautilus-file.c:4449
 msgid "today at 00:00 PM"
 msgstr "today at 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4323
+#: ../libnautilus-private/nautilus-file.c:4450
 msgid "today at %-I:%M %p"
 msgstr "today at %-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4325
+#: ../libnautilus-private/nautilus-file.c:4452
 msgid "today, 00:00 PM"
 msgstr "today, 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4326
+#: ../libnautilus-private/nautilus-file.c:4453
 msgid "today, %-I:%M %p"
 msgstr "today, %-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4328
-#: ../libnautilus-private/nautilus-file.c:4329
+#: ../libnautilus-private/nautilus-file.c:4455
+#: ../libnautilus-private/nautilus-file.c:4456
 msgid "today"
 msgstr "today"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: ../libnautilus-private/nautilus-file.c:4338
+#: ../libnautilus-private/nautilus-file.c:4465
 msgid "yesterday at 00:00:00 PM"
 msgstr "yesterday at 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4339
+#: ../libnautilus-private/nautilus-file.c:4466
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "yesterday at %-H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4341
+#: ../libnautilus-private/nautilus-file.c:4468
 msgid "yesterday at 00:00 PM"
 msgstr "yesterday at 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4342
+#: ../libnautilus-private/nautilus-file.c:4469
 msgid "yesterday at %-I:%M %p"
 msgstr "yesterday at %-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4344
+#: ../libnautilus-private/nautilus-file.c:4471
 msgid "yesterday, 00:00 PM"
 msgstr "yesterday, 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4345
+#: ../libnautilus-private/nautilus-file.c:4472
 msgid "yesterday, %-I:%M %p"
 msgstr "yesterday, %-G=H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4347
-#: ../libnautilus-private/nautilus-file.c:4348
+#: ../libnautilus-private/nautilus-file.c:4474
+#: ../libnautilus-private/nautilus-file.c:4475
 msgid "yesterday"
 msgstr "yesterday"
 
@@ -2716,103 +2801,103 @@ msgstr "yesterday"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: ../libnautilus-private/nautilus-file.c:4359
+#: ../libnautilus-private/nautilus-file.c:4486
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "Wednesday, 00 September 0000 at 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4360
+#: ../libnautilus-private/nautilus-file.c:4487
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%A, %-d %B %Y at %-H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4362
+#: ../libnautilus-private/nautilus-file.c:4489
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "Mon, 00 Oct 0000 at 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4363
+#: ../libnautilus-private/nautilus-file.c:4490
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%a, %-d %b %Y at %-H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4365
+#: ../libnautilus-private/nautilus-file.c:4492
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "Mon, 00 Oct 0000 at 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4366
+#: ../libnautilus-private/nautilus-file.c:4493
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%a, %-d %b %Y at %-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4368
+#: ../libnautilus-private/nautilus-file.c:4495
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "00 Oct 0000 at 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4369
+#: ../libnautilus-private/nautilus-file.c:4496
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%-d %-b %Y at %-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4371
+#: ../libnautilus-private/nautilus-file.c:4498
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "00 Oct 0000, 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4372
+#: ../libnautilus-private/nautilus-file.c:4499
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%-d %b %Y, %-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4374
+#: ../libnautilus-private/nautilus-file.c:4501
 msgid "00/00/00, 00:00 PM"
 msgstr "00/00/00, 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4375
+#: ../libnautilus-private/nautilus-file.c:4502
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%-d/%m/%y, %-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4377
+#: ../libnautilus-private/nautilus-file.c:4504
 msgid "00/00/00"
 msgstr "00/00/00"
 
-#: ../libnautilus-private/nautilus-file.c:4378
+#: ../libnautilus-private/nautilus-file.c:4505
 msgid "%m/%d/%y"
 msgstr "%d/%m/%y"
 
-#: ../libnautilus-private/nautilus-file.c:4993
+#: ../libnautilus-private/nautilus-file.c:5144
 #, c-format
 msgid "Not allowed to set permissions"
 msgstr "Not allowed to set permissions"
 
-#: ../libnautilus-private/nautilus-file.c:5278
+#: ../libnautilus-private/nautilus-file.c:5429
 #, c-format
 msgid "Not allowed to set owner"
 msgstr "Not allowed to set owner"
 
-#: ../libnautilus-private/nautilus-file.c:5296
+#: ../libnautilus-private/nautilus-file.c:5447
 #, c-format
 msgid "Specified owner '%s' doesn't exist"
 msgstr "Specified owner '%s' doesn't exist"
 
-#: ../libnautilus-private/nautilus-file.c:5545
+#: ../libnautilus-private/nautilus-file.c:5696
 #, c-format
 msgid "Not allowed to set group"
 msgstr "Not allowed to set group"
 
-#: ../libnautilus-private/nautilus-file.c:5563
+#: ../libnautilus-private/nautilus-file.c:5714
 #, c-format
 msgid "Specified group '%s' doesn't exist"
 msgstr "Specified group '%s' doesn't exist"
 
-#: ../libnautilus-private/nautilus-file.c:5707
-#: ../src/file-manager/fm-directory-view.c:2245
+#: ../libnautilus-private/nautilus-file.c:5858
+#: ../src/file-manager/fm-directory-view.c:2290
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
 msgstr[0] "%'u item"
 msgstr[1] "%'u items"
 
-#: ../libnautilus-private/nautilus-file.c:5708
+#: ../libnautilus-private/nautilus-file.c:5859
 #, c-format
 msgid "%'u folder"
 msgid_plural "%'u folders"
 msgstr[0] "%'u folder"
 msgstr[1] "%'u folders"
 
-#: ../libnautilus-private/nautilus-file.c:5709
+#: ../libnautilus-private/nautilus-file.c:5860
 #, c-format
 msgid "%'u file"
 msgid_plural "%'u files"
@@ -2820,51 +2905,51 @@ msgstr[0] "%'u file"
 msgstr[1] "%'u files"
 
 #. Do this in a separate stage so that we don't have to put G_GUINT64_FORMAT in the translated string
-#: ../libnautilus-private/nautilus-file.c:5788
+#: ../libnautilus-private/nautilus-file.c:5939
 msgid "%"
 msgstr "%"
 
-#: ../libnautilus-private/nautilus-file.c:5789
+#: ../libnautilus-private/nautilus-file.c:5940
 #, c-format
 msgid "%s (%s bytes)"
 msgstr "%s (%s bytes)"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6093
-#: ../libnautilus-private/nautilus-file.c:6109
+#: ../libnautilus-private/nautilus-file.c:6251
+#: ../libnautilus-private/nautilus-file.c:6267
 msgid "? items"
 msgstr "? items"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6099
+#: ../libnautilus-private/nautilus-file.c:6257
 msgid "? bytes"
 msgstr "? bytes"
 
-#: ../libnautilus-private/nautilus-file.c:6114
+#: ../libnautilus-private/nautilus-file.c:6272
 msgid "unknown type"
 msgstr "unknown type"
 
-#: ../libnautilus-private/nautilus-file.c:6117
+#: ../libnautilus-private/nautilus-file.c:6275
 msgid "unknown MIME type"
 msgstr "unknown MIME type"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: ../libnautilus-private/nautilus-file.c:6123
+#: ../libnautilus-private/nautilus-file.c:6289
 #: ../src/file-manager/fm-properties-window.c:1319
 msgid "unknown"
 msgstr "unknown"
 
-#: ../libnautilus-private/nautilus-file.c:6172
+#: ../libnautilus-private/nautilus-file.c:6339
 msgid "program"
 msgstr "program"
 
-#: ../libnautilus-private/nautilus-file.c:6192
+#: ../libnautilus-private/nautilus-file.c:6359
 msgid "link"
 msgstr "link"
 
-#: ../libnautilus-private/nautilus-file.c:6214
+#: ../libnautilus-private/nautilus-file.c:6381
 msgid "link (broken)"
 msgstr "link (broken)"
 
@@ -3001,7 +3086,7 @@ msgstr "Search for files by file name and file properties"
 #. * of navigation windows and in the preferences dialog
 #: ../libnautilus-private/nautilus-global-preferences.c:142
 #: ../src/file-manager/fm-icon-container.c:569
-#: ../src/file-manager/fm-icon-view.c:3077
+#: ../src/file-manager/fm-icon-view.c:3203
 #: ../src/nautilus-file-management-properties.ui.h:64
 msgid "Icon View"
 msgstr "Icon View"
@@ -3009,7 +3094,7 @@ msgstr "Icon View"
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
 #: ../libnautilus-private/nautilus-global-preferences.c:143
-#: ../src/file-manager/fm-icon-view.c:3091
+#: ../src/file-manager/fm-icon-view.c:3217
 #: ../src/nautilus-file-management-properties.ui.h:57
 msgid "Compact View"
 msgstr "Compact View"
@@ -3017,8 +3102,8 @@ msgstr "Compact View"
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
 #: ../libnautilus-private/nautilus-global-preferences.c:144
-#: ../src/file-manager/fm-list-view.c:1568
-#: ../src/file-manager/fm-list-view.c:3005
+#: ../src/file-manager/fm-list-view.c:1631
+#: ../src/file-manager/fm-list-view.c:3154
 #: ../src/nautilus-file-management-properties.ui.h:67
 msgid "List View"
 msgstr "List View"
@@ -3096,99 +3181,99 @@ msgstr "24"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: ../libnautilus-private/nautilus-global-preferences.c:584
+#: ../libnautilus-private/nautilus-global-preferences.c:580
 #, c-format
 msgid "%s's Home"
 msgstr "%s's Home"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:590
+#: ../libnautilus-private/nautilus-global-preferences.c:586
 #: ../data/nautilus-computer.desktop.in.in.h:2
 msgid "Computer"
 msgstr "Computer"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:596
-#: ../src/nautilus-places-sidebar.c:508 ../src/nautilus-trash-bar.c:121
+#: ../libnautilus-private/nautilus-global-preferences.c:592
+#: ../src/nautilus-places-sidebar.c:546 ../src/nautilus-trash-bar.c:186
 msgid "Trash"
 msgstr "Wastebasket"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:602
+#: ../libnautilus-private/nautilus-global-preferences.c:598
 msgid "Network Servers"
 msgstr "Network Servers"
 
-#: ../libnautilus-private/nautilus-icon-container.c:2692
+#: ../libnautilus-private/nautilus-icon-container.c:2712
 msgid "The selection rectangle"
 msgstr "The selection rectangle"
 
-#: ../libnautilus-private/nautilus-icon-dnd.c:927
+#: ../libnautilus-private/nautilus-icon-dnd.c:931
 msgid "Switch to Manual Layout?"
 msgstr "Switch to Manual Layout?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:698
+#: ../libnautilus-private/nautilus-mime-actions.c:697
 #, c-format
 msgid "The Link \"%s\" is Broken."
 msgstr "The Link \"%s\" is Broken."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:700
+#: ../libnautilus-private/nautilus-mime-actions.c:699
 #, c-format
 msgid "The Link \"%s\" is Broken. Move it to Trash?"
 msgstr "The Link \"%s\" is Broken. Move it to Wastebasket?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:706
+#: ../libnautilus-private/nautilus-mime-actions.c:705
 msgid "This link cannot be used, because it has no target."
 msgstr "This link cannot be used, because it has no target."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:708
+#: ../libnautilus-private/nautilus-mime-actions.c:707
 #, c-format
 msgid "This link cannot be used, because its target \"%s\" doesn't exist."
 msgstr "This link cannot be used, because its target \"%s\" doesn't exist."
 
 #. name, stock id
 #. label, accelerator
-#: ../libnautilus-private/nautilus-mime-actions.c:718
-#: ../src/file-manager/fm-directory-view.c:7256
-#: ../src/file-manager/fm-directory-view.c:7379
-#: ../src/file-manager/fm-directory-view.c:8530
-#: ../src/file-manager/fm-directory-view.c:8851
-#: ../src/file-manager/fm-tree-view.c:1282
+#: ../libnautilus-private/nautilus-mime-actions.c:717
+#: ../src/file-manager/fm-directory-view.c:7182
+#: ../src/file-manager/fm-directory-view.c:7305
+#: ../src/file-manager/fm-directory-view.c:8405
+#: ../src/file-manager/fm-directory-view.c:8730
+#: ../src/file-manager/fm-tree-view.c:1242
 msgid "Mo_ve to Trash"
 msgstr "Mo_ve to Wastebasket"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:778
+#: ../libnautilus-private/nautilus-mime-actions.c:777
 #, c-format
 msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "Do you want to run \"%s\", or display its contents?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:780
+#: ../libnautilus-private/nautilus-mime-actions.c:779
 #, c-format
 msgid "\"%s\" is an executable text file."
 msgstr "\"%s\" is an executable text file."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:786
+#: ../libnautilus-private/nautilus-mime-actions.c:785
 msgid "Run in _Terminal"
 msgstr "Run in _Terminal"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:787
+#: ../libnautilus-private/nautilus-mime-actions.c:786
 msgid "_Display"
 msgstr "_Display"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:790
+#: ../libnautilus-private/nautilus-mime-actions.c:789
 #: ../src/nautilus-autorun-software.c:229
 msgid "_Run"
 msgstr "_Run"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1114
-#: ../src/file-manager/fm-directory-view.c:637
+#: ../libnautilus-private/nautilus-mime-actions.c:1113
+#: ../src/file-manager/fm-directory-view.c:629
 msgid "Are you sure you want to open all files?"
 msgstr "Are you sure you want to open all files?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1116
+#: ../libnautilus-private/nautilus-mime-actions.c:1115
 #, c-format
 msgid "This will open %d separate tab."
 msgid_plural "This will open %d separate tabs."
 msgstr[0] "This will open %d separate tab."
 msgstr[1] "This will open %d separate tabs."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1119
+#: ../libnautilus-private/nautilus-mime-actions.c:1118
 #: ../src/nautilus-location-bar.c:149
 #, c-format
 msgid "This will open %d separate window."
@@ -3196,43 +3281,39 @@ msgid_plural "This will open %d separate windows."
 msgstr[0] "This will open %d separate window."
 msgstr[1] "This will open %d separate windows."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1183
-#: ../src/nautilus-window-manage-views.c:1866
-#: ../src/nautilus-window-manage-views.c:1872
-#: ../src/nautilus-window-manage-views.c:1889
-#: ../src/nautilus-window-manage-views.c:1900
-#: ../src/nautilus-window-manage-views.c:1906
-#: ../src/nautilus-window-manage-views.c:1931
+#: ../libnautilus-private/nautilus-mime-actions.c:1189
+#: ../src/nautilus-window-manage-views.c:1873
+#: ../src/nautilus-window-manage-views.c:1879
+#: ../src/nautilus-window-manage-views.c:1896
+#: ../src/nautilus-window-manage-views.c:1907
+#: ../src/nautilus-window-manage-views.c:1913
+#: ../src/nautilus-window-manage-views.c:1939
 #, c-format
 msgid "Could not display \"%s\"."
 msgstr "Could not display \"%s\"."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1267
+#: ../libnautilus-private/nautilus-mime-actions.c:1273
 msgid "The file is of an unknown type"
 msgstr "The file is of an unknown type"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1270
+#: ../libnautilus-private/nautilus-mime-actions.c:1276
 #, c-format
 msgid "There is no application installed for %s files"
 msgstr "There is no application installed for %s files"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1282
+#: ../libnautilus-private/nautilus-mime-actions.c:1288
 msgid "_Select Application"
 msgstr "_Select Application"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1318
+#: ../libnautilus-private/nautilus-mime-actions.c:1324
 msgid "There was an internal error trying to search for applications:"
 msgstr "There was an internal error trying to search for applications:"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1320
+#: ../libnautilus-private/nautilus-mime-actions.c:1326
 msgid "Unable to search for application"
 msgstr "Unable to search for application"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1394
-msgid "Could not use system package installer"
-msgstr "Could not use system package installer"
-
-#: ../libnautilus-private/nautilus-mime-actions.c:1461
+#: ../libnautilus-private/nautilus-mime-actions.c:1447
 #, c-format
 msgid ""
 "There is no application installed for %s files.\n"
@@ -3241,11 +3322,11 @@ msgstr ""
 "There is no application installed for %s files.\n"
 "Do you want to search for an application to open this file?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1634
+#: ../libnautilus-private/nautilus-mime-actions.c:1603
 msgid "Untrusted application launcher"
 msgstr "Untrusted application launcher"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1637
+#: ../libnautilus-private/nautilus-mime-actions.c:1606
 #, c-format
 msgid ""
 "The application launcher \"%s\" has not been marked as trusted. If you do "
@@ -3254,31 +3335,31 @@ msgstr ""
 "The application launcher \"%s\" has not been marked as trusted. If you do "
 "not know the source of this file, launching it may be unsafe."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1649
+#: ../libnautilus-private/nautilus-mime-actions.c:1618
 msgid "_Launch Anyway"
 msgstr "_Launch Anyway"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1652
+#: ../libnautilus-private/nautilus-mime-actions.c:1621
 msgid "Mark as _Trusted"
 msgstr "Mark as _Trusted"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1924
-#: ../libnautilus-private/nautilus-mime-actions.c:2197
-#: ../src/file-manager/fm-directory-view.c:6222
+#: ../libnautilus-private/nautilus-mime-actions.c:1893
+#: ../libnautilus-private/nautilus-mime-actions.c:2167
+#: ../src/file-manager/fm-directory-view.c:6199
 msgid "Unable to mount location"
 msgstr "Unable to mount location"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:2275
-#: ../src/file-manager/fm-directory-view.c:6381
+#: ../libnautilus-private/nautilus-mime-actions.c:2246
+#: ../src/file-manager/fm-directory-view.c:6373
 msgid "Unable to start location"
 msgstr "Unable to start location"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:2363
+#: ../libnautilus-private/nautilus-mime-actions.c:2334
 #, c-format
 msgid "Opening \"%s\"."
 msgstr "Opening \"%s\"."
 
-#: ../libnautilus-private/nautilus-mime-actions.c:2366
+#: ../libnautilus-private/nautilus-mime-actions.c:2337
 #, c-format
 msgid "Opening %d item."
 msgid_plural "Opening %d items."
@@ -3286,13 +3367,13 @@ msgstr[0] "Opening %d item."
 msgstr[1] "Opening %d items."
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:165
-#: ../libnautilus-private/nautilus-open-with-dialog.c:260
+#: ../libnautilus-private/nautilus-open-with-dialog.c:277
 #, c-format
 msgid "Could not set application as the default: %s"
 msgstr "Could not set application as the default: %s"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:166
-#: ../libnautilus-private/nautilus-open-with-dialog.c:261
+#: ../libnautilus-private/nautilus-open-with-dialog.c:278
 msgid "Could not set as default application"
 msgstr "Could not set as default application"
 
@@ -3318,7 +3399,7 @@ msgid "%s document"
 msgstr "%s document"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:573
-#: ../libnautilus-private/nautilus-open-with-dialog.c:985
+#: ../libnautilus-private/nautilus-open-with-dialog.c:998
 msgid "Unknown"
 msgstr "Unknown"
 
@@ -3332,108 +3413,108 @@ msgstr "Select an application to open %s and other files of type \"%s\""
 msgid "Open all files of type \"%s\" with:"
 msgstr "Open all files of type \"%s\" with:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:147
+#: ../libnautilus-private/nautilus-open-with-dialog.c:148
 msgid "Could not run application"
 msgstr "Could not run application"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:159
+#: ../libnautilus-private/nautilus-open-with-dialog.c:160
 #, c-format
 msgid "Could not find '%s'"
 msgstr "Could not find '%s'"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:162
+#: ../libnautilus-private/nautilus-open-with-dialog.c:163
 msgid "Could not find application"
 msgstr "Could not find application"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:236
+#: ../libnautilus-private/nautilus-open-with-dialog.c:238
 #, c-format
 msgid "Could not add application to the application database: %s"
 msgstr "Could not add application to the application database: %s"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:237
+#: ../libnautilus-private/nautilus-open-with-dialog.c:239
 msgid "Could not add application"
 msgstr "Could not add application"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:406
+#: ../libnautilus-private/nautilus-open-with-dialog.c:421
 msgid "Select an Application"
 msgstr "Select an Application"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:767
-#: ../src/file-manager/fm-properties-window.c:5106
+#: ../libnautilus-private/nautilus-open-with-dialog.c:780
+#: ../src/file-manager/fm-properties-window.c:5130
 msgid "Open With"
 msgstr "Open With"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:804
+#: ../libnautilus-private/nautilus-open-with-dialog.c:817
 msgid "Select an application to view its description."
 msgstr "Select an application to view its description."
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:829
+#: ../libnautilus-private/nautilus-open-with-dialog.c:842
 msgid "_Use a custom command"
 msgstr "_Use a custom command"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:846
+#: ../libnautilus-private/nautilus-open-with-dialog.c:859
 msgid "_Browse..."
 msgstr "_Browseâ?¦"
 
 #. name, stock id
 #. label, accelerator
-#: ../libnautilus-private/nautilus-open-with-dialog.c:882
-#: ../src/file-manager/fm-directory-view.c:7172
-#: ../src/file-manager/fm-directory-view.c:8723
-#: ../src/file-manager/fm-tree-view.c:1203
-#: ../src/nautilus-places-sidebar.c:2164
+#: ../libnautilus-private/nautilus-open-with-dialog.c:895
+#: ../src/file-manager/fm-directory-view.c:7098
+#: ../src/file-manager/fm-directory-view.c:8599
+#: ../src/file-manager/fm-tree-view.c:1163
+#: ../src/nautilus-places-sidebar.c:2222
 msgid "_Open"
 msgstr "_Open"
 
 #. first %s is a filename and second %s is a file extension
-#: ../libnautilus-private/nautilus-open-with-dialog.c:962
+#: ../libnautilus-private/nautilus-open-with-dialog.c:975
 #, c-format
 msgid "Open %s and other %s document with:"
 msgstr "Open %s and other %s document with:"
 
 #. the %s here is a file name
 #. %s is a filename
-#: ../libnautilus-private/nautilus-open-with-dialog.c:966
-#: ../libnautilus-private/nautilus-open-with-dialog.c:997
+#: ../libnautilus-private/nautilus-open-with-dialog.c:979
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1010
 #, c-format
 msgid "Open %s with:"
 msgstr "Open %s with:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:967
+#: ../libnautilus-private/nautilus-open-with-dialog.c:980
 #, c-format
 msgid "_Remember this application for %s documents"
 msgstr "_Remember this application for %s documents"
 
 #. Only in add mode - the %s here is a file extension
-#: ../libnautilus-private/nautilus-open-with-dialog.c:976
+#: ../libnautilus-private/nautilus-open-with-dialog.c:989
 #, c-format
 msgid "Open all %s documents with:"
 msgstr "Open all %s documents with:"
 
 #. First %s is a filename, second is a description
 #. * of the type, eg "plain text document"
-#: ../libnautilus-private/nautilus-open-with-dialog.c:993
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1006
 #, c-format
 msgid "Open %s and other \"%s\" files with:"
 msgstr "Open %s and other \"%s\" files with:"
 
 #. %s is a file type description
-#: ../libnautilus-private/nautilus-open-with-dialog.c:999
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1012
 #, c-format
 msgid "_Remember this application for \"%s\" files"
 msgstr "_Remember this application for \"%s\" files"
 
 #. Only in add mode
-#: ../libnautilus-private/nautilus-open-with-dialog.c:1008
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1021
 #, c-format
 msgid "Open all \"%s\" files with:"
 msgstr "Open all \"%s\" files with:"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:1019
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1032
 msgid "_Add"
 msgstr "_Add"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:1020
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1033
 msgid "Add Application"
 msgstr "Add Application"
 
@@ -3467,19 +3548,19 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-program-choosing.c:115
 msgid ""
-"No other applications are available to view this file.  If you copy this "
-"file onto your computer, you may be able to open it."
+"No other applications are available to view this file. If you copy this file "
+"onto your computer, you may be able to open it."
 msgstr ""
-"No other applications are available to view this file.  If you copy this "
-"file onto your computer, you may be able to open it."
+"No other applications are available to view this file. If you copy this file "
+"onto your computer, you may be able to open it."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:121
 msgid ""
-"No other actions are available to view this file.  If you copy this file "
-"onto your computer, you may be able to open it."
+"No other actions are available to view this file. If you copy this file onto "
+"your computer, you may be able to open it."
 msgstr ""
-"No other actions are available to view this file.  If you copy this file "
-"onto your computer, you may be able to open it."
+"No other actions are available to view this file. If you copy this file onto "
+"your computer, you may be able to open it."
 
 #: ../libnautilus-private/nautilus-program-choosing.c:372
 msgid "Sorry, but you cannot execute commands from a remote site."
@@ -3595,13 +3676,13 @@ msgid "File Management"
 msgstr "File Management"
 
 #: ../data/nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1370
+#: ../src/file-manager/fm-tree-view.c:1330
 msgid "Home Folder"
 msgstr "Home Folder"
 
 #. tooltip
 #: ../data/nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-places-sidebar.c:306 ../src/nautilus-window-menus.c:855
+#: ../src/nautilus-places-sidebar.c:344 ../src/nautilus-window-menus.c:855
 msgid "Open your personal folder"
 msgstr "Open your personal folder"
 
@@ -3609,124 +3690,128 @@ msgstr "Open your personal folder"
 msgid "File Manager"
 msgstr "File Manager"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:634
+#: ../src/file-manager/fm-desktop-icon-view.c:639
 msgid "Background"
 msgstr "Background"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:707
-#: ../src/file-manager/fm-directory-view.c:7204
-#: ../src/file-manager/fm-directory-view.c:8917
+#: ../src/file-manager/fm-desktop-icon-view.c:712
+#: ../src/file-manager/fm-directory-view.c:7130
+#: ../src/file-manager/fm-directory-view.c:8799
 msgid "E_mpty Trash"
 msgstr "E_mpty Wastebasket"
 
 #. label, accelerator
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:719
-#: ../src/file-manager/fm-directory-view.c:7168
+#: ../src/file-manager/fm-desktop-icon-view.c:724
+#: ../src/file-manager/fm-directory-view.c:7094
 msgid "Create L_auncher..."
 msgstr "Create L_auncherâ?¦"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:721
-#: ../src/file-manager/fm-directory-view.c:7169
+#: ../src/file-manager/fm-desktop-icon-view.c:726
+#: ../src/file-manager/fm-directory-view.c:7095
 msgid "Create a new launcher"
 msgstr "Create a new launcher"
 
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:726
+#: ../src/file-manager/fm-desktop-icon-view.c:731
 msgid "Change Desktop _Background"
 msgstr "Change Desktop _Background"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:728
+#: ../src/file-manager/fm-desktop-icon-view.c:733
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr ""
 "Show a window that lets you set your desktop background's pattern or colour"
 
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:733
+#: ../src/file-manager/fm-desktop-icon-view.c:738
 msgid "Empty Trash"
 msgstr "Empty Wastebasket"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:735
-#: ../src/file-manager/fm-directory-view.c:7205
-#: ../src/nautilus-trash-bar.c:132
+#: ../src/file-manager/fm-desktop-icon-view.c:740
+#: ../src/file-manager/fm-directory-view.c:7131
+#: ../src/nautilus-trash-bar.c:197
 msgid "Delete all items in the Trash"
 msgstr "Delete all items in the Wastebasket"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:826
+#: ../src/file-manager/fm-desktop-icon-view.c:837
 msgid "The desktop view encountered an error."
 msgstr "The desktop view encountered an error."
 
-#: ../src/file-manager/fm-desktop-icon-view.c:827
+#: ../src/file-manager/fm-desktop-icon-view.c:838
 msgid "The desktop view encountered an error while starting up."
 msgstr "The desktop view encountered an error while starting up."
 
-#: ../src/file-manager/fm-directory-view.c:639
+#: ../src/file-manager/fm-directory-view.c:631
 #, c-format
 msgid "This will open %'d separate tab."
 msgid_plural "This will open %'d separate tabs."
 msgstr[0] "This will open %'d separate tab."
 msgstr[1] "This will open %'d separate tabs."
 
-#: ../src/file-manager/fm-directory-view.c:642
+#: ../src/file-manager/fm-directory-view.c:634
 #, c-format
 msgid "This will open %'d separate window."
 msgid_plural "This will open %'d separate windows."
 msgstr[0] "This will open %'d separate window."
 msgstr[1] "This will open %'d separate windows."
 
-#: ../src/file-manager/fm-directory-view.c:1160
-#: ../src/file-manager/fm-properties-window.c:5455
-#: ../src/nautilus-connect-server-dialog.c:344
+#: ../src/file-manager/fm-directory-view.c:1153
+#: ../src/file-manager/fm-properties-window.c:5479
+#: ../src/nautilus-connect-server-dialog.c:349
 #: ../src/nautilus-location-dialog.c:108
 msgid "There was an error displaying help."
 msgstr "There was an error displaying help."
 
-#: ../src/file-manager/fm-directory-view.c:1180
+#: ../src/file-manager/fm-directory-view.c:1175
 msgid "Select Items Matching"
 msgstr "Select Items Matching"
 
-#: ../src/file-manager/fm-directory-view.c:1198
+#: ../src/file-manager/fm-directory-view.c:1191
 msgid "_Pattern:"
 msgstr "_Pattern:"
 
-#: ../src/file-manager/fm-directory-view.c:1296
+#: ../src/file-manager/fm-directory-view.c:1194
+msgid "Examples: "
+msgstr "Examples: "
+
+#: ../src/file-manager/fm-directory-view.c:1315
 msgid "Save Search as"
 msgstr "Save Search as"
 
-#: ../src/file-manager/fm-directory-view.c:1316
+#: ../src/file-manager/fm-directory-view.c:1335
 msgid "Search _name:"
 msgstr "Search _name:"
 
-#: ../src/file-manager/fm-directory-view.c:1330
-#: ../src/nautilus-connect-server-dialog.c:521
+#: ../src/file-manager/fm-directory-view.c:1349
+#: ../src/nautilus-connect-server-dialog.c:526
 msgid "_Folder:"
 msgstr "_Folder:"
 
-#: ../src/file-manager/fm-directory-view.c:1335
+#: ../src/file-manager/fm-directory-view.c:1354
 msgid "Select Folder to Save Search In"
 msgstr "Select Folder to Save Search In"
 
-#: ../src/file-manager/fm-directory-view.c:2165
-#: ../src/file-manager/fm-directory-view.c:2202
+#: ../src/file-manager/fm-directory-view.c:2207
+#: ../src/file-manager/fm-directory-view.c:2244
 #, c-format
 msgid "\"%s\" selected"
 msgstr "\"%s\" selected"
 
-#: ../src/file-manager/fm-directory-view.c:2167
+#: ../src/file-manager/fm-directory-view.c:2209
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
 msgstr[0] "%'d folder selected"
 msgstr[1] "%'d folders selected"
 
-#: ../src/file-manager/fm-directory-view.c:2177
+#: ../src/file-manager/fm-directory-view.c:2219
 #, c-format
 msgid " (containing %'d item)"
 msgid_plural " (containing %'d items)"
@@ -3734,14 +3819,14 @@ msgstr[0] " (containing %'d item)"
 msgstr[1] " (containing %'d items)"
 
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
-#: ../src/file-manager/fm-directory-view.c:2188
+#: ../src/file-manager/fm-directory-view.c:2230
 #, c-format
 msgid " (containing a total of %'d item)"
 msgid_plural " (containing a total of %'d items)"
 msgstr[0] " (containing a total of %'d item)"
 msgstr[1] " (containing a total of %'d items)"
 
-#: ../src/file-manager/fm-directory-view.c:2205
+#: ../src/file-manager/fm-directory-view.c:2247
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -3749,7 +3834,7 @@ msgstr[0] "%'d item selected"
 msgstr[1] "%'d items selected"
 
 #. Folders selected also, use "other" terminology
-#: ../src/file-manager/fm-directory-view.c:2212
+#: ../src/file-manager/fm-directory-view.c:2254
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -3761,16 +3846,36 @@ msgstr[1] "%'d other items selected"
 #. * first message gives the number of items selected;
 #. * the message in parentheses the size of those items.
 #.
-#: ../src/file-manager/fm-directory-view.c:2227
+#: ../src/file-manager/fm-directory-view.c:2269
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/file-manager/fm-directory-view.c:2249
+#: ../src/file-manager/fm-directory-view.c:2282
+#, c-format
+msgid "Free space: %s"
+msgstr "Free space: %s"
+
+#: ../src/file-manager/fm-directory-view.c:2293
 #, c-format
 msgid "%s, Free space: %s"
 msgstr "%s, Free space: %s"
 
+#. Marking this for translation, since you
+#. * might want to change "," to something else.
+#. * After the comma the amount of free space will
+#. * be shown.
+#.
+#: ../src/file-manager/fm-directory-view.c:2308
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#. Marking this for translation, since you
+#. * might want to change "," to something else.
+#. * After the comma the amount of free space will
+#. * be shown.
+#.
 #. This is marked for translation in case a localizer
 #. * needs to change ", " to something else. The comma
 #. * is between the message about the number of folders
@@ -3778,52 +3883,66 @@ msgstr "%s, Free space: %s"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: ../src/file-manager/fm-directory-view.c:2274
+#: ../src/file-manager/fm-directory-view.c:2327
+#: ../src/file-manager/fm-directory-view.c:2341
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%s, %s"
 
+#. This is marked for translation in case a localizer
+#. * needs to change ", " to something else. The first comma
+#. * is between the message about the number of folders
+#. * and the number of items in those folders and the
+#. * message about the number of other items and the
+#. * total size of those items. After the second comma
+#. * the free space is written.
+#.
+#: ../src/file-manager/fm-directory-view.c:2354
+#, c-format
+msgid "%s%s, %s, %s"
+msgstr "%s%s, %s, %s"
+
 #. Note that the number of items actually displayed varies somewhat due
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: ../src/file-manager/fm-directory-view.c:2356
+#: ../src/file-manager/fm-directory-view.c:2440
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr "The folder \"%s\" contains more files than Nautilus can handle."
 
-#: ../src/file-manager/fm-directory-view.c:2362
+#: ../src/file-manager/fm-directory-view.c:2446
 msgid "Some files will not be displayed."
 msgstr "Some files will not be displayed."
 
-#: ../src/file-manager/fm-directory-view.c:4334
-#: ../src/nautilus-information-panel.c:828
+#: ../src/file-manager/fm-directory-view.c:4418
+#: ../src/nautilus-information-panel.c:833
 #, c-format
-msgid "Open with %s"
-msgstr "Open with %s"
+msgid "Open With %s"
+msgstr "Open With %s"
 
-#: ../src/file-manager/fm-directory-view.c:4336
+#: ../src/file-manager/fm-directory-view.c:4420
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgid_plural "Use \"%s\" to open the selected items"
 msgstr[0] "Use \"%s\" to open the selected item"
 msgstr[1] "Use \"%s\" to open the selected items"
 
-#: ../src/file-manager/fm-directory-view.c:5176
+#: ../src/file-manager/fm-directory-view.c:5260
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "Run \"%s\" on any selected items"
 
-#: ../src/file-manager/fm-directory-view.c:5427
+#: ../src/file-manager/fm-directory-view.c:5511
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "Create Document from template \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:5677
+#: ../src/file-manager/fm-directory-view.c:5761
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "All executable files in this folder will appear in the Scripts menu."
 
-#: ../src/file-manager/fm-directory-view.c:5679
+#: ../src/file-manager/fm-directory-view.c:5763
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
@@ -3831,7 +3950,7 @@ msgstr ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 
-#: ../src/file-manager/fm-directory-view.c:5681
+#: ../src/file-manager/fm-directory-view.c:5765
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -3889,19 +4008,19 @@ msgstr ""
 "NAUTILUS_SCRIPT_NEXT_PANE_CURRENT_URI: URI for current location in the "
 "inactive pane of a split-view window"
 
-#: ../src/file-manager/fm-directory-view.c:5856
-#: ../src/file-manager/fm-tree-view.c:961
+#: ../src/file-manager/fm-directory-view.c:5833
+#: ../src/file-manager/fm-tree-view.c:921
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste command"
 msgstr "\"%s\" will be moved if you select the Paste command"
 
-#: ../src/file-manager/fm-directory-view.c:5860
-#: ../src/file-manager/fm-tree-view.c:965
+#: ../src/file-manager/fm-directory-view.c:5837
+#: ../src/file-manager/fm-tree-view.c:925
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste command"
 msgstr "\"%s\" will be copied if you select the Paste command"
 
-#: ../src/file-manager/fm-directory-view.c:5867
+#: ../src/file-manager/fm-directory-view.c:5844
 #, c-format
 msgid "The %'d selected item will be moved if you select the Paste command"
 msgid_plural ""
@@ -3910,7 +4029,7 @@ msgstr[0] "The %'d selected item will be moved if you select the Paste command"
 msgstr[1] ""
 "The %'d selected items will be moved if you select the Paste command"
 
-#: ../src/file-manager/fm-directory-view.c:5874
+#: ../src/file-manager/fm-directory-view.c:5851
 #, c-format
 msgid "The %'d selected item will be copied if you select the Paste command"
 msgid_plural ""
@@ -3920,112 +4039,98 @@ msgstr[0] ""
 msgstr[1] ""
 "The %'d selected items will be copied if you select the Paste command"
 
-#: ../src/file-manager/fm-directory-view.c:6054
-#: ../src/file-manager/fm-tree-view.c:1004
+#: ../src/file-manager/fm-directory-view.c:6031
+#: ../src/file-manager/fm-tree-view.c:964
 msgid "There is nothing on the clipboard to paste."
 msgstr "There is nothing on the clipboard to paste."
 
-#: ../src/file-manager/fm-directory-view.c:6237
+#: ../src/file-manager/fm-directory-view.c:6220
 msgid "Unable to unmount location"
 msgstr "Unable to unmount location"
 
-#: ../src/file-manager/fm-directory-view.c:6252
+#: ../src/file-manager/fm-directory-view.c:6241
 msgid "Unable to eject location"
 msgstr "Unable to eject location"
 
-#: ../src/file-manager/fm-directory-view.c:6267
+#: ../src/file-manager/fm-directory-view.c:6256
 msgid "Unable to stop drive"
 msgstr "Unable to stop drive"
 
-#: ../src/file-manager/fm-directory-view.c:6813
+#: ../src/file-manager/fm-directory-view.c:6811
 #, c-format
 msgid "Connect to Server %s"
 msgstr "Connect to Server %s"
 
-#: ../src/file-manager/fm-directory-view.c:6818
-#: ../src/file-manager/fm-directory-view.c:8143
-#: ../src/file-manager/fm-directory-view.c:8235
-#: ../src/file-manager/fm-directory-view.c:8345
+#: ../src/file-manager/fm-directory-view.c:6816
+#: ../src/file-manager/fm-directory-view.c:8018
+#: ../src/file-manager/fm-directory-view.c:8110
+#: ../src/file-manager/fm-directory-view.c:8220
 msgid "_Connect"
 msgstr "_Connect"
 
-#: ../src/file-manager/fm-directory-view.c:6832
+#: ../src/file-manager/fm-directory-view.c:6830
 msgid "Link _name:"
 msgstr "Link _name:"
 
-#: ../src/file-manager/fm-directory-view.c:7050
-#, c-format
-msgid "Could not determine original location of \"%s\" "
-msgstr "Could not determine original location of \"%s\" "
-
-#: ../src/file-manager/fm-directory-view.c:7054
-msgid "The item cannot be restored from trash"
-msgstr "The item cannot be restored from the wastebasket"
-
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7142
+#: ../src/file-manager/fm-directory-view.c:7072
 msgid "Create _Document"
 msgstr "Create _Document"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7143
+#: ../src/file-manager/fm-directory-view.c:7073
 msgid "Open Wit_h"
 msgstr "Open Wit_h"
 
-#: ../src/file-manager/fm-directory-view.c:7144
+#: ../src/file-manager/fm-directory-view.c:7074
 msgid "Choose a program with which to open the selected item"
 msgstr "Choose a program with which to open the selected item"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7146
-#: ../src/file-manager/fm-directory-view.c:7154
-#: ../src/file-manager/fm-directory-view.c:7420
+#: ../src/file-manager/fm-directory-view.c:7076
+#: ../src/file-manager/fm-directory-view.c:7346
 msgid "_Properties"
 msgstr "_Properties"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7147
+#: ../src/file-manager/fm-directory-view.c:7077
+#: ../src/file-manager/fm-directory-view.c:8786
 msgid "View or modify the properties of each selected item"
 msgstr "View or modify the properties of each selected item"
 
-#. tooltip
-#: ../src/file-manager/fm-directory-view.c:7155
-msgid "View or modify the properties of the open folder"
-msgstr "View or modify the properties of the open folder"
-
 #. name, stock id
 #. label, accelerator
 #. add the "create folder" menu item
-#: ../src/file-manager/fm-directory-view.c:7158
-#: ../src/file-manager/fm-tree-view.c:1234
+#: ../src/file-manager/fm-directory-view.c:7084
+#: ../src/file-manager/fm-tree-view.c:1194
 msgid "Create _Folder"
 msgstr "Create _Folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7159
+#: ../src/file-manager/fm-directory-view.c:7085
 msgid "Create a new empty folder inside this folder"
 msgstr "Create a new empty folder inside this folder"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7161
+#: ../src/file-manager/fm-directory-view.c:7087
 msgid "No templates installed"
 msgstr "No templates installed"
 
 #. name, stock id
 #. translators: this is used to indicate that a file doesn't contain anything
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7164
+#: ../src/file-manager/fm-directory-view.c:7090
 msgid "_Empty File"
 msgstr "_Empty File"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7165
+#: ../src/file-manager/fm-directory-view.c:7091
 msgid "Create a new empty file inside this folder"
 msgstr "Create a new empty file inside this folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7173
+#: ../src/file-manager/fm-directory-view.c:7099
 msgid "Open the selected item in this window"
 msgstr "Open the selected item in this window"
 
@@ -4034,92 +4139,92 @@ msgstr "Open the selected item in this window"
 #. Location-specific actions
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7180
-#: ../src/file-manager/fm-directory-view.c:7352
+#: ../src/file-manager/fm-directory-view.c:7106
+#: ../src/file-manager/fm-directory-view.c:7278
 msgid "Open in Navigation Window"
 msgstr "Open in Navigation Window"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7181
+#: ../src/file-manager/fm-directory-view.c:7107
 msgid "Open each selected item in a navigation window"
 msgstr "Open each selected item in a navigation window"
 
 #. name, stock id
 #. label, accelerator
 #. add the "open in new tab" menu item
-#: ../src/file-manager/fm-directory-view.c:7184
-#: ../src/file-manager/fm-directory-view.c:7356
-#: ../src/file-manager/fm-directory-view.c:8475
-#: ../src/file-manager/fm-directory-view.c:8797
-#: ../src/file-manager/fm-tree-view.c:1214
-#: ../src/nautilus-places-sidebar.c:2172
+#: ../src/file-manager/fm-directory-view.c:7110
+#: ../src/file-manager/fm-directory-view.c:7282
+#: ../src/file-manager/fm-directory-view.c:8350
+#: ../src/file-manager/fm-directory-view.c:8676
+#: ../src/file-manager/fm-tree-view.c:1174
+#: ../src/nautilus-places-sidebar.c:2230
 msgid "Open in New _Tab"
 msgstr "Open in New _Tab"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7185
+#: ../src/file-manager/fm-directory-view.c:7111
 msgid "Open each selected item in a new tab"
 msgstr "Open each selected item in a new tab"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7188
-#: ../src/file-manager/fm-directory-view.c:7361
+#: ../src/file-manager/fm-directory-view.c:7114
+#: ../src/file-manager/fm-directory-view.c:7287
 msgid "Open in _Folder Window"
 msgstr "Open in _Folder Window"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7189
+#: ../src/file-manager/fm-directory-view.c:7115
 msgid "Open each selected item in a folder window"
 msgstr "Open each selected item in a folder window"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7192
+#: ../src/file-manager/fm-directory-view.c:7118
 msgid "Other _Application..."
 msgstr "Other _Applicationâ?¦"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7193
-#: ../src/file-manager/fm-directory-view.c:7197
+#: ../src/file-manager/fm-directory-view.c:7119
+#: ../src/file-manager/fm-directory-view.c:7123
 msgid "Choose another application with which to open the selected item"
 msgstr "Choose another application with which to open the selected item"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7196
-msgid "Open with Other _Application..."
-msgstr "Open with Other _Applicationâ?¦"
+#: ../src/file-manager/fm-directory-view.c:7122
+msgid "Open With Other _Application..."
+msgstr "Open With Other _Applicationâ?¦"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7200
+#: ../src/file-manager/fm-directory-view.c:7126
 msgid "_Open Scripts Folder"
 msgstr "_Open Scripts Folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7201
+#: ../src/file-manager/fm-directory-view.c:7127
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "Show the folder containing the scripts that appear in this menu"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7209
+#: ../src/file-manager/fm-directory-view.c:7135
 msgid "Prepare the selected files to be moved with a Paste command"
 msgstr "Prepare the selected files to be moved with a Paste command"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7213
+#: ../src/file-manager/fm-directory-view.c:7139
 msgid "Prepare the selected files to be copied with a Paste command"
 msgstr "Prepare the selected files to be copied with a Paste command"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7217
+#: ../src/file-manager/fm-directory-view.c:7143
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr "Move or copy files previously selected by a Cut or Copy command"
 
@@ -4127,14 +4232,14 @@ msgstr "Move or copy files previously selected by a Cut or Copy command"
 #. accelerator for paste
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7222
-#: ../src/file-manager/fm-directory-view.c:7374
-#: ../src/file-manager/fm-tree-view.c:1266
+#: ../src/file-manager/fm-directory-view.c:7148
+#: ../src/file-manager/fm-directory-view.c:7300
+#: ../src/file-manager/fm-tree-view.c:1226
 msgid "_Paste Into Folder"
 msgstr "_Paste Into Folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7223
+#: ../src/file-manager/fm-directory-view.c:7149
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
@@ -4143,102 +4248,102 @@ msgstr ""
 "selected folder"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7225
-msgid "Copy to"
-msgstr "Copy to"
+#: ../src/file-manager/fm-directory-view.c:7151
+msgid "Cop_y to"
+msgstr "Cop_y to"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7226
-msgid "Move to"
-msgstr "Move to"
+#: ../src/file-manager/fm-directory-view.c:7152
+msgid "M_ove to"
+msgstr "M_ove to"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7229
+#: ../src/file-manager/fm-directory-view.c:7155
 msgid "Select all items in this window"
 msgstr "Select all items in this window"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7232
+#: ../src/file-manager/fm-directory-view.c:7158
 msgid "Select I_tems Matching..."
 msgstr "Select I_tems Matchingâ?¦"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7233
+#: ../src/file-manager/fm-directory-view.c:7159
 msgid "Select items in this window matching a given pattern"
 msgstr "Select items in this window matching a given pattern"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7236
+#: ../src/file-manager/fm-directory-view.c:7162
 msgid "_Invert Selection"
 msgstr "_Invert Selection"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7237
+#: ../src/file-manager/fm-directory-view.c:7163
 msgid "Select all and only the items that are not currently selected"
 msgstr "Select all and only the items that are not currently selected"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7240
+#: ../src/file-manager/fm-directory-view.c:7166
 msgid "D_uplicate"
 msgstr "D_uplicate"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7241
+#: ../src/file-manager/fm-directory-view.c:7167
 msgid "Duplicate each selected item"
 msgstr "Duplicate each selected item"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7244
-#: ../src/file-manager/fm-directory-view.c:8891
+#: ../src/file-manager/fm-directory-view.c:7170
+#: ../src/file-manager/fm-directory-view.c:8770
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Ma_ke Link"
 msgstr[1] "Ma_ke Links"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7245
+#: ../src/file-manager/fm-directory-view.c:7171
 msgid "Create a symbolic link for each selected item"
 msgstr "Create a symbolic link for each selected item"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7248
+#: ../src/file-manager/fm-directory-view.c:7174
 msgid "_Rename..."
 msgstr "_Renameâ?¦"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7249
+#: ../src/file-manager/fm-directory-view.c:7175
 msgid "Rename selected item"
 msgstr "Rename selected item"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7257
-#: ../src/file-manager/fm-directory-view.c:8852
+#: ../src/file-manager/fm-directory-view.c:7183
+#: ../src/file-manager/fm-directory-view.c:8731
 msgid "Move each selected item to the Trash"
 msgstr "Move each selected item to the Wastebasket"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7260
-#: ../src/file-manager/fm-directory-view.c:7383
-#: ../src/file-manager/fm-directory-view.c:8872
-#: ../src/file-manager/fm-tree-view.c:1296
+#: ../src/file-manager/fm-directory-view.c:7186
+#: ../src/file-manager/fm-directory-view.c:7309
+#: ../src/file-manager/fm-directory-view.c:8751
+#: ../src/file-manager/fm-tree-view.c:1256
 msgid "_Delete"
 msgstr "_Delete"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7261
+#: ../src/file-manager/fm-directory-view.c:7187
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "Delete each selected item, without moving to the Wastebasket"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7264
-#: ../src/file-manager/fm-directory-view.c:7387
+#: ../src/file-manager/fm-directory-view.c:7190
+#: ../src/file-manager/fm-directory-view.c:7313
 msgid "_Restore"
 msgstr "_Restore"
 
@@ -4250,209 +4355,209 @@ msgstr "_Restore"
 #.
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7274
+#: ../src/file-manager/fm-directory-view.c:7200
 msgid "Reset View to _Defaults"
 msgstr "Reset View to _Defaults"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7275
+#: ../src/file-manager/fm-directory-view.c:7201
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "Reset sorting order and zoom level to match preferences for this view"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7278
+#: ../src/file-manager/fm-directory-view.c:7204
 msgid "Connect To This Server"
 msgstr "Connect To This Server"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7279
+#: ../src/file-manager/fm-directory-view.c:7205
 msgid "Make a permanent connection to this server"
 msgstr "Make a permanent connection to this server"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7282
-#: ../src/file-manager/fm-directory-view.c:7310
-#: ../src/file-manager/fm-directory-view.c:7391
-#: ../src/nautilus-places-sidebar.c:2208
+#: ../src/file-manager/fm-directory-view.c:7208
+#: ../src/file-manager/fm-directory-view.c:7236
+#: ../src/file-manager/fm-directory-view.c:7317
+#: ../src/nautilus-places-sidebar.c:2266
 msgid "_Mount"
 msgstr "_Mount"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7283
+#: ../src/file-manager/fm-directory-view.c:7209
 msgid "Mount the selected volume"
 msgstr "Mount the selected volume"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7287
+#: ../src/file-manager/fm-directory-view.c:7213
 msgid "Unmount the selected volume"
 msgstr "Unmount the selected volume"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7291
+#: ../src/file-manager/fm-directory-view.c:7217
 msgid "Eject the selected volume"
 msgstr "Eject the selected volume"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7294
-#: ../src/file-manager/fm-directory-view.c:7322
-#: ../src/file-manager/fm-directory-view.c:7403
-#: ../src/nautilus-places-sidebar.c:2236
+#: ../src/file-manager/fm-directory-view.c:7220
+#: ../src/file-manager/fm-directory-view.c:7248
+#: ../src/file-manager/fm-directory-view.c:7329
+#: ../src/nautilus-places-sidebar.c:2294
 msgid "_Format"
 msgstr "_Format"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7295
+#: ../src/file-manager/fm-directory-view.c:7221
 msgid "Format the selected volume"
 msgstr "Format the selected volume"
 
 #. name, stock id
 #. label, accelerator
 #. Adjust start/stop items to reflect the type of the drive
-#: ../src/file-manager/fm-directory-view.c:7298
-#: ../src/file-manager/fm-directory-view.c:7326
-#: ../src/file-manager/fm-directory-view.c:7407
-#: ../src/file-manager/fm-directory-view.c:8135
-#: ../src/file-manager/fm-directory-view.c:8139
-#: ../src/file-manager/fm-directory-view.c:8227
-#: ../src/file-manager/fm-directory-view.c:8231
-#: ../src/file-manager/fm-directory-view.c:8337
-#: ../src/file-manager/fm-directory-view.c:8341
-#: ../src/nautilus-places-sidebar.c:1429 ../src/nautilus-places-sidebar.c:2243
+#: ../src/file-manager/fm-directory-view.c:7224
+#: ../src/file-manager/fm-directory-view.c:7252
+#: ../src/file-manager/fm-directory-view.c:7333
+#: ../src/file-manager/fm-directory-view.c:8010
+#: ../src/file-manager/fm-directory-view.c:8014
+#: ../src/file-manager/fm-directory-view.c:8102
+#: ../src/file-manager/fm-directory-view.c:8106
+#: ../src/file-manager/fm-directory-view.c:8212
+#: ../src/file-manager/fm-directory-view.c:8216
+#: ../src/nautilus-places-sidebar.c:1444 ../src/nautilus-places-sidebar.c:2301
 msgid "_Start"
 msgstr "_Start"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7299
+#: ../src/file-manager/fm-directory-view.c:7225
 msgid "Start the selected volume"
 msgstr "Start the selected volume"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7302
-#: ../src/file-manager/fm-directory-view.c:7330
-#: ../src/file-manager/fm-directory-view.c:7411
-#: ../src/file-manager/fm-directory-view.c:8164
-#: ../src/file-manager/fm-directory-view.c:8256
-#: ../src/file-manager/fm-directory-view.c:8366
-#: ../src/nautilus-places-sidebar.c:1430 ../src/nautilus-places-sidebar.c:2250
+#: ../src/file-manager/fm-directory-view.c:7228
+#: ../src/file-manager/fm-directory-view.c:7256
+#: ../src/file-manager/fm-directory-view.c:7337
+#: ../src/file-manager/fm-directory-view.c:8039
+#: ../src/file-manager/fm-directory-view.c:8131
+#: ../src/file-manager/fm-directory-view.c:8241
+#: ../src/nautilus-places-sidebar.c:1445 ../src/nautilus-places-sidebar.c:2308
 #: ../src/nautilus-window-menus.c:810
 msgid "_Stop"
 msgstr "_Stop"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7303
-#: ../src/file-manager/fm-directory-view.c:8367
+#: ../src/file-manager/fm-directory-view.c:7229
+#: ../src/file-manager/fm-directory-view.c:8242
 msgid "Stop the selected volume"
 msgstr "Stop the selected volume"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7306
-#: ../src/file-manager/fm-directory-view.c:7334
-#: ../src/file-manager/fm-directory-view.c:7415
-#: ../src/nautilus-places-sidebar.c:2229
+#: ../src/file-manager/fm-directory-view.c:7232
+#: ../src/file-manager/fm-directory-view.c:7260
+#: ../src/file-manager/fm-directory-view.c:7341
+#: ../src/nautilus-places-sidebar.c:2287
 msgid "_Detect Media"
 msgstr "_Detect Media"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7307
-#: ../src/file-manager/fm-directory-view.c:7335
-#: ../src/file-manager/fm-directory-view.c:7416
+#: ../src/file-manager/fm-directory-view.c:7233
+#: ../src/file-manager/fm-directory-view.c:7261
+#: ../src/file-manager/fm-directory-view.c:7342
 msgid "Detect media in the selected drive"
 msgstr "Detect media in the selected drive"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7311
+#: ../src/file-manager/fm-directory-view.c:7237
 msgid "Mount the volume associated with the open folder"
 msgstr "Mount the volume associated with the open folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7315
+#: ../src/file-manager/fm-directory-view.c:7241
 msgid "Unmount the volume associated with the open folder"
 msgstr "Unmount the volume associated with the open folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7319
+#: ../src/file-manager/fm-directory-view.c:7245
 msgid "Eject the volume associated with the open folder"
 msgstr "Eject the volume associated with the open folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7323
+#: ../src/file-manager/fm-directory-view.c:7249
 msgid "Format the volume associated with the open folder"
 msgstr "Format the volume associated with the open folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7327
+#: ../src/file-manager/fm-directory-view.c:7253
 msgid "Start the volume associated with the open folder"
 msgstr "Start the volume associated with the open folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7331
+#: ../src/file-manager/fm-directory-view.c:7257
 msgid "Stop the volume associated with the open folder"
 msgstr "Stop the volume associated with the open folder"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7338
+#: ../src/file-manager/fm-directory-view.c:7264
 msgid "Open File and Close window"
 msgstr "Open File and Close window"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7342
+#: ../src/file-manager/fm-directory-view.c:7268
 msgid "Sa_ve Search"
 msgstr "Sa_ve Search"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7343
+#: ../src/file-manager/fm-directory-view.c:7269
 msgid "Save the edited search"
 msgstr "Save the edited search"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7346
+#: ../src/file-manager/fm-directory-view.c:7272
 msgid "Sa_ve Search As..."
 msgstr "Sa_ve Search Asâ?¦"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7347
+#: ../src/file-manager/fm-directory-view.c:7273
 msgid "Save the current search as a file"
 msgstr "Save the current search as a file"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7353
+#: ../src/file-manager/fm-directory-view.c:7279
 msgid "Open this folder in a navigation window"
 msgstr "Open this folder in a navigation window"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7357
+#: ../src/file-manager/fm-directory-view.c:7283
 msgid "Open this folder in a new tab"
 msgstr "Open this folder in a new tab"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7362
+#: ../src/file-manager/fm-directory-view.c:7288
 msgid "Open this folder in a folder window"
 msgstr "Open this folder in a folder window"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7367
+#: ../src/file-manager/fm-directory-view.c:7293
 msgid "Prepare this folder to be moved with a Paste command"
 msgstr "Prepare this folder to be moved with a Paste command"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7371
+#: ../src/file-manager/fm-directory-view.c:7297
 msgid "Prepare this folder to be copied with a Paste command"
 msgstr "Prepare this folder to be copied with a Paste command"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7375
+#: ../src/file-manager/fm-directory-view.c:7301
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into this "
 "folder"
@@ -4461,394 +4566,398 @@ msgstr ""
 "folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7380
+#: ../src/file-manager/fm-directory-view.c:7306
 msgid "Move this folder to the Trash"
 msgstr "Move this folder to the Wastebasket"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7384
+#: ../src/file-manager/fm-directory-view.c:7310
 msgid "Delete this folder, without moving to the Trash"
 msgstr "Delete this folder, without moving to the Wastebasket"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7392
+#: ../src/file-manager/fm-directory-view.c:7318
 msgid "Mount the volume associated with this folder"
 msgstr "Mount the volume associated with this folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7396
+#: ../src/file-manager/fm-directory-view.c:7322
 msgid "Unmount the volume associated with this folder"
 msgstr "Unmount the volume associated with this folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7400
+#: ../src/file-manager/fm-directory-view.c:7326
 msgid "Eject the volume associated with this folder"
 msgstr "Eject the volume associated with this folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7404
+#: ../src/file-manager/fm-directory-view.c:7330
 msgid "Format the volume associated with this folder"
 msgstr "Format the volume associated with this folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7408
+#: ../src/file-manager/fm-directory-view.c:7334
 msgid "Start the volume associated with this folder"
 msgstr "Start the volume associated with this folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7412
+#: ../src/file-manager/fm-directory-view.c:7338
 msgid "Stop the volume associated with this folder"
 msgstr "Stop the volume associated with this folder"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7421
+#: ../src/file-manager/fm-directory-view.c:7347
 msgid "View or modify the properties of this folder"
 msgstr "View or modify the properties of this folder"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7424
-#: ../src/file-manager/fm-directory-view.c:7427
+#: ../src/file-manager/fm-directory-view.c:7350
+#: ../src/file-manager/fm-directory-view.c:7353
 msgid "_Other pane"
 msgstr "_Other pane"
 
-#: ../src/file-manager/fm-directory-view.c:7425
+#: ../src/file-manager/fm-directory-view.c:7351
 msgid "Copy the current selection to the other pane in the window"
 msgstr "Copy the current selection to the other pane in the window"
 
-#: ../src/file-manager/fm-directory-view.c:7428
+#: ../src/file-manager/fm-directory-view.c:7354
 msgid "Move the current selection to the other pane in the window"
 msgstr "Move the current selection to the other pane in the window"
 
 #. name, stock id, label
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7431
-#: ../src/file-manager/fm-directory-view.c:7435
+#: ../src/file-manager/fm-directory-view.c:7357
+#: ../src/file-manager/fm-directory-view.c:7361
 #: ../src/nautilus-window-menus.c:854
 msgid "_Home Folder"
 msgstr "_Home Folder"
 
-#: ../src/file-manager/fm-directory-view.c:7432
+#: ../src/file-manager/fm-directory-view.c:7358
 msgid "Copy the current selection to the home folder"
 msgstr "Copy the current selection to the home folder"
 
-#: ../src/file-manager/fm-directory-view.c:7436
+#: ../src/file-manager/fm-directory-view.c:7362
 msgid "Move the current selection to the home folder"
 msgstr "Move the current selection to the home folder"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:7439
-#: ../src/file-manager/fm-directory-view.c:7443
+#: ../src/file-manager/fm-directory-view.c:7365
+#: ../src/file-manager/fm-directory-view.c:7369
 msgid "_Desktop"
 msgstr "_Desktop"
 
-#: ../src/file-manager/fm-directory-view.c:7440
+#: ../src/file-manager/fm-directory-view.c:7366
 msgid "Copy the current selection to the desktop"
 msgstr "Copy the current selection to the desktop"
 
-#: ../src/file-manager/fm-directory-view.c:7444
+#: ../src/file-manager/fm-directory-view.c:7370
 msgid "Move the current selection to the desktop"
 msgstr "Move the current selection to the desktop"
 
 #. Translators: %s is a directory
-#: ../src/file-manager/fm-directory-view.c:7526
+#: ../src/file-manager/fm-directory-view.c:7450
 #, c-format
 msgid "Run or manage scripts from %s"
 msgstr "Run or manage scripts from %s"
 
 #. Create a script action here specially because its tooltip is dynamic
-#: ../src/file-manager/fm-directory-view.c:7528
+#: ../src/file-manager/fm-directory-view.c:7452
 msgid "_Scripts"
 msgstr "_Scripts"
 
-#: ../src/file-manager/fm-directory-view.c:7983
+#: ../src/file-manager/fm-directory-view.c:7858
 #, c-format
 msgid "Move the open folder out of the trash to \"%s\""
 msgstr "Move the open folder out of the wastebasket to \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:7986
+#: ../src/file-manager/fm-directory-view.c:7861
 #, c-format
 msgid "Move the selected folder out of the trash to \"%s\""
 msgid_plural "Move the selected folders out of the trash to \"%s\""
 msgstr[0] "Move the selected folder out of the wastebasket to \"%s\""
 msgstr[1] "Move the selected folders out of the wastebasket to \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:7990
+#: ../src/file-manager/fm-directory-view.c:7865
 #, c-format
 msgid "Move the selected folder out of the trash"
 msgid_plural "Move the selected folders out of the trash"
 msgstr[0] "Move the selected folder out of the wastebasket"
 msgstr[1] "Move the selected folders out of the wastebasket"
 
-#: ../src/file-manager/fm-directory-view.c:7996
+#: ../src/file-manager/fm-directory-view.c:7871
 #, c-format
 msgid "Move the selected file out of the trash to \"%s\""
 msgid_plural "Move the selected files out of the trash to \"%s\""
 msgstr[0] "Move the selected file out of the wastebasket to \"%s\""
 msgstr[1] "Move the selected files out of the wastebasket to \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:8000
+#: ../src/file-manager/fm-directory-view.c:7875
 #, c-format
 msgid "Move the selected file out of the trash"
 msgid_plural "Move the selected files out of the trash"
 msgstr[0] "Move the selected file out of the wastebasket"
 msgstr[1] "Move the selected files out of the wastebasket"
 
-#: ../src/file-manager/fm-directory-view.c:8006
+#: ../src/file-manager/fm-directory-view.c:7881
 #, c-format
 msgid "Move the selected item out of the trash to \"%s\""
 msgid_plural "Move the selected items out of the trash to \"%s\""
 msgstr[0] "Move the selected item out of the wastebasket to \"%s\""
 msgstr[1] "Move the selected items out of the wastebasket to \"%s\""
 
-#: ../src/file-manager/fm-directory-view.c:8010
+#: ../src/file-manager/fm-directory-view.c:7885
 #, c-format
 msgid "Move the selected item out of the trash"
 msgid_plural "Move the selected items out of the trash"
 msgstr[0] "Move the selected item out of the wastebasket"
 msgstr[1] "Move the selected items out of the wastebasket"
 
-#: ../src/file-manager/fm-directory-view.c:8136
-#: ../src/file-manager/fm-directory-view.c:8140
-#: ../src/file-manager/fm-directory-view.c:8338
-#: ../src/file-manager/fm-directory-view.c:8342
+#: ../src/file-manager/fm-directory-view.c:8011
+#: ../src/file-manager/fm-directory-view.c:8015
+#: ../src/file-manager/fm-directory-view.c:8213
+#: ../src/file-manager/fm-directory-view.c:8217
 msgid "Start the selected drive"
 msgstr "Start the selected drive"
 
-#: ../src/file-manager/fm-directory-view.c:8144
-#: ../src/file-manager/fm-directory-view.c:8346
+#: ../src/file-manager/fm-directory-view.c:8019
+#: ../src/file-manager/fm-directory-view.c:8221
 msgid "Connect to the selected drive"
 msgstr "Connect to the selected drive"
 
-#: ../src/file-manager/fm-directory-view.c:8147
-#: ../src/file-manager/fm-directory-view.c:8239
-#: ../src/file-manager/fm-directory-view.c:8349
+#: ../src/file-manager/fm-directory-view.c:8022
+#: ../src/file-manager/fm-directory-view.c:8114
+#: ../src/file-manager/fm-directory-view.c:8224
 msgid "_Start Multi-disk Drive"
 msgstr "_Start Multi-disk Drive"
 
-#: ../src/file-manager/fm-directory-view.c:8148
-#: ../src/file-manager/fm-directory-view.c:8350
+#: ../src/file-manager/fm-directory-view.c:8023
+#: ../src/file-manager/fm-directory-view.c:8225
 msgid "Start the selected multi-disk drive"
 msgstr "Start the selected multi-disk drive"
 
-#: ../src/file-manager/fm-directory-view.c:8151
+#: ../src/file-manager/fm-directory-view.c:8026
 msgid "U_nlock Drive"
 msgstr "U_nlock Drive"
 
-#: ../src/file-manager/fm-directory-view.c:8152
-#: ../src/file-manager/fm-directory-view.c:8354
+#: ../src/file-manager/fm-directory-view.c:8027
+#: ../src/file-manager/fm-directory-view.c:8229
 msgid "Unlock the selected drive"
 msgstr "Unlock the selected drive"
 
-#: ../src/file-manager/fm-directory-view.c:8165
+#: ../src/file-manager/fm-directory-view.c:8040
 msgid "Stop the selected drive"
 msgstr "Stop the selected drive"
 
-#: ../src/file-manager/fm-directory-view.c:8168
-#: ../src/file-manager/fm-directory-view.c:8260
-#: ../src/file-manager/fm-directory-view.c:8370
-#: ../src/nautilus-places-sidebar.c:1436
+#: ../src/file-manager/fm-directory-view.c:8043
+#: ../src/file-manager/fm-directory-view.c:8135
+#: ../src/file-manager/fm-directory-view.c:8245
+#: ../src/nautilus-places-sidebar.c:1451
 msgid "_Safely Remove Drive"
 msgstr "_Safely Remove Drive"
 
-#: ../src/file-manager/fm-directory-view.c:8169
-#: ../src/file-manager/fm-directory-view.c:8371
+#: ../src/file-manager/fm-directory-view.c:8044
+#: ../src/file-manager/fm-directory-view.c:8246
 msgid "Safely remove the selected drive"
 msgstr "Safely remove the selected drive"
 
-#: ../src/file-manager/fm-directory-view.c:8172
-#: ../src/file-manager/fm-directory-view.c:8264
-#: ../src/file-manager/fm-directory-view.c:8374
+#: ../src/file-manager/fm-directory-view.c:8047
+#: ../src/file-manager/fm-directory-view.c:8139
+#: ../src/file-manager/fm-directory-view.c:8249
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
-#: ../src/file-manager/fm-directory-view.c:8173
-#: ../src/file-manager/fm-directory-view.c:8375
+#: ../src/file-manager/fm-directory-view.c:8048
+#: ../src/file-manager/fm-directory-view.c:8250
 msgid "Disconnect the selected drive"
 msgstr "Disconnect the selected drive"
 
-#: ../src/file-manager/fm-directory-view.c:8176
-#: ../src/file-manager/fm-directory-view.c:8268
-#: ../src/file-manager/fm-directory-view.c:8378
+#: ../src/file-manager/fm-directory-view.c:8051
+#: ../src/file-manager/fm-directory-view.c:8143
+#: ../src/file-manager/fm-directory-view.c:8253
 msgid "_Stop Multi-disk Drive"
 msgstr "_Stop Multi-disk Drive"
 
-#: ../src/file-manager/fm-directory-view.c:8177
-#: ../src/file-manager/fm-directory-view.c:8379
+#: ../src/file-manager/fm-directory-view.c:8052
+#: ../src/file-manager/fm-directory-view.c:8254
 msgid "Stop the selected multi-disk drive"
 msgstr "Stop the selected multi-disk drive"
 
-#: ../src/file-manager/fm-directory-view.c:8180
-#: ../src/file-manager/fm-directory-view.c:8272
-#: ../src/file-manager/fm-directory-view.c:8382
-#: ../src/nautilus-places-sidebar.c:1449
+#: ../src/file-manager/fm-directory-view.c:8055
+#: ../src/file-manager/fm-directory-view.c:8147
+#: ../src/file-manager/fm-directory-view.c:8257
+#: ../src/nautilus-places-sidebar.c:1464
 msgid "_Lock Drive"
 msgstr "_Lock Drive"
 
-#: ../src/file-manager/fm-directory-view.c:8181
-#: ../src/file-manager/fm-directory-view.c:8383
+#: ../src/file-manager/fm-directory-view.c:8056
+#: ../src/file-manager/fm-directory-view.c:8258
 msgid "Lock the selected drive"
 msgstr "Lock the selected drive"
 
-#: ../src/file-manager/fm-directory-view.c:8228
-#: ../src/file-manager/fm-directory-view.c:8232
+#: ../src/file-manager/fm-directory-view.c:8103
+#: ../src/file-manager/fm-directory-view.c:8107
 msgid "Start the drive associated with the open folder"
 msgstr "Start the drive associated with the open folder"
 
-#: ../src/file-manager/fm-directory-view.c:8236
+#: ../src/file-manager/fm-directory-view.c:8111
 msgid "Connect to the drive associated with the open folder"
 msgstr "Connect to the drive associated with the open folder"
 
-#: ../src/file-manager/fm-directory-view.c:8240
+#: ../src/file-manager/fm-directory-view.c:8115
 msgid "Start the multi-disk drive associated with the open folder"
 msgstr "Start the multi-disk drive associated with the open folder"
 
 #. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
-#: ../src/file-manager/fm-directory-view.c:8243
-#: ../src/file-manager/fm-directory-view.c:8353
-#: ../src/nautilus-places-sidebar.c:1448
+#: ../src/file-manager/fm-directory-view.c:8118
+#: ../src/file-manager/fm-directory-view.c:8228
+#: ../src/nautilus-places-sidebar.c:1463
 msgid "_Unlock Drive"
 msgstr "_Unlock Drive"
 
-#: ../src/file-manager/fm-directory-view.c:8244
+#: ../src/file-manager/fm-directory-view.c:8119
 msgid "Unlock the drive associated with the open folder"
 msgstr "Unlock the drive associated with the open folder"
 
-#: ../src/file-manager/fm-directory-view.c:8257
+#: ../src/file-manager/fm-directory-view.c:8132
 msgid "_Stop the drive associated with the open folder"
 msgstr "_Stop the drive associated with the open folder"
 
-#: ../src/file-manager/fm-directory-view.c:8261
+#: ../src/file-manager/fm-directory-view.c:8136
 msgid "Safely remove the drive associated with the open folder"
 msgstr "Safely remove the drive associated with the open folder"
 
-#: ../src/file-manager/fm-directory-view.c:8265
+#: ../src/file-manager/fm-directory-view.c:8140
 msgid "Disconnect the drive associated with the open folder"
 msgstr "Disconnect the drive associated with the open folder"
 
-#: ../src/file-manager/fm-directory-view.c:8269
+#: ../src/file-manager/fm-directory-view.c:8144
 msgid "Stop the multi-disk drive associated with the open folder"
 msgstr "Stop the multi-disk drive associated with the open folder"
 
-#: ../src/file-manager/fm-directory-view.c:8273
+#: ../src/file-manager/fm-directory-view.c:8148
 msgid "Lock the drive associated with the open folder"
 msgstr "Lock the drive associated with the open folder"
 
 #. add the "open in new window" menu item
-#: ../src/file-manager/fm-directory-view.c:8452
-#: ../src/file-manager/fm-directory-view.c:8758
-#: ../src/file-manager/fm-tree-view.c:1223
-#: ../src/nautilus-places-sidebar.c:2179
+#: ../src/file-manager/fm-directory-view.c:8327
+#: ../src/file-manager/fm-directory-view.c:8637
+#: ../src/file-manager/fm-tree-view.c:1183
+#: ../src/nautilus-places-sidebar.c:2237
 msgid "Open in New _Window"
 msgstr "Open in New _Window"
 
-#: ../src/file-manager/fm-directory-view.c:8454
-#: ../src/file-manager/fm-directory-view.c:8767
+#: ../src/file-manager/fm-directory-view.c:8329
+#: ../src/file-manager/fm-directory-view.c:8646
 msgid "Browse in New _Window"
 msgstr "Browse in New _Window"
 
-#: ../src/file-manager/fm-directory-view.c:8460
-#: ../src/file-manager/fm-directory-view.c:8777
+#: ../src/file-manager/fm-directory-view.c:8335
+#: ../src/file-manager/fm-directory-view.c:8656
 msgid "_Browse Folder"
 msgid_plural "_Browse Folders"
 msgstr[0] "_Browse Folder"
 msgstr[1] "_Browse Folders"
 
-#: ../src/file-manager/fm-directory-view.c:8477
-#: ../src/file-manager/fm-directory-view.c:8806
+#: ../src/file-manager/fm-directory-view.c:8352
+#: ../src/file-manager/fm-directory-view.c:8685
 msgid "Browse in New _Tab"
 msgstr "Browse in New _Tab"
 
-#: ../src/file-manager/fm-directory-view.c:8526
-#: ../src/file-manager/fm-directory-view.c:8847
+#: ../src/file-manager/fm-directory-view.c:8401
+#: ../src/file-manager/fm-directory-view.c:8726
 msgid "_Delete Permanently"
 msgstr "_Delete Permanently"
 
-#: ../src/file-manager/fm-directory-view.c:8527
+#: ../src/file-manager/fm-directory-view.c:8402
 msgid "Delete the open folder permanently"
 msgstr "Delete the open folder permanently"
 
-#: ../src/file-manager/fm-directory-view.c:8531
+#: ../src/file-manager/fm-directory-view.c:8406
 msgid "Move the open folder to the Trash"
 msgstr "Move the open folder to the Wastebasket"
 
-#: ../src/file-manager/fm-directory-view.c:8710
+#: ../src/file-manager/fm-directory-view.c:8586
 #, c-format
-msgid "_Open with %s"
-msgstr "_Open with %s"
+msgid "_Open With %s"
+msgstr "_Open With %s"
 
-#: ../src/file-manager/fm-directory-view.c:8760
+#: ../src/file-manager/fm-directory-view.c:8639
 #, c-format
 msgid "Open in %'d New _Window"
 msgid_plural "Open in %'d New _Windows"
 msgstr[0] "Open in %'d New _Window"
 msgstr[1] "Open in %'d New _Windows"
 
-#: ../src/file-manager/fm-directory-view.c:8769
+#: ../src/file-manager/fm-directory-view.c:8648
 #, c-format
 msgid "Browse in %'d New _Window"
 msgid_plural "Browse in %'d New _Windows"
 msgstr[0] "Browse in %'d New _Window"
 msgstr[1] "Browse in %'d New _Windows"
 
-#: ../src/file-manager/fm-directory-view.c:8799
+#: ../src/file-manager/fm-directory-view.c:8678
 #, c-format
 msgid "Open in %'d New _Tab"
 msgid_plural "Open in %'d New _Tabs"
 msgstr[0] "Open in %'d New _Tab"
 msgstr[1] "Open in %'d New _Tabs"
 
-#: ../src/file-manager/fm-directory-view.c:8808
+#: ../src/file-manager/fm-directory-view.c:8687
 #, c-format
 msgid "Browse in %'d New _Tab"
 msgid_plural "Browse in %'d New _Tabs"
 msgstr[0] "Browse in %'d New _Tab"
 msgstr[1] "Browse in %'d New _Tabs"
 
-#: ../src/file-manager/fm-directory-view.c:8848
+#: ../src/file-manager/fm-directory-view.c:8727
 msgid "Delete all selected items permanently"
 msgstr "Delete all selected items permanently"
 
-#: ../src/file-manager/fm-directory-view.c:10196
+#: ../src/file-manager/fm-directory-view.c:8784
+msgid "View or modify the properties of the open folder"
+msgstr "View or modify the properties of the open folder"
+
+#: ../src/file-manager/fm-directory-view.c:10088
 msgid "Download location?"
 msgstr "Download location?"
 
-#: ../src/file-manager/fm-directory-view.c:10199
+#: ../src/file-manager/fm-directory-view.c:10091
 msgid "You can download it or make a link to it."
 msgstr "You can download it or make a link to it."
 
-#: ../src/file-manager/fm-directory-view.c:10202
+#: ../src/file-manager/fm-directory-view.c:10094
 msgid "Make a _Link"
 msgstr "Make a _Link"
 
-#: ../src/file-manager/fm-directory-view.c:10206
+#: ../src/file-manager/fm-directory-view.c:10098
 msgid "_Download"
 msgstr "_Download"
 
-#: ../src/file-manager/fm-directory-view.c:10367
-#: ../src/file-manager/fm-directory-view.c:10425
-#: ../src/file-manager/fm-directory-view.c:10530
+#: ../src/file-manager/fm-directory-view.c:10259
+#: ../src/file-manager/fm-directory-view.c:10317
+#: ../src/file-manager/fm-directory-view.c:10422
 msgid "Drag and drop is not supported."
 msgstr "Drag and drop is not supported."
 
-#: ../src/file-manager/fm-directory-view.c:10368
+#: ../src/file-manager/fm-directory-view.c:10260
 msgid "Drag and drop is only supported on local file systems."
 msgstr "Drag and drop is only supported on local file systems."
 
-#: ../src/file-manager/fm-directory-view.c:10426
-#: ../src/file-manager/fm-directory-view.c:10531
+#: ../src/file-manager/fm-directory-view.c:10318
+#: ../src/file-manager/fm-directory-view.c:10423
 msgid "An invalid drag type was used."
 msgstr "An invalid drag type was used."
 
 #. Translator: This is the filename used for when you dnd text to a directory
-#: ../src/file-manager/fm-directory-view.c:10608
+#: ../src/file-manager/fm-directory-view.c:10500
 msgid "dropped text.txt"
 msgstr "dropped text.txt"
 
 #. Translator: This is the filename used for when you dnd raw
 #. * data to a directory, if the source didn't supply a name.
 #.
-#: ../src/file-manager/fm-directory-view.c:10653
+#: ../src/file-manager/fm-directory-view.c:10545
 msgid "dropped data"
 msgstr "dropped data"
 
@@ -4863,7 +4972,7 @@ msgstr "URL"
 
 #: ../src/file-manager/fm-ditem-page.c:417
 #: ../src/file-manager/fm-ditem-page.c:427
-#: ../src/nautilus-image-properties-page.c:347
+#: ../src/nautilus-image-properties-page.c:352
 msgid "Description"
 msgstr "Description"
 
@@ -4975,238 +5084,255 @@ msgstr "The permissions could not be changed."
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "Renaming \"%s\" to \"%s\"."
 
-#: ../src/file-manager/fm-icon-view.c:123
+#: ../src/file-manager/fm-icon-view.c:126
 msgid "by _Name"
 msgstr "by _Name"
 
-#: ../src/file-manager/fm-icon-view.c:124
-#: ../src/file-manager/fm-icon-view.c:1535
+#: ../src/file-manager/fm-icon-view.c:127
+#: ../src/file-manager/fm-icon-view.c:1646
 msgid "Keep icons sorted by name in rows"
 msgstr "Keep icons sorted by name in rows"
 
-#: ../src/file-manager/fm-icon-view.c:130
+#: ../src/file-manager/fm-icon-view.c:133
 msgid "by _Size"
 msgstr "by _Size"
 
-#: ../src/file-manager/fm-icon-view.c:131
-#: ../src/file-manager/fm-icon-view.c:1539
+#: ../src/file-manager/fm-icon-view.c:134
+#: ../src/file-manager/fm-icon-view.c:1650
 msgid "Keep icons sorted by size in rows"
 msgstr "Keep icons sorted by size in rows"
 
-#: ../src/file-manager/fm-icon-view.c:137
+#: ../src/file-manager/fm-icon-view.c:140
 msgid "by _Type"
 msgstr "by _Type"
 
-#: ../src/file-manager/fm-icon-view.c:138
-#: ../src/file-manager/fm-icon-view.c:1543
+#: ../src/file-manager/fm-icon-view.c:141
+#: ../src/file-manager/fm-icon-view.c:1654
 msgid "Keep icons sorted by type in rows"
 msgstr "Keep icons sorted by type in rows"
 
-#: ../src/file-manager/fm-icon-view.c:144
+#: ../src/file-manager/fm-icon-view.c:147
 msgid "by Modification _Date"
 msgstr "by Modification _Date"
 
-#: ../src/file-manager/fm-icon-view.c:145
-#: ../src/file-manager/fm-icon-view.c:1547
+#: ../src/file-manager/fm-icon-view.c:148
+#: ../src/file-manager/fm-icon-view.c:1658
 msgid "Keep icons sorted by modification date in rows"
 msgstr "Keep icons sorted by modification date in rows"
 
-#: ../src/file-manager/fm-icon-view.c:151
+#: ../src/file-manager/fm-icon-view.c:154
 msgid "by _Emblems"
 msgstr "by _Emblems"
 
-#: ../src/file-manager/fm-icon-view.c:152
-#: ../src/file-manager/fm-icon-view.c:1551
+#: ../src/file-manager/fm-icon-view.c:155
+#: ../src/file-manager/fm-icon-view.c:1662
 msgid "Keep icons sorted by emblems in rows"
 msgstr "Keep icons sorted by emblems in rows"
 
+#: ../src/file-manager/fm-icon-view.c:161
+msgid "by T_rash Time"
+msgstr "by _Wastebasket Time"
+
+#: ../src/file-manager/fm-icon-view.c:162
+#: ../src/file-manager/fm-icon-view.c:1666
+msgid "Keep icons sorted by trash time in rows"
+msgstr "Keep icons sorted by trash time in rows"
+
+#: ../src/file-manager/fm-icon-view.c:728
+msgid "_Organize Desktop by Name"
+msgstr "_Organise Desktop by Name"
+
 #. name, stock id, label
-#: ../src/file-manager/fm-icon-view.c:1495
+#: ../src/file-manager/fm-icon-view.c:1606
 msgid "Arran_ge Items"
 msgstr "Arran_ge Items"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1497
-msgid "Stretc_h Icon..."
-msgstr "Stretc_h Iconâ?¦"
+#: ../src/file-manager/fm-icon-view.c:1608
+msgid "Resize Icon..."
+msgstr "Resize Iconâ?¦"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1498
-msgid "Make the selected icon stretchable"
-msgstr "Make the selected icon stretchable"
+#: ../src/file-manager/fm-icon-view.c:1609
+msgid "Make the selected icon resizable"
+msgstr "Make the selected icon resizable"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1501
-#: ../src/file-manager/fm-icon-view.c:1671
+#: ../src/file-manager/fm-icon-view.c:1612
+#: ../src/file-manager/fm-icon-view.c:1789
 msgid "Restore Icons' Original Si_zes"
 msgstr "Restore Icons' Original Si_zes"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1502
+#: ../src/file-manager/fm-icon-view.c:1613
 msgid "Restore each selected icon to its original size"
 msgstr "Restore each selected icon to its original size"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1505
-msgid "Clean _Up by Name"
-msgstr "Clean _Up by Name"
+#: ../src/file-manager/fm-icon-view.c:1616
+msgid "_Organize by Name"
+msgstr "_Organise by Name"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1506
+#: ../src/file-manager/fm-icon-view.c:1617
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr "Reposition icons to better fit in the window and avoid overlapping"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1512
+#: ../src/file-manager/fm-icon-view.c:1623
 msgid "Compact _Layout"
 msgstr "Compact _Layout"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1513
+#: ../src/file-manager/fm-icon-view.c:1624
 msgid "Toggle using a tighter layout scheme"
 msgstr "Toggle using a tighter layout scheme"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1517
+#: ../src/file-manager/fm-icon-view.c:1628
 msgid "Re_versed Order"
 msgstr "Re_versed Order"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1518
+#: ../src/file-manager/fm-icon-view.c:1629
 msgid "Display icons in the opposite order"
 msgstr "Display icons in the opposite order"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1522
+#: ../src/file-manager/fm-icon-view.c:1633
 msgid "_Keep Aligned"
 msgstr "_Keep Aligned"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1523
+#: ../src/file-manager/fm-icon-view.c:1634
 msgid "Keep icons lined up on a grid"
 msgstr "Keep icons lined up on a grid"
 
-#: ../src/file-manager/fm-icon-view.c:1530
+#: ../src/file-manager/fm-icon-view.c:1641
 msgid "_Manually"
 msgstr "_Manually"
 
-#: ../src/file-manager/fm-icon-view.c:1531
+#: ../src/file-manager/fm-icon-view.c:1642
 msgid "Leave icons wherever they are dropped"
 msgstr "Leave icons wherever they are dropped"
 
-#: ../src/file-manager/fm-icon-view.c:1534
+#: ../src/file-manager/fm-icon-view.c:1645
 msgid "By _Name"
 msgstr "By _Name"
 
-#: ../src/file-manager/fm-icon-view.c:1538
+#: ../src/file-manager/fm-icon-view.c:1649
 msgid "By _Size"
 msgstr "By _Size"
 
-#: ../src/file-manager/fm-icon-view.c:1542
+#: ../src/file-manager/fm-icon-view.c:1653
 msgid "By _Type"
 msgstr "By _Type"
 
-#: ../src/file-manager/fm-icon-view.c:1546
+#: ../src/file-manager/fm-icon-view.c:1657
 msgid "By Modification _Date"
 msgstr "By Modification _Date"
 
-#: ../src/file-manager/fm-icon-view.c:1550
+#: ../src/file-manager/fm-icon-view.c:1661
 msgid "By _Emblems"
 msgstr "By _Emblems"
 
-#: ../src/file-manager/fm-icon-view.c:1672
+#: ../src/file-manager/fm-icon-view.c:1665
+msgid "By T_rash Time"
+msgstr "By _Wastebasket Time"
+
+#: ../src/file-manager/fm-icon-view.c:1790
 msgid "Restore Icon's Original Si_ze"
 msgstr "Restore Icon's Original Si_ze"
 
-#: ../src/file-manager/fm-icon-view.c:2094
+#: ../src/file-manager/fm-icon-view.c:2214
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "pointing at \"%s\""
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-icon-view.c:3079
+#: ../src/file-manager/fm-icon-view.c:3205
 msgid "_Icons"
 msgstr "_Icons"
 
-#: ../src/file-manager/fm-icon-view.c:3080
+#: ../src/file-manager/fm-icon-view.c:3206
 msgid "The icon view encountered an error."
 msgstr "The icon view encountered an error."
 
-#: ../src/file-manager/fm-icon-view.c:3081
+#: ../src/file-manager/fm-icon-view.c:3207
 msgid "The icon view encountered an error while starting up."
 msgstr "The icon view encountered an error while starting up."
 
-#: ../src/file-manager/fm-icon-view.c:3082
+#: ../src/file-manager/fm-icon-view.c:3208
 msgid "Display this location with the icon view."
 msgstr "Display this location with the icon view."
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-icon-view.c:3093
+#: ../src/file-manager/fm-icon-view.c:3219
 msgid "_Compact"
 msgstr "_Compact"
 
-#: ../src/file-manager/fm-icon-view.c:3094
+#: ../src/file-manager/fm-icon-view.c:3220
 msgid "The compact view encountered an error."
 msgstr "The compact view encountered an error."
 
-#: ../src/file-manager/fm-icon-view.c:3095
+#: ../src/file-manager/fm-icon-view.c:3221
 msgid "The compact view encountered an error while starting up."
 msgstr "The compact view encountered an error while starting up."
 
-#: ../src/file-manager/fm-icon-view.c:3096
+#: ../src/file-manager/fm-icon-view.c:3222
 msgid "Display this location with the compact view."
 msgstr "Display this location with the compact view."
 
-#: ../src/file-manager/fm-list-model.c:382
-#: ../src/file-manager/fm-tree-model.c:1268
+#: ../src/file-manager/fm-list-model.c:397
+#: ../src/file-manager/fm-tree-model.c:1287
 msgid "(Empty)"
 msgstr "(Empty)"
 
-#: ../src/file-manager/fm-list-model.c:384
-#: ../src/file-manager/fm-tree-model.c:1268 ../src/nautilus-window-slot.c:196
+#: ../src/file-manager/fm-list-model.c:399
+#: ../src/file-manager/fm-tree-model.c:1287 ../src/nautilus-window-slot.c:196
 msgid "Loading..."
 msgstr "Loadingâ?¦"
 
-#: ../src/file-manager/fm-list-view.c:2185
+#: ../src/file-manager/fm-list-view.c:2290
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s Visible Columns"
 
-#: ../src/file-manager/fm-list-view.c:2204
+#: ../src/file-manager/fm-list-view.c:2309
 msgid "Choose the order of information to appear in this folder:"
 msgstr "Choose the order of information to appear in this folder:"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-list-view.c:2258
+#: ../src/file-manager/fm-list-view.c:2363
 msgid "Visible _Columns..."
 msgstr "Visible _Columnsâ?¦"
 
 #. tooltip
-#: ../src/file-manager/fm-list-view.c:2259
+#: ../src/file-manager/fm-list-view.c:2364
 msgid "Select the columns visible in this folder"
 msgstr "Select the columns visible in this folder"
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-list-view.c:3007
+#: ../src/file-manager/fm-list-view.c:3156
 msgid "_List"
 msgstr "_List"
 
-#: ../src/file-manager/fm-list-view.c:3008
+#: ../src/file-manager/fm-list-view.c:3157
 msgid "The list view encountered an error."
 msgstr "The list view encountered an error."
 
-#: ../src/file-manager/fm-list-view.c:3009
+#: ../src/file-manager/fm-list-view.c:3158
 msgid "The list view encountered an error while starting up."
 msgstr "The list view encountered an error while starting up."
 
-#: ../src/file-manager/fm-list-view.c:3010
+#: ../src/file-manager/fm-list-view.c:3159
 msgid "Display this location with the list view."
 msgstr "Display this location with the list view."
 
@@ -5265,22 +5391,22 @@ msgstr "Cancel Group Change?"
 msgid "Cancel Owner Change?"
 msgstr "Cancel Owner Change?"
 
-#: ../src/file-manager/fm-properties-window.c:2326
+#: ../src/file-manager/fm-properties-window.c:2329
 msgid "nothing"
 msgstr "nothing"
 
-#: ../src/file-manager/fm-properties-window.c:2328
+#: ../src/file-manager/fm-properties-window.c:2331
 msgid "unreadable"
 msgstr "unreadable"
 
-#: ../src/file-manager/fm-properties-window.c:2338
+#: ../src/file-manager/fm-properties-window.c:2341
 #, c-format
 msgid "%'d item, with size %s"
 msgid_plural "%'d items, totalling %s"
 msgstr[0] "%'d item, with size %s"
 msgstr[1] "%'d items, totalling %s"
 
-#: ../src/file-manager/fm-properties-window.c:2347
+#: ../src/file-manager/fm-properties-window.c:2350
 msgid "(some contents unreadable)"
 msgstr "(some contents unreadable)"
 
@@ -5290,120 +5416,112 @@ msgstr "(some contents unreadable)"
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
 #.
-#: ../src/file-manager/fm-properties-window.c:2364
+#: ../src/file-manager/fm-properties-window.c:2367
 msgid "Contents:"
 msgstr "Contents:"
 
 #. Translators: "used" refers to the capacity of the filesystem
-#: ../src/file-manager/fm-properties-window.c:3131
+#: ../src/file-manager/fm-properties-window.c:3141
 msgid "used"
 msgstr "used"
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/file-manager/fm-properties-window.c:3136
+#: ../src/file-manager/fm-properties-window.c:3146
 msgid "free"
 msgstr "free"
 
-#: ../src/file-manager/fm-properties-window.c:3138
+#: ../src/file-manager/fm-properties-window.c:3148
 msgid "Total capacity:"
 msgstr "Total capacity:"
 
-#: ../src/file-manager/fm-properties-window.c:3147
+#: ../src/file-manager/fm-properties-window.c:3157
 msgid "Filesystem type:"
 msgstr "Filesystem type:"
 
-#: ../src/file-manager/fm-properties-window.c:3223
+#: ../src/file-manager/fm-properties-window.c:3233
 msgid "Basic"
 msgstr "Basic"
 
-#: ../src/file-manager/fm-properties-window.c:3283
-msgid "Type:"
-msgstr "Type:"
-
-#: ../src/file-manager/fm-properties-window.c:3291
+#: ../src/file-manager/fm-properties-window.c:3301
 msgid "Link target:"
 msgstr "Link target:"
 
-#: ../src/file-manager/fm-properties-window.c:3301
-msgid "Size:"
-msgstr "Size:"
-
-#: ../src/file-manager/fm-properties-window.c:3310
+#: ../src/file-manager/fm-properties-window.c:3320
 #: ../src/nautilus-location-bar.c:56
 msgid "Location:"
 msgstr "Location:"
 
-#: ../src/file-manager/fm-properties-window.c:3316
+#: ../src/file-manager/fm-properties-window.c:3326
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../src/file-manager/fm-properties-window.c:3325
+#: ../src/file-manager/fm-properties-window.c:3335
 msgid "Accessed:"
 msgstr "Accessed:"
 
-#: ../src/file-manager/fm-properties-window.c:3329
+#: ../src/file-manager/fm-properties-window.c:3339
 msgid "Modified:"
 msgstr "Modified:"
 
-#: ../src/file-manager/fm-properties-window.c:3338
+#: ../src/file-manager/fm-properties-window.c:3348
 msgid "Free space:"
 msgstr "Free space:"
 
-#: ../src/file-manager/fm-properties-window.c:3448
-#: ../src/nautilus-emblem-sidebar.c:1032
+#: ../src/file-manager/fm-properties-window.c:3458
+#: ../src/nautilus-emblem-sidebar.c:1037
 msgid "Emblems"
 msgstr "Emblems"
 
-#: ../src/file-manager/fm-properties-window.c:3851
+#: ../src/file-manager/fm-properties-window.c:3861
 msgid "_Read"
 msgstr "_Read"
 
-#: ../src/file-manager/fm-properties-window.c:3853
+#: ../src/file-manager/fm-properties-window.c:3863
 msgid "_Write"
 msgstr "_Write"
 
-#: ../src/file-manager/fm-properties-window.c:3855
+#: ../src/file-manager/fm-properties-window.c:3865
 msgid "E_xecute"
 msgstr "E_xecute"
 
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
 #.
-#: ../src/file-manager/fm-properties-window.c:4123
-#: ../src/file-manager/fm-properties-window.c:4134
-#: ../src/file-manager/fm-properties-window.c:4146
+#: ../src/file-manager/fm-properties-window.c:4133
+#: ../src/file-manager/fm-properties-window.c:4144
+#: ../src/file-manager/fm-properties-window.c:4156
 msgid "no "
 msgstr "no "
 
-#: ../src/file-manager/fm-properties-window.c:4126
+#: ../src/file-manager/fm-properties-window.c:4136
 msgid "list"
 msgstr "list"
 
-#: ../src/file-manager/fm-properties-window.c:4128
+#: ../src/file-manager/fm-properties-window.c:4138
 msgid "read"
 msgstr "read"
 
-#: ../src/file-manager/fm-properties-window.c:4137
+#: ../src/file-manager/fm-properties-window.c:4147
 msgid "create/delete"
 msgstr "create/delete"
 
-#: ../src/file-manager/fm-properties-window.c:4139
+#: ../src/file-manager/fm-properties-window.c:4149
 msgid "write"
 msgstr "write"
 
-#: ../src/file-manager/fm-properties-window.c:4148
+#: ../src/file-manager/fm-properties-window.c:4158
 msgid "access"
 msgstr "access"
 
-#: ../src/file-manager/fm-properties-window.c:4197
+#: ../src/file-manager/fm-properties-window.c:4207
 msgid "Access:"
 msgstr "Access:"
 
-#: ../src/file-manager/fm-properties-window.c:4199
+#: ../src/file-manager/fm-properties-window.c:4209
 msgid "Folder access:"
 msgstr "Folder access:"
 
-#: ../src/file-manager/fm-properties-window.c:4201
+#: ../src/file-manager/fm-properties-window.c:4211
 msgid "File access:"
 msgstr "File access:"
 
@@ -5411,154 +5529,154 @@ msgstr "File access:"
 #. * the user has in a directory.
 #.
 #. Translators: this is referred to captions under icons.
-#: ../src/file-manager/fm-properties-window.c:4216
-#: ../src/file-manager/fm-properties-window.c:4227
+#: ../src/file-manager/fm-properties-window.c:4226
+#: ../src/file-manager/fm-properties-window.c:4237
 #: ../src/nautilus-file-management-properties.c:292
 msgid "None"
 msgstr "None"
 
-#: ../src/file-manager/fm-properties-window.c:4219
+#: ../src/file-manager/fm-properties-window.c:4229
 msgid "List files only"
 msgstr "List files only"
 
-#: ../src/file-manager/fm-properties-window.c:4221
+#: ../src/file-manager/fm-properties-window.c:4231
 msgid "Access files"
 msgstr "Access files"
 
-#: ../src/file-manager/fm-properties-window.c:4223
+#: ../src/file-manager/fm-properties-window.c:4233
 msgid "Create and delete files"
 msgstr "Create and delete files"
 
-#: ../src/file-manager/fm-properties-window.c:4230
+#: ../src/file-manager/fm-properties-window.c:4240
 msgid "Read-only"
 msgstr "Read-only"
 
-#: ../src/file-manager/fm-properties-window.c:4232
+#: ../src/file-manager/fm-properties-window.c:4242
 msgid "Read and write"
 msgstr "Read and write"
 
-#: ../src/file-manager/fm-properties-window.c:4297
+#: ../src/file-manager/fm-properties-window.c:4309
 msgid "Set _user ID"
 msgstr "Set _user ID"
 
-#: ../src/file-manager/fm-properties-window.c:4299
+#: ../src/file-manager/fm-properties-window.c:4312
 msgid "Special flags:"
 msgstr "Special flags:"
 
-#: ../src/file-manager/fm-properties-window.c:4301
+#: ../src/file-manager/fm-properties-window.c:4314
 msgid "Set gro_up ID"
 msgstr "Set gro_up ID"
 
-#: ../src/file-manager/fm-properties-window.c:4302
+#: ../src/file-manager/fm-properties-window.c:4315
 msgid "_Sticky"
 msgstr "_Sticky"
 
-#: ../src/file-manager/fm-properties-window.c:4382
-#: ../src/file-manager/fm-properties-window.c:4586
+#: ../src/file-manager/fm-properties-window.c:4397
+#: ../src/file-manager/fm-properties-window.c:4605
 msgid "_Owner:"
 msgstr "_Owner:"
 
-#: ../src/file-manager/fm-properties-window.c:4388
-#: ../src/file-manager/fm-properties-window.c:4483
-#: ../src/file-manager/fm-properties-window.c:4594
+#: ../src/file-manager/fm-properties-window.c:4403
+#: ../src/file-manager/fm-properties-window.c:4501
+#: ../src/file-manager/fm-properties-window.c:4613
 msgid "Owner:"
 msgstr "Owner:"
 
-#: ../src/file-manager/fm-properties-window.c:4411
-#: ../src/file-manager/fm-properties-window.c:4606
+#: ../src/file-manager/fm-properties-window.c:4427
+#: ../src/file-manager/fm-properties-window.c:4625
 msgid "_Group:"
 msgstr "_Group:"
 
-#: ../src/file-manager/fm-properties-window.c:4420
-#: ../src/file-manager/fm-properties-window.c:4484
-#: ../src/file-manager/fm-properties-window.c:4615
+#: ../src/file-manager/fm-properties-window.c:4436
+#: ../src/file-manager/fm-properties-window.c:4502
+#: ../src/file-manager/fm-properties-window.c:4634
 msgid "Group:"
 msgstr "Group:"
 
-#: ../src/file-manager/fm-properties-window.c:4445
+#: ../src/file-manager/fm-properties-window.c:4462
 msgid "Others"
 msgstr "Others"
 
-#: ../src/file-manager/fm-properties-window.c:4462
+#: ../src/file-manager/fm-properties-window.c:4480
 msgid "Execute:"
 msgstr "Execute:"
 
-#: ../src/file-manager/fm-properties-window.c:4466
+#: ../src/file-manager/fm-properties-window.c:4484
 msgid "Allow _executing file as program"
 msgstr "Allow _executing file as program"
 
-#: ../src/file-manager/fm-properties-window.c:4485
+#: ../src/file-manager/fm-properties-window.c:4503
 msgid "Others:"
 msgstr "Others:"
 
-#: ../src/file-manager/fm-properties-window.c:4633
+#: ../src/file-manager/fm-properties-window.c:4653
 msgid "Folder Permissions:"
 msgstr "Folder Permissions:"
 
-#: ../src/file-manager/fm-properties-window.c:4645
+#: ../src/file-manager/fm-properties-window.c:4666
 msgid "File Permissions:"
 msgstr "File Permissions:"
 
-#: ../src/file-manager/fm-properties-window.c:4655
+#: ../src/file-manager/fm-properties-window.c:4677
 msgid "Text view:"
 msgstr "Text view:"
 
-#: ../src/file-manager/fm-properties-window.c:4802
+#: ../src/file-manager/fm-properties-window.c:4825
 msgid "You are not the owner, so you cannot change these permissions."
 msgstr "You are not the owner, so you cannot change these permissions."
 
-#: ../src/file-manager/fm-properties-window.c:4826
+#: ../src/file-manager/fm-properties-window.c:4850
 msgid "SELinux context:"
 msgstr "SELinux context:"
 
-#: ../src/file-manager/fm-properties-window.c:4831
+#: ../src/file-manager/fm-properties-window.c:4855
 msgid "Last changed:"
 msgstr "Last changed:"
 
-#: ../src/file-manager/fm-properties-window.c:4845
+#: ../src/file-manager/fm-properties-window.c:4869
 msgid "Apply Permissions to Enclosed Files"
 msgstr "Apply Permissions to Enclosed Files"
 
-#: ../src/file-manager/fm-properties-window.c:4855
+#: ../src/file-manager/fm-properties-window.c:4879
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "The permissions of \"%s\" could not be determined."
 
-#: ../src/file-manager/fm-properties-window.c:4858
+#: ../src/file-manager/fm-properties-window.c:4882
 msgid "The permissions of the selected file could not be determined."
 msgstr "The permissions of the selected file could not be determined."
 
-#: ../src/file-manager/fm-properties-window.c:5428
+#: ../src/file-manager/fm-properties-window.c:5452
 msgid "Creating Properties window."
 msgstr "Creating Properties window."
 
-#: ../src/file-manager/fm-properties-window.c:5718
+#: ../src/file-manager/fm-properties-window.c:5742
 msgid "Select Custom Icon"
 msgstr "Select Custom Icon"
 
-#: ../src/file-manager/fm-tree-view.c:1374
-#: ../src/nautilus-places-sidebar.c:331
+#: ../src/file-manager/fm-tree-view.c:1334
+#: ../src/nautilus-places-sidebar.c:369
 msgid "File System"
 msgstr "File System"
 
-#: ../src/file-manager/fm-tree-view.c:1378
+#: ../src/file-manager/fm-tree-view.c:1338
 msgid "Network Neighbourhood"
 msgstr "Network Neighbourhood"
 
-#: ../src/file-manager/fm-tree-view.c:1633
+#: ../src/file-manager/fm-tree-view.c:1604
 msgid "Tree"
 msgstr "Tree"
 
-#: ../src/file-manager/fm-tree-view.c:1639
+#: ../src/file-manager/fm-tree-view.c:1610
 msgid "Show Tree"
 msgstr "Show Tree"
 
-#: ../src/nautilus-application.c:413
+#: ../src/nautilus-application.c:328
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus could not create the required folder \"%s\"."
 
-#: ../src/nautilus-application.c:415
+#: ../src/nautilus-application.c:330
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
@@ -5566,12 +5684,12 @@ msgstr ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
 
-#: ../src/nautilus-application.c:418
+#: ../src/nautilus-application.c:333
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus could not create the following required folders: %s."
 
-#: ../src/nautilus-application.c:420
+#: ../src/nautilus-application.c:335
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
@@ -5579,8 +5697,8 @@ msgstr ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
 
-#: ../src/nautilus-application.c:1493 ../src/nautilus-places-sidebar.c:1788
-#: ../src/nautilus-places-sidebar.c:1811 ../src/nautilus-places-sidebar.c:1834
+#: ../src/nautilus-application.c:1552 ../src/nautilus-places-sidebar.c:1822
+#: ../src/nautilus-places-sidebar.c:1851 ../src/nautilus-places-sidebar.c:1880
 #, c-format
 msgid "Unable to eject %s"
 msgstr "Unable to eject %s"
@@ -5623,7 +5741,7 @@ msgstr ""
 
 #: ../src/nautilus-bookmarks-window.c:158
 #: ../src/nautilus-file-management-properties.c:209
-#: ../src/nautilus-property-browser.c:1569 ../src/nautilus-window-menus.c:589
+#: ../src/nautilus-property-browser.c:1579 ../src/nautilus-window-menus.c:589
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -5657,13 +5775,13 @@ msgstr "Edit Bookmarks"
 msgid "Cannot display location \"%s\""
 msgstr "Cannot display location \"%s\""
 
-#: ../src/nautilus-connect-server-dialog-main.c:170
+#: ../src/nautilus-connect-server-dialog-main.c:171
 msgid "[URI]"
 msgstr "[URI]"
 
 #. Translators: This is the --help description for the connect to server app,
 #. the initial newlines are between the command line arg and the description
-#: ../src/nautilus-connect-server-dialog-main.c:182
+#: ../src/nautilus-connect-server-dialog-main.c:183
 msgid ""
 "\n"
 "\n"
@@ -5673,92 +5791,92 @@ msgstr ""
 "\n"
 "Add connect to server mount"
 
-#: ../src/nautilus-connect-server-dialog.c:113
+#: ../src/nautilus-connect-server-dialog.c:114
 msgid "Custom Location"
 msgstr "Custom Location"
 
-#: ../src/nautilus-connect-server-dialog.c:115
+#: ../src/nautilus-connect-server-dialog.c:116
 msgid "SSH"
 msgstr "SSH"
 
-#: ../src/nautilus-connect-server-dialog.c:118
+#: ../src/nautilus-connect-server-dialog.c:119
 msgid "Public FTP"
 msgstr "Public FTP"
 
-#: ../src/nautilus-connect-server-dialog.c:120
+#: ../src/nautilus-connect-server-dialog.c:121
 msgid "FTP (with login)"
 msgstr "FTP (with login)"
 
-#: ../src/nautilus-connect-server-dialog.c:123
+#: ../src/nautilus-connect-server-dialog.c:124
 msgid "Windows share"
 msgstr "Windows share"
 
-#: ../src/nautilus-connect-server-dialog.c:125
+#: ../src/nautilus-connect-server-dialog.c:126
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../src/nautilus-connect-server-dialog.c:127
+#: ../src/nautilus-connect-server-dialog.c:128
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Secure WebDAV (HTTPS)"
 
-#: ../src/nautilus-connect-server-dialog.c:185
+#: ../src/nautilus-connect-server-dialog.c:186
 msgid "Cannot Connect to Server. You must enter a name for the server."
 msgstr "Cannot Connect to Server. You must enter a name for the server."
 
-#: ../src/nautilus-connect-server-dialog.c:186
+#: ../src/nautilus-connect-server-dialog.c:187
 msgid "Please enter a name and try again."
 msgstr "Please enter a name and try again."
 
-#: ../src/nautilus-connect-server-dialog.c:427
+#: ../src/nautilus-connect-server-dialog.c:432
 msgid "_Location (URI):"
 msgstr "_Location (URI):"
 
-#: ../src/nautilus-connect-server-dialog.c:449
+#: ../src/nautilus-connect-server-dialog.c:454
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/nautilus-connect-server-dialog.c:468
+#: ../src/nautilus-connect-server-dialog.c:473
 msgid "Optional information:"
 msgstr "Optional information:"
 
-#: ../src/nautilus-connect-server-dialog.c:480
+#: ../src/nautilus-connect-server-dialog.c:485
 msgid "_Share:"
 msgstr "_Share:"
 
-#: ../src/nautilus-connect-server-dialog.c:501
+#: ../src/nautilus-connect-server-dialog.c:506
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/nautilus-connect-server-dialog.c:541
+#: ../src/nautilus-connect-server-dialog.c:546
 msgid "_User Name:"
 msgstr "_User Name:"
 
-#: ../src/nautilus-connect-server-dialog.c:562
+#: ../src/nautilus-connect-server-dialog.c:567
 msgid "_Domain Name:"
 msgstr "_Domain Name:"
 
-#: ../src/nautilus-connect-server-dialog.c:594
+#: ../src/nautilus-connect-server-dialog.c:599
 msgid "Bookmark _name:"
 msgstr "Bookmark _name:"
 
-#: ../src/nautilus-connect-server-dialog.c:790
+#: ../src/nautilus-connect-server-dialog.c:795
 msgid "Connect to Server"
 msgstr "Connect to Server"
 
-#: ../src/nautilus-connect-server-dialog.c:807
+#: ../src/nautilus-connect-server-dialog.c:812
 msgid "Service _type:"
 msgstr "Service _type:"
 
-#: ../src/nautilus-connect-server-dialog.c:903
+#: ../src/nautilus-connect-server-dialog.c:908
 msgid "Add _bookmark"
 msgstr "Add _bookmark"
 
-#: ../src/nautilus-connect-server-dialog.c:941
+#: ../src/nautilus-connect-server-dialog.c:946
 msgid "C_onnect"
 msgstr "C_onnect"
 
-#: ../src/nautilus-desktop-window.c:243 ../src/nautilus-pathbar.c:1240
-#: ../src/nautilus-places-sidebar.c:318
+#: ../src/nautilus-desktop-window.c:79 ../src/nautilus-desktop-window.c:249
+#: ../src/nautilus-pathbar.c:1260 ../src/nautilus-places-sidebar.c:356
 msgid "Desktop"
 msgstr "Desktop"
 
@@ -5812,32 +5930,32 @@ msgstr ""
 "Enter a descriptive name next to the emblem.  This name will be used in "
 "other places to identify the emblem."
 
-#: ../src/nautilus-emblem-sidebar.c:764
+#: ../src/nautilus-emblem-sidebar.c:769
 msgid "Some of the files could not be added as emblems."
 msgstr "Some of the files could not be added as emblems."
 
-#: ../src/nautilus-emblem-sidebar.c:764 ../src/nautilus-emblem-sidebar.c:766
+#: ../src/nautilus-emblem-sidebar.c:769 ../src/nautilus-emblem-sidebar.c:771
 msgid "The emblems do not appear to be valid images."
 msgstr "The emblems do not appear to be valid images."
 
-#: ../src/nautilus-emblem-sidebar.c:766
+#: ../src/nautilus-emblem-sidebar.c:771
 msgid "None of the files could be added as emblems."
 msgstr "None of the files could be added as emblems."
 
-#: ../src/nautilus-emblem-sidebar.c:803 ../src/nautilus-emblem-sidebar.c:858
+#: ../src/nautilus-emblem-sidebar.c:808 ../src/nautilus-emblem-sidebar.c:863
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "The file '%s' does not appear to be a valid image."
 
-#: ../src/nautilus-emblem-sidebar.c:806
+#: ../src/nautilus-emblem-sidebar.c:811
 msgid "The dragged file does not appear to be a valid image."
 msgstr "The dragged file does not appear to be a valid image."
 
-#: ../src/nautilus-emblem-sidebar.c:808 ../src/nautilus-emblem-sidebar.c:859
+#: ../src/nautilus-emblem-sidebar.c:813 ../src/nautilus-emblem-sidebar.c:864
 msgid "The emblem cannot be added."
 msgstr "The emblem cannot be added."
 
-#: ../src/nautilus-emblem-sidebar.c:1038
+#: ../src/nautilus-emblem-sidebar.c:1043
 msgid "Show Emblems"
 msgstr "Show Emblems"
 
@@ -6018,8 +6136,8 @@ msgid "Never"
 msgstr "Never"
 
 #: ../src/nautilus-file-management-properties.ui.h:71
-msgid "Open each _folder its own window"
-msgstr "Open each _folder its own window"
+msgid "Open each _folder in its own window"
+msgstr "Open each _folder in its own window"
 
 #: ../src/nautilus-file-management-properties.ui.h:72
 msgid "Preview"
@@ -6129,98 +6247,98 @@ msgstr "History"
 msgid "Show History"
 msgstr "Show History"
 
-#: ../src/nautilus-image-properties-page.c:262
+#: ../src/nautilus-image-properties-page.c:267
 msgid "Camera Brand"
 msgstr "Camera Brand"
 
-#: ../src/nautilus-image-properties-page.c:263
+#: ../src/nautilus-image-properties-page.c:268
 msgid "Camera Model"
 msgstr "Camera Model"
 
 #. Choose which date to show in order of relevance
-#: ../src/nautilus-image-properties-page.c:266
+#: ../src/nautilus-image-properties-page.c:271
 msgid "Date Taken"
 msgstr "Date Taken"
 
-#: ../src/nautilus-image-properties-page.c:268
+#: ../src/nautilus-image-properties-page.c:273
 msgid "Date Digitized"
 msgstr "Date Digitised"
 
-#: ../src/nautilus-image-properties-page.c:274
+#: ../src/nautilus-image-properties-page.c:279
 msgid "Exposure Time"
 msgstr "Exposure Time"
 
-#: ../src/nautilus-image-properties-page.c:275
+#: ../src/nautilus-image-properties-page.c:280
 msgid "Aperture Value"
 msgstr "Aperture Value"
 
-#: ../src/nautilus-image-properties-page.c:276
+#: ../src/nautilus-image-properties-page.c:281
 msgid "ISO Speed Rating"
 msgstr "ISO Speed Rating"
 
-#: ../src/nautilus-image-properties-page.c:277
+#: ../src/nautilus-image-properties-page.c:282
 msgid "Flash Fired"
 msgstr "Flash Fired"
 
-#: ../src/nautilus-image-properties-page.c:278
+#: ../src/nautilus-image-properties-page.c:283
 msgid "Metering Mode"
 msgstr "Metering Mode"
 
-#: ../src/nautilus-image-properties-page.c:279
+#: ../src/nautilus-image-properties-page.c:284
 msgid "Exposure Program"
 msgstr "Exposure Programme"
 
-#: ../src/nautilus-image-properties-page.c:280
+#: ../src/nautilus-image-properties-page.c:285
 msgid "Focal Length"
 msgstr "Focal Length"
 
-#: ../src/nautilus-image-properties-page.c:281
+#: ../src/nautilus-image-properties-page.c:286
 msgid "Software"
 msgstr "Software"
 
-#: ../src/nautilus-image-properties-page.c:348
+#: ../src/nautilus-image-properties-page.c:353
 msgid "Keywords"
 msgstr "Keywords"
 
-#: ../src/nautilus-image-properties-page.c:349
+#: ../src/nautilus-image-properties-page.c:354
 msgid "Creator"
 msgstr "Creator"
 
-#: ../src/nautilus-image-properties-page.c:350
+#: ../src/nautilus-image-properties-page.c:355
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/nautilus-image-properties-page.c:351
+#: ../src/nautilus-image-properties-page.c:356
 msgid "Rating"
 msgstr "Rating"
 
-#: ../src/nautilus-image-properties-page.c:377
+#: ../src/nautilus-image-properties-page.c:382
 msgid "Image Type:"
 msgstr "Image Type:"
 
-#: ../src/nautilus-image-properties-page.c:380
+#: ../src/nautilus-image-properties-page.c:385
 #, c-format
 msgid "<b>Width:</b> %d pixel"
 msgid_plural "<b>Width:</b> %d pixels"
 msgstr[0] "<b>Width:</b> %d pixel"
 msgstr[1] "<b>Width:</b> %d pixels"
 
-#: ../src/nautilus-image-properties-page.c:386
+#: ../src/nautilus-image-properties-page.c:391
 #, c-format
 msgid "<b>Height:</b> %d pixel"
 msgid_plural "<b>Height:</b> %d pixels"
 msgstr[0] "<b>Height:</b> %d pixel"
 msgstr[1] "<b>Height:</b> %d pixel"
 
-#: ../src/nautilus-image-properties-page.c:403
+#: ../src/nautilus-image-properties-page.c:408
 msgid "Failed to load image information"
 msgstr "Failed to load image information"
 
-#: ../src/nautilus-image-properties-page.c:617
+#: ../src/nautilus-image-properties-page.c:622
 msgid "loading..."
 msgstr "loadingâ?¦"
 
-#: ../src/nautilus-image-properties-page.c:669
+#: ../src/nautilus-image-properties-page.c:674
 msgid "Image"
 msgstr "Image"
 
@@ -6334,209 +6452,212 @@ msgstr "nautilus: --geometry cannot be used with more than one URI.\n"
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "Are you sure you want to clear the list of locations you have visited?"
 
-#: ../src/nautilus-navigation-window-menus.c:370
-#: ../src/nautilus-window-bookmarks.c:99
+#: ../src/nautilus-navigation-window-menus.c:379
+#: ../src/nautilus-window-bookmarks.c:83
 #, c-format
 msgid "The location \"%s\" does not exist."
 msgstr "The location \"%s\" does not exist."
 
-#: ../src/nautilus-navigation-window-menus.c:372
+#: ../src/nautilus-navigation-window-menus.c:381
 msgid "The history location doesn't exist."
 msgstr "The history location doesn't exist."
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:761
+#: ../src/nautilus-navigation-window-menus.c:792
 msgid "_Go"
 msgstr "_Go"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:762
+#: ../src/nautilus-navigation-window-menus.c:793
 msgid "_Bookmarks"
 msgstr "_Bookmarks"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:763
+#: ../src/nautilus-navigation-window-menus.c:794
 msgid "_Tabs"
 msgstr "_Tabs"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:764
+#: ../src/nautilus-navigation-window-menus.c:795
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ../src/nautilus-navigation-window-menus.c:765
+#: ../src/nautilus-navigation-window-menus.c:796
 msgid "Open another Nautilus window for the displayed location"
 msgstr "Open another Nautilus window for the displayed location"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:767
+#: ../src/nautilus-navigation-window-menus.c:798
 msgid "New _Tab"
 msgstr "New _Tab"
 
-#: ../src/nautilus-navigation-window-menus.c:768
+#: ../src/nautilus-navigation-window-menus.c:799
 msgid "Open another tab for the displayed location"
 msgstr "Open another tab for the displayed location"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:770
+#: ../src/nautilus-navigation-window-menus.c:801
 msgid "Open Folder W_indow"
 msgstr "Open Folder W_indow"
 
-#: ../src/nautilus-navigation-window-menus.c:771
+#: ../src/nautilus-navigation-window-menus.c:802
 msgid "Open a folder window for the displayed location"
 msgstr "Open a folder window for the displayed location"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:773
+#: ../src/nautilus-navigation-window-menus.c:804
 msgid "Close _All Windows"
 msgstr "Close _All Windows"
 
-#: ../src/nautilus-navigation-window-menus.c:774
+#: ../src/nautilus-navigation-window-menus.c:805
 msgid "Close all Navigation windows"
 msgstr "Close all Navigation windows"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:776
+#: ../src/nautilus-navigation-window-menus.c:807
 msgid "_Location..."
 msgstr "_Locationâ?¦"
 
-#: ../src/nautilus-navigation-window-menus.c:777
-#: ../src/nautilus-spatial-window.c:928
+#: ../src/nautilus-navigation-window-menus.c:808
+#: ../src/nautilus-spatial-window.c:943
 msgid "Specify a location to open"
 msgstr "Specify a location to open"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:779
+#: ../src/nautilus-navigation-window-menus.c:810
 msgid "Clea_r History"
 msgstr "Clea_r History"
 
-#: ../src/nautilus-navigation-window-menus.c:780
+#: ../src/nautilus-navigation-window-menus.c:811
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "Clear contents of Go menu and Back/Forward lists"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:782
-msgid "Switch to other pane"
-msgstr "Switch to other pane"
+#: ../src/nautilus-navigation-window-menus.c:813
+msgid "S_witch to Other Pane"
+msgstr "S_witch to Other Pane"
 
-#: ../src/nautilus-navigation-window-menus.c:783
+#: ../src/nautilus-navigation-window-menus.c:814
 msgid "Move focus to the other pane in a split view window"
 msgstr "Move focus to the other pane in a split view window"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:785
-msgid "Same location as other pane"
-msgstr "Same location as other pane"
+#: ../src/nautilus-navigation-window-menus.c:816
+msgid "Sa_me Location as Other Pane"
+msgstr "Sa_me Location as Other Pane"
 
-#: ../src/nautilus-navigation-window-menus.c:786
+#: ../src/nautilus-navigation-window-menus.c:817
 msgid "Go to the same location as in the extra pane"
 msgstr "Go to the same location as in the extra pane"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:788
-#: ../src/nautilus-spatial-window.c:936
+#: ../src/nautilus-navigation-window-menus.c:819
+#: ../src/nautilus-spatial-window.c:951
 msgid "_Add Bookmark"
 msgstr "_Add Bookmark"
 
-#: ../src/nautilus-navigation-window-menus.c:789
-#: ../src/nautilus-spatial-window.c:937
+#: ../src/nautilus-navigation-window-menus.c:820
+#: ../src/nautilus-spatial-window.c:952
 msgid "Add a bookmark for the current location to this menu"
 msgstr "Add a bookmark for the current location to this menu"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:791
-#: ../src/nautilus-spatial-window.c:939
+#: ../src/nautilus-navigation-window-menus.c:822
+#: ../src/nautilus-spatial-window.c:954
 msgid "_Edit Bookmarks..."
 msgstr "_Edit Bookmarksâ?¦"
 
-#: ../src/nautilus-navigation-window-menus.c:792
-#: ../src/nautilus-spatial-window.c:940
+#: ../src/nautilus-navigation-window-menus.c:823
+#: ../src/nautilus-spatial-window.c:955
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "Display a window that allows editing the bookmarks in this menu"
 
-#: ../src/nautilus-navigation-window-menus.c:794
+#: ../src/nautilus-navigation-window-menus.c:825
 msgid "_Previous Tab"
 msgstr "_Previous Tab"
 
-#: ../src/nautilus-navigation-window-menus.c:795
+#: ../src/nautilus-navigation-window-menus.c:826
 msgid "Activate previous tab"
 msgstr "Activate previous tab"
 
-#: ../src/nautilus-navigation-window-menus.c:797
+#: ../src/nautilus-navigation-window-menus.c:828
 msgid "_Next Tab"
 msgstr "_Next Tab"
 
-#: ../src/nautilus-navigation-window-menus.c:798
+#: ../src/nautilus-navigation-window-menus.c:829
 msgid "Activate next tab"
 msgstr "Activate next tab"
 
-#: ../src/nautilus-navigation-window-menus.c:800
+#: ../src/nautilus-navigation-window-menus.c:831
 #: ../src/nautilus-navigation-window-pane.c:377
 msgid "Move Tab _Left"
 msgstr "Move Tab _Left"
 
-#: ../src/nautilus-navigation-window-menus.c:801
+#: ../src/nautilus-navigation-window-menus.c:832
 msgid "Move current tab to left"
 msgstr "Move current tab to left"
 
-#: ../src/nautilus-navigation-window-menus.c:803
+#: ../src/nautilus-navigation-window-menus.c:834
 #: ../src/nautilus-navigation-window-pane.c:385
 msgid "Move Tab _Right"
 msgstr "Move Tab _Right"
 
-#: ../src/nautilus-navigation-window-menus.c:804
+#: ../src/nautilus-navigation-window-menus.c:835
 msgid "Move current tab to right"
 msgstr "Move current tab to right"
 
-#: ../src/nautilus-navigation-window-menus.c:806
-#: ../src/nautilus-navigation-window-menus.c:807
+#: ../src/nautilus-navigation-window-menus.c:837
+msgid "S_how Search"
+msgstr "S_how Search"
+
+#: ../src/nautilus-navigation-window-menus.c:838
 msgid "Show search"
 msgstr "Show search"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:813
+#: ../src/nautilus-navigation-window-menus.c:844
 msgid "_Main Toolbar"
 msgstr "_Main Toolbar"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:814
+#: ../src/nautilus-navigation-window-menus.c:845
 msgid "Change the visibility of this window's main toolbar"
 msgstr "Change the visibility of this window's main toolbar"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:818
+#: ../src/nautilus-navigation-window-menus.c:849
 msgid "_Side Pane"
 msgstr "_Side Pane"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:819
+#: ../src/nautilus-navigation-window-menus.c:850
 msgid "Change the visibility of this window's side pane"
 msgstr "Change the visibility of this window's side pane"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:823
+#: ../src/nautilus-navigation-window-menus.c:854
 msgid "Location _Bar"
 msgstr "Location _Bar"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:824
+#: ../src/nautilus-navigation-window-menus.c:855
 msgid "Change the visibility of this window's location bar"
 msgstr "Change the visibility of this window's location bar"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:828
+#: ../src/nautilus-navigation-window-menus.c:859
 msgid "St_atusbar"
 msgstr "St_atusbar"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:829
+#: ../src/nautilus-navigation-window-menus.c:860
 msgid "Change the visibility of this window's statusbar"
 msgstr "Change the visibility of this window's statusbar"
 
@@ -6544,62 +6665,62 @@ msgstr "Change the visibility of this window's statusbar"
 #. name, stock id
 #. label, accelerator
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:833
-#: ../src/nautilus-spatial-window.c:942
+#: ../src/nautilus-navigation-window-menus.c:864
+#: ../src/nautilus-spatial-window.c:957
 msgid "_Search for Files..."
 msgstr "_Search for Filesâ?¦"
 
 #. Accelerator is in ShowSearch
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:835
+#: ../src/nautilus-navigation-window-menus.c:866
 msgid "Search documents and folders by name"
 msgstr "Search documents and folders by name"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:839
-msgid "Extra Pane"
-msgstr "Extra Pane"
+#: ../src/nautilus-navigation-window-menus.c:870
+msgid "E_xtra Pane"
+msgstr "E_xtra Pane"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:840
+#: ../src/nautilus-navigation-window-menus.c:871
 msgid "Open an extra folder view side-by-side"
 msgstr "Open an extra folder view side-by-side"
 
-#: ../src/nautilus-navigation-window-menus.c:864
+#: ../src/nautilus-navigation-window-menus.c:896
 msgid "_Back"
 msgstr "_Back"
 
-#: ../src/nautilus-navigation-window-menus.c:866
+#: ../src/nautilus-navigation-window-menus.c:898
 msgid "Go to the previous visited location"
 msgstr "Go to the previous visited location"
 
-#: ../src/nautilus-navigation-window-menus.c:867
+#: ../src/nautilus-navigation-window-menus.c:899
 msgid "Back history"
 msgstr "Back History"
 
-#: ../src/nautilus-navigation-window-menus.c:881
+#: ../src/nautilus-navigation-window-menus.c:913
 msgid "_Forward"
 msgstr "_Forward"
 
-#: ../src/nautilus-navigation-window-menus.c:883
+#: ../src/nautilus-navigation-window-menus.c:915
 msgid "Go to the next visited location"
 msgstr "Go to the next visited location"
 
-#: ../src/nautilus-navigation-window-menus.c:884
+#: ../src/nautilus-navigation-window-menus.c:916
 msgid "Forward history"
 msgstr "Forward History"
 
-#: ../src/nautilus-navigation-window-menus.c:899
+#: ../src/nautilus-navigation-window-menus.c:931
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../src/nautilus-navigation-window-menus.c:909
+#: ../src/nautilus-navigation-window-menus.c:941
 msgid "_View As"
 msgstr "_View As"
 
-#: ../src/nautilus-navigation-window-menus.c:918
+#: ../src/nautilus-navigation-window-menus.c:975
 msgid "_Search"
 msgstr "_Search"
 
@@ -6607,12 +6728,12 @@ msgstr "_Search"
 msgid "_Close Tab"
 msgstr "_Close Tab"
 
-#: ../src/nautilus-navigation-window.c:735
+#: ../src/nautilus-navigation-window.c:734
 #, c-format
 msgid "%s - File Browser"
 msgstr "%s â?? File Browser"
 
-#: ../src/nautilus-notebook.c:378
+#: ../src/nautilus-notebook.c:379
 msgid "Close tab"
 msgstr "Close tab"
 
@@ -6624,80 +6745,80 @@ msgstr "Notes"
 msgid "Show Notes"
 msgstr "Show Notes"
 
-#: ../src/nautilus-places-sidebar.c:320
+#: ../src/nautilus-places-sidebar.c:358
 msgid "Open the contents of your desktop in a folder"
 msgstr "Open the contents of your desktop in a folder"
 
-#: ../src/nautilus-places-sidebar.c:333
+#: ../src/nautilus-places-sidebar.c:371
 msgid "Open the contents of the File System"
 msgstr "Open the contents of the File System"
 
-#: ../src/nautilus-places-sidebar.c:342 ../src/network-scheme.desktop.in.h:2
+#: ../src/nautilus-places-sidebar.c:380 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
 msgstr "Network"
 
-#: ../src/nautilus-places-sidebar.c:344
+#: ../src/nautilus-places-sidebar.c:382
 msgid "Browse the contents of the network"
 msgstr "Browse the contents of the network"
 
-#: ../src/nautilus-places-sidebar.c:392 ../src/nautilus-places-sidebar.c:415
+#: ../src/nautilus-places-sidebar.c:430 ../src/nautilus-places-sidebar.c:453
 #, c-format
 msgid "Mount and open %s"
 msgstr "Mount and open %s"
 
-#: ../src/nautilus-places-sidebar.c:510
+#: ../src/nautilus-places-sidebar.c:548
 msgid "Open the trash"
 msgstr "Open the trash"
 
 #. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
-#: ../src/nautilus-places-sidebar.c:1435
+#: ../src/nautilus-places-sidebar.c:1450
 msgid "_Power On"
 msgstr "_Power On"
 
-#: ../src/nautilus-places-sidebar.c:1439
+#: ../src/nautilus-places-sidebar.c:1454
 msgid "_Connect Drive"
 msgstr "_Connect Drive"
 
-#: ../src/nautilus-places-sidebar.c:1440
+#: ../src/nautilus-places-sidebar.c:1455
 msgid "_Disconnect Drive"
 msgstr "_Disconnect Drive"
 
-#: ../src/nautilus-places-sidebar.c:1443
+#: ../src/nautilus-places-sidebar.c:1458
 msgid "_Start Multi-disk Device"
 msgstr "_Start Multi-disk Device"
 
-#: ../src/nautilus-places-sidebar.c:1444
+#: ../src/nautilus-places-sidebar.c:1459
 msgid "_Stop Multi-disk Device"
 msgstr "_Stop Multi-disk Device"
 
-#: ../src/nautilus-places-sidebar.c:1524 ../src/nautilus-places-sidebar.c:2023
+#: ../src/nautilus-places-sidebar.c:1539 ../src/nautilus-places-sidebar.c:2075
 #, c-format
 msgid "Unable to start %s"
 msgstr "Unable to start %s"
 
-#: ../src/nautilus-places-sidebar.c:1971
+#: ../src/nautilus-places-sidebar.c:2023
 #, c-format
 msgid "Unable to poll %s for media changes"
 msgstr "Unable to poll %s for media changes"
 
-#: ../src/nautilus-places-sidebar.c:2074
+#: ../src/nautilus-places-sidebar.c:2131
 #, c-format
 msgid "Unable to stop %s"
 msgstr "Unable to stop %s"
 
-#: ../src/nautilus-places-sidebar.c:2187
+#: ../src/nautilus-places-sidebar.c:2245
 msgid "Remove"
 msgstr "Remove"
 
-#: ../src/nautilus-places-sidebar.c:2196
+#: ../src/nautilus-places-sidebar.c:2254
 msgid "Rename..."
 msgstr "Renameâ?¦"
 
-#: ../src/nautilus-places-sidebar.c:2609
+#: ../src/nautilus-places-sidebar.c:2697
 msgid "Places"
 msgstr "Places"
 
-#: ../src/nautilus-places-sidebar.c:2615
+#: ../src/nautilus-places-sidebar.c:2703
 msgid "Show Places"
 msgstr "Show Places"
 
@@ -6716,153 +6837,153 @@ msgstr "_Removeâ?¦"
 msgid "Add new..."
 msgstr "Add newâ?¦"
 
-#: ../src/nautilus-property-browser.c:931
+#: ../src/nautilus-property-browser.c:934
 #, c-format
 msgid "Sorry, but pattern %s could not be deleted."
 msgstr "Sorry, but pattern %s could not be deleted."
 
-#: ../src/nautilus-property-browser.c:932
+#: ../src/nautilus-property-browser.c:935
 msgid "Check that you have permission to delete the pattern."
 msgstr "Check that you have permission to delete the pattern."
 
-#: ../src/nautilus-property-browser.c:947
+#: ../src/nautilus-property-browser.c:950
 #, c-format
 msgid "Sorry, but emblem %s could not be deleted."
 msgstr "Sorry, but emblem %s could not be deleted."
 
-#: ../src/nautilus-property-browser.c:948
+#: ../src/nautilus-property-browser.c:951
 msgid "Check that you have permission to delete the emblem."
 msgstr "Check that you have permission to delete the emblem."
 
-#: ../src/nautilus-property-browser.c:1015
+#: ../src/nautilus-property-browser.c:1018
 msgid "Select an Image File for the New Emblem"
 msgstr "Select an Image File for the New Emblem"
 
-#: ../src/nautilus-property-browser.c:1055
+#: ../src/nautilus-property-browser.c:1058
 msgid "Create a New Emblem"
 msgstr "Create a New Emblem"
 
 #. make the keyword label and field
-#: ../src/nautilus-property-browser.c:1077
+#: ../src/nautilus-property-browser.c:1080
 msgid "_Keyword:"
 msgstr "_Keyword:"
 
 #. set up a file chooser to pick the image file
-#: ../src/nautilus-property-browser.c:1096
+#: ../src/nautilus-property-browser.c:1099
 msgid "_Image:"
 msgstr "_Image:"
 
-#: ../src/nautilus-property-browser.c:1127
+#: ../src/nautilus-property-browser.c:1130
 msgid "Create a New Color:"
 msgstr "Create a New Colour:"
 
 #. make the name label and field
-#: ../src/nautilus-property-browser.c:1141
+#: ../src/nautilus-property-browser.c:1144
 msgid "Color _name:"
 msgstr "Colour _name:"
 
-#: ../src/nautilus-property-browser.c:1157
+#: ../src/nautilus-property-browser.c:1160
 msgid "Color _value:"
 msgstr "Colour _value:"
 
-#: ../src/nautilus-property-browser.c:1191
+#: ../src/nautilus-property-browser.c:1194
 msgid "Sorry, but you cannot replace the reset image."
 msgstr "Sorry, but you cannot replace the reset image."
 
-#: ../src/nautilus-property-browser.c:1192
+#: ../src/nautilus-property-browser.c:1195
 msgid "Reset is a special image that cannot be deleted."
 msgstr "Reset is a special image that cannot be deleted."
 
-#: ../src/nautilus-property-browser.c:1220
+#: ../src/nautilus-property-browser.c:1223
 #, c-format
 msgid "Sorry, but the pattern %s could not be installed."
 msgstr "Sorry, but the pattern %s could not be installed."
 
-#: ../src/nautilus-property-browser.c:1248
+#: ../src/nautilus-property-browser.c:1251
 msgid "Select an Image File to Add as a Pattern"
 msgstr "Select an image file to Add as a Pattern"
 
-#: ../src/nautilus-property-browser.c:1320
-#: ../src/nautilus-property-browser.c:1348
+#: ../src/nautilus-property-browser.c:1323
+#: ../src/nautilus-property-browser.c:1351
 msgid "The color cannot be installed."
 msgstr "The colour cannot be installed."
 
-#: ../src/nautilus-property-browser.c:1321
+#: ../src/nautilus-property-browser.c:1324
 msgid "Sorry, but you must specify an unused color name for the new color."
 msgstr "Sorry, but you must specify an unused colour name for the new colour."
 
-#: ../src/nautilus-property-browser.c:1349
+#: ../src/nautilus-property-browser.c:1352
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "Sorry, but you must specify a non-blank name for the new colour."
 
-#: ../src/nautilus-property-browser.c:1401
+#: ../src/nautilus-property-browser.c:1407
 msgid "Select a Color to Add"
 msgstr "Select a Colour to add"
 
-#: ../src/nautilus-property-browser.c:1438
-#: ../src/nautilus-property-browser.c:1455
+#: ../src/nautilus-property-browser.c:1448
+#: ../src/nautilus-property-browser.c:1465
 #, c-format
 msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "Sorry, but \"%s\" is not a usable image file."
 
-#: ../src/nautilus-property-browser.c:1439
-#: ../src/nautilus-property-browser.c:1456
+#: ../src/nautilus-property-browser.c:1449
+#: ../src/nautilus-property-browser.c:1466
 msgid "The file is not an image."
 msgstr "The file is not an image."
 
-#: ../src/nautilus-property-browser.c:2149
+#: ../src/nautilus-property-browser.c:2159
 msgid "Select a Category:"
 msgstr "Select a Category:"
 
-#: ../src/nautilus-property-browser.c:2158
+#: ../src/nautilus-property-browser.c:2168
 msgid "C_ancel Remove"
 msgstr "C_ancel Remove"
 
-#: ../src/nautilus-property-browser.c:2164
+#: ../src/nautilus-property-browser.c:2174
 msgid "_Add a New Pattern..."
 msgstr "_Add a New Patternâ?¦"
 
-#: ../src/nautilus-property-browser.c:2167
+#: ../src/nautilus-property-browser.c:2177
 msgid "_Add a New Color..."
 msgstr "_Add a New Colourâ?¦"
 
-#: ../src/nautilus-property-browser.c:2170
+#: ../src/nautilus-property-browser.c:2180
 msgid "_Add a New Emblem..."
 msgstr "_Add a New Emblemâ?¦"
 
-#: ../src/nautilus-property-browser.c:2193
+#: ../src/nautilus-property-browser.c:2203
 msgid "Click on a pattern to remove it"
 msgstr "Click on a pattern to remove it"
 
-#: ../src/nautilus-property-browser.c:2196
+#: ../src/nautilus-property-browser.c:2206
 msgid "Click on a color to remove it"
 msgstr "Click on a colour to remove it"
 
-#: ../src/nautilus-property-browser.c:2199
+#: ../src/nautilus-property-browser.c:2209
 msgid "Click on an emblem to remove it"
 msgstr "Click on an emblem to remove it"
 
-#: ../src/nautilus-property-browser.c:2208
+#: ../src/nautilus-property-browser.c:2218
 msgid "Patterns:"
 msgstr "Patterns:"
 
-#: ../src/nautilus-property-browser.c:2211
+#: ../src/nautilus-property-browser.c:2221
 msgid "Colors:"
 msgstr "Colours:"
 
-#: ../src/nautilus-property-browser.c:2214
+#: ../src/nautilus-property-browser.c:2224
 msgid "Emblems:"
 msgstr "Emblems:"
 
-#: ../src/nautilus-property-browser.c:2234
+#: ../src/nautilus-property-browser.c:2244
 msgid "_Remove a Pattern..."
 msgstr "_Remove a Patternâ?¦"
 
-#: ../src/nautilus-property-browser.c:2237
+#: ../src/nautilus-property-browser.c:2247
 msgid "_Remove a Color..."
 msgstr "_Remove a Colourâ?¦"
 
-#: ../src/nautilus-property-browser.c:2240
+#: ../src/nautilus-property-browser.c:2250
 msgid "_Remove an Emblem..."
 msgstr "_Remove an Emblemâ?¦"
 
@@ -6962,49 +7083,57 @@ msgstr "Search results"
 msgid "Search:"
 msgstr "Search:"
 
-#: ../src/nautilus-side-pane.c:415
+#: ../src/nautilus-side-pane.c:429
 msgid "Close the side pane"
 msgstr "Close the side pane"
 
 #. Set initial window title
-#: ../src/nautilus-spatial-window.c:395 ../src/nautilus-window-menus.c:531
-#: ../src/nautilus-window.c:168
+#: ../src/nautilus-spatial-window.c:396 ../src/nautilus-window-menus.c:531
+#: ../src/nautilus-window.c:162
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:926
+#: ../src/nautilus-spatial-window.c:941
 msgid "_Places"
 msgstr "_Places"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:927
+#: ../src/nautilus-spatial-window.c:942
 msgid "Open _Location..."
 msgstr "Open _Locationâ?¦"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:930
+#: ../src/nautilus-spatial-window.c:945
 msgid "Close P_arent Folders"
 msgstr "Close P_arent Folders"
 
-#: ../src/nautilus-spatial-window.c:931
+#: ../src/nautilus-spatial-window.c:946
 msgid "Close this folder's parents"
 msgstr "Close this folder's parents"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:933
+#: ../src/nautilus-spatial-window.c:948
 msgid "Clos_e All Folders"
 msgstr "Clos_e All Folders"
 
-#: ../src/nautilus-spatial-window.c:934
+#: ../src/nautilus-spatial-window.c:949
 msgid "Close all folder windows"
 msgstr "Close all folder windows"
 
-#: ../src/nautilus-spatial-window.c:943
+#: ../src/nautilus-spatial-window.c:958
 msgid "Locate documents and folders on this computer by name or content"
 msgstr "Locate documents and folders on this computer by name or content"
 
-#: ../src/nautilus-window-bookmarks.c:97
+#: ../src/nautilus-trash-bar.c:204
+msgid "Restore Selected Items"
+msgstr "Restore Selected Items"
+
+#: ../src/nautilus-trash-bar.c:210
+msgid "Restore selected items to their original position"
+msgstr "Restore selected items to their original position"
+
+#: ../src/nautilus-window-bookmarks.c:81
 msgid ""
 "Do you want to remove any bookmarks with the non-existing location from your "
 "list?"
@@ -7012,7 +7141,7 @@ msgstr ""
 "Do you want to remove any bookmarks with the non-existing location from your "
 "list?"
 
-#: ../src/nautilus-window-bookmarks.c:102
+#: ../src/nautilus-window-bookmarks.c:86
 msgid "Bookmark for Nonexistent Location"
 msgstr "Bookmark for Nonexistent Location"
 
@@ -7024,45 +7153,45 @@ msgstr "You can choose another view or go to a different location."
 msgid "The location cannot be displayed with this viewer."
 msgstr "The location cannot be displayed with this viewer."
 
-#: ../src/nautilus-window-manage-views.c:1236
+#: ../src/nautilus-window-manage-views.c:1242
 msgid "Content View"
 msgstr "Content View"
 
-#: ../src/nautilus-window-manage-views.c:1237
+#: ../src/nautilus-window-manage-views.c:1243
 msgid "View of the current folder"
 msgstr "View of the current folder"
 
-#: ../src/nautilus-window-manage-views.c:1869
+#: ../src/nautilus-window-manage-views.c:1876
 msgid "Nautilus has no installed viewer capable of displaying the folder."
 msgstr "Nautilus has no installed viewer capable of displaying the folder."
 
-#: ../src/nautilus-window-manage-views.c:1875
+#: ../src/nautilus-window-manage-views.c:1882
 msgid "The location is not a folder."
 msgstr "The location is not a folder."
 
-#: ../src/nautilus-window-manage-views.c:1881
+#: ../src/nautilus-window-manage-views.c:1888
 #, c-format
 msgid "Could not find \"%s\"."
 msgstr "Could not find \"%s\"."
 
-#: ../src/nautilus-window-manage-views.c:1884
+#: ../src/nautilus-window-manage-views.c:1891
 msgid "Please check the spelling and try again."
 msgstr "Please check the spelling and try again."
 
-#: ../src/nautilus-window-manage-views.c:1892
+#: ../src/nautilus-window-manage-views.c:1899
 #, c-format
 msgid "Nautilus cannot handle \"%s\" locations."
 msgstr "Nautilus cannot handle \"%s\" locations."
 
-#: ../src/nautilus-window-manage-views.c:1895
+#: ../src/nautilus-window-manage-views.c:1902
 msgid "Nautilus cannot handle this kind of location."
 msgstr "Nautilus cannot handle this kind of location."
 
-#: ../src/nautilus-window-manage-views.c:1902
+#: ../src/nautilus-window-manage-views.c:1909
 msgid "Unable to mount the location."
 msgstr "Unable to mount the location."
 
-#: ../src/nautilus-window-manage-views.c:1908
+#: ../src/nautilus-window-manage-views.c:1915
 msgid "Access was denied."
 msgstr "Access was denied."
 
@@ -7071,18 +7200,18 @@ msgstr "Access was denied."
 #. * But this case is also hit for legitimate web addresses when
 #. * the proxy is set up wrong.
 #.
-#: ../src/nautilus-window-manage-views.c:1917
+#: ../src/nautilus-window-manage-views.c:1924
 #, c-format
 msgid "Could not display \"%s\", because the host could not be found."
 msgstr "Could not display \"%s\", because the host could not be found."
 
-#: ../src/nautilus-window-manage-views.c:1919
+#: ../src/nautilus-window-manage-views.c:1926
 msgid ""
 "Check that the spelling is correct and that your proxy settings are correct."
 msgstr ""
 "Check that the spelling is correct and that your proxy settings are correct."
 
-#: ../src/nautilus-window-manage-views.c:1933
+#: ../src/nautilus-window-manage-views.c:1941
 #, c-format
 msgid ""
 "Error: %s\n"
@@ -7153,7 +7282,7 @@ msgstr ""
 "Gareth Owen <gowen72 yahoo com>\n"
 "David Lodge <dave cirt net>\n"
 "Philip Withnall <philip tecnocode co uk>\n"
-"Bruce Cowan <bcowan fastmail co uk>"
+"Bruce Cowan <bruce bcowan me uk>"
 
 #: ../src/nautilus-window-menus.c:549
 msgid "Nautilus Web Site"
@@ -7274,7 +7403,7 @@ msgstr "Zoom _In"
 
 #. tooltip
 #: ../src/nautilus-window-menus.c:827 ../src/nautilus-zoom-control.c:91
-#: ../src/nautilus-zoom-control.c:345
+#: ../src/nautilus-zoom-control.c:347
 msgid "Increase the view size"
 msgstr "Increase the view size"
 
@@ -7286,7 +7415,7 @@ msgstr "Zoom _Out"
 
 #. tooltip
 #: ../src/nautilus-window-menus.c:839 ../src/nautilus-zoom-control.c:92
-#: ../src/nautilus-zoom-control.c:294
+#: ../src/nautilus-zoom-control.c:296
 msgid "Decrease the view size"
 msgstr "Decrease the view size"
 
@@ -7298,7 +7427,7 @@ msgstr "Normal Si_ze"
 
 #. tooltip
 #: ../src/nautilus-window-menus.c:847 ../src/nautilus-zoom-control.c:93
-#: ../src/nautilus-zoom-control.c:307
+#: ../src/nautilus-zoom-control.c:309
 msgid "Use the normal view size"
 msgstr "Use the normal view size"
 
@@ -7429,14 +7558,57 @@ msgstr "Zoom Out"
 msgid "Zoom to Default"
 msgstr "Zoom to Default"
 
-#: ../src/nautilus-zoom-control.c:888
+#: ../src/nautilus-zoom-control.c:890
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../src/nautilus-zoom-control.c:894
+#: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "Set the zoom level of the current view"
 
+#~ msgid ""
+#~ "If you choose to empty the trash, all items in it will be permanently "
+#~ "lost. Please note that you can also delete them separately."
+#~ msgstr ""
+#~ "If you choose to empty the wastebasket, all items in it will be "
+#~ "permanently lost. Please note that you can also delete them separately."
+
+#~ msgid "Could not use system package installer"
+#~ msgstr "Could not use system package installer"
+
+#~ msgid "Clean _Up by Name"
+#~ msgstr "Clean _Up by Name"
+
+#~ msgid ""
+#~ "If set to true, newly opened windows will have the extra pane visible."
+#~ msgstr ""
+#~ "If set to true, newly opened windows will have the extra pane visible."
+
+#~ msgid "Show extra pane in new windows"
+#~ msgstr "Show extra pane in new windows"
+
+#~ msgid ""
+#~ "A folder named \"%B\" already exists.  Do you want to merge the source "
+#~ "folder?"
+#~ msgstr ""
+#~ "A folder named \"%B\" already exists.  Do you want to merge the source "
+#~ "folder?"
+
+#~ msgid "A folder named \"%B\" already exists.  Do you want to replace it?"
+#~ msgstr "A folder named \"%B\" already exists.  Do you want to replace it?"
+
+#~ msgid "A file named \"%B\" already exists.  Do you want to replace it?"
+#~ msgstr "A file named \"%B\" already exists.  Do you want to replace it?"
+
+#~ msgid ""
+#~ "The source folder already exists in \"%B\".  Merging will ask for "
+#~ "confirmation before replacing any files in the folder that conflict with "
+#~ "the files being moved."
+#~ msgstr ""
+#~ "The source folder already exists in \"%B\".  Merging will ask for "
+#~ "confirmation before replacing any files in the folder that conflict with "
+#~ "the files being moved."
+
 #~ msgid "throbber"
 #~ msgstr "throbber"
 
@@ -7839,11 +8011,6 @@ msgstr "Set the zoom level of the current view"
 #~ msgid "If you do, you will be doomed to repeat it."
 #~ msgstr "If you do, you will be doomed to repeat it."
 
-#~ msgid ""
-#~ "If you clear the list of locations, they will be permanently deleted."
-#~ msgstr ""
-#~ "If you clear the list of locations, they will be permanently deleted."
-
 #~ msgid "Show the contents in more detail"
 #~ msgstr "Show the contents in more detail"
 
@@ -7994,9 +8161,6 @@ msgstr "Set the zoom level of the current view"
 #~ msgid "Finishing Move..."
 #~ msgstr "Finishing Move..."
 
-#~ msgid "Linking file:"
-#~ msgstr "Linking file:"
-
 #~ msgid "Linking"
 #~ msgstr "Linking"
 
@@ -8015,9 +8179,6 @@ msgstr "Set the zoom level of the current view"
 #~ msgid "You cannot create links inside the trash."
 #~ msgstr "You cannot copy items into the wastebasket."
 
-#~ msgid "Files and folders can only be moved into the trash."
-#~ msgstr "Files and folders can only be moved into the wastebasket."
-
 #~ msgid "You cannot copy this trash folder."
 #~ msgstr "You cannot copy this wastebasket folder."
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]