[nautilus] Updated zh_CN translation.

[Funda Wang <fwang src gnome org>]

commit c71ac3d1e00c3013a6736ac6dcf3ad074380b8a3
Author: YunQiang Su <wzssyqa gmail com>
Date:   Sun Jul 4 17:45:02 2010 +0200

    Updated zh_CN translation.

 po/ChangeLog |    4 +
 po/zh_CN.po  | 2644 +++++++++++++++++++++++++++++++---------------------------
 2 files changed, 1411 insertions(+), 1237 deletions(-)
---
diff --git a/po/ChangeLog b/po/ChangeLog
index a40cabd..de2658b 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-04  Funda Wang  <fundawang gmail com>
+
+  * zh_CN.po: Updated zh_CN translation from YunQiang Su <wzssyqa gmail com>.
+
 2009-06-10  Manoj Kumar Giri <mgiri redhat com>
 
 	* hi.po: Committed Hindi Translation on behalf of Rajesh Ranjan.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 76c5aca..c2d0dab 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: nautilus master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=nautilus&component=Internationalization (i18n)\n"
-"POT-Creation-Date: 2009-12-04 11:40+0000\n"
-"PO-Revision-Date: 2009-11-29 10:03+0100\n"
+"POT-Creation-Date: 2010-07-04 14:12+0000\n"
+"PO-Revision-Date: 2010-06-19 19:10+0800\n"
 "Last-Translator: Tao Wei <weitao1979 gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroup com>\n"
 "MIME-Version: 1.0\n"
@@ -189,8 +189,8 @@ msgid "Envy"
 msgstr "羡æ??"
 
 #. translators: this is the name of an emblem
-#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:928
-#: ../src/nautilus-property-browser.c:1819
+#: ../data/browser.xml.h:28 ../src/nautilus-emblem-sidebar.c:933
+#: ../src/nautilus-property-browser.c:1829
 msgid "Erase"
 msgstr "å? é?¤"
 
@@ -390,11 +390,11 @@ msgstr "æ?¾ç¤ºå?¨è­¦å??æ??示对è¯?æ¡?中ç??æ??é?®"
 msgid "Show more _details"
 msgstr "æ?¾ç¤ºæ?´å¤?ç»?è??(_D)"
 
-#: ../eel/eel-canvas.c:1227 ../eel/eel-canvas.c:1228
+#: ../eel/eel-canvas.c:1228 ../eel/eel-canvas.c:1229
 msgid "X"
 msgstr "X"
 
-#: ../eel/eel-canvas.c:1234 ../eel/eel-canvas.c:1235
+#: ../eel/eel-canvas.c:1235 ../eel/eel-canvas.c:1236
 msgid "Y"
 msgstr "Y"
 
@@ -444,11 +444,11 @@ msgid ""
 "The position of the opposite end of the selection from the cursor in chars."
 msgstr "é??æ?©å?ºå?¦ä¸?端ç??ä½?ç½®ï¼?ä»?å??æ ?å¤?以å­?符æ?°è®¡ã??"
 
-#: ../eel/eel-editable-label.c:3178
+#: ../eel/eel-editable-label.c:3201
 msgid "Select All"
 msgstr "å?¨é??"
 
-#: ../eel/eel-editable-label.c:3189
+#: ../eel/eel-editable-label.c:3212
 msgid "Input Methods"
 msgstr "���"
 
@@ -494,8 +494,14 @@ msgstr ""
 "è??)ã??â??groupâ??(ç»?)ã??â??permissionsâ??(æ??é??)ã??â??octal_permissionsâ??(å?«è¿?å?¶æ??é??)"
 "å??â??mime_typeâ??(MIME ç±»å??)ã??"
 
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:4
+msgid ""
+"A string containing the saved geometry and coordinates string for navigation "
+"windows."
+msgstr ""
+
 #. TRANSLATORS: don't translate the zoom levels between quotes
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:6
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
 #, no-c-format
 msgid ""
 "A string specifying how parts of overlong file names should be replaced by "
@@ -523,15 +529,15 @@ msgstr ""
 "å°?â?? 4 è¡?ï¼?é?£ä¹?缩ç?­å®?们ã??对äº?å?¶å®?缩æ?¾çº§å?«ä¸?缩ç?­æ??件å??称ã??å?¯ç?¨ç??缩æ?¾è§£å?«ï¼?æ??å°?"
 "(33%)ï¼?æ¯?è¾?å°?(50%)ï¼?å°?(66%)ï¼?大(150%)ï¼?æ¯?è¾?大(200%)ï¼?æ??大(400%)"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:7
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
 msgid "All columns have same width"
 msgstr "æ??æ??å??é?½å?·æ??ç?¸å??宽度"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:8
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
 msgid "Always use the location entry, instead of the pathbar"
 msgstr "æ?»æ?¯ä½¿ç?¨ä½?置项ï¼?è??ä¸?æ?¯ä½¿ç?¨è·¯å¾?æ ?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:9
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
 msgid ""
 "An integer specifying how parts of overlong file names should be replaced by "
 "ellipses on the desktop. If the number is larger than 0, the file name will "
@@ -542,20 +548,20 @@ msgstr ""
 "0ï¼?é?£ä¹?æ??件å??称å°?ä¸?è¶?è¿?ç»?å®?ç??è¡?æ?°ã??å¦?æ??æ?°å­?为 0 æ??æ?´å°?ï¼?é?£ä¹?就没æ??æ?¾ç¤ºè¡?æ?°ç??"
 "é??å?¶ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:10
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
 msgid ""
 "Color for the default folder background. Only used if background_set is true."
 msgstr "é»?认æ??件夹è??æ?¯ç??é¢?è?²ã??ä»?å½? background_set 为 true æ?¶ä½¿ç?¨ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:11
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
 msgid "Computer icon visible on desktop"
 msgstr "å?¨æ¡?é?¢ä¸?æ?¾ç¤ºè®¡ç®?æ?ºå?¾æ ?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:12
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
 msgid "Criteria for search bar searching"
 msgstr "æ??ç´¢æ ?æ??ç´¢ç??æ?¡ä»¶"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:13
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
 msgid ""
 "Criteria when matching files searched for in the search bar. If set to "
 "\"search_by_text\", then Nautilus will Search for files by file name only. "
@@ -566,123 +572,123 @@ msgstr ""
 "Nautilus å°?ä¼?å?ªæ??æ??件å??æ??ç´¢æ??件ã??å¦?æ??设为â??search_by_text_and_propertiesâ??(æ??æ??"
 "å­?å??å±?æ?§)ï¼?å?? Nautilus å°?ä¼?æ??ç?§æ??件å??å??æ??件å±?æ?§æ??ç´¢ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:14
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
 msgid "Current Nautilus theme (deprecated)"
 msgstr "Nautilus å½?å??主é¢?(ä¸?æ?¨è??)"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:15
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
 msgid "Custom Background"
 msgstr "è?ªå®?ä¹?è??æ?¯"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:16
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
 msgid "Custom Side Pane Background Set"
 msgstr "è?ªå®?ä¹?侧边æ ?è??æ?¯é??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:17
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
 msgid "Date Format"
 msgstr "æ?¥æ??æ ¼å¼?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:18
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
 msgid "Default Background Color"
 msgstr "é»?认è??æ?¯è?²"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:19
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
 msgid "Default Background Filename"
 msgstr "é»?认æ??件å??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:20
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
 msgid "Default Side Pane Background Color"
 msgstr "é»?认侧边æ ?è??æ?¯è?²"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:21
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
 msgid "Default Side Pane Background Filename"
 msgstr "é»?认侧边æ ?æ??件å??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:22
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
 msgid "Default Thumbnail Icon Size"
 msgstr "�认缩��大�"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:23
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
 msgid "Default column order in the list view"
 msgstr "å??表è§?å?¾ä½¿ç?¨ç??é»?认å??åº?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:24
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
 msgid "Default column order in the list view."
 msgstr "å??表è§?å?¾ä½¿ç?¨ç??é»?认å??åº?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:25
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
 msgid "Default compact view zoom level"
 msgstr "é»?认紧å??è§?å?¾ç¼©æ?¾çº§å?«"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:26
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
 msgid "Default folder viewer"
 msgstr "é»?认æ??件夹æ?¥ç??å?¨"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:27
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
 msgid "Default icon zoom level"
 msgstr "é»?认å?¾æ ?缩æ?¾çº§å?«"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:28
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
 msgid "Default list of columns visible in the list view"
 msgstr "å??表è§?å?¾ä¸­å?¯è§?å??ç??é»?认å??表"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:29
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
 msgid "Default list of columns visible in the list view."
 msgstr "å??表è§?å?¾ä¸­å?¯è§?å??ç??é»?认å??表ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:30
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
 msgid "Default list zoom level"
 msgstr "é»?认å??表缩æ?¾çº§å?«"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:31
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
 msgid "Default sort order"
 msgstr "é»?认æ??åº?次åº?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:32
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
 msgid "Default zoom level used by the compact view."
 msgstr "ç´§å??è§?å?¾ä½¿ç?¨ç??é»?认缩æ?¾çº§å?«ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:33
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
 msgid "Default zoom level used by the icon view."
 msgstr "å?¾æ ?è§?å?¾ä½¿ç?¨ç??é»?认缩æ?¾çº§å?«ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:34
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
 msgid "Default zoom level used by the list view."
 msgstr "å??表è§?å?¾ä½¿ç?¨ç??é»?认缩æ?¾çº§å?«ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:35
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
 msgid "Desktop computer icon name"
 msgstr "æ¡?é?¢è®¡ç®?æ?ºå?¾æ ?å??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:36
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
 msgid "Desktop font"
 msgstr "����"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:37
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
 msgid "Desktop home icon name"
 msgstr "æ¡?é?¢ä¸»æ??件夹å?¾æ ?å??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:38
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
 msgid "Desktop trash icon name"
 msgstr "æ¡?é?¢å??æ?¶ç«?å?¾æ ?å??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:39
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
 msgid "Enables the classic Nautilus behavior, where all windows are browsers"
 msgstr "å?¯ç?¨ç»?å?¸ç?? Nautilus è¡?为ï¼?å?¨é?¨çª?å?£é?½æ?¯æµ?è§?å?¨"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:40
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
 msgid ""
 "Filename for the default folder background. Only used if background_set is "
 "true."
 msgstr "é»?认æ??件夹è??æ?¯ç??æ??件å??ã??ä»?å½? background_set 为 true æ?¶ä½¿ç?¨ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:41
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
 msgid ""
 "Filename for the default side pane background. Only used if "
 "side_pane_background_set is true."
 msgstr "é»?认侧边æ ?è??æ?¯ç??æ??件å??ã??ä»?å½? side_pane_background_set 为 true æ?¶ä½¿ç?¨ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:42
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
 msgid ""
 "Folders over this size will be truncated to around this size. The purpose of "
 "this is to avoid unintentionally blowing the heap and killing Nautilus on "
@@ -692,7 +698,7 @@ msgstr ""
 "è¶?è¿?此大å°?ç??æ??件夹å°?ä¼?被æ?ªæ?­ä¸ºæ­¤å¤§å°?ã??此设置ç??ç?®ç??å?¨äº?é?¿å?? Nautilus 浪费太å¤?"
 "ç??æ?¶é?´æ?¥å¤?ç??å??å??å¤?æ??ç??æ??件夹ã??è´?å?¼æ??å?³ç??没æ??é??å?¶ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:43
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
 msgid ""
 "For users with mice that have \"Forward\" and \"Back\" buttons, this key "
 "will determine if any action is taken inside of Nautilus when either is "
@@ -701,7 +707,7 @@ msgstr ""
 "对äº?使ç?¨æ?? â??å??è¿?â?? å?? â??å??é??â?? æ??é?®ç??é¼ æ ?ç??ç?¨æ?·ï¼?è¿?个æ??é?®å°?æ£?æµ?ï¼?å½?ä»»ä½?ä¸?个æ??ä¸?"
 "æ?¶ï¼?æ?¯å?¦æ??æ´»å?¨å·²ç»?å?¨ Nautilus å??é?¨å?¯å?¨ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:44
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
 msgid ""
 "For users with mice that have buttons for \"Forward\" and \"Back\", this key "
 "will set which button activates the \"Back\" command in a browser window. "
@@ -710,7 +716,7 @@ msgstr ""
 "对äº?使ç?¨æ?? â??å??è¿?â?? å?? â??å??é??â?? æ??é?®ç??é¼ æ ?ç??ç?¨æ?·ï¼?è¿?个æ??é?®å°?设å®?å?ªä¸ªæ??é?®å?¯ä»¥æ¿?æ´»"
 "å?¨ä¸?个æµ?è§?å?¨çª?å?£ç??â??å??é??â??å?½ä»¤ã??å?¯è?½ç??æ?°å?¼è??å?´æ?¯ 6 å?° 14ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:45
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
 msgid ""
 "For users with mice that have buttons for \"Forward\" and \"Back\", this key "
 "will set which button activates the \"Forward\" command in a browser window. "
@@ -719,11 +725,11 @@ msgstr ""
 "对äº?使ç?¨æ?? â??å??è¿?â?? å?? â??å??é??â?? æ??é?®ç??é¼ æ ?ç??ç?¨æ?·ï¼?è¿?个æ??é?®å°?设å®?å?ªä¸ªæ??é?®å?¯ä»¥æ¿?æ´»"
 "å?¨ä¸?个æµ?è§?å?¨çª?å?£ç??â??å??è¿?â??å?½ä»¤ã??å?¯è?½ç??æ?°å?¼è??å?´æ?¯ 6 å?° 14ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:46
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
 msgid "Home icon visible on desktop"
 msgstr "å?¨æ¡?é?¢ä¸?æ?¾ç¤ºä¸»æ??件夹å?¾æ ?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:47
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
 msgid ""
 "If set to \"after_current_tab\", then new tabs are inserted after the "
 "current tab. If set to \"end\", then new tabs are appended to the end of the "
@@ -732,7 +738,7 @@ msgstr ""
 "å¦?æ??设å®?å?° â??å½?å??æ ?签页ä¹?å??â??ï¼?é?£ä¹?æ?°ç??æ ?签页就æ??å?¥å?¨å½?å??æ ?签页ä¹?å??ã??å¦?æ??设å®?"
 "为 â??æ?«å°¾â??ï¼?é?£ä¹?æ?°ç??æ ?签页å°?å?ºç?°å?¨æ ?签页å??表ç??æ?«å°¾ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:48
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
 msgid ""
 "If set to true, Nautilus will only show folders in the tree side pane. "
 "Otherwise it will show both folders and files."
@@ -740,24 +746,24 @@ msgstr ""
 "å¦?æ??设为 trueï¼?Nautilus å°?å?ªå?¨æ ?侧边æ ?中æ?¾ç¤ºæ??件夹ã??å?¦å??å°?å??æ?¶æ?¾ç¤ºæ??件夹å??æ??"
 "件ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:49
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
 msgid ""
 "If set to true, newly opened windows will have the location bar visible."
 msgstr "å¦?æ??设为 trueï¼?æ?°æ??å¼?ç??çª?å?£å°?æ?¾ç¤ºä½?ç½®æ ?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:50
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
 msgid "If set to true, newly opened windows will have the side pane visible."
 msgstr "å¦?æ??设为 trueï¼?æ?°æ??å¼?ç??çª?å?£å°?æ?¾ç¤ºä¾§è¾¹æ ?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:51
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
 msgid "If set to true, newly opened windows will have the status bar visible."
 msgstr "å¦?æ??设为 trueï¼?æ?°æ??å¼?ç??çª?å?£å°?æ?¾ç¤ºç?¶æ??æ ?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:52
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
 msgid "If set to true, newly opened windows will have toolbars visible."
 msgstr "å¦?æ??设为 trueï¼?æ?°æ??å¼?ç??çª?å?£å°?æ?¾ç¤ºå·¥å?·æ ?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:53
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
 msgid ""
 "If set to true, then Nautilus browser windows will always use a textual "
 "input entry for the location toolbar, instead of the pathbar."
@@ -765,7 +771,7 @@ msgstr ""
 "å¦?æ??设为 tureï¼?Nautilus æµ?è§?å?¨å°?å?¨ä½?置工å?·æ ?中æ?»æ?¯ä½¿ç?¨æ??æ?¬è¾?å?¥æ¡?ï¼?è??ä¸?æ?¯ä½¿ç?¨"
 "è·¯å¾?æ ?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:54
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
 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."
@@ -773,20 +779,20 @@ msgstr ""
 "å¦?æ??设为 trueï¼?Nautilus å°?å??许æ?¨ä»¥æ?´å?? unix ç??æ?¹å¼?ç¼?è¾?å??æ?¾ç¤ºæ??件æ??é??ï¼?以å??访"
 "é?®æ?´å¤?ç»?å¯?é??项ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:55
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
 msgid ""
 "If set to true, then Nautilus shows folders prior to showing files in the "
 "icon and list views."
 msgstr ""
 "å¦?æ??设为 trueï¼?Nautilus å°?å?¨å?¾æ ?è§?å?¾å??å??表è§?å?¾ä¸­æ??æ??件夹æ?¾ç¤ºå?¨æ??件å??é?¢ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:56
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
 msgid ""
 "If set to true, then Nautilus will ask for confirmation when you attempt to "
 "delete files, or empty the Trash."
 msgstr "å¦?æ??设为 trueï¼?Nautilus å°?å?¨æ?¨è¯?å?¾å? é?¤æ??件æ??æ¸?空å??æ?¶ç«?æ?¶è¯·æ±?确认ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:57
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
 msgid ""
 "If set to true, then Nautilus will automatically mount media such as user-"
 "visible hard disks and removable media on start-up and media insertion."
@@ -794,7 +800,7 @@ msgstr ""
 "å¦?æ??设为 trueï¼?Nautilus å°?å?¨å?¯å?¨æ?¶å??æ??å?¥æ?¶è?ªå?¨æ??è½½ä»?è´¨ï¼?æ¯?å¦?ç?¨æ?·å?¯è§?ç??硬ç??å??"
 "å?¯ç§»å?¨ä»?è´¨ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:58
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
 msgid ""
 "If set to true, then Nautilus will automatically open a folder when media is "
 "automounted. This only applies to media where no known x-content/* type was "
@@ -805,11 +811,11 @@ msgstr ""
 "æ£?æµ?å?° x-content/* ç±»å??ç??ä»?è´¨ï¼?对äº?æ£?æµ?å?°å·²ç?¥ x-content ç±»å??ç??ä»?è´¨ï¼?å°?æ?§è¡?ç?¨"
 "æ?·å?¯é??ç½®ç??æ??ä½?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:59
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
 msgid "If set to true, then Nautilus will draw the icons on the desktop."
 msgstr "å¦?æ??设为 trueï¼?Nautilus å°?å?¨æ¡?é?¢ä¸?ç»?å?¶å?¾æ ?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:60
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
 msgid ""
 "If set to true, then Nautilus will exit when all windows are destroyed. This "
 "is the default setting. If set to false, it can be started without any "
@@ -820,7 +826,7 @@ msgstr ""
 "falseï¼?å®?å?¯ä»¥å?¨æ²¡æ??çª?å?£ç??ç?¶æ??ä¸?å?¯å?¨ï¼?é?£æ · nautilus å°?ä½?为ä¸?个å®?æ?¤è¿?ç¨?æ??ä¾?è?ªå?¨"
 "æ??è½½æ??è??ç?¸ä¼¼ç??ä»»å?¡ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:61
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
 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 "
@@ -829,13 +835,13 @@ msgstr ""
 "å¦?æ??设为 trueï¼?Nautilus å°?å?¯ç?¨å??许æ?¨å°±å?°ç«?å?³å? é?¤æ??件ç??ç?¹æ?§ï¼?è??ä¸?æ?¯å°?å?¶ç§»å?¨å?°"
 "å??æ?¶ç«?ã??æ­¤ç?¹æ?§å??å??å?±é?©ï¼?æ??以请å°?å¿?使ç?¨ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:62
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
 msgid ""
 "If set to true, then Nautilus will never prompt nor autorun/autostart "
 "programs when a medium is inserted."
 msgstr "å¦?æ??设为 trueï¼?Nautilus å°?å?¨æ??å?¥ä»?è´¨æ?¶ä¸?ä¼?æ??示è?ªå?¨è¿?è¡?/è?ªå?¨å?¯å?¨ç¨?åº?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:63
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
 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."
@@ -843,7 +849,7 @@ msgstr ""
 "å¦?æ??设为 trueï¼?Nautilus å°?使ç?¨ç?¨æ?·ç??主æ??件夹ä½?为æ¡?é?¢ã??å¦?æ??设为 falseï¼?å??ä¼?使"
 "ç?¨ ~/Desktop ä½?为æ¡?é?¢ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:64
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
 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 "
@@ -852,7 +858,7 @@ msgstr ""
 "å¦?æ??设为 trueï¼?å??å?¨é?¨ç?? Nautilus çª?å?£é?½æ?¯æµ?è§?å?¨çª?å?£ã??è¿?æ?¯ Nautilus å?¨ç??æ?¬ "
 "2.6 ä¹?å??ç??è¡?为ï¼?è??ä¸?æ??人å??欢è¿?ç§?è¡?为ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:65
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
 msgid ""
 "If set to true, then backup files such as those created by Emacs are "
 "displayed. Currently, only files ending in a tilde (~) are considered backup "
@@ -861,7 +867,7 @@ msgstr ""
 "å¦?æ??设为 trueï¼?å°?ä¼?æ?¾ç¤ºå?? Emacs è¿?æ ·ç??ç¨?åº?å??建ç??å¤?份æ??件ã??ç?®å??ï¼?å?ªæ??以波浪å?·"
 "(~)ç»?å°¾ç??æ??件ä¼?被认为æ?¯å¤?份æ??件ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:66
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
 msgid ""
 "If set to true, then hidden files are shown in the file manager. Hidden "
 "files are either dotfiles or are listed in the folder's .hidden file."
@@ -869,14 +875,6 @@ msgstr ""
 "å¦?æ??设为 trueï¼?å??å?¨æ??件管ç??å?¨ä¸­æ?¾ç¤ºé??è??æ??件ã??é??è??æ??件æ??è??æ?¯ä»¥ . å¼?头ç??æ??件ï¼?"
 "æ??è??æ?¯å?¨æ??件夹ç?? .hidden æ??件中å??å?ºç??æ??件ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:67
-msgid ""
-"If set to true, then multiple views can be opened in one browser window, "
-"each in a separate tab."
-msgstr ""
-"å¦?æ??设为 trueï¼?å??å?¯ä»¥å?¨ä¸?个æµ?è§?å?¨çª?å?£ä¸­æ??å¼?å¤?个è§?å?¾ï¼?æ¯?个è§?å?¾ä½?äº?ä¸?å??ç??æ ?ç­¾"
-"中ã??"
-
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:68
 msgid ""
 "If this is set to true, an icon linking to the Network Servers view will be "
@@ -1194,58 +1192,64 @@ msgid ""
 msgstr "æ??件æ?¥æ??ç??æ ¼å¼?ã??å?¯ä¾?é??æ?©ç??å?¼æ?¯â??localeâ??ã??â??isoâ??å??â??informalâ??ã??"
 
 #: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:126
+#, fuzzy
+#| msgid "Open this folder in a navigation window"
+msgid "The geometry string for a navigation window."
+msgstr "å?¨å¯¼è?ªçª?å?£ä¸­æ??å¼?æ­¤æ??件夹"
+
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
 msgid "The side pane view to show in newly opened windows."
 msgstr "æ?°æ??å¼?ç??çª?å?£ä¸­æ?¾ç¤ºç??侧边æ ?è§?å?¾ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:127
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
 msgid ""
 "This name can be set if you want a custom name for the computer icon on the "
 "desktop."
 msgstr "å¦?æ??æ?¨æ?³è¦?为æ¡?é?¢ä¸?ç??计ç®?æ?ºå?¾æ ?æ??å®?è?ªå®?ä¹?å??称ï¼?请设置此å¤?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:128
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
 msgid ""
 "This name can be set if you want a custom name for the home icon on the "
 "desktop."
 msgstr "å¦?æ??æ?¨æ?³è¦?为æ¡?é?¢ä¸?ç??主æ??件夹å?¾æ ?æ??å®?è?ªå®?ä¹?å??称ï¼?请设置此å¤?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:129
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:130
 msgid ""
 "This name can be set if you want a custom name for the network servers icon "
 "on the desktop."
 msgstr "å¦?æ??æ?¨æ?³è¦?为æ¡?é?¢ä¸?ç??ç½?ç»?æ??å?¡å?¨å?¾æ ?æ??å®?è?ªå®?ä¹?å??称ï¼?请设置此å¤?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:130
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:131
 msgid ""
 "This name can be set if you want a custom name for the trash icon on the "
 "desktop."
 msgstr "å¦?æ??æ?¨æ?³è¦?为æ¡?é?¢ä¸?ç??å??æ?¶ç«?å?¾æ ?æ??å®?è?ªå®?ä¹?å??称ï¼?请设置此å¤?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:131
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:132
 msgid "Trash icon visible on desktop"
 msgstr "å?¨æ¡?é?¢ä¸?æ?¾ç¤ºå??æ?¶ç«?å?¾æ ?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:132
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:133
 msgid "Type of click used to launch/open files"
 msgstr "ç?¨äº?è°?ç?¨/æ??å¼?æ??件ç??å??å?»ç±»å??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:133
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:134
 msgid "Use extra mouse button events in Nautilus' browser window"
 msgstr "å?¨ Nautilus æµ?è§?çª?å?£ä¸­å?¯ç?¨é¢?å¤?é¼ æ ?äº?件"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:134
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
 msgid "Use manual layout in new windows"
 msgstr "å?¨æ?°å»ºçª?å?£ä¸­ä½¿ç?¨æ??å?¨å¸?å±?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:135
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
 msgid "Use tighter layout in new windows"
 msgstr "å?¨æ?°å»ºçª?å?£ä¸­ä½¿ç?¨ç´§å??å¸?å±?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:136
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:137
 msgid "What to do with executable text files when activated"
 msgstr "æ¿?æ´»æ?¶å¦?ä½?对å¾?å?¯æ?§è¡?æ??æ?¬æ??件"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:137
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:138
 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, "
@@ -1255,7 +1259,7 @@ msgstr ""
 "æ¿?æ´»(å??å?»æ??å??å?»)å?¯æ?§è¡?ç??æ??æ?¬æ??件æ?¶è¦?æ?§è¡?ä»?ä¹?æ??ä½?ã??å?¯ä¾?é??æ?©ç??å?¼ä¸­ï¼?â??launchâ??å?¯"
 "æ??ç¨?åº?è°?ç?¨æ??件ï¼?â??askâ??å°?æ?¾ç¤ºå¯¹è¯?æ¡?询é?®æ??ä½?ï¼?â??displayâ??å°?以æ??æ?¬æ??件æ?¾ç¤ºå?¶å??容ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:138
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:139
 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\", "
@@ -1264,63 +1268,67 @@ msgstr ""
 "è¿?å?¥æ??件夹æ?¶ï¼?å°?使ç?¨æ­¤æ?¥ç??å?¨ï¼?é?¤é??æ?¨ä¸ºè¯¥æ??件夹ç?¹å?«é??æ?©äº?å?¶å®?è§?å?¾ã??å?¯ä¾?é??æ?©ç??"
 "å?¼æ??â??list_viewâ??(å??表è§?å?¾)ã??â??icon_viewâ??(å?¾æ ?è§?å?¾)å??â??compact_viewâ??(ç´§å??è§?å?¾)ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:139
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:140
 msgid "When to show number of items in a folder"
 msgstr "ä½?æ?¶å?¨æ??件夹中æ?¾ç¤ºé¡¹ç?®æ?°"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:140
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:141
 msgid "When to show preview text in icons"
 msgstr "ä½?æ?¶å?¨å?¾æ ?中æ?¾ç¤ºé¢?è§?æ??å­?"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:141
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:142
 msgid "When to show thumbnails of image files"
 msgstr "ä½?æ?¶æ?¾ç¤ºå?¾å??æ??件ç??缩ç?¥å?¾"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:142
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:143
 msgid "Where to position newly open tabs in browser windows."
 msgstr "å?¨æµ?è§?å?¨çª?å?£ä¸­åº?å¦?ä½?æ?¾ç½®æ?°æ??å¼?ç??æ ?ç­¾ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:143
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:144
 msgid "Whether a custom default folder background has been set."
 msgstr "æ?¯å?¦è®¾ç½®äº?è?ªå®?ä¹?é»?认æ??件夹è??æ?¯ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:144
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:145
 msgid "Whether a custom default side pane background has been set."
 msgstr "æ?¯å?¦è®¾ç½®äº?è?ªå®?ä¹?é»?认侧边æ ?è??æ?¯ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:145
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:146
+msgid "Whether the navigation window should be maximized by default."
+msgstr "导è?ªçª?å?£æ?¯å?¦åº?é»?认为æ??大å??ã??"
+
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:147
+msgid "Whether the navigation window should be maximized."
+msgstr "导è?ªçª?å?£æ?¯å?¦åº?为æ??大å??ã??"
+
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:148
 msgid "Whether to ask for confirmation when deleting files, or emptying Trash"
 msgstr "å? é?¤æ??件æ??å°?æ¸?空å??æ?¶ç«?æ?¶æ?¯å?¦è¯·æ±?确认"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:146
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:149
 msgid "Whether to automatically mount media"
 msgstr "æ?¯å?¦è?ªå?¨æ??è½½ä»?è´¨"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:147
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:150
 msgid "Whether to automatically open a folder for automounted media"
 msgstr "对è?ªå?¨æ??è½½ç??ä»?è´¨æ?¯å?¦è?ªå?¨æ??å¼?æ??件夹"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:148
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:151
 msgid "Whether to enable immediate deletion"
 msgstr "æ?¯å?¦å?¯ç?¨ç«?å?³å? é?¤"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:149
-msgid "Whether to enable tabs in Nautilus browser windows"
-msgstr "æ?¯å?¦å?¨ Nautilus æµ?è§?å?¨çª?å?£ä¸­å?¯ç?¨æ ?ç­¾"
-
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:150
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:152
 msgid "Whether to preview sounds when mousing over an icon"
 msgstr "æ?¯å?¦å?¨é¼ æ ?æ??å??å?¾æ ?æ?¶é¢?è§?声é?³"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:151
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:153
 msgid "Whether to show backup files"
 msgstr "æ?¯å?¦æ?¾ç¤ºå¤?份æ??件"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:152
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:154
 msgid "Whether to show hidden files"
 msgstr "æ?¯å?¦æ?¾ç¤ºé??è??æ??件"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:153
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:155
 msgid ""
 "Whether to show the user a package installer dialog in case an unknown mime "
 "type is opened, in order to search for an application to handle it."
@@ -1328,7 +1336,7 @@ msgstr ""
 "æ?¯å?¦è¦?æ?¾ç¤ºç»?ç?¨æ?·ä¸?个软件å??å®?è£?å?¨ç??对è¯?æ¡?ï¼?以便å½?æ??å¼?ä¸?个æ?ªç?¥ mime ç±»å??æ?¶ï¼?å?¯"
 "以æ??ç´¢ä¸?个ç¨?åº?æ?¥å¤?ç??å®?ã??"
 
-#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:154
+#: ../libnautilus-private/apps_nautilus_preferences.schemas.in.h:156
 msgid "Width of the side pane"
 msgstr "侧边æ ?宽度"
 
@@ -1441,11 +1449,11 @@ msgstr "æ?»æ?¯æ?§è¡?æ­¤æ??ä½?(_A)"
 #. label, accelerator
 #. add the "Eject" menu item
 #: ../libnautilus-private/nautilus-autorun.c:1018
-#: ../src/file-manager/fm-directory-view.c:7079
-#: ../src/file-manager/fm-directory-view.c:7107
-#: ../src/file-manager/fm-directory-view.c:7188
-#: ../src/file-manager/fm-tree-view.c:1325
-#: ../src/nautilus-places-sidebar.c:2242
+#: ../src/file-manager/fm-directory-view.c:7184
+#: ../src/file-manager/fm-directory-view.c:7212
+#: ../src/file-manager/fm-directory-view.c:7293
+#: ../src/file-manager/fm-tree-view.c:1278
+#: ../src/nautilus-places-sidebar.c:2280
 msgid "_Eject"
 msgstr "弹�(_E)"
 
@@ -1453,11 +1461,11 @@ msgstr "弹�(_E)"
 #. label, accelerator
 #. add the "Unmount" menu item
 #: ../libnautilus-private/nautilus-autorun.c:1029
-#: ../src/file-manager/fm-directory-view.c:7075
-#: ../src/file-manager/fm-directory-view.c:7103
-#: ../src/file-manager/fm-directory-view.c:7184
-#: ../src/file-manager/fm-tree-view.c:1316
-#: ../src/nautilus-places-sidebar.c:2235
+#: ../src/file-manager/fm-directory-view.c:7180
+#: ../src/file-manager/fm-directory-view.c:7208
+#: ../src/file-manager/fm-directory-view.c:7289
+#: ../src/file-manager/fm-tree-view.c:1269
+#: ../src/nautilus-places-sidebar.c:2273
 msgid "_Unmount"
 msgstr "�载(_U)"
 
@@ -1485,7 +1493,7 @@ msgstr "ç²?è´´å?ªè´´æ?¿ä¸­ç??æ??å­?"
 #. name, stock id
 #. label, accelerator
 #: ../libnautilus-private/nautilus-clipboard.c:448
-#: ../src/file-manager/fm-directory-view.c:7005
+#: ../src/file-manager/fm-directory-view.c:7122
 msgid "Select _All"
 msgstr "å?¨é??(_A)"
 
@@ -1494,21 +1502,21 @@ msgstr "å?¨é??(_A)"
 msgid "Select all the text in a text field"
 msgstr "é??æ?©æ??æ?¬å??中ç??æ??æ??æ??æ?¬"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:323
+#: ../libnautilus-private/nautilus-column-chooser.c:368
 msgid "Move _Up"
 msgstr "�移(_U)"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:333
+#: ../libnautilus-private/nautilus-column-chooser.c:378
 msgid "Move Dow_n"
 msgstr "�移(_N)"
 
-#: ../libnautilus-private/nautilus-column-chooser.c:346
+#: ../libnautilus-private/nautilus-column-chooser.c:391
 msgid "Use De_fault"
 msgstr "使��认�(_F)"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:273
-#: ../src/file-manager/fm-list-view.c:1498
+#: ../src/file-manager/fm-list-view.c:1551
 msgid "Name"
 msgstr "å??称"
 
@@ -1533,7 +1541,7 @@ msgid "The type of the file."
 msgstr "æ??件ç??ç±»å??ã??"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:65
-#: ../src/nautilus-image-properties-page.c:270
+#: ../src/nautilus-image-properties-page.c:275
 msgid "Date Modified"
 msgstr "ä¿®æ?¹æ?¥æ??"
 
@@ -1566,7 +1574,7 @@ msgid "The group of the file."
 msgstr "æ??件ç??群ç»?ã??"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:97
-#: ../src/file-manager/fm-properties-window.c:4789
+#: ../src/file-manager/fm-properties-window.c:4812
 msgid "Permissions"
 msgstr "æ??é??"
 
@@ -1601,14 +1609,31 @@ msgstr "æ??件ç?? SELinux å®?å?¨ç?¯å¢?ã??"
 #. TODO: Change after string freeze over
 #: ../libnautilus-private/nautilus-column-utilities.c:127
 #: ../libnautilus-private/nautilus-column-utilities.c:129
-#: ../src/nautilus-image-properties-page.c:346
+#: ../src/nautilus-image-properties-page.c:351
 #: ../src/nautilus-query-editor.c:117
 msgid "Location"
 msgstr "ä½?ç½®"
 
+#: ../libnautilus-private/nautilus-column-utilities.c:170
+msgid "Trashed On"
+msgstr "å? é?¤äº?"
+
+#: ../libnautilus-private/nautilus-column-utilities.c:171
+msgid "Date when file was moved to the Trash"
+msgstr "æ??件移å?¨å?°å??æ?¶ç«?ç??æ?¥æ??"
+
+#: ../libnautilus-private/nautilus-column-utilities.c:177
+msgid "Original Location"
+msgstr "å??å§?ä½?ç½®"
+
+#: ../libnautilus-private/nautilus-column-utilities.c:178
+msgid "Original location of file before moved to the Trash"
+msgstr "移å?¨å?°å??æ?¶ç«?å??å??æ?¥ç??ä½?ç½®"
+
 #: ../libnautilus-private/nautilus-customization-data.c:405
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:519
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:428
-#: ../src/nautilus-property-browser.c:1863
+#: ../src/nautilus-property-browser.c:1873
 msgid "Reset"
 msgstr "é??ç½®"
 
@@ -1702,62 +1727,169 @@ msgstr "æ?±æ­?ï¼?æ? æ³?ä¿?å­?è?ªå®?ä¹?å¾½æ ?ã??"
 msgid "Sorry, unable to save custom emblem name."
 msgstr "æ?±æ­?ï¼?æ? æ³?ä¿?å­?è?ªå®?ä¹?å¾½æ ?å??称ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:186
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:82
+msgid "An older"
+msgstr "æ?§ç??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:85
+msgid "A newer"
+msgstr "æ?°ç??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:87
+msgid "Another"
+msgstr "��"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:159
+#, c-format
+msgid "Merge folder \"%s\"?"
+msgstr "å??并æ??件夹â??%sâ??å??ï¼?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:166
+#, c-format
+msgid ""
+"%s folder with the same name already exists in \"%s\".\n"
+"Merging will ask for confirmation before replacing any files in the folder "
+"that conflict with the files being copied."
+msgstr ""
+"â??%2$sâ??中已ç»?æ??å??为 %1$s ç??å??å??æ??件夹ã??\n"
+"é??æ?©å??并å°?ä¼?å?¨æ?¿æ?¢æ¯?个å?²çª?æ??件æ?¶è¯·æ±?确认ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:174
+#, c-format
+msgid "Replace folder \"%s\"?"
+msgstr "æ?¿æ?¢æ??件夹â??%sâ??å??ï¼?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:176
+#, c-format
+msgid ""
+"A folder with the same name already exists in \"%s\".\n"
+"Replacing it will remove all files in the folder."
+msgstr ""
+"â??%sâ??中已ç»?æ??å??å??æ??件夹ã??\n"
+"å¦?æ??æ?¨è¦?æ?¿æ?¢ç??è¯?ï¼?å?¶ä¸­ç??å?¨é?¨æ??件é?½å°?被å? é?¤ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:182
+#, c-format
+msgid "Replace file \"%s\"?"
+msgstr "æ?¿æ?¢æ??件â??%sâ??å??ï¼?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:188
+#, c-format
+msgid ""
+"%s file with the same name already exists in \"%s\".\n"
+"Replacing it will overwrite its content."
+msgstr ""
+"â??%2$sâ??中已ç»?æ??å??å??ç?? %1$s æ??件ã??\n"
+"å¦?æ??æ?¨è¦?æ?¿æ?¢ç??è¯?ï¼?å?¶å??容å°?被è¦?ç??ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:252
+msgid "Original file"
+msgstr "å??å§?æ??件"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:253
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:284
+#: ../src/file-manager/fm-properties-window.c:3311
+msgid "Size:"
+msgstr "大��"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:256
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:287
+#: ../src/file-manager/fm-properties-window.c:3293
+msgid "Type:"
+msgstr "ç±»å??ï¼?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:259
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:290
+msgid "Last modified:"
+msgstr "æ??è¿?ä¿®æ?¹ï¼?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:283
+msgid "Replace with"
+msgstr "��为"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:312
+msgid "Merge"
+msgstr "å??并"
+
+#. Setup the expander for the rename action
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:505
+msgid "_Select a new name for the destination"
+msgstr "为ç?®æ ?é??æ?©ä¸?个æ?°å??称(_S)"
+
+#. Setup the checkbox to apply the action to all files
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:531
+msgid "Apply this action to all files"
+msgstr "对å?¨é?¨æ??件åº?ç?¨æ­¤å?¨ä½?"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:542
+#: ../libnautilus-private/nautilus-file-operations.c:187
 msgid "_Skip"
 msgstr "跳�(_S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:187
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:547
+msgid "Re_name"
+msgstr "é??å?½å??(_N)"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:553
+msgid "Replace"
+msgstr "æ?¿æ?¢"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:626
+msgid "File conflict"
+msgstr "æ??件å?²çª?"
+
+#: ../libnautilus-private/nautilus-file-operations.c:188
 msgid "S_kip All"
 msgstr "��跳�(_K)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:188
+#: ../libnautilus-private/nautilus-file-operations.c:189
 msgid "_Retry"
 msgstr "é??è¯?(_R)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:189
+#: ../libnautilus-private/nautilus-file-operations.c:190
 msgid "Delete _All"
 msgstr "å?¨é??å? é?¤(_A)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:190
+#: ../libnautilus-private/nautilus-file-operations.c:191
 msgid "_Replace"
 msgstr "æ?¿æ?¢(_R)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:191
+#: ../libnautilus-private/nautilus-file-operations.c:192
 msgid "Replace _All"
 msgstr "����(_A)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:192
+#: ../libnautilus-private/nautilus-file-operations.c:193
 msgid "_Merge"
 msgstr "å??并(_M)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:193
+#: ../libnautilus-private/nautilus-file-operations.c:194
 msgid "Merge _All"
 msgstr "å?¨é?¨å??并(_A)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:194
+#: ../libnautilus-private/nautilus-file-operations.c:195
 msgid "Copy _Anyway"
 msgstr "����(_A)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:279
+#: ../libnautilus-private/nautilus-file-operations.c:280
 #, c-format
 msgid "%'d second"
 msgid_plural "%'d seconds"
 msgstr[0] "%'d �"
 
-#: ../libnautilus-private/nautilus-file-operations.c:284
-#: ../libnautilus-private/nautilus-file-operations.c:295
+#: ../libnautilus-private/nautilus-file-operations.c:285
+#: ../libnautilus-private/nautilus-file-operations.c:296
 #, c-format
 msgid "%'d minute"
 msgid_plural "%'d minutes"
 msgstr[0] "%'d å??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:294
+#: ../libnautilus-private/nautilus-file-operations.c:295
 #, c-format
 msgid "%'d hour"
 msgid_plural "%'d hours"
 msgstr[0] "%'d å°?æ?¶"
 
-#: ../libnautilus-private/nautilus-file-operations.c:302
+#: ../libnautilus-private/nautilus-file-operations.c:303
 #, c-format
 msgid "approximately %'d hour"
 msgid_plural "approximately %'d hours"
@@ -1768,15 +1900,15 @@ msgstr[0] "约 %'d ��"
 #. * (e.g. "folder", "plain text") to file type for symbolic link
 #. * to that kind of file (e.g. "link to folder").
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:378
-#: ../libnautilus-private/nautilus-file.c:6198
-#: ../src/file-manager/fm-directory-view.c:10170
+#: ../libnautilus-private/nautilus-file-operations.c:379
+#: ../libnautilus-private/nautilus-file.c:6355
+#: ../src/file-manager/fm-directory-view.c:10297
 #, c-format
 msgid "Link to %s"
 msgstr "å?° %s ç??é?¾æ?¥"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:382
+#: ../libnautilus-private/nautilus-file-operations.c:383
 #, c-format
 msgid "Another link to %s"
 msgstr "å?° %s ç??å?¦ä¸?个é?¾æ?¥"
@@ -1785,25 +1917,25 @@ msgstr "å?° %s ç??å?¦ä¸?个é?¾æ?¥"
 #. * if there's no way to do that nicely for a
 #. * particular language.
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:398
+#: ../libnautilus-private/nautilus-file-operations.c:399
 #, c-format
 msgid "%'dst link to %s"
 msgstr "å?° %2$s ç??第 %1$'d 个é?¾æ?¥"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:402
+#: ../libnautilus-private/nautilus-file-operations.c:403
 #, c-format
 msgid "%'dnd link to %s"
 msgstr "å?° %2$s ç??第 %1$'d 个é?¾æ?¥"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:406
+#: ../libnautilus-private/nautilus-file-operations.c:407
 #, c-format
 msgid "%'drd link to %s"
 msgstr "å?° %2$s ç??第 %1$'d 个é?¾æ?¥"
 
 #. appended to new link file
-#: ../libnautilus-private/nautilus-file-operations.c:410
+#: ../libnautilus-private/nautilus-file-operations.c:411
 #, c-format
 msgid "%'dth link to %s"
 msgstr "å?° %2$s ç??第 %1$'d 个é?¾æ?¥"
@@ -1813,12 +1945,12 @@ msgstr "å?° %2$s ç??第 %1$'d 个é?¾æ?¥"
 #. * make some or all of them match.
 #.
 #. localizers: tag used to detect the first copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:449
+#: ../libnautilus-private/nautilus-file-operations.c:450
 msgid " (copy)"
 msgstr " (�件)"
 
 #. localizers: tag used to detect the second copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:451
+#: ../libnautilus-private/nautilus-file-operations.c:452
 msgid " (another copy)"
 msgstr " (��个�件)"
 
@@ -1826,36 +1958,36 @@ msgstr " (��个�件)"
 #. localizers: tag used to detect the x12th copy of a file
 #. localizers: tag used to detect the x13th copy of a file
 #. localizers: tag used to detect the xxth copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:454
-#: ../libnautilus-private/nautilus-file-operations.c:456
-#: ../libnautilus-private/nautilus-file-operations.c:458
-#: ../libnautilus-private/nautilus-file-operations.c:468
+#: ../libnautilus-private/nautilus-file-operations.c:455
+#: ../libnautilus-private/nautilus-file-operations.c:457
+#: ../libnautilus-private/nautilus-file-operations.c:459
+#: ../libnautilus-private/nautilus-file-operations.c:469
 msgid "th copy)"
 msgstr "�件)"
 
 #. localizers: tag used to detect the x1st copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:461
+#: ../libnautilus-private/nautilus-file-operations.c:462
 msgid "st copy)"
 msgstr "�件)"
 
 #. localizers: tag used to detect the x2nd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:463
+#: ../libnautilus-private/nautilus-file-operations.c:464
 msgid "nd copy)"
 msgstr "�件)"
 
 #. localizers: tag used to detect the x3rd copy of a file
-#: ../libnautilus-private/nautilus-file-operations.c:465
+#: ../libnautilus-private/nautilus-file-operations.c:466
 msgid "rd copy)"
 msgstr "�件)"
 
 #. localizers: appended to first file copy
-#: ../libnautilus-private/nautilus-file-operations.c:482
+#: ../libnautilus-private/nautilus-file-operations.c:483
 #, c-format
 msgid "%s (copy)%s"
 msgstr "%s (�件)%s"
 
 #. localizers: appended to second file copy
-#: ../libnautilus-private/nautilus-file-operations.c:484
+#: ../libnautilus-private/nautilus-file-operations.c:485
 #, c-format
 msgid "%s (another copy)%s"
 msgstr "%s (��个�件)%s"
@@ -1864,10 +1996,10 @@ msgstr "%s (��个�件)%s"
 #. localizers: appended to x12th file copy
 #. localizers: appended to x13th file copy
 #. localizers: appended to xxth file copy
-#: ../libnautilus-private/nautilus-file-operations.c:487
-#: ../libnautilus-private/nautilus-file-operations.c:489
-#: ../libnautilus-private/nautilus-file-operations.c:491
-#: ../libnautilus-private/nautilus-file-operations.c:505
+#: ../libnautilus-private/nautilus-file-operations.c:488
+#: ../libnautilus-private/nautilus-file-operations.c:490
+#: ../libnautilus-private/nautilus-file-operations.c:492
+#: ../libnautilus-private/nautilus-file-operations.c:506
 #, c-format
 msgid "%s (%'dth copy)%s"
 msgstr "%s (第%'d个�件)%s"
@@ -1877,39 +2009,39 @@ msgstr "%s (第%'d个�件)%s"
 #. * strings look like "%s (copy %'d)%s".
 #.
 #. localizers: appended to x1st file copy
-#: ../libnautilus-private/nautilus-file-operations.c:499
+#: ../libnautilus-private/nautilus-file-operations.c:500
 #, c-format
 msgid "%s (%'dst copy)%s"
 msgstr "%s (第%'d个�件)%s"
 
 #. localizers: appended to x2nd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:501
+#: ../libnautilus-private/nautilus-file-operations.c:502
 #, c-format
 msgid "%s (%'dnd copy)%s"
 msgstr "%s (第%'d个�件)%s"
 
 #. localizers: appended to x3rd file copy
-#: ../libnautilus-private/nautilus-file-operations.c:503
+#: ../libnautilus-private/nautilus-file-operations.c:504
 #, c-format
 msgid "%s (%'drd copy)%s"
 msgstr "%s (第%'d个�件)%s"
 
 #. localizers: opening parentheses to match the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:603
+#: ../libnautilus-private/nautilus-file-operations.c:604
 msgid " ("
 msgstr " ("
 
 #. localizers: opening parentheses of the "th copy)" string
-#: ../libnautilus-private/nautilus-file-operations.c:611
+#: ../libnautilus-private/nautilus-file-operations.c:612
 #, c-format
 msgid " (%'d"
 msgstr " (第%'d个"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1298
+#: ../libnautilus-private/nautilus-file-operations.c:1299
 msgid "Are you sure you want to permanently delete \"%B\" from the trash?"
 msgstr "æ?¨ç¡®å®?è¦?ä»?å??æ?¶ç«?中永ä¹?å? é?¤â??%Bâ??å??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1301
+#: ../libnautilus-private/nautilus-file-operations.c:1302
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the %'d selected item from the "
@@ -1919,16 +2051,16 @@ msgid_plural ""
 "trash?"
 msgstr[0] "æ?¨ç¡®å®?è¦?ä»?å??æ?¶ç«?中永ä¹?å? é?¤è¿? %'d 个é??中项ç?®å??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1311
-#: ../libnautilus-private/nautilus-file-operations.c:1379
+#: ../libnautilus-private/nautilus-file-operations.c:1312
+#: ../libnautilus-private/nautilus-file-operations.c:1380
 msgid "If you delete an item, it will be permanently lost."
 msgstr "å¦?æ??æ?¨å? é?¤äº?ä¸?个项ç?®ï¼?å??该项å°?æ°¸ä¹?丢失ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1331
+#: ../libnautilus-private/nautilus-file-operations.c:1332
 msgid "Empty all of the items from the trash?"
 msgstr "æ¸?空å??æ?¶ç«?中ç??å?¨é?¨é¡¹ç?®å??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1335
+#: ../libnautilus-private/nautilus-file-operations.c:1336
 msgid ""
 "If you choose to empty the trash, all items in it will be permanently lost. "
 "Please note that you can also delete them separately."
@@ -1937,126 +2069,126 @@ msgstr ""
 "项ç?®ã??"
 
 #. Empty Trash menu item
-#: ../libnautilus-private/nautilus-file-operations.c:1340
-#: ../libnautilus-private/nautilus-file-operations.c:2183
-#: ../src/nautilus-places-sidebar.c:2279 ../src/nautilus-trash-bar.c:125
+#: ../libnautilus-private/nautilus-file-operations.c:1341
+#: ../libnautilus-private/nautilus-file-operations.c:2193
+#: ../src/nautilus-places-sidebar.c:2317 ../src/nautilus-trash-bar.c:190
 msgid "Empty _Trash"
 msgstr "æ¸?空å??æ?¶ç«?(_T)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1367
+#: ../libnautilus-private/nautilus-file-operations.c:1368
 msgid "Are you sure you want to permanently delete \"%B\"?"
 msgstr "æ?¨ç¡®å®?è¦?æ°¸ä¹?å? é?¤â??%Bâ??å??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1370
+#: ../libnautilus-private/nautilus-file-operations.c:1371
 #, c-format
 msgid "Are you sure you want to permanently delete the %'d selected item?"
 msgid_plural ""
 "Are you sure you want to permanently delete the %'d selected items?"
 msgstr[0] "æ?¨ç¡®å®?è¦?æ°¸ä¹?å? é?¤è¿? %'d 个é??中项ç?®å??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1413
+#: ../libnautilus-private/nautilus-file-operations.c:1414
 #, c-format
 msgid "%'d file left to delete"
 msgid_plural "%'d files left to delete"
 msgstr[0] "è¿?æ?? %'d 个æ??件è¦?å? é?¤"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1419
+#: ../libnautilus-private/nautilus-file-operations.c:1420
 msgid "Deleting files"
 msgstr "å? é?¤æ??件"
 
 #. To translators: %T will expand to a time like "2 minutes".
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:1433
+#: ../libnautilus-private/nautilus-file-operations.c:1434
 msgid "%T left"
 msgid_plural "%T left"
 msgstr[0] "%T å?©ä½?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1500
-#: ../libnautilus-private/nautilus-file-operations.c:1534
-#: ../libnautilus-private/nautilus-file-operations.c:1573
-#: ../libnautilus-private/nautilus-file-operations.c:1650
-#: ../libnautilus-private/nautilus-file-operations.c:2410
+#: ../libnautilus-private/nautilus-file-operations.c:1501
+#: ../libnautilus-private/nautilus-file-operations.c:1535
+#: ../libnautilus-private/nautilus-file-operations.c:1574
+#: ../libnautilus-private/nautilus-file-operations.c:1651
+#: ../libnautilus-private/nautilus-file-operations.c:2438
 msgid "Error while deleting."
 msgstr "å? é?¤æ?¶å??ç??é??误ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1504
+#: ../libnautilus-private/nautilus-file-operations.c:1505
 msgid ""
 "Files in the folder \"%B\" cannot be deleted because you do not have "
 "permissions to see them."
 msgstr "æ??件夹â??%Bâ??中ç??æ??件æ? æ³?å? é?¤ï¼?å? 为æ?¨æ²¡æ??读å??å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1507
-#: ../libnautilus-private/nautilus-file-operations.c:2469
-#: ../libnautilus-private/nautilus-file-operations.c:3435
+#: ../libnautilus-private/nautilus-file-operations.c:1508
+#: ../libnautilus-private/nautilus-file-operations.c:2497
+#: ../libnautilus-private/nautilus-file-operations.c:3463
 msgid ""
 "There was an error getting information about the files in the folder \"%B\"."
 msgstr "è?·å¾?æ??件夹â??%Bâ??中æ??件ç??ä¿¡æ?¯æ?¶å?ºé??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1516
-#: ../libnautilus-private/nautilus-file-operations.c:3444
+#: ../libnautilus-private/nautilus-file-operations.c:1517
+#: ../libnautilus-private/nautilus-file-operations.c:3472
 msgid "_Skip files"
 msgstr "è·³è¿?æ??件(_S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1537
+#: ../libnautilus-private/nautilus-file-operations.c:1538
 msgid ""
 "The folder \"%B\" cannot be deleted because you do not have permissions to "
 "read it."
 msgstr "æ? æ³?å? é?¤æ??件夹â??%Bâ??ï¼?å? 为æ?¨æ²¡æ??读å??å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1540
-#: ../libnautilus-private/nautilus-file-operations.c:2508
-#: ../libnautilus-private/nautilus-file-operations.c:3480
+#: ../libnautilus-private/nautilus-file-operations.c:1541
+#: ../libnautilus-private/nautilus-file-operations.c:2536
+#: ../libnautilus-private/nautilus-file-operations.c:3508
 msgid "There was an error reading the folder \"%B\"."
 msgstr "读å??æ??件夹â??%Bâ??æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1574
+#: ../libnautilus-private/nautilus-file-operations.c:1575
 msgid "Could not remove the folder %B."
 msgstr "æ? æ³?å? é?¤æ??件夹 %Bã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1651
+#: ../libnautilus-private/nautilus-file-operations.c:1652
 msgid "There was an error deleting %B."
 msgstr "å? é?¤ %B æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1731
+#: ../libnautilus-private/nautilus-file-operations.c:1732
 msgid "Moving files to trash"
 msgstr "å°?æ??件移å?¨å?°å??æ?¶ç«?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1733
+#: ../libnautilus-private/nautilus-file-operations.c:1734
 #, c-format
 msgid "%'d file left to trash"
 msgid_plural "%'d files left to trash"
 msgstr[0] "è¿?æ?? %'d 个æ??件è¦?移å?¨å?°å??æ?¶ç«?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1783
+#: ../libnautilus-private/nautilus-file-operations.c:1784
 msgid "Cannot move file to trash, do you want to delete immediately?"
 msgstr "æ? æ³?å°?æ??件移å?¨å?°å??æ?¶ç«?ã??æ?¨è¦?ç«?å?³å? é?¤å??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1784
+#: ../libnautilus-private/nautilus-file-operations.c:1785
 msgid "The file \"%B\" cannot be moved to the trash."
 msgstr "æ? æ³?å°?æ??件â??%Bâ??移å?¨å?°å??æ?¶ç«?中ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1959
+#: ../libnautilus-private/nautilus-file-operations.c:1960
 msgid "Trashing Files"
 msgstr "æ­£å?¨å°?æ??件移å?¨è?³å??æ?¶ç«?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:1961
+#: ../libnautilus-private/nautilus-file-operations.c:1962
 msgid "Deleting Files"
 msgstr "æ­£å?¨å? é?¤æ??件"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2023
+#: ../libnautilus-private/nautilus-file-operations.c:2026
 msgid "Unable to eject %V"
 msgstr "æ? æ³?å¼¹å?º %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2025
+#: ../libnautilus-private/nautilus-file-operations.c:2028
 msgid "Unable to unmount %V"
 msgstr "æ? æ³?å?¸è½½ %V"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2173
+#: ../libnautilus-private/nautilus-file-operations.c:2183
 msgid "Do you want to empty the trash before you unmount?"
 msgstr "æ?¨å?¨å?¸è½½ä¹?å??æ?¯å?¦æ?³è¦?æ¸?空å??æ?¶ç«?ï¼?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2175
+#: ../libnautilus-private/nautilus-file-operations.c:2185
 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."
@@ -2064,157 +2196,157 @@ msgstr ""
 "为äº?é??æ?°å?©ç?¨æ­¤å?·ä¸?ç??å?©ä½?空é?´ï¼?å¿?é¡»æ¸?空å??æ?¶ç«?ã??å??æ?¶ç«?中ç??å?¨é?¨å??容é?½å°?æ°¸ä¹?丢"
 "失ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2181
+#: ../libnautilus-private/nautilus-file-operations.c:2191
 msgid "Do _not Empty Trash"
 msgstr "ä¸?æ¸?空å??æ?¶ç«?(_N)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2280
+#: ../libnautilus-private/nautilus-file-operations.c:2307
 #, c-format
 msgid "Unable to mount %s"
 msgstr "æ? æ³?æ??è½½ %s"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2357
+#: ../libnautilus-private/nautilus-file-operations.c:2385
 #, c-format
 msgid "Preparing to copy %'d file (%S)"
 msgid_plural "Preparing to copy %'d files (%S)"
 msgstr[0] "å??å¤?å¤?å?¶ %'d 个æ??件(%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2363
+#: ../libnautilus-private/nautilus-file-operations.c:2391
 #, c-format
 msgid "Preparing to move %'d file (%S)"
 msgid_plural "Preparing to move %'d files (%S)"
 msgstr[0] "å??å¤?移å?¨ %'d 个æ??件(%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2369
+#: ../libnautilus-private/nautilus-file-operations.c:2397
 #, c-format
 msgid "Preparing to delete %'d file (%S)"
 msgid_plural "Preparing to delete %'d files (%S)"
 msgstr[0] "å??å¤?å? é?¤ %'d 个æ??件(%S)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2375
+#: ../libnautilus-private/nautilus-file-operations.c:2403
 #, c-format
 msgid "Preparing to trash %'d file"
 msgid_plural "Preparing to trash %'d files"
 msgstr[0] "å??å¤?å°? %'d 个æ??件移å?¨å?°å??æ?¶ç«?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2406
-#: ../libnautilus-private/nautilus-file-operations.c:3301
-#: ../libnautilus-private/nautilus-file-operations.c:3427
-#: ../libnautilus-private/nautilus-file-operations.c:3472
+#: ../libnautilus-private/nautilus-file-operations.c:2434
+#: ../libnautilus-private/nautilus-file-operations.c:3329
+#: ../libnautilus-private/nautilus-file-operations.c:3455
+#: ../libnautilus-private/nautilus-file-operations.c:3500
 msgid "Error while copying."
 msgstr "å¤?å?¶æ?¶å??ç??é??误ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2408
-#: ../libnautilus-private/nautilus-file-operations.c:3425
-#: ../libnautilus-private/nautilus-file-operations.c:3470
+#: ../libnautilus-private/nautilus-file-operations.c:2436
+#: ../libnautilus-private/nautilus-file-operations.c:3453
+#: ../libnautilus-private/nautilus-file-operations.c:3498
 msgid "Error while moving."
 msgstr "移å?¨æ?¶å??ç??é??误ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2412
+#: ../libnautilus-private/nautilus-file-operations.c:2440
 msgid "Error while moving files to trash."
 msgstr "å°?æ??件移å?¨å?°å??æ?¶ç«?æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2466
+#: ../libnautilus-private/nautilus-file-operations.c:2494
 msgid ""
 "Files in the folder \"%B\" cannot be handled because you do not have "
 "permissions to see them."
 msgstr "æ? æ³?å¤?ç??æ??件夹â??%Bâ??中ç??æ??件ï¼?å? 为æ?¨æ²¡æ??读å??å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2505
+#: ../libnautilus-private/nautilus-file-operations.c:2533
 msgid ""
 "The folder \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr "æ? æ³?å¤?ç??æ??件夹â??%Bâ??ï¼?å? 为æ?¨æ²¡æ??读å??å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2582
+#: ../libnautilus-private/nautilus-file-operations.c:2610
 msgid ""
 "The file \"%B\" cannot be handled because you do not have permissions to "
 "read it."
 msgstr "æ? æ³?å¤?ç??æ??件â??%Bâ??ï¼?å? 为æ?¨æ²¡æ??读å??å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2585
+#: ../libnautilus-private/nautilus-file-operations.c:2613
 msgid "There was an error getting information about \"%B\"."
 msgstr "è?·å¾?å?³äº?â??%Bâ??ç??ä¿¡æ?¯æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2685
-#: ../libnautilus-private/nautilus-file-operations.c:2727
-#: ../libnautilus-private/nautilus-file-operations.c:2760
-#: ../libnautilus-private/nautilus-file-operations.c:2790
+#: ../libnautilus-private/nautilus-file-operations.c:2713
+#: ../libnautilus-private/nautilus-file-operations.c:2755
+#: ../libnautilus-private/nautilus-file-operations.c:2788
+#: ../libnautilus-private/nautilus-file-operations.c:2818
 msgid "Error while copying to \"%B\"."
 msgstr "å¤?å?¶å?°â??%Bâ??æ?¶å??ç??é??误ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2689
+#: ../libnautilus-private/nautilus-file-operations.c:2717
 msgid "You do not have permissions to access the destination folder."
 msgstr "æ?¨æ²¡æ??访é?®ç?®æ ?æ??件夹ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2691
+#: ../libnautilus-private/nautilus-file-operations.c:2719
 msgid "There was an error getting information about the destination."
 msgstr "è?·å¾?å?³äº?ç?®æ ?ç??ä¿¡æ?¯æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2728
+#: ../libnautilus-private/nautilus-file-operations.c:2756
 msgid "The destination is not a folder."
 msgstr "ç?®æ ?ä½?ç½®ä¸?æ?¯æ??件夹ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2761
+#: ../libnautilus-private/nautilus-file-operations.c:2789
 msgid ""
 "There is not enough space on the destination. Try to remove files to make "
 "space."
 msgstr "ç?®æ ?ä½?置中没æ??足å¤?空é?´ã??请è¯?ç??å? é?¤ä¸?äº?æ??件以便é??æ?¾ç©ºé?´ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2763
+#: ../libnautilus-private/nautilus-file-operations.c:2791
 #, c-format
 msgid "There is %S available, but %S is required."
 msgstr "ç?®å??å?ªæ?? %Sï¼?ä½?é??è¦? %Sã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2791
+#: ../libnautilus-private/nautilus-file-operations.c:2819
 msgid "The destination is read-only."
 msgstr "ç?®æ ?æ?¯å?ªè¯»ç??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2850
+#: ../libnautilus-private/nautilus-file-operations.c:2878
 msgid "Moving \"%B\" to \"%B\""
 msgstr "å°?â??%Bâ??移å?¨å?°â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2851
+#: ../libnautilus-private/nautilus-file-operations.c:2879
 msgid "Copying \"%B\" to \"%B\""
 msgstr "å°?â??%Bâ??å¤?å?¶å?°â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2856
+#: ../libnautilus-private/nautilus-file-operations.c:2884
 msgid "Duplicating \"%B\""
 msgstr "å°±å?°å¤?å?¶â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2864
+#: ../libnautilus-private/nautilus-file-operations.c:2892
 msgid "Moving %'d file (in \"%B\") to \"%B\""
 msgid_plural "Moving %'d files (in \"%B\") to \"%B\""
 msgstr[0] "å°? %'d 个æ??件(â??%Bâ??中)移å?¨å?°â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2868
+#: ../libnautilus-private/nautilus-file-operations.c:2896
 msgid "Copying %'d file (in \"%B\") to \"%B\""
 msgid_plural "Copying %'d files (in \"%B\") to \"%B\""
 msgstr[0] "å°? %'d 个æ??件(â??%Bâ??中)å¤?å?¶å?°â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2876
+#: ../libnautilus-private/nautilus-file-operations.c:2904
 msgid "Duplicating %'d file (in \"%B\")"
 msgid_plural "Duplicating %'d files (in \"%B\")"
 msgstr[0] "å°±å?°å¤?å?¶ %'d 个æ??件(â??%Bâ??中)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2886
+#: ../libnautilus-private/nautilus-file-operations.c:2914
 msgid "Moving %'d file to \"%B\""
 msgid_plural "Moving %'d files to \"%B\""
 msgstr[0] "å°? %'d 个æ??件移å?¨å?°â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2890
+#: ../libnautilus-private/nautilus-file-operations.c:2918
 msgid "Copying %'d file to \"%B\""
 msgid_plural "Copying %'d files to \"%B\""
 msgstr[0] "å°? %'d 个æ??件å¤?å?¶å?°â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:2896
+#: ../libnautilus-private/nautilus-file-operations.c:2924
 #, c-format
 msgid "Duplicating %'d file"
 msgid_plural "Duplicating %'d files"
 msgstr[0] "å°±å?°å¤?å?¶ %'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:2916
+#: ../libnautilus-private/nautilus-file-operations.c:2944
 #, c-format
 msgid "%S of %S"
 msgstr "%Sï¼?å?± %S"
@@ -2224,277 +2356,240 @@ msgstr "%Sï¼?å?± %S"
 #. *
 #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument).
 #.
-#: ../libnautilus-private/nautilus-file-operations.c:2927
+#: ../libnautilus-private/nautilus-file-operations.c:2955
 msgid "%S of %S â?? %T left (%S/sec)"
 msgid_plural "%S of %S â?? %T left (%S/sec)"
 msgstr[0] "%S�� %S - �� %T (%S/�)"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3305
+#: ../libnautilus-private/nautilus-file-operations.c:3333
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "create it in the destination."
 msgstr "æ? æ³?å¤?å?¶æ??件夹â??%Bâ??ï¼?å? 为æ?¨æ²¡æ??å?¨ç?®æ ?ä½?ç½®å??建å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3308
+#: ../libnautilus-private/nautilus-file-operations.c:3336
 msgid "There was an error creating the folder \"%B\"."
 msgstr "å??建æ??件夹â??%Bâ??æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3432
+#: ../libnautilus-private/nautilus-file-operations.c:3460
 msgid ""
 "Files in the folder \"%B\" cannot be copied because you do not have "
 "permissions to see them."
 msgstr "æ? æ³?å¤?å?¶æ??件夹â??%Bâ??中ç??æ??件ï¼?å? 为æ?¨æ²¡æ??读å??å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3477
+#: ../libnautilus-private/nautilus-file-operations.c:3505
 msgid ""
 "The folder \"%B\" cannot be copied because you do not have permissions to "
 "read it."
 msgstr "æ? æ³?å¤?å?¶æ??件夹â??%Bâ??ï¼?å? 为æ?¨æ²¡æ??读å??å®?ç??æ??é??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3522
-#: ../libnautilus-private/nautilus-file-operations.c:4132
-#: ../libnautilus-private/nautilus-file-operations.c:4710
+#: ../libnautilus-private/nautilus-file-operations.c:3550
+#: ../libnautilus-private/nautilus-file-operations.c:4234
+#: ../libnautilus-private/nautilus-file-operations.c:4796
 msgid "Error while moving \"%B\"."
 msgstr "移å?¨å?°â??%Bâ??æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3523
+#: ../libnautilus-private/nautilus-file-operations.c:3551
 msgid "Could not remove the source folder."
 msgstr "æ? æ³?å? é?¤æº?æ??件夹ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3608
-#: ../libnautilus-private/nautilus-file-operations.c:3649
-#: ../libnautilus-private/nautilus-file-operations.c:4134
-#: ../libnautilus-private/nautilus-file-operations.c:4205
+#: ../libnautilus-private/nautilus-file-operations.c:3636
+#: ../libnautilus-private/nautilus-file-operations.c:3677
+#: ../libnautilus-private/nautilus-file-operations.c:4236
+#: ../libnautilus-private/nautilus-file-operations.c:4307
 msgid "Error while copying \"%B\"."
 msgstr "å¤?å?¶â??%Bâ??æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3609
+#: ../libnautilus-private/nautilus-file-operations.c:3637
 #, c-format
 msgid "Could not remove files from the already existing folder %F."
 msgstr "æ? æ³?ä»?å·²å­?å?¨ç??æ??件夹 %F 中å? é?¤æ??件ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3650
+#: ../libnautilus-private/nautilus-file-operations.c:3678
 #, c-format
 msgid "Could not remove the already existing file %F."
 msgstr "æ? æ³?å? é?¤å·²æ??æ??件 %Fã??"
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:3865
-#: ../libnautilus-private/nautilus-file-operations.c:4537
+#: ../libnautilus-private/nautilus-file-operations.c:3994
+#: ../libnautilus-private/nautilus-file-operations.c:4640
 msgid "You cannot move a folder into itself."
 msgstr "æ?¨æ? æ³?å°?æ??件夹移å?¥è?ªèº«ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3866
-#: ../libnautilus-private/nautilus-file-operations.c:4538
+#: ../libnautilus-private/nautilus-file-operations.c:3995
+#: ../libnautilus-private/nautilus-file-operations.c:4641
 msgid "You cannot copy a folder into itself."
 msgstr "æ?¨æ? æ³?å°?æ??件夹å¤?å?¶å?°è?ªèº«ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3867
-#: ../libnautilus-private/nautilus-file-operations.c:4539
+#: ../libnautilus-private/nautilus-file-operations.c:3996
+#: ../libnautilus-private/nautilus-file-operations.c:4642
 msgid "The destination folder is inside the source folder."
 msgstr "ç?®æ ?æ??件夹ä½?äº?æº?æ??件夹å??ã??"
 
 #. the run_warning() frees all strings passed in automatically
-#: ../libnautilus-private/nautilus-file-operations.c:3898
+#: ../libnautilus-private/nautilus-file-operations.c:4027
 msgid "You cannot move a file over itself."
 msgstr "æ?¨æ? æ³?å°?æ??件夹移å?¥è?ªèº«ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3899
+#: ../libnautilus-private/nautilus-file-operations.c:4028
 msgid "You cannot copy a file over itself."
 msgstr "æ?¨æ? æ³?å°?æ??件夹å¤?å?¶å?°è?ªèº«ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:3900
+#: ../libnautilus-private/nautilus-file-operations.c:4029
 msgid "The source file would be overwritten by the destination."
 msgstr "æº?æ??件å°?ä¼?被ç?®æ ?è¦?ç??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4030
-#: ../libnautilus-private/nautilus-file-operations.c:4619
-msgid ""
-"A folder named \"%B\" already exists.  Do you want to merge the source "
-"folder?"
-msgstr "æ??件夹â??%sâ??å·²ç»?å­?å?¨ã??æ?¨è¦?ä¸?æº?æ??件夹å??并å??ï¼?"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4032
-msgid ""
-"The source folder already exists in \"%B\".  Merging will ask for "
-"confirmation before replacing any files in the folder that conflict with the "
-"files being copied."
-msgstr "æº?æ??件夹已ç»?ä½?äº?â??%sâ??中ã??å??并å°?ä¼?å?¨æ?¿æ?¢å?²çª?æ??件æ?¶è¯·æ±?确认ã??"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4037
-#: ../libnautilus-private/nautilus-file-operations.c:4626
-msgid "A folder named \"%B\" already exists.  Do you want to replace it?"
-msgstr "æ??件夹â??%Bâ??å·²ç»?å­?å?¨ã??æ?¨è¦?æ?¿æ?¢å®?å??ï¼?"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4039
-#: ../libnautilus-private/nautilus-file-operations.c:4628
-#, c-format
-msgid ""
-"The folder already exists in \"%F\".  Replacing it will remove all files in "
-"the folder."
-msgstr "æ??件夹已ç»?ä½?äº?â??%Fâ??中ã??å¦?æ??æ?¨è¦?æ?¿æ?¢ç??è¯?ï¼?å?¶ä¸­ç??å?¨é?¨æ??件é?½å°?被å? é?¤ã??"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4044
-#: ../libnautilus-private/nautilus-file-operations.c:4633
-msgid "A file named \"%B\" already exists.  Do you want to replace it?"
-msgstr "æ??件â??%Bâ??å·²ç»?å­?å?¨ã??æ?¨è¦?æ?¿æ?¢å®?å??ï¼?"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4046
-#: ../libnautilus-private/nautilus-file-operations.c:4635
-#, c-format
-msgid ""
-"The file already exists in \"%F\".  Replacing it will overwrite its content."
-msgstr "æ??件已ç»?ä½?äº?â??%Fâ??中ã??å¦?æ??æ?¨è¦?æ?¿æ?¢ç??è¯?ï¼?å?¶å??容å°?被è¦?ç??ã??"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4136
+#: ../libnautilus-private/nautilus-file-operations.c:4238
 #, c-format
 msgid "Could not remove the already existing file with the same name in %F."
 msgstr "æ? æ³?å? é?¤ %F 中已æ??ç??å??å??æ??件ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4206
+#: ../libnautilus-private/nautilus-file-operations.c:4308
 #, c-format
 msgid "There was an error copying the file into %F."
 msgstr "å°?æ??件å¤?å?¶å?° %F æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4430
+#: ../libnautilus-private/nautilus-file-operations.c:4532
 msgid "Copying Files"
 msgstr "æ­£å?¨å¤?å?¶æ??件"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4447
+#: ../libnautilus-private/nautilus-file-operations.c:4549
 msgid "Preparing to Move to \"%B\""
 msgstr "å??å¤?移å?¨å?°â??%Bâ??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4451
+#: ../libnautilus-private/nautilus-file-operations.c:4553
 #, c-format
 msgid "Preparing to move %'d file"
 msgid_plural "Preparing to move %'d files"
 msgstr[0] "å??å¤?移å?¨ %'d 个æ??件"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4621
-msgid ""
-"The source folder already exists in \"%B\".  Merging will ask for "
-"confirmation before replacing any files in the folder that conflict with the "
-"files being moved."
-msgstr "æº?æ??件夹已ç»?ä½?äº?â??%Bâ??中ã??å??并å°?ä¼?å?¨æ?¿æ?¢å?²çª?æ??件æ?¶è¯·æ±?确认ã??"
-
-#: ../libnautilus-private/nautilus-file-operations.c:4711
+#: ../libnautilus-private/nautilus-file-operations.c:4797
 #, c-format
 msgid "There was an error moving the file into %F."
 msgstr "å°?æ??件移å?¨å?° %F æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4971
+#: ../libnautilus-private/nautilus-file-operations.c:5057
 msgid "Moving Files"
 msgstr "æ­£å?¨ç§»å?¨æ??件"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4988
+#: ../libnautilus-private/nautilus-file-operations.c:5074
 msgid "Creating links in \"%B\""
 msgstr "å??建æ??å??â??%Bâ??é?¾æ?¥"
 
-#: ../libnautilus-private/nautilus-file-operations.c:4992
+#: ../libnautilus-private/nautilus-file-operations.c:5078
 #, c-format
 msgid "Making link to %'d file"
 msgid_plural "Making links to %'d files"
 msgstr[0] "å??建 %'d 个æ??件ç??é?¾æ?¥"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5121
+#: ../libnautilus-private/nautilus-file-operations.c:5207
 msgid "Error while creating link to %B."
 msgstr "å?¨å??建å?° %B ç??é?¾æ?¥æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5123
+#: ../libnautilus-private/nautilus-file-operations.c:5209
 msgid "Symbolic links only supported for local files"
 msgstr "符å?·é?¾æ?¥å?ªæ?¯æ??æ?¬å?°æ??件"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5126
+#: ../libnautilus-private/nautilus-file-operations.c:5212
 msgid "The target doesn't support symbolic links."
 msgstr "æ??æ?¾ç?®æ ?ä¸?æ?¯æ??符å?·é?¾æ?¥ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5129
+#: ../libnautilus-private/nautilus-file-operations.c:5215
 #, c-format
 msgid "There was an error creating the symlink in %F."
 msgstr "å?¨ %F 中å??建符å?·é?¾ç»?æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5423
+#: ../libnautilus-private/nautilus-file-operations.c:5509
 msgid "Setting permissions"
 msgstr "设å®?æ??é??"
 
 #. localizers: the initial name of a new folder
-#: ../libnautilus-private/nautilus-file-operations.c:5673
+#: ../libnautilus-private/nautilus-file-operations.c:5759
 msgid "untitled folder"
 msgstr "æ?ªå?½å??æ??件夹"
 
 #. localizers: the initial name of a new empty file
-#: ../libnautilus-private/nautilus-file-operations.c:5681
+#: ../libnautilus-private/nautilus-file-operations.c:5767
 msgid "new file"
 msgstr "æ?°æ??件"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5831
+#: ../libnautilus-private/nautilus-file-operations.c:5917
 msgid "Error while creating directory %B."
 msgstr "å??建ç?®å½? %B æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5833
+#: ../libnautilus-private/nautilus-file-operations.c:5919
 msgid "Error while creating file %B."
 msgstr "å??建æ??件 %B æ?¶å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:5835
+#: ../libnautilus-private/nautilus-file-operations.c:5921
 #, c-format
 msgid "There was an error creating the directory in %F."
 msgstr "å?¨ %F 中å??建ç?®å½?å?ºé??ã??"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6093
+#: ../libnautilus-private/nautilus-file-operations.c:6179
 msgid "Emptying Trash"
 msgstr "æ­£å?¨æ¸?空å??æ?¶ç«?"
 
-#: ../libnautilus-private/nautilus-file-operations.c:6140
-#: ../libnautilus-private/nautilus-file-operations.c:6181
-#: ../libnautilus-private/nautilus-file-operations.c:6216
-#: ../libnautilus-private/nautilus-file-operations.c:6251
+#: ../libnautilus-private/nautilus-file-operations.c:6226
+#: ../libnautilus-private/nautilus-file-operations.c:6267
+#: ../libnautilus-private/nautilus-file-operations.c:6302
+#: ../libnautilus-private/nautilus-file-operations.c:6337
 msgid "Unable to mark launcher trusted (executable)"
 msgstr "æ? æ³?æ ?è®°å?¯å?¨å?¨ä¸ºå?¯ä¿¡ä»»ç??(å?¯æ?§è¡?)"
 
-#: ../libnautilus-private/nautilus-file.c:1211
-#: ../libnautilus-private/nautilus-vfs-file.c:381
+#: ../libnautilus-private/nautilus-file-utilities.c:1260
+#, c-format
+msgid "Could not determine original location of \"%s\" "
+msgstr "æ? æ³?ç¡®å®?â??%sâ??ç??å??å§?ä½?ç½®"
+
+#: ../libnautilus-private/nautilus-file-utilities.c:1264
+msgid "The item cannot be restored from trash"
+msgstr "项ç?®æ? æ³?ä»?å??æ?¶ç«?中æ?¢å¤?"
+
+#: ../libnautilus-private/nautilus-file.c:1214
+#: ../libnautilus-private/nautilus-vfs-file.c:390
 msgid "This file cannot be mounted"
 msgstr "æ? æ³?æ??载此æ??件"
 
-#: ../libnautilus-private/nautilus-file.c:1236
+#: ../libnautilus-private/nautilus-file.c:1259
 msgid "This file cannot be unmounted"
 msgstr "æ? æ³?å?¸è½½æ­¤æ??件"
 
-#: ../libnautilus-private/nautilus-file.c:1263
+#: ../libnautilus-private/nautilus-file.c:1293
 msgid "This file cannot be ejected"
 msgstr "æ? æ³?å¼¹å?ºæ­¤æ??件"
 
-#: ../libnautilus-private/nautilus-file.c:1290
-#: ../libnautilus-private/nautilus-vfs-file.c:559
+#: ../libnautilus-private/nautilus-file.c:1326
+#: ../libnautilus-private/nautilus-vfs-file.c:568
 msgid "This file cannot be started"
 msgstr "æ? æ³?å¼?å§?æ­¤æ??件"
 
-#: ../libnautilus-private/nautilus-file.c:1342
-#: ../libnautilus-private/nautilus-file.c:1373
+#: ../libnautilus-private/nautilus-file.c:1378
+#: ../libnautilus-private/nautilus-file.c:1409
 msgid "This file cannot be stopped"
 msgstr "æ? æ³?å?³é?­æ­¤æ??件"
 
-#: ../libnautilus-private/nautilus-file.c:1773
+#: ../libnautilus-private/nautilus-file.c:1809
 #, c-format
 msgid "Slashes are not allowed in filenames"
 msgstr "æ??件å??中ä¸?è?½å?ºç?°æ??线"
 
-#: ../libnautilus-private/nautilus-file.c:1791
+#: ../libnautilus-private/nautilus-file.c:1827
 #, c-format
 msgid "File not found"
 msgstr "æ??件æ?ªæ?¾å?°"
 
-#: ../libnautilus-private/nautilus-file.c:1819
+#: ../libnautilus-private/nautilus-file.c:1855
 #, c-format
 msgid "Toplevel files cannot be renamed"
 msgstr "æ? æ³?é??å?½å??顶级æ??件"
 
-#: ../libnautilus-private/nautilus-file.c:1842
+#: ../libnautilus-private/nautilus-file.c:1878
 #, c-format
 msgid "Unable to rename desktop icon"
 msgstr "æ? æ³?é??å?½å??æ¡?é?¢å?¾æ ?"
 
-#: ../libnautilus-private/nautilus-file.c:1879
+#: ../libnautilus-private/nautilus-file.c:1915
 #, c-format
 msgid "Unable to rename desktop file"
 msgstr "æ? æ³?é??å?½å??æ¡?é?¢æ??件"
@@ -2514,65 +2609,65 @@ msgstr "æ? æ³?é??å?½å??æ¡?é?¢æ??件"
 #. * off zero padding, and putting a "_" there will use
 #. * space padding instead of zero padding.
 #.
-#: ../libnautilus-private/nautilus-file.c:4319
+#: ../libnautilus-private/nautilus-file.c:4436
 msgid "today at 00:00:00 PM"
 msgstr "�天 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4320
+#: ../libnautilus-private/nautilus-file.c:4437
 #: ../src/nautilus-file-management-properties.c:472
 msgid "today at %-I:%M:%S %p"
 msgstr "�天 %H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4322
+#: ../libnautilus-private/nautilus-file.c:4439
 msgid "today at 00:00 PM"
 msgstr "�天 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4323
+#: ../libnautilus-private/nautilus-file.c:4440
 msgid "today at %-I:%M %p"
 msgstr "�天 %H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4325
+#: ../libnautilus-private/nautilus-file.c:4442
 msgid "today, 00:00 PM"
 msgstr "�天�00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4326
+#: ../libnautilus-private/nautilus-file.c:4443
 msgid "today, %-I:%M %p"
 msgstr "�天�%H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4328
-#: ../libnautilus-private/nautilus-file.c:4329
+#: ../libnautilus-private/nautilus-file.c:4445
+#: ../libnautilus-private/nautilus-file.c:4446
 msgid "today"
 msgstr "�天"
 
 #. Yesterday, use special word.
 #. * Note to localizers: Same issues as "today" string.
 #.
-#: ../libnautilus-private/nautilus-file.c:4338
+#: ../libnautilus-private/nautilus-file.c:4455
 msgid "yesterday at 00:00:00 PM"
 msgstr "�天 00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4339
+#: ../libnautilus-private/nautilus-file.c:4456
 msgid "yesterday at %-I:%M:%S %p"
 msgstr "�天 %-H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4341
+#: ../libnautilus-private/nautilus-file.c:4458
 msgid "yesterday at 00:00 PM"
 msgstr "�天 00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4342
+#: ../libnautilus-private/nautilus-file.c:4459
 msgid "yesterday at %-I:%M %p"
 msgstr "�天 %H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4344
+#: ../libnautilus-private/nautilus-file.c:4461
 msgid "yesterday, 00:00 PM"
 msgstr "�天�00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4345
+#: ../libnautilus-private/nautilus-file.c:4462
 msgid "yesterday, %-I:%M %p"
 msgstr "�天�%H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4347
-#: ../libnautilus-private/nautilus-file.c:4348
+#: ../libnautilus-private/nautilus-file.c:4464
+#: ../libnautilus-private/nautilus-file.c:4465
 msgid "yesterday"
 msgstr "�天"
 
@@ -2581,152 +2676,152 @@ msgstr "�天"
 #. * The width measurement templates correspond to
 #. * the day/month name with the most letters.
 #.
-#: ../libnautilus-private/nautilus-file.c:4359
+#: ../libnautilus-private/nautilus-file.c:4476
 msgid "Wednesday, September 00 0000 at 00:00:00 PM"
 msgstr "0000å¹´9æ??0æ?¥æ??æ??ä¸?ï¼?00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4360
+#: ../libnautilus-private/nautilus-file.c:4477
 msgid "%A, %B %-d %Y at %-I:%M:%S %p"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%Aï¼?%-H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4362
+#: ../libnautilus-private/nautilus-file.c:4479
 msgid "Mon, Oct 00 0000 at 00:00:00 PM"
 msgstr "0000å¹´10æ??0æ?¥æ??æ??ä¸?ï¼?00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4363
+#: ../libnautilus-private/nautilus-file.c:4480
 msgid "%a, %b %-d %Y at %-I:%M:%S %p"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%Aï¼?%-H:%M:%S"
 
-#: ../libnautilus-private/nautilus-file.c:4365
+#: ../libnautilus-private/nautilus-file.c:4482
 msgid "Mon, Oct 00 0000 at 00:00 PM"
 msgstr "0000å¹´10æ??0æ?¥å?¨ä¸?ï¼?00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4366
+#: ../libnautilus-private/nautilus-file.c:4483
 msgid "%a, %b %-d %Y at %-I:%M %p"
 msgstr "%Yå¹´%-mæ??%-dæ?¥%aï¼?%-H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4368
+#: ../libnautilus-private/nautilus-file.c:4485
 msgid "Oct 00 0000 at 00:00 PM"
 msgstr "0000å¹´10æ??0æ?¥ï¼?00:00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4369
+#: ../libnautilus-private/nautilus-file.c:4486
 msgid "%b %-d %Y at %-I:%M %p"
 msgstr "%Yå¹´%-mæ??%-dæ?¥ï¼?%H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4371
+#: ../libnautilus-private/nautilus-file.c:4488
 msgid "Oct 00 0000, 00:00 PM"
 msgstr "0000å¹´0æ??0æ?¥ï¼?00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4372
+#: ../libnautilus-private/nautilus-file.c:4489
 msgid "%b %-d %Y, %-I:%M %p"
 msgstr "%Yå¹´%-mæ??%-dæ?¥ï¼?%H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4374
+#: ../libnautilus-private/nautilus-file.c:4491
 msgid "00/00/00, 00:00 PM"
 msgstr "00-00-00ï¼?00:00"
 
-#: ../libnautilus-private/nautilus-file.c:4375
+#: ../libnautilus-private/nautilus-file.c:4492
 msgid "%m/%-d/%y, %-I:%M %p"
 msgstr "%Y-%-m-%-dï¼?%H:%M"
 
-#: ../libnautilus-private/nautilus-file.c:4377
+#: ../libnautilus-private/nautilus-file.c:4494
 msgid "00/00/00"
 msgstr "00-00-00"
 
-#: ../libnautilus-private/nautilus-file.c:4378
+#: ../libnautilus-private/nautilus-file.c:4495
 msgid "%m/%d/%y"
 msgstr "%Y-%m-%d"
 
-#: ../libnautilus-private/nautilus-file.c:4993
+#: ../libnautilus-private/nautilus-file.c:5134
 #, c-format
 msgid "Not allowed to set permissions"
 msgstr "ä¸?å??许设å®?æ??é??"
 
-#: ../libnautilus-private/nautilus-file.c:5278
+#: ../libnautilus-private/nautilus-file.c:5419
 #, c-format
 msgid "Not allowed to set owner"
 msgstr "ä¸?å??许设å®?æ??æ??è??"
 
-#: ../libnautilus-private/nautilus-file.c:5296
+#: ../libnautilus-private/nautilus-file.c:5437
 #, c-format
 msgid "Specified owner '%s' doesn't exist"
 msgstr "æ??å®?ç??æ??æ??è??â??%sâ??ä¸?å­?å?¨"
 
-#: ../libnautilus-private/nautilus-file.c:5545
+#: ../libnautilus-private/nautilus-file.c:5686
 #, c-format
 msgid "Not allowed to set group"
 msgstr "ä¸?å??许设å®?ç»?"
 
-#: ../libnautilus-private/nautilus-file.c:5563
+#: ../libnautilus-private/nautilus-file.c:5704
 #, c-format
 msgid "Specified group '%s' doesn't exist"
 msgstr "æ??å®?ç»?â??%sâ??ä¸?å­?å?¨"
 
-#: ../libnautilus-private/nautilus-file.c:5707
-#: ../src/file-manager/fm-directory-view.c:2228
+#: ../libnautilus-private/nautilus-file.c:5848
+#: ../src/file-manager/fm-directory-view.c:2293
 #, c-format
 msgid "%'u item"
 msgid_plural "%'u items"
 msgstr[0] "%'u 项"
 
-#: ../libnautilus-private/nautilus-file.c:5708
+#: ../libnautilus-private/nautilus-file.c:5849
 #, c-format
 msgid "%'u folder"
 msgid_plural "%'u folders"
 msgstr[0] "%'u 个æ??件夹"
 
-#: ../libnautilus-private/nautilus-file.c:5709
+#: ../libnautilus-private/nautilus-file.c:5850
 #, c-format
 msgid "%'u file"
 msgid_plural "%'u files"
 msgstr[0] "%'u 个æ??件"
 
 #. Do this in a separate stage so that we don't have to put G_GUINT64_FORMAT in the translated string
-#: ../libnautilus-private/nautilus-file.c:5788
+#: ../libnautilus-private/nautilus-file.c:5929
 msgid "%"
 msgstr "%"
 
-#: ../libnautilus-private/nautilus-file.c:5789
+#: ../libnautilus-private/nautilus-file.c:5930
 #, c-format
 msgid "%s (%s bytes)"
 msgstr "%s (%s å­?è??)"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6093
-#: ../libnautilus-private/nautilus-file.c:6109
+#: ../libnautilus-private/nautilus-file.c:6241
+#: ../libnautilus-private/nautilus-file.c:6257
 msgid "? items"
 msgstr "? 项"
 
 #. This means no contents at all were readable
-#: ../libnautilus-private/nautilus-file.c:6099
+#: ../libnautilus-private/nautilus-file.c:6247
 msgid "? bytes"
 msgstr "? å­?è??"
 
-#: ../libnautilus-private/nautilus-file.c:6114
+#: ../libnautilus-private/nautilus-file.c:6262
 msgid "unknown type"
 msgstr "æ?ªç?¥ç±»å??"
 
-#: ../libnautilus-private/nautilus-file.c:6117
+#: ../libnautilus-private/nautilus-file.c:6265
 msgid "unknown MIME type"
 msgstr "æ?ªç?¥ MIME ç±»å??"
 
 #. Fallback, use for both unknown attributes and attributes
 #. * for which we have no more appropriate default.
 #.
-#: ../libnautilus-private/nautilus-file.c:6123
+#: ../libnautilus-private/nautilus-file.c:6279
 #: ../src/file-manager/fm-properties-window.c:1319
 msgid "unknown"
 msgstr "��"
 
-#: ../libnautilus-private/nautilus-file.c:6172
+#: ../libnautilus-private/nautilus-file.c:6329
 msgid "program"
 msgstr "��"
 
-#: ../libnautilus-private/nautilus-file.c:6192
+#: ../libnautilus-private/nautilus-file.c:6349
 msgid "link"
 msgstr "��"
 
-#: ../libnautilus-private/nautilus-file.c:6214
+#: ../libnautilus-private/nautilus-file.c:6371
 msgid "link (broken)"
 msgstr "��(已�)"
 
@@ -2863,25 +2958,25 @@ msgstr "æ??æ??件å??å??æ??件å±?æ?§æ??ç´¢æ??件"
 #. * of navigation windows and in the preferences dialog
 #: ../libnautilus-private/nautilus-global-preferences.c:142
 #: ../src/file-manager/fm-icon-container.c:569
-#: ../src/file-manager/fm-icon-view.c:3062
-#: ../src/nautilus-file-management-properties.ui.h:65
+#: ../src/file-manager/fm-icon-view.c:3168
+#: ../src/nautilus-file-management-properties.ui.h:64
 msgid "Icon View"
 msgstr "å?¾æ ?è§?å?¾"
 
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
 #: ../libnautilus-private/nautilus-global-preferences.c:143
-#: ../src/file-manager/fm-icon-view.c:3076
-#: ../src/nautilus-file-management-properties.ui.h:58
+#: ../src/file-manager/fm-icon-view.c:3182
+#: ../src/nautilus-file-management-properties.ui.h:57
 msgid "Compact View"
 msgstr "ç´§å??è§?å?¾"
 
 #. translators: this is used in the view selection dropdown
 #. * of navigation windows and in the preferences dialog
 #: ../libnautilus-private/nautilus-global-preferences.c:144
-#: ../src/file-manager/fm-list-view.c:1552
-#: ../src/file-manager/fm-list-view.c:2967
-#: ../src/nautilus-file-management-properties.ui.h:68
+#: ../src/file-manager/fm-list-view.c:1605
+#: ../src/file-manager/fm-list-view.c:3128
+#: ../src/nautilus-file-management-properties.ui.h:67
 msgid "List View"
 msgstr "å??表è§?å?¾"
 
@@ -2890,27 +2985,27 @@ msgid "Manually"
 msgstr "æ??å?¨"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:150
-#: ../src/nautilus-file-management-properties.ui.h:51
+#: ../src/nautilus-file-management-properties.ui.h:50
 msgid "By Name"
 msgstr "æ??å??称"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:151
-#: ../src/nautilus-file-management-properties.ui.h:52
+#: ../src/nautilus-file-management-properties.ui.h:51
 msgid "By Size"
 msgstr "æ??大å°?"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:152
-#: ../src/nautilus-file-management-properties.ui.h:53
+#: ../src/nautilus-file-management-properties.ui.h:52
 msgid "By Type"
 msgstr "æ??ç±»å??"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:153
-#: ../src/nautilus-file-management-properties.ui.h:50
+#: ../src/nautilus-file-management-properties.ui.h:49
 msgid "By Modification Date"
 msgstr "æ??ä¿®æ?¹æ?¶é?´"
 
 #: ../libnautilus-private/nautilus-global-preferences.c:154
-#: ../src/nautilus-file-management-properties.ui.h:49
+#: ../src/nautilus-file-management-properties.ui.h:48
 msgid "By Emblems"
 msgstr "æ??å¾½æ ?"
 
@@ -2958,143 +3053,137 @@ msgstr "24"
 #. * match the user name string passed by the C code, but not
 #. * put the user name in the final string.
 #.
-#: ../libnautilus-private/nautilus-global-preferences.c:584
+#: ../libnautilus-private/nautilus-global-preferences.c:580
 #, c-format
 msgid "%s's Home"
 msgstr "%s ç??主æ??件夹"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:590
+#: ../libnautilus-private/nautilus-global-preferences.c:586
 #: ../data/nautilus-computer.desktop.in.in.h:2
 msgid "Computer"
 msgstr "计��"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:596
-#: ../src/nautilus-places-sidebar.c:508 ../src/nautilus-trash-bar.c:121
+#: ../libnautilus-private/nautilus-global-preferences.c:592
+#: ../src/nautilus-places-sidebar.c:546 ../src/nautilus-trash-bar.c:186
 msgid "Trash"
 msgstr "å??æ?¶ç«?"
 
-#: ../libnautilus-private/nautilus-global-preferences.c:602
+#: ../libnautilus-private/nautilus-global-preferences.c:598
 msgid "Network Servers"
 msgstr "ç½?ç»?æ??å?¡å?¨"
 
-#: ../libnautilus-private/nautilus-icon-container.c:2692
+#: ../libnautilus-private/nautilus-icon-container.c:2712
 msgid "The selection rectangle"
 msgstr "ç?©å½¢é??å?º"
 
-#: ../libnautilus-private/nautilus-icon-dnd.c:927
+#: ../libnautilus-private/nautilus-icon-dnd.c:931
 msgid "Switch to Manual Layout?"
 msgstr "å??æ?¢å?°æ??å·¥å¸?å±?ï¼?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:698
+#: ../libnautilus-private/nautilus-mime-actions.c:697
 #, c-format
 msgid "The Link \"%s\" is Broken."
 msgstr "é?¾æ?¥â??%sâ??å·²ç»?æ??å??ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:700
+#: ../libnautilus-private/nautilus-mime-actions.c:699
 #, c-format
 msgid "The Link \"%s\" is Broken. Move it to Trash?"
 msgstr "é?¾æ?¥â??%sâ??å·²ç»?æ??å??ã??æ?¨è¦?å°?该å?¶ç§»å?¨å?°å??æ?¶ç«?中å??ï¼?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:706
+#: ../libnautilus-private/nautilus-mime-actions.c:705
 msgid "This link cannot be used, because it has no target."
 msgstr "æ? æ³?使ç?¨æ­¤é?¾æ?¥ï¼?å? 为å®?没æ??ç?®æ ?ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:708
+#: ../libnautilus-private/nautilus-mime-actions.c:707
 #, c-format
 msgid "This link cannot be used, because its target \"%s\" doesn't exist."
 msgstr "æ? æ³?使ç?¨æ­¤é?¾æ?¥ï¼?å? 为å?¶ç?®æ ?â??%sâ??ä¸?å­?å?¨ã??"
 
 #. name, stock id
 #. label, accelerator
-#: ../libnautilus-private/nautilus-mime-actions.c:718
-#: ../src/file-manager/fm-directory-view.c:7033
-#: ../src/file-manager/fm-directory-view.c:7037
-#: ../src/file-manager/fm-directory-view.c:7041
-#: ../src/file-manager/fm-directory-view.c:7168
-#: ../src/file-manager/fm-directory-view.c:8298
-#: ../src/file-manager/fm-directory-view.c:8607
-#: ../src/file-manager/fm-tree-view.c:1289
+#: ../libnautilus-private/nautilus-mime-actions.c:717
+#: ../src/file-manager/fm-directory-view.c:7150
+#: ../src/file-manager/fm-directory-view.c:7273
+#: ../src/file-manager/fm-directory-view.c:8373
+#: ../src/file-manager/fm-directory-view.c:8694
+#: ../src/file-manager/fm-tree-view.c:1242
 msgid "Mo_ve to Trash"
 msgstr "移å?¨å?°å??æ?¶ç«?(_V)"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:778
+#: ../libnautilus-private/nautilus-mime-actions.c:777
 #, c-format
 msgid "Do you want to run \"%s\", or display its contents?"
 msgstr "æ?¨æ?¯è¦?è¿?è¡?â??%sâ??ï¼?è¿?æ?¯æ?¾ç¤ºå®?ç??å??容ï¼?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:780
+#: ../libnautilus-private/nautilus-mime-actions.c:779
 #, c-format
 msgid "\"%s\" is an executable text file."
 msgstr "â??%sâ??æ?¯å?¯æ?§è¡?ç??æ??æ?¬æ??件ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:786
+#: ../libnautilus-private/nautilus-mime-actions.c:785
 msgid "Run in _Terminal"
 msgstr "��端中��(_T)"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:787
+#: ../libnautilus-private/nautilus-mime-actions.c:786
 msgid "_Display"
 msgstr "�示(_D)"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:790
+#: ../libnautilus-private/nautilus-mime-actions.c:789
 #: ../src/nautilus-autorun-software.c:229
 msgid "_Run"
 msgstr "è¿?è¡?(_R)"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1114
-#: ../src/file-manager/fm-directory-view.c:631
+#: ../libnautilus-private/nautilus-mime-actions.c:1113
+#: ../src/file-manager/fm-directory-view.c:629
 msgid "Are you sure you want to open all files?"
 msgstr "æ?¨ç¡®å®?è¦?æ??å¼?å?¨é?¨æ??件å??ï¼?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1116
+#: ../libnautilus-private/nautilus-mime-actions.c:1115
 #, c-format
 msgid "This will open %d separate tab."
 msgid_plural "This will open %d separate tabs."
 msgstr[0] "è¿?å°?æ??å¼? %d 个ç?¬ç«?ç??æ ?ç­¾ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1119
-#: ../src/nautilus-location-bar.c:148
+#: ../libnautilus-private/nautilus-mime-actions.c:1118
+#: ../src/nautilus-location-bar.c:149
 #, c-format
 msgid "This will open %d separate window."
 msgid_plural "This will open %d separate windows."
 msgstr[0] "è¿?å°?æ??å¼? %d 个ç?¬ç«?ç??çª?å?£ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1183
-#: ../src/nautilus-window-manage-views.c:1891
-#: ../src/nautilus-window-manage-views.c:1897
-#: ../src/nautilus-window-manage-views.c:1914
-#: ../src/nautilus-window-manage-views.c:1925
-#: ../src/nautilus-window-manage-views.c:1931
-#: ../src/nautilus-window-manage-views.c:1956
+#: ../libnautilus-private/nautilus-mime-actions.c:1185
+#: ../src/nautilus-window-manage-views.c:1873
+#: ../src/nautilus-window-manage-views.c:1879
+#: ../src/nautilus-window-manage-views.c:1896
+#: ../src/nautilus-window-manage-views.c:1907
+#: ../src/nautilus-window-manage-views.c:1913
+#: ../src/nautilus-window-manage-views.c:1939
 #, c-format
 msgid "Could not display \"%s\"."
 msgstr "æ? æ³?æ?¾ç¤ºâ??%sâ??ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1267
+#: ../libnautilus-private/nautilus-mime-actions.c:1269
 msgid "The file is of an unknown type"
 msgstr "æ??件æ?¯æ?ªç?¥ç±»å??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1270
+#: ../libnautilus-private/nautilus-mime-actions.c:1272
 #, c-format
 msgid "There is no application installed for %s files"
 msgstr "没æ??为 %s æ??件类å??å®?è£?åº?ç?¨ç¨?åº?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1282
+#: ../libnautilus-private/nautilus-mime-actions.c:1284
 msgid "_Select Application"
 msgstr "é??æ?©ç¨?åº?(_S)"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1318
+#: ../libnautilus-private/nautilus-mime-actions.c:1320
 msgid "There was an internal error trying to search for applications:"
 msgstr "è¯?å?¾æ??ç´¢åº?ç?¨ç¨?åº?æ?¶å??ç??äº?å??é?¨é??误ï¼?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1320
+#: ../libnautilus-private/nautilus-mime-actions.c:1322
 msgid "Unable to search for application"
 msgstr "æ? æ³?æ??ç´¢åº?ç?¨ç¨?åº?"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1394
-msgid "Could not use system package installer"
-msgstr "æ? æ³?使ç?¨ç³»ç»?å??å®?è£?å?¨"
-
-#: ../libnautilus-private/nautilus-mime-actions.c:1461
+#: ../libnautilus-private/nautilus-mime-actions.c:1443
 #, c-format
 msgid ""
 "There is no application installed for %s files.\n"
@@ -3103,11 +3192,11 @@ msgstr ""
 "没æ??为 %s æ??件类å??å®?è£?åº?ç?¨ç¨?åº?ã??\n"
 "æ?¨æ?¯å?¦æ?³è¦?æ??ç´¢å?¯æ??å¼?æ­¤æ??件ç??åº?ç?¨ç¨?åº??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1634
+#: ../libnautilus-private/nautilus-mime-actions.c:1599
 msgid "Untrusted application launcher"
 msgstr "æ?ªä¿¡ä»»ç??åº?ç?¨ç¨?åº?å?¯å?¨å?¨"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1637
+#: ../libnautilus-private/nautilus-mime-actions.c:1602
 #, c-format
 msgid ""
 "The application launcher \"%s\" has not been marked as trusted. If you do "
@@ -3116,44 +3205,44 @@ msgstr ""
 "åº?ç?¨ç¨?åº?å?¯å?¨å?¨ â??%sâ?? è¿?没æ??被æ ?记为å?¯ä¿¡ä»»ç??ã??å¦?æ??æ?¨ä¸?ç?¥é??è¿?个æ??件ç??æ?¥æº?ï¼?é?£ä¹?"
 "å?¯å?¨å®?å?¯è?½ä¼?ä¸?å®?å?¨ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1649
+#: ../libnautilus-private/nautilus-mime-actions.c:1614
 msgid "_Launch Anyway"
 msgstr "����(_L)"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1652
+#: ../libnautilus-private/nautilus-mime-actions.c:1617
 msgid "Mark as _Trusted"
 msgstr "æ ?记为信任(_T)"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:1925
-#: ../libnautilus-private/nautilus-mime-actions.c:2198
-#: ../src/file-manager/fm-directory-view.c:6001
+#: ../libnautilus-private/nautilus-mime-actions.c:1889
+#: ../libnautilus-private/nautilus-mime-actions.c:2163
+#: ../src/file-manager/fm-directory-view.c:6163
 msgid "Unable to mount location"
 msgstr "æ? æ³?æ??è½½ä½?ç½®"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:2276
-#: ../src/file-manager/fm-directory-view.c:6160
+#: ../libnautilus-private/nautilus-mime-actions.c:2242
+#: ../src/file-manager/fm-directory-view.c:6337
 msgid "Unable to start location"
 msgstr "æ? æ³?å?¯å?¨ä½?ç½®"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:2364
+#: ../libnautilus-private/nautilus-mime-actions.c:2330
 #, c-format
 msgid "Opening \"%s\"."
 msgstr "æ­£å?¨æ??å¼?â??%sâ??ã??"
 
-#: ../libnautilus-private/nautilus-mime-actions.c:2367
+#: ../libnautilus-private/nautilus-mime-actions.c:2333
 #, c-format
 msgid "Opening %d item."
 msgid_plural "Opening %d items."
 msgstr[0] "æ­£å?¨æ??å¼? %d 项ã??"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:165
-#: ../libnautilus-private/nautilus-open-with-dialog.c:260
+#: ../libnautilus-private/nautilus-open-with-dialog.c:277
 #, c-format
 msgid "Could not set application as the default: %s"
 msgstr "æ? æ³?å°?åº?ç?¨ç¨?åº?设å®?为é»?认å?¼ï¼?%s"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:166
-#: ../libnautilus-private/nautilus-open-with-dialog.c:261
+#: ../libnautilus-private/nautilus-open-with-dialog.c:278
 msgid "Could not set as default application"
 msgstr "æ? æ³?设å®?为é»?认åº?ç?¨ç¨?åº?"
 
@@ -3179,7 +3268,7 @@ msgid "%s document"
 msgstr "%s æ??æ¡£"
 
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:573
-#: ../libnautilus-private/nautilus-open-with-dialog.c:985
+#: ../libnautilus-private/nautilus-open-with-dialog.c:998
 msgid "Unknown"
 msgstr "��"
 
@@ -3193,108 +3282,108 @@ msgstr "é??æ?©ä¸?个åº?ç?¨ç¨?åº?ç?¨æ?¥æ??å¼? %s å??â??%sâ??ç±»å??ç??å?¶å®?æ??件
 msgid "Open all files of type \"%s\" with:"
 msgstr "ç?¨æ­¤åº?ç?¨ç¨?åº?æ??å¼?â??%sâ??ç±»å??ç??å?¨é?¨æ??件ï¼?"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:147
+#: ../libnautilus-private/nautilus-open-with-dialog.c:148
 msgid "Could not run application"
 msgstr "æ? æ³?è¿?è¡?åº?ç?¨ç¨?åº?"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:159
+#: ../libnautilus-private/nautilus-open-with-dialog.c:160
 #, c-format
 msgid "Could not find '%s'"
 msgstr "æ?¾ä¸?å?°â??%sâ??"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:162
+#: ../libnautilus-private/nautilus-open-with-dialog.c:163
 msgid "Could not find application"
 msgstr "�������"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:236
+#: ../libnautilus-private/nautilus-open-with-dialog.c:238
 #, c-format
 msgid "Could not add application to the application database: %s"
 msgstr "æ? æ³?å°?åº?ç?¨ç¨?åº?æ·»å? å?°åº?ç?¨ç¨?åº?æ?°æ?®åº?中ï¼?%s"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:237
+#: ../libnautilus-private/nautilus-open-with-dialog.c:239
 msgid "Could not add application"
 msgstr "æ? æ³?æ·»å? åº?ç?¨ç¨?åº?"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:406
+#: ../libnautilus-private/nautilus-open-with-dialog.c:421
 msgid "Select an Application"
 msgstr "é??æ?©ä¸?个åº?ç?¨ç¨?åº?"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:767
-#: ../src/file-manager/fm-properties-window.c:5106
+#: ../libnautilus-private/nautilus-open-with-dialog.c:780
+#: ../src/file-manager/fm-properties-window.c:5130
 msgid "Open With"
 msgstr "æ??å¼?æ?¹å¼?"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:804
+#: ../libnautilus-private/nautilus-open-with-dialog.c:817
 msgid "Select an application to view its description."
 msgstr "é??æ?©ä¸?个åº?ç?¨ç¨?åº?以æ?¥ç??å?¶æ??è¿°ã??"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:829
+#: ../libnautilus-private/nautilus-open-with-dialog.c:842
 msgid "_Use a custom command"
 msgstr "使�����令(_U)"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:846
+#: ../libnautilus-private/nautilus-open-with-dialog.c:859
 msgid "_Browse..."
 msgstr "��(_B)..."
 
 #. name, stock id
 #. label, accelerator
-#: ../libnautilus-private/nautilus-open-with-dialog.c:882
-#: ../src/file-manager/fm-directory-view.c:6951
-#: ../src/file-manager/fm-directory-view.c:8486
-#: ../src/file-manager/fm-tree-view.c:1210
-#: ../src/nautilus-places-sidebar.c:2184
+#: ../libnautilus-private/nautilus-open-with-dialog.c:895
+#: ../src/file-manager/fm-directory-view.c:7066
+#: ../src/file-manager/fm-directory-view.c:8566
+#: ../src/file-manager/fm-tree-view.c:1163
+#: ../src/nautilus-places-sidebar.c:2222
 msgid "_Open"
 msgstr "æ??å¼?(_O)"
 
 #. first %s is a filename and second %s is a file extension
-#: ../libnautilus-private/nautilus-open-with-dialog.c:962
+#: ../libnautilus-private/nautilus-open-with-dialog.c:975
 #, c-format
 msgid "Open %s and other %s document with:"
 msgstr "ç?¨æ­¤åº?ç?¨ç¨?åº?æ??å¼? %s å??â??%sâ??ç±»å??ç??å?¶å®?æ??件ï¼?"
 
 #. the %s here is a file name
 #. %s is a filename
-#: ../libnautilus-private/nautilus-open-with-dialog.c:966
-#: ../libnautilus-private/nautilus-open-with-dialog.c:997
+#: ../libnautilus-private/nautilus-open-with-dialog.c:979
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1010
 #, c-format
 msgid "Open %s with:"
 msgstr "%s ç??æ??å¼?æ?¹å¼?ï¼?"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:967
+#: ../libnautilus-private/nautilus-open-with-dialog.c:980
 #, c-format
 msgid "_Remember this application for %s documents"
 msgstr "è®°ä½?æ??å¼? %s ç±»å??æ??件使ç?¨ç??ç¨?åº?(_R)"
 
 #. Only in add mode - the %s here is a file extension
-#: ../libnautilus-private/nautilus-open-with-dialog.c:976
+#: ../libnautilus-private/nautilus-open-with-dialog.c:989
 #, c-format
 msgid "Open all %s documents with:"
 msgstr "ç?¨æ­¤åº?ç?¨ç¨?åº?æ??å¼?â??%sâ??ç±»å??ç??å?¨é?¨æ??件ï¼?"
 
 #. First %s is a filename, second is a description
 #. * of the type, eg "plain text document"
-#: ../libnautilus-private/nautilus-open-with-dialog.c:993
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1006
 #, c-format
 msgid "Open %s and other \"%s\" files with:"
 msgstr "ç?¨æ­¤åº?ç?¨ç¨?åº?æ??å¼? %s å??â??%sâ??ç±»å??ç??å?¶å®?æ??件ï¼?"
 
 #. %s is a file type description
-#: ../libnautilus-private/nautilus-open-with-dialog.c:999
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1012
 #, c-format
 msgid "_Remember this application for \"%s\" files"
 msgstr "è®°ä½?æ??å¼? %s ç±»å??æ??件使ç?¨ç??ç¨?åº?(_R)"
 
 #. Only in add mode
-#: ../libnautilus-private/nautilus-open-with-dialog.c:1008
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1021
 #, c-format
 msgid "Open all \"%s\" files with:"
 msgstr "ç?¨æ­¤åº?ç?¨ç¨?åº?æ??å¼?â??%sâ??ç±»å??ç??å?¨é?¨æ??件ï¼?"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:1019
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1032
 msgid "_Add"
 msgstr "æ·»å? (_A)"
 
-#: ../libnautilus-private/nautilus-open-with-dialog.c:1020
+#: ../libnautilus-private/nautilus-open-with-dialog.c:1033
 msgid "Add Application"
 msgstr "æ·»å? åº?ç?¨ç¨?åº?"
 
@@ -3449,13 +3538,13 @@ msgid "File Management"
 msgstr "æ??件管ç??"
 
 #: ../data/nautilus-home.desktop.in.in.h:1
-#: ../src/file-manager/fm-tree-view.c:1377
+#: ../src/file-manager/fm-tree-view.c:1330
 msgid "Home Folder"
 msgstr "主æ??件夹"
 
 #. tooltip
 #: ../data/nautilus-home.desktop.in.in.h:2
-#: ../src/nautilus-places-sidebar.c:306 ../src/nautilus-window-menus.c:855
+#: ../src/nautilus-places-sidebar.c:344 ../src/nautilus-window-menus.c:855
 msgid "Open your personal folder"
 msgstr "æ??å¼?æ?¨ç??个人æ??件夹"
 
@@ -3463,140 +3552,144 @@ msgstr "æ??å¼?æ?¨ç??个人æ??件夹"
 msgid "File Manager"
 msgstr "æ??件管ç??å?¨"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:634
+#: ../src/file-manager/fm-desktop-icon-view.c:637
 msgid "Background"
 msgstr "è??æ?¯"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:707
-#: ../src/file-manager/fm-directory-view.c:6983
-#: ../src/file-manager/fm-directory-view.c:8677
+#: ../src/file-manager/fm-desktop-icon-view.c:710
+#: ../src/file-manager/fm-directory-view.c:7098
+#: ../src/file-manager/fm-directory-view.c:8760
 msgid "E_mpty Trash"
 msgstr "æ¸?空å??æ?¶ç«?(_M)"
 
 #. label, accelerator
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:719
-#: ../src/file-manager/fm-directory-view.c:6947
+#: ../src/file-manager/fm-desktop-icon-view.c:722
+#: ../src/file-manager/fm-directory-view.c:7062
 msgid "Create L_auncher..."
 msgstr "å??建å?¯å?¨å?¨(_A)..."
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:721
-#: ../src/file-manager/fm-directory-view.c:6948
+#: ../src/file-manager/fm-desktop-icon-view.c:724
+#: ../src/file-manager/fm-directory-view.c:7063
 msgid "Create a new launcher"
 msgstr "å??建æ?°å?¯å?¨å?¨"
 
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:726
+#: ../src/file-manager/fm-desktop-icon-view.c:729
 msgid "Change Desktop _Background"
 msgstr "æ?´æ?¹æ¡?é?¢è??æ?¯(_B)"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:728
+#: ../src/file-manager/fm-desktop-icon-view.c:731
 msgid ""
 "Show a window that lets you set your desktop background's pattern or color"
 msgstr "æ?¾ç¤ºå??许æ?¨è®¾ç½®æ¡?é?¢è??æ?¯ç??å?¾æ¡?æ??é¢?è?²ç??çª?å?£"
 
 #. label, accelerator
-#: ../src/file-manager/fm-desktop-icon-view.c:733
+#: ../src/file-manager/fm-desktop-icon-view.c:736
 msgid "Empty Trash"
 msgstr "æ¸?空å??æ?¶ç«?"
 
 #. tooltip
-#: ../src/file-manager/fm-desktop-icon-view.c:735
-#: ../src/file-manager/fm-directory-view.c:6984
-#: ../src/nautilus-trash-bar.c:132
+#: ../src/file-manager/fm-desktop-icon-view.c:738
+#: ../src/file-manager/fm-directory-view.c:7099
+#: ../src/nautilus-trash-bar.c:197
 msgid "Delete all items in the Trash"
 msgstr "å? é?¤å??æ?¶ç«?中ç??æ??æ??项ç?®"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:826
+#: ../src/file-manager/fm-desktop-icon-view.c:829
 msgid "The desktop view encountered an error."
 msgstr "æ¡?é?¢è§?å?¾é??å?°äº?é??误ã??"
 
-#: ../src/file-manager/fm-desktop-icon-view.c:827
+#: ../src/file-manager/fm-desktop-icon-view.c:830
 msgid "The desktop view encountered an error while starting up."
 msgstr "æ¡?é?¢è§?å?¾å?¨å?¯å?¨æ?¶é??å?°é??误ã??"
 
-#: ../src/file-manager/fm-directory-view.c:633
+#: ../src/file-manager/fm-directory-view.c:631
 #, c-format
 msgid "This will open %'d separate tab."
 msgid_plural "This will open %'d separate tabs."
 msgstr[0] "è¿?å°?æ??å¼? %'d 个ç?¬ç«?ç??æ ?ç­¾ã??"
 
-#: ../src/file-manager/fm-directory-view.c:636
+#: ../src/file-manager/fm-directory-view.c:634
 #, c-format
 msgid "This will open %'d separate window."
 msgid_plural "This will open %'d separate windows."
 msgstr[0] "è¿?å°?æ??å¼? %'d 个ç?¬ç«?ç??çª?å?£ã??"
 
-#: ../src/file-manager/fm-directory-view.c:1145
-#: ../src/file-manager/fm-properties-window.c:5455
-#: ../src/nautilus-connect-server-dialog.c:344
+#: ../src/file-manager/fm-directory-view.c:1153
+#: ../src/file-manager/fm-properties-window.c:5479
+#: ../src/nautilus-connect-server-dialog.c:349
 #: ../src/nautilus-location-dialog.c:108
 msgid "There was an error displaying help."
 msgstr "æ?¾ç¤ºå¸®å?©æ?¶å?ºé??ã??"
 
-#: ../src/file-manager/fm-directory-view.c:1165
+#: ../src/file-manager/fm-directory-view.c:1175
 msgid "Select Items Matching"
 msgstr "é??æ?©å?¹é??ç??项ç?®"
 
-#: ../src/file-manager/fm-directory-view.c:1183
+#: ../src/file-manager/fm-directory-view.c:1191
 msgid "_Pattern:"
 msgstr "模�(_P)�"
 
-#: ../src/file-manager/fm-directory-view.c:1281
+#: ../src/file-manager/fm-directory-view.c:1194
+msgid "Examples: "
+msgstr "示��"
+
+#: ../src/file-manager/fm-directory-view.c:1315
 msgid "Save Search as"
 msgstr "æ??ç´¢å?¦å­?为"
 
-#: ../src/file-manager/fm-directory-view.c:1301
+#: ../src/file-manager/fm-directory-view.c:1335
 msgid "Search _name:"
 msgstr "æ??ç´¢å??称(_N)ï¼?"
 
-#: ../src/file-manager/fm-directory-view.c:1315
-#: ../src/nautilus-connect-server-dialog.c:521
+#: ../src/file-manager/fm-directory-view.c:1349
+#: ../src/nautilus-connect-server-dialog.c:526
 msgid "_Folder:"
 msgstr "æ??件夹(_F)ï¼?"
 
-#: ../src/file-manager/fm-directory-view.c:1320
+#: ../src/file-manager/fm-directory-view.c:1354
 msgid "Select Folder to Save Search In"
 msgstr "é??æ?©ç?¨æ?¥ä¿?å­?æ??ç´¢ç??æ??件夹"
 
-#: ../src/file-manager/fm-directory-view.c:2148
-#: ../src/file-manager/fm-directory-view.c:2185
+#: ../src/file-manager/fm-directory-view.c:2213
+#: ../src/file-manager/fm-directory-view.c:2250
 #, c-format
 msgid "\"%s\" selected"
 msgstr "é??中äº?â??%sâ??"
 
-#: ../src/file-manager/fm-directory-view.c:2150
+#: ../src/file-manager/fm-directory-view.c:2215
 #, c-format
 msgid "%'d folder selected"
 msgid_plural "%'d folders selected"
 msgstr[0] "é??中äº? %'d 个æ??件夹"
 
-#: ../src/file-manager/fm-directory-view.c:2160
+#: ../src/file-manager/fm-directory-view.c:2225
 #, c-format
 msgid " (containing %'d item)"
 msgid_plural " (containing %'d items)"
 msgstr[0] " (å?«æ?? %'d 项)"
 
 #. translators: this is preceded with a string of form 'N folders' (N more than 1)
-#: ../src/file-manager/fm-directory-view.c:2171
+#: ../src/file-manager/fm-directory-view.c:2236
 #, c-format
 msgid " (containing a total of %'d item)"
 msgid_plural " (containing a total of %'d items)"
 msgstr[0] " (æ?»å?±æ?? %'d 项)"
 
-#: ../src/file-manager/fm-directory-view.c:2188
+#: ../src/file-manager/fm-directory-view.c:2253
 #, c-format
 msgid "%'d item selected"
 msgid_plural "%'d items selected"
 msgstr[0] "é??中äº? %'d 项"
 
 #. Folders selected also, use "other" terminology
-#: ../src/file-manager/fm-directory-view.c:2195
+#: ../src/file-manager/fm-directory-view.c:2260
 #, c-format
 msgid "%'d other item selected"
 msgid_plural "%'d other items selected"
@@ -3607,12 +3700,12 @@ msgstr[0] "å??é??中äº? %'d 项"
 #. * first message gives the number of items selected;
 #. * the message in parentheses the size of those items.
 #.
-#: ../src/file-manager/fm-directory-view.c:2210
+#: ../src/file-manager/fm-directory-view.c:2275
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/file-manager/fm-directory-view.c:2232
+#: ../src/file-manager/fm-directory-view.c:2297
 #, c-format
 msgid "%s, Free space: %s"
 msgstr "%s���空��%s"
@@ -3624,7 +3717,7 @@ msgstr "%s���空��%s"
 #. * message about the number of other items and the
 #. * total size of those items.
 #.
-#: ../src/file-manager/fm-directory-view.c:2257
+#: ../src/file-manager/fm-directory-view.c:2322
 #, c-format
 msgid "%s%s, %s"
 msgstr "%s%sï¼?%s"
@@ -3633,48 +3726,48 @@ msgstr "%s%sï¼?%s"
 #. * to the way files are collected in batches. So you can't assume that
 #. * no more than the constant limit are displayed.
 #.
-#: ../src/file-manager/fm-directory-view.c:2339
+#: ../src/file-manager/fm-directory-view.c:2404
 #, c-format
 msgid "The folder \"%s\" contains more files than Nautilus can handle."
 msgstr "æ??件夹â??%sâ??中å??å?«ç??æ??件å¤?äº? Nautilus æ??è?½å¤?å¤?ç??ç??æ?°é??ã??"
 
-#: ../src/file-manager/fm-directory-view.c:2345
+#: ../src/file-manager/fm-directory-view.c:2410
 msgid "Some files will not be displayed."
 msgstr "æ??äº?æ??件å°?ä¸?ä¼?æ?¾ç¤ºã??"
 
-#: ../src/file-manager/fm-directory-view.c:4297
-#: ../src/nautilus-information-panel.c:828
+#: ../src/file-manager/fm-directory-view.c:4382
+#: ../src/nautilus-information-panel.c:833
 #, c-format
-msgid "Open with %s"
+msgid "Open With %s"
 msgstr "ç?¨ %s æ??å¼?"
 
-#: ../src/file-manager/fm-directory-view.c:4299
+#: ../src/file-manager/fm-directory-view.c:4384
 #, c-format
 msgid "Use \"%s\" to open the selected item"
 msgid_plural "Use \"%s\" to open the selected items"
 msgstr[0] "ç?¨â??%sâ??æ??å¼?é??中ç??项ç?®"
 
-#: ../src/file-manager/fm-directory-view.c:5082
+#: ../src/file-manager/fm-directory-view.c:5224
 #, c-format
 msgid "Run \"%s\" on any selected items"
 msgstr "å?¨ä»»æ??é??中ç??项ç?®ä¸?è¿?è¡?â??%sâ??"
 
-#: ../src/file-manager/fm-directory-view.c:5333
+#: ../src/file-manager/fm-directory-view.c:5475
 #, c-format
 msgid "Create Document from template \"%s\""
 msgstr "æ ¹æ?®æ¨¡æ?¿â??%sâ??å??建æ??æ¡£"
 
-#: ../src/file-manager/fm-directory-view.c:5583
+#: ../src/file-manager/fm-directory-view.c:5725
 msgid "All executable files in this folder will appear in the Scripts menu."
 msgstr "该æ??件夹中æ??æ??ç??å?¯æ?§è¡?æ??件é?½å°?æ?¾ç¤ºå?¨è??æ?¬è??å??中ã??"
 
-#: ../src/file-manager/fm-directory-view.c:5585
+#: ../src/file-manager/fm-directory-view.c:5727
 msgid ""
 "Choosing a script from the menu will run that script with any selected items "
 "as input."
 msgstr "ä»?该è??å??中é??æ?©æ??è??æ?¬å°?ä¼?ç?¨ä»»æ??é??中项ç?®ä½?为è¾?å?¥æ?¥æ?§è¡?é?£ä¸ªè??æ?¬ã??"
 
-#: ../src/file-manager/fm-directory-view.c:5587
+#: ../src/file-manager/fm-directory-view.c:5729
 msgid ""
 "All executable files in this folder will appear in the Scripts menu. "
 "Choosing a script from the menu will run that script.\n"
@@ -3693,7 +3786,16 @@ msgid ""
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URI: URI for current location\n"
 "\n"
-"NAUTILUS_SCRIPT_WINDOW_GEOMETRY: position and size of current window"
+"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 ""
 "该æ??件夹中ç??æ??æ??æ?§è¡?æ??件å°?æ?¾ç¤ºå?¨è??æ?¬è??å??中ã??ä»?该è??å??中é??æ?©æ??è??æ?¬å°?ä¼?æ?§è¡?é?£ä¸ª"
 "è??æ?¬ã??\n"
@@ -3703,147 +3805,147 @@ msgstr ""
 "\n"
 "æ? 论ä½?ç§?æ??å?µï¼?Nautilus é?½ä¼?设置å?¯ä¾?è??æ?¬ä½¿ç?¨ç??å¦?ä¸?ç?¯å¢?å??é??ï¼?\n"
 "\n"
-"NAUTILUS_SCRIPT_SELECTED_FILE_PATHSï¼?ç?¨æ?°è¡?å??å¼?ç??æ??é??æ??件ç??è·¯å¾?(é?¤é??æ?¯æ?¬å?°æ??"
-"件)\n"
+"NAUTILUS_SCRIPT_SELECTED_FILE_PATHSï¼?ç?¨æ?°è¡?å??å¼?ç??æ??é??æ??件ç??è·¯å¾?(å?ªæ??æ?¯æ?¬å?°æ??"
+"件�)\n"
 "\n"
 "NAUTILUS_SCRIPT_SELECTED_URISï¼?ç?¨æ?°è¡?å??å¼?ç??æ??é??æ??件ç?? URI\n"
 "\n"
 "NAUTILUS_SCRIPT_CURRENT_URIï¼?å½?å??ä½?ç½®ç?? URI\n"
 "\n"
-"NAUTILUS_SCRIPT_WINDOW_GEOMETRYï¼?å½?å??çª?å?£ç??ä½?ç½®å??大å°?"
+"NAUTILUS_SCRIPT_WINDOW_GEOMETRYï¼?å½?å??çª?å?£ç??ä½?ç½®å??大å°?\n"
+"\n"
+"NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_FILE_PATHSï¼?æ?°è¡?å??å?²ç??å??å?²è§?å?¾çª?å?£ä¸­æ?ªæ¿?æ´»"
+"çª?æ ¼ä¸­ç??é??中ç??æ??件路å¾?(å?ªæ??æ?¯æ?¬å?°æ??件æ?¶)\n"
+"\n"
+"NAUTILUS_SCRIPT_NEXT_PANE_SELECTED_URISï¼?æ?°è¡?å??å?²ç??å??å?²è§?å?¾çª?å?£ä¸­æ?ªæ¿?æ´»çª?æ ¼ç??"
+"é??中æ??件ç?? URI\n"
+"\n"
+"NAUTILUS_SCRIPT_NEXT_PANE_CURRENT_URIï¼?å??å?²è§?å?¾çª?å?£ä¸­æ?ªæ¿?æ´»çª?æ ¼ç??å½?å??ä½?ç½®ç?? "
+"URI"
 
-#: ../src/file-manager/fm-directory-view.c:5759
-#: ../src/file-manager/fm-tree-view.c:968
+#: ../src/file-manager/fm-directory-view.c:5797
+#: ../src/file-manager/fm-tree-view.c:921
 #, c-format
 msgid "\"%s\" will be moved if you select the Paste command"
 msgstr "å¦?æ??æ?¨é??æ?©äº?ç²?è´´å?½ä»¤ï¼?â??%sâ??å°?被移å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:5763
-#: ../src/file-manager/fm-tree-view.c:972
+#: ../src/file-manager/fm-directory-view.c:5801
+#: ../src/file-manager/fm-tree-view.c:925
 #, c-format
 msgid "\"%s\" will be copied if you select the Paste command"
 msgstr "å¦?æ??æ?¨é??æ?©äº?ç²?è´´å?½ä»¤ï¼?â??%sâ??å°?被å¤?å?¶"
 
-#: ../src/file-manager/fm-directory-view.c:5770
+#: ../src/file-manager/fm-directory-view.c:5808
 #, 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] "å¦?æ??æ?¨é??æ?©äº?ç²?è´´å?½ä»¤ï¼?å°?移å?¨é??中ç?? %'d 个项ç?®"
 
-#: ../src/file-manager/fm-directory-view.c:5777
+#: ../src/file-manager/fm-directory-view.c:5815
 #, 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] "å¦?æ??æ?¨é??æ?©äº?ç²?è´´å?½ä»¤ï¼?å°?å¤?å?¶é??中ç?? %'d 个项ç?®"
 
-#: ../src/file-manager/fm-directory-view.c:5833
-#: ../src/file-manager/fm-tree-view.c:1011
+#: ../src/file-manager/fm-directory-view.c:5995
+#: ../src/file-manager/fm-tree-view.c:964
 msgid "There is nothing on the clipboard to paste."
 msgstr "å?ªè´´æ?¿ä¸­æ²¡æ??ä¸?西å?¯ä»¥ç²?è´´ã??"
 
-#: ../src/file-manager/fm-directory-view.c:6016
+#: ../src/file-manager/fm-directory-view.c:6184
 msgid "Unable to unmount location"
 msgstr "æ? æ³?å?¸è½½ä½?ç½®"
 
-#: ../src/file-manager/fm-directory-view.c:6031
+#: ../src/file-manager/fm-directory-view.c:6205
 msgid "Unable to eject location"
 msgstr "æ? æ³?å¼¹å?ºä½?ç½®"
 
-#: ../src/file-manager/fm-directory-view.c:6046
+#: ../src/file-manager/fm-directory-view.c:6220
 msgid "Unable to stop drive"
 msgstr "æ? æ³?å??止驱å?¨å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:6592
+#: ../src/file-manager/fm-directory-view.c:6775
 #, c-format
 msgid "Connect to Server %s"
 msgstr "è¿?æ?¥å?°æ??å?¡å?¨ %s"
 
-#: ../src/file-manager/fm-directory-view.c:6597
-#: ../src/file-manager/fm-directory-view.c:7909
-#: ../src/file-manager/fm-directory-view.c:8001
-#: ../src/file-manager/fm-directory-view.c:8111
+#: ../src/file-manager/fm-directory-view.c:6780
+#: ../src/file-manager/fm-directory-view.c:7986
+#: ../src/file-manager/fm-directory-view.c:8078
+#: ../src/file-manager/fm-directory-view.c:8188
 msgid "_Connect"
 msgstr "è¿?æ?¥(_C)"
 
-#: ../src/file-manager/fm-directory-view.c:6611
+#: ../src/file-manager/fm-directory-view.c:6794
 msgid "Link _name:"
 msgstr "é?¾æ?¥å??称(_N)ï¼?"
 
-#: ../src/file-manager/fm-directory-view.c:6829
-#, c-format
-msgid "Could not determine original location of \"%s\" "
-msgstr "æ? æ³?ç¡®å®?â??%sâ??ç??å??å§?ä½?ç½®"
-
-#: ../src/file-manager/fm-directory-view.c:6833
-msgid "The item cannot be restored from trash"
-msgstr "项ç?®æ? æ³?ä»?å??æ?¶ç«?中æ?¢å¤?"
-
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6921
+#: ../src/file-manager/fm-directory-view.c:7036
 msgid "Create _Document"
 msgstr "å??建æ??æ¡£(_D)"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6922
+#: ../src/file-manager/fm-directory-view.c:7037
 msgid "Open Wit_h"
 msgstr "æ??å¼?æ?¹å¼?(_H)"
 
-#: ../src/file-manager/fm-directory-view.c:6923
+#: ../src/file-manager/fm-directory-view.c:7038
 msgid "Choose a program with which to open the selected item"
 msgstr "é??æ?©ç?¨æ?¥æ??å¼?é??中项ç?®ç??ç¨?åº?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6925
-#: ../src/file-manager/fm-directory-view.c:6933
-#: ../src/file-manager/fm-directory-view.c:7209
+#: ../src/file-manager/fm-directory-view.c:7040
+#: ../src/file-manager/fm-directory-view.c:7048
+#: ../src/file-manager/fm-directory-view.c:7314
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6926
+#: ../src/file-manager/fm-directory-view.c:7041
 msgid "View or modify the properties of each selected item"
 msgstr "æ?¥ç??æ??ä¿®æ?¹æ¯?个é??中项ç?®ç??å±?æ?§"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6934
+#: ../src/file-manager/fm-directory-view.c:7049
 msgid "View or modify the properties of the open folder"
 msgstr "æ?¥ç??æ??ä¿®æ?¹æ??å¼?ç??æ??件夹ç??å±?æ?§"
 
 #. name, stock id
 #. label, accelerator
 #. add the "create folder" menu item
-#: ../src/file-manager/fm-directory-view.c:6937
-#: ../src/file-manager/fm-tree-view.c:1241
+#: ../src/file-manager/fm-directory-view.c:7052
+#: ../src/file-manager/fm-tree-view.c:1194
 msgid "Create _Folder"
 msgstr "å??建æ??件夹(_F)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6938
+#: ../src/file-manager/fm-directory-view.c:7053
 msgid "Create a new empty folder inside this folder"
 msgstr "å?¨è¯¥æ??件夹中å??建æ?°ç??空æ??件夹"
 
 #. name, stock id, label
-#: ../src/file-manager/fm-directory-view.c:6940
+#: ../src/file-manager/fm-directory-view.c:7055
 msgid "No templates installed"
 msgstr "没æ??å®?è£?模æ?¿"
 
 #. name, stock id
 #. translators: this is used to indicate that a file doesn't contain anything
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6943
+#: ../src/file-manager/fm-directory-view.c:7058
 msgid "_Empty File"
 msgstr "空æ??件(_E)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6944
+#: ../src/file-manager/fm-directory-view.c:7059
 msgid "Create a new empty file inside this folder"
 msgstr "å?¨è¯¥æ??件夹中å??建æ?°ç??空æ??件"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6952
+#: ../src/file-manager/fm-directory-view.c:7067
 msgid "Open the selected item in this window"
 msgstr "å?¨æ?¬çª?å?£ä¸­æ??å¼?é??中ç??项ç?®"
 
@@ -3852,92 +3954,92 @@ msgstr "å?¨æ?¬çª?å?£ä¸­æ??å¼?é??中ç??项ç?®"
 #. Location-specific actions
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6959
-#: ../src/file-manager/fm-directory-view.c:7141
+#: ../src/file-manager/fm-directory-view.c:7074
+#: ../src/file-manager/fm-directory-view.c:7246
 msgid "Open in Navigation Window"
 msgstr "å?¨å¯¼è?ªçª?å?£ä¸­æ??å¼?"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6960
+#: ../src/file-manager/fm-directory-view.c:7075
 msgid "Open each selected item in a navigation window"
 msgstr "å?¨å¯¼è?ªçª?å?£ä¸­æ??å¼?æ¯?个é??中ç??项ç?®"
 
 #. name, stock id
 #. label, accelerator
 #. add the "open in new tab" menu item
-#: ../src/file-manager/fm-directory-view.c:6963
-#: ../src/file-manager/fm-directory-view.c:7145
-#: ../src/file-manager/fm-directory-view.c:8243
-#: ../src/file-manager/fm-directory-view.c:8561
-#: ../src/file-manager/fm-tree-view.c:1221
-#: ../src/nautilus-places-sidebar.c:2192
+#: ../src/file-manager/fm-directory-view.c:7078
+#: ../src/file-manager/fm-directory-view.c:7250
+#: ../src/file-manager/fm-directory-view.c:8318
+#: ../src/file-manager/fm-directory-view.c:8640
+#: ../src/file-manager/fm-tree-view.c:1174
+#: ../src/nautilus-places-sidebar.c:2230
 msgid "Open in New _Tab"
 msgstr "å?¨æ?°æ ?签中æ??å¼?(_T)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6964
+#: ../src/file-manager/fm-directory-view.c:7079
 msgid "Open each selected item in a new tab"
 msgstr "å?¨æ?°æ ?签中æ??å¼?é??中ç??æ¯?个项ç?®"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6967
-#: ../src/file-manager/fm-directory-view.c:7150
+#: ../src/file-manager/fm-directory-view.c:7082
+#: ../src/file-manager/fm-directory-view.c:7255
 msgid "Open in _Folder Window"
 msgstr "å?¨æ??件夹çª?å?£ä¸­æ??å¼?(_F)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6968
+#: ../src/file-manager/fm-directory-view.c:7083
 msgid "Open each selected item in a folder window"
 msgstr "å?¨æ??件夹çª?å?£ä¸­æ??å¼?æ¯?个é??中ç??项ç?®"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6971
+#: ../src/file-manager/fm-directory-view.c:7086
 msgid "Other _Application..."
 msgstr "����(_A)..."
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6972
-#: ../src/file-manager/fm-directory-view.c:6976
+#: ../src/file-manager/fm-directory-view.c:7087
+#: ../src/file-manager/fm-directory-view.c:7091
 msgid "Choose another application with which to open the selected item"
 msgstr "å?¦é??ä¸?个ç?¨æ?¥æ??å¼?é??中项ç?®ç??ç¨?åº?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6975
-msgid "Open with Other _Application..."
+#: ../src/file-manager/fm-directory-view.c:7090
+msgid "Open With Other _Application..."
 msgstr "使ç?¨å?¶å®?ç¨?åº?æ??å¼?(_A)..."
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:6979
+#: ../src/file-manager/fm-directory-view.c:7094
 msgid "_Open Scripts Folder"
 msgstr "æ??å¼?è??æ?¬æ??件夹(_O)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6980
+#: ../src/file-manager/fm-directory-view.c:7095
 msgid "Show the folder containing the scripts that appear in this menu"
 msgstr "æ?¾ç¤ºå??å?«å?ºç?°å?¨è¯¥è??å??中ç??è??æ?¬ç??æ??件夹"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6988
+#: ../src/file-manager/fm-directory-view.c:7103
 msgid "Prepare the selected files to be moved with a Paste command"
 msgstr "å??å¤?å°?é??中ç??æ??件ç?¨ç²?è´´å?½ä»¤ç§»å?¨"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6992
+#: ../src/file-manager/fm-directory-view.c:7107
 msgid "Prepare the selected files to be copied with a Paste command"
 msgstr "å??å¤?å°?é??中ç??æ??件ç?¨ç²?è´´å?½ä»¤å¤?å?¶"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:6996
+#: ../src/file-manager/fm-directory-view.c:7111
 msgid "Move or copy files previously selected by a Cut or Copy command"
 msgstr "移å?¨æ??å¤?å?¶ç?±å??é?¢ç??å?ªå??æ??å¤?å?¶å?½ä»¤æ??é??中ç??æ??件"
 
@@ -3945,109 +4047,115 @@ msgstr "移å?¨æ??å¤?å?¶ç?±å??é?¢ç??å?ªå??æ??å¤?å?¶å?½ä»¤æ??é??中ç??æ??件"
 #. accelerator for paste
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7001
-#: ../src/file-manager/fm-directory-view.c:7163
-#: ../src/file-manager/fm-tree-view.c:1273
+#: ../src/file-manager/fm-directory-view.c:7116
+#: ../src/file-manager/fm-directory-view.c:7268
+#: ../src/file-manager/fm-tree-view.c:1226
 msgid "_Paste Into Folder"
 msgstr "ç²?è´´å?°æ??件夹(_P)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7002
+#: ../src/file-manager/fm-directory-view.c:7117
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into the "
 "selected folder"
 msgstr "å°?å??å??ç?±å?ªå??æ??å¤?å?¶å?½ä»¤æ??é??中ç??æ??件移å?¨æ??å¤?å?¶å?°é??中æ??件夹中"
 
+#. name, stock id, label
+#: ../src/file-manager/fm-directory-view.c:7119
+msgid "Cop_y to"
+msgstr "���(_Y)"
+
+#. name, stock id, label
+#: ../src/file-manager/fm-directory-view.c:7120
+msgid "M_ove to"
+msgstr "移��(_O)"
+
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7006
+#: ../src/file-manager/fm-directory-view.c:7123
 msgid "Select all items in this window"
 msgstr "é??æ?©è¯¥çª?å?£ä¸­ç??æ??æ??项ç?®"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7009
+#: ../src/file-manager/fm-directory-view.c:7126
 msgid "Select I_tems Matching..."
 msgstr "é??æ?©å?¹é??ç??项ç?®(_T)..."
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7010
+#: ../src/file-manager/fm-directory-view.c:7127
 msgid "Select items in this window matching a given pattern"
 msgstr "æ??ç»?å®?模å¼?é??æ?©æ­¤çª?å?£ä¸­ç??项ç?®"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7013
+#: ../src/file-manager/fm-directory-view.c:7130
 msgid "_Invert Selection"
 msgstr "å??转é??æ?©(_I)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7014
+#: ../src/file-manager/fm-directory-view.c:7131
 msgid "Select all and only the items that are not currently selected"
 msgstr "å?¨é??é?£äº?ç?®å??没æ??é??中ç??项ç?®"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7017
+#: ../src/file-manager/fm-directory-view.c:7134
 msgid "D_uplicate"
 msgstr "就���(_U)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7018
+#: ../src/file-manager/fm-directory-view.c:7135
 msgid "Duplicate each selected item"
 msgstr "å¤?å?¶æ¯?个é??中ç??项"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7021
-#: ../src/file-manager/fm-directory-view.c:8651
+#: ../src/file-manager/fm-directory-view.c:7138
+#: ../src/file-manager/fm-directory-view.c:8734
 msgid "Ma_ke Link"
 msgid_plural "Ma_ke Links"
 msgstr[0] "å??建é?¾æ?¥(_K)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7022
+#: ../src/file-manager/fm-directory-view.c:7139
 msgid "Create a symbolic link for each selected item"
 msgstr "为æ¯?个é??中ç??项ç?®å??建é?¾æ?¥"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7025
+#: ../src/file-manager/fm-directory-view.c:7142
 msgid "_Rename..."
 msgstr "é??å?½å??(_R)..."
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7026
+#: ../src/file-manager/fm-directory-view.c:7143
 msgid "Rename selected item"
 msgstr "é??å?½å??é??中ç??项ç?®"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7034
-#: ../src/file-manager/fm-directory-view.c:7038
-#: ../src/file-manager/fm-directory-view.c:7042
-#: ../src/file-manager/fm-directory-view.c:8608
+#: ../src/file-manager/fm-directory-view.c:7151
+#: ../src/file-manager/fm-directory-view.c:8695
 msgid "Move each selected item to the Trash"
 msgstr "æ??æ¯?个é??中项ç?®é?½ç§»å?°å??æ?¶ç«?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7045
-#: ../src/file-manager/fm-directory-view.c:7049
-#: ../src/file-manager/fm-directory-view.c:7172
-#: ../src/file-manager/fm-directory-view.c:8631
-#: ../src/file-manager/fm-tree-view.c:1303
+#: ../src/file-manager/fm-directory-view.c:7154
+#: ../src/file-manager/fm-directory-view.c:7277
+#: ../src/file-manager/fm-directory-view.c:8715
+#: ../src/file-manager/fm-tree-view.c:1256
 msgid "_Delete"
 msgstr "å? é?¤(_D)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7046
-#: ../src/file-manager/fm-directory-view.c:7050
+#: ../src/file-manager/fm-directory-view.c:7155
 msgid "Delete each selected item, without moving to the Trash"
 msgstr "å? é?¤æ¯?个é??中ç??项ç?®ï¼?è??ä¸?移å?¨å?°å??æ?¶ç«?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7053
-#: ../src/file-manager/fm-directory-view.c:7176
+#: ../src/file-manager/fm-directory-view.c:7158
+#: ../src/file-manager/fm-directory-view.c:7281
 msgid "_Restore"
 msgstr "��(_R)"
 
@@ -4059,549 +4167,594 @@ msgstr "��(_R)"
 #.
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7063
+#: ../src/file-manager/fm-directory-view.c:7168
 msgid "Reset View to _Defaults"
 msgstr "å°?è§?å?¾é??置为é»?认å?¼(_D)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7064
+#: ../src/file-manager/fm-directory-view.c:7169
 msgid "Reset sorting order and zoom level to match preferences for this view"
 msgstr "é??ç½®æ??åº?å??缩æ?¾çº§å?«ä»¥ç¬¦å??该è§?å?¾ç??é¦?é??项"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7067
+#: ../src/file-manager/fm-directory-view.c:7172
 msgid "Connect To This Server"
 msgstr "è¿?æ?¥å?°æ­¤æ??å?¡å?¨"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7068
+#: ../src/file-manager/fm-directory-view.c:7173
 msgid "Make a permanent connection to this server"
 msgstr "æ°¸ä¹?è¿?æ?¥å?°æ­¤æ??å?¡å?¨"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7071
-#: ../src/file-manager/fm-directory-view.c:7099
-#: ../src/file-manager/fm-directory-view.c:7180
-#: ../src/nautilus-places-sidebar.c:2228
+#: ../src/file-manager/fm-directory-view.c:7176
+#: ../src/file-manager/fm-directory-view.c:7204
+#: ../src/file-manager/fm-directory-view.c:7285
+#: ../src/nautilus-places-sidebar.c:2266
 msgid "_Mount"
 msgstr "æ??è½½(_M)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7072
+#: ../src/file-manager/fm-directory-view.c:7177
 msgid "Mount the selected volume"
 msgstr "æ??è½½é??中ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7076
+#: ../src/file-manager/fm-directory-view.c:7181
 msgid "Unmount the selected volume"
 msgstr "å?¸è½½é??中ç??æ??件å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7080
+#: ../src/file-manager/fm-directory-view.c:7185
 msgid "Eject the selected volume"
 msgstr "å¼¹å?ºé??中ç??å?·"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7083
-#: ../src/file-manager/fm-directory-view.c:7111
-#: ../src/file-manager/fm-directory-view.c:7192
-#: ../src/nautilus-places-sidebar.c:2256
+#: ../src/file-manager/fm-directory-view.c:7188
+#: ../src/file-manager/fm-directory-view.c:7216
+#: ../src/file-manager/fm-directory-view.c:7297
+#: ../src/nautilus-places-sidebar.c:2294
 msgid "_Format"
 msgstr "æ ¼å¼?å??(_F)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7084
+#: ../src/file-manager/fm-directory-view.c:7189
 msgid "Format the selected volume"
 msgstr "æ ¼å¼?å??é??中ç??å?·"
 
 #. name, stock id
 #. label, accelerator
 #. Adjust start/stop items to reflect the type of the drive
-#: ../src/file-manager/fm-directory-view.c:7087
-#: ../src/file-manager/fm-directory-view.c:7115
-#: ../src/file-manager/fm-directory-view.c:7196
-#: ../src/file-manager/fm-directory-view.c:7901
-#: ../src/file-manager/fm-directory-view.c:7905
-#: ../src/file-manager/fm-directory-view.c:7993
-#: ../src/file-manager/fm-directory-view.c:7997
-#: ../src/file-manager/fm-directory-view.c:8103
-#: ../src/file-manager/fm-directory-view.c:8107
-#: ../src/nautilus-places-sidebar.c:1443 ../src/nautilus-places-sidebar.c:2263
+#: ../src/file-manager/fm-directory-view.c:7192
+#: ../src/file-manager/fm-directory-view.c:7220
+#: ../src/file-manager/fm-directory-view.c:7301
+#: ../src/file-manager/fm-directory-view.c:7978
+#: ../src/file-manager/fm-directory-view.c:7982
+#: ../src/file-manager/fm-directory-view.c:8070
+#: ../src/file-manager/fm-directory-view.c:8074
+#: ../src/file-manager/fm-directory-view.c:8180
+#: ../src/file-manager/fm-directory-view.c:8184
+#: ../src/nautilus-places-sidebar.c:1444 ../src/nautilus-places-sidebar.c:2301
 msgid "_Start"
 msgstr "��(_S)�"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7088
+#: ../src/file-manager/fm-directory-view.c:7193
 msgid "Start the selected volume"
 msgstr "å¼?å§?é??中ç??å?·"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7091
-#: ../src/file-manager/fm-directory-view.c:7119
-#: ../src/file-manager/fm-directory-view.c:7200
-#: ../src/file-manager/fm-directory-view.c:7930
-#: ../src/file-manager/fm-directory-view.c:8022
-#: ../src/file-manager/fm-directory-view.c:8132
-#: ../src/nautilus-places-sidebar.c:1444 ../src/nautilus-places-sidebar.c:2270
+#: ../src/file-manager/fm-directory-view.c:7196
+#: ../src/file-manager/fm-directory-view.c:7224
+#: ../src/file-manager/fm-directory-view.c:7305
+#: ../src/file-manager/fm-directory-view.c:8007
+#: ../src/file-manager/fm-directory-view.c:8099
+#: ../src/file-manager/fm-directory-view.c:8209
+#: ../src/nautilus-places-sidebar.c:1445 ../src/nautilus-places-sidebar.c:2308
 #: ../src/nautilus-window-menus.c:810
 msgid "_Stop"
 msgstr "å??æ­¢(_S)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7092
-#: ../src/file-manager/fm-directory-view.c:8133
+#: ../src/file-manager/fm-directory-view.c:7197
+#: ../src/file-manager/fm-directory-view.c:8210
 msgid "Stop the selected volume"
 msgstr "å??æ­¢é??中ç??å?·"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7095
-#: ../src/file-manager/fm-directory-view.c:7123
-#: ../src/file-manager/fm-directory-view.c:7204
-#: ../src/nautilus-places-sidebar.c:2249
+#: ../src/file-manager/fm-directory-view.c:7200
+#: ../src/file-manager/fm-directory-view.c:7228
+#: ../src/file-manager/fm-directory-view.c:7309
+#: ../src/nautilus-places-sidebar.c:2287
 msgid "_Detect Media"
 msgstr "å? é?¤åª?ä½?(_D)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7096
-#: ../src/file-manager/fm-directory-view.c:7124
-#: ../src/file-manager/fm-directory-view.c:7205
+#: ../src/file-manager/fm-directory-view.c:7201
+#: ../src/file-manager/fm-directory-view.c:7229
+#: ../src/file-manager/fm-directory-view.c:7310
 msgid "Detect media in the selected drive"
 msgstr "æ£?æµ?é??å®?驱å?¨å?¨ä¸­ç??åª?ä½?"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7100
+#: ../src/file-manager/fm-directory-view.c:7205
 msgid "Mount the volume associated with the open folder"
 msgstr "æ??è½½ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7104
+#: ../src/file-manager/fm-directory-view.c:7209
 msgid "Unmount the volume associated with the open folder"
 msgstr "å?¸è½½ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7108
+#: ../src/file-manager/fm-directory-view.c:7213
 msgid "Eject the volume associated with the open folder"
 msgstr "å¼¹å?ºä¸?æ??æ??å¼?æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7112
+#: ../src/file-manager/fm-directory-view.c:7217
 msgid "Format the volume associated with the open folder"
 msgstr "æ ¼å¼?å??ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7116
+#: ../src/file-manager/fm-directory-view.c:7221
 msgid "Start the volume associated with the open folder"
 msgstr "å?¯å?¨ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7120
+#: ../src/file-manager/fm-directory-view.c:7225
 msgid "Stop the volume associated with the open folder"
 msgstr "å??æ­¢ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å?·"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7127
+#: ../src/file-manager/fm-directory-view.c:7232
 msgid "Open File and Close window"
 msgstr "æ??å¼?æ??件并å?³é?­çª?å?£"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7131
+#: ../src/file-manager/fm-directory-view.c:7236
 msgid "Sa_ve Search"
 msgstr "ä¿?å­?æ??ç´¢(_V)"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7132
+#: ../src/file-manager/fm-directory-view.c:7237
 msgid "Save the edited search"
 msgstr "ä¿?å­?æ??ç¼?è¾?ç??æ??ç´¢"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-directory-view.c:7135
+#: ../src/file-manager/fm-directory-view.c:7240
 msgid "Sa_ve Search As..."
 msgstr "æ??ç´¢å?¦å­?为(_V)..."
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7136
+#: ../src/file-manager/fm-directory-view.c:7241
 msgid "Save the current search as a file"
 msgstr "å°?å½?å??æ??ç´¢å?¦å­?为æ??件"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7142
+#: ../src/file-manager/fm-directory-view.c:7247
 msgid "Open this folder in a navigation window"
 msgstr "å?¨å¯¼è?ªçª?å?£ä¸­æ??å¼?æ­¤æ??件夹"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7146
+#: ../src/file-manager/fm-directory-view.c:7251
 msgid "Open this folder in a new tab"
 msgstr "å?¨æ?°æ ?签中æ??å¼?æ­¤æ??件夹"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7151
+#: ../src/file-manager/fm-directory-view.c:7256
 msgid "Open this folder in a folder window"
 msgstr "å?¨æ??件夹çª?å?£ä¸­æ??å¼?æ­¤æ??件夹"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7156
+#: ../src/file-manager/fm-directory-view.c:7261
 msgid "Prepare this folder to be moved with a Paste command"
 msgstr "å??å¤?å°?æ­¤æ??件夹ç?¨ç²?è´´å?½ä»¤ç§»å?¨"
 
 #. name, stock id
 #. label, accelerator
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7160
+#: ../src/file-manager/fm-directory-view.c:7265
 msgid "Prepare this folder to be copied with a Paste command"
 msgstr "å??å¤?å°?æ­¤æ??件夹ç?¨ç²?è´´å?½ä»¤å¤?å?¶"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7164
+#: ../src/file-manager/fm-directory-view.c:7269
 msgid ""
 "Move or copy files previously selected by a Cut or Copy command into this "
 "folder"
 msgstr "å°?å??å??ç?±å?ªå??æ??å¤?å?¶å?½ä»¤æ??é??中ç??æ??件移å?¨æ??å¤?å?¶å?°æ­¤æ??件夹中"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7169
+#: ../src/file-manager/fm-directory-view.c:7274
 msgid "Move this folder to the Trash"
 msgstr "å°?æ­¤æ??件夹移å?¨å?°å??æ?¶ç«?"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7173
+#: ../src/file-manager/fm-directory-view.c:7278
 msgid "Delete this folder, without moving to the Trash"
 msgstr "å? é?¤æ­¤æ??件夹ï¼?è??ä¸?移å?¨å?°å??æ?¶ç«?"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7181
+#: ../src/file-manager/fm-directory-view.c:7286
 msgid "Mount the volume associated with this folder"
 msgstr "æ??è½½ä¸?æ­¤æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7185
+#: ../src/file-manager/fm-directory-view.c:7290
 msgid "Unmount the volume associated with this folder"
 msgstr "å?¸è½½ä¸?æ­¤æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7189
+#: ../src/file-manager/fm-directory-view.c:7294
 msgid "Eject the volume associated with this folder"
 msgstr "å¼¹å?ºä¸?æ­¤æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7193
+#: ../src/file-manager/fm-directory-view.c:7298
 msgid "Format the volume associated with this folder"
 msgstr "æ ¼å¼?å??ä¸?æ­¤æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7197
+#: ../src/file-manager/fm-directory-view.c:7302
 msgid "Start the volume associated with this folder"
 msgstr "å?¯å?¨ä¸?æ­¤æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7201
+#: ../src/file-manager/fm-directory-view.c:7306
 msgid "Stop the volume associated with this folder"
 msgstr "å??æ­¢ä¸?æ­¤æ??件夹å?³è??ç??å?·"
 
 #. tooltip
-#: ../src/file-manager/fm-directory-view.c:7210
+#: ../src/file-manager/fm-directory-view.c:7315
 msgid "View or modify the properties of this folder"
 msgstr "æ?¥ç??æ??ä¿®æ?¹æ­¤æ??件夹ç??å±?æ?§"
 
+#. name, stock id, label
+#: ../src/file-manager/fm-directory-view.c:7318
+#: ../src/file-manager/fm-directory-view.c:7321
+msgid "_Other pane"
+msgstr "å?¶å®?çª?æ ¼(_O)"
+
+#: ../src/file-manager/fm-directory-view.c:7319
+msgid "Copy the current selection to the other pane in the window"
+msgstr "å¤?å?¶å½?å??é??中项å?°çª?å?£ç??å?¶å®?çª?æ ¼"
+
+#: ../src/file-manager/fm-directory-view.c:7322
+msgid "Move the current selection to the other pane in the window"
+msgstr "移å?¨å½?å??é??中项å?°çª?å?£ç??å?¶å®?çª?æ ¼"
+
+#. name, stock id, label
+#. name, stock id
+#. label, accelerator
+#: ../src/file-manager/fm-directory-view.c:7325
+#: ../src/file-manager/fm-directory-view.c:7329
+#: ../src/nautilus-window-menus.c:854
+msgid "_Home Folder"
+msgstr "主æ??件夹(_H)"
+
+#: ../src/file-manager/fm-directory-view.c:7326
+msgid "Copy the current selection to the home folder"
+msgstr "å¤?å?¶å½?å??é??中项å?°ä¸»æ??件夹"
+
+#: ../src/file-manager/fm-directory-view.c:7330
+msgid "Move the current selection to the home folder"
+msgstr "移å?¨å½?å??é??中项å?°ä¸»æ??件夹"
+
+#. name, stock id, label
+#: ../src/file-manager/fm-directory-view.c:7333
+#: ../src/file-manager/fm-directory-view.c:7337
+msgid "_Desktop"
+msgstr "æ¡?é?¢(_D)"
+
+#: ../src/file-manager/fm-directory-view.c:7334
+msgid "Copy the current selection to the desktop"
+msgstr "å¤?å?¶å½?å??é??中项å?°æ¡?é?¢"
+
+#: ../src/file-manager/fm-directory-view.c:7338
+msgid "Move the current selection to the desktop"
+msgstr "移å?¨å½?å??é??中项å?°æ¡?é?¢"
+
 #. Translators: %s is a directory
-#: ../src/file-manager/fm-directory-view.c:7292
+#: ../src/file-manager/fm-directory-view.c:7418
 #, c-format
 msgid "Run or manage scripts from %s"
 msgstr "å?¨ %s 中è¿?è¡?æ??管ç??è??æ?¬"
 
 #. Create a script action here specially because its tooltip is dynamic
-#: ../src/file-manager/fm-directory-view.c:7294
+#: ../src/file-manager/fm-directory-view.c:7420
 msgid "_Scripts"
 msgstr "è??æ?¬(_S)"
 
-#: ../src/file-manager/fm-directory-view.c:7749
+#: ../src/file-manager/fm-directory-view.c:7826
 #, c-format
 msgid "Move the open folder out of the trash to \"%s\""
 msgstr "å°?æ??å¼?ç??æ??件夹ä»?å??æ?¶ç«?移è?³â??%sâ??"
 
-#: ../src/file-manager/fm-directory-view.c:7752
+#: ../src/file-manager/fm-directory-view.c:7829
 #, 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] "å°?é??中ç??æ??件夹ä»?å??æ?¶ç«?移è?³â??%sâ??"
 
-#: ../src/file-manager/fm-directory-view.c:7756
+#: ../src/file-manager/fm-directory-view.c:7833
 #, c-format
 msgid "Move the selected folder out of the trash"
 msgid_plural "Move the selected folders out of the trash"
 msgstr[0] "å°?é??中ç??æ??件夹移å?ºå??æ?¶ç«?"
 
-#: ../src/file-manager/fm-directory-view.c:7762
+#: ../src/file-manager/fm-directory-view.c:7839
 #, 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] "å°?é??中ç??æ??件ä»?å??æ?¶ç«?移è?³â??%sâ??"
 
-#: ../src/file-manager/fm-directory-view.c:7766
+#: ../src/file-manager/fm-directory-view.c:7843
 #, c-format
 msgid "Move the selected file out of the trash"
 msgid_plural "Move the selected files out of the trash"
 msgstr[0] "å°?é??中ç??æ??件ä»?å??æ?¶ç«?移å?º"
 
-#: ../src/file-manager/fm-directory-view.c:7772
+#: ../src/file-manager/fm-directory-view.c:7849
 #, 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] "å°?é??中项ä»?å??æ?¶ç«?移è?³â??%sâ??"
 
-#: ../src/file-manager/fm-directory-view.c:7776
+#: ../src/file-manager/fm-directory-view.c:7853
 #, c-format
 msgid "Move the selected item out of the trash"
 msgid_plural "Move the selected items out of the trash"
 msgstr[0] "å°?é??中项ä»?移å?ºå??æ?¶ç«?"
 
-#: ../src/file-manager/fm-directory-view.c:7902
-#: ../src/file-manager/fm-directory-view.c:7906
-#: ../src/file-manager/fm-directory-view.c:8104
-#: ../src/file-manager/fm-directory-view.c:8108
+#: ../src/file-manager/fm-directory-view.c:7979
+#: ../src/file-manager/fm-directory-view.c:7983
+#: ../src/file-manager/fm-directory-view.c:8181
+#: ../src/file-manager/fm-directory-view.c:8185
 msgid "Start the selected drive"
 msgstr "å¼?å§?é??中ç??å?·"
 
-#: ../src/file-manager/fm-directory-view.c:7910
-#: ../src/file-manager/fm-directory-view.c:8112
+#: ../src/file-manager/fm-directory-view.c:7987
+#: ../src/file-manager/fm-directory-view.c:8189
 msgid "Connect to the selected drive"
 msgstr "è¿?æ?¥å?°é??中ç??å?·"
 
-#: ../src/file-manager/fm-directory-view.c:7913
-#: ../src/file-manager/fm-directory-view.c:8005
-#: ../src/file-manager/fm-directory-view.c:8115
+#: ../src/file-manager/fm-directory-view.c:7990
+#: ../src/file-manager/fm-directory-view.c:8082
+#: ../src/file-manager/fm-directory-view.c:8192
 msgid "_Start Multi-disk Drive"
 msgstr "å?¯å?¨å¤?ç£?ç??驱å?¨(_S)"
 
-#: ../src/file-manager/fm-directory-view.c:7914
-#: ../src/file-manager/fm-directory-view.c:8116
+#: ../src/file-manager/fm-directory-view.c:7991
+#: ../src/file-manager/fm-directory-view.c:8193
 msgid "Start the selected multi-disk drive"
 msgstr "å?¯å?¨é??æ?©ç??å¤?ç£?ç??驱å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:7917
+#: ../src/file-manager/fm-directory-view.c:7994
 msgid "U_nlock Drive"
 msgstr "解é??驱å?¨(_N)"
 
-#: ../src/file-manager/fm-directory-view.c:7918
-#: ../src/file-manager/fm-directory-view.c:8120
+#: ../src/file-manager/fm-directory-view.c:7995
+#: ../src/file-manager/fm-directory-view.c:8197
 msgid "Unlock the selected drive"
 msgstr "解é??é??中ç??å?·"
 
-#: ../src/file-manager/fm-directory-view.c:7931
+#: ../src/file-manager/fm-directory-view.c:8008
 msgid "Stop the selected drive"
 msgstr "å??æ­¢é??中ç??å?·"
 
-#: ../src/file-manager/fm-directory-view.c:7934
-#: ../src/file-manager/fm-directory-view.c:8026
-#: ../src/file-manager/fm-directory-view.c:8136
-#: ../src/nautilus-places-sidebar.c:1450
+#: ../src/file-manager/fm-directory-view.c:8011
+#: ../src/file-manager/fm-directory-view.c:8103
+#: ../src/file-manager/fm-directory-view.c:8213
+#: ../src/nautilus-places-sidebar.c:1451
 msgid "_Safely Remove Drive"
 msgstr "��移�驱��(_S)"
 
-#: ../src/file-manager/fm-directory-view.c:7935
-#: ../src/file-manager/fm-directory-view.c:8137
+#: ../src/file-manager/fm-directory-view.c:8012
+#: ../src/file-manager/fm-directory-view.c:8214
 msgid "Safely remove the selected drive"
 msgstr "å®?å?¨å?°ç§»é?¤é??中ç??å?·"
 
-#: ../src/file-manager/fm-directory-view.c:7938
-#: ../src/file-manager/fm-directory-view.c:8030
-#: ../src/file-manager/fm-directory-view.c:8140
+#: ../src/file-manager/fm-directory-view.c:8015
+#: ../src/file-manager/fm-directory-view.c:8107
+#: ../src/file-manager/fm-directory-view.c:8217
 msgid "_Disconnect"
 msgstr "æ?­å¼?è¿?æ?¥(_D)"
 
-#: ../src/file-manager/fm-directory-view.c:7939
-#: ../src/file-manager/fm-directory-view.c:8141
+#: ../src/file-manager/fm-directory-view.c:8016
+#: ../src/file-manager/fm-directory-view.c:8218
 msgid "Disconnect the selected drive"
 msgstr "æ?­å¼?å?°é??中ç??å?·ç??è¿?æ?¥"
 
-#: ../src/file-manager/fm-directory-view.c:7942
-#: ../src/file-manager/fm-directory-view.c:8034
-#: ../src/file-manager/fm-directory-view.c:8144
+#: ../src/file-manager/fm-directory-view.c:8019
+#: ../src/file-manager/fm-directory-view.c:8111
+#: ../src/file-manager/fm-directory-view.c:8221
 msgid "_Stop Multi-disk Drive"
 msgstr "å??æ­¢å¤?ç£?ç??驱å?¨(_S)"
 
-#: ../src/file-manager/fm-directory-view.c:7943
-#: ../src/file-manager/fm-directory-view.c:8145
+#: ../src/file-manager/fm-directory-view.c:8020
+#: ../src/file-manager/fm-directory-view.c:8222
 msgid "Stop the selected multi-disk drive"
 msgstr "å??æ­¢é??æ?©ç??å¤?ç£?ç??驱å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:7946
-#: ../src/file-manager/fm-directory-view.c:8038
-#: ../src/file-manager/fm-directory-view.c:8148
-#: ../src/nautilus-places-sidebar.c:1463
+#: ../src/file-manager/fm-directory-view.c:8023
+#: ../src/file-manager/fm-directory-view.c:8115
+#: ../src/file-manager/fm-directory-view.c:8225
+#: ../src/nautilus-places-sidebar.c:1464
 msgid "_Lock Drive"
 msgstr "é??å®?驱å?¨å?¨(_L)"
 
-#: ../src/file-manager/fm-directory-view.c:7947
-#: ../src/file-manager/fm-directory-view.c:8149
+#: ../src/file-manager/fm-directory-view.c:8024
+#: ../src/file-manager/fm-directory-view.c:8226
 msgid "Lock the selected drive"
 msgstr "é??å®?é??中ç??驱å?¨å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:7994
-#: ../src/file-manager/fm-directory-view.c:7998
+#: ../src/file-manager/fm-directory-view.c:8071
+#: ../src/file-manager/fm-directory-view.c:8075
 msgid "Start the drive associated with the open folder"
 msgstr "å?¯å?¨ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å?·"
 
-#: ../src/file-manager/fm-directory-view.c:8002
+#: ../src/file-manager/fm-directory-view.c:8079
 msgid "Connect to the drive associated with the open folder"
 msgstr "è¿?æ?¥å?°ä¸?æ??æ??å¼?æ??件夹å?³è??ç??驱å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:8006
+#: ../src/file-manager/fm-directory-view.c:8083
 msgid "Start the multi-disk drive associated with the open folder"
 msgstr "å?¯å?¨ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å¤?ç£?ç??驱å?¨"
 
 #. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
-#: ../src/file-manager/fm-directory-view.c:8009
-#: ../src/file-manager/fm-directory-view.c:8119
-#: ../src/nautilus-places-sidebar.c:1462
+#: ../src/file-manager/fm-directory-view.c:8086
+#: ../src/file-manager/fm-directory-view.c:8196
+#: ../src/nautilus-places-sidebar.c:1463
 msgid "_Unlock Drive"
 msgstr "解é??驱å?¨å?¨(_U)"
 
-#: ../src/file-manager/fm-directory-view.c:8010
+#: ../src/file-manager/fm-directory-view.c:8087
 msgid "Unlock the drive associated with the open folder"
 msgstr "å??æ¶?ä¸?æ??æ??å¼?æ??件夹å?³è??驱å?¨ç??é??å®?"
 
-#: ../src/file-manager/fm-directory-view.c:8023
+#: ../src/file-manager/fm-directory-view.c:8100
 msgid "_Stop the drive associated with the open folder"
 msgstr "å??æ­¢ä¸?æ??æ??å¼?æ??件夹å?³è??ç??驱å?¨(_S)"
 
-#: ../src/file-manager/fm-directory-view.c:8027
+#: ../src/file-manager/fm-directory-view.c:8104
 msgid "Safely remove the drive associated with the open folder"
 msgstr "å®?å?¨ç§»é?¤ä¸?æ??æ??å¼?æ??件夹å?³è??ç??驱å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:8031
+#: ../src/file-manager/fm-directory-view.c:8108
 msgid "Disconnect the drive associated with the open folder"
 msgstr "æ?­å¼?ä¸?æ??æ??å¼?æ??件夹å?³è??ç??驱å?¨ç??è¿?æ?¥"
 
-#: ../src/file-manager/fm-directory-view.c:8035
+#: ../src/file-manager/fm-directory-view.c:8112
 msgid "Stop the multi-disk drive associated with the open folder"
 msgstr "å??æ­¢ä¸?æ??æ??å¼?æ??件夹å?³è??ç??å¤?ç£?ç??驱å?¨"
 
-#: ../src/file-manager/fm-directory-view.c:8039
+#: ../src/file-manager/fm-directory-view.c:8116
 msgid "Lock the drive associated with the open folder"
 msgstr "é??å®?ä¸?æ??æ??å¼?æ??件夹å?³è??ç??驱å?¨"
 
 #. add the "open in new window" menu item
-#: ../src/file-manager/fm-directory-view.c:8218
-#: ../src/file-manager/fm-directory-view.c:8521
-#: ../src/file-manager/fm-tree-view.c:1230
-#: ../src/nautilus-places-sidebar.c:2199
+#: ../src/file-manager/fm-directory-view.c:8295
+#: ../src/file-manager/fm-directory-view.c:8601
+#: ../src/file-manager/fm-tree-view.c:1183
+#: ../src/nautilus-places-sidebar.c:2237
 msgid "Open in New _Window"
 msgstr "å?¨æ?°çª?å?£ä¸­æ??å¼?(_W)"
 
-#: ../src/file-manager/fm-directory-view.c:8220
-#: ../src/file-manager/fm-directory-view.c:8530
+#: ../src/file-manager/fm-directory-view.c:8297
+#: ../src/file-manager/fm-directory-view.c:8610
 msgid "Browse in New _Window"
 msgstr "����中��(_W)"
 
-#: ../src/file-manager/fm-directory-view.c:8228
-#: ../src/file-manager/fm-directory-view.c:8540
+#: ../src/file-manager/fm-directory-view.c:8303
+#: ../src/file-manager/fm-directory-view.c:8620
 msgid "_Browse Folder"
 msgid_plural "_Browse Folders"
 msgstr[0] "æµ?è§?æ??件夹(_B)"
 
-#: ../src/file-manager/fm-directory-view.c:8245
-#: ../src/file-manager/fm-directory-view.c:8570
+#: ../src/file-manager/fm-directory-view.c:8320
+#: ../src/file-manager/fm-directory-view.c:8649
 msgid "Browse in New _Tab"
 msgstr "å?¨æ?°æ ?签中æµ?è§?(_T)"
 
-#: ../src/file-manager/fm-directory-view.c:8294
-#: ../src/file-manager/fm-directory-view.c:8603
+#: ../src/file-manager/fm-directory-view.c:8369
+#: ../src/file-manager/fm-directory-view.c:8690
 msgid "_Delete Permanently"
 msgstr "æ°¸ä¹?å? é?¤(_D)"
 
-#: ../src/file-manager/fm-directory-view.c:8295
+#: ../src/file-manager/fm-directory-view.c:8370
 msgid "Delete the open folder permanently"
 msgstr "æ°¸ä¹?å? é?¤æ??å¼?ç??æ??件夹"
 
-#: ../src/file-manager/fm-directory-view.c:8299
+#: ../src/file-manager/fm-directory-view.c:8374
 msgid "Move the open folder to the Trash"
 msgstr "å°?æ??å¼?ç??æ??件夹移å?¨å?°å??æ?¶ç«?"
 
-#: ../src/file-manager/fm-directory-view.c:8473
+#: ../src/file-manager/fm-directory-view.c:8553
 #, c-format
-msgid "_Open with %s"
+msgid "_Open With %s"
 msgstr "使ç?¨ %s æ??å¼?(_O)"
 
-#: ../src/file-manager/fm-directory-view.c:8523
+#: ../src/file-manager/fm-directory-view.c:8603
 #, c-format
 msgid "Open in %'d New _Window"
 msgid_plural "Open in %'d New _Windows"
 msgstr[0] "å?¨ %'d 个æ?°çª?å?£ä¸­æ??å¼?(_W)"
 
-#: ../src/file-manager/fm-directory-view.c:8532
+#: ../src/file-manager/fm-directory-view.c:8612
 #, c-format
 msgid "Browse in %'d New _Window"
 msgid_plural "Browse in %'d New _Windows"
 msgstr[0] "� %'d 个���中��(_W)"
 
-#: ../src/file-manager/fm-directory-view.c:8563
+#: ../src/file-manager/fm-directory-view.c:8642
 #, c-format
 msgid "Open in %'d New _Tab"
 msgid_plural "Open in %'d New _Tabs"
 msgstr[0] "å?¨ %'d 个æ?°æ ?签中æ??å¼?(_T)"
 
-#: ../src/file-manager/fm-directory-view.c:8572
+#: ../src/file-manager/fm-directory-view.c:8651
 #, c-format
 msgid "Browse in %'d New _Tab"
 msgid_plural "Browse in %'d New _Tabs"
 msgstr[0] "å?¨ %'d 个æ?°æ ?签中æµ?è§?(_T)"
 
-#: ../src/file-manager/fm-directory-view.c:8604
+#: ../src/file-manager/fm-directory-view.c:8691
 msgid "Delete all selected items permanently"
 msgstr "æ°¸ä¹?å? é?¤æ??æ??é??中ç??项ç?®"
 
-#: ../src/file-manager/fm-directory-view.c:9922
+#: ../src/file-manager/fm-directory-view.c:10049
 msgid "Download location?"
 msgstr "�载�置�"
 
-#: ../src/file-manager/fm-directory-view.c:9925
+#: ../src/file-manager/fm-directory-view.c:10052
 msgid "You can download it or make a link to it."
 msgstr "æ?¨å?¯ä»¥ä¸?载该ä½?ç½®æ??è??å??建æ??å??å®?ç??é?¾æ?¥ã??"
 
-#: ../src/file-manager/fm-directory-view.c:9928
+#: ../src/file-manager/fm-directory-view.c:10055
 msgid "Make a _Link"
 msgstr "å??建é?¾æ?¥(_L)"
 
-#: ../src/file-manager/fm-directory-view.c:9932
+#: ../src/file-manager/fm-directory-view.c:10059
 msgid "_Download"
 msgstr "�载(_D)"
 
-#: ../src/file-manager/fm-directory-view.c:10093
-#: ../src/file-manager/fm-directory-view.c:10151
-#: ../src/file-manager/fm-directory-view.c:10256
+#: ../src/file-manager/fm-directory-view.c:10220
+#: ../src/file-manager/fm-directory-view.c:10278
+#: ../src/file-manager/fm-directory-view.c:10383
 msgid "Drag and drop is not supported."
 msgstr "ä¸?æ?¯æ??æ??æ?¾æ??ä½?ã??"
 
-#: ../src/file-manager/fm-directory-view.c:10094
+#: ../src/file-manager/fm-directory-view.c:10221
 msgid "Drag and drop is only supported on local file systems."
 msgstr "æ??æ?¾æ??ä½?å?ªè?½å?¨æ?¬å?°æ??件系ç»?中è¿?è¡?ã??"
 
-#: ../src/file-manager/fm-directory-view.c:10152
-#: ../src/file-manager/fm-directory-view.c:10257
+#: ../src/file-manager/fm-directory-view.c:10279
+#: ../src/file-manager/fm-directory-view.c:10384
 msgid "An invalid drag type was used."
 msgstr "使ç?¨äº?æ? æ??ç??æ??æ?¾ç±»å??ã??"
 
 #. Translator: This is the filename used for when you dnd text to a directory
-#: ../src/file-manager/fm-directory-view.c:10334
+#: ../src/file-manager/fm-directory-view.c:10461
 msgid "dropped text.txt"
 msgstr "text.txt ç??ç??段"
 
 #. Translator: This is the filename used for when you dnd raw
 #. * data to a directory, if the source didn't supply a name.
 #.
-#: ../src/file-manager/fm-directory-view.c:10379
+#: ../src/file-manager/fm-directory-view.c:10506
 msgid "dropped data"
-msgstr ""
+msgstr "丢失ç??æ?°æ?®"
 
 #: ../src/file-manager/fm-ditem-page.c:411
 #: ../src/file-manager/fm-ditem-page.c:421
@@ -4614,7 +4767,7 @@ msgstr "URL"
 
 #: ../src/file-manager/fm-ditem-page.c:417
 #: ../src/file-manager/fm-ditem-page.c:427
-#: ../src/nautilus-image-properties-page.c:347
+#: ../src/nautilus-image-properties-page.c:352
 msgid "Description"
 msgstr "æ??è¿°"
 
@@ -4720,238 +4873,251 @@ msgstr "æ? æ³?æ?´æ?¹æ??é??ã??"
 msgid "Renaming \"%s\" to \"%s\"."
 msgstr "å°?â??%sâ??é??å?½å??为â??%sâ??ã??"
 
-#: ../src/file-manager/fm-icon-view.c:123
+#: ../src/file-manager/fm-icon-view.c:126
 msgid "by _Name"
 msgstr "æ??å??称(_N)"
 
-#: ../src/file-manager/fm-icon-view.c:124
-#: ../src/file-manager/fm-icon-view.c:1535
+#: ../src/file-manager/fm-icon-view.c:127
+#: ../src/file-manager/fm-icon-view.c:1618
 msgid "Keep icons sorted by name in rows"
 msgstr "æ??å??称æ??å??å?¾æ ?"
 
-#: ../src/file-manager/fm-icon-view.c:130
+#: ../src/file-manager/fm-icon-view.c:133
 msgid "by _Size"
 msgstr "æ??大å°?(_S)"
 
-#: ../src/file-manager/fm-icon-view.c:131
-#: ../src/file-manager/fm-icon-view.c:1539
+#: ../src/file-manager/fm-icon-view.c:134
+#: ../src/file-manager/fm-icon-view.c:1622
 msgid "Keep icons sorted by size in rows"
 msgstr "æ??大å°?æ??å??å?¾æ ?"
 
-#: ../src/file-manager/fm-icon-view.c:137
+#: ../src/file-manager/fm-icon-view.c:140
 msgid "by _Type"
 msgstr "æ??ç±»å??(_T)"
 
-#: ../src/file-manager/fm-icon-view.c:138
-#: ../src/file-manager/fm-icon-view.c:1543
+#: ../src/file-manager/fm-icon-view.c:141
+#: ../src/file-manager/fm-icon-view.c:1626
 msgid "Keep icons sorted by type in rows"
 msgstr "æ??ç±»å??æ??å??å?¾æ ?"
 
-#: ../src/file-manager/fm-icon-view.c:144
+#: ../src/file-manager/fm-icon-view.c:147
 msgid "by Modification _Date"
 msgstr "æ??ä¿®æ?¹æ?¶é?´(_D)"
 
-#: ../src/file-manager/fm-icon-view.c:145
-#: ../src/file-manager/fm-icon-view.c:1547
+#: ../src/file-manager/fm-icon-view.c:148
+#: ../src/file-manager/fm-icon-view.c:1630
 msgid "Keep icons sorted by modification date in rows"
 msgstr "æ??ä¿®æ?¹æ?¶é?´æ??å??å?¾æ ?"
 
-#: ../src/file-manager/fm-icon-view.c:151
+#: ../src/file-manager/fm-icon-view.c:154
 msgid "by _Emblems"
 msgstr "æ??å¾½æ ?(_E)"
 
-#: ../src/file-manager/fm-icon-view.c:152
-#: ../src/file-manager/fm-icon-view.c:1551
+#: ../src/file-manager/fm-icon-view.c:155
+#: ../src/file-manager/fm-icon-view.c:1634
 msgid "Keep icons sorted by emblems in rows"
 msgstr "æ??å¾½æ ?æ??å??å?¾æ ?"
 
+#: ../src/file-manager/fm-icon-view.c:161
+msgid "by T_rash Time"
+msgstr "æ??å? é?¤æ?¶é?´(_R)"
+
+#: ../src/file-manager/fm-icon-view.c:162
+#: ../src/file-manager/fm-icon-view.c:1638
+msgid "Keep icons sorted by trash time in rows"
+msgstr "å?¨è¡?中æ??ç?§å? é?¤æ?¶é?´ä¿?æ??å?¾æ ?æ??åº?"
+
 #. name, stock id, label
-#: ../src/file-manager/fm-icon-view.c:1495
+#: ../src/file-manager/fm-icon-view.c:1578
 msgid "Arran_ge Items"
 msgstr "æ??å??项ç?®(_G)"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1497
-msgid "Stretc_h Icon..."
-msgstr "伸å±?å?¾æ ?(_H)..."
+#: ../src/file-manager/fm-icon-view.c:1580
+msgid "Resize Icon..."
+msgstr "è°?æ?´å?¾æ ?大å°?..."
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1498
-msgid "Make the selected icon stretchable"
-msgstr "使é??中ç??å?¾æ ?å?¯ä¼¸å±?"
+#: ../src/file-manager/fm-icon-view.c:1581
+msgid "Make the selected icon resizable"
+msgstr "使é??中ç??å?¾æ ?å?¯è°?æ?´å¤§å°?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1501
-#: ../src/file-manager/fm-icon-view.c:1671
+#: ../src/file-manager/fm-icon-view.c:1584
+#: ../src/file-manager/fm-icon-view.c:1758
 msgid "Restore Icons' Original Si_zes"
 msgstr "æ?¢å¤?å?¾æ ?ç??å??å§?大å°?(_Z)"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1502
+#: ../src/file-manager/fm-icon-view.c:1585
 msgid "Restore each selected icon to its original size"
 msgstr "æ?¢å¤?æ¯?个é??中å?¾æ ?ç??å??å§?大å°?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1505
-msgid "Clean _Up by Name"
-msgstr "æ??å??称æ¸?ç??(_U)"
+#: ../src/file-manager/fm-icon-view.c:1588
+msgid "_Organize Desktop by Name"
+msgstr ""
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1506
+#: ../src/file-manager/fm-icon-view.c:1589
 msgid "Reposition icons to better fit in the window and avoid overlapping"
 msgstr "é??æ?°å®?ä½?å?¾æ ?æ?¥æ?´å¥½å?°æ?¾å?¨çª?å?£ä¸­ï¼?ä¸?é?¿å??é??å? "
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1512
+#: ../src/file-manager/fm-icon-view.c:1595
 msgid "Compact _Layout"
 msgstr "ç´§å??å¸?å±?(_L)"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1513
+#: ../src/file-manager/fm-icon-view.c:1596
 msgid "Toggle using a tighter layout scheme"
 msgstr "使ç?¨æ?´ç´§å¯?ç??å¸?å±?æ?¹æ¡?å??æ?¢"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1517
+#: ../src/file-manager/fm-icon-view.c:1600
 msgid "Re_versed Order"
 msgstr "é??åº?(_V)"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1518
+#: ../src/file-manager/fm-icon-view.c:1601
 msgid "Display icons in the opposite order"
 msgstr "ç?¨ç?¸å??ç??顺åº?æ?¾ç¤ºå?¾æ ?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-icon-view.c:1522
+#: ../src/file-manager/fm-icon-view.c:1605
 msgid "_Keep Aligned"
 msgstr "ä¿?æ??对é½?(_K)"
 
 #. tooltip
-#: ../src/file-manager/fm-icon-view.c:1523
+#: ../src/file-manager/fm-icon-view.c:1606
 msgid "Keep icons lined up on a grid"
 msgstr "å°?å?¾æ ?æ??ç½?æ ¼å¯¹é½?"
 
-#: ../src/file-manager/fm-icon-view.c:1530
+#: ../src/file-manager/fm-icon-view.c:1613
 msgid "_Manually"
 msgstr "æ??å?¨(_M)"
 
-#: ../src/file-manager/fm-icon-view.c:1531
+#: ../src/file-manager/fm-icon-view.c:1614
 msgid "Leave icons wherever they are dropped"
 msgstr "å°?å?¾æ ?ç??å?¨æ??æ?¾å?°ç??ä½?ç½®"
 
-#: ../src/file-manager/fm-icon-view.c:1534
+#: ../src/file-manager/fm-icon-view.c:1617
 msgid "By _Name"
 msgstr "æ??å??称(_N)"
 
-#: ../src/file-manager/fm-icon-view.c:1538
+#: ../src/file-manager/fm-icon-view.c:1621
 msgid "By _Size"
 msgstr "æ??大å°?(_S)"
 
-#: ../src/file-manager/fm-icon-view.c:1542
+#: ../src/file-manager/fm-icon-view.c:1625
 msgid "By _Type"
 msgstr "æ??ç±»å??(_T)"
 
-#: ../src/file-manager/fm-icon-view.c:1546
+#: ../src/file-manager/fm-icon-view.c:1629
 msgid "By Modification _Date"
 msgstr "æ??ä¿®æ?¹æ?¶é?´(_D)"
 
-#: ../src/file-manager/fm-icon-view.c:1550
+#: ../src/file-manager/fm-icon-view.c:1633
 msgid "By _Emblems"
 msgstr "æ??å¾½æ ?(_E)"
 
-#: ../src/file-manager/fm-icon-view.c:1672
+#: ../src/file-manager/fm-icon-view.c:1637
+msgid "By T_rash Time"
+msgstr "æ??å? é?¤æ?¶é?´(_R)"
+
+#: ../src/file-manager/fm-icon-view.c:1759
 msgid "Restore Icon's Original Si_ze"
 msgstr "æ?¢å¤?å?¾æ ?ç??å??å§?大å°?(_Z)"
 
-#: ../src/file-manager/fm-icon-view.c:2094
+#: ../src/file-manager/fm-icon-view.c:2180
 #, c-format
 msgid "pointing at \"%s\""
 msgstr "æ??å??â??%sâ??"
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-icon-view.c:3064
+#: ../src/file-manager/fm-icon-view.c:3170
 msgid "_Icons"
 msgstr "å?¾æ ?(_I)"
 
-#: ../src/file-manager/fm-icon-view.c:3065
+#: ../src/file-manager/fm-icon-view.c:3171
 msgid "The icon view encountered an error."
 msgstr "å?¾æ ?è§?å?¾é??å?°äº?é??误ã??"
 
-#: ../src/file-manager/fm-icon-view.c:3066
+#: ../src/file-manager/fm-icon-view.c:3172
 msgid "The icon view encountered an error while starting up."
 msgstr "å?¾æ ?è§?å?¾å?¨å?¯å?¨æ?¶é??å?°é??误ã??"
 
-#: ../src/file-manager/fm-icon-view.c:3067
+#: ../src/file-manager/fm-icon-view.c:3173
 msgid "Display this location with the icon view."
 msgstr "ç?¨å?¾æ ?è§?å?¾æ?¾ç¤ºè¯¥ä½?ç½®ã??"
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-icon-view.c:3078
+#: ../src/file-manager/fm-icon-view.c:3184
 msgid "_Compact"
 msgstr "ç´§å??(_C)"
 
-#: ../src/file-manager/fm-icon-view.c:3079
+#: ../src/file-manager/fm-icon-view.c:3185
 msgid "The compact view encountered an error."
 msgstr "ç´§å??è§?å?¾é??å?°äº?é??误ã??"
 
-#: ../src/file-manager/fm-icon-view.c:3080
+#: ../src/file-manager/fm-icon-view.c:3186
 msgid "The compact view encountered an error while starting up."
 msgstr "ç´§å??è§?å?¾å?¨å?¯å?¨æ?¶é??å?°é??误ã??"
 
-#: ../src/file-manager/fm-icon-view.c:3081
+#: ../src/file-manager/fm-icon-view.c:3187
 msgid "Display this location with the compact view."
 msgstr "ç?¨ç´§å??è§?å?¾æ?¾ç¤ºè¯¥ä½?ç½®ã??"
 
-#: ../src/file-manager/fm-list-model.c:382
-#: ../src/file-manager/fm-tree-model.c:1268
+#: ../src/file-manager/fm-list-model.c:397
+#: ../src/file-manager/fm-tree-model.c:1287
 msgid "(Empty)"
 msgstr "(空)"
 
-#: ../src/file-manager/fm-list-model.c:384
-#: ../src/file-manager/fm-tree-model.c:1268 ../src/nautilus-window-slot.c:191
+#: ../src/file-manager/fm-list-model.c:399
+#: ../src/file-manager/fm-tree-model.c:1287 ../src/nautilus-window-slot.c:205
 msgid "Loading..."
 msgstr "正�载�..."
 
-#: ../src/file-manager/fm-list-view.c:2169
+#: ../src/file-manager/fm-list-view.c:2264
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s å?¯è§?å??"
 
-#: ../src/file-manager/fm-list-view.c:2188
+#: ../src/file-manager/fm-list-view.c:2283
 msgid "Choose the order of information to appear in this folder:"
 msgstr "为此æ??件夹中è¦?æ?¾ç¤ºç??ä¿¡æ?¯é??æ?©é¡ºåº?ï¼?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-list-view.c:2242
+#: ../src/file-manager/fm-list-view.c:2337
 msgid "Visible _Columns..."
 msgstr "å?¯è§?å??(_C)..."
 
 #. tooltip
-#: ../src/file-manager/fm-list-view.c:2243
+#: ../src/file-manager/fm-list-view.c:2338
 msgid "Select the columns visible in this folder"
 msgstr "é??æ?©æ­¤æ??件夹中ç??å?¯è§?å??"
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-list-view.c:2969
+#: ../src/file-manager/fm-list-view.c:3130
 msgid "_List"
 msgstr "å??表(_L)"
 
-#: ../src/file-manager/fm-list-view.c:2970
+#: ../src/file-manager/fm-list-view.c:3131
 msgid "The list view encountered an error."
 msgstr "å??表è§?å?¾é??å?°äº?é??误ã??"
 
-#: ../src/file-manager/fm-list-view.c:2971
+#: ../src/file-manager/fm-list-view.c:3132
 msgid "The list view encountered an error while starting up."
 msgstr "å??表è§?å?¾å?¨å?¯å?¨æ?¶é??å?°é??误ã??"
 
-#: ../src/file-manager/fm-list-view.c:2972
+#: ../src/file-manager/fm-list-view.c:3133
 msgid "Display this location with the list view."
 msgstr "ç?¨å??表è§?å?¾æ?¾ç¤ºè¯¥ä½?ç½®ã??"
 
@@ -5009,21 +5175,21 @@ msgstr "å??æ¶?群ç»?æ?´æ?¹ï¼?"
 msgid "Cancel Owner Change?"
 msgstr "å??æ¶?æ??æ??è??æ?´æ?¹ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:2326
+#: ../src/file-manager/fm-properties-window.c:2329
 msgid "nothing"
 msgstr "æ? "
 
-#: ../src/file-manager/fm-properties-window.c:2328
+#: ../src/file-manager/fm-properties-window.c:2331
 msgid "unreadable"
 msgstr "��读"
 
-#: ../src/file-manager/fm-properties-window.c:2338
+#: ../src/file-manager/fm-properties-window.c:2341
 #, c-format
 msgid "%'d item, with size %s"
 msgid_plural "%'d items, totalling %s"
 msgstr[0] "%'d项�大� %s"
 
-#: ../src/file-manager/fm-properties-window.c:2347
+#: ../src/file-manager/fm-properties-window.c:2350
 msgid "(some contents unreadable)"
 msgstr "(æ??äº?å??容ä¸?å?¯è¯»)"
 
@@ -5033,120 +5199,112 @@ msgstr "(æ??äº?å??容ä¸?å?¯è¯»)"
 #. * 2-line value. Maybe there's a better way to do this, but I
 #. * couldn't think of one.
 #.
-#: ../src/file-manager/fm-properties-window.c:2364
+#: ../src/file-manager/fm-properties-window.c:2367
 msgid "Contents:"
 msgstr "å??容ï¼?"
 
 #. Translators: "used" refers to the capacity of the filesystem
-#: ../src/file-manager/fm-properties-window.c:3131
+#: ../src/file-manager/fm-properties-window.c:3141
 msgid "used"
 msgstr "已�"
 
 #. Translators: "free" refers to the capacity of the filesystem
-#: ../src/file-manager/fm-properties-window.c:3136
+#: ../src/file-manager/fm-properties-window.c:3146
 msgid "free"
 msgstr "å?©ä½?"
 
-#: ../src/file-manager/fm-properties-window.c:3138
+#: ../src/file-manager/fm-properties-window.c:3148
 msgid "Total capacity:"
 msgstr "æ?»å®¹é??ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:3147
+#: ../src/file-manager/fm-properties-window.c:3157
 msgid "Filesystem type:"
 msgstr "æ??件系ç»?ç±»å??ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:3223
+#: ../src/file-manager/fm-properties-window.c:3233
 msgid "Basic"
 msgstr "��"
 
-#: ../src/file-manager/fm-properties-window.c:3283
-msgid "Type:"
-msgstr "ç±»å??ï¼?"
-
-#: ../src/file-manager/fm-properties-window.c:3291
+#: ../src/file-manager/fm-properties-window.c:3301
 msgid "Link target:"
 msgstr "é?¾æ?¥ç?®æ ?ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:3301
-msgid "Size:"
-msgstr "大��"
-
-#: ../src/file-manager/fm-properties-window.c:3310
-#: ../src/nautilus-location-bar.c:55
+#: ../src/file-manager/fm-properties-window.c:3320
+#: ../src/nautilus-location-bar.c:56
 msgid "Location:"
 msgstr "�置�"
 
-#: ../src/file-manager/fm-properties-window.c:3316
+#: ../src/file-manager/fm-properties-window.c:3326
 msgid "Volume:"
 msgstr "æ??件å?·ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:3325
+#: ../src/file-manager/fm-properties-window.c:3335
 msgid "Accessed:"
 msgstr "访��"
 
-#: ../src/file-manager/fm-properties-window.c:3329
+#: ../src/file-manager/fm-properties-window.c:3339
 msgid "Modified:"
 msgstr "修��"
 
-#: ../src/file-manager/fm-properties-window.c:3338
+#: ../src/file-manager/fm-properties-window.c:3348
 msgid "Free space:"
 msgstr "��空��"
 
-#: ../src/file-manager/fm-properties-window.c:3448
-#: ../src/nautilus-emblem-sidebar.c:1032
+#: ../src/file-manager/fm-properties-window.c:3458
+#: ../src/nautilus-emblem-sidebar.c:1037
 msgid "Emblems"
 msgstr "å¾½æ ?"
 
-#: ../src/file-manager/fm-properties-window.c:3851
+#: ../src/file-manager/fm-properties-window.c:3861
 msgid "_Read"
 msgstr "读å??(_R)"
 
-#: ../src/file-manager/fm-properties-window.c:3853
+#: ../src/file-manager/fm-properties-window.c:3863
 msgid "_Write"
 msgstr "å??å?¥(_W)"
 
-#: ../src/file-manager/fm-properties-window.c:3855
+#: ../src/file-manager/fm-properties-window.c:3865
 msgid "E_xecute"
 msgstr "��(_X)"
 
 #. translators: this gets concatenated to "no read",
 #. * "no access", etc. (see following strings)
 #.
-#: ../src/file-manager/fm-properties-window.c:4123
-#: ../src/file-manager/fm-properties-window.c:4134
-#: ../src/file-manager/fm-properties-window.c:4146
+#: ../src/file-manager/fm-properties-window.c:4133
+#: ../src/file-manager/fm-properties-window.c:4144
+#: ../src/file-manager/fm-properties-window.c:4156
 msgid "no "
 msgstr "æ? "
 
-#: ../src/file-manager/fm-properties-window.c:4126
+#: ../src/file-manager/fm-properties-window.c:4136
 msgid "list"
 msgstr "å??表"
 
-#: ../src/file-manager/fm-properties-window.c:4128
+#: ../src/file-manager/fm-properties-window.c:4138
 msgid "read"
 msgstr "读å??"
 
-#: ../src/file-manager/fm-properties-window.c:4137
+#: ../src/file-manager/fm-properties-window.c:4147
 msgid "create/delete"
 msgstr "å??建/å? é?¤"
 
-#: ../src/file-manager/fm-properties-window.c:4139
+#: ../src/file-manager/fm-properties-window.c:4149
 msgid "write"
 msgstr "å??å?¥"
 
-#: ../src/file-manager/fm-properties-window.c:4148
+#: ../src/file-manager/fm-properties-window.c:4158
 msgid "access"
 msgstr "访�"
 
-#: ../src/file-manager/fm-properties-window.c:4197
+#: ../src/file-manager/fm-properties-window.c:4207
 msgid "Access:"
 msgstr "访��"
 
-#: ../src/file-manager/fm-properties-window.c:4199
+#: ../src/file-manager/fm-properties-window.c:4209
 msgid "Folder access:"
 msgstr "æ??件夹访é?®ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4201
+#: ../src/file-manager/fm-properties-window.c:4211
 msgid "File access:"
 msgstr "æ??件访é?®ï¼?"
 
@@ -5154,166 +5312,166 @@ msgstr "æ??件访é?®ï¼?"
 #. * the user has in a directory.
 #.
 #. Translators: this is referred to captions under icons.
-#: ../src/file-manager/fm-properties-window.c:4216
-#: ../src/file-manager/fm-properties-window.c:4227
+#: ../src/file-manager/fm-properties-window.c:4226
+#: ../src/file-manager/fm-properties-window.c:4237
 #: ../src/nautilus-file-management-properties.c:292
 msgid "None"
 msgstr "æ? "
 
-#: ../src/file-manager/fm-properties-window.c:4219
+#: ../src/file-manager/fm-properties-window.c:4229
 msgid "List files only"
 msgstr "å?ªè?½å??å?ºæ??件"
 
-#: ../src/file-manager/fm-properties-window.c:4221
+#: ../src/file-manager/fm-properties-window.c:4231
 msgid "Access files"
 msgstr "访é?®æ??件"
 
-#: ../src/file-manager/fm-properties-window.c:4223
+#: ../src/file-manager/fm-properties-window.c:4233
 msgid "Create and delete files"
 msgstr "å??建å??å? é?¤æ??件"
 
-#: ../src/file-manager/fm-properties-window.c:4230
+#: ../src/file-manager/fm-properties-window.c:4240
 msgid "Read-only"
 msgstr "�读"
 
-#: ../src/file-manager/fm-properties-window.c:4232
+#: ../src/file-manager/fm-properties-window.c:4242
 msgid "Read and write"
 msgstr "读å??"
 
-#: ../src/file-manager/fm-properties-window.c:4297
+#: ../src/file-manager/fm-properties-window.c:4309
 msgid "Set _user ID"
 msgstr "设置�� ID(_U)"
 
-#: ../src/file-manager/fm-properties-window.c:4299
+#: ../src/file-manager/fm-properties-window.c:4312
 msgid "Special flags:"
 msgstr "ç?¹æ®?æ ?å¿?ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4301
+#: ../src/file-manager/fm-properties-window.c:4314
 msgid "Set gro_up ID"
 msgstr "设置群� ID(_U)"
 
-#: ../src/file-manager/fm-properties-window.c:4302
+#: ../src/file-manager/fm-properties-window.c:4315
 msgid "_Sticky"
 msgstr "ç²?é??(_S)"
 
-#: ../src/file-manager/fm-properties-window.c:4382
-#: ../src/file-manager/fm-properties-window.c:4586
+#: ../src/file-manager/fm-properties-window.c:4397
+#: ../src/file-manager/fm-properties-window.c:4605
 msgid "_Owner:"
 msgstr "æ??æ??è??(_O)ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4388
-#: ../src/file-manager/fm-properties-window.c:4483
-#: ../src/file-manager/fm-properties-window.c:4594
+#: ../src/file-manager/fm-properties-window.c:4403
+#: ../src/file-manager/fm-properties-window.c:4501
+#: ../src/file-manager/fm-properties-window.c:4613
 msgid "Owner:"
 msgstr "æ??æ??è??ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4411
-#: ../src/file-manager/fm-properties-window.c:4606
+#: ../src/file-manager/fm-properties-window.c:4427
+#: ../src/file-manager/fm-properties-window.c:4625
 msgid "_Group:"
 msgstr "群�(_G)�"
 
-#: ../src/file-manager/fm-properties-window.c:4420
-#: ../src/file-manager/fm-properties-window.c:4484
-#: ../src/file-manager/fm-properties-window.c:4615
+#: ../src/file-manager/fm-properties-window.c:4436
+#: ../src/file-manager/fm-properties-window.c:4502
+#: ../src/file-manager/fm-properties-window.c:4634
 msgid "Group:"
 msgstr "群��"
 
-#: ../src/file-manager/fm-properties-window.c:4445
+#: ../src/file-manager/fm-properties-window.c:4462
 msgid "Others"
 msgstr "��"
 
-#: ../src/file-manager/fm-properties-window.c:4462
+#: ../src/file-manager/fm-properties-window.c:4480
 msgid "Execute:"
 msgstr "���"
 
-#: ../src/file-manager/fm-properties-window.c:4466
+#: ../src/file-manager/fm-properties-window.c:4484
 msgid "Allow _executing file as program"
 msgstr "å??许以ç¨?åº?æ?§è¡?æ??件(_E)"
 
-#: ../src/file-manager/fm-properties-window.c:4485
+#: ../src/file-manager/fm-properties-window.c:4503
 msgid "Others:"
 msgstr "���"
 
-#: ../src/file-manager/fm-properties-window.c:4633
+#: ../src/file-manager/fm-properties-window.c:4653
 msgid "Folder Permissions:"
 msgstr "æ??件夹æ??é??ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4645
+#: ../src/file-manager/fm-properties-window.c:4666
 msgid "File Permissions:"
 msgstr "æ??件æ??é??ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4655
+#: ../src/file-manager/fm-properties-window.c:4677
 msgid "Text view:"
 msgstr "æ??æ?¬è§?å?¾ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4802
+#: ../src/file-manager/fm-properties-window.c:4825
 msgid "You are not the owner, so you cannot change these permissions."
 msgstr "æ?¨ä¸?æ?¯æ??æ??è??ï¼?æ??以æ?¨ä¸?è?½æ?´æ?¹è¿?äº?æ??é??ã??"
 
-#: ../src/file-manager/fm-properties-window.c:4826
+#: ../src/file-manager/fm-properties-window.c:4850
 msgid "SELinux context:"
 msgstr "SELinux ���"
 
-#: ../src/file-manager/fm-properties-window.c:4831
+#: ../src/file-manager/fm-properties-window.c:4855
 msgid "Last changed:"
 msgstr "æ??å??ä¿®æ?¹ï¼?"
 
-#: ../src/file-manager/fm-properties-window.c:4845
+#: ../src/file-manager/fm-properties-window.c:4869
 msgid "Apply Permissions to Enclosed Files"
 msgstr "对å??å?«ç??æ??件åº?ç?¨æ??é??"
 
-#: ../src/file-manager/fm-properties-window.c:4855
+#: ../src/file-manager/fm-properties-window.c:4879
 #, c-format
 msgid "The permissions of \"%s\" could not be determined."
 msgstr "æ? æ³?ç¡®å®?â??%sâ??ç??æ??é??ã??"
 
-#: ../src/file-manager/fm-properties-window.c:4858
+#: ../src/file-manager/fm-properties-window.c:4882
 msgid "The permissions of the selected file could not be determined."
 msgstr "æ? æ³?ç¡®å®?é??中æ??件ç??æ??é??ã??"
 
-#: ../src/file-manager/fm-properties-window.c:5428
+#: ../src/file-manager/fm-properties-window.c:5452
 msgid "Creating Properties window."
 msgstr "å??建å±?æ?§çª?å?£ã??"
 
-#: ../src/file-manager/fm-properties-window.c:5718
+#: ../src/file-manager/fm-properties-window.c:5742
 msgid "Select Custom Icon"
 msgstr "é??æ?©è?ªå®?ä¹?å?¾æ ?"
 
-#: ../src/file-manager/fm-tree-view.c:1381
-#: ../src/nautilus-places-sidebar.c:331
+#: ../src/file-manager/fm-tree-view.c:1334
+#: ../src/nautilus-places-sidebar.c:369
 msgid "File System"
 msgstr "æ??件系ç»?"
 
-#: ../src/file-manager/fm-tree-view.c:1385
+#: ../src/file-manager/fm-tree-view.c:1338
 msgid "Network Neighbourhood"
 msgstr "����"
 
-#: ../src/file-manager/fm-tree-view.c:1639
+#: ../src/file-manager/fm-tree-view.c:1604
 msgid "Tree"
 msgstr "æ ?"
 
-#: ../src/file-manager/fm-tree-view.c:1645
+#: ../src/file-manager/fm-tree-view.c:1610
 msgid "Show Tree"
 msgstr "æ?¾ç¤ºæ ?"
 
-#: ../src/nautilus-application.c:413
+#: ../src/nautilus-application.c:329
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus æ? æ³?å??建æ??é??ç??æ??件夹â??%sâ??ã??"
 
-#: ../src/nautilus-application.c:415
+#: ../src/nautilus-application.c:331
 msgid ""
 "Before running Nautilus, please create the following folder, or set "
 "permissions such that Nautilus can create it."
 msgstr ""
 "å?¨è¿?è¡? Nautilus å??ï¼?请å??建该æ??件夹ï¼?æ??设置好æ??é??以使 Nautilus å?¯ä»¥å??建å®?ã??"
 
-#: ../src/nautilus-application.c:418
+#: ../src/nautilus-application.c:334
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus æ? æ³?å??建ä¸?å??æ??é??ç??æ??件夹ï¼?%sã??"
 
-#: ../src/nautilus-application.c:420
+#: ../src/nautilus-application.c:336
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
@@ -5321,8 +5479,14 @@ msgstr ""
 "å?¨è¿?è¡? Nautilus å??ï¼?请å??建è¿?äº?æ??件夹ï¼?æ??设置好æ??é??以使 Nautilus å?¯ä»¥å??建å®?"
 "们ã??"
 
-#: ../src/nautilus-application.c:1493 ../src/nautilus-places-sidebar.c:1808
-#: ../src/nautilus-places-sidebar.c:1831 ../src/nautilus-places-sidebar.c:1854
+#: ../src/nautilus-application.c:621
+msgid ""
+"Nautilus 2.32 deprecated this directory and tried migrating this "
+"configuration to ~/.config/nautilus"
+msgstr "Nautilus 2.32 åº?å¼?äº?æ­¤ç?®å½?ï¼?并ä¸?å°?è¯?è¿?移此é??ç½®å?° ~/.config/nautilus"
+
+#: ../src/nautilus-application.c:1560 ../src/nautilus-places-sidebar.c:1822
+#: ../src/nautilus-places-sidebar.c:1851 ../src/nautilus-places-sidebar.c:1880
 #, c-format
 msgid "Unable to eject %s"
 msgstr "æ? æ³?å¼¹å?º %s"
@@ -5362,7 +5526,7 @@ msgstr ""
 
 #: ../src/nautilus-bookmarks-window.c:158
 #: ../src/nautilus-file-management-properties.c:209
-#: ../src/nautilus-property-browser.c:1569 ../src/nautilus-window-menus.c:589
+#: ../src/nautilus-property-browser.c:1579 ../src/nautilus-window-menus.c:589
 #, c-format
 msgid ""
 "There was an error displaying help: \n"
@@ -5396,13 +5560,13 @@ msgstr "��书签"
 msgid "Cannot display location \"%s\""
 msgstr "æ? æ³?æ?¾ç¤ºä½?ç½®â??%sâ??"
 
-#: ../src/nautilus-connect-server-dialog-main.c:170
+#: ../src/nautilus-connect-server-dialog-main.c:171
 msgid "[URI]"
 msgstr "[URI]"
 
 #. Translators: This is the --help description for the connect to server app,
 #. the initial newlines are between the command line arg and the description
-#: ../src/nautilus-connect-server-dialog-main.c:182
+#: ../src/nautilus-connect-server-dialog-main.c:183
 msgid ""
 "\n"
 "\n"
@@ -5412,92 +5576,92 @@ msgstr ""
 "\n"
 "æ·»å? â??è¿?æ?¥å?°æ??å?¡å?¨â??æ??è½½"
 
-#: ../src/nautilus-connect-server-dialog.c:113
+#: ../src/nautilus-connect-server-dialog.c:114
 msgid "Custom Location"
 msgstr "����置"
 
-#: ../src/nautilus-connect-server-dialog.c:115
+#: ../src/nautilus-connect-server-dialog.c:116
 msgid "SSH"
 msgstr "SSH"
 
-#: ../src/nautilus-connect-server-dialog.c:118
+#: ../src/nautilus-connect-server-dialog.c:119
 msgid "Public FTP"
 msgstr "�� FTP"
 
-#: ../src/nautilus-connect-server-dialog.c:120
+#: ../src/nautilus-connect-server-dialog.c:121
 msgid "FTP (with login)"
 msgstr "FTP (é??ç?»å½?)"
 
-#: ../src/nautilus-connect-server-dialog.c:123
+#: ../src/nautilus-connect-server-dialog.c:124
 msgid "Windows share"
 msgstr "Windows �享"
 
-#: ../src/nautilus-connect-server-dialog.c:125
+#: ../src/nautilus-connect-server-dialog.c:126
 msgid "WebDAV (HTTP)"
 msgstr "WebDAV (HTTP)"
 
-#: ../src/nautilus-connect-server-dialog.c:127
+#: ../src/nautilus-connect-server-dialog.c:128
 msgid "Secure WebDAV (HTTPS)"
 msgstr "å®?å?¨ WebDAV (HTTPS)"
 
-#: ../src/nautilus-connect-server-dialog.c:185
+#: ../src/nautilus-connect-server-dialog.c:186
 msgid "Cannot Connect to Server. You must enter a name for the server."
 msgstr "æ? æ³?è¿?æ?¥å?°æ??å?¡å?¨ã??æ?¨å¿?é¡»è¾?å?¥ä¸?个æ??å?¡å?¨å??ã??"
 
-#: ../src/nautilus-connect-server-dialog.c:186
+#: ../src/nautilus-connect-server-dialog.c:187
 msgid "Please enter a name and try again."
 msgstr "请è¾?å?¥å??称ç?¶å??é??è¯?ã??"
 
-#: ../src/nautilus-connect-server-dialog.c:427
+#: ../src/nautilus-connect-server-dialog.c:432
 msgid "_Location (URI):"
 msgstr "ä½?ç½®(URI)(_L)ï¼?"
 
-#: ../src/nautilus-connect-server-dialog.c:449
+#: ../src/nautilus-connect-server-dialog.c:454
 msgid "_Server:"
 msgstr "æ??å?¡å?¨(_S)ï¼?"
 
-#: ../src/nautilus-connect-server-dialog.c:468
+#: ../src/nautilus-connect-server-dialog.c:473
 msgid "Optional information:"
 msgstr "å?¯é??ä¿¡æ?¯ï¼?"
 
-#: ../src/nautilus-connect-server-dialog.c:480
+#: ../src/nautilus-connect-server-dialog.c:485
 msgid "_Share:"
 msgstr "�享(_S)�"
 
-#: ../src/nautilus-connect-server-dialog.c:501
+#: ../src/nautilus-connect-server-dialog.c:506
 msgid "_Port:"
 msgstr "端�(_P)�"
 
-#: ../src/nautilus-connect-server-dialog.c:541
+#: ../src/nautilus-connect-server-dialog.c:546
 msgid "_User Name:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
-#: ../src/nautilus-connect-server-dialog.c:562
+#: ../src/nautilus-connect-server-dialog.c:567
 msgid "_Domain Name:"
 msgstr "å??å??(_D)ï¼?"
 
-#: ../src/nautilus-connect-server-dialog.c:594
+#: ../src/nautilus-connect-server-dialog.c:599
 msgid "Bookmark _name:"
 msgstr "书签å??称(_N)ï¼?"
 
-#: ../src/nautilus-connect-server-dialog.c:790
+#: ../src/nautilus-connect-server-dialog.c:795
 msgid "Connect to Server"
 msgstr "è¿?æ?¥å?°æ??å?¡å?¨"
 
-#: ../src/nautilus-connect-server-dialog.c:807
+#: ../src/nautilus-connect-server-dialog.c:812
 msgid "Service _type:"
 msgstr "æ??å?¡ç±»å??(_T)ï¼?"
 
-#: ../src/nautilus-connect-server-dialog.c:903
+#: ../src/nautilus-connect-server-dialog.c:908
 msgid "Add _bookmark"
 msgstr "æ·»å? 书签(_B)"
 
-#: ../src/nautilus-connect-server-dialog.c:941
+#: ../src/nautilus-connect-server-dialog.c:946
 msgid "C_onnect"
 msgstr "è¿?æ?¥(_O)"
 
-#: ../src/nautilus-desktop-window.c:243 ../src/nautilus-pathbar.c:1240
-#: ../src/nautilus-places-sidebar.c:318
+#: ../src/nautilus-desktop-window.c:79 ../src/nautilus-desktop-window.c:249
+#: ../src/nautilus-pathbar.c:1259 ../src/nautilus-places-sidebar.c:356
 msgid "Desktop"
 msgstr "æ¡?é?¢"
 
@@ -5545,32 +5709,32 @@ msgid ""
 "other places to identify the emblem."
 msgstr "è¾?å?¥å¾½æ ?æ??è¾¹ç??æ??è¿°æ?§å??称ã??æ­¤å??称å°?å?¨å?¶å®?ä½?ç½®ç?¨äº?æ ?è¯?å¾½æ ?ã??"
 
-#: ../src/nautilus-emblem-sidebar.c:764
+#: ../src/nautilus-emblem-sidebar.c:769
 msgid "Some of the files could not be added as emblems."
 msgstr "æ??äº?æ??件æ? æ³?æ·»å? 为徽æ ?ã??"
 
-#: ../src/nautilus-emblem-sidebar.c:764 ../src/nautilus-emblem-sidebar.c:766
+#: ../src/nautilus-emblem-sidebar.c:769 ../src/nautilus-emblem-sidebar.c:771
 msgid "The emblems do not appear to be valid images."
 msgstr "å¾½æ ?ä¸?å??æ?¯æ??æ??ç??å?¾å??ã??"
 
-#: ../src/nautilus-emblem-sidebar.c:766
+#: ../src/nautilus-emblem-sidebar.c:771
 msgid "None of the files could be added as emblems."
 msgstr "æ? æ³?å°?ä»»ä½?ä¸?个æ??件添å? 为徽æ ?ã??"
 
-#: ../src/nautilus-emblem-sidebar.c:803 ../src/nautilus-emblem-sidebar.c:858
+#: ../src/nautilus-emblem-sidebar.c:808 ../src/nautilus-emblem-sidebar.c:863
 #, c-format
 msgid "The file '%s' does not appear to be a valid image."
 msgstr "æ??件â??%sâ??ä¸?å??æ?¯æ??æ??ç??å?¾å??ã??"
 
-#: ../src/nautilus-emblem-sidebar.c:806
+#: ../src/nautilus-emblem-sidebar.c:811
 msgid "The dragged file does not appear to be a valid image."
 msgstr "æ??æ?³ç??æ??件ä¸?å??æ?¯æ??æ??ç??å?¾å??ã??"
 
-#: ../src/nautilus-emblem-sidebar.c:808 ../src/nautilus-emblem-sidebar.c:859
+#: ../src/nautilus-emblem-sidebar.c:813 ../src/nautilus-emblem-sidebar.c:864
 msgid "The emblem cannot be added."
 msgstr "æ? æ³?æ·»å? å¾½æ ?ã??"
 
-#: ../src/nautilus-emblem-sidebar.c:1038
+#: ../src/nautilus-emblem-sidebar.c:1043
 msgid "Show Emblems"
 msgstr "æ?¾ç¤ºå¾½æ ?"
 
@@ -5673,85 +5837,85 @@ msgid "Always"
 msgstr "��"
 
 #: ../src/nautilus-file-management-properties.ui.h:45
-msgid "Always open in _browser windows"
-msgstr "æ?»æ?¯å?¨æµ?è§?å?¨çª?å?£ä¸­æ??å¼?(_B)"
-
-#: ../src/nautilus-file-management-properties.ui.h:46
 msgid "Ask before _emptying the Trash or deleting files"
 msgstr "æ¸?空å??æ?¶ç«?æ??å? é?¤æ??件å??询é?®(_E)"
 
-#: ../src/nautilus-file-management-properties.ui.h:47
+#: ../src/nautilus-file-management-properties.ui.h:46
 msgid "B_rowse media when inserted"
 msgstr "æ??å?¥æ?¶æµ?è§?ä»?è´¨(_R)"
 
-#: ../src/nautilus-file-management-properties.ui.h:48
+#: ../src/nautilus-file-management-properties.ui.h:47
 msgid "Behavior"
 msgstr "�为"
 
-#: ../src/nautilus-file-management-properties.ui.h:54
+#: ../src/nautilus-file-management-properties.ui.h:53
 msgid "CD _Audio:"
 msgstr "�� CD(_A)�"
 
-#: ../src/nautilus-file-management-properties.ui.h:55
+#: ../src/nautilus-file-management-properties.ui.h:54
 msgid ""
 "Choose the order of information to appear beneath icon names. More "
 "information will appear when zooming in closer."
 msgstr ""
 "为å?¾æ ?å??å­?ä¸?è¦?æ?¾ç¤ºç??ä¿¡æ?¯é??æ?©é¡ºåº?ã??é??ç??æ?¾å¤§å??æ?°ç??å¢?å? ï¼?æ??å?ºç?°ç??ä¿¡æ?¯ä¼?å¢?å¤?ã??"
 
-#: ../src/nautilus-file-management-properties.ui.h:56
+#: ../src/nautilus-file-management-properties.ui.h:55
 msgid "Choose the order of information to appear in the list view."
 msgstr "é??æ?©ä¿¡æ?¯å?¨å??表è§?å?¾ä¸?æ?¾ç¤ºç??顺åº?ã??"
 
-#: ../src/nautilus-file-management-properties.ui.h:57
+#: ../src/nautilus-file-management-properties.ui.h:56
 msgid ""
 "Choose what happens when inserting media or connecting devices to the system"
 msgstr "é??æ?©æ??å?¥ä»?è´¨æ??å°?设å¤?è¿?æ?¥å?°ç³»ç»?æ?¶åº?æ?§è¡?ä½?ç§?æ??ä½?"
 
-#: ../src/nautilus-file-management-properties.ui.h:59
+#: ../src/nautilus-file-management-properties.ui.h:58
 msgid "Count _number of items:"
 msgstr "ç»?计项ç?®æ?°é??(_N)ï¼?"
 
-#: ../src/nautilus-file-management-properties.ui.h:60
+#: ../src/nautilus-file-management-properties.ui.h:59
 msgid "D_efault zoom level:"
 msgstr "�认缩�级�(_E)�"
 
-#: ../src/nautilus-file-management-properties.ui.h:61
+#: ../src/nautilus-file-management-properties.ui.h:60
 msgid "Default _zoom level:"
 msgstr "�认缩�级�(_Z)�"
 
-#: ../src/nautilus-file-management-properties.ui.h:62
+#: ../src/nautilus-file-management-properties.ui.h:61
 msgid "Display"
 msgstr "�示"
 
-#: ../src/nautilus-file-management-properties.ui.h:63
+#: ../src/nautilus-file-management-properties.ui.h:62
 msgid "File Management Preferences"
 msgstr "æ??件管ç??é¦?é??项"
 
-#: ../src/nautilus-file-management-properties.ui.h:64
+#: ../src/nautilus-file-management-properties.ui.h:63
 msgid "I_nclude a Delete command that bypasses Trash"
 msgstr "å??å?«ç»?è¿?å??æ?¶ç«?ç??å? é?¤å?½ä»¤(_N)"
 
-#: ../src/nautilus-file-management-properties.ui.h:66
+#: ../src/nautilus-file-management-properties.ui.h:65
 msgid "Less common media formats can be configured here"
 msgstr "è¾?ä¸?常è§?ç??ä»?质类å??å?¯å?¨æ­¤é??ç½®"
 
-#: ../src/nautilus-file-management-properties.ui.h:67
+#: ../src/nautilus-file-management-properties.ui.h:66
 msgid "List Columns"
 msgstr "å??表å??"
 
-#: ../src/nautilus-file-management-properties.ui.h:69
+#: ../src/nautilus-file-management-properties.ui.h:68
 msgid "Local Files Only"
 msgstr "ä»?æ?¬å?°æ??件"
 
-#: ../src/nautilus-file-management-properties.ui.h:70
+#: ../src/nautilus-file-management-properties.ui.h:69
 msgid "Media"
 msgstr "ä»?è´¨"
 
-#: ../src/nautilus-file-management-properties.ui.h:71
+#: ../src/nautilus-file-management-properties.ui.h:70
 msgid "Never"
 msgstr "��"
 
+#: ../src/nautilus-file-management-properties.ui.h:71
+msgid "Open each _folder its own window"
+msgstr "为æ¯?ä¸?个æ??件夹æ??å¼?è?ªå·±ç??çª?å?£(_F)"
+
 #: ../src/nautilus-file-management-properties.ui.h:72
 msgid "Preview"
 msgstr "��"
@@ -5852,104 +6016,104 @@ msgstr "使ç?¨ç´§å??å¸?å±?(_U)"
 msgid "_View executable text files when they are opened"
 msgstr "æ??å¼?æ?¶æ?¥ç??å?¯æ?§è¡?æ??æ?¬æ??件(_V)"
 
-#: ../src/nautilus-history-sidebar.c:327
+#: ../src/nautilus-history-sidebar.c:328
 msgid "History"
 msgstr "å??å?²"
 
-#: ../src/nautilus-history-sidebar.c:333
+#: ../src/nautilus-history-sidebar.c:334
 msgid "Show History"
 msgstr "æ?¾ç¤ºå??å?²"
 
-#: ../src/nautilus-image-properties-page.c:262
+#: ../src/nautilus-image-properties-page.c:267
 msgid "Camera Brand"
 msgstr "ç?¸æ?ºå??ç??"
 
-#: ../src/nautilus-image-properties-page.c:263
+#: ../src/nautilus-image-properties-page.c:268
 msgid "Camera Model"
 msgstr "ç?§ç?¸æ?ºå??å?·"
 
 #. Choose which date to show in order of relevance
-#: ../src/nautilus-image-properties-page.c:266
+#: ../src/nautilus-image-properties-page.c:271
 msgid "Date Taken"
 msgstr "æ??ç?§æ?¥æ??"
 
-#: ../src/nautilus-image-properties-page.c:268
+#: ../src/nautilus-image-properties-page.c:273
 msgid "Date Digitized"
 msgstr "æ?°å­?å??æ?¥æ??"
 
-#: ../src/nautilus-image-properties-page.c:274
+#: ../src/nautilus-image-properties-page.c:279
 msgid "Exposure Time"
 msgstr "æ??å??æ?¶é?´"
 
-#: ../src/nautilus-image-properties-page.c:275
+#: ../src/nautilus-image-properties-page.c:280
 msgid "Aperture Value"
 msgstr "å??å??å?¼"
 
-#: ../src/nautilus-image-properties-page.c:276
+#: ../src/nautilus-image-properties-page.c:281
 msgid "ISO Speed Rating"
 msgstr "ISO é??度ç­?级"
 
-#: ../src/nautilus-image-properties-page.c:277
+#: ../src/nautilus-image-properties-page.c:282
 msgid "Flash Fired"
 msgstr "é?ªå??ç?¯"
 
-#: ../src/nautilus-image-properties-page.c:278
+#: ../src/nautilus-image-properties-page.c:283
 msgid "Metering Mode"
 msgstr "��模�"
 
-#: ../src/nautilus-image-properties-page.c:279
+#: ../src/nautilus-image-properties-page.c:284
 msgid "Exposure Program"
 msgstr "æ??å??ç¨?åº?"
 
-#: ../src/nautilus-image-properties-page.c:280
+#: ../src/nautilus-image-properties-page.c:285
 msgid "Focal Length"
 msgstr "��"
 
-#: ../src/nautilus-image-properties-page.c:281
+#: ../src/nautilus-image-properties-page.c:286
 msgid "Software"
 msgstr "软件"
 
-#: ../src/nautilus-image-properties-page.c:348
+#: ../src/nautilus-image-properties-page.c:353
 msgid "Keywords"
 msgstr "���"
 
-#: ../src/nautilus-image-properties-page.c:349
+#: ../src/nautilus-image-properties-page.c:354
 msgid "Creator"
 msgstr "å??建è??"
 
-#: ../src/nautilus-image-properties-page.c:350
+#: ../src/nautilus-image-properties-page.c:355
 msgid "Copyright"
 msgstr "ç??æ??"
 
-#: ../src/nautilus-image-properties-page.c:351
+#: ../src/nautilus-image-properties-page.c:356
 msgid "Rating"
 msgstr "è¯?å??"
 
-#: ../src/nautilus-image-properties-page.c:377
+#: ../src/nautilus-image-properties-page.c:382
 msgid "Image Type:"
 msgstr "å?¾å??ç±»å??ï¼?"
 
-#: ../src/nautilus-image-properties-page.c:380
+#: ../src/nautilus-image-properties-page.c:385
 #, c-format
 msgid "<b>Width:</b> %d pixel"
 msgid_plural "<b>Width:</b> %d pixels"
 msgstr[0] "<b>宽度ï¼?</b> %d å??ç´ "
 
-#: ../src/nautilus-image-properties-page.c:386
+#: ../src/nautilus-image-properties-page.c:391
 #, c-format
 msgid "<b>Height:</b> %d pixel"
 msgid_plural "<b>Height:</b> %d pixels"
 msgstr[0] "<b>é«?度ï¼?</b> %d å??ç´ "
 
-#: ../src/nautilus-image-properties-page.c:403
+#: ../src/nautilus-image-properties-page.c:408
 msgid "Failed to load image information"
 msgstr "è£?å?¥å?¾å??ä¿¡æ?¯å¤±è´¥"
 
-#: ../src/nautilus-image-properties-page.c:617
+#: ../src/nautilus-image-properties-page.c:622
 msgid "loading..."
 msgstr "正�载�..."
 
-#: ../src/nautilus-image-properties-page.c:669
+#: ../src/nautilus-image-properties-page.c:674
 msgid "Image"
 msgstr "å?¾å??"
 
@@ -5974,11 +6138,11 @@ msgstr "æ?¨ä¸?è?½ä¸?次æ??å®?å¤?个è?ªå®?ä¹?å?¾æ ?ã??"
 msgid "You can only use images as custom icons."
 msgstr "æ?¨å?ªè?½ä½¿ç?¨å?¾å??æ??件ä½?为è?ªå®?ä¹?å?¾æ ?ã??"
 
-#: ../src/nautilus-location-bar.c:56
+#: ../src/nautilus-location-bar.c:57
 msgid "Go To:"
 msgstr "转��"
 
-#: ../src/nautilus-location-bar.c:144
+#: ../src/nautilus-location-bar.c:145
 #, c-format
 msgid "Do you want to view %d location?"
 msgid_plural "Do you want to view %d locations?"
@@ -6056,195 +6220,216 @@ msgstr "nautilusï¼?--check æ? æ³?å??å?¶å®?é??项ä¸?起使ç?¨ã??\n"
 msgid "nautilus: --geometry cannot be used with more than one URI.\n"
 msgstr "nautilusï¼?--geometry æ? æ³?å??å¤?个URI ä¸?起使ç?¨ã??\n"
 
-#: ../src/nautilus-navigation-window-menus.c:124
+#: ../src/nautilus-navigation-window-menus.c:126
 msgid "Are you sure you want to clear the list of locations you have visited?"
 msgstr "æ?¨ç¡®å®?æ?³è¦? Nautilus æ¸?空æ?¨è®¿é?®è¿?ç??ä½?ç½®å??表å??ï¼?"
 
-#: ../src/nautilus-navigation-window-menus.c:318
-#: ../src/nautilus-window-bookmarks.c:99
+#: ../src/nautilus-navigation-window-menus.c:379
+#: ../src/nautilus-window-bookmarks.c:83
 #, c-format
 msgid "The location \"%s\" does not exist."
 msgstr "ä½?ç½®â??%sâ??ä¸?å­?å?¨ã??"
 
-#: ../src/nautilus-navigation-window-menus.c:320
+#: ../src/nautilus-navigation-window-menus.c:381
 msgid "The history location doesn't exist."
 msgstr "å??å?²ä½?ç½®ä¸?å­?å?¨ã??"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:853
+#: ../src/nautilus-navigation-window-menus.c:792
 msgid "_Go"
 msgstr "转�(_G)"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:854
+#: ../src/nautilus-navigation-window-menus.c:793
 msgid "_Bookmarks"
 msgstr "书签(_B)"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:855
+#: ../src/nautilus-navigation-window-menus.c:794
 msgid "_Tabs"
 msgstr "æ ?ç­¾(_T)"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:856
+#: ../src/nautilus-navigation-window-menus.c:795
 msgid "New _Window"
 msgstr "�建��(_W)"
 
-#: ../src/nautilus-navigation-window-menus.c:857
+#: ../src/nautilus-navigation-window-menus.c:796
 msgid "Open another Nautilus window for the displayed location"
 msgstr "为æ?¾ç¤ºç??ä½?ç½®æ??å¼?å?¦å¤?ä¸?个 Nautilus çª?å?£"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:859
+#: ../src/nautilus-navigation-window-menus.c:798
 msgid "New _Tab"
 msgstr "æ?°å»ºæ ?ç­¾(_T)"
 
-#: ../src/nautilus-navigation-window-menus.c:860
+#: ../src/nautilus-navigation-window-menus.c:799
 msgid "Open another tab for the displayed location"
 msgstr "为æ?¾ç¤ºç??ä½?ç½®æ??å¼?å?¦å¤?ä¸?个 Nautilus æ ?ç­¾"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:862
+#: ../src/nautilus-navigation-window-menus.c:801
 msgid "Open Folder W_indow"
 msgstr "æ??å¼?æ??件夹çª?å?£(_I)"
 
-#: ../src/nautilus-navigation-window-menus.c:863
+#: ../src/nautilus-navigation-window-menus.c:802
 msgid "Open a folder window for the displayed location"
 msgstr "为æ?¾ç¤ºç??ä½?ç½®æ??å¼?å?¦å¤?ä¸?个æ??件夹çª?å?£"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:865
+#: ../src/nautilus-navigation-window-menus.c:804
 msgid "Close _All Windows"
 msgstr "������(_A)"
 
-#: ../src/nautilus-navigation-window-menus.c:866
+#: ../src/nautilus-navigation-window-menus.c:805
 msgid "Close all Navigation windows"
 msgstr "å?³é?­æ??å¼?ç??å?¨é?¨å¯¼è?ªçª?å?£"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:868
+#: ../src/nautilus-navigation-window-menus.c:807
 msgid "_Location..."
 msgstr "ä½?ç½®(_L)..."
 
-#: ../src/nautilus-navigation-window-menus.c:869
-#: ../src/nautilus-spatial-window.c:927
+#: ../src/nautilus-navigation-window-menus.c:808
+#: ../src/nautilus-spatial-window.c:943
 msgid "Specify a location to open"
 msgstr "æ??å®?è¦?æ??å¼?ç??ä½?ç½®"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:871
+#: ../src/nautilus-navigation-window-menus.c:810
 msgid "Clea_r History"
 msgstr "æ¸?é?¤å??å?²(_R)"
 
-#: ../src/nautilus-navigation-window-menus.c:872
+#: ../src/nautilus-navigation-window-menus.c:811
 msgid "Clear contents of Go menu and Back/Forward lists"
 msgstr "æ¸?é?¤â??转å?°â??è??å??å??â??å??è¿?â??æ??â??å??é??â??å??表中ç??å??容"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:874
-#: ../src/nautilus-spatial-window.c:935
+#: ../src/nautilus-navigation-window-menus.c:813
+msgid "S_witch to Other Pane"
+msgstr "å??æ?¢å?°å?¶å®?çª?æ ¼(_W)"
+
+#: ../src/nautilus-navigation-window-menus.c:814
+msgid "Move focus to the other pane in a split view window"
+msgstr "移å?¨ç?¦ç?¹å?°å??å?²çª?å?£ç??å?¶å®?çª?æ ¼"
+
+#. name, stock id, label
+#: ../src/nautilus-navigation-window-menus.c:816
+msgid "Sa_me Location as Other Pane"
+msgstr "å??å?¶å®?çª?æ ¼å??æ ·ç??ä½?ç½®(_M)"
+
+#: ../src/nautilus-navigation-window-menus.c:817
+msgid "Go to the same location as in the extra pane"
+msgstr "转å?°å??é¢?å¤?çª?æ ¼å??æ ·ç??ä½?ç½®"
+
+#. name, stock id, label
+#: ../src/nautilus-navigation-window-menus.c:819
+#: ../src/nautilus-spatial-window.c:951
 msgid "_Add Bookmark"
 msgstr "æ·»å? 书签(_A)"
 
-#: ../src/nautilus-navigation-window-menus.c:875
-#: ../src/nautilus-spatial-window.c:936
+#: ../src/nautilus-navigation-window-menus.c:820
+#: ../src/nautilus-spatial-window.c:952
 msgid "Add a bookmark for the current location to this menu"
 msgstr "å?¨è¯¥è??å??中添å? ä¸?个å½?å??ä½?ç½®ç??书签"
 
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:877
-#: ../src/nautilus-spatial-window.c:938
+#: ../src/nautilus-navigation-window-menus.c:822
+#: ../src/nautilus-spatial-window.c:954
 msgid "_Edit Bookmarks..."
 msgstr "��书签(_E)..."
 
-#: ../src/nautilus-navigation-window-menus.c:878
-#: ../src/nautilus-spatial-window.c:939
+#: ../src/nautilus-navigation-window-menus.c:823
+#: ../src/nautilus-spatial-window.c:955
 msgid "Display a window that allows editing the bookmarks in this menu"
 msgstr "æ?¾ç¤ºè?½å¤?ç¼?è¾?该è??å??中ç??书签ç??çª?å?£"
 
-#: ../src/nautilus-navigation-window-menus.c:881
+#: ../src/nautilus-navigation-window-menus.c:825
 msgid "_Previous Tab"
 msgstr "ä¸?ä¸?个æ ?ç­¾(_P)"
 
-#: ../src/nautilus-navigation-window-menus.c:882
+#: ../src/nautilus-navigation-window-menus.c:826
 msgid "Activate previous tab"
 msgstr "æ¿?æ´»ä¸?ä¸?个æ ?ç­¾"
 
-#: ../src/nautilus-navigation-window-menus.c:884
+#: ../src/nautilus-navigation-window-menus.c:828
 msgid "_Next Tab"
 msgstr "ä¸?ä¸?个æ ?ç­¾(_N)"
 
-#: ../src/nautilus-navigation-window-menus.c:885
+#: ../src/nautilus-navigation-window-menus.c:829
 msgid "Activate next tab"
 msgstr "æ¿?æ´»ä¸?ä¸?个æ ?ç­¾"
 
-#: ../src/nautilus-navigation-window-menus.c:887
-#: ../src/nautilus-navigation-window.c:273
+#: ../src/nautilus-navigation-window-menus.c:831
+#: ../src/nautilus-navigation-window-pane.c:377
 msgid "Move Tab _Left"
 msgstr "æ ?签左移(_L)"
 
-#: ../src/nautilus-navigation-window-menus.c:888
+#: ../src/nautilus-navigation-window-menus.c:832
 msgid "Move current tab to left"
 msgstr "å°?å½?å??æ ?ç­¾å??左移å?¨"
 
-#: ../src/nautilus-navigation-window-menus.c:890
-#: ../src/nautilus-navigation-window.c:281
+#: ../src/nautilus-navigation-window-menus.c:834
+#: ../src/nautilus-navigation-window-pane.c:385
 msgid "Move Tab _Right"
 msgstr "æ ?ç­¾å?³ç§»(_R)"
 
-#: ../src/nautilus-navigation-window-menus.c:891
+#: ../src/nautilus-navigation-window-menus.c:835
 msgid "Move current tab to right"
 msgstr "å°?å½?å??æ ?ç­¾å??å?³ç§»å?¨"
 
-#: ../src/nautilus-navigation-window-menus.c:893
-#: ../src/nautilus-navigation-window-menus.c:894
+#: ../src/nautilus-navigation-window-menus.c:837
+msgid "S_how Search"
+msgstr "æ?¾ç¤ºæ??ç´¢(_H)"
+
+#: ../src/nautilus-navigation-window-menus.c:838
 msgid "Show search"
 msgstr "æ?¾ç¤ºæ??ç´¢"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:900
+#: ../src/nautilus-navigation-window-menus.c:844
 msgid "_Main Toolbar"
 msgstr "主工å?·æ ?(_M)"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:901
+#: ../src/nautilus-navigation-window-menus.c:845
 msgid "Change the visibility of this window's main toolbar"
 msgstr "æ?´æ?¹æ­¤çª?å?£ä¸»å·¥å?·æ ?ç??å?¯è§?æ?§"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:905
+#: ../src/nautilus-navigation-window-menus.c:849
 msgid "_Side Pane"
 msgstr "侧边æ ?(_S)"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:906
+#: ../src/nautilus-navigation-window-menus.c:850
 msgid "Change the visibility of this window's side pane"
 msgstr "æ?´æ?¹è¯¥çª?å?£ä¾§è¾¹æ ?ç??å?¯è§?æ?§"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:910
+#: ../src/nautilus-navigation-window-menus.c:854
 msgid "Location _Bar"
 msgstr "ä½?ç½®æ ?(_B)"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:911
+#: ../src/nautilus-navigation-window-menus.c:855
 msgid "Change the visibility of this window's location bar"
 msgstr "æ?´æ?¹è¯¥çª?å?£ä½?ç½®æ ?ç??å?¯è§?æ?§"
 
 #. is_active
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-navigation-window-menus.c:915
+#: ../src/nautilus-navigation-window-menus.c:859
 msgid "St_atusbar"
 msgstr "ç?¶æ??æ ?(_A)"
 
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:916
+#: ../src/nautilus-navigation-window-menus.c:860
 msgid "Change the visibility of this window's statusbar"
 msgstr "æ?´æ?¹è¯¥çª?å?£ç?¶æ??æ ?ç??å?¯è§?æ?§"
 
@@ -6252,59 +6437,75 @@ msgstr "æ?´æ?¹è¯¥çª?å?£ç?¶æ??æ ?ç??å?¯è§?æ?§"
 #. name, stock id
 #. label, accelerator
 #. name, stock id, label
-#: ../src/nautilus-navigation-window-menus.c:920
-#: ../src/nautilus-spatial-window.c:941
+#: ../src/nautilus-navigation-window-menus.c:864
+#: ../src/nautilus-spatial-window.c:957
 msgid "_Search for Files..."
 msgstr "æ??ç´¢æ??件(_S)..."
 
 #. Accelerator is in ShowSearch
 #. tooltip
-#: ../src/nautilus-navigation-window-menus.c:922
+#: ../src/nautilus-navigation-window-menus.c:866
 msgid "Search documents and folders by name"
 msgstr "æ??å??称æ?¥æ??ç´¢æ??æ¡£å??æ??件夹"
 
-#: ../src/nautilus-navigation-window-menus.c:946
+#. is_active
+#. name, stock id
+#. label, accelerator
+#: ../src/nautilus-navigation-window-menus.c:870
+msgid "E_xtra Pane"
+msgstr "é¢?å¤?çª?æ ¼(_X)"
+
+#. tooltip
+#: ../src/nautilus-navigation-window-menus.c:871
+msgid "Open an extra folder view side-by-side"
+msgstr "并æ??æ??å¼?ä¸?个å?¦å¤?ç??æ??件夹è§?å?¾"
+
+#: ../src/nautilus-navigation-window-menus.c:896
 msgid "_Back"
 msgstr "å??é??(_B)"
 
-#: ../src/nautilus-navigation-window-menus.c:948
+#: ../src/nautilus-navigation-window-menus.c:898
 msgid "Go to the previous visited location"
 msgstr "转å?°ä¸?ä¸?个访é?®è¿?ç??ä½?ç½®"
 
-#: ../src/nautilus-navigation-window-menus.c:949
+#: ../src/nautilus-navigation-window-menus.c:899
 msgid "Back history"
 msgstr "å??é??å??å?²"
 
-#: ../src/nautilus-navigation-window-menus.c:963
+#: ../src/nautilus-navigation-window-menus.c:913
 msgid "_Forward"
 msgstr "å??è¿?(_F)"
 
-#: ../src/nautilus-navigation-window-menus.c:965
+#: ../src/nautilus-navigation-window-menus.c:915
 msgid "Go to the next visited location"
 msgstr "转å?°ä¸?ä¸?个访é?®è¿?ç??ä½?ç½®"
 
-#: ../src/nautilus-navigation-window-menus.c:966
+#: ../src/nautilus-navigation-window-menus.c:916
 msgid "Forward history"
 msgstr "å??è¿?å??å?²"
 
-#: ../src/nautilus-navigation-window-menus.c:980
+#: ../src/nautilus-navigation-window-menus.c:931
+msgid "_Zoom"
+msgstr "缩�(_Z)"
+
+#: ../src/nautilus-navigation-window-menus.c:941
+msgid "_View As"
+msgstr "æ?¥ç??为(_V)"
+
+#: ../src/nautilus-navigation-window-menus.c:975
 msgid "_Search"
 msgstr "æ??ç´¢(_S)"
 
-#: ../src/nautilus-navigation-window.c:185
-msgid "Toggle between button and text-based location bar"
-msgstr "å?¨æ??é?®å??å?ºäº?æ??æ?¬ç??ä½?ç½®æ ?ä¹?é?´å??æ?¢"
-
-#: ../src/nautilus-navigation-window.c:292
+#: ../src/nautilus-navigation-window-pane.c:396
 msgid "_Close Tab"
 msgstr "å?³é?­æ ?ç­¾(_C)"
 
-#: ../src/nautilus-navigation-window.c:1277
+#: ../src/nautilus-navigation-window.c:734
 #, c-format
 msgid "%s - File Browser"
 msgstr "%s - æ??件æµ?è§?å?¨"
 
-#: ../src/nautilus-notebook.c:406
+#: ../src/nautilus-notebook.c:379
 msgid "Close tab"
 msgstr "å?³é?­æ ?ç­¾"
 
@@ -6316,80 +6517,80 @@ msgstr "��"
 msgid "Show Notes"
 msgstr "�示��"
 
-#: ../src/nautilus-places-sidebar.c:320
+#: ../src/nautilus-places-sidebar.c:358
 msgid "Open the contents of your desktop in a folder"
 msgstr "å?¨ä¸?个æ??件夹é??æ??å¼?æ?¨æ¡?é?¢ç??å??容"
 
-#: ../src/nautilus-places-sidebar.c:333
+#: ../src/nautilus-places-sidebar.c:371
 msgid "Open the contents of the File System"
 msgstr "æ??å¼?æ??件系ç»?ç?®å½?"
 
-#: ../src/nautilus-places-sidebar.c:342 ../src/network-scheme.desktop.in.h:2
+#: ../src/nautilus-places-sidebar.c:380 ../src/network-scheme.desktop.in.h:2
 msgid "Network"
 msgstr "ç½?ç»?"
 
-#: ../src/nautilus-places-sidebar.c:344
+#: ../src/nautilus-places-sidebar.c:382
 msgid "Browse the contents of the network"
 msgstr "������"
 
-#: ../src/nautilus-places-sidebar.c:392 ../src/nautilus-places-sidebar.c:415
+#: ../src/nautilus-places-sidebar.c:430 ../src/nautilus-places-sidebar.c:453
 #, c-format
 msgid "Mount and open %s"
 msgstr "å? 载并æ??å¼? %s"
 
-#: ../src/nautilus-places-sidebar.c:510
+#: ../src/nautilus-places-sidebar.c:548
 msgid "Open the trash"
 msgstr "æ??å¼?å??æ?¶ç«?"
 
 #. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
-#: ../src/nautilus-places-sidebar.c:1449
+#: ../src/nautilus-places-sidebar.c:1450
 msgid "_Power On"
 msgstr "���(_P)"
 
-#: ../src/nautilus-places-sidebar.c:1453
+#: ../src/nautilus-places-sidebar.c:1454
 msgid "_Connect Drive"
 msgstr "��驱�(_C)"
 
-#: ../src/nautilus-places-sidebar.c:1454
+#: ../src/nautilus-places-sidebar.c:1455
 msgid "_Disconnect Drive"
 msgstr "��驱�(_D)"
 
-#: ../src/nautilus-places-sidebar.c:1457
+#: ../src/nautilus-places-sidebar.c:1458
 msgid "_Start Multi-disk Device"
 msgstr "å?¯å?¨å¤?ç£?ç??设å¤?(_S)"
 
-#: ../src/nautilus-places-sidebar.c:1458
+#: ../src/nautilus-places-sidebar.c:1459
 msgid "_Stop Multi-disk Device"
 msgstr "å??æ­¢å¤?ç£?ç??设å¤?(_S)"
 
-#: ../src/nautilus-places-sidebar.c:1538 ../src/nautilus-places-sidebar.c:2043
+#: ../src/nautilus-places-sidebar.c:1539 ../src/nautilus-places-sidebar.c:2075
 #, c-format
 msgid "Unable to start %s"
 msgstr "æ? æ³?å?¯å?¨ %s"
 
-#: ../src/nautilus-places-sidebar.c:1991
+#: ../src/nautilus-places-sidebar.c:2023
 #, c-format
 msgid "Unable to poll %s for media changes"
 msgstr "æ? æ³?æ?¥è¯¢ %s ç??ä»?è´¨æ?´æ?¹"
 
-#: ../src/nautilus-places-sidebar.c:2094
+#: ../src/nautilus-places-sidebar.c:2131
 #, c-format
 msgid "Unable to stop %s"
 msgstr "æ? æ³?å??æ­¢ %s"
 
-#: ../src/nautilus-places-sidebar.c:2207
+#: ../src/nautilus-places-sidebar.c:2245
 msgid "Remove"
 msgstr "å? é?¤"
 
-#: ../src/nautilus-places-sidebar.c:2216
+#: ../src/nautilus-places-sidebar.c:2254
 msgid "Rename..."
 msgstr "é??å?½å??..."
 
-#: ../src/nautilus-places-sidebar.c:2633
+#: ../src/nautilus-places-sidebar.c:2697
 msgid "Places"
 msgstr "ä½?ç½®"
 
-#: ../src/nautilus-places-sidebar.c:2639
+#: ../src/nautilus-places-sidebar.c:2703
 msgid "Show Places"
 msgstr "�示�置"
 
@@ -6408,153 +6609,153 @@ msgstr "å? é?¤(_R)..."
 msgid "Add new..."
 msgstr "æ·»å? ..."
 
-#: ../src/nautilus-property-browser.c:931
+#: ../src/nautilus-property-browser.c:934
 #, c-format
 msgid "Sorry, but pattern %s could not be deleted."
 msgstr "æ?±æ­?ï¼?æ? æ³?å? é?¤å?¾æ¡? %sã??"
 
-#: ../src/nautilus-property-browser.c:932
+#: ../src/nautilus-property-browser.c:935
 msgid "Check that you have permission to delete the pattern."
 msgstr "请æ£?æ?¥æ?¨æ?¯å?¦æ??æ??é??å? é?¤å?¾æ¡?ã??"
 
-#: ../src/nautilus-property-browser.c:947
+#: ../src/nautilus-property-browser.c:950
 #, c-format
 msgid "Sorry, but emblem %s could not be deleted."
 msgstr "æ?±æ­?ï¼?å¾½æ ? %s æ? æ³?被å? é?¤ã??"
 
-#: ../src/nautilus-property-browser.c:948
+#: ../src/nautilus-property-browser.c:951
 msgid "Check that you have permission to delete the emblem."
 msgstr "请æ£?æ?¥æ?¨æ?¯å?¦æ??å? é?¤å¾½æ ?ç??æ??é??ã??"
 
-#: ../src/nautilus-property-browser.c:1015
+#: ../src/nautilus-property-browser.c:1018
 msgid "Select an Image File for the New Emblem"
 msgstr "é??æ?©æ?°å¾½æ ?ç??å?¾å??æ??件"
 
-#: ../src/nautilus-property-browser.c:1055
+#: ../src/nautilus-property-browser.c:1058
 msgid "Create a New Emblem"
 msgstr "å??建æ?°å¾½æ ?"
 
 #. make the keyword label and field
-#: ../src/nautilus-property-browser.c:1077
+#: ../src/nautilus-property-browser.c:1080
 msgid "_Keyword:"
 msgstr "���(_K)�"
 
 #. set up a file chooser to pick the image file
-#: ../src/nautilus-property-browser.c:1096
+#: ../src/nautilus-property-browser.c:1099
 msgid "_Image:"
 msgstr "å?¾å??(_I)ï¼?"
 
-#: ../src/nautilus-property-browser.c:1127
+#: ../src/nautilus-property-browser.c:1130
 msgid "Create a New Color:"
 msgstr "å??建æ?°é¢?è?²ï¼?"
 
 #. make the name label and field
-#: ../src/nautilus-property-browser.c:1141
+#: ../src/nautilus-property-browser.c:1144
 msgid "Color _name:"
 msgstr "é¢?è?²å??(_N)ï¼?"
 
-#: ../src/nautilus-property-browser.c:1157
+#: ../src/nautilus-property-browser.c:1160
 msgid "Color _value:"
 msgstr "���(_V)�"
 
-#: ../src/nautilus-property-browser.c:1191
+#: ../src/nautilus-property-browser.c:1194
 msgid "Sorry, but you cannot replace the reset image."
 msgstr "æ?±æ­?ï¼?æ?¨ä¸?è?½æ?¿æ?¢é??ç½®å?¾å??ã??"
 
-#: ../src/nautilus-property-browser.c:1192
+#: ../src/nautilus-property-browser.c:1195
 msgid "Reset is a special image that cannot be deleted."
 msgstr "é??ç½®æ?¯ç?¹æ®?å?¾å??ï¼?æ? æ³?å? é?¤ã??"
 
-#: ../src/nautilus-property-browser.c:1220
+#: ../src/nautilus-property-browser.c:1223
 #, c-format
 msgid "Sorry, but the pattern %s could not be installed."
 msgstr "æ?±æ­?ï¼?æ? æ³?å®?è£?å?¾æ¡? %sã??"
 
-#: ../src/nautilus-property-browser.c:1248
+#: ../src/nautilus-property-browser.c:1251
 msgid "Select an Image File to Add as a Pattern"
 msgstr "é??æ?©ä¸?个è¦?æ·»å? 为å?¾æ¡?ç??å?¾å??æ??件"
 
-#: ../src/nautilus-property-browser.c:1320
-#: ../src/nautilus-property-browser.c:1348
+#: ../src/nautilus-property-browser.c:1323
+#: ../src/nautilus-property-browser.c:1351
 msgid "The color cannot be installed."
 msgstr "æ? æ³?å®?è£?é¢?è?²ã??"
 
-#: ../src/nautilus-property-browser.c:1321
+#: ../src/nautilus-property-browser.c:1324
 msgid "Sorry, but you must specify an unused color name for the new color."
 msgstr "æ?±æ­?ï¼?æ?¨å¿?é¡»æ??å®?ä¸?个æ?ªç?¨ç??å??å­?ç?¨äº?æ?°å»ºç??é¢?è?²ã??"
 
-#: ../src/nautilus-property-browser.c:1349
+#: ../src/nautilus-property-browser.c:1352
 msgid "Sorry, but you must specify a non-blank name for the new color."
 msgstr "æ?±æ­?ï¼?æ?¨å¿?é¡»æ??å®?ä¸?个é??空ç??å??å­?ç?¨äº?æ?°å»ºç??é¢?è?²ã??"
 
-#: ../src/nautilus-property-browser.c:1401
+#: ../src/nautilus-property-browser.c:1407
 msgid "Select a Color to Add"
 msgstr "é??æ?©è¦?æ·»å? ç??é¢?è?²"
 
-#: ../src/nautilus-property-browser.c:1438
-#: ../src/nautilus-property-browser.c:1455
+#: ../src/nautilus-property-browser.c:1448
+#: ../src/nautilus-property-browser.c:1465
 #, c-format
 msgid "Sorry, but \"%s\" is not a usable image file."
 msgstr "æ?±æ­?ï¼?â??%sâ??ä¸?æ?¯ä¸?个å?¯ç?¨ç??å?¾å??æ??件ã??"
 
-#: ../src/nautilus-property-browser.c:1439
-#: ../src/nautilus-property-browser.c:1456
+#: ../src/nautilus-property-browser.c:1449
+#: ../src/nautilus-property-browser.c:1466
 msgid "The file is not an image."
 msgstr "æ??件ä¸?æ?¯å?¾å??ã??"
 
-#: ../src/nautilus-property-browser.c:2149
+#: ../src/nautilus-property-browser.c:2159
 msgid "Select a Category:"
 msgstr "é??æ?©ç±»å?«ï¼?"
 
-#: ../src/nautilus-property-browser.c:2158
+#: ../src/nautilus-property-browser.c:2168
 msgid "C_ancel Remove"
 msgstr "å??æ¶?å? é?¤(_A)"
 
-#: ../src/nautilus-property-browser.c:2164
+#: ../src/nautilus-property-browser.c:2174
 msgid "_Add a New Pattern..."
 msgstr "æ·»å? æ?°å?¾æ¡?(_A)..."
 
-#: ../src/nautilus-property-browser.c:2167
+#: ../src/nautilus-property-browser.c:2177
 msgid "_Add a New Color..."
 msgstr "æ·»å? æ?°é¢?è?²(_A)..."
 
-#: ../src/nautilus-property-browser.c:2170
+#: ../src/nautilus-property-browser.c:2180
 msgid "_Add a New Emblem..."
 msgstr "æ·»å? æ?°å¾½æ ?(_A)..."
 
-#: ../src/nautilus-property-browser.c:2193
+#: ../src/nautilus-property-browser.c:2203
 msgid "Click on a pattern to remove it"
 msgstr "å??å?»å?¾æ¡?以å? é?¤"
 
-#: ../src/nautilus-property-browser.c:2196
+#: ../src/nautilus-property-browser.c:2206
 msgid "Click on a color to remove it"
 msgstr "å??å?»é¢?è?²ä»¥å? é?¤"
 
-#: ../src/nautilus-property-browser.c:2199
+#: ../src/nautilus-property-browser.c:2209
 msgid "Click on an emblem to remove it"
 msgstr "å??å?»å¾½æ ?以å? é?¤"
 
-#: ../src/nautilus-property-browser.c:2208
+#: ../src/nautilus-property-browser.c:2218
 msgid "Patterns:"
 msgstr "���"
 
-#: ../src/nautilus-property-browser.c:2211
+#: ../src/nautilus-property-browser.c:2221
 msgid "Colors:"
 msgstr "���"
 
-#: ../src/nautilus-property-browser.c:2214
+#: ../src/nautilus-property-browser.c:2224
 msgid "Emblems:"
 msgstr "å¾½æ ?ï¼?"
 
-#: ../src/nautilus-property-browser.c:2234
+#: ../src/nautilus-property-browser.c:2244
 msgid "_Remove a Pattern..."
 msgstr "å? é?¤å?¾æ¡?(_R)..."
 
-#: ../src/nautilus-property-browser.c:2237
+#: ../src/nautilus-property-browser.c:2247
 msgid "_Remove a Color..."
 msgstr "å? é?¤é¢?è?²(_R)..."
 
-#: ../src/nautilus-property-browser.c:2240
+#: ../src/nautilus-property-browser.c:2250
 msgid "_Remove an Emblem..."
 msgstr "å? é?¤å¾½æ ?(_R)..."
 
@@ -6650,117 +6851,117 @@ msgstr "æ??ç´¢(_S)ï¼?"
 msgid "Search results"
 msgstr "æ??ç´¢ç»?æ??"
 
-#: ../src/nautilus-search-bar.c:146
+#: ../src/nautilus-search-bar.c:169
 msgid "Search:"
 msgstr "æ??ç´¢ï¼?"
 
-#: ../src/nautilus-side-pane.c:411
+#: ../src/nautilus-side-pane.c:429
 msgid "Close the side pane"
 msgstr "å?³é?­ä¾§è¾¹æ ?"
 
 #. Set initial window title
-#: ../src/nautilus-spatial-window.c:395 ../src/nautilus-window-menus.c:531
-#: ../src/nautilus-window.c:153
+#: ../src/nautilus-spatial-window.c:396 ../src/nautilus-window-menus.c:531
+#: ../src/nautilus-window.c:168
 msgid "Nautilus"
 msgstr "Nautilus"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:925
+#: ../src/nautilus-spatial-window.c:941
 msgid "_Places"
 msgstr "ä½?ç½®(_P)"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:926
+#: ../src/nautilus-spatial-window.c:942
 msgid "Open _Location..."
 msgstr "æ??å¼?ä½?ç½®(_L)..."
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:929
+#: ../src/nautilus-spatial-window.c:945
 msgid "Close P_arent Folders"
 msgstr "å?³é?­ç?¶æ??件夹(_A)"
 
-#: ../src/nautilus-spatial-window.c:930
+#: ../src/nautilus-spatial-window.c:946
 msgid "Close this folder's parents"
 msgstr "å?³é?­æ­¤æ??件夹ç??ç?¶æ??件夹"
 
 #. name, stock id, label
-#: ../src/nautilus-spatial-window.c:932
+#: ../src/nautilus-spatial-window.c:948
 msgid "Clos_e All Folders"
 msgstr "å?³é?­å?¨é?¨æ??件夹(_E)"
 
-#: ../src/nautilus-spatial-window.c:933
+#: ../src/nautilus-spatial-window.c:949
 msgid "Close all folder windows"
 msgstr "å?³é?­å?¨é?¨æ??件夹çª?å?£"
 
-#: ../src/nautilus-spatial-window.c:942
+#: ../src/nautilus-spatial-window.c:958
 msgid "Locate documents and folders on this computer by name or content"
 msgstr "æ??å??称æ??å??容å®?ä½?此计ç®?æ?ºä¸?ç??æ??æ¡£å??æ??件夹"
 
-#: ../src/nautilus-throbber.c:82
-msgid "throbber"
-msgstr "throbber"
+#: ../src/nautilus-trash-bar.c:204
+msgid "Restore Selected Items"
+msgstr "æ?¢å¤?é??中ç??项ç?®"
 
-#: ../src/nautilus-throbber.c:83
-msgid "provides visual status"
-msgstr "æ??ä¾?è§?è§?ç?¶æ??"
+#: ../src/nautilus-trash-bar.c:210
+msgid "Restore selected items to their original position"
+msgstr "å°?é??中项ç?®æ?¢å¤?å?°å?¶å??å§?ä½?ç½®"
 
-#: ../src/nautilus-window-bookmarks.c:97
+#: ../src/nautilus-window-bookmarks.c:81
 msgid ""
 "Do you want to remove any bookmarks with the non-existing location from your "
 "list?"
 msgstr "æ?¨è¦?ä»?å??表中å? é?¤è¿?个ä½?ç½®ç??å?¨é?¨ä¹¦ç­¾å??ï¼?"
 
-#: ../src/nautilus-window-bookmarks.c:102
+#: ../src/nautilus-window-bookmarks.c:86
 msgid "Bookmark for Nonexistent Location"
 msgstr "ä¸?å­?å?¨ä½?ç½®ç??书签"
 
-#: ../src/nautilus-window-manage-views.c:731
+#: ../src/nautilus-window-manage-views.c:743
 msgid "You can choose another view or go to a different location."
 msgstr "æ?¨å?¯ä»¥é??æ?©å?¶å®?è§?å?¾æ??转å?°å?¦ä¸?ä½?ç½®ã??"
 
-#: ../src/nautilus-window-manage-views.c:750
+#: ../src/nautilus-window-manage-views.c:762
 msgid "The location cannot be displayed with this viewer."
 msgstr "ä½?ç½®æ? æ³?ç?¨æ­¤æ?¥ç??å?¨æ?¾ç¤ºã??"
 
-#: ../src/nautilus-window-manage-views.c:1224
+#: ../src/nautilus-window-manage-views.c:1242
 msgid "Content View"
 msgstr "å??容è§?å?¾"
 
-#: ../src/nautilus-window-manage-views.c:1225
+#: ../src/nautilus-window-manage-views.c:1243
 msgid "View of the current folder"
 msgstr "å½?å??æ??件夹ç??è§?å?¾"
 
-#: ../src/nautilus-window-manage-views.c:1894
+#: ../src/nautilus-window-manage-views.c:1876
 msgid "Nautilus has no installed viewer capable of displaying the folder."
 msgstr "Nautilus 没æ??å®?è£?è?½å¤?æ?¾ç¤ºæ??件夹ç??æ?¥ç??å?¨ã??"
 
-#: ../src/nautilus-window-manage-views.c:1900
+#: ../src/nautilus-window-manage-views.c:1882
 msgid "The location is not a folder."
 msgstr "ä½?ç½®ä¸?æ?¯æ??件夹ã??"
 
-#: ../src/nautilus-window-manage-views.c:1906
+#: ../src/nautilus-window-manage-views.c:1888
 #, c-format
 msgid "Could not find \"%s\"."
 msgstr "æ?¾ä¸?å?°â??%sâ??ã??"
 
-#: ../src/nautilus-window-manage-views.c:1909
+#: ../src/nautilus-window-manage-views.c:1891
 msgid "Please check the spelling and try again."
 msgstr "请æ£?æ?¥æ?¼å??å??é??è¯?ã??"
 
-#: ../src/nautilus-window-manage-views.c:1917
+#: ../src/nautilus-window-manage-views.c:1899
 #, c-format
 msgid "Nautilus cannot handle \"%s\" locations."
 msgstr "Nautilus æ? æ³?å¤?ç??â??%sâ??ä½?ç½®ã??"
 
-#: ../src/nautilus-window-manage-views.c:1920
+#: ../src/nautilus-window-manage-views.c:1902
 msgid "Nautilus cannot handle this kind of location."
 msgstr "Nautilus æ? æ³?å¤?ç??è¿?ç§?ç±»å??ç??ä½?ç½®ã??"
 
-#: ../src/nautilus-window-manage-views.c:1927
+#: ../src/nautilus-window-manage-views.c:1909
 msgid "Unable to mount the location."
 msgstr "æ? æ³?æ??è½½ä½?ç½®ã??"
 
-#: ../src/nautilus-window-manage-views.c:1933
+#: ../src/nautilus-window-manage-views.c:1915
 msgid "Access was denied."
 msgstr "ç¦?止访é?®ã??"
 
@@ -6769,17 +6970,17 @@ msgstr "ç¦?止访é?®ã??"
 #. * But this case is also hit for legitimate web addresses when
 #. * the proxy is set up wrong.
 #.
-#: ../src/nautilus-window-manage-views.c:1942
+#: ../src/nautilus-window-manage-views.c:1924
 #, c-format
 msgid "Could not display \"%s\", because the host could not be found."
 msgstr "æ? æ³?æ?¾ç¤ºâ??%sâ??ï¼?å??å? æ?¯æ?¾ä¸?å?°ä¸»æ?ºã??"
 
-#: ../src/nautilus-window-manage-views.c:1944
+#: ../src/nautilus-window-manage-views.c:1926
 msgid ""
 "Check that the spelling is correct and that your proxy settings are correct."
 msgstr "请æ£?æ?¥æ?¼å??以å??代ç??æ??å?¡å?¨è®¾ç½®ç??正确æ?§ã??"
 
-#: ../src/nautilus-window-manage-views.c:1958
+#: ../src/nautilus-window-manage-views.c:1941
 #, c-format
 msgid ""
 "Error: %s\n"
@@ -6961,7 +7162,7 @@ msgstr "�大(_I)"
 
 #. tooltip
 #: ../src/nautilus-window-menus.c:827 ../src/nautilus-zoom-control.c:91
-#: ../src/nautilus-zoom-control.c:345
+#: ../src/nautilus-zoom-control.c:347
 msgid "Increase the view size"
 msgstr "å¢?å? è§?å?¾å¤§å°?"
 
@@ -6973,7 +7174,7 @@ msgstr "缩�(_O)"
 
 #. tooltip
 #: ../src/nautilus-window-menus.c:839 ../src/nautilus-zoom-control.c:92
-#: ../src/nautilus-zoom-control.c:294
+#: ../src/nautilus-zoom-control.c:296
 msgid "Decrease the view size"
 msgstr "å??å°?è§?å?¾å¤§å°?"
 
@@ -6985,7 +7186,7 @@ msgstr "æ?®é??大å°?(_Z)"
 
 #. tooltip
 #: ../src/nautilus-window-menus.c:847 ../src/nautilus-zoom-control.c:93
-#: ../src/nautilus-zoom-control.c:307
+#: ../src/nautilus-zoom-control.c:309
 msgid "Use the normal view size"
 msgstr "使ç?¨æ?®é??大å°?ç??è§?å?¾"
 
@@ -7002,12 +7203,6 @@ msgstr "è¿?æ?¥å?°è¿?ç¨?计ç®?æ?ºæ??å?±äº«ç£?ç??"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/nautilus-window-menus.c:854
-msgid "_Home Folder"
-msgstr "主æ??件夹(_H)"
-
-#. name, stock id
-#. label, accelerator
 #: ../src/nautilus-window-menus.c:858
 msgid "_Computer"
 msgstr "计��(_C)"
@@ -7122,35 +7317,10 @@ msgstr "缩�"
 msgid "Zoom to Default"
 msgstr "缩���认�"
 
-#: ../src/nautilus-zoom-control.c:888
+#: ../src/nautilus-zoom-control.c:890
 msgid "Zoom"
 msgstr "缩�"
 
-#: ../src/nautilus-zoom-control.c:894
+#: ../src/nautilus-zoom-control.c:896
 msgid "Set the zoom level of the current view"
 msgstr "设置å½?å??è§?å?¾ç??缩æ?¾çº§å?«"
-
-#~ msgid "%'d file left to delete â?? %T left"
-#~ msgid_plural "%'d files left to delete â?? %T left"
-#~ msgstr[0] "è¿?æ?? %'d 个æ??件è¦?å? é?¤ - å?©ä½? %T"
-
-#~ msgid "Open with \"%s\""
-#~ msgstr "ç?¨â??%sâ??æ??å¼?"
-
-#~ msgid "_Mount Volume"
-#~ msgstr "æ??è½½å?·(_M)"
-
-#~ msgid "_Unmount Volume"
-#~ msgstr "å?¸è½½æ??件å?·(_U)"
-
-#~ msgid "_Eject Volume"
-#~ msgstr "弹��(_E)"
-
-#~ msgid "_Open with \"%s\""
-#~ msgstr "ç?¨â??%sâ??æ??å¼?(_O)"
-
-#~ msgid "MIME type description (MIME type)|%s (%s)"
-#~ msgstr "MIME ç±»å??æ??è¿°(MIME ç±»å??)|%s (%s)"
-
-#~ msgid "_Rescan"
-#~ msgstr "é??æ?°æ?«æ??(_R)"