[conduit] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [conduit] Update Simplified Chinese translation.
Date: Mon, 27 Dec 2010 08:01:36 +0000 (UTC)
commit 4cf824392d351d71673e347bb225dc9d903eb511
Author: Yinghua Wang <wantinghard gmail com>
Date:   Mon Dec 27 08:01:22 2010 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  531 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 283 insertions(+), 248 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 74cf922..8b84103 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,9 +8,9 @@ msgstr ""
 "Project-Id-Version: conduit master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=conduit&component=documentation and translation\n"
-"POT-Creation-Date: 2010-07-05 16:11+0000\n"
-"PO-Revision-Date: 2010-07-25 19:22+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"POT-Creation-Date: 2010-10-29 22:35+0000\n"
+"PO-Revision-Date: 2010-11-20 15:56+0800\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +24,142 @@ msgstr "Conduit å??æ¥å·¥å?·"
 msgid "Synchronization for GNOME"
 msgstr "GNOME ç??å??æ¥"
 
+#: ../data/conduit.ui.h:1
+msgid "Always Up-To-Date"
+msgstr "æ?»æ?¯å??æ?¶æ?´æ?°"
+
+#: ../data/conduit.ui.h:2
+msgid "Ask Me What to Do"
+msgstr "è¯¢é?®è¦?å??ä»?ä¹?"
+
+#: ../data/conduit.ui.h:3
+msgid "Ask me what to do"
+msgstr "è¯¢é?®è¦?å??ä»?ä¹?"
+
+#: ../data/conduit.ui.h:4
+msgid "Compare"
+msgstr "æ¯?è¾?"
+
+#: ../data/conduit.ui.h:5
+msgid "Conduit Preferences"
+msgstr "Conduit é¦?é??é¡¹"
+
+#: ../data/conduit.ui.h:6
+msgid "Configuration"
+msgstr "é??ç½®"
+
+#: ../data/conduit.ui.h:7
+msgid "Conflict Options"
+msgstr "å?²çª?é??é¡¹"
+
+#: ../data/conduit.ui.h:8
+msgid "Conflicts"
+msgstr "å?²çª?"
+
+#: ../data/conduit.ui.h:9
+msgid "Data Conversions"
+msgstr "æ?°æ?®è½¬æ?¢"
+
+#: ../data/conduit.ui.h:10
+msgid "Data Providers"
+msgstr "æ?°æ?®æ??ä¾?è??"
+
+#: ../data/conduit.ui.h:11
+msgid "Default Synchronization Options"
+msgstr "é»?è®¤å??æ¥é??é¡¹"
+
+#: ../data/conduit.ui.h:12
+msgid "Delete Options"
+msgstr "å? é?¤é??é¡¹"
+
+#: ../data/conduit.ui.h:13
+msgid "Delete from the corresponding sink"
+msgstr "å? é?¤ç?¸åº?ç??æ?¥æ?¶å?¨"
+
+#: ../data/conduit.ui.h:14
+msgid "Delete the Corresponding Item"
+msgstr "å? é?¤ç?¸åº?ç??æ?¡ç?®"
+
+#: ../data/conduit.ui.h:15
+msgid "Editor"
+msgstr "ç¼?è¾?å?¨"
+
+#: ../data/conduit.ui.h:16
+msgid "General"
+msgstr "å¸¸è§?"
+
+#: ../data/conduit.ui.h:17
+msgid "Minimize to notification area"
+msgstr "æ??å°?å??å?°é??ç?¥å?ºå??"
+
+#: ../data/conduit.ui.h:18
+msgid "Replace the Older Item"
+msgstr "æ?¿ä»£æ?§æ?¡ç?®"
+
+#: ../data/conduit.ui.h:19
+msgid "Replace the older item"
+msgstr "æ?¿ä»£æ?§æ?¡ç?®"
+
+#: ../data/conduit.ui.h:20
+msgid "Resolve Conflicts"
+msgstr "è§£å?³å?²çª?"
+
+#: ../data/conduit.ui.h:21
+msgid "Save settings on exit"
+msgstr "é??å?ºæ?¶ä¿?å?è®¾ç½®"
+
+#: ../data/conduit.ui.h:22
+msgid "Show Hints"
+msgstr "æ?¾ç¤ºæ??ç¤º"
+
+#: ../data/conduit.ui.h:23
+msgid "Show status icon"
+msgstr "æ?¾ç¤ºç?¶æ??å?¾æ ?"
+
+#: ../data/conduit.ui.h:24
+msgid "Skip"
+msgstr "è·³è¿?"
+
+#: ../data/conduit.ui.h:25
+msgid "Slow Synchronization"
+msgstr "æ?¢é??å??æ¥"
+
+#: ../data/conduit.ui.h:26
+msgid "Start Conduit at login"
+msgstr "ç?»å½?æ?¶å?¯å?¨ Conduit"
+
+#: ../data/conduit.ui.h:27
+msgid "Synchronization Options"
+msgstr "å??æ¥é??é¡¹"
+
+#: ../data/conduit.ui.h:28
+msgid "Title"
+msgstr "æ ?é¢?"
+
+#: ../data/conduit.ui.h:29
+msgid "Two-Way Synchronization"
+msgstr "å??å??å??æ¥"
+
+#: ../data/conduit.ui.h:30
+msgid "When an item has been deleted:"
+msgstr "å½?ä¸?ä¸ªæ?¡ç?®è¢«å? é?¤æ?¶ï¼?"
+
+#: ../data/conduit.ui.h:31
+msgid "When there is a two-way conflict:"
+msgstr "å½?æ??å??å??å?²çª?æ?¶ï¼?"
+
+#: ../data/conduit.ui.h:32
+msgid "_Edit"
+msgstr "ç¼?è¾?(_E)"
+
+#: ../data/conduit.ui.h:33
+msgid "_File"
+msgstr "æ??ä»¶(_F)"
+
+#: ../data/conduit.ui.h:34
+msgid "_Help"
+msgstr "å¸®å?©(_H)"
+
 #: ../conduit/Knowledge.py:8
 msgid "What Do You Want to Synchronize?"
 msgstr "æ?¨è¦?å??æ¥ä»?ä¹?ï¼?"
@@ -72,62 +208,62 @@ msgstr "å?? Facebook ä¸?ä¼ ç?§ç??"
 msgid "Synchronize Desktop Wallpaper from a RSS Feed"
 msgstr "ä»? RSS ç§?å?å??æ¥æ¡?é?¢å£?çº¸"
 
-#: ../conduit/Main.py:59
+#: ../conduit/Main.py:57
 msgid "Conduit is a synchronization application."
 msgstr "Conduit æ?¯ä¸?ä¸ªå??æ¥ç¨?åº?ã??"
 
-#: ../conduit/Main.py:63
+#: ../conduit/Main.py:61
 #, python-format
 msgid "Launch without GUI. [default: %default]"
 msgstr "ä¸?ä½¿ç?¨å?¾å½¢ç??é?¢è¿?è¡?ã??[é»?è®¤ï¼? %default]"
 
-#: ../conduit/Main.py:67
+#: ../conduit/Main.py:65
 #, python-format
 msgid "Save dataprovider configuration to FILE. [default: %default]"
 msgstr "ä¿?å?æ?°æ?®æ??ä¾?è??é??ç½®è?³æ??ä»¶ã??[é»?è®¤ï¼?%default]"
 
-#: ../conduit/Main.py:71
+#: ../conduit/Main.py:69
 #, python-format
 msgid "Iconify on startup. [default: %default]"
 msgstr "å?¯å?¨æ?¶æ??å°?å??å?°æ??ç??ã??[é»?è®¤ï¼? %default]"
 
-#: ../conduit/Main.py:75
+#: ../conduit/Main.py:73
 #, python-format
 msgid "Run with the specified UI. [default: %default]"
 msgstr "ä½¿ç?¨æ??å®?ç??ç?¨æ?·ç??é?¢è¿?è¡?ã??[é»?è®¤ï¼?%default]"
 
-#: ../conduit/Main.py:79
+#: ../conduit/Main.py:77
 msgid "Only load modules in the named files. [default: load all modules]"
 msgstr "å?ªä»?å?½å??ç??æ??ä»¶ä¸å? è½½æ¨¡å??ã??[é»?è®¤ï¼?å? è½½æ??æ??æ¨¡å??]"
 
-#: ../conduit/Main.py:83
+#: ../conduit/Main.py:81
 msgid "Do not load modules in the named files. [default: load all modules]"
 msgstr "ä¸?è¦?ä»?å?½å??ç??æ??ä»¶ä¸å? è½½æ¨¡å??ã??[é»?è®¤ï¼?å? è½½æ??æ??æ¨¡å??]"
 
-#: ../conduit/Main.py:87
+#: ../conduit/Main.py:85
 msgid ""
 "Explicitly set internal Conduit settings (keys) to the given values for this "
 "session. [default: do not set]"
 msgstr "æ?¾å¼?ä¸ºä¼?è¯?è®¾ç½®å??é?¨ Conduit è®¾ç½® (keys) ä¸ºç»?å®?ç??å?¼ã??[é»?è®¤ï¼?ä¸?è®¾ç½®]"
 
-#: ../conduit/Main.py:91
+#: ../conduit/Main.py:89
 #, python-format
 msgid ""
 "Enable loading of unfinished or unsupported dataproviders. [default: %"
 "default]"
 msgstr "å?¯ç?¨å? è½½æ?ªå®?æ??æ??æ?ªæ?¯æ??ç??æ?°æ?®æ??ä¾?è??ã??[é»?è®¤ï¼?%default]"
 
-#: ../conduit/Main.py:95
+#: ../conduit/Main.py:93
 #, python-format
 msgid "Generate more debugging information. [default: %default]"
 msgstr "äº§ç??è¾?å¤?è°?è¯?ä¿¡æ?¯ã??[é»?è®¤ï¼?%default]"
 
-#: ../conduit/Main.py:99
+#: ../conduit/Main.py:97
 #, python-format
 msgid "Generate less debugging information. [default: %default]"
 msgstr "äº§ç??è¾?å°?è°?è¯?ä¿¡æ?¯ã??[é»?è®¤ï¼?%default]"
 
-#: ../conduit/Main.py:103
+#: ../conduit/Main.py:101
 #, python-format
 msgid "Generate no debugging information. [default: %default]"
 msgstr "ä¸?äº§ç??è°?è¯?ä¿¡æ?¯ã??[é»?è®¤ï¼?%default]"
@@ -172,7 +308,7 @@ msgstr "å??æ¥å·²è·³è¿?"
 msgid "Synchronization Cancelled"
 msgstr "å??æ¥å·²å??æ¶?"
 
-#: ../conduit/dataproviders/DataProvider.py:32
+#: ../conduit/dataproviders/DataProvider.py:32 ../conduit/gtkui/UI.py:743
 msgid "Synchronization Conflict"
 msgstr "å??æ¥å?²çª?"
 
@@ -207,12 +343,12 @@ msgid "Files and Folders"
 msgstr "æ??ä»¶å??ç?®å½?"
 
 #: ../conduit/dataproviders/__init__.py:7
-#: ../conduit/modules/iPodModule/iPodModule.py:179
+#: ../conduit/modules/iPodModule/iPodModule.py:276
 msgid "Notes"
 msgstr "ä¾¿ç¬º"
 
 #: ../conduit/dataproviders/__init__.py:8
-#: ../conduit/modules/iPodModule/iPodModule.py:367
+#: ../conduit/modules/iPodModule/iPodModule.py:464
 msgid "Photos"
 msgstr "ç?§ç??"
 
@@ -244,7 +380,7 @@ msgstr "æµ?è¯?"
 msgid "Drag a Data Provider here to continue"
 msgstr "æ??å?¨ä¸?ä¸ªæ?°æ?®æ??ä¾?è??è?³æ¤å¤?ä»¥ç»§ç»"
 
-#: ../conduit/gtkui/Canvas.py:217
+#: ../conduit/gtkui/Canvas.py:227
 msgid "Show me"
 msgstr "æ?¾ç¤ºæ¤é¡¹"
 
@@ -310,7 +446,7 @@ msgid "Conversions Available"
 msgstr "è½¬æ?¢å?¯ç?¨"
 
 #: ../conduit/gtkui/UI.py:200 ../conduit/gtkui/Tree.py:355
-#: ../conduit/modules/FileModule/FileConfiguration.py:117
+#: ../conduit/modules/FileModule/FileConfiguration.py:118
 msgid "Name"
 msgstr "å??å?"
 
@@ -359,17 +495,17 @@ msgstr "é??å?º(_Q)"
 msgid "Close Conduit"
 msgstr "å?³é? Conduit"
 
-#: ../conduit/gtkui/UI.py:754
-msgid "Synchronization Error"
-msgstr "å??æ¥å?ºé??"
+#: ../conduit/gtkui/UI.py:731
+msgid "Synchronizing"
+msgstr "æ£å?¨å??æ¥"
 
-#: ../conduit/gtkui/UI.py:757
+#: ../conduit/gtkui/UI.py:737
 msgid "Synchronization Complete"
 msgstr "å??æ¥å®?æ??"
 
-#: ../conduit/gtkui/UI.py:765
-msgid "Synchronizing"
-msgstr "æ£å?¨å??æ¥"
+#: ../conduit/gtkui/UI.py:741
+msgid "Synchronization Error"
+msgstr "å??æ¥å?ºé??"
 
 #: ../conduit/gtkui/Tree.py:364
 msgid "Description"
@@ -424,8 +560,8 @@ msgstr "å??æ¥ Banshee æ?æ?¾å??è¡¨"
 
 #: ../conduit/modules/BansheeModule/BansheeModule.py:187
 #: ../conduit/modules/BansheeModule/BansheeModule.py:188
-#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:116
-#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:117
+#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:120
+#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:121
 msgid "Playlists"
 msgstr "æ?æ?¾å??è¡¨"
 
@@ -438,7 +574,7 @@ msgid "Synchronize your Box.net files"
 msgstr "å??æ¥æ?¨ç?? Box.net æ??ä»¶"
 
 #: ../conduit/modules/BoxDotNetModule/BoxDotNetModule.py:290
-#: ../conduit/modules/FileModule/FileModule.py:82
+#: ../conduit/modules/FileModule/FileModule.py:86
 msgid "Folder"
 msgstr "ç?®å½?"
 
@@ -462,40 +598,40 @@ msgstr "å£?çº¸"
 msgid "Changes your Desktop Wallpaper"
 msgstr "æ?´æ?¹æ?¨ç??æ¡?é?¢å£?çº¸"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:107
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:110
 #, python-format
 msgid "Select %s"
 msgstr "é??æ?© %s"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:127
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:130
 msgid "Evolution Contacts"
 msgstr "Evolution è??ç³»äºº"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:128
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:131
 msgid "Synchronize your contacts"
 msgstr "å??æ¥æ?¨ç??è??ç³»äºº"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:178
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:181
 msgid "Evolution Calendar"
 msgstr "å??æ¥æ?¥å??"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:179
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:182
 msgid "Synchronize your calendar"
 msgstr "å??æ¥æ?¨ç??æ?¥å??"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:240
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:243
 msgid "Evolution Tasks"
 msgstr "Evolution ä»»å?¡"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:241
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:244
 msgid "Synchronize your tasks"
 msgstr "å??æ¥æ?¨ç??ä»»å?¡"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:297
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:300
 msgid "Evolution Memos"
 msgstr "Evolution å¤?å¿?å½?"
 
-#: ../conduit/modules/EvolutionModule/EvolutionModule.py:298
+#: ../conduit/modules/EvolutionModule/EvolutionModule.py:301
 msgid "Synchronize your memos"
 msgstr "å??æ¥æ?¨ç??å¤?å¿?å½?"
 
@@ -525,12 +661,12 @@ msgid "Failed to login"
 msgstr "ç?»å½?å¤±è´¥"
 
 #: ../conduit/modules/FacebookModule/FacebookModule.py:145
-#: ../conduit/modules/FspotModule/FspotModule.py:243
+#: ../conduit/modules/FspotModule/FspotModule.py:246
 msgid "Status"
 msgstr "ç?¶æ??"
 
 #: ../conduit/modules/FacebookModule/FacebookModule.py:150
-#: ../conduit/modules/iPodModule/iPodModule.py:461
+#: ../conduit/modules/iPodModule/iPodModule.py:566
 #: ../conduit/modules/ZotoModule/ZotoModule.py:252
 msgid "Album"
 msgstr "ç?¸å??"
@@ -592,50 +728,50 @@ msgstr "ä¸?è½½è§?é¢?æ??ä»¶"
 msgid "Download photo files"
 msgstr "ä¸?è½½å?¾å??æ??ä»¶"
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:111
+#: ../conduit/modules/FileModule/FileConfiguration.py:112
 msgid "Icon"
 msgstr "å?¾æ ?"
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:123
+#: ../conduit/modules/FileModule/FileConfiguration.py:124
 #: ../conduit/modules/GConfModule/GConfModule.py:138
 msgid "Items"
 msgstr "æ?¡ç?®"
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:149
+#: ../conduit/modules/FileModule/FileConfiguration.py:150
 #, python-format
 msgid "<i>Contains %s files</i>"
 msgstr "<i>å??å?« %s æ??ä»¶</i>"
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:248
+#: ../conduit/modules/FileModule/FileConfiguration.py:249
 msgid "Include file..."
 msgstr "å??å?«æ??ä»¶..."
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:258
+#: ../conduit/modules/FileModule/FileConfiguration.py:259
 msgid "All files"
 msgstr "æ??æ??æ??ä»¶"
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:271
+#: ../conduit/modules/FileModule/FileConfiguration.py:272
 msgid "Include folder..."
 msgstr "å??å?«ç?®å½?..."
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:314
+#: ../conduit/modules/FileModule/FileConfiguration.py:315
 msgid "Please Name All Folders"
 msgstr "è¯·å?½å??æ??æ??ç?®å½?"
 
-#: ../conduit/modules/FileModule/FileConfiguration.py:315
+#: ../conduit/modules/FileModule/FileConfiguration.py:316
 msgid ""
 "All folders require a descriptive name. To name a folder simply click on it"
 msgstr "æ??æ??ç?®å½?é?½é??è¦?ä¸?ä¸ªæ??è¿°æ?§ç??å??å?ã??è¦?å?½å??ä¸?ä¸ªç?®å½?ï¼?å?ªé??å?¨ä¸?è¾¹ç?¹å?»"
 
-#: ../conduit/modules/FileModule/FileModule.py:23
+#: ../conduit/modules/FileModule/FileModule.py:27
 msgid "Files"
 msgstr "æ??ä»¶"
 
-#: ../conduit/modules/FileModule/FileModule.py:24
+#: ../conduit/modules/FileModule/FileModule.py:28
 msgid "Source for synchronizing multiple files"
 msgstr "å??æ¥å¤?ä¸ªæ??ä»¶ç??æº?"
 
-#: ../conduit/modules/FileModule/FileModule.py:83
+#: ../conduit/modules/FileModule/FileModule.py:87
 msgid "Synchronize folders"
 msgstr "å??æ¥ç?®å½?"
 
@@ -702,44 +838,46 @@ msgstr "ä¸?è¦?è°?æ?´ç?§ç??å¤§å°?"
 msgid "Photos are public"
 msgstr "å?¬ç?§ç??"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:25
+#: ../conduit/modules/FspotModule/FspotModule.py:28
 msgid "F-Spot"
 msgstr "F-Spot"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:26
+#: ../conduit/modules/FspotModule/FspotModule.py:29
 msgid "Synchronize your F-Spot photos"
 msgstr "å??æ¥æ?¨ç?? F-Spot ç?§ç??"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:152
+#: ../conduit/modules/FspotModule/FspotModule.py:155
 msgid "F-Spot DBus interface is operating in read-only mode"
 msgstr "F-Spot DBus æ?¥å?£æ£å?¨ä»¥å?ªè¯»æ¨¡å¼?æ??ä½?"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:218
+#: ../conduit/modules/FspotModule/FspotModule.py:221
 msgid "F-Spot is running"
 msgstr "F-Spot æ£å?¨è¿?è¡?"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:219
+#: ../conduit/modules/FspotModule/FspotModule.py:222
 msgid "Please start F-Spot or activate the D-Bus Extension"
 msgstr "è¯·å?¯å?¨ F-Spot æ??æ¿?æ´»æ¤ D-Bus æ?©å±?ã??"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:244
+#: ../conduit/modules/FspotModule/FspotModule.py:247
 msgid "Start F-Spot"
 msgstr "å?¯å?¨ F-Spot"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:248
-#: ../conduit/modules/FspotModule/FspotModule.py:249
+#: ../conduit/modules/FspotModule/FspotModule.py:251
+#: ../conduit/modules/FspotModule/FspotModule.py:252
+#: ../conduit/modules/ShotwellModule/ShotwellModule.py:72
+#: ../conduit/modules/ShotwellModule/ShotwellModule.py:74
 msgid "Tags"
 msgstr "æ ?è®°"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:262
+#: ../conduit/modules/FspotModule/FspotModule.py:265
 msgid "Add tags"
 msgstr "æ·»å? æ ?è®°"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:263
+#: ../conduit/modules/FspotModule/FspotModule.py:266
 msgid "Tag name"
 msgstr "æ ?è®°å??"
 
-#: ../conduit/modules/FspotModule/FspotModule.py:266
+#: ../conduit/modules/FspotModule/FspotModule.py:269
 msgid "Add tag"
 msgstr "æ·»å? æ ?è®°"
 
@@ -792,130 +930,85 @@ msgstr "ç?»å½?ç»?è??"
 msgid "Password"
 msgstr "å?£ä»¤"
 
-#: ../conduit/modules/GoogleModule/GoogleModule.py:399
-msgid "Google Calendar"
-msgstr "Google æ?¥å??"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:400
-msgid "Synchronize your Google Calendar"
-msgstr "å??æ¥æ?¨ç?? Google æ?¥å??"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:582
-msgid "Picasa"
-msgstr "Picasa"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:583
-msgid "Synchronize your Google Picasa photos"
-msgstr "å??æ¥æ?¨ç?? Google Picasa ç?§ç??"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:745
-msgid "Google Contacts"
-msgstr "Google è??ç³»äºº"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:746
-msgid "Synchronize your Google Mail contacts"
-msgstr "å??æ¥æ?¨ç?? Google Mail è??ç³»äºº"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:1076
-msgid "Google Documents"
-msgstr "Google æ??æ¡£"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:1077
-msgid "Synchronize your Google Documents"
-msgstr "å??æ¥æ?¨ç?? Google æ??æ¡£"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:1322
-#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:69
-msgid "Unknown"
-msgstr "æ?ªç?¥"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:1323
-msgid "miscellaneous"
-msgstr "æ??é¡¹"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:1324
-msgid "No description."
-msgstr "æ²¡æ??æ??è¿°"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:1333
-msgid "YouTube"
-msgstr "YouTube"
-
-#: ../conduit/modules/GoogleModule/GoogleModule.py:1334
-msgid "Synchronize data from YouTube"
-msgstr "ä»? YouTube å??æ¥æ?°æ?®"
-
-#: ../conduit/modules/iPodModule/iPodModule.py:180
+#: ../conduit/modules/iPodModule/iPodModule.py:277
 msgid "Synchronize your iPod notes"
 msgstr "å??æ¥æ?¨ç?? iPod ç¬?è®°"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:295
+#: ../conduit/modules/iPodModule/iPodModule.py:392
 msgid "Contacts"
 msgstr "è??ç³»äºº"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:296
+#: ../conduit/modules/iPodModule/iPodModule.py:393
 msgid "Synchronize your iPod contacts"
 msgstr "å??æ¥æ?¨ç?? iPod è??ç³»äºº"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:331
+#: ../conduit/modules/iPodModule/iPodModule.py:428
 msgid "Calendar"
 msgstr "æ?¥å??"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:332
+#: ../conduit/modules/iPodModule/iPodModule.py:429
 msgid "Synchronize your iPod calendar"
 msgstr "å??æ¥æ?¨ç?? iPod æ?¥å??"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:368
+#: ../conduit/modules/iPodModule/iPodModule.py:465
 msgid "Synchronize your iPod photos"
 msgstr "å??æ¥æ?¨ç?? iPod ç?§ç??"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:465
+#: ../conduit/modules/iPodModule/iPodModule.py:570
 msgid "Delete"
 msgstr "å? é?¤"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:695
-#: ../conduit/modules/iPodModule/iPodModule.py:812
+#: ../conduit/modules/iPodModule/iPodModule.py:573
+msgid "Delete All Photos"
+msgstr "å? é?¤æ??æ??ç?§ç??"
+
+#: ../conduit/modules/iPodModule/iPodModule.py:803
+#: ../conduit/modules/iPodModule/iPodModule.py:920
 #: ../conduit/modules/N800Module/N800Module.py:77
 msgid "Encoding"
 msgstr "ç¼?ç ?"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:811
+#: ../conduit/modules/iPodModule/iPodModule.py:919
 msgid "Conversion options"
 msgstr "è½¬æ?¢é??é¡¹"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:816
+#: ../conduit/modules/iPodModule/iPodModule.py:924
 msgid "Keep converted files"
 msgstr "ä¿?æ??è½¬æ?¢è¿?ç??æ??ä»¶"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:846
-msgid "iPod Music"
-msgstr "iPod é?³ä¹?"
+#. To translators: defaul music folder of N800
+#: ../conduit/modules/iPodModule/iPodModule.py:954
+#: ../conduit/modules/N800Module/N800Module.py:133
+msgid "Music"
+msgstr "é?³ä¹?"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:847
+#: ../conduit/modules/iPodModule/iPodModule.py:955
 msgid "Synchronize your iPod music"
 msgstr "å??æ¥æ?¨ç?? iPod é?³ä¹?"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:882
-msgid "iPod Video"
-msgstr "iPod è§?é¢?"
+#. To translators: defaul video folder of N800
+#: ../conduit/modules/iPodModule/iPodModule.py:990
+#: ../conduit/modules/N800Module/N800Module.py:157
+msgid "Video"
+msgstr "è§?é¢?"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:883
+#: ../conduit/modules/iPodModule/iPodModule.py:991
 msgid "Synchronize your iPod videos"
 msgstr "å??æ¥æ?¨ç?? iPod è§?é¢?"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:907
+#: ../conduit/modules/iPodModule/iPodModule.py:1015
 msgid "Movie"
 msgstr "ç?µå½±"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:908
+#: ../conduit/modules/iPodModule/iPodModule.py:1016
 msgid "Music Video"
 msgstr "é?³ä¹?è§?é¢?"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:909
+#: ../conduit/modules/iPodModule/iPodModule.py:1017
 msgid "TV Show"
 msgstr "ç?µè§?è??ç?®"
 
-#: ../conduit/modules/iPodModule/iPodModule.py:911
+#: ../conduit/modules/iPodModule/iPodModule.py:1019
 msgid "Video kind"
 msgstr "è§?é¢?ç±»"
 
@@ -945,11 +1038,6 @@ msgstr "N800 é?³ä¹?"
 msgid "Synchronizes music to a N800 device"
 msgstr "å??æ¥é?³ä¹?å?° N800"
 
-#. To translators: defaul music folder of N800
-#: ../conduit/modules/N800Module/N800Module.py:133
-msgid "Music"
-msgstr "é?³ä¹?"
-
 #: ../conduit/modules/N800Module/N800Module.py:150
 msgid "N800 Videos"
 msgstr "N800 è§?é¢?"
@@ -958,11 +1046,6 @@ msgstr "N800 è§?é¢?"
 msgid "Synchronizes video to a N800 device"
 msgstr "å??æ¥è§?é¢?å?° N800"
 
-#. To translators: defaul video folder of N800
-#: ../conduit/modules/N800Module/N800Module.py:157
-msgid "Video"
-msgstr "è§?é¢?"
-
 #: ../conduit/modules/N800Module/N800Module.py:174
 msgid "N800 Photos"
 msgstr "N800 ç?§ç??"
@@ -1000,14 +1083,26 @@ msgstr "ç½?ç»?"
 msgid "Enable synchronization via network"
 msgstr "å?¯ç?¨é??è¿?ç½?ç»?å??æ¥"
 
-#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:44
+#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:48
 msgid "Rhythmbox Music"
 msgstr "Rhythmbox é?³ä¹?"
 
-#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:45
+#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:49
 msgid "Synchronize songs from your Rhythmbox playlists"
 msgstr "ä»? Rhythmbox æ?æ?¾å??è¡¨å??æ¥æ?æ?²"
 
+#: ../conduit/modules/RhythmboxModule/RhythmboxModule.py:73
+msgid "Unknown"
+msgstr "æ?ªç?¥"
+
+#: ../conduit/modules/ShotwellModule/ShotwellModule.py:37
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: ../conduit/modules/ShotwellModule/ShotwellModule.py:38
+msgid "Sync from your Shotwell photo library"
+msgstr "ä»?æ?¨ç?? Shotwell ç?§ç??åº?å??æ¥"
+
 #: ../conduit/modules/ShutterflyModule/ShutterflyModule.py:26
 msgid "Shutterfly"
 msgstr "Shutterfly"
@@ -1036,20 +1131,47 @@ msgstr "Zoto"
 msgid "Synchronize your Zoto photos"
 msgstr "å??æ¥æ?¨ç?? Zoto ç?§ç??"
 
-#~ msgid "<b>Default Synchronization Options</b>"
-#~ msgstr "<b>é»?è®¤å??æ¥é??é¡¹</b>"
+#~ msgid "Google Calendar"
+#~ msgstr "Google æ?¥å??"
+
+#~ msgid "Synchronize your Google Calendar"
+#~ msgstr "å??æ¥æ?¨ç?? Google æ?¥å??"
+
+#~ msgid "Picasa"
+#~ msgstr "Picasa"
+
+#~ msgid "Synchronize your Google Picasa photos"
+#~ msgstr "å??æ¥æ?¨ç?? Google Picasa ç?§ç??"
+
+#~ msgid "Google Contacts"
+#~ msgstr "Google è??ç³»äºº"
+
+#~ msgid "Synchronize your Google Mail contacts"
+#~ msgstr "å??æ¥æ?¨ç?? Google Mail è??ç³»äºº"
+
+#~ msgid "Google Documents"
+#~ msgstr "Google æ??æ¡£"
+
+#~ msgid "Synchronize your Google Documents"
+#~ msgstr "å??æ¥æ?¨ç?? Google æ??æ¡£"
 
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>å¸¸è§?</b>"
+#~ msgid "miscellaneous"
+#~ msgstr "æ??é¡¹"
 
-#~ msgid "Always Up-To-Date"
-#~ msgstr "æ?»æ?¯å??æ?¶æ?´æ?°"
+#~ msgid "No description."
+#~ msgstr "æ²¡æ??æ??è¿°"
 
-#~ msgid "Ask Me What to Do"
-#~ msgstr "è¯¢é?®è¦?å??ä»?ä¹?"
+#~ msgid "YouTube"
+#~ msgstr "YouTube"
 
-#~ msgid "Ask me what to do"
-#~ msgstr "è¯¢é?®è¦?å??ä»?ä¹?"
+#~ msgid "Synchronize data from YouTube"
+#~ msgstr "ä»? YouTube å??æ¥æ?°æ?®"
+
+#~ msgid "iPod Music"
+#~ msgstr "iPod é?³ä¹?"
+
+#~ msgid "iPod Video"
+#~ msgstr "iPod è§?é¢?"
 
 #~ msgid "Cancel Synchronization"
 #~ msgstr "å??æ¶?å??æ¥"
@@ -1060,93 +1182,27 @@ msgstr "å??æ¥æ?¨ç?? Zoto ç?§ç??"
 #~ msgid "Clear Canvas"
 #~ msgstr "æ¸?é?¤æ?¾ç¤ºå?º"
 
-#~ msgid "Compare"
-#~ msgstr "æ¯?è¾?"
-
-#~ msgid "Conduit Preferences"
-#~ msgstr "Conduit é¦?é??é¡¹"
-
-#~ msgid "Configuration"
-#~ msgstr "é??ç½®"
-
 #~ msgid "Configure Item"
 #~ msgstr "é??ç½®æ?¡ç?®"
 
 #~ msgid "Configure the synchronization settings for this item"
 #~ msgstr "ä¸ºæ¤æ?¡ç?®é??ç½®å??æ¥è®¾ç½®"
 
-#~ msgid "Conflict Options"
-#~ msgstr "å?²çª?é??é¡¹"
-
-#~ msgid "Conflicts"
-#~ msgstr "å?²çª?"
-
 #~ msgid "Contents"
 #~ msgstr "å??å®¹"
 
-#~ msgid "Data Conversions"
-#~ msgstr "æ?°æ?®è½¬æ?¢"
-
-#~ msgid "Data Providers"
-#~ msgstr "æ?°æ?®æ??ä¾?è??"
-
 #~ msgid "Delete Group"
 #~ msgstr "å? é?¤ç»?"
 
 #~ msgid "Delete Item"
 #~ msgstr "å? é?¤æ?¡ç?®"
 
-#~ msgid "Delete Options"
-#~ msgstr "å? é?¤é??é¡¹"
-
-#~ msgid "Delete from the corresponding sink"
-#~ msgstr "å? é?¤ç?¸åº?ç??æ?¥æ?¶å?¨"
-
-#~ msgid "Delete the Corresponding Item"
-#~ msgstr "å? é?¤ç?¸åº?ç??æ?¡ç?®"
-
-#~ msgid "Editor"
-#~ msgstr "ç¼?è¾?å?¨"
-
-#~ msgid "Minimize to notification area"
-#~ msgstr "æ??å°?å??å?°é??ç?¥å?ºå??"
-
 #~ msgid "Refresh Group"
 #~ msgstr "å?·æ?°ç»?"
 
 #~ msgid "Refresh Item"
 #~ msgstr "å?·æ?°æ?¡ç?®"
 
-#~ msgid "Replace the Older Item"
-#~ msgstr "æ?¿ä»£æ?§æ?¡ç?®"
-
-#~ msgid "Replace the older item"
-#~ msgstr "æ?¿ä»£æ?§æ?¡ç?®"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "è§£å?³å?²çª?"
-
-#~ msgid "Save settings on exit"
-#~ msgstr "é??å?ºæ?¶ä¿?å?è®¾ç½®"
-
-#~ msgid "Show Hints"
-#~ msgstr "æ?¾ç¤ºæ??ç¤º"
-
-#~ msgid "Show status icon"
-#~ msgstr "æ?¾ç¤ºç?¶æ??å?¾æ ?"
-
-#~ msgid "Skip"
-#~ msgstr "è·³è¿?"
-
-#~ msgid "Slow Synchronization"
-#~ msgstr "æ?¢é??å??æ¥"
-
-#~ msgid "Start Conduit at login"
-#~ msgstr "ç?»å½?æ?¶å?¯å?¨ Conduit"
-
-#~ msgid "Synchronization Options"
-#~ msgstr "å??æ¥é??é¡¹"
-
 #~ msgid "Synchronize All"
 #~ msgstr "å??æ¥æ??æ??"
 
@@ -1159,33 +1215,12 @@ msgstr "å??æ¥æ?¨ç?? Zoto ç?§ç??"
 #~ msgid "Synchronizes all groups"
 #~ msgstr "å??æ¥æ??æ??ç»?"
 
-#~ msgid "Title"
-#~ msgstr "æ ?é¢?"
-
-#~ msgid "Two-Way Synchronization"
-#~ msgstr "å??å??å??æ¥"
-
-#~ msgid "When an item has been deleted:"
-#~ msgstr "å½?ä¸?ä¸ªæ?¡ç?®è¢«å? é?¤æ?¶ï¼?"
-
 #~ msgid "When an item is deleted..."
 #~ msgstr "å½?ä¸?ä¸ªæ?¡ç?®è¢«å? é?¤æ?¶..."
 
 #~ msgid "When there is a conflict..."
 #~ msgstr "å½?æ??ä¸?ä¸ªå?²çª?æ?¶"
 
-#~ msgid "When there is a two-way conflict:"
-#~ msgstr "å½?æ??å??å??å?²çª?æ?¶ï¼?"
-
-#~ msgid "_Edit"
-#~ msgstr "ç¼?è¾?(_E)"
-
-#~ msgid "_File"
-#~ msgstr "æ??ä»¶(_F)"
-
-#~ msgid "_Help"
-#~ msgstr "å¸®å?©(_H)"
-
 #~ msgid "<b>Account Details</b>"
 #~ msgstr "<b>è´¦æ?·ç»?è??</b>"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]