[nautilus/gnome-2-32] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 60b61f4fb983091e42f0bc2e01b09713ee51d1fa
Author: Aron Xu <aronxu gnome org>
Date:   Thu Sep 16 14:41:25 2010 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  170 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 95 insertions(+), 75 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index addaf9b..f782587 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,8 +13,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: 2010-08-18 11:37+0000\n"
-"PO-Revision-Date: 2010-08-23 18:54+0800\n"
+"POT-Creation-Date: 2010-09-16 13:14+0000\n"
+"PO-Revision-Date: 2010-09-16 22:35+0800\n"
 "Last-Translator: Xhacker Liu <liu dongyuan gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroup com>\n"
 "MIME-Version: 1.0\n"
@@ -1515,7 +1515,7 @@ msgstr "使��认�(_F)"
 
 #: ../libnautilus-private/nautilus-column-utilities.c:43
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:273
-#: ../src/file-manager/fm-list-view.c:1577
+#: ../src/file-manager/fm-list-view.c:1603
 msgid "Name"
 msgstr "å??称"
 
@@ -1630,7 +1630,7 @@ 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-file-conflict-dialog.c:522
 #: ../libnautilus-private/nautilus-mime-application-chooser.c:428
 #: ../src/nautilus-property-browser.c:1873
 msgid "Reset"
@@ -1726,114 +1726,123 @@ msgstr "æ?±æ­?ï¼?æ? æ³?ä¿?å­?è?ªå®?ä¹?å¾½æ ?ã??"
 msgid "Sorry, unable to save custom emblem name."
 msgstr "æ?±æ­?ï¼?æ? æ³?ä¿?å­?è?ªå®?ä¹?å¾½æ ?å??称ã??"
 
-#: ../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
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:144
 #, c-format
 msgid "Merge folder \"%s\"?"
 msgstr "å??并æ??件夹â??%sâ??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:166
-#, c-format
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:148
 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"
-"å??并å°?å?¨æ?¿æ?¢æ??件夹中任ä½?ä¸?å¤?å?¶ç??æ??件å??ç??å?²çª?ç??æ??件å??è¦?æ±?确认ã??"
+msgstr "å??并å°?ä¼?å?¨æ?¿æ?¢å?²çª?æ??件æ?¶è¯·æ±?确认ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:153
+#, c-format
+msgid "An older folder with the same name already exists in \"%s\"."
+msgstr "å?¨â??%sâ??中å­?å?¨ç?¸å??å??称ç??æ?§æ??件夹ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:157
+#, c-format
+msgid "A newer folder with the same name already exists in \"%s\"."
+msgstr "å?¨â??%sâ??中å­?å?¨ç?¸å??å??称ç??æ?°æ??件夹ã??"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:174
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:161
+#, c-format
+msgid "Another folder with the same name already exists in \"%s\"."
+msgstr "å?¨â??%sâ??中å­?å?¨ç?¸å??å??称ç??æ??件夹ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:166
+msgid "Replacing it will remove all files in the folder."
+msgstr "æ?¿æ?¢å°?移é?¤æ??件夹中ç??æ??æ??æ??件ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:168
 #, c-format
 msgid "Replace folder \"%s\"?"
 msgstr "æ?¿æ?¢æ??件夹â??%sâ??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:176
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:170
 #, 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"
-"æ?¿æ?¢å°?移é?¤æ??件夹中ç??æ??æ??æ??件ã??"
+msgid "A folder with the same name already exists in \"%s\"."
+msgstr "å?¨â??%sâ??中å­?å?¨ç?¸å??å??称ç??æ??件夹ã??"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:182
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:175
 #, c-format
 msgid "Replace file \"%s\"?"
 msgstr "æ?¿æ?¢æ??件â??%sâ??ï¼?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:188
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:177
+msgid "Replacing it will overwrite its content."
+msgstr "æ?¿æ?¢å°?è¦?ç??å®?ç??å??容ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:181
 #, 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"
-"æ?¿æ?¢å°?è¦?ç??å®?ç??å??容ã??"
+msgid "An older file with the same name already exists in \"%s\"."
+msgstr "å?¨â??%sâ??中å­?å?¨ç?¸å??å??称ç??æ??件ã??"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:252
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:185
+#, c-format
+msgid "A newer file with the same name already exists in \"%s\"."
+msgstr "å?¨â??%sâ??中å­?å?¨ç?¸å??å??称ç??æ??件ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:189
+#, c-format
+msgid "Another file with the same name already exists in \"%s\"."
+msgstr "å?¨â??%sâ??中å­?å?¨ç?¸å??å??称ç??æ??件ã??"
+
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:255
 msgid "Original file"
 msgstr "å??å§?æ??件"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:253
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:284
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:256
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:287
 #: ../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
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:259
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:290
 #: ../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
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:262
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:293
 msgid "Last modified:"
 msgstr "æ??å??ä¿®æ?¹ï¼?"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:283
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:286
 msgid "Replace with"
 msgstr "��为"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:312
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:315
 msgid "Merge"
 msgstr "å??并"
 
 #. Setup the expander for the rename action
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:505
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:508
 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
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:534
 msgid "Apply this action to all files"
 msgstr "å°?è¿?个å?¨ä½?åº?ç?¨å?°æ??æ??æ??件"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:542
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:545
 #: ../libnautilus-private/nautilus-file-operations.c:187
 msgid "_Skip"
 msgstr "跳�(_S)"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:547
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:550
 msgid "Re_name"
 msgstr "é??å?½å??(_N)"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:553
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:556
 msgid "Replace"
 msgstr "æ?¿æ?¢"
 
-#: ../libnautilus-private/nautilus-file-conflict-dialog.c:626
+#: ../libnautilus-private/nautilus-file-conflict-dialog.c:629
 msgid "File conflict"
 msgstr "æ??件å?²çª?"
 
@@ -2969,8 +2978,8 @@ 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:1631
-#: ../src/file-manager/fm-list-view.c:3154
+#: ../src/file-manager/fm-list-view.c:1658
+#: ../src/file-manager/fm-list-view.c:3147
 #: ../src/nautilus-file-management-properties.ui.h:67
 msgid "List View"
 msgstr "å??表è§?å?¾"
@@ -5102,44 +5111,44 @@ msgid "(Empty)"
 msgstr "(空)"
 
 #: ../src/file-manager/fm-list-model.c:399
-#: ../src/file-manager/fm-tree-model.c:1287 ../src/nautilus-window-slot.c:196
+#: ../src/file-manager/fm-tree-model.c:1287 ../src/nautilus-window-slot.c:201
 msgid "Loading..."
 msgstr "正�载�..."
 
-#: ../src/file-manager/fm-list-view.c:2290
+#: ../src/file-manager/fm-list-view.c:2317
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s å?¯è§?å??"
 
-#: ../src/file-manager/fm-list-view.c:2309
+#: ../src/file-manager/fm-list-view.c:2336
 msgid "Choose the order of information to appear in this folder:"
 msgstr "为此æ??件夹中è¦?æ?¾ç¤ºç??ä¿¡æ?¯é??æ?©é¡ºåº?ï¼?"
 
 #. name, stock id
 #. label, accelerator
-#: ../src/file-manager/fm-list-view.c:2363
+#: ../src/file-manager/fm-list-view.c:2390
 msgid "Visible _Columns..."
 msgstr "å?¯è§?å??(_C)..."
 
 #. tooltip
-#: ../src/file-manager/fm-list-view.c:2364
+#: ../src/file-manager/fm-list-view.c:2391
 msgid "Select the columns visible in this folder"
 msgstr "é??æ?©æ­¤æ??件夹中ç??å?¯è§?å??"
 
 #. translators: this is used in the view menu
-#: ../src/file-manager/fm-list-view.c:3156
+#: ../src/file-manager/fm-list-view.c:3149
 msgid "_List"
 msgstr "å??表(_L)"
 
-#: ../src/file-manager/fm-list-view.c:3157
+#: ../src/file-manager/fm-list-view.c:3150
 msgid "The list view encountered an error."
 msgstr "å??表è§?å?¾é??å?°äº?é??误ã??"
 
-#: ../src/file-manager/fm-list-view.c:3158
+#: ../src/file-manager/fm-list-view.c:3151
 msgid "The list view encountered an error while starting up."
 msgstr "å??表è§?å?¾å?¨å?¯å?¨æ?¶é??å?°é??误ã??"
 
-#: ../src/file-manager/fm-list-view.c:3159
+#: ../src/file-manager/fm-list-view.c:3152
 msgid "Display this location with the list view."
 msgstr "ç?¨å??表è§?å?¾æ?¾ç¤ºè¯¥ä½?ç½®ã??"
 
@@ -5476,24 +5485,24 @@ msgstr "æ ?"
 msgid "Show Tree"
 msgstr "æ?¾ç¤ºæ ?"
 
-#: ../src/nautilus-application.c:328
+#: ../src/nautilus-application.c:406
 #, c-format
 msgid "Nautilus could not create the required folder \"%s\"."
 msgstr "Nautilus æ? æ³?å??建æ??é??ç??æ??件夹â??%sâ??ã??"
 
-#: ../src/nautilus-application.c:330
+#: ../src/nautilus-application.c:408
 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:333
+#: ../src/nautilus-application.c:411
 #, c-format
 msgid "Nautilus could not create the following required folders: %s."
 msgstr "Nautilus æ? æ³?å??建ä¸?å??æ??é??ç??æ??件夹ï¼?%sã??"
 
-#: ../src/nautilus-application.c:335
+#: ../src/nautilus-application.c:413
 msgid ""
 "Before running Nautilus, please create these folders, or set permissions "
 "such that Nautilus can create them."
@@ -7341,6 +7350,23 @@ msgstr "缩�"
 msgid "Set the zoom level of the current view"
 msgstr "设置å½?å??è§?å?¾ç??缩æ?¾çº§å?«"
 
+#~ msgid "An older"
+#~ msgstr "è¾?è??ç??"
+
+#~ msgid "A newer"
+#~ msgstr "è¾?æ?°ç??"
+
+#~ msgid "Another"
+#~ msgstr "��个"
+
+#~ 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"
+#~ "å??并å°?å?¨æ?¿æ?¢æ??件夹中任ä½?ä¸?å¤?å?¶ç??æ??件å??ç??å?²çª?ç??æ??件å??è¦?æ±?确认ã??"
+
 #~ 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."
@@ -7359,12 +7385,6 @@ msgstr "设置å½?å??è§?å?¾ç??缩æ?¾çº§å?«"
 #~ msgid "A file named \"%B\" already exists.  Do you want to replace it?"
 #~ msgstr "æ??件â??%Bâ??å·²ç»?å­?å?¨ã??æ?¨è¦?æ?¿æ?¢å®?å??ï¼?"
 
-#~ 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â??中ã??å??并å°?ä¼?å?¨æ?¿æ?¢å?²çª?æ??件æ?¶è¯·æ±?确认ã??"
-
 #~ msgid "Could not use system package installer"
 #~ msgstr "æ? æ³?使ç?¨ç³»ç»?å??å®?è£?å?¨"