[nautilus/gnome-2-32] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [nautilus/gnome-2-32] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Sun, 19 Sep 2010 09:05:41 +0000 (UTC)
commit 0ab0c20516ecc6971cf33e6026358e3925490b01
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sun Sep 19 17:05:31 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  174 ++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po |  173 ++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 192 insertions(+), 155 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index ec79374..e1d2c11 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus 2.31.90\n"
+"Project-Id-Version: nautilus 2.31.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-21 21:03+0800\n"
-"PO-Revision-Date: 2010-08-21 21:03+0800\n"
+"POT-Creation-Date: 2010-09-19 17:03+0800\n"
+"PO-Revision-Date: 2010-09-19 17:04+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -1434,7 +1434,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 "å??ç¨±"
 
@@ -1549,7 +1549,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"
@@ -1645,114 +1645,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 ""
-"å??æ¨£å??ç¨±ç?? %s è³?æ??å¤¾å·²ç¶?å?å?¨æ?¼ã??%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 ""
-"å??æ¨£å??ç¨±ç?? %s æª?æ¡?å·²ç¶?å?å?¨ã??%sã??ä¸ã??\n"
-"å??ä»£å®?å°?æ??è¦?è??å?¶å?§å®¹ã??"
+msgid "An older file with the same name already exists in \"%s\"."
+msgstr "ç?¸å??å??ç¨±ç??è¼?è??æª?æ¡?å·²ç¶?å?å?¨æ?¼ã??%sã??ä¸ã??"
+
+#: ../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:252
+#: ../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 "æª?æ¡?ç?¼ç??è¡?çª?"
 
@@ -2911,8 +2920,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 "æ¸?å?®æª¢è¦?"
@@ -5066,44 +5075,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 "ä»¥æ¸?å?®é¡¯ç¤ºæ¨¡å¼?ä¾?é¡¯ç¤ºæ?¬ä½?ç½®ã??"
 
@@ -5442,23 +5451,23 @@ 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."
@@ -7310,6 +7319,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 ""
+#~ "å??æ¨£å??ç¨±ç?? %s è³?æ??å¤¾å·²ç¶?å?å?¨æ?¼ã??%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."
@@ -7345,14 +7371,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 "ç?¡æ³?ä½¿ç?¨ç³»çµ±å¥?ä»¶å®?è£?ç¨?å¼?"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e94d13c..119410d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nautilus 2.31.90\n"
+"Project-Id-Version: nautilus 2.31.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-21 21:03+0800\n"
-"PO-Revision-Date: 2010-08-20 19:23+0800\n"
+"POT-Creation-Date: 2010-09-19 17:03+0800\n"
+"PO-Revision-Date: 2010-09-19 10:58+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese(Taiwan) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -1533,7 +1533,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 "å??ç¨±"
 
@@ -1648,7 +1648,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"
@@ -1747,114 +1747,124 @@ 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 ""
-"å??æ¨£å??ç¨±ç?? %s è³?æ??å¤¾å·²ç¶?å?å?¨æ?¼ã??%sã??ä¸ã??\n"
-"å??ä½µå??è?½æ??å?¨æ?¿æ??è©²è³?æ??å¤¾ä¸å?§ä»»ä½?è??è¢«è¤?è£½æª?æ¡?ç?¼ç??è¡?çª?ç??æª?æ¡?å??å??è¦?æ±?ç¢ºèª?ã??"
+"å??ä½µå??è?½æ??å?¨æ?¿æ??è©²è³?æ??å¤¾ä¸å?§ä»»ä½?è??è¢«ç§»å??æª?æ¡?ç?¼ç??è¡?çª?ç??æª?æ¡?å??å??è¦?æ±?ç¢ºèª?ã??"
+
+#: ../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: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:174
+#: ../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 ""
-"å??æ¨£å??ç¨±ç?? %s æª?æ¡?å·²ç¶?å?å?¨ã??%sã??ä¸ã??\n"
-"å??ä»£å®?å°?æ??è¦?è??å?¶å?§å®¹ã??"
+msgid "An older file with the same name already exists in \"%s\"."
+msgstr "ç?¸å??å??ç¨±ç??è¼?è??æª?æ¡?å·²ç¶?å?å?¨æ?¼ã??%sã??ä¸ã??"
+
+#: ../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:252
+#: ../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 "æª?æ¡?ç?¼ç??è¡?çª?"
 
@@ -3013,8 +3023,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 "æ¸?å?®æª¢è¦?"
@@ -5184,44 +5194,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 "ä»¥æ¸?å?®é¡¯ç¤ºæ¨¡å¼?ä¾?é¡¯ç¤ºæ?¬ä½?ç½®ã??"
 
@@ -5560,12 +5570,12 @@ 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."
@@ -5573,12 +5583,12 @@ 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."
@@ -7435,6 +7445,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 ""
+#~ "å??æ¨£å??ç¨±ç?? %s è³?æ??å¤¾å·²ç¶?å?å?¨æ?¼ã??%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."
@@ -7470,14 +7497,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 "ç?¡æ³?ä½¿ç?¨ç³»çµ±å¥?ä»¶å®?è£?ç¨?å¼?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]