[conduit] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [conduit] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Sat, 5 Feb 2011 09:45:51 +0000 (UTC)
commit 4ec2054080c1242dd109b2d65b69a75f42bb4423
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sat Feb 5 17:45:41 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  555 ++++++++++++++++++++++++++++++++---------------------------
 po/zh_TW.po |  555 ++++++++++++++++++++++++++++++++---------------------------
 2 files changed, 604 insertions(+), 506 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8a681c5..bb0eda8 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,16 +1,18 @@
 # Chinese (Hong Kong) translation of conduit.
 # Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2008.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2008, 2010.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: conduit 0.3.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 14:06+0800\n"
-"PO-Revision-Date: 2010-03-29 14:06+0800\n"
+"POT-Creation-Date: 2011-02-05 17:45+0800\n"
+"PO-Revision-Date: 2011-02-05 17:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,13 +25,148 @@ 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
+#, fuzzy
+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 "ä½ æ?³è¦?å??æ¥ä»?éº¼ï¼?"
 
 #: ../conduit/Knowledge.py:9
-#, fuzzy
-#| msgid "Drag a Data Provider here to continue"
 msgid "Drag and Drop a Data Provider on the Canvas"
 msgstr "å°?è³?æ??æ??ä¾?è??æ??æ?¾å?°é??è£?ä»¥ç¹¼çº?"
 
@@ -73,62 +210,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 "ä¸?ä½¿ç?¨ GUI å??å??ã??[é ?è¨å?¼ï¼?%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 "ä»¥æ??å®?ç?? UI å?·è¡?ã??[é ?è¨å?¼ï¼?%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 è¨å®?å?¼ï¼?è¨å®?é?µï¼?ä»¥æ??å®?é??å??ä½?æ¥é??æ®µç??æ?¸å?¼ã??[é ?è¨å?¼ï¼?ä¸?è¦?è¨å®?]"
 
-#: ../conduit/Main.py:91
+#: ../conduit/Main.py:89
 #, python-format
 msgid ""
-"Enable loading of unfinished or unsupported dataproviders. [default: %"
-"default]"
+"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]"
@@ -143,7 +280,7 @@ msgstr "è¦?å??æ¥ç??æ?°è³?æ??"
 
 #: ../conduit/dataproviders/DataProvider.py:24
 msgid "Refreshing..."
-msgstr "é??æ?°æ?´ç??..."
+msgstr "é??æ?°æ?´ç??â?¦"
 
 #: ../conduit/dataproviders/DataProvider.py:25
 msgid "Refreshed OK"
@@ -155,7 +292,7 @@ msgstr "é??æ?°æ?´ç??ç?¼ç??é?¯èª¤"
 
 #: ../conduit/dataproviders/DataProvider.py:27
 msgid "Synchronizing..."
-msgstr "æ£å?¨å??æ¥..."
+msgstr "æ£å?¨å??æ¥â?¦"
 
 #: ../conduit/dataproviders/DataProvider.py:28
 msgid "Synchronized OK"
@@ -173,7 +310,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 "å??æ¥å??æ??è¡?çª?"
 
@@ -208,12 +345,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 "ç?¸ç??"
 
@@ -245,7 +382,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 +447,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 "å??ç¨±"
 
@@ -324,9 +461,8 @@ msgid " - %s (Development Version)"
 msgstr " - %s (é??ç?¼ç??æ?¬)"
 
 #: ../conduit/gtkui/UI.py:331
-#, fuzzy
 msgid " - Running Uninstalled"
-msgstr "å°?æ?ªé??ä½?"
+msgstr " - å?·è¡?è§£é?¤å®?è£?"
 
 #: ../conduit/gtkui/UI.py:375
 msgid "Developers"
@@ -336,41 +472,41 @@ msgstr "é??ç?¼é??ä¼?"
 msgid "Synchronization in progress. Do you want to cancel it?"
 msgstr "å??æ¥å??å°?å?¨é?²è¡?ä¸ã??ä½ æ?¯å?¦è¦?å??æ¶?å®?ï¼?"
 
-#: ../conduit/gtkui/UI.py:711
+#: ../conduit/gtkui/UI.py:712
 msgid "_Synchronize All"
 msgstr "å??æ¥å?¨é?¨(_S)"
 
-#: ../conduit/gtkui/UI.py:711
+#: ../conduit/gtkui/UI.py:712
 msgid "Synchronizes All Groups"
 msgstr "å??æ¥æ??æ??ç??ç¾£çµ?"
 
-#: ../conduit/gtkui/UI.py:712
+#: ../conduit/gtkui/UI.py:713
 msgid "_Cancel Synchronization"
 msgstr "å??æ¶?å??æ¥å??(_C)"
 
-#: ../conduit/gtkui/UI.py:712
+#: ../conduit/gtkui/UI.py:713
 msgid "Cancels Currently Synchronizing Groups"
 msgstr "å??æ¶?ç?®å??æ£å?¨å??æ¥ç??ç¾£çµ?"
 
-#: ../conduit/gtkui/UI.py:713
+#: ../conduit/gtkui/UI.py:714
 msgid "_Quit"
 msgstr "é?¢é??(_Q)"
 
-#: ../conduit/gtkui/UI.py:713
+#: ../conduit/gtkui/UI.py:714
 msgid "Close Conduit"
 msgstr "é??é?? Conduit"
 
-#: ../conduit/gtkui/UI.py:753
-msgid "Synchronization Error"
-msgstr "å??æ¥å??é?¯èª¤"
+#: ../conduit/gtkui/UI.py:731
+msgid "Synchronizing"
+msgstr "å??æ¥ä¸"
 
-#: ../conduit/gtkui/UI.py:756
+#: ../conduit/gtkui/UI.py:737
 msgid "Synchronization Complete"
 msgstr "å??æ¥å??å®?æ??"
 
-#: ../conduit/gtkui/UI.py:764
-msgid "Synchronizing"
-msgstr "å??æ¥ä¸"
+#: ../conduit/gtkui/UI.py:741
+msgid "Synchronization Error"
+msgstr "å??æ¥å??é?¯èª¤"
 
 #: ../conduit/gtkui/Tree.py:364
 msgid "Description"
@@ -425,8 +561,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 "æ?æ?¾æ¸?å?®"
 
@@ -439,7 +575,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 "è³?æ??å¤¾"
 
@@ -463,40 +599,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 "Evolution è¡?äº?æ??"
 
-#: ../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 "å??æ¥ä½ ç??å??å¿?é??"
 
@@ -511,7 +647,7 @@ msgstr "å??æ¥ä½ ç?? Facebook ç?¸ç??"
 #: ../conduit/modules/FacebookModule/FacebookModule.py:124
 #: ../conduit/modules/FlickrModule/FlickrModule.py:282
 msgid "Loading album list..."
-msgstr "è¼?å?¥ç?¸ç°¿æ¸?å?®..."
+msgstr "è¼?å?¥ç?¸ç°¿æ¸?å?®â?¦"
 
 #: ../conduit/modules/FacebookModule/FacebookModule.py:128
 msgid "Failed to connect"
@@ -526,12 +662,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 "ç?¸ç°¿"
@@ -593,50 +729,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 "å??å?«æª?æ¡?..."
+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 "å??å?«è³?æ??å¤¾..."
+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 "å??æ¥è³?æ??å¤¾"
 
@@ -674,7 +810,7 @@ msgstr "ç?»å?¥å¤±æ??ã??"
 
 #: ../conduit/modules/FlickrModule/FlickrModule.py:303
 msgid "Logging in, please wait..."
-msgstr "æ£å?¨ç?»å?¥ï¼?è«?ç¨?å??..."
+msgstr "æ£å?¨ç?»å?¥ï¼?è«?ç¨?å??â?¦"
 
 #: ../conduit/modules/FlickrModule/FlickrModule.py:308
 #: ../conduit/modules/GoogleBookmarksModule.py:67
@@ -703,44 +839,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 "å? å?¥æ¨?ç±¤"
 
@@ -793,130 +931,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 é?µä»¶è?¯çµ¡äºº"
-
-#: ../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 "Video"
 
-#: ../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 "è¦?å??ç¨®é¡?"
 
@@ -946,11 +1039,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 å½±ç??"
@@ -959,11 +1047,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 "Video"
-
 #: ../conduit/modules/N800Module/N800Module.py:174
 msgid "N800 Photos"
 msgstr "N800 ç?¸ç??"
@@ -1001,14 +1084,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"
@@ -1037,67 +1132,60 @@ msgstr "Zoto"
 msgid "Synchronize your Zoto photos"
 msgstr "å??æ¥ä½ ç?? Zoto ç?¸ç??"
 
-#~ msgid "<b>Default Synchronization Options</b>"
-#~ msgstr "<b>é ?è¨å??æ¥å??é?¸é ?</b>"
+#~ msgid "Google Calendar"
+#~ msgstr "Google æ?¥æ??"
 
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>ä¸?è?¬</b>"
+#~ msgid "Synchronize your Google Calendar"
+#~ msgstr "å??æ¥æ?¨ç?? Google æ?¥æ??"
 
-#~ msgid "Always Up To Date"
-#~ msgstr "æ°¸é? ä¿?æ??æ??æ?°"
+#~ msgid "Picasa"
+#~ msgstr "Picasa"
 
-#~ msgid "Ask Me What to Do"
-#~ msgstr "è©¢å??æ??è¦?æ??éº¼å??"
+#~ msgid "Synchronize your Google Picasa photos"
+#~ msgstr "å??æ¥æ?¨ç?? Google Picasa ç?¸ç??"
 
-#~ msgid "Ask me what to do"
-#~ msgstr "è©¢å??æ??è¦?æ??éº¼å??"
+#~ msgid "Google Contacts"
+#~ msgstr "Google é?£çµ¡äºº"
 
-#~ msgid "Cancel Synchronization"
-#~ msgstr "å??æ¶?å??æ¥å??"
+#~ msgid "Synchronize your Google Mail contacts"
+#~ msgstr "å??æ¥æ?¨ç?? Google é?µä»¶é?£çµ¡äºº"
 
-#~ msgid "Cancel currently synchronizing groups"
-#~ msgstr "å??æ¶?ç?®å??ç??å??æ¥ç¾¤çµ?"
-
-#, fuzzy
-#~ msgid "Clear Canvas"
-#~ msgstr "å?¨é?¨æ¸?é?¤"
+#~ msgid "Google Documents"
+#~ msgstr "Google æ??ä»¶"
 
-#~ msgid "Compare"
-#~ msgstr "æ¯?è¼?"
+#~ msgid "Synchronize your Google Documents"
+#~ msgstr "å??æ¥æ?¨ç?? Google æ??ä»¶"
 
-#~ msgid "Conduit Preferences"
-#~ msgstr "Conduit å??å¥½è¨å®?"
+#~ msgid "miscellaneous"
+#~ msgstr "é??é ?"
 
-#~ msgid "Configuration"
-#~ msgstr "çµ?æ??"
+#~ msgid "No description."
+#~ msgstr "æ²?æ??æ??è¿°ã??"
 
-#~ msgid "Configure the synchronization settings for this item"
-#~ msgstr "è¨å®?é??å??é ?ç?®ç??å??æ¥è¨å®?å?¼"
+#~ msgid "YouTube"
+#~ msgstr "YouTube"
 
-#~ msgid "Conflicts"
-#~ msgstr "è¡?çª?"
+#~ msgid "Synchronize data from YouTube"
+#~ msgstr "å¾? YouTube å??æ¥è³?æ??"
 
-#~ msgid "Data Conversions"
-#~ msgstr "è³?æ??è½?æ??"
+#~ msgid "iPod Music"
+#~ msgstr "iPod é?³æ¨?"
 
-#~ msgid "Delete Group"
-#~ msgstr "å?ªé?¤ç¾¤çµ?"
+#~ msgid "iPod Video"
+#~ msgstr "iPod è¦?è¨?"
 
-#~ msgid "Delete Options"
-#~ msgstr "å?ªé?¤é?¸é ?"
+#~ msgid "Cancel currently synchronizing groups"
+#~ msgstr "å??æ¶?ç?®å??ç??å??æ¥ç¾¤çµ?"
 
 #, fuzzy
-#~ msgid "Delete from the corresponding sink"
-#~ msgstr "å¾? {0} ç??å?ªé?¤è??è³?æ??ï¼?"
-
-#~ msgid "Delete the Corresponding Item"
-#~ msgstr "å?ªé?¤å°?ç?ç??é ?ç?®"
+#~ msgid "Clear Canvas"
+#~ msgstr "å?¨é?¨æ¸?é?¤"
 
-#~ msgid "Editor"
-#~ msgstr "ç·¨è¼¯"
+#~ msgid "Configure the synchronization settings for this item"
+#~ msgstr "è¨å®?é??å??é ?ç?®ç??å??æ¥è¨å®?å?¼"
 
-#~ msgid "Minimize to notification area"
-#~ msgstr "æ??å°?å??è?³é??ç?¥å??å??"
+#~ msgid "Delete Group"
+#~ msgstr "å?ªé?¤ç¾¤çµ?"
 
 #~ msgid "Refresh Group"
 #~ msgstr "é??æ?°æ?´ç??ç¾¤çµ?"
@@ -1105,27 +1193,6 @@ msgstr "å??æ¥ä½ ç?? Zoto ç?¸ç??"
 #~ 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 Sync"
 #~ msgstr "æ?¢é??å??æ¥"
 
@@ -1141,32 +1208,14 @@ msgstr "å??æ¥ä½ ç?? Zoto ç?¸ç??"
 #~ msgid "Synchronizes all groups"
 #~ msgstr "å??æ¥æ??æ??ç??ç¾¤çµ?"
 
-#~ msgid "Title"
-#~ msgstr "æ¨?é¡?"
-
 #~ msgid "Two Way Sync"
 #~ msgstr "é??å??å??æ¥"
 
-#~ msgid "When an item has been deleted:"
-#~ msgstr "ç?¶é ?ç?®è¢«å?ªé?¤æ??ï¼?"
-
 #~ msgid "When an item is deleted..."
-#~ msgstr "ç?¶é ?ç?®è¢«å?ªé?¤æ??..."
+#~ 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)"
+#~ msgstr "ç?¶ç?¼ç??è¡?çª?æ??â?¦"
 
 #~ msgid "<b>Saved Note Settings</b>"
 #~ msgstr "<b>å?²å?ç??ç?è¨?è¨å®?å?¼</b>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b106fdc..10b3a90 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,16 +1,18 @@
 # traditional Chinese translation of conduit.
 # Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2008.
+# Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2008, 2010.
+# Wei-Lun Chao <chaoweilun gmail com>, 2010.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: conduit 0.3.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 14:06+0800\n"
-"PO-Revision-Date: 2010-03-28 17:33+0800\n"
+"POT-Creation-Date: 2011-02-05 17:45+0800\n"
+"PO-Revision-Date: 2011-02-04 16:23+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese/Traditional <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,13 +25,148 @@ 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
+#, fuzzy
+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 "æ?¨æ?³è¦?å??æ¥ä»?éº¼ï¼?"
 
 #: ../conduit/Knowledge.py:9
-#, fuzzy
-#| msgid "Drag a Data Provider here to continue"
 msgid "Drag and Drop a Data Provider on the Canvas"
 msgstr "å°?è³?æ??æ??ä¾?è??æ??æ?¾å?°é??è£¡ä»¥ç¹¼çº?"
 
@@ -73,39 +210,39 @@ 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 "ä¸?ä½¿ç?¨ GUI å??å??ã??[é ?è¨å?¼ï¼?%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 "ä»¥æ??å®?ç?? UI å?·è¡?ã??[é ?è¨å?¼ï¼?%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]"
@@ -113,24 +250,24 @@ msgstr ""
 "æ??ç¢ºç??è¨å®? Conduit è¨å®?å?¼ï¼?è¨å®?é?µï¼?ä»¥æ??å®?é??å??ä½?æ¥é??æ®µç??æ?¸å?¼ã??[é ?è¨å?¼ï¼?ä¸?è¦?è¨"
 "å®?]"
 
-#: ../conduit/Main.py:91
+#: ../conduit/Main.py:89
 #, python-format
 msgid ""
-"Enable loading of unfinished or unsupported dataproviders. [default: %"
-"default]"
+"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]"
@@ -145,7 +282,7 @@ msgstr "è¦?å??æ¥ç??æ?°è³?æ??"
 
 #: ../conduit/dataproviders/DataProvider.py:24
 msgid "Refreshing..."
-msgstr "é??æ?°æ?´ç??..."
+msgstr "é??æ?°æ?´ç??â?¦"
 
 #: ../conduit/dataproviders/DataProvider.py:25
 msgid "Refreshed OK"
@@ -157,7 +294,7 @@ msgstr "é??æ?°æ?´ç??ç?¼ç??é?¯èª¤"
 
 #: ../conduit/dataproviders/DataProvider.py:27
 msgid "Synchronizing..."
-msgstr "æ£å?¨å??æ¥..."
+msgstr "æ£å?¨å??æ¥â?¦"
 
 #: ../conduit/dataproviders/DataProvider.py:28
 msgid "Synchronized OK"
@@ -175,7 +312,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 "å??æ¥å??æ??è¡?çª?"
 
@@ -210,12 +347,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 "ç?¸ç??"
 
@@ -247,7 +384,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 "é¡¯ç¤ºçµ¦æ??"
 
@@ -312,7 +449,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 "å??ç¨±"
 
@@ -326,9 +463,8 @@ msgid " - %s (Development Version)"
 msgstr " - %s (é??ç?¼ç??æ?¬)"
 
 #: ../conduit/gtkui/UI.py:331
-#, fuzzy
 msgid " - Running Uninstalled"
-msgstr "å°?æ?ªé??ä½?"
+msgstr " - å?·è¡?è§£é?¤å®?è£?"
 
 #: ../conduit/gtkui/UI.py:375
 msgid "Developers"
@@ -338,41 +474,41 @@ msgstr "é??ç?¼å??é??"
 msgid "Synchronization in progress. Do you want to cancel it?"
 msgstr "å??æ¥å??å°?å?¨é?²è¡?ä¸ã??æ?¨æ?¯å?¦è¦?å??æ¶?å®?ï¼?"
 
-#: ../conduit/gtkui/UI.py:711
+#: ../conduit/gtkui/UI.py:712
 msgid "_Synchronize All"
 msgstr "å??æ¥å?¨é?¨(_S)"
 
-#: ../conduit/gtkui/UI.py:711
+#: ../conduit/gtkui/UI.py:712
 msgid "Synchronizes All Groups"
 msgstr "å??æ¥æ??æ??ç??ç¾¤çµ?"
 
-#: ../conduit/gtkui/UI.py:712
+#: ../conduit/gtkui/UI.py:713
 msgid "_Cancel Synchronization"
 msgstr "å??æ¶?å??æ¥å??(_C)"
 
-#: ../conduit/gtkui/UI.py:712
+#: ../conduit/gtkui/UI.py:713
 msgid "Cancels Currently Synchronizing Groups"
 msgstr "å??æ¶?ç?®å??æ£å?¨å??æ¥ç??ç¾¤çµ?"
 
-#: ../conduit/gtkui/UI.py:713
+#: ../conduit/gtkui/UI.py:714
 msgid "_Quit"
 msgstr "é?¢é??(_Q)"
 
-#: ../conduit/gtkui/UI.py:713
+#: ../conduit/gtkui/UI.py:714
 msgid "Close Conduit"
 msgstr "é??é?? Conduit"
 
-#: ../conduit/gtkui/UI.py:753
-msgid "Synchronization Error"
-msgstr "å??æ¥å??é?¯èª¤"
+#: ../conduit/gtkui/UI.py:731
+msgid "Synchronizing"
+msgstr "å??æ¥ä¸"
 
-#: ../conduit/gtkui/UI.py:756
+#: ../conduit/gtkui/UI.py:737
 msgid "Synchronization Complete"
 msgstr "å??æ¥å??å®?æ??"
 
-#: ../conduit/gtkui/UI.py:764
-msgid "Synchronizing"
-msgstr "å??æ¥ä¸"
+#: ../conduit/gtkui/UI.py:741
+msgid "Synchronization Error"
+msgstr "å??æ¥å??é?¯èª¤"
 
 #: ../conduit/gtkui/Tree.py:364
 msgid "Description"
@@ -427,8 +563,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 "æ?æ?¾æ¸?å?®"
 
@@ -441,7 +577,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 "è³?æ??å¤¾"
 
@@ -465,40 +601,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 "Evolution è¡?äº?æ??"
 
-#: ../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 "å??æ¥æ?¨ç??å??å¿?é??"
 
@@ -513,7 +649,7 @@ msgstr "å??æ¥æ?¨ç?? Facebook ç?¸ç??"
 #: ../conduit/modules/FacebookModule/FacebookModule.py:124
 #: ../conduit/modules/FlickrModule/FlickrModule.py:282
 msgid "Loading album list..."
-msgstr "è¼?å?¥ç?¸ç°¿æ¸?å?®..."
+msgstr "è¼?å?¥ç?¸ç°¿æ¸?å?®â?¦"
 
 #: ../conduit/modules/FacebookModule/FacebookModule.py:128
 msgid "Failed to connect"
@@ -528,12 +664,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 "ç?¸ç°¿"
@@ -595,50 +731,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 "å??å?«æª?æ¡?..."
+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 "å??å?«è³?æ??å¤¾..."
+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 "å??æ¥è³?æ??å¤¾"
 
@@ -676,7 +812,7 @@ msgstr "ç?»å?¥å¤±æ??ã??"
 
 #: ../conduit/modules/FlickrModule/FlickrModule.py:303
 msgid "Logging in, please wait..."
-msgstr "æ£å?¨ç?»å?¥ï¼?è«?ç¨?å??..."
+msgstr "æ£å?¨ç?»å?¥ï¼?è«?ç¨?å??â?¦"
 
 #: ../conduit/modules/FlickrModule/FlickrModule.py:308
 #: ../conduit/modules/GoogleBookmarksModule.py:67
@@ -705,44 +841,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 "å? å?¥æ¨?ç±¤"
 
@@ -795,130 +933,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 é?µä»¶é?£çµ¡äºº"
-
-#: ../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 "Video"
 
-#: ../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 "è¦?è¨?ç¨®é¡?"
 
@@ -948,11 +1041,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 å½±ç??"
@@ -961,11 +1049,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 "Video"
-
 #: ../conduit/modules/N800Module/N800Module.py:174
 msgid "N800 Photos"
 msgstr "N800 ç?¸ç??"
@@ -1003,14 +1086,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"
@@ -1039,67 +1134,60 @@ msgstr "Zoto"
 msgid "Synchronize your Zoto photos"
 msgstr "å??æ¥æ?¨ç?? Zoto ç?¸ç??"
 
-#~ msgid "<b>Default Synchronization Options</b>"
-#~ msgstr "<b>é ?è¨å??æ¥å??é?¸é ?</b>"
+#~ msgid "Google Calendar"
+#~ msgstr "Google æ?¥æ??"
 
-#~ msgid "<b>General</b>"
-#~ msgstr "<b>ä¸?è?¬</b>"
+#~ msgid "Synchronize your Google Calendar"
+#~ msgstr "å??æ¥æ?¨ç?? Google æ?¥æ??"
 
-#~ msgid "Always Up To Date"
-#~ msgstr "æ°¸é? ä¿?æ??æ??æ?°"
+#~ msgid "Picasa"
+#~ msgstr "Picasa"
 
-#~ msgid "Ask Me What to Do"
-#~ msgstr "è©¢å??æ??è¦?æ??éº¼å??"
+#~ msgid "Synchronize your Google Picasa photos"
+#~ msgstr "å??æ¥æ?¨ç?? Google Picasa ç?¸ç??"
 
-#~ msgid "Ask me what to do"
-#~ msgstr "è©¢å??æ??è¦?æ??éº¼å??"
+#~ msgid "Google Contacts"
+#~ msgstr "Google é?£çµ¡äºº"
 
-#~ msgid "Cancel Synchronization"
-#~ msgstr "å??æ¶?å??æ¥å??"
+#~ msgid "Synchronize your Google Mail contacts"
+#~ msgstr "å??æ¥æ?¨ç?? Google é?µä»¶é?£çµ¡äºº"
 
-#~ msgid "Cancel currently synchronizing groups"
-#~ msgstr "å??æ¶?ç?®å??ç??å??æ¥ç¾¤çµ?"
-
-#, fuzzy
-#~ msgid "Clear Canvas"
-#~ msgstr "å?¨é?¨æ¸?é?¤"
+#~ msgid "Google Documents"
+#~ msgstr "Google æ??ä»¶"
 
-#~ msgid "Compare"
-#~ msgstr "æ¯?è¼?"
+#~ msgid "Synchronize your Google Documents"
+#~ msgstr "å??æ¥æ?¨ç?? Google æ??ä»¶"
 
-#~ msgid "Conduit Preferences"
-#~ msgstr "Conduit å??å¥½è¨å®?"
+#~ msgid "miscellaneous"
+#~ msgstr "é??é ?"
 
-#~ msgid "Configuration"
-#~ msgstr "çµ?æ??"
+#~ msgid "No description."
+#~ msgstr "æ²?æ??æ??è¿°ã??"
 
-#~ msgid "Configure the synchronization settings for this item"
-#~ msgstr "è¨å®?é??å??é ?ç?®ç??å??æ¥è¨å®?å?¼"
+#~ msgid "YouTube"
+#~ msgstr "YouTube"
 
-#~ msgid "Conflicts"
-#~ msgstr "è¡?çª?"
+#~ msgid "Synchronize data from YouTube"
+#~ msgstr "å¾? YouTube å??æ¥è³?æ??"
 
-#~ msgid "Data Conversions"
-#~ msgstr "è³?æ??è½?æ??"
+#~ msgid "iPod Music"
+#~ msgstr "iPod é?³æ¨?"
 
-#~ msgid "Delete Group"
-#~ msgstr "å?ªé?¤ç¾¤çµ?"
+#~ msgid "iPod Video"
+#~ msgstr "iPod è¦?è¨?"
 
-#~ msgid "Delete Options"
-#~ msgstr "å?ªé?¤é?¸é ?"
+#~ msgid "Cancel currently synchronizing groups"
+#~ msgstr "å??æ¶?ç?®å??ç??å??æ¥ç¾¤çµ?"
 
 #, fuzzy
-#~ msgid "Delete from the corresponding sink"
-#~ msgstr "å¾? {0} ç??å?ªé?¤è??è³?æ??ï¼?"
-
-#~ msgid "Delete the Corresponding Item"
-#~ msgstr "å?ªé?¤å°?ç?ç??é ?ç?®"
+#~ msgid "Clear Canvas"
+#~ msgstr "å?¨é?¨æ¸?é?¤"
 
-#~ msgid "Editor"
-#~ msgstr "ç·¨è¼¯"
+#~ msgid "Configure the synchronization settings for this item"
+#~ msgstr "è¨å®?é??å??é ?ç?®ç??å??æ¥è¨å®?å?¼"
 
-#~ msgid "Minimize to notification area"
-#~ msgstr "æ??å°?å??è?³é??ç?¥å??å??"
+#~ msgid "Delete Group"
+#~ msgstr "å?ªé?¤ç¾¤çµ?"
 
 #~ msgid "Refresh Group"
 #~ msgstr "é??æ?°æ?´ç??ç¾¤çµ?"
@@ -1107,27 +1195,6 @@ msgstr "å??æ¥æ?¨ç?? Zoto ç?¸ç??"
 #~ 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 Sync"
 #~ msgstr "æ?¢é??å??æ¥"
 
@@ -1143,32 +1210,14 @@ msgstr "å??æ¥æ?¨ç?? Zoto ç?¸ç??"
 #~ msgid "Synchronizes all groups"
 #~ msgstr "å??æ¥æ??æ??ç??ç¾¤çµ?"
 
-#~ msgid "Title"
-#~ msgstr "æ¨?é¡?"
-
 #~ msgid "Two Way Sync"
 #~ msgstr "é??å??å??æ¥"
 
-#~ msgid "When an item has been deleted:"
-#~ msgstr "ç?¶é ?ç?®è¢«å?ªé?¤æ??ï¼?"
-
 #~ msgid "When an item is deleted..."
-#~ msgstr "ç?¶é ?ç?®è¢«å?ªé?¤æ??..."
+#~ 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)"
+#~ msgstr "ç?¶ç?¼ç??è¡?çª?æ??â?¦"
 
 #~ msgid "<b>Saved Note Settings</b>"
 #~ msgstr "<b>å?²å?ç??ç?è¨?è¨å®?å?¼</b>"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]