[nautilus] Updated British English translation



commit 36fb4cb670e1b3e4b637087fb7d600e131cc099d
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Sat Sep 1 01:30:09 2012 +0100

    Updated British English translation

 po/en_GB.po | 5394 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2724 insertions(+), 2670 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index b5657af..498f392 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,12 +4,13 @@
 # Abigail Brady <morwen evilmagic org>, Bastien Nocera <hadess hadess net>, 2003.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004
 # Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011, 2012.
+# Chris Leonard <cjl laptop org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-07 16:10+0000\n"
-"PO-Revision-Date: 2012-03-07 16:21+0100\n"
+"POT-Creation-Date: 2012-09-01 01:20+0100\n"
+"PO-Revision-Date: 2012-09-01 01:29+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -18,16 +19,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.7.1\n"
-
-#: ../data/nautilus.xml.in.h:1
-msgid "Saved search"
-msgstr "Saved search"
+"X-Project-Style: gnome\n"
 
 #: ../data/nautilus-autorun-software.desktop.in.in.h:1
-msgid "Autorun Prompt"
-msgstr "Autorun Prompt"
+msgid "Run Software"
+msgstr "Run Software"
 
+#. Set initial window title
 #: ../data/nautilus.desktop.in.in.h:1
+#: ../src/nautilus-file-management-properties.ui.h:27
+#: ../src/nautilus-properties-window.c:4296 ../src/nautilus-window.c:1888
+#: ../src/nautilus-window.c:2143
 msgid "Files"
 msgstr "Files"
 
@@ -35,6 +37,10 @@ msgstr "Files"
 msgid "Access and organize files"
 msgstr "Access and organise files"
 
+#: ../data/nautilus.xml.in.h:1
+msgid "Saved search"
+msgstr "Saved search"
+
 #: ../eel/eel-canvas.c:1255 ../eel/eel-canvas.c:1256
 msgid "X"
 msgstr "X"
@@ -91,15 +97,15 @@ msgid ""
 msgstr ""
 "The position of the opposite end of the selection from the cursor in chars."
 
-#: ../eel/eel-editable-label.c:3105
+#: ../eel/eel-editable-label.c:3051
 msgid "Select All"
 msgstr "Select All"
 
-#: ../eel/eel-editable-label.c:3116
+#: ../eel/eel-editable-label.c:3062
 msgid "Input Methods"
 msgstr "Input Methods"
 
-#: ../eel/eel-gtk-extensions.c:403
+#: ../eel/eel-gtk-extensions.c:378
 msgid "Show more _details"
 msgstr "Show more _details"
 
@@ -107,47 +113,51 @@ msgstr "Show more _details"
 msgid "You can stop this operation by clicking cancel."
 msgstr "You can stop this operation by clicking cancel."
 
-#: ../eel/eel-vfs-extensions.c:93
+#: ../eel/eel-vfs-extensions.c:99
 msgid " (invalid Unicode)"
 msgstr " (invalid Unicode)"
 
-#: ../libnautilus-private/nautilus-bookmark.c:129
-#: ../libnautilus-private/nautilus-desktop-link.c:120
-#: ../libnautilus-private/nautilus-file-utilities.c:68
-#: ../src/nautilus-pathbar.c:1269 ../src/nautilus-places-sidebar.c:680
-#: ../src/nautilus-tree-sidebar.c:1338
+#: ../libnautilus-private/nautilus-bookmark.c:101
+#: ../libnautilus-private/nautilus-desktop-link.c:134
+#: ../libnautilus-private/nautilus-file-utilities.c:274
+#: ../src/nautilus-pathbar.c:298 ../src/nautilus-places-sidebar.c:514
+#: ../src/nautilus-query-editor.c:1175
 msgid "Home"
 msgstr "Home"
 
+#: ../libnautilus-private/nautilus-canvas-container.c:2596
+msgid "The selection rectangle"
+msgstr "The selection rectangle"
+
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../libnautilus-private/nautilus-clipboard.c:433
+#: ../libnautilus-private/nautilus-clipboard.c:359
 msgid "Cut the selected text to the clipboard"
 msgstr "Cut the selected text to the clipboard"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../libnautilus-private/nautilus-clipboard.c:437
+#: ../libnautilus-private/nautilus-clipboard.c:363
 msgid "Copy the selected text to the clipboard"
 msgstr "Copy the selected text to the clipboard"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../libnautilus-private/nautilus-clipboard.c:441
+#: ../libnautilus-private/nautilus-clipboard.c:367
 msgid "Paste the text stored on the clipboard"
 msgstr "Paste the text stored on the clipboard"
 
 #. name, stock id
 #. label, accelerator
-#: ../libnautilus-private/nautilus-clipboard.c:444 ../src/nautilus-view.c:7020
+#: ../libnautilus-private/nautilus-clipboard.c:370 ../src/nautilus-view.c:7222
 msgid "Select _All"
 msgstr "Select _All"
 
 #. tooltip
-#: ../libnautilus-private/nautilus-clipboard.c:445
+#: ../libnautilus-private/nautilus-clipboard.c:371
 msgid "Select all the text in a text field"
 msgstr "Select all the text in a text field"
 
@@ -163,221 +173,214 @@ msgstr "Move Dow_n"
 msgid "Use De_fault"
 msgstr "Use De_fault"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:43
-#: ../src/nautilus-list-view.c:1658
+#: ../libnautilus-private/nautilus-column-utilities.c:57
+#: ../src/nautilus-list-view.c:1500
 msgid "Name"
 msgstr "Name"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:44
+#: ../libnautilus-private/nautilus-column-utilities.c:58
 msgid "The name and icon of the file."
 msgstr "The name and icon of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:50
+#: ../libnautilus-private/nautilus-column-utilities.c:64
 msgid "Size"
 msgstr "Size"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:51
+#: ../libnautilus-private/nautilus-column-utilities.c:65
 msgid "The size of the file."
 msgstr "The size of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:58
+#: ../libnautilus-private/nautilus-column-utilities.c:72
 msgid "Type"
 msgstr "Type"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:59
+#: ../libnautilus-private/nautilus-column-utilities.c:73
 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
-msgid "Date Modified"
-msgstr "Date Modified"
+#: ../libnautilus-private/nautilus-column-utilities.c:79
+msgid "Modified"
+msgstr "Modified"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:66
+#: ../libnautilus-private/nautilus-column-utilities.c:80
 msgid "The date the file was modified."
 msgstr "The date the file was modified."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:73
-msgid "Date Accessed"
-msgstr "Date Accessed"
-
-#: ../libnautilus-private/nautilus-column-utilities.c:74
-msgid "The date the file was accessed."
-msgstr "The date the file was accessed."
-
-#: ../libnautilus-private/nautilus-column-utilities.c:81
+#: ../libnautilus-private/nautilus-column-utilities.c:88
 msgid "Owner"
 msgstr "Owner"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:82
+#: ../libnautilus-private/nautilus-column-utilities.c:89
 msgid "The owner of the file."
 msgstr "The owner of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:89
+#: ../libnautilus-private/nautilus-column-utilities.c:96
 msgid "Group"
 msgstr "Group"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:90
+#: ../libnautilus-private/nautilus-column-utilities.c:97
 msgid "The group of the file."
 msgstr "The group of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:97
-#: ../src/nautilus-properties-window.c:4468
+#: ../libnautilus-private/nautilus-column-utilities.c:104
+#: ../src/nautilus-properties-window.c:4358
 msgid "Permissions"
 msgstr "Permissions"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:98
+#: ../libnautilus-private/nautilus-column-utilities.c:105
 msgid "The permissions of the file."
 msgstr "The permissions of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:105
-msgid "Octal Permissions"
-msgstr "Octal Permissions"
-
-#: ../libnautilus-private/nautilus-column-utilities.c:106
-msgid "The permissions of the file, in octal notation."
-msgstr "The permissions of the file, in octal notation."
-
-#: ../libnautilus-private/nautilus-column-utilities.c:113
+#: ../libnautilus-private/nautilus-column-utilities.c:112
 msgid "MIME Type"
 msgstr "MIME Type"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:114
+#: ../libnautilus-private/nautilus-column-utilities.c:113
 msgid "The mime type of the file."
 msgstr "The MIME type of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:121
-msgid "SELinux Context"
-msgstr "SELinux Context"
+#: ../libnautilus-private/nautilus-column-utilities.c:120
+msgid "Security Context"
+msgstr "Security Context"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:122
-msgid "The SELinux security context of the file."
-msgstr "The SELinux security context of the file."
+#: ../libnautilus-private/nautilus-column-utilities.c:121
+msgid "The security context of the file."
+msgstr "The security context of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:129
-#: ../src/nautilus-image-properties-page.c:342
-#: ../src/nautilus-query-editor.c:112
+#: ../libnautilus-private/nautilus-column-utilities.c:128
+#: ../src/nautilus-image-properties-page.c:329
 msgid "Location"
 msgstr "Location"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:130
+#: ../libnautilus-private/nautilus-column-utilities.c:129
 msgid "The location of the file."
 msgstr "The location of the file."
 
-#: ../libnautilus-private/nautilus-column-utilities.c:171
+#: ../libnautilus-private/nautilus-column-utilities.c:170
 msgid "Trashed On"
 msgstr "Moved to wastebasket on"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:172
+#: ../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:178
+#: ../libnautilus-private/nautilus-column-utilities.c:177
 msgid "Original Location"
 msgstr "Original Location"
 
-#: ../libnautilus-private/nautilus-column-utilities.c:179
+#: ../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-column-utilities.c:195
+msgid "Relevance"
+msgstr "Relevance"
+
+#: ../libnautilus-private/nautilus-column-utilities.c:196
+msgid "Relevance rank for search"
+msgstr "Relevance rank for search"
+
 #: ../libnautilus-private/nautilus-desktop-directory-file.c:435
 #: ../libnautilus-private/nautilus-desktop-icon-file.c:151
 msgid "on the desktop"
 msgstr "on the desktop"
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:92
+#: ../libnautilus-private/nautilus-desktop-link-monitor.c:89
 #, c-format
-msgid "You cannot move the volume \"%s\" to the trash."
-msgstr "You cannot move the volume \"%s\" to the wastebasket."
+msgid "You cannot move the volume â%sâ to the trash."
+msgstr "You cannot move the volume â%sâ to the wastebasket."
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:102
+#: ../libnautilus-private/nautilus-desktop-link-monitor.c:99
 msgid ""
-"If you want to eject the volume, please use \"Eject\" in the popup menu of "
-"the volume."
+"If you want to eject the volume, please use Eject in the popup menu of the "
+"volume."
 msgstr ""
-"If you want to eject the volume, please use \"Eject\" in the popup menu of "
-"the volume."
+"If you want to eject the volume, please use Eject in the popup menu of the "
+"volume."
 
-#: ../libnautilus-private/nautilus-desktop-link-monitor.c:111
+#: ../libnautilus-private/nautilus-desktop-link-monitor.c:108
 msgid ""
-"If you want to unmount the volume, please use \"Unmount Volume\" in the "
-"popup menu of the volume."
+"If you want to unmount the volume, please use Unmount Volume in the popup "
+"menu of the volume."
 msgstr ""
-"If you want to unmount the volume, please use \"Unmount Volume\" in the "
-"popup menu of the volume."
+"If you want to unmount the volume, please use Unmount Volume in the popup "
+"menu of the volume."
+
+#. Translators: this is of the format "hostname (uri-scheme)"
+#: ../libnautilus-private/nautilus-directory.c:475
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../libnautilus-private/nautilus-dnd.c:771
+#: ../libnautilus-private/nautilus-dnd.c:697
 msgid "_Move Here"
 msgstr "_Move Here"
 
-#: ../libnautilus-private/nautilus-dnd.c:776
+#: ../libnautilus-private/nautilus-dnd.c:702
 msgid "_Copy Here"
 msgstr "_Copy Here"
 
-#: ../libnautilus-private/nautilus-dnd.c:781
+#: ../libnautilus-private/nautilus-dnd.c:707
 msgid "_Link Here"
 msgstr "_Link Here"
 
-#: ../libnautilus-private/nautilus-dnd.c:786
+#: ../libnautilus-private/nautilus-dnd.c:712
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: ../libnautilus-private/nautilus-dnd.c:793
+#: ../libnautilus-private/nautilus-dnd.c:719
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../libnautilus-private/nautilus-file.c:1210
-#: ../libnautilus-private/nautilus-vfs-file.c:382
+#: ../libnautilus-private/nautilus-file.c:1219
+#: ../libnautilus-private/nautilus-vfs-file.c:356
 msgid "This file cannot be mounted"
 msgstr "This file cannot be mounted"
 
-#: ../libnautilus-private/nautilus-file.c:1255
+#: ../libnautilus-private/nautilus-file.c:1264
 msgid "This file cannot be unmounted"
 msgstr "This file cannot be unmounted"
 
-#: ../libnautilus-private/nautilus-file.c:1289
+#: ../libnautilus-private/nautilus-file.c:1298
 msgid "This file cannot be ejected"
 msgstr "This file cannot be ejected"
 
-#: ../libnautilus-private/nautilus-file.c:1322
-#: ../libnautilus-private/nautilus-vfs-file.c:560
+#: ../libnautilus-private/nautilus-file.c:1331
+#: ../libnautilus-private/nautilus-vfs-file.c:534
 msgid "This file cannot be started"
 msgstr "This file cannot be started"
 
-#: ../libnautilus-private/nautilus-file.c:1374
-#: ../libnautilus-private/nautilus-file.c:1405
+#: ../libnautilus-private/nautilus-file.c:1383
+#: ../libnautilus-private/nautilus-file.c:1414
 msgid "This file cannot be stopped"
 msgstr "This file cannot be stopped"
 
-#: ../libnautilus-private/nautilus-file.c:1816
+#: ../libnautilus-private/nautilus-file.c:1825
 #, c-format
 msgid "Slashes are not allowed in filenames"
 msgstr "Slashes are not allowed in filenames"
 
-#: ../libnautilus-private/nautilus-file.c:1834
+#: ../libnautilus-private/nautilus-file.c:1843
 #, c-format
 msgid "File not found"
 msgstr "File not found"
 
-#: ../libnautilus-private/nautilus-file.c:1862
+#: ../libnautilus-private/nautilus-file.c:1871
 #, c-format
 msgid "Toplevel files cannot be renamed"
 msgstr "Top-level files cannot be renamed"
 
-#: ../libnautilus-private/nautilus-file.c:1885
+#: ../libnautilus-private/nautilus-file.c:1894
 #, c-format
 msgid "Unable to rename desktop icon"
 msgstr "Unable to rename desktop icon"
 
-#: ../libnautilus-private/nautilus-file.c:1914
+#: ../libnautilus-private/nautilus-file.c:1923
 #, c-format
 msgid "Unable to rename desktop file"
 msgstr "Unable to rename desktop file"
 
-#. Today, use special word.
-#. * strftime patterns preceeded with the widest
-#. * possible resulting string for that pattern.
-#. *
+#.
 #. * Note to localizers: You can look at man strftime
 #. * for details on the format, but you should only use
 #. * the specifiers from the C standard, not extensions.
@@ -389,169 +392,76 @@ 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:4362
-msgid "today at 00:00:00 PM"
-msgstr "today at 00:00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4363
-#: ../src/nautilus-file-management-properties.c:470
-msgid "today at %-I:%M:%S %p"
-msgstr "today at %-H:%M:%S"
-
-#: ../libnautilus-private/nautilus-file.c:4365
-msgid "today at 00:00 PM"
-msgstr "today at 00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4366
-msgid "today at %-I:%M %p"
-msgstr "today at %-H:%M"
-
-#: ../libnautilus-private/nautilus-file.c:4368
-msgid "today, 00:00 PM"
-msgstr "today, 00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4369
-msgid "today, %-I:%M %p"
-msgstr "today, %-H:%M"
-
-#: ../libnautilus-private/nautilus-file.c:4371
-#: ../libnautilus-private/nautilus-file.c:4372
-msgid "today"
-msgstr "today"
-
-#. Yesterday, use special word.
-#. * Note to localizers: Same issues as "today" string.
-#.
-#: ../libnautilus-private/nautilus-file.c:4381
-msgid "yesterday at 00:00:00 PM"
-msgstr "yesterday at 00:00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4382
-msgid "yesterday at %-I:%M:%S %p"
-msgstr "yesterday at %-H:%M:%S"
-
-#: ../libnautilus-private/nautilus-file.c:4384
-msgid "yesterday at 00:00 PM"
-msgstr "yesterday at 00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4385
-msgid "yesterday at %-I:%M %p"
-msgstr "yesterday at %-H:%M"
-
-#: ../libnautilus-private/nautilus-file.c:4387
-msgid "yesterday, 00:00 PM"
-msgstr "yesterday, 00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4388
-msgid "yesterday, %-I:%M %p"
-msgstr "yesterday, %-G=H:%M"
-
-#: ../libnautilus-private/nautilus-file.c:4390
-#: ../libnautilus-private/nautilus-file.c:4391
-msgid "yesterday"
-msgstr "yesterday"
-
-#. Current week, include day of week.
-#. * Note to localizers: Same issues as "today" string.
-#. * The width measurement templates correspond to
-#. * the day/month name with the most letters.
-#.
-#: ../libnautilus-private/nautilus-file.c:4402
-msgid "Wednesday, September 00 0000 at 00:00:00 PM"
-msgstr "Wednesday, 00 September 0000 at 00:00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4403
-msgid "%A, %B %-d %Y at %-I:%M:%S %p"
-msgstr "%A, %-d %B %Y at %-H:%M:%S"
-
-#: ../libnautilus-private/nautilus-file.c:4405
-msgid "Mon, Oct 00 0000 at 00:00:00 PM"
-msgstr "Mon, 00 Oct 0000 at 00:00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4406
-msgid "%a, %b %-d %Y at %-I:%M:%S %p"
-msgstr "%a, %-d %b %Y at %-H:%M:%S"
-
-#: ../libnautilus-private/nautilus-file.c:4408
-msgid "Mon, Oct 00 0000 at 00:00 PM"
-msgstr "Mon, 00 Oct 0000 at 00:00"
+#: ../libnautilus-private/nautilus-file.c:4433
+msgid "%R"
+msgstr "%R"
 
-#: ../libnautilus-private/nautilus-file.c:4409
-msgid "%a, %b %-d %Y at %-I:%M %p"
-msgstr "%a, %-d %b %Y at %-H:%M"
+#: ../libnautilus-private/nautilus-file.c:4434
+msgid "%-I:%M %P"
+msgstr "%-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4411
-msgid "Oct 00 0000 at 00:00 PM"
-msgstr "00 Oct 0000 at 00:00"
+#: ../libnautilus-private/nautilus-file.c:4435
+#: ../libnautilus-private/nautilus-file.c:4436
+msgid "%b %-e"
+msgstr "%-e %b"
 
-#: ../libnautilus-private/nautilus-file.c:4412
-msgid "%b %-d %Y at %-I:%M %p"
-msgstr "%-d %-b %Y at %-H:%M"
+#: ../libnautilus-private/nautilus-file.c:4437
+msgid "%b %-d %Y"
+msgstr "%-d %b %Y"
 
-#: ../libnautilus-private/nautilus-file.c:4414
-msgid "Oct 00 0000, 00:00 PM"
-msgstr "00 Oct 0000, 00:00"
+#: ../libnautilus-private/nautilus-file.c:4438
+msgid "%a, %b %e %Y %I:%M:%S %p"
+msgstr "%a, %e %b %Y %H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4415
-msgid "%b %-d %Y, %-I:%M %p"
-msgstr "%-d %b %Y, %-H:%M"
+#: ../libnautilus-private/nautilus-file.c:4439
+msgid "%a, %b %e %Y %T"
+msgstr "%a, %e %b %Y %T"
 
-#: ../libnautilus-private/nautilus-file.c:4417
-msgid "00/00/00, 00:00 PM"
-msgstr "00/00/00, 00:00"
-
-#: ../libnautilus-private/nautilus-file.c:4418
-msgid "%m/%-d/%y, %-I:%M %p"
-msgstr "%-d/%m/%y, %-H:%M"
-
-#: ../libnautilus-private/nautilus-file.c:4420
-msgid "00/00/00"
-msgstr "00/00/00"
-
-#: ../libnautilus-private/nautilus-file.c:4421
-msgid "%m/%d/%y"
-msgstr "%d/%m/%y"
-
-#: ../libnautilus-private/nautilus-file.c:5059
+#: ../libnautilus-private/nautilus-file.c:4938
 #, c-format
 msgid "Not allowed to set permissions"
 msgstr "Not allowed to set permissions"
 
-#: ../libnautilus-private/nautilus-file.c:5354
+#: ../libnautilus-private/nautilus-file.c:5233
 #, c-format
 msgid "Not allowed to set owner"
 msgstr "Not allowed to set owner"
 
-#: ../libnautilus-private/nautilus-file.c:5372
+#: ../libnautilus-private/nautilus-file.c:5251
 #, c-format
 msgid "Specified owner '%s' doesn't exist"
 msgstr "Specified owner '%s' doesn't exist"
 
-#: ../libnautilus-private/nautilus-file.c:5636
+#: ../libnautilus-private/nautilus-file.c:5515
 #, c-format
 msgid "Not allowed to set group"
 msgstr "Not allowed to set group"
 
-#: ../libnautilus-private/nautilus-file.c:5654
+#: ../libnautilus-private/nautilus-file.c:5533
 #, c-format
 msgid "Specified group '%s' doesn't exist"
 msgstr "Specified group '%s' doesn't exist"
 
-#: ../libnautilus-private/nautilus-file.c:5811 ../src/nautilus-view.c:2856
+#. Translators: "Me" is used to indicate the file is owned by me (the current user)
+#: ../libnautilus-private/nautilus-file.c:5667
+msgid "Me"
+msgstr "Me"
+
+#: ../libnautilus-private/nautilus-file.c:5691
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
 msgstr[0] "%'u item"
 msgstr[1] "%'u items"
 
-#: ../libnautilus-private/nautilus-file.c:5812
+#: ../libnautilus-private/nautilus-file.c:5692
 #, c-format
 msgid "%'u folder"
 msgid_plural "%'u folders"
 msgstr[0] "%'u folder"
 msgstr[1] "%'u folders"
 
-#: ../libnautilus-private/nautilus-file.c:5813
+#: ../libnautilus-private/nautilus-file.c:5693
 #, c-format
 msgid "%'u file"
 msgid_plural "%'u files"
@@ -559,37 +469,37 @@ msgstr[0] "%'u file"
 msgstr[1] "%'u files"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6195
-#: ../libnautilus-private/nautilus-file.c:6211
+#: ../libnautilus-private/nautilus-file.c:6086
+#: ../libnautilus-private/nautilus-file.c:6102
 msgid "? items"
 msgstr "? items"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6201
+#: ../libnautilus-private/nautilus-file.c:6092
 msgid "? bytes"
 msgstr "? bytes"
 
-#: ../libnautilus-private/nautilus-file.c:6216
+#: ../libnautilus-private/nautilus-file.c:6107
 msgid "unknown type"
 msgstr "unknown type"
 
-#: ../libnautilus-private/nautilus-file.c:6219
+#: ../libnautilus-private/nautilus-file.c:6110
 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:6233
-#: ../src/nautilus-properties-window.c:1122
+#: ../libnautilus-private/nautilus-file.c:6124
+#: ../src/nautilus-properties-window.c:1105
 msgid "unknown"
 msgstr "unknown"
 
-#: ../libnautilus-private/nautilus-file.c:6283
+#: ../libnautilus-private/nautilus-file.c:6175
 msgid "program"
 msgstr "program"
 
-#: ../libnautilus-private/nautilus-file.c:6303
+#: ../libnautilus-private/nautilus-file.c:6195
 msgid "link"
 msgstr "link"
 
@@ -598,21 +508,21 @@ msgstr "link"
 #. * to that kind of file (e.g. "link to folder").
 #.
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file.c:6309
+#: ../libnautilus-private/nautilus-file.c:6201
 #: ../libnautilus-private/nautilus-file-operations.c:377
-#: ../src/nautilus-view-dnd.c:125
+#: ../src/nautilus-view-dnd.c:124
 #, c-format
 msgid "Link to %s"
 msgstr "Link to %s"
 
-#: ../libnautilus-private/nautilus-file.c:6325
+#: ../libnautilus-private/nautilus-file.c:6217
 msgid "link (broken)"
 msgstr "link (broken)"
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:141
 #, c-format
-msgid "Merge folder \"%s\"?"
-msgstr "Merge folder \"%s\"?"
+msgid "Merge folder â%sâ?"
+msgstr "Merge folder â%sâ?"
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:145
 msgid ""
@@ -624,18 +534,18 @@ msgstr ""
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:150
 #, c-format
-msgid "An older folder with the same name already exists in \"%s\"."
-msgstr "An older folder with the same name already exists in \"%s\"."
+msgid "An older folder with the same name already exists in â%sâ."
+msgstr "An older folder with the same name already exists in â%sâ."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:154
 #, c-format
-msgid "A newer folder with the same name already exists in \"%s\"."
-msgstr "A newer folder with the same name already exists in \"%s\"."
+msgid "A newer folder with the same name already exists in â%sâ."
+msgstr "A newer folder with the same name already exists in â%sâ."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:158
 #, c-format
-msgid "Another folder with the same name already exists in \"%s\"."
-msgstr "Another folder with the same name already exists in \"%s\"."
+msgid "Another folder with the same name already exists in â%sâ."
+msgstr "Another folder with the same name already exists in â%sâ."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:163
 msgid "Replacing it will remove all files in the folder."
@@ -643,18 +553,18 @@ msgstr "Replacing it will remove all files in the folder."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:165
 #, c-format
-msgid "Replace folder \"%s\"?"
-msgstr "Replace folder \"%s\"?"
+msgid "Replace folder â%sâ?"
+msgstr "Replace folder â%sâ?"
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:167
 #, c-format
-msgid "A folder with the same name already exists in \"%s\"."
-msgstr "A folder with the same name already exists in \"%s\"."
+msgid "A folder with the same name already exists in â%sâ."
+msgstr "A folder with the same name already exists in â%sâ."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:172
 #, c-format
-msgid "Replace file \"%s\"?"
-msgstr "Replace file \"%s\"?"
+msgid "Replace file â%sâ?"
+msgstr "Replace file â%sâ?"
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:174
 msgid "Replacing it will overwrite its content."
@@ -662,18 +572,18 @@ msgstr "Replacing it will overwrite its content."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:178
 #, c-format
-msgid "An older file with the same name already exists in \"%s\"."
-msgstr "An older file with the same name already exists in \"%s\"."
+msgid "An older file with the same name already exists in â%sâ."
+msgstr "An older file with the same name already exists in â%sâ."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:182
 #, c-format
-msgid "A newer file with the same name already exists in \"%s\"."
-msgstr "A newer file with the same name already exists in \"%s\"."
+msgid "A newer file with the same name already exists in â%sâ."
+msgstr "A newer file with the same name already exists in â%sâ."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:186
 #, c-format
-msgid "Another file with the same name already exists in \"%s\"."
-msgstr "Another file with the same name already exists in \"%s\"."
+msgid "Another file with the same name already exists in â%sâ."
+msgstr "Another file with the same name already exists in â%sâ."
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:252
 msgid "Original file"
@@ -681,13 +591,13 @@ msgstr "Original file"
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:253
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:284
-#: ../src/nautilus-properties-window.c:3097
+#: ../src/nautilus-properties-window.c:3099
 msgid "Size:"
 msgstr "Size:"
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:256
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:287
-#: ../src/nautilus-properties-window.c:3079
+#: ../src/nautilus-properties-window.c:3081
 msgid "Type:"
 msgstr "Type:"
 
@@ -710,7 +620,7 @@ msgid "_Select a new name for the destination"
 msgstr "_Select a new name for the destination"
 
 #: ../libnautilus-private/nautilus-file-conflict-dialog.c:519
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:379
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:317
 msgid "Reset"
 msgstr "Reset"
 
@@ -927,12 +837,11 @@ msgstr " ("
 msgid " (%'d"
 msgstr " (%'d"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1310
-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:1323
+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:1313
+#: ../libnautilus-private/nautilus-file-operations.c:1326
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -947,31 +856,31 @@ msgstr[1] ""
 "Are you sure you want to permanently delete the %'d selected items from the "
 "wastebasket?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1323
-#: ../libnautilus-private/nautilus-file-operations.c:1389
+#: ../libnautilus-private/nautilus-file-operations.c:1336
+#: ../libnautilus-private/nautilus-file-operations.c:1402
 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:1343
+#: ../libnautilus-private/nautilus-file-operations.c:1356
 msgid "Empty all items from Trash?"
 msgstr "Empty all items from Wastebasket?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1347
+#: ../libnautilus-private/nautilus-file-operations.c:1360
 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:1350
-#: ../libnautilus-private/nautilus-file-operations.c:2209
-#: ../src/nautilus-places-sidebar.c:2730 ../src/nautilus-trash-bar.c:204
+#: ../libnautilus-private/nautilus-file-operations.c:1363
+#: ../libnautilus-private/nautilus-file-operations.c:2229
+#: ../src/nautilus-places-sidebar.c:2715
 msgid "Empty _Trash"
 msgstr "Empty _Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1377
-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:1390
+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:1380
+#: ../libnautilus-private/nautilus-file-operations.c:1393
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
@@ -979,118 +888,120 @@ 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:1423
+#: ../libnautilus-private/nautilus-file-operations.c:1436
 #, 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:1429
+#: ../libnautilus-private/nautilus-file-operations.c:1442
 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:1443
+#: ../libnautilus-private/nautilus-file-operations.c:1456
 msgid "%T left"
 msgid_plural "%T left"
 msgstr[0] "%T left"
 msgstr[1] "%T left"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1510
-#: ../libnautilus-private/nautilus-file-operations.c:1544
-#: ../libnautilus-private/nautilus-file-operations.c:1583
-#: ../libnautilus-private/nautilus-file-operations.c:1660
-#: ../libnautilus-private/nautilus-file-operations.c:2462
+#: ../libnautilus-private/nautilus-file-operations.c:1523
+#: ../libnautilus-private/nautilus-file-operations.c:1557
+#: ../libnautilus-private/nautilus-file-operations.c:1596
+#: ../libnautilus-private/nautilus-file-operations.c:1673
+#: ../libnautilus-private/nautilus-file-operations.c:2491
 msgid "Error while deleting."
 msgstr "Error while deleting."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1514
+#: ../libnautilus-private/nautilus-file-operations.c:1527
 msgid ""
-"Files in the folder \"%B\" cannot be deleted because you do not have "
+"Files in the folder â%Bâ cannot be deleted because you do not have "
 "permissions to see them."
 msgstr ""
-"Files in the folder \"%B\" cannot be deleted because you do not have "
+"Files in the folder â%Bâ cannot be deleted because you do not have "
 "permissions to see them."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1517
-#: ../libnautilus-private/nautilus-file-operations.c:2521
-#: ../libnautilus-private/nautilus-file-operations.c:3509
+#: ../libnautilus-private/nautilus-file-operations.c:1530
+#: ../libnautilus-private/nautilus-file-operations.c:2550
+#: ../libnautilus-private/nautilus-file-operations.c:3538
 msgid ""
-"There was an error getting information about the files in the folder \"%B\"."
+"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\"."
+"There was an error getting information about the files in the folder â%Bâ."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1526
-#: ../libnautilus-private/nautilus-file-operations.c:3518
+#: ../libnautilus-private/nautilus-file-operations.c:1539
+#: ../libnautilus-private/nautilus-file-operations.c:3547
 msgid "_Skip files"
 msgstr "_Skip files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1547
+#: ../libnautilus-private/nautilus-file-operations.c:1560
 msgid ""
-"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"The folder â%Bâ cannot be deleted because you do not have permissions to "
 "read it."
 msgstr ""
-"The folder \"%B\" cannot be deleted because you do not have permissions to "
+"The folder â%Bâ cannot be deleted because you do not have permissions to "
 "read it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1550
-#: ../libnautilus-private/nautilus-file-operations.c:2560
-#: ../libnautilus-private/nautilus-file-operations.c:3554
-msgid "There was an error reading the folder \"%B\"."
-msgstr "There was an error reading the folder \"%B\"."
+#: ../libnautilus-private/nautilus-file-operations.c:1563
+#: ../libnautilus-private/nautilus-file-operations.c:2589
+#: ../libnautilus-private/nautilus-file-operations.c:3583
+msgid "There was an error reading the folder â%Bâ."
+msgstr "There was an error reading the folder â%Bâ."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1584
+#: ../libnautilus-private/nautilus-file-operations.c:1597
 msgid "Could not remove the folder %B."
 msgstr "Could not remove the folder %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1661
+#: ../libnautilus-private/nautilus-file-operations.c:1674
 msgid "There was an error deleting %B."
 msgstr "There was an error deleting %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1741
+#: ../libnautilus-private/nautilus-file-operations.c:1754
 msgid "Moving files to trash"
 msgstr "Moving files to the wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1743
+#: ../libnautilus-private/nautilus-file-operations.c:1756
 #, 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:1794
-msgid "Cannot move file to trash, do you want to delete immediately?"
+#. Translators: %B is a file name
+#: ../libnautilus-private/nautilus-file-operations.c:1808
+msgid "â%Bâ can't be put in the trash. Do you want to delete it immediately?"
 msgstr ""
-"Cannot move file to the wastebasket, do you want to delete immediately?"
+"â%Bâ can't be put in the wastebasket. Do you want to delete it immediately?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1795
-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:1814
+msgid "This remote location does not support sending items to the trash."
+msgstr ""
+"This remote location does not support sending items to the wastebasket."
 
-#: ../libnautilus-private/nautilus-file-operations.c:1972
+#: ../libnautilus-private/nautilus-file-operations.c:1988
 msgid "Trashing Files"
 msgstr "Moving Files to Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1974
+#: ../libnautilus-private/nautilus-file-operations.c:1990
 msgid "Deleting Files"
 msgstr "Deleting Files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2042
+#: ../libnautilus-private/nautilus-file-operations.c:2058
 msgid "Unable to eject %V"
 msgstr "Unable to eject %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2044
+#: ../libnautilus-private/nautilus-file-operations.c:2060
 msgid "Unable to unmount %V"
 msgstr "Unable to unmount %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2199
+#: ../libnautilus-private/nautilus-file-operations.c:2219
 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:2201
+#: ../libnautilus-private/nautilus-file-operations.c:2221
 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."
@@ -1098,108 +1009,110 @@ 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:2207
+#: ../libnautilus-private/nautilus-file-operations.c:2227
 msgid "Do _not Empty Trash"
 msgstr "Do _not Empty Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2333
+#. Translators: %s is a file name formatted for display
+#: ../libnautilus-private/nautilus-file-operations.c:2362
+#: ../src/nautilus-view.c:6461
 #, c-format
-msgid "Unable to mount %s"
-msgstr "Unable to mount %s"
+msgid "Unable to access â%sâ"
+msgstr "Unable to access â%sâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2409
+#: ../libnautilus-private/nautilus-file-operations.c:2438
 #, 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:2415
+#: ../libnautilus-private/nautilus-file-operations.c:2444
 #, 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:2421
+#: ../libnautilus-private/nautilus-file-operations.c:2450
 #, 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:2427
+#: ../libnautilus-private/nautilus-file-operations.c:2456
 #, 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:2458
-#: ../libnautilus-private/nautilus-file-operations.c:3369
-#: ../libnautilus-private/nautilus-file-operations.c:3501
-#: ../libnautilus-private/nautilus-file-operations.c:3546
+#: ../libnautilus-private/nautilus-file-operations.c:2487
+#: ../libnautilus-private/nautilus-file-operations.c:3398
+#: ../libnautilus-private/nautilus-file-operations.c:3530
+#: ../libnautilus-private/nautilus-file-operations.c:3575
 msgid "Error while copying."
 msgstr "Error while copying."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2460
-#: ../libnautilus-private/nautilus-file-operations.c:3499
-#: ../libnautilus-private/nautilus-file-operations.c:3544
+#: ../libnautilus-private/nautilus-file-operations.c:2489
+#: ../libnautilus-private/nautilus-file-operations.c:3528
+#: ../libnautilus-private/nautilus-file-operations.c:3573
 msgid "Error while moving."
 msgstr "Error while moving."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2464
+#: ../libnautilus-private/nautilus-file-operations.c:2493
 msgid "Error while moving files to trash."
 msgstr "Error while moving files to the wastebasket."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2518
+#: ../libnautilus-private/nautilus-file-operations.c:2547
 msgid ""
-"Files in the folder \"%B\" cannot be handled because you do not have "
+"Files in the folder â%Bâ cannot be handled because you do not have "
 "permissions to see them."
 msgstr ""
-"Files in the folder \"%B\" cannot be handled because you do not have "
+"Files in the folder â%Bâ cannot be handled because you do not have "
 "permissions to see them."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2557
+#: ../libnautilus-private/nautilus-file-operations.c:2586
 msgid ""
-"The folder \"%B\" cannot be handled because you do not have permissions to "
+"The folder â%Bâ cannot be handled because you do not have permissions to "
 "read it."
 msgstr ""
-"The folder \"%B\" cannot be handled because you do not have permissions to "
+"The folder â%Bâ cannot be handled because you do not have permissions to "
 "read it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2634
+#: ../libnautilus-private/nautilus-file-operations.c:2663
 msgid ""
-"The file \"%B\" cannot be handled because you do not have permissions to "
-"read it."
+"The file â%Bâ cannot be handled because you do not have permissions to read "
+"it."
 msgstr ""
-"The file \"%B\" cannot be handled because you do not have permissions to "
-"read it."
+"The file â%Bâ cannot be handled because you do not have permissions to read "
+"it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2637
-msgid "There was an error getting information about \"%B\"."
-msgstr "There was an error getting information about \"%B\"."
+#: ../libnautilus-private/nautilus-file-operations.c:2666
+msgid "There was an error getting information about â%Bâ."
+msgstr "There was an error getting information about â%Bâ."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2738
-#: ../libnautilus-private/nautilus-file-operations.c:2780
-#: ../libnautilus-private/nautilus-file-operations.c:2814
-#: ../libnautilus-private/nautilus-file-operations.c:2844
-msgid "Error while copying to \"%B\"."
-msgstr "Error while copying to \"%B\"."
+#: ../libnautilus-private/nautilus-file-operations.c:2767
+#: ../libnautilus-private/nautilus-file-operations.c:2809
+#: ../libnautilus-private/nautilus-file-operations.c:2843
+#: ../libnautilus-private/nautilus-file-operations.c:2873
+msgid "Error while copying to â%Bâ."
+msgstr "Error while copying to â%Bâ."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2742
+#: ../libnautilus-private/nautilus-file-operations.c:2771
 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:2744
+#: ../libnautilus-private/nautilus-file-operations.c:2773
 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:2781
+#: ../libnautilus-private/nautilus-file-operations.c:2810
 msgid "The destination is not a folder."
 msgstr "The destination is not a folder."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2815
+#: ../libnautilus-private/nautilus-file-operations.c:2844
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
@@ -1207,54 +1120,54 @@ msgstr ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2817
+#: ../libnautilus-private/nautilus-file-operations.c:2846
 #, c-format
 msgid "%S more space is required to copy to the destination."
 msgstr "%S more space is required to copy to the destination."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2845
+#: ../libnautilus-private/nautilus-file-operations.c:2874
 msgid "The destination is read-only."
 msgstr "The destination is read-only."
 
-#: ../libnautilus-private/nautilus-file-operations.c:2904
-msgid "Moving \"%B\" to \"%B\""
-msgstr "Moving \"%B\" to \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:2933
+msgid "Moving â%Bâ to â%Bâ"
+msgstr "Moving â%Bâ to â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2905
-msgid "Copying \"%B\" to \"%B\""
-msgstr "Copying \"%B\" to \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:2934
+msgid "Copying â%Bâ to â%Bâ"
+msgstr "Copying â%Bâ to â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2912
-msgid "Duplicating \"%B\""
-msgstr "Duplicating \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:2941
+msgid "Duplicating â%Bâ"
+msgstr "Duplicating â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2920
-msgid "Moving file %'d of %'d (in \"%B\") to \"%B\""
-msgstr "Moving file %'d of %'d (in \"%B\") to \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:2949
+msgid "Moving file %'d of %'d (in â%Bâ) to â%Bâ"
+msgstr "Moving file %'d of %'d (in â%Bâ) to â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2922
-msgid "Copying file %'d of %'d (in \"%B\") to \"%B\""
-msgstr "Copying file %'d of %'d (in \"%B\") to \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:2951
+msgid "Copying file %'d of %'d (in â%Bâ) to â%Bâ"
+msgstr "Copying file %'d of %'d (in â%Bâ) to â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2929
-msgid "Duplicating file %'d of %'d (in \"%B\")"
-msgstr "Duplicating file %'d of %'d (in \"%B\")"
+#: ../libnautilus-private/nautilus-file-operations.c:2958
+msgid "Duplicating file %'d of %'d (in â%Bâ)"
+msgstr "Duplicating file %'d of %'d (in â%Bâ)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2938
-msgid "Moving file %'d of %'d to \"%B\""
-msgstr "Moving file %'d of %'d to \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:2967
+msgid "Moving file %'d of %'d to â%Bâ"
+msgstr "Moving file %'d of %'d to â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2940
-msgid "Copying file %'d of %'d to \"%B\""
-msgstr "Copying file %'d of %'d to \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:2969
+msgid "Copying file %'d of %'d to â%Bâ"
+msgstr "Copying file %'d of %'d to â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2946
+#: ../libnautilus-private/nautilus-file-operations.c:2975
 #, c-format
 msgid "Duplicating file %'d of %'d"
 msgstr "Duplicating file %'d of %'d"
 
 #. 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:2965
+#: ../libnautilus-private/nautilus-file-operations.c:2994
 #, c-format
 msgid "%S of %S"
 msgstr "%S of %S"
@@ -1264,222 +1177,222 @@ 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:2976
+#: ../libnautilus-private/nautilus-file-operations.c:3005
 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:3373
+#: ../libnautilus-private/nautilus-file-operations.c:3402
 msgid ""
-"The folder \"%B\" cannot be copied because you do not have permissions to "
+"The folder â%Bâ cannot be copied because you do not have permissions to "
 "create it in the destination."
 msgstr ""
-"The folder \"%B\" cannot be copied because you do not have permissions to "
+"The folder â%Bâ cannot be copied because you do not have permissions to "
 "create it in the destination."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3376
-msgid "There was an error creating the folder \"%B\"."
-msgstr "There was an error creating the folder \"%B\"."
+#: ../libnautilus-private/nautilus-file-operations.c:3405
+msgid "There was an error creating the folder â%Bâ."
+msgstr "There was an error creating the folder â%Bâ."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3506
+#: ../libnautilus-private/nautilus-file-operations.c:3535
 msgid ""
-"Files in the folder \"%B\" cannot be copied because you do not have "
+"Files in the folder â%Bâ cannot be copied because you do not have "
 "permissions to see them."
 msgstr ""
-"Files in the folder \"%B\" cannot be copied because you do not have "
+"Files in the folder â%Bâ cannot be copied because you do not have "
 "permissions to see them."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3551
+#: ../libnautilus-private/nautilus-file-operations.c:3580
 msgid ""
-"The folder \"%B\" cannot be copied because you do not have permissions to "
-"read it."
+"The folder â%Bâ cannot be copied because you do not have permissions to read "
+"it."
 msgstr ""
-"The folder \"%B\" cannot be copied because you do not have permissions to "
-"read it."
+"The folder â%Bâ cannot be copied because you do not have permissions to read "
+"it."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3596
-#: ../libnautilus-private/nautilus-file-operations.c:4287
-#: ../libnautilus-private/nautilus-file-operations.c:4899
-msgid "Error while moving \"%B\"."
-msgstr "Error while moving \"%B\"."
+#: ../libnautilus-private/nautilus-file-operations.c:3625
+#: ../libnautilus-private/nautilus-file-operations.c:4318
+#: ../libnautilus-private/nautilus-file-operations.c:4933
+msgid "Error while moving â%Bâ."
+msgstr "Error while moving â%Bâ."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3597
+#: ../libnautilus-private/nautilus-file-operations.c:3626
 msgid "Could not remove the source folder."
 msgstr "Could not remove the source folder."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3682
-#: ../libnautilus-private/nautilus-file-operations.c:3723
-#: ../libnautilus-private/nautilus-file-operations.c:4289
-#: ../libnautilus-private/nautilus-file-operations.c:4360
-msgid "Error while copying \"%B\"."
-msgstr "Error while copying \"%B\"."
+#: ../libnautilus-private/nautilus-file-operations.c:3711
+#: ../libnautilus-private/nautilus-file-operations.c:3752
+#: ../libnautilus-private/nautilus-file-operations.c:4320
+#: ../libnautilus-private/nautilus-file-operations.c:4391
+msgid "Error while copying â%Bâ."
+msgstr "Error while copying â%Bâ."
 
-#: ../libnautilus-private/nautilus-file-operations.c:3683
+#: ../libnautilus-private/nautilus-file-operations.c:3712
 #, 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:3724
+#: ../libnautilus-private/nautilus-file-operations.c:3753
 #, 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:4042
-#: ../libnautilus-private/nautilus-file-operations.c:4745
+#: ../libnautilus-private/nautilus-file-operations.c:4073
+#: ../libnautilus-private/nautilus-file-operations.c:4776
 msgid "You cannot move a folder into itself."
 msgstr "You cannot move a folder into itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4043
-#: ../libnautilus-private/nautilus-file-operations.c:4746
+#: ../libnautilus-private/nautilus-file-operations.c:4074
+#: ../libnautilus-private/nautilus-file-operations.c:4777
 msgid "You cannot copy a folder into itself."
 msgstr "You cannot copy a folder into itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4044
-#: ../libnautilus-private/nautilus-file-operations.c:4747
+#: ../libnautilus-private/nautilus-file-operations.c:4075
+#: ../libnautilus-private/nautilus-file-operations.c:4778
 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:4075
+#: ../libnautilus-private/nautilus-file-operations.c:4106
 msgid "You cannot move a file over itself."
 msgstr "You cannot move a file over itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4076
+#: ../libnautilus-private/nautilus-file-operations.c:4107
 msgid "You cannot copy a file over itself."
 msgstr "You cannot copy a file over itself."
 
-#: ../libnautilus-private/nautilus-file-operations.c:4077
+#: ../libnautilus-private/nautilus-file-operations.c:4108
 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:4291
+#: ../libnautilus-private/nautilus-file-operations.c:4322
 #, 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:4361
+#: ../libnautilus-private/nautilus-file-operations.c:4392
 #, 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:4593
-#: ../libnautilus-private/nautilus-file-operations.c:4627
+#: ../libnautilus-private/nautilus-file-operations.c:4624
+#: ../libnautilus-private/nautilus-file-operations.c:4658
 msgid "Copying Files"
 msgstr "Copying Files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4655
-msgid "Preparing to Move to \"%B\""
-msgstr "Preparing to Move to \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:4686
+msgid "Preparing to Move to â%Bâ"
+msgstr "Preparing to Move to â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4659
+#: ../libnautilus-private/nautilus-file-operations.c:4690
 #, 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:4900
+#: ../libnautilus-private/nautilus-file-operations.c:4934
 #, 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:5162
+#: ../libnautilus-private/nautilus-file-operations.c:5196
 msgid "Moving Files"
 msgstr "Moving Files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5197
-msgid "Creating links in \"%B\""
-msgstr "Creating links in \"%B\""
+#: ../libnautilus-private/nautilus-file-operations.c:5231
+msgid "Creating links in â%Bâ"
+msgstr "Creating links in â%Bâ"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5201
+#: ../libnautilus-private/nautilus-file-operations.c:5235
 #, 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:5336
+#: ../libnautilus-private/nautilus-file-operations.c:5370
 msgid "Error while creating link to %B."
 msgstr "Error while creating link to %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5338
+#: ../libnautilus-private/nautilus-file-operations.c:5372
 msgid "Symbolic links only supported for local files"
 msgstr "Symbolic links only supported for local files"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5341
+#: ../libnautilus-private/nautilus-file-operations.c:5375
 msgid "The target doesn't support symbolic links."
 msgstr "The target doesn't support symbolic links."
 
-#: ../libnautilus-private/nautilus-file-operations.c:5344
+#: ../libnautilus-private/nautilus-file-operations.c:5378
 #, 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:5663
+#: ../libnautilus-private/nautilus-file-operations.c:5697
 msgid "Setting permissions"
 msgstr "Setting permissions"
 
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:5928
+#: ../libnautilus-private/nautilus-file-operations.c:5962
 msgid "Untitled Folder"
 msgstr "Untitled Folder"
 
 #. localizers: the initial name of a new template document
-#: ../libnautilus-private/nautilus-file-operations.c:5934
+#: ../libnautilus-private/nautilus-file-operations.c:5968
 #, c-format
 msgid "Untitled %s"
 msgstr "Untitled %s"
 
 #. localizers: the initial name of a new empty document
-#: ../libnautilus-private/nautilus-file-operations.c:5940
+#: ../libnautilus-private/nautilus-file-operations.c:5974
 msgid "Untitled Document"
 msgstr "Untitled Document"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6118
+#: ../libnautilus-private/nautilus-file-operations.c:6152
 msgid "Error while creating directory %B."
 msgstr "Error while creating directory %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6120
+#: ../libnautilus-private/nautilus-file-operations.c:6154
 msgid "Error while creating file %B."
 msgstr "Error while creating file %B."
 
-#: ../libnautilus-private/nautilus-file-operations.c:6122
+#: ../libnautilus-private/nautilus-file-operations.c:6156
 #, 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:6391
+#: ../libnautilus-private/nautilus-file-operations.c:6425
 msgid "Emptying Trash"
 msgstr "Emptying Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6439
-#: ../libnautilus-private/nautilus-file-operations.c:6480
-#: ../libnautilus-private/nautilus-file-operations.c:6515
-#: ../libnautilus-private/nautilus-file-operations.c:6550
+#: ../libnautilus-private/nautilus-file-operations.c:6473
+#: ../libnautilus-private/nautilus-file-operations.c:6514
+#: ../libnautilus-private/nautilus-file-operations.c:6549
+#: ../libnautilus-private/nautilus-file-operations.c:6584
 msgid "Unable to mark launcher trusted (executable)"
 msgstr "Unable to mark launcher as trusted (executable)"
 
 #. Reset to default info
 #: ../libnautilus-private/nautilus-file-undo-operations.c:135
-#: ../src/nautilus-view.c:2392
+#: ../src/nautilus-view.c:2521
 msgid "Undo"
 msgstr "Undo"
 
 #: ../libnautilus-private/nautilus-file-undo-operations.c:138
-#: ../src/nautilus-view.c:2393
+#: ../src/nautilus-view.c:2522
 msgid "Undo last action"
 msgstr "Undo last action"
 
 #. Reset to default info
 #: ../libnautilus-private/nautilus-file-undo-operations.c:142
-#: ../src/nautilus-view.c:2411
+#: ../src/nautilus-view.c:2540
 msgid "Redo"
 msgstr "Redo"
 
 #: ../libnautilus-private/nautilus-file-undo-operations.c:145
-#: ../src/nautilus-view.c:2412
+#: ../src/nautilus-view.c:2541
 msgid "Redo last undone action"
 msgstr "Redo last undone action"
 
@@ -1761,133 +1674,126 @@ msgstr "_Undo Wastebasket"
 msgid "_Redo Trash"
 msgstr "_Redo Wastebasket"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1301
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1300
 #, c-format
 msgid "Restore original permissions of items enclosed in '%s'"
 msgstr "Restore original permissions of items enclosed in '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1302
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1301
 #, c-format
 msgid "Set permissions of items enclosed in '%s'"
 msgstr "Set permissions of items enclosed in '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1304
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1459
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1303
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1458
 msgid "_Undo Change Permissions"
 msgstr "_Undo Change Permissions"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1305
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1460
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1304
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1459
 msgid "_Redo Change Permissions"
 msgstr "_Redo Change Permissions"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1456
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1455
 #, c-format
 msgid "Restore original permissions of '%s'"
 msgstr "Restore original permissions of '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1457
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1456
 #, c-format
 msgid "Set permissions of '%s'"
 msgstr "Set permissions of '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1567
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1566
 #, c-format
 msgid "Restore group of '%s' to '%s'"
 msgstr "Restore group of '%s' to '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1569
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1568
 #, c-format
 msgid "Set group of '%s' to '%s'"
 msgstr "Set group of '%s' to '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1572
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1571
 msgid "_Undo Change Group"
 msgstr "_Undo Change Group"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1573
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1572
 msgid "_Redo Change Group"
 msgstr "_Redo Change Group"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1575
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1574
 #, c-format
 msgid "Restore owner of '%s' to '%s'"
 msgstr "Restore owner of '%s' to '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1577
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1576
 #, c-format
 msgid "Set owner of '%s' to '%s'"
 msgstr "Set owner of '%s' to '%s'"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1580
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1579
 msgid "_Undo Change Owner"
 msgstr "_Undo Change Owner"
 
-#: ../libnautilus-private/nautilus-file-undo-operations.c:1581
+#: ../libnautilus-private/nautilus-file-undo-operations.c:1580
 msgid "_Redo Change Owner"
 msgstr "_Redo Change Owner"
 
-#: ../libnautilus-private/nautilus-file-utilities.c:1229
+#: ../libnautilus-private/nautilus-file-utilities.c:1143
 #, c-format
-msgid "Could not determine original location of \"%s\" "
-msgstr "Could not determine original location of \"%s\" "
+msgid "Could not determine original location of â%sâ "
+msgstr "Could not determine original location of â%sâ "
 
-#: ../libnautilus-private/nautilus-file-utilities.c:1233
+#: ../libnautilus-private/nautilus-file-utilities.c:1147
 msgid "The item cannot be restored from trash"
 msgstr "The item cannot be restored from the wastebasket"
 
-#: ../libnautilus-private/nautilus-icon-container.c:2664
-msgid "The selection rectangle"
-msgstr "The selection rectangle"
-
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:83
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:81
 #, c-format
-msgid "Error while adding \"%s\": %s"
-msgstr "Error while adding \"%s\": %s"
+msgid "Error while adding â%sâ: %s"
+msgstr "Error while adding â%sâ: %s"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:85
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:83
 msgid "Could not add application"
 msgstr "Could not add application"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:113
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:111
 msgid "Could not forget association"
 msgstr "Could not forget association"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:137
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:135
 msgid "Forget association"
 msgstr "Forget association"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:175
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:173
 #, c-format
-msgid "Error while setting \"%s\" as default application: %s"
-msgstr "Error while setting \"%s\" as default application: %s"
+msgid "Error while setting â%sâ as default application: %s"
+msgstr "Error while setting â%sâ as default application: %s"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:177
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:175
 msgid "Could not set as default"
 msgstr "Could not set as default"
 
-#. the %s here is a file extension
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:279
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:297
+#. Translators: the %s here is a file extension
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:253
 #, c-format
 msgid "%s document"
 msgstr "%s document"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:284
+#. Translators; %s here is a mime-type description
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:260
 #, c-format
-msgid "Open all files of type \"%s\" with"
-msgstr "Open all files of type \"%s\" with"
+msgid "Open all files of type â%sâ with"
+msgstr "Open all files of type â%sâ with"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:304
+#. Translators: first %s is filename, second %s is mime-type description
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:267
 #, c-format
-msgid "Select an application to open %s and other files of type \"%s\""
-msgstr "Select an application to open %s and other files of type \"%s\""
+msgid "Select an application to open â%sâ and other files of type â%sâ"
+msgstr "Select an application to open â%sâ and other files of type â%sâ"
 
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:366
-msgid "Show other applications"
-msgstr "Show other applications"
-
-#: ../libnautilus-private/nautilus-mime-application-chooser.c:395
+#: ../libnautilus-private/nautilus-mime-application-chooser.c:333
 msgid "Set as default"
 msgstr "Set as default"
 
@@ -1932,39 +1838,21 @@ msgstr "Details: "
 msgid "Preparing"
 msgstr "Preparing"
 
-#: ../libnautilus-private/nautilus-query.c:129
+#: ../libnautilus-private/nautilus-query.c:130
 #: ../libnautilus-private/nautilus-search-directory-file.c:160
 #: ../libnautilus-private/nautilus-search-directory-file.c:186
-#: ../libnautilus-private/nautilus-search-directory-file.c:218
-#: ../src/nautilus-window-menus.c:1148
+#: ../libnautilus-private/nautilus-search-directory-file.c:220
 msgid "Search"
 msgstr "Search"
 
-#: ../libnautilus-private/nautilus-query.c:132
+#: ../libnautilus-private/nautilus-query.c:133
 #, c-format
-msgid "Search for \"%s\""
-msgstr "Search for \"%s\""
-
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:173
-#: ../src/nautilus-query-editor.c:1001
-msgid "Edit"
-msgstr "Edit"
-
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:174
-msgid "Undo Edit"
-msgstr "Undo Edit"
-
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:175
-msgid "Undo the edit"
-msgstr "Undo the edit"
+msgid "Search for â%sâ"
+msgstr "Search for â%sâ"
 
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:176
-msgid "Redo Edit"
-msgstr "Redo Edit"
-
-#: ../libnautilus-private/nautilus-undo-signal-handlers.c:177
-msgid "Redo the edit"
-msgstr "Redo the edit"
+#: ../libnautilus-private/nautilus-search-engine.c:155
+msgid "Unable to complete the requested search"
+msgstr "Unable to complete the requested search"
 
 #: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:1
 msgid "Where to position newly open tabs in browser windows."
@@ -1981,24 +1869,10 @@ msgstr ""
 "tab list."
 
 #: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:3
-msgid "Enables the classic Nautilus behavior, where all windows are browsers"
-msgstr "Enables the classic Nautilus behaviour, where all windows are browsers"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:4
-msgid ""
-"If set to true, then all Nautilus windows will be browser windows. This is "
-"how Nautilus used to behave before version 2.6, and some people prefer this "
-"behavior."
-msgstr ""
-"If set to true, then all Nautilus windows will be browser windows. This is "
-"how Nautilus used to behave before version 2.6, and some people prefer this "
-"behaviour."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:5
 msgid "Always use the location entry, instead of the pathbar"
 msgstr "Always use the location entry, instead of the pathbar"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:6
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:4
 msgid ""
 "If set to true, then Nautilus browser windows will always use a textual "
 "input entry for the location toolbar, instead of the pathbar."
@@ -2006,13 +1880,13 @@ msgstr ""
 "If set to true, then Nautilus browser windows will always use a textual "
 "input entry for the location toolbar, instead of the pathbar."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:7
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:5
 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/org.gnome.nautilus.gschema.xml.in.h:8
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:6
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
@@ -2020,11 +1894,11 @@ msgstr ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Wastebasket."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:9
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:7
 msgid "Whether to enable immediate deletion"
 msgstr "Whether to enable immediate deletion"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:10
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:8
 msgid ""
 "If set to true, then Nautilus will have a feature allowing you to delete a "
 "file immediately and in-place, instead of moving it to the trash. This "
@@ -2034,29 +1908,11 @@ msgstr ""
 "file immediately and in-place, instead of moving it to the wastebasket. This "
 "feature can be dangerous, so use caution."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:11
-msgid "When to show preview text in icons"
-msgstr "When to show preview text in icons"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:12
-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 "
-"folder is on a remote server. If set to \"local-only\" then only show "
-"previews for local file systems. If set to \"never\" then never bother to "
-"read preview data."
-msgstr ""
-"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 "
-"folder is on a remote server. If set to \"local-only\" then only show "
-"previews for local file systems. If set to \"never\" then never bother to "
-"read preview data."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:13
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:9
 msgid "When to show number of items in a folder"
 msgstr "When to show number of items in a folder"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:14
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:10
 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 "
@@ -2068,11 +1924,11 @@ 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/org.gnome.nautilus.gschema.xml.in.h:15
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:11
 msgid "Type of click used to launch/open files"
 msgstr "Type of click used to launch/open files"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:16
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:12
 msgid ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
@@ -2080,11 +1936,11 @@ msgstr ""
 "Possible values are \"single\" to launch files on a single click, or \"double"
 "\" to launch them on a double click."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:17
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:13
 msgid "What to do with executable text files when activated"
 msgstr "What to do with executable text files when activated"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:18
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:14
 msgid ""
 "What to do with executable text files when they are activated (single or "
 "double clicked). Possible values are \"launch\" to launch them as programs, "
@@ -2096,11 +1952,11 @@ msgstr ""
 "\"ask\" to ask what to do via a dialogue, and \"display\" to display them as "
 "text files."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:19
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:15
 msgid "Show the package installer for unknown mime types"
 msgstr "Show the package installer for unknown MIME types"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:20
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:16
 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."
@@ -2108,11 +1964,11 @@ 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/org.gnome.nautilus.gschema.xml.in.h:21
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:17
 msgid "Use extra mouse button events in Nautilus' browser window"
 msgstr "Use extra mouse button events in Nautilus' browser window"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:22
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:18
 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 "
@@ -2122,11 +1978,11 @@ msgstr ""
 "will determine if any action is taken inside of Nautilus when either is "
 "pressed."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:23
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:19
 msgid "Mouse button to activate the \"Forward\" command in browser window"
 msgstr "Mouse button to activate the \"Forward\" command in browser window"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:24
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:20
 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. "
@@ -2136,11 +1992,11 @@ msgstr ""
 "will set which button activates the \"Forward\" command in a browser window. "
 "Possible values range between 6 and 14."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:25
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:21
 msgid "Mouse button to activate the \"Back\" command in browser window"
 msgstr "Mouse button to activate the \"Back\" command in browser window"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:26
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:22
 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. "
@@ -2150,29 +2006,30 @@ msgstr ""
 "will set which button activates the \"Back\" command in a browser window. "
 "Possible values range between 6 and 14."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:27
-msgid "When to show thumbnails of image files"
-msgstr "When to show thumbnails of image files"
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:23
+msgid "When to show thumbnails of files"
+msgstr "When to show thumbnails of files"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:28
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:24
 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. "
-"If set to \"local-only\" then only show thumbnails for local file systems. "
-"If set to \"never\" then never bother to thumbnail images, just use a "
-"generic icon."
+"Speed tradeoff for when to show a file as a thumbnail. If set to \"always\" "
+"then always thumbnail, even if the folder is on a remote server. If set to "
+"\"local-only\" then only show thumbnails for local file systems. If set to "
+"\"never\" then never bother to thumbnail files, just use a generic icon. "
+"Despite what the name may suggest, this applies to any previewable file type."
 msgstr ""
-"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. "
-"If set to \"local-only\" then only show thumbnails for local file systems. "
-"If set to \"never\" then never bother to thumbnail images, just use a "
-"generic icon."
+"Speed tradeoff for when to show a file as a thumbnail. If set to \"always\" "
+"then always thumbnail, even if the folder is on a remote server. If set to "
+"\"local-only\" then only show thumbnails for local file systems. If set to "
+"\"never\" then never bother to thumbnail files, just use a generic icon. "
+"Despite what the name may suggest, this applies to any previewable file "
+"type."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:29
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:25
 msgid "Maximum image size for thumbnailing"
 msgstr "Maximum image size for thumbnailing"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:30
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:26
 msgid ""
 "Images over this size (in bytes) won't be thumbnailed. The purpose of this "
 "setting is to avoid thumbnailing large images that may take a long time to "
@@ -2182,23 +2039,11 @@ msgstr ""
 "setting is to avoid thumbnailing large images that may take a long time to "
 "load or use lots of memory."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:31
-msgid "Show advanced permissions in the file property dialog"
-msgstr "Show advanced permissions in the file property dialogue"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:32
-msgid ""
-"If set to true, then Nautilus lets you edit and display file permissions in "
-"a more unix-like way, accessing some more esoteric options."
-msgstr ""
-"If set to true, then Nautilus lets you edit and display file permissions in "
-"a more unix-like way, accessing some more esoteric options."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:33
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:27
 msgid "Show folders first in windows"
 msgstr "Show folders first in windows"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:34
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:28
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
@@ -2206,11 +2051,11 @@ msgstr ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:35
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:29
 msgid "Default sort order"
 msgstr "Default sort order"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:36
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:30
 msgid ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\" and \"mtime\"."
@@ -2218,11 +2063,11 @@ msgstr ""
 "The default sort-order for items in the icon view. Possible values are \"name"
 "\", \"size\", \"type\" and \"mtime\"."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:37
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:31
 msgid "Reverse sort order in new windows"
 msgstr "Reverse sort order in new windows"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:38
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:32
 msgid ""
 "If true, files in new windows will be sorted in reverse order. ie, if sorted "
 "by name, then instead of sorting the files from \"a\" to \"z\", they will be "
@@ -2234,49 +2079,25 @@ msgstr ""
 "sorted from \"z\" to \"a\"; if sorted by size, instead of being "
 "incrementally they will be sorted decrementally."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:39
-msgid "Nautilus uses the users home folder as the desktop"
-msgstr "Nautilus uses the users home folder as the desktop"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:40
-msgid ""
-"If set to true, then Nautilus will use the user's home folder as the "
-"desktop. If it is false, then it will use ~/Desktop as the desktop."
-msgstr ""
-"If set to true, then Nautilus will use the user's home folder as the "
-"desktop. If it is false, then it will use ~/Desktop as the desktop."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:41
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:33
 msgid "Default folder viewer"
 msgstr "Default folder viewer"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:42
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:34
 msgid ""
 "When a folder is visited this viewer is used unless you have selected "
 "another view for that particular folder. Possible values are \"list-view\", "
-"\"icon-view\" and \"compact-view\"."
+"and \"icon-view\"."
 msgstr ""
 "When a folder is visited this viewer is used unless you have selected "
 "another view for that particular folder. Possible values are \"list-view\", "
-"\"icon-view\" and \"compact-view\"."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:43
-msgid "Date Format"
-msgstr "Date Format"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:44
-msgid ""
-"The format of file dates. Possible values are \"locale\", \"iso\", and "
-"\"informal\"."
-msgstr ""
-"The format of file dates. Possible values are \"locale\", \"iso\", and "
-"\"informal\"."
+"and \"icon-view\"."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:45
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:35
 msgid "Whether to show hidden files"
 msgstr "Whether to show hidden files"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:46
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:36
 msgid ""
 "If set to true, then hidden files are shown by default in the file manager. "
 "Hidden files are either dotfiles, listed in the folder's .hidden file or "
@@ -2286,11 +2107,11 @@ msgstr ""
 "Hidden files are either dotfiles, listed in the folder's .hidden file or "
 "backup files ending with a tilde (~)."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:47
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:37
 msgid "Bulk rename utility"
 msgstr "Bulk rename utility"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:48
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:38
 msgid ""
 "If set, Nautilus will append URIs of selected files and treat the result as "
 "a command line for bulk renaming. Bulk rename applications can register "
@@ -2304,55 +2125,43 @@ msgstr ""
 "their executable name and any command line options. If the executable name "
 "is not set to a full path, it will be searched for in the search path."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:49
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:39
 msgid "List of possible captions on icons"
 msgstr "List of possible captions on icons"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:50
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:40
 msgid ""
 "A list of captions below an icon in the icon view and the desktop. The "
 "actual number of captions shown depends on the zoom level. Some possible "
-"values are: \"size\", \"type\", \"date_modified\", \"date_changed\", "
-"\"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions"
-"\" and \"mime_type\"."
+"values are: \"size\", \"type\", \"date_modified\", \"owner\", \"group\", "
+"\"permissions\", and \"mime_type\"."
 msgstr ""
 "A list of captions below an icon in the icon view and the desktop. The "
 "actual number of captions shown depends on the zoom level. Some possible "
-"values are: \"size\", \"type\", \"date_modified\", \"date_changed\", "
-"\"date_accessed\", \"owner\", \"group\", \"permissions\", \"octal_permissions"
-"\" and \"mime_type\"."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:51
-msgid "Put labels beside icons"
-msgstr "Put labels beside icons"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:52
-msgid ""
-"If true, labels will be placed beside icons rather than underneath them."
-msgstr ""
-"If true, labels will be placed beside icons rather than underneath them."
+"values are: \"size\", \"type\", \"date_modified\", \"owner\", \"group\", "
+"\"permissions\", and \"mime_type\"."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:53
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:41
 msgid "Default icon zoom level"
 msgstr "Default icon zoom level"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:54
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:42
 msgid "Default zoom level used by the icon view."
 msgstr "Default zoom level used by the icon view."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:55
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:43
 msgid "Default Thumbnail Icon Size"
 msgstr "Default Thumbnail Icon Size"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:56
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:44
 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/org.gnome.nautilus.gschema.xml.in.h:57
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:45
 msgid "Text Ellipsis Limit"
 msgstr "Text Ellipsis Limit"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:59
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:47
 #, no-c-format
 msgid ""
 "A string specifying how parts of overlong file names should be replaced by "
@@ -2385,75 +2194,43 @@ msgstr ""
 "smallest (33%), smaller (50%), small (66%), standard (100%), large (150%), "
 "larger (200%), largest (400%)"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:60
-msgid "Default compact view zoom level"
-msgstr "Default compact view zoom level"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:61
-msgid "Default zoom level used by the compact view."
-msgstr "Default zoom level used by the compact view."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:62
-msgid "All columns have same width"
-msgstr "All columns have same width"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:63
-msgid ""
-"If this preference is set, all columns in the compact view have the same "
-"width. Otherwise, the width of each column is determined seperately."
-msgstr ""
-"If this preference is set, all columns in the compact view have the same "
-"width. Otherwise, the width of each column is determined separately."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:64
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:48
 msgid "Default list zoom level"
 msgstr "Default list zoom level"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:65
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:49
 msgid "Default zoom level used by the list view."
 msgstr "Default zoom level used by the list view."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:66
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:50
 msgid "Default list of columns visible in the list view"
 msgstr "Default list of columns visible in the list view"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:67
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:51
 msgid "Default list of columns visible in the list view."
 msgstr "Default list of columns visible in the list view."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:68
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:52
 msgid "Default column order in the list view"
 msgstr "Default column order in the list view"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:69
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:53
 msgid "Default column order in the list view."
 msgstr "Default column order in the list view."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:70
-msgid "Only show folders in the tree side pane"
-msgstr "Only show folders in the tree side pane"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:71
-msgid ""
-"If set to true, Nautilus will only show folders in the tree side pane. "
-"Otherwise it will show both folders and files."
-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/org.gnome.nautilus.gschema.xml.in.h:72
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:54
 msgid "Desktop font"
 msgstr "Desktop font"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:73
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:55
 msgid "The font _description used for the icons on the desktop."
 msgstr "The font _description used for the icons on the desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:74
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:56
 msgid "Home icon visible on desktop"
 msgstr "Home icon visible on desktop"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:75
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:57
 msgid ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
@@ -2461,23 +2238,11 @@ msgstr ""
 "If this is set to true, an icon linking to the home folder will be put on "
 "the desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:76
-msgid "Computer icon visible on desktop"
-msgstr "Computer icon visible on desktop"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:77
-msgid ""
-"If this is set to true, an icon linking to the computer location will be put "
-"on the desktop."
-msgstr ""
-"If this is set to true, an icon linking to the computer location will be put "
-"on the desktop."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:78
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:58
 msgid "Trash icon visible on desktop"
 msgstr "Wastebasket icon visible on desktop"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:79
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:59
 msgid ""
 "If this is set to true, an icon linking to the trash will be put on the "
 "desktop."
@@ -2485,11 +2250,11 @@ msgstr ""
 "If this is set to true, an icon linking to the wastebasket will be put on "
 "the desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:80
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:60
 msgid "Show mounted volumes on the desktop"
 msgstr "Show mounted volumes on the desktop"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:81
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:61
 msgid ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
@@ -2497,11 +2262,11 @@ msgstr ""
 "If this is set to true, icons linking to mounted volumes will be put on the "
 "desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:82
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:62
 msgid "Network Servers icon visible on the desktop"
 msgstr "Network Servers icon visible on the desktop"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:83
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:63
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
@@ -2509,23 +2274,11 @@ msgstr ""
 "If this is set to true, an icon linking to the Network Servers view will be "
 "put on the desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:84
-msgid "Desktop computer icon name"
-msgstr "Desktop computer icon name"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:85
-msgid ""
-"This name can be set if you want a custom name for the computer icon on the "
-"desktop."
-msgstr ""
-"This name can be set if you want a custom name for the computer icon on the "
-"desktop."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:86
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:64
 msgid "Desktop home icon name"
 msgstr "Desktop home icon name"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:87
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:65
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
@@ -2533,11 +2286,11 @@ msgstr ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:88
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:66
 msgid "Desktop trash icon name"
 msgstr "Desktop wastebasket icon name"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:89
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:67
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
@@ -2545,11 +2298,11 @@ msgstr ""
 "This name can be set if you want a custom name for the wastebasket icon on "
 "the desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:90
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:68
 msgid "Network servers icon name"
 msgstr "Network servers icon name"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:91
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:69
 msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
@@ -2557,7 +2310,7 @@ msgstr ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:92
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:70
 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 "
@@ -2569,11 +2322,11 @@ 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/org.gnome.nautilus.gschema.xml.in.h:93
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:71
 msgid "Fade the background on change"
 msgstr "Fade the background on change"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:94
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:72
 msgid ""
 "If set to true, then Nautilus will use a fade effect to change the desktop "
 "background."
@@ -2581,11 +2334,11 @@ msgstr ""
 "If set to true, then Nautilus will use a fade effect to change the desktop "
 "background."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:95
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:73
 msgid "The geometry string for a navigation window."
 msgstr "The geometry string for a navigation window."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:96
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:74
 msgid ""
 "A string containing the saved geometry and coordinates string for navigation "
 "windows."
@@ -2593,64 +2346,40 @@ msgstr ""
 "A string containing the saved geometry and coordinates string for navigation "
 "windows."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:97
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:75
 msgid "Whether the navigation window should be maximized."
 msgstr "Whether the navigation window should be maximised."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:98
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:76
 msgid "Whether the navigation window should be maximized by default."
 msgstr "Whether the navigation window should be maximised by default."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:99
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:77
 msgid "Width of the side pane"
 msgstr "Width of the side pane"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:100
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:78
 msgid "The default width of the side pane in new windows."
 msgstr "The default width of the side pane in new windows."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:101
-msgid "Show toolbar in new windows"
-msgstr "Show toolbar in new windows"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:102
-msgid "If set to true, newly opened windows will have toolbars visible."
-msgstr "If set to true, newly opened windows will have toolbars visible."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:103
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:79
 msgid "Show location bar in new windows"
 msgstr "Show location bar in new windows"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:104
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:80
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
 msgstr ""
 "If set to true, newly opened windows will have the location bar visible."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:105
-msgid "Show status bar in new windows"
-msgstr "Show status bar in new windows"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:106
-msgid "If set to true, newly opened windows will have the status bar visible."
-msgstr "If set to true, newly opened windows will have the status bar visible."
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:107
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:81
 msgid "Show side pane in new windows"
 msgstr "Show side pane in new windows"
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:108
+#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:82
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr "If set to true, newly opened windows will have the side pane visible."
 
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:109
-msgid "Side pane view"
-msgstr "Side pane view"
-
-#: ../libnautilus-private/org.gnome.nautilus.gschema.xml.in.h:110
-msgid "The side pane view to show in newly opened windows."
-msgstr "The side pane view to show in newly opened windows."
-
 #: ../nautilus-sendto-extension/nautilus-nste.c:80
 #: ../nautilus-sendto-extension/nautilus-nste.c:85
 msgid "Send To..."
@@ -2664,33 +2393,35 @@ msgstr "Send file by mail, instant messageâ"
 msgid "Send files by mail, instant message..."
 msgstr "Send files by mail, instant messageâ"
 
-#: ../src/nautilus-application.c:157
-#, c-format
-msgid "Nautilus could not create the required folder \"%s\"."
-msgstr "Nautilus could not create the required folder \"%s\"."
+#. Some sort of failure occurred. How 'bout we tell the user?
+#: ../src/nautilus-application.c:225
+#: ../src/nautilus-window-manage-views.c:1649
+msgid "Oops! Something went wrong."
+msgstr "Oops! Something went wrong."
 
-#: ../src/nautilus-application.c:159
+#: ../src/nautilus-application.c:227
+#, c-format
 msgid ""
-"Before running Nautilus, please create the following folder, or set "
-"permissions such that Nautilus can create it."
+"Unable to create a required folder. Please create the following folder, or "
+"set permissions such that it can be created:\n"
+"%s"
 msgstr ""
-"Before running Nautilus, please create the following folder, or set "
-"permissions such that Nautilus can create it."
+"Unable to create a required folder. Please create the following folder, or "
+"set permissions such that it can be created:\n"
+"%s"
 
-#: ../src/nautilus-application.c:162
+#: ../src/nautilus-application.c:232
 #, 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:164
 msgid ""
-"Before running Nautilus, please create these folders, or set permissions "
-"such that Nautilus can create them."
+"Unable to create required folders. Please create the following folders, or "
+"set permissions such that they can be created:\n"
+"%s"
 msgstr ""
-"Before running Nautilus, please create these folders, or set permissions "
-"such that Nautilus can create them."
+"Unable to create required folders. Please create the following folders, or "
+"set permissions such that they can be created:\n"
+"%s"
 
-#: ../src/nautilus-application.c:296
+#: ../src/nautilus-application.c:366
 msgid ""
 "Nautilus 3.0 deprecated this directory and tried migrating this "
 "configuration to ~/.config/nautilus"
@@ -2698,39 +2429,50 @@ msgstr ""
 "Nautilus 3.0 deprecated this directory and tried migrating this "
 "configuration to ~/.config/nautilus"
 
-#: ../src/nautilus-application.c:844
+#: ../src/nautilus-application.c:782
+#: ../src/nautilus-file-management-properties.c:196
+#: ../src/nautilus-window-menus.c:296
+#, c-format
+msgid ""
+"There was an error displaying help: \n"
+"%s"
+msgstr ""
+"There was an error displaying help: \n"
+"%s"
+
+#: ../src/nautilus-application.c:905
 msgid "--check cannot be used with other options."
 msgstr "--check cannot be used with other options."
 
-#: ../src/nautilus-application.c:850
+#: ../src/nautilus-application.c:911
 msgid "--quit cannot be used with URIs."
 msgstr "--quit cannot be used with URIs."
 
-#: ../src/nautilus-application.c:857
+#: ../src/nautilus-application.c:918
 msgid "--geometry cannot be used with more than one URI."
 msgstr "--geometry cannot be used with more than one URI."
 
-#: ../src/nautilus-application.c:911
+#: ../src/nautilus-application.c:964
 msgid "Perform a quick set of self-check tests."
 msgstr "Perform a quick set of self-check tests."
 
-#: ../src/nautilus-application.c:917
+#: ../src/nautilus-application.c:970
 msgid "Show the version of the program."
 msgstr "Show the version of the program."
 
-#: ../src/nautilus-application.c:919
+#: ../src/nautilus-application.c:972
 msgid "Create the initial window with the given geometry."
 msgstr "Create the initial window with the given geometry."
 
-#: ../src/nautilus-application.c:919
+#: ../src/nautilus-application.c:972
 msgid "GEOMETRY"
 msgstr "GEOMETRY"
 
-#: ../src/nautilus-application.c:921
+#: ../src/nautilus-application.c:974
 msgid "Only create windows for explicitly specified URIs."
 msgstr "Only create windows for explicitly specified URIs."
 
-#: ../src/nautilus-application.c:923
+#: ../src/nautilus-application.c:976
 msgid ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialog)."
@@ -2738,15 +2480,15 @@ msgstr ""
 "Do not manage the desktop (ignore the preference set in the preferences "
 "dialogue)."
 
-#: ../src/nautilus-application.c:925
+#: ../src/nautilus-application.c:978
 msgid "Quit Nautilus."
 msgstr "Quit Nautilus."
 
-#: ../src/nautilus-application.c:926
+#: ../src/nautilus-application.c:979
 msgid "[URI...]"
 msgstr "[URIâ]"
 
-#: ../src/nautilus-application.c:937
+#: ../src/nautilus-application.c:992
 msgid ""
 "\n"
 "\n"
@@ -2756,106 +2498,299 @@ msgstr ""
 "\n"
 "Browse the file system with the file manager"
 
+#. name, stock id, label
+#: ../src/nautilus-app-menu.ui.h:1 ../src/nautilus-window-menus.c:568
+msgid "New _Window"
+msgstr "New _Window"
+
+#: ../src/nautilus-app-menu.ui.h:2
+msgid "Connect to _Server"
+msgstr "Connect to _Server"
+
+#: ../src/nautilus-app-menu.ui.h:3
+msgid "Enter _Location"
+msgstr "Enter _Location"
+
+#: ../src/nautilus-app-menu.ui.h:4
+msgid "_Bookmarks"
+msgstr "_Bookmarks"
+
+#: ../src/nautilus-app-menu.ui.h:5 ../src/nautilus-window-menus.c:498
+msgid "Prefere_nces"
+msgstr "Prefere_nces"
+
+#: ../src/nautilus-app-menu.ui.h:6
+msgid "_About Files"
+msgstr "_About Files"
+
+#. name, stock id, label
+#: ../src/nautilus-app-menu.ui.h:7 ../src/nautilus-window-menus.c:492
+msgid "_Help"
+msgstr "_Help"
+
+#: ../src/nautilus-app-menu.ui.h:8
+msgid "_Quit"
+msgstr "_Quit"
+
 #: ../src/nautilus-autorun-software.c:143
 #: ../src/nautilus-autorun-software.c:146
 #, c-format
-msgid "Error starting autorun program: %s"
-msgstr "Error starting autorun program: %s"
+msgid ""
+"Unable to start the program:\n"
+"%s"
+msgstr ""
+"Unable to start the program:\n"
+"%s"
 
 #: ../src/nautilus-autorun-software.c:149
 #, c-format
-msgid "Cannot find the autorun program"
-msgstr "Cannot find the autorun program"
+msgid "Unable to locate the program"
+msgstr "Unable to locate the program"
 
 #: ../src/nautilus-autorun-software.c:171
-msgid "<big><b>Error autorunning software</b></big>"
-msgstr "<big><b>Error autorunning software</b></big>"
-
-#: ../src/nautilus-autorun-software.c:197
-msgid ""
-"<big><b>This medium contains software intended to be automatically started. "
-"Would you like to run it?</b></big>"
-msgstr ""
-"<big><b>This medium contains software intended to be automatically started. "
-"Would you like to run it?</b></big>"
+msgid "Oops! There was a problem running this software."
+msgstr "Oops! There was a problem running this software."
 
-#: ../src/nautilus-autorun-software.c:199
+#: ../src/nautilus-autorun-software.c:202
 #, c-format
 msgid ""
-"The software will run directly from the medium \"%s\". You should never run "
-"software that you don't trust.\n"
-"\n"
-"If in doubt, press Cancel."
+"â%sâ contains software intended to be automatically started. Would you like "
+"to run it?"
 msgstr ""
-"The software will run directly from the medium \"%s\". You should never run "
-"software that you don't trust.\n"
-"\n"
-"If in doubt, press Cancel."
+"â%sâ contains software intended to be automatically started. Would you like "
+"to run it?"
+
+#: ../src/nautilus-autorun-software.c:206
+msgid "If you don't trust this location or aren't sure, press Cancel."
+msgstr "If you don't trust this location or aren't sure, press Cancel."
 
-#: ../src/nautilus-autorun-software.c:233 ../src/nautilus-mime-actions.c:718
+#: ../src/nautilus-autorun-software.c:240 ../src/nautilus-mime-actions.c:724
 msgid "_Run"
 msgstr "_Run"
 
-#: ../src/nautilus-bookmarks-window.c:158
-#: ../src/nautilus-file-management-properties.c:203
-#: ../src/nautilus-window-menus.c:458
-#, c-format
-msgid ""
-"There was an error displaying help: \n"
-"%s"
-msgstr ""
-"There was an error displaying help: \n"
-"%s"
-
-#: ../src/nautilus-bookmarks-window.c:192
+#: ../src/nautilus-bookmarks-window.c:170
 msgid "No bookmarks defined"
 msgstr "No bookmarks defined"
 
+#: ../src/nautilus-bookmarks-window.c:711 ../src/nautilus-places-sidebar.c:278
+msgid "Bookmarks"
+msgstr "Bookmarks"
+
 #: ../src/nautilus-bookmarks-window.ui.h:1
-msgid "Edit Bookmarks"
-msgstr "Edit Bookmarks"
+#: ../src/nautilus-places-sidebar.c:2650
+msgid "Remove"
+msgstr "Remove"
 
 #: ../src/nautilus-bookmarks-window.ui.h:2
-msgid "<b>_Bookmarks</b>"
-msgstr "<b>_Bookmarks</b>"
+msgid "Move Up"
+msgstr "Move Up"
 
 #: ../src/nautilus-bookmarks-window.ui.h:3
-msgid "<b>_Name</b>"
-msgstr "<b>_Name</b>"
+msgid "Move Down"
+msgstr "Move Down"
 
 #: ../src/nautilus-bookmarks-window.ui.h:4
-msgid "<b>_Location</b>"
-msgstr "<b>_Location</b>"
+msgid "_Name"
+msgstr "_Name"
+
+#: ../src/nautilus-bookmarks-window.ui.h:5
+msgid "_Location"
+msgstr "_Location"
+
+#: ../src/nautilus-canvas-view.c:130
+msgid "by _Name"
+msgstr "by _Name"
+
+#: ../src/nautilus-canvas-view.c:131 ../src/nautilus-canvas-view.c:1226
+msgid "Keep icons sorted by name in rows"
+msgstr "Keep icons sorted by name in rows"
+
+#: ../src/nautilus-canvas-view.c:137
+msgid "by _Size"
+msgstr "by _Size"
+
+#: ../src/nautilus-canvas-view.c:138 ../src/nautilus-canvas-view.c:1230
+msgid "Keep icons sorted by size in rows"
+msgstr "Keep icons sorted by size in rows"
+
+#: ../src/nautilus-canvas-view.c:144
+msgid "by _Type"
+msgstr "by _Type"
+
+#: ../src/nautilus-canvas-view.c:145 ../src/nautilus-canvas-view.c:1234
+msgid "Keep icons sorted by type in rows"
+msgstr "Keep icons sorted by type in rows"
 
-#: ../src/nautilus-connect-server-dialog.c:128
+#: ../src/nautilus-canvas-view.c:151
+msgid "by Modification _Date"
+msgstr "by Modification _Date"
+
+#: ../src/nautilus-canvas-view.c:152 ../src/nautilus-canvas-view.c:1238
+msgid "Keep icons sorted by modification date in rows"
+msgstr "Keep icons sorted by modification date in rows"
+
+#: ../src/nautilus-canvas-view.c:158
+msgid "by T_rash Time"
+msgstr "by _Wastebasket Time"
+
+#: ../src/nautilus-canvas-view.c:159 ../src/nautilus-canvas-view.c:1242
+msgid "Keep icons sorted by trash time in rows"
+msgstr "Keep icons sorted by wastebasket time in rows"
+
+#: ../src/nautilus-canvas-view.c:632
+msgid "_Organize Desktop by Name"
+msgstr "_Organise Desktop by Name"
+
+#. name, stock id, label
+#: ../src/nautilus-canvas-view.c:1191
+msgid "Arran_ge Items"
+msgstr "Arran_ge Items"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-canvas-view.c:1193
+msgid "Resize Icon..."
+msgstr "Resize Iconâ"
+
+#. tooltip
+#: ../src/nautilus-canvas-view.c:1194
+msgid "Make the selected icons resizable"
+msgstr "Make the selected icons resizable"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-canvas-view.c:1197 ../src/nautilus-canvas-view.c:1361
+msgid "Restore Icons' Original Si_zes"
+msgstr "Restore Icons' Original Si_zes"
+
+#. tooltip
+#: ../src/nautilus-canvas-view.c:1198
+msgid "Restore each selected icons to its original size"
+msgstr "Restore each selected icons to its original size"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-canvas-view.c:1201
+msgid "_Organize by Name"
+msgstr "_Organise by Name"
+
+#. tooltip
+#: ../src/nautilus-canvas-view.c:1202
+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/nautilus-canvas-view.c:1208
+msgid "Re_versed Order"
+msgstr "Re_versed Order"
+
+#. tooltip
+#: ../src/nautilus-canvas-view.c:1209
+msgid "Display icons in the opposite order"
+msgstr "Display icons in the opposite order"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-canvas-view.c:1213
+msgid "_Keep Aligned"
+msgstr "_Keep Aligned"
+
+#. tooltip
+#: ../src/nautilus-canvas-view.c:1214
+msgid "Keep icons lined up on a grid"
+msgstr "Keep icons lined up on a grid"
+
+#: ../src/nautilus-canvas-view.c:1221
+msgid "_Manually"
+msgstr "_Manually"
+
+#: ../src/nautilus-canvas-view.c:1222
+msgid "Leave icons wherever they are dropped"
+msgstr "Leave icons wherever they are dropped"
+
+#: ../src/nautilus-canvas-view.c:1225
+msgid "By _Name"
+msgstr "By _Name"
+
+#: ../src/nautilus-canvas-view.c:1229
+msgid "By _Size"
+msgstr "By _Size"
+
+#: ../src/nautilus-canvas-view.c:1233
+msgid "By _Type"
+msgstr "By _Type"
+
+#: ../src/nautilus-canvas-view.c:1237
+msgid "By Modification _Date"
+msgstr "By Modification _Date"
+
+#: ../src/nautilus-canvas-view.c:1241
+msgid "By T_rash Time"
+msgstr "By _Wastebasket Time"
+
+#: ../src/nautilus-canvas-view.c:1362
+msgid "Restore Icon's Original Si_ze"
+msgstr "Restore Icon's Original Si_ze"
+
+#. translators: this is used in the view selection dropdown
+#. * of navigation windows and in the preferences dialog
+#: ../src/nautilus-canvas-view.c:2411
+#: ../src/nautilus-canvas-view-container.c:571
+#: ../src/nautilus-file-management-properties.ui.h:33
+msgid "Icon View"
+msgstr "Icon View"
+
+#. translators: this is used in the view menu
+#: ../src/nautilus-canvas-view.c:2413
+msgid "_Icons"
+msgstr "_Icons"
+
+#: ../src/nautilus-canvas-view.c:2414
+msgid "The icon view encountered an error."
+msgstr "The icon view encountered an error."
+
+#: ../src/nautilus-canvas-view.c:2415
+msgid "The icon view encountered an error while starting up."
+msgstr "The icon view encountered an error while starting up."
+
+#: ../src/nautilus-canvas-view.c:2416
+msgid "Display this location with the icon view."
+msgstr "Display this location with the icon view."
+
+#: ../src/nautilus-connect-server-dialog.c:129
 msgid "SSH"
 msgstr "SSH"
 
-#: ../src/nautilus-connect-server-dialog.c:131
+#: ../src/nautilus-connect-server-dialog.c:132
 msgid "Public FTP"
 msgstr "Public FTP"
 
-#: ../src/nautilus-connect-server-dialog.c:133
+#: ../src/nautilus-connect-server-dialog.c:134
 msgid "FTP (with login)"
 msgstr "FTP (with login)"
 
-#: ../src/nautilus-connect-server-dialog.c:136
+#: ../src/nautilus-connect-server-dialog.c:137
 msgid "Windows share"
 msgstr "Windows share"
 
-#: ../src/nautilus-connect-server-dialog.c:138
+#: ../src/nautilus-connect-server-dialog.c:139
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../src/nautilus-connect-server-dialog.c:140
+#: ../src/nautilus-connect-server-dialog.c:141
 msgid "Secure WebDAV (HTTPS)"
 msgstr "Secure WebDAV (HTTPS)"
 
-#: ../src/nautilus-connect-server-dialog.c:187
+#: ../src/nautilus-connect-server-dialog.c:143
+msgid "Apple Filing Protocol (AFP)"
+msgstr "Apple Filing Protocol (AFP)"
+
+#: ../src/nautilus-connect-server-dialog.c:189
 msgid "Connecting..."
 msgstr "Connectingâ"
 
-#: ../src/nautilus-connect-server-dialog.c:211
+#: ../src/nautilus-connect-server-dialog.c:213
 msgid ""
 "Can't load the supported server method list.\n"
 "Please check your gvfs installation."
@@ -2863,97 +2798,97 @@ msgstr ""
 "Can't load the supported server method list.\n"
 "Please check your gvfs installation."
 
-#: ../src/nautilus-connect-server-dialog.c:289
+#: ../src/nautilus-connect-server-dialog.c:291
 #, c-format
-msgid "The folder \"%s\" cannot be opened on \"%s\"."
-msgstr "The folder \"%s\" cannot be opened on \"%s\"."
+msgid "The folder â%sâ cannot be opened on â%sâ."
+msgstr "The folder â%sâ cannot be opened on â%sâ."
 
-#: ../src/nautilus-connect-server-dialog.c:299
+#: ../src/nautilus-connect-server-dialog.c:301
 #, c-format
-msgid "The server at \"%s\" cannot be found."
-msgstr "The server at \"%s\" cannot be found."
+msgid "The server at â%sâ cannot be found."
+msgstr "The server at â%sâ cannot be found."
 
-#: ../src/nautilus-connect-server-dialog.c:334
+#: ../src/nautilus-connect-server-dialog.c:336
 msgid "Try Again"
 msgstr "Try Again"
 
-#: ../src/nautilus-connect-server-dialog.c:399
+#: ../src/nautilus-connect-server-dialog.c:401
 msgid "Please verify your user details."
 msgstr "Please verify your user details."
 
-#: ../src/nautilus-connect-server-dialog.c:429
+#: ../src/nautilus-connect-server-dialog.c:431
 msgid "Continue"
 msgstr "Continue"
 
-#: ../src/nautilus-connect-server-dialog.c:701
-#: ../src/nautilus-properties-window.c:5123 ../src/nautilus-view.c:1457
+#: ../src/nautilus-connect-server-dialog.c:703
+#: ../src/nautilus-properties-window.c:5015 ../src/nautilus-view.c:1448
 msgid "There was an error displaying help."
 msgstr "There was an error displaying help."
 
-#: ../src/nautilus-connect-server-dialog.c:719
-#: ../src/nautilus-connect-server-dialog.c:1109
+#: ../src/nautilus-connect-server-dialog.c:721
+#: ../src/nautilus-connect-server-dialog.c:1111
 msgid "C_onnect"
 msgstr "C_onnect"
 
 #. set dialog properties
-#: ../src/nautilus-connect-server-dialog.c:844
+#: ../src/nautilus-connect-server-dialog.c:846
 msgid "Connect to Server"
 msgstr "Connect to Server"
 
-#: ../src/nautilus-connect-server-dialog.c:862
+#: ../src/nautilus-connect-server-dialog.c:864
 msgid "Server Details"
 msgstr "Server Details"
 
 #. first row: server entry + port spinbutton
-#: ../src/nautilus-connect-server-dialog.c:886
+#: ../src/nautilus-connect-server-dialog.c:888
 msgid "_Server:"
 msgstr "_Server:"
 
 #. port
-#: ../src/nautilus-connect-server-dialog.c:906
+#: ../src/nautilus-connect-server-dialog.c:908
 msgid "_Port:"
 msgstr "_Port:"
 
 #. second row: type combobox
-#: ../src/nautilus-connect-server-dialog.c:924
+#: ../src/nautilus-connect-server-dialog.c:926
 msgid "_Type:"
 msgstr "_Type:"
 
 #. third row: share entry
-#: ../src/nautilus-connect-server-dialog.c:993
+#: ../src/nautilus-connect-server-dialog.c:995
 msgid "Sh_are:"
 msgstr "Sh_are:"
 
 #. fourth row: folder entry
-#: ../src/nautilus-connect-server-dialog.c:1008 ../src/nautilus-view.c:1651
+#: ../src/nautilus-connect-server-dialog.c:1010 ../src/nautilus-view.c:1642
 msgid "_Folder:"
 msgstr "_Folder:"
 
-#: ../src/nautilus-connect-server-dialog.c:1026
+#: ../src/nautilus-connect-server-dialog.c:1028
 msgid "User Details"
 msgstr "User Details"
 
 #. first row: domain entry
-#: ../src/nautilus-connect-server-dialog.c:1049
+#: ../src/nautilus-connect-server-dialog.c:1051
 msgid "_Domain name:"
 msgstr "_Domain name:"
 
 #. second row: username entry
-#: ../src/nautilus-connect-server-dialog.c:1064
+#: ../src/nautilus-connect-server-dialog.c:1066
 msgid "_User name:"
 msgstr "_User name:"
 
 #. third row: password entry
-#: ../src/nautilus-connect-server-dialog.c:1079
+#: ../src/nautilus-connect-server-dialog.c:1081
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
 #. fourth row: remember checkbox
-#: ../src/nautilus-connect-server-dialog.c:1095
+#: ../src/nautilus-connect-server-dialog.c:1097
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: ../src/nautilus-connect-server-dialog.c:1195
+#: ../src/nautilus-connect-server-dialog.c:1197
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
@@ -2975,39 +2910,39 @@ msgstr ""
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-desktop-icon-view.c:719 ../src/nautilus-view.c:6996
-#: ../src/nautilus-view.c:8533
+#: ../src/nautilus-desktop-canvas-view.c:701 ../src/nautilus-view.c:7192
+#: ../src/nautilus-view.c:8722
 msgid "E_mpty Trash"
 msgstr "E_mpty Wastebasket"
 
 #. label, accelerator
-#: ../src/nautilus-desktop-icon-view.c:731
+#: ../src/nautilus-desktop-canvas-view.c:713
 msgid "Change Desktop _Background"
 msgstr "Change Desktop _Background"
 
 #. tooltip
-#: ../src/nautilus-desktop-icon-view.c:733
+#: ../src/nautilus-desktop-canvas-view.c:715
 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/nautilus-desktop-icon-view.c:738
+#: ../src/nautilus-desktop-canvas-view.c:720
 msgid "Empty Trash"
 msgstr "Empty Wastebasket"
 
 #. tooltip
-#: ../src/nautilus-desktop-icon-view.c:740 ../src/nautilus-trash-bar.c:207
-#: ../src/nautilus-view.c:6997
+#: ../src/nautilus-desktop-canvas-view.c:722 ../src/nautilus-trash-bar.c:212
+#: ../src/nautilus-view.c:7193
 msgid "Delete all items in the Trash"
 msgstr "Delete all items in the Wastebasket"
 
-#: ../src/nautilus-desktop-icon-view.c:803
+#: ../src/nautilus-desktop-canvas-view.c:785
 msgid "The desktop view encountered an error."
 msgstr "The desktop view encountered an error."
 
-#: ../src/nautilus-desktop-icon-view.c:804
+#: ../src/nautilus-desktop-canvas-view.c:786
 msgid "The desktop view encountered an error while starting up."
 msgstr "The desktop view encountered an error while starting up."
 
@@ -3022,7 +2957,7 @@ msgstr "URL"
 
 #: ../src/nautilus-desktop-item-properties.c:411
 #: ../src/nautilus-desktop-item-properties.c:421
-#: ../src/nautilus-image-properties-page.c:343
+#: ../src/nautilus-image-properties-page.c:330
 msgid "Description"
 msgstr "Description"
 
@@ -3031,44 +2966,40 @@ msgid "Command"
 msgstr "Command"
 
 #. hardcode "Desktop"
-#: ../src/nautilus-desktop-window.c:92 ../src/nautilus-desktop-window.c:290
-#: ../src/nautilus-pathbar.c:1267 ../src/nautilus-places-sidebar.c:693
+#: ../src/nautilus-desktop-window.c:92 ../src/nautilus-desktop-window.c:270
+#: ../src/nautilus-places-sidebar.c:526
 msgid "Desktop"
 msgstr "Desktop"
 
 #: ../src/nautilus-error-reporting.c:68
 #, c-format
-msgid ""
-"You do not have the permissions necessary to view the contents of \"%s\"."
-msgstr ""
-"You do not have the permissions necessary to view the contents of \"%s\"."
+msgid "You do not have the permissions necessary to view the contents of â%sâ."
+msgstr "You do not have the permissions necessary to view the contents of â%sâ."
 
 #: ../src/nautilus-error-reporting.c:72
 #, c-format
-msgid "\"%s\" could not be found. Perhaps it has recently been deleted."
-msgstr "\"%s\" could not be found. Perhaps it has recently been deleted."
+msgid "â%sâ could not be found. Perhaps it has recently been deleted."
+msgstr "â%sâ could not be found. Perhaps it has recently been deleted."
 
 #: ../src/nautilus-error-reporting.c:76
 #, c-format
-msgid "Sorry, could not display all the contents of \"%s\": %s"
-msgstr "Sorry, could not display all the contents of \"%s\": %s"
+msgid "Sorry, could not display all the contents of â%sâ: %s"
+msgstr "Sorry, could not display all the contents of â%sâ: %s"
 
 #: ../src/nautilus-error-reporting.c:83
-msgid "The folder contents could not be displayed."
-msgstr "The folder contents could not be displayed."
+msgid "This location could not be displayed."
+msgstr "This location could not be displayed."
 
 #: ../src/nautilus-error-reporting.c:107
 #, c-format
-msgid ""
-"You do not have the permissions necessary to change the group of \"%s\"."
-msgstr ""
-"You do not have the permissions necessary to change the group of \"%s\"."
+msgid "You do not have the permissions necessary to change the group of â%sâ."
+msgstr "You do not have the permissions necessary to change the group of â%sâ."
 
 #. fall through
 #: ../src/nautilus-error-reporting.c:120
 #, c-format
-msgid "Sorry, could not change the group of \"%s\": %s"
-msgstr "Sorry, could not change the group of \"%s\": %s"
+msgid "Sorry, could not change the group of â%sâ: %s"
+msgstr "Sorry, could not change the group of â%sâ: %s"
 
 #: ../src/nautilus-error-reporting.c:125
 msgid "The group could not be changed."
@@ -3076,8 +3007,8 @@ msgstr "The group could not be changed."
 
 #: ../src/nautilus-error-reporting.c:145
 #, c-format
-msgid "Sorry, could not change the owner of \"%s\": %s"
-msgstr "Sorry, could not change the owner of \"%s\": %s"
+msgid "Sorry, could not change the owner of â%sâ: %s"
+msgstr "Sorry, could not change the owner of â%sâ: %s"
 
 #: ../src/nautilus-error-reporting.c:147
 msgid "The owner could not be changed."
@@ -3085,8 +3016,8 @@ msgstr "The owner could not be changed."
 
 #: ../src/nautilus-error-reporting.c:167
 #, c-format
-msgid "Sorry, could not change the permissions of \"%s\": %s"
-msgstr "Sorry, could not change the permissions of \"%s\": %s"
+msgid "Sorry, could not change the permissions of â%sâ: %s"
+msgstr "Sorry, could not change the permissions of â%sâ: %s"
 
 #: ../src/nautilus-error-reporting.c:169
 msgid "The permissions could not be changed."
@@ -3095,46 +3026,46 @@ msgstr "The permissions could not be changed."
 #: ../src/nautilus-error-reporting.c:204
 #, c-format
 msgid ""
-"The name \"%s\" is already used in this folder. Please use a different name."
+"The name â%sâ is already used in this location. Please use a different name."
 msgstr ""
-"The name \"%s\" is already used in this folder. Please use a different name."
+"The name â%sâ is already used in this location. Please use a different name."
 
 #: ../src/nautilus-error-reporting.c:209
 #, c-format
 msgid ""
-"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+"There is no â%sâ in this location. Perhaps it was just moved or deleted?"
 msgstr ""
-"There is no \"%s\" in this folder. Perhaps it was just moved or deleted?"
+"There is no â%sâ in this location. Perhaps it was just moved or deleted?"
 
 #: ../src/nautilus-error-reporting.c:214
 #, c-format
-msgid "You do not have the permissions necessary to rename \"%s\"."
-msgstr "You do not have the permissions necessary to rename \"%s\"."
+msgid "You do not have the permissions necessary to rename â%sâ."
+msgstr "You do not have the permissions necessary to rename â%sâ."
 
 #: ../src/nautilus-error-reporting.c:219
 #, c-format
 msgid ""
-"The name \"%s\" is not valid because it contains the character \"/\". Please "
-"use a different name."
+"The name â%sâ is not valid because it contains the character â/â. Please use "
+"a different name."
 msgstr ""
-"The name \"%s\" is not valid because it contains the character \"/\". Please "
-"use a different name."
+"The name â%sâ is not valid because it contains the character â/â. Please use "
+"a different name."
 
 #: ../src/nautilus-error-reporting.c:223
 #, c-format
-msgid "The name \"%s\" is not valid. Please use a different name."
-msgstr "The name \"%s\" is not valid. Please use a different name."
+msgid "The name â%sâ is not valid. Please use a different name."
+msgstr "The name â%sâ is not valid. Please use a different name."
 
 #: ../src/nautilus-error-reporting.c:229
 #, c-format
-msgid "The name \"%s\" is too long. Please use a different name."
-msgstr "The name \"%s\" is too long. Please use a different name."
+msgid "The name â%sâ is too long. Please use a different name."
+msgstr "The name â%sâ is too long. Please use a different name."
 
 #. fall through
 #: ../src/nautilus-error-reporting.c:243
 #, c-format
-msgid "Sorry, could not rename \"%s\" to \"%s\": %s"
-msgstr "Sorry, could not rename \"%s\" to \"%s\": %s"
+msgid "Sorry, could not rename â%sâ to â%sâ: %s"
+msgstr "Sorry, could not rename â%sâ to â%sâ: %s"
 
 #: ../src/nautilus-error-reporting.c:251
 msgid "The item could not be renamed."
@@ -3142,26 +3073,23 @@ msgstr "The item could not be renamed."
 
 #: ../src/nautilus-error-reporting.c:348
 #, c-format
-msgid "Renaming \"%s\" to \"%s\"."
-msgstr "Renaming \"%s\" to \"%s\"."
+msgid "Renaming â%sâ to â%sâ."
+msgstr "Renaming â%sâ to â%sâ."
 
 #. Translators: this is referred to captions under icons.
-#. Translators: this is referred to the permissions
-#. * the user has in a directory.
-#.
-#: ../src/nautilus-file-management-properties.c:287
-#: ../src/nautilus-properties-window.c:3919
-#: ../src/nautilus-properties-window.c:3930
+#: ../src/nautilus-file-management-properties.c:280
+#: ../src/nautilus-properties-window.c:3871
+#: ../src/nautilus-properties-window.c:3898
 msgid "None"
 msgstr "None"
 
 #: ../src/nautilus-file-management-properties.ui.h:1
-msgid "File Management Preferences"
-msgstr "File Management Preferences"
+msgid "Files Preferences"
+msgstr "Files Preferences"
 
 #: ../src/nautilus-file-management-properties.ui.h:2
-msgid "<b>Default View</b>"
-msgstr "<b>Default View</b>"
+msgid "Default View"
+msgstr "Default View"
 
 #: ../src/nautilus-file-management-properties.ui.h:3
 msgid "View _new folders using:"
@@ -3180,102 +3108,71 @@ msgid "Show hidden and _backup files"
 msgstr "Show hidden and _backup files"
 
 #: ../src/nautilus-file-management-properties.ui.h:7
-msgid "<b>Icon View Defaults</b>"
-msgstr "<b>Icon View Defaults</b>"
+msgid "Icon View Defaults"
+msgstr "Icon View Defaults"
 
 #: ../src/nautilus-file-management-properties.ui.h:8
 msgid "Default _zoom level:"
 msgstr "Default _zoom level:"
 
 #: ../src/nautilus-file-management-properties.ui.h:9
-msgid "_Text beside icons"
-msgstr "_Text beside icons"
+msgid "List View Defaults"
+msgstr "List View Defaults"
 
 #: ../src/nautilus-file-management-properties.ui.h:10
-msgid "<b>Compact View Defaults</b>"
-msgstr "<b>Compact View Defaults</b>"
+msgid "D_efault zoom level:"
+msgstr "D_efault zoom level:"
 
 #: ../src/nautilus-file-management-properties.ui.h:11
-msgid "_Default zoom level:"
-msgstr "_Default zoom level:"
+msgid "Views"
+msgstr "Views"
 
 #: ../src/nautilus-file-management-properties.ui.h:12
-msgid "A_ll columns have the same width"
-msgstr "A_ll columns have the same width"
+msgid "Behavior"
+msgstr "Behaviour"
 
 #: ../src/nautilus-file-management-properties.ui.h:13
-msgid "<b>List View Defaults</b>"
-msgstr "<b>List View Defaults</b>"
+msgid "_Single click to open items"
+msgstr "_Single click to open items"
 
 #: ../src/nautilus-file-management-properties.ui.h:14
-msgid "D_efault zoom level:"
-msgstr "D_efault zoom level:"
+msgid "_Double click to open items"
+msgstr "_Double click to open items"
 
 #: ../src/nautilus-file-management-properties.ui.h:15
-msgid "<b>Tree View Defaults</b>"
-msgstr "<b>Tree View Defaults</b>"
+msgid "Executable Text Files"
+msgstr "Executable Text Files"
 
 #: ../src/nautilus-file-management-properties.ui.h:16
-msgid "Show _only folders"
-msgstr "Show _only folders"
+msgid "_Run executable text files when they are opened"
+msgstr "_Run executable text files when they are opened"
 
 #: ../src/nautilus-file-management-properties.ui.h:17
-msgid "Views"
-msgstr "Views"
+msgid "_View executable text files when they are opened"
+msgstr "_View executable text files when they are opened"
 
 #: ../src/nautilus-file-management-properties.ui.h:18
-msgid "<b>Behavior</b>"
-msgstr "<b>Behaviour</b>"
-
-#: ../src/nautilus-file-management-properties.ui.h:19
-msgid "_Single click to open items"
-msgstr "_Single click to open items"
-
-#: ../src/nautilus-file-management-properties.ui.h:20
-msgid "_Double click to open items"
-msgstr "_Double click to open items"
-
-#: ../src/nautilus-file-management-properties.ui.h:21
-msgid "Open each _folder in its own window"
-msgstr "Open each _folder in its own window"
-
-#: ../src/nautilus-file-management-properties.ui.h:22
-msgid "<b>Executable Text Files</b>"
-msgstr "<b>Executable Text Files</b>"
-
-#: ../src/nautilus-file-management-properties.ui.h:23
-msgid "_Run executable text files when they are opened"
-msgstr "_Run executable text files when they are opened"
-
-#: ../src/nautilus-file-management-properties.ui.h:24
-msgid "_View executable text files when they are opened"
-msgstr "_View executable text files when they are opened"
-
-#: ../src/nautilus-file-management-properties.ui.h:25
 msgid "_Ask each time"
 msgstr "_Ask each time"
 
-#: ../src/nautilus-file-management-properties.ui.h:26
-msgid "<b>Trash</b>"
-msgstr "<b>Wastebasket</b>"
+#: ../src/nautilus-file-management-properties.ui.h:19
+#: ../src/nautilus-places-sidebar.c:574 ../src/nautilus-trash-bar.c:194
+msgid "Trash"
+msgstr "Wastebasket"
 
-#: ../src/nautilus-file-management-properties.ui.h:27
+#: ../src/nautilus-file-management-properties.ui.h:20
 msgid "Ask before _emptying the Trash or deleting files"
 msgstr "Ask before _emptying the Wastebasket or deleting files"
 
-#: ../src/nautilus-file-management-properties.ui.h:28
+#: ../src/nautilus-file-management-properties.ui.h:21
 msgid "I_nclude a Delete command that bypasses Trash"
 msgstr "I_nclude a Delete command that bypasses the Wastebasket"
 
-#: ../src/nautilus-file-management-properties.ui.h:29
-msgid "Behavior"
-msgstr "Behaviour"
-
-#: ../src/nautilus-file-management-properties.ui.h:30
-msgid "<b>Icon Captions</b>"
-msgstr "<b>Icon Captions</b>"
+#: ../src/nautilus-file-management-properties.ui.h:22
+msgid "Icon Captions"
+msgstr "Icon Captions"
 
-#: ../src/nautilus-file-management-properties.ui.h:31
+#: ../src/nautilus-file-management-properties.ui.h:23
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
@@ -3283,618 +3180,407 @@ msgstr ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
 
-#: ../src/nautilus-file-management-properties.ui.h:32
-msgid "<b>Date</b>"
-msgstr "<b>Date</b>"
-
-#: ../src/nautilus-file-management-properties.ui.h:33
-msgid "_Format:"
-msgstr "_Format:"
-
-#: ../src/nautilus-file-management-properties.ui.h:34
+#: ../src/nautilus-file-management-properties.ui.h:24
 msgid "Display"
 msgstr "Display"
 
-#: ../src/nautilus-file-management-properties.ui.h:35
-msgid "<b>List Columns</b>"
-msgstr "<b>List Columns</b>"
-
-#: ../src/nautilus-file-management-properties.ui.h:36
+#: ../src/nautilus-file-management-properties.ui.h:25
 msgid "Choose the order of information to appear in the list view."
 msgstr "Choose the order of information to appear in the list view."
 
-#: ../src/nautilus-file-management-properties.ui.h:37
+#: ../src/nautilus-file-management-properties.ui.h:26
 msgid "List Columns"
 msgstr "List Columns"
 
-#: ../src/nautilus-file-management-properties.ui.h:38
-msgid "<b>Text Files</b>"
-msgstr "<b>Text Files</b>"
-
-#: ../src/nautilus-file-management-properties.ui.h:39
-msgid "Show te_xt in icons:"
-msgstr "Show te_xt in icons:"
-
-#: ../src/nautilus-file-management-properties.ui.h:40
-msgid "<b>Other Previewable Files</b>"
-msgstr "<b>Other Previewable Files</b>"
-
-#: ../src/nautilus-file-management-properties.ui.h:41
+#: ../src/nautilus-file-management-properties.ui.h:28
 msgid "Show _thumbnails:"
 msgstr "Show _thumbnails:"
 
-#: ../src/nautilus-file-management-properties.ui.h:42
+#: ../src/nautilus-file-management-properties.ui.h:29
 msgid "_Only for files smaller than:"
 msgstr "_Only for files smaller than:"
 
-#: ../src/nautilus-file-management-properties.ui.h:43
-msgid "<b>Folders</b>"
-msgstr "<b>Folders</b>"
+#: ../src/nautilus-file-management-properties.ui.h:30
+#: ../src/nautilus-properties-window.c:4299
+msgid "Folders"
+msgstr "Folders"
 
-#: ../src/nautilus-file-management-properties.ui.h:44
+#: ../src/nautilus-file-management-properties.ui.h:31
 msgid "Count _number of items:"
 msgstr "Count _number of items:"
 
-#: ../src/nautilus-file-management-properties.ui.h:45
+#: ../src/nautilus-file-management-properties.ui.h:32
 msgid "Preview"
 msgstr "Preview"
 
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
-#: ../src/nautilus-file-management-properties.ui.h:46
-#: ../src/nautilus-icon-view.c:2664 ../src/nautilus-icon-view-container.c:582
-msgid "Icon View"
-msgstr "Icon View"
-
-#. translators: this is used in the view selection dropdown
-#. * of navigation windows and in the preferences dialog
-#: ../src/nautilus-file-management-properties.ui.h:47
-#: ../src/nautilus-list-view.c:1716 ../src/nautilus-list-view.c:3342
+#: ../src/nautilus-file-management-properties.ui.h:34
+#: ../src/nautilus-list-view.c:1569 ../src/nautilus-list-view.c:3094
 msgid "List View"
 msgstr "List View"
 
-#. translators: this is used in the view selection dropdown
-#. * of navigation windows and in the preferences dialog
-#: ../src/nautilus-file-management-properties.ui.h:48
-#: ../src/nautilus-icon-view.c:2678
-msgid "Compact View"
-msgstr "Compact View"
-
-#: ../src/nautilus-file-management-properties.ui.h:49
+#: ../src/nautilus-file-management-properties.ui.h:35
 msgid "Always"
 msgstr "Always"
 
-#: ../src/nautilus-file-management-properties.ui.h:50
+#: ../src/nautilus-file-management-properties.ui.h:36
 msgid "Local Files Only"
 msgstr "Local Files Only"
 
-#: ../src/nautilus-file-management-properties.ui.h:51
+#: ../src/nautilus-file-management-properties.ui.h:37
 msgid "Never"
 msgstr "Never"
 
-#: ../src/nautilus-file-management-properties.ui.h:52
+#: ../src/nautilus-file-management-properties.ui.h:38
 msgid "By Name"
 msgstr "By Name"
 
-#: ../src/nautilus-file-management-properties.ui.h:53
+#: ../src/nautilus-file-management-properties.ui.h:39
 msgid "By Size"
 msgstr "By Size"
 
-#: ../src/nautilus-file-management-properties.ui.h:54
+#: ../src/nautilus-file-management-properties.ui.h:40
 msgid "By Type"
 msgstr "By Type"
 
-#: ../src/nautilus-file-management-properties.ui.h:55
+#: ../src/nautilus-file-management-properties.ui.h:41
 msgid "By Modification Date"
 msgstr "By Modification Date"
 
-#: ../src/nautilus-file-management-properties.ui.h:56
+#: ../src/nautilus-file-management-properties.ui.h:42
 msgid "By Access Date"
 msgstr "By Access Date"
 
-#: ../src/nautilus-file-management-properties.ui.h:57
+#: ../src/nautilus-file-management-properties.ui.h:43
 msgid "By Trashed Date"
 msgstr "By Wastebasket Date"
 
-#: ../src/nautilus-file-management-properties.ui.h:59
+#: ../src/nautilus-file-management-properties.ui.h:45
 #, no-c-format
 msgid "33%"
 msgstr "33%"
 
-#: ../src/nautilus-file-management-properties.ui.h:61
+#: ../src/nautilus-file-management-properties.ui.h:47
 #, no-c-format
 msgid "50%"
 msgstr "50%"
 
-#: ../src/nautilus-file-management-properties.ui.h:63
+#: ../src/nautilus-file-management-properties.ui.h:49
 #, no-c-format
 msgid "66%"
 msgstr "66%"
 
-#: ../src/nautilus-file-management-properties.ui.h:65
+#: ../src/nautilus-file-management-properties.ui.h:51
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
-#: ../src/nautilus-file-management-properties.ui.h:67
+#: ../src/nautilus-file-management-properties.ui.h:53
 #, no-c-format
 msgid "150%"
 msgstr "150%"
 
-#: ../src/nautilus-file-management-properties.ui.h:69
+#: ../src/nautilus-file-management-properties.ui.h:55
 #, no-c-format
 msgid "200%"
 msgstr "200%"
 
-#: ../src/nautilus-file-management-properties.ui.h:71
+#: ../src/nautilus-file-management-properties.ui.h:57
 #, no-c-format
 msgid "400%"
 msgstr "400%"
 
-#: ../src/nautilus-file-management-properties.ui.h:72
+#: ../src/nautilus-file-management-properties.ui.h:58
 msgid "100 KB"
 msgstr "100 KB"
 
-#: ../src/nautilus-file-management-properties.ui.h:73
+#: ../src/nautilus-file-management-properties.ui.h:59
 msgid "500 KB"
 msgstr "500 KB"
 
-#: ../src/nautilus-file-management-properties.ui.h:74
+#: ../src/nautilus-file-management-properties.ui.h:60
 msgid "1 MB"
 msgstr "1 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:75
+#: ../src/nautilus-file-management-properties.ui.h:61
 msgid "3 MB"
 msgstr "3 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:76
+#: ../src/nautilus-file-management-properties.ui.h:62
 msgid "5 MB"
 msgstr "5 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:77
+#: ../src/nautilus-file-management-properties.ui.h:63
 msgid "10 MB"
 msgstr "10 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:78
+#: ../src/nautilus-file-management-properties.ui.h:64
 msgid "100 MB"
 msgstr "100 MB"
 
-#: ../src/nautilus-file-management-properties.ui.h:79
+#: ../src/nautilus-file-management-properties.ui.h:65
 msgid "1 GB"
 msgstr "1 GB"
 
-#: ../src/nautilus-file-management-properties.ui.h:80
+#: ../src/nautilus-file-management-properties.ui.h:66
 msgid "2 GB"
 msgstr "2 GB"
 
-#: ../src/nautilus-file-management-properties.ui.h:81
+#: ../src/nautilus-file-management-properties.ui.h:67
 msgid "4 GB"
 msgstr "4 GB"
 
-#: ../src/nautilus-icon-view.c:133
-msgid "by _Name"
-msgstr "by _Name"
-
-#: ../src/nautilus-icon-view.c:134 ../src/nautilus-icon-view.c:1332
-msgid "Keep icons sorted by name in rows"
-msgstr "Keep icons sorted by name in rows"
-
-#: ../src/nautilus-icon-view.c:140
-msgid "by _Size"
-msgstr "by _Size"
-
-#: ../src/nautilus-icon-view.c:141 ../src/nautilus-icon-view.c:1336
-msgid "Keep icons sorted by size in rows"
-msgstr "Keep icons sorted by size in rows"
-
-#: ../src/nautilus-icon-view.c:147
-msgid "by _Type"
-msgstr "by _Type"
-
-#: ../src/nautilus-icon-view.c:148 ../src/nautilus-icon-view.c:1340
-msgid "Keep icons sorted by type in rows"
-msgstr "Keep icons sorted by type in rows"
-
-#: ../src/nautilus-icon-view.c:154
-msgid "by Modification _Date"
-msgstr "by Modification _Date"
-
-#: ../src/nautilus-icon-view.c:155 ../src/nautilus-icon-view.c:1344
-msgid "Keep icons sorted by modification date in rows"
-msgstr "Keep icons sorted by modification date in rows"
-
-#: ../src/nautilus-icon-view.c:161
-msgid "by T_rash Time"
-msgstr "by _Wastebasket Time"
-
-#: ../src/nautilus-icon-view.c:162 ../src/nautilus-icon-view.c:1348
-msgid "Keep icons sorted by trash time in rows"
-msgstr "Keep icons sorted by wastebasket time in rows"
-
-#: ../src/nautilus-icon-view.c:641
-msgid "_Organize Desktop by Name"
-msgstr "_Organise Desktop by Name"
-
-#. name, stock id, label
-#: ../src/nautilus-icon-view.c:1297
-msgid "Arran_ge Items"
-msgstr "Arran_ge Items"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-icon-view.c:1299
-msgid "Resize Icon..."
-msgstr "Resize Iconâ"
-
-#. tooltip
-#: ../src/nautilus-icon-view.c:1300
-msgid "Make the selected icon resizable"
-msgstr "Make the selected icon resizable"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-icon-view.c:1303 ../src/nautilus-icon-view.c:1467
-msgid "Restore Icons' Original Si_zes"
-msgstr "Restore Icons' Original Si_zes"
-
-#. tooltip
-#: ../src/nautilus-icon-view.c:1304
-msgid "Restore each selected icon to its original size"
-msgstr "Restore each selected icon to its original size"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-icon-view.c:1307
-msgid "_Organize by Name"
-msgstr "_Organise by Name"
-
-#. tooltip
-#: ../src/nautilus-icon-view.c:1308
-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/nautilus-icon-view.c:1314
-msgid "Re_versed Order"
-msgstr "Re_versed Order"
-
-#. tooltip
-#: ../src/nautilus-icon-view.c:1315
-msgid "Display icons in the opposite order"
-msgstr "Display icons in the opposite order"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-icon-view.c:1319
-msgid "_Keep Aligned"
-msgstr "_Keep Aligned"
-
-#. tooltip
-#: ../src/nautilus-icon-view.c:1320
-msgid "Keep icons lined up on a grid"
-msgstr "Keep icons lined up on a grid"
-
-#: ../src/nautilus-icon-view.c:1327
-msgid "_Manually"
-msgstr "_Manually"
-
-#: ../src/nautilus-icon-view.c:1328
-msgid "Leave icons wherever they are dropped"
-msgstr "Leave icons wherever they are dropped"
-
-#: ../src/nautilus-icon-view.c:1331
-msgid "By _Name"
-msgstr "By _Name"
-
-#: ../src/nautilus-icon-view.c:1335
-msgid "By _Size"
-msgstr "By _Size"
-
-#: ../src/nautilus-icon-view.c:1339
-msgid "By _Type"
-msgstr "By _Type"
-
-#: ../src/nautilus-icon-view.c:1343
-msgid "By Modification _Date"
-msgstr "By Modification _Date"
-
-#: ../src/nautilus-icon-view.c:1347
-msgid "By T_rash Time"
-msgstr "By _Wastebasket Time"
-
-#: ../src/nautilus-icon-view.c:1468
-msgid "Restore Icon's Original Si_ze"
-msgstr "Restore Icon's Original Si_ze"
-
-#. translators: this is used in the view menu
-#: ../src/nautilus-icon-view.c:2666
-msgid "_Icons"
-msgstr "_Icons"
-
-#: ../src/nautilus-icon-view.c:2667
-msgid "The icon view encountered an error."
-msgstr "The icon view encountered an error."
-
-#: ../src/nautilus-icon-view.c:2668
-msgid "The icon view encountered an error while starting up."
-msgstr "The icon view encountered an error while starting up."
-
-#: ../src/nautilus-icon-view.c:2669
-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/nautilus-icon-view.c:2680
-msgid "_Compact"
-msgstr "_Compact"
-
-#: ../src/nautilus-icon-view.c:2681
-msgid "The compact view encountered an error."
-msgstr "The compact view encountered an error."
-
-#: ../src/nautilus-icon-view.c:2682
-msgid "The compact view encountered an error while starting up."
-msgstr "The compact view encountered an error while starting up."
-
-#: ../src/nautilus-icon-view.c:2683
-msgid "Display this location with the compact view."
-msgstr "Display this location with the compact view."
-
-#: ../src/nautilus-image-properties-page.c:262
+#: ../src/nautilus-image-properties-page.c:255
 msgid "Camera Brand"
 msgstr "Camera Brand"
 
-#: ../src/nautilus-image-properties-page.c:263
+#: ../src/nautilus-image-properties-page.c:256
 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:259
 msgid "Date Taken"
 msgstr "Date Taken"
 
-#: ../src/nautilus-image-properties-page.c:268
+#: ../src/nautilus-image-properties-page.c:261
 msgid "Date Digitized"
 msgstr "Date Digitised"
 
-#: ../src/nautilus-image-properties-page.c:274
+#: ../src/nautilus-image-properties-page.c:263
+msgid "Date Modified"
+msgstr "Date Modified"
+
+#: ../src/nautilus-image-properties-page.c:267
 msgid "Exposure Time"
 msgstr "Exposure Time"
 
-#: ../src/nautilus-image-properties-page.c:275
+#: ../src/nautilus-image-properties-page.c:268
 msgid "Aperture Value"
 msgstr "Aperture Value"
 
-#: ../src/nautilus-image-properties-page.c:276
+#: ../src/nautilus-image-properties-page.c:269
 msgid "ISO Speed Rating"
 msgstr "ISO Speed Rating"
 
-#: ../src/nautilus-image-properties-page.c:277
+#: ../src/nautilus-image-properties-page.c:270
 msgid "Flash Fired"
 msgstr "Flash Fired"
 
-#: ../src/nautilus-image-properties-page.c:278
+#: ../src/nautilus-image-properties-page.c:271
 msgid "Metering Mode"
 msgstr "Metering Mode"
 
-#: ../src/nautilus-image-properties-page.c:279
+#: ../src/nautilus-image-properties-page.c:272
 msgid "Exposure Program"
 msgstr "Exposure Programme"
 
-#: ../src/nautilus-image-properties-page.c:280
+#: ../src/nautilus-image-properties-page.c:273
 msgid "Focal Length"
 msgstr "Focal Length"
 
-#: ../src/nautilus-image-properties-page.c:281
+#: ../src/nautilus-image-properties-page.c:274
 msgid "Software"
 msgstr "Software"
 
-#: ../src/nautilus-image-properties-page.c:344
+#: ../src/nautilus-image-properties-page.c:331
 msgid "Keywords"
 msgstr "Keywords"
 
-#: ../src/nautilus-image-properties-page.c:345
+#: ../src/nautilus-image-properties-page.c:332
 msgid "Creator"
 msgstr "Creator"
 
-#: ../src/nautilus-image-properties-page.c:346
+#: ../src/nautilus-image-properties-page.c:333
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../src/nautilus-image-properties-page.c:347
+#: ../src/nautilus-image-properties-page.c:334
 msgid "Rating"
 msgstr "Rating"
 
-#: ../src/nautilus-image-properties-page.c:377
-msgid "Image Type:"
-msgstr "Image Type:"
+#: ../src/nautilus-image-properties-page.c:367
+msgid "Image Type"
+msgstr "Image Type"
 
-#: ../src/nautilus-image-properties-page.c:380
+#: ../src/nautilus-image-properties-page.c:369
+#: ../src/nautilus-image-properties-page.c:375
 #, 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"
+msgid "%d pixel"
+msgid_plural "%d pixels"
+msgstr[0] "%d pixel"
+msgstr[1] "%d pixels"
 
-#: ../src/nautilus-image-properties-page.c:386
-#, 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:373
+msgid "Width"
+msgstr "Width"
 
-#: ../src/nautilus-image-properties-page.c:403
+#: ../src/nautilus-image-properties-page.c:379
+msgid "Height"
+msgstr "Height"
+
+#: ../src/nautilus-image-properties-page.c:390
 msgid "Failed to load image information"
 msgstr "Failed to load image information"
 
-#: ../src/nautilus-image-properties-page.c:617
-msgid "loading..."
-msgstr "loadingâ"
+#: ../src/nautilus-image-properties-page.c:655
+#: ../src/nautilus-list-model.c:378 ../src/nautilus-window-manage-views.c:1195
+#: ../src/nautilus-window-slot.c:368
+msgid "Loading..."
+msgstr "Loadingâ"
 
-#: ../src/nautilus-image-properties-page.c:669
+#: ../src/nautilus-image-properties-page.c:716
 msgid "Image"
 msgstr "Image"
 
-#: ../src/nautilus-list-model.c:393 ../src/nautilus-tree-sidebar-model.c:1252
+#: ../src/nautilus-list-model.c:376
 msgid "(Empty)"
 msgstr "(Empty)"
 
-#: ../src/nautilus-list-model.c:395 ../src/nautilus-tree-sidebar-model.c:1252
-#: ../src/nautilus-window-manage-views.c:1137
-#: ../src/nautilus-window-slot.c:201
-msgid "Loading..."
-msgstr "Loadingâ"
-
-#: ../src/nautilus-list-view.c:2533
+#: ../src/nautilus-list-view.c:2348
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s Visible Columns"
 
-#: ../src/nautilus-list-view.c:2553
+#: ../src/nautilus-list-view.c:2368
 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/nautilus-list-view.c:2607
+#: ../src/nautilus-list-view.c:2423
 msgid "Visible _Columns..."
 msgstr "Visible _Columnsâ"
 
 #. tooltip
-#: ../src/nautilus-list-view.c:2608
+#: ../src/nautilus-list-view.c:2424
 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/nautilus-list-view.c:3344
+#: ../src/nautilus-list-view.c:3096
 msgid "_List"
 msgstr "_List"
 
-#: ../src/nautilus-list-view.c:3345
+#: ../src/nautilus-list-view.c:3097
 msgid "The list view encountered an error."
 msgstr "The list view encountered an error."
 
-#: ../src/nautilus-list-view.c:3346
+#: ../src/nautilus-list-view.c:3098
 msgid "The list view encountered an error while starting up."
 msgstr "The list view encountered an error while starting up."
 
-#: ../src/nautilus-list-view.c:3347
+#: ../src/nautilus-list-view.c:3099
 msgid "Display this location with the list view."
 msgstr "Display this location with the list view."
 
-#: ../src/nautilus-location-bar.c:54 ../src/nautilus-properties-window.c:3106
+#: ../src/nautilus-location-bar.c:53 ../src/nautilus-properties-window.c:3108
 msgid "Location:"
 msgstr "Location:"
 
-#: ../src/nautilus-location-bar.c:55
+#: ../src/nautilus-location-bar.c:54
 msgid "Go To:"
 msgstr "Go To:"
 
-#: ../src/nautilus-location-bar.c:180
+#: ../src/nautilus-location-bar.c:168
 #, c-format
 msgid "Do you want to view %d location?"
 msgid_plural "Do you want to view %d locations?"
 msgstr[0] "Do you want to view %d location?"
 msgstr[1] "Do you want to view %d locations?"
 
-#: ../src/nautilus-location-bar.c:184 ../src/nautilus-mime-actions.c:1047
+#: ../src/nautilus-location-bar.c:172 ../src/nautilus-mime-actions.c:1052
 #, 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/nautilus-mime-actions.c:626
+#: ../src/nautilus-mime-actions.c:632
 #, c-format
-msgid "The Link \"%s\" is Broken."
-msgstr "The Link \"%s\" is Broken."
+msgid "The link â%sâ is broken. Move it to Trash?"
+msgstr "The link â%sâ is broken. Move it to Wastebasket?"
 
-#: ../src/nautilus-mime-actions.c:628
+#: ../src/nautilus-mime-actions.c:634
 #, c-format
-msgid "The Link \"%s\" is Broken. Move it to Trash?"
-msgstr "The Link \"%s\" is Broken. Move it to Wastebasket?"
+msgid "The link â%sâ is broken."
+msgstr "The link â%sâ is broken."
 
-#: ../src/nautilus-mime-actions.c:634
-msgid "This link cannot be used, because it has no target."
-msgstr "This link cannot be used, because it has no target."
+#: ../src/nautilus-mime-actions.c:640
+msgid "This link cannot be used because it has no target."
+msgstr "This link cannot be used because it has no target."
 
-#: ../src/nautilus-mime-actions.c:636
+#: ../src/nautilus-mime-actions.c:642
 #, 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."
+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
-#: ../src/nautilus-mime-actions.c:646 ../src/nautilus-tree-sidebar.c:1247
-#: ../src/nautilus-view.c:7048 ../src/nautilus-view.c:7166
-#: ../src/nautilus-view.c:8187 ../src/nautilus-view.c:8465
+#: ../src/nautilus-mime-actions.c:652 ../src/nautilus-view.c:7250
+#: ../src/nautilus-view.c:7364 ../src/nautilus-view.c:8351
+#: ../src/nautilus-view.c:8650
 msgid "Mo_ve to Trash"
 msgstr "Mo_ve to Wastebasket"
 
-#: ../src/nautilus-mime-actions.c:706
+#: ../src/nautilus-mime-actions.c:712
 #, c-format
-msgid "Do you want to run \"%s\", or display its contents?"
-msgstr "Do you want to run \"%s\", or display its contents?"
+msgid "Do you want to run â%sâ, or display its contents?"
+msgstr "Do you want to run â%sâ, or display its contents?"
 
-#: ../src/nautilus-mime-actions.c:708
+#: ../src/nautilus-mime-actions.c:714
 #, c-format
-msgid "\"%s\" is an executable text file."
-msgstr "\"%s\" is an executable text file."
+msgid "â%sâ is an executable text file."
+msgstr "â%sâ is an executable text file."
 
-#: ../src/nautilus-mime-actions.c:714
+#: ../src/nautilus-mime-actions.c:720
 msgid "Run in _Terminal"
 msgstr "Run in _Terminal"
 
-#: ../src/nautilus-mime-actions.c:715
+#: ../src/nautilus-mime-actions.c:721
 msgid "_Display"
 msgstr "_Display"
 
-#: ../src/nautilus-mime-actions.c:1042 ../src/nautilus-mime-actions.c:1785
-#: ../src/nautilus-view.c:957
+#: ../src/nautilus-mime-actions.c:1047 ../src/nautilus-mime-actions.c:1782
+#: ../src/nautilus-view.c:965
 msgid "Are you sure you want to open all files?"
 msgstr "Are you sure you want to open all files?"
 
-#: ../src/nautilus-mime-actions.c:1044
+#: ../src/nautilus-mime-actions.c:1049
 #, 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/nautilus-mime-actions.c:1117
-#: ../src/nautilus-window-manage-views.c:1603
-#: ../src/nautilus-window-manage-views.c:1609
-#: ../src/nautilus-window-manage-views.c:1626
-#: ../src/nautilus-window-manage-views.c:1637
-#: ../src/nautilus-window-manage-views.c:1643
-#: ../src/nautilus-window-manage-views.c:1669
+#: ../src/nautilus-mime-actions.c:1114
 #, c-format
-msgid "Could not display \"%s\"."
-msgstr "Could not display \"%s\"."
+msgid "Could not display â%sâ."
+msgstr "Could not display â%sâ."
 
-#: ../src/nautilus-mime-actions.c:1214
+#: ../src/nautilus-mime-actions.c:1212
 msgid "The file is of an unknown type"
 msgstr "The file is of an unknown type"
 
-#: ../src/nautilus-mime-actions.c:1218
+#: ../src/nautilus-mime-actions.c:1216
 #, c-format
 msgid "There is no application installed for %s files"
 msgstr "There is no application installed for %s files"
 
-#: ../src/nautilus-mime-actions.c:1233
+#: ../src/nautilus-mime-actions.c:1231
 msgid "_Select Application"
 msgstr "_Select Application"
 
-#: ../src/nautilus-mime-actions.c:1269
+#: ../src/nautilus-mime-actions.c:1267
 msgid "There was an internal error trying to search for applications:"
 msgstr "There was an internal error trying to search for applications:"
 
-#: ../src/nautilus-mime-actions.c:1271
+#: ../src/nautilus-mime-actions.c:1269
 msgid "Unable to search for application"
 msgstr "Unable to search for application"
 
-#: ../src/nautilus-mime-actions.c:1390
+#: ../src/nautilus-mime-actions.c:1388
 #, c-format
 msgid ""
 "There is no application installed for %s files.\n"
@@ -3903,267 +3589,253 @@ msgstr ""
 "There is no application installed for %s files.\n"
 "Do you want to search for an application to open this file?"
 
-#: ../src/nautilus-mime-actions.c:1540
+#: ../src/nautilus-mime-actions.c:1538
 msgid "Untrusted application launcher"
 msgstr "Untrusted application launcher"
 
-#: ../src/nautilus-mime-actions.c:1543
+#: ../src/nautilus-mime-actions.c:1541
 #, c-format
 msgid ""
-"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."
+"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."
 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."
+"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."
 
-#: ../src/nautilus-mime-actions.c:1558
+#: ../src/nautilus-mime-actions.c:1556
 msgid "_Launch Anyway"
 msgstr "_Launch Anyway"
 
-#: ../src/nautilus-mime-actions.c:1561
+#: ../src/nautilus-mime-actions.c:1559
 msgid "Mark as _Trusted"
 msgstr "Mark as _Trusted"
 
-#: ../src/nautilus-mime-actions.c:1786
+#: ../src/nautilus-mime-actions.c:1783
 #, c-format
 msgid "This will open %d separate application."
 msgid_plural "This will open %d separate applications."
 msgstr[0] "This will open %d separate application."
 msgstr[1] "This will open %d separate applications."
 
-#: ../src/nautilus-mime-actions.c:1863 ../src/nautilus-mime-actions.c:2137
-#: ../src/nautilus-view.c:6168
-msgid "Unable to mount location"
-msgstr "Unable to mount location"
+#: ../src/nautilus-mime-actions.c:1860 ../src/nautilus-mime-actions.c:2133
+msgid "Unable to access location"
+msgstr "Unable to access location"
 
-#: ../src/nautilus-mime-actions.c:2216 ../src/nautilus-view.c:6315
+#: ../src/nautilus-mime-actions.c:2212
 msgid "Unable to start location"
 msgstr "Unable to start location"
 
-#: ../src/nautilus-mime-actions.c:2300
+#: ../src/nautilus-mime-actions.c:2296
 #, c-format
-msgid "Opening \"%s\"."
-msgstr "Opening \"%s\"."
+msgid "Opening â%sâ."
+msgstr "Opening â%sâ."
 
-#: ../src/nautilus-mime-actions.c:2303
+#: ../src/nautilus-mime-actions.c:2299
 #, c-format
 msgid "Opening %d item."
 msgid_plural "Opening %d items."
 msgstr[0] "Opening %d item."
 msgstr[1] "Opening %d items."
 
-#: ../src/nautilus-notebook.c:370
+#: ../src/nautilus-notebook.c:368
 msgid "Close tab"
 msgstr "Close tab"
 
-#: ../src/nautilus-places-sidebar.c:325
+#: ../src/nautilus-places-sidebar.c:270
 msgid "Devices"
 msgstr "Devices"
 
-#: ../src/nautilus-places-sidebar.c:333
-msgid "Bookmarks"
-msgstr "Bookmarks"
+#: ../src/nautilus-places-sidebar.c:496
+msgid "Places"
+msgstr "Places"
 
-#: ../src/nautilus-places-sidebar.c:552 ../src/nautilus-places-sidebar.c:577
-#, c-format
-msgid "Mount and open %s"
-msgstr "Mount and open %s"
+#: ../src/nautilus-places-sidebar.c:503
+msgid "Recent"
+msgstr "Recent"
 
-#: ../src/nautilus-places-sidebar.c:671
-msgid "Computer"
-msgstr "Computer"
+#: ../src/nautilus-places-sidebar.c:505
+msgid "Recent files"
+msgstr "Recent files"
 
 #. tooltip
-#: ../src/nautilus-places-sidebar.c:682 ../src/nautilus-window-menus.c:996
+#: ../src/nautilus-places-sidebar.c:516 ../src/nautilus-window-menus.c:566
 msgid "Open your personal folder"
 msgstr "Open your personal folder"
 
-#: ../src/nautilus-places-sidebar.c:695
+#: ../src/nautilus-places-sidebar.c:528
 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:784 ../src/nautilus-tree-sidebar.c:1342
-msgid "File System"
-msgstr "File System"
+#: ../src/nautilus-places-sidebar.c:576
+msgid "Open the trash"
+msgstr "Open the wastebasket"
+
+#: ../src/nautilus-places-sidebar.c:628 ../src/nautilus-places-sidebar.c:653
+#: ../src/nautilus-places-sidebar.c:830
+#, c-format
+msgid "Mount and open %s"
+msgstr "Mount and open %s"
 
-#: ../src/nautilus-places-sidebar.c:786
+#: ../src/nautilus-places-sidebar.c:728
 msgid "Open the contents of the File System"
 msgstr "Open the contents of the File System"
 
-#: ../src/nautilus-places-sidebar.c:793 ../src/nautilus-trash-bar.c:191
-msgid "Trash"
-msgstr "Wastebasket"
-
-#: ../src/nautilus-places-sidebar.c:795
-msgid "Open the trash"
-msgstr "Open the wastebasket"
-
-#: ../src/nautilus-places-sidebar.c:800
+#: ../src/nautilus-places-sidebar.c:808
 msgid "Network"
 msgstr "Network"
 
-#: ../src/nautilus-places-sidebar.c:829
+#: ../src/nautilus-places-sidebar.c:814
 msgid "Browse Network"
 msgstr "Browse Network"
 
-#: ../src/nautilus-places-sidebar.c:831
+#: ../src/nautilus-places-sidebar.c:816
 msgid "Browse the contents of the network"
 msgstr "Browse the contents of the network"
 
 #. Adjust start/stop items to reflect the type of the drive
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:1694 ../src/nautilus-places-sidebar.c:2714
-#: ../src/nautilus-view.c:7094 ../src/nautilus-view.c:7118
-#: ../src/nautilus-view.c:7190 ../src/nautilus-view.c:7823
-#: ../src/nautilus-view.c:7827 ../src/nautilus-view.c:7910
-#: ../src/nautilus-view.c:7914 ../src/nautilus-view.c:8014
-#: ../src/nautilus-view.c:8018
+#: ../src/nautilus-places-sidebar.c:1637 ../src/nautilus-places-sidebar.c:2699
+#: ../src/nautilus-view.c:7292 ../src/nautilus-view.c:7316
+#: ../src/nautilus-view.c:7388 ../src/nautilus-view.c:7987
+#: ../src/nautilus-view.c:7991 ../src/nautilus-view.c:8074
+#: ../src/nautilus-view.c:8078 ../src/nautilus-view.c:8176
+#: ../src/nautilus-view.c:8180
 msgid "_Start"
 msgstr "_Start"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:1695 ../src/nautilus-places-sidebar.c:2721
-#: ../src/nautilus-view.c:7098 ../src/nautilus-view.c:7122
-#: ../src/nautilus-view.c:7194 ../src/nautilus-view.c:7852
-#: ../src/nautilus-view.c:7939 ../src/nautilus-view.c:8043
-#: ../src/nautilus-window-menus.c:935
+#: ../src/nautilus-places-sidebar.c:1638 ../src/nautilus-places-sidebar.c:2706
+#: ../src/nautilus-view.c:7296 ../src/nautilus-view.c:7320
+#: ../src/nautilus-view.c:7392 ../src/nautilus-view.c:8016
+#: ../src/nautilus-view.c:8103 ../src/nautilus-view.c:8205
+#: ../src/nautilus-window-menus.c:505
 msgid "_Stop"
 msgstr "_Stop"
 
 #. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
-#: ../src/nautilus-places-sidebar.c:1700
+#: ../src/nautilus-places-sidebar.c:1643
 msgid "_Power On"
 msgstr "_Power On"
 
-#: ../src/nautilus-places-sidebar.c:1701 ../src/nautilus-view.c:7856
-#: ../src/nautilus-view.c:7943 ../src/nautilus-view.c:8047
+#: ../src/nautilus-places-sidebar.c:1644 ../src/nautilus-view.c:8020
+#: ../src/nautilus-view.c:8107 ../src/nautilus-view.c:8209
 msgid "_Safely Remove Drive"
 msgstr "_Safely Remove Drive"
 
-#: ../src/nautilus-places-sidebar.c:1704
+#: ../src/nautilus-places-sidebar.c:1647
 msgid "_Connect Drive"
 msgstr "_Connect Drive"
 
-#: ../src/nautilus-places-sidebar.c:1705
+#: ../src/nautilus-places-sidebar.c:1648
 msgid "_Disconnect Drive"
 msgstr "_Disconnect Drive"
 
-#: ../src/nautilus-places-sidebar.c:1708
+#: ../src/nautilus-places-sidebar.c:1651
 msgid "_Start Multi-disk Device"
 msgstr "_Start Multi-disk Device"
 
-#: ../src/nautilus-places-sidebar.c:1709
+#: ../src/nautilus-places-sidebar.c:1652
 msgid "_Stop Multi-disk Device"
 msgstr "_Stop Multi-disk Device"
 
 #. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
-#: ../src/nautilus-places-sidebar.c:1713 ../src/nautilus-view.c:7926
-#: ../src/nautilus-view.c:8030
+#: ../src/nautilus-places-sidebar.c:1656 ../src/nautilus-view.c:8090
+#: ../src/nautilus-view.c:8192
 msgid "_Unlock Drive"
 msgstr "_Unlock Drive"
 
-#: ../src/nautilus-places-sidebar.c:1714 ../src/nautilus-view.c:7868
-#: ../src/nautilus-view.c:7955 ../src/nautilus-view.c:8059
+#: ../src/nautilus-places-sidebar.c:1657 ../src/nautilus-view.c:8032
+#: ../src/nautilus-view.c:8119 ../src/nautilus-view.c:8221
 msgid "_Lock Drive"
 msgstr "_Lock Drive"
 
-#: ../src/nautilus-places-sidebar.c:1788 ../src/nautilus-places-sidebar.c:2352
+#: ../src/nautilus-places-sidebar.c:1734 ../src/nautilus-places-sidebar.c:2333
 #, c-format
 msgid "Unable to start %s"
 msgstr "Unable to start %s"
 
-#: ../src/nautilus-places-sidebar.c:2111 ../src/nautilus-places-sidebar.c:2139
-#: ../src/nautilus-places-sidebar.c:2167
+#: ../src/nautilus-places-sidebar.c:2087 ../src/nautilus-places-sidebar.c:2115
+#: ../src/nautilus-places-sidebar.c:2143
 #, c-format
 msgid "Unable to eject %s"
 msgstr "Unable to eject %s"
 
-#: ../src/nautilus-places-sidebar.c:2307
+#: ../src/nautilus-places-sidebar.c:2288
 #, c-format
 msgid "Unable to poll %s for media changes"
 msgstr "Unable to poll %s for media changes"
 
-#: ../src/nautilus-places-sidebar.c:2407
+#: ../src/nautilus-places-sidebar.c:2388
 #, c-format
 msgid "Unable to stop %s"
 msgstr "Unable to stop %s"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2630 ../src/nautilus-tree-sidebar.c:1158
-#: ../src/nautilus-view.c:6968 ../src/nautilus-view.c:8381
+#: ../src/nautilus-places-sidebar.c:2621 ../src/nautilus-view.c:7164
+#: ../src/nautilus-view.c:8575
 msgid "_Open"
 msgstr "_Open"
 
-#. add the "open in new tab" menu item
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2638 ../src/nautilus-tree-sidebar.c:1169
-#: ../src/nautilus-view.c:6980 ../src/nautilus-view.c:7148
-#: ../src/nautilus-view.c:8140 ../src/nautilus-view.c:8443
+#: ../src/nautilus-places-sidebar.c:2629 ../src/nautilus-view.c:7176
+#: ../src/nautilus-view.c:7346 ../src/nautilus-view.c:8300
+#: ../src/nautilus-view.c:8628
 msgid "Open in New _Tab"
 msgstr "Open in New _Tab"
 
-#. add the "open in new window" menu item
-#: ../src/nautilus-places-sidebar.c:2648 ../src/nautilus-tree-sidebar.c:1183
-#: ../src/nautilus-view.c:8131 ../src/nautilus-view.c:8423
+#: ../src/nautilus-places-sidebar.c:2636 ../src/nautilus-view.c:8292
+#: ../src/nautilus-view.c:8608
 msgid "Open in New _Window"
 msgstr "Open in New _Window"
 
-#. name, stock id, label
-#: ../src/nautilus-places-sidebar.c:2659 ../src/nautilus-window-menus.c:1041
+#: ../src/nautilus-places-sidebar.c:2644
 msgid "_Add Bookmark"
 msgstr "_Add Bookmark"
 
-#: ../src/nautilus-places-sidebar.c:2665
-msgid "Remove"
-msgstr "Remove"
-
-#: ../src/nautilus-places-sidebar.c:2674
+#: ../src/nautilus-places-sidebar.c:2659
 msgid "Rename..."
 msgstr "Renameâ"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2686 ../src/nautilus-view.c:7082
-#: ../src/nautilus-view.c:7106 ../src/nautilus-view.c:7178
+#: ../src/nautilus-places-sidebar.c:2671 ../src/nautilus-view.c:7280
+#: ../src/nautilus-view.c:7304 ../src/nautilus-view.c:7376
 msgid "_Mount"
 msgstr "_Mount"
 
-#. add the "Unmount" menu item
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2693 ../src/nautilus-tree-sidebar.c:1274
-#: ../src/nautilus-view.c:7086 ../src/nautilus-view.c:7110
-#: ../src/nautilus-view.c:7182
+#: ../src/nautilus-places-sidebar.c:2678 ../src/nautilus-view.c:7284
+#: ../src/nautilus-view.c:7308 ../src/nautilus-view.c:7380
 msgid "_Unmount"
 msgstr "_Unmount"
 
-#. add the "Eject" menu item
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2700 ../src/nautilus-tree-sidebar.c:1283
-#: ../src/nautilus-view.c:7090 ../src/nautilus-view.c:7114
-#: ../src/nautilus-view.c:7186
+#: ../src/nautilus-places-sidebar.c:2685 ../src/nautilus-view.c:7288
+#: ../src/nautilus-view.c:7312 ../src/nautilus-view.c:7384
 msgid "_Eject"
 msgstr "_Eject"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2707 ../src/nautilus-view.c:7102
-#: ../src/nautilus-view.c:7126 ../src/nautilus-view.c:7198
+#: ../src/nautilus-places-sidebar.c:2692 ../src/nautilus-view.c:7300
+#: ../src/nautilus-view.c:7324 ../src/nautilus-view.c:7396
 msgid "_Detect Media"
 msgstr "_Detect Media"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-places-sidebar.c:2742 ../src/nautilus-view.c:6950
-#: ../src/nautilus-view.c:7203
+#: ../src/nautilus-places-sidebar.c:2727
 msgid "_Properties"
 msgstr "_Properties"
 
+#: ../src/nautilus-places-sidebar.c:3291
+msgid "Computer"
+msgstr "Computer"
+
 #: ../src/nautilus-progress-ui-handler.c:108
 #: ../src/nautilus-progress-ui-handler.c:158
 #: ../src/nautilus-progress-ui-handler.c:216
@@ -4187,73 +3859,73 @@ msgstr[1] "%'d file operations active"
 msgid "All file operations have been successfully completed"
 msgstr "All file operations have been successfully completed"
 
-#: ../src/nautilus-properties-window.c:483
+#: ../src/nautilus-properties-window.c:478
 msgid "You cannot assign more than one custom icon at a time!"
 msgstr "You cannot assign more than one custom icon at a time!"
 
-#: ../src/nautilus-properties-window.c:484
+#: ../src/nautilus-properties-window.c:479
 msgid "Please drag just one image to set a custom icon."
 msgstr "Please drag just one image to set a custom icon."
 
-#: ../src/nautilus-properties-window.c:495
+#: ../src/nautilus-properties-window.c:490
 msgid "The file that you dropped is not local."
 msgstr "The file that you dropped is not local."
 
-#: ../src/nautilus-properties-window.c:496
-#: ../src/nautilus-properties-window.c:502
+#: ../src/nautilus-properties-window.c:491
+#: ../src/nautilus-properties-window.c:497
 msgid "You can only use local images as custom icons."
 msgstr "You can only use local images as custom icons."
 
-#: ../src/nautilus-properties-window.c:501
+#: ../src/nautilus-properties-window.c:496
 msgid "The file that you dropped is not an image."
 msgstr "The file that you dropped is not an image."
 
-#: ../src/nautilus-properties-window.c:637
+#: ../src/nautilus-properties-window.c:618
 msgid "_Name:"
 msgid_plural "_Names:"
 msgstr[0] "_Name:"
 msgstr[1] "_Names:"
 
-#: ../src/nautilus-properties-window.c:832
+#: ../src/nautilus-properties-window.c:813
 #, c-format
 msgid "Properties"
 msgstr "Properties"
 
-#: ../src/nautilus-properties-window.c:840
+#: ../src/nautilus-properties-window.c:821
 #, c-format
 msgid "%s Properties"
 msgstr "%s Properties"
 
-#: ../src/nautilus-properties-window.c:1163
+#: ../src/nautilus-properties-window.c:1146
 #, c-format
 msgctxt "MIME type description (MIME type)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/nautilus-properties-window.c:1377
+#: ../src/nautilus-properties-window.c:1354
 msgid "Cancel Group Change?"
 msgstr "Cancel Group Change?"
 
-#: ../src/nautilus-properties-window.c:1792
+#: ../src/nautilus-properties-window.c:1769
 msgid "Cancel Owner Change?"
 msgstr "Cancel Owner Change?"
 
-#: ../src/nautilus-properties-window.c:2110
+#: ../src/nautilus-properties-window.c:2086
 msgid "nothing"
 msgstr "nothing"
 
-#: ../src/nautilus-properties-window.c:2112
+#: ../src/nautilus-properties-window.c:2088
 msgid "unreadable"
 msgstr "unreadable"
 
-#: ../src/nautilus-properties-window.c:2122
+#: ../src/nautilus-properties-window.c:2098
 #, 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/nautilus-properties-window.c:2131
+#: ../src/nautilus-properties-window.c:2107
 msgid "(some contents unreadable)"
 msgstr "(some contents unreadable)"
 
@@ -4263,447 +3935,364 @@ msgstr "(some contents unreadable)"
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
 #.
-#: ../src/nautilus-properties-window.c:2148
+#: ../src/nautilus-properties-window.c:2124
 msgid "Contents:"
 msgstr "Contents:"
 
 #. Translators: "used" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:2920
+#: ../src/nautilus-properties-window.c:2921
 msgid "used"
 msgstr "used"
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/nautilus-properties-window.c:2927
+#: ../src/nautilus-properties-window.c:2928
 msgid "free"
 msgstr "free"
 
-#: ../src/nautilus-properties-window.c:2929
+#: ../src/nautilus-properties-window.c:2930
 msgid "Total capacity:"
 msgstr "Total capacity:"
 
-#: ../src/nautilus-properties-window.c:2938
+#: ../src/nautilus-properties-window.c:2939
 msgid "Filesystem type:"
 msgstr "Filesystem type:"
 
-#: ../src/nautilus-properties-window.c:3022
+#: ../src/nautilus-properties-window.c:3024
 msgid "Basic"
 msgstr "Basic"
 
-#: ../src/nautilus-properties-window.c:3087
+#: ../src/nautilus-properties-window.c:3089
 msgid "Link target:"
 msgstr "Link target:"
 
-#: ../src/nautilus-properties-window.c:3112
+#: ../src/nautilus-properties-window.c:3114
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../src/nautilus-properties-window.c:3121
+#: ../src/nautilus-properties-window.c:3123
 msgid "Accessed:"
 msgstr "Accessed:"
 
-#: ../src/nautilus-properties-window.c:3125
+#: ../src/nautilus-properties-window.c:3127
 msgid "Modified:"
 msgstr "Modified:"
 
-#: ../src/nautilus-properties-window.c:3134
+#: ../src/nautilus-properties-window.c:3137
 msgid "Free space:"
 msgstr "Free space:"
 
-#: ../src/nautilus-properties-window.c:3555
-msgid "_Read"
-msgstr "_Read"
-
-#: ../src/nautilus-properties-window.c:3557
-msgid "_Write"
-msgstr "_Write"
-
-#: ../src/nautilus-properties-window.c:3559
-msgid "E_xecute"
-msgstr "E_xecute"
-
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
 #.
-#: ../src/nautilus-properties-window.c:3827
-#: ../src/nautilus-properties-window.c:3838
-#: ../src/nautilus-properties-window.c:3850
+#: ../src/nautilus-properties-window.c:3788
+#: ../src/nautilus-properties-window.c:3799
+#: ../src/nautilus-properties-window.c:3811
 msgid "no "
 msgstr "no "
 
-#: ../src/nautilus-properties-window.c:3830
+#: ../src/nautilus-properties-window.c:3791
 msgid "list"
 msgstr "list"
 
-#: ../src/nautilus-properties-window.c:3832
+#: ../src/nautilus-properties-window.c:3793
 msgid "read"
 msgstr "read"
 
-#: ../src/nautilus-properties-window.c:3841
+#: ../src/nautilus-properties-window.c:3802
 msgid "create/delete"
 msgstr "create/delete"
 
-#: ../src/nautilus-properties-window.c:3843
+#: ../src/nautilus-properties-window.c:3804
 msgid "write"
 msgstr "write"
 
-#: ../src/nautilus-properties-window.c:3852
+#: ../src/nautilus-properties-window.c:3813
 msgid "access"
 msgstr "access"
 
-#: ../src/nautilus-properties-window.c:3900
-msgid "Access:"
-msgstr "Access:"
-
-#: ../src/nautilus-properties-window.c:3902
-msgid "Folder access:"
-msgstr "Folder access:"
-
-#: ../src/nautilus-properties-window.c:3904
-msgid "File access:"
-msgstr "File access:"
-
-#: ../src/nautilus-properties-window.c:3922
+#: ../src/nautilus-properties-window.c:3878
 msgid "List files only"
 msgstr "List files only"
 
-#: ../src/nautilus-properties-window.c:3924
+#: ../src/nautilus-properties-window.c:3884
 msgid "Access files"
 msgstr "Access files"
 
-#: ../src/nautilus-properties-window.c:3926
+#: ../src/nautilus-properties-window.c:3890
 msgid "Create and delete files"
 msgstr "Create and delete files"
 
-#: ../src/nautilus-properties-window.c:3933
+#: ../src/nautilus-properties-window.c:3905
 msgid "Read-only"
 msgstr "Read-only"
 
-#: ../src/nautilus-properties-window.c:3935
+#: ../src/nautilus-properties-window.c:3911
 msgid "Read and write"
 msgstr "Read and write"
 
-#: ../src/nautilus-properties-window.c:4000
-msgid "Special flags:"
-msgstr "Special flags:"
-
-#: ../src/nautilus-properties-window.c:4002
-msgid "Set _user ID"
-msgstr "Set _user ID"
+#: ../src/nautilus-properties-window.c:3938
+msgid "Access:"
+msgstr "Access:"
 
-#: ../src/nautilus-properties-window.c:4003
-msgid "Set gro_up ID"
-msgstr "Set gro_up ID"
+#: ../src/nautilus-properties-window.c:3940
+msgid "Folder access:"
+msgstr "Folder access:"
 
-#: ../src/nautilus-properties-window.c:4004
-msgid "_Sticky"
-msgstr "_Sticky"
+#: ../src/nautilus-properties-window.c:3942
+msgid "File access:"
+msgstr "File access:"
 
-#: ../src/nautilus-properties-window.c:4079
-#: ../src/nautilus-properties-window.c:4271
+#: ../src/nautilus-properties-window.c:4031
 msgid "_Owner:"
 msgstr "_Owner:"
 
-#: ../src/nautilus-properties-window.c:4087
-#: ../src/nautilus-properties-window.c:4176
-#: ../src/nautilus-properties-window.c:4281
+#: ../src/nautilus-properties-window.c:4039
+#: ../src/nautilus-properties-window.c:4303
 msgid "Owner:"
 msgstr "Owner:"
 
-#: ../src/nautilus-properties-window.c:4109
-#: ../src/nautilus-properties-window.c:4293
+#: ../src/nautilus-properties-window.c:4061
 msgid "_Group:"
 msgstr "_Group:"
 
-#: ../src/nautilus-properties-window.c:4117
-#: ../src/nautilus-properties-window.c:4177
-#: ../src/nautilus-properties-window.c:4301
+#: ../src/nautilus-properties-window.c:4069
+#: ../src/nautilus-properties-window.c:4317
 msgid "Group:"
 msgstr "Group:"
 
-#: ../src/nautilus-properties-window.c:4141
+#: ../src/nautilus-properties-window.c:4090
 msgid "Others"
 msgstr "Others"
 
-#: ../src/nautilus-properties-window.c:4156
+#: ../src/nautilus-properties-window.c:4105
 msgid "Execute:"
 msgstr "Execute:"
 
-#: ../src/nautilus-properties-window.c:4159
+#: ../src/nautilus-properties-window.c:4108
 msgid "Allow _executing file as program"
 msgstr "Allow _executing file as program"
 
-#: ../src/nautilus-properties-window.c:4178
-msgid "Others:"
-msgstr "Others:"
-
-#: ../src/nautilus-properties-window.c:4317
-msgid "Folder Permissions:"
-msgstr "Folder Permissions:"
+#: ../src/nautilus-properties-window.c:4284
+msgid "Change Permissions for Enclosed Files"
+msgstr "Change Permissions for Enclosed Files"
 
-#: ../src/nautilus-properties-window.c:4325
-msgid "File Permissions:"
-msgstr "File Permissions:"
+#: ../src/nautilus-properties-window.c:4288
+msgid "Change"
+msgstr "Change"
 
-#: ../src/nautilus-properties-window.c:4334
-msgid "Text view:"
-msgstr "Text view:"
+#: ../src/nautilus-properties-window.c:4331
+msgid "Others:"
+msgstr "Others:"
 
-#: ../src/nautilus-properties-window.c:4482
+#: ../src/nautilus-properties-window.c:4372
 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/nautilus-properties-window.c:4502
-msgid "SELinux context:"
-msgstr "SELinux context:"
+#: ../src/nautilus-properties-window.c:4387
+msgid "Security context:"
+msgstr "Security context:"
 
-#: ../src/nautilus-properties-window.c:4507
-msgid "Last changed:"
-msgstr "Last changed:"
+#: ../src/nautilus-properties-window.c:4402
+msgid "Change Permissions for Enclosed Files..."
+msgstr "Change Permissions for Enclosed Filesâ"
 
-#: ../src/nautilus-properties-window.c:4519
-msgid "Apply Permissions to Enclosed Files"
-msgstr "Apply Permissions to Enclosed Files"
-
-#: ../src/nautilus-properties-window.c:4529
+#: ../src/nautilus-properties-window.c:4412
 #, c-format
-msgid "The permissions of \"%s\" could not be determined."
-msgstr "The permissions of \"%s\" could not be determined."
+msgid "The permissions of â%sâ could not be determined."
+msgstr "The permissions of â%sâ could not be determined."
 
-#: ../src/nautilus-properties-window.c:4532
+#: ../src/nautilus-properties-window.c:4415
 msgid "The permissions of the selected file could not be determined."
 msgstr "The permissions of the selected file could not be determined."
 
-#: ../src/nautilus-properties-window.c:4765
+#: ../src/nautilus-properties-window.c:4660
 msgid "Open With"
 msgstr "Open With"
 
-#: ../src/nautilus-properties-window.c:5091
+#: ../src/nautilus-properties-window.c:4983
 msgid "Creating Properties window."
 msgstr "Creating Properties window."
 
-#: ../src/nautilus-properties-window.c:5377
+#: ../src/nautilus-properties-window.c:5272
 msgid "Select Custom Icon"
 msgstr "Select Custom Icon"
 
-#: ../src/nautilus-query-editor.c:118
+#: ../src/nautilus-query-editor.c:107
 msgid "File Type"
 msgstr "File Type"
 
-#: ../src/nautilus-query-editor.c:276
-msgid "Select folder to search in"
-msgstr "Select folder to search in"
-
-#: ../src/nautilus-query-editor.c:366
+#: ../src/nautilus-query-editor.c:385
 msgid "Documents"
 msgstr "Documents"
 
-#: ../src/nautilus-query-editor.c:384
+#: ../src/nautilus-query-editor.c:403
 msgid "Music"
 msgstr "Music"
 
-#: ../src/nautilus-query-editor.c:399
+#: ../src/nautilus-query-editor.c:418
 msgid "Video"
 msgstr "Video"
 
-#: ../src/nautilus-query-editor.c:415
+#: ../src/nautilus-query-editor.c:434
 msgid "Picture"
 msgstr "Picture"
 
-#: ../src/nautilus-query-editor.c:435
+#: ../src/nautilus-query-editor.c:454
 msgid "Illustration"
 msgstr "Illustration"
 
-#: ../src/nautilus-query-editor.c:449
+#: ../src/nautilus-query-editor.c:468
 msgid "Spreadsheet"
 msgstr "Spreadsheet"
 
-#: ../src/nautilus-query-editor.c:465
+#: ../src/nautilus-query-editor.c:484
 msgid "Presentation"
 msgstr "Presentation"
 
-#: ../src/nautilus-query-editor.c:474
+#: ../src/nautilus-query-editor.c:493
 msgid "Pdf / Postscript"
 msgstr "Pdf / Postscript"
 
-#: ../src/nautilus-query-editor.c:482
+#: ../src/nautilus-query-editor.c:501
 msgid "Text File"
 msgstr "Text File"
 
-#: ../src/nautilus-query-editor.c:561
+#: ../src/nautilus-query-editor.c:580
 msgid "Select type"
 msgstr "Select type"
 
-#: ../src/nautilus-query-editor.c:645
+#: ../src/nautilus-query-editor.c:584
+msgid "Select"
+msgstr "Select"
+
+#: ../src/nautilus-query-editor.c:665
 msgid "Any"
 msgstr "Any"
 
-#: ../src/nautilus-query-editor.c:660
+#: ../src/nautilus-query-editor.c:680
 msgid "Other Type..."
 msgstr "Other Typeâ"
 
-#: ../src/nautilus-query-editor.c:941
+#: ../src/nautilus-query-editor.c:961
 msgid "Remove this criterion from the search"
 msgstr "Remove this criterion from the search"
 
-#: ../src/nautilus-query-editor.c:991
-msgid "Search Folder"
-msgstr "Search Folder"
+#. create the Current/All Files selector
+#: ../src/nautilus-query-editor.c:1050
+msgid "Current"
+msgstr "Current"
 
-#: ../src/nautilus-query-editor.c:1009
-msgid "Edit the saved search"
-msgstr "Edit the saved search"
+#: ../src/nautilus-query-editor.c:1053
+msgid "All Files"
+msgstr "All Files"
 
-#: ../src/nautilus-query-editor.c:1038
+#: ../src/nautilus-query-editor.c:1075
 msgid "Add a new criterion to this search"
 msgstr "Add a new criterion to this search"
 
-#: ../src/nautilus-query-editor.c:1041
-msgid "Go"
-msgstr "Go"
-
-#: ../src/nautilus-query-editor.c:1043
-msgid "Reload"
-msgstr "Reload"
-
-#: ../src/nautilus-query-editor.c:1048
-msgid "Perform or update the search"
-msgstr "Perform or update the search"
-
-#: ../src/nautilus-query-editor.c:1068
-msgid "_Search for:"
-msgstr "_Search for:"
+#: ../src/nautilus-special-location-bar.c:52
+msgid "Files in this folder will appear in the Create Document menu."
+msgstr "Files in this folder will appear in the Create Document menu."
 
-#: ../src/nautilus-query-editor.c:1102
-msgid "Search results"
-msgstr "Search results"
+#: ../src/nautilus-special-location-bar.c:55
+msgid "Executable files in this folder will appear in the Scripts menu."
+msgstr "Executable files in this folder will appear in the Scripts menu."
 
-#: ../src/nautilus-search-bar.c:146
-msgid "Search:"
-msgstr "Search:"
+#: ../src/nautilus-trash-bar.c:202
+msgid "Restore"
+msgstr "Restore"
 
-#: ../src/nautilus-trash-bar.c:198
-msgid "Restore Selected Items"
-msgstr "Restore Selected Items"
-
-#: ../src/nautilus-trash-bar.c:201
+#: ../src/nautilus-trash-bar.c:205
 msgid "Restore selected items to their original position"
 msgstr "Restore selected items to their original position"
 
-#: ../src/nautilus-tree-sidebar.c:916 ../src/nautilus-view.c:5733
-#, 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/nautilus-tree-sidebar.c:920 ../src/nautilus-view.c:5737
-#, 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/nautilus-tree-sidebar.c:959 ../src/nautilus-view.c:5930
-msgid "There is nothing on the clipboard to paste."
-msgstr "There is nothing on the clipboard to paste."
-
-#. add the "create new folder" menu item
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-tree-sidebar.c:1199 ../src/nautilus-view.c:6958
-msgid "Create New _Folder"
-msgstr "Create New _Folder"
-
-#. We make accelerator "" instead of null here to not inherit the stock
-#. accelerator for paste
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-tree-sidebar.c:1231 ../src/nautilus-view.c:7014
-#: ../src/nautilus-view.c:7161
-msgid "_Paste Into Folder"
-msgstr "_Paste Into Folder"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-tree-sidebar.c:1261 ../src/nautilus-view.c:7052
-#: ../src/nautilus-view.c:7170 ../src/nautilus-view.c:8486
-msgid "_Delete"
-msgstr "_Delete"
-
-#: ../src/nautilus-tree-sidebar.c:1346
-msgid "Network Neighbourhood"
-msgstr "Network Neighbourhood"
+#. Translators: "Empty" is an action (for the trash) , not a state
+#: ../src/nautilus-trash-bar.c:209
+msgid "Empty"
+msgstr "Empty"
 
-#: ../src/nautilus-view.c:959
+#: ../src/nautilus-view.c:967
 #, 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/nautilus-view.c:962
+#: ../src/nautilus-view.c:970
 #, 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/nautilus-view.c:1477
+#: ../src/nautilus-view.c:1468
 msgid "Select Items Matching"
 msgstr "Select Items Matching"
 
-#: ../src/nautilus-view.c:1492
+#: ../src/nautilus-view.c:1483
 msgid "_Pattern:"
 msgstr "_Pattern:"
 
-#: ../src/nautilus-view.c:1498
+#: ../src/nautilus-view.c:1489
 msgid "Examples: "
 msgstr "Examples: "
 
-#: ../src/nautilus-view.c:1611
+#: ../src/nautilus-view.c:1602
 msgid "Save Search as"
 msgstr "Save Search as"
 
-#: ../src/nautilus-view.c:1634
+#: ../src/nautilus-view.c:1625
 msgid "Search _name:"
 msgstr "Search _name:"
 
-#: ../src/nautilus-view.c:1656
+#: ../src/nautilus-view.c:1647
 msgid "Select Folder to Save Search In"
 msgstr "Select Folder to Save Search In"
 
-#: ../src/nautilus-view.c:2572
+#: ../src/nautilus-view.c:2274
+msgid ""
+"Nautilus 3.6 deprecated this directory and tried migrating this "
+"configuration to ~/.local/share/nautilus"
+msgstr ""
+"Nautilus 3.6 deprecated this directory and tried migrating this "
+"configuration to ~/.local/share/nautilus"
+
+#: ../src/nautilus-view.c:2700
 msgid "Content View"
 msgstr "Content View"
 
-#: ../src/nautilus-view.c:2573
+#: ../src/nautilus-view.c:2701
 msgid "View of the current folder"
 msgstr "View of the current folder"
 
-#: ../src/nautilus-view.c:2773 ../src/nautilus-view.c:2810
+#: ../src/nautilus-view.c:2899 ../src/nautilus-view.c:2934
 #, c-format
-msgid "\"%s\" selected"
-msgstr "\"%s\" selected"
+msgid "â%sâ selected"
+msgstr "â%sâ selected"
 
-#: ../src/nautilus-view.c:2775
+#: ../src/nautilus-view.c:2901
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
 msgstr[0] "%'d folder selected"
 msgstr[1] "%'d folders selected"
 
-#: ../src/nautilus-view.c:2785
+#: ../src/nautilus-view.c:2911
 #, c-format
-msgid " (containing %'d item)"
-msgid_plural " (containing %'d items)"
-msgstr[0] " (containing %'d item)"
-msgstr[1] " (containing %'d items)"
+msgid "(containing %'d item)"
+msgid_plural "(containing %'d items)"
+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/nautilus-view.c:2796
+#: ../src/nautilus-view.c:2922
 #, 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)"
+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/nautilus-view.c:2813
+#: ../src/nautilus-view.c:2937
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
@@ -4711,7 +4300,7 @@ msgstr[0] "%'d item selected"
 msgstr[1] "%'d items selected"
 
 #. Folders selected also, use "other" terminology
-#: ../src/nautilus-view.c:2820
+#: ../src/nautilus-view.c:2944
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -4720,39 +4309,13 @@ msgstr[1] "%'d other items selected"
 
 #. This is marked for translation in case a localiser
 #. * needs to use something other than parentheses. The
-#. * first message gives the number of items selected;
-#. * the message in parentheses the size of those items.
-#.
-#: ../src/nautilus-view.c:2835
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../src/nautilus-view.c:2848
-#, c-format
-msgid "Free space: %s"
-msgstr "Free space: %s"
-
-#: ../src/nautilus-view.c:2859
-#, 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.
+#. * the message in parentheses is the size of the selected items.
 #.
-#: ../src/nautilus-view.c:2874
+#: ../src/nautilus-view.c:2958
 #, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
+msgid "(%s)"
+msgstr "(%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
@@ -4760,204 +4323,125 @@ msgstr "%s, %s"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: ../src/nautilus-view.c:2893 ../src/nautilus-view.c:2906
-#, 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/nautilus-view.c:2920
+#: ../src/nautilus-view.c:2982
 #, c-format
-msgid "%s%s, %s, %s"
-msgstr "%s%s, %s, %s"
+msgid "%s %s, %s %s"
+msgstr "%s %s, %s %s"
 
-#: ../src/nautilus-view.c:4340
+#: ../src/nautilus-view.c:4371
 #, c-format
 msgid "Open With %s"
 msgstr "Open With %s"
 
-#: ../src/nautilus-view.c:4342
+#: ../src/nautilus-view.c:4373
 #, 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"
+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/nautilus-view.c:5156
+#: ../src/nautilus-view.c:5116
 #, c-format
-msgid "Run \"%s\" on any selected items"
-msgstr "Run \"%s\" on any selected items"
+msgid "Run â%sâ on any selected items"
+msgstr "Run â%sâ on any selected items"
 
-#: ../src/nautilus-view.c:5407
+#: ../src/nautilus-view.c:5370
 #, c-format
-msgid "Create a new document from template \"%s\""
-msgstr "Create a new document from template \"%s\""
+msgid "Create a new document from template â%sâ"
+msgstr "Create a new document from template â%sâ"
 
-#: ../src/nautilus-view.c:5661
-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/nautilus-view.c:5663
-msgid ""
-"Choosing a script from the menu will run that script with any selected items "
-"as input."
-msgstr ""
-"Choosing a script from the menu will run that script with any selected items "
-"as input."
+#: ../src/nautilus-view.c:5970
+msgid "Select Destination"
+msgstr "Select Destination"
 
-#: ../src/nautilus-view.c:5665
-msgid ""
-"All executable files in this folder will appear in the Scripts menu. "
-"Choosing a script from the menu will run that script.\n"
-"\n"
-"When executed from a local folder, scripts will be passed the selected file "
-"names. When executed from a remote folder (e.g. a folder showing web or ftp "
-"content), scripts will be passed no parameters.\n"
-"\n"
-"In all cases, the following environment variables will be set by Nautilus, "
-"which the scripts may use:\n"
-"\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
-"files (only if local)\n"
-"\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
-"\n"
-"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
-"\n"
-"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window\n"
-"\n"
-"NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_FILE_PATHS: newline-delimited paths for "
-"selected files in the inactive pane of a split-view window (only if local)\n"
-"\n"
-"NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_URIS: newline-delimited URIs for selected "
-"files in the inactive pane of a split-view window\n"
-"\n"
-"NAUTILUS_SCRIPT_NEXT_PANE_CURRENT_URI: URI for current location in the "
-"inactive pane of a split-view window"
-msgstr ""
-"All executable files in this folder will appear in the Scripts menu. "
-"Choosing a script from the menu will run that script.\n"
-"\n"
-"When executed from a local folder, scripts will be passed the selected file "
-"names. When executed from a remote folder (e.g. a folder showing web or ftp "
-"content), scripts will be passed no parameters.\n"
-"\n"
-"In all cases, the following environment variables will be set by Nautilus, "
-"which the scripts may use:\n"
-"\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
-"files (only if local)\n"
-"\n"
-"NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
-"\n"
-"NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
-"\n"
-"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window\n"
-"\n"
-"NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_FILE_PATHS: newline-delimited paths for "
-"selected files in the inactive pane of a split-view window (only if local)\n"
-"\n"
-"NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_URIS: newline-delimited URIs for selected "
-"files in the inactive pane of a split-view window\n"
-"\n"
-"NAUTILUS_SCRIPT_NEXT_PANE_CURRENT_URI: URI for current location in the "
-"inactive pane of a split-view window"
+#: ../src/nautilus-view.c:5974
+msgid "_Select"
+msgstr "_Select"
 
-#: ../src/nautilus-view.c:5744
+#. Translators: %s is a file name formatted for display
+#: ../src/nautilus-view.c:6487
 #, c-format
-msgid "The %'d selected item will be moved if you select the Paste command"
-msgid_plural ""
-"The %'d selected items will be moved if you select the Paste command"
-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"
+msgid "Unable to remove â%sâ"
+msgstr "Unable to remove â%sâ"
 
-#: ../src/nautilus-view.c:5751
+#. Translators: %s is a file name formatted for display
+#: ../src/nautilus-view.c:6513
 #, c-format
-msgid "The %'d selected item will be copied if you select the Paste command"
-msgid_plural ""
-"The %'d selected items will be copied if you select the Paste command"
-msgstr[0] ""
-"The %'d selected item will be copied if you select the Paste command"
-msgstr[1] ""
-"The %'d selected items will be copied if you select the Paste command"
-
-#: ../src/nautilus-view.c:6188
-msgid "Unable to unmount location"
-msgstr "Unable to unmount location"
-
-#: ../src/nautilus-view.c:6208
-msgid "Unable to eject location"
-msgstr "Unable to eject location"
+msgid "Unable to eject â%sâ"
+msgstr "Unable to eject â%sâ"
 
-#: ../src/nautilus-view.c:6223
+#: ../src/nautilus-view.c:6534
 msgid "Unable to stop drive"
 msgstr "Unable to stop drive"
 
-#: ../src/nautilus-view.c:6709
+#. Translators: %s is a file name formatted for display
+#: ../src/nautilus-view.c:6635
 #, c-format
-msgid "Connect to Server %s"
-msgstr "Connect to Server %s"
-
-#: ../src/nautilus-view.c:6714 ../src/nautilus-view.c:7831
-#: ../src/nautilus-view.c:7918 ../src/nautilus-view.c:8022
-msgid "_Connect"
-msgstr "_Connect"
-
-#: ../src/nautilus-view.c:6728
-msgid "Link _name:"
-msgstr "Link _name:"
+msgid "Unable to start â%sâ"
+msgstr "Unable to start â%sâ"
 
 #. name, stock id, label
-#: ../src/nautilus-view.c:6946
-msgid "Create New _Document"
-msgstr "Create New _Document"
+#: ../src/nautilus-view.c:7139
+msgid "New _Document"
+msgstr "New _Document"
 
 #. name, stock id, label
-#: ../src/nautilus-view.c:6947
+#: ../src/nautilus-view.c:7140
 msgid "Open Wit_h"
 msgstr "Open Wit_h"
 
-#: ../src/nautilus-view.c:6948
+#: ../src/nautilus-view.c:7141
 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/nautilus-view.c:7143 ../src/nautilus-view.c:7401
+#: ../src/nautilus-window-menus.c:605
+msgid "P_roperties"
+msgstr "P_roperties"
+
 #. tooltip
-#: ../src/nautilus-view.c:6951 ../src/nautilus-view.c:8520
+#: ../src/nautilus-view.c:7144 ../src/nautilus-view.c:8710
 msgid "View or modify the properties of each selected item"
 msgstr "View or modify the properties of each selected item"
 
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-view.c:7151
+msgid "New _Folder"
+msgstr "New _Folder"
+
 #. tooltip
-#: ../src/nautilus-view.c:6959
+#: ../src/nautilus-view.c:7152
 msgid "Create a new empty folder inside this folder"
 msgstr "Create a new empty folder inside this folder"
 
-#. name, stock id, label
-#: ../src/nautilus-view.c:6961
-msgid "No templates installed"
-msgstr "No templates installed"
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-view.c:7155
+msgid "New Folder with Selection"
+msgstr "New Folder with Selection"
+
+#. tooltip
+#: ../src/nautilus-view.c:7156
+msgid "Create a new folder containing the selected items"
+msgstr "Create a new folder containing the selected items"
 
 #. name, stock id
 #. translators: this is used to indicate that a document doesn't contain anything
 #. label, accelerator
-#: ../src/nautilus-view.c:6964
+#: ../src/nautilus-view.c:7160
 msgid "_Empty Document"
 msgstr "_Empty Document"
 
 #. tooltip
-#: ../src/nautilus-view.c:6965
+#: ../src/nautilus-view.c:7161
 msgid "Create a new empty document inside this folder"
 msgstr "Create a new empty document inside this folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:6969
+#: ../src/nautilus-view.c:7165
 msgid "Open the selected item in this window"
 msgstr "Open the selected item in this window"
 
@@ -4966,71 +4450,79 @@ msgstr "Open the selected item in this window"
 #. Location-specific actions
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:6976 ../src/nautilus-view.c:7144
+#: ../src/nautilus-view.c:7172 ../src/nautilus-view.c:7342
 msgid "Open in Navigation Window"
 msgstr "Open in Navigation Window"
 
 #. tooltip
-#: ../src/nautilus-view.c:6977
+#: ../src/nautilus-view.c:7173
 msgid "Open each selected item in a navigation window"
 msgstr "Open each selected item in a navigation window"
 
 #. tooltip
-#: ../src/nautilus-view.c:6981
+#: ../src/nautilus-view.c:7177
 msgid "Open each selected item in a new tab"
 msgstr "Open each selected item in a new tab"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:6984
+#: ../src/nautilus-view.c:7180
 msgid "Other _Application..."
 msgstr "Other _Applicationâ"
 
 #. tooltip
-#: ../src/nautilus-view.c:6985 ../src/nautilus-view.c:6989
+#: ../src/nautilus-view.c:7181 ../src/nautilus-view.c:7185
 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/nautilus-view.c:6988
+#: ../src/nautilus-view.c:7184
 msgid "Open With Other _Application..."
 msgstr "Open With Other _Applicationâ"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:6992
+#: ../src/nautilus-view.c:7188
 msgid "_Open Scripts Folder"
 msgstr "_Open Scripts Folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:6993
+#: ../src/nautilus-view.c:7189
 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/nautilus-view.c:7001
+#: ../src/nautilus-view.c:7197
 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/nautilus-view.c:7005
+#: ../src/nautilus-view.c:7201
 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/nautilus-view.c:7009
+#: ../src/nautilus-view.c:7205
 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"
 
+#. We make accelerator "" instead of null here to not inherit the stock
+#. accelerator for paste
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-view.c:7210 ../src/nautilus-view.c:7359
+msgid "_Paste Into Folder"
+msgstr "_Paste Into Folder"
+
 #. tooltip
-#: ../src/nautilus-view.c:7015
+#: ../src/nautilus-view.c:7211
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
@@ -5038,114 +4530,132 @@ msgstr ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
 
-#. name, stock id, label
-#: ../src/nautilus-view.c:7017
-msgid "Cop_y to"
-msgstr "Cop_y to"
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-view.c:7214
+msgid "Copy To..."
+msgstr "Copy Toâ"
 
-#. name, stock id, label
-#: ../src/nautilus-view.c:7018
-msgid "M_ove to"
-msgstr "M_ove to"
+#. tooltip
+#: ../src/nautilus-view.c:7215
+msgid "Copy selected files to another location"
+msgstr "Copy selected files to another location"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-view.c:7218
+msgid "Move To..."
+msgstr "Move Toâ"
+
+#. tooltip
+#: ../src/nautilus-view.c:7219
+msgid "Move selected files to another location"
+msgstr "Move selected files to another location"
 
 #. tooltip
-#: ../src/nautilus-view.c:7021
+#: ../src/nautilus-view.c:7223
 msgid "Select all items in this window"
 msgstr "Select all items in this window"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7024
+#: ../src/nautilus-view.c:7226
 msgid "Select I_tems Matching..."
 msgstr "Select I_tems Matchingâ"
 
 #. tooltip
-#: ../src/nautilus-view.c:7025
+#: ../src/nautilus-view.c:7227
 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/nautilus-view.c:7028
+#: ../src/nautilus-view.c:7230
 msgid "_Invert Selection"
 msgstr "_Invert Selection"
 
 #. tooltip
-#: ../src/nautilus-view.c:7029
+#: ../src/nautilus-view.c:7231
 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/nautilus-view.c:7032
-msgid "D_uplicate"
-msgstr "D_uplicate"
-
-#. tooltip
-#: ../src/nautilus-view.c:7033
-msgid "Duplicate each selected item"
-msgstr "Duplicate each selected item"
-
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-view.c:7036 ../src/nautilus-view.c:8505
+#: ../src/nautilus-view.c:7234 ../src/nautilus-view.c:8693
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "Ma_ke Link"
 msgstr[1] "Ma_ke Links"
 
 #. tooltip
-#: ../src/nautilus-view.c:7037
+#: ../src/nautilus-view.c:7235
 msgid "Create a symbolic link for each selected item"
 msgstr "Create a symbolic link for each selected item"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7040
-msgid "_Rename..."
-msgstr "_Renameâ"
+#: ../src/nautilus-view.c:7238
+msgid "Rena_me..."
+msgstr "Rena_meâ"
 
 #. tooltip
-#: ../src/nautilus-view.c:7041
+#: ../src/nautilus-view.c:7239
 msgid "Rename selected item"
 msgstr "Rename selected item"
 
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-view.c:7242
+msgid "Set as Wallpaper"
+msgstr "Set as Wallpaper"
+
+#. tooltip
+#: ../src/nautilus-view.c:7243
+msgid "Make item the wallpaper"
+msgstr "Make item the wallpaper"
+
 #. tooltip
-#: ../src/nautilus-view.c:7049 ../src/nautilus-view.c:8466
+#: ../src/nautilus-view.c:7251 ../src/nautilus-view.c:8651
 msgid "Move each selected item to the Trash"
 msgstr "Move each selected item to the Wastebasket"
 
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-view.c:7254 ../src/nautilus-view.c:7368
+#: ../src/nautilus-view.c:8677
+msgid "_Delete"
+msgstr "_Delete"
+
 #. tooltip
-#: ../src/nautilus-view.c:7053
+#: ../src/nautilus-view.c:7255
 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/nautilus-view.c:7056 ../src/nautilus-view.c:7174
+#: ../src/nautilus-view.c:7258 ../src/nautilus-view.c:7372
 msgid "_Restore"
 msgstr "_Restore"
 
 #. name, stock id
 #. label, accelerator
-#. name, stock id, label
-#: ../src/nautilus-view.c:7060 ../src/nautilus-window-menus.c:924
+#: ../src/nautilus-view.c:7262
 msgid "_Undo"
 msgstr "_Undo"
 
 #. tooltip
-#: ../src/nautilus-view.c:7061
+#: ../src/nautilus-view.c:7263
 msgid "Undo the last action"
 msgstr "Undo the last action"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7064
+#: ../src/nautilus-view.c:7266
 msgid "_Redo"
 msgstr "_Redo"
 
 #. tooltip
-#: ../src/nautilus-view.c:7065
+#: ../src/nautilus-view.c:7267
 msgid "Redo the last undone action"
 msgstr "Redo the last undone action"
 
@@ -5157,136 +4667,125 @@ msgstr "Redo the last undone action"
 #.
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7074
+#: ../src/nautilus-view.c:7276
 msgid "Reset View to _Defaults"
 msgstr "Reset View to _Defaults"
 
 #. tooltip
-#: ../src/nautilus-view.c:7075
+#: ../src/nautilus-view.c:7277
 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/nautilus-view.c:7078
-msgid "Connect To This Server"
-msgstr "Connect To This Server"
-
-#. tooltip
-#: ../src/nautilus-view.c:7079
-msgid "Make a permanent connection to this server"
-msgstr "Make a permanent connection to this server"
-
 #. tooltip
-#: ../src/nautilus-view.c:7083
+#: ../src/nautilus-view.c:7281
 msgid "Mount the selected volume"
 msgstr "Mount the selected volume"
 
 #. tooltip
-#: ../src/nautilus-view.c:7087
+#: ../src/nautilus-view.c:7285
 msgid "Unmount the selected volume"
 msgstr "Unmount the selected volume"
 
 #. tooltip
-#: ../src/nautilus-view.c:7091
+#: ../src/nautilus-view.c:7289
 msgid "Eject the selected volume"
 msgstr "Eject the selected volume"
 
 #. tooltip
-#: ../src/nautilus-view.c:7095
+#: ../src/nautilus-view.c:7293
 msgid "Start the selected volume"
 msgstr "Start the selected volume"
 
 #. tooltip
-#: ../src/nautilus-view.c:7099 ../src/nautilus-view.c:8044
+#: ../src/nautilus-view.c:7297 ../src/nautilus-view.c:8206
 msgid "Stop the selected volume"
 msgstr "Stop the selected volume"
 
 #. tooltip
-#: ../src/nautilus-view.c:7103 ../src/nautilus-view.c:7127
-#: ../src/nautilus-view.c:7199
+#: ../src/nautilus-view.c:7301 ../src/nautilus-view.c:7325
+#: ../src/nautilus-view.c:7397
 msgid "Detect media in the selected drive"
 msgstr "Detect media in the selected drive"
 
 #. tooltip
-#: ../src/nautilus-view.c:7107
+#: ../src/nautilus-view.c:7305
 msgid "Mount the volume associated with the open folder"
 msgstr "Mount the volume associated with the open folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7111
+#: ../src/nautilus-view.c:7309
 msgid "Unmount the volume associated with the open folder"
 msgstr "Unmount the volume associated with the open folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7115
+#: ../src/nautilus-view.c:7313
 msgid "Eject the volume associated with the open folder"
 msgstr "Eject the volume associated with the open folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7119
+#: ../src/nautilus-view.c:7317
 msgid "Start the volume associated with the open folder"
 msgstr "Start the volume associated with the open folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7123
+#: ../src/nautilus-view.c:7321
 msgid "Stop the volume associated with the open folder"
 msgstr "Stop the volume associated with the open folder"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7130
+#: ../src/nautilus-view.c:7328
 msgid "Open File and Close window"
 msgstr "Open File and Close window"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7134
+#: ../src/nautilus-view.c:7332
 msgid "Sa_ve Search"
 msgstr "Sa_ve Search"
 
 #. tooltip
-#: ../src/nautilus-view.c:7135
+#: ../src/nautilus-view.c:7333
 msgid "Save the edited search"
 msgstr "Save the edited search"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-view.c:7138
+#: ../src/nautilus-view.c:7336
 msgid "Sa_ve Search As..."
 msgstr "Sa_ve Search Asâ"
 
 #. tooltip
-#: ../src/nautilus-view.c:7139
+#: ../src/nautilus-view.c:7337
 msgid "Save the current search as a file"
 msgstr "Save the current search as a file"
 
 #. tooltip
-#: ../src/nautilus-view.c:7145
+#: ../src/nautilus-view.c:7343
 msgid "Open this folder in a navigation window"
 msgstr "Open this folder in a navigation window"
 
 #. tooltip
-#: ../src/nautilus-view.c:7149
+#: ../src/nautilus-view.c:7347
 msgid "Open this folder in a new tab"
 msgstr "Open this folder in a new tab"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/nautilus-view.c:7154
+#: ../src/nautilus-view.c:7352
 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/nautilus-view.c:7158
+#: ../src/nautilus-view.c:7356
 msgid "Prepare this folder to be copied with a Paste command"
 msgstr "Prepare this folder to be copied with a Paste command"
 
 #. tooltip
-#: ../src/nautilus-view.c:7162
+#: ../src/nautilus-view.c:7360
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into this "
 "folder"
@@ -5295,982 +4794,1570 @@ msgstr ""
 "folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7167
+#: ../src/nautilus-view.c:7365
 msgid "Move this folder to the Trash"
 msgstr "Move this folder to the Wastebasket"
 
 #. tooltip
-#: ../src/nautilus-view.c:7171
+#: ../src/nautilus-view.c:7369
 msgid "Delete this folder, without moving to the Trash"
 msgstr "Delete this folder, without moving to the Wastebasket"
 
 #. tooltip
-#: ../src/nautilus-view.c:7179
+#: ../src/nautilus-view.c:7377
 msgid "Mount the volume associated with this folder"
 msgstr "Mount the volume associated with this folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7183
+#: ../src/nautilus-view.c:7381
 msgid "Unmount the volume associated with this folder"
 msgstr "Unmount the volume associated with this folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7187
+#: ../src/nautilus-view.c:7385
 msgid "Eject the volume associated with this folder"
 msgstr "Eject the volume associated with this folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7191
+#: ../src/nautilus-view.c:7389
 msgid "Start the volume associated with this folder"
 msgstr "Start the volume associated with this folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7195
+#: ../src/nautilus-view.c:7393
 msgid "Stop the volume associated with this folder"
 msgstr "Stop the volume associated with this folder"
 
 #. tooltip
-#: ../src/nautilus-view.c:7204
+#: ../src/nautilus-view.c:7402 ../src/nautilus-window-menus.c:606
 msgid "View or modify the properties of this folder"
 msgstr "View or modify the properties of this folder"
 
-#. name, stock id, label
-#: ../src/nautilus-view.c:7207 ../src/nautilus-view.c:7210
-msgid "_Other pane"
-msgstr "_Other pane"
-
-#: ../src/nautilus-view.c:7208
-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/nautilus-view.c:7211
-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/nautilus-view.c:7214 ../src/nautilus-view.c:7218
-#: ../src/nautilus-window-menus.c:995 ../src/nautilus-window-menus.c:1256
-msgid "_Home"
-msgstr "_Home"
-
-#: ../src/nautilus-view.c:7215
-msgid "Copy the current selection to the home folder"
-msgstr "Copy the current selection to the home folder"
-
-#: ../src/nautilus-view.c:7219
-msgid "Move the current selection to the home folder"
-msgstr "Move the current selection to the home folder"
-
-#. name, stock id, label
-#: ../src/nautilus-view.c:7222 ../src/nautilus-view.c:7226
-msgid "_Desktop"
-msgstr "_Desktop"
-
-#: ../src/nautilus-view.c:7223
-msgid "Copy the current selection to the desktop"
-msgstr "Copy the current selection to the desktop"
-
-#: ../src/nautilus-view.c:7227
-msgid "Move the current selection to the desktop"
-msgstr "Move the current selection to the desktop"
-
-#. Translators: %s is a directory
-#: ../src/nautilus-view.c:7306
-#, c-format
-msgid "Run or manage scripts from %s"
-msgstr "Run or manage scripts from %s"
+#: ../src/nautilus-view.c:7480
+msgid "Run or manage scripts"
+msgstr "Run or manage scripts"
 
 #. Create a script action here specially because its tooltip is dynamic
-#: ../src/nautilus-view.c:7308
+#: ../src/nautilus-view.c:7482
 msgid "_Scripts"
 msgstr "_Scripts"
 
-#: ../src/nautilus-view.c:7681
+#: ../src/nautilus-view.c:7835
 #, c-format
-msgid "Move the open folder out of the trash to \"%s\""
-msgstr "Move the open folder out of the wastebasket to \"%s\""
+msgid "Move the open folder out of the trash to â%sâ"
+msgstr "Move the open folder out of the wastebasket to â%sâ"
 
-#: ../src/nautilus-view.c:7684
+#: ../src/nautilus-view.c:7839
 #, 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\""
+msgid "Move the selected folder out of the trash to â%sâ"
+msgstr "Move the selected folder out of the wastebasket to â%sâ"
 
-#: ../src/nautilus-view.c:7688
+#: ../src/nautilus-view.c:7842
 #, c-format
+msgid "Move the selected folders out of the trash to â%sâ"
+msgstr "Move the selected folders out of the wastebasket to â%sâ"
+
+#: ../src/nautilus-view.c:7847
 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"
+msgstr "Move the selected folder out of the wastebasket"
+
+#: ../src/nautilus-view.c:7849
+msgid "Move the selected folders out of the trash"
+msgstr "Move the selected folders out of the wastebasket"
 
-#: ../src/nautilus-view.c:7694
+#: ../src/nautilus-view.c:7855
 #, 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\""
+msgid "Move the selected file out of the trash to â%sâ"
+msgstr "Move the selected file out of the wastebasket to â%sâ"
 
-#: ../src/nautilus-view.c:7698
+#: ../src/nautilus-view.c:7858
 #, c-format
+msgid "Move the selected files out of the trash to â%sâ"
+msgstr "Move the selected file out of the wastebasket to â%sâ"
+
+#: ../src/nautilus-view.c:7863
 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"
+msgstr "Move the selected file out of the wastebasket"
+
+#: ../src/nautilus-view.c:7865
+msgid "Move the selected files out of the trash"
+msgstr "Move the selected files out of the wastebasket"
 
-#: ../src/nautilus-view.c:7704
+#: ../src/nautilus-view.c:7871
 #, 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\""
+msgid "Move the selected item out of the trash to â%sâ"
+msgstr "Move the selected item out of the wastebasket to â%sâ"
 
-#: ../src/nautilus-view.c:7708
+#: ../src/nautilus-view.c:7874
 #, c-format
+msgid "Move the selected items out of the trash to â%sâ"
+msgstr "Move the selected item out of the wastebasket to â%sâ"
+
+#: ../src/nautilus-view.c:7879
 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"
+msgstr "Move the selected item out of the wastebasket"
+
+#: ../src/nautilus-view.c:7881
+msgid "Move the selected items out of the trash"
+msgstr "Move the selected items out of the wastebasket"
 
-#: ../src/nautilus-view.c:7824 ../src/nautilus-view.c:7828
-#: ../src/nautilus-view.c:8015 ../src/nautilus-view.c:8019
+#: ../src/nautilus-view.c:7988 ../src/nautilus-view.c:7992
+#: ../src/nautilus-view.c:8177 ../src/nautilus-view.c:8181
 msgid "Start the selected drive"
 msgstr "Start the selected drive"
 
-#: ../src/nautilus-view.c:7832 ../src/nautilus-view.c:8023
+#: ../src/nautilus-view.c:7995 ../src/nautilus-view.c:8082
+#: ../src/nautilus-view.c:8184
+msgid "_Connect"
+msgstr "_Connect"
+
+#: ../src/nautilus-view.c:7996 ../src/nautilus-view.c:8185
 msgid "Connect to the selected drive"
 msgstr "Connect to the selected drive"
 
-#: ../src/nautilus-view.c:7835 ../src/nautilus-view.c:7922
-#: ../src/nautilus-view.c:8026
+#: ../src/nautilus-view.c:7999 ../src/nautilus-view.c:8086
+#: ../src/nautilus-view.c:8188
 msgid "_Start Multi-disk Drive"
 msgstr "_Start Multi-disk Drive"
 
-#: ../src/nautilus-view.c:7836 ../src/nautilus-view.c:8027
+#: ../src/nautilus-view.c:8000 ../src/nautilus-view.c:8189
 msgid "Start the selected multi-disk drive"
 msgstr "Start the selected multi-disk drive"
 
-#: ../src/nautilus-view.c:7839
+#: ../src/nautilus-view.c:8003
 msgid "U_nlock Drive"
 msgstr "U_nlock Drive"
 
-#: ../src/nautilus-view.c:7840 ../src/nautilus-view.c:8031
+#: ../src/nautilus-view.c:8004 ../src/nautilus-view.c:8193
 msgid "Unlock the selected drive"
 msgstr "Unlock the selected drive"
 
-#: ../src/nautilus-view.c:7853
+#: ../src/nautilus-view.c:8017
 msgid "Stop the selected drive"
 msgstr "Stop the selected drive"
 
-#: ../src/nautilus-view.c:7857 ../src/nautilus-view.c:8048
+#: ../src/nautilus-view.c:8021 ../src/nautilus-view.c:8210
 msgid "Safely remove the selected drive"
 msgstr "Safely remove the selected drive"
 
-#: ../src/nautilus-view.c:7860 ../src/nautilus-view.c:7947
-#: ../src/nautilus-view.c:8051
+#: ../src/nautilus-view.c:8024 ../src/nautilus-view.c:8111
+#: ../src/nautilus-view.c:8213
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
-#: ../src/nautilus-view.c:7861 ../src/nautilus-view.c:8052
+#: ../src/nautilus-view.c:8025 ../src/nautilus-view.c:8214
 msgid "Disconnect the selected drive"
 msgstr "Disconnect the selected drive"
 
-#: ../src/nautilus-view.c:7864 ../src/nautilus-view.c:7951
-#: ../src/nautilus-view.c:8055
+#: ../src/nautilus-view.c:8028 ../src/nautilus-view.c:8115
+#: ../src/nautilus-view.c:8217
 msgid "_Stop Multi-disk Drive"
 msgstr "_Stop Multi-disk Drive"
 
-#: ../src/nautilus-view.c:7865 ../src/nautilus-view.c:8056
+#: ../src/nautilus-view.c:8029 ../src/nautilus-view.c:8218
 msgid "Stop the selected multi-disk drive"
 msgstr "Stop the selected multi-disk drive"
 
-#: ../src/nautilus-view.c:7869 ../src/nautilus-view.c:8060
+#: ../src/nautilus-view.c:8033 ../src/nautilus-view.c:8222
 msgid "Lock the selected drive"
 msgstr "Lock the selected drive"
 
-#: ../src/nautilus-view.c:7911 ../src/nautilus-view.c:7915
+#: ../src/nautilus-view.c:8075 ../src/nautilus-view.c:8079
 msgid "Start the drive associated with the open folder"
 msgstr "Start the drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7919
+#: ../src/nautilus-view.c:8083
 msgid "Connect to the drive associated with the open folder"
 msgstr "Connect to the drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7923
+#: ../src/nautilus-view.c:8087
 msgid "Start the multi-disk drive associated with the open folder"
 msgstr "Start the multi-disk drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7927
+#: ../src/nautilus-view.c:8091
 msgid "Unlock the drive associated with the open folder"
 msgstr "Unlock the drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7940
+#: ../src/nautilus-view.c:8104
 msgid "_Stop the drive associated with the open folder"
 msgstr "_Stop the drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7944
+#: ../src/nautilus-view.c:8108
 msgid "Safely remove the drive associated with the open folder"
 msgstr "Safely remove the drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7948
+#: ../src/nautilus-view.c:8112
 msgid "Disconnect the drive associated with the open folder"
 msgstr "Disconnect the drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7952
+#: ../src/nautilus-view.c:8116
 msgid "Stop the multi-disk drive associated with the open folder"
 msgstr "Stop the multi-disk drive associated with the open folder"
 
-#: ../src/nautilus-view.c:7956
+#: ../src/nautilus-view.c:8120
 msgid "Lock the drive associated with the open folder"
 msgstr "Lock the drive associated with the open folder"
 
-#: ../src/nautilus-view.c:8183 ../src/nautilus-view.c:8461
+#: ../src/nautilus-view.c:8347 ../src/nautilus-view.c:8646
 msgid "_Delete Permanently"
 msgstr "_Delete Permanently"
 
-#: ../src/nautilus-view.c:8184
+#: ../src/nautilus-view.c:8348
 msgid "Delete the open folder permanently"
 msgstr "Delete the open folder permanently"
 
-#: ../src/nautilus-view.c:8188
+#: ../src/nautilus-view.c:8352
 msgid "Move the open folder to the Trash"
 msgstr "Move the open folder to the Wastebasket"
 
-#: ../src/nautilus-view.c:8368
+#: ../src/nautilus-view.c:8522
+#, c-format
+msgid "New Folder with Selection (%'d Item)"
+msgid_plural "New Folder with Selection (%'d Items)"
+msgstr[0] "New Folder with Selection (%'d Item)"
+msgstr[1] "New Folder with Selection (%'d Items)"
+
+#: ../src/nautilus-view.c:8562
 #, c-format
 msgid "_Open With %s"
 msgstr "_Open With %s"
 
-#: ../src/nautilus-view.c:8425
+#: ../src/nautilus-view.c:8610
 #, 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/nautilus-view.c:8445
+#: ../src/nautilus-view.c:8630
 #, 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/nautilus-view.c:8462
+#: ../src/nautilus-view.c:8647
 msgid "Delete all selected items permanently"
 msgstr "Delete all selected items permanently"
 
-#: ../src/nautilus-view.c:8518
+#: ../src/nautilus-view.c:8708
 msgid "View or modify the properties of the open folder"
 msgstr "View or modify the properties of the open folder"
 
-#: ../src/nautilus-view-dnd.c:172 ../src/nautilus-view-dnd.c:206
-#: ../src/nautilus-view-dnd.c:297
+#: ../src/nautilus-view-dnd.c:171 ../src/nautilus-view-dnd.c:205
+#: ../src/nautilus-view-dnd.c:296
 msgid "Drag and drop is not supported."
 msgstr "Drag and drop is not supported."
 
-#: ../src/nautilus-view-dnd.c:173
+#: ../src/nautilus-view-dnd.c:172
 msgid "Drag and drop is only supported on local file systems."
 msgstr "Drag and drop is only supported on local file systems."
 
-#: ../src/nautilus-view-dnd.c:207 ../src/nautilus-view-dnd.c:298
+#: ../src/nautilus-view-dnd.c:206 ../src/nautilus-view-dnd.c:297
 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/nautilus-view-dnd.c:375
-msgid "dropped text.txt"
-msgstr "dropped text.txt"
+#: ../src/nautilus-view-dnd.c:383
+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/nautilus-view-dnd.c:420
+#: ../src/nautilus-view-dnd.c:472
 msgid "dropped data"
 msgstr "dropped data"
 
-#: ../src/nautilus-window-bookmarks.c:83
-msgid ""
-"Do you want to remove any bookmarks with the non-existing location from your "
-"list?"
-msgstr ""
-"Do you want to remove any bookmarks with the non-existing location from your "
-"list?"
-
-#: ../src/nautilus-window-bookmarks.c:85
-#, c-format
-msgid "The location \"%s\" does not exist."
-msgstr "The location \"%s\" does not exist."
-
-#: ../src/nautilus-window-bookmarks.c:88
-msgid "Bookmark for Nonexistent Location"
-msgstr "Bookmark for Nonexistent Location"
-
-#: ../src/nautilus-window-bookmarks.c:316
-msgid "Go to the location specified by this bookmark"
-msgstr "Go to the location specified by this bookmark"
+#: ../src/nautilus-window.c:890
+msgid "_New Tab"
+msgstr "_New Tab"
 
-#: ../src/nautilus-window.c:1429
-#, c-format
-msgid "%s - File Browser"
-msgstr "%s â File Browser"
+#: ../src/nautilus-window.c:900 ../src/nautilus-window-menus.c:598
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
 
-#. Set initial window title
-#: ../src/nautilus-window.c:1897 ../src/nautilus-window-menus.c:384
-msgid "Nautilus"
-msgstr "Nautilus"
+#: ../src/nautilus-window.c:908 ../src/nautilus-window-menus.c:601
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
 
-#: ../src/nautilus-window-manage-views.c:1137
-msgid "Searching..."
-msgstr "Searchingâ"
+#: ../src/nautilus-window.c:919
+msgid "_Close Tab"
+msgstr "_Close Tab"
 
-#: ../src/nautilus-window-manage-views.c:1606
-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.c:2116
+msgid ""
+"Files is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Files is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public Licence as published by the Free Software "
+"Foundation; either version 2 of the Licence, or (at your option) any later "
+"version."
 
-#: ../src/nautilus-window-manage-views.c:1612
-msgid "The location is not a folder."
-msgstr "The location is not a folder."
+#: ../src/nautilus-window.c:2120
+msgid ""
+"Files is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Files is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
+"details."
 
-#: ../src/nautilus-window-manage-views.c:1618
+#: ../src/nautilus-window.c:2124
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+msgstr ""
+"You should have received a copy of the GNU General Public Licence along with "
+"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+
+#. Translators: these two strings here indicate the copyright time span,
+#. * e.g. 1999-2011.
+#.
+#: ../src/nautilus-window.c:2139
+msgid "Copyright  %Idâ%Id The Files authors"
+msgstr "Copyright  %Idâ%Id The Files authors"
+
+#: ../src/nautilus-window.c:2145
+msgid "Access and organize your files."
+msgstr "Access and organise your files."
+
+#. Translators should localize the following string
+#. * which will be displayed at the bottom of the about
+#. * box to give credit to the translator(s).
+#.
+#: ../src/nautilus-window.c:2155
+msgid "translator-credits"
+msgstr ""
+"Abigail Brady <morwen evilmagic org>\n"
+"Bastien Nocera <hadess hadess net>\n"
+"Gareth Owen <gowen72 yahoo com>\n"
+"David Lodge <dave cirt net>\n"
+"Philip Withnall <philip tecnocode co uk>\n"
+"Bruce Cowan <bruce bcowan me uk>\n"
+"Chris Leonard <cjl laptop org>"
+
+#: ../src/nautilus-window-manage-views.c:892
+#: ../src/nautilus-window-manage-views.c:1041
 #, c-format
-msgid "Could not find \"%s\"."
-msgstr "Could not find \"%s\"."
+msgid "Unable to load location"
+msgstr "Unable to load location"
 
-#: ../src/nautilus-window-manage-views.c:1621
-msgid "Please check the spelling and try again."
-msgstr "Please check the spelling and try again."
+#: ../src/nautilus-window-manage-views.c:1195
+msgid "Searching..."
+msgstr "Searchingâ"
 
-#: ../src/nautilus-window-manage-views.c:1629
+#: ../src/nautilus-window-manage-views.c:1653
+msgid "Unable to display the contents of this folder."
+msgstr "Unable to display the contents of this folder."
+
+#: ../src/nautilus-window-manage-views.c:1655
+msgid "This location doesn't appear to be a folder."
+msgstr "This location doesn't appear to be a folder."
+
+#: ../src/nautilus-window-manage-views.c:1660
+msgid ""
+"Unable to find the requested file. Please check the spelling and try again."
+msgstr ""
+"Unable to find the requested file. Please check the spelling and try again."
+
+#: ../src/nautilus-window-manage-views.c:1665
 #, c-format
-msgid "Nautilus cannot handle \"%s\" locations."
-msgstr "Nautilus cannot handle \"%s\" locations."
+msgid "â%sâ locations are not supported."
+msgstr "â%sâ locations are not supported."
 
-#: ../src/nautilus-window-manage-views.c:1632
-msgid "Nautilus cannot handle this kind of location."
-msgstr "Nautilus cannot handle this kind of location."
+#: ../src/nautilus-window-manage-views.c:1668
+msgid "Unable to handle this kind of location."
+msgstr "Unable to handle this kind of location."
 
-#: ../src/nautilus-window-manage-views.c:1639
-msgid "Unable to mount the location."
-msgstr "Unable to mount the location."
+#: ../src/nautilus-window-manage-views.c:1673
+msgid "Unable to access the requested location."
+msgstr "Unable to access the requested location."
 
-#: ../src/nautilus-window-manage-views.c:1645
-msgid "Access was denied."
-msgstr "Access was denied."
+#: ../src/nautilus-window-manage-views.c:1676
+msgid "Don't have permission to access the requested location."
+msgstr "Don't have permission to access the requested location."
 
 #. This case can be hit for user-typed strings like "foo" due to
 #. * the code that guesses web addresses when there's no initial "/".
 #. * But this case is also hit for legitimate web addresses when
 #. * the proxy is set up wrong.
 #.
-#: ../src/nautilus-window-manage-views.c:1654
-#, 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:1656
+#: ../src/nautilus-window-manage-views.c:1684
 msgid ""
-"Check that the spelling is correct and that your proxy settings are correct."
+"Unable to find the requested location. Please check the spelling or the "
+"network settings."
 msgstr ""
-"Check that the spelling is correct and that your proxy settings are correct."
+"Unable to find the requested location. Please check the spelling or the "
+"network"
 
-#: ../src/nautilus-window-manage-views.c:1671
+#: ../src/nautilus-window-manage-views.c:1695
 #, c-format
-msgid ""
-"Error: %s\n"
-"Please select another viewer and try again."
-msgstr ""
-"Error: %s\n"
-"Please select another viewer and try again."
+msgid "Unhandled error message: %s"
+msgstr "Unhandled error message: %s"
 
-#: ../src/nautilus-window-menus.c:357
-msgid ""
-"Nautilus is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public License as published by the Free "
-"Software Foundation; either version 2 of the License, or (at your option) "
-"any later version."
-msgstr ""
-"Nautilus is free software; you can redistribute it and/or modify it under "
-"the terms of the GNU General Public Licence as published by the Free "
-"Software Foundation; either version 2 of the Licence, or (at your option) "
-"any later version."
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:494
+msgid "_Close"
+msgstr "_Close"
 
-#: ../src/nautilus-window-menus.c:361
-msgid ""
-"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"Nautilus is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
-"details."
+#. tooltip
+#: ../src/nautilus-window-menus.c:495
+msgid "Close this folder"
+msgstr "Close this folder"
 
-#: ../src/nautilus-window-menus.c:365
+#: ../src/nautilus-window-menus.c:499
+msgid "Edit Nautilus preferences"
+msgstr "Edit Nautilus preferences"
+
+#. name, stock id, label
+#: ../src/nautilus-window-menus.c:501
+msgid "Open _Parent"
+msgstr "Open _Parent"
+
+#: ../src/nautilus-window-menus.c:502
+msgid "Open the parent folder"
+msgstr "Open the parent folder"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:506
+msgid "Stop loading the current location"
+msgstr "Stop loading the current location"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:509
+msgid "_Reload"
+msgstr "_Reload"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:510
+msgid "Reload the current location"
+msgstr "Reload the current location"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:513
+msgid "_All Topics"
+msgstr "_All Topics"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:514
+msgid "Display Nautilus help"
+msgstr "Display Nautilus help"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:517
+msgid "Search for files"
+msgstr "Search for files"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:518
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"Locate files based on file name and type. Save your searches for later use."
 msgstr ""
-"You should have received a copy of the GNU General Public Licence along with "
-"Nautilus; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"Locate files based on file name and type. Save your searches for later use."
 
-#. Translators: these two strings here indicate the copyright time span,
-#. * e.g. 1999-2011.
-#.
-#: ../src/nautilus-window-menus.c:380
-msgid "Copyright  %Idâ%Id The Nautilus authors"
-msgstr "Copyright  %Idâ%Id The Nautilus authors"
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:521
+msgid "Sort files and folders"
+msgstr "Sort files and folders"
 
-#: ../src/nautilus-window-menus.c:386
+#. tooltip
+#: ../src/nautilus-window-menus.c:522
+msgid "Arrange files by name, size, type, or when they were changed."
+msgstr "Arrange files by name, size, type, or when they were changed."
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:525
+msgid "Find a lost file"
+msgstr "Find a lost file"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:526
+msgid "Follow these tips if you can't find a file you created or downloaded."
+msgstr "Follow these tips if you can't find a file you created or downloaded."
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:529
+msgid "Share and transfer files"
+msgstr "Share and transfer files"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:530
 msgid ""
-"Nautilus lets you organize files and folders, both on your computer and "
-"online."
+"Easily transfer files to your contacts and devices from the file manager."
 msgstr ""
-"Nautilus lets you organise files and folders, both on your computer and "
-"online."
+"Easily transfer files to your contacts and devices from the file manager."
 
-#. Translators should localize the following string
-#. * which will be displayed at the bottom of the about
-#. * box to give credit to the translator(s).
-#.
-#: ../src/nautilus-window-menus.c:398
-msgid "translator-credits"
-msgstr ""
-"Abigail Brady <morwen evilmagic org>\n"
-"Bastien Nocera <hadess hadess net>\n"
-"Gareth Owen <gowen72 yahoo com>\n"
-"David Lodge <dave cirt net>\n"
-"Philip Withnall <philip tecnocode co uk>\n"
-"Bruce Cowan <bruce bcowan me uk>"
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:533
+msgid "_About"
+msgstr "_About"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:534
+msgid "Display credits for the creators of Nautilus"
+msgstr "Display credits for the creators of Nautilus"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:537
+msgid "Zoom _In"
+msgstr "Zoom _In"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:538
+msgid "Increase the view size"
+msgstr "Increase the view size"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:549
+msgid "Zoom _Out"
+msgstr "Zoom _Out"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:550
+msgid "Decrease the view size"
+msgstr "Decrease the view size"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:557
+msgid "Normal Si_ze"
+msgstr "Normal Si_ze"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:558
+msgid "Use the normal view size"
+msgstr "Use the normal view size"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:561
+msgid "Connect to _Server..."
+msgstr "Connect to _Serverâ"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:562
+msgid "Connect to a remote computer or shared disk"
+msgstr "Connect to a remote computer or shared disk"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:565 ../src/nautilus-window-menus.c:758
+msgid "_Home"
+msgstr "_Home"
+
+#: ../src/nautilus-window-menus.c:569
+msgid "Open another Nautilus window for the displayed location"
+msgstr "Open another Nautilus window for the displayed location"
 
-#: ../src/nautilus-window-menus.c:401
-msgid "Nautilus Web Site"
-msgstr "Nautilus Website"
+#. name, stock id, label
+#: ../src/nautilus-window-menus.c:571
+msgid "New _Tab"
+msgstr "New _Tab"
+
+#: ../src/nautilus-window-menus.c:572
+msgid "Open another tab for the displayed location"
+msgstr "Open another tab for the displayed location"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:911
-msgid "_File"
-msgstr "_File"
+#: ../src/nautilus-window-menus.c:574
+msgid "Close _All Windows"
+msgstr "Close _All Windows"
+
+#: ../src/nautilus-window-menus.c:575
+msgid "Close all Navigation windows"
+msgstr "Close all Navigation windows"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:912
-msgid "_Edit"
-msgstr "_Edit"
+#: ../src/nautilus-window-menus.c:577
+msgid "_Back"
+msgstr "_Back"
+
+#: ../src/nautilus-window-menus.c:578
+msgid "Go to the previous visited location"
+msgstr "Go to the previous visited location"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:913
-msgid "_View"
-msgstr "_View"
+#: ../src/nautilus-window-menus.c:580
+msgid "_Forward"
+msgstr "_Forward"
+
+#: ../src/nautilus-window-menus.c:581
+msgid "Go to the next visited location"
+msgstr "Go to the next visited location"
 
 #. name, stock id, label
-#: ../src/nautilus-window-menus.c:914
-msgid "_Help"
-msgstr "_Help"
+#: ../src/nautilus-window-menus.c:583
+msgid "Enter _Location..."
+msgstr "Enter _Locationâ"
+
+#: ../src/nautilus-window-menus.c:584
+msgid "Specify a location to open"
+msgstr "Specify a location to open"
+
+#. name, stock id, label
+#: ../src/nautilus-window-menus.c:586
+msgid "Bookmark this Location"
+msgstr "Bookmark this Location"
+
+#: ../src/nautilus-window-menus.c:587
+msgid "Add a bookmark for the current location"
+msgstr "Add a bookmark for the current location"
+
+#. name, stock id, label
+#: ../src/nautilus-window-menus.c:589
+msgid "_Bookmarks..."
+msgstr "_Bookmarksâ"
+
+#: ../src/nautilus-window-menus.c:590
+msgid "Display and edit bookmarks"
+msgstr "Display and edit bookmarks"
+
+#: ../src/nautilus-window-menus.c:592
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
+
+#: ../src/nautilus-window-menus.c:593
+msgid "Activate previous tab"
+msgstr "Activate previous tab"
+
+#: ../src/nautilus-window-menus.c:595
+msgid "_Next Tab"
+msgstr "_Next Tab"
+
+#: ../src/nautilus-window-menus.c:596
+msgid "Activate next tab"
+msgstr "Activate next tab"
+
+#: ../src/nautilus-window-menus.c:599
+msgid "Move current tab to left"
+msgstr "Move current tab to left"
+
+#: ../src/nautilus-window-menus.c:602
+msgid "Move current tab to right"
+msgstr "Move current tab to right"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:613
+msgid "Show _Hidden Files"
+msgstr "Show _Hidden Files"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:614
+msgid "Toggle the display of hidden files in the current window"
+msgstr "Toggle the display of hidden files in the current window"
+
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-window-menus.c:618
+msgid "_Show Sidebar"
+msgstr "_Show Sidebar"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:619
+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-window-menus.c:623
+msgid "_Search for Files..."
+msgstr "_Search for Filesâ"
+
+#. tooltip
+#: ../src/nautilus-window-menus.c:624
+msgid "Search documents and folders by name"
+msgstr "Search documents and folders by name"
+
+#: ../src/nautilus-window-menus.c:630 ../src/nautilus-window-menus.c:632
+msgid "List"
+msgstr "List"
+
+#: ../src/nautilus-window-menus.c:631
+msgid "View items as a list"
+msgstr "View items as a list"
+
+#: ../src/nautilus-window-menus.c:633
+msgid "View items as a grid of icons"
+msgstr "View items as a grid of icons"
+
+#: ../src/nautilus-window-menus.c:755
+msgid "_Up"
+msgstr "_Up"
+
+#: ../src/nautilus-x-content-bar.c:93
+msgid "Audio CD"
+msgstr "Audio CD"
+
+#: ../src/nautilus-x-content-bar.c:95
+msgid "Audio DVD"
+msgstr "Audio DVD"
+
+#: ../src/nautilus-x-content-bar.c:97
+msgid "Video DVD"
+msgstr "Video DVD"
+
+#: ../src/nautilus-x-content-bar.c:99
+msgid "Video CD"
+msgstr "Video CD"
+
+#: ../src/nautilus-x-content-bar.c:101
+msgid "Super Video CD"
+msgstr "Super Video CD"
+
+#: ../src/nautilus-x-content-bar.c:103
+msgid "Photo CD"
+msgstr "Photo CD"
+
+#: ../src/nautilus-x-content-bar.c:105
+msgid "Picture CD"
+msgstr "Picture CD"
+
+#: ../src/nautilus-x-content-bar.c:107 ../src/nautilus-x-content-bar.c:140
+msgid "Contains digital photos"
+msgstr "Contains digital photos"
+
+#: ../src/nautilus-x-content-bar.c:109
+msgid "Contains music"
+msgstr "Contains music"
+
+#: ../src/nautilus-x-content-bar.c:111
+msgid "Contains software"
+msgstr "Contains software"
+
+#. fallback to generic greeting
+#: ../src/nautilus-x-content-bar.c:114
+#, c-format
+msgid "Detected as â%sâ"
+msgstr "Detected as â%sâ"
+
+#: ../src/nautilus-x-content-bar.c:136
+msgid "Contains music and photos"
+msgstr "Contains music and photos"
+
+#: ../src/nautilus-x-content-bar.c:138
+msgid "Contains photos and music"
+msgstr "Contains photos and music"
+
+#: ../src/nautilus-x-content-bar.c:195
+msgid "Open with:"
+msgstr "Open with:"
+
+#~ msgid "Free space: %s"
+#~ msgstr "Free space: %s"
+
+#~ msgid "%s, Free space: %s"
+#~ msgstr "%s, Free space: %s"
+
+#~ msgid "%s, %s"
+#~ msgstr "%s, %s"
+
+#~ msgid "%s%s, %s"
+#~ msgstr "%s%s, %s"
+
+#, fuzzy
+#~| msgid "\"%s\" will be moved if you select the Paste command"
+#~ msgid "â%sâ will be moved if you select the Paste command"
+#~ msgstr "\"%s\" will be moved if you select the Paste command"
+
+#, fuzzy
+#~| msgid "\"%s\" will be copied if you select the Paste command"
+#~ msgid "â%sâ will be copied if you select the Paste command"
+#~ msgstr "\"%s\" will be copied if you select the Paste command"
+
+#~ msgid "The %'d selected item will be moved if you select the Paste command"
+#~ msgid_plural ""
+#~ "The %'d selected items will be moved if you select the Paste command"
+#~ 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"
+
+#~ msgid "The %'d selected item will be copied if you select the Paste command"
+#~ msgid_plural ""
+#~ "The %'d selected items will be copied if you select the Paste command"
+#~ msgstr[0] ""
+#~ "The %'d selected item will be copied if you select the Paste command"
+#~ msgstr[1] ""
+#~ "The %'d selected items will be copied if you select the Paste command"
+
+#~ msgid "There is nothing on the clipboard to paste."
+#~ msgstr "There is nothing on the clipboard to paste."
+
+#~ msgid "Connect to Server %s"
+#~ msgstr "Connect to Server %s"
+
+#~ msgid "Link _name:"
+#~ msgstr "Link _name:"
+
+#~ msgid "D_uplicate"
+#~ msgstr "D_uplicate"
+
+#~ msgid "Duplicate each selected item"
+#~ msgstr "Duplicate each selected item"
+
+#~ msgid "Connect To This Server"
+#~ msgstr "Connect To This Server"
+
+#~ msgid "Make a permanent connection to this server"
+#~ msgstr "Make a permanent connection to this server"
+
+#~ msgid "Autorun Prompt"
+#~ msgstr "Autorun Prompt"
+
+#~ msgid "Date Accessed"
+#~ msgstr "Date Accessed"
+
+#~ msgid "The date the file was accessed."
+#~ msgstr "The date the file was accessed."
+
+#~ msgid "Octal Permissions"
+#~ msgstr "Octal Permissions"
+
+#~ msgid "The permissions of the file, in octal notation."
+#~ msgstr "The permissions of the file, in octal notation."
+
+#~ msgid "today at 00:00:00 PM"
+#~ msgstr "today at 00:00:00"
+
+#~ msgid "today at %-I:%M:%S %p"
+#~ msgstr "today at %-H:%M:%S"
+
+#~ msgid "today at 00:00 PM"
+#~ msgstr "today at 00:00"
+
+#~ msgid "today at %-I:%M %p"
+#~ msgstr "today at %-H:%M"
+
+#~ msgid "today, 00:00 PM"
+#~ msgstr "today, 00:00"
+
+#~ msgid "today"
+#~ msgstr "today"
+
+#~ msgid "yesterday at 00:00:00 PM"
+#~ msgstr "yesterday at 00:00:00"
+
+#~ msgid "yesterday at %-I:%M:%S %p"
+#~ msgstr "yesterday at %-H:%M:%S"
+
+#~ msgid "yesterday at 00:00 PM"
+#~ msgstr "yesterday at 00:00"
+
+#~ msgid "yesterday at %-I:%M %p"
+#~ msgstr "yesterday at %-H:%M"
+
+#~ msgid "yesterday, 00:00 PM"
+#~ msgstr "yesterday, 00:00"
+
+#~ msgid "yesterday, %-I:%M %p"
+#~ msgstr "yesterday, %-G=H:%M"
+
+#~ msgid "yesterday"
+#~ msgstr "yesterday"
+
+#~ msgid "Wednesday, September 00 0000 at 00:00:00 PM"
+#~ msgstr "Wednesday, 00 September 0000 at 00:00:00"
+
+#~ msgid "%A, %B %-d %Y at %-I:%M:%S %p"
+#~ msgstr "%A, %-d %B %Y at %-H:%M:%S"
+
+#~ msgid "Mon, Oct 00 0000 at 00:00:00 PM"
+#~ msgstr "Mon, 00 Oct 0000 at 00:00:00"
+
+#~ msgid "Mon, Oct 00 0000 at 00:00 PM"
+#~ msgstr "Mon, 00 Oct 0000 at 00:00"
+
+#~ msgid "%a, %b %-d %Y at %-I:%M %p"
+#~ msgstr "%a, %-d %b %Y at %-H:%M"
+
+#~ msgid "Oct 00 0000 at 00:00 PM"
+#~ msgstr "00 Oct 0000 at 00:00"
+
+#~ msgid "%b %-d %Y at %-I:%M %p"
+#~ msgstr "%-d %-b %Y at %-H:%M"
+
+#~ msgid "Oct 00 0000, 00:00 PM"
+#~ msgstr "00 Oct 0000, 00:00"
+
+#~ msgid "00/00/00, 00:00 PM"
+#~ msgstr "00/00/00, 00:00"
+
+#~ msgid "%m/%-d/%y, %-I:%M %p"
+#~ msgstr "%-d/%m/%y, %-H:%M"
+
+#~ msgid "00/00/00"
+#~ msgstr "00/00/00"
+
+#~ msgid "%m/%d/%y"
+#~ msgstr "%d/%m/%y"
+
+#~ msgid "The file \"%B\" cannot be moved to the trash."
+#~ msgstr "The file \"%B\" cannot be moved to the wastebasket."
+
+#~ msgid "Show other applications"
+#~ msgstr "Show other applications"
+
+#~ msgid "Edit"
+#~ msgstr "Edit"
+
+#~ msgid "Undo Edit"
+#~ msgstr "Undo Edit"
+
+#~ msgid "Undo the edit"
+#~ msgstr "Undo the edit"
+
+#~ msgid "Redo Edit"
+#~ msgstr "Redo Edit"
+
+#~ msgid "Redo the edit"
+#~ msgstr "Redo the edit"
+
+#~ msgid ""
+#~ "Enables the classic Nautilus behavior, where all windows are browsers"
+#~ msgstr ""
+#~ "Enables the classic Nautilus behaviour, where all windows are browsers"
+
+#~ msgid ""
+#~ "If set to true, then all Nautilus windows will be browser windows. This "
+#~ "is how Nautilus used to behave before version 2.6, and some people prefer "
+#~ "this behavior."
+#~ msgstr ""
+#~ "If set to true, then all Nautilus windows will be browser windows. This "
+#~ "is how Nautilus used to behave before version 2.6, and some people prefer "
+#~ "this behaviour."
+
+#~ msgid "When to show preview text in icons"
+#~ msgstr "When to show preview text in icons"
+
+#~ 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 "
+#~ "folder is on a remote server. If set to \"local-only\" then only show "
+#~ "previews for local file systems. If set to \"never\" then never bother to "
+#~ "read preview data."
+#~ msgstr ""
+#~ "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 "
+#~ "folder is on a remote server. If set to \"local-only\" then only show "
+#~ "previews for local file systems. If set to \"never\" then never bother to "
+#~ "read preview data."
+
+#~ msgid "Show advanced permissions in the file property dialog"
+#~ msgstr "Show advanced permissions in the file property dialogue"
+
+#~ msgid ""
+#~ "If set to true, then Nautilus lets you edit and display file permissions "
+#~ "in a more unix-like way, accessing some more esoteric options."
+#~ msgstr ""
+#~ "If set to true, then Nautilus lets you edit and display file permissions "
+#~ "in a more unix-like way, accessing some more esoteric options."
+
+#~ msgid "Nautilus uses the users home folder as the desktop"
+#~ msgstr "Nautilus uses the users home folder as the desktop"
+
+#~ msgid ""
+#~ "If set to true, then Nautilus will use the user's home folder as the "
+#~ "desktop. If it is false, then it will use ~/Desktop as the desktop."
+#~ msgstr ""
+#~ "If set to true, then Nautilus will use the user's home folder as the "
+#~ "desktop. If it is false, then it will use ~/Desktop as the desktop."
+
+#~ msgid "Date Format"
+#~ msgstr "Date Format"
+
+#~ msgid ""
+#~ "The format of file dates. Possible values are \"locale\", \"iso\", and "
+#~ "\"informal\"."
+#~ msgstr ""
+#~ "The format of file dates. Possible values are \"locale\", \"iso\", and "
+#~ "\"informal\"."
+
+#~ msgid "Put labels beside icons"
+#~ msgstr "Put labels beside icons"
+
+#~ msgid ""
+#~ "If true, labels will be placed beside icons rather than underneath them."
+#~ msgstr ""
+#~ "If true, labels will be placed beside icons rather than underneath them."
+
+#~ msgid "Default compact view zoom level"
+#~ msgstr "Default compact view zoom level"
+
+#~ msgid "Default zoom level used by the compact view."
+#~ msgstr "Default zoom level used by the compact view."
+
+#~ msgid "All columns have same width"
+#~ msgstr "All columns have same width"
+
+#~ msgid ""
+#~ "If this preference is set, all columns in the compact view have the same "
+#~ "width. Otherwise, the width of each column is determined seperately."
+#~ msgstr ""
+#~ "If this preference is set, all columns in the compact view have the same "
+#~ "width. Otherwise, the width of each column is determined separately."
+
+#~ msgid "Only show folders in the tree side pane"
+#~ msgstr "Only show folders in the tree side pane"
+
+#~ msgid ""
+#~ "If set to true, Nautilus will only show folders in the tree side pane. "
+#~ "Otherwise it will show both folders and files."
+#~ msgstr ""
+#~ "If set to true, Nautilus will only show folders in the tree side pane. "
+#~ "Otherwise it will show both folders and files."
+
+#~ msgid "Computer icon visible on desktop"
+#~ msgstr "Computer icon visible on desktop"
+
+#~ msgid ""
+#~ "If this is set to true, an icon linking to the computer location will be "
+#~ "put on the desktop."
+#~ msgstr ""
+#~ "If this is set to true, an icon linking to the computer location will be "
+#~ "put on the desktop."
+
+#~ msgid "Desktop computer icon name"
+#~ msgstr "Desktop computer icon name"
+
+#~ msgid ""
+#~ "This name can be set if you want a custom name for the computer icon on "
+#~ "the desktop."
+#~ msgstr ""
+#~ "This name can be set if you want a custom name for the computer icon on "
+#~ "the desktop."
+
+#~ msgid "Show toolbar in new windows"
+#~ msgstr "Show toolbar in new windows"
+
+#~ msgid "If set to true, newly opened windows will have toolbars visible."
+#~ msgstr "If set to true, newly opened windows will have toolbars visible."
+
+#~ msgid "Show status bar in new windows"
+#~ msgstr "Show status bar in new windows"
+
+#~ msgid ""
+#~ "If set to true, newly opened windows will have the status bar visible."
+#~ msgstr ""
+#~ "If set to true, newly opened windows will have the status bar visible."
+
+#~ msgid "Side pane view"
+#~ msgstr "Side pane view"
+
+#~ msgid "The side pane view to show in newly opened windows."
+#~ msgstr "The side pane view to show in newly opened windows."
+
+#~ msgid "Nautilus could not create the required folder \"%s\"."
+#~ msgstr "Nautilus could not create the required folder \"%s\"."
+
+#~ msgid "Nautilus could not create the following required folders: %s."
+#~ msgstr "Nautilus could not create the following required folders: %s."
+
+#~ msgid ""
+#~ "Before running Nautilus, please create these folders, or set permissions "
+#~ "such that Nautilus can create them."
+#~ msgstr ""
+#~ "Before running Nautilus, please create these folders, or set permissions "
+#~ "such that Nautilus can create them."
+
+#~ msgid "Error starting autorun program: %s"
+#~ msgstr "Error starting autorun program: %s"
+
+#~ msgid "Cannot find the autorun program"
+#~ msgstr "Cannot find the autorun program"
+
+#~ msgid "<big><b>Error autorunning software</b></big>"
+#~ msgstr "<big><b>Error autorunning software</b></big>"
+
+#~ msgid ""
+#~ "The software will run directly from the medium \"%s\". You should never "
+#~ "run software that you don't trust.\n"
+#~ "\n"
+#~ "If in doubt, press Cancel."
+#~ msgstr ""
+#~ "The software will run directly from the medium \"%s\". You should never "
+#~ "run software that you don't trust.\n"
+#~ "\n"
+#~ "If in doubt, press Cancel."
+
+#~ msgid "<b>_Bookmarks</b>"
+#~ msgstr "<b>_Bookmarks</b>"
+
+#~ msgid "<b>_Name</b>"
+#~ msgstr "<b>_Name</b>"
+
+#~ msgid "<b>_Location</b>"
+#~ msgstr "<b>_Location</b>"
+
+#~ msgid "File Management Preferences"
+#~ msgstr "File Management Preferences"
+
+#~ msgid "_Text beside icons"
+#~ msgstr "_Text beside icons"
+
+#~ msgid "<b>Compact View Defaults</b>"
+#~ msgstr "<b>Compact View Defaults</b>"
+
+#~ msgid "_Default zoom level:"
+#~ msgstr "_Default zoom level:"
+
+#~ msgid "A_ll columns have the same width"
+#~ msgstr "A_ll columns have the same width"
+
+#~ msgid "<b>Tree View Defaults</b>"
+#~ msgstr "<b>Tree View Defaults</b>"
+
+#~ msgid "Show _only folders"
+#~ msgstr "Show _only folders"
+
+#~ msgid "<b>Behavior</b>"
+#~ msgstr "<b>Behaviour</b>"
+
+#~ msgid "Open each _folder in its own window"
+#~ msgstr "Open each _folder in its own window"
+
+#~ msgid "<b>Trash</b>"
+#~ msgstr "<b>Wastebasket</b>"
+
+#~ msgid "<b>Date</b>"
+#~ msgstr "<b>Date</b>"
+
+#~ msgid "_Format:"
+#~ msgstr "_Format:"
+
+#~ msgid "<b>List Columns</b>"
+#~ msgstr "<b>List Columns</b>"
+
+#~ msgid "<b>Text Files</b>"
+#~ msgstr "<b>Text Files</b>"
+
+#~ msgid "Show te_xt in icons:"
+#~ msgstr "Show te_xt in icons:"
+
+#~ msgid "<b>Other Previewable Files</b>"
+#~ msgstr "<b>Other Previewable Files</b>"
+
+#~ msgid "<b>Folders</b>"
+#~ msgstr "<b>Folders</b>"
+
+#~ msgid "Compact View"
+#~ msgstr "Compact View"
+
+#~ msgid "_Compact"
+#~ msgstr "_Compact"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:916
-msgid "_Close"
-msgstr "_Close"
+#~ msgid "The compact view encountered an error."
+#~ msgstr "The compact view encountered an error."
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:917
-msgid "Close this folder"
-msgstr "Close this folder"
+#~ msgid "The compact view encountered an error while starting up."
+#~ msgstr "The compact view encountered an error while starting up."
 
-#: ../src/nautilus-window-menus.c:920
-msgid "Prefere_nces"
-msgstr "Prefere_nces"
+#~ msgid "Display this location with the compact view."
+#~ msgstr "Display this location with the compact view."
 
-#: ../src/nautilus-window-menus.c:921
-msgid "Edit Nautilus preferences"
-msgstr "Edit Nautilus preferences"
+#~ 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-window-menus.c:925
-msgid "Undo the last text change"
-msgstr "Undo the last text change"
+#~ 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"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:928
-msgid "Open _Parent"
-msgstr "Open _Parent"
+#~ msgid "loading..."
+#~ msgstr "loadingâ"
 
-#: ../src/nautilus-window-menus.c:929
-msgid "Open the parent folder"
-msgstr "Open the parent folder"
+#~ msgid "Opening \"%s\"."
+#~ msgstr "Opening \"%s\"."
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:936
-msgid "Stop loading the current location"
-msgstr "Stop loading the current location"
+#~ msgid "File System"
+#~ msgstr "File System"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:939
-msgid "_Reload"
-msgstr "_Reload"
+#~ msgid "_Read"
+#~ msgstr "_Read"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:940
-msgid "Reload the current location"
-msgstr "Reload the current location"
+#~ msgid "_Write"
+#~ msgstr "_Write"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:943
-msgid "_All Topics"
-msgstr "_All Topics"
+#~ msgid "E_xecute"
+#~ msgstr "E_xecute"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:944
-msgid "Display Nautilus help"
-msgstr "Display Nautilus help"
+#~ msgid "Special flags:"
+#~ msgstr "Special flags:"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:947
-msgid "Search for files"
-msgstr "Search for files"
+#~ msgid "Set _user ID"
+#~ msgstr "Set _user ID"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:948
-msgid ""
-"Locate files based on file name and type. Save your searches for later use."
-msgstr ""
-"Locate files based on file name and type. Save your searches for later use."
+#~ msgid "Set gro_up ID"
+#~ msgstr "Set gro_up ID"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:951
-msgid "Sort files and folders"
-msgstr "Sort files and folders"
+#~ msgid "_Sticky"
+#~ msgstr "_Sticky"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:952
-msgid "Arrange files by name, size, type, or when they were changed."
-msgstr "Arrange files by name, size, type, or when they were changed."
+#~ msgid "Folder Permissions:"
+#~ msgstr "Folder Permissions:"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:955
-msgid "Find a lost file"
-msgstr "Find a lost file"
+#~ msgid "File Permissions:"
+#~ msgstr "File Permissions:"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:956
-msgid "Follow these tips if you can't find a file you created or downloaded."
-msgstr "Follow these tips if you can't find a file you created or downloaded."
+#~ msgid "Text view:"
+#~ msgstr "Text view:"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:959
-msgid "Share and transfer files"
-msgstr "Share and transfer files"
+#~ msgid "Last changed:"
+#~ msgstr "Last changed:"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:960
-msgid ""
-"Easily transfer files to your contacts and devices from the file manager."
-msgstr ""
-"Easily transfer files to your contacts and devices from the file manager."
+#~ msgid "Select folder to search in"
+#~ msgstr "Select folder to search in"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:963
-msgid "_About"
-msgstr "_About"
+#~ msgid "Search Folder"
+#~ msgstr "Search Folder"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:964
-msgid "Display credits for the creators of Nautilus"
-msgstr "Display credits for the creators of Nautilus"
+#~ msgid "Edit the saved search"
+#~ msgstr "Edit the saved search"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:967
-msgid "Zoom _In"
-msgstr "Zoom _In"
+#~ msgid "Go"
+#~ msgstr "Go"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:968
-msgid "Increase the view size"
-msgstr "Increase the view size"
+#~ msgid "Reload"
+#~ msgstr "Reload"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:979
-msgid "Zoom _Out"
-msgstr "Zoom _Out"
+#~ msgid "Perform or update the search"
+#~ msgstr "Perform or update the search"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:980
-msgid "Decrease the view size"
-msgstr "Decrease the view size"
+#~ msgid "_Search for:"
+#~ msgstr "_Search for:"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:987
-msgid "Normal Si_ze"
-msgstr "Normal Si_ze"
+#~ msgid "Search results"
+#~ msgstr "Search results"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:988
-msgid "Use the normal view size"
-msgstr "Use the normal view size"
+#~ msgid "Search:"
+#~ msgstr "Search:"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:991
-msgid "Connect to _Server..."
-msgstr "Connect to _Serverâ"
+#~ msgid "Restore Selected Items"
+#~ msgstr "Restore Selected Items"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:992
-msgid "Connect to a remote computer or shared disk"
-msgstr "Connect to a remote computer or shared disk"
+#~ msgid "Network Neighbourhood"
+#~ msgstr "Network Neighbourhood"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:999
-msgid "_Computer"
-msgstr "_Computer"
+#~ msgid ""
+#~ "Choosing a script from the menu will run that script with any selected "
+#~ "items as input."
+#~ msgstr ""
+#~ "Choosing a script from the menu will run that script with any selected "
+#~ "items as input."
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1000
-msgid ""
-"Browse all local and remote disks and folders accessible from this computer"
-msgstr ""
-"Browse all local and remote disks and folders accessible from this computer"
+#~ msgid ""
+#~ "All executable files in this folder will appear in the Scripts menu. "
+#~ "Choosing a script from the menu will run that script.\n"
+#~ "\n"
+#~ "When executed from a local folder, scripts will be passed the selected "
+#~ "file names. When executed from a remote folder (e.g. a folder showing web "
+#~ "or ftp content), scripts will be passed no parameters.\n"
+#~ "\n"
+#~ "In all cases, the following environment variables will be set by "
+#~ "Nautilus, which the scripts may use:\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+#~ "files (only if local)\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_FILE_PATHS: newline-delimited paths "
+#~ "for selected files in the inactive pane of a split-view window (only if "
+#~ "local)\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_URIS: newline-delimited URIs for "
+#~ "selected files in the inactive pane of a split-view window\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_NEXT_PANE_CURRENT_URI: URI for current location in the "
+#~ "inactive pane of a split-view window"
+#~ msgstr ""
+#~ "All executable files in this folder will appear in the Scripts menu. "
+#~ "Choosing a script from the menu will run that script.\n"
+#~ "\n"
+#~ "When executed from a local folder, scripts will be passed the selected "
+#~ "file names. When executed from a remote folder (e.g. a folder showing web "
+#~ "or ftp content), scripts will be passed no parameters.\n"
+#~ "\n"
+#~ "In all cases, the following environment variables will be set by "
+#~ "Nautilus, which the scripts may use:\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_SELECTED_FILE_PATHS: newline-delimited paths for selected "
+#~ "files (only if local)\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_SELECTED_URIS: newline-delimited URIs for selected files\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_FILE_PATHS: newline-delimited paths "
+#~ "for selected files in the inactive pane of a split-view window (only if "
+#~ "local)\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_URIS: newline-delimited URIs for "
+#~ "selected files in the inactive pane of a split-view window\n"
+#~ "\n"
+#~ "NAUTILUS_SCRIPT_NEXT_PANE_CURRENT_URI: URI for current location in the "
+#~ "inactive pane of a split-view window"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1003
-msgid "_Network"
-msgstr "_Network"
+#~ msgid "Unable to unmount location"
+#~ msgstr "Unable to unmount location"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1004
-msgid "Browse bookmarked and local network locations"
-msgstr "Browse bookmarked and local network locations"
+#~ msgid "Unable to eject location"
+#~ msgstr "Unable to eject location"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1007
-msgid "T_emplates"
-msgstr "T_emplates"
+#~ msgid "No templates installed"
+#~ msgstr "No templates installed"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1008
-msgid "Open your personal templates folder"
-msgstr "Open your personal templates folder"
+#~ msgid "Cop_y to"
+#~ msgstr "Cop_y to"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1011
-msgid "_Trash"
-msgstr "_Wastebasket"
+#~ msgid "M_ove to"
+#~ msgstr "M_ove to"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1012
-msgid "Open your personal trash folder"
-msgstr "Open your personal wastebasket folder"
+#~ msgid "_Rename..."
+#~ msgstr "_Renameâ"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1014
-msgid "_Go"
-msgstr "_Go"
+#~ msgid "_Other pane"
+#~ msgstr "_Other pane"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1015
-msgid "_Bookmarks"
-msgstr "_Bookmarks"
+#~ msgid "Copy the current selection to the other pane in the window"
+#~ msgstr "Copy the current selection to the other pane in the window"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1016
-msgid "_Tabs"
-msgstr "_Tabs"
+#~ 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
-#: ../src/nautilus-window-menus.c:1017
-msgid "New _Window"
-msgstr "New _Window"
+#~ msgid "Copy the current selection to the home folder"
+#~ msgstr "Copy the current selection to the home folder"
 
-#: ../src/nautilus-window-menus.c:1018
-msgid "Open another Nautilus window for the displayed location"
-msgstr "Open another Nautilus window for the displayed location"
+#~ msgid "Move the current selection to the home folder"
+#~ msgstr "Move the current selection to the home folder"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1020
-msgid "New _Tab"
-msgstr "New _Tab"
+#~ msgid "_Desktop"
+#~ msgstr "_Desktop"
 
-#: ../src/nautilus-window-menus.c:1021
-msgid "Open another tab for the displayed location"
-msgstr "Open another tab for the displayed location"
+#~ msgid "Copy the current selection to the desktop"
+#~ msgstr "Copy the current selection to the desktop"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1023
-msgid "Close _All Windows"
-msgstr "Close _All Windows"
+#~ msgid "Move the current selection to the desktop"
+#~ msgstr "Move the current selection to the desktop"
 
-#: ../src/nautilus-window-menus.c:1024
-msgid "Close all Navigation windows"
-msgstr "Close all Navigation windows"
+#~ msgid ""
+#~ "Do you want to remove any bookmarks with the non-existing location from "
+#~ "your list?"
+#~ msgstr ""
+#~ "Do you want to remove any bookmarks with the non-existing location from "
+#~ "your list?"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1026 ../src/nautilus-window-menus.c:1116
-msgid "_Back"
-msgstr "_Back"
+#~ msgid "The location \"%s\" does not exist."
+#~ msgstr "The location \"%s\" does not exist."
 
-#: ../src/nautilus-window-menus.c:1027 ../src/nautilus-window-menus.c:1118
-msgid "Go to the previous visited location"
-msgstr "Go to the previous visited location"
+#~ msgid "Go to the location specified by this bookmark"
+#~ msgstr "Go to the location specified by this bookmark"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1029 ../src/nautilus-window-menus.c:1132
-msgid "_Forward"
-msgstr "_Forward"
+#~ msgid "%s - File Browser"
+#~ msgstr "%s â File Browser"
 
-#: ../src/nautilus-window-menus.c:1030 ../src/nautilus-window-menus.c:1134
-msgid "Go to the next visited location"
-msgstr "Go to the next visited location"
+#~ msgid "Nautilus"
+#~ msgstr "Nautilus"
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1032
-msgid "_Location..."
-msgstr "_Locationâ"
+#~ 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-menus.c:1033
-msgid "Specify a location to open"
-msgstr "Specify a location to open"
+#~ msgid "Could not find \"%s\"."
+#~ msgstr "Could not find \"%s\"."
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1035
-msgid "S_witch to Other Pane"
-msgstr "S_witch to Other Pane"
+#~ msgid "Nautilus cannot handle \"%s\" locations."
+#~ msgstr "Nautilus cannot handle \"%s\" locations."
 
-#: ../src/nautilus-window-menus.c:1036
-msgid "Move focus to the other pane in a split view window"
-msgstr "Move focus to the other pane in a split view window"
+#~ msgid "Access was denied."
+#~ msgstr "Access was denied."
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1038
-msgid "Sa_me Location as Other Pane"
-msgstr "Sa_me Location as Other Pane"
+#~ 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-menus.c:1039
-msgid "Go to the same location as in the extra pane"
-msgstr "Go to the same location as in the extra pane"
+#~ 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-menus.c:1042
-msgid "Add a bookmark for the current location to this menu"
-msgstr "Add a bookmark for the current location to this menu"
+#~ msgid ""
+#~ "Error: %s\n"
+#~ "Please select another viewer and try again."
+#~ msgstr ""
+#~ "Error: %s\n"
+#~ "Please select another viewer and try again."
 
-#. name, stock id, label
-#: ../src/nautilus-window-menus.c:1044
-msgid "_Edit Bookmarks..."
-msgstr "_Edit Bookmarksâ"
+#~ msgid ""
+#~ "Nautilus lets you organize files and folders, both on your computer and "
+#~ "online."
+#~ msgstr ""
+#~ "Nautilus lets you organise files and folders, both on your computer and "
+#~ "online."
 
-#: ../src/nautilus-window-menus.c:1045
-msgid "Display a window that allows editing the bookmarks in this menu"
-msgstr "Display a window that allows editing the bookmarks in this menu"
+#~ msgid "Nautilus Web Site"
+#~ msgstr "Nautilus Website"
 
-#: ../src/nautilus-window-menus.c:1047
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
+#~ msgid "_File"
+#~ msgstr "_File"
 
-#: ../src/nautilus-window-menus.c:1048
-msgid "Activate previous tab"
-msgstr "Activate previous tab"
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
 
-#: ../src/nautilus-window-menus.c:1050
-msgid "_Next Tab"
-msgstr "_Next Tab"
+#~ msgid "_View"
+#~ msgstr "_View"
 
-#: ../src/nautilus-window-menus.c:1051
-msgid "Activate next tab"
-msgstr "Activate next tab"
+#~ msgid "Undo the last text change"
+#~ msgstr "Undo the last text change"
 
-#: ../src/nautilus-window-menus.c:1053 ../src/nautilus-window-pane.c:508
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#~ msgid "_Computer"
+#~ msgstr "_Computer"
 
-#: ../src/nautilus-window-menus.c:1054
-msgid "Move current tab to left"
-msgstr "Move current tab to left"
+#~ msgid ""
+#~ "Browse all local and remote disks and folders accessible from this "
+#~ "computer"
+#~ msgstr ""
+#~ "Browse all local and remote disks and folders accessible from this "
+#~ "computer"
 
-#: ../src/nautilus-window-menus.c:1056 ../src/nautilus-window-pane.c:516
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+#~ msgid "_Network"
+#~ msgstr "_Network"
 
-#: ../src/nautilus-window-menus.c:1057
-msgid "Move current tab to right"
-msgstr "Move current tab to right"
+#~ msgid "Browse bookmarked and local network locations"
+#~ msgstr "Browse bookmarked and local network locations"
 
-#: ../src/nautilus-window-menus.c:1059
-msgid "Sidebar"
-msgstr "Sidebar"
+#~ msgid "T_emplates"
+#~ msgstr "T_emplates"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1064
-msgid "Show _Hidden Files"
-msgstr "Show _Hidden Files"
+#~ msgid "Open your personal templates folder"
+#~ msgstr "Open your personal templates folder"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1065
-msgid "Toggle the display of hidden files in the current window"
-msgstr "Toggle the display of hidden files in the current window"
+#~ msgid "_Trash"
+#~ msgstr "_Wastebasket"
 
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1069
-msgid "_Main Toolbar"
-msgstr "_Main Toolbar"
+#~ msgid "Open your personal trash folder"
+#~ msgstr "Open your personal wastebasket folder"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1070
-msgid "Change the visibility of this window's main toolbar"
-msgstr "Change the visibility of this window's main toolbar"
+#~ msgid "_Go"
+#~ msgstr "_Go"
 
-#. is_active
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1074
-msgid "_Show Sidebar"
-msgstr "_Show Sidebar"
+#~ msgid "_Tabs"
+#~ msgstr "_Tabs"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1075
-msgid "Change the visibility of this window's side pane"
-msgstr "Change the visibility of this window's side pane"
+#~ msgid "_Location..."
+#~ msgstr "_Locationâ"
 
-#. is_active
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1079
-msgid "St_atusbar"
-msgstr "St_atusbar"
+#~ msgid "S_witch to Other Pane"
+#~ msgstr "S_witch to Other Pane"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1080
-msgid "Change the visibility of this window's statusbar"
-msgstr "Change the visibility of this window's statusbar"
+#~ msgid "Move focus to the other pane in a split view window"
+#~ msgstr "Move focus to the other pane in a split view window"
 
-#. is_active
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1084
-msgid "_Search for Files..."
-msgstr "_Search for Filesâ"
+#~ msgid "Sa_me Location as Other Pane"
+#~ msgstr "Sa_me Location as Other Pane"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1085 ../src/nautilus-window-menus.c:1149
-msgid "Search documents and folders by name"
-msgstr "Search documents and folders by name"
+#~ msgid "Go to the same location as in the extra pane"
+#~ msgstr "Go to the same location as in the extra pane"
 
-#. is_active
-#. name, stock id
-#. label, accelerator
-#: ../src/nautilus-window-menus.c:1089
-msgid "E_xtra Pane"
-msgstr "E_xtra Pane"
+#~ msgid "_Edit Bookmarks..."
+#~ msgstr "_Edit Bookmarksâ"
 
-#. tooltip
-#: ../src/nautilus-window-menus.c:1090
-msgid "Open an extra folder view side-by-side"
-msgstr "Open an extra folder view side-by-side"
+#~ 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-window-menus.c:1097
-msgid "Places"
-msgstr "Places"
+#~ msgid "Sidebar"
+#~ msgstr "Sidebar"
 
-#: ../src/nautilus-window-menus.c:1097
-msgid "Select Places as the default sidebar"
-msgstr "Select Places as the default sidebar"
+#~ msgid "_Main Toolbar"
+#~ msgstr "_Main Toolbar"
 
-#: ../src/nautilus-window-menus.c:1100
-msgid "Tree"
-msgstr "Tree"
+#~ msgid "Change the visibility of this window's main toolbar"
+#~ msgstr "Change the visibility of this window's main toolbar"
 
-#: ../src/nautilus-window-menus.c:1100
-msgid "Select Tree as the default sidebar"
-msgstr "Select Tree as the default sidebar"
+#~ msgid "St_atusbar"
+#~ msgstr "St_atusbar"
 
-#: ../src/nautilus-window-menus.c:1119
-msgid "Back history"
-msgstr "Back History"
+#~ msgid "Change the visibility of this window's statusbar"
+#~ msgstr "Change the visibility of this window's statusbar"
 
-#: ../src/nautilus-window-menus.c:1135
-msgid "Forward history"
-msgstr "Forward History"
+#~ msgid "E_xtra Pane"
+#~ msgstr "E_xtra Pane"
 
-#: ../src/nautilus-window-menus.c:1253
-msgid "_Up"
-msgstr "_Up"
+#~ msgid "Open an extra folder view side-by-side"
+#~ msgstr "Open an extra folder view side-by-side"
 
-#: ../src/nautilus-window-pane.c:498
-msgid "_New Tab"
-msgstr "_New Tab"
+#~ msgid "Select Places as the default sidebar"
+#~ msgstr "Select Places as the default sidebar"
 
-#: ../src/nautilus-window-pane.c:527
-msgid "_Close Tab"
-msgstr "_Close Tab"
+#~ msgid "Tree"
+#~ msgstr "Tree"
 
-#: ../src/nautilus-x-content-bar.c:96
-msgid "These files are on an Audio CD."
-msgstr "These files are on an Audio CD."
+#~ msgid "Select Tree as the default sidebar"
+#~ msgstr "Select Tree as the default sidebar"
 
-#: ../src/nautilus-x-content-bar.c:98
-msgid "These files are on an Audio DVD."
-msgstr "These files are on an Audio DVD."
+#~ msgid "Back history"
+#~ msgstr "Back History"
 
-#: ../src/nautilus-x-content-bar.c:100
-msgid "These files are on a Video DVD."
-msgstr "These files are on a Video DVD."
+#~ msgid "Forward history"
+#~ msgstr "Forward History"
 
-#: ../src/nautilus-x-content-bar.c:102
-msgid "These files are on a Video CD."
-msgstr "These files are on a Video CD."
+#~ msgid "These files are on an Audio CD."
+#~ msgstr "These files are on an Audio CD."
 
-#: ../src/nautilus-x-content-bar.c:104
-msgid "These files are on a Super Video CD."
-msgstr "These files are on a Super Video CD."
+#~ msgid "These files are on an Audio DVD."
+#~ msgstr "These files are on an Audio DVD."
 
-#: ../src/nautilus-x-content-bar.c:106
-msgid "These files are on a Photo CD."
-msgstr "These files are on a Photo CD."
+#~ msgid "These files are on a Video DVD."
+#~ msgstr "These files are on a Video DVD."
 
-#: ../src/nautilus-x-content-bar.c:108
-msgid "These files are on a Picture CD."
-msgstr "These files are on a Picture CD."
+#~ msgid "These files are on a Video CD."
+#~ msgstr "These files are on a Video CD."
 
-#: ../src/nautilus-x-content-bar.c:110
-msgid "The media contains digital photos."
-msgstr "The medium contains digital photos."
+#~ msgid "These files are on a Super Video CD."
+#~ msgstr "These files are on a Super Video CD."
 
-#: ../src/nautilus-x-content-bar.c:112
-msgid "These files are on a digital audio player."
-msgstr "These files are on a digital audio player."
+#~ msgid "These files are on a Photo CD."
+#~ msgstr "These files are on a Photo CD."
 
-#: ../src/nautilus-x-content-bar.c:114
-msgid "The media contains software."
-msgstr "The medium contains software."
+#~ msgid "These files are on a Picture CD."
+#~ msgstr "These files are on a Picture CD."
 
-#. fallback to generic greeting
-#: ../src/nautilus-x-content-bar.c:117
-#, c-format
-msgid "The media has been detected as \"%s\"."
-msgstr "The medium has been detected as \"%s\"."
+#~ msgid "These files are on a digital audio player."
+#~ msgstr "These files are on a digital audio player."
 
-#: ../src/nautilus-x-content-bar.c:142
-#, c-format
-msgid "Open %s"
-msgstr "Open %s"
+#~ msgid "The media has been detected as \"%s\"."
+#~ msgstr "The medium has been detected as \"%s\"."
+
+#~ msgid "Open %s"
+#~ msgstr "Open %s"
 
 #~ msgid "There is %S available, but %S is required."
 #~ msgstr "There is %S available, but %S is required."
@@ -6281,9 +6368,6 @@ msgstr "Open %s"
 #~ msgid "The location cannot be displayed with this viewer."
 #~ msgstr "The location cannot be displayed with this viewer."
 
-#~ msgid "%"
-#~ msgstr "%"
-
 #~ msgid "%s (%s bytes)"
 #~ msgstr "%s (%s bytes)"
 
@@ -6550,9 +6634,6 @@ msgstr "Open %s"
 #~ msgid "Onyx"
 #~ msgstr "Onyx"
 
-#~ msgid "Orange"
-#~ msgstr "Orange"
-
 #~ msgid "Pale Blue"
 #~ msgstr "Pale Blue"
 
@@ -7091,9 +7172,6 @@ msgstr "Open %s"
 #~ msgid "Open %s and other %s document with:"
 #~ msgstr "Open %s and other %s document with:"
 
-#~ msgid "Open %s with:"
-#~ msgstr "Open %s with:"
-
 #~ msgid "Open all %s documents with:"
 #~ msgstr "Open all %s documents with:"
 
@@ -7338,9 +7416,6 @@ msgstr "Open %s"
 #~ msgid "_Never prompt or start programs on media insertion"
 #~ msgstr "_Never prompt or start programs on media insertion"
 
-#~ msgid "_Photos:"
-#~ msgstr "_Photos:"
-
 #~ msgid "_Software:"
 #~ msgstr "_Software:"
 
@@ -7371,9 +7446,6 @@ msgstr "Open %s"
 #~ msgid "Open Location"
 #~ msgstr "Open Location"
 
-#~ msgid "_Location:"
-#~ msgstr "_Location:"
-
 #~ msgid "open a browser window."
 #~ msgstr "open a browser window."
 
@@ -7534,9 +7606,6 @@ msgstr "Open %s"
 #~ msgid "_Places"
 #~ msgstr "_Places"
 
-#~ msgid "Open _Location..."
-#~ msgstr "Open _Locationâ"
-
 #~ msgid "Close P_arent Folders"
 #~ msgstr "Close P_arent Folders"
 
@@ -7896,9 +7965,6 @@ msgstr "Open %s"
 #~ msgid "You must click on an image to select it."
 #~ msgstr "You must click on an image to select it."
 
-#~ msgid "Opening %s"
-#~ msgstr "Opening %s"
-
 #~ msgid "Blank Blu-Ray Disc"
 #~ msgstr "Blank Blu-Ray Disc"
 
@@ -7929,18 +7995,9 @@ msgstr "Open %s"
 #~ msgid "HD DVD Video"
 #~ msgstr "HD DVD Video"
 
-#~ msgid "Picture CD"
-#~ msgstr "Picture CD"
-
 #~ msgid "Portable Audio Player"
 #~ msgstr "Portable Audio Player"
 
-#~ msgid "Super Video CD"
-#~ msgstr "Super Video CD"
-
-#~ msgid "Video CD"
-#~ msgstr "Video CD"
-
 #~ msgid "List of x-content/* types to ask the user what to do on insertion."
 #~ msgstr "List of x-content/* types to ask the user what to do on insertion."
 
@@ -7990,9 +8047,6 @@ msgstr "Open %s"
 #~ msgid "View as _Icons"
 #~ msgstr "View as _Icons"
 
-#~ msgid "View as List"
-#~ msgstr "View as List"
-
 #~ msgid "View as _List"
 #~ msgstr "View as _List"
 



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